remove some bad fuzzy, update line numbers

23 files changed, 12021 insertions, 8972 deletions

diff --git a/po/be.po b/po/be.po
index ef6ab3a7f..ceeeeb261 100644
--- a/po/be.po
+++ b/po/be.po
@@ -3,18 +3,20 @@
 # This file is distributed under the same license as Gajim.
 # Ihar Hrachyshka <ihar.hrachyshka@gmail.com>, 2006.
 #
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-02 17:15+0100\n"
+"POT-Creation-Date: 2006-12-09 10:02+0100\n"
 "PO-Revision-Date: 2006-12-04 11:55+0300\n"
 "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
@@ -84,7 +86,9 @@ msgstr "<b>Запоўніце звесткі Вашага рахунка</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:6
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr "Пстрыкніце, каб праглядзець спіс здольнасцяў jabber-сэрвэраў (напр., транспарты MSN, ICQ)"
+msgstr ""
+"Пстрыкніце, каб праглядзець спіс здольнасцяў jabber-сэрвэраў (напр., "
+"транспарты MSN, ICQ)"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
 msgid "Connect when I press Finish"
@@ -215,8 +219,16 @@ msgid "Chan_ge Password"
 msgstr "З_мяніць пароль"
 
 #: ../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 "Скарыстайце гэтую опцыю, калі хочаце, каб Gajim злучаўся з сэрвэрам праз порт 5223, праз які старыя сэрвэры даюць мажлівасць выкарыстання SSL. Зважайце, што Gajim звычайна выкарыстоўвае шыфраванне TLS, калі звяртаецца да сэрвэра, а гэтая опцыя адключыць выкарыстанне TLS"
+msgid ""
+"Check this so Gajim will connect in port 5223 where legacy servers are "
+"expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
+"default if broadcasted by the server, and with this option enabled TLS will "
+"be disabled"
+msgstr ""
+"Скарыстайце гэтую опцыю, калі хочаце, каб Gajim злучаўся з сэрвэрам праз "
+"порт 5223, праз які старыя сэрвэры даюць мажлівасць выкарыстання SSL. "
+"Зважайце, што Gajim звычайна выкарыстоўвае шыфраванне TLS, калі звяртаецца "
+"да сэрвэра, а гэтая опцыя адключыць выкарыстанне TLS"
 
 #: ../data/glade/account_modification_window.glade.h:10
 #: ../data/glade/zeroconf_properties_window.glade.h:4
@@ -236,11 +248,8 @@ msgid "Edit Personal Information..."
 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:905
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
+#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:905
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -248,12 +257,9 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:15
 #: ../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
+#: ../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 "Агульная"
 
@@ -262,27 +268,48 @@ msgid "Hostname: "
 msgstr "Назва вузла: "
 
 #: ../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 "Калі гэтая опцыя ўключана, Gajim займе некаторыя іншыя адрасы IP, і шанец правільнай перадачы файлаў падвысіцца."
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Калі гэтая опцыя ўключана, Gajim займе некаторыя іншыя адрасы IP, і шанец "
+"правільнай перадачы файлаў падвысіцца."
 
 #: ../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 "Калі гэтая опцыя ўключана, Gajim адпраўляе адмысловыя пакункі, для запэўнівання сэрвэра ў Вашым існаванні"
+msgid ""
+"If checked, Gajim will send keep-alive packets so it prevents connection "
+"timeout which results in disconnection"
+msgstr ""
+"Калі гэтая опцыя ўключана, Gajim адпраўляе адмысловыя пакункі, для "
+"запэўнівання сэрвэра ў Вашым існаванні"
 
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/zeroconf_properties_window.glade.h:8
-msgid "If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you"
-msgstr "Калі гэтая опцыя ўключана, Gajim будзе захоўваць пароль у файле ~/.gajim/config з правамі чытання толькі для Вас"
+msgid ""
+"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+"permission only for you"
+msgstr ""
+"Калі гэтая опцыя ўключана, Gajim будзе захоўваць пароль у файле ~/.gajim/"
+"config з правамі чытання толькі для Вас"
 
 #: ../data/glade/account_modification_window.glade.h:21
 #: ../data/glade/zeroconf_properties_window.glade.h:9
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "Калі гэтая опцыя ўключана, Gajim будзе аўтаматычна злучацца з дапамогай гэтага рахунка"
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Калі гэтая опцыя ўключана, Gajim будзе аўтаматычна злучацца з дапамогай "
+"гэтага рахунка"
 
 #: ../data/glade/account_modification_window.glade.h:22
 #: ../data/glade/zeroconf_properties_window.glade.h:10
-msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly"
-msgstr "Калі гэтая опцыя ўключана, любыя глабальныя змены стану (праз адмысловы спіс унізе галоўнага вакна) будуць змяняць стан рахунка адпаведным чынам"
+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 ""
+"Калі гэтая опцыя ўключана, любыя глабальныя змены стану (праз адмысловы спіс "
+"унізе галоўнага вакна) будуць змяняць стан рахунка адпаведным чынам"
 
 #: ../data/glade/account_modification_window.glade.h:23
 msgid "Information about you, as stored in the server"
@@ -293,26 +320,17 @@ msgid "Manage..."
 msgstr "Кіраванне..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16
-#: ../src/config.py:1637
-#: ../src/config.py:3430
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1642
+#: ../src/config.py:3435
 msgid "No key selected"
 msgstr "Ключ не выбраны"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../src/config.py:1219
-#: ../src/config.py:1224
-#: ../src/config.py:1408
-#: ../src/config.py:1627
-#: ../src/config.py:1636
-#: ../src/config.py:1695
-#: ../src/config.py:1769
-#: ../src/config.py:2640
-#: ../src/config.py:3420
-#: ../src/config.py:3429
-#: ../src/dialogs.py:281
-#: ../src/dialogs.py:283
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1224
+#: ../src/config.py:1229 ../src/config.py:1413 ../src/config.py:1632
+#: ../src/config.py:1641 ../src/config.py:1700 ../src/config.py:1774
+#: ../src/config.py:2645 ../src/config.py:3425 ../src/config.py:3434
+#: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Ніякі"
 
@@ -330,8 +348,14 @@ msgid "Priori_ty:"
 msgstr "Прыяры_тэт:"
 
 #: ../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 "Прыярытэт вызначае, куды накіроўваць падзеі, калі некалькі праграмаў злучаны з сэрвэрам праз адзін і той жа рахунак. Праграма з найвышэйшым прыярытэтам атрымлівае гэтыя падзеі"
+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 ""
+"Прыярытэт вызначае, куды накіроўваць падзеі, калі некалькі праграмаў злучаны "
+"з сэрвэрам праз адзін і той жа рахунак. Праграма з найвышэйшым прыярытэтам "
+"атрымлівае гэтыя падзеі"
 
 #: ../data/glade/account_modification_window.glade.h:32
 msgid "Priority will change automatically according to your status."
@@ -346,8 +370,18 @@ msgid "Resour_ce: "
 msgstr "Рэ_сурс: "
 
 #: ../data/glade/account_modification_window.glade.h:35
-msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the 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 "Назва рэсурса перадаецца сэрвэру, каб той мог адрозніваць некалькі праграмаў, злучаных праз адзін і той жа рахунак. Такім чынам, Вы можаце злучыцца праз адзін і той жа рахунак і з рэсурса 'Дома', і з рэсурса 'Праца'. Падзеі будуць накіроўвацца на рэсурс з найвышэйшым прыярытэтам. (гл. ніжэй)"
+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 ""
+"Назва рэсурса перадаецца сэрвэру, каб той мог адрозніваць некалькі "
+"праграмаў, злучаных праз адзін і той жа рахунак. Такім чынам, Вы можаце "
+"злучыцца праз адзін і той жа рахунак і з рэсурса 'Дома', і з рэсурса "
+"'Праца'. Падзеі будуць накіроўвацца на рэсурс з найвышэйшым прыярытэтам. "
+"(гл. ніжэй)"
 
 #: ../data/glade/account_modification_window.glade.h:36
 #: ../data/glade/zeroconf_properties_window.glade.h:18
@@ -398,15 +432,25 @@ msgstr "Рахункі"
 
 #: ../data/glade/accounts_window.glade.h:2
 msgid ""
-"If checked, all local contacts that use a Bonjour compatible chat client (like iChat, Trillian or Gaim) will be shown in roster. You don't need to be connected to a jabber server for it to work.\n"
-"This is only available if python-avahi is installed and avahi-daemon is running."
+"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 ""
-"Калі гэтая опцыя ўключана, усе мясцовыя кантакты з Bonjour-кліентам (напр., iChat, Trillian, Gaim) будуць паказвацца ў галоўным вакне. Для гэтага Вам не патрэбна злучэнне.\n"
-"Гэтая мажлівасць будзе працаваць, калі ўсталяваны python-avahi і працуе сэрвіс avahi-daemon."
+"Калі гэтая опцыя ўключана, усе мясцовыя кантакты з Bonjour-кліентам (напр., "
+"iChat, Trillian, Gaim) будуць паказвацца ў галоўным вакне. Для гэтага Вам не "
+"патрэбна злучэнне.\n"
+"Гэтая мажлівасць будзе працаваць, калі ўсталяваны python-avahi і працуе "
+"сэрвіс avahi-daemon."
 
 #: ../data/glade/accounts_window.glade.h:4
-msgid "If you have 2 or more accounts and it is checked, Gajim will list all contacts as if you had one account"
-msgstr "Калі ў Вас некалькі рахункаў, гэтая опцыя прымушае Gajim паказваць усіх людзей з розных рахункаў у адзіным спісе"
+msgid ""
+"If you have 2 or more accounts and it is checked, Gajim will list all "
+"contacts as if you had one account"
+msgstr ""
+"Калі ў Вас некалькі рахункаў, гэтая опцыя прымушае Gajim паказваць усіх "
+"людзей з розных рахункаў у адзіным спісе"
 
 #: ../data/glade/accounts_window.glade.h:5
 msgid "Mer_ge accounts"
@@ -481,6 +525,43 @@ msgstr "_Рэгістрацыя"
 msgid "_User ID:"
 msgstr "_ID карыстальніка:"
 
+#: ../data/glade/adhoc_commands_window.glade.h:1
+msgid "<b>An error has occured:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:2
+msgid "<b>Choose command to execute:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:3
+msgid "Ad-hoc Commands - Gajim"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:4
+msgid "Check once more"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:5
+#, fuzzy
+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>"
@@ -620,13 +701,13 @@ msgstr "Граць гук"
 #: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
-"Contact Connected\n"
-"Contact Disconnected\n"
-"Contact Change Status\n"
-"Group Chat Message Highlight\n"
-"Group Chat Message Received\n"
-"File Transfert Resquest\n"
-"File Transfert Started\n"
+"Contact Connected \n"
+"Contact Disconnected \n"
+"Contact Change Status \n"
+"Group Chat Message Highlight \n"
+"Group Chat Message Received \n"
+"File Transfert Resquest \n"
+"File Transfert Started \n"
 "File Transfert Finished"
 msgstr ""
 "Атрыманае паведамленне\n"
@@ -644,8 +725,11 @@ msgid "When "
 msgstr "Калі "
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
-msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr "_Скарыстаць здольнасць UrgencyHint, каб вакно размовы міргала на панэлі заданняў"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+msgstr ""
+"_Скарыстаць здольнасць UrgencyHint, каб вакно размовы міргала на панэлі "
+"заданняў"
 
 #: ../data/glade/advanced_notifications_window.glade.h:29
 msgid "_Disable auto opening chat window"
@@ -705,6 +789,46 @@ 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 "назва тэмы"
+
+#: ../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 "Змяніць пароль"
@@ -790,7 +914,7 @@ msgstr "_Кампактны выгляд    Alt+К"
 msgid "_History"
 msgstr "_Журнал"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/glade/data_form_window.glade.h:1 ../src/dataforms_widget.py:76
 msgid "Fill in the form."
 msgstr "Запоўніце форму."
 
@@ -843,15 +967,18 @@ msgid "Shows a list of file transfers between you and other"
 msgstr "Паказаць спіс перадаваемых файлаў"
 
 #: ../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 "Выдаліць адзін файл з чаргі перадачы. Калі яшчэ адбываецца перадача, яна спыняецца, а потым выдаляецца"
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
+msgstr ""
+"Выдаліць адзін файл з чаргі перадачы. Калі яшчэ адбываецца перадача, яна "
+"спыняецца, а потым выдаляецца"
 
 #: ../data/glade/filetransfers.glade.h:12
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Паказаць нагадванне па заканчэнні перадачы файла"
 
-#: ../data/glade/filetransfers.glade.h:13
-#: ../src/filetransfers_window.py:761
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
 msgid "_Continue"
 msgstr "_Працягнуць"
 
@@ -859,8 +986,7 @@ msgstr "_Працягнуць"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Паведамляць мне аб заканчэнні перадачы файлаў"
 
-#: ../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 "_Адкрыць дырэкторыю з файлам"
 
@@ -1004,6 +1130,21 @@ msgstr "Ад_правіць прыватнае паведамленне"
 msgid "_Voice"
 msgstr "_Голас"
 
+#: ../data/glade/groups_post_window.glade.h:1
+#, fuzzy
+msgid "Create new post"
+msgstr "Новы допіс"
+
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:259
+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"
@@ -1011,14 +1152,17 @@ 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>Gajim - Кіраўнік размоўных журналаў</b></big>\n"
 "\n"
-"Вы можаце выбраць адзін з журналаў на левай панэлі альбо адшукаць у базе данняў.\n"
+"Вы можаце выбраць адзін з журналаў на левай панэлі альбо адшукаць у базе "
+"данняў.\n"
 "\n"
 "<b>Увага:</b>\n"
-"Калі Вы хочаце здзейсніць масавую чыстку журналаў, закрыйце Gajim. Не выдаляйце журналы размоваў з людзьмі, з якімі Вы зараз размаўляеце."
+"Калі Вы хочаце здзейсніць масавую чыстку журналаў, закрыйце Gajim. Не "
+"выдаляйце журналы размоваў з людзьмі, з якімі Вы зараз размаўляеце."
 
 #: ../data/glade/history_manager.glade.h:7
 msgid "Delete"
@@ -1069,8 +1213,7 @@ msgstr "Адмовіць"
 msgid "Invitation Received"
 msgstr "Атрымана запрашэнне"
 
-#: ../data/glade/join_groupchat_window.glade.h:1
-#: ../src/dialogs.py:1146
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
 msgid "Join Group Chat"
 msgstr "Удзельнічаць у групавой размове"
 
@@ -1095,8 +1238,7 @@ msgstr "Нядаўна:"
 msgid "Room:"
 msgstr "Пакой:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../src/disco.py:1150
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1150
 #: ../src/disco.py:1517
 msgid "_Join"
 msgstr "_Далучыцца"
@@ -1111,7 +1253,9 @@ msgstr "Аўтаматычна далучацца"
 
 #: ../data/glade/manage_bookmarks_window.glade.h:2
 msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Калі гэтая опцыя ўключана, Gajim далучыцца да гэтай групавой размовы па старце"
+msgstr ""
+"Калі гэтая опцыя ўключана, Gajim далучыцца да гэтай групавой размовы па "
+"старце"
 
 #: ../data/glade/manage_bookmarks_window.glade.h:3
 msgid "Manage Bookmarks"
@@ -1163,8 +1307,7 @@ msgstr "Аўтарызацыя"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2
-#: ../src/chat_control.py:1116
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
 msgid "OpenPGP Encryption"
 msgstr "Шыфраванне OpenPGP"
 
@@ -1243,15 +1386,21 @@ msgstr "Дазволіць адпраўку звестак аб _сістэме"
 
 #: ../data/glade/preferences_window.glade.h:18
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Дазволіць паказ паведамленняў і нагадванні, калі я _не тут/заняты/нябачны"
+msgstr ""
+"Дазволіць паказ паведамленняў і нагадванні, калі я _не тут/заняты/нябачны"
 
 #: ../data/glade/preferences_window.glade.h:19
 msgid "Also known as iChat style"
 msgstr "Вядомы як стыль iChat"
 
 #: ../data/glade/preferences_window.glade.h:20
-msgid "An example: If you have enabled status message for away, Gajim won't ask you anymore for a status message when you change your status to away; it will use the default one set here"
-msgstr "Напрыклад, калі Вы ўключылі паведамленне стану для сышоўшага стану, Gajim больш не будзе ў Вас пытацца пацверджання гэтага паведамлення"
+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 ""
+"Напрыклад, калі Вы ўключылі паведамленне стану для сышоўшага стану, Gajim "
+"больш не будзе ў Вас пытацца пацверджання гэтага паведамлення"
 
 #: ../data/glade/preferences_window.glade.h:21
 msgid "Ask status message when I:"
@@ -1282,14 +1431,20 @@ msgstr ""
 msgid "B_efore nickname:"
 msgstr "П_ерад мянушкай:"
 
-#: ../data/glade/preferences_window.glade.h:30
-#: ../src/chat_control.py:841
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
 msgid "Chat"
 msgstr "Гутарня"
 
 #: ../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 "Скарыстайце гэтую опцыю, калі Вам надакучвае ці закідвае непатрэбнымі паведамленнямі нейкі чалавек, якога няма ў Вашым спісе. Але зважайце, што ў такім разе ніхто з людзей, якіх няма ў Вашым спісе, не зможа адправіць Вам паведамленне"
+msgid ""
+"Check this option, only if someone you don't have in the roster spams/annoys "
+"you. Use with caution, cause it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Скарыстайце гэтую опцыю, калі Вам надакучвае ці закідвае непатрэбнымі "
+"паведамленнямі нейкі чалавек, якога няма ў Вашым спісе. Але зважайце, што ў "
+"такім разе ніхто з людзей, якіх няма ў Вашым спісе, не зможа адправіць Вам "
+"паведамленне"
 
 #: ../data/glade/preferences_window.glade.h:32
 msgid "Configure color and font of the interface"
@@ -1332,56 +1487,107 @@ msgid "Events"
 msgstr "Падзеі"
 
 #: ../data/glade/preferences_window.glade.h:42
-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 можа адпраўляць і атрымліваць мэта-звесткі аб размовах з пэўным чалавекам. Вызначыце, аб якіх зменах стану Вы хочаце ведаць."
+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 send to the other party."
-msgstr "Gajim можа адпраўляць і атрымліваць мэта-звесткі аб размовах з пэўным чалавекам. Вызначыце, аб якіх змяненнях стану Вы хочаце паведамляць суразмоўцу."
+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"
+msgid ""
+"Gajim will automatically show new events by poping up the relative window"
 msgstr "Gajim аўтаматычна пакажа новыя падзеі ў адпаведным вакне"
 
 #: ../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 будзе паведамляць Вам аб новых падзеях у вынырлівым вакне ў правым верхнім куце экрана"
+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: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 будзе паведамляць Вам аб увайшоўшых людзях у вынырлівым вакне ў правым верхнім куце экрана"
+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: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 будзе паведамляць Вам аб сышоўшых людзях у вынырлівым вакне ў правым верхнім куце экрана"
+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:48
-msgid "Gajim will only change the icon of the contact that triggered the new event"
+msgid ""
+"Gajim will only change the icon of the contact that triggered the new event"
 msgstr "Gajim толькі зменіць значку чалавека, які стаў прычынай новай падзеі"
 
 #: ../data/glade/preferences_window.glade.h:50
-msgid "If checked, Gajim will also include information about the sender of the new emails"
-msgstr "Калі гэтая опцыя ўключана, Gajim таксама дадасць звесткі аб адпраўніку новых лістоў"
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+"Калі гэтая опцыя ўключана, Gajim таксама дадасць звесткі аб адпраўніку новых "
+"лістоў"
 
 #: ../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 паказвае аватары ў галоўным вакне і ў групавых размовах"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Калі гэтая опцыя ўключана, Gajim паказвае аватары ў галоўным вакне і ў "
+"групавых размовах"
 
 #: ../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 паказвае паведамленні аб зменах стану для кожнага чалавека ў галоўным вакне і ў групавых размовах"
+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: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 запомніць пазіцыю галоўнага і іншых вокнаў і іх памеры"
+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: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 "Калі гэтая опцыя ўключана, Gajim будзе паказваць значкі для асобных пратаколаў. (напр., чалавек з MSN будзе мець адпаведныя значкі злучанасці, адсутнасці, занятасці і г.д. для MSN-карыстальнікаў)"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Калі гэтая опцыя ўключана, Gajim будзе паказваць значкі для асобных "
+"пратаколаў. (напр., чалавек з MSN будзе мець адпаведныя значкі злучанасці, "
+"адсутнасці, занятасці і г.д. для MSN-карыстальнікаў)"
 
 #: ../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 заменіць ascii-сымболікі (напр., ':)' ) адпаведнай значкай"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Калі гэтая опцыя ўключана, Gajim заменіць ascii-сымболікі (напр., ':)' ) "
+"адпаведнай значкай"
 
 #: ../data/glade/preferences_window.glade.h:56
 msgid "Ignore rich content in incoming messages"
@@ -1456,8 +1662,12 @@ msgid "Sign _out"
 msgstr "_Сысці"
 
 #: ../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 "Некаторыя паведамленні ўключаюць афармленне (фармат, колеры і г.д.). Калі гэтая опцыя ўключана, Gajim будзе паказваць нефарматаваны тэкст."
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Некаторыя паведамленні ўключаюць афармленне (фармат, колеры і г.д.). Калі "
+"гэтая опцыя ўключана, Gajim будзе паказваць нефарматаваны тэкст."
 
 #: ../data/glade/preferences_window.glade.h:76
 msgid "Status"
@@ -1488,16 +1698,28 @@ msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "_Значка панэлі паведамленняў"
 
 #: ../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 "Магчымыя наступныя варыянты нагадвання аб здзяйсненні новых падзей (паведамленне, запыт на перадачу файла і г.д.). Зважайце, што атрыманне новага паведамлення фіксуецца толькі тады, калі Вы атрымліваеце паведамленне ад чалавека, з якім на той момант яшчэ не вялася размова"
+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 ""
+"Магчымыя наступныя варыянты нагадвання аб здзяйсненні новых падзей "
+"(паведамленне, запыт на перадачу файла і г.д.). Зважайце, што атрыманне "
+"новага паведамлення фіксуецца толькі тады, калі Вы атрымліваеце паведамленне "
+"ад чалавека, з якім на той момант яшчэ не вялася размова"
 
 #: ../data/glade/preferences_window.glade.h:84
 msgid "When new event is received"
 msgstr "Па атрыманні новай падзеі"
 
 #: ../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 "Працуе з Rhythmbox і Muine. Для іншых праграмаў глядзіце старонку http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+"Працуе з Rhythmbox і Muine. Для іншых праграмаў глядзіце старонку http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
 
 #: ../data/glade/preferences_window.glade.h:86
 msgid "_Advanced Notifications Control..."
@@ -1627,8 +1849,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Парадак:"
 
-#: ../data/glade/privacy_list_window.glade.h:11
-#: ../src/dialogs.py:1841
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
 msgid "Privacy List"
 msgstr "Спіс прыватнасці"
 
@@ -1781,8 +2002,7 @@ msgid "Prefix:"
 msgstr "Прэфікс:"
 
 #: ../data/glade/profile_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:37
-#: ../src/vcard.py:273
+#: ../data/glade/vcard_information_window.glade.h:37 ../src/vcard.py:273
 msgid "Role:"
 msgstr "Роля:"
 
@@ -1877,8 +2097,7 @@ msgstr "_Забараніць праглядаць змены майго ста�
 
 #. 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:1948 ../src/roster_window.py:2045
 #: ../src/roster_window.py:2152
 msgid "_Remove from Roster"
 msgstr "Вы_даліць з кантактнага ліста"
@@ -1933,8 +2152,7 @@ msgstr "_Змест"
 msgid "_Discover Services"
 msgstr "_Праглядзець сэрвісы"
 
-#: ../data/glade/roster_window.glade.h:14
-#: ../src/disco.py:1255
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1255
 #: ../src/roster_window.py:2123
 msgid "_Edit"
 msgstr "_Змяніць"
@@ -2079,8 +2297,7 @@ msgstr "Чалавек"
 
 #: ../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
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -2159,7 +2376,8 @@ msgstr "Асабістае"
 
 #: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
-"If the default port that is used for incoming messages is unfitting for your setup you can select another one here.\n"
+"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 ""
 "Калі порт адпраўкі паведамленняў не прыдатны для Вас, выберыце іншы.\n"
@@ -2288,14 +2506,19 @@ msgstr "Швэдская"
 msgid "Chinese (Ch)"
 msgstr "Кітайская (Ch)"
 
-#: ../src/chat_control.py:201
-#: ../src/dialogs.py:1497
+#: ../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 ""
-"Калі гэта не мова, для якой трэба паказваць няправільна напісаныя словы, тады вызначыце зменную $LANG адпаведным чынам. Напр., для беларускай мовы змясціце каманду export LANG=be_BY.UTF-8 у файле ~/.bash_profile, альбо глабальна ў /etc/profile.\n"
+"Калі гэта не мова, для якой трэба паказваць няправільна напісаныя словы, "
+"тады вызначыце зменную $LANG адпаведным чынам. Напр., для беларускай мовы "
+"змясціце каманду export LANG=be_BY.UTF-8 у файле ~/.bash_profile, альбо "
+"глабальна ў /etc/profile.\n"
 "\n"
 "Фарбаванне няправільна напісаных словаў не працуе"
 
@@ -2304,351 +2527,332 @@ msgid "Spelling language"
 msgstr "Мова правапісу"
 
 #. we are not connected
-#: ../src/chat_control.py:262
-#: ../src/chat_control.py:468
+#: ../src/chat_control.py:262 ../src/chat_control.py:468
 msgid "A connection is not available"
 msgstr "Няма злучэння"
 
-#: ../src/chat_control.py:263
-#: ../src/chat_control.py:469
+#: ../src/chat_control.py:263 ../src/chat_control.py:469
 msgid "Your message can not be sent until you are connected."
 msgstr "Вы не можаце адпраўляць паведамленні без злучэння."
 
-#: ../src/chat_control.py:841
+#: ../src/chat_control.py:844
 msgid "Chats"
 msgstr "Гутарні"
 
-#: ../src/chat_control.py:1042
+#: ../src/chat_control.py:1030
 #, 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:1130
+#: ../src/chat_control.py:1118
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s не распаўсюджвае ключ OpenPGP і не мае прызначанага ключа"
 
-#: ../src/chat_control.py:1266
+#: ../src/chat_control.py:1254
 msgid "Encryption enabled"
 msgstr "Шыфраванне дзейнічае"
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1259
 msgid "Encryption disabled"
 msgstr "Шыфраванне адключана"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1413
-#: ../src/conversation_textview.py:493
-#: ../src/dialogs.py:629
-#: ../src/gajim.py:727
-#: ../src/gajim.py:728
-#: ../src/gajim.py:1067
-#: ../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/chat_control.py:1401 ../src/conversation_textview.py:495
+#: ../src/dialogs.py:629 ../src/gajim.py:733 ../src/gajim.py:734
+#: ../src/gajim.py:1073 ../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:1557
+#: ../src/chat_control.py:1545
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Вам адправіў паведамленне \"%s\""
 
-#: ../src/chat_control.py:1558
-msgid "If you close this tab and you have history disabled, this message will be lost."
-msgstr "Калі Вы закрыеце гэтую картку з адключаным вядзеннем журналаў, гэтае паведамленне згубіцца."
+#: ../src/chat_control.py:1546
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Калі Вы закрыеце гэтую картку з адключаным вядзеннем журналаў, гэтае "
+"паведамленне згубіцца."
 
-#: ../src/config.py:130
-#: ../src/config.py:589
+#: ../src/config.py:135 ../src/config.py:594
 msgid "Disabled"
 msgstr "Адключана"
 
-#: ../src/config.py:216
+#: ../src/config.py:221
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Кожныя %s _хвілін"
 
-#: ../src/config.py:358
+#: ../src/config.py:363
 msgid "Active"
 msgstr "Актыўны"
 
-#: ../src/config.py:366
+#: ../src/config.py:371
 msgid "Event"
 msgstr "Падзея"
 
-#: ../src/config.py:679
-#: ../src/gajim.py:2086
+#: ../src/config.py:684 ../src/gajim.py:2094
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Слоўніка для мовы %s няма"
 
-#: ../src/config.py:680
-#: ../src/gajim.py:2087
+#: ../src/config.py:685 ../src/gajim.py:2095
 #, python-format
-msgid "You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option."
-msgstr "Вы павінны ўсталяваць слоўнік %s, каб правяраць правапіс, альбо выбраць іншую мову праз опцыю speller_language."
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+"Вы павінны ўсталяваць слоўнік %s, каб правяраць правапіс, альбо выбраць "
+"іншую мову праз опцыю speller_language."
 
-#: ../src/config.py:1032
+#: ../src/config.py:1037
 msgid "status message title"
 msgstr "загаловак паведамлення аб змене стану"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1037
 msgid "status message text"
 msgstr "тэкст паведамлення аб змене стану"
 
-#: ../src/config.py:1067
+#: ../src/config.py:1072
 msgid "First Message Received"
 msgstr "Атрымана першае паведамленне"
 
-#: ../src/config.py:1068
+#: ../src/config.py:1073
 msgid "Next Message Received"
 msgstr "Атрымана наступнае паведамленне"
 
-#: ../src/config.py:1069
+#: ../src/config.py:1074
 msgid "Contact Connected"
 msgstr "Чалавек далучыўся"
 
-#: ../src/config.py:1070
+#: ../src/config.py:1075
 msgid "Contact Disconnected"
 msgstr "Чалавек адлучыўся"
 
-#: ../src/config.py:1071
+#: ../src/config.py:1076
 msgid "Message Sent"
 msgstr "Паведамленне адпраўлена"
 
-#: ../src/config.py:1072
+#: ../src/config.py:1077
 msgid "Group Chat Message Highlight"
 msgstr "Фарбаванае паведамленне ў групавой размове"
 
-#: ../src/config.py:1073
+#: ../src/config.py:1078
 msgid "Group Chat Message Received"
 msgstr "Новае паведамленне ў групавой размове"
 
-#: ../src/config.py:1080
+#: ../src/config.py:1085
 msgid "GMail Email Received"
 msgstr "Новы ліст GMail Email"
 
-#: ../src/config.py:1283
+#: ../src/config.py:1288
 msgid "OpenPGP is not usable in this computer"
 msgstr "Немагчыма ўжыць OpenPGP на гэтым кампутары"
 
-#: ../src/config.py:1329
+#: ../src/config.py:1334
 msgid "You are currently connected to the server"
 msgstr "Вы злучаны з сэрвэрам"
 
-#: ../src/config.py:1330
+#: ../src/config.py:1335
 msgid "To change the account name, you must be disconnected."
 msgstr "Каб змяніць назву рахунка, трэба папярэдне адлучыцца."
 
-#: ../src/config.py:1333
-#: ../src/config.py:1925
+#: ../src/config.py:1338 ../src/config.py:1930
 msgid "Unread events"
 msgstr "Нягледжаныя падзеі"
 
-#: ../src/config.py:1334
+#: ../src/config.py:1339
 msgid "To change the account name, you must read all pending events."
-msgstr "Каб змяніць назву рахунка, Вы павінны праглядзець усе нягледжаныя падзеі."
+msgstr ""
+"Каб змяніць назву рахунка, Вы павінны праглядзець усе нягледжаныя падзеі."
 
-#: ../src/config.py:1338
+#: ../src/config.py:1343
 msgid "Account Name Already Used"
 msgstr "Назва рахунка ўжо скарыстаная"
 
-#: ../src/config.py:1339
-msgid "This name is already used by another of your accounts. Please choose another name."
+#: ../src/config.py:1344
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
 msgstr "Гэтая назва ўжо скарыстаная для іншага рахунка. Выберыце іншую назву."
 
-#: ../src/config.py:1343
-#: ../src/config.py:1347
+#: ../src/config.py:1348 ../src/config.py:1352
 msgid "Invalid account name"
 msgstr "Няправільная назва рахунка"
 
-#: ../src/config.py:1344
+#: ../src/config.py:1349
 msgid "Account name cannot be empty."
 msgstr "Назва рахунка не павінна быць пустой."
 
-#: ../src/config.py:1348
+#: ../src/config.py:1353
 msgid "Account name cannot contain spaces."
 msgstr "Назва рахунка не павінна ўтрымліваць прагалаў."
 
-#: ../src/config.py:1356
-#: ../src/config.py:1362
-#: ../src/config.py:1372
-#: ../src/config.py:3030
+#: ../src/config.py:1361 ../src/config.py:1367 ../src/config.py:1377
+#: ../src/config.py:3035
 msgid "Invalid Jabber ID"
 msgstr "Няправільны Jabber ID"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1368
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID павінны мець форму \"user@servername\"."
 
-#: ../src/config.py:1422
+#: ../src/config.py:1427
 msgid "Invalid entry"
 msgstr "Няправільны элемэнт"
 
-#: ../src/config.py:1423
+#: ../src/config.py:1428
 msgid "Custom port must be a port number."
 msgstr "Адмысловы порт павінны быць нумарам порта."
 
-#: ../src/config.py:1549
-#: ../src/common/config.py:363
+#: ../src/config.py:1554 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Хутка прыйду."
 
-#: ../src/config.py:1559
+#: ../src/config.py:1564
 msgid "Relogin now?"
 msgstr "Перадалучыцца?"
 
-#: ../src/config.py:1560
+#: ../src/config.py:1565
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Калі Вы хочаце ўжыць усе зробленыя змены, перадалучыцеся."
 
-#: ../src/config.py:1586
+#: ../src/config.py:1591
 msgid "No such account available"
 msgstr "Такога рахунка няма"
 
-#: ../src/config.py:1587
+#: ../src/config.py:1592
 msgid "You must create your account before editing your personal information."
 msgstr "Вы павінны стварыць рахунак да рэдагавання асабістых звестак."
 
-#: ../src/config.py:1594
-#: ../src/dialogs.py:1128
-#: ../src/dialogs.py:1297
-#: ../src/disco.py:417
-#: ../src/profile_window.py:307
+#: ../src/config.py:1599 ../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:1595
+#: ../src/config.py:1600
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Немагчыма рэдагаваць асабістыя звесткі ў адлучаным рэжыме."
 
-#: ../src/config.py:1599
+#: ../src/config.py:1604
 msgid "Your server doesn't support Vcard"
 msgstr "Ваш сэрвэр не падтрымлівае Vcard"
 
-#: ../src/config.py:1600
+#: ../src/config.py:1605
 msgid "Your server can't save your personal information."
 msgstr "Сэрвэр не можа захаваць Вашыя асабістыя звесткі."
 
-#: ../src/config.py:1624
-#: ../src/config.py:3417
+#: ../src/config.py:1629 ../src/config.py:3422
 msgid "Failed to get secret keys"
 msgstr "Немагчыма атрымаць сакрэтныя ключы"
 
-#: ../src/config.py:1625
-#: ../src/config.py:3418
+#: ../src/config.py:1630 ../src/config.py:3423
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Памылка пошуку Вашых сакрэтных ключоў OpenPGP."
 
-#: ../src/config.py:1628
-#: ../src/config.py:3421
+#: ../src/config.py:1633 ../src/config.py:3426
 msgid "OpenPGP Key Selection"
 msgstr "Выбар ключоў OpenPGP"
 
-#: ../src/config.py:1629
-#: ../src/config.py:3422
+#: ../src/config.py:1634 ../src/config.py:3427
 msgid "Choose your OpenPGP key"
 msgstr "Выберыце Ваш ключ OpenPGP"
 
 #. Name column
-#: ../src/config.py:1859
-#: ../src/disco.py:740
-#: ../src/disco.py:1466
-#: ../src/disco.py:1704
-#: ../src/history_window.py:78
+#: ../src/config.py:1864 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Назва"
 
-#: ../src/config.py:1862
+#: ../src/config.py:1867
 msgid "Server"
 msgstr "Сэрвэр"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1931
 msgid "Read all pending events before removing this account."
 msgstr "Прагледзьце нягледжаныя падзеі перад выдаленнем гэтага рахунка."
 
-#: ../src/config.py:1963
+#: ../src/config.py:1968
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Вы пачалі размову ў рахунку %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:1969
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Усе размоўныя вокны закрыюцца. Хочаце працягнуць?"
 
-#: ../src/config.py:2023
+#: ../src/config.py:2028
 msgid "Account Local already exists."
 msgstr "Мясцовы рахунак Local ужо існуе."
 
-#: ../src/config.py:2024
+#: ../src/config.py:2029
 msgid "Please rename or remove it before enabling link-local messaging."
-msgstr "Змяніце назву альбо выдаліце яго, каб скарыстаць мясцовыя паведамленні."
+msgstr ""
+"Змяніце назву альбо выдаліце яго, каб скарыстаць мясцовыя паведамленні."
 
-#: ../src/config.py:2256
+#: ../src/config.py:2261
 #, python-format
 msgid "Edit %s"
 msgstr "Змяніць %s"
 
-#: ../src/config.py:2258
+#: ../src/config.py:2263
 #, python-format
 msgid "Register to %s"
 msgstr "Рэгістрацыя %s"
 
 #. list at the begining
-#: ../src/config.py:2330
+#: ../src/config.py:2335
 msgid "Ban List"
 msgstr "Чорны спіс"
 
-#: ../src/config.py:2331
+#: ../src/config.py:2336
 msgid "Member List"
 msgstr "Спіс удзельнікаў"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2337
 msgid "Owner List"
 msgstr "Спіс уладальнікаў"
 
-#: ../src/config.py:2333
+#: ../src/config.py:2338
 msgid "Administrator List"
 msgstr "Спіс адміністратараў"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2366
-#: ../src/disco.py:747
-#: ../src/history_manager.py:154
+#: ../src/config.py:2371 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2374
+#: ../src/config.py:2379
 msgid "Reason"
 msgstr "Прычына"
 
-#: ../src/config.py:2379
+#: ../src/config.py:2384
 msgid "Nick"
 msgstr "Мянушка"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2388
 msgid "Role"
 msgstr "Роля"
 
-#: ../src/config.py:2404
+#: ../src/config.py:2409
 msgid "Banning..."
 msgstr "Забараніць казанне..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2406
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2656,11 +2860,11 @@ msgstr ""
 "<b>Каму Вы хочаце забараніць казанне?</b>\n"
 "\n"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2413
 msgid "Adding Member..."
 msgstr "Дадаць ўдзельніка..."
 
-#: ../src/config.py:2409
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2668,11 +2872,11 @@ msgstr ""
 "<b>Каго Вы хочаце зрабіць удзельнікам?</b>\n"
 "\n"
 
-#: ../src/config.py:2411
+#: ../src/config.py:2416
 msgid "Adding Owner..."
 msgstr "Дадаць ўладальніка..."
 
-#: ../src/config.py:2412
+#: ../src/config.py:2417
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2680,11 +2884,11 @@ msgstr ""
 "<b>Каго Вы хочаце зрабіць уладальнікам?</b>\n"
 "\n"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2419
 msgid "Adding Administrator..."
 msgstr "Дадаць адміністратара..."
 
-#: ../src/config.py:2415
+#: ../src/config.py:2420
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2692,7 +2896,7 @@ msgstr ""
 "<b>Каго Вы хочаце зрабіць адміністратарам?</b>\n"
 "\n"
 
-#: ../src/config.py:2416
+#: ../src/config.py:2421
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2708,174 +2912,186 @@ msgstr ""
 "4. domain (гэты домэн user@domain,\n"
 "domain/resource ці адрас паддомэна)."
 
-#: ../src/config.py:2521
+#: ../src/config.py:2526
 #, python-format
 msgid "Removing %s account"
 msgstr "Выдаленне рахунка %s"
 
-#: ../src/config.py:2538
-#: ../src/roster_window.py:2667
+#: ../src/config.py:2543 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Патрабуецца пароль"
 
-#: ../src/config.py:2539
-#: ../src/roster_window.py:2668
+#: ../src/config.py:2544 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Увядзіце пароль для рахунка %s"
 
-#: ../src/config.py:2540
-#: ../src/roster_window.py:2669
+#: ../src/config.py:2545 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Захаваць пароль"
 
-#: ../src/config.py:2554
+#: ../src/config.py:2559
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Рахунак \"%s\" злучаны з сэрвэрам"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2560
 msgid "If you remove it, the connection will be lost."
 msgstr "Калі Вы выдаліце яго, згубіцца злучэнне."
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 msgid "Default"
 msgstr "Прадвызначана"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 msgid "?print_status:All"
 msgstr "?print_status:Усе"
 
-#: ../src/config.py:2640
+#: ../src/config.py:2645
 msgid "Enter and leave only"
 msgstr "Увайсці і выйсці"
 
-#: ../src/config.py:2710
+#: ../src/config.py:2715
 msgid "New Group Chat"
 msgstr "Новая групавая размова"
 
-#: ../src/config.py:2742
+#: ../src/config.py:2747
 msgid "This bookmark has invalid data"
 msgstr "Гэтая закладка мае няправільныя данні"
 
-#: ../src/config.py:2743
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
+#: ../src/config.py:2748
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Запоўніце палі сэрвэра і пакоя альбо выдаліце гэтую закладку."
 
-#: ../src/config.py:3005
+#: ../src/config.py:3010
 msgid "Invalid username"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/config.py:3006
+#: ../src/config.py:3011
 msgid "You must provide a username to configure this account."
-msgstr "Вы павінны пазначыць імя карыстальніка, каб змяніць настаўленні гэтага рахунка."
+msgstr ""
+"Вы павінны пазначыць імя карыстальніка, каб змяніць настаўленні гэтага "
+"рахунка."
 
-#: ../src/config.py:3016
-#: ../src/dialogs.py:1316
+#: ../src/config.py:3021 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Няправільны пароль"
 
-#: ../src/config.py:3017
+#: ../src/config.py:3022
 msgid "You must enter a password for the new account."
 msgstr "Вы павінны ўвесці пароль для новага рахунка."
 
-#: ../src/config.py:3021
-#: ../src/dialogs.py:1321
+#: ../src/config.py:3026 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Паролі розныя"
 
-#: ../src/config.py:3022
-#: ../src/dialogs.py:1322
+#: ../src/config.py:3027 ../src/dialogs.py:1322
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролі ў абодвух палях павінны быць аднолькавымі."
 
-#: ../src/config.py:3041
+#: ../src/config.py:3046
 msgid "Duplicate Jabber ID"
 msgstr "Паўторны Jabber ID"
 
-#: ../src/config.py:3042
+#: ../src/config.py:3047
 msgid "This account is already configured in Gajim."
 msgstr "Гэты рахунак ужо выкарыстоўваецца ў Gajim."
 
-#: ../src/config.py:3059
+#: ../src/config.py:3064
 msgid "Account has been added successfully"
 msgstr "Рахунак паспяхова даданы"
 
-#: ../src/config.py:3060
-#: ../src/config.py:3095
-msgid "You can set advanced account options by pressing Advanced button, or later by clicking in Accounts menuitem under Edit menu from the main window."
-msgstr "Вы можаце змяніць асаблівыя настаўленні, націснуўшы гузік \"Адмысловы\", альбо пазней выбраўшы элемэнт \"Змяніць \" у мэню \"Рахункі\" галоўнага вакна."
+#: ../src/config.py:3065 ../src/config.py:3100
+msgid ""
+"You can set advanced account options by pressing Advanced button, or later "
+"by clicking in Accounts menuitem under Edit menu from the main window."
+msgstr ""
+"Вы можаце змяніць асаблівыя настаўленні, націснуўшы гузік \"Адмысловы\", "
+"альбо пазней выбраўшы элемэнт \"Змяніць \" у мэню \"Рахункі\" галоўнага "
+"вакна."
 
-#: ../src/config.py:3094
+#: ../src/config.py:3099
 msgid "Your new account has been created successfully"
 msgstr "Новы рахунак паспяхова створаны"
 
-#: ../src/config.py:3112
+#: ../src/config.py:3117
 msgid "An error occured during account creation"
 msgstr "Адбылася памылка ў часе стварэння рахунка"
 
-#: ../src/config.py:3170
+#: ../src/config.py:3175
 msgid "Account name is in use"
 msgstr "Назва рахунка ўжо скарыстана"
 
-#: ../src/config.py:3171
+#: ../src/config.py:3176
 msgid "You already have an account using this name."
 msgstr "Вы ўжо маеце рахунак з такой назваю."
 
-#: ../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"
+#: ../src/conversation_textview.py:273
+msgid ""
+"Text below this line is what has been said since the last time you paid "
+"attention to this group chat"
 msgstr "Тэкст пад гэтай рысаю ёсць тэкстам, які Вы яшчэ не бачылі"
 
-#: ../src/conversation_textview.py:340
+#: ../src/conversation_textview.py:342
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Дзеянні для \"%s\""
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Прачытаць артыкул у _Вікіпэдыі"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Шукаць у _слоўніку"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:373
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "У адрасе слоўніка не хапае \"%s\", і гэта не Вікі-слоўнік"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:386
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "У адрасе пошуку ў Сеціве не хапае \"%s\""
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "_Шукаць у Сеціве"
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:397
 msgid "Open as _Link"
 msgstr "Адкрыць _спасылку"
 
-#: ../src/conversation_textview.py:755
+#: ../src/conversation_textview.py:757
 msgid "Yesterday"
 msgstr "Учора"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:761
 #, python-format
 msgid "%i days ago"
 msgstr "%i дзён таму"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:791
+#: ../src/conversation_textview.py:793
 #, python-format
 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>"
@@ -2942,31 +3158,24 @@ msgstr "Адрас Yahoo!:"
 #: ../src/dialogs.py:457
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
-msgstr "Запоўніце палі звесткамі пра чалавека, якога Вы хочаце дадаць у спіс рахунка %s"
+msgstr ""
+"Запоўніце палі звесткамі пра чалавека, якога Вы хочаце дадаць у спіс рахунка "
+"%s"
 
 #: ../src/dialogs.py:459
 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:491
-#: ../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
+#: ../src/dialogs.py:467 ../src/disco.py:102 ../src/disco.py:103
+#: ../src/disco.py:1252 ../src/gajim.py:491 ../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:609
-#: ../src/dialogs.py:615
+#: ../src/dialogs.py:609 ../src/dialogs.py:615
 msgid "Invalid User ID"
 msgstr "Няправільны ID карыстальніка"
 
@@ -3014,7 +3223,9 @@ msgstr "Падзякі:"
 #. and add it manually as translatable
 #: ../src/dialogs.py:762
 msgid "Last but not least, we would like to thank all the package maintainers."
-msgstr "Таксама хочам выказаць падзяку ўсім людзям, што збіраюць пакункі з праграмай для розных сістэм."
+msgstr ""
+"Таксама хочам выказаць падзяку ўсім людзям, што збіраюць пакункі з праграмай "
+"для розных сістэм."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
 #: ../src/dialogs.py:776
@@ -3027,7 +3238,9 @@ msgid "Unable to bind to port %s."
 msgstr "Немагчыма адкрыць порт %s."
 
 #: ../src/dialogs.py:907
-msgid "Maybe you have another running instance of Gajim. File Transfer will be canceled."
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"canceled."
 msgstr "Магчыма, Gajim ужо працуе. Перадача файлаў спынена."
 
 #: ../src/dialogs.py:1058
@@ -3040,28 +3253,26 @@ msgstr "Запыт увагі на рахунак %s ад %s"
 msgid "Subscription request from %s"
 msgstr "Запыт увагі ад %s"
 
-#: ../src/dialogs.py:1121
-#: ../src/roster_window.py:681
+#: ../src/dialogs.py:1121 ../src/roster_window.py:681
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Вы ўжо ўдзельнічаеце ў групавой размове %s"
 
 #: ../src/dialogs.py:1129
 msgid "You can not join a group chat unless you are connected."
-msgstr "Вы не можаце ўдзельнічаць у групавой размове, не злучыўшыся з сэрвэрам."
+msgstr ""
+"Вы не можаце ўдзельнічаць у групавой размове, не злучыўшыся з сэрвэрам."
 
 #: ../src/dialogs.py:1144
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Удзельнічаць у групавой размове праз рахунак %s"
 
-#: ../src/dialogs.py:1212
-#: ../src/dialogs.py:1218
+#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
 msgid "Invalid group chat Jabber ID"
 msgstr "Няправільны Jabber ID групавой размовы"
 
-#: ../src/dialogs.py:1213
-#: ../src/dialogs.py:1219
+#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя сымбалі."
 
@@ -3092,21 +3303,16 @@ msgstr ""
 "хочаце адправіць паведамленне:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1276
-#: ../src/dialogs.py:1635
-#: ../src/dialogs.py:1764
+#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
 msgid "Connection not available"
 msgstr "Няма злучэння"
 
-#: ../src/dialogs.py:1277
-#: ../src/dialogs.py:1636
-#: ../src/dialogs.py:1765
+#: ../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:1286
-#: ../src/dialogs.py:1289
+#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
 msgid "Invalid JID"
 msgstr "Няправільны JID"
 
@@ -3125,81 +3331,56 @@ msgstr "Вы павінны ўвесці пароль."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1364
-#: ../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:1366
-#: ../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:1368
-#: ../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:1368
-#: ../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:1369
-#: ../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:1369
-#: ../src/gajim.py:1161
-#: ../src/notify.py:424
+#: ../src/dialogs.py:1369 ../src/gajim.py:1168 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Новы ліст"
 
-#: ../src/dialogs.py:1371
-#: ../src/gajim.py:1314
-#: ../src/notify.py:418
+#: ../src/dialogs.py:1371 ../src/gajim.py:1321 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Запыт на перадачу файла"
 
-#: ../src/dialogs.py:1373
-#: ../src/gajim.py:1134
-#: ../src/gajim.py:1290
+#: ../src/dialogs.py:1373 ../src/gajim.py:1140 ../src/gajim.py:1297
 #: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Памылка перадачы файла"
 
-#: ../src/dialogs.py:1375
-#: ../src/gajim.py:1353
-#: ../src/gajim.py:1375
-#: ../src/gajim.py:1392
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1375 ../src/gajim.py:1360 ../src/gajim.py:1382
+#: ../src/gajim.py:1399 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Перадача файла скончана"
 
-#: ../src/dialogs.py:1376
-#: ../src/gajim.py:1356
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1376 ../src/gajim.py:1363 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Перадача файла спынена"
 
-#: ../src/dialogs.py:1378
-#: ../src/gajim.py:1032
-#: ../src/notify.py:426
+#: ../src/dialogs.py:1378 ../src/gajim.py:1038 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Запрашэнне ў групавую размову"
 
-#: ../src/dialogs.py:1380
-#: ../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 "Чалавек змяніў стан"
 
@@ -3298,7 +3479,8 @@ msgstr "Вы павінны вызначыць назву для новага с
 #: ../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"
+msgstr ""
+"%(contact_jid)s запрасіў Вас паўдзельнічаць у групавой размове %(room_jid)s"
 
 #. only if not None and not ''
 #: ../src/dialogs.py:2226
@@ -3310,8 +3492,7 @@ msgstr "Камэнтар: %s"
 msgid "Choose Sound"
 msgstr "Выберыце гукавы файл"
 
-#: ../src/dialogs.py:2298
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
 msgid "All files"
 msgstr "Усе файлы"
 
@@ -3361,7 +3542,8 @@ msgstr "Канфэрэнцыі"
 
 #: ../src/disco.py:418
 msgid "Without a connection, you can not browse available services"
-msgstr "Вы не можаце праглядзець спіс даступных сэрвісаў, не злучыўшыся з сэрвэрам."
+msgstr ""
+"Вы не можаце праглядзець спіс даступных сэрвісаў, не злучыўшыся з сэрвэрам."
 
 #: ../src/disco.py:497
 #, python-format
@@ -3377,11 +3559,14 @@ msgid "The service could not be found"
 msgstr "Немагчыма знайсці сэрвіс"
 
 #: ../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 "Па вызначаным адрасе няма сэрвісаў, альбо яны не адказваюць на запыты. Праверце адрас і паспрабуйце зноў."
+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:646
-#: ../src/disco.py:927
+#: ../src/disco.py:646 ../src/disco.py:927
 msgid "The service is not browsable"
 msgstr "Немагчыма праглядзець сэрвіс"
 
@@ -3402,8 +3587,7 @@ msgstr "_Праглядзець"
 msgid "This service does not contain any items to browse."
 msgstr "Гэты сэрвіс не ўтрымлівае ў сабе элемэнтаў, якія можна праглядзець."
 
-#: ../src/disco.py:1142
-#: ../src/disco.py:1257
+#: ../src/disco.py:1142 ../src/disco.py:1257
 msgid "Re_gister"
 msgstr "Рэ_гістрацыя"
 
@@ -3455,22 +3639,19 @@ msgstr "Час"
 msgid "Progress"
 msgstr "Ступень выкананасці"
 
-#: ../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 "Файл: %s"
 
-#: ../src/filetransfers_window.py:164
-#: ../src/filetransfers_window.py:298
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
 #, python-format
 msgid "Size: %s"
 msgstr "Памер: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:173
-#: ../src/filetransfers_window.py:183
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183
 #: ../src/history_manager.py:463
 msgid "You"
 msgstr "Вы"
@@ -3480,8 +3661,7 @@ msgstr "Вы"
 msgid "Sender: %s"
 msgstr "Адпраўнік: %s"
 
-#: ../src/filetransfers_window.py:175
-#: ../src/filetransfers_window.py:564
+#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
 #: ../src/tooltips.py:573
 msgid "Recipient: "
 msgstr "Атрымальнік: "
@@ -3495,13 +3675,11 @@ msgstr "Захаваць у: %s"
 msgid "File transfer completed"
 msgstr "Перадача файла скончана"
 
-#: ../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 "Перадача файла скасавана"
 
-#: ../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 "Немагчыма ўсталяваць злучэнне з атрымальнікам."
 
@@ -3551,35 +3729,31 @@ msgstr "Апісанне: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s хоча адправіць Вам файл:"
 
-#: ../src/filetransfers_window.py:318
-#: ../src/gtkgui_helpers.py:682
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Немагчыма перапісаць наяўны файл \"%s\""
 
-#: ../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."
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+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:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "This file already exists"
 msgstr "Такі файл ужо ёсць"
 
-#: ../src/filetransfers_window.py:326
-#: ../src/gtkgui_helpers.py:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "What do you want to do?"
 msgstr "Што Вы хочаце зрабіць?"
 
-#: ../src/filetransfers_window.py:338
-#: ../src/gtkgui_helpers.py:698
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Дырэкторыя \"%s\" непісальная"
 
-#: ../src/filetransfers_window.py:338
-#: ../src/gtkgui_helpers.py:699
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
 msgid "You do not have permission to create files in this directory."
 msgstr "Вы не маеце права ствараць файлы ў гэтай дырэкторыі."
 
@@ -3603,8 +3777,7 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/с)"
 
-#: ../src/filetransfers_window.py:536
-#: ../src/filetransfers_window.py:539
+#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
 msgid "Invalid File"
 msgstr "Няправільны файл"
 
@@ -3616,13 +3789,11 @@ msgstr "Файл: "
 msgid "It is not possible to send empty files"
 msgstr "Немагчыма адправіць пусты файл"
 
-#: ../src/filetransfers_window.py:560
-#: ../src/tooltips.py:563
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:563
 msgid "Name: "
 msgstr "Назва:"
 
-#: ../src/filetransfers_window.py:562
-#: ../src/tooltips.py:567
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:567
 msgid "Sender: "
 msgstr "Адпраўнік:"
 
@@ -3656,11 +3827,14 @@ msgstr "GTK+ не падтрымлівае libglade"
 
 #: ../src/gajim.py:62
 #, python-format
-msgid "Please remove your current GTK+ runtime and install the latest stable version from %s"
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
 msgstr "Выдаліце бібліятэку GTK+ і ўсталюйце найноўшую стабільную вэрсію з %s"
 
 #: ../src/gajim.py:64
-msgid "Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "Праверце, ці падтрымліваюць бібліятэкі GTK+ і PyGTK сродкі libglade."
 
 #: ../src/gajim.py:69
@@ -3673,7 +3847,9 @@ msgstr "Gajim патрабуе pywin32 для старту"
 
 #: ../src/gajim.py:78
 #, python-format
-msgid "Please make sure that Pywin32 is installed on your system. You can get it at %s"
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
 msgstr "Праверце, ці ўсталяваны Pywin32. Вы можаце сцягнуць яго з %s"
 
 #. set the icon to all newly opened wind
@@ -3698,8 +3874,7 @@ msgstr "HTTP (%s) аўтарызацыя для %s (id: %s)"
 msgid "Do you accept this request?"
 msgstr "Хочаце задаволіць гэты запыт?"
 
-#: ../src/gajim.py:345
-#: ../src/notify.py:430
+#: ../src/gajim.py:345 ../src/notify.py:430
 msgid "Connection Failed"
 msgstr "Памылка злучэння"
 
@@ -3708,59 +3883,58 @@ msgstr "Памылка злучэння"
 msgid "Subject: %s"
 msgstr "Тэма: %s"
 
-#: ../src/gajim.py:703
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:703 ../src/gajim.py:716
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "памылка адпраўкі %s ( %s )"
 
-#: ../src/gajim.py:743
+#: ../src/gajim.py:749
 msgid "Authorization accepted"
 msgstr "Паспяховая аўтарызацыя"
 
-#: ../src/gajim.py:744
+#: ../src/gajim.py:750
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Чалавек \"%s\" дазволіў Вам бачыць змены яго стану."
 
-#: ../src/gajim.py:752
+#: ../src/gajim.py:758
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Чалавек \"%s\" выдаліў Вас з свайго спіса"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:759
 msgid "You will always see him or her as offline."
 msgstr "Вы заўсёды будзеце бачыць гэтага чалавека адключаным."
 
-#: ../src/gajim.py:796
+#: ../src/gajim.py:802
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Немагчыма злучыцца з \"%s\""
 
-#: ../src/gajim.py:797
-#: ../src/common/connection.py:395
+#: ../src/gajim.py:803 ../src/common/connection.py:395
 msgid "Check your connection or try again later."
 msgstr "Праверце злучэнне, альбо паспрабуйце пазней."
 
-#: ../src/gajim.py:945
-#: ../src/roster_window.py:1201
+#: ../src/gajim.py:951 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s цяпер %s (%s)"
 
-#: ../src/gajim.py:1042
+#: ../src/gajim.py:1048
 msgid "Your passphrase is incorrect"
 msgstr "Пароль няправільны"
 
-#: ../src/gajim.py:1043
+#: ../src/gajim.py:1049
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Вы злучаны без выкарыстання ключа OpenPGP."
 
-#: ../src/gajim.py:1145
+#: ../src/gajim.py:1151
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Новая пошта на %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1147
+#: ../src/gajim.py:1153
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3771,7 +3945,7 @@ 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:1156
+#: ../src/gajim.py:1162
 #, python-format
 msgid ""
 "\n"
@@ -3780,52 +3954,52 @@ msgstr ""
 "\n"
 "Ад: %(from_address)s"
 
-#: ../src/gajim.py:1311
+#: ../src/gajim.py:1318
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s хоча адправіць Вам файл."
 
-#: ../src/gajim.py:1376
+#: ../src/gajim.py:1383
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Файл %(filename)s паспяхова атрыманы ад %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1387
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Перадача файла %(filename)s ад %(name)s спынена."
 
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1400
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Вы паспяхова адправілі файл %(filename)s для %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1397
+#: ../src/gajim.py:1404
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Перадача файла %(filename)s для %(name)s спынена."
 
-#: ../src/gajim.py:1503
+#: ../src/gajim.py:1510
 msgid "Username Conflict"
 msgstr "Канфлікт імёнаў карыстальнікаў"
 
-#: ../src/gajim.py:1504
+#: ../src/gajim.py:1511
 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:1842
+#: ../src/gajim.py:1850
 msgid "Could not save your settings and preferences"
 msgstr "Немагчыма захаваць Вашыя настаўленні"
 
-#: ../src/gajim.py:2034
+#: ../src/gajim.py:2042
 msgid "Network Manager support not available"
 msgstr "Падтрымка Network Manager адсутнічае"
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2117
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Падтрымка рабочых сэсій адсутнічае (няма модуля gnome.ui)"
 
@@ -3851,19 +4025,16 @@ msgid "Popups a window with the next pending event"
 msgstr "Паказвае вакно з наступнай нягледжанай падзеяй"
 
 #: ../src/gajim-remote.py:82
-msgid "Prints a list of all contacts in the roster. Each contact appear on a separate line"
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appear on a "
+"separate line"
 msgstr "Паказвае спіс усіх людзей. Кожны чалавек друкуецца ў асобным радку"
 
-#: ../src/gajim-remote.py: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: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 "рахунак"
@@ -3889,8 +4060,7 @@ msgstr "стан"
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "адзін з: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:97
-#: ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
 #: ../src/gajim-remote.py:132
 msgid "message"
 msgstr "паведамленне"
@@ -3900,54 +4070,65 @@ msgid "status message"
 msgstr "паведамленне аб змене стану"
 
 #: ../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 "змяніць стан рахунка \"account\". Калі не вызначана, змяняецца стан усіх рахункаў, якія \"сінхраніхуюцца з глабальным станам\""
+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 ""
+"змяніць стан рахунка \"account\". Калі не вызначана, змяняецца стан усіх "
+"рахункаў, якія \"сінхраніхуюцца з глабальным станам\""
 
 #: ../src/gajim-remote.py:104
 msgid "Shows the chat dialog so that you can send messages to a contact"
-msgstr "Паказвае вакно, з якога Вы можаце адправіць паведамленне пэўнаму чалавеку"
+msgstr ""
+"Паказвае вакно, з якога Вы можаце адправіць паведамленне пэўнаму чалавеку"
 
 #: ../src/gajim-remote.py:106
 msgid "JID of the contact that you want to chat with"
 msgstr "JID чалавека, з якім Вы хочаце паразмаўляць"
 
-#: ../src/gajim-remote.py:108
-#: ../src/gajim-remote.py:186
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Калі вызначана, то імя чалавека выбіраецца з спіса гэтага рахунка"
 
 #: ../src/gajim-remote.py: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 "Адпраўляе новае паведамленне чалавеку з спіса. Выстаўленне ключа OpenPGP і рахунка неабавязковае. Калі Вы хочаце вызначыць толькі 'account', без 'ключа OpenPGP', проста выставіце 'ключ OpenPGP' у ''."
+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 ""
+"Адпраўляе новае паведамленне чалавеку з спіса. Выстаўленне ключа OpenPGP і "
+"рахунка неабавязковае. Калі Вы хочаце вызначыць толькі 'account', без 'ключа "
+"OpenPGP', проста выставіце 'ключ OpenPGP' у ''."
 
-#: ../src/gajim-remote.py:117
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
 msgid "JID of the contact that will receive the message"
 msgstr "JID чалавека, які атрымае паведамленне"
 
-#: ../src/gajim-remote.py:118
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
 msgid "message contents"
 msgstr "змест паведамлення"
 
-#: ../src/gajim-remote.py:119
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "pgp key"
 msgstr "ключ pgp"
 
-#: ../src/gajim-remote.py:119
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "Калі вызначана, паведамленне будзе зашыфравана адкрытым ключом"
 
-#: ../src/gajim-remote.py:121
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
 msgid "if specified, the message will be sent using this account"
 msgstr "Калі вызначана, паведамленне будзе адпраўлена праз гэты рахунак"
 
 #: ../src/gajim-remote.py: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 "Адпраўляе новае асобнае паведамленне чалавеку з спіса. Выстаўленне ключа OpenPGP і рахунка неабавязковае. Калі Вы хочаце вызначыць толькі 'account', без 'ключа OpenPGP', проста выставіце 'ключ OpenPGP' у ''."
+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 ""
+"Адпраўляе новае асобнае паведамленне чалавеку з спіса. Выстаўленне ключа "
+"OpenPGP і рахунка неабавязковае. Калі Вы хочаце вызначыць толькі 'account', "
+"без 'ключа OpenPGP', проста выставіце 'ключ OpenPGP' у ''."
 
 #: ../src/gajim-remote.py:131
 msgid "subject"
@@ -3961,10 +4142,8 @@ msgstr "тэма паведамлення"
 msgid "Gets detailed info on a contact"
 msgstr "Атрымаць падрабязныя звесткі пра чалавека"
 
-#: ../src/gajim-remote.py:142
-#: ../src/gajim-remote.py:155
-#: ../src/gajim-remote.py:185
-#: ../src/gajim-remote.py:194
+#: ../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 чалавека"
 
@@ -4045,8 +4224,10 @@ msgid "Returns current status (the global one unless account is specified)"
 msgstr "Вяртае бягчы стан (глабальны, калі не вызначаны рахунак)"
 
 #: ../src/gajim-remote.py:207
-msgid "Returns current status message(the global one unless account is specified)"
-msgstr "Вяртае бягучае паведамленне аб стане (глабальнае, калі не вызначаны рахунак)"
+msgid ""
+"Returns current status message(the global one unless account is specified)"
+msgstr ""
+"Вяртае бягучае паведамленне аб стане (глабальнае, калі не вызначаны рахунак)"
 
 #: ../src/gajim-remote.py:214
 msgid "Returns number of unreaded messages"
@@ -4069,8 +4250,12 @@ msgid "XML to send"
 msgstr "Адправіць XML"
 
 #: ../src/gajim-remote.py:227
-msgid "Account in which the xml will be sent; if not specified, xml will be sent to all accounts"
-msgstr "Рахунак, на які будзе адпраўлены xml; калі не вызначаны, xml будзе адпраўлены на ўсе рахункі"
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Рахунак, на які будзе адпраўлены xml; калі не вызначаны, xml будзе "
+"адпраўлены на ўсе рахункі"
 
 #: ../src/gajim-remote.py:249
 msgid "Missing argument \"contact_jid\""
@@ -4142,254 +4327,294 @@ msgstr "Вы не можаце выдаліць актыўную тэму"
 msgid "Please first choose another for your current theme."
 msgstr "Спачатку актывізуйце іншую тэму."
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chat"
 msgstr "Прыватная размова"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chats"
 msgstr "Прыватныя размовы"
 
-#: ../src/groupchat_control.py:120
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Памылка адпраўкі прыватнага паведамлення"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Вы выйшлі з пакоя \"%s\", альбо \"%s\" сышоў."
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chat"
 msgstr "Групавая размова"
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chats"
 msgstr "Групавыя размовы"
 
-#: ../src/groupchat_control.py:315
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Уставіць мянушку"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:810
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s пакараны: %(reason)s"
 
-#: ../src/groupchat_control.py:814
+#: ../src/groupchat_control.py:816
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(who)s пакараў %(nick)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:821
+#: ../src/groupchat_control.py:823
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Для %(nick)s забаронена казанне: %(reason)s"
 
-#: ../src/groupchat_control.py:825
+#: ../src/groupchat_control.py:827
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s забараніў казанне для %(nick)s: %(reason)s"
 
-#: ../src/groupchat_control.py:833
+#: ../src/groupchat_control.py:835
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вашая мянушка зменена на %s"
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:837
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s змяніў мянушку на %s"
 
-#: ../src/groupchat_control.py:915
+#: ../src/groupchat_control.py:917
 #, python-format
 msgid "%s has left"
 msgstr "%s сышоў"
 
-#: ../src/groupchat_control.py:920
+#: ../src/groupchat_control.py:922
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s увайшоў у групавую размову"
 
 #. No status message
-#: ../src/groupchat_control.py:922
-#: ../src/roster_window.py:1204
+#: ../src/groupchat_control.py:924 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s цяпер %s"
 
-#: ../src/groupchat_control.py:1041
-#: ../src/groupchat_control.py:1059
-#: ../src/groupchat_control.py:1152
-#: ../src/groupchat_control.py:1169
+#: ../src/groupchat_control.py:1043 ../src/groupchat_control.py:1061
+#: ../src/groupchat_control.py:1154 ../src/groupchat_control.py:1171
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Мянушка не знойдзена: %s"
 
-#: ../src/groupchat_control.py:1075
+#: ../src/groupchat_control.py:1077
 msgid "This group chat has no subject"
 msgstr "Для гэтай групавой размовы не вызначана тэма размовы"
 
-#: ../src/groupchat_control.py:1088
+#: ../src/groupchat_control.py:1090
 #, 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:1095
-#: ../src/groupchat_control.py:1123
+#: ../src/groupchat_control.py:1097 ../src/groupchat_control.py:1125
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s не з'яўляецца карэктным JID"
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1208
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr "Такой каманды няма: /%s (калі Вы хочаце адправіць яе, устаўце перад тэкстам \"/say\")"
+msgstr ""
+"Такой каманды няма: /%s (калі Вы хочаце адправіць яе, устаўце перад тэкстам "
+"\"/say\")"
 
-#: ../src/groupchat_control.py:1229
+#: ../src/groupchat_control.py:1231
 #, python-format
 msgid "Commands: %s"
 msgstr "Каманды: %s"
 
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1233
 #, 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 "Карыстанне: /%s <nickname|JID> [прычына], забараняе JID казанне для гэтай групавой размовы. Мянушку парушальніка можна змясціць тут, калі яна не ўтрымлівае сымбаля \"@\". Калі JID яшчэ ўдзельнічае ў групавой размове, ён таксама будзе выкінуты адтуль. Прагалы ў мянушках не падтрымліваюцца."
+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 ""
+"Карыстанне: /%s <nickname|JID> [прычына], забараняе JID казанне для гэтай "
+"групавой размовы. Мянушку парушальніка можна змясціць тут, калі яна не "
+"ўтрымлівае сымбаля \"@\". Калі JID яшчэ ўдзельнічае ў групавой размове, ён "
+"таксама будзе выкінуты адтуль. Прагалы ў мянушках не падтрымліваюцца."
 
-#: ../src/groupchat_control.py:1238
+#: ../src/groupchat_control.py:1240
 #, python-format
-msgid "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
-msgstr "Карыстанне: /%s <мянушка>, адкрывае прыватную размову з пазначаным удзельнікам."
+msgid ""
+"Usage: /%s <nickname>, opens a private chat window to the specified occupant."
+msgstr ""
+"Карыстанне: /%s <мянушка>, адкрывае прыватную размову з пазначаным "
+"удзельнікам."
 
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1244
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Карыстанне: /%s, прыбірае тэкст у вакне."
 
-#: ../src/groupchat_control.py:1244
+#: ../src/groupchat_control.py:1246
 #, python-format
-msgid "Usage: /%s [reason], closes the current window or tab, displaying reason if specified."
-msgstr "Карыстанне: /%s [прычына], закрывае вакно / картку, паказаўшы вызначаную прычыну."
+msgid ""
+"Usage: /%s [reason], closes the current window or tab, displaying reason if "
+"specified."
+msgstr ""
+"Карыстанне: /%s [прычына], закрывае вакно / картку, паказаўшы вызначаную "
+"прычыну."
 
-#: ../src/groupchat_control.py:1247
+#: ../src/groupchat_control.py:1249
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Карыстанне: /%s, хавае кнопкі размовы."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1252
 #, python-format
-msgid "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally providing a reason."
-msgstr "Карыстанне: /%s <JID> [прычына], запрашае JID паўдзельнічаць у гэтай групавой размове, з пазначанай прычынай запрашэння."
+msgid ""
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
+"providing a reason."
+msgstr ""
+"Карыстанне: /%s <JID> [прычына], запрашае JID паўдзельнічаць у гэтай "
+"групавой размове, з пазначанай прычынай запрашэння."
 
-#: ../src/groupchat_control.py:1254
+#: ../src/groupchat_control.py:1256
 #, python-format
-msgid "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally using specified nickname."
-msgstr "Карыстанне: /%s <пакой>@<сэрвэр>[/мянушка], увайсці ў пакой room@server з вызначанай мянушкай."
+msgid ""
+"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
+"using specified nickname."
+msgstr ""
+"Карыстанне: /%s <пакой>@<сэрвэр>[/мянушка], увайсці ў пакой room@server з "
+"вызначанай мянушкай."
 
-#: ../src/groupchat_control.py:1258
+#: ../src/groupchat_control.py:1260
 #, 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 "Карыстанне: /%s <мянушка> [прычына], выкідае парушальніка з вызначанай мянушкай з групавой размовы з паказанай прычынай. Прагалы ў мянушках не падтрымліваюцца."
+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 ""
+"Карыстанне: /%s <мянушка> [прычына], выкідае парушальніка з вызначанай "
+"мянушкай з групавой размовы з паказанай прычынай. Прагалы ў мянушках не "
+"падтрымліваюцца."
 
-#: ../src/groupchat_control.py:1263
+#: ../src/groupchat_control.py:1265
 #, python-format
-msgid "Usage: /%s <action>, sends action to the current group chat. Use third person. (e.g. /%s explodes.)"
-msgstr "Карыстанне: /%s <дзеянне>, выконвае дзеянне ў групавой размове (ад трэцяй асобы). (напр. /%s рагоча як конь.)"
+msgid ""
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
+msgstr ""
+"Карыстанне: /%s <дзеянне>, выконвае дзеянне ў групавой размове (ад трэцяй "
+"асобы). (напр. /%s рагоча як конь.)"
 
-#: ../src/groupchat_control.py:1267
+#: ../src/groupchat_control.py:1269
 #, python-format
-msgid "Usage: /%s <nickname> [message], opens a private message windowand sends message to the occupant specified by nickname."
-msgstr "Карыстанне: /%s <мянушка> [паведамленне], адкрывае прыватную размову і адпраўляе паведамленне ўдзельніку з вызначанай мянушкаю."
+msgid ""
+"Usage: /%s <nickname> [message], opens a private message windowand sends "
+"message to the occupant specified by nickname."
+msgstr ""
+"Карыстанне: /%s <мянушка> [паведамленне], адкрывае прыватную размову і "
+"адпраўляе паведамленне ўдзельніку з вызначанай мянушкаю."
 
-#: ../src/groupchat_control.py:1272
+#: ../src/groupchat_control.py:1274
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Карыстанне: /%s <мянушка>, змяняе Вашую мянушку ў гэтай групавой размове."
+msgstr ""
+"Карыстанне: /%s <мянушка>, змяняе Вашую мянушку ў гэтай групавой размове."
 
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1278
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Карыстанне: /%s, хавае кнокі групавой размовы."
 
-#: ../src/groupchat_control.py:1280
+#: ../src/groupchat_control.py:1282
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Карыстанне: /%s [тэма], паказвае ці змяняе тэму групавой размовы."
 
-#: ../src/groupchat_control.py:1283
+#: ../src/groupchat_control.py:1285
 #, python-format
-msgid "Usage: /%s <message>, sends a message without looking for other commands."
-msgstr "Карыстанне: /%s <паведамленне>, адпраўляе паведамленне, не шукаючы іншых камандаў."
+msgid ""
+"Usage: /%s <message>, sends a message without looking for other commands."
+msgstr ""
+"Карыстанне: /%s <паведамленне>, адпраўляе паведамленне, не шукаючы іншых "
+"камандаў."
 
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1288
 #, python-format
 msgid "No help info for /%s"
 msgstr "Даведка па /%s адсутнічае"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Вы сапраўды хочаце сысці з групавой размовы \"%s\"?"
 
-#: ../src/groupchat_control.py:1337
-msgid "If you close this window, you will be disconnected from this group chat."
+#: ../src/groupchat_control.py:1339
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr "Калі Вы закрыеце гэтае вакно, Вы выйдзеце з гэтай групавой размовы."
 
-#: ../src/groupchat_control.py:1341
-#: ../src/roster_window.py:3961
+#: ../src/groupchat_control.py:1343 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "_Больш не пытацца"
 
-#: ../src/groupchat_control.py:1375
+#: ../src/groupchat_control.py:1377
 msgid "Changing Subject"
 msgstr "Змяненне тэмы"
 
-#: ../src/groupchat_control.py:1376
+#: ../src/groupchat_control.py:1378
 msgid "Please specify the new subject:"
 msgstr "Вызначыце новую тэму:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1387
 msgid "Changing Nickname"
 msgstr "Змяненне мянушкі"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1388
 msgid "Please specify the new nickname you want to use:"
 msgstr "Вызначыце сваю новую мянушку:"
 
-#: ../src/groupchat_control.py:1411
+#: ../src/groupchat_control.py:1413
 msgid "Bookmark already set"
 msgstr "Закладка ўжо ўсталяваная"
 
-#: ../src/groupchat_control.py:1412
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Групавая размова \"%s\" ужо знаходзіцца ў Вашых закладках."
 
-#: ../src/groupchat_control.py:1421
+#: ../src/groupchat_control.py:1423
 msgid "Bookmark has been added successfully"
 msgstr "Закладка паспяхова дадана"
 
-#: ../src/groupchat_control.py:1422
+#: ../src/groupchat_control.py:1424
 msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Вы можаце рэдагаваць спіс Вашых закладак праз мэню \"Дзеянні\" галоўнага вакна."
+msgstr ""
+"Вы можаце рэдагаваць спіс Вашых закладак праз мэню \"Дзеянні\" галоўнага "
+"вакна."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1548
+#: ../src/groupchat_control.py:1550
 #, python-format
 msgid "Kicking %s"
 msgstr "Выкіданне %s"
 
-#: ../src/groupchat_control.py:1549
-#: ../src/groupchat_control.py:1831
+#: ../src/groupchat_control.py:1551 ../src/groupchat_control.py:1833
 msgid "You may specify a reason below:"
 msgstr "Вы можаце вызначыць прычыну:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1830
+#: ../src/groupchat_control.py:1832
 #, python-format
 msgid "Banning %s"
 msgstr "Забарона казання для %s"
@@ -4399,8 +4624,12 @@ msgid "A programming error has been detected"
 msgstr "Знойдзена памылка праграмнага коду"
 
 #: ../src/gtkexcepthook.py:42
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
-msgstr "Магчыма, гэтая памылка не крытычная, але пра яе варта паведаміць распрацоўнікам."
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
+msgstr ""
+"Магчыма, гэтая памылка не крытычная, але пра яе варта паведаміць "
+"распрацоўнікам."
 
 #: ../src/gtkexcepthook.py:48
 msgid "_Report Bug"
@@ -4411,8 +4640,7 @@ msgid "Details"
 msgstr "Падрабязнасці"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:153
-#: ../src/gtkgui_helpers.py:168
+#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Памылка: немагчыма прачытаць %s"
@@ -4432,16 +4660,17 @@ msgstr "Памылка разбору файла:"
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Немагчыма запісаць у %s. Сэансы не працуюць"
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:728
 msgid "Extension not supported"
 msgstr "Пашырэнне не падтрымліваецца"
 
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:729
 #, 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
+#: ../src/gtkgui_helpers.py:738
 msgid "Save Image as..."
 msgstr "Захаваць малюнак як..."
 
@@ -4455,42 +4684,41 @@ msgid "Contacts"
 msgstr "Людзі"
 
 #. holds time
-#: ../src/history_manager.py:120
-#: ../src/history_manager.py:160
+#: ../src/history_manager.py:120 ../src/history_manager.py:160
 #: ../src/history_window.py:86
 msgid "Date"
 msgstr "Дата"
 
 #. holds nickname
-#: ../src/history_manager.py:126
-#: ../src/history_manager.py:178
+#: ../src/history_manager.py:126 ../src/history_manager.py:178
 msgid "Nickname"
 msgstr "Мянушка"
 
 #. holds message
-#: ../src/history_manager.py:134
-#: ../src/history_manager.py:166
+#: ../src/history_manager.py:134 ../src/history_manager.py:166
 #: ../src/history_window.py:94
 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 RUNNING)"
-msgstr "Вы сапраўды хочаце ачысціць базу данняў? (Увага: закрыйце Gajim перад працягам)"
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
+msgstr ""
+"Вы сапраўды хочаце ачысціць базу данняў? (Увага: закрыйце Gajim перад "
+"працягам)"
 
 #: ../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 ""
-"Звычайна памер базы данняў не змяншаецца, але вызваленае месца можа быць скарыстана для пазнейшых размоваў. Калі Вы хочаце зменшыць памер базы данняў, пстрыкніце ТАК, інакш НЕ.\n"
+"Звычайна памер базы данняў не змяншаецца, але вызваленае месца можа быць "
+"скарыстана для пазнейшых размоваў. Калі Вы хочаце зменшыць памер базы "
+"данняў, пстрыкніце ТАК, інакш НЕ.\n"
 "\n"
 "Калі Вы выбралі ТАК, пачакайце..."
 
@@ -4510,8 +4738,7 @@ msgstr[0] "Вы сапраўды хочаце выдаліць журнал ра
 msgstr[1] "Вы сапраўды хочаце выдаліць журналы размоваў выбраных асобаў?"
 msgstr[2] "Вы сапраўды хочаце выдаліць журналы размоваў выбраных асобаў?"
 
-#: ../src/history_manager.py:518
-#: ../src/history_manager.py:554
+#: ../src/history_manager.py:518 ../src/history_manager.py:554
 msgid "This is an irreversible operation."
 msgstr "Гэтае дзеянне не аднаўляецца."
 
@@ -4522,8 +4749,7 @@ msgstr[0] "Вы сапраўды хочаце выдаліць выбранае
 msgstr[1] "Вы сапраўды хочаце выдаліць выбраныя паведамленні?"
 msgstr[2] "Вы сапраўды хочаце выдаліць выбраныя паведамленні?"
 
-#: ../src/history_window.py:103
-#: ../src/history_window.py:105
+#: ../src/history_window.py:103 ../src/history_window.py:105
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Размоўны журнал %s"
@@ -4533,8 +4759,7 @@ msgstr "Размоўны журнал %s"
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s цяпер %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:265
-#: ../src/notify.py:198
+#: ../src/history_window.py:265 ../src/notify.py:198
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s цяпер %(status)s"
@@ -4593,15 +4818,12 @@ msgstr "%(nickname)s: %(message)s"
 msgid "New Message from %(nickname)s"
 msgstr "Новае паведамленне ад %(nickname)s"
 
-#: ../src/profile_window.py:72
-#: ../src/profile_window.py:376
+#: ../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
+#: ../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 "Пстрыкніце, каб вызначыць свой аватар"
 
@@ -4616,7 +4838,8 @@ msgstr "Атрыманыя звесткі"
 
 #: ../src/profile_window.py:308
 msgid "Without a connection you can not publish your contact information."
-msgstr "Вы не можаце абнавіць Вашыя асабістыя звесткі, не злучыўшыся з сэрвэрам."
+msgstr ""
+"Вы не можаце абнавіць Вашыя асабістыя звесткі, не злучыўшыся з сэрвэрам."
 
 #: ../src/profile_window.py:320
 msgid "Sending profile..."
@@ -4635,34 +4858,33 @@ msgid "vCard publication failed"
 msgstr "Памылка абнаўлення vCard"
 
 #: ../src/profile_window.py:348
-msgid "There was an error while publishing your personal information, try again later."
-msgstr "У часе абнаўлення Вашых асабістых звестак адбылася памылка, паспрабуйце абнавіць пазней."
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"У часе абнаўлення Вашых асабістых звестак адбылася памылка, паспрабуйце "
+"абнавіць пазней."
 
 #: ../src/profile_window.py:374
 msgid "Without a connection, you can not get your contact information."
 msgstr "Вы не можаце атрымаць звесткі аб сабе, не злучыўшыся з сэрвэрам."
 
-#: ../src/roster_window.py:168
-#: ../src/roster_window.py:223
+#: ../src/roster_window.py:168 ../src/roster_window.py:223
 msgid "Merged accounts"
 msgstr "Аб'яднаныя рахункі"
 
-#: ../src/roster_window.py:340
-#: ../src/common/helpers.py:42
+#: ../src/roster_window.py:340 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Назіральнікі"
 
-#: ../src/roster_window.py:686
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:686 ../src/roster_window.py:3132
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Вы не можаце ўдзельнічаць у групавой размове нябачным"
 
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:878
-#: ../src/systray.py:187
-#: ../src/systray.py:192
+#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
 #, python-format
 msgid "using account %s"
 msgstr "выкарыстоўвае рахунак %s"
@@ -4705,8 +4927,7 @@ msgstr "Кіраўнік журналаў"
 msgid "_Join New Group Chat"
 msgstr "_Удзельнічаць у групавой размове"
 
-#: ../src/roster_window.py:1384
-#: ../src/roster_window.py:3325
+#: ../src/roster_window.py:1384 ../src/roster_window.py:3325
 #: ../src/roster_window.py:3332
 msgid "You have unread messages"
 msgstr "Ёсць нечытаныя паведамленні"
@@ -4721,7 +4942,9 @@ msgid "Transport \"%s\" will be removed"
 msgstr "Транспарт \"%s\" будзе выдалены"
 
 #: ../src/roster_window.py:1389
-msgid "You will no longer be able to send and receive messages to contacts from this transport."
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"this transport."
 msgstr "Вы больш не зможаце мець зносіны з людзьмі праз гэты транспарт."
 
 #: ../src/roster_window.py:1392
@@ -4730,7 +4953,9 @@ msgstr "Транспарты будуць выдаленыя"
 
 #: ../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"
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
 msgstr "Вы больш не зможаце мець зносіны з людзьмі праз гэтыя транспарты: %s"
 
 #. it's jid
@@ -4773,8 +4998,7 @@ msgstr "Прызначыць ключ OpenPGP"
 msgid "Select a key to apply to the contact"
 msgstr "Выберыце ключ для гэтага чалавека"
 
-#: ../src/roster_window.py:1788
-#: ../src/roster_window.py:1963
+#: ../src/roster_window.py:1788 ../src/roster_window.py:1963
 msgid "_New group chat"
 msgstr "_Новая групавая размова"
 
@@ -4782,8 +5006,7 @@ msgstr "_Новая групавая размова"
 msgid "I would like to add you to my roster"
 msgstr "Я хачу дадаць Вас у мой кантактны ліст"
 
-#: ../src/roster_window.py:2008
-#: ../src/roster_window.py:2055
+#: ../src/roster_window.py:2008 ../src/roster_window.py:2055
 msgid "Send Group M_essage"
 msgstr "Ад_правіць групавое паведамленне"
 
@@ -4807,8 +5030,7 @@ msgstr "_Увайсці"
 msgid "Log _off"
 msgstr "_Выйсці"
 
-#: ../src/roster_window.py:2232
-#: ../src/roster_window.py:2303
+#: ../src/roster_window.py:2232 ../src/roster_window.py:2303
 msgid "_Change Status Message"
 msgstr "З_мяніць паведамленне аб стане"
 
@@ -4845,12 +5067,21 @@ msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" будзе выдалены з Вашага кантактнага ліста"
 
 #: ../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 "Выдаліўшы гэтага чалавека з Вашага кантактнага ліста, Вы такім чынам таксама прыбярэце ў яго аўтарызацыю, і ён заўсёды будзе бачыць Вас адлучаным."
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Выдаліўшы гэтага чалавека з Вашага кантактнага ліста, Вы такім чынам таксама "
+"прыбярэце ў яго аўтарызацыю, і ён заўсёды будзе бачыць Вас адлучаным."
 
 #: ../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 "Выдаліўшы гэтага чалавека з Вашага кантактнага ліста, Вы звычайна такім чынам таксама прыбярэце ў яго аўтарызацыю, і ён заўсёды будзе бачыць Вас адлучаным."
+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:2629
 msgid "I want this contact to know my status after removal"
@@ -4868,7 +5099,8 @@ msgid ""
 "you also remove authorization resulting in them always seeing you as offline."
 msgstr ""
 "Выдаліўшы гэтых людзей:%s\n"
-"з Вашага кантактнага ліста, Вы такім чынам таксама прыбераце ў іх аўтарызацыю, і яны заўсёды будуць бачыць Вас адлучаным."
+"з Вашага кантактнага ліста, Вы такім чынам таксама прыбераце ў іх "
+"аўтарызацыю, і яны заўсёды будуць бачыць Вас адлучаным."
 
 #: ../src/roster_window.py:2709
 msgid "Passphrase Required"
@@ -4891,15 +5123,17 @@ msgstr "Няправільны пароль"
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Паўтары ўвод пароля GPG альбо пстрыкніце Скасаваць."
 
-#: ../src/roster_window.py:2781
-#: ../src/roster_window.py:2841
+#: ../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: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: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:2799
 msgid "No account available"
@@ -4914,26 +5148,39 @@ msgstr "Вы павінны стварыць рахунак, каб размаў
 msgid "♪ \"%(title)s\" by %(artist)s ♪"
 msgstr "♪ \"%(title)s\" выконвае %(artist)s ♪"
 
-#: ../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: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: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 "Сэрвэр не падтрымлівае мэта-кантакты. Гэтае настаўленне не захаваецца для наступных сэансаў."
+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
-msgid "You are about to create a metacontact. Are you sure you want to continue?"
+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 "Мэтакантакты дазваляюць згрупаваць некалькі людзей. Звычайна ўжываецца, калі ў чалавека некалькі рахункаў Jabber альбо некалькі транспартных рахункаў."
+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 ""
+"Мэтакантакты дазваляюць згрупаваць некалькі людзей. Звычайна ўжываецца, калі "
+"ў чалавека некалькі рахункаў Jabber альбо некалькі транспартных рахункаў."
 
 #: ../src/roster_window.py:4124
 #, python-format
@@ -4957,13 +5204,11 @@ msgstr "_Змяніць паведамленне стану..."
 msgid "Hide this menu"
 msgstr "Схаваць гэтае мэню"
 
-#: ../src/tooltips.py:309
-#: ../src/tooltips.py:492
+#: ../src/tooltips.py:309 ../src/tooltips.py:492
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:312
-#: ../src/tooltips.py:496
+#: ../src/tooltips.py:312 ../src/tooltips.py:496
 msgid "Resource: "
 msgstr "Рэсурс: "
 
@@ -4972,8 +5217,7 @@ msgstr "Рэсурс: "
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s гэтай групавой размовы"
 
-#: ../src/tooltips.py:430
-#: ../src/tooltips.py:610
+#: ../src/tooltips.py:430 ../src/tooltips.py:610
 msgid "Status: "
 msgstr "Стан: "
 
@@ -5012,8 +5256,7 @@ msgstr "Тып: "
 msgid "Transferred: "
 msgstr "Перададзена: "
 
-#: ../src/tooltips.py:588
-#: ../src/tooltips.py:609
+#: ../src/tooltips.py:588 ../src/tooltips.py:609
 msgid "Not started"
 msgstr "Не пачата"
 
@@ -5021,8 +5264,7 @@ msgstr "Не пачата"
 msgid "Stopped"
 msgstr "Спынена"
 
-#: ../src/tooltips.py:594
-#: ../src/tooltips.py:597
+#: ../src/tooltips.py:594 ../src/tooltips.py:597
 msgid "Completed"
 msgstr "Скончана"
 
@@ -5059,8 +5301,7 @@ msgstr "?Праграма:Невядомая"
 msgid "?OS:Unknown"
 msgstr "?Сістэма:Невядомая"
 
-#: ../src/vcard.py:247
-#: ../src/vcard.py:449
+#: ../src/vcard.py:247 ../src/vcard.py:449
 #, python-format
 msgid "since %s"
 msgstr "ад %s"
@@ -5070,11 +5311,15 @@ msgid "Affiliation:"
 msgstr "Адносіны: "
 
 #: ../src/vcard.py:285
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
+msgid ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
 msgstr "Вы не цікавіцеся гэтым чалавекам, але ён цікавіцца Вамі"
 
 #: ../src/vcard.py:287
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
 msgstr "Вы цікавіцеся чалавекам, але ён не цікавіцца Вамі"
 
 #: ../src/vcard.py:289
@@ -5083,16 +5328,16 @@ msgstr "Вы і гэты чалавек абодва цікавіцеся адн
 
 #. None
 #: ../src/vcard.py:291
-msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
+msgid ""
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
 msgstr "Вы не цікавіцеся чалавекам, ён не цікавіцца Вамі"
 
 #: ../src/vcard.py:299
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Вы чакаеце адказу на Ваш запыт"
 
-#: ../src/vcard.py:311
-#: ../src/vcard.py:338
-#: ../src/vcard.py:482
+#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
 msgid " resource with priority "
 msgstr " рэсурс з прыярытэтам "
 
@@ -5100,17 +5345,14 @@ msgstr " рэсурс з прыярытэтам "
 msgid "creating logs database"
 msgstr "стварэнне базы журналаў"
 
-#: ../src/common/check_paths.py:89
-#: ../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:90
-#: ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:108
-#: ../src/common/check_paths.py:116
+#: ../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 сканчвае работу"
 
@@ -5145,7 +5387,8 @@ msgid "Not available as a result of being idle"
 msgstr "Недаступны ў выніку марнавання часу"
 
 #: ../src/common/config.py:82
-msgid "List (space separated) of rows (accounts and groups) that are collapsed."
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "Спіс падзеленых прагаламі згорнутых рахункаў і груп."
 
 #: ../src/common/config.py:87
@@ -5167,44 +5410,69 @@ msgstr ""
 "'never' - не паказваць час."
 
 #: ../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 "Паказваць час прыблізна. Значэнне прыблізнасці ад 0 да 4: 0 адключае прыблізнасць, 1 паказвае самы дакладны час, 4 паказвае самы прыблізны. Працуе, калі значэнне опцыі print_time 'sometimes'."
+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 ""
+"Паказваць час прыблізна. Значэнне прыблізнасці ад 0 да 4: 0 адключае "
+"прыблізнасць, 1 паказвае самы дакладны час, 4 паказвае самы прыблізны. "
+"Працуе, калі значэнне опцыі print_time 'sometimes'."
 
 #: ../src/common/config.py:95
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Лічыць спалучэнні * / _  мажлівымі сымбалямі фарматавання."
 
 #: ../src/common/config.py:96
-msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr "True: не выдаляць */_ . Такім чынам, *abc* будзе тлустым, але з * * не выдаляецца."
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"True: не выдаляць */_ . Такім чынам, *abc* будзе тлустым, але з * * не "
+"выдаляецца."
 
 #: ../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 "Ужыць тэкставае фарматаванне HTML у дадатак да фарматавання ascii. (трэба ўсталяваць docutils)"
+msgid ""
+"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
+"(If you want to use this, install docutils)"
+msgstr ""
+"Ужыць тэкставае фарматаванне HTML у дадатак да фарматавання ascii. (трэба "
+"ўсталяваць docutils)"
 
 #: ../src/common/config.py:108
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
 msgstr "Сымбаль пасля дапоўненай мянушкі ў групавой размове."
 
 #: ../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 "Сымбаль пасля вызначанай мянушкі, калі яе ўспамінаюць у групавой размове."
+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:142
 msgid "Add * and [n] in roster title?"
 msgstr "Дадаць * і [n] у назву галоўнага вакна?"
 
 #: ../src/common/config.py:143
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
-msgstr "Колькі радкоў помніць з апошняй размовы, калі размова наноў адкрываецца."
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Колькі радкоў помніць з апошняй размовы, калі размова наноў адкрываецца."
 
 #: ../src/common/config.py:144
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Колькі хвілін апошняй размовы паказваць у новых размовах."
 
 #: ../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 стварае новы радок (стандартныя паводзіны Mirabilis ICQ)."
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Адпраўляць паведамленне праз Ctrl+Enter, а Enter стварае новы радок "
+"(стандартныя паводзіны Mirabilis ICQ)."
 
 #: ../src/common/config.py:147
 msgid "How many lines to store for Ctrl+KeyUP."
@@ -5212,44 +5480,79 @@ msgstr "Колькі радкоў захоўваць для Ctrl+KeyUP."
 
 #: ../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 "Альбо адмысловы адрас з %s, дзе %s ёсць словам/выразам, альбо 'WIKTIONARY', што значыць выкарыстанне Вікі-Слоўніка."
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Альбо адмысловы адрас з %s, дзе %s ёсць словам/выразам, альбо 'WIKTIONARY', "
+"што значыць выкарыстанне Вікі-Слоўніка."
 
 #: ../src/common/config.py:153
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr "Калі гэтая опцыя ўключана, Gajim можа кантралявацца з дапамогай 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 "True: чакаць сігналаў D-Bus ад NetworkManager і змяняць стан рахункаў (для якіх опцыя listen_to_network_manager не выстаўлена ў False і якія сінхранізуюцца з глабальным станам) згодна з станам сеткавага злучэння."
+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 ""
+"True: чакаць сігналаў D-Bus ад NetworkManager і змяняць стан рахункаў (для "
+"якіх опцыя listen_to_network_manager не выстаўлена ў False і якія "
+"сінхранізуюцца з глабальным станам) згодна з станам сеткавага злучэння."
 
 #: ../src/common/config.py:155
-msgid "Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr "Адпраўляць паведамленні аб стане размовы. Адно з наступных значэнняў: all, composing_only, disabled."
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+"Адпраўляць паведамленні аб стане размовы. Адно з наступных значэнняў: all, "
+"composing_only, disabled."
 
 #: ../src/common/config.py:156
-msgid "Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled."
-msgstr "Паказваць паведамленні аб стане размовы. Адно з наступных значэнняў: all, composing_only, disabled."
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Паказваць паведамленні аб стане размовы. Адно з наступных значэнняў: all, "
+"composing_only, disabled."
 
 #: ../src/common/config.py:158
-msgid "When not printing time for every message (print_time==sometimes), print it every x minutes."
-msgstr "Калі трэба паказваць час не для кожнага паведамлення (print_time==sometimes), паказваць яго кожныя x хвілін."
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Калі трэба паказваць час не для кожнага паведамлення "
+"(print_time==sometimes), паказваць яго кожныя x хвілін."
 
 #: ../src/common/config.py:159
 msgid "Ask before closing a group chat tab/window."
 msgstr "Пытацца пацверджання закрыцця групавой размовы."
 
 #: ../src/common/config.py:160
-msgid "Always ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Заўсёды пытацца пацверджання закрыцця групавых размоваў з гэтага спіса падзеленых прагаламі назваў групавых размоваў."
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Заўсёды пытацца пацверджання закрыцця групавых размоваў з гэтага спіса "
+"падзеленых прагаламі назваў групавых размоваў."
 
 #: ../src/common/config.py:161
-msgid "Never ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Ніколі не пытацца пацверджання закрыцця групавых размоваў з гэтага спіса падзеленых прагаламі назваў групавых размоваў."
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Ніколі не пытацца пацверджання закрыцця групавых размоваў з гэтага спіса "
+"падзеленых прагаламі назваў групавых размоваў."
 
 #: ../src/common/config.py:164
-msgid "Overrides the host we send for File Transfer in case of address translation/port forwarding."
-msgstr "Вызначае вузел, якому мы адпраўляем файлы, у выпадку трансляцыі адрасоў / перанакіравання портаў."
+msgid ""
+"Overrides the host we send for File Transfer in case of address translation/"
+"port forwarding."
+msgstr ""
+"Вызначае вузел, якому мы адпраўляем файлы, у выпадку трансляцыі адрасоў / "
+"перанакіравання портаў."
 
 #: ../src/common/config.py:166
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
@@ -5272,36 +5575,65 @@ msgid "Show close button in tab?"
 msgstr "Паказваць кнопку закрыцця на картцы?"
 
 #: ../src/common/config.py:189
-msgid "A semicolon-separated list of words that will be highlighted in group chats."
-msgstr "Спіс падзеленых кропкай з коскай словаў, якія трэба фарбаваць у групавых размовах."
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"Спіс падзеленых кропкай з коскай словаў, якія трэба фарбаваць у групавых "
+"размовах."
 
 #: ../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 "True: Gajim сканчвае работу, калі націскаецца кнопка X вакна. Гэтае настаўленне ўлічваецца толькі разам з значкам прасторы паведамленняў."
+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 ""
+"True: Gajim сканчвае работу, калі націскаецца кнопка X вакна. Гэтае "
+"настаўленне ўлічваецца толькі разам з значкам прасторы паведамленняў."
 
 #: ../src/common/config.py:191
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "True: Gajim рэгіструе на сябе пратакол xmpp:// па кожным старце."
 
 #: ../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 "True: Gajim паказвае значку на кожнай картцы з нечытанымі паведамленнямі. У залежнасці ад тэмы, гэтая значка можа быць і анімаванай."
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"True: Gajim паказвае значку на кожнай картцы з нечытанымі паведамленнямі. У "
+"залежнасці ад тэмы, гэтая значка можа быць і анімаванай."
 
 #: ../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."
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
 msgstr "True: Gajim паказвае стан у галоўным вакне для кожнага чалавека"
 
 #: ../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 "True: Gajim будзе адпраўляць запыт на атрыманне аватара кожнаму чалавеку, хто не меў усталяванага аватара ў апошні сэанс, ці чый аватар надта стары."
+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 ""
+"True: Gajim будзе адпраўляць запыт на атрыманне аватара кожнаму чалавеку, "
+"хто не меў усталяванага аватара ў апошні сэанс, ці чый аватар надта стары."
 
 #: ../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."
+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 "False: не паказваць паведамленні аб змене стану суразмоўцы."
 
 #: ../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 group chat."
-msgstr "магчымыя значэнні: \"none\", \"all\" ці \"in_and_out\". Калі опцыя выстаўлена ў \"none\", Gajim не будзе паказваць паведамленні аб змене стану ўдзельнікаў. Калі опцыя выстаўлена ў \"all\", Gajim будзе паказваць усе такія паведамленні. Калі опцыя выстаўлена ў \"in_and_out\", gajim будзе паказваць толькі паведамленні аб выхадзе / ўваходзе ўдзельніка."
+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 ""
+"магчымыя значэнні: \"none\", \"all\" ці \"in_and_out\". Калі опцыя "
+"выстаўлена ў \"none\", Gajim не будзе паказваць паведамленні аб змене стану "
+"ўдзельнікаў. Калі опцыя выстаўлена ў \"all\", Gajim будзе паказваць усе "
+"такія паведамленні. Калі опцыя выстаўлена ў \"in_and_out\", gajim будзе "
+"паказваць толькі паведамленні аб выхадзе / ўваходзе ўдзельніка."
 
 #: ../src/common/config.py:199
 msgid "Background color of contacts when they just signed in."
@@ -5312,8 +5644,11 @@ 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 "True: адноўленыя з папярэдняга сэанса паведамленні будуць мець меншы памер шрыфта."
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+"True: адноўленыя з папярэдняга сэанса паведамленні будуць мець меншы памер "
+"шрыфта."
 
 #: ../src/common/config.py:203
 msgid "Don't show avatar for the transport itself."
@@ -5324,12 +5659,24 @@ msgid "Don't show roster in the system taskbar."
 msgstr "Не паказваць галоўнае вакно на панэлі заданняў."
 
 #: ../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 "True: калі ўсталяваныя GTK+ і PyGTK вэрсіі, вышэйшай за 2.8, міргаць вакном (звычайныя паводзіны ў бальшыні ваконных кіраўнікоў) пры наяўнасці нягледжаных падзей."
+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 ""
+"True: калі ўсталяваныя GTK+ і PyGTK вэрсіі, вышэйшай за 2.8, міргаць вакном "
+"(звычайныя паводзіны ў бальшыні ваконных кіраўнікоў) пры наяўнасці "
+"нягледжаных падзей."
 
 #: ../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 presences."
-msgstr "Jabberd1.4 не любіць звесткі sha, калі чалавек заходзіць у абароненую паролем групавую размову. Змяніце значэнне гэтай опцыі на False, каб перастаць адпраўляць звесткі sha ў групавыя размовы"
+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 не любіць звесткі sha, калі чалавек заходзіць у абароненую "
+"паролем групавую размову. Змяніце значэнне гэтай опцыі на False, каб "
+"перастаць адпраўляць звесткі sha ў групавыя размовы"
 
 #. always, never, peracct, pertype should not be translated
 #: ../src/common/config.py:210
@@ -5338,13 +5685,17 @@ msgid ""
 "'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 ""
 "Вызначае вакно для новых паведамленняў.\n"
 "'always' - Усе паведамленні адпраўляюцца ў адзінае вакно.\n"
 "'never' - Усе паведамленні адпраўляюцца ў асобныя вокны.\n"
 "'peracct' - Паведамленні ад кожнага рахунка адпраўляюцца ў асобнае вакно.\n"
-"'pertype' - Паведамленні аднаго тыпу (напр., прыватныя і групавыя) адпраўляюцца ў асобныя вокны. Зважайце, што гэтыя змены будуць ужыты толькі пасля перазапуску праграмы."
+"'pertype' - Паведамленні аднаго тыпу (напр., прыватныя і групавыя) "
+"адпраўляюцца ў асобныя вокны. Зважайце, што гэтыя змены будуць ужыты толькі "
+"пасля перазапуску праграмы."
 
 #: ../src/common/config.py:211
 msgid "If False, you will no longer see the avatar in the chat window."
@@ -5375,8 +5726,12 @@ msgid "Hides the group chat occupants list in group chat window."
 msgstr "Схаваць спіс удзельнікаў групавой размовы."
 
 #: ../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 "У групавой размове не паказваць мянушку, калі папярэдняе паведамленне напісаў той самы чалавек."
+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:219
 msgid "Indentation when using merge consecutive nickame."
@@ -5388,19 +5743,33 @@ msgstr "Спіс колераў для фарбавання мянушак у г
 
 #: ../src/common/config.py:221
 msgid "Ctrl-Tab go to next composing tab when none is unread."
-msgstr "Ctrl-Tab пераходзіць у наступную картку, калі няма нечытаных паведамленняў."
+msgstr ""
+"Ctrl-Tab пераходзіць у наступную картку, калі няма нечытаных паведамленняў."
 
 #: ../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 "Ці трэба паказваць вакно пацверджання пры стварэнні мэта-кантакта? Пусты радок адключае гэтае вакно."
+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 "True: Вы зможаце выставіць для рахунка адмоўны прыярытэт. Увага: калі Вы ўвайшлі з адмоўным прыярытэтам, Вы не будзеце атрымліваць паведамленняў."
+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 ""
+"True: Вы зможаце выставіць для рахунка адмоўны прыярытэт. Увага: калі Вы "
+"ўвайшлі з адмоўным прыярытэтам, Вы не будзеце атрымліваць паведамленняў."
 
 #: ../src/common/config.py:234
-msgid "Priority will change automatically according to your status. Priorities are defined in autopriority_* options."
-msgstr "Аўтаматычна змяняць прыярытэт згодна з станам. Прыярытэты выстаўлены ў опцыях autopriority_*."
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Аўтаматычна змяняць прыярытэт згодна з станам. Прыярытэты выстаўлены ў "
+"опцыях autopriority_*."
 
 #. yes, no, ask
 #: ../src/common/config.py:263
@@ -5408,15 +5777,18 @@ msgid "Jabberd2 workaround"
 msgstr "Выпраўленне хібы Jabberd2"
 
 #: ../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 "Калі выстаўлена гэтая опцыя, Gajim будзе ўжываць для перадачы файлаў выстаўленыя IP-адрас і проксі-сэрвэры з парамэтра file_transfer_proxies."
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Калі выстаўлена гэтая опцыя, Gajim будзе ўжываць для перадачы файлаў "
+"выстаўленыя IP-адрас і проксі-сэрвэры з парамэтра file_transfer_proxies."
 
 #: ../src/common/config.py:326
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ці ўжыты OpenPGP ў размове з гэтым чалавекам?"
 
-#: ../src/common/config.py:327
-#: ../src/common/config.py:330
+#: ../src/common/config.py:327 ../src/common/config.py:330
 msgid "Language for which we want to check misspelled words"
 msgstr "Мова праверкі правапіса"
 
@@ -5428,10 +5800,8 @@ msgstr "усе ці падзеленыя прагаламі станы"
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' ці 'both'"
 
-#: ../src/common/config.py:338
-#: ../src/common/config.py:340
-#: ../src/common/config.py:341
-#: ../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 "'yes', 'no' ці ''"
@@ -5504,26 +5874,28 @@ msgstr "Мяне няма."
 msgid "Do not disturb."
 msgstr "Не турбаваць."
 
-#: ../src/common/config.py:366
-#: ../src/common/config.py:367
+#: ../src/common/config.py:366 ../src/common/config.py:367
 msgid "Bye!"
 msgstr "Бывай!"
 
 #: ../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."
-msgstr "Прайграць гэты гук, калі прыходзіць групавое паведамленне з адным з словаў, вызначаных у парамэтры muc_highlight_words, ці калі гэтае паведамленне ўтрымлівае Вашую мянушку."
+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 ""
+"Прайграць гэты гук, калі прыходзіць групавое паведамленне з адным з словаў, "
+"вызначаных у парамэтры muc_highlight_words, ці калі гэтае паведамленне "
+"ўтрымлівае Вашую мянушку."
 
 #: ../src/common/config.py:377
 msgid "Sound to play when any MUC message arrives."
 msgstr "Прайграць гук пры атрыманні паведамлення MUC."
 
-#: ../src/common/config.py:386
-#: ../src/common/optparser.py:197
+#: ../src/common/config.py:386 ../src/common/optparser.py:197
 msgid "green"
 msgstr "зялёны"
 
-#: ../src/common/config.py:390
-#: ../src/common/optparser.py:183
+#: ../src/common/config.py:390 ../src/common/optparser.py:183
 msgid "grocery"
 msgstr "садавіна"
 
@@ -5547,15 +5919,19 @@ msgstr "Няправільны вузел"
 
 #: ../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 "Вузел, вызначаны опцыяй ft_override_host_to_send, некарэктны, таму ігнаруецца."
+msgid ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"Вузел, вызначаны опцыяй ft_override_host_to_send, некарэктны, таму "
+"ігнаруецца."
 
 #: ../src/common/connection_handlers.py:590
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Звесткі рэгістрацыі для транспарту %s не прыйшлі ў час"
 
-#: ../src/common/connection_handlers.py:1515
+#: ../src/common/connection_handlers.py:1523
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Такая мянушка не дазволена: %s"
@@ -5563,41 +5939,41 @@ msgstr "Такая мянушка не дазволена: %s"
 #. password required to join
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1577
-#: ../src/common/connection_handlers.py:1580
-#: ../src/common/connection_handlers.py:1583
-#: ../src/common/connection_handlers.py:1586
-#: ../src/common/connection_handlers.py:1589
-#: ../src/common/connection_handlers.py:1592
+#: ../src/common/connection_handlers.py:1585
+#: ../src/common/connection_handlers.py:1588
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1597
 #: ../src/common/connection_handlers.py:1600
+#: ../src/common/connection_handlers.py:1608
 msgid "Unable to join group chat"
 msgstr "Немагчыма ўвайсці ў групавую размову"
 
-#: ../src/common/connection_handlers.py:1578
+#: ../src/common/connection_handlers.py:1586
 msgid "A password is required to join this group chat."
 msgstr "Каб удзельнічаць у гэтай групавой размове, трэба ведаць пароль."
 
-#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1589
 msgid "You are banned from this group chat."
 msgstr "Вам забаронена казанне ў гэтай групавой размове."
 
-#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1592
 msgid "Such group chat does not exist."
 msgstr "Такой групавой размовы няма."
 
-#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1595
 msgid "Group chat creation is restricted."
 msgstr "Стварэнне групавых размоваў абмежавана."
 
-#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1598
 msgid "Your registered nickname must be used."
 msgstr "Вы павінны карыстацца зарэгістраванай для Вас мянушкай."
 
-#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1601
 msgid "You are not in the members list."
 msgstr "Вас няма ў спісе ўдзельнікаў."
 
-#: ../src/common/connection_handlers.py:1601
+#: ../src/common/connection_handlers.py:1609
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5605,30 +5981,35 @@ msgstr ""
 "Гэтая мянушка ўжо ўжыта альбо зарэгістравана іншым чалавекам.\n"
 "Выберыце іншую мянушку:"
 
-#: ../src/common/connection_handlers.py:1651
+#: ../src/common/connection_handlers.py:1659
 msgid "I would like to add you to my roster."
 msgstr "Я хачу дадаць Вас у мой кантактны ліст."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1672
+#: ../src/common/connection_handlers.py:1680
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "цяпер падпісаны на %s"
 
-#: ../src/common/connection_handlers.py:1674
+#: ../src/common/connection_handlers.py:1682
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "запыт адпіскі ад %s"
 
-#: ../src/common/connection_handlers.py:1676
+#: ../src/common/connection_handlers.py:1684
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "цяпер адпісаны ад %s"
 
-#: ../src/common/connection_handlers.py:1846
+#: ../src/common/connection_handlers.py:1854
 #, python-format
-msgid "JID %s is not RFC compliant. It will not be added to your roster. Use roster management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr "JID %s не адпавядае стандарту RFC. Ён не будзе даданы ў кантактны ліст. Выдаліце яго з дапамогай адмысловай праграмы, напр., http://jru.jabberstudio.org/"
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s не адпавядае стандарту RFC. Ён не будзе даданы ў кантактны ліст. "
+"Выдаліце яго з дапамогай адмысловай праграмы, напр., http://jru.jabberstudio."
+"org/"
 
 #: ../src/common/connection.py:164
 #: ../src/common/zeroconf/connection_zeroconf.py:196
@@ -5640,8 +6021,7 @@ msgstr "Злучэнне для рахунка \"%s\" згублена"
 msgid "Reconnect manually."
 msgstr "Перадалучыцеся самастойна."
 
-#: ../src/common/connection.py:176
-#: ../src/common/connection.py:203
+#: ../src/common/connection.py:176 ../src/common/connection.py:203
 #, python-format
 msgid "Transport %s answered wrongly to register request: %s"
 msgstr "Транспарт %s некарэктна адказаў, каб зарэгістраваць запыт: %s"
@@ -5651,9 +6031,8 @@ msgstr "Транспарт %s некарэктна адказаў, каб зар
 msgid "Invalid answer"
 msgstr "Няправільны адказ"
 
-#: ../src/common/connection.py:394
-#: ../src/common/connection.py:429
-#: ../src/common/connection.py:872
+#: ../src/common/connection.py:394 ../src/common/connection.py:429
+#: ../src/common/connection.py:877
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
@@ -5710,7 +6089,7 @@ msgstr "Я %s"
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Гэтае паведамленне *зашыфравана* (Гл.:JEP:`27`]"
 
-#: ../src/common/connection.py:759
+#: ../src/common/connection.py:764
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -5720,7 +6099,7 @@ msgstr ""
 "Тэма: %s\n"
 "%s"
 
-#: ../src/common/connection.py:898
+#: ../src/common/connection.py:903
 msgid "Not fetched because of invisible status"
 msgstr "Не атрымана з-за нябачнага стану"
 
@@ -5739,7 +6118,8 @@ msgstr "Залежнасць ад pysqlite2 (aka python-pysqlite2) не выка
 
 #: ../src/common/exceptions.py:30
 msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr "Сэрвіс недаступны: Gajim не працуе, альбо remote_control мае значэнне False"
+msgstr ""
+"Сэрвіс недаступны: Gajim не працуе, альбо remote_control мае значэнне False"
 
 #: ../src/common/exceptions.py:38
 msgid "D-Bus is not present on this machine or python module is missing"
@@ -5803,68 +6183,55 @@ 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
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 msgid "%0 o'clock"
 msgstr "%0 гадзін"
 
-#: ../src/common/fuzzyclock.py:47
-#: ../src/common/fuzzyclock.py:55
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 msgid "five past %0"
 msgstr "пяць хвілін на %0"
 
-#: ../src/common/fuzzyclock.py:47
-#: ../src/common/fuzzyclock.py:56
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
 msgid "ten past %0"
 msgstr "дзесяць хвілін на %0"
 
-#: ../src/common/fuzzyclock.py:48
-#: ../src/common/fuzzyclock.py:56
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
 msgid "quarter past %0"
 msgstr "чвэрць на %0"
 
-#: ../src/common/fuzzyclock.py:48
-#: ../src/common/fuzzyclock.py:57
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
 msgid "twenty past %0"
 msgstr "дваццаць хвілін на %0"
 
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:57
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
 msgid "twenty five past %0"
 msgstr "дваццаць пяць хвілін на %0"
 
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:58
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
 msgid "half past %0"
 msgstr "палова на %0"
 
-#: ../src/common/fuzzyclock.py:50
-#: ../src/common/fuzzyclock.py:58
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
 msgid "twenty five to %1"
 msgstr "без дваццаці пяці хвілін %1"
 
-#: ../src/common/fuzzyclock.py:50
-#: ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
 msgid "twenty to %1"
 msgstr "без дваццаці хвілін %1"
 
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
 msgid "quarter to %1"
 msgstr "без чвэрці %1"
 
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
 msgid "ten to %1"
 msgstr "дзесяць хвілін на %s"
 
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
 msgid "five to %1"
 msgstr "без пяці хвілін %1"
 
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
 msgid "%1 o'clock"
 msgstr "%1 гадзін"
 
@@ -6038,10 +6405,6 @@ msgstr "?Ужо ёсць падпіскі:Няма"
 msgid "To"
 msgstr "Да"
 
-#: ../src/common/helpers.py:259
-msgid "From"
-msgstr "Ад"
-
 #: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Абодва"
@@ -6151,8 +6514,7 @@ msgstr[0] "%d нечытанае прыватнае паведамленне"
 msgstr[1] "%d нечытаныя прыватныя паведамленні"
 msgstr[2] "%d нечытаных прыватных паведамленняў"
 
-#: ../src/common/helpers.py:909
-#: ../src/common/helpers.py:911
+#: ../src/common/helpers.py:909 ../src/common/helpers.py:911
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -6167,8 +6529,7 @@ msgstr "памылка: немагчыма прачытаць %s"
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:192
-#: ../src/common/optparser.py:193
+#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
 msgid "cyan"
 msgstr "cyan"
 
@@ -6182,7 +6543,8 @@ msgid "Gajim account %s"
 msgstr "Рахунак Gajim %s"
 
 #: ../src/common/zeroconf/client_zeroconf.py:189
-msgid "Connection to host could not be established: Incorrect answer from server."
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
 msgstr "Немагчыма злучыцца з вузлом: некарэктны адказ сэрвэра."
 
 #: ../src/common/zeroconf/client_zeroconf.py:205
@@ -6190,7 +6552,8 @@ 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."
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
 msgstr "Немагчыма злучыцца з вузлом: скончыўся тэрмін чакання."
 
 #: ../src/common/zeroconf/client_zeroconf.py:629
@@ -6199,7 +6562,8 @@ msgstr "Чалавека пакуль няма. Вы не можаце адпр�
 
 #: ../src/common/zeroconf/connection_zeroconf.py:197
 msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "Каб працягваць адпраўку і атрыманне паведамленняў, трэба перадалучыцца."
+msgstr ""
+"Каб працягваць адпраўку і атрыманне паведамленняў, трэба перадалучыцца."
 
 #: ../src/common/zeroconf/connection_zeroconf.py:207
 msgid "Avahi error"
@@ -6239,8 +6603,11 @@ 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 "Вы не злучаны альбо не бачны для іншых. Вы не можаце адправіць паведамленне."
+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
diff --git a/po/bg.po b/po/bg.po
index 79093c484..b2d1e4507 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-12-02 17:15+0100\n"
+"POT-Creation-Date: 2006-12-09 10:02+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"
@@ -323,16 +323,16 @@ msgid "Manage..."
 msgstr "Управление на..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1637
-#: ../src/config.py:3430
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1642
+#: ../src/config.py:3435
 msgid "No key selected"
 msgstr "Няма избран ключ"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1219
-#: ../src/config.py:1224 ../src/config.py:1408 ../src/config.py:1627
-#: ../src/config.py:1636 ../src/config.py:1695 ../src/config.py:1769
-#: ../src/config.py:2640 ../src/config.py:3420 ../src/config.py:3429
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1224
+#: ../src/config.py:1229 ../src/config.py:1413 ../src/config.py:1632
+#: ../src/config.py:1641 ../src/config.py:1700 ../src/config.py:1774
+#: ../src/config.py:2645 ../src/config.py:3425 ../src/config.py:3434
 #: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Няма"
@@ -525,6 +525,45 @@ msgstr "_Регистриране"
 msgid "_User ID:"
 msgstr "Jabber ID:"
 
+#: ../data/glade/adhoc_commands_window.glade.h:1
+msgid "<b>An error has occured:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:2
+msgid "<b>Choose command to execute:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:3
+msgid "Ad-hoc Commands - Gajim"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:4
+msgid "Check once more"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:5
+#, fuzzy
+msgid "Error description..."
+msgstr "Описание"
+
+#: ../data/glade/adhoc_commands_window.glade.h:6
+#, fuzzy
+msgid "Please wait while retrieving command list..."
+msgstr "Изчакайте, докато записите на разговорите се мигрират..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:7
+#, fuzzy
+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>"
@@ -676,13 +715,13 @@ msgstr "Изпълнение на з_вуци"
 #: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
-"Contact Connected\n"
-"Contact Disconnected\n"
-"Contact Change Status\n"
-"Group Chat Message Highlight\n"
-"Group Chat Message Received\n"
-"File Transfert Resquest\n"
-"File Transfert Started\n"
+"Contact Connected \n"
+"Contact Disconnected \n"
+"Contact Change Status \n"
+"Group Chat Message Highlight \n"
+"Group Chat Message Received \n"
+"File Transfert Resquest \n"
+"File Transfert Started \n"
 "File Transfert Finished"
 msgstr ""
 
@@ -754,6 +793,46 @@ 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 "име на тема"
+
+#: ../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 "Промяна на парола"
@@ -839,7 +918,7 @@ msgstr "_Компактен изглед (Alt+C)"
 msgid "_History"
 msgstr "_История"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/glade/data_form_window.glade.h:1 ../src/dataforms_widget.py:76
 #, fuzzy
 msgid "Fill in the form."
 msgstr "В групата"
@@ -1058,6 +1137,20 @@ 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:259
+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"
@@ -1220,7 +1313,7 @@ msgstr "Използване на удостоверяване"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Натиснете за вмъкване на емотикона (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1116
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP криптиране"
 
@@ -1345,7 +1438,7 @@ msgstr ""
 msgid "B_efore nickname:"
 msgstr "П_реди псевдонима:"
 
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:841
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
 msgid "Chat"
 msgstr "Разговор"
 
@@ -2477,33 +2570,33 @@ msgstr "В момента няма връзка"
 msgid "Your message can not be sent until you are connected."
 msgstr "Съобщението не може да бъде изпратено, докато не се свържете."
 
-#: ../src/chat_control.py:841
+#: ../src/chat_control.py:844
 msgid "Chats"
 msgstr "Разговори"
 
-#: ../src/chat_control.py:1042
+#: ../src/chat_control.py:1030
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1130
+#: ../src/chat_control.py:1118
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s не предлага OpenPGP ключ и не сте задавали такъв"
 
-#: ../src/chat_control.py:1266
+#: ../src/chat_control.py:1254
 msgid "Encryption enabled"
 msgstr "Криптирането е включено"
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1259
 msgid "Encryption disabled"
 msgstr "Криптирането е изключено"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1413 ../src/conversation_textview.py:493
-#: ../src/dialogs.py:629 ../src/gajim.py:727 ../src/gajim.py:728
-#: ../src/gajim.py:1067 ../src/roster_window.py:328
+#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495
+#: ../src/dialogs.py:629 ../src/gajim.py:733 ../src/gajim.py:734
+#: ../src/gajim.py:1073 ../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
@@ -2514,12 +2607,12 @@ msgid "Not in Roster"
 msgstr "не е в списъка"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1545
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Току-що получихте ново съобщение от „%s“"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1546
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2527,278 +2620,278 @@ msgstr ""
 "Ако затворите този прозорец и нямате включена опция за запазване на "
 "историята, съобщението ще бъде загубено."
 
-#: ../src/config.py:130 ../src/config.py:589
+#: ../src/config.py:135 ../src/config.py:594
 msgid "Disabled"
 msgstr "Изключени"
 
-#: ../src/config.py:216
+#: ../src/config.py:221
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Всеки %s _минути"
 
-#: ../src/config.py:358
+#: ../src/config.py:363
 msgid "Active"
 msgstr "Активен"
 
-#: ../src/config.py:366
+#: ../src/config.py:371
 msgid "Event"
 msgstr "Събитие"
 
-#: ../src/config.py:679 ../src/gajim.py:2086
+#: ../src/config.py:684 ../src/gajim.py:2094
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "В момента няма връзка"
 
-#: ../src/config.py:680 ../src/gajim.py:2087
+#: ../src/config.py:685 ../src/gajim.py:2095
 #, 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:1032
+#: ../src/config.py:1037
 msgid "status message title"
 msgstr "заглавие на съобщението за състояние"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1037
 msgid "status message text"
 msgstr "текст на съобщението за състояние"
 
-#: ../src/config.py:1067
+#: ../src/config.py:1072
 msgid "First Message Received"
 msgstr "Първо получено съобщение"
 
-#: ../src/config.py:1068
+#: ../src/config.py:1073
 msgid "Next Message Received"
 msgstr "Следващо получено съобщение"
 
-#: ../src/config.py:1069
+#: ../src/config.py:1074
 msgid "Contact Connected"
 msgstr "Включване на контакт"
 
-#: ../src/config.py:1070
+#: ../src/config.py:1075
 msgid "Contact Disconnected"
 msgstr "Изключване на контакт"
 
-#: ../src/config.py:1071
+#: ../src/config.py:1076
 msgid "Message Sent"
 msgstr "Изпратено съобщение"
 
-#: ../src/config.py:1072
+#: ../src/config.py:1077
 msgid "Group Chat Message Highlight"
 msgstr "Осветено съобщение в стая"
 
-#: ../src/config.py:1073
+#: ../src/config.py:1078
 msgid "Group Chat Message Received"
 msgstr "Получено съобщение в стая"
 
-#: ../src/config.py:1080
+#: ../src/config.py:1085
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Получена покана"
 
-#: ../src/config.py:1283
+#: ../src/config.py:1288
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP не може да бъде използван на този компютър"
 
-#: ../src/config.py:1329
+#: ../src/config.py:1334
 msgid "You are currently connected to the server"
 msgstr "В момента сте свързани със сървъра"
 
-#: ../src/config.py:1330
+#: ../src/config.py:1335
 msgid "To change the account name, you must be disconnected."
 msgstr "Трябва да сте изключени, за да смените името на акаунта."
 
-#: ../src/config.py:1333 ../src/config.py:1925
+#: ../src/config.py:1338 ../src/config.py:1930
 msgid "Unread events"
 msgstr "Непрочетени събития"
 
-#: ../src/config.py:1334
+#: ../src/config.py:1339
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "За да смените името на акаунта, трябва да прочетете всички чакащи събития."
 
-#: ../src/config.py:1338
+#: ../src/config.py:1343
 msgid "Account Name Already Used"
 msgstr "Името на акаунта вече се използва"
 
-#: ../src/config.py:1339
+#: ../src/config.py:1344
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Това име вече се използва от друг акаунт. Изберете друго име."
 
-#: ../src/config.py:1343 ../src/config.py:1347
+#: ../src/config.py:1348 ../src/config.py:1352
 msgid "Invalid account name"
 msgstr "Невалидно име на акаунт"
 
-#: ../src/config.py:1344
+#: ../src/config.py:1349
 msgid "Account name cannot be empty."
 msgstr "Трябва да посочите някакво име на акаунта."
 
-#: ../src/config.py:1348
+#: ../src/config.py:1353
 msgid "Account name cannot contain spaces."
 msgstr "Името на акаунта не може да съдържа интервали."
 
-#: ../src/config.py:1356 ../src/config.py:1362 ../src/config.py:1372
-#: ../src/config.py:3030
+#: ../src/config.py:1361 ../src/config.py:1367 ../src/config.py:1377
+#: ../src/config.py:3035
 msgid "Invalid Jabber ID"
 msgstr "Невалиден Jabber ID"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1368
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID трябва да бъде под формата на „user@server“"
 
-#: ../src/config.py:1422
+#: ../src/config.py:1427
 msgid "Invalid entry"
 msgstr "Невалиден формат"
 
-#: ../src/config.py:1423
+#: ../src/config.py:1428
 msgid "Custom port must be a port number."
 msgstr "Портът по избор трябва все пак да е номер на порт"
 
-#: ../src/config.py:1549 ../src/common/config.py:363
+#: ../src/config.py:1554 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Сега се връщам."
 
-#: ../src/config.py:1559
+#: ../src/config.py:1564
 msgid "Relogin now?"
 msgstr "Свързване наново сега?"
 
-#: ../src/config.py:1560
+#: ../src/config.py:1565
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ако искате всички промени да влязат в сила веднага, трябва да се свържете "
 "наново."
 
-#: ../src/config.py:1586
+#: ../src/config.py:1591
 msgid "No such account available"
 msgstr "Няма такъв наличен акаунт"
 
-#: ../src/config.py:1587
+#: ../src/config.py:1592
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Трябва първо да създадете акаунт и след това да редактирате личните данни."
 
-#: ../src/config.py:1594 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/config.py:1599 ../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:1595
+#: ../src/config.py:1600
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Трябва да сте свързани, за да редактирате личните данни."
 
-#: ../src/config.py:1599
+#: ../src/config.py:1604
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1600
+#: ../src/config.py:1605
 #, fuzzy
 msgid "Your server can't save your personal information."
 msgstr ""
 "Трябва първо да създадете акаунт и след това да редактирате личните данни."
 
-#: ../src/config.py:1624 ../src/config.py:3417
+#: ../src/config.py:1629 ../src/config.py:3422
 msgid "Failed to get secret keys"
 msgstr "Неуспех при извличането на частните ключове"
 
-#: ../src/config.py:1625 ../src/config.py:3418
+#: ../src/config.py:1630 ../src/config.py:3423
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Възникна проблем при извличането на частните ви OpenPGP ключове."
 
-#: ../src/config.py:1628 ../src/config.py:3421
+#: ../src/config.py:1633 ../src/config.py:3426
 msgid "OpenPGP Key Selection"
 msgstr "Избор на OpenPGP ключ"
 
-#: ../src/config.py:1629 ../src/config.py:3422
+#: ../src/config.py:1634 ../src/config.py:3427
 msgid "Choose your OpenPGP key"
 msgstr "Изберете вашия OpenPGP ключ"
 
 #. Name column
-#: ../src/config.py:1859 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/config.py:1864 ../src/disco.py:740 ../src/disco.py:1466
 #: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Име"
 
-#: ../src/config.py:1862
+#: ../src/config.py:1867
 msgid "Server"
 msgstr "Сървър"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1931
 msgid "Read all pending events before removing this account."
 msgstr "Преди да премахнете този акаунт, прочетете всички чакащи събития."
 
-#: ../src/config.py:1963
+#: ../src/config.py:1968
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Нямате активен акаунт"
 
-#: ../src/config.py:1964
+#: ../src/config.py:1969
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:2023
+#: ../src/config.py:2028
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Името на акаунта вече се използва"
 
-#: ../src/config.py:2024
+#: ../src/config.py:2029
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2256
+#: ../src/config.py:2261
 #, python-format
 msgid "Edit %s"
 msgstr "Редактиране на %s"
 
-#: ../src/config.py:2258
+#: ../src/config.py:2263
 #, python-format
 msgid "Register to %s"
 msgstr "Регистриране в %s"
 
 #. list at the begining
-#: ../src/config.py:2330
+#: ../src/config.py:2335
 msgid "Ban List"
 msgstr "Списък с изритани"
 
-#: ../src/config.py:2331
+#: ../src/config.py:2336
 msgid "Member List"
 msgstr "Списък с членове"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2337
 msgid "Owner List"
 msgstr "Списък със собственици"
 
-#: ../src/config.py:2333
+#: ../src/config.py:2338
 msgid "Administrator List"
 msgstr "Списък с администратори"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2366 ../src/disco.py:747 ../src/history_manager.py:154
+#: ../src/config.py:2371 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2374
+#: ../src/config.py:2379
 msgid "Reason"
 msgstr "Причина"
 
-#: ../src/config.py:2379
+#: ../src/config.py:2384
 msgid "Nick"
 msgstr "Псевдоним"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2388
 msgid "Role"
 msgstr "Роля"
 
-#: ../src/config.py:2404
+#: ../src/config.py:2409
 msgid "Banning..."
 msgstr "Изритване..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2406
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2806,11 +2899,11 @@ msgstr ""
 "<b>Кого искате да изритате?</b>\n"
 "\n"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2413
 msgid "Adding Member..."
 msgstr "Добавяне на член..."
 
-#: ../src/config.py:2409
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2818,11 +2911,11 @@ msgstr ""
 "<b>Кого искате да направите член?</b>\n"
 "\n"
 
-#: ../src/config.py:2411
+#: ../src/config.py:2416
 msgid "Adding Owner..."
 msgstr "Добавяне на собственик..."
 
-#: ../src/config.py:2412
+#: ../src/config.py:2417
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2830,11 +2923,11 @@ msgstr ""
 "<b>Кого искате да направите собственик?</b>\n"
 "\n"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2419
 msgid "Adding Administrator..."
 msgstr "Добавяне на администратор..."
 
-#: ../src/config.py:2415
+#: ../src/config.py:2420
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2842,7 +2935,7 @@ msgstr ""
 "<b>Кого искате да направите администратор?</b>\n"
 "\n"
 
-#: ../src/config.py:2416
+#: ../src/config.py:2421
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2858,98 +2951,98 @@ msgstr ""
 "4. домейн (домейна съвпада, както и всеки потребител@домейн,\n"
 "домейн/ресурс или адрес, съдържащ поддомейн."
 
-#: ../src/config.py:2521
+#: ../src/config.py:2526
 #, python-format
 msgid "Removing %s account"
 msgstr "Премахване на акаунт %s"
 
-#: ../src/config.py:2538 ../src/roster_window.py:2667
+#: ../src/config.py:2543 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Необходима е парола"
 
-#: ../src/config.py:2539 ../src/roster_window.py:2668
+#: ../src/config.py:2544 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Въведете парола за акаунт „%s“"
 
-#: ../src/config.py:2540 ../src/roster_window.py:2669
+#: ../src/config.py:2545 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Запазване на паролата"
 
-#: ../src/config.py:2554
+#: ../src/config.py:2559
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Акаунт „%s“ е свързан към сървъра"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2560
 msgid "If you remove it, the connection will be lost."
 msgstr "Ако го премахнете, връзката ще се разпадне."
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 #, fuzzy
 msgid "Default"
 msgstr "Изтриване"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Изписване на времето:"
 
-#: ../src/config.py:2640
+#: ../src/config.py:2645
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2710
+#: ../src/config.py:2715
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Стая"
 
-#: ../src/config.py:2742
+#: ../src/config.py:2747
 msgid "This bookmark has invalid data"
 msgstr "Тази отметка съдържа невалидни данни"
 
-#: ../src/config.py:2743
+#: ../src/config.py:2748
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Попълнете полетата за сървър и стая или изтрийте тази отметка."
 
-#: ../src/config.py:3005
+#: ../src/config.py:3010
 msgid "Invalid username"
 msgstr "Невалидно потребителско име"
 
-#: ../src/config.py:3006
+#: ../src/config.py:3011
 msgid "You must provide a username to configure this account."
 msgstr "Трябва да въведете име на потребител за новия акаунт."
 
-#: ../src/config.py:3016 ../src/dialogs.py:1316
+#: ../src/config.py:3021 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Невалидна парола"
 
-#: ../src/config.py:3017
+#: ../src/config.py:3022
 msgid "You must enter a password for the new account."
 msgstr "Трябва да въведете парола за новия акаунт."
 
-#: ../src/config.py:3021 ../src/dialogs.py:1321
+#: ../src/config.py:3026 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Паролите не съвпадат"
 
-#: ../src/config.py:3022 ../src/dialogs.py:1322
+#: ../src/config.py:3027 ../src/dialogs.py:1322
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролите, написани в двете полета, трябва да са едни и същи."
 
-#: ../src/config.py:3041
+#: ../src/config.py:3046
 msgid "Duplicate Jabber ID"
 msgstr "Дублиран Jabber ID"
 
-#: ../src/config.py:3042
+#: ../src/config.py:3047
 msgid "This account is already configured in Gajim."
 msgstr "Този акаунт вече е конфигуриран в Gajim."
 
-#: ../src/config.py:3059
+#: ../src/config.py:3064
 msgid "Account has been added successfully"
 msgstr "Акаунтът беше добавен успешно"
 
-#: ../src/config.py:3060 ../src/config.py:3095
+#: ../src/config.py:3065 ../src/config.py:3100
 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."
@@ -2957,23 +3050,23 @@ msgstr ""
 "Може да настроите допълнителните опции, като натиснете бутона „Напреднали“ "
 "или по-късно от менюто „Редактиране“->„Акаунти“ в основния прозорец."
 
-#: ../src/config.py:3094
+#: ../src/config.py:3099
 msgid "Your new account has been created successfully"
 msgstr "Новият акаунт беше създаден успешно"
 
-#: ../src/config.py:3112
+#: ../src/config.py:3117
 msgid "An error occured during account creation"
 msgstr "Възникна грешка при създаването на акаунта"
 
-#: ../src/config.py:3170
+#: ../src/config.py:3175
 msgid "Account name is in use"
 msgstr "Името на акаунта се използва"
 
-#: ../src/config.py:3171
+#: ../src/config.py:3176
 msgid "You already have an account using this name."
 msgstr "Вече има регистриран акаунт с това име."
 
-#: ../src/conversation_textview.py:271
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2981,56 +3074,65 @@ msgstr ""
 "Текстът под този ред е последното, което е казано откакто за последен път "
 "сте обърнали внимание на тази стая"
 
-#: ../src/conversation_textview.py:340
+#: ../src/conversation_textview.py:342
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Действия за „%s“"
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Четене на статия от _Уикипедия"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Проверка в _речника"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:373
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Липсва „%s“ в URL на речника и не е WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:386
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Липсва „%s“ в URL за търсене"
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "_Търсене в уеб"
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:397
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:755
+#: ../src/conversation_textview.py:757
 msgid "Yesterday"
 msgstr "Вчера"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:761
 #, python-format
 msgid "%i days ago"
 msgstr "Преди %i дни"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:791
+#: ../src/conversation_textview.py:793
 #, python-format
 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
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
@@ -3305,29 +3407,29 @@ msgstr "Ново еднократно съобщение"
 msgid "New Private Message"
 msgstr "Ново лично съобщение"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1161 ../src/notify.py:424
+#: ../src/dialogs.py:1369 ../src/gajim.py:1168 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Нова е-поща"
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1314 ../src/notify.py:418
+#: ../src/dialogs.py:1371 ../src/gajim.py:1321 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Запитване за файлов трансфер"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1134 ../src/gajim.py:1290
+#: ../src/dialogs.py:1373 ../src/gajim.py:1140 ../src/gajim.py:1297
 #: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Грешка при файловия трансфер"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1353 ../src/gajim.py:1375
-#: ../src/gajim.py:1392 ../src/notify.py:422
+#: ../src/dialogs.py:1375 ../src/gajim.py:1360 ../src/gajim.py:1382
+#: ../src/gajim.py:1399 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Файловият трансфер е приключен"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1356 ../src/notify.py:422
+#: ../src/dialogs.py:1376 ../src/gajim.py:1363 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Файловият трансфер е преустановен"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1032 ../src/notify.py:426
+#: ../src/dialogs.py:1378 ../src/gajim.py:1038 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Покана за раговор в стая"
 
@@ -3687,31 +3789,31 @@ msgstr "Описание: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s иска да ви изпрати файл:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:682
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
 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:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "This file already exists"
 msgstr "Този файл вече съществува"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "What do you want to do?"
 msgstr "Какво искате да направите?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3845,57 +3947,58 @@ msgstr "Свързване"
 msgid "Subject: %s"
 msgstr "Тема: %s\n"
 
-#: ../src/gajim.py:703
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:703 ../src/gajim.py:716
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "грешка при изпращане на %s ( %s )"
 
-#: ../src/gajim.py:743
+#: ../src/gajim.py:749
 msgid "Authorization accepted"
 msgstr "Упълномощаването е прието"
 
-#: ../src/gajim.py:744
+#: ../src/gajim.py:750
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контактът „%s“ ви упълномощи да виждате състоянието му."
 
-#: ../src/gajim.py:752
+#: ../src/gajim.py:758
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контактът „%s“ премахна записването за вас"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:759
 msgid "You will always see him or her as offline."
 msgstr "Винаги ще го виждате като изключен."
 
-#: ../src/gajim.py:796
+#: ../src/gajim.py:802
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Не може да бъде установен контакт с „%s“"
 
-#: ../src/gajim.py:797 ../src/common/connection.py:395
+#: ../src/gajim.py:803 ../src/common/connection.py:395
 msgid "Check your connection or try again later."
 msgstr "Проверете връзката или опитайте отново по-късно."
 
-#: ../src/gajim.py:945 ../src/roster_window.py:1201
+#: ../src/gajim.py:951 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s вече е %s (%s)"
 
-#: ../src/gajim.py:1042
+#: ../src/gajim.py:1048
 msgid "Your passphrase is incorrect"
 msgstr "Паролата е грешна"
 
-#: ../src/gajim.py:1043
+#: ../src/gajim.py:1049
 msgid "You are currently connected without your OpenPGP key."
 msgstr "В момента сте свързани без OpenPGP ключ."
 
-#: ../src/gajim.py:1145
+#: ../src/gajim.py:1151
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ново писмо за %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1147
+#: ../src/gajim.py:1153
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3905,61 +4008,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:1156
+#: ../src/gajim.py:1162
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1311
+#: ../src/gajim.py:1318
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s иска да ви изпрати файл."
 
-#: ../src/gajim.py:1376
+#: ../src/gajim.py:1383
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Успешно получихте %(filename)s от %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1387
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
 
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1400
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Успешно изпратихте %(filename)s на %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1397
+#: ../src/gajim.py:1404
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Файловият трансфер на %(filename)s до %(name)s прекъсна."
 
-#: ../src/gajim.py:1503
+#: ../src/gajim.py:1510
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1504
+#: ../src/gajim.py:1511
 #, 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:1842
+#: ../src/gajim.py:1850
 msgid "Could not save your settings and preferences"
 msgstr "Неуспех при запазването на настройките"
 
-#: ../src/gajim.py:2034
+#: ../src/gajim.py:2042
 #, fuzzy
 msgid "Network Manager support not available"
 msgstr "В момента няма връзка"
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2117
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Липсва поддръжка за управление на сесиите (модул gnome.ui)"
 
@@ -4304,120 +4407,120 @@ msgstr "Не може да изтриете текущата тема"
 msgid "Please first choose another for your current theme."
 msgstr "Първо изберете друга като текуща тема."
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chat"
 msgstr "Личен разговор"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chats"
 msgstr "Лични разговори"
 
-#: ../src/groupchat_control.py:120
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Неуспех при изпращането на лично съобщение"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:124
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Вече не сте в стая „%s“ или „%s“ е напуснал(а)."
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chat"
 msgstr "Стая"
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chats"
 msgstr "Стаи"
 
-#: ../src/groupchat_control.py:315
+#: ../src/groupchat_control.py:317
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Смяна на псе_вдоним"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:810
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s беше изритан: %(reason)s"
 
-#: ../src/groupchat_control.py:814
+#: ../src/groupchat_control.py:816
 #, 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:821
+#: ../src/groupchat_control.py:823
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s беше отлъчен: %(reason)s"
 
-#: ../src/groupchat_control.py:825
+#: ../src/groupchat_control.py:827
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s беше отлъчен от %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:833
+#: ../src/groupchat_control.py:835
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вече сте познати като %s"
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:837
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s вече е познат като %s"
 
-#: ../src/groupchat_control.py:915
+#: ../src/groupchat_control.py:917
 #, python-format
 msgid "%s has left"
 msgstr "%s напусна"
 
-#: ../src/groupchat_control.py:920
+#: ../src/groupchat_control.py:922
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "В групата"
 
 #. No status message
-#: ../src/groupchat_control.py:922 ../src/roster_window.py:1204
+#: ../src/groupchat_control.py:924 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s сега е %s"
 
-#: ../src/groupchat_control.py:1041 ../src/groupchat_control.py:1059
-#: ../src/groupchat_control.py:1152 ../src/groupchat_control.py:1169
+#: ../src/groupchat_control.py:1043 ../src/groupchat_control.py:1061
+#: ../src/groupchat_control.py:1154 ../src/groupchat_control.py:1171
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Псевдонимът не е намерен: %s"
 
-#: ../src/groupchat_control.py:1075
+#: ../src/groupchat_control.py:1077
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "Няма тема за тази стая"
 
-#: ../src/groupchat_control.py:1088
+#: ../src/groupchat_control.py:1090
 #, 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:1095 ../src/groupchat_control.py:1123
+#: ../src/groupchat_control.py:1097 ../src/groupchat_control.py:1125
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "„%s“ изглежда не е валиден JID"
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1208
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Няма такава команда: /%s (ако искате да изпратите това, сложете представка /"
 "say)"
 
-#: ../src/groupchat_control.py:1229
+#: ../src/groupchat_control.py:1231
 #, python-format
 msgid "Commands: %s"
 msgstr "Команди: %s"
 
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1233
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4429,7 +4532,7 @@ msgstr ""
 "Псевдонимът може да се замества, но не и ако съдържа „@“. Ако контактът е в "
 "стаята, той също ще бъде изритан. Не се поддържат интервали в псевдонима."
 
-#: ../src/groupchat_control.py:1238
+#: ../src/groupchat_control.py:1240
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4437,12 +4540,12 @@ msgstr ""
 "Употреба: /%s <псевдоним>, отваря прозорец за лично съобщение със съответния "
 "контакт."
 
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1244
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Употреба: /%s, изчиства текстовия прозорец."
 
-#: ../src/groupchat_control.py:1244
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4451,12 +4554,12 @@ msgstr ""
 "Употреба: /%s [причина], затваря текущия прозорец или подпрозорец и показва "
 "причина, ако е указана."
 
-#: ../src/groupchat_control.py:1247
+#: ../src/groupchat_control.py:1249
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Употреба: /%s, скрива бутоните за раговор."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1252
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4465,7 +4568,7 @@ msgstr ""
 "Употреба: /%s <JID> [причина], кани JID в текущата стая, причината е по "
 "избор."
 
-#: ../src/groupchat_control.py:1254
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4474,7 +4577,7 @@ msgstr ""
 "Употреба: /%s <стая>@<сървър>[/псевдоним], предлага влизане в стая@сървър, "
 "използването на указания псевдоним е по избор."
 
-#: ../src/groupchat_control.py:1258
+#: ../src/groupchat_control.py:1260
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4485,7 +4588,7 @@ msgstr ""
 "от стаята и евентуално показва причина. Не се поддържат интервали в "
 "псевдонима."
 
-#: ../src/groupchat_control.py:1263
+#: ../src/groupchat_control.py:1265
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current group chat. Use third "
@@ -4494,7 +4597,7 @@ msgstr ""
 "Употреба: /%s <действие>, изпраща действие до текущата стая. Използва се "
 "трето лице (т.е. „/%s експлодира“)."
 
-#: ../src/groupchat_control.py:1267
+#: ../src/groupchat_control.py:1269
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4503,22 +4606,22 @@ msgstr ""
 "Употреба: /%s <псевдоним> [съобщение], отваря прозорец за лично съобщение и "
 "изпраща съобщение до участника, указан с псевдонима."
 
-#: ../src/groupchat_control.py:1272
+#: ../src/groupchat_control.py:1274
 #, fuzzy, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Употреба: /%s <псевдоним>, сменя псевдонима ви в текущата стая."
 
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1278
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Употреба: /%s [тема], показва или актуализира темата на текущата стая."
 
-#: ../src/groupchat_control.py:1280
+#: ../src/groupchat_control.py:1282
 #, fuzzy, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Употреба: /%s [тема], показва или актуализира темата на текущата стая."
 
-#: ../src/groupchat_control.py:1283
+#: ../src/groupchat_control.py:1285
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -4526,71 +4629,71 @@ msgstr ""
 "Употреба: /%s <съобщение>, изпраща съобщение без да се имат предвид други "
 "команди."
 
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1288
 #, python-format
 msgid "No help info for /%s"
 msgstr "Няма помощна информация за /%s"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1337
 #, fuzzy, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Сигурни ли сте, че искате да напуснете стаята „%s“?"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1339
 #, fuzzy
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Ако затворите този прозорец, връзката със стаята ще бъде прекъсната."
 
-#: ../src/groupchat_control.py:1341 ../src/roster_window.py:3961
+#: ../src/groupchat_control.py:1343 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "Да _не се задава този въпрос отново"
 
-#: ../src/groupchat_control.py:1375
+#: ../src/groupchat_control.py:1377
 msgid "Changing Subject"
 msgstr "Промяна на темата"
 
-#: ../src/groupchat_control.py:1376
+#: ../src/groupchat_control.py:1378
 msgid "Please specify the new subject:"
 msgstr "Въведете новата тема:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1387
 msgid "Changing Nickname"
 msgstr "Промяна на псевдонима"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1388
 msgid "Please specify the new nickname you want to use:"
 msgstr "Въведете новия псевдоним, който искате да използвате:"
 
-#: ../src/groupchat_control.py:1411
+#: ../src/groupchat_control.py:1413
 msgid "Bookmark already set"
 msgstr "Отметката вече е установена"
 
-#: ../src/groupchat_control.py:1412
+#: ../src/groupchat_control.py:1414
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Стаята „%s“ вече присъства в отметките."
 
-#: ../src/groupchat_control.py:1421
+#: ../src/groupchat_control.py:1423
 msgid "Bookmark has been added successfully"
 msgstr "Отметката беше добавена успешно"
 
-#: ../src/groupchat_control.py:1422
+#: ../src/groupchat_control.py:1424
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Може да организирате отметките чрез менюто „Действия“."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1548
+#: ../src/groupchat_control.py:1550
 #, python-format
 msgid "Kicking %s"
 msgstr "Изритване на %s"
 
-#: ../src/groupchat_control.py:1549 ../src/groupchat_control.py:1831
+#: ../src/groupchat_control.py:1551 ../src/groupchat_control.py:1833
 msgid "You may specify a reason below:"
 msgstr "Може да уточните причина по-долу:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1830
+#: ../src/groupchat_control.py:1832
 #, python-format
 msgid "Banning %s"
 msgstr "Изритване на %s"
@@ -4636,16 +4739,16 @@ msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Неуспех при запис на %s. Поддръжката за управление на сесиите няма да работи"
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:728
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:729
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:737
+#: ../src/gtkgui_helpers.py:738
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Запазване на файла като..."
@@ -4676,11 +4779,6 @@ 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 "
@@ -5925,7 +6023,7 @@ msgstr ""
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1515
+#: ../src/common/connection_handlers.py:1523
 #, fuzzy, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Псевдонимът не е намерен: %s"
@@ -5933,72 +6031,72 @@ msgstr "Псевдонимът не е намерен: %s"
 #. password required to join
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1577
-#: ../src/common/connection_handlers.py:1580
-#: ../src/common/connection_handlers.py:1583
-#: ../src/common/connection_handlers.py:1586
-#: ../src/common/connection_handlers.py:1589
-#: ../src/common/connection_handlers.py:1592
+#: ../src/common/connection_handlers.py:1585
+#: ../src/common/connection_handlers.py:1588
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1597
 #: ../src/common/connection_handlers.py:1600
+#: ../src/common/connection_handlers.py:1608
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Влизане в стая"
 
-#: ../src/common/connection_handlers.py:1578
+#: ../src/common/connection_handlers.py:1586
 msgid "A password is required to join this group chat."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1589
 #, fuzzy
 msgid "You are banned from this group chat."
 msgstr "Вече сте в стая „%s“"
 
-#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1592
 msgid "Such group chat does not exist."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1595
 msgid "Group chat creation is restricted."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1598
 msgid "Your registered nickname must be used."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1601
 #, fuzzy
 msgid "You are not in the members list."
 msgstr "Не сте свързани към сървъра."
 
-#: ../src/common/connection_handlers.py:1601
+#: ../src/common/connection_handlers.py:1609
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1651
+#: ../src/common/connection_handlers.py:1659
 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:1672
+#: ../src/common/connection_handlers.py:1680
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1674
+#: ../src/common/connection_handlers.py:1682
 #, fuzzy, python-format
 msgid "unsubscribe request from %s"
 msgstr "Искане за записване от %s"
 
-#: ../src/common/connection_handlers.py:1676
+#: ../src/common/connection_handlers.py:1684
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1846
+#: ../src/common/connection_handlers.py:1854
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -6026,7 +6124,7 @@ msgid "Invalid answer"
 msgstr "Невалиден отговор"
 
 #: ../src/common/connection.py:394 ../src/common/connection.py:429
-#: ../src/common/connection.py:872
+#: ../src/common/connection.py:877
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
@@ -6084,7 +6182,7 @@ msgstr "%s"
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Това съобщение е криптирано]"
 
-#: ../src/common/connection.py:759
+#: ../src/common/connection.py:764
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6094,7 +6192,7 @@ msgstr ""
 "Тема: %s\n"
 "%s"
 
-#: ../src/common/connection.py:898
+#: ../src/common/connection.py:903
 msgid "Not fetched because of invisible status"
 msgstr ""
 
@@ -6415,10 +6513,6 @@ msgstr "Няма"
 msgid "To"
 msgstr "За"
 
-#: ../src/common/helpers.py:259
-msgid "From"
-msgstr "От"
-
 #: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Двустранно"
@@ -6696,9 +6790,6 @@ msgstr "грешка при изпращане на %s ( %s )"
 #~ msgid "Migrating Logs..."
 #~ msgstr "Мигриране на записите на разговорите..."
 
-#~ msgid "Please wait while logs are being migrated..."
-#~ msgstr "Изчакайте, докато записите на разговорите се мигрират..."
-
 #~ msgid "_Join New Room"
 #~ msgstr "_Влизане в нова стая"
 
diff --git a/po/br.po b/po/br.po
index 9cda05ffb..26d444eae 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-12-02 17:15+0100\n"
+"POT-Creation-Date: 2006-12-09 10:02+0100\n"
 "PO-Revision-Date: 2006-06-05 19:14+0100\n"
 "Last-Translator: Giulia Fraboulet <djoulia_at_gmail.com>\n"
 "Language-Team: \n"
@@ -327,16 +327,16 @@ msgid "Manage..."
 msgstr "Kemmañ..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1637
-#: ../src/config.py:3430
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1642
+#: ../src/config.py:3435
 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:1219
-#: ../src/config.py:1224 ../src/config.py:1408 ../src/config.py:1627
-#: ../src/config.py:1636 ../src/config.py:1695 ../src/config.py:1769
-#: ../src/config.py:2640 ../src/config.py:3420 ../src/config.py:3429
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1224
+#: ../src/config.py:1229 ../src/config.py:1413 ../src/config.py:1632
+#: ../src/config.py:1641 ../src/config.py:1700 ../src/config.py:1774
+#: ../src/config.py:2645 ../src/config.py:3425 ../src/config.py:3434
 #: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Hini ebet"
@@ -521,6 +521,46 @@ msgstr "_Emezelañ"
 msgid "_User ID:"
 msgstr "ID arveriad-ez:"
 
+#: ../data/glade/adhoc_commands_window.glade.h:1
+#, fuzzy
+msgid "<b>An error has occured:</b>"
+msgstr "Une erreur de protocole s'est produite :"
+
+#: ../data/glade/adhoc_commands_window.glade.h:2
+msgid "<b>Choose command to execute:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:3
+msgid "Ad-hoc Commands - Gajim"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:4
+msgid "Check once more"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:5
+#, fuzzy
+msgid "Error description..."
+msgstr "Taolennadur"
+
+#: ../data/glade/adhoc_commands_window.glade.h:6
+#, fuzzy
+msgid "Please wait while retrieving command list..."
+msgstr "Gortozit marplij e keit ma vez dilec'hiet an istoradur..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:7
+#, fuzzy
+msgid "Please wait while the command is sending..."
+msgstr "Gortozit marplij e keit ma vez dilec'hiet an istoradur..."
+
+#: ../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>Taolennadur</b>"
@@ -670,13 +710,13 @@ msgstr "_Seniñ"
 #: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
-"Contact Connected\n"
-"Contact Disconnected\n"
-"Contact Change Status\n"
-"Group Chat Message Highlight\n"
-"Group Chat Message Received\n"
-"File Transfert Resquest\n"
-"File Transfert Started\n"
+"Contact Connected \n"
+"Contact Disconnected \n"
+"Contact Change Status \n"
+"Group Chat Message Highlight \n"
+"Group Chat Message Received \n"
+"File Transfert Resquest \n"
+"File Transfert Started \n"
 "File Transfert Finished"
 msgstr ""
 
@@ -749,6 +789,46 @@ msgstr "Porzh:"
 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 "Bro:"
+
+#: ../data/glade/atom_entry_window.glade.h:4
+#, fuzzy
+msgid "Feed name:"
+msgstr "anv ar gwiskadur"
+
+#: ../data/glade/atom_entry_window.glade.h:5
+#, fuzzy
+msgid "Last modified:"
+msgstr "Anv:"
+
+#: ../data/glade/atom_entry_window.glade.h:6
+#, fuzzy
+msgid "New entry received"
+msgstr "Pa resever un darvoud nevez"
+
+#: ../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 "Cheñch ar ger-kuzh"
@@ -835,7 +915,7 @@ msgstr ""
 msgid "_History"
 msgstr "_Istoradur"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/glade/data_form_window.glade.h:1 ../src/dataforms_widget.py:76
 #, fuzzy
 msgid "Fill in the form."
 msgstr "Er strollad"
@@ -1054,6 +1134,20 @@ msgstr "_Kas ur gemennadenn brevez"
 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:259
+msgid "From"
+msgstr "Digant"
+
+#. holds subject
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141
+#: ../src/history_manager.py:172
+msgid "Subject"
+msgstr "Titl"
+
 #: ../data/glade/history_manager.glade.h:1
 msgid ""
 "<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
@@ -1207,7 +1301,7 @@ 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:1116
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
 msgid "OpenPGP Encryption"
 msgstr "Encryption OpenPGP"
 
@@ -1330,7 +1424,7 @@ msgstr ""
 msgid "B_efore nickname:"
 msgstr "_A-raok al lesanv:"
 
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:841
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
 msgid "Chat"
 msgstr "Flap"
 
@@ -2458,35 +2552,35 @@ 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:841
+#: ../src/chat_control.py:844
 msgid "Chats"
 msgstr "Flapoù"
 
-#: ../src/chat_control.py:1042
+#: ../src/chat_control.py:1030
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s : %(message)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1130
+#: ../src/chat_control.py:1118
 #, 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:1266
+#: ../src/chat_control.py:1254
 msgid "Encryption enabled"
 msgstr "War enaou emañ ar sifrañ"
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1259
 msgid "Encryption disabled"
 msgstr "Lazhet eo ar sifrañ"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1413 ../src/conversation_textview.py:493
-#: ../src/dialogs.py:629 ../src/gajim.py:727 ../src/gajim.py:728
-#: ../src/gajim.py:1067 ../src/roster_window.py:328
+#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495
+#: ../src/dialogs.py:629 ../src/gajim.py:733 ../src/gajim.py:734
+#: ../src/gajim.py:1073 ../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
@@ -2497,12 +2591,12 @@ msgid "Not in Roster"
 msgstr "Ket er roll"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1545
 #, 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:1558
+#: ../src/chat_control.py:1546
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2510,102 +2604,102 @@ msgstr ""
 "Ma serrit ar prenestr-mañ ha n'eo ket enaouet an istoradur, e vo kollet ar "
 "gemennadenn."
 
-#: ../src/config.py:130 ../src/config.py:589
+#: ../src/config.py:135 ../src/config.py:594
 msgid "Disabled"
 msgstr "Dizoberiant"
 
-#: ../src/config.py:216
+#: ../src/config.py:221
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Bep %s _munutenn"
 
-#: ../src/config.py:358
+#: ../src/config.py:363
 msgid "Active"
 msgstr "Oberiant"
 
-#: ../src/config.py:366
+#: ../src/config.py:371
 msgid "Event"
 msgstr "Darvoud"
 
-#: ../src/config.py:679 ../src/gajim.py:2086
+#: ../src/config.py:684 ../src/gajim.py:2094
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "N'eus ket tu da gevreañ"
 
-#: ../src/config.py:680 ../src/gajim.py:2087
+#: ../src/config.py:685 ../src/gajim.py:2095
 #, 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:1032
+#: ../src/config.py:1037
 msgid "status message title"
 msgstr "titl ar gemennadenn stad"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1037
 msgid "status message text"
 msgstr "korf ar gemennadenn stad"
 
-#: ../src/config.py:1067
+#: ../src/config.py:1072
 msgid "First Message Received"
 msgstr "Kemennadenn gentañ"
 
-#: ../src/config.py:1068
+#: ../src/config.py:1073
 msgid "Next Message Received"
 msgstr "Kemennadenn da-heul"
 
-#: ../src/config.py:1069
+#: ../src/config.py:1074
 msgid "Contact Connected"
 msgstr "Darempred luget"
 
-#: ../src/config.py:1070
+#: ../src/config.py:1075
 msgid "Contact Disconnected"
 msgstr "Darempred diluget"
 
-#: ../src/config.py:1071
+#: ../src/config.py:1076
 msgid "Message Sent"
 msgstr "Kemennadenn gaset"
 
-#: ../src/config.py:1072
+#: ../src/config.py:1077
 msgid "Group Chat Message Highlight"
 msgstr "Message d'un Salon mis en Sur-brillance"
 
-#: ../src/config.py:1073
+#: ../src/config.py:1078
 msgid "Group Chat Message Received"
 msgstr "Kemennadenn digant ur sal-flapiñ"
 
-#: ../src/config.py:1080
+#: ../src/config.py:1085
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Resevet ar bedadenn"
 
-#: ../src/config.py:1283
+#: ../src/config.py:1288
 msgid "OpenPGP is not usable in this computer"
 msgstr "N'eus ket tu da implij OpenPGP war an urzhiataer-mañ"
 
-#: ../src/config.py:1329
+#: ../src/config.py:1334
 msgid "You are currently connected to the server"
 msgstr "Luget oc'h d'ar servijer"
 
-#: ../src/config.py:1330
+#: ../src/config.py:1335
 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:1333 ../src/config.py:1925
+#: ../src/config.py:1338 ../src/config.py:1930
 msgid "Unread events"
 msgstr "Darvoudoù chomet dilenn"
 
-#: ../src/config.py:1334
+#: ../src/config.py:1339
 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:1338
+#: ../src/config.py:1343
 msgid "Account Name Already Used"
 msgstr "Anv-kont implijet dija"
 
-#: ../src/config.py:1339
+#: ../src/config.py:1344
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2613,173 +2707,173 @@ msgstr ""
 "Implijet e vez an anv-mañ gant unan eus ho kontoù dija. Dibabit un anv all "
 "marplij."
 
-#: ../src/config.py:1343 ../src/config.py:1347
+#: ../src/config.py:1348 ../src/config.py:1352
 msgid "Invalid account name"
 msgstr "Anv-kont direizh"
 
-#: ../src/config.py:1344
+#: ../src/config.py:1349
 msgid "Account name cannot be empty."
 msgstr "N'hell ket anv ar gont chom goullo."
 
-#: ../src/config.py:1348
+#: ../src/config.py:1353
 msgid "Account name cannot contain spaces."
 msgstr "N'hell ket anv ar gont kaout esaouennoù."
 
-#: ../src/config.py:1356 ../src/config.py:1362 ../src/config.py:1372
-#: ../src/config.py:3030
+#: ../src/config.py:1361 ../src/config.py:1367 ../src/config.py:1377
+#: ../src/config.py:3035
 msgid "Invalid Jabber ID"
 msgstr "ID jabber direizh"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1368
 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:1422
+#: ../src/config.py:1427
 msgid "Invalid entry"
 msgstr "Road direizh"
 
-#: ../src/config.py:1423
+#: ../src/config.py:1428
 msgid "Custom port must be a port number."
 msgstr "Ar porzh personelaet a rank bezañ un niverenn borzh"
 
-#: ../src/config.py:1549 ../src/common/config.py:363
+#: ../src/config.py:1554 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Distro a-benn nebeut."
 
-#: ../src/config.py:1559
+#: ../src/config.py:1564
 msgid "Relogin now?"
 msgstr "Adlugañ bremañ?"
 
-#: ../src/config.py:1560
+#: ../src/config.py:1565
 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:1586
+#: ../src/config.py:1591
 msgid "No such account available"
 msgstr "Kont dihegerz"
 
-#: ../src/config.py:1587
+#: ../src/config.py:1592
 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:1594 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/config.py:1599 ../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:1595
+#: ../src/config.py:1600
 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:1599
+#: ../src/config.py:1604
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1600
+#: ../src/config.py:1605
 #, 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:1624 ../src/config.py:3417
+#: ../src/config.py:1629 ../src/config.py:3422
 msgid "Failed to get secret keys"
 msgstr "Fazi en ur dapout an alc'hwezhioù kuzh"
 
-#: ../src/config.py:1625 ../src/config.py:3418
+#: ../src/config.py:1630 ../src/config.py:3423
 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:1628 ../src/config.py:3421
+#: ../src/config.py:1633 ../src/config.py:3426
 msgid "OpenPGP Key Selection"
 msgstr "Dibab un alc'hwezh OpenPGP"
 
-#: ../src/config.py:1629 ../src/config.py:3422
+#: ../src/config.py:1634 ../src/config.py:3427
 msgid "Choose your OpenPGP key"
 msgstr "Dibabit hoc'h alc'hwezh OpenPGP"
 
 #. Name column
-#: ../src/config.py:1859 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/config.py:1864 ../src/disco.py:740 ../src/disco.py:1466
 #: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Anv"
 
-#: ../src/config.py:1862
+#: ../src/config.py:1867
 msgid "Server"
 msgstr "Servijer"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1931
 msgid "Read all pending events before removing this account."
 msgstr "Lennit an holl zarvoudoù a-raok lemel ar gont-mañ."
 
-#: ../src/config.py:1963
+#: ../src/config.py:1968
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "N'ho peus kont bev ebet"
 
-#: ../src/config.py:1964
+#: ../src/config.py:1969
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:2023
+#: ../src/config.py:2028
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Anv-kont implijet dija"
 
-#: ../src/config.py:2024
+#: ../src/config.py:2029
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2256
+#: ../src/config.py:2261
 #, python-format
 msgid "Edit %s"
 msgstr "Kemmañ %s"
 
-#: ../src/config.py:2258
+#: ../src/config.py:2263
 #, python-format
 msgid "Register to %s"
 msgstr "Emezelañ war %s"
 
 #. list at the begining
-#: ../src/config.py:2330
+#: ../src/config.py:2335
 msgid "Ban List"
 msgstr "Roll argas"
 
-#: ../src/config.py:2331
+#: ../src/config.py:2336
 msgid "Member List"
 msgstr "Roll an izili"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2337
 msgid "Owner List"
 msgstr "Roll ar perc'hennerien"
 
-#: ../src/config.py:2333
+#: ../src/config.py:2338
 msgid "Administrator List"
 msgstr "Roll ar verourien"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2366 ../src/disco.py:747 ../src/history_manager.py:154
+#: ../src/config.py:2371 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2374
+#: ../src/config.py:2379
 msgid "Reason"
 msgstr "Abeg"
 
-#: ../src/config.py:2379
+#: ../src/config.py:2384
 msgid "Nick"
 msgstr "Lesanv"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2388
 msgid "Role"
 msgstr "Perzh"
 
-#: ../src/config.py:2404
+#: ../src/config.py:2409
 msgid "Banning..."
 msgstr "Oc'h argas..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2406
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2787,11 +2881,11 @@ msgstr ""
 "<b>Piv a fell deoc'h argas ?</b>\n"
 "\n"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2413
 msgid "Adding Member..."
 msgstr "Oc'h ouzhpennañ un ezel..."
 
-#: ../src/config.py:2409
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2799,11 +2893,11 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da ezel ?</b>\n"
 "\n"
 
-#: ../src/config.py:2411
+#: ../src/config.py:2416
 msgid "Adding Owner..."
 msgstr "Oc'h ouzhpennañ ur perc'henn..."
 
-#: ../src/config.py:2412
+#: ../src/config.py:2417
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2811,11 +2905,11 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da berc'henn ?</b>\n"
 "\n"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2419
 msgid "Adding Administrator..."
 msgstr "Oc'h ouzhpennañ ur v-merour-ez..."
 
-#: ../src/config.py:2415
+#: ../src/config.py:2420
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2823,7 +2917,7 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da verour-ez ?</b>\n"
 "\n"
 
-#: ../src/config.py:2416
+#: ../src/config.py:2421
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2840,100 +2934,100 @@ msgstr ""
 "pseudo@domaine,\n"
 "domaine/ressource, ou les adresses comprenant un sous-domaine)."
 
-#: ../src/config.py:2521
+#: ../src/config.py:2526
 #, python-format
 msgid "Removing %s account"
 msgstr "Lemel ar gont %s"
 
-#: ../src/config.py:2538 ../src/roster_window.py:2667
+#: ../src/config.py:2543 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Ger-kuzh ret"
 
-#: ../src/config.py:2539 ../src/roster_window.py:2668
+#: ../src/config.py:2544 ../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:2540 ../src/roster_window.py:2669
+#: ../src/config.py:2545 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Enrollañ ar ger-kuzh"
 
-#: ../src/config.py:2554
+#: ../src/config.py:2559
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Luget eo ar gont \"%s\" d'ar servijer"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2560
 msgid "If you remove it, the connection will be lost."
 msgstr "Ma tilamit anezhañ, e voc'h diluget."
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 #, fuzzy
 msgid "Default"
 msgstr "Dilemel"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Diskouez an eur:"
 
-#: ../src/config.py:2640
+#: ../src/config.py:2645
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2710
+#: ../src/config.py:2715
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Flap a-stroll"
 
-#: ../src/config.py:2742
+#: ../src/config.py:2747
 msgid "This bookmark has invalid data"
 msgstr "Bez ez eus titouroù direizh er sined-mañ"
 
-#: ../src/config.py:2743
+#: ../src/config.py:2748
 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:3005
+#: ../src/config.py:3010
 msgid "Invalid username"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/config.py:3006
+#: ../src/config.py:3011
 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:3016 ../src/dialogs.py:1316
+#: ../src/config.py:3021 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Ger-kuzh direizh"
 
-#: ../src/config.py:3017
+#: ../src/config.py:3022
 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:3021 ../src/dialogs.py:1321
+#: ../src/config.py:3026 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Ne glot ket ar gerioù-kuzh"
 
-#: ../src/config.py:3022 ../src/dialogs.py:1322
+#: ../src/config.py:3027 ../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:3041
+#: ../src/config.py:3046
 msgid "Duplicate Jabber ID"
 msgstr "Eilañ an ID Jabber"
 
-#: ../src/config.py:3042
+#: ../src/config.py:3047
 msgid "This account is already configured in Gajim."
 msgstr "Kefluniet eo bet ar gont-mañ e-barzh Gajim dija."
 
-#: ../src/config.py:3059
+#: ../src/config.py:3064
 msgid "Account has been added successfully"
 msgstr "Gant berzh eo bet ouzhpennet ar gont!"
 
-#: ../src/config.py:3060 ../src/config.py:3095
+#: ../src/config.py:3065 ../src/config.py:3100
 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."
@@ -2942,23 +3036,23 @@ msgstr ""
 "Araoket, pe hen ober diwezhatoc'h en ur glikañ war Kontoù er meuziad Aozañ "
 "eus ar prenestr pennañ."
 
-#: ../src/config.py:3094
+#: ../src/config.py:3099
 msgid "Your new account has been created successfully"
 msgstr "Gant berzh eo bet krouet ho kont nevez!"
 
-#: ../src/config.py:3112
+#: ../src/config.py:3117
 msgid "An error occured during account creation"
 msgstr "Bez ez eus bet ur fazi en ur grouiñ ar gont"
 
-#: ../src/config.py:3170
+#: ../src/config.py:3175
 msgid "Account name is in use"
 msgstr "Implijet eo an anv-kont dija"
 
-#: ../src/config.py:3171
+#: ../src/config.py:3176
 msgid "You already have an account using this name."
 msgstr "Bez ho peus ur gont gant an anv-se dija."
 
-#: ../src/conversation_textview.py:271
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2966,57 +3060,66 @@ 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:340
+#: ../src/conversation_textview.py:342
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Oberoù evit \"%s\""
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Lenn pennad _Wikipedia"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Klask er _geriadur"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:373
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 "Mankout a ra un \"%s\" e-barzh URL ar geriaoueg, ha n'eo ket WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:386
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Mankout a ra un \"%s\" e-barzh URL ar webklask"
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "Web_klask"
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:397
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:755
+#: ../src/conversation_textview.py:757
 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:759
+#: ../src/conversation_textview.py:761
 #, python-format
 msgid "%i days ago"
 msgstr "%i devezh 'zo"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:791
+#: ../src/conversation_textview.py:793
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujed: %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
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
@@ -3285,29 +3388,29 @@ msgstr "Kemennadenn simpl nevez"
 msgid "New Private Message"
 msgstr "Kemennadenn hiniennel nevez"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1161 ../src/notify.py:424
+#: ../src/dialogs.py:1369 ../src/gajim.py:1168 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Postel nevez"
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1314 ../src/notify.py:418
+#: ../src/dialogs.py:1371 ../src/gajim.py:1321 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Goulenn treuzkas"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1134 ../src/gajim.py:1290
+#: ../src/dialogs.py:1373 ../src/gajim.py:1140 ../src/gajim.py:1297
 #: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Fazi treuzkas"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1353 ../src/gajim.py:1375
-#: ../src/gajim.py:1392 ../src/notify.py:422
+#: ../src/dialogs.py:1375 ../src/gajim.py:1360 ../src/gajim.py:1382
+#: ../src/gajim.py:1399 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Echu an treuzkasadenn"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1356 ../src/notify.py:422
+#: ../src/dialogs.py:1376 ../src/gajim.py:1363 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Sac'het an treuzkas"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1032 ../src/notify.py:426
+#: ../src/dialogs.py:1378 ../src/gajim.py:1038 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Pedadenn evit ur sal-flapiñ"
 
@@ -3667,31 +3770,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:682
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
 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:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "This file already exists"
 msgstr "Bez ez eus eus ar restr-mañ dija"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "What do you want to do?"
 msgstr "Petra a fell deoc'h ober?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3825,57 +3928,58 @@ msgstr "Kevreadenn"
 msgid "Subject: %s"
 msgstr "Sujed: %s\n"
 
-#: ../src/gajim.py:703
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:703 ../src/gajim.py:716
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "fazi en ur gas %s ( %s )"
 
-#: ../src/gajim.py:743
+#: ../src/gajim.py:749
 msgid "Authorization accepted"
 msgstr "Aotre degmeret"
 
-#: ../src/gajim.py:744
+#: ../src/gajim.py:750
 #, 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:752
+#: ../src/gajim.py:758
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Dilamet eo bet ho aotre digant \"%s\""
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:759
 msgid "You will always see him or her as offline."
 msgstr "Atav e weloc'h anezhañ ezlinenn."
 
-#: ../src/gajim.py:796
+#: ../src/gajim.py:802
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "N'eus ket tu da dizhout \"%s\""
 
-#: ../src/gajim.py:797 ../src/common/connection.py:395
+#: ../src/gajim.py:803 ../src/common/connection.py:395
 msgid "Check your connection or try again later."
 msgstr "Gwiriekait ho lugadenn pe klaskit diwezhatoc'h."
 
-#: ../src/gajim.py:945 ../src/roster_window.py:1201
+#: ../src/gajim.py:951 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s a zo bremañ %s (%s)"
 
-#: ../src/gajim.py:1042
+#: ../src/gajim.py:1048
 msgid "Your passphrase is incorrect"
 msgstr "Direizh eo ho ker-kuzh"
 
-#: ../src/gajim.py:1043
+#: ../src/gajim.py:1049
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Luget oc'h hep hoc'h alc'hwezh OpenPGP."
 
-#: ../src/gajim.py:1145
+#: ../src/gajim.py:1151
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Postel nevez war %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1147
+#: ../src/gajim.py:1153
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3885,61 +3989,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:1156
+#: ../src/gajim.py:1162
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1311
+#: ../src/gajim.py:1318
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "Fellout a ra da %s kas deoc'h ur restr."
 
-#: ../src/gajim.py:1376
+#: ../src/gajim.py:1383
 #, 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:1380
+#: ../src/gajim.py:1387
 #, 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:1393
+#: ../src/gajim.py:1400
 #, 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:1397
+#: ../src/gajim.py:1404
 #, 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:1503
+#: ../src/gajim.py:1510
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1504
+#: ../src/gajim.py:1511
 #, 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:1842
+#: ../src/gajim.py:1850
 msgid "Could not save your settings and preferences"
 msgstr "Dibosupl eo enrollañ ho tibarzhioù ha dibaboù"
 
-#: ../src/gajim.py:2034
+#: ../src/gajim.py:2042
 #, fuzzy
 msgid "Network Manager support not available"
 msgstr "N'eus ket tu da gevreañ"
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2117
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Support du gestionnaire de sessions indisponible (module gnome.ui manquant)"
@@ -4276,119 +4380,119 @@ msgstr "N'hellit ket dilemel ar gwiskadur red"
 msgid "Please first choose another for your current theme."
 msgstr "Dibabit ur gwiskadur all da gentañ."
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chat"
 msgstr "Flap prevez"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chats"
 msgstr "Flapoù prevez"
 
-#: ../src/groupchat_control.py:120
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Kas ar gemennadenn brevez c'hwitet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:124
 #, 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
+#: ../src/groupchat_control.py:143
 msgid "Group Chat"
 msgstr "Flap a-stroll"
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chats"
 msgstr "Flapoù a-stroll"
 
-#: ../src/groupchat_control.py:315
+#: ../src/groupchat_control.py:317
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Cheñch _lesanv"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:810
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s a zo bet skarzhet : %(reason)s"
 
-#: ../src/groupchat_control.py:814
+#: ../src/groupchat_control.py:816
 #, 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:821
+#: ../src/groupchat_control.py:823
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s a zo argaset : %(reason)s"
 
-#: ../src/groupchat_control.py:825
+#: ../src/groupchat_control.py:827
 #, 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:833
+#: ../src/groupchat_control.py:835
 #, python-format
 msgid "You are now known as %s"
 msgstr "Anavezet oc'h bremañ gant an anv %s"
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:837
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s a zo bremañ %s"
 
-#: ../src/groupchat_control.py:915
+#: ../src/groupchat_control.py:917
 #, python-format
 msgid "%s has left"
 msgstr "Aet eo kuit %s"
 
-#: ../src/groupchat_control.py:920
+#: ../src/groupchat_control.py:922
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Er strollad"
 
 #. No status message
-#: ../src/groupchat_control.py:922 ../src/roster_window.py:1204
+#: ../src/groupchat_control.py:924 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s a zo bremañ %s"
 
-#: ../src/groupchat_control.py:1041 ../src/groupchat_control.py:1059
-#: ../src/groupchat_control.py:1152 ../src/groupchat_control.py:1169
+#: ../src/groupchat_control.py:1043 ../src/groupchat_control.py:1061
+#: ../src/groupchat_control.py:1154 ../src/groupchat_control.py:1171
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "N'eus ket bet kavet al lesanv : %s"
 
-#: ../src/groupchat_control.py:1075
+#: ../src/groupchat_control.py:1077
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "N'eus sujed ebet gant ar webgaoz-mañ"
 
-#: ../src/groupchat_control.py:1088
+#: ../src/groupchat_control.py:1090
 #, 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:1095 ../src/groupchat_control.py:1123
+#: ../src/groupchat_control.py:1097 ../src/groupchat_control.py:1125
 #, 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:1206
+#: ../src/groupchat_control.py:1208
 #, 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:1229
+#: ../src/groupchat_control.py:1231
 #, python-format
 msgid "Commands: %s"
 msgstr "Urzhioù: %s"
 
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1233
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4401,7 +4505,7 @@ msgstr ""
 "actuellement dans le salon il sera également éjecté. Ne supporte pas les "
 "espaces dans le surnom."
 
-#: ../src/groupchat_control.py:1238
+#: ../src/groupchat_control.py:1240
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4409,12 +4513,12 @@ msgstr ""
 "Usage : /%s <surnom>, ouvre une fenêtre de discussion privée avec l'occupant "
 "spécifié."
 
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1244
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Usage : /%s, nettoie la fenêtre."
 
-#: ../src/groupchat_control.py:1244
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4423,12 +4527,12 @@ msgstr ""
 "Usage : /%s [raison], ferme la fenêtre ou l'onglet courrant en affichant la "
 "raison si spécifiée."
 
-#: ../src/groupchat_control.py:1247
+#: ../src/groupchat_control.py:1249
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Usage: /%s, cache les boutons de discussion."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1252
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4437,7 +4541,7 @@ msgstr ""
 "Usage : /%s <JID> [raison], invite le JID dans le salon actuel, la raison "
 "est optionnelle."
 
-#: ../src/groupchat_control.py:1254
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4446,7 +4550,7 @@ msgstr ""
 "Usage : /%s <salon>@<serveur>[/surnom], propose de rejoindre salon@serveur "
 "en option on peut spécifier le surnom utilisé."
 
-#: ../src/groupchat_control.py:1258
+#: ../src/groupchat_control.py:1260
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4457,7 +4561,7 @@ msgstr ""
 "spécifié du salon et affiche en option la raison. Le surnom ne doit pas "
 "contenir d'espaces !"
 
-#: ../src/groupchat_control.py:1263
+#: ../src/groupchat_control.py:1265
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current group chat. Use third "
@@ -4466,7 +4570,7 @@ msgstr ""
 "Usage : /%s <action>, envoie l'action au salon actuel. Utilise la troisième "
 "personne. (ex : /%s explose.)"
 
-#: ../src/groupchat_control.py:1267
+#: ../src/groupchat_control.py:1269
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4475,94 +4579,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:1272
+#: ../src/groupchat_control.py:1274
 #, 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:1276
+#: ../src/groupchat_control.py:1278
 #, fuzzy, python-format
 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:1280
+#: ../src/groupchat_control.py:1282
 #, 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:1283
+#: ../src/groupchat_control.py:1285
 #, 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:1286
+#: ../src/groupchat_control.py:1288
 #, python-format
 msgid "No help info for /%s"
 msgstr "N'eus skoazell hegerz ebet evit /%s"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1337
 #, 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:1337
+#: ../src/groupchat_control.py:1339
 #, 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:1341 ../src/roster_window.py:3961
+#: ../src/groupchat_control.py:1343 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "_Chom hep goulenn ket"
 
-#: ../src/groupchat_control.py:1375
+#: ../src/groupchat_control.py:1377
 msgid "Changing Subject"
 msgstr "Cheñch ar sujed"
 
-#: ../src/groupchat_control.py:1376
+#: ../src/groupchat_control.py:1378
 msgid "Please specify the new subject:"
 msgstr "Skrivit ar sujed nevez:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1387
 msgid "Changing Nickname"
 msgstr "Cheñch lesanv"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1388
 msgid "Please specify the new nickname you want to use:"
 msgstr "Skrivit al lesanv nevez a fell deoc'h implij:"
 
-#: ../src/groupchat_control.py:1411
+#: ../src/groupchat_control.py:1413
 msgid "Bookmark already set"
 msgstr "Sined lakaet dija"
 
-#: ../src/groupchat_control.py:1412
+#: ../src/groupchat_control.py:1414
 #, 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:1421
+#: ../src/groupchat_control.py:1423
 msgid "Bookmark has been added successfully"
 msgstr "Gant berzh eo bet ouzhpennet ar sined"
 
-#: ../src/groupchat_control.py:1422
+#: ../src/groupchat_control.py:1424
 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:1548
+#: ../src/groupchat_control.py:1550
 #, python-format
 msgid "Kicking %s"
 msgstr "Skarzhañ %s"
 
-#: ../src/groupchat_control.py:1549 ../src/groupchat_control.py:1831
+#: ../src/groupchat_control.py:1551 ../src/groupchat_control.py:1833
 msgid "You may specify a reason below:"
 msgstr "Bez e c'hellit reiñ un abeg amañ dindan:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1830
+#: ../src/groupchat_control.py:1832
 #, python-format
 msgid "Banning %s"
 msgstr "Argas %s"
@@ -4606,16 +4710,16 @@ msgstr ""
 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:727
+#: ../src/gtkgui_helpers.py:728
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:729
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:737
+#: ../src/gtkgui_helpers.py:738
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Enrollañ ar restr dindan..."
@@ -4646,11 +4750,6 @@ msgstr "Lesanv"
 msgid "Message"
 msgstr "Kemennadenn"
 
-#. holds subject
-#: ../src/history_manager.py:141 ../src/history_manager.py:172
-msgid "Subject"
-msgstr "Titl"
-
 #: ../src/history_manager.py:186
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -5865,7 +5964,7 @@ msgstr ""
 "L'information d'enregistrement pour la passerelle %s n'est pas arrivée à "
 "temps"
 
-#: ../src/common/connection_handlers.py:1515
+#: ../src/common/connection_handlers.py:1523
 #, fuzzy, python-format
 msgid "Nickname not allowed: %s"
 msgstr "N'eus ket bet kavet al lesanv : %s"
@@ -5873,46 +5972,46 @@ msgstr "N'eus ket bet kavet al lesanv : %s"
 #. password required to join
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1577
-#: ../src/common/connection_handlers.py:1580
-#: ../src/common/connection_handlers.py:1583
-#: ../src/common/connection_handlers.py:1586
-#: ../src/common/connection_handlers.py:1589
-#: ../src/common/connection_handlers.py:1592
+#: ../src/common/connection_handlers.py:1585
+#: ../src/common/connection_handlers.py:1588
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1597
 #: ../src/common/connection_handlers.py:1600
+#: ../src/common/connection_handlers.py:1608
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/connection_handlers.py:1578
+#: ../src/common/connection_handlers.py:1586
 #, 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:1581
+#: ../src/common/connection_handlers.py:1589
 #, fuzzy
 msgid "You are banned from this group chat."
 msgstr "Vous êtes banni de ce salon."
 
-#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1592
 #, fuzzy
 msgid "Such group chat does not exist."
 msgstr "Ce salon n'existe pas."
 
-#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1595
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "La création de salon est réservée aux administrateurs."
 
-#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1598
 msgid "Your registered nickname must be used."
 msgstr "Vous devez utiliser le surnom donné lors de l'enregistrement."
 
-#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1601
 msgid "You are not in the members list."
 msgstr "Vous n'êtes pas dans la liste des membres."
 
-#: ../src/common/connection_handlers.py:1601
+#: ../src/common/connection_handlers.py:1609
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5921,27 +6020,27 @@ msgstr ""
 "par un autre occupant.\n"
 "Veuillez entrer un autre surnom ci-dessous :"
 
-#: ../src/common/connection_handlers.py:1651
+#: ../src/common/connection_handlers.py:1659
 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:1672
+#: ../src/common/connection_handlers.py:1680
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nous sommes maintenant inscrits chez %s"
 
-#: ../src/common/connection_handlers.py:1674
+#: ../src/common/connection_handlers.py:1682
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Requête de désinscription de la part de %s"
 
-#: ../src/common/connection_handlers.py:1676
+#: ../src/common/connection_handlers.py:1684
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nous ne sommes plus dans la liste de %s"
 
-#: ../src/common/connection_handlers.py:1846
+#: ../src/common/connection_handlers.py:1854
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5972,7 +6071,7 @@ msgid "Invalid answer"
 msgstr "Respont direizh"
 
 #: ../src/common/connection.py:394 ../src/common/connection.py:429
-#: ../src/common/connection.py:872
+#: ../src/common/connection.py:877
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
@@ -6030,7 +6129,7 @@ msgstr "%s on"
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
-#: ../src/common/connection.py:759
+#: ../src/common/connection.py:764
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6040,7 +6139,7 @@ msgstr ""
 "Titl : %s\n"
 "%s"
 
-#: ../src/common/connection.py:898
+#: ../src/common/connection.py:903
 msgid "Not fetched because of invisible status"
 msgstr ""
 
@@ -6362,10 +6461,6 @@ msgstr "Hini ebet"
 msgid "To"
 msgstr "Da"
 
-#: ../src/common/helpers.py:259
-msgid "From"
-msgstr "Digant"
-
 #: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "An daou"
@@ -6631,9 +6726,6 @@ msgstr "fazi en ur gas %s ( %s )"
 #~ msgid "Migrating Logs..."
 #~ msgstr "O tilec'hiañ an istoradur..."
 
-#~ msgid "Please wait while logs are being migrated..."
-#~ msgstr "Gortozit marplij e keit ma vez dilec'hiet an istoradur..."
-
 #~ msgid "_Join New Room"
 #~ msgstr "_Ebarzhiñ ur webgaoz nevez"
 
@@ -6784,9 +6876,6 @@ msgstr "fazi en ur gas %s ( %s )"
 #~ msgid "Timeout"
 #~ msgstr "Dépassement de temps"
 
-#~ msgid "A protocol error has occured:"
-#~ msgstr "Une erreur de protocole s'est produite :"
-
 #~ msgid "account: "
 #~ msgstr "compte : "
 
diff --git a/po/cs.po b/po/cs.po
index dc47544e8..099259e71 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-12-02 17:15+0100\n"
+"POT-Creation-Date: 2006-12-09 10:02+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"
@@ -333,16 +333,16 @@ msgid "Manage..."
 msgstr "Spravovat..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1637
-#: ../src/config.py:3430
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1642
+#: ../src/config.py:3435
 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:1219
-#: ../src/config.py:1224 ../src/config.py:1408 ../src/config.py:1627
-#: ../src/config.py:1636 ../src/config.py:1695 ../src/config.py:1769
-#: ../src/config.py:2640 ../src/config.py:3420 ../src/config.py:3429
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1224
+#: ../src/config.py:1229 ../src/config.py:1413 ../src/config.py:1632
+#: ../src/config.py:1641 ../src/config.py:1700 ../src/config.py:1774
+#: ../src/config.py:2645 ../src/config.py:3425 ../src/config.py:3434
 #: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Žádný"
@@ -535,6 +535,45 @@ msgstr "Re_gistrace"
 msgid "_User ID:"
 msgstr "Uživatel:"
 
+#: ../data/glade/adhoc_commands_window.glade.h:1
+msgid "<b>An error has occured:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:2
+msgid "<b>Choose command to execute:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:3
+msgid "Ad-hoc Commands - Gajim"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:4
+msgid "Check once more"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:5
+#, fuzzy
+msgid "Error description..."
+msgstr "Popis"
+
+#: ../data/glade/adhoc_commands_window.glade.h:6
+#, fuzzy
+msgid "Please wait while retrieving command list..."
+msgstr "Prosím vyčkejte až bude historie převedena..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:7
+#, fuzzy
+msgid "Please wait while the command is sending..."
+msgstr "Prosím vyčkejte až bude historie převedena..."
+
+#: ../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>Popis</b>"
@@ -685,13 +724,13 @@ msgstr "Přehrávat _zvuky"
 #: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
-"Contact Connected\n"
-"Contact Disconnected\n"
-"Contact Change Status\n"
-"Group Chat Message Highlight\n"
-"Group Chat Message Received\n"
-"File Transfert Resquest\n"
-"File Transfert Started\n"
+"Contact Connected \n"
+"Contact Disconnected \n"
+"Contact Change Status \n"
+"Group Chat Message Highlight \n"
+"Group Chat Message Received \n"
+"File Transfert Resquest \n"
+"File Transfert Started \n"
 "File Transfert Finished"
 msgstr ""
 
@@ -763,6 +802,46 @@ msgstr "Port: "
 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 "Země:"
+
+#: ../data/glade/atom_entry_window.glade.h:4
+#, fuzzy
+msgid "Feed name:"
+msgstr "jméno tématu"
+
+#: ../data/glade/atom_entry_window.glade.h:5
+#, fuzzy
+msgid "Last modified:"
+msgstr "Jméno:"
+
+#: ../data/glade/atom_entry_window.glade.h:6
+#, fuzzy
+msgid "New entry received"
+msgstr "Když je přijata nová zpráva"
+
+#: ../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 "Změnit heslo"
@@ -849,7 +928,7 @@ msgstr "_Zjednodušený pohled    Alt+C"
 msgid "_History"
 msgstr "_Historie"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/glade/data_form_window.glade.h:1 ../src/dataforms_widget.py:76
 #, fuzzy
 msgid "Fill in the form."
 msgstr "Ve skupině"
@@ -1069,6 +1148,20 @@ msgstr "_Odeslat soukromou zprávu"
 msgid "_Voice"
 msgstr "_Hlas"
 
+#: ../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:259
+msgid "From"
+msgstr "Odesílatel"
+
+#. holds subject
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141
+#: ../src/history_manager.py:172
+msgid "Subject"
+msgstr "Předmět"
+
 #: ../data/glade/history_manager.glade.h:1
 msgid ""
 "<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
@@ -1230,7 +1323,7 @@ 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:1116
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP Šifrování"
 
@@ -1354,7 +1447,7 @@ msgstr ""
 msgid "B_efore nickname:"
 msgstr "Pře_d přezdívkou:"
 
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:841
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
 msgid "Chat"
 msgstr "Rozhovor"
 
@@ -2486,33 +2579,33 @@ 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:841
+#: ../src/chat_control.py:844
 msgid "Chats"
 msgstr "Rozhovory"
 
-#: ../src/chat_control.py:1042
+#: ../src/chat_control.py:1030
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1130
+#: ../src/chat_control.py:1118
 #, 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:1266
+#: ../src/chat_control.py:1254
 msgid "Encryption enabled"
 msgstr "Šifrování zapnuto"
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1259
 msgid "Encryption disabled"
 msgstr "Šifrování vypnuto"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1413 ../src/conversation_textview.py:493
-#: ../src/dialogs.py:629 ../src/gajim.py:727 ../src/gajim.py:728
-#: ../src/gajim.py:1067 ../src/roster_window.py:328
+#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495
+#: ../src/dialogs.py:629 ../src/gajim.py:733 ../src/gajim.py:734
+#: ../src/gajim.py:1073 ../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
@@ -2523,285 +2616,285 @@ msgid "Not in Roster"
 msgstr "není v seznamu"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1545
 #, 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:1558
+#: ../src/chat_control.py:1546
 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:130 ../src/config.py:589
+#: ../src/config.py:135 ../src/config.py:594
 msgid "Disabled"
 msgstr "Vypnuto"
 
-#: ../src/config.py:216
+#: ../src/config.py:221
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Každých %s _minut"
 
-#: ../src/config.py:358
+#: ../src/config.py:363
 msgid "Active"
 msgstr "Aktivní"
 
-#: ../src/config.py:366
+#: ../src/config.py:371
 msgid "Event"
 msgstr "Událost"
 
-#: ../src/config.py:679 ../src/gajim.py:2086
+#: ../src/config.py:684 ../src/gajim.py:2094
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/config.py:680 ../src/gajim.py:2087
+#: ../src/config.py:685 ../src/gajim.py:2095
 #, 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:1032
+#: ../src/config.py:1037
 msgid "status message title"
 msgstr "titulek stavu"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1037
 msgid "status message text"
 msgstr "text stavu"
 
-#: ../src/config.py:1067
+#: ../src/config.py:1072
 msgid "First Message Received"
 msgstr "První zpráva přijata"
 
-#: ../src/config.py:1068
+#: ../src/config.py:1073
 msgid "Next Message Received"
 msgstr "Další zpráva přijata"
 
-#: ../src/config.py:1069
+#: ../src/config.py:1074
 msgid "Contact Connected"
 msgstr "Kontakt se připojil"
 
-#: ../src/config.py:1070
+#: ../src/config.py:1075
 msgid "Contact Disconnected"
 msgstr "Kontakt se odpojil"
 
-#: ../src/config.py:1071
+#: ../src/config.py:1076
 msgid "Message Sent"
 msgstr "Zpráva odeslána"
 
-#: ../src/config.py:1072
+#: ../src/config.py:1077
 msgid "Group Chat Message Highlight"
 msgstr "Zvýraznění zprávy v diskuzi"
 
-#: ../src/config.py:1073
+#: ../src/config.py:1078
 msgid "Group Chat Message Received"
 msgstr "Přijetí zprávy v diskuzi"
 
-#: ../src/config.py:1080
+#: ../src/config.py:1085
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Přijata pozvánka"
 
-#: ../src/config.py:1283
+#: ../src/config.py:1288
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP není použitelné na tomto počítači"
 
-#: ../src/config.py:1329
+#: ../src/config.py:1334
 msgid "You are currently connected to the server"
 msgstr "Nejste přávě připojen(a) k serveru"
 
-#: ../src/config.py:1330
+#: ../src/config.py:1335
 msgid "To change the account name, you must be disconnected."
 msgstr "Ke změně jména účtu se musite odpojit."
 
-#: ../src/config.py:1333 ../src/config.py:1925
+#: ../src/config.py:1338 ../src/config.py:1930
 msgid "Unread events"
 msgstr "Nepřečtené zprávy"
 
-#: ../src/config.py:1334
+#: ../src/config.py:1339
 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:1338
+#: ../src/config.py:1343
 msgid "Account Name Already Used"
 msgstr "Jméno účtu už existuje"
 
-#: ../src/config.py:1339
+#: ../src/config.py:1344
 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:1343 ../src/config.py:1347
+#: ../src/config.py:1348 ../src/config.py:1352
 msgid "Invalid account name"
 msgstr "Neplatné jméno účtu"
 
-#: ../src/config.py:1344
+#: ../src/config.py:1349
 msgid "Account name cannot be empty."
 msgstr "Jméno účtu nemůže být prázdné."
 
-#: ../src/config.py:1348
+#: ../src/config.py:1353
 msgid "Account name cannot contain spaces."
 msgstr "Jméno účtu nesmí obsahovat mezery."
 
-#: ../src/config.py:1356 ../src/config.py:1362 ../src/config.py:1372
-#: ../src/config.py:3030
+#: ../src/config.py:1361 ../src/config.py:1367 ../src/config.py:1377
+#: ../src/config.py:3035
 msgid "Invalid Jabber ID"
 msgstr "Neplatné Jabber ID"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1368
 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:1422
+#: ../src/config.py:1427
 msgid "Invalid entry"
 msgstr "Neplatný záznam"
 
-#: ../src/config.py:1423
+#: ../src/config.py:1428
 msgid "Custom port must be a port number."
 msgstr "Vlastní port musí být číslo portu."
 
-#: ../src/config.py:1549 ../src/common/config.py:363
+#: ../src/config.py:1554 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Hned jsem zpět."
 
-#: ../src/config.py:1559
+#: ../src/config.py:1564
 msgid "Relogin now?"
 msgstr "Připojit se teď znovu?"
 
-#: ../src/config.py:1560
+#: ../src/config.py:1565
 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:1586
+#: ../src/config.py:1591
 msgid "No such account available"
 msgstr "Takový účet není dostupný"
 
-#: ../src/config.py:1587
+#: ../src/config.py:1592
 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:1594 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/config.py:1599 ../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:1595
+#: ../src/config.py:1600
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez připojení nemůžete upravovat osobní údaje."
 
-#: ../src/config.py:1599
+#: ../src/config.py:1604
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1600
+#: ../src/config.py:1605
 #, 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:1624 ../src/config.py:3417
+#: ../src/config.py:1629 ../src/config.py:3422
 msgid "Failed to get secret keys"
 msgstr "Selhalo získání privátního klíče"
 
-#: ../src/config.py:1625 ../src/config.py:3418
+#: ../src/config.py:1630 ../src/config.py:3423
 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:1628 ../src/config.py:3421
+#: ../src/config.py:1633 ../src/config.py:3426
 msgid "OpenPGP Key Selection"
 msgstr "Výběr OpenPGP klíče"
 
-#: ../src/config.py:1629 ../src/config.py:3422
+#: ../src/config.py:1634 ../src/config.py:3427
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte Váš OpenPGP klíč"
 
 #. Name column
-#: ../src/config.py:1859 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/config.py:1864 ../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:1862
+#: ../src/config.py:1867
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1931
 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:1963
+#: ../src/config.py:1968
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Nemáte aktivní účet"
 
-#: ../src/config.py:1964
+#: ../src/config.py:1969
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:2023
+#: ../src/config.py:2028
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Jméno účtu už existuje"
 
-#: ../src/config.py:2024
+#: ../src/config.py:2029
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2256
+#: ../src/config.py:2261
 #, python-format
 msgid "Edit %s"
 msgstr "Uprav %s"
 
-#: ../src/config.py:2258
+#: ../src/config.py:2263
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovat k %s"
 
 #. list at the begining
-#: ../src/config.py:2330
+#: ../src/config.py:2335
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:2331
+#: ../src/config.py:2336
 msgid "Member List"
 msgstr "Seznam členů"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2337
 msgid "Owner List"
 msgstr "Seznam vlastníků"
 
-#: ../src/config.py:2333
+#: ../src/config.py:2338
 msgid "Administrator List"
 msgstr "Seznam správců"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2366 ../src/disco.py:747 ../src/history_manager.py:154
+#: ../src/config.py:2371 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2374
+#: ../src/config.py:2379
 msgid "Reason"
 msgstr "Důvod"
 
-#: ../src/config.py:2379
+#: ../src/config.py:2384
 msgid "Nick"
 msgstr "Přezdívka"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2388
 msgid "Role"
 msgstr "Postavení"
 
-#: ../src/config.py:2404
+#: ../src/config.py:2409
 msgid "Banning..."
 msgstr "Zakazuji..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2406
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2809,37 +2902,37 @@ msgstr ""
 "<b>Koho chcete zakázat?</b>\n"
 "\n"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2413
 msgid "Adding Member..."
 msgstr "Přidávám člena..."
 
-#: ../src/config.py:2409
+#: ../src/config.py:2414
 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:2411
+#: ../src/config.py:2416
 msgid "Adding Owner..."
 msgstr "Přidávám vlastníka..."
 
-#: ../src/config.py:2412
+#: ../src/config.py:2417
 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:2414
+#: ../src/config.py:2419
 msgid "Adding Administrator..."
 msgstr "Přidávám správce..."
 
-#: ../src/config.py:2415
+#: ../src/config.py:2420
 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:2416
+#: ../src/config.py:2421
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2856,100 +2949,100 @@ msgstr ""
 "uživatel@doména),\n"
 "doména/zdroj, nebo adresa obsahující poddoménu."
 
-#: ../src/config.py:2521
+#: ../src/config.py:2526
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuju účet %s"
 
-#: ../src/config.py:2538 ../src/roster_window.py:2667
+#: ../src/config.py:2543 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Vyžadováno heslo"
 
-#: ../src/config.py:2539 ../src/roster_window.py:2668
+#: ../src/config.py:2544 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Zadejte heslo pro účet %s"
 
-#: ../src/config.py:2540 ../src/roster_window.py:2669
+#: ../src/config.py:2545 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Uložit heslo"
 
-#: ../src/config.py:2554
+#: ../src/config.py:2559
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Účet \"%s\" se připojil k serveru"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2560
 msgid "If you remove it, the connection will be lost."
 msgstr "Pokud jej smažete, připojení bude ztraceno."
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 #, fuzzy
 msgid "Default"
 msgstr "Smazat"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Čas tisku:"
 
-#: ../src/config.py:2640
+#: ../src/config.py:2645
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2710
+#: ../src/config.py:2715
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Diskuze"
 
-#: ../src/config.py:2742
+#: ../src/config.py:2747
 msgid "This bookmark has invalid data"
 msgstr "Tato záložka má neplatná data"
 
-#: ../src/config.py:2743
+#: ../src/config.py:2748
 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:3005
+#: ../src/config.py:3010
 msgid "Invalid username"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/config.py:3006
+#: ../src/config.py:3011
 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:3016 ../src/dialogs.py:1316
+#: ../src/config.py:3021 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Neplatné heslo"
 
-#: ../src/config.py:3017
+#: ../src/config.py:3022
 msgid "You must enter a password for the new account."
 msgstr "Musíte zadat heslo pro nový účet."
 
-#: ../src/config.py:3021 ../src/dialogs.py:1321
+#: ../src/config.py:3026 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Hesla se neshodují"
 
-#: ../src/config.py:3022 ../src/dialogs.py:1322
+#: ../src/config.py:3027 ../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:3041
+#: ../src/config.py:3046
 msgid "Duplicate Jabber ID"
 msgstr "Dvakrát použité Jabber ID"
 
-#: ../src/config.py:3042
+#: ../src/config.py:3047
 msgid "This account is already configured in Gajim."
 msgstr "Tento účet už je nastaven v Gajimu."
 
-#: ../src/config.py:3059
+#: ../src/config.py:3064
 msgid "Account has been added successfully"
 msgstr "Účet byl úspěšně přidán"
 
-#: ../src/config.py:3060 ../src/config.py:3095
+#: ../src/config.py:3065 ../src/config.py:3100
 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."
@@ -2957,23 +3050,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:3094
+#: ../src/config.py:3099
 msgid "Your new account has been created successfully"
 msgstr "Váš účet byl úspěšně vytvořen"
 
-#: ../src/config.py:3112
+#: ../src/config.py:3117
 msgid "An error occured during account creation"
 msgstr "Nastala chyba při vytváření účtu"
 
-#: ../src/config.py:3170
+#: ../src/config.py:3175
 msgid "Account name is in use"
 msgstr "Jméno účtu se používá"
 
-#: ../src/config.py:3171
+#: ../src/config.py:3176
 msgid "You already have an account using this name."
 msgstr "Již máte účet s tímto jménem."
 
-#: ../src/conversation_textview.py:271
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2981,56 +3074,65 @@ msgstr ""
 "Text pod touto čarou označuje to, co bylo řečeno po posledním čtení této "
 "diskuze"
 
-#: ../src/conversation_textview.py:340
+#: ../src/conversation_textview.py:342
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Akce pro \"%s\""
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Číst článkek na _Wikipedia"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Vyhledat ve _slovníku"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:373
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL slovníku chybí \"%s\" a není to WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:386
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL pro hledání na webu chybí \"%s\""
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "_Hledat na Webu"
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:397
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:755
+#: ../src/conversation_textview.py:757
 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:759
+#: ../src/conversation_textview.py:761
 #, python-format
 msgid "%i days ago"
 msgstr "před %i dny"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:791
+#: ../src/conversation_textview.py:793
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Předmět: %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
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
@@ -3297,29 +3399,29 @@ msgstr "Nová jednoduché zpráva"
 msgid "New Private Message"
 msgstr "Nová soukromá zpráva"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1161 ../src/notify.py:424
+#: ../src/dialogs.py:1369 ../src/gajim.py:1168 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Nový E-mail"
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1314 ../src/notify.py:418
+#: ../src/dialogs.py:1371 ../src/gajim.py:1321 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Žádost o přenos souboru"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1134 ../src/gajim.py:1290
+#: ../src/dialogs.py:1373 ../src/gajim.py:1140 ../src/gajim.py:1297
 #: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Chyba přenosu souboru"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1353 ../src/gajim.py:1375
-#: ../src/gajim.py:1392 ../src/notify.py:422
+#: ../src/dialogs.py:1375 ../src/gajim.py:1360 ../src/gajim.py:1382
+#: ../src/gajim.py:1399 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Přenos souboru dokončen"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1356 ../src/notify.py:422
+#: ../src/dialogs.py:1376 ../src/gajim.py:1363 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Přenos souboru zastaven"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1032 ../src/notify.py:426
+#: ../src/dialogs.py:1378 ../src/gajim.py:1038 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Skupinová pozvánka"
 
@@ -3680,31 +3782,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:682
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
 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:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "This file already exists"
 msgstr "Tento soubor už existuje"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 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:698
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3839,58 +3941,59 @@ msgstr "Spojení"
 msgid "Subject: %s"
 msgstr "Předmět: %s\n"
 
-#: ../src/gajim.py:703
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:703 ../src/gajim.py:716
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "chyba při odesílání %s ( %s )"
 
-#: ../src/gajim.py:743
+#: ../src/gajim.py:749
 msgid "Authorization accepted"
 msgstr "Autorizace přijata"
 
-#: ../src/gajim.py:744
+#: ../src/gajim.py:750
 #, 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:752
+#: ../src/gajim.py:758
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" Vám odebral autorizaci"
 
 # FIXME: hrozna veta
-#: ../src/gajim.py:753
+#: ../src/gajim.py:759
 msgid "You will always see him or her as offline."
 msgstr "Uvidíte jej nebo ji vždy jako odpojenou."
 
-#: ../src/gajim.py:796
+#: ../src/gajim.py:802
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt s \"%s\" nebyl navázán"
 
-#: ../src/gajim.py:797 ../src/common/connection.py:395
+#: ../src/gajim.py:803 ../src/common/connection.py:395
 msgid "Check your connection or try again later."
 msgstr "Ověřte spojení nebo zkuste později."
 
-#: ../src/gajim.py:945 ../src/roster_window.py:1201
+#: ../src/gajim.py:951 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s je nyní %s (%s)"
 
-#: ../src/gajim.py:1042
+#: ../src/gajim.py:1048
 msgid "Your passphrase is incorrect"
 msgstr "Vaše heslo je neplatné"
 
-#: ../src/gajim.py:1043
+#: ../src/gajim.py:1049
 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:1145
+#: ../src/gajim.py:1151
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nový E-mail on %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1147
+#: ../src/gajim.py:1153
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3901,45 +4004,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:1156
+#: ../src/gajim.py:1162
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1311
+#: ../src/gajim.py:1318
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Vám chce poslat soubor."
 
-#: ../src/gajim.py:1376
+#: ../src/gajim.py:1383
 #, 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:1380
+#: ../src/gajim.py:1387
 #, 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:1393
+#: ../src/gajim.py:1400
 #, 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:1397
+#: ../src/gajim.py:1404
 #, 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:1503
+#: ../src/gajim.py:1510
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1504
+#: ../src/gajim.py:1511
 #, fuzzy
 msgid "Please type a new username for your local account"
 msgstr "<b>Prosím vyplňte údaje pro Váš nový účet</b>"
@@ -3947,16 +4050,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:1842
+#: ../src/gajim.py:1850
 msgid "Could not save your settings and preferences"
 msgstr "Nelze uložit Vaše nastavení"
 
-#: ../src/gajim.py:2034
+#: ../src/gajim.py:2042
 #, fuzzy
 msgid "Network Manager support not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2117
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Podpora Správce sezení není dostupná (schází gnome.ui modul)"
 
@@ -4294,119 +4397,119 @@ msgstr "Nemůžete smazat právě používané téma"
 msgid "Please first choose another for your current theme."
 msgstr "Vyberte prosím napřed jiné téma."
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chat"
 msgstr "Soukromý rozhovor"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chats"
 msgstr "Soukromé rozhovory"
 
-#: ../src/groupchat_control.py:120
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Odesílání soukromé zprávy selhalo"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:124
 #, 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
+#: ../src/groupchat_control.py:143
 msgid "Group Chat"
 msgstr "Diskuze"
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chats"
 msgstr "Diskuze"
 
-#: ../src/groupchat_control.py:315
+#: ../src/groupchat_control.py:317
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Změ_nit přezdívku"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:810
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s byli vyhozeni: %(reason)s"
 
-#: ../src/groupchat_control.py:814
+#: ../src/groupchat_control.py:816
 #, 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:821
+#: ../src/groupchat_control.py:823
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s byli zakázáni: %(reason)s"
 
-#: ../src/groupchat_control.py:825
+#: ../src/groupchat_control.py:827
 #, 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:833
+#: ../src/groupchat_control.py:835
 #, python-format
 msgid "You are now known as %s"
 msgstr "Jste nyní znám(a) jako %s"
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:837
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s se přejmenoval na %s"
 
-#: ../src/groupchat_control.py:915
+#: ../src/groupchat_control.py:917
 #, python-format
 msgid "%s has left"
 msgstr "%s odešel(a)"
 
-#: ../src/groupchat_control.py:920
+#: ../src/groupchat_control.py:922
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Ve skupině"
 
 #. No status message
-#: ../src/groupchat_control.py:922 ../src/roster_window.py:1204
+#: ../src/groupchat_control.py:924 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s je nyní %s"
 
-#: ../src/groupchat_control.py:1041 ../src/groupchat_control.py:1059
-#: ../src/groupchat_control.py:1152 ../src/groupchat_control.py:1169
+#: ../src/groupchat_control.py:1043 ../src/groupchat_control.py:1061
+#: ../src/groupchat_control.py:1154 ../src/groupchat_control.py:1171
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Přezdívka nenalezena: %s"
 
-#: ../src/groupchat_control.py:1075
+#: ../src/groupchat_control.py:1077
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "Místnost nemá žádné téma"
 
-#: ../src/groupchat_control.py:1088
+#: ../src/groupchat_control.py:1090
 #, 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:1095 ../src/groupchat_control.py:1123
+#: ../src/groupchat_control.py:1097 ../src/groupchat_control.py:1125
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s nevypadá jako platné JID"
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1208
 #, 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:1229
+#: ../src/groupchat_control.py:1231
 #, python-format
 msgid "Commands: %s"
 msgstr "Příkazy: %s"
 
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1233
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4418,7 +4521,7 @@ msgstr ""
 "Přezdívka nájemníka může být nahrazena, pokud neobsahuje \"@\". Pokud je JID "
 "právě v místnosti, bude vyhozen. NEpodporuje mezery v přezdívce."
 
-#: ../src/groupchat_control.py:1238
+#: ../src/groupchat_control.py:1240
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4426,12 +4529,12 @@ msgstr ""
 "Použití: /%s <přezdívka>, otevře okno soukromého rozhovoru uvedenému "
 "nájemníkovi."
 
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1244
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Použití: /%s, smaže zprávy v okně."
 
-#: ../src/groupchat_control.py:1244
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4440,12 +4543,12 @@ msgstr ""
 "Použití: /%s [důvod], uzavře toto okno nebo záložku, a vypíše důvod, pokud "
 "byl uveden."
 
-#: ../src/groupchat_control.py:1247
+#: ../src/groupchat_control.py:1249
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Použití: /%s, skryje tlačítka rozhovoru."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1252
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4454,7 +4557,7 @@ msgstr ""
 "Použití: /%s <JID> [důvod], pozve JID do této místnosti, případně s uvedeným "
 "důvodem."
 
-#: ../src/groupchat_control.py:1254
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4463,7 +4566,7 @@ msgstr ""
 "Použití: /%s <místnost>@<server>[/přezdívka], nabízí vstup do místnosti "
 "místnost@server, případně s uvedenou přezdívkou."
 
-#: ../src/groupchat_control.py:1258
+#: ../src/groupchat_control.py:1260
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4473,7 +4576,7 @@ msgstr ""
 "Použití: /%s <přezdívka> [důvod], odstraní nájemníka určeného přezdívkou z "
 "místnosti a případně zobrazí důvod. NEpodporuje mezery v přezdívce."
 
-#: ../src/groupchat_control.py:1263
+#: ../src/groupchat_control.py:1265
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current group chat. Use third "
@@ -4482,7 +4585,7 @@ msgstr ""
 "Použití: /%s <akce>, pošle akci do aktuální místnosti. Použijte třetí osobu "
 "(například /%s explodoval.)"
 
-#: ../src/groupchat_control.py:1267
+#: ../src/groupchat_control.py:1269
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4491,94 +4594,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:1272
+#: ../src/groupchat_control.py:1274
 #, 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:1276
+#: ../src/groupchat_control.py:1278
 #, fuzzy, python-format
 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:1280
+#: ../src/groupchat_control.py:1282
 #, 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:1283
+#: ../src/groupchat_control.py:1285
 #, 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:1286
+#: ../src/groupchat_control.py:1288
 #, python-format
 msgid "No help info for /%s"
 msgstr "Žádná další nápověda pro /%s"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1337
 #, 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:1337
+#: ../src/groupchat_control.py:1339
 #, 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:1341 ../src/roster_window.py:3961
+#: ../src/groupchat_control.py:1343 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "Příště _nezobrazovat"
 
-#: ../src/groupchat_control.py:1375
+#: ../src/groupchat_control.py:1377
 msgid "Changing Subject"
 msgstr "Měním Téma"
 
-#: ../src/groupchat_control.py:1376
+#: ../src/groupchat_control.py:1378
 msgid "Please specify the new subject:"
 msgstr "Prosím zadejte nové téma:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1387
 msgid "Changing Nickname"
 msgstr "Měním přezdívku"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1388
 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:1411
+#: ../src/groupchat_control.py:1413
 msgid "Bookmark already set"
 msgstr "Záložka je už nastavena"
 
-#: ../src/groupchat_control.py:1412
+#: ../src/groupchat_control.py:1414
 #, 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:1421
+#: ../src/groupchat_control.py:1423
 msgid "Bookmark has been added successfully"
 msgstr "Záložka byla úspěšně přidána"
 
-#: ../src/groupchat_control.py:1422
+#: ../src/groupchat_control.py:1424
 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:1548
+#: ../src/groupchat_control.py:1550
 #, python-format
 msgid "Kicking %s"
 msgstr "Vyhazuji %s"
 
-#: ../src/groupchat_control.py:1549 ../src/groupchat_control.py:1831
+#: ../src/groupchat_control.py:1551 ../src/groupchat_control.py:1833
 msgid "You may specify a reason below:"
 msgstr "Můžete uvést důvod níže:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1830
+#: ../src/groupchat_control.py:1832
 #, python-format
 msgid "Banning %s"
 msgstr "Zakazuji %s"
@@ -4623,16 +4726,16 @@ msgstr "Chyba parsování souboru:"
 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:727
+#: ../src/gtkgui_helpers.py:728
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:729
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:737
+#: ../src/gtkgui_helpers.py:738
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Uložit jako..."
@@ -4663,11 +4766,6 @@ msgstr "Přezdívka"
 msgid "Message"
 msgstr "Zpráva"
 
-#. holds subject
-#: ../src/history_manager.py:141 ../src/history_manager.py:172
-msgid "Subject"
-msgstr "Předmět"
-
 #: ../src/history_manager.py:186
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -5900,7 +5998,7 @@ msgstr ""
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1515
+#: ../src/common/connection_handlers.py:1523
 #, fuzzy, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Přezdívka nenalezena: %s"
@@ -5908,70 +6006,70 @@ msgstr "Přezdívka nenalezena: %s"
 #. password required to join
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1577
-#: ../src/common/connection_handlers.py:1580
-#: ../src/common/connection_handlers.py:1583
-#: ../src/common/connection_handlers.py:1586
-#: ../src/common/connection_handlers.py:1589
-#: ../src/common/connection_handlers.py:1592
+#: ../src/common/connection_handlers.py:1585
+#: ../src/common/connection_handlers.py:1588
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1597
 #: ../src/common/connection_handlers.py:1600
+#: ../src/common/connection_handlers.py:1608
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Připojit se do diskuze"
 
-#: ../src/common/connection_handlers.py:1578
+#: ../src/common/connection_handlers.py:1586
 msgid "A password is required to join this group chat."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1589
 #, fuzzy
 msgid "You are banned from this group chat."
 msgstr "Už jsi v místnosti %s"
 
-#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1592
 msgid "Such group chat does not exist."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1595
 msgid "Group chat creation is restricted."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1598
 msgid "Your registered nickname must be used."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1601
 #, fuzzy
 msgid "You are not in the members list."
 msgstr "Nejste připojen(a) k serveru"
 
-#: ../src/common/connection_handlers.py:1601
+#: ../src/common/connection_handlers.py:1609
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1651
+#: ../src/common/connection_handlers.py:1659
 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:1672
+#: ../src/common/connection_handlers.py:1680
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1674
+#: ../src/common/connection_handlers.py:1682
 #, fuzzy, python-format
 msgid "unsubscribe request from %s"
 msgstr "Žádost o autorizaci od %s"
 
-#: ../src/common/connection_handlers.py:1676
+#: ../src/common/connection_handlers.py:1684
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1846
+#: ../src/common/connection_handlers.py:1854
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5999,7 +6097,7 @@ msgid "Invalid answer"
 msgstr "Neplatná odpověď"
 
 #: ../src/common/connection.py:394 ../src/common/connection.py:429
-#: ../src/common/connection.py:872
+#: ../src/common/connection.py:877
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
@@ -6057,7 +6155,7 @@ msgstr "Jsem %s"
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Tato zpráva je zašifrovaná]"
 
-#: ../src/common/connection.py:759
+#: ../src/common/connection.py:764
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6067,7 +6165,7 @@ msgstr ""
 "Předmět: %s\n"
 "%s"
 
-#: ../src/common/connection.py:898
+#: ../src/common/connection.py:903
 msgid "Not fetched because of invisible status"
 msgstr ""
 
@@ -6386,10 +6484,6 @@ msgstr "?Subscription we already have:Žádná"
 msgid "To"
 msgstr "Příjemce"
 
-#: ../src/common/helpers.py:259
-msgid "From"
-msgstr "Odesílatel"
-
 #: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Obojí"
@@ -6669,9 +6763,6 @@ msgstr "chyba při odesílání %s ( %s )"
 #~ msgid "Migrating Logs..."
 #~ msgstr "Převádím historii..."
 
-#~ msgid "Please wait while logs are being migrated..."
-#~ msgstr "Prosím vyčkejte až bude historie převedena..."
-
 #~ msgid "_Join New Room"
 #~ msgstr "_Vstoupit do nové místnosti"
 
diff --git a/po/de.po b/po/de.po
index 199b45856..73b9cd33c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-05 01:02+0100\n"
+"POT-Creation-Date: 2006-12-09 10:02+0100\n"
 "PO-Revision-Date: 2006-12-09 09:05+0100\n"
 "Last-Translator: Fridtjof Busse <fridtjof@fbunet.de>\n"
 "Language-Team: German <translators@gajim.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
@@ -320,16 +320,16 @@ msgid "Manage..."
 msgstr "Verwalten ..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1637
-#: ../src/config.py:3430
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1642
+#: ../src/config.py:3435
 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:1219
-#: ../src/config.py:1224 ../src/config.py:1408 ../src/config.py:1627
-#: ../src/config.py:1636 ../src/config.py:1695 ../src/config.py:1769
-#: ../src/config.py:2640 ../src/config.py:3420 ../src/config.py:3429
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1224
+#: ../src/config.py:1229 ../src/config.py:1413 ../src/config.py:1632
+#: ../src/config.py:1641 ../src/config.py:1700 ../src/config.py:1774
+#: ../src/config.py:2645 ../src/config.py:3425 ../src/config.py:3434
 #: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Kein"
@@ -704,60 +704,79 @@ msgid "Play a sound"
 msgstr "Klänge abspielen"
 
 #: ../data/glade/advanced_notifications_window.glade.h:18
-msgid "Receive a Message"
-msgstr "Nachricht empfangen"
+msgid ""
+"Receive a Message\n"
+"Contact Connected \n"
+"Contact Disconnected \n"
+"Contact Change Status \n"
+"Group Chat Message Highlight \n"
+"Group Chat Message Received \n"
+"File Transfert Resquest \n"
+"File Transfert Started \n"
+"File Transfert Finished"
+msgstr ""
+"Nachricht empfangen\n"
+"Kontakt verbunden\n"
+"Kontakt nicht mehr verbunden\n"
+"Kontakt ändert Status\n"
+"Gruppenchat-Nachricht hervorgehoben\n"
+"Gruppenchat-Nachricht empfangen\n"
+"Anfrage zur Dateiübertragung\n"
+"Dateiübertragung begonnen\n"
+"Dateiübertragung beendet"
 
-#: ../data/glade/advanced_notifications_window.glade.h:19
+#: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr "Wenn "
 
-#: ../data/glade/advanced_notifications_window.glade.h:20
+#: ../data/glade/advanced_notifications_window.glade.h:28
 msgid ""
 "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
-"_Aktivere den UrgencyHint des Fenstermanagers, um das Chatfenster in der Taskleiste blinken zu lassen"
+"_Aktivere den UrgencyHint des Fenstermanagers, um das Chatfenster in der "
+"Taskleiste blinken zu lassen"
 
-#: ../data/glade/advanced_notifications_window.glade.h:21
+#: ../data/glade/advanced_notifications_window.glade.h:29
 msgid "_Disable auto opening chat window"
 msgstr "_Deaktiviere automatisch öffnendes Chatfenster"
 
-#: ../data/glade/advanced_notifications_window.glade.h:22
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing popup window"
 msgstr "_Deaktivere existierendes Popup-Fenster"
 
-#: ../data/glade/advanced_notifications_window.glade.h:23
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable existing sound for this event"
 msgstr "_Deaktivere existierenden Sound für dieses Ereignis"
 
-#: ../data/glade/advanced_notifications_window.glade.h:24
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in roster"
 msgstr "_Deaktivere die Ereignisanzeige im Roster"
 
-#: ../data/glade/advanced_notifications_window.glade.h:25
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Disable showing event in systray"
 msgstr "_Deaktiviere die Ereignisanzeige im Systray"
 
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Inform me with a popup window"
 msgstr "_Informiere mich mit einem Popup-Fenster"
 
-#: ../data/glade/advanced_notifications_window.glade.h:27
+#: ../data/glade/advanced_notifications_window.glade.h:35
 msgid "_Open chat window with user"
 msgstr "Ein Chat-Fenster mit Benutzer öffnen"
 
-#: ../data/glade/advanced_notifications_window.glade.h:28
+#: ../data/glade/advanced_notifications_window.glade.h:36
 msgid "_Show event in roster"
 msgstr "Zeige Ereignis in der _Kontaktliste"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/glade/advanced_notifications_window.glade.h:37
 msgid "_Show event in systray"
 msgstr "Zeige _Ereignisse im Systray"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/glade/advanced_notifications_window.glade.h:38
 msgid "and I "
 msgstr "und ich "
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/glade/advanced_notifications_window.glade.h:39
 msgid ""
 "contact(s)\n"
 "group(s)\n"
@@ -767,11 +786,11 @@ msgstr ""
 "Gruppe(n)\n"
 "Alle"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:42
 msgid "for "
 msgstr "für "
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:43
 msgid "when I'm in"
 msgstr "wenn ich bin"
 
@@ -1289,7 +1308,7 @@ 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:1101
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP-Verschlüsselung"
 
@@ -1416,7 +1435,7 @@ msgstr ""
 msgid "B_efore nickname:"
 msgstr "Vor d_em Spitznamen:"
 
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:841
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
 msgid "Chat"
 msgstr "Chat"
 
@@ -1801,6 +1820,10 @@ msgstr "_URL:"
 msgid "minutes"
 msgstr "Minuten"
 
+#: ../data/glade/privacy_lists_window.glade.h:1
+msgid "Privacy Lists:"
+msgstr "Privatsphären-Liste:"
+
 #: ../data/glade/privacy_list_window.glade.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Hinzufügen / Ändern einer Regel</b>"
@@ -1877,10 +1900,6 @@ msgstr "um mir den Status zu senden"
 msgid "to view my status"
 msgstr "um meinen Status zu sehen"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
-msgid "Privacy Lists:"
-msgstr "Privatsphären-Liste:"
-
 #. "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
@@ -2531,34 +2550,34 @@ 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:841
+#: ../src/chat_control.py:844
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/chat_control.py:1027
+#: ../src/chat_control.py:1030
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s aus Gruppenchat %(room_name)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1115
+#: ../src/chat_control.py:1118
 #, 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:1251
+#: ../src/chat_control.py:1254
 msgid "Encryption enabled"
 msgstr "Verschlüsselung aktiviert"
 
-#: ../src/chat_control.py:1256
+#: ../src/chat_control.py:1259
 msgid "Encryption disabled"
 msgstr "Verschlüsselung deaktiviert"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1398 ../src/conversation_textview.py:495
-#: ../src/dialogs.py:629 ../src/gajim.py:727 ../src/gajim.py:728
-#: ../src/gajim.py:1067 ../src/roster_window.py:328
+#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495
+#: ../src/dialogs.py:629 ../src/gajim.py:733 ../src/gajim.py:734
+#: ../src/gajim.py:1073 ../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
@@ -2569,12 +2588,12 @@ msgid "Not in Roster"
 msgstr "Nicht in der Liste"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1542
+#: ../src/chat_control.py:1545
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Sie haben eine neue Nachricht von \"%s\""
 
-#: ../src/chat_control.py:1543
+#: ../src/chat_control.py:1546
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2582,29 +2601,29 @@ msgstr ""
 "Wenn sie das Fenster schließen und der Verlauf abgeschaltet ist, geht die "
 "Nachricht verloren."
 
-#: ../src/config.py:130 ../src/config.py:589
+#: ../src/config.py:135 ../src/config.py:594
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: ../src/config.py:216
+#: ../src/config.py:221
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Alle %s _Minuten"
 
-#: ../src/config.py:358
+#: ../src/config.py:363
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:366
+#: ../src/config.py:371
 msgid "Event"
 msgstr "Ereignis"
 
-#: ../src/config.py:679 ../src/gajim.py:2087
+#: ../src/config.py:684 ../src/gajim.py:2094
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Wörterburch für Sprache %s nicht verfügbar"
 
-#: ../src/config.py:680 ../src/gajim.py:2088
+#: ../src/config.py:685 ../src/gajim.py:2095
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -2613,71 +2632,71 @@ msgstr ""
 "Sie müssen das Wörterbuch %s installieren oder eine andere Sprache wählen, "
 "um die Rechtschreibprüfung zu nutzen."
 
-#: ../src/config.py:1032
+#: ../src/config.py:1037
 msgid "status message title"
 msgstr "Statusbetreff"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1037
 msgid "status message text"
 msgstr "Statusnachricht"
 
-#: ../src/config.py:1067
+#: ../src/config.py:1072
 msgid "First Message Received"
 msgstr "Erste empfangene Nachricht"
 
-#: ../src/config.py:1068
+#: ../src/config.py:1073
 msgid "Next Message Received"
 msgstr "Nächste empfangene Nachricht"
 
-#: ../src/config.py:1069
+#: ../src/config.py:1074
 msgid "Contact Connected"
 msgstr "Kontakt verbunden"
 
-#: ../src/config.py:1070
+#: ../src/config.py:1075
 msgid "Contact Disconnected"
 msgstr "Kontakt nicht verbunden"
 
-#: ../src/config.py:1071
+#: ../src/config.py:1076
 msgid "Message Sent"
 msgstr "Nachricht gesendet"
 
-#: ../src/config.py:1072
+#: ../src/config.py:1077
 msgid "Group Chat Message Highlight"
 msgstr "Gruppenchat Nachrichten-Hervorhebung"
 
-#: ../src/config.py:1073
+#: ../src/config.py:1078
 msgid "Group Chat Message Received"
 msgstr "Gruppenchat-Nachricht empfangen"
 
-#: ../src/config.py:1080
+#: ../src/config.py:1085
 msgid "GMail Email Received"
 msgstr "E-Mail über Googlemail empfangen"
 
-#: ../src/config.py:1283
+#: ../src/config.py:1288
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP kann auf diesem Computer nicht genutzt werden"
 
-#: ../src/config.py:1329
+#: ../src/config.py:1334
 msgid "You are currently connected to the server"
 msgstr "Sie sind mit dem Server verbunden"
 
-#: ../src/config.py:1330
+#: ../src/config.py:1335
 msgid "To change the account name, you must be disconnected."
 msgstr "Verbindung muss beendet werden, um Kontonamen zu ändern."
 
-#: ../src/config.py:1333 ../src/config.py:1925
+#: ../src/config.py:1338 ../src/config.py:1930
 msgid "Unread events"
 msgstr "Ungelesene Ereignisse"
 
-#: ../src/config.py:1334
+#: ../src/config.py:1339
 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:1338
+#: ../src/config.py:1343
 msgid "Account Name Already Used"
 msgstr "Kontoname wird bereits verwendet"
 
-#: ../src/config.py:1339
+#: ../src/config.py:1344
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2685,178 +2704,178 @@ msgstr ""
 "Dieser Name wird bereits für einen anderen Ihrer Accounts verwendet. Bitte "
 "wählenSie einen anderen Namen."
 
-#: ../src/config.py:1343 ../src/config.py:1347
+#: ../src/config.py:1348 ../src/config.py:1352
 msgid "Invalid account name"
 msgstr "Ungültiger Kontoname"
 
-#: ../src/config.py:1344
+#: ../src/config.py:1349
 msgid "Account name cannot be empty."
 msgstr "Kontoname darf nicht leer sein."
 
-#: ../src/config.py:1348
+#: ../src/config.py:1353
 msgid "Account name cannot contain spaces."
 msgstr "Kontoname darf keine Leerzeichen enthalten."
 
-#: ../src/config.py:1356 ../src/config.py:1362 ../src/config.py:1372
-#: ../src/config.py:3030
+#: ../src/config.py:1361 ../src/config.py:1367 ../src/config.py:1377
+#: ../src/config.py:3035
 msgid "Invalid Jabber ID"
 msgstr "Ungültige Jabber ID"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1368
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID muss in der Form \"user@servername\" sein."
 
-#: ../src/config.py:1422
+#: ../src/config.py:1427
 msgid "Invalid entry"
 msgstr "Ungültiger Eintrag"
 
-#: ../src/config.py:1423
+#: ../src/config.py:1428
 msgid "Custom port must be a port number."
 msgstr "Proxy Port muss eine Portnummer sein."
 
-#: ../src/config.py:1549 ../src/common/config.py:363
+#: ../src/config.py:1554 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Bin gleich zurück."
 
-#: ../src/config.py:1559
+#: ../src/config.py:1564
 msgid "Relogin now?"
 msgstr "Jetzt neu einloggen?"
 
-#: ../src/config.py:1560
+#: ../src/config.py:1565
 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:1586
+#: ../src/config.py:1591
 msgid "No such account available"
 msgstr "Account nicht verfügbar"
 
-#: ../src/config.py:1587
+#: ../src/config.py:1592
 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:1594 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/config.py:1599 ../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:1595
+#: ../src/config.py:1600
 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:1599
+#: ../src/config.py:1604
 msgid "Your server doesn't support Vcard"
 msgstr "Ihr Server unterstützt vCard nicht"
 
-#: ../src/config.py:1600
+#: ../src/config.py:1605
 msgid "Your server can't save your personal information."
 msgstr "Ihr Server kann keine persönlichen Informationen speichern."
 
-#: ../src/config.py:1624 ../src/config.py:3417
+#: ../src/config.py:1629 ../src/config.py:3422
 msgid "Failed to get secret keys"
 msgstr "Holen der geheimen Schlüssel fehlgeschlagen"
 
-#: ../src/config.py:1625 ../src/config.py:3418
+#: ../src/config.py:1630 ../src/config.py:3423
 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:1628 ../src/config.py:3421
+#: ../src/config.py:1633 ../src/config.py:3426
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Schlüssel-Auswahl"
 
-#: ../src/config.py:1629 ../src/config.py:3422
+#: ../src/config.py:1634 ../src/config.py:3427
 msgid "Choose your OpenPGP key"
 msgstr "Wählen Sie Ihren OpenPGP Schlüssel"
 
 #. Name column
-#: ../src/config.py:1859 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/config.py:1864 ../src/disco.py:740 ../src/disco.py:1466
 #: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Name"
 
-#: ../src/config.py:1862
+#: ../src/config.py:1867
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1931
 msgid "Read all pending events before removing this account."
 msgstr "Alle ungelesenen Ereignisse lesen, bevor der Account entfernt wird."
 
-#: ../src/config.py:1963
+#: ../src/config.py:1968
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Sie haben mit Account %s einen Chat geöffnet"
 
-#: ../src/config.py:1964
+#: ../src/config.py:1969
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alle Chatfenster werden geschlossen. Fortfahren?"
 
-#: ../src/config.py:2023
+#: ../src/config.py:2028
 msgid "Account Local already exists."
 msgstr "Ein Konto mit dem Namen 'Local' ist bereits vorhanden"
 
-#: ../src/config.py:2024
+#: ../src/config.py:2029
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Bitte benennen Sie es um oder entfernen es, bevor Sie LAN-Kontakte "
 "aktivieren."
 
-#: ../src/config.py:2256
+#: ../src/config.py:2261
 #, python-format
 msgid "Edit %s"
 msgstr "%s ändern"
 
-#: ../src/config.py:2258
+#: ../src/config.py:2263
 #, python-format
 msgid "Register to %s"
 msgstr "Auf %s registrieren"
 
 #. list at the begining
-#: ../src/config.py:2330
+#: ../src/config.py:2335
 msgid "Ban List"
 msgstr "Sperrliste"
 
-#: ../src/config.py:2331
+#: ../src/config.py:2336
 msgid "Member List"
 msgstr "Mitgliedsliste"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2337
 msgid "Owner List"
 msgstr "Listenbesitzer"
 
-#: ../src/config.py:2333
+#: ../src/config.py:2338
 msgid "Administrator List"
 msgstr "Administratorliste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2366 ../src/disco.py:747 ../src/history_manager.py:154
+#: ../src/config.py:2371 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2374
+#: ../src/config.py:2379
 msgid "Reason"
 msgstr "Grund"
 
-#: ../src/config.py:2379
+#: ../src/config.py:2384
 msgid "Nick"
 msgstr "Spitzname"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2388
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2404
+#: ../src/config.py:2409
 msgid "Banning..."
 msgstr "Verbanne ..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2406
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2864,11 +2883,11 @@ msgstr ""
 "<b>Wen möchten Sie verbannen?</b>\n"
 "\n"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2413
 msgid "Adding Member..."
 msgstr "Füge Mitglied hinzu ..."
 
-#: ../src/config.py:2409
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2876,11 +2895,11 @@ msgstr ""
 "<b>Wen möchten Sie zum Mitglied machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2411
+#: ../src/config.py:2416
 msgid "Adding Owner..."
 msgstr "Füge Besitzer hinzu ..."
 
-#: ../src/config.py:2412
+#: ../src/config.py:2417
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2888,11 +2907,11 @@ msgstr ""
 "<b>Wen möchten Sie zum Besitzer machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2419
 msgid "Adding Administrator..."
 msgstr "Füge Administrator hinzu ..."
 
-#: ../src/config.py:2415
+#: ../src/config.py:2420
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2900,7 +2919,7 @@ msgstr ""
 "<b>Wen möchten Sie zum Administrator machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2416
+#: ../src/config.py:2421
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2915,96 +2934,96 @@ 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:2521
+#: ../src/config.py:2526
 #, python-format
 msgid "Removing %s account"
 msgstr "Entferne Konto %s"
 
-#: ../src/config.py:2538 ../src/roster_window.py:2667
+#: ../src/config.py:2543 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Passwort benötigt"
 
-#: ../src/config.py:2539 ../src/roster_window.py:2668
+#: ../src/config.py:2544 ../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:2540 ../src/roster_window.py:2669
+#: ../src/config.py:2545 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Passwort speichern"
 
-#: ../src/config.py:2554
+#: ../src/config.py:2559
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" ist mit Server verbunden"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2560
 msgid "If you remove it, the connection will be lost."
 msgstr "Wenn Sie es entfernen, wird die Verbindung beendet."
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:2640
+#: ../src/config.py:2645
 msgid "Enter and leave only"
 msgstr "Nur betreten und verlassen"
 
-#: ../src/config.py:2710
+#: ../src/config.py:2715
 msgid "New Group Chat"
 msgstr "Neuer Gruppenchat"
 
-#: ../src/config.py:2742
+#: ../src/config.py:2747
 msgid "This bookmark has invalid data"
 msgstr "Dieses Lesezeichen hat ungültige Daten"
 
-#: ../src/config.py:2743
+#: ../src/config.py:2748
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Bitte Serverfeld und Raumfeld ausfüllen oder Lesezeichen löschen."
 
-#: ../src/config.py:3005
+#: ../src/config.py:3010
 msgid "Invalid username"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/config.py:3006
+#: ../src/config.py:3011
 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:3016 ../src/dialogs.py:1316
+#: ../src/config.py:3021 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Ungültiges Passwort"
 
-#: ../src/config.py:3017
+#: ../src/config.py:3022
 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:3021 ../src/dialogs.py:1321
+#: ../src/config.py:3026 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Passwörter stimmen nicht überein"
 
-#: ../src/config.py:3022 ../src/dialogs.py:1322
+#: ../src/config.py:3027 ../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:3041
+#: ../src/config.py:3046
 msgid "Duplicate Jabber ID"
 msgstr "Doppelte Jabber ID"
 
-#: ../src/config.py:3042
+#: ../src/config.py:3047
 msgid "This account is already configured in Gajim."
 msgstr "Dieser Kontakt bwurde in Gajim bereits konfiguriert."
 
-#: ../src/config.py:3059
+#: ../src/config.py:3064
 msgid "Account has been added successfully"
 msgstr "Account wurde erfolgreich hinzugefügt"
 
-#: ../src/config.py:3060 ../src/config.py:3095
+#: ../src/config.py:3065 ../src/config.py:3100
 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."
@@ -3013,19 +3032,19 @@ msgstr ""
 "oder durch klicken des Konto-Menüpunktes im Bearbeiten-Menü des "
 "Hauptfensters erreichen."
 
-#: ../src/config.py:3094
+#: ../src/config.py:3099
 msgid "Your new account has been created successfully"
 msgstr "Ihr neues Konto wurde erfolgreich erstellt"
 
-#: ../src/config.py:3112
+#: ../src/config.py:3117
 msgid "An error occured during account creation"
 msgstr "Während der Konto-Erstellung ist ein Fehler aufgetreten"
 
-#: ../src/config.py:3170
+#: ../src/config.py:3175
 msgid "Account name is in use"
 msgstr "Kontoname ist schon vergeben"
 
-#: ../src/config.py:3171
+#: ../src/config.py:3176
 msgid "You already have an account using this name."
 msgstr "Sie haben bereits ein Konto mit diesem Namen."
 
@@ -3357,29 +3376,29 @@ msgstr "Neue einzelne Nachricht"
 msgid "New Private Message"
 msgstr "Neue private Nachricht"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1162 ../src/notify.py:424
+#: ../src/dialogs.py:1369 ../src/gajim.py:1168 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Neue E-Mail"
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1315 ../src/notify.py:418
+#: ../src/dialogs.py:1371 ../src/gajim.py:1321 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Dateitransfer Anfrage"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1134 ../src/gajim.py:1291
+#: ../src/dialogs.py:1373 ../src/gajim.py:1140 ../src/gajim.py:1297
 #: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Dateitransfer-Fehler"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1354 ../src/gajim.py:1376
-#: ../src/gajim.py:1393 ../src/notify.py:422
+#: ../src/dialogs.py:1375 ../src/gajim.py:1360 ../src/gajim.py:1382
+#: ../src/gajim.py:1399 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Dateitransfer beendet"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1357 ../src/notify.py:422
+#: ../src/dialogs.py:1376 ../src/gajim.py:1363 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Dateitransfer gestoppt"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1032 ../src/notify.py:426
+#: ../src/dialogs.py:1378 ../src/gajim.py:1038 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Gruppenchat-Einladung"
 
@@ -3522,15 +3541,15 @@ msgid "Adding Special Notification for %s"
 msgstr "Füge speziellen Hinweis für %s hinzu"
 
 #. # means number
-#: ../src/dialogs.py:2481
+#: ../src/dialogs.py:2478
 msgid "#"
 msgstr "Nr."
 
-#: ../src/dialogs.py:2487
+#: ../src/dialogs.py:2484
 msgid "Condition"
 msgstr "Bedingung"
 
-#: ../src/dialogs.py:2608
+#: ../src/dialogs.py:2605
 msgid "when I am "
 msgstr "wenn Ich bin "
 
@@ -3808,6 +3827,215 @@ msgstr "Absender: "
 msgid "Pause"
 msgstr "Pause"
 
+#: ../src/gajim.py:47
+msgid "Gajim needs Xserver to run. Quiting..."
+msgstr "Gajim benötigt einen laufenden Xserver. Breche ab ..."
+
+#: ../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: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:54
+msgid "Gajim needs GTK 2.6 or above"
+msgstr "Gajim benötigt GTK 2.6 oder höher"
+
+#: ../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:60
+msgid "GTK+ runtime is missing libglade support"
+msgstr "GTK+ runtine fehlt libglade-Unterstützung"
+
+#: ../src/gajim.py:62
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Bitte entfernen Sie Ihre derzeitige GTK+ Laufzeitumgebung und installieren "
+"Sie die aktuelle Version von %s"
+
+#: ../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:69
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Gajim benötigt PySQLite2 zum Starten"
+
+#: ../src/gajim.py:77
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim benötigt pywin32 zum Laufen"
+
+#: ../src/gajim.py:78
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+"Bitte stellen Sie sicher das Pywin32 auf Ihrem System installiert ist. Sie "
+"können es unter folgender URL herunterladen: %s "
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:190
+msgid "Gajim is already running"
+msgstr "Gajim läuft bereits"
+
+#: ../src/gajim.py:191
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+"Eine andere Instanz von Gajim schein bereits zu laufen\n"
+"Trotzdem starten?"
+
+#: ../src/gajim.py:298
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "HTTP (%s) Autorisierung für %s (id: %s)"
+
+#: ../src/gajim.py:299
+msgid "Do you accept this request?"
+msgstr "Akzeptieren Sie diese Anfrage?"
+
+#: ../src/gajim.py:345 ../src/notify.py:430
+msgid "Connection Failed"
+msgstr "Verbindung fehlgeschlagen"
+
+#: ../src/gajim.py:658
+#, python-format
+msgid "Subject: %s"
+msgstr "Thema: %s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:703 ../src/gajim.py:716
+#, python-format
+msgid "error while sending %s ( %s )"
+msgstr "Fehler beim Senden von %s ( %s )"
+
+#: ../src/gajim.py:749
+msgid "Authorization accepted"
+msgstr "Autorisierung akzeptiert"
+
+#: ../src/gajim.py:750
+#, 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:758
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Kontakt \"%s\" hat das Abonnement zurückgezogen"
+
+#: ../src/gajim.py:759
+msgid "You will always see him or her as offline."
+msgstr "Sie werden den Kontakt ab sofort als offline sehen."
+
+#: ../src/gajim.py:802
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Kontakt mit \"%s\" konnte nicht hergestellt werden"
+
+#: ../src/gajim.py:803 ../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:951 ../src/roster_window.py:1201
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s ist jetzt %s (%s)"
+
+#: ../src/gajim.py:1048
+msgid "Your passphrase is incorrect"
+msgstr "Ihre Passphrase ist falsch"
+
+#: ../src/gajim.py:1049
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Sie wurden ohne ihren GPG-Schlüssel verbunden"
+
+#: ../src/gajim.py:1151
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Neue E-Mail auf %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1153
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Sie haben %d ungelesene E-Mail-Nachricht"
+msgstr[1] "Sie haben %d ungelesene E-Mail-Nachrichten"
+
+#. FIXME: emulate Gtalk client popups. find out what they parse and how
+#. they decide what to show
+#. each message has a 'From', 'Subject' and 'Snippet' field
+#: ../src/gajim.py:1162
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+"\n"
+"Von: %(from_address)s"
+
+#: ../src/gajim.py:1318
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s möchte ihnen eine Datei senden."
+
+#: ../src/gajim.py:1383
+#, 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:1387
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Dateitransfer %(filename)s von %(name)s wurde gestoppt."
+
+#: ../src/gajim.py:1400
+#, 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:1404
+#, 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:1510
+msgid "Username Conflict"
+msgstr "Benutzernamenkonflikt"
+
+#: ../src/gajim.py:1511
+msgid "Please type a new username for your local account"
+msgstr ""
+"<b>Bitte geben Sie einen neuen Benutzernamen für Ihr lokales 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:1850
+msgid "Could not save your settings and preferences"
+msgstr "Konnte Einstellungen nicht speichern"
+
+#: ../src/gajim.py:2042
+msgid "Network Manager support not available"
+msgstr "Unterstützung für Network Manager nicht verfügbar"
+
+#: ../src/gajim.py:2117
+msgid "Session Management support not available (missing gnome.ui module)"
+msgstr "Sitzungsmanagment-Unterstützung nicht verfügbar (Modul gnome.ui fehlt)"
+
 #: ../src/gajim-remote.py:66
 msgid "Shows a help on specific command"
 msgstr "zeige die Hilfe für einen bestimmten Befehl"
@@ -4120,214 +4348,6 @@ msgstr ""
 "Argument \"%s\" wurde nicht angegeben. \n"
 "Geben Sie \"%s help %s\" ein für Hilfe"
 
-#: ../src/gajim.py:47
-msgid "Gajim needs Xserver to run. Quiting..."
-msgstr "Gajim benötigt einen laufenden Xserver. Breche ab ..."
-
-#: ../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: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:54
-msgid "Gajim needs GTK 2.6 or above"
-msgstr "Gajim benötigt GTK 2.6 oder höher"
-
-#: ../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:60
-msgid "GTK+ runtime is missing libglade support"
-msgstr "GTK+ runtine fehlt libglade-Unterstützung"
-
-#: ../src/gajim.py:62
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Bitte entfernen Sie Ihre derzeitige GTK+ Laufzeitumgebung und installieren "
-"Sie die aktuelle Version von %s"
-
-#: ../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:69
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim benötigt PySQLite2 zum Starten"
-
-#: ../src/gajim.py:77
-msgid "Gajim needs pywin32 to run"
-msgstr "Gajim benötigt pywin32 zum Laufen"
-
-#: ../src/gajim.py:78
-#, python-format
-msgid ""
-"Please make sure that Pywin32 is installed on your system. You can get it at "
-"%s"
-msgstr ""
-"Bitte stellen Sie sicher das Pywin32 auf Ihrem System installiert ist. Sie "
-"können es unter folgender URL herunterladen: %s "
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:190
-msgid "Gajim is already running"
-msgstr "Gajim läuft bereits"
-
-#: ../src/gajim.py:191
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-"Eine andere Instanz von Gajim schein bereits zu laufen\n"
-"Trotzdem starten?"
-
-#: ../src/gajim.py:298
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) Autorisierung für %s (id: %s)"
-
-#: ../src/gajim.py:299
-msgid "Do you accept this request?"
-msgstr "Akzeptieren Sie diese Anfrage?"
-
-#: ../src/gajim.py:345 ../src/notify.py:430
-msgid "Connection Failed"
-msgstr "Verbindung fehlgeschlagen"
-
-#: ../src/gajim.py:658
-#, python-format
-msgid "Subject: %s"
-msgstr "Thema: %s"
-
-#: ../src/gajim.py:703
-#, python-format
-msgid "error while sending %s ( %s )"
-msgstr "Fehler beim Senden von %s ( %s )"
-
-#: ../src/gajim.py:743
-msgid "Authorization accepted"
-msgstr "Autorisierung akzeptiert"
-
-#: ../src/gajim.py:744
-#, 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:752
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Kontakt \"%s\" hat das Abonnement zurückgezogen"
-
-#: ../src/gajim.py:753
-msgid "You will always see him or her as offline."
-msgstr "Sie werden den Kontakt ab sofort als offline sehen."
-
-#: ../src/gajim.py:796
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Kontakt mit \"%s\" konnte nicht hergestellt werden"
-
-#: ../src/gajim.py:797 ../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:945 ../src/roster_window.py:1201
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s ist jetzt %s (%s)"
-
-#: ../src/gajim.py:1042
-msgid "Your passphrase is incorrect"
-msgstr "Ihre Passphrase ist falsch"
-
-#: ../src/gajim.py:1043
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Sie wurden ohne ihren GPG-Schlüssel verbunden"
-
-#: ../src/gajim.py:1145
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Neue E-Mail auf %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1147
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "Sie haben %d ungelesene E-Mail-Nachricht"
-msgstr[1] "Sie haben %d ungelesene E-Mail-Nachrichten"
-
-#. FIXME: emulate Gtalk client popups. find out what they parse and how
-#. they decide what to show
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1156
-#, python-format
-msgid ""
-"\n"
-"From: %(from_address)s"
-msgstr ""
-"\n"
-"Von: %(from_address)s"
-
-#: ../src/gajim.py:1312
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s möchte ihnen eine Datei senden."
-
-#: ../src/gajim.py:1377
-#, 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:1381
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Dateitransfer %(filename)s von %(name)s wurde gestoppt."
-
-#: ../src/gajim.py:1394
-#, 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:1398
-#, 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:1504
-msgid "Username Conflict"
-msgstr "Benutzernamenkonflikt"
-
-#: ../src/gajim.py:1505
-msgid "Please type a new username for your local account"
-msgstr ""
-"<b>Bitte geben Sie einen neuen Benutzernamen für Ihr lokales 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:1843
-msgid "Could not save your settings and preferences"
-msgstr "Konnte Einstellungen nicht speichern"
-
-#: ../src/gajim.py:2035
-msgid "Network Manager support not available"
-msgstr "Unterstützung für Network Manager nicht verfügbar"
-
-#: ../src/gajim.py:2110
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Sitzungsmanagment-Unterstützung nicht verfügbar (Modul gnome.ui fehlt)"
-
 #: ../src/gajim_themes_window.py:60
 msgid "Theme"
 msgstr "Thema"
@@ -4345,117 +4365,119 @@ msgstr "Sie können ihr derzeitiges Theme nicht löschen"
 msgid "Please first choose another for your current theme."
 msgstr "Bitte wählen Sie zuerst einen anderen Namen für ihr derzeitiges Theme."
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chat"
 msgstr "Privater Chat"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: ../src/groupchat_control.py:120
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Senden privater Nachricht fehlgeschlagen"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
-msgstr "Sie sind nicht mehr im Gruppenchat \"%s\" oder \"%s\" hat den Gruppenchat verlassen."
+msgstr ""
+"Sie sind nicht mehr im Gruppenchat \"%s\" oder \"%s\" hat den Gruppenchat "
+"verlassen."
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chat"
 msgstr "Gruppenchat"
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chats"
 msgstr "Gruppenchat"
 
-#: ../src/groupchat_control.py:315
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Spitzname einfügen"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:810
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s wurde rausgeschmissen: %(reason)s"
 
-#: ../src/groupchat_control.py:814
+#: ../src/groupchat_control.py:816
 #, 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:821
+#: ../src/groupchat_control.py:823
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s wurde gebannt: %(reason)s"
 
-#: ../src/groupchat_control.py:825
+#: ../src/groupchat_control.py:827
 #, 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:833
+#: ../src/groupchat_control.py:835
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sie heißen nun %s"
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:837
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s heißt jetzt %s"
 
-#: ../src/groupchat_control.py:915
+#: ../src/groupchat_control.py:917
 #, python-format
 msgid "%s has left"
 msgstr "%s ist gegangen"
 
-#: ../src/groupchat_control.py:920
+#: ../src/groupchat_control.py:922
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s hat den Gruppenchat betreten"
 
 #. No status message
-#: ../src/groupchat_control.py:922 ../src/roster_window.py:1204
+#: ../src/groupchat_control.py:924 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s ist jetzt %s"
 
-#: ../src/groupchat_control.py:1041 ../src/groupchat_control.py:1059
-#: ../src/groupchat_control.py:1152 ../src/groupchat_control.py:1169
+#: ../src/groupchat_control.py:1043 ../src/groupchat_control.py:1061
+#: ../src/groupchat_control.py:1154 ../src/groupchat_control.py:1171
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Spitzname nicht gefunden: %s"
 
-#: ../src/groupchat_control.py:1075
+#: ../src/groupchat_control.py:1077
 msgid "This group chat has no subject"
 msgstr "Dieser Gruppenchat hat kein Thema"
 
-#: ../src/groupchat_control.py:1088
+#: ../src/groupchat_control.py:1090
 #, 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:1095 ../src/groupchat_control.py:1123
+#: ../src/groupchat_control.py:1097 ../src/groupchat_control.py:1125
 #, 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:1206
+#: ../src/groupchat_control.py:1208
 #, 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:1229
+#: ../src/groupchat_control.py:1231
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandos: %s"
 
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1233
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4463,12 +4485,12 @@ msgid ""
 "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 Gruppenchat. Der "
-"Spitzname eines Teilnehmers kann hinzugefügt werden, aber nicht, wenn es ein "
-"\"@\" enthält. Wenn die JID derzeit im Gruppenchat ist, wird er/sie/es ebenfalls "
-"gebannt. Unterstützt KEINE Leerzeichen im Spitznamen."
+"Bedienung: /%s <Spitzname|JID> [Grund], bannt die JID aus dem Gruppenchat. "
+"Der Spitzname eines Teilnehmers kann hinzugefügt werden, aber nicht, wenn es "
+"ein \"@\" enthält. Wenn die JID derzeit im Gruppenchat ist, wird er/sie/es "
+"ebenfalls gebannt. Unterstützt KEINE Leerzeichen im Spitznamen."
 
-#: ../src/groupchat_control.py:1238
+#: ../src/groupchat_control.py:1240
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4476,12 +4498,12 @@ msgstr ""
 "Bedienung: /%s <Spitzname>, öffnet ein privates Chatfenster mit dem "
 "spezifierten Teilnehmer."
 
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1244
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Bedienung: /%s, leert das Textfenster."
 
-#: ../src/groupchat_control.py:1244
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4490,12 +4512,12 @@ msgstr ""
 "Bedienung: /%s [Grund], schließt das aktuelle Fenster oder Tab, mit Anzeige "
 "eines Grundes, falls angegeben."
 
-#: ../src/groupchat_control.py:1247
+#: ../src/groupchat_control.py:1249
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Verwendung: /%s, versteckt die Chatbuttons."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1252
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4504,7 +4526,7 @@ msgstr ""
 "Bedienung: /%s <JID> [Grund], lädt die JID in den aktuellen Gruppenchat ein, "
 "optional mit der Angabe eines Grundes."
 
-#: ../src/groupchat_control.py:1254
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4513,7 +4535,7 @@ msgstr ""
 "Bedienung: /%s <Raum>@<Server> [/Spitzname], bietet den Beitritt zu "
 "Raum@Server an, optional mit Spitznamen."
 
-#: ../src/groupchat_control.py:1258
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4521,19 +4543,19 @@ msgid ""
 "spaces in nickname."
 msgstr ""
 "Bedienung: /%s <Spitzname> [Grund], verweist den Inhaber des Spitznamen des "
-"Gruppenchats und zeigt optional einen Grund. Unterstützt KEINE Leerzeichen im "
-"Spitznamen."
+"Gruppenchats und zeigt optional einen Grund. Unterstützt KEINE Leerzeichen "
+"im Spitznamen."
 
-#: ../src/groupchat_control.py:1263
+#: ../src/groupchat_control.py:1265
 #, python-format
 msgid ""
 "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 Gruppenchat. Verwende "
-"dritte Person, z.B. /%s explodiert)."
+"Bedienung: /%s <Aktion>, sendet die Aktion im aktuellen Gruppenchat. "
+"Verwende dritte Person, z.B. /%s explodiert)."
 
-#: ../src/groupchat_control.py:1267
+#: ../src/groupchat_control.py:1269
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4543,23 +4565,25 @@ msgstr ""
 "Nachrichtenfenster und sendet die Nachricht zum Inhaber des angegebenen "
 "Spitznamen."
 
-#: ../src/groupchat_control.py:1272
+#: ../src/groupchat_control.py:1274
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Bedienung: /%s <Spitzname>, ändert den Spitznamen im aktuellen Gruppenchat."
+msgstr ""
+"Bedienung: /%s <Spitzname>, ändert den Spitznamen im aktuellen Gruppenchat."
 
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1278
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Benutzung: /%s , zeigt die Namen der Gruppenchatbesucher."
 
-#: ../src/groupchat_control.py:1280
+#: ../src/groupchat_control.py:1282
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
-"Benutzung: /%s [topic], zeigt oder aktualisiert das derzeitige Gruppenchat-Thema."
+"Benutzung: /%s [topic], zeigt oder aktualisiert das derzeitige Gruppenchat-"
+"Thema."
 
-#: ../src/groupchat_control.py:1283
+#: ../src/groupchat_control.py:1285
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -4567,74 +4591,74 @@ msgstr ""
 "Benutzung: /%s <Nachricht>, sendet eine Nachricht ohne andere Befehle zu "
 "beachten."
 
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1288
 #, python-format
 msgid "No help info for /%s"
 msgstr "Keine Hilfe vorhanden für /%s"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Möchten Sie den Gruppenchat \"%s\" wirklich verlassen?g"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1339
 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 Gruppenchat."
 "geschlossen."
 
-#: ../src/groupchat_control.py:1341 ../src/roster_window.py:3961
+#: ../src/groupchat_control.py:1343 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "_Nicht noch einmal fragen"
 
-#: ../src/groupchat_control.py:1375
+#: ../src/groupchat_control.py:1377
 msgid "Changing Subject"
 msgstr "Thema ändern"
 
-#: ../src/groupchat_control.py:1376
+#: ../src/groupchat_control.py:1378
 msgid "Please specify the new subject:"
 msgstr "Bitte bestimmen Sie ein neues Thema"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1387
 msgid "Changing Nickname"
 msgstr "Spitzname ändern"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1388
 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:1411
+#: ../src/groupchat_control.py:1413
 msgid "Bookmark already set"
 msgstr "Lesezeichen existiert schon"
 
-#: ../src/groupchat_control.py:1412
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Der Gruppenchat \"%s\" ist schon in den Lesezeichen."
 
-#: ../src/groupchat_control.py:1421
+#: ../src/groupchat_control.py:1423
 msgid "Bookmark has been added successfully"
 msgstr "Lesezeichen wurde erfolgreich hinzugefügt"
 
-#: ../src/groupchat_control.py:1422
+#: ../src/groupchat_control.py:1424
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Sie können ihre Lesezeichen über das Aktionen-Menü in der Kontaktliste "
 "bearbeiten"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1548
+#: ../src/groupchat_control.py:1550
 #, python-format
 msgid "Kicking %s"
 msgstr "%s rausschmeißen"
 
-#: ../src/groupchat_control.py:1549 ../src/groupchat_control.py:1831
+#: ../src/groupchat_control.py:1551 ../src/groupchat_control.py:1833
 msgid "You may specify a reason below:"
 msgstr "Sie können eine Begründung angeben:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1830
+#: ../src/groupchat_control.py:1832
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
@@ -4900,7 +4924,8 @@ msgstr "Beobachter"
 
 #: ../src/roster_window.py:686 ../src/roster_window.py:3132
 msgid "You cannot join a group chat while you are invisible"
-msgstr "Sie können einem Gruppenchat nicht beitreten, wenn Sie unsichtbar sind."
+msgstr ""
+"Sie können einem Gruppenchat nicht beitreten, wenn Sie unsichtbar sind."
 
 #. new chat
 #. for chat_with
@@ -5408,7 +5433,8 @@ msgstr "Erstelle Verzeichnis %s"
 
 #: ../src/common/config.py:55
 msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr "Verwende D-Bus und Notification-Daemon, um Benachrichtigungen zu zeigen"
+msgstr ""
+"Verwende D-Bus und Notification-Daemon, um Benachrichtigungen zu zeigen"
 
 #: ../src/common/config.py:60
 msgid "Time in minutes, after which your status changes to away."
@@ -5457,9 +5483,10 @@ msgid ""
 "to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. "
 "This is used only if print_time is 'sometimes'."
 msgstr ""
-"Zeige die Zeit in Chats mittels Fuzzy Clock. Wert für Fuzzy von 1 bis 4 oder 0, "
-"um die Fuzzy Clock zu deaktieren. 1 ist am genauesten, 4 ist die ungenaueste. "
-"Dies wird nur verwendet, wenn print_time auf 'sometimes' gesetzt ist."
+"Zeige die Zeit in Chats mittels Fuzzy Clock. Wert für Fuzzy von 1 bis 4 oder "
+"0, um die Fuzzy Clock zu deaktieren. 1 ist am genauesten, 4 ist die "
+"ungenaueste. Dies wird nur verwendet, wenn print_time auf 'sometimes' "
+"gesetzt ist."
 
 #: ../src/common/config.py:95
 msgid "Treat * / _ pairs as possible formatting characters."
@@ -5477,24 +5504,24 @@ msgid ""
 "Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
 "(If you want to use this, install docutils)"
 msgstr ""
-"Verwendet ReStructured Textmarkierungen für HTML und ASCII-Formatierung falls aktiviere "
-"(falls Sie dies wünschen, installieren Sie docutils)."
+"Verwendet ReStructured Textmarkierungen für HTML und ASCII-Formatierung "
+"falls aktiviere (falls Sie dies wünschen, installieren Sie docutils)."
 
 #: ../src/common/config.py:108
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
-"Zeichen, das hinter Spitznamen angezeigt wird, wenn Spitznamenvervollständigung (Tab) "
-"im Gruppenchat verwendet wird."
+"Zeichen, das hinter Spitznamen angezeigt wird, wenn "
+"Spitznamenvervollständigung (Tab) im Gruppenchat verwendet wird."
 
 #: ../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 ""
-"Zeichen, das hinter den gewünschten Spitznamen gehängt wird, falls der gewünschte"
-"Name im Gruppenchat bereits vergeben ist."
+"Zeichen, das hinter den gewünschten Spitznamen gehängt wird, falls der "
+"gewünschteName im Gruppenchat bereits vergeben ist."
 
 #: ../src/common/config.py:142
 msgid "Add * and [n] in roster title?"
@@ -5548,15 +5575,16 @@ msgid ""
 "connection."
 msgstr ""
 "Wenn aktiviert, reagiere auf D-Bus-Signale von NetworkManager and ändere den "
-"Status von Konten (vorausgesetzt, sie haben listen_to_network_manager nicht auf "
-"False gesetzt und sie synchronisieren sich mit dem globalen Status) basierend auf dem"
-"Status der Netzwerkverbindung."
+"Status von Konten (vorausgesetzt, sie haben listen_to_network_manager nicht "
+"auf False gesetzt und sie synchronisieren sich mit dem globalen Status) "
+"basierend auf demStatus der Netzwerkverbindung."
 
 #: ../src/common/config.py:155
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
-"Chat-Statusbenachrichtigungen gesendet. Kann eine von allen sein, composing_only deaktiviert."
+"Chat-Statusbenachrichtigungen gesendet. Kann eine von allen sein, "
+"composing_only deaktiviert."
 
 #: ../src/common/config.py:156
 msgid ""
@@ -5571,8 +5599,8 @@ msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
-"Wenn die Uhrzeit nicht für jede Nachricht angezeigt werden soll (print_time==sometimes), zeige"
-"sie alle x Minuten."
+"Wenn die Uhrzeit nicht für jede Nachricht angezeigt werden soll "
+"(print_time==sometimes), zeigesie alle x Minuten."
 
 #: ../src/common/config.py:159
 msgid "Ask before closing a group chat tab/window."
@@ -5682,12 +5710,11 @@ msgid ""
 "status messages. If \"in_and_out\", gajim will only print FOO enters/leaves "
 "group chat."
 msgstr ""
-"kann \"none\", \"all\" oder \"in_and_out\" sein. Falls \"none\", wird Gajim keine "
-"Status-Zeilen mehr in Gruppenchats anzeigen, wenn ein Mitglied seinen Status "
-"oder seine Statusnachricht ändert. Falls \"alL\", wird Gajim alle Statusnachrichten "
-"anzeigen. Falls \"in_and_out\", wird Gajim nur einen Status anzeigen, wenn jemand"
-"den Gruppenchat betritt oder verlässt."
-""
+"kann \"none\", \"all\" oder \"in_and_out\" sein. Falls \"none\", wird Gajim "
+"keine Status-Zeilen mehr in Gruppenchats anzeigen, wenn ein Mitglied seinen "
+"Status oder seine Statusnachricht ändert. Falls \"alL\", wird Gajim alle "
+"Statusnachrichten anzeigen. Falls \"in_and_out\", wird Gajim nur einen "
+"Status anzeigen, wenn jemandden Gruppenchat betritt oder verlässt."
 
 #: ../src/common/config.py:199
 msgid "Background color of contacts when they just signed in."
@@ -5728,9 +5755,9 @@ msgid ""
 "chat. Turn this option to False to stop sending sha info in group chat "
 "presences."
 msgstr ""
-"Jabberd1.4 mag keine SHA-Informationen wenn ein passwortgeschützter Gruppenchat "
-"betreten wird. Deaktivieren Sie diese Option um keine SHA-Informationen in "
-"Gruppenchats zu senden"
+"Jabberd1.4 mag keine SHA-Informationen wenn ein passwortgeschützter "
+"Gruppenchat betreten wird. Deaktivieren Sie diese Option um keine SHA-"
+"Informationen in Gruppenchats zu senden"
 
 #. always, never, peracct, pertype should not be translated
 #: ../src/common/config.py:210
@@ -5746,7 +5773,8 @@ msgstr ""
 "Kontrolliert das Fenster in dem neue Nachrichten platziert werden.\n"
 "'always' - Alle Nachrichten landen in einem einzelnen Fenster.\n"
 "'never' Alle Nachrichten bekommen ihr eigenes Fenster.\n"
-"'peracct' - Nachrichten für jeden Account landen in einem speziellen Fenster.\n"
+"'peracct' - Nachrichten für jeden Account landen in einem speziellen "
+"Fenster.\n"
 "'pertype' - Jede Nachrichtentyp (z.B. Chat vs. Gruppenchat) landet in in "
 "einem speziellen Fenster. Falls Sie diese Option ändern, muss Gajim neu "
 "gestartet werden, damit die Änderungen übernommen werden"
@@ -5790,7 +5818,8 @@ msgstr ""
 
 #: ../src/common/config.py:219
 msgid "Indentation when using merge consecutive nickame."
-msgstr "Einrücken, wenn das Zusammenführen nachfolgender Spitznamen verwendet wird."
+msgstr ""
+"Einrücken, wenn das Zusammenführen nachfolgender Spitznamen verwendet wird."
 
 #: ../src/common/config.py:220
 msgid "List of colors that will be used to color nicknames in group chats."
@@ -5967,99 +5996,6 @@ msgstr "menschlich"
 msgid "marine"
 msgstr "Marine"
 
-#: ../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:165
-msgid "Reconnect manually."
-msgstr "Manuelle Neuverbindung."
-
-#: ../src/common/connection.py:176 ../src/common/connection.py:203
-#, python-format
-msgid "Transport %s answered wrongly to register request: %s"
-msgstr ""
-"Transport %s beantwortete unsere Registrierungsanfrage nicht korrekt: %s"
-
-#. wrong answer
-#: ../src/common/connection.py:202
-msgid "Invalid answer"
-msgstr "Ungültige Antwort"
-
-#: ../src/common/connection.py:394 ../src/common/connection.py:429
-#: ../src/common/connection.py:872
-#: ../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:408
-#, python-format
-msgid "Connected to server %s:%s with %s"
-msgstr "Verbunden mit Server %s:%s mit %s"
-
-#: ../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:455
-#, python-format
-msgid "Authentication failed with \"%s\""
-msgstr "Authentifizierung mit \"%s\" fehlgeschlagen"
-
-#: ../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: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: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:615
-msgid "invisible"
-msgstr "unsichtbar"
-
-#: ../src/common/connection.py:616
-msgid "offline"
-msgstr "abgemeldet"
-
-#: ../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:708
-msgid "[This message is *encrypted* (See :JEP:`27`]"
-msgstr "[Diese Nachricht ist *verschlüsselt* (Siehe: JEP:`27`)]"
-
-#: ../src/common/connection.py:759
-#: ../src/common/zeroconf/connection_zeroconf.py:397
-#, python-format
-msgid ""
-"Subject: %s\n"
-"%s"
-msgstr ""
-"Thema: %s\n"
-"%s"
-
-#: ../src/common/connection.py:898
-msgid "Not fetched because of invisible status"
-msgstr "Nicht abgeholt aufgrund eines Unsichtbar-Status"
-
 #: ../src/common/connection_handlers.py:52
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 msgid "Unable to load idle module"
@@ -6166,6 +6102,99 @@ msgstr ""
 "Verwenden Sie ein Roster-Managment-Tool wie <http://jru.jabberstudio.org/>, "
 "um ihn zu entfernen"
 
+#: ../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:165
+msgid "Reconnect manually."
+msgstr "Manuelle Neuverbindung."
+
+#: ../src/common/connection.py:176 ../src/common/connection.py:203
+#, python-format
+msgid "Transport %s answered wrongly to register request: %s"
+msgstr ""
+"Transport %s beantwortete unsere Registrierungsanfrage nicht korrekt: %s"
+
+#. wrong answer
+#: ../src/common/connection.py:202
+msgid "Invalid answer"
+msgstr "Ungültige Antwort"
+
+#: ../src/common/connection.py:394 ../src/common/connection.py:429
+#: ../src/common/connection.py:877
+#: ../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:408
+#, python-format
+msgid "Connected to server %s:%s with %s"
+msgstr "Verbunden mit Server %s:%s mit %s"
+
+#: ../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:455
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "Authentifizierung mit \"%s\" fehlgeschlagen"
+
+#: ../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: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: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:615
+msgid "invisible"
+msgstr "unsichtbar"
+
+#: ../src/common/connection.py:616
+msgid "offline"
+msgstr "abgemeldet"
+
+#: ../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:708
+msgid "[This message is *encrypted* (See :JEP:`27`]"
+msgstr "[Diese Nachricht ist *verschlüsselt* (Siehe: JEP:`27`)]"
+
+#: ../src/common/connection.py:764
+#: ../src/common/zeroconf/connection_zeroconf.py:397
+#, python-format
+msgid ""
+"Subject: %s\n"
+"%s"
+msgstr ""
+"Thema: %s\n"
+"%s"
+
+#: ../src/common/connection.py:903
+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:33
 msgid "D-Bus python bindings are missing in this computer"
@@ -6685,26 +6714,8 @@ msgstr "[Diese Nachricht ist verschlüsselt]"
 msgid "Error while adding service. %s"
 msgstr "Fehler beim Hinzufügen des Dienstes. %s"
 
-#~ msgid ""
-#~ "Receive a Message\n"
-#~ "Contact Connected\n"
-#~ "Contact Disconnected\n"
-#~ "Contact Change Status\n"
-#~ "Group Chat Message Highlight\n"
-#~ "Group Chat Message Received\n"
-#~ "File Transfert Resquest\n"
-#~ "File Transfert Started\n"
-#~ "File Transfert Finished"
-#~ msgstr ""
-#~ "Nachricht empfangen\n"
-#~ "Kontakt verbunden\n"
-#~ "Kontakt nicht mehr verbunden\n"
-#~ "Kontakt ändert Status\n"
-#~ "Gruppenchat-Nachricht hervorgehoben\n"
-#~ "Gruppenchat-Nachricht empfangen\n"
-#~ "Anfrage zur Dateiübertragung\n"
-#~ "Dateiübertragung begonnen\n"
-#~ "Dateiübertragung beendet"
+#~ msgid "Receive a Message"
+#~ msgstr "Nachricht empfangen"
 
 #~ msgid "_New room"
 #~ msgstr "_Neuer Raum"
diff --git a/po/el.po b/po/el.po
index effe61cdd..7bc253cfb 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-12-02 17:15+0100\n"
+"POT-Creation-Date: 2006-12-09 10:02+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"
@@ -330,16 +330,16 @@ msgid "Manage..."
 msgstr "Διαχείριση..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1637
-#: ../src/config.py:3430
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1642
+#: ../src/config.py:3435
 msgid "No key selected"
 msgstr "Καμία επιλογή κλειδιού"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1219
-#: ../src/config.py:1224 ../src/config.py:1408 ../src/config.py:1627
-#: ../src/config.py:1636 ../src/config.py:1695 ../src/config.py:1769
-#: ../src/config.py:2640 ../src/config.py:3420 ../src/config.py:3429
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1224
+#: ../src/config.py:1229 ../src/config.py:1413 ../src/config.py:1632
+#: ../src/config.py:1641 ../src/config.py:1700 ../src/config.py:1774
+#: ../src/config.py:2645 ../src/config.py:3425 ../src/config.py:3434
 #: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Τίποτα"
@@ -533,6 +533,46 @@ msgstr "_Εγγραφή"
 msgid "_User ID:"
 msgstr "Ταυτότητα χρήστη:"
 
+#: ../data/glade/adhoc_commands_window.glade.h:1
+#, fuzzy
+msgid "<b>An error has occured:</b>"
+msgstr "Συνέβει σφάλμα πρωτοκόλου:"
+
+#: ../data/glade/adhoc_commands_window.glade.h:2
+msgid "<b>Choose command to execute:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:3
+msgid "Ad-hoc Commands - Gajim"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:4
+msgid "Check once more"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:5
+#, fuzzy
+msgid "Error description..."
+msgstr "Περιγραφή"
+
+#: ../data/glade/adhoc_commands_window.glade.h:6
+#, fuzzy
+msgid "Please wait while retrieving command list..."
+msgstr "Παρακαλώ περιμένετε όσο μεταφέρεται το ιστορικό..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:7
+#, fuzzy
+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>"
@@ -684,13 +724,13 @@ msgstr "Αναπαραγωγή _ήχων"
 #: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
-"Contact Connected\n"
-"Contact Disconnected\n"
-"Contact Change Status\n"
-"Group Chat Message Highlight\n"
-"Group Chat Message Received\n"
-"File Transfert Resquest\n"
-"File Transfert Started\n"
+"Contact Connected \n"
+"Contact Disconnected \n"
+"Contact Change Status \n"
+"Group Chat Message Highlight \n"
+"Group Chat Message Received \n"
+"File Transfert Resquest \n"
+"File Transfert Started \n"
 "File Transfert Finished"
 msgstr ""
 
@@ -763,6 +803,46 @@ 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 "όνομα θέματος"
+
+#: ../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 "Αλλαγή κωδικού"
@@ -848,7 +928,7 @@ msgstr "_Συμπαγής όψη   Alt+C"
 msgid "_History"
 msgstr "_Ιστορικό"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/glade/data_form_window.glade.h:1 ../src/dataforms_widget.py:76
 #, fuzzy
 msgid "Fill in the form."
 msgstr "Στην ομάδα"
@@ -1068,6 +1148,20 @@ 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:259
+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"
@@ -1232,7 +1326,7 @@ msgstr "Χρήση πιστοποίησης"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1116
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
 msgid "OpenPGP Encryption"
 msgstr "Κρυπτογράφηση OpenPGP"
 
@@ -1357,7 +1451,7 @@ msgstr ""
 msgid "B_efore nickname:"
 msgstr "Π_ριν το ψευδώνυμο:"
 
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:841
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
 msgid "Chat"
 msgstr "Κουβέντα"
 
@@ -2495,34 +2589,34 @@ msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
 msgid "Your message can not be sent until you are connected."
 msgstr "Δε μπορεί να σταλεί το μήνυμα σας εκτός αν είστε συνδεδεμένος."
 
-#: ../src/chat_control.py:841
+#: ../src/chat_control.py:844
 msgid "Chats"
 msgstr "Κουβέντες"
 
-#: ../src/chat_control.py:1042
+#: ../src/chat_control.py:1030
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1130
+#: ../src/chat_control.py:1118
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "Ο/η %s δεν έχει στείλει ένα κλειδί OpenPGP ούτε εσείς έχετε εφαρμόσει κάποιο"
 
-#: ../src/chat_control.py:1266
+#: ../src/chat_control.py:1254
 msgid "Encryption enabled"
 msgstr "Ενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1259
 msgid "Encryption disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1413 ../src/conversation_textview.py:493
-#: ../src/dialogs.py:629 ../src/gajim.py:727 ../src/gajim.py:728
-#: ../src/gajim.py:1067 ../src/roster_window.py:328
+#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495
+#: ../src/dialogs.py:629 ../src/gajim.py:733 ../src/gajim.py:734
+#: ../src/gajim.py:1073 ../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
@@ -2533,12 +2627,12 @@ msgid "Not in Roster"
 msgstr "εκτός λίστας επαφών"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1545
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Mόλις λάβατε ένα μήνυμα από \"%s\""
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1546
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2546,103 +2640,103 @@ msgstr ""
 "Εάν κλείσετε αυτήν την καρτέλα και έχετε απενεργοποιημένο το ιστορικό, το "
 "μήνυμα θα χαθεί."
 
-#: ../src/config.py:130 ../src/config.py:589
+#: ../src/config.py:135 ../src/config.py:594
 msgid "Disabled"
 msgstr "Απενεργοποιημένο"
 
-#: ../src/config.py:216
+#: ../src/config.py:221
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Κάθε %s _λεπτά"
 
-#: ../src/config.py:358
+#: ../src/config.py:363
 msgid "Active"
 msgstr "Ενεργοποιημένο"
 
-#: ../src/config.py:366
+#: ../src/config.py:371
 msgid "Event"
 msgstr "Γεγονός"
 
-#: ../src/config.py:679 ../src/gajim.py:2086
+#: ../src/config.py:684 ../src/gajim.py:2094
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
 
-#: ../src/config.py:680 ../src/gajim.py:2087
+#: ../src/config.py:685 ../src/gajim.py:2095
 #, 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:1032
+#: ../src/config.py:1037
 msgid "status message title"
 msgstr "τίτλος μηνύματος κατάστασης"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1037
 msgid "status message text"
 msgstr "κείμενο μηνύματος κατάστασης"
 
-#: ../src/config.py:1067
+#: ../src/config.py:1072
 msgid "First Message Received"
 msgstr "Λήφθηκε το πρώτο μήνυμα"
 
-#: ../src/config.py:1068
+#: ../src/config.py:1073
 msgid "Next Message Received"
 msgstr "Επόμενο μήνυμα ελήφθη"
 
-#: ../src/config.py:1069
+#: ../src/config.py:1074
 msgid "Contact Connected"
 msgstr "Σύνδεση επαφής"
 
-#: ../src/config.py:1070
+#: ../src/config.py:1075
 msgid "Contact Disconnected"
 msgstr "Αποσύνδεση επαφής"
 
-#: ../src/config.py:1071
+#: ../src/config.py:1076
 msgid "Message Sent"
 msgstr "Το μήνυμα στάλθηκε"
 
-#: ../src/config.py:1072
+#: ../src/config.py:1077
 msgid "Group Chat Message Highlight"
 msgstr "Επισήμανση "
 
-#: ../src/config.py:1073
+#: ../src/config.py:1078
 msgid "Group Chat Message Received"
 msgstr "Λήφθηκε μήνυμα ομαδικής κουβέντας"
 
-#: ../src/config.py:1080
+#: ../src/config.py:1085
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Παραλήφθηκε μια πρόσκληση"
 
-#: ../src/config.py:1283
+#: ../src/config.py:1288
 msgid "OpenPGP is not usable in this computer"
 msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
 
-#: ../src/config.py:1329
+#: ../src/config.py:1334
 msgid "You are currently connected to the server"
 msgstr "Αυτή τη στιγμή είστε συνδεδεμένος στο διακομιστή"
 
-#: ../src/config.py:1330
+#: ../src/config.py:1335
 msgid "To change the account name, you must be disconnected."
 msgstr "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να αποσυνδεθείτε."
 
-#: ../src/config.py:1333 ../src/config.py:1925
+#: ../src/config.py:1338 ../src/config.py:1930
 msgid "Unread events"
 msgstr "Αδιάβαστα γεγονότα"
 
-#: ../src/config.py:1334
+#: ../src/config.py:1339
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να διαβάσετε όλα τα εκκρεμή "
 "γεγονότα."
 
-#: ../src/config.py:1338
+#: ../src/config.py:1343
 msgid "Account Name Already Used"
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#: ../src/config.py:1339
+#: ../src/config.py:1344
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2650,184 +2744,184 @@ msgstr ""
 "Αυτό το όνομα χρησιμοποιείται ήδη από κάποιον άλλον από τους λογαριασμούς "
 "σας. Παρακαλώ, επιλέξτε άλλο όνομα."
 
-#: ../src/config.py:1343 ../src/config.py:1347
+#: ../src/config.py:1348 ../src/config.py:1352
 msgid "Invalid account name"
 msgstr "Μη έγκυρο όνομα λογαριασμού"
 
-#: ../src/config.py:1344
+#: ../src/config.py:1349
 msgid "Account name cannot be empty."
 msgstr "Το όνομα λογαριασμού δε μπορεί να είναι κενό."
 
-#: ../src/config.py:1348
+#: ../src/config.py:1353
 msgid "Account name cannot contain spaces."
 msgstr "Το όνομα λογαριασμού δε μπορεί να έχει κενά."
 
-#: ../src/config.py:1356 ../src/config.py:1362 ../src/config.py:1372
-#: ../src/config.py:3030
+#: ../src/config.py:1361 ../src/config.py:1367 ../src/config.py:1377
+#: ../src/config.py:3035
 msgid "Invalid Jabber ID"
 msgstr "Μη έγκυρο Jabber ID"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1368
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr ""
 "Ένα Jabber ID πρέπει να είναι στην μορφή \"όνομα_χρήστη@όνομα_διακομιστή\"."
 
-#: ../src/config.py:1422
+#: ../src/config.py:1427
 msgid "Invalid entry"
 msgstr "Μη έγκυρη καταχώρηση"
 
-#: ../src/config.py:1423
+#: ../src/config.py:1428
 msgid "Custom port must be a port number."
 msgstr "Ο προσαρμοσμένος αριθμός θύρας του μεσολαβητή πρέπει να είναι αριθμός."
 
-#: ../src/config.py:1549 ../src/common/config.py:363
+#: ../src/config.py:1554 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Επιστρέφω αμέσως."
 
-#: ../src/config.py:1559
+#: ../src/config.py:1564
 msgid "Relogin now?"
 msgstr "Νέα είσοδος τώρα;"
 
-#: ../src/config.py:1560
+#: ../src/config.py:1565
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Αν θέλετε να εφαρμόσετε άμεσα τις αλλαγές, θα πρέπει να αποσυνδεθείτε και να "
 "συνδεθείτε ξανά."
 
-#: ../src/config.py:1586
+#: ../src/config.py:1591
 msgid "No such account available"
 msgstr "Τέτοιος λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/config.py:1587
+#: ../src/config.py:1592
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Πρέπει πρώτα να δημιουργήσετε το λογαριασμό σας προτού ξεκινήσετε να "
 "τροποποιείτε τις προσωπικές σας πληροφορίες."
 
-#: ../src/config.py:1594 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/config.py:1599 ../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:1595
+#: ../src/config.py:1600
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να τροποποιήσετε τις προσωπικές σας "
 "πληροφορίες."
 
-#: ../src/config.py:1599
+#: ../src/config.py:1604
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1600
+#: ../src/config.py:1605
 #, fuzzy
 msgid "Your server can't save your personal information."
 msgstr ""
 "Πρέπει πρώτα να δημιουργήσετε το λογαριασμό σας προτού ξεκινήσετε να "
 "τροποποιείτε τις προσωπικές σας πληροφορίες."
 
-#: ../src/config.py:1624 ../src/config.py:3417
+#: ../src/config.py:1629 ../src/config.py:3422
 msgid "Failed to get secret keys"
 msgstr "Σφάλμα κατά τη λήψη μυστικών κλειδιών"
 
-#: ../src/config.py:1625 ../src/config.py:3418
+#: ../src/config.py:1630 ../src/config.py:3423
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Σφάλμα κατά τη λήψη του OpenPGP μυστικών κλειδιών σας."
 
-#: ../src/config.py:1628 ../src/config.py:3421
+#: ../src/config.py:1633 ../src/config.py:3426
 msgid "OpenPGP Key Selection"
 msgstr "Επιλογή κλειδιού OpenPGP"
 
-#: ../src/config.py:1629 ../src/config.py:3422
+#: ../src/config.py:1634 ../src/config.py:3427
 msgid "Choose your OpenPGP key"
 msgstr "Επιλέξτε το OpenPGP κλειδί σας"
 
 #. Name column
-#: ../src/config.py:1859 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/config.py:1864 ../src/disco.py:740 ../src/disco.py:1466
 #: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Όνομα"
 
-#: ../src/config.py:1862
+#: ../src/config.py:1867
 msgid "Server"
 msgstr "Διακομιστής"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1931
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Ανάγνωση όλων των γενονότων που εκκρεμούν, πριν την αφαίρεση αυτού του "
 "λογαριασμού."
 
-#: ../src/config.py:1963
+#: ../src/config.py:1968
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
 
-#: ../src/config.py:1964
+#: ../src/config.py:1969
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:2023
+#: ../src/config.py:2028
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#: ../src/config.py:2024
+#: ../src/config.py:2029
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2256
+#: ../src/config.py:2261
 #, python-format
 msgid "Edit %s"
 msgstr "Επεξεργασία %s"
 
-#: ../src/config.py:2258
+#: ../src/config.py:2263
 #, python-format
 msgid "Register to %s"
 msgstr "Εγγραφή στο %s"
 
 #. list at the begining
-#: ../src/config.py:2330
+#: ../src/config.py:2335
 msgid "Ban List"
 msgstr "Λίστα Ban"
 
-#: ../src/config.py:2331
+#: ../src/config.py:2336
 msgid "Member List"
 msgstr "Λίστα μελών"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2337
 msgid "Owner List"
 msgstr "Λίστα ιδιοκτητών"
 
-#: ../src/config.py:2333
+#: ../src/config.py:2338
 msgid "Administrator List"
 msgstr "Λίστα διαχειριστών"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2366 ../src/disco.py:747 ../src/history_manager.py:154
+#: ../src/config.py:2371 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2374
+#: ../src/config.py:2379
 msgid "Reason"
 msgstr "Αιτία"
 
-#: ../src/config.py:2379
+#: ../src/config.py:2384
 msgid "Nick"
 msgstr "Ψευδώνυμο"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2388
 msgid "Role"
 msgstr "Ρόλος"
 
-#: ../src/config.py:2404
+#: ../src/config.py:2409
 msgid "Banning..."
 msgstr "Απαγορεύεται η πρόσβαση..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2406
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2835,11 +2929,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να αποβάλλετε;</b>\n"
 "\n"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2413
 msgid "Adding Member..."
 msgstr "Προσθήκη μέλους..."
 
-#: ../src/config.py:2409
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2847,11 +2941,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε μέλος;</b>\n"
 "\n"
 
-#: ../src/config.py:2411
+#: ../src/config.py:2416
 msgid "Adding Owner..."
 msgstr "Προσθήκη ιδιοκτήτη..."
 
-#: ../src/config.py:2412
+#: ../src/config.py:2417
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2859,11 +2953,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε ιδιοκτήτη;</b>\n"
 "\n"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2419
 msgid "Adding Administrator..."
 msgstr "Προσθήκη διαχειριστή..."
 
-#: ../src/config.py:2415
+#: ../src/config.py:2420
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2871,7 +2965,7 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε διαχειριστή;</b>\n"
 "\n"
 
-#: ../src/config.py:2416
+#: ../src/config.py:2421
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2887,102 +2981,102 @@ msgstr ""
 "4. τομέας (ταιριάζει ο τομέας, και κάθε χρήστης@τομέας,\n"
 "τομέας/πόρος, ή διεύθυνση που περιέχει υποτομέα."
 
-#: ../src/config.py:2521
+#: ../src/config.py:2526
 #, python-format
 msgid "Removing %s account"
 msgstr "Aφαίρεση του λογαριασμού %s"
 
-#: ../src/config.py:2538 ../src/roster_window.py:2667
+#: ../src/config.py:2543 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Απαιτείται κωδικός"
 
-#: ../src/config.py:2539 ../src/roster_window.py:2668
+#: ../src/config.py:2544 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Πληκτρολογήστε τον κωδικό σας για το λογαριασμό %s"
 
-#: ../src/config.py:2540 ../src/roster_window.py:2669
+#: ../src/config.py:2545 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Αποθήκευση κωδικού"
 
-#: ../src/config.py:2554
+#: ../src/config.py:2559
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με το διακομιστή"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2560
 msgid "If you remove it, the connection will be lost."
 msgstr "Αν αφαιρεθεί, η σύνδεση θα χαθεί."
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 #, fuzzy
 msgid "Default"
 msgstr "Διαγραφή"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Εμφάνιση χρόνου:"
 
-#: ../src/config.py:2640
+#: ../src/config.py:2645
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2710
+#: ../src/config.py:2715
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Ομαδική συζήτηση"
 
-#: ../src/config.py:2742
+#: ../src/config.py:2747
 msgid "This bookmark has invalid data"
 msgstr "Αυτός ο σελιδοδείκτης έχει μη έγκυρα δεδομένα"
 
-#: ../src/config.py:2743
+#: ../src/config.py:2748
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Παρακαλώ συμπληρώστε τα πεδία του διακομιστή και του δωματίου ή διαφορετικά "
 "αφαιρέστε το σελιδοδείκτη."
 
-#: ../src/config.py:3005
+#: ../src/config.py:3010
 msgid "Invalid username"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/config.py:3006
+#: ../src/config.py:3011
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Πρέπει να δώσετε ένα όνομα χρήστη για την παραμετροποίηση του συγκεκριμένου "
 "λογαριασμού."
 
-#: ../src/config.py:3016 ../src/dialogs.py:1316
+#: ../src/config.py:3021 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Μη έγκυρος κωδικός"
 
-#: ../src/config.py:3017
+#: ../src/config.py:3022
 msgid "You must enter a password for the new account."
 msgstr "Πρέπει να δώσετε έναν κωδικό για το νέο λογαριασμό."
 
-#: ../src/config.py:3021 ../src/dialogs.py:1321
+#: ../src/config.py:3026 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Οι κωδικοί δεν ταιριάζουν"
 
-#: ../src/config.py:3022 ../src/dialogs.py:1322
+#: ../src/config.py:3027 ../src/dialogs.py:1322
 msgid "The passwords typed in both fields must be identical."
 msgstr "Οι κωδικοί των δυο πεδίων πρέπει να είναι ίδιοι."
 
-#: ../src/config.py:3041
+#: ../src/config.py:3046
 msgid "Duplicate Jabber ID"
 msgstr "Διπλότυπο αναγνωριστικό Jabber"
 
-#: ../src/config.py:3042
+#: ../src/config.py:3047
 msgid "This account is already configured in Gajim."
 msgstr "Αυτός ο λογαριασμός έχει ήδη στηθεί στο Gajim."
 
-#: ../src/config.py:3059
+#: ../src/config.py:3064
 msgid "Account has been added successfully"
 msgstr "Ο λογαριασμός προστέθηκε με επιτυχία"
 
-#: ../src/config.py:3060 ../src/config.py:3095
+#: ../src/config.py:3065 ../src/config.py:3100
 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."
@@ -2991,23 +3085,23 @@ msgstr ""
 "επιλέγοντας το κουμπί για Προχωρημένους, ή αργότερα εάν επιλέξετε "
 "Λογαριασμοί από το μενού Επεξεργασία στο κυρίως παράθυρο."
 
-#: ../src/config.py:3094
+#: ../src/config.py:3099
 msgid "Your new account has been created successfully"
 msgstr "Ο νέος σας λογαριασμός δημιουργήθηκε με επιτυχία"
 
-#: ../src/config.py:3112
+#: ../src/config.py:3117
 msgid "An error occured during account creation"
 msgstr "Σφάλμα κατά τη διάρκεια δημιουργίας λογαριασμού"
 
-#: ../src/config.py:3170
+#: ../src/config.py:3175
 msgid "Account name is in use"
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#: ../src/config.py:3171
+#: ../src/config.py:3176
 msgid "You already have an account using this name."
 msgstr "Έχετε ήδη ένα λογαριασμό με αυτό το όνομα."
 
-#: ../src/conversation_textview.py:271
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3015,56 +3109,65 @@ msgstr ""
 "Το κείμενο κάτω από αυτή τη γραμμή είναι ότι έχει λεχθεί από την τελευταία "
 "φορά που κοιτάξατε αυτή την ομαδική συζήτηση"
 
-#: ../src/conversation_textview.py:340
+#: ../src/conversation_textview.py:342
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Ενέργειες για \"%s\""
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Ανάγνωση άρθρου της _Wikipedia"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Εύρεση στο _Λεξικό"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:373
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Λείπει ένα \"%s\" από το URL του λεξικού και δεν είναι WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:386
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Λείπει ένα \"%s\" από το URL της Δικτυακής αναζήτησης"
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "Δικτυακή ανα_ζήτηση γι' αυτό"
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:397
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:755
+#: ../src/conversation_textview.py:757
 msgid "Yesterday"
 msgstr "Χθες"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:761
 #, python-format
 msgid "%i days ago"
 msgstr "πριν από %i μέρες"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:791
+#: ../src/conversation_textview.py:793
 #, python-format
 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
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
@@ -3340,29 +3443,29 @@ msgstr "Νέο μονό μήνυμα"
 msgid "New Private Message"
 msgstr "Νέο προσωπικό μήνυμα"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1161 ../src/notify.py:424
+#: ../src/dialogs.py:1369 ../src/gajim.py:1168 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Νέο E-Mail"
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1314 ../src/notify.py:418
+#: ../src/dialogs.py:1371 ../src/gajim.py:1321 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Αίτηση μεταφοράς αρχείου"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1134 ../src/gajim.py:1290
+#: ../src/dialogs.py:1373 ../src/gajim.py:1140 ../src/gajim.py:1297
 #: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Σφάλμα μεταφοράς αρχείου"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1353 ../src/gajim.py:1375
-#: ../src/gajim.py:1392 ../src/notify.py:422
+#: ../src/dialogs.py:1375 ../src/gajim.py:1360 ../src/gajim.py:1382
+#: ../src/gajim.py:1399 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Η μεταφορά αρχείου ολοκληρώθηκε"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1356 ../src/notify.py:422
+#: ../src/dialogs.py:1376 ../src/gajim.py:1363 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Η μεταφορά αρχείου διακόπηκε"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1032 ../src/notify.py:426
+#: ../src/dialogs.py:1378 ../src/gajim.py:1038 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Πρόσκληση ομαδικής κουβέντας"
 
@@ -3722,31 +3825,31 @@ msgstr "Περιγραφή: %s"
 msgid "%s wants to send you a file:"
 msgstr "O %s επιθυμεί να σας στείλει ένα αρχείο:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:682
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
 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:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "This file already exists"
 msgstr "Αυτό το αρχείο υπάρχει ήδη"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "What do you want to do?"
 msgstr "Τι θέλετε να κάνετε;"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3880,57 +3983,58 @@ msgstr "Σύνδεση"
 msgid "Subject: %s"
 msgstr "Θέμα: %s\n"
 
-#: ../src/gajim.py:703
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:703 ../src/gajim.py:716
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "σφάλμα κατά την αποστολή του %s ( %s )"
 
-#: ../src/gajim.py:743
+#: ../src/gajim.py:749
 msgid "Authorization accepted"
 msgstr "Λήψη εξουσιοδότησης"
 
-#: ../src/gajim.py:744
+#: ../src/gajim.py:750
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Η επαφή \"%s\" σας εξουσιοδότησε να βλέπετε την κατάστασή της."
 
-#: ../src/gajim.py:752
+#: ../src/gajim.py:758
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Η επαφή \"%s\" αφαίρεσαι την εγγραφή από εσάς"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:759
 msgid "You will always see him or her as offline."
 msgstr "Θα βλέπετε την επαφή πάντα ως αποσυνδεδεμένη."
 
-#: ../src/gajim.py:796
+#: ../src/gajim.py:802
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Δεν ήταν δυνατή η επαφή με \"%s\""
 
-#: ../src/gajim.py:797 ../src/common/connection.py:395
+#: ../src/gajim.py:803 ../src/common/connection.py:395
 msgid "Check your connection or try again later."
 msgstr "Ελέγξτε τη σύνδεση σας ή δοκιμάστε αργότερα."
 
-#: ../src/gajim.py:945 ../src/roster_window.py:1201
+#: ../src/gajim.py:951 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "Ο %s είναι τώρα %s (%s)"
 
-#: ../src/gajim.py:1042
+#: ../src/gajim.py:1048
 msgid "Your passphrase is incorrect"
 msgstr "H κωδική φράση είναι λανθασμένη"
 
-#: ../src/gajim.py:1043
+#: ../src/gajim.py:1049
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Είστε συνδεδεμένοι χωρίς τη χρήση του OpenPGP κλειδιού σας."
 
-#: ../src/gajim.py:1145
+#: ../src/gajim.py:1151
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Νέα αλληλογραφία στο %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1147
+#: ../src/gajim.py:1153
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3940,61 +4044,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:1156
+#: ../src/gajim.py:1162
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1311
+#: ../src/gajim.py:1318
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
 
-#: ../src/gajim.py:1376
+#: ../src/gajim.py:1383
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Λάβατε το αρχείο %(filename)s από τον/την %(name)s επιτυχώς."
 
 #. ft stopped
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1387
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Η μεταφορά του αρχείου %(filename)s από τον/την %(name)s σταμάτησε."
 
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1400
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Έχετε στείλει με επιτυχία το %(filename)s στον/ους %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1397
+#: ../src/gajim.py:1404
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Η μεταφορά του αρχείου %(filename)s στον/ους %(name)s σταμάτησε."
 
-#: ../src/gajim.py:1503
+#: ../src/gajim.py:1510
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1504
+#: ../src/gajim.py:1511
 #, 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:1842
+#: ../src/gajim.py:1850
 msgid "Could not save your settings and preferences"
 msgstr "Δεν ήταν δυνατή η αποθήκευση των προτιμήσεων σας"
 
-#: ../src/gajim.py:2034
+#: ../src/gajim.py:2042
 #, fuzzy
 msgid "Network Manager support not available"
 msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2117
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Η υποστήριξη για Διαχείριση συνόδων δεν είναι διαθέσιμη (δεν υπάρχει το "
@@ -4349,119 +4453,119 @@ msgstr "Δεν είναι δυνατή η διαγραφή του τρέχοντ
 msgid "Please first choose another for your current theme."
 msgstr "Παρακαλώ επιλέξτε ένα άλλο θέμα πρώτα."
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chat"
 msgstr "Προσωπική συζήτηση"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chats"
 msgstr "Προσωπικές συζητήσεις"
 
-#: ../src/groupchat_control.py:120
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Αποτυχία αποστολής προσωπικού μηνύματος"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:124
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Δεν είστε πια στο δωμάτιο \"%s\" ή ο/η \"%s\" έφυγε."
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chat"
 msgstr "Ομαδική συζήτηση"
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chats"
 msgstr "Ομαδικές συζητήσεις"
 
-#: ../src/groupchat_control.py:315
+#: ../src/groupchat_control.py:317
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Αλλαγή _ψευδώνυμου"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:810
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
 
-#: ../src/groupchat_control.py:814
+#: ../src/groupchat_control.py:816
 #, 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:821
+#: ../src/groupchat_control.py:823
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί: %(reason)s"
 
-#: ../src/groupchat_control.py:825
+#: ../src/groupchat_control.py:827
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί από τον %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:833
+#: ../src/groupchat_control.py:835
 #, python-format
 msgid "You are now known as %s"
 msgstr "Είστε τώρα γνωστός ως %s"
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:837
 #, python-format
 msgid "%s is now known as %s"
 msgstr "Ο %s είναι τώρα γνωστός ως %s"
 
-#: ../src/groupchat_control.py:915
+#: ../src/groupchat_control.py:917
 #, python-format
 msgid "%s has left"
 msgstr "Ο %s έφυγε"
 
-#: ../src/groupchat_control.py:920
+#: ../src/groupchat_control.py:922
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Στην ομάδα"
 
 #. No status message
-#: ../src/groupchat_control.py:922 ../src/roster_window.py:1204
+#: ../src/groupchat_control.py:924 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "Ο %s είναι τώρα %s"
 
-#: ../src/groupchat_control.py:1041 ../src/groupchat_control.py:1059
-#: ../src/groupchat_control.py:1152 ../src/groupchat_control.py:1169
+#: ../src/groupchat_control.py:1043 ../src/groupchat_control.py:1061
+#: ../src/groupchat_control.py:1154 ../src/groupchat_control.py:1171
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
 
-#: ../src/groupchat_control.py:1075
+#: ../src/groupchat_control.py:1077
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "Αυτό το δωμάτιο δεν έχει θέμα"
 
-#: ../src/groupchat_control.py:1088
+#: ../src/groupchat_control.py:1090
 #, 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:1095 ../src/groupchat_control.py:1123
+#: ../src/groupchat_control.py:1097 ../src/groupchat_control.py:1125
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "Το %s δεν φαίνεται να είναι έγκυρο JID"
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1208
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Δεν βρέθηκε η εντολή: /%s (εάν θέλετε να το πείτε αυτό βάλτε το /say μπροστά)"
 
-#: ../src/groupchat_control.py:1229
+#: ../src/groupchat_control.py:1231
 #, python-format
 msgid "Commands: %s"
 msgstr "Εντολές: %s"
 
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1233
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4474,7 +4578,7 @@ msgstr ""
 "Εάν το JID είναι στο δωμάτιο, ο χρήστης θα πεταχτεί έξω επίσης. ΔΕΝ "
 "υποστηρίζει κενά στο ψευδώνυμο."
 
-#: ../src/groupchat_control.py:1238
+#: ../src/groupchat_control.py:1240
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4482,12 +4586,12 @@ msgstr ""
 "Χρήση: /%s <ψευδώνυμο>, ανοίγει ένα παράθυρο προσωπικής κουβέντας με το "
 "συγκεκριμένο χρήστη."
 
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1244
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Χρήση: /%s, καθαρίζει το παράθυρο από το κείμενο."
 
-#: ../src/groupchat_control.py:1244
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4496,12 +4600,12 @@ msgstr ""
 "Χρήση: /%s [λόγος], κλείνει το τρέχον παράθυρο ή καρτέλα, ανακοινώνοντας το "
 "λόγο εάν έχει προσδιοριστεί."
 
-#: ../src/groupchat_control.py:1247
+#: ../src/groupchat_control.py:1249
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Χρήση: /%s, αποκρύπτει τα κουμπιά της κουβέντας."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1252
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4510,7 +4614,7 @@ msgstr ""
 "Χρήση: /%s <JID> [λόγος], προσκαλεί το JID στο τρέχον δωμάτιο, παρέχοντας "
 "προαιρετικά και λόγο."
 
-#: ../src/groupchat_control.py:1254
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4519,7 +4623,7 @@ msgstr ""
 "Χρήση: /%s <δωμάτιο>@<διακομιστής>[/ψευδώνυμο], επιδιώκει την είσοδο στο "
 "δωμάτιο@διακομιστή, προαιρετικά χρησιμοποιώντας το ψευδώνυμο."
 
-#: ../src/groupchat_control.py:1258
+#: ../src/groupchat_control.py:1260
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4529,7 +4633,7 @@ msgstr ""
 "Χρήση: /%s <ψευδώνυμο> [αιτία], βγάζει τον χρήστη που προσδιορίστηκε από το "
 "δωμάτιο, προσδιορίζοντας την αιτία. ΔΕΝ υποστηρίζει κενά στο ψευδώνυμο."
 
-#: ../src/groupchat_control.py:1263
+#: ../src/groupchat_control.py:1265
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current group chat. Use third "
@@ -4538,7 +4642,7 @@ msgstr ""
 "Χρήση: /%s <δράση>, στέλνει τη δράση στο τρέχον δωμάτιο, με χρήση τρίτου "
 "προσώπου (π.χ. /%s χοροπηδάει)."
 
-#: ../src/groupchat_control.py:1267
+#: ../src/groupchat_control.py:1269
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4547,22 +4651,22 @@ msgstr ""
 "Χρήση: /%s <ψευδώνυμο> [μήνυμα], ανοίγει ένα παράθυρο προσωπικού διαλόγου "
 "και στέλνει το μήνυμα στο χρήστη που προσδιορίστηκε."
 
-#: ../src/groupchat_control.py:1272
+#: ../src/groupchat_control.py:1274
 #, fuzzy, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Χρήση: /%s <ψευδώνυμο>, αλλάζει το ψευδώνυμο σας στο τρέχον δωμάτιο."
 
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1278
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Χρήση: /%s [θέμα], εμφανίζει ή αλλάζει το θέμα στο τρέχον δωμάτιο."
 
-#: ../src/groupchat_control.py:1280
+#: ../src/groupchat_control.py:1282
 #, fuzzy, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Χρήση: /%s [θέμα], εμφανίζει ή αλλάζει το θέμα στο τρέχον δωμάτιο."
 
-#: ../src/groupchat_control.py:1283
+#: ../src/groupchat_control.py:1285
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -4570,73 +4674,73 @@ msgstr ""
 "Χρήση: /%s <μήνυμα>, στέλνει ένα μήνυμα χωρίς να γίνει έλεγχος για άλλες "
 "εντολές."
 
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1288
 #, python-format
 msgid "No help info for /%s"
 msgstr "Δεν υπάρχουν πληροφορίες για το /%s"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1337
 #, fuzzy, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από το δωμάτιο \"%s\";"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1339
 #, fuzzy
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Αν κλείσετε αυτό το παράθυρο, θα αποσυνδεθείτε από αυτό το δωμάτιο."
 
-#: ../src/groupchat_control.py:1341 ../src/roster_window.py:3961
+#: ../src/groupchat_control.py:1343 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "Μη_ν με ξαναρωτήσεις"
 
-#: ../src/groupchat_control.py:1375
+#: ../src/groupchat_control.py:1377
 msgid "Changing Subject"
 msgstr "Αλλαγή θέματος"
 
-#: ../src/groupchat_control.py:1376
+#: ../src/groupchat_control.py:1378
 msgid "Please specify the new subject:"
 msgstr "Παρακαλώ καθορίστε το νέο θέμα:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1387
 msgid "Changing Nickname"
 msgstr "Αλλαγή ψευδωνύμου"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1388
 msgid "Please specify the new nickname you want to use:"
 msgstr "Παρακαλώ καθορίστε το νέο ψευδώνυμο που θέλετε να χρησιμοποιείτε:"
 
-#: ../src/groupchat_control.py:1411
+#: ../src/groupchat_control.py:1413
 msgid "Bookmark already set"
 msgstr "Ο σελιδοδείκτης έχει οριστεί ήδη"
 
-#: ../src/groupchat_control.py:1412
+#: ../src/groupchat_control.py:1414
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Το δωμάτιο \"%s\" υπάρχει ήδη στους σελιδοδείκτες σας."
 
-#: ../src/groupchat_control.py:1421
+#: ../src/groupchat_control.py:1423
 msgid "Bookmark has been added successfully"
 msgstr "Ο σελιδοδείκτης προστέθηκε με επιτυχία"
 
-#: ../src/groupchat_control.py:1422
+#: ../src/groupchat_control.py:1424
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Μπορείτε να διαχειριστείτε τους σελιδοδείκτες από το μενού Ενέργειας στο "
 "κεντρικό παράθυρο."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1548
+#: ../src/groupchat_control.py:1550
 #, python-format
 msgid "Kicking %s"
 msgstr "Διώχνοντας τον %s"
 
-#: ../src/groupchat_control.py:1549 ../src/groupchat_control.py:1831
+#: ../src/groupchat_control.py:1551 ../src/groupchat_control.py:1833
 msgid "You may specify a reason below:"
 msgstr "Μπορείτε να προσδιορίσετε ένα λόγο παρακάτω:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1830
+#: ../src/groupchat_control.py:1832
 #, python-format
 msgid "Banning %s"
 msgstr "Απαγορεύοντας την πρόσβαση στον %s"
@@ -4684,16 +4788,16 @@ msgstr ""
 "Αδυναμία εγγραφής στο %s. Δε θα υπάρξει υποστήριξη για το διαχειριστή "
 "συνεδριών"
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:728
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:729
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:737
+#: ../src/gtkgui_helpers.py:738
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Αποθήκευση αρχείου ως..."
@@ -4724,11 +4828,6 @@ 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 "
@@ -5989,7 +6088,7 @@ msgstr ""
 "Πληροφορίες σχετικές με την καταχώριση δεν έφτασαν εγκαίρως για την μεταφορά "
 "%s"
 
-#: ../src/common/connection_handlers.py:1515
+#: ../src/common/connection_handlers.py:1523
 #, fuzzy, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
@@ -5997,46 +6096,46 @@ msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
 #. password required to join
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1577
-#: ../src/common/connection_handlers.py:1580
-#: ../src/common/connection_handlers.py:1583
-#: ../src/common/connection_handlers.py:1586
-#: ../src/common/connection_handlers.py:1589
-#: ../src/common/connection_handlers.py:1592
+#: ../src/common/connection_handlers.py:1585
+#: ../src/common/connection_handlers.py:1588
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1597
 #: ../src/common/connection_handlers.py:1600
+#: ../src/common/connection_handlers.py:1608
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Αδυναμία συμμετοχής στο δωμάτιο"
 
-#: ../src/common/connection_handlers.py:1578
+#: ../src/common/connection_handlers.py:1586
 #, fuzzy
 msgid "A password is required to join this group chat."
 msgstr "Απαιτείται συνθηματικό για τη είσοδο σας σε αυτό το δωμάτιο."
 
-#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1589
 #, fuzzy
 msgid "You are banned from this group chat."
 msgstr "Σας έχει απαγορευτεί η είσοδος σε αυτό το δωμάτιο."
 
-#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1592
 #, fuzzy
 msgid "Such group chat does not exist."
 msgstr "Δεν υπάρχει τέτοιο δωμάτιο."
 
-#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1595
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "Δεν επιτρέπεται η δημιουργία δωματίων."
 
-#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1598
 msgid "Your registered nickname must be used."
 msgstr "Πρέπει να χρησιμοποιηθεί το καταχωρημένο σας ψευδώνυμο."
 
-#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1601
 msgid "You are not in the members list."
 msgstr "Δεν είστε στη λίστα μελών."
 
-#: ../src/common/connection_handlers.py:1601
+#: ../src/common/connection_handlers.py:1609
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -6044,27 +6143,27 @@ msgstr ""
 "Το επιθυμητό ψευδώνυμο είναι σε χρήση ή καταχωρημένο από κάποιον άλλο.\n"
 "Παρακαλώ προσδιορίστε ένα άλλο παρακάτω:"
 
-#: ../src/common/connection_handlers.py:1651
+#: ../src/common/connection_handlers.py:1659
 msgid "I would like to add you to my roster."
 msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1672
+#: ../src/common/connection_handlers.py:1680
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "Ο %s μόλις σας εξουσιοδότησε"
 
-#: ../src/common/connection_handlers.py:1674
+#: ../src/common/connection_handlers.py:1682
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "αίτηση αφαίρεσης εξουσιοδότησης από %s"
 
-#: ../src/common/connection_handlers.py:1676
+#: ../src/common/connection_handlers.py:1684
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "πραγματοποιήθηκε αφαίρεση εξουσιοδότησης από %s"
 
-#: ../src/common/connection_handlers.py:1846
+#: ../src/common/connection_handlers.py:1854
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -6095,7 +6194,7 @@ msgid "Invalid answer"
 msgstr "Μη έγκυρη απόκριση"
 
 #: ../src/common/connection.py:394 ../src/common/connection.py:429
-#: ../src/common/connection.py:872
+#: ../src/common/connection.py:877
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
@@ -6153,7 +6252,7 @@ msgstr "Είμαι %s"
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
-#: ../src/common/connection.py:759
+#: ../src/common/connection.py:764
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6163,7 +6262,7 @@ msgstr ""
 "Θέμα: %s\n"
 "%s"
 
-#: ../src/common/connection.py:898
+#: ../src/common/connection.py:903
 msgid "Not fetched because of invisible status"
 msgstr ""
 
@@ -6485,10 +6584,6 @@ msgstr "Καμία"
 msgid "To"
 msgstr "Προς"
 
-#: ../src/common/helpers.py:259
-msgid "From"
-msgstr "Από"
-
 #: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Και τα δυο"
@@ -6765,9 +6860,6 @@ msgstr "σφάλμα κατά την αποστολή του %s ( %s )"
 #~ msgid "Migrating Logs..."
 #~ msgstr "Μεταφορά ιστορικού..."
 
-#~ msgid "Please wait while logs are being migrated..."
-#~ msgstr "Παρακαλώ περιμένετε όσο μεταφέρεται το ιστορικό..."
-
 #~ msgid "_Join New Room"
 #~ msgstr "_Σύνδεση σε νέο δωμάτιο"
 
@@ -6986,9 +7078,6 @@ msgstr "σφάλμα κατά την αποστολή του %s ( %s )"
 #~ msgid "Timeout"
 #~ msgstr "Λήξη χρονικού ορίου"
 
-#~ msgid "A protocol error has occured:"
-#~ msgstr "Συνέβει σφάλμα πρωτοκόλου:"
-
 #~ msgid "account: "
 #~ msgstr "λογαριασμός: "
 
diff --git a/po/en_GB.po b/po/en_GB.po
index fcb6d4bd0..4ddf9ebeb 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.10.1.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-02 17:15+0100\n"
+"POT-Creation-Date: 2006-12-09 10:02+0100\n"
 "PO-Revision-Date: 2006-11-30 14:06+1100\n"
 "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
 "Language-Team: English <en_gb@li.org>\n"
@@ -318,16 +318,16 @@ msgid "Manage..."
 msgstr "Manage..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1637
-#: ../src/config.py:3430
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1642
+#: ../src/config.py:3435
 msgid "No key selected"
 msgstr "No key selected"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1219
-#: ../src/config.py:1224 ../src/config.py:1408 ../src/config.py:1627
-#: ../src/config.py:1636 ../src/config.py:1695 ../src/config.py:1769
-#: ../src/config.py:2640 ../src/config.py:3420 ../src/config.py:3429
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1224
+#: ../src/config.py:1229 ../src/config.py:1413 ../src/config.py:1632
+#: ../src/config.py:1641 ../src/config.py:1700 ../src/config.py:1774
+#: ../src/config.py:2645 ../src/config.py:3425 ../src/config.py:3434
 #: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "None"
@@ -523,6 +523,42 @@ msgstr "_Register"
 msgid "_User ID:"
 msgstr "_User ID:"
 
+#: ../data/glade/adhoc_commands_window.glade.h:1
+msgid "<b>An error has occured:</b>"
+msgstr "<b>An error has occured:</b>"
+
+#: ../data/glade/adhoc_commands_window.glade.h:2
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Choose command to execute:</b>"
+
+#: ../data/glade/adhoc_commands_window.glade.h:3
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc Commands - Gajim"
+
+#: ../data/glade/adhoc_commands_window.glade.h:4
+msgid "Check once more"
+msgstr "Check once more"
+
+#: ../data/glade/adhoc_commands_window.glade.h:5
+msgid "Error description..."
+msgstr "Error description..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:6
+msgid "Please wait while retrieving command list..."
+msgstr "Please wait while retrieving command list..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:7
+msgid "Please wait while the command is sending..."
+msgstr "Please wait while the command is sending..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:8
+msgid "Please wait..."
+msgstr "Please wait..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:9
+msgid "This jabber entity does not expose any commands."
+msgstr "This jabber entity does not expose any commands."
+
 #: ../data/glade/advanced_configuration_window.glade.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Description</b>"
@@ -662,13 +698,13 @@ msgstr "Play a sound"
 #: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
-"Contact Connected\n"
-"Contact Disconnected\n"
-"Contact Change Status\n"
-"Group Chat Message Highlight\n"
-"Group Chat Message Received\n"
-"File Transfert Resquest\n"
-"File Transfert Started\n"
+"Contact Connected \n"
+"Contact Disconnected \n"
+"Contact Change Status \n"
+"Group Chat Message Highlight \n"
+"Group Chat Message Received \n"
+"File Transfert Resquest \n"
+"File Transfert Started \n"
 "File Transfert Finished"
 msgstr ""
 "Receive a Message\n"
@@ -749,6 +785,42 @@ msgstr "for "
 msgid "when I'm in"
 msgstr "when I'm in"
 
+#: ../data/glade/atom_entry_window.glade.h:1
+msgid "2003-12-13T18:30:02Z"
+msgstr "2003-12-13T18:30:02Z"
+
+#: ../data/glade/atom_entry_window.glade.h:2
+msgid "<small>Romeo and Juliet</small>"
+msgstr "<small>Romeo and Juliet</small>"
+
+#: ../data/glade/atom_entry_window.glade.h:3
+msgid "Entry:"
+msgstr "Entry:"
+
+#: ../data/glade/atom_entry_window.glade.h:4
+msgid "Feed name:"
+msgstr "Feed name:"
+
+#: ../data/glade/atom_entry_window.glade.h:5
+msgid "Last modified:"
+msgstr "Last modified:"
+
+#: ../data/glade/atom_entry_window.glade.h:6
+msgid "New entry received"
+msgstr "New entry received"
+
+#: ../data/glade/atom_entry_window.glade.h:7
+msgid "Old stories"
+msgstr "Old stories"
+
+#: ../data/glade/atom_entry_window.glade.h:8
+msgid "Soliloquy"
+msgstr "Soliloquy"
+
+#: ../data/glade/atom_entry_window.glade.h:9
+msgid "You have received new entry:"
+msgstr "You have received new entry:"
+
 #: ../data/glade/change_password_dialog.glade.h:1
 msgid "Change Password"
 msgstr "Change Password"
@@ -834,7 +906,7 @@ msgstr "_Compact View    Alt+C"
 msgid "_History"
 msgstr "_History"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/glade/data_form_window.glade.h:1 ../src/dataforms_widget.py:76
 msgid "Fill in the form."
 msgstr "Fill in the form."
 
@@ -1050,6 +1122,20 @@ msgstr "_Send Private Message"
 msgid "_Voice"
 msgstr "_Voice"
 
+#: ../data/glade/groups_post_window.glade.h:1
+msgid "Create new post"
+msgstr "Create new post"
+
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:259
+msgid "From"
+msgstr "From"
+
+#. holds subject
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141
+#: ../src/history_manager.py:172
+msgid "Subject"
+msgstr "Subject"
+
 #: ../data/glade/history_manager.glade.h:1
 msgid ""
 "<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
@@ -1209,7 +1295,7 @@ msgstr "Use authentication"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Click to insert an emoticon (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1116
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP Encryption"
 
@@ -1334,7 +1420,7 @@ msgstr ""
 msgid "B_efore nickname:"
 msgstr "B_efore nickname:"
 
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:841
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
 msgid "Chat"
 msgstr "Chat"
 
@@ -2442,33 +2528,33 @@ msgstr "A connection is not available"
 msgid "Your message can not be sent until you are connected."
 msgstr "Your message can not be sent until you are connected."
 
-#: ../src/chat_control.py:841
+#: ../src/chat_control.py:844
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/chat_control.py:1042
+#: ../src/chat_control.py:1030
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s from group chat %(room_name)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1130
+#: ../src/chat_control.py:1118
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s has not broadcast an OpenPGP key, nor has one been assigned"
 
-#: ../src/chat_control.py:1266
+#: ../src/chat_control.py:1254
 msgid "Encryption enabled"
 msgstr "Encryption enabled"
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1259
 msgid "Encryption disabled"
 msgstr "Encryption disabled"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1413 ../src/conversation_textview.py:493
-#: ../src/dialogs.py:629 ../src/gajim.py:727 ../src/gajim.py:728
-#: ../src/gajim.py:1067 ../src/roster_window.py:328
+#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495
+#: ../src/dialogs.py:629 ../src/gajim.py:733 ../src/gajim.py:734
+#: ../src/gajim.py:1073 ../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
@@ -2479,12 +2565,12 @@ msgid "Not in Roster"
 msgstr "Not in Roster"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1545
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "You just received a new message from \"%s\""
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1546
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2492,29 +2578,29 @@ msgstr ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 
-#: ../src/config.py:130 ../src/config.py:589
+#: ../src/config.py:135 ../src/config.py:594
 msgid "Disabled"
 msgstr "Disabled"
 
-#: ../src/config.py:216
+#: ../src/config.py:221
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Every %s _minutes"
 
-#: ../src/config.py:358
+#: ../src/config.py:363
 msgid "Active"
 msgstr "Active"
 
-#: ../src/config.py:366
+#: ../src/config.py:371
 msgid "Event"
 msgstr "Event"
 
-#: ../src/config.py:679 ../src/gajim.py:2086
+#: ../src/config.py:684 ../src/gajim.py:2094
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Dictionary for lang %s not available"
 
-#: ../src/config.py:680 ../src/gajim.py:2087
+#: ../src/config.py:685 ../src/gajim.py:2095
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -2523,71 +2609,71 @@ msgstr ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 
-#: ../src/config.py:1032
+#: ../src/config.py:1037
 msgid "status message title"
 msgstr "status message title"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1037
 msgid "status message text"
 msgstr "status message text"
 
-#: ../src/config.py:1067
+#: ../src/config.py:1072
 msgid "First Message Received"
 msgstr "First Message Received"
 
-#: ../src/config.py:1068
+#: ../src/config.py:1073
 msgid "Next Message Received"
 msgstr "Next Message Received"
 
-#: ../src/config.py:1069
+#: ../src/config.py:1074
 msgid "Contact Connected"
 msgstr "Contact Connected"
 
-#: ../src/config.py:1070
+#: ../src/config.py:1075
 msgid "Contact Disconnected"
 msgstr "Contact Disconnected"
 
-#: ../src/config.py:1071
+#: ../src/config.py:1076
 msgid "Message Sent"
 msgstr "Message Sent"
 
-#: ../src/config.py:1072
+#: ../src/config.py:1077
 msgid "Group Chat Message Highlight"
 msgstr "Group Chat Message Highlight"
 
-#: ../src/config.py:1073
+#: ../src/config.py:1078
 msgid "Group Chat Message Received"
 msgstr "Group Chat Message Received"
 
-#: ../src/config.py:1080
+#: ../src/config.py:1085
 msgid "GMail Email Received"
 msgstr "GMail E-mail Received"
 
-#: ../src/config.py:1283
+#: ../src/config.py:1288
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP is not usable in this computer"
 
-#: ../src/config.py:1329
+#: ../src/config.py:1334
 msgid "You are currently connected to the server"
 msgstr "You are currently connected to the server"
 
-#: ../src/config.py:1330
+#: ../src/config.py:1335
 msgid "To change the account name, you must be disconnected."
 msgstr "To change the account name, you must be disconnected."
 
-#: ../src/config.py:1333 ../src/config.py:1925
+#: ../src/config.py:1338 ../src/config.py:1930
 msgid "Unread events"
 msgstr "Unread events"
 
-#: ../src/config.py:1334
+#: ../src/config.py:1339
 msgid "To change the account name, you must read all pending events."
 msgstr "To change the account name, you must read all pending events."
 
-#: ../src/config.py:1338
+#: ../src/config.py:1343
 msgid "Account Name Already Used"
 msgstr "Account Name Already Used"
 
-#: ../src/config.py:1339
+#: ../src/config.py:1344
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2595,172 +2681,172 @@ msgstr ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 
-#: ../src/config.py:1343 ../src/config.py:1347
+#: ../src/config.py:1348 ../src/config.py:1352
 msgid "Invalid account name"
 msgstr "Invalid account name"
 
-#: ../src/config.py:1344
+#: ../src/config.py:1349
 msgid "Account name cannot be empty."
 msgstr "Account name cannot be empty."
 
-#: ../src/config.py:1348
+#: ../src/config.py:1353
 msgid "Account name cannot contain spaces."
 msgstr "Account name cannot contain spaces."
 
-#: ../src/config.py:1356 ../src/config.py:1362 ../src/config.py:1372
-#: ../src/config.py:3030
+#: ../src/config.py:1361 ../src/config.py:1367 ../src/config.py:1377
+#: ../src/config.py:3035
 msgid "Invalid Jabber ID"
 msgstr "Invalid Jabber ID"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1368
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "A Jabber ID must be in the form \"user@servername\"."
 
-#: ../src/config.py:1422
+#: ../src/config.py:1427
 msgid "Invalid entry"
 msgstr "Invalid entry"
 
-#: ../src/config.py:1423
+#: ../src/config.py:1428
 msgid "Custom port must be a port number."
 msgstr "Custom port must be a port number."
 
-#: ../src/config.py:1549 ../src/common/config.py:363
+#: ../src/config.py:1554 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Be right back."
 
-#: ../src/config.py:1559
+#: ../src/config.py:1564
 msgid "Relogin now?"
 msgstr "Relogin now?"
 
-#: ../src/config.py:1560
+#: ../src/config.py:1565
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "If you want all the changes to apply instantly, you must relogin."
 
-#: ../src/config.py:1586
+#: ../src/config.py:1591
 msgid "No such account available"
 msgstr "No such account available"
 
-#: ../src/config.py:1587
+#: ../src/config.py:1592
 msgid "You must create your account before editing your personal information."
 msgstr "You must create your account before editing your personal information."
 
-#: ../src/config.py:1594 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/config.py:1599 ../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 "You are not connected to the server"
 
-#: ../src/config.py:1595
+#: ../src/config.py:1600
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Without a connection, you can not edit your personal information."
 
-#: ../src/config.py:1599
+#: ../src/config.py:1604
 msgid "Your server doesn't support Vcard"
 msgstr "Your server doesn't support Vcard"
 
-#: ../src/config.py:1600
+#: ../src/config.py:1605
 msgid "Your server can't save your personal information."
 msgstr "Your server can't save your personal information."
 
-#: ../src/config.py:1624 ../src/config.py:3417
+#: ../src/config.py:1629 ../src/config.py:3422
 msgid "Failed to get secret keys"
 msgstr "Failed to get secret keys"
 
-#: ../src/config.py:1625 ../src/config.py:3418
+#: ../src/config.py:1630 ../src/config.py:3423
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "There was a problem retrieving your OpenPGP secret keys."
 
-#: ../src/config.py:1628 ../src/config.py:3421
+#: ../src/config.py:1633 ../src/config.py:3426
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Key Selection"
 
-#: ../src/config.py:1629 ../src/config.py:3422
+#: ../src/config.py:1634 ../src/config.py:3427
 msgid "Choose your OpenPGP key"
 msgstr "Choose your OpenPGP key"
 
 #. Name column
-#: ../src/config.py:1859 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/config.py:1864 ../src/disco.py:740 ../src/disco.py:1466
 #: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Name"
 
-#: ../src/config.py:1862
+#: ../src/config.py:1867
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1931
 msgid "Read all pending events before removing this account."
 msgstr "Read all pending events before removing this account."
 
-#: ../src/config.py:1963
+#: ../src/config.py:1968
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "You have opened chat in account %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:1969
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "All chat and groupchat windows will be closed. Do you want to continue?"
 
-#: ../src/config.py:2023
+#: ../src/config.py:2028
 msgid "Account Local already exists."
 msgstr "Account Local already exists."
 
-#: ../src/config.py:2024
+#: ../src/config.py:2029
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Please rename or remove it before enabling link-local messaging."
 
-#: ../src/config.py:2256
+#: ../src/config.py:2261
 #, python-format
 msgid "Edit %s"
 msgstr "Edit %s"
 
-#: ../src/config.py:2258
+#: ../src/config.py:2263
 #, python-format
 msgid "Register to %s"
 msgstr "Register to %s"
 
 #. list at the begining
-#: ../src/config.py:2330
+#: ../src/config.py:2335
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:2331
+#: ../src/config.py:2336
 msgid "Member List"
 msgstr "Member List"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2337
 msgid "Owner List"
 msgstr "Owner List"
 
-#: ../src/config.py:2333
+#: ../src/config.py:2338
 msgid "Administrator List"
 msgstr "Administrator List"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2366 ../src/disco.py:747 ../src/history_manager.py:154
+#: ../src/config.py:2371 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2374
+#: ../src/config.py:2379
 msgid "Reason"
 msgstr "Reason"
 
-#: ../src/config.py:2379
+#: ../src/config.py:2384
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2388
 msgid "Role"
 msgstr "Role"
 
-#: ../src/config.py:2404
+#: ../src/config.py:2409
 msgid "Banning..."
 msgstr "Banning..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2406
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2768,11 +2854,11 @@ msgstr ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2413
 msgid "Adding Member..."
 msgstr "Adding Member..."
 
-#: ../src/config.py:2409
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2780,11 +2866,11 @@ msgstr ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 
-#: ../src/config.py:2411
+#: ../src/config.py:2416
 msgid "Adding Owner..."
 msgstr "Adding Owner..."
 
-#: ../src/config.py:2412
+#: ../src/config.py:2417
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2792,11 +2878,11 @@ msgstr ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2419
 msgid "Adding Administrator..."
 msgstr "Adding Administrator..."
 
-#: ../src/config.py:2415
+#: ../src/config.py:2420
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2804,7 +2890,7 @@ msgstr ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2416
+#: ../src/config.py:2421
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2820,96 +2906,96 @@ msgstr ""
 "4. domain (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain."
 
-#: ../src/config.py:2521
+#: ../src/config.py:2526
 #, python-format
 msgid "Removing %s account"
 msgstr "Removing %s account"
 
-#: ../src/config.py:2538 ../src/roster_window.py:2667
+#: ../src/config.py:2543 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Password Required"
 
-#: ../src/config.py:2539 ../src/roster_window.py:2668
+#: ../src/config.py:2544 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enter your password for account %s"
 
-#: ../src/config.py:2540 ../src/roster_window.py:2669
+#: ../src/config.py:2545 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Save password"
 
-#: ../src/config.py:2554
+#: ../src/config.py:2559
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" is connected to the server"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2560
 msgid "If you remove it, the connection will be lost."
 msgstr "If you remove it, the connection will be lost."
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 msgid "Default"
 msgstr "Default"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 msgid "?print_status:All"
 msgstr "All"
 
-#: ../src/config.py:2640
+#: ../src/config.py:2645
 msgid "Enter and leave only"
 msgstr "Enter and leave only"
 
-#: ../src/config.py:2710
+#: ../src/config.py:2715
 msgid "New Group Chat"
 msgstr "New Group Chat"
 
-#: ../src/config.py:2742
+#: ../src/config.py:2747
 msgid "This bookmark has invalid data"
 msgstr "This bookmark has invalid data"
 
-#: ../src/config.py:2743
+#: ../src/config.py:2748
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 
-#: ../src/config.py:3005
+#: ../src/config.py:3010
 msgid "Invalid username"
 msgstr "Invalid username"
 
-#: ../src/config.py:3006
+#: ../src/config.py:3011
 msgid "You must provide a username to configure this account."
 msgstr "You must provide a username to configure this account."
 
-#: ../src/config.py:3016 ../src/dialogs.py:1316
+#: ../src/config.py:3021 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Invalid password"
 
-#: ../src/config.py:3017
+#: ../src/config.py:3022
 msgid "You must enter a password for the new account."
 msgstr "You must enter a password for the new account."
 
-#: ../src/config.py:3021 ../src/dialogs.py:1321
+#: ../src/config.py:3026 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
-#: ../src/config.py:3022 ../src/dialogs.py:1322
+#: ../src/config.py:3027 ../src/dialogs.py:1322
 msgid "The passwords typed in both fields must be identical."
 msgstr "The passwords typed in both fields must be identical."
 
-#: ../src/config.py:3041
+#: ../src/config.py:3046
 msgid "Duplicate Jabber ID"
 msgstr "Duplicate Jabber ID"
 
-#: ../src/config.py:3042
+#: ../src/config.py:3047
 msgid "This account is already configured in Gajim."
 msgstr "This account is already configured in Gajim."
 
-#: ../src/config.py:3059
+#: ../src/config.py:3064
 msgid "Account has been added successfully"
 msgstr "Account has been added successfully"
 
-#: ../src/config.py:3060 ../src/config.py:3095
+#: ../src/config.py:3065 ../src/config.py:3100
 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."
@@ -2918,23 +3004,23 @@ msgstr ""
 "later by clicking the Accounts menuitem under the Edit menu from the main "
 "window."
 
-#: ../src/config.py:3094
+#: ../src/config.py:3099
 msgid "Your new account has been created successfully"
 msgstr "Your new account has been successfully created"
 
-#: ../src/config.py:3112
+#: ../src/config.py:3117
 msgid "An error occured during account creation"
 msgstr "An error occured during account creation"
 
-#: ../src/config.py:3170
+#: ../src/config.py:3175
 msgid "Account name is in use"
 msgstr "Account name is in use"
 
-#: ../src/config.py:3171
+#: ../src/config.py:3176
 msgid "You already have an account using this name."
 msgstr "You already have an account using this name."
 
-#: ../src/conversation_textview.py:271
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2942,56 +3028,65 @@ msgstr ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
 
-#: ../src/conversation_textview.py:340
+#: ../src/conversation_textview.py:342
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Actions for \"%s\""
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Read _Wikipedia Article"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Look it up in _Dictionary"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:373
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:386
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Search URL is missing an \"%s\""
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "Web _Search for it"
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:397
 msgid "Open as _Link"
 msgstr "Open as _Link"
 
-#: ../src/conversation_textview.py:755
+#: ../src/conversation_textview.py:757
 msgid "Yesterday"
 msgstr "Yesterday"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:761
 #, python-format
 msgid "%i days ago"
 msgstr "%i days ago"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:791
+#: ../src/conversation_textview.py:793
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Subject: %s\n"
 
+#. form is single
+#: ../src/dataforms_widget.py:72
+msgid "This is result of query."
+msgstr "This is result of query."
+
+#: ../src/dataforms_widget.py:78
+msgid "Edit items on the list"
+msgstr "Edit items on the list"
+
 #: ../src/dialogs.py:59
 #, python-format
 msgid "Contact name: <i>%s</i>"
@@ -3252,29 +3347,29 @@ msgstr "New Single Message"
 msgid "New Private Message"
 msgstr "New Private Message"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1161 ../src/notify.py:424
+#: ../src/dialogs.py:1369 ../src/gajim.py:1168 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "New E-mail"
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1314 ../src/notify.py:418
+#: ../src/dialogs.py:1371 ../src/gajim.py:1321 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "File Transfer Request"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1134 ../src/gajim.py:1290
+#: ../src/dialogs.py:1373 ../src/gajim.py:1140 ../src/gajim.py:1297
 #: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "File Transfer Error"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1353 ../src/gajim.py:1375
-#: ../src/gajim.py:1392 ../src/notify.py:422
+#: ../src/dialogs.py:1375 ../src/gajim.py:1360 ../src/gajim.py:1382
+#: ../src/gajim.py:1399 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "File Transfer Completed"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1356 ../src/notify.py:422
+#: ../src/dialogs.py:1376 ../src/gajim.py:1363 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "File Transfer Stopped"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1032 ../src/notify.py:426
+#: ../src/dialogs.py:1378 ../src/gajim.py:1038 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Groupchat Invitation"
 
@@ -3625,12 +3720,12 @@ msgstr "Description: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s wants to send you a file:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:682
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Cannot overwrite existing file \"%s\""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -3638,20 +3733,20 @@ msgstr ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "This file already exists"
 msgstr "This file already exists"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "What do you want to do?"
 msgstr "What do you want to do?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Directory \"%s\" is not writable"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
 msgid "You do not have permission to create files in this directory."
 msgstr "You do not have permission to create files in this directory."
 
@@ -3786,57 +3881,58 @@ msgstr "Connection Failed"
 msgid "Subject: %s"
 msgstr "Subject: %s"
 
-#: ../src/gajim.py:703
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:703 ../src/gajim.py:716
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "error while sending %s ( %s )"
 
-#: ../src/gajim.py:743
+#: ../src/gajim.py:749
 msgid "Authorization accepted"
 msgstr "Authorisation accepted"
 
-#: ../src/gajim.py:744
+#: ../src/gajim.py:750
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "The contact \"%s\" has authorised you to see his or her status."
 
-#: ../src/gajim.py:752
+#: ../src/gajim.py:758
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" removed subscription from you"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:759
 msgid "You will always see him or her as offline."
 msgstr "You will always see him or her as offline."
 
-#: ../src/gajim.py:796
+#: ../src/gajim.py:802
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contact with \"%s\" cannot be established"
 
-#: ../src/gajim.py:797 ../src/common/connection.py:395
+#: ../src/gajim.py:803 ../src/common/connection.py:395
 msgid "Check your connection or try again later."
 msgstr "Check your connection or try again later."
 
-#: ../src/gajim.py:945 ../src/roster_window.py:1201
+#: ../src/gajim.py:951 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s is now %s (%s)"
 
-#: ../src/gajim.py:1042
+#: ../src/gajim.py:1048
 msgid "Your passphrase is incorrect"
 msgstr "Your passphrase is incorrect"
 
-#: ../src/gajim.py:1043
+#: ../src/gajim.py:1049
 msgid "You are currently connected without your OpenPGP key."
 msgstr "You are currently connected without your OpenPGP key."
 
-#: ../src/gajim.py:1145
+#: ../src/gajim.py:1151
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "New mail on %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1147
+#: ../src/gajim.py:1153
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3846,7 +3942,7 @@ msgstr[1] "You have %d new mail conversations"
 #. 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:1156
+#: ../src/gajim.py:1162
 #, python-format
 msgid ""
 "\n"
@@ -3855,52 +3951,52 @@ msgstr ""
 "\n"
 "From: %(from_address)s"
 
-#: ../src/gajim.py:1311
+#: ../src/gajim.py:1318
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wants to send you a file."
 
-#: ../src/gajim.py:1376
+#: ../src/gajim.py:1383
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "You successfully received %(filename)s from %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1387
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1400
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "You successfully sent %(filename)s to %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1397
+#: ../src/gajim.py:1404
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "File transfer of %(filename)s to %(name)s stopped."
 
-#: ../src/gajim.py:1503
+#: ../src/gajim.py:1510
 msgid "Username Conflict"
 msgstr "Username Conflict"
 
-#: ../src/gajim.py:1504
+#: ../src/gajim.py:1511
 msgid "Please type a new username for your local account"
 msgstr "Please type a new username for your local account"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1842
+#: ../src/gajim.py:1850
 msgid "Could not save your settings and preferences"
 msgstr "Could not save your settings and preferences"
 
-#: ../src/gajim.py:2034
+#: ../src/gajim.py:2042
 msgid "Network Manager support not available"
 msgstr "Network Manager support not available"
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2117
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Session Management support not available (missing gnome.ui module)"
 
@@ -4229,116 +4325,116 @@ msgstr "You cannot delete your current theme"
 msgid "Please first choose another for your current theme."
 msgstr "Please first choose another for your current theme."
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chat"
 msgstr "Private Chat"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: ../src/groupchat_control.py:120
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Sending private message failed"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "You are no longer in group chat \"%s\" or \"%s\" has left."
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chat"
 msgstr "Group Chat"
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chats"
 msgstr "Group Chats"
 
-#: ../src/groupchat_control.py:315
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Insert Nickname"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:810
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s has been kicked: %(reason)s"
 
-#: ../src/groupchat_control.py:814
+#: ../src/groupchat_control.py:816
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s has been kicked by %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:821
+#: ../src/groupchat_control.py:823
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s has been banned: %(reason)s"
 
-#: ../src/groupchat_control.py:825
+#: ../src/groupchat_control.py:827
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s has been banned by %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:833
+#: ../src/groupchat_control.py:835
 #, python-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:837
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s is now known as %s"
 
-#: ../src/groupchat_control.py:915
+#: ../src/groupchat_control.py:917
 #, python-format
 msgid "%s has left"
 msgstr "%s has left"
 
-#: ../src/groupchat_control.py:920
+#: ../src/groupchat_control.py:922
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s has joined the group chat"
 
 #. No status message
-#: ../src/groupchat_control.py:922 ../src/roster_window.py:1204
+#: ../src/groupchat_control.py:924 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s is now %s"
 
-#: ../src/groupchat_control.py:1041 ../src/groupchat_control.py:1059
-#: ../src/groupchat_control.py:1152 ../src/groupchat_control.py:1169
+#: ../src/groupchat_control.py:1043 ../src/groupchat_control.py:1061
+#: ../src/groupchat_control.py:1154 ../src/groupchat_control.py:1171
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Nickname not found: %s"
 
-#: ../src/groupchat_control.py:1075
+#: ../src/groupchat_control.py:1077
 msgid "This group chat has no subject"
 msgstr "This group chat has no subject"
 
-#: ../src/groupchat_control.py:1088
+#: ../src/groupchat_control.py:1090
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Invited %(contact_jid)s to %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1095 ../src/groupchat_control.py:1123
+#: ../src/groupchat_control.py:1097 ../src/groupchat_control.py:1125
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s does not appear to be a valid JID"
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1208
 #, 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:1229
+#: ../src/groupchat_control.py:1231
 #, python-format
 msgid "Commands: %s"
 msgstr "Commands: %s"
 
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1233
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4351,19 +4447,19 @@ msgstr ""
 "the JID is currently in the group chat, he/she/it will also be kicked. Does "
 "NOT support spaces in nickname."
 
-#: ../src/groupchat_control.py:1238
+#: ../src/groupchat_control.py:1240
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
 msgstr ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
 
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1244
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Usage: /%s, clears the text window."
 
-#: ../src/groupchat_control.py:1244
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4372,12 +4468,12 @@ msgstr ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
 "specified."
 
-#: ../src/groupchat_control.py:1247
+#: ../src/groupchat_control.py:1249
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Usage: /%s, hide the chat buttons."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1252
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4386,7 +4482,7 @@ msgstr ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
 
-#: ../src/groupchat_control.py:1254
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4395,7 +4491,7 @@ msgstr ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
 "using specified nickname."
 
-#: ../src/groupchat_control.py:1258
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4406,7 +4502,7 @@ msgstr ""
 "from the group chat and optionally displays a reason. Does NOT support "
 "spaces in nickname."
 
-#: ../src/groupchat_control.py:1263
+#: ../src/groupchat_control.py:1265
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current group chat. Use third "
@@ -4415,7 +4511,7 @@ msgstr ""
 "Usage: /%s <action>, sends action to the current group chat. Use third "
 "person. (e.g. /%s explodes.)"
 
-#: ../src/groupchat_control.py:1267
+#: ../src/groupchat_control.py:1269
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4424,93 +4520,93 @@ msgstr ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
 "message to the occupant specified by nickname."
 
-#: ../src/groupchat_control.py:1272
+#: ../src/groupchat_control.py:1274
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Usage: /%s <nickname>, changes your nickname in current group chat."
 
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1278
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Usage: /%s , display the names of group chat occupants."
 
-#: ../src/groupchat_control.py:1280
+#: ../src/groupchat_control.py:1282
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Usage: /%s [topic], displays or updates the current group chat topic."
 
-#: ../src/groupchat_control.py:1283
+#: ../src/groupchat_control.py:1285
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1288
 #, python-format
 msgid "No help info for /%s"
 msgstr "No help info for /%s"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Are you sure you want to leave group chat \"%s\"?"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1339
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "If you close this window, you will be disconnected from this group chat."
 
-#: ../src/groupchat_control.py:1341 ../src/roster_window.py:3961
+#: ../src/groupchat_control.py:1343 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "Do _not ask me again"
 
-#: ../src/groupchat_control.py:1375
+#: ../src/groupchat_control.py:1377
 msgid "Changing Subject"
 msgstr "Changing Subject"
 
-#: ../src/groupchat_control.py:1376
+#: ../src/groupchat_control.py:1378
 msgid "Please specify the new subject:"
 msgstr "Please specify the new subject:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1387
 msgid "Changing Nickname"
 msgstr "Changing Nickname"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1388
 msgid "Please specify the new nickname you want to use:"
 msgstr "Please specify the new nickname you want to use:"
 
-#: ../src/groupchat_control.py:1411
+#: ../src/groupchat_control.py:1413
 msgid "Bookmark already set"
 msgstr "Bookmark already set"
 
-#: ../src/groupchat_control.py:1412
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Group Chat \"%s\" is already in your bookmarks."
 
-#: ../src/groupchat_control.py:1421
+#: ../src/groupchat_control.py:1423
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark has been added successfully"
 
-#: ../src/groupchat_control.py:1422
+#: ../src/groupchat_control.py:1424
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "You can manage your bookmarks via Actions menu in your roster."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1548
+#: ../src/groupchat_control.py:1550
 #, python-format
 msgid "Kicking %s"
 msgstr "Kicking %s"
 
-#: ../src/groupchat_control.py:1549 ../src/groupchat_control.py:1831
+#: ../src/groupchat_control.py:1551 ../src/groupchat_control.py:1833
 msgid "You may specify a reason below:"
 msgstr "You may specify a reason below:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1830
+#: ../src/groupchat_control.py:1832
 #, python-format
 msgid "Banning %s"
 msgstr "Banning %s"
@@ -4556,16 +4652,16 @@ msgstr "Error parsing file:"
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Could not write to %s. Session Management support will not work"
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:728
 msgid "Extension not supported"
 msgstr "Extension not supported"
 
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:729
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:737
+#: ../src/gtkgui_helpers.py:738
 msgid "Save Image as..."
 msgstr "Save Image as..."
 
@@ -4595,11 +4691,6 @@ msgstr "Nickname"
 msgid "Message"
 msgstr "Message"
 
-#. holds subject
-#: ../src/history_manager.py:141 ../src/history_manager.py:172
-msgid "Subject"
-msgstr "Subject"
-
 #: ../src/history_manager.py:186
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -5843,7 +5934,7 @@ msgstr ""
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registration information for transport %s has not arrived in time"
 
-#: ../src/common/connection_handlers.py:1515
+#: ../src/common/connection_handlers.py:1523
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Nickname not allowed: %s"
@@ -5851,41 +5942,41 @@ msgstr "Nickname not allowed: %s"
 #. password required to join
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1577
-#: ../src/common/connection_handlers.py:1580
-#: ../src/common/connection_handlers.py:1583
-#: ../src/common/connection_handlers.py:1586
-#: ../src/common/connection_handlers.py:1589
-#: ../src/common/connection_handlers.py:1592
+#: ../src/common/connection_handlers.py:1585
+#: ../src/common/connection_handlers.py:1588
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1597
 #: ../src/common/connection_handlers.py:1600
+#: ../src/common/connection_handlers.py:1608
 msgid "Unable to join group chat"
 msgstr "Unable to join group chat"
 
-#: ../src/common/connection_handlers.py:1578
+#: ../src/common/connection_handlers.py:1586
 msgid "A password is required to join this group chat."
 msgstr "A password is required to join this group chat."
 
-#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1589
 msgid "You are banned from this group chat."
 msgstr "You are banned from this group chat."
 
-#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1592
 msgid "Such group chat does not exist."
 msgstr "Such group chat does not exist."
 
-#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1595
 msgid "Group chat creation is restricted."
 msgstr "Group chat creation is restricted."
 
-#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1598
 msgid "Your registered nickname must be used."
 msgstr "Your registered nickname must be used."
 
-#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1601
 msgid "You are not in the members list."
 msgstr "You are not in the members list."
 
-#: ../src/common/connection_handlers.py:1601
+#: ../src/common/connection_handlers.py:1609
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5893,27 +5984,27 @@ msgstr ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 
-#: ../src/common/connection_handlers.py:1651
+#: ../src/common/connection_handlers.py:1659
 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:1672
+#: ../src/common/connection_handlers.py:1680
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "we are now subscribed to %s"
 
-#: ../src/common/connection_handlers.py:1674
+#: ../src/common/connection_handlers.py:1682
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "unsubscribe request from %s"
 
-#: ../src/common/connection_handlers.py:1676
+#: ../src/common/connection_handlers.py:1684
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "we are now unsubscribed from %s"
 
-#: ../src/common/connection_handlers.py:1846
+#: ../src/common/connection_handlers.py:1854
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5943,7 +6034,7 @@ msgid "Invalid answer"
 msgstr "Invalid answer"
 
 #: ../src/common/connection.py:394 ../src/common/connection.py:429
-#: ../src/common/connection.py:872
+#: ../src/common/connection.py:877
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
@@ -6000,7 +6091,7 @@ msgstr "I'm %s"
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[This message is *encrypted* (See :JEP:`27`]"
 
-#: ../src/common/connection.py:759
+#: ../src/common/connection.py:764
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6010,7 +6101,7 @@ msgstr ""
 "Subject: %s\n"
 "%s"
 
-#: ../src/common/connection.py:898
+#: ../src/common/connection.py:903
 msgid "Not fetched because of invisible status"
 msgstr "Not fetched because of invisible status"
 
@@ -6317,10 +6408,6 @@ msgstr "None"
 msgid "To"
 msgstr "To"
 
-#: ../src/common/helpers.py:259
-msgid "From"
-msgstr "From"
-
 #: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Both"
@@ -6533,66 +6620,3 @@ msgstr "[This message is encrypted]"
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "Error while adding service. %s"
-
-#~ msgid "<b>An error has occured:</b>"
-#~ msgstr "<b>An error has occured:</b>"
-
-#~ msgid "<b>Choose command to execute:</b>"
-#~ msgstr "<b>Choose command to execute:</b>"
-
-#~ msgid "Ad-hoc Commands - Gajim"
-#~ msgstr "Ad-hoc Commands - Gajim"
-
-#~ msgid "Check once more"
-#~ msgstr "Check once more"
-
-#~ msgid "Error description..."
-#~ msgstr "Error description..."
-
-#~ msgid "Please wait while retrieving command list..."
-#~ msgstr "Please wait while retrieving command list..."
-
-#~ msgid "Please wait while the command is sending..."
-#~ msgstr "Please wait while the command is sending..."
-
-#~ msgid "Please wait..."
-#~ msgstr "Please wait..."
-
-#~ msgid "This jabber entity does not expose any commands."
-#~ msgstr "This jabber entity does not expose any commands."
-
-#~ msgid "2003-12-13T18:30:02Z"
-#~ msgstr "2003-12-13T18:30:02Z"
-
-#~ msgid "<small>Romeo and Juliet</small>"
-#~ msgstr "<small>Romeo and Juliet</small>"
-
-#~ msgid "Entry:"
-#~ msgstr "Entry:"
-
-#~ msgid "Feed name:"
-#~ msgstr "Feed name:"
-
-#~ msgid "Last modified:"
-#~ msgstr "Last modified:"
-
-#~ msgid "New entry received"
-#~ msgstr "New entry received"
-
-#~ msgid "Old stories"
-#~ msgstr "Old stories"
-
-#~ msgid "Soliloquy"
-#~ msgstr "Soliloquy"
-
-#~ msgid "You have received new entry:"
-#~ msgstr "You have received new entry:"
-
-#~ msgid "Create new post"
-#~ msgstr "Create new post"
-
-#~ msgid "This is result of query."
-#~ msgstr "This is result of query."
-
-#~ msgid "Edit items on the list"
-#~ msgstr "Edit items on the list"
diff --git a/po/eo.po b/po/eo.po
index 0537d5354..ed7bb2ff6 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-12-02 17:15+0100\n"
+"POT-Creation-Date: 2006-12-09 10:02+0100\n"
 "PO-Revision-Date: 2006-11-30 21:53+0400\n"
 "Last-Translator: Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -316,16 +316,16 @@ msgid "Manage..."
 msgstr "Administri..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1637
-#: ../src/config.py:3430
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1642
+#: ../src/config.py:3435
 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:1219
-#: ../src/config.py:1224 ../src/config.py:1408 ../src/config.py:1627
-#: ../src/config.py:1636 ../src/config.py:1695 ../src/config.py:1769
-#: ../src/config.py:2640 ../src/config.py:3420 ../src/config.py:3429
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1224
+#: ../src/config.py:1229 ../src/config.py:1413 ../src/config.py:1632
+#: ../src/config.py:1641 ../src/config.py:1700 ../src/config.py:1774
+#: ../src/config.py:2645 ../src/config.py:3425 ../src/config.py:3434
 #: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Neniu"
@@ -519,6 +519,45 @@ msgstr "Re_gistri"
 msgid "_User ID:"
 msgstr "_Uzula ID:"
 
+#: ../data/glade/adhoc_commands_window.glade.h:1
+msgid "<b>An error has occured:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:2
+msgid "<b>Choose command to execute:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:3
+msgid "Ad-hoc Commands - Gajim"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:4
+msgid "Check once more"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:5
+#, fuzzy
+msgid "Error description..."
+msgstr "Priskribo"
+
+#: ../data/glade/adhoc_commands_window.glade.h:6
+#, fuzzy
+msgid "Please wait while retrieving command list..."
+msgstr "Bonvolu atendi dum protokoloj estas portata..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:7
+#, fuzzy
+msgid "Please wait while the command is sending..."
+msgstr "Bonvolu atendi dum protokoloj estas portata..."
+
+#: ../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>Priskribo</b>"
@@ -658,13 +697,13 @@ msgstr "Ludi sonon"
 #: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
-"Contact Connected\n"
-"Contact Disconnected\n"
-"Contact Change Status\n"
-"Group Chat Message Highlight\n"
-"Group Chat Message Received\n"
-"File Transfert Resquest\n"
-"File Transfert Started\n"
+"Contact Connected \n"
+"Contact Disconnected \n"
+"Contact Change Status \n"
+"Group Chat Message Highlight \n"
+"Group Chat Message Received \n"
+"File Transfert Resquest \n"
+"File Transfert Started \n"
 "File Transfert Finished"
 msgstr ""
 "Mesaĝo venas\n"
@@ -746,6 +785,46 @@ msgstr "por "
 msgid "when I'm in"
 msgstr "dum mi estas je"
 
+#: ../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 "Lando:"
+
+#: ../data/glade/atom_entry_window.glade.h:4
+#, fuzzy
+msgid "Feed name:"
+msgstr "Etosa nomo"
+
+#: ../data/glade/atom_entry_window.glade.h:5
+#, fuzzy
+msgid "Last modified:"
+msgstr "Familia nomo:"
+
+#: ../data/glade/atom_entry_window.glade.h:6
+#, fuzzy
+msgid "New entry received"
+msgstr "Kiam ricevas novan eventon"
+
+#: ../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 "Ŝanĝi pasvorton"
@@ -831,7 +910,7 @@ msgstr "_Kompakta vido    Alt+C"
 msgid "_History"
 msgstr "_Historio"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/glade/data_form_window.glade.h:1 ../src/dataforms_widget.py:76
 msgid "Fill in the form."
 msgstr "Plenigu la formon."
 
@@ -1049,6 +1128,21 @@ msgstr "_Sendi privatan mesaĝon"
 msgid "_Voice"
 msgstr "_Voĉo"
 
+#: ../data/glade/groups_post_window.glade.h:1
+#, fuzzy
+msgid "Create new post"
+msgstr "Nova mesaĝo"
+
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:259
+msgid "From"
+msgstr "De"
+
+#. holds subject
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141
+#: ../src/history_manager.py:172
+msgid "Subject"
+msgstr "Temo"
+
 #: ../data/glade/history_manager.glade.h:1
 msgid ""
 "<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
@@ -1209,7 +1303,7 @@ 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:1116
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
 msgid "OpenPGP Encryption"
 msgstr "Ĉifrado per OpenPGP"
 
@@ -1334,7 +1428,7 @@ msgstr ""
 msgid "B_efore nickname:"
 msgstr "Antaŭ kaŝnomo:"
 
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:841
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
 msgid "Chat"
 msgstr "Babilejo"
 
@@ -2441,33 +2535,33 @@ 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:841
+#: ../src/chat_control.py:844
 msgid "Chats"
 msgstr "Babilejoj"
 
-#: ../src/chat_control.py:1042
+#: ../src/chat_control.py:1030
 #, 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:1130
+#: ../src/chat_control.py:1118
 #, 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:1266
+#: ../src/chat_control.py:1254
 msgid "Encryption enabled"
 msgstr "Ĉifrado ebligata"
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1259
 msgid "Encryption disabled"
 msgstr "Ĉifrado malebligata"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1413 ../src/conversation_textview.py:493
-#: ../src/dialogs.py:629 ../src/gajim.py:727 ../src/gajim.py:728
-#: ../src/gajim.py:1067 ../src/roster_window.py:328
+#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495
+#: ../src/dialogs.py:629 ../src/gajim.py:733 ../src/gajim.py:734
+#: ../src/gajim.py:1073 ../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
@@ -2478,12 +2572,12 @@ msgid "Not in Roster"
 msgstr "Mankas en kontaktlisto"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1545
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Vi ĵus ricevis novan mesaĝon de \"%s\""
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1546
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2491,29 +2585,29 @@ msgstr ""
 "Se vi fermos tiun ĉi slipon kaj la historio estas malŝalta, tiu ĉi mesaĝo "
 "perdiĝos."
 
-#: ../src/config.py:130 ../src/config.py:589
+#: ../src/config.py:135 ../src/config.py:594
 msgid "Disabled"
 msgstr "malŝaltitaj"
 
-#: ../src/config.py:216
+#: ../src/config.py:221
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Ĉiujn %s _minutojn"
 
-#: ../src/config.py:358
+#: ../src/config.py:363
 msgid "Active"
 msgstr "Aktiva"
 
-#: ../src/config.py:366
+#: ../src/config.py:371
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:679 ../src/gajim.py:2086
+#: ../src/config.py:684 ../src/gajim.py:2094
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Vortaro mankas por %s lingvo"
 
-#: ../src/config.py:680 ../src/gajim.py:2087
+#: ../src/config.py:685 ../src/gajim.py:2095
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -2522,242 +2616,242 @@ msgstr ""
 "Vi bezonas Instali la vortaron %s por uzi literumadon, aŭ elekti alian "
 "lingvon ĉe la agordero \"speller_language\"."
 
-#: ../src/config.py:1032
+#: ../src/config.py:1037
 msgid "status message title"
 msgstr "statmesaĝa titolo"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1037
 msgid "status message text"
 msgstr "statmesaĝa teksto"
 
-#: ../src/config.py:1067
+#: ../src/config.py:1072
 msgid "First Message Received"
 msgstr "Unua mesaĝo ricevita"
 
-#: ../src/config.py:1068
+#: ../src/config.py:1073
 msgid "Next Message Received"
 msgstr "Sekva mesaĝo ricevita"
 
-#: ../src/config.py:1069
+#: ../src/config.py:1074
 msgid "Contact Connected"
 msgstr "Kontakto konektita"
 
-#: ../src/config.py:1070
+#: ../src/config.py:1075
 msgid "Contact Disconnected"
 msgstr "Kontakto malkonektita"
 
-#: ../src/config.py:1071
+#: ../src/config.py:1076
 msgid "Message Sent"
 msgstr "Mesaĝo sendita"
 
-#: ../src/config.py:1072
+#: ../src/config.py:1077
 msgid "Group Chat Message Highlight"
 msgstr "Emfazado de mesaĝoj en babilejo"
 
-#: ../src/config.py:1073
+#: ../src/config.py:1078
 msgid "Group Chat Message Received"
 msgstr "Ricevitas mesaĝo en babilejo"
 
-#: ../src/config.py:1080
+#: ../src/config.py:1085
 msgid "GMail Email Received"
 msgstr "GMail-retletero venis"
 
-#: ../src/config.py:1283
+#: ../src/config.py:1288
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP estas neuzebla ĉe tiu ĉi komputilo"
 
-#: ../src/config.py:1329
+#: ../src/config.py:1334
 msgid "You are currently connected to the server"
 msgstr "Nun vi estas konektita al la servilo"
 
-#: ../src/config.py:1330
+#: ../src/config.py:1335
 msgid "To change the account name, you must be disconnected."
 msgstr "Por ke ŝanĝi kontnomon, vi devas esti senkonekta."
 
-#: ../src/config.py:1333 ../src/config.py:1925
+#: ../src/config.py:1338 ../src/config.py:1930
 msgid "Unread events"
 msgstr "Nelegitaj eventoj"
 
-#: ../src/config.py:1334
+#: ../src/config.py:1339
 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:1338
+#: ../src/config.py:1343
 msgid "Account Name Already Used"
 msgstr "Kontnomo jam estas uzata"
 
-#: ../src/config.py:1339
+#: ../src/config.py:1344
 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:1343 ../src/config.py:1347
+#: ../src/config.py:1348 ../src/config.py:1352
 msgid "Invalid account name"
 msgstr "Malkorekta kontnomo"
 
-#: ../src/config.py:1344
+#: ../src/config.py:1349
 msgid "Account name cannot be empty."
 msgstr "Kontnomo ne povas esti malplena."
 
-#: ../src/config.py:1348
+#: ../src/config.py:1353
 msgid "Account name cannot contain spaces."
 msgstr "Kontnomo ne povas enteni spacetojn."
 
-#: ../src/config.py:1356 ../src/config.py:1362 ../src/config.py:1372
-#: ../src/config.py:3030
+#: ../src/config.py:1361 ../src/config.py:1367 ../src/config.py:1377
+#: ../src/config.py:3035
 msgid "Invalid Jabber ID"
 msgstr "Malkorekta jabber-ID"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1368
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber-ID devas esti en la formo \"uzulo@servilnomo\"."
 
-#: ../src/config.py:1422
+#: ../src/config.py:1427
 msgid "Invalid entry"
 msgstr "Malkorekta rikordo"
 
-#: ../src/config.py:1423
+#: ../src/config.py:1428
 msgid "Custom port must be a port number."
 msgstr "La pordo devas esti nombro."
 
-#: ../src/config.py:1549 ../src/common/config.py:363
+#: ../src/config.py:1554 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Revenos baldaŭ."
 
-#: ../src/config.py:1559
+#: ../src/config.py:1564
 msgid "Relogin now?"
 msgstr "Ĉu rekonektu nun?"
 
-#: ../src/config.py:1560
+#: ../src/config.py:1565
 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:1586
+#: ../src/config.py:1591
 msgid "No such account available"
 msgstr "Tia konto nedisponebla"
 
-#: ../src/config.py:1587
+#: ../src/config.py:1592
 msgid "You must create your account before editing your personal information."
 msgstr "Vi devas krei konton antaŭ korekti vian personan informon."
 
-#: ../src/config.py:1594 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/config.py:1599 ../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:1595
+#: ../src/config.py:1600
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Senkonekte vi ne povas ŝanĝi vian personan informon."
 
-#: ../src/config.py:1599
+#: ../src/config.py:1604
 msgid "Your server doesn't support Vcard"
 msgstr "Via servilo ne subtenas Vizitkarton"
 
-#: ../src/config.py:1600
+#: ../src/config.py:1605
 msgid "Your server can't save your personal information."
 msgstr "Via servilo ne povas konservi vian personan informon."
 
-#: ../src/config.py:1624 ../src/config.py:3417
+#: ../src/config.py:1629 ../src/config.py:3422
 msgid "Failed to get secret keys"
 msgstr "Ricevado de sekreta ĉifroŝlosilo malsukcesis"
 
-#: ../src/config.py:1625 ../src/config.py:3418
+#: ../src/config.py:1630 ../src/config.py:3423
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Estas problemo ricevi vian sekretan OpenPGP-ĉifrŝlosilon."
 
-#: ../src/config.py:1628 ../src/config.py:3421
+#: ../src/config.py:1633 ../src/config.py:3426
 msgid "OpenPGP Key Selection"
 msgstr "Elekto de OpenPGP-ĉifrŝlosilo"
 
-#: ../src/config.py:1629 ../src/config.py:3422
+#: ../src/config.py:1634 ../src/config.py:3427
 msgid "Choose your OpenPGP key"
 msgstr "Elektu vian OpenPGP-ĉifrŝlosilon"
 
 #. Name column
-#: ../src/config.py:1859 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/config.py:1864 ../src/disco.py:740 ../src/disco.py:1466
 #: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Nomo"
 
-#: ../src/config.py:1862
+#: ../src/config.py:1867
 msgid "Server"
 msgstr "Servilo"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1931
 msgid "Read all pending events before removing this account."
 msgstr "Legu ĉiujn atendantajn eventojn antaŭ forigi tiun konton."
 
-#: ../src/config.py:1963
+#: ../src/config.py:1968
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Vi havas aktivan konversacion ĉe konto %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:1969
 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:2023
+#: ../src/config.py:2028
 msgid "Account Local already exists."
 msgstr "Loka konto jam ekzistas."
 
-#: ../src/config.py:2024
+#: ../src/config.py:2029
 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:2256
+#: ../src/config.py:2261
 #, python-format
 msgid "Edit %s"
 msgstr "Administri %s"
 
-#: ../src/config.py:2258
+#: ../src/config.py:2263
 #, python-format
 msgid "Register to %s"
 msgstr "Registri ĉe %s"
 
 #. list at the begining
-#: ../src/config.py:2330
+#: ../src/config.py:2335
 msgid "Ban List"
 msgstr "Listo de malpermesoj"
 
-#: ../src/config.py:2331
+#: ../src/config.py:2336
 msgid "Member List"
 msgstr "Membra listo"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2337
 msgid "Owner List"
 msgstr "Listo de mastroj"
 
-#: ../src/config.py:2333
+#: ../src/config.py:2338
 msgid "Administrator List"
 msgstr "Estra listo"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2366 ../src/disco.py:747 ../src/history_manager.py:154
+#: ../src/config.py:2371 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2374
+#: ../src/config.py:2379
 msgid "Reason"
 msgstr "Kialo"
 
-#: ../src/config.py:2379
+#: ../src/config.py:2384
 msgid "Nick"
 msgstr "Kaŝnomo"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2388
 msgid "Role"
 msgstr "Rolo"
 
-#: ../src/config.py:2404
+#: ../src/config.py:2409
 msgid "Banning..."
 msgstr "Malpermesas..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2406
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2765,11 +2859,11 @@ msgstr ""
 "<b>Por kiu vi volas malpermesi aliĝon?</b>\n"
 "\n"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2413
 msgid "Adding Member..."
 msgstr "Aligas membron..."
 
-#: ../src/config.py:2409
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2777,11 +2871,11 @@ msgstr ""
 "<b>Kiun vi volas fari membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2411
+#: ../src/config.py:2416
 msgid "Adding Owner..."
 msgstr "Aligas mastron..."
 
-#: ../src/config.py:2412
+#: ../src/config.py:2417
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2789,11 +2883,11 @@ msgstr ""
 "<b>Kiun vi volas fari mastro?</b>\n"
 "\n"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2419
 msgid "Adding Administrator..."
 msgstr "Aligas administriston..."
 
-#: ../src/config.py:2415
+#: ../src/config.py:2420
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2801,7 +2895,7 @@ msgstr ""
 "<b>Kiun vi volas fari administristo?</b>\n"
 "\n"
 
-#: ../src/config.py:2416
+#: ../src/config.py:2421
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2817,97 +2911,97 @@ msgstr ""
 "4. domajno (iu kombinaĵo de risurco kaj uzulo\n"
 "kun tiu domajno aŭ subdomajno)."
 
-#: ../src/config.py:2521
+#: ../src/config.py:2526
 #, python-format
 msgid "Removing %s account"
 msgstr "Forigado de konto %s"
 
-#: ../src/config.py:2538 ../src/roster_window.py:2667
+#: ../src/config.py:2543 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Pasvorto necesas"
 
-#: ../src/config.py:2539 ../src/roster_window.py:2668
+#: ../src/config.py:2544 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enigi vian pasvorton por konto %s"
 
-#: ../src/config.py:2540 ../src/roster_window.py:2669
+#: ../src/config.py:2545 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Konservi pasvorton"
 
-#: ../src/config.py:2554
+#: ../src/config.py:2559
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" estas konektita al la servilo"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2560
 msgid "If you remove it, the connection will be lost."
 msgstr "Se vi forigos ĝin, la konekto disiĝos."
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 msgid "Default"
 msgstr "Defaŭlte"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 msgid "?print_status:All"
 msgstr "Ĉiuj"
 
-#: ../src/config.py:2640
+#: ../src/config.py:2645
 msgid "Enter and leave only"
 msgstr "Nur en/el-irado"
 
-#: ../src/config.py:2710
+#: ../src/config.py:2715
 msgid "New Group Chat"
 msgstr "Nova babilejo"
 
-#: ../src/config.py:2742
+#: ../src/config.py:2747
 msgid "This bookmark has invalid data"
 msgstr "Tiu ĉi legosigno havas malkorektan datumon"
 
-#: ../src/config.py:2743
+#: ../src/config.py:2748
 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:3005
+#: ../src/config.py:3010
 msgid "Invalid username"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/config.py:3006
+#: ../src/config.py:3011
 msgid "You must provide a username to configure this account."
 msgstr "Vi devas enigi salutnomon por administri tiun ĉi konton."
 
-#: ../src/config.py:3016 ../src/dialogs.py:1316
+#: ../src/config.py:3021 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Malkorekta pasvorto"
 
-#: ../src/config.py:3017
+#: ../src/config.py:3022
 msgid "You must enter a password for the new account."
 msgstr "Vi devas enigi pasvorton por la nova konto."
 
-#: ../src/config.py:3021 ../src/dialogs.py:1321
+#: ../src/config.py:3026 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Pasvortoj diversas"
 
-#: ../src/config.py:3022 ../src/dialogs.py:1322
+#: ../src/config.py:3027 ../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:3041
+#: ../src/config.py:3046
 msgid "Duplicate Jabber ID"
 msgstr "Ripeta Jabber-ID"
 
-#: ../src/config.py:3042
+#: ../src/config.py:3047
 msgid "This account is already configured in Gajim."
 msgstr "Tiu ĉi konto jam ĉeestas en kontlisto de Gajim."
 
-#: ../src/config.py:3059
+#: ../src/config.py:3064
 msgid "Account has been added successfully"
 msgstr "Konto estas sukcese aldonita"
 
-#: ../src/config.py:3060 ../src/config.py:3095
+#: ../src/config.py:3065 ../src/config.py:3100
 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."
@@ -2915,23 +3009,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:3094
+#: ../src/config.py:3099
 msgid "Your new account has been created successfully"
 msgstr "Via nova konto estas sukcese kreita"
 
-#: ../src/config.py:3112
+#: ../src/config.py:3117
 msgid "An error occured during account creation"
 msgstr "Eraro okazis dum kreado de konto"
 
-#: ../src/config.py:3170
+#: ../src/config.py:3175
 msgid "Account name is in use"
 msgstr "Kontnomo estas uzata"
 
-#: ../src/config.py:3171
+#: ../src/config.py:3176
 msgid "You already have an account using this name."
 msgstr "Vi jam havas konto kun tiu nomo."
 
-#: ../src/conversation_textview.py:271
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2939,56 +3033,65 @@ msgstr ""
 "Teksto sub tiu ĉi lineo estas, kio estas dirita post kiam vi lastfoje "
 "atentis al tiu ĉi babilejo"
 
-#: ../src/conversation_textview.py:340
+#: ../src/conversation_textview.py:342
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Agoj por \"%s\""
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Legi _vikipedian artikolon"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:359
 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:373
+#: ../src/conversation_textview.py:375
 #, 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:386
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Retserĉila URL ne enhavas \"%s\""
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "Retserĉi tion"
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:397
 msgid "Open as _Link"
 msgstr "Malfermi  kiel _ligilon"
 
-#: ../src/conversation_textview.py:755
+#: ../src/conversation_textview.py:757
 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:759
+#: ../src/conversation_textview.py:761
 #, python-format
 msgid "%i days ago"
 msgstr "Antaŭ %i tagoj"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:791
+#: ../src/conversation_textview.py:793
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temo: %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>"
@@ -3249,29 +3352,29 @@ msgstr "Nova unuobla mesaĝo"
 msgid "New Private Message"
 msgstr "Nova privata mesaĝo"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1161 ../src/notify.py:424
+#: ../src/dialogs.py:1369 ../src/gajim.py:1168 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Nova retletero"
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1314 ../src/notify.py:418
+#: ../src/dialogs.py:1371 ../src/gajim.py:1321 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Mendo de dosiera transmeto"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1134 ../src/gajim.py:1290
+#: ../src/dialogs.py:1373 ../src/gajim.py:1140 ../src/gajim.py:1297
 #: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Dosiertransmeta eraro"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1353 ../src/gajim.py:1375
-#: ../src/gajim.py:1392 ../src/notify.py:422
+#: ../src/dialogs.py:1375 ../src/gajim.py:1360 ../src/gajim.py:1382
+#: ../src/gajim.py:1399 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Dosiera transmeto plenumis"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1356 ../src/notify.py:422
+#: ../src/dialogs.py:1376 ../src/gajim.py:1363 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Dosiera transmeto haltitas"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1032 ../src/notify.py:426
+#: ../src/dialogs.py:1378 ../src/gajim.py:1038 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Babileja invitilo"
 
@@ -3622,32 +3725,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:682
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Ne povas reskribi ekzistan dosieron \"%s\""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
 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:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "This file already exists"
 msgstr "Tiu dosiero jam ekzistas"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "What do you want to do?"
 msgstr "Kion vi volas fari?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Dosierujo \"%s\" ne skribeblas"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
 msgid "You do not have permission to create files in this directory."
 msgstr "Vi ne havas permeson krei dosierojn en ĉi tiu dosierujo."
 
@@ -3783,57 +3886,58 @@ msgstr "Konektado malsukcesis"
 msgid "Subject: %s"
 msgstr "Temo: %s"
 
-#: ../src/gajim.py:703
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:703 ../src/gajim.py:716
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "eraro dum sendado %s ( %s )"
 
-#: ../src/gajim.py:743
+#: ../src/gajim.py:749
 msgid "Authorization accepted"
 msgstr "Permespeto akceptitas"
 
-#: ../src/gajim.py:744
+#: ../src/gajim.py:750
 #, 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:752
+#: ../src/gajim.py:758
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakto \"%s\" nuligis abonon de vi"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:759
 msgid "You will always see him or her as offline."
 msgstr "Vi ĉiam vidos ŝin aŭ lin senkonekta."
 
-#: ../src/gajim.py:796
+#: ../src/gajim.py:802
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakto kun \"%s\" neestableblas"
 
-#: ../src/gajim.py:797 ../src/common/connection.py:395
+#: ../src/gajim.py:803 ../src/common/connection.py:395
 msgid "Check your connection or try again later."
 msgstr "Kontrolu vian konekton aŭ provu denove poste."
 
-#: ../src/gajim.py:945 ../src/roster_window.py:1201
+#: ../src/gajim.py:951 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s nun estas %s (%s)"
 
-#: ../src/gajim.py:1042
+#: ../src/gajim.py:1048
 msgid "Your passphrase is incorrect"
 msgstr "Via pasfrazo estas malvalida"
 
-#: ../src/gajim.py:1043
+#: ../src/gajim.py:1049
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Nun vi estas konekta sen uzado de via OpenPGP-ŝlosilo."
 
-#: ../src/gajim.py:1145
+#: ../src/gajim.py:1151
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nova retletero ĉe %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1147
+#: ../src/gajim.py:1153
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3843,7 +3947,7 @@ msgstr[1] "Vi havas %d novajn retleterojn"
 #. FIXME: emulate Gtalk client popups. find out what they parse and how
 #. they decide what to show
 #. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1156
+#: ../src/gajim.py:1162
 #, python-format
 msgid ""
 "\n"
@@ -3852,52 +3956,52 @@ msgstr ""
 "\n"
 "De: %(from_address)s"
 
-#: ../src/gajim.py:1311
+#: ../src/gajim.py:1318
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s volas sendi dosieron al vi."
 
-#: ../src/gajim.py:1376
+#: ../src/gajim.py:1383
 #, 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:1380
+#: ../src/gajim.py:1387
 #, 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:1393
+#: ../src/gajim.py:1400
 #, 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:1397
+#: ../src/gajim.py:1404
 #, 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:1503
+#: ../src/gajim.py:1510
 msgid "Username Conflict"
 msgstr "Konflikto de salutnomoj"
 
-#: ../src/gajim.py:1504
+#: ../src/gajim.py:1511
 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:1842
+#: ../src/gajim.py:1850
 msgid "Could not save your settings and preferences"
 msgstr "Ne povis konservi vian agordon"
 
-#: ../src/gajim.py:2034
+#: ../src/gajim.py:2042
 msgid "Network Manager support not available"
 msgstr "Subteno de retadministrilo mankas"
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2117
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Subteno de seancagordo nedisponeblas (mankas modulo gnome.ui)"
 
@@ -4227,116 +4331,116 @@ msgstr "Vi ne povas forigi aktivan etoson"
 msgid "Please first choose another for your current theme."
 msgstr "Bonvolu komence aktivigi alian etoson."
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chat"
 msgstr "Privata interparolo"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chats"
 msgstr "Privataj interparoloj"
 
-#: ../src/groupchat_control.py:120
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Sendado de privata mesaĝo malsukcesis"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Vi ne plu ĉeestas en babilejo \"%s\" aŭ \"%s\" foriris."
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chat"
 msgstr "Babilejo"
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chats"
 msgstr "Babilejoj"
 
-#: ../src/groupchat_control.py:315
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Enmeti kaŝnomon"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:810
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s estas elpelita: %(reason)s"
 
-#: ../src/groupchat_control.py:814
+#: ../src/groupchat_control.py:816
 #, 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:821
+#: ../src/groupchat_control.py:823
 #, 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:825
+#: ../src/groupchat_control.py:827
 #, 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:833
+#: ../src/groupchat_control.py:835
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vi nomiĝas %s"
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:837
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s nomiĝas %s"
 
-#: ../src/groupchat_control.py:915
+#: ../src/groupchat_control.py:917
 #, python-format
 msgid "%s has left"
 msgstr "%s foriris"
 
-#: ../src/groupchat_control.py:920
+#: ../src/groupchat_control.py:922
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s aliĝis al la babilejo"
 
 #. No status message
-#: ../src/groupchat_control.py:922 ../src/roster_window.py:1204
+#: ../src/groupchat_control.py:924 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s nun estas %s"
 
-#: ../src/groupchat_control.py:1041 ../src/groupchat_control.py:1059
-#: ../src/groupchat_control.py:1152 ../src/groupchat_control.py:1169
+#: ../src/groupchat_control.py:1043 ../src/groupchat_control.py:1061
+#: ../src/groupchat_control.py:1154 ../src/groupchat_control.py:1171
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Kaŝnomo ne trovitas: %s"
 
-#: ../src/groupchat_control.py:1075
+#: ../src/groupchat_control.py:1077
 msgid "This group chat has no subject"
 msgstr "Tiu ĉi babilejo ne havas temon"
 
-#: ../src/groupchat_control.py:1088
+#: ../src/groupchat_control.py:1090
 #, 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:1095 ../src/groupchat_control.py:1123
+#: ../src/groupchat_control.py:1097 ../src/groupchat_control.py:1125
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "Tio ne estas valida JID: %s"
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1208
 #, 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:1229
+#: ../src/groupchat_control.py:1231
 #, python-format
 msgid "Commands: %s"
 msgstr "Komandoj: %s"
 
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1233
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4348,7 +4452,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:1238
+#: ../src/groupchat_control.py:1240
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4356,12 +4460,12 @@ msgstr ""
 "Uzado: /%s <kaŝnomo>, - malfermas privatan interparolan fenestron por "
 "specifita persono."
 
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1244
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uzado: /%s, - malplenigas la tekstan fenestron."
 
-#: ../src/groupchat_control.py:1244
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4370,12 +4474,12 @@ msgstr ""
 "Uzado: /%s [kialo], - fermas la nuntempan fenestron aŭ slipon, informe pri "
 "kialo se specifita."
 
-#: ../src/groupchat_control.py:1247
+#: ../src/groupchat_control.py:1249
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Uzado: /%s, - kaŝas la babiladajn butonojn."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1252
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4384,7 +4488,7 @@ msgstr ""
 "Uzado: /%s <JID> [kialo], - invitas JID al la nuntempa babilejo, fakultative "
 "informante pri kialo."
 
-#: ../src/groupchat_control.py:1254
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4393,7 +4497,7 @@ msgstr ""
 "Uzado: /%s <babilejo>@<servilo>[/kaŝnomo], - aliĝas al room@server "
 "fakultative uze specifitan kaŝnomon."
 
-#: ../src/groupchat_control.py:1258
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4403,7 +4507,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:1263
+#: ../src/groupchat_control.py:1265
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current group chat. Use third "
@@ -4411,7 +4515,7 @@ msgid ""
 msgstr ""
 "Uzado: /%s <ago>, sendas agon en aktualan babilejon (ekzemple /%s eksplodas)."
 
-#: ../src/groupchat_control.py:1267
+#: ../src/groupchat_control.py:1269
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4420,93 +4524,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:1272
+#: ../src/groupchat_control.py:1274
 #, 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:1276
+#: ../src/groupchat_control.py:1278
 #, 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:1280
+#: ../src/groupchat_control.py:1282
 #, 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:1283
+#: ../src/groupchat_control.py:1285
 #, 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:1286
+#: ../src/groupchat_control.py:1288
 #, python-format
 msgid "No help info for /%s"
 msgstr "helpinformo mankas por /%s"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1337
 #, 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:1337
+#: ../src/groupchat_control.py:1339
 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:1341 ../src/roster_window.py:3961
+#: ../src/groupchat_control.py:1343 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "_Ne plu demandi"
 
-#: ../src/groupchat_control.py:1375
+#: ../src/groupchat_control.py:1377
 msgid "Changing Subject"
 msgstr "Korektas temon"
 
-#: ../src/groupchat_control.py:1376
+#: ../src/groupchat_control.py:1378
 msgid "Please specify the new subject:"
 msgstr "Bonvolu enigi novan temon:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1387
 msgid "Changing Nickname"
 msgstr "Ŝanĝas kaŝnomon"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1388
 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:1411
+#: ../src/groupchat_control.py:1413
 msgid "Bookmark already set"
 msgstr "Legosigno jam estas metita"
 
-#: ../src/groupchat_control.py:1412
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Babilejo \"%s\" jam estas en viajn legosignojn."
 
-#: ../src/groupchat_control.py:1421
+#: ../src/groupchat_control.py:1423
 msgid "Bookmark has been added successfully"
 msgstr "Legosigno sukcese aldonitas"
 
-#: ../src/groupchat_control.py:1422
+#: ../src/groupchat_control.py:1424
 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:1548
+#: ../src/groupchat_control.py:1550
 #, python-format
 msgid "Kicking %s"
 msgstr "Elpelatas %s"
 
-#: ../src/groupchat_control.py:1549 ../src/groupchat_control.py:1831
+#: ../src/groupchat_control.py:1551 ../src/groupchat_control.py:1833
 msgid "You may specify a reason below:"
 msgstr "Vi povas specifi kialon sube:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1830
+#: ../src/groupchat_control.py:1832
 #, python-format
 msgid "Banning %s"
 msgstr "Malpermesas %s"
@@ -4550,17 +4654,17 @@ msgstr "Eraro dum dosieranalizo:"
 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:727
+#: ../src/gtkgui_helpers.py:728
 msgid "Extension not supported"
 msgstr "Kromaĵo ne subtenatas"
 
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:729
 #, 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:737
+#: ../src/gtkgui_helpers.py:738
 msgid "Save Image as..."
 msgstr "Konservi bildon kiel..."
 
@@ -4590,11 +4694,6 @@ msgstr "Kaŝnomo"
 msgid "Message"
 msgstr "Mesaĝo"
 
-#. holds subject
-#: ../src/history_manager.py:141 ../src/history_manager.py:172
-msgid "Subject"
-msgstr "Temo"
-
 #: ../src/history_manager.py:186
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -5828,7 +5927,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:1515
+#: ../src/common/connection_handlers.py:1523
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Kaŝnomo malpermesita: %s"
@@ -5836,41 +5935,41 @@ msgstr "Kaŝnomo malpermesita: %s"
 #. password required to join
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1577
-#: ../src/common/connection_handlers.py:1580
-#: ../src/common/connection_handlers.py:1583
-#: ../src/common/connection_handlers.py:1586
-#: ../src/common/connection_handlers.py:1589
-#: ../src/common/connection_handlers.py:1592
+#: ../src/common/connection_handlers.py:1585
+#: ../src/common/connection_handlers.py:1588
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1597
 #: ../src/common/connection_handlers.py:1600
+#: ../src/common/connection_handlers.py:1608
 msgid "Unable to join group chat"
 msgstr "Neeblas aliĝi al babilejo"
 
-#: ../src/common/connection_handlers.py:1578
+#: ../src/common/connection_handlers.py:1586
 msgid "A password is required to join this group chat."
 msgstr "Necesas pasvorto por aliĝi al la babilejo."
 
-#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1589
 msgid "You are banned from this group chat."
 msgstr "Al vi oni malpermesis esti en la babilejo."
 
-#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1592
 msgid "Such group chat does not exist."
 msgstr "Tiu babilejo ne ekzistas."
 
-#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1595
 msgid "Group chat creation is restricted."
 msgstr "Babileja kreado limigitas."
 
-#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1598
 msgid "Your registered nickname must be used."
 msgstr "Vi devas uzi vian registritan kaŝnomon."
 
-#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1601
 msgid "You are not in the members list."
 msgstr "Vi ne ĉeestas en membrolisto."
 
-#: ../src/common/connection_handlers.py:1601
+#: ../src/common/connection_handlers.py:1609
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5878,27 +5977,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:1651
+#: ../src/common/connection_handlers.py:1659
 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:1672
+#: ../src/common/connection_handlers.py:1680
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nun ni abonas %s"
 
-#: ../src/common/connection_handlers.py:1674
+#: ../src/common/connection_handlers.py:1682
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "ordono pri abona fino de %s"
 
-#: ../src/common/connection_handlers.py:1676
+#: ../src/common/connection_handlers.py:1684
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "ni nun ne abonas pri %s"
 
-#: ../src/common/connection_handlers.py:1846
+#: ../src/common/connection_handlers.py:1854
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5928,7 +6027,7 @@ msgid "Invalid answer"
 msgstr "Nekorekta respondo"
 
 #: ../src/common/connection.py:394 ../src/common/connection.py:429
-#: ../src/common/connection.py:872
+#: ../src/common/connection.py:877
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
@@ -5985,7 +6084,7 @@ msgstr "Mi estas %s"
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Tiu ĉi mesaĝo estas *ĉifrita* (Vidu :JEP:`27`]"
 
-#: ../src/common/connection.py:759
+#: ../src/common/connection.py:764
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -5995,7 +6094,7 @@ msgstr ""
 "Temo: %s\n"
 "%s"
 
-#: ../src/common/connection.py:898
+#: ../src/common/connection.py:903
 msgid "Not fetched because of invisible status"
 msgstr "Ne obtenita pro nevidebla stato"
 
@@ -6301,10 +6400,6 @@ msgstr "Neniu"
 msgid "To"
 msgstr "Al"
 
-#: ../src/common/helpers.py:259
-msgid "From"
-msgstr "De"
-
 #: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Ambaŭ"
@@ -6589,9 +6684,6 @@ msgstr "eraro dum aldonado de servo %s"
 #~ msgid "Migrating Logs..."
 #~ msgstr "Portas protokolojn..."
 
-#~ msgid "Please wait while logs are being migrated..."
-#~ msgstr "Bonvolu atendi dum protokoloj estas portata..."
-
 #~ msgid "Role: "
 #~ msgstr "Rolo: "
 
diff --git a/po/es.po b/po/es.po
index 50c0e303c..153ea0f30 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-12-02 17:15+0100\n"
+"POT-Creation-Date: 2006-12-09 10:02+0100\n"
 "PO-Revision-Date: 2005-05-21 20:03+0100\n"
 "Last-Translator: Membris Khan <membriskhan@gmail.com>\n"
 "Language-Team: none\n"
@@ -320,16 +320,16 @@ msgid "Manage..."
 msgstr "Gestionar..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1637
-#: ../src/config.py:3430
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1642
+#: ../src/config.py:3435
 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:1219
-#: ../src/config.py:1224 ../src/config.py:1408 ../src/config.py:1627
-#: ../src/config.py:1636 ../src/config.py:1695 ../src/config.py:1769
-#: ../src/config.py:2640 ../src/config.py:3420 ../src/config.py:3429
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1224
+#: ../src/config.py:1229 ../src/config.py:1413 ../src/config.py:1632
+#: ../src/config.py:1641 ../src/config.py:1700 ../src/config.py:1774
+#: ../src/config.py:2645 ../src/config.py:3425 ../src/config.py:3434
 #: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Ninguno"
@@ -523,6 +523,46 @@ msgstr "_Suscribir"
 msgid "_User ID:"
 msgstr "Identificador:"
 
+#: ../data/glade/adhoc_commands_window.glade.h:1
+#, fuzzy
+msgid "<b>An error has occured:</b>"
+msgstr "Ha ocurrido un error de protocolo:"
+
+#: ../data/glade/adhoc_commands_window.glade.h:2
+msgid "<b>Choose command to execute:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:3
+msgid "Ad-hoc Commands - Gajim"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:4
+msgid "Check once more"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:5
+#, fuzzy
+msgid "Error description..."
+msgstr "Descripción"
+
+#: ../data/glade/adhoc_commands_window.glade.h:6
+#, fuzzy
+msgid "Please wait while retrieving command list..."
+msgstr "Por favor, espera mientras el registro está siendo migrado..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:7
+#, fuzzy
+msgid "Please wait while the command is sending..."
+msgstr "Por favor, espera mientras el registro está siendo migrado..."
+
+#: ../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>Descripción</b>"
@@ -671,13 +711,13 @@ msgstr "Reproducir _sonidos"
 #: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
-"Contact Connected\n"
-"Contact Disconnected\n"
-"Contact Change Status\n"
-"Group Chat Message Highlight\n"
-"Group Chat Message Received\n"
-"File Transfert Resquest\n"
-"File Transfert Started\n"
+"Contact Connected \n"
+"Contact Disconnected \n"
+"Contact Change Status \n"
+"Group Chat Message Highlight \n"
+"Group Chat Message Received \n"
+"File Transfert Resquest \n"
+"File Transfert Started \n"
 "File Transfert Finished"
 msgstr ""
 
@@ -750,6 +790,46 @@ msgstr "Puerto: "
 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 "País:"
+
+#: ../data/glade/atom_entry_window.glade.h:4
+#, fuzzy
+msgid "Feed name:"
+msgstr "nombre del tema"
+
+#: ../data/glade/atom_entry_window.glade.h:5
+#, fuzzy
+msgid "Last modified:"
+msgstr "Nombre:"
+
+#: ../data/glade/atom_entry_window.glade.h:6
+#, fuzzy
+msgid "New entry received"
+msgstr "Cuando se reciba un nuevo evento"
+
+#: ../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 "Cambiar contraseña"
@@ -838,7 +918,7 @@ msgstr "Vista _compacta    Alt+C"
 msgid "_History"
 msgstr "_Histórico"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/glade/data_form_window.glade.h:1 ../src/dataforms_widget.py:76
 #, fuzzy
 msgid "Fill in the form."
 msgstr "En el grupo"
@@ -1059,6 +1139,22 @@ msgstr "_Enviar mensaje privado"
 msgid "_Voice"
 msgstr "_Voz"
 
+#: ../data/glade/groups_post_window.glade.h:1
+#, fuzzy
+msgid "Create new post"
+msgstr "Nuevo salón"
+
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:259
+msgid "From"
+msgstr "Salón:"
+
+#. holds subject
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141
+#: ../src/history_manager.py:172
+#, fuzzy
+msgid "Subject"
+msgstr "Tema:"
+
 #: ../data/glade/history_manager.glade.h:1
 msgid ""
 "<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
@@ -1216,7 +1312,7 @@ 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:1116
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
 msgid "OpenPGP Encryption"
 msgstr "Encriptación OpenPGP"
 
@@ -1343,7 +1439,7 @@ msgstr ""
 msgid "B_efore nickname:"
 msgstr "Antes del nombre:"
 
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:841
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
 msgid "Chat"
 msgstr "Charla"
 
@@ -2498,34 +2594,34 @@ 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:841
+#: ../src/chat_control.py:844
 #, fuzzy
 msgid "Chats"
 msgstr "Charla"
 
-#: ../src/chat_control.py:1042
+#: ../src/chat_control.py:1030
 #, fuzzy, python-format
 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:1130
+#: ../src/chat_control.py:1118
 #, 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:1266
+#: ../src/chat_control.py:1254
 msgid "Encryption enabled"
 msgstr "Encriptación activada"
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1259
 msgid "Encryption disabled"
 msgstr "Encriptación desactivada"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1413 ../src/conversation_textview.py:493
-#: ../src/dialogs.py:629 ../src/gajim.py:727 ../src/gajim.py:728
-#: ../src/gajim.py:1067 ../src/roster_window.py:328
+#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495
+#: ../src/dialogs.py:629 ../src/gajim.py:733 ../src/gajim.py:734
+#: ../src/gajim.py:1073 ../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
@@ -2536,12 +2632,12 @@ msgid "Not in Roster"
 msgstr "no está en el roster"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1545
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Acabas de recibir un nuevo mensaje de \"%s\""
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1546
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2549,327 +2645,327 @@ msgstr ""
 "Si cierras esta pestaña y tienes el regstro desactivado, este mensaje se "
 "perderá."
 
-#: ../src/config.py:130 ../src/config.py:589
+#: ../src/config.py:135 ../src/config.py:594
 msgid "Disabled"
 msgstr ""
 
-#: ../src/config.py:216
+#: ../src/config.py:221
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Cada %s _minutos"
 
-#: ../src/config.py:358
+#: ../src/config.py:363
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:366
+#: ../src/config.py:371
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:679 ../src/gajim.py:2086
+#: ../src/config.py:684 ../src/gajim.py:2094
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "No hay disponible una conexión"
 
-#: ../src/config.py:680 ../src/gajim.py:2087
+#: ../src/config.py:685 ../src/gajim.py:2095
 #, 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:1032
+#: ../src/config.py:1037
 msgid "status message title"
 msgstr "título del mensaje de estado"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1037
 msgid "status message text"
 msgstr "texto del mensaje de estado"
 
-#: ../src/config.py:1067
+#: ../src/config.py:1072
 msgid "First Message Received"
 msgstr ""
 
-#: ../src/config.py:1068
+#: ../src/config.py:1073
 #, fuzzy
 msgid "Next Message Received"
 msgstr "Nuevo mensaje"
 
-#: ../src/config.py:1069
+#: ../src/config.py:1074
 #, fuzzy
 msgid "Contact Connected"
 msgstr "Nombre de contacto"
 
-#: ../src/config.py:1070
+#: ../src/config.py:1075
 #, fuzzy
 msgid "Contact Disconnected"
 msgstr "Contacto conectado"
 
-#: ../src/config.py:1071
+#: ../src/config.py:1076
 #, fuzzy
 msgid "Message Sent"
 msgstr "Mensaje"
 
-#: ../src/config.py:1072
+#: ../src/config.py:1077
 msgid "Group Chat Message Highlight"
 msgstr ""
 
-#: ../src/config.py:1073
+#: ../src/config.py:1078
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: ../src/config.py:1080
+#: ../src/config.py:1085
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Invitación recibida"
 
-#: ../src/config.py:1283
+#: ../src/config.py:1288
 msgid "OpenPGP is not usable in this computer"
 msgstr "GPG no es usable en este ordenador"
 
-#: ../src/config.py:1329
+#: ../src/config.py:1334
 msgid "You are currently connected to the server"
 msgstr "Debes estar conectado para navegar los servicios"
 
-#: ../src/config.py:1330
+#: ../src/config.py:1335
 msgid "To change the account name, you must be disconnected."
 msgstr "Para cambiar el nombre de la cuenta, debes estar desconectado"
 
-#: ../src/config.py:1333 ../src/config.py:1925
+#: ../src/config.py:1338 ../src/config.py:1930
 msgid "Unread events"
 msgstr ""
 
-#: ../src/config.py:1334
+#: ../src/config.py:1339
 #, 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:1338
+#: ../src/config.py:1343
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "El nombre de la cuenta está en uso"
 
-#: ../src/config.py:1339
+#: ../src/config.py:1344
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 
-#: ../src/config.py:1343 ../src/config.py:1347
+#: ../src/config.py:1348 ../src/config.py:1352
 msgid "Invalid account name"
 msgstr "Nombre de cuenta no válido"
 
-#: ../src/config.py:1344
+#: ../src/config.py:1349
 msgid "Account name cannot be empty."
 msgstr "El nombre de la cuenta no puede estar vacío."
 
-#: ../src/config.py:1348
+#: ../src/config.py:1353
 msgid "Account name cannot contain spaces."
 msgstr "El nombre de la cuenta no puede contener espacios."
 
-#: ../src/config.py:1356 ../src/config.py:1362 ../src/config.py:1372
-#: ../src/config.py:3030
+#: ../src/config.py:1361 ../src/config.py:1367 ../src/config.py:1377
+#: ../src/config.py:3035
 msgid "Invalid Jabber ID"
 msgstr "ID de Jabber no válida"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1368
 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:1422
+#: ../src/config.py:1427
 msgid "Invalid entry"
 msgstr "Entrada no válida"
 
-#: ../src/config.py:1423
+#: ../src/config.py:1428
 msgid "Custom port must be a port number."
 msgstr "El puerto personalizado debe ser un número de puerto"
 
-#: ../src/config.py:1549 ../src/common/config.py:363
+#: ../src/config.py:1554 ../src/common/config.py:363
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1559
+#: ../src/config.py:1564
 msgid "Relogin now?"
 msgstr ""
 
-#: ../src/config.py:1560
+#: ../src/config.py:1565
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 
-#: ../src/config.py:1586
+#: ../src/config.py:1591
 msgid "No such account available"
 msgstr "No está disponible dicha cuenta"
 
-#: ../src/config.py:1587
+#: ../src/config.py:1592
 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:1594 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/config.py:1599 ../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:1595
+#: ../src/config.py:1600
 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:1599
+#: ../src/config.py:1604
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1600
+#: ../src/config.py:1605
 #, 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:1624 ../src/config.py:3417
+#: ../src/config.py:1629 ../src/config.py:3422
 msgid "Failed to get secret keys"
 msgstr "Error obteniendo las claves secretas"
 
-#: ../src/config.py:1625 ../src/config.py:3418
+#: ../src/config.py:1630 ../src/config.py:3423
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Ha habido un problema recuperando tus claves secretas OpenPGP"
 
-#: ../src/config.py:1628 ../src/config.py:3421
+#: ../src/config.py:1633 ../src/config.py:3426
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "Encriptación OpenPGP"
 
-#: ../src/config.py:1629 ../src/config.py:3422
+#: ../src/config.py:1634 ../src/config.py:3427
 msgid "Choose your OpenPGP key"
 msgstr "Elige tu clave OpenPGP"
 
 #. Name column
-#: ../src/config.py:1859 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/config.py:1864 ../src/disco.py:740 ../src/disco.py:1466
 #: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Nombre"
 
-#: ../src/config.py:1862
+#: ../src/config.py:1867
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1931
 msgid "Read all pending events before removing this account."
 msgstr ""
 
-#: ../src/config.py:1963
+#: ../src/config.py:1968
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "No tienes cuentas activas"
 
-#: ../src/config.py:1964
+#: ../src/config.py:1969
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:2023
+#: ../src/config.py:2028
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "El nombre de la cuenta está en uso"
 
-#: ../src/config.py:2024
+#: ../src/config.py:2029
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2256
+#: ../src/config.py:2261
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:2258
+#: ../src/config.py:2263
 #, python-format
 msgid "Register to %s"
 msgstr "Registrar a %s"
 
 #. list at the begining
-#: ../src/config.py:2330
+#: ../src/config.py:2335
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:2331
+#: ../src/config.py:2336
 #, fuzzy
 msgid "Member List"
 msgstr "_Miembro"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2337
 #, fuzzy
 msgid "Owner List"
 msgstr "_Propietario"
 
-#: ../src/config.py:2333
+#: ../src/config.py:2338
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrador"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2366 ../src/disco.py:747 ../src/history_manager.py:154
+#: ../src/config.py:2371 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr ""
 
-#: ../src/config.py:2374
+#: ../src/config.py:2379
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:2379
+#: ../src/config.py:2384
 #, fuzzy
 msgid "Nick"
 msgstr "_Expulsar"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2388
 #, fuzzy
 msgid "Role"
 msgstr "Puesto:"
 
-#: ../src/config.py:2404
+#: ../src/config.py:2409
 #, fuzzy
 msgid "Banning..."
 msgstr "Expulsando a %s"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2406
+#: ../src/config.py:2411
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>¿Qué quieres hacer?</b>"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2413
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:2409
+#: ../src/config.py:2414
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>¿Qué quieres hacer?</b>"
 
-#: ../src/config.py:2411
+#: ../src/config.py:2416
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:2412
+#: ../src/config.py:2417
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>¿Qué quieres hacer?</b>"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2419
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrador"
 
-#: ../src/config.py:2415
+#: ../src/config.py:2420
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>¿Qué quieres hacer?</b>"
 
-#: ../src/config.py:2416
+#: ../src/config.py:2421
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2879,102 +2975,102 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2521
+#: ../src/config.py:2526
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminando la cuenta %s"
 
-#: ../src/config.py:2538 ../src/roster_window.py:2667
+#: ../src/config.py:2543 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Contraseña requerida"
 
-#: ../src/config.py:2539 ../src/roster_window.py:2668
+#: ../src/config.py:2544 ../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:2540 ../src/roster_window.py:2669
+#: ../src/config.py:2545 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Guardar contraseña"
 
-#: ../src/config.py:2554
+#: ../src/config.py:2559
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "La cuenta \"%s\" está conectada al servidor"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2560
 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:2639
+#: ../src/config.py:2644
 #, fuzzy
 msgid "Default"
 msgstr "Eliminar MOTD"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Insertar la hora:"
 
-#: ../src/config.py:2640
+#: ../src/config.py:2645
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2710
+#: ../src/config.py:2715
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Grupos de charla"
 
-#: ../src/config.py:2742
+#: ../src/config.py:2747
 msgid "This bookmark has invalid data"
 msgstr "Este marcador tiene información no válida"
 
-#: ../src/config.py:2743
+#: ../src/config.py:2748
 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:3005
+#: ../src/config.py:3010
 msgid "Invalid username"
 msgstr "Nombre de usuario no válido"
 
-#: ../src/config.py:3006
+#: ../src/config.py:3011
 msgid "You must provide a username to configure this account."
 msgstr "Debes proporcionar un nombre para configurar esta cuenta."
 
-#: ../src/config.py:3016 ../src/dialogs.py:1316
+#: ../src/config.py:3021 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Contraseña no válida"
 
-#: ../src/config.py:3017
+#: ../src/config.py:3022
 msgid "You must enter a password for the new account."
 msgstr "Debes introducir una contraseña para la nueva cuenta"
 
-#: ../src/config.py:3021 ../src/dialogs.py:1321
+#: ../src/config.py:3026 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Las contraseñas no coinciden"
 
-#: ../src/config.py:3022 ../src/dialogs.py:1322
+#: ../src/config.py:3027 ../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:3041
+#: ../src/config.py:3046
 #, fuzzy
 msgid "Duplicate Jabber ID"
 msgstr "ID de Jabber no válida"
 
-#: ../src/config.py:3042
+#: ../src/config.py:3047
 #, fuzzy
 msgid "This account is already configured in Gajim."
 msgstr "Este contacto ya está listado en tu roster."
 
-#: ../src/config.py:3059
+#: ../src/config.py:3064
 msgid "Account has been added successfully"
 msgstr "La cuenta ha sido añadida con éxito"
 
-#: ../src/config.py:3060 ../src/config.py:3095
+#: ../src/config.py:3065 ../src/config.py:3100
 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."
@@ -2983,23 +3079,23 @@ msgstr ""
 "Avanzado, o más tarde mediante el submenú Cuentas del menú Editar de la "
 "ventana principal."
 
-#: ../src/config.py:3094
+#: ../src/config.py:3099
 msgid "Your new account has been created successfully"
 msgstr "Tu nueva cuenta ha sido creada con éxito"
 
-#: ../src/config.py:3112
+#: ../src/config.py:3117
 msgid "An error occured during account creation"
 msgstr "Ha ocurrido un error durante la creación de la cuenta"
 
-#: ../src/config.py:3170
+#: ../src/config.py:3175
 msgid "Account name is in use"
 msgstr "El nombre de la cuenta está en uso"
 
-#: ../src/config.py:3171
+#: ../src/config.py:3176
 msgid "You already have an account using this name."
 msgstr "Ya tienes una cuenta usando este nombre"
 
-#: ../src/conversation_textview.py:271
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3007,56 +3103,65 @@ 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:340
+#: ../src/conversation_textview.py:342
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Acciones para \"%s\""
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Leer artículo de _Wikipedia"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Buscarlo en el _Diccionario"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:373
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Falta un \"%s\" en la URL del Diccionario y no está en WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:386
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Falta un \"%s\" en la URL de la búsqueda web"
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "_Buscarlo en la web"
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:397
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:755
+#: ../src/conversation_textview.py:757
 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:759
+#: ../src/conversation_textview.py:761
 #, python-format
 msgid "%i days ago"
 msgstr "hace %i días"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:791
+#: ../src/conversation_textview.py:793
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %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
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
@@ -3326,30 +3431,30 @@ msgstr "Nuevo mensaje"
 msgid "New Private Message"
 msgstr "Nuevo mensaje privado"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1161 ../src/notify.py:424
+#: ../src/dialogs.py:1369 ../src/gajim.py:1168 ../src/notify.py:424
 #, fuzzy
 msgid "New E-mail"
 msgstr "Correo-e"
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1314 ../src/notify.py:418
+#: ../src/dialogs.py:1371 ../src/gajim.py:1321 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Petición de transferencia de archivo"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1134 ../src/gajim.py:1290
+#: ../src/dialogs.py:1373 ../src/gajim.py:1140 ../src/gajim.py:1297
 #: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Error en la transferencia del archivo"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1353 ../src/gajim.py:1375
-#: ../src/gajim.py:1392 ../src/notify.py:422
+#: ../src/dialogs.py:1375 ../src/gajim.py:1360 ../src/gajim.py:1382
+#: ../src/gajim.py:1399 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Transferencia del archivo finalizada"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1356 ../src/notify.py:422
+#: ../src/dialogs.py:1376 ../src/gajim.py:1363 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Transferencia del archivo detenida"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1032 ../src/notify.py:426
+#: ../src/dialogs.py:1378 ../src/gajim.py:1038 ../src/notify.py:426
 #, fuzzy
 msgid "Groupchat Invitation"
 msgstr "Ninguno"
@@ -3711,32 +3816,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:682
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
 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:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "This file already exists"
 msgstr "Este archivo ya existe"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>¿Qué quieres hacer?</b>"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3871,57 +3976,58 @@ msgstr "Conexión"
 msgid "Subject: %s"
 msgstr "Tema: %s\n"
 
-#: ../src/gajim.py:703
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:703 ../src/gajim.py:716
 #, fuzzy, python-format
 msgid "error while sending %s ( %s )"
 msgstr "error durante el envío"
 
-#: ../src/gajim.py:743
+#: ../src/gajim.py:749
 msgid "Authorization accepted"
 msgstr "Autorización aceptada"
 
-#: ../src/gajim.py:744
+#: ../src/gajim.py:750
 #, 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:752
+#: ../src/gajim.py:758
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "El contacto \"%s\" eliminó su subscripción de tí"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:759
 msgid "You will always see him or her as offline."
 msgstr "Siempre le verás desconectado."
 
-#: ../src/gajim.py:796
+#: ../src/gajim.py:802
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "No se ha podido establecer contacto con \"%s\""
 
-#: ../src/gajim.py:797 ../src/common/connection.py:395
+#: ../src/gajim.py:803 ../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:945 ../src/roster_window.py:1201
+#: ../src/gajim.py:951 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s está ahora %s (%s)"
 
-#: ../src/gajim.py:1042
+#: ../src/gajim.py:1048
 msgid "Your passphrase is incorrect"
 msgstr "Contraseña incorrecta"
 
-#: ../src/gajim.py:1043
+#: ../src/gajim.py:1049
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Estás actualmente conectado sin tu clave GPG"
 
-#: ../src/gajim.py:1145
+#: ../src/gajim.py:1151
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1147
+#: ../src/gajim.py:1153
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3931,61 +4037,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:1156
+#: ../src/gajim.py:1162
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1311
+#: ../src/gajim.py:1318
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quiere enviarte un archivo."
 
-#: ../src/gajim.py:1376
+#: ../src/gajim.py:1383
 #, 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:1380
+#: ../src/gajim.py:1387
 #, 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:1393
+#: ../src/gajim.py:1400
 #, 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:1397
+#: ../src/gajim.py:1404
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transferencia de %(filename)s a %(name)s detenida."
 
-#: ../src/gajim.py:1503
+#: ../src/gajim.py:1510
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1504
+#: ../src/gajim.py:1511
 #, 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:1842
+#: ../src/gajim.py:1850
 msgid "Could not save your settings and preferences"
 msgstr "No se pueden guardar las preferencias"
 
-#: ../src/gajim.py:2034
+#: ../src/gajim.py:2042
 #, fuzzy
 msgid "Network Manager support not available"
 msgstr "No hay disponible una conexión"
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2117
 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)"
 
@@ -4330,121 +4436,121 @@ msgstr "No puedes eliminar el tema actual"
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, primero elige otro distinto como tema actual."
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 #, fuzzy
 msgid "Private Chat"
 msgstr "Iniciar conversación"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 #, fuzzy
 msgid "Private Chats"
 msgstr "Iniciar conversación"
 
-#: ../src/groupchat_control.py:120
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Falló el envío del mensaje privado"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:124
 #, 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
+#: ../src/groupchat_control.py:143
 msgid "Group Chat"
 msgstr "Grupos de charla"
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 #, fuzzy
 msgid "Group Chats"
 msgstr "Grupos de charla"
 
-#: ../src/groupchat_control.py:315
+#: ../src/groupchat_control.py:317
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Cambiar _Alias"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:810
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(reason)s"
 
-#: ../src/groupchat_control.py:814
+#: ../src/groupchat_control.py:816
 #, 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:821
+#: ../src/groupchat_control.py:823
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ha sido expulsado: %(reason)s"
 
-#: ../src/groupchat_control.py:825
+#: ../src/groupchat_control.py:827
 #, 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:833
+#: ../src/groupchat_control.py:835
 #, python-format
 msgid "You are now known as %s"
 msgstr "Eres ahora conocido como %s"
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:837
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s es ahora conocido como %s"
 
-#: ../src/groupchat_control.py:915
+#: ../src/groupchat_control.py:917
 #, python-format
 msgid "%s has left"
 msgstr "%s ha salido"
 
-#: ../src/groupchat_control.py:920
+#: ../src/groupchat_control.py:922
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "En el grupo"
 
 #. No status message
-#: ../src/groupchat_control.py:922 ../src/roster_window.py:1204
+#: ../src/groupchat_control.py:924 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s está ahora %s"
 
-#: ../src/groupchat_control.py:1041 ../src/groupchat_control.py:1059
-#: ../src/groupchat_control.py:1152 ../src/groupchat_control.py:1169
+#: ../src/groupchat_control.py:1043 ../src/groupchat_control.py:1061
+#: ../src/groupchat_control.py:1154 ../src/groupchat_control.py:1171
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Alias no encontrado: %s"
 
-#: ../src/groupchat_control.py:1075
+#: ../src/groupchat_control.py:1077
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "Este salón no tiene tema"
 
-#: ../src/groupchat_control.py:1088
+#: ../src/groupchat_control.py:1090
 #, 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:1095 ../src/groupchat_control.py:1123
+#: ../src/groupchat_control.py:1097 ../src/groupchat_control.py:1125
 #, 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:1206
+#: ../src/groupchat_control.py:1208
 #, 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:1229
+#: ../src/groupchat_control.py:1231
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandos: %s"
 
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1233
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4457,7 +4563,7 @@ msgstr ""
 "actualmente en el salón, el/ella puede ser también expulsado. NO soporta "
 "espacio en el alias."
 
-#: ../src/groupchat_control.py:1238
+#: ../src/groupchat_control.py:1240
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4465,12 +4571,12 @@ msgstr ""
 "Uso: /%s <alias>, abre una ventana de conversación con el ocupante "
 "especificado."
 
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1244
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uso: /%s, limpia de texto la ventana."
 
-#: ../src/groupchat_control.py:1244
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4479,12 +4585,12 @@ msgstr ""
 "Uso: /%s [motivo], cierra la ventana o pestaña actual, mostrando el motivo "
 "si se especifica."
 
-#: ../src/groupchat_control.py:1247
+#: ../src/groupchat_control.py:1249
 #, fuzzy, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Uso: /%s, limpia de texto la ventana."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1252
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4493,7 +4599,7 @@ msgstr ""
 "Uso: /%s <JID> [reason], invita al JID al salón actual, opcionalmente "
 "proveyendo un motivo."
 
-#: ../src/groupchat_control.py:1254
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4502,7 +4608,7 @@ msgstr ""
 "Uso: /%s <salón>@<servidor>[/alias], ofrece la entrada a salón@servidor "
 "opcionalmente usando el alias especificado"
 
-#: ../src/groupchat_control.py:1258
+#: ../src/groupchat_control.py:1260
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4512,7 +4618,7 @@ msgstr ""
 "Uso: /%s <alias> [motivo], elimina del salón al ocupante especificado por el "
 "alias y opcionalmente muestra un motivo. NO soporta espacios en el alias."
 
-#: ../src/groupchat_control.py:1263
+#: ../src/groupchat_control.py:1265
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current group chat. Use third "
@@ -4521,7 +4627,7 @@ msgstr ""
 "Uso: /%s <acción>, envía una acción al salón actual. Usa la tercera persona. "
 "(p.ej. /%s grita.)"
 
-#: ../src/groupchat_control.py:1267
+#: ../src/groupchat_control.py:1269
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4530,93 +4636,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:1272
+#: ../src/groupchat_control.py:1274
 #, 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:1276
+#: ../src/groupchat_control.py:1278
 #, fuzzy, python-format
 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:1280
+#: ../src/groupchat_control.py:1282
 #, 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:1283
+#: ../src/groupchat_control.py:1285
 #, 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:1286
+#: ../src/groupchat_control.py:1288
 #, python-format
 msgid "No help info for /%s"
 msgstr "No hay información de ayuda para /%s"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1337
 #, 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:1337
+#: ../src/groupchat_control.py:1339
 #, 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:1341 ../src/roster_window.py:3961
+#: ../src/groupchat_control.py:1343 ../src/roster_window.py:3961
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "_No preguntarme otra vez"
 
-#: ../src/groupchat_control.py:1375
+#: ../src/groupchat_control.py:1377
 msgid "Changing Subject"
 msgstr "Cambiando el tema"
 
-#: ../src/groupchat_control.py:1376
+#: ../src/groupchat_control.py:1378
 msgid "Please specify the new subject:"
 msgstr "Especifica el nuevo tema:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1387
 msgid "Changing Nickname"
 msgstr "Cambiando alias"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1388
 msgid "Please specify the new nickname you want to use:"
 msgstr "Especifica el nuevo alias que quieres usar:"
 
-#: ../src/groupchat_control.py:1411
+#: ../src/groupchat_control.py:1413
 msgid "Bookmark already set"
 msgstr "Marcador ya definido"
 
-#: ../src/groupchat_control.py:1412
+#: ../src/groupchat_control.py:1414
 #, 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:1421
+#: ../src/groupchat_control.py:1423
 msgid "Bookmark has been added successfully"
 msgstr "Marcador añadido con éxito"
 
-#: ../src/groupchat_control.py:1422
+#: ../src/groupchat_control.py:1424
 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:1548
+#: ../src/groupchat_control.py:1550
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando a %s"
 
-#: ../src/groupchat_control.py:1549 ../src/groupchat_control.py:1831
+#: ../src/groupchat_control.py:1551 ../src/groupchat_control.py:1833
 msgid "You may specify a reason below:"
 msgstr "Debes especificar un motivo debajo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1830
+#: ../src/groupchat_control.py:1832
 #, python-format
 msgid "Banning %s"
 msgstr "Expulsando a %s"
@@ -4663,16 +4769,16 @@ 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:727
+#: ../src/gtkgui_helpers.py:728
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:729
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:737
+#: ../src/gtkgui_helpers.py:738
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Guardar archivo como..."
@@ -4706,12 +4812,6 @@ msgstr "Alias:"
 msgid "Message"
 msgstr "Mensaje"
 
-#. holds subject
-#: ../src/history_manager.py:141 ../src/history_manager.py:172
-#, fuzzy
-msgid "Subject"
-msgstr "Tema:"
-
 #: ../src/history_manager.py:186
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -5931,7 +6031,7 @@ 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:1515
+#: ../src/common/connection_handlers.py:1523
 #, fuzzy, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Alias no encontrado: %s"
@@ -5939,46 +6039,46 @@ msgstr "Alias no encontrado: %s"
 #. password required to join
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1577
-#: ../src/common/connection_handlers.py:1580
-#: ../src/common/connection_handlers.py:1583
-#: ../src/common/connection_handlers.py:1586
-#: ../src/common/connection_handlers.py:1589
-#: ../src/common/connection_handlers.py:1592
+#: ../src/common/connection_handlers.py:1585
+#: ../src/common/connection_handlers.py:1588
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1597
 #: ../src/common/connection_handlers.py:1600
+#: ../src/common/connection_handlers.py:1608
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "No se pudo entrar al salón"
 
-#: ../src/common/connection_handlers.py:1578
+#: ../src/common/connection_handlers.py:1586
 #, 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:1581
+#: ../src/common/connection_handlers.py:1589
 #, fuzzy
 msgid "You are banned from this group chat."
 msgstr "Estás expulsado de este salón"
 
-#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1592
 #, fuzzy
 msgid "Such group chat does not exist."
 msgstr "No existe el salón."
 
-#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1595
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "La creación de salones está restringida."
 
-#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1598
 msgid "Your registered nickname must be used."
 msgstr "Es necesario usar el alias registrado."
 
-#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1601
 msgid "You are not in the members list."
 msgstr "No estás en la lista de miembros"
 
-#: ../src/common/connection_handlers.py:1601
+#: ../src/common/connection_handlers.py:1609
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5986,27 +6086,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:1651
+#: ../src/common/connection_handlers.py:1659
 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:1672
+#: ../src/common/connection_handlers.py:1680
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "estamos ahora suscritos a %s"
 
-#: ../src/common/connection_handlers.py:1674
+#: ../src/common/connection_handlers.py:1682
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "petición de eliminación de suscripción de %s"
 
-#: ../src/common/connection_handlers.py:1676
+#: ../src/common/connection_handlers.py:1684
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "ya no estamos suscritos a %s"
 
-#: ../src/common/connection_handlers.py:1846
+#: ../src/common/connection_handlers.py:1854
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -6038,7 +6138,7 @@ msgid "Invalid answer"
 msgstr "Contraseña no válida"
 
 #: ../src/common/connection.py:394 ../src/common/connection.py:429
-#: ../src/common/connection.py:872
+#: ../src/common/connection.py:877
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
@@ -6097,7 +6197,7 @@ msgstr "Estoy %s"
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Este mensaje está encriptado]"
 
-#: ../src/common/connection.py:759
+#: ../src/common/connection.py:764
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6107,7 +6207,7 @@ msgstr ""
 "Tema: %s\n"
 "%s"
 
-#: ../src/common/connection.py:898
+#: ../src/common/connection.py:903
 msgid "Not fetched because of invisible status"
 msgstr ""
 
@@ -6425,10 +6525,6 @@ msgstr "Ninguna"
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:259
-msgid "From"
-msgstr "Salón:"
-
 #: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Ambos"
@@ -6787,9 +6883,6 @@ msgstr "error durante el envío"
 #~ msgid "Migrating Logs..."
 #~ msgstr "Migrando el registro..."
 
-#~ msgid "Please wait while logs are being migrated..."
-#~ msgstr "Por favor, espera mientras el registro está siendo migrado..."
-
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Autorizar contactos automáticamente"
 
@@ -6921,9 +7014,6 @@ msgstr "error durante el envío"
 #~ msgid "Timeout"
 #~ msgstr "Fuera de tiempo"
 
-#~ msgid "A protocol error has occured:"
-#~ msgstr "Ha ocurrido un error de protocolo:"
-
 #~ msgid "account: "
 #~ msgstr "cuenta: "
 
diff --git a/po/eu.po b/po/eu.po
index 3c82817cb..203b2f7cf 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-12-02 17:15+0100\n"
+"POT-Creation-Date: 2006-12-09 10:02+0100\n"
 "PO-Revision-Date: 2006-11-29 16:28+0100\n"
 "Last-Translator: Urtzi \n"
 "Language-Team: Basque <urtzi@altza.net>\n"
@@ -320,16 +320,16 @@ msgid "Manage..."
 msgstr "Moldatu..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1637
-#: ../src/config.py:3430
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1642
+#: ../src/config.py:3435
 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:1219
-#: ../src/config.py:1224 ../src/config.py:1408 ../src/config.py:1627
-#: ../src/config.py:1636 ../src/config.py:1695 ../src/config.py:1769
-#: ../src/config.py:2640 ../src/config.py:3420 ../src/config.py:3429
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1224
+#: ../src/config.py:1229 ../src/config.py:1413 ../src/config.py:1632
+#: ../src/config.py:1641 ../src/config.py:1700 ../src/config.py:1774
+#: ../src/config.py:2645 ../src/config.py:3425 ../src/config.py:3434
 #: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Ezer ez"
@@ -525,6 +525,45 @@ msgstr "Erre_gistratu"
 msgid "_User ID:"
 msgstr "E_rabiltzailearen ID:"
 
+#: ../data/glade/adhoc_commands_window.glade.h:1
+msgid "<b>An error has occured:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:2
+msgid "<b>Choose command to execute:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:3
+msgid "Ad-hoc Commands - Gajim"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:4
+msgid "Check once more"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:5
+#, fuzzy
+msgid "Error description..."
+msgstr "Deskribapena"
+
+#: ../data/glade/adhoc_commands_window.glade.h:6
+#, fuzzy
+msgid "Please wait while retrieving command list..."
+msgstr "Mesedez itxoin log-a eraldatzen den bitartean...."
+
+#: ../data/glade/adhoc_commands_window.glade.h:7
+#, fuzzy
+msgid "Please wait while the command is sending..."
+msgstr "Mesedez itxoin log-a eraldatzen den bitartean...."
+
+#: ../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>Deskribapena</b>"
@@ -667,13 +706,13 @@ msgstr "Soinua ezarri"
 #: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
-"Contact Connected\n"
-"Contact Disconnected\n"
-"Contact Change Status\n"
-"Group Chat Message Highlight\n"
-"Group Chat Message Received\n"
-"File Transfert Resquest\n"
-"File Transfert Started\n"
+"Contact Connected \n"
+"Contact Disconnected \n"
+"Contact Change Status \n"
+"Group Chat Message Highlight \n"
+"Group Chat Message Received \n"
+"File Transfert Resquest \n"
+"File Transfert Started \n"
 "File Transfert Finished"
 msgstr ""
 "Mezu bat Jasotzean\n"
@@ -754,6 +793,46 @@ msgstr "norentzat"
 msgid "when I'm in"
 msgstr "Nagoenean"
 
+#: ../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 "Estatua:"
+
+#: ../data/glade/atom_entry_window.glade.h:4
+#, fuzzy
+msgid "Feed name:"
+msgstr "gaiaren izena"
+
+#: ../data/glade/atom_entry_window.glade.h:5
+#, fuzzy
+msgid "Last modified:"
+msgstr "Azken Izena:"
+
+#: ../data/glade/atom_entry_window.glade.h:6
+#, fuzzy
+msgid "New entry received"
+msgstr "Ekintza berri bat jasotzean."
+
+#: ../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 "Aldatu Pasahitza"
@@ -839,7 +918,7 @@ msgstr "_Bista trikoa        Alt+C"
 msgid "_History"
 msgstr "_Historiala"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/glade/data_form_window.glade.h:1 ../src/dataforms_widget.py:76
 msgid "Fill in the form."
 msgstr "Formularioan bete"
 
@@ -1059,6 +1138,21 @@ msgstr "_Bidali Mezu Pribatu bat"
 msgid "_Voice"
 msgstr "_Ahotsa"
 
+#: ../data/glade/groups_post_window.glade.h:1
+#, fuzzy
+msgid "Create new post"
+msgstr "Mezu berria"
+
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:259
+msgid "From"
+msgstr "-etik"
+
+#. holds subject
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141
+#: ../src/history_manager.py:172
+msgid "Subject"
+msgstr "Gaia"
+
 #: ../data/glade/history_manager.glade.h:1
 msgid ""
 "<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
@@ -1218,7 +1312,7 @@ 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:1116
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
 msgid "OpenPGP Encryption"
 msgstr "Ireki OpenPGP Enkriptazioa"
 
@@ -1345,7 +1439,7 @@ msgstr ""
 msgid "B_efore nickname:"
 msgstr "Izengoitia baino l_ehen:"
 
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:841
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
 msgid "Chat"
 msgstr "Txat"
 
@@ -2450,33 +2544,33 @@ 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:841
+#: ../src/chat_control.py:844
 msgid "Chats"
 msgstr "Txat-ak"
 
-#: ../src/chat_control.py:1042
+#: ../src/chat_control.py:1030
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s  %(room_name)s gelatik"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1130
+#: ../src/chat_control.py:1118
 #, 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:1266
+#: ../src/chat_control.py:1254
 msgid "Encryption enabled"
 msgstr "Enkriptazioa aktibatuta"
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1259
 msgid "Encryption disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1413 ../src/conversation_textview.py:493
-#: ../src/dialogs.py:629 ../src/gajim.py:727 ../src/gajim.py:728
-#: ../src/gajim.py:1067 ../src/roster_window.py:328
+#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495
+#: ../src/dialogs.py:629 ../src/gajim.py:733 ../src/gajim.py:734
+#: ../src/gajim.py:1073 ../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
@@ -2487,12 +2581,12 @@ msgid "Not in Roster"
 msgstr "Ez dago zerrendan"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1545
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" -tik mezu berri bat jaso duzu"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1546
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2500,29 +2594,29 @@ msgstr ""
 "Leiho hau isten baduzu eta ez baduzu historiala aktibatua mezu hau galduko "
 "duzu."
 
-#: ../src/config.py:130 ../src/config.py:589
+#: ../src/config.py:135 ../src/config.py:594
 msgid "Disabled"
 msgstr "Ezindu"
 
-#: ../src/config.py:216
+#: ../src/config.py:221
 #, python-format
 msgid "Every %s _minutes"
 msgstr "%s _minuturo"
 
-#: ../src/config.py:358
+#: ../src/config.py:363
 msgid "Active"
 msgstr "Aktibatuta"
 
-#: ../src/config.py:366
+#: ../src/config.py:371
 msgid "Event"
 msgstr "Gertaera"
 
-#: ../src/config.py:679 ../src/gajim.py:2086
+#: ../src/config.py:684 ../src/gajim.py:2094
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "%s hizkuntzarako hiztegia ez dago erabilgarri"
 
-#: ../src/config.py:680 ../src/gajim.py:2087
+#: ../src/config.py:685 ../src/gajim.py:2095
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -2531,73 +2625,73 @@ msgstr ""
 "%s hiztegia instalatu behar duzu zuzentzailea erabiltzeko, edota beste "
 "hizkuntz bat aukeratu speller_language aukera erabiliz."
 
-#: ../src/config.py:1032
+#: ../src/config.py:1037
 msgid "status message title"
 msgstr "egoera mezuaren izenburua"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1037
 msgid "status message text"
 msgstr "egoera mezuaren testua"
 
-#: ../src/config.py:1067
+#: ../src/config.py:1072
 msgid "First Message Received"
 msgstr "Lehen Mezu Jasoa"
 
-#: ../src/config.py:1068
+#: ../src/config.py:1073
 msgid "Next Message Received"
 msgstr "Jasotako Hurrengo Mezua"
 
-#: ../src/config.py:1069
+#: ../src/config.py:1074
 msgid "Contact Connected"
 msgstr "Kontaktua Konektatuta"
 
-#: ../src/config.py:1070
+#: ../src/config.py:1075
 msgid "Contact Disconnected"
 msgstr "Kontaktua Deskonektatuta"
 
-#: ../src/config.py:1071
+#: ../src/config.py:1076
 msgid "Message Sent"
 msgstr "Mezua Bidaltzean"
 
-#: ../src/config.py:1072
+#: ../src/config.py:1077
 msgid "Group Chat Message Highlight"
 msgstr "Txat Taldeko Mezu Nabarmendua"
 
-#: ../src/config.py:1073
+#: ../src/config.py:1078
 msgid "Group Chat Message Received"
 msgstr "Txat Taldeko Mezua Jasotzean"
 
-#: ../src/config.py:1080
+#: ../src/config.py:1085
 msgid "GMail Email Received"
 msgstr "GMail posta jasoa"
 
-#: ../src/config.py:1283
+#: ../src/config.py:1288
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP ezin da ordenagailu honetan erabili"
 
-#: ../src/config.py:1329
+#: ../src/config.py:1334
 msgid "You are currently connected to the server"
 msgstr "Zerbitzarira konektatu zaude dagoeneko"
 
-#: ../src/config.py:1330
+#: ../src/config.py:1335
 msgid "To change the account name, you must be disconnected."
 msgstr "Kontuko izena aldatzeko deskonektatuta egon behar zara."
 
-#: ../src/config.py:1333 ../src/config.py:1925
+#: ../src/config.py:1338 ../src/config.py:1930
 msgid "Unread events"
 msgstr "Irakurri gabeko gertaerak"
 
-#: ../src/config.py:1334
+#: ../src/config.py:1339
 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:1338
+#: ../src/config.py:1343
 msgid "Account Name Already Used"
 msgstr "Kontu Izena Jadanik Erabilia"
 
-#: ../src/config.py:1339
+#: ../src/config.py:1344
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2605,175 +2699,175 @@ msgstr ""
 "Izen hau jadanik zure kontaktu batengatik erabilita dago. Mesedez aukeratu "
 "beste izen bat."
 
-#: ../src/config.py:1343 ../src/config.py:1347
+#: ../src/config.py:1348 ../src/config.py:1352
 msgid "Invalid account name"
 msgstr "Kontu izen baliogabea"
 
-#: ../src/config.py:1344
+#: ../src/config.py:1349
 msgid "Account name cannot be empty."
 msgstr "Kontu izena ezin da hustu."
 
-#: ../src/config.py:1348
+#: ../src/config.py:1353
 msgid "Account name cannot contain spaces."
 msgstr "Kontuko izenak ezin du espaziorik izan."
 
-#: ../src/config.py:1356 ../src/config.py:1362 ../src/config.py:1372
-#: ../src/config.py:3030
+#: ../src/config.py:1361 ../src/config.py:1367 ../src/config.py:1377
+#: ../src/config.py:3035
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID baliogabea"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1368
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "\"izena@zerbitzaria\" Jabber ID-a horrela izan behar da."
 
-#: ../src/config.py:1422
+#: ../src/config.py:1427
 msgid "Invalid entry"
 msgstr "Sarrera baliogabea"
 
-#: ../src/config.py:1423
+#: ../src/config.py:1428
 msgid "Custom port must be a port number."
 msgstr "Bezeroaren portua portu zenbaki bat izan behar da."
 
-#: ../src/config.py:1549 ../src/common/config.py:363
+#: ../src/config.py:1554 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Be right back."
 
-#: ../src/config.py:1559
+#: ../src/config.py:1564
 msgid "Relogin now?"
 msgstr "Birkargatu orain?"
 
-#: ../src/config.py:1560
+#: ../src/config.py:1565
 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:1586
+#: ../src/config.py:1591
 msgid "No such account available"
 msgstr "Horrelako konturik ez erabilgarri"
 
-#: ../src/config.py:1587
+#: ../src/config.py:1592
 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:1594 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/config.py:1599 ../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:1595
+#: ../src/config.py:1600
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Konektatzen ez bazara, ezin duzu zure informazio pertsonala aldatu."
 
-#: ../src/config.py:1599
+#: ../src/config.py:1604
 msgid "Your server doesn't support Vcard"
 msgstr "Zure zerbitzariak ez du Vcard-ik onartzen"
 
-#: ../src/config.py:1600
+#: ../src/config.py:1605
 msgid "Your server can't save your personal information."
 msgstr "Zerbitzariak ezin du zure informazio pertsonala gorde"
 
-#: ../src/config.py:1624 ../src/config.py:3417
+#: ../src/config.py:1629 ../src/config.py:3422
 msgid "Failed to get secret keys"
 msgstr "Kode sekretua lortzeko huts egitea"
 
-#: ../src/config.py:1625 ../src/config.py:3418
+#: ../src/config.py:1630 ../src/config.py:3423
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Problema bat egon da zure OpenPGP-ko kode sekretua lortzeko."
 
-#: ../src/config.py:1628 ../src/config.py:3421
+#: ../src/config.py:1633 ../src/config.py:3426
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Giltzaren Aukera"
 
-#: ../src/config.py:1629 ../src/config.py:3422
+#: ../src/config.py:1634 ../src/config.py:3427
 msgid "Choose your OpenPGP key"
 msgstr "Aukeratu zure OpenPGP kodea"
 
 #. Name column
-#: ../src/config.py:1859 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/config.py:1864 ../src/disco.py:740 ../src/disco.py:1466
 #: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Izena"
 
-#: ../src/config.py:1862
+#: ../src/config.py:1867
 msgid "Server"
 msgstr "Zerbitzaria"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1931
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Irakurri pendiente dituzun gertaera guztiak kontu hau ezabatu baino lehen. "
 
-#: ../src/config.py:1963
+#: ../src/config.py:1968
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Txat-a %s kontuan ireki duzu"
 
-#: ../src/config.py:1964
+#: ../src/config.py:1969
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Elkarrizketa guztiak itxiko dira. Jarraitu nahi al duzu?"
 
-#: ../src/config.py:2023
+#: ../src/config.py:2028
 msgid "Account Local already exists."
 msgstr "Kontu izena jadanik badago"
 
-#: ../src/config.py:2024
+#: ../src/config.py:2029
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Mesedez berridatzi edo ezabatu hori  link-local messaging martxan jarri "
 "baino lehen."
 
-#: ../src/config.py:2256
+#: ../src/config.py:2261
 #, python-format
 msgid "Edit %s"
 msgstr "Editatu %s"
 
-#: ../src/config.py:2258
+#: ../src/config.py:2263
 #, python-format
 msgid "Register to %s"
 msgstr "%s -ra erregistratua"
 
 #. list at the begining
-#: ../src/config.py:2330
+#: ../src/config.py:2335
 msgid "Ban List"
 msgstr "Debekatutako Zerrenda"
 
-#: ../src/config.py:2331
+#: ../src/config.py:2336
 msgid "Member List"
 msgstr "Partaide Zerrenda"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2337
 msgid "Owner List"
 msgstr "Jabe Zerrenda"
 
-#: ../src/config.py:2333
+#: ../src/config.py:2338
 msgid "Administrator List"
 msgstr "Administratzaile Zerrenda"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2366 ../src/disco.py:747 ../src/history_manager.py:154
+#: ../src/config.py:2371 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2374
+#: ../src/config.py:2379
 msgid "Reason"
 msgstr "Arrazoia"
 
-#: ../src/config.py:2379
+#: ../src/config.py:2384
 msgid "Nick"
 msgstr "Izengoitia"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2388
 msgid "Role"
 msgstr "Eginkizuna"
 
-#: ../src/config.py:2404
+#: ../src/config.py:2409
 msgid "Banning..."
 msgstr "Debekatzen..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2406
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2781,11 +2875,11 @@ msgstr ""
 "<b>Zein nahi duzu debekatu?</b>\n"
 "\n"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2413
 msgid "Adding Member..."
 msgstr "Kidea ezartzen..."
 
-#: ../src/config.py:2409
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2793,11 +2887,11 @@ msgstr ""
 "<b>Zein nahi duzu kide egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2411
+#: ../src/config.py:2416
 msgid "Adding Owner..."
 msgstr "Jabea ezartzen..."
 
-#: ../src/config.py:2412
+#: ../src/config.py:2417
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2805,11 +2899,11 @@ msgstr ""
 "<b>Zein nahi duzu jabe egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2419
 msgid "Adding Administrator..."
 msgstr "Administratzailea ezartzen..."
 
-#: ../src/config.py:2415
+#: ../src/config.py:2420
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2817,7 +2911,7 @@ msgstr ""
 "<b>Zein nahi duzu administratzaile egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2416
+#: ../src/config.py:2421
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2833,174 +2927,183 @@ msgstr ""
 "4. zerbitzaria (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain."
 
-#: ../src/config.py:2521
+#: ../src/config.py:2526
 #, python-format
 msgid "Removing %s account"
 msgstr "%s kontua ezabatzen"
 
-#: ../src/config.py:2538 ../src/roster_window.py:2667
+#: ../src/config.py:2543 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Pasahitza behar da"
 
-#: ../src/config.py:2539 ../src/roster_window.py:2668
+#: ../src/config.py:2544 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s kontuaren pasahitza sartu"
 
-#: ../src/config.py:2540 ../src/roster_window.py:2669
+#: ../src/config.py:2545 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Gorde pasahitza"
 
-#: ../src/config.py:2554
+#: ../src/config.py:2559
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "\"%s\"  kontua zerbitzarira konektatu da"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2560
 msgid "If you remove it, the connection will be lost."
 msgstr "Hau ezabatzen baduzu, konexioa galdu egingo da."
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 msgid "Default"
 msgstr "Berezkoa"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 msgid "?print_status:All"
 msgstr "Denak"
 
-#: ../src/config.py:2640
+#: ../src/config.py:2645
 msgid "Enter and leave only"
 msgstr "Sarrerak eta irteerak bakarrik"
 
-#: ../src/config.py:2710
+#: ../src/config.py:2715
 msgid "New Group Chat"
 msgstr "Txat Taldea Berria"
 
-#: ../src/config.py:2742
+#: ../src/config.py:2747
 msgid "This bookmark has invalid data"
 msgstr "Talde agenda honek datu-banku baliogabea du"
 
-#: ../src/config.py:2743
+#: ../src/config.py:2748
 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:3005
+#: ../src/config.py:3010
 msgid "Invalid username"
 msgstr "Baliogabeko izena"
 
-#: ../src/config.py:3006
+#: ../src/config.py:3011
 msgid "You must provide a username to configure this account."
 msgstr "Izen bat sartu behar duzu kontu bat sortzeko."
 
-#: ../src/config.py:3016 ../src/dialogs.py:1316
+#: ../src/config.py:3021 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Pasahitz baliogabea"
 
-#: ../src/config.py:3017
+#: ../src/config.py:3022
 msgid "You must enter a password for the new account."
 msgstr "Kontu berrirako pasahitz bat sartu behar duzu."
 
-#: ../src/config.py:3021 ../src/dialogs.py:1321
+#: ../src/config.py:3026 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Pasahitzak desberdinak dira"
 
-#: ../src/config.py:3022 ../src/dialogs.py:1322
+#: ../src/config.py:3027 ../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:3041
+#: ../src/config.py:3046
 msgid "Duplicate Jabber ID"
 msgstr "Bikoiztutako Jabber ID "
 
-#: ../src/config.py:3042
+#: ../src/config.py:3047
 msgid "This account is already configured in Gajim."
 msgstr "Kontaktu hau dagoeneko Gajim-en konfiguratua dago."
 
-#: ../src/config.py:3059
+#: ../src/config.py:3064
 msgid "Account has been added successfully"
 msgstr "Kontua egoki sartua izan da"
 
-#: ../src/config.py:3060 ../src/config.py:3095
+#: ../src/config.py:3065 ../src/config.py:3100
 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:3094
+#: ../src/config.py:3099
 msgid "Your new account has been created successfully"
 msgstr "Zure kontu berria egoki sortua izan da."
 
-#: ../src/config.py:3112
+#: ../src/config.py:3117
 msgid "An error occured during account creation"
 msgstr "Errore bat gertatu da kontua sortzen zen bitartean"
 
-#: ../src/config.py:3170
+#: ../src/config.py:3175
 msgid "Account name is in use"
 msgstr "Kontu izena erabiltzen ari da"
 
-#: ../src/config.py:3171
+#: ../src/config.py:3176
 msgid "You already have an account using this name."
 msgstr "Jadanik baduzu kontu izen hau erabilgarri."
 
-#: ../src/conversation_textview.py:271
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
 msgstr "Beheko testua adi zeuden azken uneko txat taldeko mezuak dira"
 
-#: ../src/conversation_textview.py:340
+#: ../src/conversation_textview.py:342
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr " \"%s\" -rako _aukerak"
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Irakurri _Wikipedia Artikuloa"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Bila Ezazu _Hiztegian"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:373
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL hiztegia galdu egin da \"%s\" -an eta ez dago WIKTIONARY-an"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:386
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL bilatzailea ez da aurkizten \"%s\" -an"
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "Web _Bilaketa "
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:397
 msgid "Open as _Link"
 msgstr "Ireki _lotura bezala"
 
-#: ../src/conversation_textview.py:755
+#: ../src/conversation_textview.py:757
 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:759
+#: ../src/conversation_textview.py:761
 #, python-format
 msgid "%i days ago"
 msgstr "%i egun lehenago"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:791
+#: ../src/conversation_textview.py:793
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Gaia: %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>"
@@ -3262,29 +3365,29 @@ msgstr "Mezu Berri Bat"
 msgid "New Private Message"
 msgstr "Mezu Pribatu Berri Bat"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1161 ../src/notify.py:424
+#: ../src/dialogs.py:1369 ../src/gajim.py:1168 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "E-Posta Berria"
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1314 ../src/notify.py:418
+#: ../src/dialogs.py:1371 ../src/gajim.py:1321 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Fitxeroa Transferitzeko Baimena"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1134 ../src/gajim.py:1290
+#: ../src/dialogs.py:1373 ../src/gajim.py:1140 ../src/gajim.py:1297
 #: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Fitxero Transferitze Errorea"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1353 ../src/gajim.py:1375
-#: ../src/gajim.py:1392 ../src/notify.py:422
+#: ../src/dialogs.py:1375 ../src/gajim.py:1360 ../src/gajim.py:1382
+#: ../src/gajim.py:1399 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Fitxero Transferitzea Egina"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1356 ../src/notify.py:422
+#: ../src/dialogs.py:1376 ../src/gajim.py:1363 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Fitxero Transferentzia Gelditua"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1032 ../src/notify.py:426
+#: ../src/dialogs.py:1378 ../src/gajim.py:1038 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Txat Taldeko Gonbidapena"
 
@@ -3635,32 +3738,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:682
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Ezin izan da gainarazi \"%s\" fitxeroa"
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
 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:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "This file already exists"
 msgstr "Fitxero hau jadanik badago"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "What do you want to do?"
 msgstr "Zer nahi duzu egitea?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "\"%s\" kokapena ez da idazgarria"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
 msgid "You do not have permission to create files in this directory."
 msgstr "Ez duzu baimenik kokapen honetan fitxerorik sortzeko."
 
@@ -3793,57 +3896,58 @@ msgstr "Konexioak huts egin du"
 msgid "Subject: %s"
 msgstr "Gaia: %s"
 
-#: ../src/gajim.py:703
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:703 ../src/gajim.py:716
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "errorea bidaltzen zen bitartean %s ( %s )"
 
-#: ../src/gajim.py:743
+#: ../src/gajim.py:749
 msgid "Authorization accepted"
 msgstr "Autorizazioa baimendua"
 
-#: ../src/gajim.py:744
+#: ../src/gajim.py:750
 #, 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:752
+#: ../src/gajim.py:758
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "\"%s\" kontaktuak harpidetza ezabatu dizu"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:759
 msgid "You will always see him or her as offline."
 msgstr "Beti deskonektatuta ikusiko duzu."
 
-#: ../src/gajim.py:796
+#: ../src/gajim.py:802
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "\"%s\" ezin izan da kontaktuan jarri"
 
-#: ../src/gajim.py:797 ../src/common/connection.py:395
+#: ../src/gajim.py:803 ../src/common/connection.py:395
 msgid "Check your connection or try again later."
 msgstr "Begiratu zure konexioa edo saiatu berriro beranduago."
 
-#: ../src/gajim.py:945 ../src/roster_window.py:1201
+#: ../src/gajim.py:951 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s orain %s dago: (%s)"
 
-#: ../src/gajim.py:1042
+#: ../src/gajim.py:1048
 msgid "Your passphrase is incorrect"
 msgstr "Zure pasa-esaldia ez da egokia"
 
-#: ../src/gajim.py:1043
+#: ../src/gajim.py:1049
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Zure OpenPGP koderik gabe konektatu zara."
 
-#: ../src/gajim.py:1145
+#: ../src/gajim.py:1151
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "E-posta Berria %(gmail_mail_address)s -en"
 
-#: ../src/gajim.py:1147
+#: ../src/gajim.py:1153
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3853,7 +3957,7 @@ msgstr[1] "%d e-posta elkarrizketa 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:1156
+#: ../src/gajim.py:1162
 #, python-format
 msgid ""
 "\n"
@@ -3862,53 +3966,53 @@ msgstr ""
 "\n"
 "Norengandik: %(from_address)s"
 
-#: ../src/gajim.py:1311
+#: ../src/gajim.py:1318
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s fitxero bat bidali nahi dizu"
 
-#: ../src/gajim.py:1376
+#: ../src/gajim.py:1383
 #, 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:1380
+#: ../src/gajim.py:1387
 #, 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:1393
+#: ../src/gajim.py:1400
 #, 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:1397
+#: ../src/gajim.py:1404
 #, 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:1503
+#: ../src/gajim.py:1510
 msgid "Username Conflict"
 msgstr "Erabiltze izenarekin gatazka"
 
-#: ../src/gajim.py:1504
+#: ../src/gajim.py:1511
 msgid "Please type a new username for your local account"
 msgstr "Mesedez ezarri erabiltzaile izen berri bat kontu lokalerako"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1842
+#: ../src/gajim.py:1850
 msgid "Could not save your settings and preferences"
 msgstr "Ezin izan dira zure aldaketak eta hobespenak gorde"
 
-#: ../src/gajim.py:2034
+#: ../src/gajim.py:2042
 msgid "Network Manager support not available"
 msgstr "Network Kudeatzailea ez dago erabilgarri"
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2117
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Session Management support not available (missing gnome.ui module)"
 
@@ -4237,116 +4341,116 @@ msgstr "Ezin duzu zure berezko gaia ezabatu"
 msgid "Please first choose another for your current theme."
 msgstr "Please first choose another for your current theme."
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chat"
 msgstr "Txat Pribatua"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chats"
 msgstr "Txat Pribatuak"
 
-#: ../src/groupchat_control.py:120
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Mezu pribatua bidaltzeak huts egin du"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Ez zaude gela honetan \"%s\"jadanik edo \"%s\" joan da."
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chat"
 msgstr "Txat Taldea"
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chats"
 msgstr "Txat Taldeak"
 
-#: ../src/groupchat_control.py:315
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Sartu Izengoitia"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:810
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s botata izan da%(reason)s -engatik: "
 
-#: ../src/groupchat_control.py:814
+#: ../src/groupchat_control.py:816
 #, 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:821
+#: ../src/groupchat_control.py:823
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s debekatu da %(reason)s -engatik:"
 
-#: ../src/groupchat_control.py:825
+#: ../src/groupchat_control.py:827
 #, 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:833
+#: ../src/groupchat_control.py:835
 #, python-format
 msgid "You are now known as %s"
 msgstr "Orain %s bezala ezaguna zara"
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:837
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s orain %s bezala ezaguna da"
 
-#: ../src/groupchat_control.py:915
+#: ../src/groupchat_control.py:917
 #, python-format
 msgid "%s has left"
 msgstr "%s deskonektatu da"
 
-#: ../src/groupchat_control.py:920
+#: ../src/groupchat_control.py:922
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s gelan sartu da"
 
 #. No status message
-#: ../src/groupchat_control.py:922 ../src/roster_window.py:1204
+#: ../src/groupchat_control.py:924 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s orain %s da"
 
-#: ../src/groupchat_control.py:1041 ../src/groupchat_control.py:1059
-#: ../src/groupchat_control.py:1152 ../src/groupchat_control.py:1169
+#: ../src/groupchat_control.py:1043 ../src/groupchat_control.py:1061
+#: ../src/groupchat_control.py:1154 ../src/groupchat_control.py:1171
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Izengoitia aurkitugabea: %s"
 
-#: ../src/groupchat_control.py:1075
+#: ../src/groupchat_control.py:1077
 msgid "This group chat has no subject"
 msgstr "Gela honek ez du gairik"
 
-#: ../src/groupchat_control.py:1088
+#: ../src/groupchat_control.py:1090
 #, 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:1095 ../src/groupchat_control.py:1123
+#: ../src/groupchat_control.py:1097 ../src/groupchat_control.py:1125
 #, 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:1206
+#: ../src/groupchat_control.py:1208
 #, 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:1229
+#: ../src/groupchat_control.py:1231
 #, python-format
 msgid "Commands: %s"
 msgstr "Azalpenak: %s"
 
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1233
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4359,7 +4463,7 @@ msgstr ""
 "beharko   \"@\" -rik  badu. JID-a jadanik gelan bada, bera botatata izango "
 "da ere. Izengoitiak EZ du onartzen tarterik. "
 
-#: ../src/groupchat_control.py:1238
+#: ../src/groupchat_control.py:1240
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4367,24 +4471,24 @@ msgstr ""
 "Erabilera: /%s <nickname>, ireki txat pribatu bat espezifikatutako "
 "erabiltzaileari."
 
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1244
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Erabilera: %s, testu leihoa itxi."
 
-#: ../src/groupchat_control.py:1244
+#: ../src/groupchat_control.py:1246
 #, 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:1247
+#: ../src/groupchat_control.py:1249
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Erabilera:/%s, ezkutatu txat-eko botoilak."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1252
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4393,7 +4497,7 @@ msgstr ""
 "Erabilera: /%s <JID> [reason], gonbidatu JID-a oraingo gelara, aukerazko "
 "arrazoi bat emanez. "
 
-#: ../src/groupchat_control.py:1254
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4402,7 +4506,7 @@ msgstr ""
 "Erabilera:  /%s <room>@<server>[/nickname], eskaini room@server-era sartzen "
 "aukeraz izengoiti bat ezarriz."
 
-#: ../src/groupchat_control.py:1258
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4413,7 +4517,7 @@ msgstr ""
 "erabiltzailea gelatik eta nahi bada arrazoi bat adierazi. EZ da onartzen "
 "espazioak iznegoitian."
 
-#: ../src/groupchat_control.py:1263
+#: ../src/groupchat_control.py:1265
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current group chat. Use third "
@@ -4422,7 +4526,7 @@ msgstr ""
 "Erabilera:  /%s <action>, bidali aukeratutako ekintza daukazun oraingo "
 "gelara. Erabili 3. pertsona. (e.g. /%s explodes.)"
 
-#: ../src/groupchat_control.py:1267
+#: ../src/groupchat_control.py:1269
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4431,94 +4535,94 @@ msgstr ""
 "Erabilera: /%s <nickname> [message], ireki mezu pribatuko leiho bat eta "
 "bidali zehaztutako izengoitiaren erabiltzailera."
 
-#: ../src/groupchat_control.py:1272
+#: ../src/groupchat_control.py:1274
 #, 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:1276
+#: ../src/groupchat_control.py:1278
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Erabilera:/%s , erakutsarazi gelako pertsonen izenak."
 
-#: ../src/groupchat_control.py:1280
+#: ../src/groupchat_control.py:1282
 #, 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:1283
+#: ../src/groupchat_control.py:1285
 #, 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:1286
+#: ../src/groupchat_control.py:1288
 #, python-format
 msgid "No help info for /%s"
 msgstr "Ez dago laguntza informazioa  /%s -rentzat"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1337
 #, 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:1337
+#: ../src/groupchat_control.py:1339
 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:1341 ../src/roster_window.py:3961
+#: ../src/groupchat_control.py:1343 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "E_z galdetu berriro  "
 
-#: ../src/groupchat_control.py:1375
+#: ../src/groupchat_control.py:1377
 msgid "Changing Subject"
 msgstr "Gaia Aldatu"
 
-#: ../src/groupchat_control.py:1376
+#: ../src/groupchat_control.py:1378
 msgid "Please specify the new subject:"
 msgstr "Gai berria zehaztu:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1387
 msgid "Changing Nickname"
 msgstr "Izengoitia Aldatu"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1388
 msgid "Please specify the new nickname you want to use:"
 msgstr "Mesedez zehaztu ezazu erabili nahi duzun izengoiti berria:"
 
-#: ../src/groupchat_control.py:1411
+#: ../src/groupchat_control.py:1413
 msgid "Bookmark already set"
 msgstr "Talde agenda ezarria"
 
-#: ../src/groupchat_control.py:1412
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "\"%s\" gela zure talde agendan dago jadanik."
 
-#: ../src/groupchat_control.py:1421
+#: ../src/groupchat_control.py:1423
 msgid "Bookmark has been added successfully"
 msgstr "Talde agenda egoki sortu da"
 
-#: ../src/groupchat_control.py:1422
+#: ../src/groupchat_control.py:1424
 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:1548
+#: ../src/groupchat_control.py:1550
 #, python-format
 msgid "Kicking %s"
 msgstr "Botatzen %s"
 
-#: ../src/groupchat_control.py:1549 ../src/groupchat_control.py:1831
+#: ../src/groupchat_control.py:1551 ../src/groupchat_control.py:1833
 msgid "You may specify a reason below:"
 msgstr "Arrazoia zehaztu behar duzu behean:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1830
+#: ../src/groupchat_control.py:1832
 #, python-format
 msgid "Banning %s"
 msgstr "Debekatzen %s"
@@ -4565,17 +4669,17 @@ 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:727
+#: ../src/gtkgui_helpers.py:728
 msgid "Extension not supported"
 msgstr "Gehigarriak ez eskuragarri"
 
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:729
 #, 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:737
+#: ../src/gtkgui_helpers.py:738
 msgid "Save Image as..."
 msgstr "Gorde Irudia Bezala..."
 
@@ -4605,11 +4709,6 @@ msgstr "Izengoitia"
 msgid "Message"
 msgstr "Mezua"
 
-#. holds subject
-#: ../src/history_manager.py:141 ../src/history_manager.py:172
-msgid "Subject"
-msgstr "Gaia"
-
 #: ../src/history_manager.py:186
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -5853,7 +5952,7 @@ 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:1515
+#: ../src/common/connection_handlers.py:1523
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Baimenik gabeko izengoitia: %s"
@@ -5861,41 +5960,41 @@ msgstr "Baimenik gabeko izengoitia: %s"
 #. password required to join
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1577
-#: ../src/common/connection_handlers.py:1580
-#: ../src/common/connection_handlers.py:1583
-#: ../src/common/connection_handlers.py:1586
-#: ../src/common/connection_handlers.py:1589
-#: ../src/common/connection_handlers.py:1592
+#: ../src/common/connection_handlers.py:1585
+#: ../src/common/connection_handlers.py:1588
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1597
 #: ../src/common/connection_handlers.py:1600
+#: ../src/common/connection_handlers.py:1608
 msgid "Unable to join group chat"
 msgstr "Ezin da gela honetara sartu"
 
-#: ../src/common/connection_handlers.py:1578
+#: ../src/common/connection_handlers.py:1586
 msgid "A password is required to join this group chat."
 msgstr "Pasahitza behar da gela honetan sartzeko."
 
-#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1589
 msgid "You are banned from this group chat."
 msgstr "Gela honetan ukatua izan zara."
 
-#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1592
 msgid "Such group chat does not exist."
 msgstr "Honako gela honek ez du existitzen."
 
-#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1595
 msgid "Group chat creation is restricted."
 msgstr "Gela sortzea mugatua dago."
 
-#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1598
 msgid "Your registered nickname must be used."
 msgstr "Erregistratutako izengoitia erabilia izan behar da."
 
-#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1601
 msgid "You are not in the members list."
 msgstr "Ez zaude kideen zerrendan."
 
-#: ../src/common/connection_handlers.py:1601
+#: ../src/common/connection_handlers.py:1609
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5903,27 +6002,27 @@ msgstr ""
 "Zuk aukeratutako izengoitia erregistratuta dago jadanik.\n"
 "Mesedez ezarri beste izengoiti bat:"
 
-#: ../src/common/connection_handlers.py:1651
+#: ../src/common/connection_handlers.py:1659
 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:1672
+#: ../src/common/connection_handlers.py:1680
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "%s -ra harpidetuak gaude orain"
 
-#: ../src/common/connection_handlers.py:1674
+#: ../src/common/connection_handlers.py:1682
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Harpidetza kentzekoa eskaera %s -tik"
 
-#: ../src/common/connection_handlers.py:1676
+#: ../src/common/connection_handlers.py:1684
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s -ren harpidetzatik kenduta gaude"
 
-#: ../src/common/connection_handlers.py:1846
+#: ../src/common/connection_handlers.py:1854
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5953,7 +6052,7 @@ msgid "Invalid answer"
 msgstr "Erantzun baliogabea"
 
 #: ../src/common/connection.py:394 ../src/common/connection.py:429
-#: ../src/common/connection.py:872
+#: ../src/common/connection.py:877
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
@@ -6010,7 +6109,7 @@ msgstr "%s naiz"
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Mezu hau *enkriptatua\" dago (Ikusi: JEP:`27`]"
 
-#: ../src/common/connection.py:759
+#: ../src/common/connection.py:764
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6020,7 +6119,7 @@ msgstr ""
 "Gaia: %s\n"
 "%s"
 
-#: ../src/common/connection.py:898
+#: ../src/common/connection.py:903
 msgid "Not fetched because of invisible status"
 msgstr "Ez bidali ikusezin egoerarengatik"
 
@@ -6329,10 +6428,6 @@ msgstr "Inork ez"
 msgid "To"
 msgstr "Norentzat"
 
-#: ../src/common/helpers.py:259
-msgid "From"
-msgstr "-etik"
-
 #: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Biak"
@@ -6612,9 +6707,6 @@ msgstr "Errorea zerbitzarian sartzean.%s"
 #~ msgid "Migrating Logs..."
 #~ msgstr "Historialeko Log-ak Esportatzen...."
 
-#~ msgid "Please wait while logs are being migrated..."
-#~ msgstr "Mesedez itxoin log-a eraldatzen den bitartean...."
-
 #~ msgid "_Join New Room"
 #~ msgstr "_Gela Berri Sartu"
 
diff --git a/po/fr.po b/po/fr.po
index 48d318ab7..2a213701d 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-12-02 17:15+0100\n"
+"POT-Creation-Date: 2006-12-09 10:02+0100\n"
 "PO-Revision-Date: 2006-04-20 17:23+0100\n"
 "Last-Translator: Yann Le Boulanger <asterix@lagaule.org>\n"
 "Language-Team: \n"
@@ -325,16 +325,16 @@ msgid "Manage..."
 msgstr "Gérer..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1637
-#: ../src/config.py:3430
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1642
+#: ../src/config.py:3435
 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:1219
-#: ../src/config.py:1224 ../src/config.py:1408 ../src/config.py:1627
-#: ../src/config.py:1636 ../src/config.py:1695 ../src/config.py:1769
-#: ../src/config.py:2640 ../src/config.py:3420 ../src/config.py:3429
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1224
+#: ../src/config.py:1229 ../src/config.py:1413 ../src/config.py:1632
+#: ../src/config.py:1641 ../src/config.py:1700 ../src/config.py:1774
+#: ../src/config.py:2645 ../src/config.py:3425 ../src/config.py:3434
 #: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Aucun"
@@ -522,6 +522,45 @@ msgstr "_Souscrire"
 msgid "_User ID:"
 msgstr "_Identifiant :"
 
+#: ../data/glade/adhoc_commands_window.glade.h:1
+msgid "<b>An error has occured:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:2
+msgid "<b>Choose command to execute:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:3
+msgid "Ad-hoc Commands - Gajim"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:4
+msgid "Check once more"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:5
+#, fuzzy
+msgid "Error description..."
+msgstr "Description"
+
+#: ../data/glade/adhoc_commands_window.glade.h:6
+#, fuzzy
+msgid "Please wait while retrieving command list..."
+msgstr "Merci de patienter pendant la migration de l'historique..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:7
+#, fuzzy
+msgid "Please wait while the command is sending..."
+msgstr "Merci de patienter pendant la migration de l'historique..."
+
+#: ../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>Description</b>"
@@ -665,13 +704,13 @@ msgstr "Jouer un son"
 #: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
-"Contact Connected\n"
-"Contact Disconnected\n"
-"Contact Change Status\n"
-"Group Chat Message Highlight\n"
-"Group Chat Message Received\n"
-"File Transfert Resquest\n"
-"File Transfert Started\n"
+"Contact Connected \n"
+"Contact Disconnected \n"
+"Contact Change Status \n"
+"Group Chat Message Highlight \n"
+"Group Chat Message Received \n"
+"File Transfert Resquest \n"
+"File Transfert Started \n"
 "File Transfert Finished"
 msgstr ""
 
@@ -745,6 +784,46 @@ msgstr "Port : "
 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 "Pays :"
+
+#: ../data/glade/atom_entry_window.glade.h:4
+#, fuzzy
+msgid "Feed name:"
+msgstr "nom du thème"
+
+#: ../data/glade/atom_entry_window.glade.h:5
+#, fuzzy
+msgid "Last modified:"
+msgstr "Nom :"
+
+#: ../data/glade/atom_entry_window.glade.h:6
+#, fuzzy
+msgid "New entry received"
+msgstr "Quand un nouvel événement est reçu"
+
+#: ../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 "Changer le mot de passe"
@@ -830,7 +909,7 @@ msgstr "Vue _Compacte    Alt+C"
 msgid "_History"
 msgstr "_Historique"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/glade/data_form_window.glade.h:1 ../src/dataforms_widget.py:76
 #, fuzzy
 msgid "Fill in the form."
 msgstr "Dans le groupe"
@@ -1053,6 +1132,20 @@ msgstr "_Envoyer un message privé"
 msgid "_Voice"
 msgstr "_S'exprimer"
 
+#: ../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:259
+msgid "From"
+msgstr "De"
+
+#. holds subject
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141
+#: ../src/history_manager.py:172
+msgid "Subject"
+msgstr "Sujet"
+
 #: ../data/glade/history_manager.glade.h:1
 msgid ""
 "<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
@@ -1215,7 +1308,7 @@ 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:1116
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
 msgid "OpenPGP Encryption"
 msgstr "Chiffrement OpenPGP"
 
@@ -1341,7 +1434,7 @@ msgstr ""
 msgid "B_efore nickname:"
 msgstr "Avant le surnom :"
 
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:841
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
 msgid "Chat"
 msgstr "Discussion"
 
@@ -2479,34 +2572,34 @@ 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:841
+#: ../src/chat_control.py:844
 msgid "Chats"
 msgstr "Discussions"
 
-#: ../src/chat_control.py:1042
+#: ../src/chat_control.py:1030
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s : %(message)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1130
+#: ../src/chat_control.py:1118
 #, 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:1266
+#: ../src/chat_control.py:1254
 msgid "Encryption enabled"
 msgstr "Chiffrement activée"
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1259
 msgid "Encryption disabled"
 msgstr "Chiffrement désactivée"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1413 ../src/conversation_textview.py:493
-#: ../src/dialogs.py:629 ../src/gajim.py:727 ../src/gajim.py:728
-#: ../src/gajim.py:1067 ../src/roster_window.py:328
+#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495
+#: ../src/dialogs.py:629 ../src/gajim.py:733 ../src/gajim.py:734
+#: ../src/gajim.py:1073 ../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
@@ -2517,12 +2610,12 @@ msgid "Not in Roster"
 msgstr "Absent de la liste"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1545
 #, 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:1558
+#: ../src/chat_control.py:1546
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2530,277 +2623,277 @@ msgstr ""
 "Si vous fermez cette fenêtre et que l'historique n'est pas activé, ce "
 "message sera perdu."
 
-#: ../src/config.py:130 ../src/config.py:589
+#: ../src/config.py:135 ../src/config.py:594
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: ../src/config.py:216
+#: ../src/config.py:221
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Toutes les %s _minutes"
 
-#: ../src/config.py:358
+#: ../src/config.py:363
 msgid "Active"
 msgstr "Actif"
 
-#: ../src/config.py:366
+#: ../src/config.py:371
 msgid "Event"
 msgstr "Événement"
 
-#: ../src/config.py:679 ../src/gajim.py:2086
+#: ../src/config.py:684 ../src/gajim.py:2094
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Aucune connexion disponible"
 
-#: ../src/config.py:680 ../src/gajim.py:2087
+#: ../src/config.py:685 ../src/gajim.py:2095
 #, 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:1032
+#: ../src/config.py:1037
 msgid "status message title"
 msgstr "titre du message d'état"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1037
 msgid "status message text"
 msgstr "texte du message d'état :"
 
-#: ../src/config.py:1067
+#: ../src/config.py:1072
 msgid "First Message Received"
 msgstr "Premier Message Reçu"
 
-#: ../src/config.py:1068
+#: ../src/config.py:1073
 msgid "Next Message Received"
 msgstr "Message Suivant Reçu"
 
-#: ../src/config.py:1069
+#: ../src/config.py:1074
 msgid "Contact Connected"
 msgstr "Contacte Connecté"
 
-#: ../src/config.py:1070
+#: ../src/config.py:1075
 msgid "Contact Disconnected"
 msgstr "Contacte Déconnecté."
 
-#: ../src/config.py:1071
+#: ../src/config.py:1076
 msgid "Message Sent"
 msgstr "Message Envoyé"
 
-#: ../src/config.py:1072
+#: ../src/config.py:1077
 msgid "Group Chat Message Highlight"
 msgstr "Message d'un Salon mis en Sur-brillance"
 
-#: ../src/config.py:1073
+#: ../src/config.py:1078
 msgid "Group Chat Message Received"
 msgstr "Message d'un Salon Reçu"
 
-#: ../src/config.py:1080
+#: ../src/config.py:1085
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Invitation reçue"
 
-#: ../src/config.py:1283
+#: ../src/config.py:1288
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP n'est pas utilisable sur cet ordinateur"
 
-#: ../src/config.py:1329
+#: ../src/config.py:1334
 msgid "You are currently connected to the server"
 msgstr "Vous êtes actuellement connecté au serveur"
 
-#: ../src/config.py:1330
+#: ../src/config.py:1335
 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:1333 ../src/config.py:1925
+#: ../src/config.py:1338 ../src/config.py:1930
 msgid "Unread events"
 msgstr "Événements non lus"
 
-#: ../src/config.py:1334
+#: ../src/config.py:1339
 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:1338
+#: ../src/config.py:1343
 msgid "Account Name Already Used"
 msgstr "Nom de Compte déjà utilisé"
 
-#: ../src/config.py:1339
+#: ../src/config.py:1344
 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:1343 ../src/config.py:1347
+#: ../src/config.py:1348 ../src/config.py:1352
 msgid "Invalid account name"
 msgstr "Nom de compte invalide"
 
-#: ../src/config.py:1344
+#: ../src/config.py:1349
 msgid "Account name cannot be empty."
 msgstr "Le nom du compte ne peut pas être vide."
 
-#: ../src/config.py:1348
+#: ../src/config.py:1353
 msgid "Account name cannot contain spaces."
 msgstr "Le nom du compte ne peut pas contenir d'espaces."
 
-#: ../src/config.py:1356 ../src/config.py:1362 ../src/config.py:1372
-#: ../src/config.py:3030
+#: ../src/config.py:1361 ../src/config.py:1367 ../src/config.py:1377
+#: ../src/config.py:3035
 msgid "Invalid Jabber ID"
 msgstr "Identifiant Jabber invalide"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1368
 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:1422
+#: ../src/config.py:1427
 msgid "Invalid entry"
 msgstr "Entrée invalide"
 
-#: ../src/config.py:1423
+#: ../src/config.py:1428
 msgid "Custom port must be a port number."
 msgstr "Le port personnalisé doit être un numéro de port"
 
-#: ../src/config.py:1549 ../src/common/config.py:363
+#: ../src/config.py:1554 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Revient de suite."
 
-#: ../src/config.py:1559
+#: ../src/config.py:1564
 msgid "Relogin now?"
 msgstr "Reconnecter maintenant ?"
 
-#: ../src/config.py:1560
+#: ../src/config.py:1565
 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:1586
+#: ../src/config.py:1591
 msgid "No such account available"
 msgstr "Compte non disponible"
 
-#: ../src/config.py:1587
+#: ../src/config.py:1592
 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:1594 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/config.py:1599 ../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:1595
+#: ../src/config.py:1600
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Vous devez être connecté pour éditer vos informations."
 
-#: ../src/config.py:1599
+#: ../src/config.py:1604
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1600
+#: ../src/config.py:1605
 #, 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:1624 ../src/config.py:3417
+#: ../src/config.py:1629 ../src/config.py:3422
 msgid "Failed to get secret keys"
 msgstr "Erreur en récupérant les clés secrètes"
 
-#: ../src/config.py:1625 ../src/config.py:3418
+#: ../src/config.py:1630 ../src/config.py:3423
 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:1628 ../src/config.py:3421
+#: ../src/config.py:1633 ../src/config.py:3426
 msgid "OpenPGP Key Selection"
 msgstr "Sélection d'une clé OpenPGP"
 
-#: ../src/config.py:1629 ../src/config.py:3422
+#: ../src/config.py:1634 ../src/config.py:3427
 msgid "Choose your OpenPGP key"
 msgstr "Choisissez votre clé OpenPGP"
 
 #. Name column
-#: ../src/config.py:1859 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/config.py:1864 ../src/disco.py:740 ../src/disco.py:1466
 #: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/config.py:1862
+#: ../src/config.py:1867
 msgid "Server"
 msgstr "Serveur"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1931
 msgid "Read all pending events before removing this account."
 msgstr "Lisez tous les évènements avant de supprimer ce compte."
 
-#: ../src/config.py:1963
+#: ../src/config.py:1968
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Vous n'avez aucun compte actif"
 
-#: ../src/config.py:1964
+#: ../src/config.py:1969
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:2023
+#: ../src/config.py:2028
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Nom de Compte déjà utilisé"
 
-#: ../src/config.py:2024
+#: ../src/config.py:2029
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2256
+#: ../src/config.py:2261
 #, python-format
 msgid "Edit %s"
 msgstr "_Éditer %s"
 
-#: ../src/config.py:2258
+#: ../src/config.py:2263
 #, python-format
 msgid "Register to %s"
 msgstr "S'enregistrer à %s"
 
 #. list at the begining
-#: ../src/config.py:2330
+#: ../src/config.py:2335
 msgid "Ban List"
 msgstr "Liste des Bannis"
 
-#: ../src/config.py:2331
+#: ../src/config.py:2336
 msgid "Member List"
 msgstr "Liste des Membres"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2337
 msgid "Owner List"
 msgstr "Liste des Propriétaires"
 
-#: ../src/config.py:2333
+#: ../src/config.py:2338
 msgid "Administrator List"
 msgstr "Liste des Administrateurs"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2366 ../src/disco.py:747 ../src/history_manager.py:154
+#: ../src/config.py:2371 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2374
+#: ../src/config.py:2379
 msgid "Reason"
 msgstr "Raison"
 
-#: ../src/config.py:2379
+#: ../src/config.py:2384
 msgid "Nick"
 msgstr "Pseudonyme"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2388
 msgid "Role"
 msgstr "Rôle"
 
-#: ../src/config.py:2404
+#: ../src/config.py:2409
 msgid "Banning..."
 msgstr "Bannissement de ..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2406
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2808,11 +2901,11 @@ msgstr ""
 "<b>Qui voulez-vous bannir ?</b>\n"
 "\n"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2413
 msgid "Adding Member..."
 msgstr "Ajout d'un Membre ..."
 
-#: ../src/config.py:2409
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2820,11 +2913,11 @@ msgstr ""
 "<b>De qui voulez-vous faire un membre ?</b>\n"
 "\n"
 
-#: ../src/config.py:2411
+#: ../src/config.py:2416
 msgid "Adding Owner..."
 msgstr "Ajout d'un Propriétaire ..."
 
-#: ../src/config.py:2412
+#: ../src/config.py:2417
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2832,11 +2925,11 @@ msgstr ""
 "<b>De qui voulez-vous faire un propriétaire ?</b>\n"
 "\n"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2419
 msgid "Adding Administrator..."
 msgstr "Ajout d'un Administrateur ..."
 
-#: ../src/config.py:2415
+#: ../src/config.py:2420
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2844,7 +2937,7 @@ msgstr ""
 "<b>De qui voulez-vous faire un administrateur ?</b>\n"
 "\n"
 
-#: ../src/config.py:2416
+#: ../src/config.py:2421
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2861,99 +2954,99 @@ msgstr ""
 "pseudo@domaine,\n"
 "domaine/ressource, ou les adresses comprenant un sous-domaine)."
 
-#: ../src/config.py:2521
+#: ../src/config.py:2526
 #, python-format
 msgid "Removing %s account"
 msgstr "Supprimer le compte %s"
 
-#: ../src/config.py:2538 ../src/roster_window.py:2667
+#: ../src/config.py:2543 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Mot de passe requis"
 
-#: ../src/config.py:2539 ../src/roster_window.py:2668
+#: ../src/config.py:2544 ../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:2540 ../src/roster_window.py:2669
+#: ../src/config.py:2545 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Enregistrer le mot de passe"
 
-#: ../src/config.py:2554
+#: ../src/config.py:2559
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Le compte \"%s\" est connecté au serveur"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2560
 msgid "If you remove it, the connection will be lost."
 msgstr "Si vous l'enlevez, la connection sera perdue."
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 #, fuzzy
 msgid "Default"
 msgstr "Supprimer"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Afficher l'heure :"
 
-#: ../src/config.py:2640
+#: ../src/config.py:2645
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2710
+#: ../src/config.py:2715
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Salon de Discussion"
 
-#: ../src/config.py:2742
+#: ../src/config.py:2747
 msgid "This bookmark has invalid data"
 msgstr "Ce marque-page contient des données invalides"
 
-#: ../src/config.py:2743
+#: ../src/config.py:2748
 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:3005
+#: ../src/config.py:3010
 msgid "Invalid username"
 msgstr "Nom d'utilisateur non valide"
 
-#: ../src/config.py:3006
+#: ../src/config.py:3011
 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:3016 ../src/dialogs.py:1316
+#: ../src/config.py:3021 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Mot de passe invalide"
 
-#: ../src/config.py:3017
+#: ../src/config.py:3022
 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:3021 ../src/dialogs.py:1321
+#: ../src/config.py:3026 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas"
 
-#: ../src/config.py:3022 ../src/dialogs.py:1322
+#: ../src/config.py:3027 ../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:3041
+#: ../src/config.py:3046
 msgid "Duplicate Jabber ID"
 msgstr "Identifiant Jabber dupliqué"
 
-#: ../src/config.py:3042
+#: ../src/config.py:3047
 msgid "This account is already configured in Gajim."
 msgstr "Ce compte est déjà configuré dans Gajim."
 
-#: ../src/config.py:3059
+#: ../src/config.py:3064
 msgid "Account has been added successfully"
 msgstr "Compte ajouté avec succès"
 
-#: ../src/config.py:3060 ../src/config.py:3095
+#: ../src/config.py:3065 ../src/config.py:3100
 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."
@@ -2962,23 +3055,23 @@ msgstr ""
 "Avancé, ou plus tard en cliquant sur Comptes dans le menu Éditer de la "
 "fenêtre principale."
 
-#: ../src/config.py:3094
+#: ../src/config.py:3099
 msgid "Your new account has been created successfully"
 msgstr "Votre nouveau compte a été créé avec succès"
 
-#: ../src/config.py:3112
+#: ../src/config.py:3117
 msgid "An error occured during account creation"
 msgstr "Une erreur est survenue lors de la création du compte"
 
-#: ../src/config.py:3170
+#: ../src/config.py:3175
 msgid "Account name is in use"
 msgstr "Le nom du compte est utilisé"
 
-#: ../src/config.py:3171
+#: ../src/config.py:3176
 msgid "You already have an account using this name."
 msgstr "Vous avez déjà un compte avec ce nom."
 
-#: ../src/conversation_textview.py:271
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2986,57 +3079,66 @@ 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:340
+#: ../src/conversation_textview.py:342
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Actions pour \"%s\""
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Lire l'Article _Wikipédia"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Chercher dans le _Dictionnaire"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:373
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 "Il manque un \"%s\" dans l'URL du dictionnaire et ce n'est pas WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:386
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Il manque un \"%s\" dans l'URL de recherche sur Internet"
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "_Rechercher sur Internet"
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:397
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:755
+#: ../src/conversation_textview.py:757
 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:759
+#: ../src/conversation_textview.py:761
 #, python-format
 msgid "%i days ago"
 msgstr "Il y a %i jours"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:791
+#: ../src/conversation_textview.py:793
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujet : %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
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
@@ -3307,29 +3409,29 @@ msgstr "Nouveau message simple"
 msgid "New Private Message"
 msgstr "Nouveau message privé"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1161 ../src/notify.py:424
+#: ../src/dialogs.py:1369 ../src/gajim.py:1168 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "nouveau courrier électronique"
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1314 ../src/notify.py:418
+#: ../src/dialogs.py:1371 ../src/gajim.py:1321 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Requête de transfert de fichier"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1134 ../src/gajim.py:1290
+#: ../src/dialogs.py:1373 ../src/gajim.py:1140 ../src/gajim.py:1297
 #: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Erreur de Transfert de Fichier"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1353 ../src/gajim.py:1375
-#: ../src/gajim.py:1392 ../src/notify.py:422
+#: ../src/dialogs.py:1375 ../src/gajim.py:1360 ../src/gajim.py:1382
+#: ../src/gajim.py:1399 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Transfert de Fichier Terminé"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1356 ../src/notify.py:422
+#: ../src/dialogs.py:1376 ../src/gajim.py:1363 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Transfert de Fichier Arrêté"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1032 ../src/notify.py:426
+#: ../src/dialogs.py:1378 ../src/gajim.py:1038 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Invitation à un salon"
 
@@ -3689,31 +3791,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:682
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
 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:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "This file already exists"
 msgstr "Ce fichier existe déjà"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "What do you want to do?"
 msgstr "Que voulez vous faire ?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3847,57 +3949,58 @@ msgstr "Connexion"
 msgid "Subject: %s"
 msgstr "Sujet : %s\n"
 
-#: ../src/gajim.py:703
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:703 ../src/gajim.py:716
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "erreur en envoyant %s ( %s )"
 
-#: ../src/gajim.py:743
+#: ../src/gajim.py:749
 msgid "Authorization accepted"
 msgstr "Autorisation acceptée"
 
-#: ../src/gajim.py:744
+#: ../src/gajim.py:750
 #, 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:752
+#: ../src/gajim.py:758
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Le contact \"%s\" a cessé de vous souscrire à sa présence"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:759
 msgid "You will always see him or her as offline."
 msgstr "Vous le verrez toujours déconnecté."
 
-#: ../src/gajim.py:796
+#: ../src/gajim.py:802
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Le contact avec \"%s\" ne peut être établi"
 
-#: ../src/gajim.py:797 ../src/common/connection.py:395
+#: ../src/gajim.py:803 ../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:945 ../src/roster_window.py:1201
+#: ../src/gajim.py:951 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s est maintenant %s (%s)"
 
-#: ../src/gajim.py:1042
+#: ../src/gajim.py:1048
 msgid "Your passphrase is incorrect"
 msgstr "Votre mot de passe est incorrect"
 
-#: ../src/gajim.py:1043
+#: ../src/gajim.py:1049
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Vous êtes actuellement connecté sans clé OpenPGP."
 
-#: ../src/gajim.py:1145
+#: ../src/gajim.py:1151
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nouvel E-mail sur %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1147
+#: ../src/gajim.py:1153
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3907,62 +4010,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:1156
+#: ../src/gajim.py:1162
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1311
+#: ../src/gajim.py:1318
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s souhaite vous envoyer un fichier."
 
-#: ../src/gajim.py:1376
+#: ../src/gajim.py:1383
 #, 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:1380
+#: ../src/gajim.py:1387
 #, 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:1393
+#: ../src/gajim.py:1400
 #, 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:1397
+#: ../src/gajim.py:1404
 #, 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:1503
+#: ../src/gajim.py:1510
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1504
+#: ../src/gajim.py:1511
 #, 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:1842
+#: ../src/gajim.py:1850
 msgid "Could not save your settings and preferences"
 msgstr "Impossible d'enregistrer vos informations de configuration"
 
-#: ../src/gajim.py:2034
+#: ../src/gajim.py:2042
 #, fuzzy
 msgid "Network Manager support not available"
 msgstr "Aucune connexion disponible"
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2117
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Support du gestionnaire de sessions indisponible (module gnome.ui manquant)"
@@ -4304,119 +4407,119 @@ msgid "Please first choose another for your current theme."
 msgstr ""
 "Veuillez tout d'abord appliquer un autre thème avant de supprimer celui-ci."
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chat"
 msgstr "Conversation privée"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chats"
 msgstr "Conversations privées"
 
-#: ../src/groupchat_control.py:120
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "L'envoi du message privé a échoué"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:124
 #, 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
+#: ../src/groupchat_control.py:143
 msgid "Group Chat"
 msgstr "Salon de Discussion"
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chats"
 msgstr "Salons de Discussion"
 
-#: ../src/groupchat_control.py:315
+#: ../src/groupchat_control.py:317
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Changer de sur_nom"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:810
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s a été éjecté : %(reason)s"
 
-#: ../src/groupchat_control.py:814
+#: ../src/groupchat_control.py:816
 #, 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:821
+#: ../src/groupchat_control.py:823
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s a été banni : %(reason)s"
 
-#: ../src/groupchat_control.py:825
+#: ../src/groupchat_control.py:827
 #, 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:833
+#: ../src/groupchat_control.py:835
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vous êtes désormais connu sous le nom de %s"
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:837
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s est maintenant %s"
 
-#: ../src/groupchat_control.py:915
+#: ../src/groupchat_control.py:917
 #, python-format
 msgid "%s has left"
 msgstr "%s est parti"
 
-#: ../src/groupchat_control.py:920
+#: ../src/groupchat_control.py:922
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Dans le groupe"
 
 #. No status message
-#: ../src/groupchat_control.py:922 ../src/roster_window.py:1204
+#: ../src/groupchat_control.py:924 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s est maintenant %s"
 
-#: ../src/groupchat_control.py:1041 ../src/groupchat_control.py:1059
-#: ../src/groupchat_control.py:1152 ../src/groupchat_control.py:1169
+#: ../src/groupchat_control.py:1043 ../src/groupchat_control.py:1061
+#: ../src/groupchat_control.py:1154 ../src/groupchat_control.py:1171
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Surnom introuvable : %s"
 
-#: ../src/groupchat_control.py:1075
+#: ../src/groupchat_control.py:1077
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "Ce salon n'a pas de sujet"
 
-#: ../src/groupchat_control.py:1088
+#: ../src/groupchat_control.py:1090
 #, 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:1095 ../src/groupchat_control.py:1123
+#: ../src/groupchat_control.py:1097 ../src/groupchat_control.py:1125
 #, 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:1206
+#: ../src/groupchat_control.py:1208
 #, 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:1229
+#: ../src/groupchat_control.py:1231
 #, python-format
 msgid "Commands: %s"
 msgstr "Commandes : %s"
 
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1233
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4429,7 +4532,7 @@ msgstr ""
 "actuellement dans le salon il sera également éjecté. Ne supporte pas les "
 "espaces dans le surnom."
 
-#: ../src/groupchat_control.py:1238
+#: ../src/groupchat_control.py:1240
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4437,12 +4540,12 @@ msgstr ""
 "Utilisation : /%s <surnom>, ouvre une fenêtre de discussion privée avec "
 "l'occupant spécifié."
 
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1244
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Usage : /%s, nettoie la fenêtre."
 
-#: ../src/groupchat_control.py:1244
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4451,12 +4554,12 @@ msgstr ""
 "Utilisation : /%s [raison], ferme la fenêtre ou l'onglet courrant en "
 "affichant la raison si spécifiée."
 
-#: ../src/groupchat_control.py:1247
+#: ../src/groupchat_control.py:1249
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Usage: /%s, cache les boutons de discussion."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1252
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4465,7 +4568,7 @@ msgstr ""
 "Utilisation : /%s <JID> [raison], invite le JID dans le salon actuel, la "
 "raison est optionnelle."
 
-#: ../src/groupchat_control.py:1254
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4474,7 +4577,7 @@ msgstr ""
 "Utilisation : /%s <salon>@<serveur>[/surnom], propose de rejoindre "
 "salon@serveur en option on peut spécifier le surnom utilisé."
 
-#: ../src/groupchat_control.py:1258
+#: ../src/groupchat_control.py:1260
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4485,7 +4588,7 @@ msgstr ""
 "spécifié du salon et affiche en option la raison. Le surnom ne doit pas "
 "contenir d'espaces !"
 
-#: ../src/groupchat_control.py:1263
+#: ../src/groupchat_control.py:1265
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current group chat. Use third "
@@ -4494,7 +4597,7 @@ msgstr ""
 "Utilisation : /%s <action>, envoie l'action au salon actuel. Utilise la "
 "troisième personne. (ex : /%s explose.)"
 
-#: ../src/groupchat_control.py:1267
+#: ../src/groupchat_control.py:1269
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4503,24 +4606,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:1272
+#: ../src/groupchat_control.py:1274
 #, 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:1276
+#: ../src/groupchat_control.py:1278
 #, fuzzy, python-format
 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:1280
+#: ../src/groupchat_control.py:1282
 #, 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:1283
+#: ../src/groupchat_control.py:1285
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -4528,73 +4631,73 @@ msgstr ""
 "Utilisation : /%s <message>, envoie un message sans chercher d'autres "
 "commandes."
 
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1288
 #, python-format
 msgid "No help info for /%s"
 msgstr "Pas d'aide disponible pour /%s"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1337
 #, 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:1337
+#: ../src/groupchat_control.py:1339
 #, 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:1341 ../src/roster_window.py:3961
+#: ../src/groupchat_control.py:1343 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "_Ne plus me poser la question"
 
-#: ../src/groupchat_control.py:1375
+#: ../src/groupchat_control.py:1377
 msgid "Changing Subject"
 msgstr "Changement de Sujet"
 
-#: ../src/groupchat_control.py:1376
+#: ../src/groupchat_control.py:1378
 msgid "Please specify the new subject:"
 msgstr "Saisissez le nouveau sujet :"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1387
 msgid "Changing Nickname"
 msgstr "Changement de Surnom"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1388
 msgid "Please specify the new nickname you want to use:"
 msgstr "Saisissez le nouveau surnom que vous souhaitez utiliser :"
 
-#: ../src/groupchat_control.py:1411
+#: ../src/groupchat_control.py:1413
 msgid "Bookmark already set"
 msgstr "Marque-page déjà spécifié"
 
-#: ../src/groupchat_control.py:1412
+#: ../src/groupchat_control.py:1414
 #, 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:1421
+#: ../src/groupchat_control.py:1423
 msgid "Bookmark has been added successfully"
 msgstr "Marque-page ajouté avec succès"
 
-#: ../src/groupchat_control.py:1422
+#: ../src/groupchat_control.py:1424
 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:1548
+#: ../src/groupchat_control.py:1550
 #, python-format
 msgid "Kicking %s"
 msgstr "Exclusion de %s"
 
-#: ../src/groupchat_control.py:1549 ../src/groupchat_control.py:1831
+#: ../src/groupchat_control.py:1551 ../src/groupchat_control.py:1833
 msgid "You may specify a reason below:"
 msgstr "Vous pouvez saisir une raison ci-dessous :"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1830
+#: ../src/groupchat_control.py:1832
 #, python-format
 msgid "Banning %s"
 msgstr "Bannissement de %s"
@@ -4640,16 +4743,16 @@ msgstr "Erreur lors de l'analyse du fichier :"
 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:727
+#: ../src/gtkgui_helpers.py:728
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:729
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:737
+#: ../src/gtkgui_helpers.py:738
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Enregistrer le Fichier sous..."
@@ -4680,11 +4783,6 @@ msgstr "Pseudonyme"
 msgid "Message"
 msgstr "Message"
 
-#. holds subject
-#: ../src/history_manager.py:141 ../src/history_manager.py:172
-msgid "Subject"
-msgstr "Sujet"
-
 #: ../src/history_manager.py:186
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -5939,7 +6037,7 @@ msgstr ""
 "L'information d'enregistrement pour la passerelle %s n'est pas arrivée à "
 "temps"
 
-#: ../src/common/connection_handlers.py:1515
+#: ../src/common/connection_handlers.py:1523
 #, fuzzy, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Surnom introuvable : %s"
@@ -5947,46 +6045,46 @@ msgstr "Surnom introuvable : %s"
 #. password required to join
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1577
-#: ../src/common/connection_handlers.py:1580
-#: ../src/common/connection_handlers.py:1583
-#: ../src/common/connection_handlers.py:1586
-#: ../src/common/connection_handlers.py:1589
-#: ../src/common/connection_handlers.py:1592
+#: ../src/common/connection_handlers.py:1585
+#: ../src/common/connection_handlers.py:1588
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1597
 #: ../src/common/connection_handlers.py:1600
+#: ../src/common/connection_handlers.py:1608
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/connection_handlers.py:1578
+#: ../src/common/connection_handlers.py:1586
 #, 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:1581
+#: ../src/common/connection_handlers.py:1589
 #, fuzzy
 msgid "You are banned from this group chat."
 msgstr "Vous êtes banni de ce salon."
 
-#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1592
 #, fuzzy
 msgid "Such group chat does not exist."
 msgstr "Ce salon n'existe pas."
 
-#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1595
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "La création de salon est réservée aux administrateurs."
 
-#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1598
 msgid "Your registered nickname must be used."
 msgstr "Vous devez utiliser le surnom donné lors de l'enregistrement."
 
-#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1601
 msgid "You are not in the members list."
 msgstr "Vous n'êtes pas dans la liste des membres."
 
-#: ../src/common/connection_handlers.py:1601
+#: ../src/common/connection_handlers.py:1609
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5995,27 +6093,27 @@ msgstr ""
 "par un autre occupant.\n"
 "Veuillez entrer un autre surnom ci-dessous :"
 
-#: ../src/common/connection_handlers.py:1651
+#: ../src/common/connection_handlers.py:1659
 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:1672
+#: ../src/common/connection_handlers.py:1680
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nous sommes maintenant inscrits chez %s"
 
-#: ../src/common/connection_handlers.py:1674
+#: ../src/common/connection_handlers.py:1682
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Requête de désinscription de la part de %s"
 
-#: ../src/common/connection_handlers.py:1676
+#: ../src/common/connection_handlers.py:1684
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nous ne sommes plus dans la liste de %s"
 
-#: ../src/common/connection_handlers.py:1846
+#: ../src/common/connection_handlers.py:1854
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -6046,7 +6144,7 @@ msgid "Invalid answer"
 msgstr "Réponse non valide"
 
 #: ../src/common/connection.py:394 ../src/common/connection.py:429
-#: ../src/common/connection.py:872
+#: ../src/common/connection.py:877
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
@@ -6104,7 +6202,7 @@ msgstr "Je suis %s"
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[ce message est chiffré]"
 
-#: ../src/common/connection.py:759
+#: ../src/common/connection.py:764
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6114,7 +6212,7 @@ msgstr ""
 "Sujet : %s\n"
 "%s"
 
-#: ../src/common/connection.py:898
+#: ../src/common/connection.py:903
 msgid "Not fetched because of invisible status"
 msgstr ""
 
@@ -6434,10 +6532,6 @@ msgstr "Aucune"
 msgid "To"
 msgstr "À"
 
-#: ../src/common/helpers.py:259
-msgid "From"
-msgstr "De"
-
 #: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Les deux"
@@ -6714,9 +6808,6 @@ msgstr "erreur en envoyant %s ( %s )"
 #~ msgid "Migrating Logs..."
 #~ msgstr "Migration de l'historique..."
 
-#~ msgid "Please wait while logs are being migrated..."
-#~ msgstr "Merci de patienter pendant la migration de l'historique..."
-
 #~ msgid "_Join New Room"
 #~ msgstr "Re_joindre un nouveau salon"
 
diff --git a/po/hr.po b/po/hr.po
index 9678cd03e..f98f29c1a 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-04 00:03+0200\n"
+"POT-Creation-Date: 2006-12-09 10:02+0100\n"
 "PO-Revision-Date: 2006-12-07 20:05+0100\n"
 "Last-Translator: Adrian C. <anrxc@sysphere.org>\n"
 "Language-Team: Croatian\n"
@@ -251,7 +251,7 @@ msgstr "Izmjeni Osobne Informacije"
 
 #: ../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:904
+#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:905
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -322,16 +322,16 @@ msgid "Manage..."
 msgstr "Podesi..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1636
-#: ../src/config.py:3429
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1642
+#: ../src/config.py:3435
 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: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
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1224
+#: ../src/config.py:1229 ../src/config.py:1413 ../src/config.py:1632
+#: ../src/config.py:1641 ../src/config.py:1700 ../src/config.py:1774
+#: ../src/config.py:2645 ../src/config.py:3425 ../src/config.py:3434
 #: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Ništa"
@@ -439,10 +439,12 @@ msgid ""
 "This is only available if python-avahi is installed and avahi-daemon is "
 "running."
 msgstr ""
-"Ako je označeno, svi lokalni kontakti koji koriste Bonjour kompatibilni klijent "
-"za razgovor (kao iChat, Trillian ili Gaim) biti će prikazani na listi kontakata. Ne morate biti "
-"spojeni na jabber poslužitelj kako bi ovo radilo.\n"
-"Ovo je dostupno samo ako je instaliran python-avahi i avahi-daemon je pokrenut."
+"Ako je označeno, svi lokalni kontakti koji koriste Bonjour kompatibilni "
+"klijent za razgovor (kao iChat, Trillian ili Gaim) biti će prikazani na "
+"listi kontakata. Ne morate biti spojeni na jabber poslužitelj kako bi ovo "
+"radilo.\n"
+"Ovo je dostupno samo ako je instaliran python-avahi i avahi-daemon je "
+"pokrenut."
 
 #: ../data/glade/accounts_window.glade.h:4
 msgid ""
@@ -525,6 +527,45 @@ msgstr "Re_gistracija"
 msgid "_User ID:"
 msgstr "_ID Korisnika:"
 
+#: ../data/glade/adhoc_commands_window.glade.h:1
+msgid "<b>An error has occured:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:2
+msgid "<b>Choose command to execute:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:3
+msgid "Ad-hoc Commands - Gajim"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:4
+msgid "Check once more"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:5
+#, fuzzy
+msgid "Error description..."
+msgstr "Opis"
+
+#: ../data/glade/adhoc_commands_window.glade.h:6
+#, fuzzy
+msgid "Please wait while retrieving command list..."
+msgstr "Pričekajte dok se odvija selidba zapisa..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:7
+#, fuzzy
+msgid "Please wait while the command is sending..."
+msgstr "Pričekajte dok se odvija selidba zapisa..."
+
+#: ../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>Opis</b>"
@@ -666,13 +707,13 @@ msgstr "Sviraj zvukove"
 #: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
-"Contact Connected\n"
-"Contact Disconnected\n"
-"Contact Change Status\n"
-"Group Chat Message Highlight\n"
-"Group Chat Message Received\n"
-"File Transfert Resquest\n"
-"File Transfert Started\n"
+"Contact Connected \n"
+"Contact Disconnected \n"
+"Contact Change Status \n"
+"Group Chat Message Highlight \n"
+"Group Chat Message Received \n"
+"File Transfert Resquest \n"
+"File Transfert Started \n"
 "File Transfert Finished"
 msgstr ""
 "Primanje Poruke\n"
@@ -693,7 +734,8 @@ msgstr "Kada "
 msgid ""
 "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
-"_Aktivacija opcije upravitelja prozora za bljeskanje prozora razgovora u taskbaru"
+"_Aktivacija opcije upravitelja prozora za bljeskanje prozora razgovora u "
+"taskbaru"
 
 #: ../data/glade/advanced_notifications_window.glade.h:29
 msgid "_Disable auto opening chat window"
@@ -753,6 +795,46 @@ msgstr "za"
 msgid "when I'm in"
 msgstr "kada sam u"
 
+#: ../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 "Država:"
+
+#: ../data/glade/atom_entry_window.glade.h:4
+#, fuzzy
+msgid "Feed name:"
+msgstr "ime teme"
+
+#: ../data/glade/atom_entry_window.glade.h:5
+#, fuzzy
+msgid "Last modified:"
+msgstr "Prezime:"
+
+#: ../data/glade/atom_entry_window.glade.h:6
+#, fuzzy
+msgid "New entry received"
+msgstr "Kada se primi novi događaj"
+
+#: ../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 "Promijeni Password"
@@ -838,7 +920,7 @@ msgstr "_Kompaktan Pregled    Alt+K"
 msgid "_History"
 msgstr "_Povijest"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/glade/data_form_window.glade.h:1 ../src/dataforms_widget.py:76
 msgid "Fill in the form."
 msgstr "Ispunite formular."
 
@@ -1055,6 +1137,21 @@ msgstr "_Pošalji Privatnu Poruku"
 msgid "_Voice"
 msgstr "_Glas"
 
+#: ../data/glade/groups_post_window.glade.h:1
+#, fuzzy
+msgid "Create new post"
+msgstr "Nova objava"
+
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:259
+msgid "From"
+msgstr "Od"
+
+#. holds subject
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141
+#: ../src/history_manager.py:172
+msgid "Subject"
+msgstr "Tema"
+
 #: ../data/glade/history_manager.glade.h:1
 msgid ""
 "<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
@@ -1217,7 +1314,7 @@ 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:1099
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP Enkripcija"
 
@@ -1310,8 +1407,8 @@ msgid ""
 "use the default one set here"
 msgstr ""
 "Primjer: Ako ste omogućili statusnu poruku za odsutnost, Gajim vas neće više "
-"pitati za statusnu poruku kada promjenite svoj status u odsutnost; koristiti će "
-"onu postavljenu ovdje"
+"pitati za statusnu poruku kada promjenite svoj status u odsutnost; koristiti "
+"će onu postavljenu ovdje"
 
 #: ../data/glade/preferences_window.glade.h:21
 msgid "Ask status message when I:"
@@ -1343,7 +1440,7 @@ msgstr ""
 msgid "B_efore nickname:"
 msgstr "Prij_e nadimka"
 
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:839
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
 msgid "Chat"
 msgstr "Razgovor"
 
@@ -1404,8 +1501,8 @@ msgid ""
 "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 prikazati "
-"u prozorima razgovora."
+"sa kontaktom. Ovdje možete odrediti koji statusi razgovora će se prikazati u "
+"prozorima razgovora."
 
 #: ../data/glade/preferences_window.glade.h:43
 msgid ""
@@ -1458,8 +1555,8 @@ msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
-"Ako je označeno, Gajim će ujedno uključiti i informacije o pošiljatelju novih "
-"emailova"
+"Ako je označeno, Gajim će ujedno uključiti i informacije o pošiljatelju "
+"novih emailova"
 
 #: ../data/glade/preferences_window.glade.h:51
 msgid ""
@@ -1579,8 +1676,8 @@ msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
 msgstr ""
-"Neke poruke mogu uključivati bogati sadržaj (formatiranje, boje itd.) Ako je označeno, "
-"Gajim će samo prikazivati sirovi tekst poruke."
+"Neke poruke mogu uključivati bogati sadržaj (formatiranje, boje itd.) Ako je "
+"označeno, Gajim će samo prikazivati sirovi tekst poruke."
 
 #: ../data/glade/preferences_window.glade.h:76
 msgid "Status"
@@ -2449,33 +2546,33 @@ msgstr "Veza nije dostupna"
 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:839
+#: ../src/chat_control.py:844
 msgid "Chats"
 msgstr "Razgovori"
 
-#: ../src/chat_control.py:1025
+#: ../src/chat_control.py:1030
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s iz grupnog razgovora %(room_name)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1113
+#: ../src/chat_control.py:1118
 #, 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:1239
+#: ../src/chat_control.py:1254
 msgid "Encryption enabled"
 msgstr "Enkripcija omogućena"
 
-#: ../src/chat_control.py:1244
+#: ../src/chat_control.py:1259
 msgid "Encryption disabled"
 msgstr "Enkripcija onemogućena"
 
 #. add_to_roster_menuitem
-#: ../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/chat_control.py:1401 ../src/conversation_textview.py:495
+#: ../src/dialogs.py:629 ../src/gajim.py:733 ../src/gajim.py:734
+#: ../src/gajim.py:1073 ../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
@@ -2486,12 +2583,12 @@ msgid "Not in Roster"
 msgstr "Nije na Listi Kontakata"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1530
+#: ../src/chat_control.py:1545
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Upravo ste primili novu poruku od \"%s\""
 
-#: ../src/chat_control.py:1531
+#: ../src/chat_control.py:1546
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2499,272 +2596,277 @@ msgstr ""
 "Ako zatvorite ovaj tab, a imate povijest onemogućenu, ova poruka biti će "
 "izgubljena."
 
-#: ../src/config.py:129 ../src/config.py:588
+#: ../src/config.py:135 ../src/config.py:594
 msgid "Disabled"
 msgstr "Onemogućeno"
 
-#: ../src/config.py:215
+#: ../src/config.py:221
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Svakih %s _minuta"
 
-#: ../src/config.py:357
+#: ../src/config.py:363
 msgid "Active"
 msgstr "Aktivno"
 
-#: ../src/config.py:365
+#: ../src/config.py:371
 msgid "Event"
 msgstr "Događaj"
 
-#: ../src/config.py:678 ../src/gajim.py:2072
+#: ../src/config.py:684 ../src/gajim.py:2094
+#, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Riječnik za jezik %s nije dostupan"
 
-#: ../src/config.py:679 ../src/gajim.py:2073
+#: ../src/config.py:685 ../src/gajim.py:2095
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 msgstr ""
-"Morate instalirati %s rječnik kako biste mogli koristiti provjeru pravopisa, ili odaberite "
-"drugi jezik postavkom odabira speller_language opcije."
+"Morate instalirati %s rječnik kako biste mogli koristiti provjeru pravopisa, "
+"ili odaberite drugi jezik postavkom odabira speller_language opcije."
 
-#: ../src/config.py:1031
+#: ../src/config.py:1037
 msgid "status message title"
 msgstr "naslov statusne poruke"
 
-#: ../src/config.py:1031
+#: ../src/config.py:1037
 msgid "status message text"
 msgstr "tekst statusne poruke"
 
-#: ../src/config.py:1066
+#: ../src/config.py:1072
 msgid "First Message Received"
 msgstr "Prva Poruka Primljena"
 
-#: ../src/config.py:1067
+#: ../src/config.py:1073
 msgid "Next Message Received"
 msgstr "Sljedeća Poruka Primljena"
 
-#: ../src/config.py:1068
+#: ../src/config.py:1074
 msgid "Contact Connected"
 msgstr "Kontakt Spojen"
 
-#: ../src/config.py:1069
+#: ../src/config.py:1075
 msgid "Contact Disconnected"
 msgstr "Kontakt Odspojen"
 
-#: ../src/config.py:1070
+#: ../src/config.py:1076
 msgid "Message Sent"
 msgstr "Poruka Poslana"
 
-#: ../src/config.py:1071
+#: ../src/config.py:1077
 msgid "Group Chat Message Highlight"
 msgstr "Označavanje Poruke Grupnog Razgovora"
 
-#: ../src/config.py:1072
+#: ../src/config.py:1078
 msgid "Group Chat Message Received"
 msgstr "Primljena Poruka Grupnog Razgovora"
 
-#: ../src/config.py:1079
+#: ../src/config.py:1085
 msgid "GMail Email Received"
 msgstr "Primljen Gmail Email"
 
-#: ../src/config.py:1282
+#: ../src/config.py:1288
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP nije moguće koristiti na ovom računalu"
 
-#: ../src/config.py:1328
+#: ../src/config.py:1334
 msgid "You are currently connected to the server"
 msgstr "Trenutno ste spojeni na poslužitelj"
 
-#: ../src/config.py:1329
+#: ../src/config.py:1335
 msgid "To change the account name, you must be disconnected."
 msgstr "Za promjenu imena računa morate se odspojiti."
 
-#: ../src/config.py:1332 ../src/config.py:1924
+#: ../src/config.py:1338 ../src/config.py:1930
 msgid "Unread events"
 msgstr "Nepročitani događaji"
 
-#: ../src/config.py:1333
+#: ../src/config.py:1339
 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"
 
-#: ../src/config.py:1337
+#: ../src/config.py:1343
 msgid "Account Name Already Used"
 msgstr "Ime Računa Već Upotrebljeno"
 
-#: ../src/config.py:1338
+#: ../src/config.py:1344
 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:1342 ../src/config.py:1346
+#: ../src/config.py:1348 ../src/config.py:1352
 msgid "Invalid account name"
 msgstr "Neispravno ime računa"
 
-#: ../src/config.py:1343
+#: ../src/config.py:1349
 msgid "Account name cannot be empty."
 msgstr "Ime računa ne može biti prazno."
 
-#: ../src/config.py:1347
+#: ../src/config.py:1353
 msgid "Account name cannot contain spaces."
 msgstr "Ime računa ne može sadržavati razmake."
 
-#: ../src/config.py:1355 ../src/config.py:1361 ../src/config.py:1371
-#: ../src/config.py:3029
+#: ../src/config.py:1361 ../src/config.py:1367 ../src/config.py:1377
+#: ../src/config.py:3035
 msgid "Invalid Jabber ID"
 msgstr "Neispravan Jabber ID"
 
-#: ../src/config.py:1362
+#: ../src/config.py:1368
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID mora biti forme \"korisnik@poslužitelj\"."
 
-#: ../src/config.py:1421
+#: ../src/config.py:1427
 msgid "Invalid entry"
 msgstr "Neispravan unos"
 
-#: ../src/config.py:1422
+#: ../src/config.py:1428
 msgid "Custom port must be a port number."
 msgstr "Osobni port mora biti broj porta."
 
-#: ../src/config.py:1548 ../src/common/config.py:363
+#: ../src/config.py:1554 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Odmah se vraćam."
 
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 msgid "Relogin now?"
 msgstr "Prijaviti se odmah?"
 
-#: ../src/config.py:1559
+#: ../src/config.py:1565
 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."
 
-#: ../src/config.py:1585
+#: ../src/config.py:1591
 msgid "No such account available"
 msgstr "Takav račun nije dostupan"
 
-#: ../src/config.py:1586
+#: ../src/config.py:1592
 msgid "You must create your account before editing your personal information."
 msgstr "Morate napravit svoj račun prije izmjena osobnih informacija."
 
-#: ../src/config.py:1593 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/config.py:1599 ../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:1594
+#: ../src/config.py:1600
 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:1598
+#: ../src/config.py:1604
 msgid "Your server doesn't support Vcard"
 msgstr "Vaš poslužitelj ne podržava Vcard"
 
-#: ../src/config.py:1599
+#: ../src/config.py:1605
 msgid "Your server can't save your personal information."
 msgstr "Vaš poslužitelj nije u mogućnosti spremiti vaše osobne informacije."
 
-#: ../src/config.py:1623 ../src/config.py:3416
+#: ../src/config.py:1629 ../src/config.py:3422
 msgid "Failed to get secret keys"
 msgstr "Neuspješno dohvaćanje tajnih ključeva"
 
-#: ../src/config.py:1624 ../src/config.py:3417
+#: ../src/config.py:1630 ../src/config.py:3423
 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:1627 ../src/config.py:3420
+#: ../src/config.py:1633 ../src/config.py:3426
 msgid "OpenPGP Key Selection"
 msgstr "Odabir OpenPGP Ključeva"
 
-#: ../src/config.py:1628 ../src/config.py:3421
+#: ../src/config.py:1634 ../src/config.py:3427
 msgid "Choose your OpenPGP key"
 msgstr "Odaberite svoj OpenPGP ključ"
 
 #. Name column
-#: ../src/config.py:1858 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/config.py:1864 ../src/disco.py:740 ../src/disco.py:1466
 #: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Ime"
 
-#: ../src/config.py:1861
+#: ../src/config.py:1867
 msgid "Server"
 msgstr "Poslužitelj"
 
-#: ../src/config.py:1925
+#: ../src/config.py:1931
 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:1962
+#: ../src/config.py:1968
+#, python-format
 msgid "You have opened chat in account %s"
 msgstr "Otvorili ste razgovor u računu %s"
 
-#: ../src/config.py:1963
+#: ../src/config.py:1969
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
-msgstr "Prozori svih razgovora i grupnih razgovora biti će zatvoreni. Želite li nastaviti?"
+msgstr ""
+"Prozori svih razgovora i grupnih razgovora biti će zatvoreni. Želite li "
+"nastaviti?"
 
-#: ../src/config.py:2022
+#: ../src/config.py:2028
 msgid "Account Local already exists."
 msgstr "Račun Lokalno već postoji."
 
-#: ../src/config.py:2023
+#: ../src/config.py:2029
 msgid "Please rename or remove it before enabling link-local messaging."
-msgstr "Molimo uklonite ili preimenujte prije omogućivanja poruka lokalne veze."
+msgstr ""
+"Molimo uklonite ili preimenujte prije omogućivanja poruka lokalne veze."
 
-#: ../src/config.py:2255
+#: ../src/config.py:2261
 #, python-format
 msgid "Edit %s"
 msgstr "Izmjena %s"
 
-#: ../src/config.py:2257
+#: ../src/config.py:2263
 #, python-format
 msgid "Register to %s"
 msgstr "Registrirati se na %s"
 
 #. list at the begining
-#: ../src/config.py:2329
+#: ../src/config.py:2335
 msgid "Ban List"
 msgstr "Ban Lista"
 
-#: ../src/config.py:2330
+#: ../src/config.py:2336
 msgid "Member List"
 msgstr "Lista Članova"
 
-#: ../src/config.py:2331
+#: ../src/config.py:2337
 msgid "Owner List"
 msgstr "Lista Vasnika"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2338
 msgid "Administrator List"
 msgstr "Lista Administratora"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2365 ../src/disco.py:747 ../src/history_manager.py:154
+#: ../src/config.py:2371 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 msgid "Reason"
 msgstr "Razlog"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Nick"
 msgstr "Nadimak"
 
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 msgid "Role"
 msgstr "Uloga"
 
-#: ../src/config.py:2403
+#: ../src/config.py:2409
 msgid "Banning..."
 msgstr "Zabranjivanje..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2405
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2772,11 +2874,11 @@ msgstr ""
 "<b>Koga želite zabraniti?</b>\n"
 "\n"
 
-#: ../src/config.py:2407
+#: ../src/config.py:2413
 msgid "Adding Member..."
 msgstr "Dodaja Člana..."
 
-#: ../src/config.py:2408
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2784,11 +2886,11 @@ msgstr ""
 "<b>Koga želite učiniti članom?</b>\n"
 "\n"
 
-#: ../src/config.py:2410
+#: ../src/config.py:2416
 msgid "Adding Owner..."
 msgstr "Dodavanje Vlasnika..."
 
-#: ../src/config.py:2411
+#: ../src/config.py:2417
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2796,11 +2898,11 @@ msgstr ""
 "<b>Koga želite učiniti vlasnikom?</b>\n"
 "\n"
 
-#: ../src/config.py:2413
+#: ../src/config.py:2419
 msgid "Adding Administrator..."
 msgstr "Dodajem Administratora..."
 
-#: ../src/config.py:2414
+#: ../src/config.py:2420
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2808,7 +2910,7 @@ msgstr ""
 "<b>Koga želite učiniti administratorom?</b>\n"
 "\n"
 
-#: ../src/config.py:2415
+#: ../src/config.py:2421
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2824,97 +2926,97 @@ 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:2520
+#: ../src/config.py:2526
 #, python-format
 msgid "Removing %s account"
 msgstr "Uklanjanje %s računa"
 
-#: ../src/config.py:2537 ../src/roster_window.py:2667
+#: ../src/config.py:2543 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Potrebna Lozinka"
 
-#: ../src/config.py:2538 ../src/roster_window.py:2668
+#: ../src/config.py:2544 ../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:2539 ../src/roster_window.py:2669
+#: ../src/config.py:2545 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Spremiti lozinku"
 
-#: ../src/config.py:2553
+#: ../src/config.py:2559
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Račun \"%s\" je spojen na poslužitelj"
 
-#: ../src/config.py:2554
+#: ../src/config.py:2560
 msgid "If you remove it, the connection will be lost."
 msgstr "Ukoliko ga uklonite, veza će biti izgubljena."
 
-#: ../src/config.py:2638
+#: ../src/config.py:2644
 msgid "Default"
 msgstr "Predefinirano"
 
-#: ../src/config.py:2638
+#: ../src/config.py:2644
 msgid "?print_status:All"
 msgstr "?ispis_statusa:Sve"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2645
 msgid "Enter and leave only"
 msgstr "Ući i samo napustiti"
 
-#: ../src/config.py:2709
+#: ../src/config.py:2715
 msgid "New Group Chat"
 msgstr "Novi Grupni Razgovor"
 
-#: ../src/config.py:2741
+#: ../src/config.py:2747
 msgid "This bookmark has invalid data"
 msgstr "Ova knjižna oznaka ima neispravne podatke"
 
-#: ../src/config.py:2742
+#: ../src/config.py:2748
 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:3004
+#: ../src/config.py:3010
 msgid "Invalid username"
 msgstr "Neispravno korisničko ime"
 
-#: ../src/config.py:3005
+#: ../src/config.py:3011
 msgid "You must provide a username to configure this account."
 msgstr "Morate ponuditi korisničko ime za postavke ovog računa."
 
-#: ../src/config.py:3015 ../src/dialogs.py:1316
+#: ../src/config.py:3021 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Neispravna lozinka"
 
-#: ../src/config.py:3016
+#: ../src/config.py:3022
 msgid "You must enter a password for the new account."
 msgstr "Morate unesti lozinku za novi račun"
 
-#: ../src/config.py:3020 ../src/dialogs.py:1321
+#: ../src/config.py:3026 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Lozinke se ne podudaraju"
 
-#: ../src/config.py:3021 ../src/dialogs.py:1322
+#: ../src/config.py:3027 ../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:3040
+#: ../src/config.py:3046
 msgid "Duplicate Jabber ID"
 msgstr "Dvostruki Jabber ID"
 
-#: ../src/config.py:3041
+#: ../src/config.py:3047
 msgid "This account is already configured in Gajim."
 msgstr "Ovaj račun je već konfiguriran u Gajimu."
 
-#: ../src/config.py:3058
+#: ../src/config.py:3064
 msgid "Account has been added successfully"
 msgstr "Račun je uspješno dodan"
 
-#: ../src/config.py:3059 ../src/config.py:3094
+#: ../src/config.py:3065 ../src/config.py:3100
 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."
@@ -2922,23 +3024,23 @@ 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:3093
+#: ../src/config.py:3099
 msgid "Your new account has been created successfully"
 msgstr "Vaš novi račun je uspješno stvoren"
 
-#: ../src/config.py:3111
+#: ../src/config.py:3117
 msgid "An error occured during account creation"
 msgstr "Pojavila se greška pri stvaranju računa"
 
-#: ../src/config.py:3169
+#: ../src/config.py:3175
 msgid "Account name is in use"
 msgstr "Ime računa se već koristi"
 
-#: ../src/config.py:3170
+#: ../src/config.py:3176
 msgid "You already have an account using this name."
 msgstr "Već imate račun pod tim imenom."
 
-#: ../src/conversation_textview.py:271
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2946,60 +3048,72 @@ 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:340
+#: ../src/conversation_textview.py:342
+#, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akcije za \"%s\""
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Pročitajte članak na _Wikipedii"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:359
 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:373
+#: ../src/conversation_textview.py:375
 #, 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:386
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL-u Web Pretrage nedostaje \"%s\""
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "_Pretraži Web"
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:397
 msgid "Open as _Link"
 msgstr "Otvori kao _Poveznicu"
 
-#: ../src/conversation_textview.py:752
+#: ../src/conversation_textview.py:757
 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:756
+#: ../src/conversation_textview.py:761
 #, python-format
 msgid "%i days ago"
 msgstr "Prije %i dana"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:788
+#: ../src/conversation_textview.py:793
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %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 "Ime kontakta: <i>%s</i>"
 
 #: ../src/dialogs.py:61
+#, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
@@ -3066,7 +3180,7 @@ msgid "Please fill in the data of the contact you want to add"
 msgstr "Molimo ispunite podatke kontakta kojeg želite dodati"
 
 #: ../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/disco.py:1252 ../src/gajim.py:491 ../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
@@ -3159,6 +3273,7 @@ msgid "Subscription request from %s"
 msgstr "Zahtjev za pretplatom od %s"
 
 #: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#, python-format
 msgid "You are already in group chat %s"
 msgstr "Već ste u grupnom razgovoru %s"
 
@@ -3184,6 +3299,7 @@ msgid "This is not a group chat"
 msgstr "Ovo nije grupni razgovor"
 
 #: ../src/dialogs.py:1226
+#, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nije ime grupnog razgovora."
 
@@ -3256,29 +3372,29 @@ msgstr "Nova Jedna Poruka"
 msgid "New Private Message"
 msgstr "Nova Privatna Poruka"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1159 ../src/notify.py:424
+#: ../src/dialogs.py:1369 ../src/gajim.py:1168 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Novi E-mail"
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1300 ../src/notify.py:418
+#: ../src/dialogs.py:1371 ../src/gajim.py:1321 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Zahtjev Razmjene Datoteka"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1132 ../src/gajim.py:1276
+#: ../src/dialogs.py:1373 ../src/gajim.py:1140 ../src/gajim.py:1297
 #: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Greška u Razmjeni Datoteka"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1339 ../src/gajim.py:1361
-#: ../src/gajim.py:1378 ../src/notify.py:422
+#: ../src/dialogs.py:1375 ../src/gajim.py:1360 ../src/gajim.py:1382
+#: ../src/gajim.py:1399 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Razmjena Datoteka Završena"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1342 ../src/notify.py:422
+#: ../src/dialogs.py:1376 ../src/gajim.py:1363 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Razmjena Datoteka Zaustavljena"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1030 ../src/notify.py:426
+#: ../src/dialogs.py:1378 ../src/gajim.py:1038 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Poziv na Grupni Razgovor"
 
@@ -3287,10 +3403,12 @@ msgid "Contact Changed Status"
 msgstr "Kontakt Promjenio Status"
 
 #: ../src/dialogs.py:1565
+#, python-format
 msgid "Single Message using account %s"
 msgstr "Jedna Poruka koristeći račun %s"
 
 #: ../src/dialogs.py:1567
+#, python-format
 msgid "Single Message in account %s"
 msgstr "Jedna Poruka u računu %s"
 
@@ -3346,6 +3464,7 @@ msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr "Redoslijed: %s, akcija: %s, tip: %s, vrijednost: %s"
 
 #: ../src/dialogs.py:1890
+#, python-format
 msgid "Order: %s, action: %s"
 msgstr "Redosljed: %s, akcija: %s"
 
@@ -3376,6 +3495,7 @@ msgstr "Morate unesti ime za stvaranje liste privatnosti."
 
 #. FIXME: use nickname instead of contact_jid
 #: ../src/dialogs.py:2220
+#, python-format
 msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s vas je pozvao na grupni razgovor %(room_jid)s"
 
@@ -3580,10 +3700,12 @@ msgid "Connection with peer cannot be established."
 msgstr "Vezu nije moguće ostvariti."
 
 #: ../src/filetransfers_window.py:224
+#, python-format
 msgid "Recipient: %s"
 msgstr "Primatelj: %s"
 
 #: ../src/filetransfers_window.py:226
+#, python-format
 msgid "Error message: %s"
 msgstr "Poruka Greške: %s"
 
@@ -3623,31 +3745,31 @@ msgstr "Opis: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s vam želi poslati datoteku:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:682
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nije moguće prepisati postojeću datoteku \"%s\""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
 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:326 ../src/gtkgui_helpers.py:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "This file already exists"
 msgstr "Ova datoteka već postoji"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "What do you want to do?"
 msgstr "Å to želite učiniti?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "U direktorij \"%s\" nije moguće zapisivati"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemate ovlasti stvarati datoteke u ovom direktoriju"
 
@@ -3738,25 +3860,25 @@ msgstr ""
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim treba PySQLite2 za pokretanje"
 
-#: ../src/gajim.py:76
+#: ../src/gajim.py:77
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim treba pywin32 za pokretanje"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:78
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
 "%s"
 msgstr ""
-"Molimo osigurajte da je Pywin32 instaliran na vašem sustavu. Možete ga naći na "
-"%s"
+"Molimo osigurajte da je Pywin32 instaliran na vašem sustavu. Možete ga naći "
+"na %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:189
+#: ../src/gajim.py:190
 msgid "Gajim is already running"
 msgstr "Gajim je već pokrenut"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:191
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -3764,73 +3886,77 @@ msgstr ""
 "Trenutno je već pokrenuta jedna instanca Gajima\n"
 "Svejedno pokrenuti?"
 
-#: ../src/gajim.py:297
+#: ../src/gajim.py:298
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Autorizacija za %s (id: %s)"
 
-#: ../src/gajim.py:298
+#: ../src/gajim.py:299
 msgid "Do you accept this request?"
 msgstr "Prihvaćate li ovaj zahtjev?"
 
-#: ../src/gajim.py:344 ../src/notify.py:430
+#: ../src/gajim.py:345 ../src/notify.py:430
 msgid "Connection Failed"
 msgstr "Veza Prekinuta"
 
-#: ../src/gajim.py:656
+#: ../src/gajim.py:658
+#, python-format
 msgid "Subject: %s"
 msgstr "Tema: %s"
 
-#: ../src/gajim.py:701
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:703 ../src/gajim.py:716
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "greška prilikom slanja %s ( %s )"
 
-#: ../src/gajim.py:741
+#: ../src/gajim.py:749
 msgid "Authorization accepted"
 msgstr "Autorizacija prihvaćena"
 
-#: ../src/gajim.py:742
+#: ../src/gajim.py:750
 #, 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
+#: ../src/gajim.py:758
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontankt \"%s\" je uklonio pretplatu od vas"
 
-#: ../src/gajim.py:751
+#: ../src/gajim.py:759
 msgid "You will always see him or her as offline."
 msgstr "Uvijek ćete vidjeti njega ili nju kao nepriključenog."
 
-#: ../src/gajim.py:794
+#: ../src/gajim.py:802
 #, 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
+#: ../src/gajim.py:803 ../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
+#: ../src/gajim.py:951 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s je sada %s (%s)"
 
-#: ../src/gajim.py:1040
+#: ../src/gajim.py:1048
 msgid "Your passphrase is incorrect"
 msgstr "Vaša lozinka nije točna"
 
-#: ../src/gajim.py:1041
+#: ../src/gajim.py:1049
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Trenutno ste spojeni bez OpenPGP ključa."
 
-#: ../src/gajim.py:1143
+#: ../src/gajim.py:1151
+#, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novi E-mail na %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1145
+#: ../src/gajim.py:1153
+#, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Imate %d novi E-mail razgovor"
@@ -3840,7 +3966,7 @@ msgstr[2] "Imate %d novih E-mail razgovora"
 #. 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
+#: ../src/gajim.py:1162
 #, python-format
 msgid ""
 "\n"
@@ -3849,52 +3975,52 @@ msgstr ""
 "\n"
 "Od: %(from_address)s"
 
-#: ../src/gajim.py:1297
+#: ../src/gajim.py:1318
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vam želi poslati datoteku."
 
-#: ../src/gajim.py:1362
+#: ../src/gajim.py:1383
 #, 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
+#: ../src/gajim.py:1387
 #, 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
+#: ../src/gajim.py:1400
 #, 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
+#: ../src/gajim.py:1404
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Prijenos %(filename)s %(name)s je zaustavljen. "
 
-#: ../src/gajim.py:1489
+#: ../src/gajim.py:1510
 msgid "Username Conflict"
 msgstr "Konflikt korisničkog imena"
 
-#: ../src/gajim.py:1490
+#: ../src/gajim.py:1511
 msgid "Please type a new username for your local account"
 msgstr "Molimo unesite novo korisničko ime za vaš lokalni račun"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1850
 msgid "Could not save your settings and preferences"
 msgstr "Nije moguće spremanje vaših postavki"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2042
 msgid "Network Manager support not available"
 msgstr "Podrška za Upravitelja Mrežom nije dostupna"
 
-#: ../src/gajim.py:2095
+#: ../src/gajim.py:2117
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Podrška za Upravljanje Seansama nije dostupna (nedostaje gnome.ui modul)"
@@ -4152,8 +4278,8 @@ msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr ""
-"Račun u kojem će xml biti poslan; ako nije specificirano, xml će biti poslan na "
-"sve račune"
+"Račun u kojem će xml biti poslan; ako nije specificirano, xml će biti poslan "
+"na sve račune"
 
 #: ../src/gajim-remote.py:249
 msgid "Missing argument \"contact_jid\""
@@ -4225,116 +4351,119 @@ msgstr "Ne možete izbrisati svoju trenutnu temu"
 msgid "Please first choose another for your current theme."
 msgstr "Molimo vas da prvo odaberete neku drugu temu za trenutnu."
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chat"
 msgstr "Privatni Razgovor"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chats"
 msgstr "Privanti Razgovori"
 
-#: ../src/groupchat_control.py:120
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Slanje privatne poruke neuspješno"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:124
+#, python-format
 msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Više niste u grupnom razgovoru \"%s\" ili je \"%s\" otišao."
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chat"
 msgstr "Grupni Razgovor"
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chats"
 msgstr "Grupni Razgovori"
 
-#: ../src/groupchat_control.py:315
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Umetni _Nadimak"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:789
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s je izbačen: %(reason)s"
 
-#: ../src/groupchat_control.py:793
+#: ../src/groupchat_control.py:816
 #, 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:800
+#: ../src/groupchat_control.py:823
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ima zabranjen pristup: %(reason)s"
 
-#: ../src/groupchat_control.py:804
+#: ../src/groupchat_control.py:827
 #, 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:812
+#: ../src/groupchat_control.py:835
 #, python-format
 msgid "You are now known as %s"
 msgstr "Od sada ste poznati kao %s"
 
-#: ../src/groupchat_control.py:814
+#: ../src/groupchat_control.py:837
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s je od sada poznat kao %s"
 
-#: ../src/groupchat_control.py:894
+#: ../src/groupchat_control.py:917
 #, python-format
 msgid "%s has left"
 msgstr "%s je napustio"
 
-#: ../src/groupchat_control.py:899
+#: ../src/groupchat_control.py:922
+#, python-format
 msgid "%s has joined the group chat"
 msgstr "%s se pridružio grupnom razgovoru"
 
 #. No status message
-#: ../src/groupchat_control.py:901 ../src/roster_window.py:1204
+#: ../src/groupchat_control.py:924 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s je sada %s"
 
-#: ../src/groupchat_control.py:1020 ../src/groupchat_control.py:1038
-#: ../src/groupchat_control.py:1131 ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1043 ../src/groupchat_control.py:1061
+#: ../src/groupchat_control.py:1154 ../src/groupchat_control.py:1171
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Nadimak nije pronađen: %s "
 
-#: ../src/groupchat_control.py:1054
+#: ../src/groupchat_control.py:1077
 msgid "This group chat has no subject"
 msgstr "Ovaj grupni razgovor nema temu"
 
-#: ../src/groupchat_control.py:1067
+#: ../src/groupchat_control.py:1090
 #, 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:1074 ../src/groupchat_control.py:1102
+#: ../src/groupchat_control.py:1097 ../src/groupchat_control.py:1125
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s ne izgleda kao valjani JID"
 
-#: ../src/groupchat_control.py:1185
+#: ../src/groupchat_control.py:1208
 #, 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)"
 
-#: ../src/groupchat_control.py:1208
+#: ../src/groupchat_control.py:1231
 #, python-format
 msgid "Commands: %s"
 msgstr "Komanda: %s"
 
-#: ../src/groupchat_control.py:1210
+#: ../src/groupchat_control.py:1233
+#, 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 "
@@ -4346,19 +4475,19 @@ msgstr ""
 "trenutno u sobi, on/ona/ono će biti izbačen(a/o). Razmaci u imenima NISU "
 "podržani."
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1240
 #, 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"
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1244
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Način korištenja: /%s, prazni tekstualni prozor"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4367,20 +4496,21 @@ msgstr ""
 "Način korištenja: /%s [razlog], zatvara trenutni prozor ili tab, i prikazuje "
 "razlog ako je specificiran."
 
-#: ../src/groupchat_control.py:1226
+#: ../src/groupchat_control.py:1249
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Način korištenja: /%s, sakriva dugmadi."
 
-#: ../src/groupchat_control.py:1229
+#: ../src/groupchat_control.py:1252
+#, 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 trenutni grupni razgovor, opcionalno "
-"dajući razlog."
+"Način korištenja: /%s <JID> [razlog], poziva JID u trenutni grupni razgovor, "
+"opcionalno dajući razlog."
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4389,25 +4519,27 @@ 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:1237
+#: ../src/groupchat_control.py:1260
+#, 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 grupnog razgovora i opcionalno prikazuje razlog. NE podržava razmake u "
-"nadimku."
+"nadimkom iz grupnog razgovora i opcionalno prikazuje razlog. NE podržava "
+"razmake u nadimku."
 
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1265
+#, 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 trenutnom grupnom razgovoru. Koristite treću "
-"osobu. (npr. /%s eksplodira.)"
+"Način korištenja: /%s <action>, šalje akciju trenutnom grupnom razgovoru. "
+"Koristite treću osobu. (npr. /%s eksplodira.)"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1269
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4416,90 +4548,98 @@ 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:1251
+#: ../src/groupchat_control.py:1274
+#, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Način korištenja: /%s <nickname>, mjenja vaš nadimak u trenutnom grupnom razgovoru."
+msgstr ""
+"Način korištenja: /%s <nickname>, mjenja vaš nadimak u trenutnom grupnom "
+"razgovoru."
 
-#: ../src/groupchat_control.py:1255
+#: ../src/groupchat_control.py:1278
+#, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Način korištenja: /%s , prikazuje imena učesnika u grupnom razgovoru."
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1282
+#, 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 grupnog razgovora."
+msgstr ""
+"Način korištenja: /%s [tema], prikazuje ili ažurira temu grupnog razgovora."
 
-#: ../src/groupchat_control.py:1262
+#: ../src/groupchat_control.py:1285
 #, 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."
 
-#: ../src/groupchat_control.py:1265
+#: ../src/groupchat_control.py:1288
 #, python-format
 msgid "No help info for /%s"
 msgstr "Nema informacija ni pomoći za /%s"
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1337
+#, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Jeste li sigurni da želite napustiti grupni razgovor \"%s\"?"
 
-#: ../src/groupchat_control.py:1316
+#: ../src/groupchat_control.py:1339
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Ako zatvorite ovaj prozor, biti ćete odspojeni iz ovog grupnog razgovora."
 
-#: ../src/groupchat_control.py:1320 ../src/roster_window.py:3961
+#: ../src/groupchat_control.py:1343 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "_Ne pitaj me više"
 
-#: ../src/groupchat_control.py:1354
+#: ../src/groupchat_control.py:1377
 msgid "Changing Subject"
 msgstr "Mijenjanje Teme"
 
-#: ../src/groupchat_control.py:1355
+#: ../src/groupchat_control.py:1378
 msgid "Please specify the new subject:"
 msgstr "Molimo specificirajte novu temu:"
 
-#: ../src/groupchat_control.py:1364
+#: ../src/groupchat_control.py:1387
 msgid "Changing Nickname"
 msgstr "Mijenjam Nadimak"
 
-#: ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1388
 msgid "Please specify the new nickname you want to use:"
 msgstr "Molimo specificirajte novi nadimak ako ga želite koristiti:"
 
-#: ../src/groupchat_control.py:1390
+#: ../src/groupchat_control.py:1413
 msgid "Bookmark already set"
 msgstr "Knjižna oznaka je već postavljena"
 
-#: ../src/groupchat_control.py:1391
+#: ../src/groupchat_control.py:1414
+#, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Grupni Razgovor \"%s\" je već u vašim knjižnim oznakama."
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1423
 msgid "Bookmark has been added successfully"
 msgstr "Knjižna oznaka je bez uspješno dodana"
 
-#: ../src/groupchat_control.py:1401
+#: ../src/groupchat_control.py:1424
 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."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1550
 #, python-format
 msgid "Kicking %s"
 msgstr "Izbacujem %s"
 
-#: ../src/groupchat_control.py:1528 ../src/groupchat_control.py:1810
+#: ../src/groupchat_control.py:1551 ../src/groupchat_control.py:1833
 msgid "You may specify a reason below:"
 msgstr "Možete specificirati razlog ispod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1809
+#: ../src/groupchat_control.py:1832
 #, python-format
 msgid "Banning %s"
 msgstr "Zabranjujem pristup %s"
@@ -4544,17 +4684,17 @@ msgstr "Greška pri učitavanju datoteke:"
 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:727
+#: ../src/gtkgui_helpers.py:728
 msgid "Extension not supported"
 msgstr "Produžetak nije podržan"
 
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:729
 #, 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?"
 
-#: ../src/gtkgui_helpers.py:737
+#: ../src/gtkgui_helpers.py:738
 msgid "Save Image as..."
 msgstr "Snimiti Sliku kao..."
 
@@ -4584,11 +4724,6 @@ msgstr "Nadimak"
 msgid "Message"
 msgstr "Poruka"
 
-#. holds subject
-#: ../src/history_manager.py:141 ../src/history_manager.py:172
-msgid "Subject"
-msgstr "Tema"
-
 #: ../src/history_manager.py:186
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -4693,6 +4828,7 @@ msgid "New Single Message from %(nickname)s"
 msgstr "Nova Jedna Poruka od %(nickname)s"
 
 #: ../src/notify.py:234
+#, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova Privatna Poruka iz privatnog razgovora %s"
 
@@ -4841,6 +4977,7 @@ msgid "Transports will be removed"
 msgstr "Prijenos će biti uklonjen"
 
 #: ../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"
@@ -4854,6 +4991,7 @@ msgid "Rename Contact"
 msgstr "Preimenuj Kontakt"
 
 #: ../src/roster_window.py:1418
+#, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Unesite novi nadimak za kontakt %s"
 
@@ -4862,6 +5000,7 @@ msgid "Rename Group"
 msgstr "Preimenuj Grupu"
 
 #: ../src/roster_window.py:1426
+#, python-format
 msgid "Enter a new name for group %s"
 msgstr "Unesite novo ime za grupu %s"
 
@@ -4980,12 +5119,14 @@ msgid "Contacts will be removed from your roster"
 msgstr "Kontakti će biti uklonjeni sa vaše liste kontakata"
 
 #: ../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 ""
 "Uklanjanjem ovih kontakata:%s\n"
-"ujedno uklanjate i odobrenje što konačno znači da će vas ta osoba uvijek vidjeti kao da ste odspojeni."
+"ujedno uklanjate i 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"
@@ -5066,8 +5207,9 @@ msgid ""
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 msgstr ""
-"Metakontakti su nacin grupiranja nekoliko kontakata u jednu liniju. Općenito oni "
-"se koriste kada ista osoba ima nekoliko Jabber računa ili računa prijenosa."
+"Metakontakti su nacin grupiranja nekoliko kontakata u jednu liniju. Općenito "
+"oni se koriste kada ista osoba ima nekoliko Jabber računa ili računa "
+"prijenosa."
 
 #: ../src/roster_window.py:4124
 #, python-format
@@ -5109,10 +5251,12 @@ msgid "Status: "
 msgstr "Status: "
 
 #: ../src/tooltips.py:461
+#, python-format
 msgid "Last status: %s"
 msgstr "Zadnji status: %s"
 
 #: ../src/tooltips.py:463
+#, python-format
 msgid " since %s"
 msgstr " od %s"
 
@@ -5308,9 +5452,10 @@ msgid ""
 "to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. "
 "This is used only if print_time is 'sometimes'."
 msgstr ""
-"Ispisuj vrijeme u razgovorima koristeći Nejasni Sat. Vrijednost nejasnoće od 1 do 4 ili 0 "
-"za onemogućavanje nejasnog sata. 1 je najprecizniji sat, 4 najneprecizniji. "
-"Ovo se koristi samo ukoliko je prikazivanje _vremena na 'ponekad'."
+"Ispisuj vrijeme u razgovorima koristeći Nejasni Sat. Vrijednost nejasnoće od "
+"1 do 4 ili 0 za onemogućavanje nejasnog sata. 1 je najprecizniji sat, 4 "
+"najneprecizniji. Ovo se koristi samo ukoliko je prikazivanje _vremena na "
+"'ponekad'."
 
 #: ../src/common/config.py:95
 msgid "Treat * / _ pairs as possible formatting characters."
@@ -5328,8 +5473,8 @@ msgid ""
 "Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
 "(If you want to use this, install docutils)"
 msgstr ""
-"Koristi ReStructured text markup za HTML i ascii formatiranje ako je odabrano. "
-"(Ako ovo želite koristiti, instalirajte docutils)"
+"Koristi ReStructured text markup za HTML i ascii formatiranje ako je "
+"odabrano. (Ako ovo želite koristiti, instalirajte docutils)"
 
 #: ../src/common/config.py:108
 msgid ""
@@ -5395,15 +5540,16 @@ msgid ""
 "False and they sync with global status) based upon the status of the network "
 "connection."
 msgstr ""
-"Ako je Istinito, osluškuj D-Bus signale iz UpraviteljaMrežom i promjeni status "
-"računa (ako nemaju listen_to_network_manager postavljen na Neistinito i "
-"sinkroniziraju se sa globalnim statusom) ovisno o statusu mrežnog spoja."
+"Ako je Istinito, osluškuj D-Bus signale iz UpraviteljaMrežom i promjeni "
+"status računa (ako nemaju listen_to_network_manager postavljen na Neistinito "
+"i sinkroniziraju se sa globalnim statusom) ovisno o statusu mrežnog spoja."
 
 #: ../src/common/config.py:155
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
-"Poslane obavijesti o statusu u razgovoru. Može biti jedno od svi,samo_sastavljanje, onemogućeno."
+"Poslane obavijesti o statusu u razgovoru. Može biti jedno od svi,"
+"samo_sastavljanje, onemogućeno."
 
 #: ../src/common/config.py:156
 msgid ""
@@ -5473,7 +5619,8 @@ msgstr "Prikaži dugme za zatvaranje u tabu?"
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
-"Lista riječi odijeljena točka-zarezom koje će biti označene u grupnim razgovorima."
+"Lista riječi odijeljena točka-zarezom koje će biti označene u grupnim "
+"razgovorima."
 
 #: ../src/common/config.py:190
 msgid ""
@@ -5571,9 +5718,9 @@ msgid ""
 "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 grupni razgovor zaštićen lozinkom. "
-"Isključite ovu opciju da prestanete slati sha informacije "
-"u grupnim razgovorima"
+"Jabberd1.4 ne voli sha informacije kada netko uđe u grupni razgovor zaštićen "
+"lozinkom. Isključite ovu opciju da prestanete slati sha informacije u "
+"grupnim razgovorima"
 
 #. always, never, peracct, pertype should not be translated
 #: ../src/common/config.py:210
@@ -5591,8 +5738,8 @@ msgstr ""
 "'nikad' - Svaka poruka dobiva svoj prozor.\n"
 "'poracun' - Poruke za svaki račun su poslane u svoj prozor.\n"
 "'potipu' - Svaki tip poruke (npr., razgovori i grupni razgovori) je poslan u "
-"svoj prozor. Promjena ove opcije zahtijeva ponovno pokretanje Gajima kako "
-"bi se promjene primjenile."
+"svoj prozor. Promjena ove opcije zahtijeva ponovno pokretanje Gajima kako bi "
+"se promjene primjenile."
 
 #: ../src/common/config.py:211
 msgid "If False, you will no longer see the avatar in the chat window."
@@ -5636,7 +5783,8 @@ msgstr "Uvlačenje pri korištenju spajanja toka po nadimcima."
 
 #: ../src/common/config.py:220
 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."
+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."
@@ -5647,8 +5795,8 @@ msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
 msgstr ""
-"Trebamo li prikazati upit za potvrdu stvaranja metakontakata ili ne? Prazan niz "
-"znači da nikada ne prikazujemo upit."
+"Trebamo li prikazati upit za potvrdu stvaranja metakontakata ili ne? Prazan "
+"niz znači da nikada ne prikazujemo upit."
 
 #: ../src/common/config.py:223
 msgid ""
@@ -5656,9 +5804,10 @@ msgid ""
 "account modification window. BE CAREFULL, when you are logged in with a "
 "negative priority, you will NOT receive any message from your server."
 msgstr ""
-"Ako je Istinito, biti ćete u mogućnosti postaviti negativni prioritet na vaš račun u "
-"prozoru za izmjenu postavki računa. BUDITE OPREZNI, kada ste prijavljeni sa "
-"negativnim prioritetom NEĆETE primati nikakve poruke od poslužitelja."
+"Ako je Istinito, biti ćete u mogućnosti postaviti negativni prioritet na vaš "
+"račun u prozoru za izmjenu postavki računa. BUDITE OPREZNI, kada ste "
+"prijavljeni sa negativnim prioritetom NEĆETE primati nikakve poruke od "
+"poslužitelja."
 
 #: ../src/common/config.py:234
 msgid ""
@@ -5781,7 +5930,8 @@ msgid ""
 "muc_highlight_words, or when a group chat message contains your nickname."
 msgstr ""
 "Zvuk koji će biti pušten kada poruka grupnog razgovora sadrži neku riječ iz "
-"muc_highlight_words, ili kada neka poruka grupnog razgovora sadrži vaš nadimak."
+"muc_highlight_words, ili kada neka poruka grupnog razgovora sadrži vaš "
+"nadimak."
 
 #: ../src/common/config.py:377
 msgid "Sound to play when any MUC message arrives."
@@ -5819,56 +5969,57 @@ msgid ""
 "The host you configured as the ft_override_host_to_send advanced option is "
 "not valid, so ignored."
 msgstr ""
-"Domaćin koji ste postavili kao ft_override_host_to_send naprednu opciju "
-"nije ispravan, time ignoriran."
+"Domaćin koji ste postavili kao ft_override_host_to_send naprednu opciju nije "
+"ispravan, time ignoriran."
 
 #: ../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
+#: ../src/common/connection_handlers.py:1523
+#, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Nedozvoljeni nadimak: %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
+#: ../src/common/connection_handlers.py:1585
+#: ../src/common/connection_handlers.py:1588
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1597
+#: ../src/common/connection_handlers.py:1600
+#: ../src/common/connection_handlers.py:1608
 msgid "Unable to join group chat"
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: ../src/common/connection_handlers.py:1582
+#: ../src/common/connection_handlers.py:1586
 msgid "A password is required to join this group chat."
 msgstr "Potrebna je lozinka za pridruživanje ovom grupnom razgovoru."
 
-#: ../src/common/connection_handlers.py:1585
+#: ../src/common/connection_handlers.py:1589
 msgid "You are banned from this group chat."
 msgstr "Zabranjen vam je pristup ovom grupnom razgovoru."
 
-#: ../src/common/connection_handlers.py:1588
+#: ../src/common/connection_handlers.py:1592
 msgid "Such group chat does not exist."
 msgstr "Takav grupni razgovor ne postoji."
 
-#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1595
 msgid "Group chat creation is restricted."
 msgstr "Stvaranje grupnih razgovora je ograničeno."
 
-#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1598
 msgid "Your registered nickname must be used."
 msgstr "Morate koristiti vaš registrirani nadimak."
 
-#: ../src/common/connection_handlers.py:1597
+#: ../src/common/connection_handlers.py:1601
 msgid "You are not in the members list."
 msgstr "Niste u listi članova."
 
-#: ../src/common/connection_handlers.py:1605
+#: ../src/common/connection_handlers.py:1609
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5877,27 +6028,27 @@ msgstr ""
 "od učesnika.\n"
 "Molimo niže odredite drugi nadimak:"
 
-#: ../src/common/connection_handlers.py:1651
+#: ../src/common/connection_handlers.py:1659
 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
+#: ../src/common/connection_handlers.py:1680
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "sada smo pretplaćeni na %s"
 
-#: ../src/common/connection_handlers.py:1674
+#: ../src/common/connection_handlers.py:1682
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Zahtjev za ukidanjem pretplate od %s"
 
-#: ../src/common/connection_handlers.py:1676
+#: ../src/common/connection_handlers.py:1684
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "sada smo ukinuli pretplatu za %s"
 
-#: ../src/common/connection_handlers.py:1846
+#: ../src/common/connection_handlers.py:1854
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5918,6 +6069,7 @@ msgid "Reconnect manually."
 msgstr "Ponovo se spojite ručno."
 
 #: ../src/common/connection.py:176 ../src/common/connection.py:203
+#, python-format
 msgid "Transport %s answered wrongly to register request: %s"
 msgstr "Prijenos %s je krivo odgovorio na poziv za registraciju: %s"
 
@@ -5927,7 +6079,7 @@ msgid "Invalid answer"
 msgstr "Nepravilan odgovor"
 
 #: ../src/common/connection.py:394 ../src/common/connection.py:429
-#: ../src/common/connection.py:871
+#: ../src/common/connection.py:877
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
@@ -5984,7 +6136,7 @@ msgstr "Ja sam %s"
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Ova poruka je *kriptirana* (Vidi :JEP:`27`]"
 
-#: ../src/common/connection.py:758
+#: ../src/common/connection.py:764
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -5994,7 +6146,7 @@ msgstr ""
 "Tema: %s\n"
 "%s"
 
-#: ../src/common/connection.py:897
+#: ../src/common/connection.py:903
 msgid "Not fetched because of invisible status"
 msgstr "Nije dohvaćeno zbog statusa nevidljivosti"
 
@@ -6156,7 +6308,6 @@ msgid "Afternoon"
 msgstr "Poslijepodne"
 
 #: ../src/common/fuzzyclock.py:63
-#, 
 msgid "Evening"
 msgstr "Večer"
 
@@ -6302,10 +6453,6 @@ msgstr "?Pretplata koju već imamo:Ništa"
 msgid "To"
 msgstr "Za"
 
-#: ../src/common/helpers.py:259
-msgid "From"
-msgstr "Od"
-
 #: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Oboje"
@@ -6383,35 +6530,35 @@ msgstr "stanka pri pisanju poruke"
 msgid "has closed the chat window or tab"
 msgstr "je zatvorio/zatvorila prozor za razgovor"
 
-#: ../src/common/helpers.py:880
+#: ../src/common/helpers.py:881
 #, 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
+#: ../src/common/helpers.py:887
 #, 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
+#: ../src/common/helpers.py:893
 #, 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
+#: ../src/common/helpers.py:899
 #, 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
+#: ../src/common/helpers.py:909 ../src/common/helpers.py:911
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -6435,6 +6582,7 @@ msgid "migrating logs database to indeces"
 msgstr "migriram bazu zabilješki u indekse"
 
 #: ../src/common/passwords.py:86
+#, python-format
 msgid "Gajim account %s"
 msgstr "Gajim račun %s"
 
@@ -6456,8 +6604,7 @@ msgstr ""
 
 #: ../src/common/zeroconf/client_zeroconf.py:629
 msgid "Contact is offline. Your message could not be sent."
-msgstr ""
-"Kontakt je odspojen. Vašu poruku nije moguće poslati."
+msgstr "Kontakt je odspojen. Vašu poruku nije moguće poslati."
 
 #: ../src/common/zeroconf/connection_zeroconf.py:197
 msgid "To continue sending and receiving messages, you will need to reconnect."
@@ -6488,6 +6635,7 @@ msgid "Could not start local service"
 msgstr "Nije moguće pokrenuti lokalnu uslugu"
 
 #: ../src/common/zeroconf/connection_zeroconf.py:228
+#, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nemoguće vezanje na port %d."
 
@@ -6497,6 +6645,7 @@ msgid "Please check if avahi-daemon is running."
 msgstr "Molimo provjerite da li je avahi-daemon pokrenut."
 
 #: ../src/common/zeroconf/connection_zeroconf.py:324
+#, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nije moguće promjeniti status računa \"%s\""
 
@@ -6505,8 +6654,7 @@ msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
 msgstr ""
-"Niste spojeni ili ste nevidljivi za druge. Vašu poruku nije moguće "
-"poslati."
+"Niste spojeni ili ste nevidljivi za druge. Vašu poruku nije moguće poslati."
 
 #. we're not english
 #: ../src/common/zeroconf/connection_zeroconf.py:353
@@ -6514,6 +6662,7 @@ msgid "[This message is encrypted]"
 msgstr "[Ova poruka je kriptirana]"
 
 #: ../src/common/zeroconf/zeroconf.py:180
+#, python-format
 msgid "Error while adding service. %s"
 msgstr "Greška prilikom dodavanja usluge. %s"
 
@@ -6565,9 +6714,6 @@ msgstr "Greška prilikom dodavanja usluge. %s"
 #~ 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"
 
diff --git a/po/it.po b/po/it.po
index c62fea420..9dfbaa893 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-12-02 17:15+0100\n"
+"POT-Creation-Date: 2006-12-09 10:02+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"
@@ -323,16 +323,16 @@ msgid "Manage..."
 msgstr "Gestisci..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1637
-#: ../src/config.py:3430
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1642
+#: ../src/config.py:3435
 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:1219
-#: ../src/config.py:1224 ../src/config.py:1408 ../src/config.py:1627
-#: ../src/config.py:1636 ../src/config.py:1695 ../src/config.py:1769
-#: ../src/config.py:2640 ../src/config.py:3420 ../src/config.py:3429
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1224
+#: ../src/config.py:1229 ../src/config.py:1413 ../src/config.py:1632
+#: ../src/config.py:1641 ../src/config.py:1700 ../src/config.py:1774
+#: ../src/config.py:2645 ../src/config.py:3425 ../src/config.py:3434
 #: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Nessuno"
@@ -524,6 +524,46 @@ msgstr "_Registra"
 msgid "_User ID:"
 msgstr "ID utente:"
 
+#: ../data/glade/adhoc_commands_window.glade.h:1
+#, fuzzy
+msgid "<b>An error has occured:</b>"
+msgstr "È avvenuto un errore di protocollo:"
+
+#: ../data/glade/adhoc_commands_window.glade.h:2
+msgid "<b>Choose command to execute:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:3
+msgid "Ad-hoc Commands - Gajim"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:4
+msgid "Check once more"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:5
+#, fuzzy
+msgid "Error description..."
+msgstr "Descrizione"
+
+#: ../data/glade/adhoc_commands_window.glade.h:6
+#, fuzzy
+msgid "Please wait while retrieving command list..."
+msgstr "Attendere durante la migrazione dei log..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:7
+#, fuzzy
+msgid "Please wait while the command is sending..."
+msgstr "Attendere durante la migrazione dei log..."
+
+#: ../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>Descrizione</b>"
@@ -674,13 +714,13 @@ msgstr "Riproduci _suoni"
 #: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
-"Contact Connected\n"
-"Contact Disconnected\n"
-"Contact Change Status\n"
-"Group Chat Message Highlight\n"
-"Group Chat Message Received\n"
-"File Transfert Resquest\n"
-"File Transfert Started\n"
+"Contact Connected \n"
+"Contact Disconnected \n"
+"Contact Change Status \n"
+"Group Chat Message Highlight \n"
+"Group Chat Message Received \n"
+"File Transfert Resquest \n"
+"File Transfert Started \n"
 "File Transfert Finished"
 msgstr ""
 
@@ -753,6 +793,46 @@ msgstr "Porta: "
 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 "Paese:"
+
+#: ../data/glade/atom_entry_window.glade.h:4
+#, fuzzy
+msgid "Feed name:"
+msgstr "nome del tema"
+
+#: ../data/glade/atom_entry_window.glade.h:5
+#, fuzzy
+msgid "Last modified:"
+msgstr "Nome:"
+
+#: ../data/glade/atom_entry_window.glade.h:6
+#, fuzzy
+msgid "New entry received"
+msgstr "Quando si riceve un nuovo evento"
+
+#: ../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 "Cambia password"
@@ -838,7 +918,7 @@ msgstr "_Vista compatta    Alt+C"
 msgid "_History"
 msgstr "_Cronologia"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/glade/data_form_window.glade.h:1 ../src/dataforms_widget.py:76
 #, fuzzy
 msgid "Fill in the form."
 msgstr "Nel gruppo"
@@ -1058,6 +1138,20 @@ msgstr "_Invia messaggio privato"
 msgid "_Voice"
 msgstr "_Voce"
 
+#: ../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:259
+msgid "From"
+msgstr "Da"
+
+#. holds subject
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141
+#: ../src/history_manager.py:172
+msgid "Subject"
+msgstr "Oggetto"
+
 #: ../data/glade/history_manager.glade.h:1
 msgid ""
 "<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
@@ -1220,7 +1314,7 @@ 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:1116
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
 msgid "OpenPGP Encryption"
 msgstr "Cifratura OpenPGP"
 
@@ -1343,7 +1437,7 @@ msgstr ""
 msgid "B_efore nickname:"
 msgstr "_Prima del nickname:"
 
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:841
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
 msgid "Chat"
 msgstr "Chat"
 
@@ -2478,34 +2572,34 @@ 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:841
+#: ../src/chat_control.py:844
 msgid "Chats"
 msgstr "Chat"
 
-#: ../src/chat_control.py:1042
+#: ../src/chat_control.py:1030
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1130
+#: ../src/chat_control.py:1118
 #, 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:1266
+#: ../src/chat_control.py:1254
 msgid "Encryption enabled"
 msgstr "Cifratura attivata"
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1259
 msgid "Encryption disabled"
 msgstr "Cifratura disattivata"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1413 ../src/conversation_textview.py:493
-#: ../src/dialogs.py:629 ../src/gajim.py:727 ../src/gajim.py:728
-#: ../src/gajim.py:1067 ../src/roster_window.py:328
+#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495
+#: ../src/dialogs.py:629 ../src/gajim.py:733 ../src/gajim.py:734
+#: ../src/gajim.py:1073 ../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
@@ -2516,12 +2610,12 @@ msgid "Not in Roster"
 msgstr "Non nei contatti"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1545
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Hai appena ricevuto un nuovo messaggio da \"%s\""
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1546
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2529,281 +2623,281 @@ msgstr ""
 "Se questa scheda viene chiusa e la cronologia è disabilitata, questo "
 "messaggio verrà perso."
 
-#: ../src/config.py:130 ../src/config.py:589
+#: ../src/config.py:135 ../src/config.py:594
 msgid "Disabled"
 msgstr "Disabilitato"
 
-#: ../src/config.py:216
+#: ../src/config.py:221
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Ogni %s _minuti"
 
-#: ../src/config.py:358
+#: ../src/config.py:363
 msgid "Active"
 msgstr "Attivo"
 
-#: ../src/config.py:366
+#: ../src/config.py:371
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:679 ../src/gajim.py:2086
+#: ../src/config.py:684 ../src/gajim.py:2094
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Nessuna connessione disponibile"
 
-#: ../src/config.py:680 ../src/gajim.py:2087
+#: ../src/config.py:685 ../src/gajim.py:2095
 #, 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:1032
+#: ../src/config.py:1037
 msgid "status message title"
 msgstr "titolo del messaggio di stato"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1037
 msgid "status message text"
 msgstr "testo del messaggio di stato"
 
-#: ../src/config.py:1067
+#: ../src/config.py:1072
 msgid "First Message Received"
 msgstr "Primo messaggio ricevuto"
 
-#: ../src/config.py:1068
+#: ../src/config.py:1073
 msgid "Next Message Received"
 msgstr "Prossimo messaggio ricevuto"
 
-#: ../src/config.py:1069
+#: ../src/config.py:1074
 msgid "Contact Connected"
 msgstr "Contatto connesso"
 
-#: ../src/config.py:1070
+#: ../src/config.py:1075
 msgid "Contact Disconnected"
 msgstr "Contatto disconnesso"
 
-#: ../src/config.py:1071
+#: ../src/config.py:1076
 msgid "Message Sent"
 msgstr "Messaggio inviato"
 
-#: ../src/config.py:1072
+#: ../src/config.py:1077
 msgid "Group Chat Message Highlight"
 msgstr "Evidenziatura messaggi in chat di gruppo"
 
-#: ../src/config.py:1073
+#: ../src/config.py:1078
 msgid "Group Chat Message Received"
 msgstr "Messaggio ricevuto in chat di gruppo"
 
-#: ../src/config.py:1080
+#: ../src/config.py:1085
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Invito ricevuto"
 
-#: ../src/config.py:1283
+#: ../src/config.py:1288
 msgid "OpenPGP is not usable in this computer"
 msgstr "Non è possibile usare OpenPGP su questo computer"
 
-#: ../src/config.py:1329
+#: ../src/config.py:1334
 msgid "You are currently connected to the server"
 msgstr "Si è ora connessi al server"
 
-#: ../src/config.py:1330
+#: ../src/config.py:1335
 msgid "To change the account name, you must be disconnected."
 msgstr "Per cambiare nome account, è necessario disconnettersi."
 
-#: ../src/config.py:1333 ../src/config.py:1925
+#: ../src/config.py:1338 ../src/config.py:1930
 msgid "Unread events"
 msgstr "Eventi non letti"
 
-#: ../src/config.py:1334
+#: ../src/config.py:1339
 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:1338
+#: ../src/config.py:1343
 msgid "Account Name Already Used"
 msgstr "Nome account già in uso"
 
-#: ../src/config.py:1339
+#: ../src/config.py:1344
 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:1343 ../src/config.py:1347
+#: ../src/config.py:1348 ../src/config.py:1352
 msgid "Invalid account name"
 msgstr "Il nome account non è valido"
 
-#: ../src/config.py:1344
+#: ../src/config.py:1349
 msgid "Account name cannot be empty."
 msgstr "Il nome account non può essere vuoto."
 
-#: ../src/config.py:1348
+#: ../src/config.py:1353
 msgid "Account name cannot contain spaces."
 msgstr "Il nome account non può contenere spazi."
 
-#: ../src/config.py:1356 ../src/config.py:1362 ../src/config.py:1372
-#: ../src/config.py:3030
+#: ../src/config.py:1361 ../src/config.py:1367 ../src/config.py:1377
+#: ../src/config.py:3035
 msgid "Invalid Jabber ID"
 msgstr "ID Jabber non valido"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1368
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Un ID Jabber deve essere nella forma \"utente@nomeserver\"."
 
-#: ../src/config.py:1422
+#: ../src/config.py:1427
 msgid "Invalid entry"
 msgstr "Voce non valida"
 
-#: ../src/config.py:1423
+#: ../src/config.py:1428
 msgid "Custom port must be a port number."
 msgstr "Si deve scegliere un numero di porta."
 
-#: ../src/config.py:1549 ../src/common/config.py:363
+#: ../src/config.py:1554 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Torno subito."
 
-#: ../src/config.py:1559
+#: ../src/config.py:1564
 msgid "Relogin now?"
 msgstr "Effettuare un nuovo login?"
 
-#: ../src/config.py:1560
+#: ../src/config.py:1565
 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:1586
+#: ../src/config.py:1591
 msgid "No such account available"
 msgstr "Questo account non è disponibile"
 
-#: ../src/config.py:1587
+#: ../src/config.py:1592
 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:1594 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/config.py:1599 ../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:1595
+#: ../src/config.py:1600
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Senza una connessione, non è possibile modificare le informazioni personali."
 
-#: ../src/config.py:1599
+#: ../src/config.py:1604
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1600
+#: ../src/config.py:1605
 #, 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:1624 ../src/config.py:3417
+#: ../src/config.py:1629 ../src/config.py:3422
 msgid "Failed to get secret keys"
 msgstr "Fallimento nella ricezione delle chiavi segrete"
 
-#: ../src/config.py:1625 ../src/config.py:3418
+#: ../src/config.py:1630 ../src/config.py:3423
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "C'è stato un problema nel recuperare le chiavi segrete OpenPGP."
 
-#: ../src/config.py:1628 ../src/config.py:3421
+#: ../src/config.py:1633 ../src/config.py:3426
 msgid "OpenPGP Key Selection"
 msgstr "Scelta chiave OpenPGP"
 
-#: ../src/config.py:1629 ../src/config.py:3422
+#: ../src/config.py:1634 ../src/config.py:3427
 msgid "Choose your OpenPGP key"
 msgstr "Scegliere la chiave OpenPGP"
 
 #. Name column
-#: ../src/config.py:1859 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/config.py:1864 ../src/disco.py:740 ../src/disco.py:1466
 #: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1862
+#: ../src/config.py:1867
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1931
 msgid "Read all pending events before removing this account."
 msgstr "Leggere tutti gli eventi pendenti prima di rimuovere questo account."
 
-#: ../src/config.py:1963
+#: ../src/config.py:1968
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Non ci sono account attivi"
 
-#: ../src/config.py:1964
+#: ../src/config.py:1969
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:2023
+#: ../src/config.py:2028
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Nome account già in uso"
 
-#: ../src/config.py:2024
+#: ../src/config.py:2029
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2256
+#: ../src/config.py:2261
 #, python-format
 msgid "Edit %s"
 msgstr "Modifica %s"
 
-#: ../src/config.py:2258
+#: ../src/config.py:2263
 #, python-format
 msgid "Register to %s"
 msgstr "Registra a %s"
 
 #. list at the begining
-#: ../src/config.py:2330
+#: ../src/config.py:2335
 msgid "Ban List"
 msgstr "Lista utenti bloccati"
 
-#: ../src/config.py:2331
+#: ../src/config.py:2336
 msgid "Member List"
 msgstr "Lista membri"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2337
 msgid "Owner List"
 msgstr "Lista proprietari"
 
-#: ../src/config.py:2333
+#: ../src/config.py:2338
 msgid "Administrator List"
 msgstr "Lista amministratori"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2366 ../src/disco.py:747 ../src/history_manager.py:154
+#: ../src/config.py:2371 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2374
+#: ../src/config.py:2379
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:2379
+#: ../src/config.py:2384
 msgid "Nick"
 msgstr "Nickname"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2388
 msgid "Role"
 msgstr "Ruolo"
 
-#: ../src/config.py:2404
+#: ../src/config.py:2409
 msgid "Banning..."
 msgstr "Sto bloccando..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2406
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2811,11 +2905,11 @@ msgstr ""
 "<b>Chi si vuole bloccare?</b>\n"
 "\n"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2413
 msgid "Adding Member..."
 msgstr "Aggiunta membro..."
 
-#: ../src/config.py:2409
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2823,11 +2917,11 @@ msgstr ""
 "<b>Chi si vuole rendere membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2411
+#: ../src/config.py:2416
 msgid "Adding Owner..."
 msgstr "Aggiunta proprietario..."
 
-#: ../src/config.py:2412
+#: ../src/config.py:2417
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2835,11 +2929,11 @@ msgstr ""
 "<b>Chi si vuole rendere proprietario?</b>\n"
 "\n"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2419
 msgid "Adding Administrator..."
 msgstr "Aggiunta amministratore..."
 
-#: ../src/config.py:2415
+#: ../src/config.py:2420
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2847,7 +2941,7 @@ msgstr ""
 "<b>Chi si vuole rendere amministratore?</b>\n"
 "\n"
 
-#: ../src/config.py:2416
+#: ../src/config.py:2421
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2864,100 +2958,100 @@ msgstr ""
 "4. dominio (il dominio corrisponde, così come qualsiasi utente@dominio,\n"
 "dominio/risorsa, o indirizzo contenente un sottodominio)."
 
-#: ../src/config.py:2521
+#: ../src/config.py:2526
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminazione account %s"
 
-#: ../src/config.py:2538 ../src/roster_window.py:2667
+#: ../src/config.py:2543 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Password richiesta"
 
-#: ../src/config.py:2539 ../src/roster_window.py:2668
+#: ../src/config.py:2544 ../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:2540 ../src/roster_window.py:2669
+#: ../src/config.py:2545 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Memorizza password"
 
-#: ../src/config.py:2554
+#: ../src/config.py:2559
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "L'account \"%s\" è connesso al server"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2560
 msgid "If you remove it, the connection will be lost."
 msgstr "Se viene rimosso, la connessione verrà persa."
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 #, fuzzy
 msgid "Default"
 msgstr "Elimina"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Stampa ora:"
 
-#: ../src/config.py:2640
+#: ../src/config.py:2645
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2710
+#: ../src/config.py:2715
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Chat di gruppo"
 
-#: ../src/config.py:2742
+#: ../src/config.py:2747
 msgid "This bookmark has invalid data"
 msgstr "Questo segnalibro contiene dati non validi"
 
-#: ../src/config.py:2743
+#: ../src/config.py:2748
 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:3005
+#: ../src/config.py:3010
 msgid "Invalid username"
 msgstr "Nome utente non valido"
 
-#: ../src/config.py:3006
+#: ../src/config.py:3011
 msgid "You must provide a username to configure this account."
 msgstr "È necessario inserire un nome utente per configurare questo account."
 
-#: ../src/config.py:3016 ../src/dialogs.py:1316
+#: ../src/config.py:3021 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Password non valida"
 
-#: ../src/config.py:3017
+#: ../src/config.py:3022
 msgid "You must enter a password for the new account."
 msgstr "È necessario inserire una password per il nuovo account."
 
-#: ../src/config.py:3021 ../src/dialogs.py:1321
+#: ../src/config.py:3026 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Le password non coincidono"
 
-#: ../src/config.py:3022 ../src/dialogs.py:1322
+#: ../src/config.py:3027 ../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:3041
+#: ../src/config.py:3046
 msgid "Duplicate Jabber ID"
 msgstr "Jabber ID duplicato"
 
-#: ../src/config.py:3042
+#: ../src/config.py:3047
 msgid "This account is already configured in Gajim."
 msgstr "Questo account è già configurato in Gajim."
 
-#: ../src/config.py:3059
+#: ../src/config.py:3064
 msgid "Account has been added successfully"
 msgstr "L'account è stato aggiunto con successo"
 
-#: ../src/config.py:3060 ../src/config.py:3095
+#: ../src/config.py:3065 ../src/config.py:3100
 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."
@@ -2966,23 +3060,23 @@ msgstr ""
 "\", o farlo più tardi cliccando alla voce \"Account\" nel menu \"Modifica\" "
 "della finestra principale."
 
-#: ../src/config.py:3094
+#: ../src/config.py:3099
 msgid "Your new account has been created successfully"
 msgstr "Il nuovo account è stato creato con successo"
 
-#: ../src/config.py:3112
+#: ../src/config.py:3117
 msgid "An error occured during account creation"
 msgstr "Si è verificato un errore durante la creazione dell'account"
 
-#: ../src/config.py:3170
+#: ../src/config.py:3175
 msgid "Account name is in use"
 msgstr "Il nome account è già in uso"
 
-#: ../src/config.py:3171
+#: ../src/config.py:3176
 msgid "You already have an account using this name."
 msgstr "Esiste già un account con lo stesso nome"
 
-#: ../src/conversation_textview.py:271
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2990,56 +3084,65 @@ 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:340
+#: ../src/conversation_textview.py:342
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Azioni per \"%s\""
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Leggi l'articolo di _Wikipedia"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Controlla nel _Dizionario"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:373
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Manca un \"%s\" nell'URL del Dizionario e questo non è WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:386
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Manca un \"%s\" nell'URL di ricerca su web"
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "_Cercalo nel Web"
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:397
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:755
+#: ../src/conversation_textview.py:757
 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:759
+#: ../src/conversation_textview.py:761
 #, python-format
 msgid "%i days ago"
 msgstr "%i giorni fa"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:791
+#: ../src/conversation_textview.py:793
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Oggetto: %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
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
@@ -3309,29 +3412,29 @@ msgstr "Nuovo messaggio singolo"
 msgid "New Private Message"
 msgstr "Nuovo messaggio privato"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1161 ../src/notify.py:424
+#: ../src/dialogs.py:1369 ../src/gajim.py:1168 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Nuova e-mail"
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1314 ../src/notify.py:418
+#: ../src/dialogs.py:1371 ../src/gajim.py:1321 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Richiesta di trasferimento file"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1134 ../src/gajim.py:1290
+#: ../src/dialogs.py:1373 ../src/gajim.py:1140 ../src/gajim.py:1297
 #: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Errore nel trasferimento file"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1353 ../src/gajim.py:1375
-#: ../src/gajim.py:1392 ../src/notify.py:422
+#: ../src/dialogs.py:1375 ../src/gajim.py:1360 ../src/gajim.py:1382
+#: ../src/gajim.py:1399 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Trasferimento file completato"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1356 ../src/notify.py:422
+#: ../src/dialogs.py:1376 ../src/gajim.py:1363 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Trasferimento file fermato"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1032 ../src/notify.py:426
+#: ../src/dialogs.py:1378 ../src/gajim.py:1038 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Invito a chat di gruppo"
 
@@ -3692,31 +3795,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:682
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
 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:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "This file already exists"
 msgstr "Questo file esiste già"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "What do you want to do?"
 msgstr "Cosa fare?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3849,57 +3952,58 @@ msgstr "Connessione"
 msgid "Subject: %s"
 msgstr "Oggetto: %s\n"
 
-#: ../src/gajim.py:703
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:703 ../src/gajim.py:716
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "errore durante l'invio di %s ( %s )"
 
-#: ../src/gajim.py:743
+#: ../src/gajim.py:749
 msgid "Authorization accepted"
 msgstr "Autorizzazione accettata"
 
-#: ../src/gajim.py:744
+#: ../src/gajim.py:750
 #, 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:752
+#: ../src/gajim.py:758
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Il contatto \"%s\" ha eliminato il tuo abbonamento verso di lui"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:759
 msgid "You will always see him or her as offline."
 msgstr "Lo vedrai sempre come offline."
 
-#: ../src/gajim.py:796
+#: ../src/gajim.py:802
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Non si può contattare \"%s\""
 
-#: ../src/gajim.py:797 ../src/common/connection.py:395
+#: ../src/gajim.py:803 ../src/common/connection.py:395
 msgid "Check your connection or try again later."
 msgstr "Controllare la connessione o riprovare più tardi."
 
-#: ../src/gajim.py:945 ../src/roster_window.py:1201
+#: ../src/gajim.py:951 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s è ora %s (%s)"
 
-#: ../src/gajim.py:1042
+#: ../src/gajim.py:1048
 msgid "Your passphrase is incorrect"
 msgstr "Passphrase errata"
 
-#: ../src/gajim.py:1043
+#: ../src/gajim.py:1049
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Si è connessi senza la chiave OpenPGP"
 
-#: ../src/gajim.py:1145
+#: ../src/gajim.py:1151
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nuova e-mail su %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1147
+#: ../src/gajim.py:1153
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3909,61 +4013,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:1156
+#: ../src/gajim.py:1162
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1311
+#: ../src/gajim.py:1318
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vuole inviarti un file."
 
-#: ../src/gajim.py:1376
+#: ../src/gajim.py:1383
 #, 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:1380
+#: ../src/gajim.py:1387
 #, 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:1393
+#: ../src/gajim.py:1400
 #, 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:1397
+#: ../src/gajim.py:1404
 #, 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:1503
+#: ../src/gajim.py:1510
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1504
+#: ../src/gajim.py:1511
 #, 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:1842
+#: ../src/gajim.py:1850
 msgid "Could not save your settings and preferences"
 msgstr "Impossibile salvare impostazioni e preferenze"
 
-#: ../src/gajim.py:2034
+#: ../src/gajim.py:2042
 #, fuzzy
 msgid "Network Manager support not available"
 msgstr "Nessuna connessione disponibile"
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2117
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Supporto gestione sessioni non disponibile (modulo gnome.ui mancante)"
 
@@ -4305,118 +4409,118 @@ msgstr "Non è possibile eliminare il tema corrente"
 msgid "Please first choose another for your current theme."
 msgstr "Scegliere prima un altro tema."
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chat"
 msgstr "Chat privata"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chats"
 msgstr "Chat private"
 
-#: ../src/groupchat_control.py:120
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Invio messaggio privato fallito"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:124
 #, 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
+#: ../src/groupchat_control.py:143
 msgid "Group Chat"
 msgstr "Chat di gruppo"
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chats"
 msgstr "Chat di gruppo"
 
-#: ../src/groupchat_control.py:315
+#: ../src/groupchat_control.py:317
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Cambia _nickname"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:810
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s è stato cacciato: %(reason)s"
 
-#: ../src/groupchat_control.py:814
+#: ../src/groupchat_control.py:816
 #, 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:821
+#: ../src/groupchat_control.py:823
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s è stato bandito: %(reason)s"
 
-#: ../src/groupchat_control.py:825
+#: ../src/groupchat_control.py:827
 #, 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:833
+#: ../src/groupchat_control.py:835
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sei ora conosciuto come %s"
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:837
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s è ora conosciuto come %s"
 
-#: ../src/groupchat_control.py:915
+#: ../src/groupchat_control.py:917
 #, python-format
 msgid "%s has left"
 msgstr "%s se ne è andato"
 
-#: ../src/groupchat_control.py:920
+#: ../src/groupchat_control.py:922
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Nel gruppo"
 
 #. No status message
-#: ../src/groupchat_control.py:922 ../src/roster_window.py:1204
+#: ../src/groupchat_control.py:924 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s è ora %s"
 
-#: ../src/groupchat_control.py:1041 ../src/groupchat_control.py:1059
-#: ../src/groupchat_control.py:1152 ../src/groupchat_control.py:1169
+#: ../src/groupchat_control.py:1043 ../src/groupchat_control.py:1061
+#: ../src/groupchat_control.py:1154 ../src/groupchat_control.py:1171
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Nickname non trovato: %s"
 
-#: ../src/groupchat_control.py:1075
+#: ../src/groupchat_control.py:1077
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "Questa stanza non ha oggetto"
 
-#: ../src/groupchat_control.py:1088
+#: ../src/groupchat_control.py:1090
 #, 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:1095 ../src/groupchat_control.py:1123
+#: ../src/groupchat_control.py:1097 ../src/groupchat_control.py:1125
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s non sembra essere un JID valido"
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1208
 #, 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:1229
+#: ../src/groupchat_control.py:1231
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandi: %s"
 
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1233
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4429,7 +4533,7 @@ msgstr ""
 "\". Se il JID è correntemente nella stanza, verrà anche cacciato. NON "
 "supporta la presenza di spazi nel nickname."
 
-#: ../src/groupchat_control.py:1238
+#: ../src/groupchat_control.py:1240
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4437,12 +4541,12 @@ msgstr ""
 "Uso: /%s <nickname>, apre una finestra di chat privata al partecipante "
 "specificato."
 
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1244
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uso: /%s, pulisce la finestra di testo."
 
-#: ../src/groupchat_control.py:1244
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4451,12 +4555,12 @@ msgstr ""
 "Uso: /%s [motivo], chiude la finestra oi scheda corrente, mostrando il "
 "motivo se specificato."
 
-#: ../src/groupchat_control.py:1247
+#: ../src/groupchat_control.py:1249
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Uso: /%s, nasconde i pulsanti di chat."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1252
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4465,7 +4569,7 @@ msgstr ""
 "Uso: /%s <JID> [motivo], invita JID alla stanza corrente, opzionalmente "
 "fornendo un motivo."
 
-#: ../src/groupchat_control.py:1254
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4474,7 +4578,7 @@ msgstr ""
 "Uso: /%s <stanza>@<server>[/nickname], offre la possibilità di entrare in "
 "stanza@server, opzionalmente usando il nickname specificato."
 
-#: ../src/groupchat_control.py:1258
+#: ../src/groupchat_control.py:1260
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4485,7 +4589,7 @@ msgstr ""
 "nickname dalla stanza e opzionalmente mostra un motivo. NON supporta la "
 "presenza di spazi nel nickname."
 
-#: ../src/groupchat_control.py:1263
+#: ../src/groupchat_control.py:1265
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current group chat. Use third "
@@ -4494,7 +4598,7 @@ msgstr ""
 "Uso: /%s <azione>, invia l'azione alla stanza corrente. Usare la terza "
 "persona (esempio: /%s esplode)."
 
-#: ../src/groupchat_control.py:1267
+#: ../src/groupchat_control.py:1269
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4503,97 +4607,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:1272
+#: ../src/groupchat_control.py:1274
 #, 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:1276
+#: ../src/groupchat_control.py:1278
 #, fuzzy, python-format
 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:1280
+#: ../src/groupchat_control.py:1282
 #, 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:1283
+#: ../src/groupchat_control.py:1285
 #, 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:1286
+#: ../src/groupchat_control.py:1288
 #, python-format
 msgid "No help info for /%s"
 msgstr "Non esiste aiuto per /%s"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1337
 #, 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:1337
+#: ../src/groupchat_control.py:1339
 #, 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:1341 ../src/roster_window.py:3961
+#: ../src/groupchat_control.py:1343 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "_Non chiederlo più"
 
-#: ../src/groupchat_control.py:1375
+#: ../src/groupchat_control.py:1377
 msgid "Changing Subject"
 msgstr "Cambio oggetto"
 
-#: ../src/groupchat_control.py:1376
+#: ../src/groupchat_control.py:1378
 msgid "Please specify the new subject:"
 msgstr "Specificare il nuovo oggetto:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1387
 msgid "Changing Nickname"
 msgstr "Cambio nickname"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1388
 msgid "Please specify the new nickname you want to use:"
 msgstr "Specificare il nuovo nickname da usare:"
 
-#: ../src/groupchat_control.py:1411
+#: ../src/groupchat_control.py:1413
 msgid "Bookmark already set"
 msgstr "Segnalibro già impostato"
 
-#: ../src/groupchat_control.py:1412
+#: ../src/groupchat_control.py:1414
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "La stanza \"%s\" è già tra i segnalibri."
 
-#: ../src/groupchat_control.py:1421
+#: ../src/groupchat_control.py:1423
 msgid "Bookmark has been added successfully"
 msgstr "Il segnalibro è stato aggiunto con successo"
 
-#: ../src/groupchat_control.py:1422
+#: ../src/groupchat_control.py:1424
 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:1548
+#: ../src/groupchat_control.py:1550
 #, python-format
 msgid "Kicking %s"
 msgstr "Sto cacciando %s"
 
-#: ../src/groupchat_control.py:1549 ../src/groupchat_control.py:1831
+#: ../src/groupchat_control.py:1551 ../src/groupchat_control.py:1833
 msgid "You may specify a reason below:"
 msgstr "Specifica un motivo qui sotto:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1830
+#: ../src/groupchat_control.py:1832
 #, python-format
 msgid "Banning %s"
 msgstr "Sto bandendo %s"
@@ -4640,17 +4744,17 @@ 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:727
+#: ../src/gtkgui_helpers.py:728
 #, fuzzy
 msgid "Extension not supported"
 msgstr "Dbus non è supportato."
 
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:729
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:737
+#: ../src/gtkgui_helpers.py:738
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Salva file come..."
@@ -4681,11 +4785,6 @@ msgstr "Nickname"
 msgid "Message"
 msgstr "Messaggio"
 
-#. holds subject
-#: ../src/history_manager.py:141 ../src/history_manager.py:172
-msgid "Subject"
-msgstr "Oggetto"
-
 #: ../src/history_manager.py:186
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -5936,7 +6035,7 @@ msgstr ""
 "Le informazioni di registrazione per il transport %s non sono arrivate in "
 "tempo"
 
-#: ../src/common/connection_handlers.py:1515
+#: ../src/common/connection_handlers.py:1523
 #, fuzzy, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Nickname non trovato: %s"
@@ -5944,46 +6043,46 @@ msgstr "Nickname non trovato: %s"
 #. password required to join
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1577
-#: ../src/common/connection_handlers.py:1580
-#: ../src/common/connection_handlers.py:1583
-#: ../src/common/connection_handlers.py:1586
-#: ../src/common/connection_handlers.py:1589
-#: ../src/common/connection_handlers.py:1592
+#: ../src/common/connection_handlers.py:1585
+#: ../src/common/connection_handlers.py:1588
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1597
 #: ../src/common/connection_handlers.py:1600
+#: ../src/common/connection_handlers.py:1608
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Non è possibile entrare nella stanza"
 
-#: ../src/common/connection_handlers.py:1578
+#: ../src/common/connection_handlers.py:1586
 #, 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:1581
+#: ../src/common/connection_handlers.py:1589
 #, fuzzy
 msgid "You are banned from this group chat."
 msgstr "Sei bandito da questa stanza."
 
-#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1592
 #, fuzzy
 msgid "Such group chat does not exist."
 msgstr "Questa stanza non esiste."
 
-#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1595
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "Non è permessa la creazione di stanze."
 
-#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1598
 msgid "Your registered nickname must be used."
 msgstr "È necessario usare il nickname registrato."
 
-#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1601
 msgid "You are not in the members list."
 msgstr "Non appartieni alla lista dei membri."
 
-#: ../src/common/connection_handlers.py:1601
+#: ../src/common/connection_handlers.py:1609
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5991,27 +6090,27 @@ msgstr ""
 "Il nickname desiderato è in uso o registrato da un altro partecipante.\n"
 "Specificare un altro nickname sotto:"
 
-#: ../src/common/connection_handlers.py:1651
+#: ../src/common/connection_handlers.py:1659
 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:1672
+#: ../src/common/connection_handlers.py:1680
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "si è ora abbonati a %s"
 
-#: ../src/common/connection_handlers.py:1674
+#: ../src/common/connection_handlers.py:1682
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "richiesta di cancellazione abbonamento da %s"
 
-#: ../src/common/connection_handlers.py:1676
+#: ../src/common/connection_handlers.py:1684
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "è stato ora cancellato l'abbonamento a %s"
 
-#: ../src/common/connection_handlers.py:1846
+#: ../src/common/connection_handlers.py:1854
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -6044,7 +6143,7 @@ msgid "Invalid answer"
 msgstr "Risposta non valida"
 
 #: ../src/common/connection.py:394 ../src/common/connection.py:429
-#: ../src/common/connection.py:872
+#: ../src/common/connection.py:877
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
@@ -6102,7 +6201,7 @@ msgstr "Sono %s"
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Questo messaggio è cifrato]"
 
-#: ../src/common/connection.py:759
+#: ../src/common/connection.py:764
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6112,7 +6211,7 @@ msgstr ""
 "Oggetto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:898
+#: ../src/common/connection.py:903
 msgid "Not fetched because of invisible status"
 msgstr ""
 
@@ -6434,10 +6533,6 @@ msgstr "Nulla"
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:259
-msgid "From"
-msgstr "Da"
-
 #: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Entrambi"
@@ -6713,9 +6808,6 @@ msgstr "errore durante l'invio di %s ( %s )"
 #~ msgid "Migrating Logs..."
 #~ msgstr "Migrazione log..."
 
-#~ msgid "Please wait while logs are being migrated..."
-#~ msgstr "Attendere durante la migrazione dei log..."
-
 #~ msgid "_Join New Room"
 #~ msgstr "_Entra in nuova stanza"
 
@@ -6879,9 +6971,6 @@ msgstr "errore durante l'invio di %s ( %s )"
 #~ msgid "Timeout"
 #~ msgstr "Timeout"
 
-#~ msgid "A protocol error has occured:"
-#~ msgstr "È avvenuto un errore di protocollo:"
-
 #~ msgid "account: "
 #~ msgstr "account: "
 
diff --git a/po/nb.po b/po/nb.po
index 7fcb2e143..e1146dfdf 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2,11 +2,12 @@
 # This file is distributed under the same license as the Gajim package.
 # Stian B. Barmen <stian@jabber.no>, 2005.
 #
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-26 22:15+0100\n"
+"POT-Creation-Date: 2006-12-09 10:02+0100\n"
 "PO-Revision-Date: 2006-12-05 11:35+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team: \n"
@@ -84,7 +85,8 @@ msgstr "<b>Vennligst fyll in data for din nye konto</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:6
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr "Klikk for å se tjenester (som MSN og ICQ transporter) på jabber serveren"
+msgstr ""
+"Klikk for å se tjenester (som MSN og ICQ transporter) på jabber serveren"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
 msgid "Connect when I press Finish"
@@ -215,8 +217,16 @@ msgid "Chan_ge Password"
 msgstr "En_dre Passord"
 
 #: ../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 "Velg denne slik at Gajim vil prøve å koble til port 5223 som gamle servere forventes å ha SSL muligheter. Merk at Gajim bruker TLS kryptering som standard dersom dette tilbys av servere, og med dette valget blir TLS deaktivert."
+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 ""
+"Velg denne slik at Gajim vil prøve å koble til port 5223 som gamle servere "
+"forventes å ha SSL muligheter. Merk at Gajim bruker TLS kryptering som "
+"standard dersom dette tilbys av servere, og med dette valget blir TLS "
+"deaktivert."
 
 #: ../data/glade/account_modification_window.glade.h:10
 #: ../data/glade/zeroconf_properties_window.glade.h:4
@@ -236,11 +246,8 @@ 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:453
-#: ../src/notify.py:475
-#: ../src/notify.py:487
-#: ../src/common/helpers.py:904
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
+#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:905
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -248,12 +255,9 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:15
 #: ../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
+#: ../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"
 
@@ -262,27 +266,48 @@ msgid "Hostname: "
 msgstr "Maskinnavn:"
 
 #: ../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 "Dersom valgt vil Gajim sende ut noen flere IP adresser i tillegg til din egen, så filoverføringen har større mulighet for å fungere. "
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Dersom valgt vil Gajim sende ut noen flere IP adresser i tillegg til din "
+"egen, så filoverføringen har større mulighet for å fungere. "
 
 #: ../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 "Dersom valgt vil Gajim sende hold-i-live pakker så man ikke får en frakobling på grunn av inaktivitet"
+msgid ""
+"If checked, Gajim will send keep-alive packets so it prevents connection "
+"timeout which results in disconnection"
+msgstr ""
+"Dersom valgt vil Gajim sende hold-i-live pakker så man ikke får en "
+"frakobling på grunn av inaktivitet"
 
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/zeroconf_properties_window.glade.h:8
-msgid "If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you"
-msgstr "Dersom valgt vil Gajim lagre passord i ~/.gajim/config med 'les' rettighet bare for deg"
+msgid ""
+"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+"permission only for you"
+msgstr ""
+"Dersom valgt vil Gajim lagre passord i ~/.gajim/config med 'les' rettighet "
+"bare for deg"
 
 #: ../data/glade/account_modification_window.glade.h:21
 #: ../data/glade/zeroconf_properties_window.glade.h:9
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "Dersom valgt, vil Gajim automatisk koble seg til jabber med denne kontoen ved oppstart"
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Dersom valgt, vil Gajim automatisk koble seg til jabber med denne kontoen "
+"ved oppstart"
 
 #: ../data/glade/account_modification_window.glade.h:22
 #: ../data/glade/zeroconf_properties_window.glade.h:10
-msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly"
-msgstr "Dersom valgt vil endringer til global status (håndtert av kombomenyen nederst i kontaktvinduet) endre status på denne kontoen. "
+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 ""
+"Dersom valgt vil endringer til global status (håndtert av kombomenyen "
+"nederst i kontaktvinduet) endre status på denne kontoen. "
 
 #: ../data/glade/account_modification_window.glade.h:23
 msgid "Information about you, as stored in the server"
@@ -293,26 +318,17 @@ msgid "Manage..."
 msgstr "Behandle..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16
-#: ../src/config.py:1636
-#: ../src/config.py:3429
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1642
+#: ../src/config.py:3435
 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: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
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1224
+#: ../src/config.py:1229 ../src/config.py:1413 ../src/config.py:1632
+#: ../src/config.py:1641 ../src/config.py:1700 ../src/config.py:1774
+#: ../src/config.py:2645 ../src/config.py:3425 ../src/config.py:3434
+#: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Ingen"
 
@@ -330,8 +346,14 @@ msgid "Priori_ty:"
 msgstr "Priorit_et:"
 
 #: ../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 brukes av Jabber for å finne ut hvem som skal få hendelser fra jabber serveren når to eller flere klienter er tilkoblet med samme konto. Klienten med den høyeste prioriteten vil få hendelsen"
+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 brukes av Jabber for å finne ut hvem som skal få hendelser fra "
+"jabber serveren når to eller flere klienter er tilkoblet med samme konto. "
+"Klienten med den høyeste prioriteten vil få hendelsen"
 
 #: ../data/glade/account_modification_window.glade.h:32
 msgid "Priority will change automatically according to your status."
@@ -346,8 +368,18 @@ msgid "Resour_ce: "
 msgstr "Ressu_rs:"
 
 #: ../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 "Ressurs navnet blir sendt til Jabber serveren for å separere JID'en din i to eller flere deler alt etter hvor mange ganger du er tilkoblet til serveren (samtidig). Dette gjør at du kan være tilkoblet med samme konto med ressurs navn 'Hjeme' og 'Jobb' på samme tid. Ressursen med høyest prioritet vil få hendelsene. (se under)"
+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 ""
+"Ressurs navnet blir sendt til Jabber serveren for å separere JID'en din i to "
+"eller flere deler alt etter hvor mange ganger du er tilkoblet til serveren "
+"(samtidig). Dette gjør at du kan være tilkoblet med samme konto med ressurs "
+"navn 'Hjeme' og 'Jobb' på samme tid. Ressursen med høyest prioritet vil få "
+"hendelsene. (se under)"
 
 #: ../data/glade/account_modification_window.glade.h:36
 #: ../data/glade/zeroconf_properties_window.glade.h:18
@@ -398,15 +430,25 @@ msgstr "Kontoer"
 
 #: ../data/glade/accounts_window.glade.h:2
 msgid ""
-"If checked, all local contacts that use a Bonjour compatible chat client (like iChat, Trillian or Gaim) will be shown in roster. You don't need to be connected to a jabber server for it to work.\n"
-"This is only available if python-avahi is installed and avahi-daemon is running."
+"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 ""
-"Dersom valgt vil alle lokale kontakter som bruker en Bonjour kompatibel samtale klient (som iChat, Trillian eller Gaim) vil vises i kontaktlisten. Du trenger ikke være koblet til en jabber server for at det skal virke.\n"
-"Dette er bare tilgjengelig dersom python-avahi er installert og avahi-tjenesten kjører."
+"Dersom valgt vil alle lokale kontakter som bruker en Bonjour kompatibel "
+"samtale klient (som iChat, Trillian eller Gaim) vil vises i kontaktlisten. "
+"Du trenger ikke være koblet til en jabber server for at det skal virke.\n"
+"Dette er bare tilgjengelig dersom python-avahi er installert og avahi-"
+"tjenesten kjører."
 
 #: ../data/glade/accounts_window.glade.h:4
-msgid "If you have 2 or more accounts and it is checked, Gajim will list all contacts as if you had one account"
-msgstr "Dersom du har 2 eller flere kontoer og denne er valgt, vil Gajim liste alle kontakter som om du hadde en konto"
+msgid ""
+"If you have 2 or more accounts and it is checked, Gajim will list all "
+"contacts as if you had one account"
+msgstr ""
+"Dersom du har 2 eller flere kontoer og denne er valgt, vil Gajim liste alle "
+"kontakter som om du hadde en konto"
 
 #: ../data/glade/accounts_window.glade.h:5
 msgid "Mer_ge accounts"
@@ -481,13 +523,54 @@ msgstr "_Registrer"
 msgid "_User ID:"
 msgstr "_Bruker ID:"
 
+#: ../data/glade/adhoc_commands_window.glade.h:1
+#, fuzzy
+msgid "<b>An error has occured:</b>"
+msgstr "En protokoll feil har skjedd:"
+
+#: ../data/glade/adhoc_commands_window.glade.h:2
+msgid "<b>Choose command to execute:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:3
+msgid "Ad-hoc Commands - Gajim"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:4
+msgid "Check once more"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:5
+#, fuzzy
+msgid "Error description..."
+msgstr "Beskrivelse"
+
+#: ../data/glade/adhoc_commands_window.glade.h:6
+#, fuzzy
+msgid "Please wait while retrieving command list..."
+msgstr "Vennligst vent mens loggene blir migrert..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:7
+#, fuzzy
+msgid "Please wait while the command is sending..."
+msgstr "Vennligst vent mens loggene blir migrert..."
+
+#: ../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>Beskrivelse</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>MERK:</b> Du må starte gajim på nytt for å aktivere noen instillinger"
+msgstr ""
+"<b>MERK:</b> Du må starte gajim på nytt for å aktivere noen instillinger"
 
 #: ../data/glade/advanced_configuration_window.glade.h:3
 msgid "Advanced Configuration Editor"
@@ -620,13 +703,13 @@ msgstr "Spill av en lyd"
 #: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
-"Contact Connected\n"
-"Contact Disconnected\n"
-"Contact Change Status\n"
-"Group Chat Message Highlight\n"
-"Group Chat Message Received\n"
-"File Transfert Resquest\n"
-"File Transfert Started\n"
+"Contact Connected \n"
+"Contact Disconnected \n"
+"Contact Change Status \n"
+"Group Chat Message Highlight \n"
+"Group Chat Message Received \n"
+"File Transfert Resquest \n"
+"File Transfert Started \n"
 "File Transfert Finished"
 msgstr ""
 "Motta en Melding\n"
@@ -644,8 +727,11 @@ msgid "When "
 msgstr "Når"
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
-msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr "_Aktiver vindu behandlerens HasterHint for å få samtalevinduet i oppgavelinjen til å blinke"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+msgstr ""
+"_Aktiver vindu behandlerens HasterHint for å få samtalevinduet i "
+"oppgavelinjen til å blinke"
 
 #: ../data/glade/advanced_notifications_window.glade.h:29
 msgid "_Disable auto opening chat window"
@@ -705,6 +791,46 @@ msgstr "for "
 msgid "when I'm in"
 msgstr "når jeg er i"
 
+#: ../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 "Land:"
+
+#: ../data/glade/atom_entry_window.glade.h:4
+#, fuzzy
+msgid "Feed name:"
+msgstr "tema navn"
+
+#: ../data/glade/atom_entry_window.glade.h:5
+#, fuzzy
+msgid "Last modified:"
+msgstr "Etternavn:"
+
+#: ../data/glade/atom_entry_window.glade.h:6
+#, fuzzy
+msgid "New entry received"
+msgstr "Når en ny hendelse blir motatt"
+
+#: ../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 "Endre Passord"
@@ -790,7 +916,7 @@ msgstr "_Kompakt Utseende    Alt+C"
 msgid "_History"
 msgstr "_Historie"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/glade/data_form_window.glade.h:1 ../src/dataforms_widget.py:76
 msgid "Fill in the form."
 msgstr "Fyll inn skjemaet."
 
@@ -843,15 +969,18 @@ msgid "Shows a list of file transfers between you and other"
 msgstr "Viser en liste over overføringer mellom deg og andre"
 
 #: ../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 "Dette valget fjerner en filoverføring fra listen. Dersom den er aktiv vil den først bli stoppet og så fjernet."
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
+msgstr ""
+"Dette valget fjerner en filoverføring fra listen. Dersom den er aktiv vil "
+"den først bli stoppet og så fjernet."
 
 #: ../data/glade/filetransfers.glade.h:12
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Når en fil overføring er komplett vis en sprettopp informasjon"
 
-#: ../data/glade/filetransfers.glade.h:13
-#: ../src/filetransfers_window.py:761
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
 msgid "_Continue"
 msgstr "_Fortsett"
 
@@ -859,8 +988,7 @@ msgstr "_Fortsett"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Gi meg beskjed når filoverføring er komplett"
 
-#: ../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 "_Åpne Foreldre Katalog"
 
@@ -1004,6 +1132,21 @@ msgstr "_Send Privat Melding"
 msgid "_Voice"
 msgstr "_Stemme"
 
+#: ../data/glade/groups_post_window.glade.h:1
+#, fuzzy
+msgid "Create new post"
+msgstr "Ny post"
+
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:259
+msgid "From"
+msgstr "Fra"
+
+#. holds subject
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141
+#: ../src/history_manager.py:172
+msgid "Subject"
+msgstr "Tittel"
+
 #: ../data/glade/history_manager.glade.h:1
 msgid ""
 "<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
@@ -1011,14 +1154,16 @@ msgid ""
 "You can select logs from the left and/or search database from below.\n"
 "\n"
 "<b>WARNING:</b>\n"
-"If you plan to do massive deletions, please make sure Gajim is not running. Generally avoid deletions with contacts you currently chat with."
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 "<big><b>Velkommen til Gajim Historiske Logg Behandler</b></big>\n"
 "\n"
 "Du kan velge logger fra venstre og/eller søke databasen under.\n"
 "\n"
 "<b>ADVARSEL:</b>\n"
-"Dersom du planlegger å gjøre store slette operasjoner, pass på at Gajim ikke kjører. Generelt bør man unngå å slette fra kontakter du er i samtale med."
+"Dersom du planlegger å gjøre store slette operasjoner, pass på at Gajim ikke "
+"kjører. Generelt bør man unngå å slette fra kontakter du er i samtale med."
 
 #: ../data/glade/history_manager.glade.h:7
 msgid "Delete"
@@ -1069,8 +1214,7 @@ msgstr "Nekt"
 msgid "Invitation Received"
 msgstr "Invitasjon motatt"
 
-#: ../data/glade/join_groupchat_window.glade.h:1
-#: ../src/dialogs.py:1146
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
 msgid "Join Group Chat"
 msgstr "Bli med i Gruppesamtale"
 
@@ -1095,8 +1239,7 @@ msgstr "Nylig:"
 msgid "Room:"
 msgstr "Rom:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../src/disco.py:1150
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1150
 #: ../src/disco.py:1517
 msgid "_Join"
 msgstr "_Bli med"
@@ -1163,8 +1306,7 @@ 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:1099
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP Kryptering"
 
@@ -1243,15 +1385,22 @@ msgstr "Tillat _OS informasjon å bli sendt"
 
 #: ../data/glade/preferences_window.glade.h:18
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Tillat sprettopp/melding når jeg er _borte/ikke tilgjengelig/opptatt/usynlig"
+msgstr ""
+"Tillat sprettopp/melding når jeg er _borte/ikke tilgjengelig/opptatt/usynlig"
 
 #: ../data/glade/preferences_window.glade.h:19
 msgid "Also known as iChat style"
 msgstr "Også kjent som iChat stil"
 
 #: ../data/glade/preferences_window.glade.h:20
-msgid "An example: If you have enabled status message for away, Gajim won't ask you anymore for a status message when you change your status to away; it will use the default one set here"
-msgstr "Et eksempel: Dersom du har slått på status melding for borte, så vil Gajim ikke spør flere ganger etter melding når du endrer status til borte; den vil bruke standard meldingen du lager her"
+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 ""
+"Et eksempel: Dersom du har slått på status melding for borte, så vil Gajim "
+"ikke spør flere ganger etter melding når du endrer status til borte; den vil "
+"bruke standard meldingen du lager her"
 
 #: ../data/glade/preferences_window.glade.h:21
 msgid "Ask status message when I:"
@@ -1283,14 +1432,19 @@ msgstr ""
 msgid "B_efore nickname:"
 msgstr "F_ør kallenavn:"
 
-#: ../data/glade/preferences_window.glade.h:30
-#: ../src/chat_control.py:839
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
 msgid "Chat"
 msgstr "Samtale"
 
 #: ../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 "Velg dette valget bare dersom noen i kontaktlisten spammer/irriterer deg. Bruk med varsomhet, fordi det blokkerer alle meldinger fra alle kontakter som ikke er i kontaktlisten"
+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 ""
+"Velg dette valget bare dersom noen i kontaktlisten spammer/irriterer deg. "
+"Bruk med varsomhet, fordi det blokkerer alle meldinger fra alle kontakter "
+"som ikke er i kontaktlisten"
 
 #: ../data/glade/preferences_window.glade.h:32
 msgid "Configure color and font of the interface"
@@ -1333,56 +1487,108 @@ msgid "Events"
 msgstr "Hendelser"
 
 #: ../data/glade/preferences_window.glade.h:42
-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 å vise i samtale vinduer."
+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 å "
+"vise i samtale vinduer."
 
 #: ../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 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."
+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 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: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"
+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: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"
+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: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 vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen om at en kontakt har akkurat logget inn"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed in"
+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: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 vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen om at en kontakt har akkurat logget ut"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+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: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"
+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:50
-msgid "If checked, Gajim will also include information about the sender of the new emails"
-msgstr "Desrom valgt vil Gajim også inkludere informasjon om senderen av nye e-post"
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+"Desrom valgt vil Gajim også inkludere informasjon om senderen av nye e-post"
 
 #: ../data/glade/preferences_window.glade.h:51
-msgid "If checked, Gajim will display avatars of contacts in roster window and in group chats"
-msgstr "Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet og i gruppesamtaler"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet "
+"og i gruppesamtaler"
 
 #: ../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 "Dersom valg vil Gajim vise status melding til kontakter under kontakt navnet i kontaktliste vinduet og i gruppesamtaler"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+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: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 "Dersom valgt vil Gajim huske kontaktliste og samtalevindu posisjoner på skjermen, samt størrelsen på de til neste gang du åpner de"
+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 ""
+"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: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 "Dersom valgt vil Gajim bruke protkoll-spesifikke ikoner. (En kontakt fra MSN vil ha msn ikoner for status pålogget, borte, opptatt, osv...)"
+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 ""
+"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:55
-msgid "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons"
-msgstr "Dersom ikke deaktiver, vil Gajim bytte ut ascii smil som ':)' med animerte eller statiske grafiske uttrykksikoner"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Dersom ikke deaktiver, vil Gajim bytte ut ascii smil som ':)' med animerte "
+"eller statiske grafiske uttrykksikoner"
 
 #: ../data/glade/preferences_window.glade.h:56
 msgid "Ignore rich content in incoming messages"
@@ -1457,8 +1663,12 @@ msgid "Sign _out"
 msgstr "Logger _ut"
 
 #: ../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 "Noen meldinger kan inkludere rikt innhold (formatering, farger osv). Dersom valgt vil Gajim kun vise rå meldings tekst."
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Noen meldinger kan inkludere rikt innhold (formatering, farger osv). Dersom "
+"valgt vil Gajim kun vise rå meldings tekst."
 
 #: ../data/glade/preferences_window.glade.h:76
 msgid "Status"
@@ -1489,16 +1699,28 @@ msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "Bruk Ikon i s_ystemstatusfelt (også kjent som systray)"
 
 #: ../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 "Når en ny hendelse (melding, fil overføring osv.) blir motatt, vil følgende metoder kunne bli brukt for å informere deg om det. Vennligst merk at ny melding hendelser vil bare skje dersom du får en ny melding fra en kontakt du ikke er i samtale med."
+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 ""
+"Når en ny hendelse (melding, fil overføring osv.) blir motatt, vil følgende "
+"metoder kunne bli brukt for å informere deg om det. Vennligst merk at ny "
+"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:84
 msgid "When new event is received"
 msgstr "Når en ny hendelse blir motatt"
 
 #: ../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 "Virker for Rhythmbox og Muine avspillere. For flere avspillere kan du besøke http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+"Virker for Rhythmbox og Muine avspillere. For flere avspillere kan du besøke "
+"http://trac.gajim.org/wiki/GajimAndMusicPlayer"
 
 #: ../data/glade/preferences_window.glade.h:86
 msgid "_Advanced Notifications Control..."
@@ -1628,8 +1850,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Rekkefølge:"
 
-#: ../data/glade/privacy_list_window.glade.h:11
-#: ../src/dialogs.py:1841
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
 msgid "Privacy List"
 msgstr "Liste over Utestengte"
 
@@ -1782,8 +2003,7 @@ msgid "Prefix:"
 msgstr "Tittel:"
 
 #: ../data/glade/profile_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:37
-#: ../src/vcard.py:273
+#: ../data/glade/vcard_information_window.glade.h:37 ../src/vcard.py:273
 msgid "Role:"
 msgstr "Rolle:"
 
@@ -1878,8 +2098,7 @@ msgstr "_Forby han/henne å se min status"
 
 #. 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:1948 ../src/roster_window.py:2045
 #: ../src/roster_window.py:2152
 msgid "_Remove from Roster"
 msgstr "_Fjern fra Kontaktliste"
@@ -1934,8 +2153,7 @@ msgstr "_Innhold"
 msgid "_Discover Services"
 msgstr "_Oppdag Tjenester"
 
-#: ../data/glade/roster_window.glade.h:14
-#: ../src/disco.py:1255
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1255
 #: ../src/roster_window.py:2123
 msgid "_Edit"
 msgstr "_Rediger"
@@ -2080,8 +2298,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:416
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -2160,10 +2377,12 @@ msgstr "Personlige"
 
 #: ../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"
+"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 ""
-"Dersom standard porten som brukes til inngående meldinger ikke passer for ditt oppsett kan du velge en annen her.\n"
+"Dersom standard porten som brukes til inngående meldinger ikke passer for "
+"ditt oppsett kan du velge en annen her.\n"
 "Du kan også vurdere å endre mulige brannmur innstillinger."
 
 #: ../data/glade/zeroconf_properties_window.glade.h:15
@@ -2289,14 +2508,19 @@ msgstr "Svensk"
 msgid "Chinese (Ch)"
 msgstr "Kinesisk (Ch)"
 
-#: ../src/chat_control.py:201
-#: ../src/dialogs.py:1497
+#: ../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 ""
-"Dersom dette ikke er språket du ønsker å utheve feilstavede ord i, så vennligst endre $LANG slik at det stemmer. For eksempel for Fransk gjør du export LANG=fr_FR eller export LANG=fr_FR.UTF-8 i ~/.bash_profile eller i den globale /etc/profile.\n"
+"Dersom dette ikke er språket du ønsker å utheve feilstavede ord i, så "
+"vennligst endre $LANG slik at det stemmer. For eksempel for Fransk gjør du "
+"export LANG=fr_FR eller export LANG=fr_FR.UTF-8 i ~/.bash_profile eller i "
+"den globale /etc/profile.\n"
 "\n"
 "Utheving av feilstavede ord funksjonen vil ikke bli brukt."
 
@@ -2305,351 +2529,334 @@ msgid "Spelling language"
 msgstr "Stavekontroll språk"
 
 #. we are not connected
-#: ../src/chat_control.py:262
-#: ../src/chat_control.py:468
+#: ../src/chat_control.py:262 ../src/chat_control.py:468
 msgid "A connection is not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/chat_control.py:263
-#: ../src/chat_control.py:469
+#: ../src/chat_control.py:263 ../src/chat_control.py:469
 msgid "Your message can not be sent until you are connected."
 msgstr "Meldingen din kan ikke sendes før du er tilkoblet."
 
-#: ../src/chat_control.py:839
+#: ../src/chat_control.py:844
 msgid "Chats"
 msgstr "Samtaler"
 
-#: ../src/chat_control.py:1025
+#: ../src/chat_control.py:1030
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s fra gruppesamtale %(room_name)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1113
+#: ../src/chat_control.py:1118
 #, 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:1239
+#: ../src/chat_control.py:1254
 msgid "Encryption enabled"
 msgstr "Kryptering påslått"
 
-#: ../src/chat_control.py:1244
+#: ../src/chat_control.py:1259
 msgid "Encryption disabled"
 msgstr "Kryptering avslått"
 
 #. add_to_roster_menuitem
-#: ../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/chat_control.py:1401 ../src/conversation_textview.py:495
+#: ../src/dialogs.py:629 ../src/gajim.py:733 ../src/gajim.py:734
+#: ../src/gajim.py:1073 ../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:1530
+#: ../src/chat_control.py:1545
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du fikk akkurat en ny melding fra \"%s\""
 
-#: ../src/chat_control.py:1531
-msgid "If you close this tab and you have history disabled, this message will be lost."
-msgstr "Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli mistet."
+#: ../src/chat_control.py:1546
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
+"mistet."
 
-#: ../src/config.py:129
-#: ../src/config.py:588
+#: ../src/config.py:135 ../src/config.py:594
 msgid "Disabled"
 msgstr "Deaktivert"
 
-#: ../src/config.py:215
+#: ../src/config.py:221
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Hvert %s _minutt"
 
-#: ../src/config.py:357
+#: ../src/config.py:363
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:365
+#: ../src/config.py:371
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../src/config.py:678
-#: ../src/gajim.py:2072
+#: ../src/config.py:684 ../src/gajim.py:2094
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordliste for språk %s er ikke tilgjengelig"
 
-#: ../src/config.py:679
-#: ../src/gajim.py:2073
+#: ../src/config.py:685 ../src/gajim.py:2095
 #, python-format
-msgid "You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option."
-msgstr "Du må installere %s ordbok for å bruke stavekontroll, eller velge et annet språk ved å sette stavekontro_llspråk valget."
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+"Du må installere %s ordbok for å bruke stavekontroll, eller velge et annet "
+"språk ved å sette stavekontro_llspråk valget."
 
-#: ../src/config.py:1031
+#: ../src/config.py:1037
 msgid "status message title"
 msgstr "status melding tittel"
 
-#: ../src/config.py:1031
+#: ../src/config.py:1037
 msgid "status message text"
 msgstr "status melding tekst"
 
-#: ../src/config.py:1066
+#: ../src/config.py:1072
 msgid "First Message Received"
 msgstr "Første Melding Motatt"
 
-#: ../src/config.py:1067
+#: ../src/config.py:1073
 msgid "Next Message Received"
 msgstr "Neste Melding Motatt"
 
-#: ../src/config.py:1068
+#: ../src/config.py:1074
 msgid "Contact Connected"
 msgstr "Kontakt Koblet til"
 
-#: ../src/config.py:1069
+#: ../src/config.py:1075
 msgid "Contact Disconnected"
 msgstr "Kontakt Frakoblet"
 
-#: ../src/config.py:1070
+#: ../src/config.py:1076
 msgid "Message Sent"
 msgstr "Melding Sendt"
 
-#: ../src/config.py:1071
+#: ../src/config.py:1077
 msgid "Group Chat Message Highlight"
 msgstr "Gruppe Samtale Melding Utheving"
 
-#: ../src/config.py:1072
+#: ../src/config.py:1078
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Melding Motatt"
 
-#: ../src/config.py:1079
+#: ../src/config.py:1085
 msgid "GMail Email Received"
 msgstr "Gmail E-post Motatt"
 
-#: ../src/config.py:1282
+#: ../src/config.py:1288
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP er ikke tilgjenglig på denne maskinen"
 
-#: ../src/config.py:1328
+#: ../src/config.py:1334
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
 
-#: ../src/config.py:1329
+#: ../src/config.py:1335
 msgid "To change the account name, you must be disconnected."
 msgstr "For å endre konto navnet må du ikke være tilkoblet."
 
-#: ../src/config.py:1332
-#: ../src/config.py:1924
+#: ../src/config.py:1338 ../src/config.py:1930
 msgid "Unread events"
 msgstr "Uleste hendelser"
 
-#: ../src/config.py:1333
+#: ../src/config.py:1339
 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:1337
+#: ../src/config.py:1343
 msgid "Account Name Already Used"
 msgstr "Konto Navnet er Allerede i Bruk"
 
-#: ../src/config.py:1338
-msgid "This name is already used by another of your accounts. Please choose another name."
-msgstr "Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst velg et annet navn."
+#: ../src/config.py:1344
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
+msgstr ""
+"Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst velg "
+"et annet navn."
 
-#: ../src/config.py:1342
-#: ../src/config.py:1346
+#: ../src/config.py:1348 ../src/config.py:1352
 msgid "Invalid account name"
 msgstr "Ugyldig konto navn"
 
-#: ../src/config.py:1343
+#: ../src/config.py:1349
 msgid "Account name cannot be empty."
 msgstr "Konto navn kan ikke være tomt."
 
-#: ../src/config.py:1347
+#: ../src/config.py:1353
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
 
-#: ../src/config.py:1355
-#: ../src/config.py:1361
-#: ../src/config.py:1371
-#: ../src/config.py:3029
+#: ../src/config.py:1361 ../src/config.py:1367 ../src/config.py:1377
+#: ../src/config.py:3035
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/config.py:1362
+#: ../src/config.py:1368
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "En Jabber ID må skrives som \"bruker@servernavn\"."
 
-#: ../src/config.py:1421
+#: ../src/config.py:1427
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:1422
+#: ../src/config.py:1428
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
 
-#: ../src/config.py:1548
-#: ../src/common/config.py:363
+#: ../src/config.py:1554 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Snart tilbake."
 
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 msgid "Relogin now?"
 msgstr "Logge inn på nytt nå?"
 
-#: ../src/config.py:1559
+#: ../src/config.py:1565
 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."
+msgstr ""
+"Dersom du ønsker at endringene skal tre i kraft umiddelbart, må du logge inn "
+"på nytt."
 
-#: ../src/config.py:1585
+#: ../src/config.py:1591
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
 
-#: ../src/config.py:1586
+#: ../src/config.py:1592
 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:1593
-#: ../src/dialogs.py:1128
-#: ../src/dialogs.py:1297
-#: ../src/disco.py:417
-#: ../src/profile_window.py:307
+#: ../src/config.py:1599 ../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:1594
+#: ../src/config.py:1600
 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:1598
+#: ../src/config.py:1604
 msgid "Your server doesn't support Vcard"
 msgstr "Din server støtter ikke Vcard"
 
-#: ../src/config.py:1599
+#: ../src/config.py:1605
 msgid "Your server can't save your personal information."
 msgstr "Din server kan ikke lagre din personlige informasjon."
 
-#: ../src/config.py:1623
-#: ../src/config.py:3416
+#: ../src/config.py:1629 ../src/config.py:3422
 msgid "Failed to get secret keys"
 msgstr "Klarte ikke å hente hemmelig nøkkel"
 
-#: ../src/config.py:1624
-#: ../src/config.py:3417
+#: ../src/config.py:1630 ../src/config.py:3423
 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:1627
-#: ../src/config.py:3420
+#: ../src/config.py:1633 ../src/config.py:3426
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøkkel Valg"
 
-#: ../src/config.py:1628
-#: ../src/config.py:3421
+#: ../src/config.py:1634 ../src/config.py:3427
 msgid "Choose your OpenPGP key"
 msgstr "Velg din OpenPGP nøkkel"
 
 #. Name column
-#: ../src/config.py:1858
-#: ../src/disco.py:740
-#: ../src/disco.py:1466
-#: ../src/disco.py:1704
-#: ../src/history_window.py:78
+#: ../src/config.py:1864 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/config.py:1861
+#: ../src/config.py:1867
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1925
+#: ../src/config.py:1931
 msgid "Read all pending events before removing this account."
 msgstr "Les alle ventende meldinger før du fjerner denne kontoen."
 
-#: ../src/config.py:1962
+#: ../src/config.py:1968
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har åpne samtaler på konto %s"
 
-#: ../src/config.py:1963
+#: ../src/config.py:1969
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alle samtaler og gruppesamtaler vil bli lukket. Ønsker du å fortsette?"
 
-#: ../src/config.py:2022
+#: ../src/config.py:2028
 msgid "Account Local already exists."
 msgstr "Konto Lokal eksisterer allerede."
 
-#: ../src/config.py:2023
+#: ../src/config.py:2029
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Vennligst omdøp eller fjern den før du slår på link-lokal meldinger."
 
-#: ../src/config.py:2255
+#: ../src/config.py:2261
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:2257
+#: ../src/config.py:2263
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
 #. list at the begining
-#: ../src/config.py:2329
+#: ../src/config.py:2335
 msgid "Ban List"
 msgstr "Listen over Utestengte"
 
-#: ../src/config.py:2330
+#: ../src/config.py:2336
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:2331
+#: ../src/config.py:2337
 msgid "Owner List"
 msgstr "Eier Liste"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2338
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2365
-#: ../src/disco.py:747
-#: ../src/history_manager.py:154
+#: ../src/config.py:2371 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 msgid "Reason"
 msgstr "Grunn"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Nick"
 msgstr "Kallenavn"
 
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2403
+#: ../src/config.py:2409
 msgid "Banning..."
 msgstr "Utvis..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2405
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2657,11 +2864,11 @@ msgstr ""
 "<b>Hvem ønsker du å utvise?</b>\n"
 "\n"
 
-#: ../src/config.py:2407
+#: ../src/config.py:2413
 msgid "Adding Member..."
 msgstr "Legger til Medlem..."
 
-#: ../src/config.py:2408
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2669,11 +2876,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2410
+#: ../src/config.py:2416
 msgid "Adding Owner..."
 msgstr "Legger til Eier..."
 
-#: ../src/config.py:2411
+#: ../src/config.py:2417
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2681,11 +2888,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til eier?</b>\n"
 "\n"
 
-#: ../src/config.py:2413
+#: ../src/config.py:2419
 msgid "Adding Administrator..."
 msgstr "Legger til Administrator..."
 
-#: ../src/config.py:2414
+#: ../src/config.py:2420
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2693,7 +2900,7 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2415
+#: ../src/config.py:2421
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2709,174 +2916,186 @@ msgstr ""
 "4. domene (domene selv treffer, smt treffer alle bruker@domene,\n"
 "domene/ressurs, eller adresser i et underdomene."
 
-#: ../src/config.py:2520
+#: ../src/config.py:2526
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2537
-#: ../src/roster_window.py:2667
+#: ../src/config.py:2543 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/config.py:2538
-#: ../src/roster_window.py:2668
+#: ../src/config.py:2544 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/config.py:2539
-#: ../src/roster_window.py:2669
+#: ../src/config.py:2545 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../src/config.py:2553
+#: ../src/config.py:2559
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilkoblet til serveren"
 
-#: ../src/config.py:2554
+#: ../src/config.py:2560
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen mistes."
 
-#: ../src/config.py:2638
+#: ../src/config.py:2644
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2638
+#: ../src/config.py:2644
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2645
 msgid "Enter and leave only"
 msgstr "Gå inn og legg igjen bare"
 
-#: ../src/config.py:2709
+#: ../src/config.py:2715
 msgid "New Group Chat"
 msgstr "Ny Gruppesamtale"
 
-#: ../src/config.py:2741
+#: ../src/config.py:2747
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
 
-#: ../src/config.py:2742
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
+#: ../src/config.py:2748
+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:3004
+#: ../src/config.py:3010
 msgid "Invalid username"
 msgstr "Ugyldig brukernavn"
 
-#: ../src/config.py:3005
+#: ../src/config.py:3011
 msgid "You must provide a username to configure this account."
 msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
 
-#: ../src/config.py:3015
-#: ../src/dialogs.py:1316
+#: ../src/config.py:3021 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Ugyldig passord"
 
-#: ../src/config.py:3016
+#: ../src/config.py:3022
 msgid "You must enter a password for the new account."
 msgstr "Du må skrive inn et passord for den nye kontoen"
 
-#: ../src/config.py:3020
-#: ../src/dialogs.py:1321
+#: ../src/config.py:3026 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: ../src/config.py:3021
-#: ../src/dialogs.py:1322
+#: ../src/config.py:3027 ../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:3040
+#: ../src/config.py:3046
 msgid "Duplicate Jabber ID"
 msgstr "Duplikat Jabber ID"
 
-#: ../src/config.py:3041
+#: ../src/config.py:3047
 msgid "This account is already configured in Gajim."
 msgstr "Kontakten er allerede konfigurert i Gajim."
 
-#: ../src/config.py:3058
+#: ../src/config.py:3064
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
 
-#: ../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 "Du kan sette avanserte konto instillinger ved å trykke på Avansert knappen, eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra hovedvinduet."
+#: ../src/config.py:3065 ../src/config.py:3100
+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 ""
+"Du kan sette avanserte konto instillinger ved å trykke på Avansert knappen, "
+"eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
+"hovedvinduet."
 
-#: ../src/config.py:3093
+#: ../src/config.py:3099
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
 
-#: ../src/config.py:3111
+#: ../src/config.py:3117
 msgid "An error occured during account creation"
 msgstr "Det skjedde en feil ved oppretting av kontoen"
 
-#: ../src/config.py:3169
+#: ../src/config.py:3175
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
 
-#: ../src/config.py:3170
+#: ../src/config.py:3176
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
 
-#: ../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 under denne linjen er hva som har blitt sagt siden sist du fulgte med i denne gruppe samtalen"
+#: ../src/conversation_textview.py:273
+msgid ""
+"Text below this line is what has been said since the last time you paid "
+"attention to this group chat"
+msgstr ""
+"Tekst under denne linjen er hva som har blitt sagt siden sist du fulgte med "
+"i denne gruppe samtalen"
 
-#: ../src/conversation_textview.py:340
+#: ../src/conversation_textview.py:342
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Les_Wikipedia Artikkel"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Slå det opp i _Ordbok"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:373
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Ordbok URL mangler en \"%s\" og den må ikke være WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:386
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Søk URL mangler en \"%s\""
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "Web _Søk etter den"
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:397
 msgid "Open as _Link"
 msgstr "Åpne som _Link"
 
-#: ../src/conversation_textview.py:752
+#: ../src/conversation_textview.py:757
 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:756
+#: ../src/conversation_textview.py:761
 #, python-format
 msgid "%i days ago"
 msgstr "%i dager siden"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:788
+#: ../src/conversation_textview.py:793
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %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>"
@@ -2943,31 +3162,23 @@ msgstr "Yahoo Adresse:"
 #: ../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"
+msgstr ""
+"Vennligst fyll inn dataene til kontakten du ønsker å legge til kontoen %s"
 
 #: ../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: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
+#: ../src/dialogs.py:467 ../src/disco.py:102 ../src/disco.py:103
+#: ../src/disco.py:1252 ../src/gajim.py:491 ../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:609
-#: ../src/dialogs.py:615
+#: ../src/dialogs.py:609 ../src/dialogs.py:615
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruker ID"
 
@@ -3015,7 +3226,8 @@ msgstr "TUSEN TAKK:"
 #. and add it manually as translatable
 #: ../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."
+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:776
@@ -3028,8 +3240,12 @@ msgid "Unable to bind to port %s."
 msgstr "Klarer ikke å lytte til port %s."
 
 #: ../src/dialogs.py:907
-msgid "Maybe you have another running instance of Gajim. File Transfer will be canceled."
-msgstr "Kanskje du har en annen kjørende instans av Gajim. Filoverføring vil bli avbrutt."
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"canceled."
+msgstr ""
+"Kanskje du har en annen kjørende instans av Gajim. Filoverføring vil bli "
+"avbrutt."
 
 #: ../src/dialogs.py:1058
 #, python-format
@@ -3041,8 +3257,7 @@ msgstr "Abonnerings ønske for konto %s fra %s"
 msgid "Subscription request from %s"
 msgstr "Abonnerings ønske fra %s"
 
-#: ../src/dialogs.py:1121
-#: ../src/roster_window.py:681
+#: ../src/dialogs.py:1121 ../src/roster_window.py:681
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du er allerede i gruppesamtale %s"
@@ -3056,13 +3271,11 @@ msgstr "Du kan ikke gå inn i en gruppe samtale uten å være tilkoblet."
 msgid "Join Group Chat with account %s"
 msgstr "Bli med i samtalegruppe med konto %s"
 
-#: ../src/dialogs.py:1212
-#: ../src/dialogs.py:1218
+#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
 msgid "Invalid group chat Jabber ID"
 msgstr "Ugyldig gruppesamtale Jabber ID"
 
-#: ../src/dialogs.py:1213
-#: ../src/dialogs.py:1219
+#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
 
@@ -3093,21 +3306,16 @@ msgstr ""
 "å sende en samtale melding til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1276
-#: ../src/dialogs.py:1635
-#: ../src/dialogs.py:1764
+#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
 msgid "Connection not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/dialogs.py:1277
-#: ../src/dialogs.py:1636
-#: ../src/dialogs.py:1765
+#: ../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:1286
-#: ../src/dialogs.py:1289
+#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
 msgid "Invalid JID"
 msgstr "Ugyldig JID"
 
@@ -3126,81 +3334,56 @@ msgstr "Du må skrive inn et passord."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1364
-#: ../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 "Kontakt Logget På"
 
-#: ../src/dialogs.py:1366
-#: ../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 "Kontakt Logget Av"
 
 #. chat message
-#: ../src/dialogs.py:1368
-#: ../src/notify.py:238
-#: ../src/notify.py:415
+#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
 msgid "New Message"
 msgstr "Ny Melding"
 
 #. single message
-#: ../src/dialogs.py:1368
-#: ../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 "Ny Melding"
 
 #. private message
-#: ../src/dialogs.py:1369
-#: ../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 "Ny Privat Melding"
 
-#: ../src/dialogs.py:1369
-#: ../src/gajim.py:1159
-#: ../src/notify.py:424
+#: ../src/dialogs.py:1369 ../src/gajim.py:1168 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:1371
-#: ../src/gajim.py:1300
-#: ../src/notify.py:418
+#: ../src/dialogs.py:1371 ../src/gajim.py:1321 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/dialogs.py:1373
-#: ../src/gajim.py:1132
-#: ../src/gajim.py:1276
+#: ../src/dialogs.py:1373 ../src/gajim.py:1140 ../src/gajim.py:1297
 #: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Fil Overføring Feilet"
 
-#: ../src/dialogs.py:1375
-#: ../src/gajim.py:1339
-#: ../src/gajim.py:1361
-#: ../src/gajim.py:1378
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1375 ../src/gajim.py:1360 ../src/gajim.py:1382
+#: ../src/gajim.py:1399 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Fil Overføring Komplett"
 
-#: ../src/dialogs.py:1376
-#: ../src/gajim.py:1342
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1376 ../src/gajim.py:1363 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Fil Overføring Stoppet"
 
-#: ../src/dialogs.py:1378
-#: ../src/gajim.py:1030
-#: ../src/notify.py:426
+#: ../src/dialogs.py:1378 ../src/gajim.py:1038 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Gruppesamtale invitasjon"
 
-#: ../src/dialogs.py:1380
-#: ../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 "Kontakt Endret Status"
 
@@ -3311,8 +3494,7 @@ msgstr "Kommentar: %s"
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/dialogs.py:2298
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
 msgid "All files"
 msgstr "Alle filer"
 
@@ -3378,11 +3560,14 @@ msgid "The service could not be found"
 msgstr "Tjenesten ble ikke funnet"
 
 #: ../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 "Det er ingen tjeneste på adressen du oppgav, eller den svarer ikke. Sjekk adressen og prøv igjen."
+msgid ""
+"There is no service at the address you entered, or it is not responding. "
+"Check the address and try again."
+msgstr ""
+"Det er ingen tjeneste på adressen du oppgav, eller den svarer ikke. Sjekk "
+"adressen og prøv igjen."
 
-#: ../src/disco.py:646
-#: ../src/disco.py:927
+#: ../src/disco.py:646 ../src/disco.py:927
 msgid "The service is not browsable"
 msgstr "Ikke mulig å utforske tjeneste"
 
@@ -3403,8 +3588,7 @@ msgstr "_Utforsk"
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjenesten innholer ingen elementer å utforske."
 
-#: ../src/disco.py:1142
-#: ../src/disco.py:1257
+#: ../src/disco.py:1142 ../src/disco.py:1257
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
@@ -3456,22 +3640,19 @@ msgstr "Tid"
 msgid "Progress"
 msgstr "Fremdrift"
 
-#: ../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 "Filnavn: %s"
 
-#: ../src/filetransfers_window.py:164
-#: ../src/filetransfers_window.py:298
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
 #, python-format
 msgid "Size: %s"
 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/filetransfers_window.py:173 ../src/filetransfers_window.py:183
 #: ../src/history_manager.py:463
 msgid "You"
 msgstr "Du"
@@ -3481,8 +3662,7 @@ msgstr "Du"
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:175
-#: ../src/filetransfers_window.py:564
+#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
 #: ../src/tooltips.py:573
 msgid "Recipient: "
 msgstr "Mottaker: "
@@ -3496,13 +3676,11 @@ msgstr "Lagret i: %s"
 msgid "File transfer completed"
 msgstr "Fil overføring komplett"
 
-#: ../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 "Fil overføring avbrutt"
 
-#: ../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 "Tilkoblingen kan ikke opprettes."
 
@@ -3552,35 +3730,33 @@ 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:682
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kan ikke overskrive eksisterende fil \"%s\""
 
-#: ../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 "En fil med dette navnet eksisterer og du har ikke rettigheter til å overskrive den."
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+msgid ""
+"A file with this name already exists and you do not have permission to "
+"overwrite it."
+msgstr ""
+"En fil med dette navnet eksisterer og du har ikke rettigheter til å "
+"overskrive den."
 
-#: ../src/filetransfers_window.py:326
-#: ../src/gtkgui_helpers.py:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "This file already exists"
 msgstr "Denne filen finnes fra før"
 
-#: ../src/filetransfers_window.py:326
-#: ../src/gtkgui_helpers.py:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "What do you want to do?"
 msgstr "Hva ønsker du å gjøre?"
 
-#: ../src/filetransfers_window.py:338
-#: ../src/gtkgui_helpers.py:698
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Katalogen \"%s\" er ikke skrivbar"
 
-#: ../src/filetransfers_window.py:338
-#: ../src/gtkgui_helpers.py:699
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
 msgid "You do not have permission to create files in this directory."
 msgstr "Du har ikke rettigheter til å lage filer i denne katalogen."
 
@@ -3604,8 +3780,7 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:536
-#: ../src/filetransfers_window.py:539
+#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
 msgid "Invalid File"
 msgstr "Ugyldig Fil"
 
@@ -3617,13 +3792,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:563
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:563
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../src/filetransfers_window.py:562
-#: ../src/tooltips.py:567
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:567
 msgid "Sender: "
 msgstr "Avsender: "
 
@@ -3657,32 +3830,41 @@ msgstr "GTK+ mangler libglade støtte"
 
 #: ../src/gajim.py:62
 #, python-format
-msgid "Please remove your current GTK+ runtime and install the latest stable version from %s"
-msgstr "Vennligst fjern din gjeldende GTK+ installasjon og installer siste stabile versjon fra %s"
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Vennligst fjern din gjeldende GTK+ installasjon og installer siste stabile "
+"versjon fra %s"
 
 #: ../src/gajim.py:64
-msgid "Please make sure that GTK+ and PyGTK have libglade support in your system."
+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:69
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim trenger PySQLite2 for å kjøre"
 
-#: ../src/gajim.py:76
+#: ../src/gajim.py:77
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim trenger pywin32 for å kjøre"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:78
 #, python-format
-msgid "Please make sure that Pywin32 is installed on your system. You can get it at %s"
-msgstr "Vennligst pass på at Pywin32 er installert på ditt system. Du kan hente den på %s"
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+"Vennligst pass på at Pywin32 er installert på ditt system. Du kan hente den "
+"på %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:189
+#: ../src/gajim.py:190
 msgid "Gajim is already running"
 msgstr "Gajim kjører allerede"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:191
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -3690,78 +3872,76 @@ msgstr ""
 "En annen instans av Gajim ser ut til å kjøre\n"
 "Start likevel?"
 
-#: ../src/gajim.py:297
+#: ../src/gajim.py:298
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Autentisering for %s (id: %s)"
 
-#: ../src/gajim.py:298
+#: ../src/gajim.py:299
 msgid "Do you accept this request?"
 msgstr "Godtar du denne forespørselen?"
 
-#: ../src/gajim.py:344
-#: ../src/notify.py:430
+#: ../src/gajim.py:345 ../src/notify.py:430
 msgid "Connection Failed"
 msgstr "Tilkobling Feilet"
 
-#: ../src/gajim.py:656
+#: ../src/gajim.py:658
 #, python-format
 msgid "Subject: %s"
 msgstr "Tittel: %s"
 
-#: ../src/gajim.py:701
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:703 ../src/gajim.py:716
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "feil ved sending %s ( %s )"
 
-#: ../src/gajim.py:741
+#: ../src/gajim.py:749
 msgid "Authorization accepted"
 msgstr "Godkjenningsforespørel akseptert"
 
-#: ../src/gajim.py:742
+#: ../src/gajim.py:750
 #, 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:750
+#: ../src/gajim.py:758
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" fjernet abonnementet fra deg"
 
-#: ../src/gajim.py:751
+#: ../src/gajim.py:759
 msgid "You will always see him or her as offline."
 msgstr "Du vil alltid se han eller henne som frakoblet."
 
-#: ../src/gajim.py:794
+#: ../src/gajim.py:802
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke opprettes"
 
-#: ../src/gajim.py:795
-#: ../src/common/connection.py:395
+#: ../src/gajim.py:803 ../src/common/connection.py:395
 msgid "Check your connection or try again later."
 msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
 
-#: ../src/gajim.py:943
-#: ../src/roster_window.py:1201
+#: ../src/gajim.py:951 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s er nå %s (%s)"
 
-#: ../src/gajim.py:1040
+#: ../src/gajim.py:1048
 msgid "Your passphrase is incorrect"
 msgstr "Passord setningen din er ikke riktig"
 
-#: ../src/gajim.py:1041
+#: ../src/gajim.py:1049
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
 
-#: ../src/gajim.py:1143
+#: ../src/gajim.py:1151
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny e-post på %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1145
+#: ../src/gajim.py:1153
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3771,7 +3951,7 @@ msgstr[1] "Du har %d nye e-post samtaler"
 #. 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
+#: ../src/gajim.py:1162
 #, python-format
 msgid ""
 "\n"
@@ -3780,54 +3960,55 @@ msgstr ""
 "\n"
 "Fra: %(from_address)s"
 
-#: ../src/gajim.py:1297
+#: ../src/gajim.py:1318
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/gajim.py:1362
+#: ../src/gajim.py:1383
 #, 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:1366
+#: ../src/gajim.py:1387
 #, 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:1379
+#: ../src/gajim.py:1400
 #, 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:1383
+#: ../src/gajim.py:1404
 #, 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:1489
+#: ../src/gajim.py:1510
 msgid "Username Conflict"
 msgstr "Brukernavn Konflikt"
 
-#: ../src/gajim.py:1490
+#: ../src/gajim.py:1511
 msgid "Please type a new username for your local account"
 msgstr "Vennligst skriv inn et nytt brukernavn for din lokale konto"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1850
 msgid "Could not save your settings and preferences"
 msgstr "Kan ikke lagre dine innstillinger og valg"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2042
 msgid "Network Manager support not available"
 msgstr "Network Manager støtte er ikke tilgjengelig"
 
-#: ../src/gajim.py:2095
+#: ../src/gajim.py:2117
 msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Sesjons Administrasjons støtte ikke tilgjengelig (mangler gnome.ui modul)"
+msgstr ""
+"Sesjons Administrasjons støtte ikke tilgjengelig (mangler gnome.ui modul)"
 
 #: ../src/gajim-remote.py:66
 msgid "Shows a help on specific command"
@@ -3851,19 +4032,18 @@ msgid "Popups a window with the next pending event"
 msgstr "Aktiver nytt vindu med den neste ventende hendelsen"
 
 #: ../src/gajim-remote.py:82
-msgid "Prints a list of all contacts in the roster. Each contact appear on a separate line"
-msgstr "Skriv ut en liste over alle kontakter i kontaklisten. Hver kontakt kommer på en egen linje"
-
-#: ../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
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appear on a "
+"separate line"
+msgstr ""
+"Skriv ut en liste over alle kontakter i kontaklisten. Hver kontakt kommer på "
+"en egen linje"
+
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 #: ../src/gajim-remote.py:220
 msgid "account"
 msgstr "konto"
@@ -3887,10 +4067,11 @@ msgstr "status"
 
 #: ../src/gajim-remote.py:96
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
-msgstr "en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, usynlig"
+msgstr ""
+"en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, "
+"usynlig"
 
-#: ../src/gajim-remote.py:97
-#: ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
 #: ../src/gajim-remote.py:132
 msgid "message"
 msgstr "melding"
@@ -3900,8 +4081,12 @@ msgid "status message"
 msgstr "status melding"
 
 #: ../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 "endre status til konto \"konto\". Dersom uspesifisert, prøv å endre status til alle kontoer som har \"synkroniser med global status\" valget påslått"
+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 ""
+"endre status til konto \"konto\". Dersom uspesifisert, prøv å endre status "
+"til alle kontoer som har \"synkroniser med global status\" valget påslått"
 
 #: ../src/gajim-remote.py:104
 msgid "Shows the chat dialog so that you can send messages to a contact"
@@ -3911,43 +4096,50 @@ msgstr "Vis samtale vinduet så du kan sende meldinger til en kontakt"
 msgid "JID of the contact that you want to chat with"
 msgstr "JID til kontakten du ønsker å snakke med"
 
-#: ../src/gajim-remote.py:108
-#: ../src/gajim-remote.py:186
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "om spesifisert vil kontakten fjernes fra listen på denne kontoen"
 
 #: ../src/gajim-remote.py: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 "Sender ny samtale melding til en kontakt i kontaktlisten. Både OpenPGP nøkkelen og konto er valgfri. Dersom du ønsker å sette bare 'konto', uten 'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
+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 ""
+"Sender ny samtale melding til en kontakt i kontaktlisten. Både OpenPGP "
+"nøkkelen og konto er valgfri. Dersom du ønsker å sette bare 'konto', uten "
+"'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: ../src/gajim-remote.py:117
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
 msgid "JID of the contact that will receive the message"
 msgstr "JID til kontakten som vil motta meldingen"
 
-#: ../src/gajim-remote.py:118
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
 msgid "message contents"
 msgstr "meldings innhold"
 
-#: ../src/gajim-remote.py:119
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "pgp key"
 msgstr "pgp nøkkel"
 
-#: ../src/gajim-remote.py:119
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "if specified, the message will be encrypted using this public key"
-msgstr "dersom spesifisert vil meldingen bli kryptert med denne offentlige nøkkelen"
+msgstr ""
+"dersom spesifisert vil meldingen bli kryptert med denne offentlige nøkkelen"
 
-#: ../src/gajim-remote.py:121
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
 msgid "if specified, the message will be sent using this account"
 msgstr "dersom spesifisert, vil meldingen bli sendt med denne kontoen"
 
 #: ../src/gajim-remote.py: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 "Sender ny enkelt melding til en kontakt i kontaktlisten. Både OpenPGP nøkkelen og konto er valgfritt. Dersom du ønsker å sette bare 'konto', uten 'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
+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 ""
+"Sender ny enkelt melding til en kontakt i kontaktlisten. Både OpenPGP "
+"nøkkelen og konto er valgfritt. Dersom du ønsker å sette bare 'konto', uten "
+"'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
 #: ../src/gajim-remote.py:131
 msgid "subject"
@@ -3961,10 +4153,8 @@ msgstr "meldings tittel"
 msgid "Gets detailed info on a contact"
 msgstr "Henter detaljert informasjon om en kontakt"
 
-#: ../src/gajim-remote.py:142
-#: ../src/gajim-remote.py:155
-#: ../src/gajim-remote.py:185
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
 msgid "JID of the contact"
 msgstr "JID til kontakten"
 
@@ -4042,11 +4232,16 @@ msgstr "Legger til en ny kontakt til denne kontoen."
 
 #: ../src/gajim-remote.py:200
 msgid "Returns current status (the global one unless account is specified)"
-msgstr "Returnerer innstillinger (globale innstillinger om ikke en konto er spesifisert)"
+msgstr ""
+"Returnerer innstillinger (globale innstillinger om ikke en konto er "
+"spesifisert)"
 
 #: ../src/gajim-remote.py:207
-msgid "Returns current status message(the global one unless account is specified)"
-msgstr "Returnerer gjeldende status melding (den globale om ikke en konto er spesifisert)"
+msgid ""
+"Returns current status message(the global one unless account is specified)"
+msgstr ""
+"Returnerer gjeldende status melding (den globale om ikke en konto er "
+"spesifisert)"
 
 #: ../src/gajim-remote.py:214
 msgid "Returns number of unreaded messages"
@@ -4069,8 +4264,12 @@ msgid "XML to send"
 msgstr "XML for sending"
 
 #: ../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 "Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt til alle kontoer"
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt "
+"til alle kontoer"
 
 #: ../src/gajim-remote.py:249
 msgid "Missing argument \"contact_jid\""
@@ -4142,254 +4341,295 @@ msgstr "Du kan ikke slette ditt gjeldene tema"
 msgid "Please first choose another for your current theme."
 msgstr "Vennligst velg en annen for ditt gjeldende tema."
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chat"
 msgstr "Privat Samtale"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chats"
 msgstr "Private Samtaler"
 
-#: ../src/groupchat_control.py:120
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Sending av privat melding feilet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Du er ikke lenger i samtalerommet \"%s\" eller \"%s\" har dratt."
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chat"
 msgstr "Gruppe Samtale"
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chats"
 msgstr "Gruppe Samtaler"
 
-#: ../src/groupchat_control.py:315
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Skriv inn Kallenavn"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:789
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
 
-#: ../src/groupchat_control.py:793
+#: ../src/groupchat_control.py:816
 #, 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:800
+#: ../src/groupchat_control.py:823
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:804
+#: ../src/groupchat_control.py:827
 #, 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:812
+#: ../src/groupchat_control.py:835
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
 
-#: ../src/groupchat_control.py:814
+#: ../src/groupchat_control.py:837
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
 
-#: ../src/groupchat_control.py:894
+#: ../src/groupchat_control.py:917
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
 
-#: ../src/groupchat_control.py:899
+#: ../src/groupchat_control.py:922
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har blitt med i gruppesamtalen"
 
 #. No status message
-#: ../src/groupchat_control.py:901
-#: ../src/roster_window.py:1204
+#: ../src/groupchat_control.py:924 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s er nå %s"
 
-#: ../src/groupchat_control.py:1020
-#: ../src/groupchat_control.py:1038
-#: ../src/groupchat_control.py:1131
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1043 ../src/groupchat_control.py:1061
+#: ../src/groupchat_control.py:1154 ../src/groupchat_control.py:1171
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Kallenavn ikke funnet: %s"
 
-#: ../src/groupchat_control.py:1054
+#: ../src/groupchat_control.py:1077
 msgid "This group chat has no subject"
 msgstr "Dette gruppesamtalerommet har ikke tittel"
 
-#: ../src/groupchat_control.py:1067
+#: ../src/groupchat_control.py:1090
 #, 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:1074
-#: ../src/groupchat_control.py:1102
+#: ../src/groupchat_control.py:1097 ../src/groupchat_control.py:1125
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s ser ikke ut til å være en gyldig JID"
 
-#: ../src/groupchat_control.py:1185
+#: ../src/groupchat_control.py:1208
 #, 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)"
+msgstr ""
+"Ingen slik kommando: /%s (dersom du ønsker å sende dette, så skriv /say før "
+"teksten)"
 
-#: ../src/groupchat_control.py:1208
+#: ../src/groupchat_control.py:1231
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandoer: %s"
 
-#: ../src/groupchat_control.py:1210
+#: ../src/groupchat_control.py:1233
 #, 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 "Bruksanvisning: /%s <kallenavn|JID> [grunn], utviser JIDen fra samtalerommet. 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."
+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 ""
+"Bruksanvisning: /%s <kallenavn|JID> [grunn], utviser JIDen fra "
+"samtalerommet. 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:1217
+#: ../src/groupchat_control.py:1240
 #, python-format
-msgid "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
-msgstr "Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu til den spesifiserte brukeren."
+msgid ""
+"Usage: /%s <nickname>, opens a private chat window to the specified occupant."
+msgstr ""
+"Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu til den "
+"spesifiserte brukeren."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1244
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Bruksanvisning: /%s, tømmer tekst vinduet."
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1246
 #, python-format
-msgid "Usage: /%s [reason], closes the current window or tab, displaying reason if specified."
-msgstr "Bruksanvisning: /%s [årsak], lukker gjeldende vindu eller fane, viser årsak dersom spesifisert."
+msgid ""
+"Usage: /%s [reason], closes the current window or tab, displaying reason if "
+"specified."
+msgstr ""
+"Bruksanvisning: /%s [årsak], lukker gjeldende vindu eller fane, viser årsak "
+"dersom spesifisert."
 
-#: ../src/groupchat_control.py:1226
+#: ../src/groupchat_control.py:1249
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Bruk: /%s, gjemmer samtale knappene."
 
-#: ../src/groupchat_control.py:1229
+#: ../src/groupchat_control.py:1252
 #, python-format
-msgid "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally providing a reason."
-msgstr "Bruksanvisning: /%s <JID> [grunn], inviterer JID til gjeldende rom, og viser en grunn dersom spesifisert."
+msgid ""
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
+"providing a reason."
+msgstr ""
+"Bruksanvisning: /%s <JID> [grunn], inviterer JID til gjeldende rom, og viser "
+"en grunn dersom spesifisert."
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1256
 #, python-format
-msgid "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally using specified nickname."
-msgstr "Bruksanvisning: /%s <rom>@<server>[/kallenavn], inviterer til rom@server og gir mulighet for å spesifisere valgfritt kallenavn."
+msgid ""
+"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
+"using specified nickname."
+msgstr ""
+"Bruksanvisning: /%s <rom>@<server>[/kallenavn], inviterer til rom@server og "
+"gir mulighet for å spesifisere valgfritt kallenavn."
 
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1260
 #, 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 "Bruksanvisning: /%s <kallenavn> [grunn], fjerner brukeren spesifisert av kallenavn fra rommet og viser om spesifisert en grunn. Støtter ikke mellomrom i kallenavn."
+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 ""
+"Bruksanvisning: /%s <kallenavn> [grunn], fjerner brukeren spesifisert av "
+"kallenavn fra rommet og viser om spesifisert en grunn. Støtter ikke "
+"mellomrom i kallenavn."
 
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1265
 #, python-format
-msgid "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 explodes.)"
+msgid ""
+"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 explodes.)"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1269
 #, python-format
-msgid "Usage: /%s <nickname> [message], opens a private message windowand sends message to the occupant specified by nickname."
-msgstr "Bruk: /%s <kallenavn> [melding], åpner et privat meldingsvindu og sender meldingen til brukeren spesifisert av kallenavn."
+msgid ""
+"Usage: /%s <nickname> [message], opens a private message windowand sends "
+"message to the occupant specified by nickname."
+msgstr ""
+"Bruk: /%s <kallenavn> [melding], åpner et privat meldingsvindu og sender "
+"meldingen til brukeren spesifisert av kallenavn."
 
-#: ../src/groupchat_control.py:1251
+#: ../src/groupchat_control.py:1274
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende samtalerom."
+msgstr ""
+"Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende "
+"samtalerom."
 
-#: ../src/groupchat_control.py:1255
+#: ../src/groupchat_control.py:1278
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Bruksanvisning: /%s , viser navnene til deltakere i samtalerommet."
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1282
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr "Bruksanvisning: /%s [tittel], viser eller oppdaterer samtalerom tittel."
+msgstr ""
+"Bruksanvisning: /%s [tittel], viser eller oppdaterer samtalerom tittel."
 
-#: ../src/groupchat_control.py:1262
+#: ../src/groupchat_control.py:1285
 #, python-format
-msgid "Usage: /%s <message>, sends a message without looking for other commands."
-msgstr "Bruksanvisning: /%s <melding>, sender en melding uten å se etter andre kommandoer."
+msgid ""
+"Usage: /%s <message>, sends a message without looking for other commands."
+msgstr ""
+"Bruksanvisning: /%s <melding>, sender en melding uten å se etter andre "
+"kommandoer."
 
-#: ../src/groupchat_control.py:1265
+#: ../src/groupchat_control.py:1288
 #, python-format
 msgid "No help info for /%s"
 msgstr "Ingen hjelpe informasjon for /%s"
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Er du sikker på at du vil gå ut av samtalerommet \"%s\"?"
 
-#: ../src/groupchat_control.py:1316
-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 samtalerommet."
+#: ../src/groupchat_control.py:1339
+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 samtalerommet."
 
-#: ../src/groupchat_control.py:1320
-#: ../src/roster_window.py:3961
+#: ../src/groupchat_control.py:1343 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "_Ikke spør meg igjen"
 
-#: ../src/groupchat_control.py:1354
+#: ../src/groupchat_control.py:1377
 msgid "Changing Subject"
 msgstr "Endrer Tittel"
 
-#: ../src/groupchat_control.py:1355
+#: ../src/groupchat_control.py:1378
 msgid "Please specify the new subject:"
 msgstr "Vennlist skriv inn ny tittel:"
 
-#: ../src/groupchat_control.py:1364
+#: ../src/groupchat_control.py:1387
 msgid "Changing Nickname"
 msgstr "Endrer Kallenavn"
 
-#: ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1388
 msgid "Please specify the new nickname you want to use:"
 msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
 
-#: ../src/groupchat_control.py:1390
+#: ../src/groupchat_control.py:1413
 msgid "Bookmark already set"
 msgstr "Bokmerke allerede satt"
 
-#: ../src/groupchat_control.py:1391
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Gruppesamtalen \"%s\" er allerede i dine bokmerker."
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1423
 msgid "Bookmark has been added successfully"
 msgstr "Bokmerke har blitt lagt til"
 
-#: ../src/groupchat_control.py:1401
+#: ../src/groupchat_control.py:1424
 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:1527
+#: ../src/groupchat_control.py:1550
 #, python-format
 msgid "Kicking %s"
 msgstr "Utkasting %s"
 
-#: ../src/groupchat_control.py:1528
-#: ../src/groupchat_control.py:1810
+#: ../src/groupchat_control.py:1551 ../src/groupchat_control.py:1833
 msgid "You may specify a reason below:"
 msgstr "Du kan spesifisere grunn under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1809
+#: ../src/groupchat_control.py:1832
 #, python-format
 msgid "Banning %s"
 msgstr "Utvise %s"
@@ -4399,8 +4639,12 @@ msgid "A programming error has been detected"
 msgstr "En programmerings feil har blitt detektert"
 
 #: ../src/gtkexcepthook.py:42
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
-msgstr "Det er sannsynligvis ikke kritisk, men bør rapporteres til utviklerene likevel."
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
+msgstr ""
+"Det er sannsynligvis ikke kritisk, men bør rapporteres til utviklerene "
+"likevel."
 
 #: ../src/gtkexcepthook.py:48
 msgid "_Report Bug"
@@ -4411,8 +4655,7 @@ msgid "Details"
 msgstr "Detaljer"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:153
-#: ../src/gtkgui_helpers.py:168
+#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Feil: kan ikke åpne %s for lesing"
@@ -4432,16 +4675,16 @@ msgstr "Feil under traversering av fil:"
 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:727
+#: ../src/gtkgui_helpers.py:728
 msgid "Extension not supported"
 msgstr "Utvidelse ikke støttet"
 
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:729
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr "Bilde kan ikke lagres i %(type)s format. Lagre som %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:737
+#: ../src/gtkgui_helpers.py:738
 msgid "Save Image as..."
 msgstr "Lagre Bilde som..."
 
@@ -4455,42 +4698,39 @@ msgid "Contacts"
 msgstr "Kontakter"
 
 #. holds time
-#: ../src/history_manager.py:120
-#: ../src/history_manager.py:160
+#: ../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:126
-#: ../src/history_manager.py:178
+#: ../src/history_manager.py:126 ../src/history_manager.py:178
 msgid "Nickname"
 msgstr "Kallenavn"
 
 #. holds message
-#: ../src/history_manager.py:134
-#: ../src/history_manager.py:166
+#: ../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:141
-#: ../src/history_manager.py:172
-msgid "Subject"
-msgstr "Tittel"
-
 #: ../src/history_manager.py:186
-msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
+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: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 ""
-"Normalt vil tildelt database plass ikke frigjøres, den vil bare be merket som ledig. Dersom du virkelig ønsker å redusere fil størrelsen klikker du JA, ellers klikker du NEI.\n"
+"Normalt vil tildelt database plass ikke frigjøres, den vil bare be merket "
+"som ledig. Dersom du virkelig ønsker å redusere fil størrelsen klikker du "
+"JA, ellers klikker du NEI.\n"
 "\n"
 "I tilfelle du klikker JA, vennligst vent..."
 
@@ -4509,8 +4749,7 @@ 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:518
-#: ../src/history_manager.py:554
+#: ../src/history_manager.py:518 ../src/history_manager.py:554
 msgid "This is an irreversible operation."
 msgstr "Denne operasjonen kan ikke angres."
 
@@ -4520,8 +4759,7 @@ msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ønsker du virkelig å slette den valgte meldingen?"
 msgstr[1] "Ønsker du virkelig å slette de valgte meldingene?"
 
-#: ../src/history_window.py:103
-#: ../src/history_window.py:105
+#: ../src/history_window.py:103 ../src/history_window.py:105
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Samtale Historikk med %s"
@@ -4531,8 +4769,7 @@ msgstr "Samtale Historikk med %s"
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s er nå %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:265
-#: ../src/notify.py:198
+#: ../src/history_window.py:265 ../src/notify.py:198
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s er nå %(status)s"
@@ -4591,15 +4828,12 @@ msgstr "%(nickname)s: %(message)s"
 msgid "New Message from %(nickname)s"
 msgstr "Ny Melding fra %(nickname)s"
 
-#: ../src/profile_window.py:72
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:72 ../src/profile_window.py:376
 msgid "Retrieving profile..."
 msgstr "Henter profil..."
 
-#: ../src/profile_window.py:107
-#: ../src/profile_window.py:203
-#: ../src/profile_window.py:212
-#: ../src/profile_window.py:370
+#: ../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 "Klikk for å sette ditt kontaktbilde"
 
@@ -4633,34 +4867,33 @@ msgid "vCard publication failed"
 msgstr "vCard publisering feilet"
 
 #: ../src/profile_window.py:348
-msgid "There was an error while publishing your personal information, try again later."
-msgstr "Det skjedde en feil med publisering av din personlige informasjon, prøv igjen senere."
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Det skjedde en feil med publisering av din personlige informasjon, prøv "
+"igjen senere."
 
 #: ../src/profile_window.py: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:168
-#: ../src/roster_window.py:223
+#: ../src/roster_window.py:168 ../src/roster_window.py:223
 msgid "Merged accounts"
 msgstr "Samlede kontoer"
 
-#: ../src/roster_window.py:340
-#: ../src/common/helpers.py:42
+#: ../src/roster_window.py:340 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Observerere"
 
-#: ../src/roster_window.py:686
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:686 ../src/roster_window.py:3132
 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"
 
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:878
-#: ../src/systray.py:187
-#: ../src/systray.py:192
+#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
 #, python-format
 msgid "using account %s"
 msgstr "bruker kontoen %s"
@@ -4703,8 +4936,7 @@ msgstr "Historikk Behandler"
 msgid "_Join New Group Chat"
 msgstr "_Bli med i Gruppesamtale"
 
-#: ../src/roster_window.py:1384
-#: ../src/roster_window.py:3325
+#: ../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"
@@ -4719,8 +4951,12 @@ msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
 #: ../src/roster_window.py:1389
-msgid "You will no longer be able to send and receive messages to contacts from this transport."
-msgstr "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra denne transporten."
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"this transport."
+msgstr ""
+"Du vil ikke lenger kunne sende og motta meldinger med kontakter fra denne "
+"transporten."
 
 #: ../src/roster_window.py:1392
 msgid "Transports will be removed"
@@ -4728,8 +4964,12 @@ msgstr "Transportene vil bli fjernet"
 
 #: ../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 "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra disse transportene:%s"
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr ""
+"Du vil ikke lenger kunne sende og motta meldinger med kontakter fra disse "
+"transportene:%s"
 
 #. it's jid
 #: ../src/roster_window.py:1417
@@ -4771,8 +5011,7 @@ msgstr "Tilegn OpenPGP Nøkkel"
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: ../src/roster_window.py:1788
-#: ../src/roster_window.py:1963
+#: ../src/roster_window.py:1788 ../src/roster_window.py:1963
 msgid "_New group chat"
 msgstr "_Ny gruppe samtale"
 
@@ -4780,8 +5019,7 @@ msgstr "_Ny gruppe samtale"
 msgid "I would like to add you to my roster"
 msgstr "Jeg ønsker å legge deg til min kontaktliste"
 
-#: ../src/roster_window.py:2008
-#: ../src/roster_window.py:2055
+#: ../src/roster_window.py:2008 ../src/roster_window.py:2055
 msgid "Send Group M_essage"
 msgstr "Send Gruppe M_elding"
 
@@ -4805,8 +5043,7 @@ msgstr "_Logg på"
 msgid "Log _off"
 msgstr "Logg _av"
 
-#: ../src/roster_window.py:2232
-#: ../src/roster_window.py:2303
+#: ../src/roster_window.py:2232 ../src/roster_window.py:2303
 msgid "_Change Status Message"
 msgstr "_Endre Status Melding"
 
@@ -4826,7 +5063,9 @@ msgstr "Abonnerings forespørsel er sendt"
 #: ../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."
+msgstr ""
+"Dersom \"%s\" aksepterer denne forespørselen vil du få vite hans eller "
+"hennes status."
 
 #: ../src/roster_window.py:2413
 msgid "Authorization has been removed"
@@ -4843,12 +5082,20 @@ msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
 #: ../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 "Ved å fjerne denne kontakten fjerner du også godkjenningen som gjør at han eller henne alltid vil se deg som frakoblet."
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Ved å fjerne denne kontakten fjerner du også godkjenningen som gjør at han "
+"eller henne alltid vil se deg som frakoblet."
 
 #: ../src/roster_window.py:2626
-msgid "By removing this contact you also by default remove authorization resulting in him or her always seeing you as offline."
-msgstr "Ved å fjerne denne kontakten fjerner du også godkjenningen som resulterer i at han eller henne alltid vil se deg som frakoblet."
+msgid ""
+"By removing this contact you also by default remove authorization resulting "
+"in him or her always seeing you as offline."
+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:2629
 msgid "I want this contact to know my status after removal"
@@ -4866,7 +5113,8 @@ msgid ""
 "you also remove authorization resulting in them always seeing you as offline."
 msgstr ""
 "Ved å fjerne disse kontaktene:%s\n"
-"fjerner du også autorisasjonen som gjør at de alltid vil se deg som frakoblet."
+"fjerner du også autorisasjonen som gjør at de alltid vil se deg som "
+"frakoblet."
 
 #: ../src/roster_window.py:2709
 msgid "Passphrase Required"
@@ -4889,15 +5137,17 @@ msgstr "Feil Passordsetning"
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
 
-#: ../src/roster_window.py:2781
-#: ../src/roster_window.py:2841
+#: ../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: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 "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: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 ""
+"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:2799
 msgid "No account available"
@@ -4912,26 +5162,41 @@ msgstr "Du må lage en konto før du kan snakke med andre kontakter."
 msgid "♪ \"%(title)s\" by %(artist)s ♪"
 msgstr "♪ \"%(title)s\" etter %(artist)s ♪"
 
-#: ../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 "Meldinger vil kun være tilgjengelig for lesing senere dersom du har historikk påslått."
+#: ../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 ""
+"Meldinger vil kun være tilgjengelig for lesing senere dersom du har "
+"historikk påslått."
 
 #: ../src/roster_window.py:3911
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakter lagring støttes ikke av din server"
 
 #: ../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 "Din server støtter ikke lagring av metakontakt informasjon. Så denne informasjonen vil ikke bli lagret på neste oppkobling."
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be save on next reconnection."
+msgstr ""
+"Din server støtter ikke lagring av metakontakt informasjon. Så denne "
+"informasjonen vil ikke bli lagret på neste oppkobling."
 
 #: ../src/roster_window.py:3955
-msgid "You are about to create a metacontact. Are you sure you want to continue?"
-msgstr "Du skal til å lage en metakontakt. Er du sikker på at du ønsker å fortsette?"
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr ""
+"Du skal til å lage en metakontakt. Er du sikker på at du ønsker å fortsette?"
 
 #: ../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 "Metakontakter er en måte å gruppere flere kontakter på en linje. Generelt brukes dette når samme person har flere Jabber kontoer eller transport kontoer."
+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 ""
+"Metakontakter er en måte å gruppere flere kontakter på en linje. Generelt "
+"brukes dette når samme person har flere Jabber kontoer eller transport "
+"kontoer."
 
 #: ../src/roster_window.py:4124
 #, python-format
@@ -4955,13 +5220,11 @@ msgstr "_Endre Status Melding..."
 msgid "Hide this menu"
 msgstr "Gjem dette vinduet"
 
-#: ../src/tooltips.py:309
-#: ../src/tooltips.py:492
+#: ../src/tooltips.py:309 ../src/tooltips.py:492
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:312
-#: ../src/tooltips.py:496
+#: ../src/tooltips.py:312 ../src/tooltips.py:496
 msgid "Resource: "
 msgstr "Ressurs: "
 
@@ -4970,8 +5233,7 @@ msgstr "Ressurs: "
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s av denne samtalegruppen"
 
-#: ../src/tooltips.py:430
-#: ../src/tooltips.py:610
+#: ../src/tooltips.py:430 ../src/tooltips.py:610
 msgid "Status: "
 msgstr "Status: "
 
@@ -5010,8 +5272,7 @@ msgstr "Type: "
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: ../src/tooltips.py:588
-#: ../src/tooltips.py:609
+#: ../src/tooltips.py:588 ../src/tooltips.py:609
 msgid "Not started"
 msgstr "Ikke startet"
 
@@ -5019,8 +5280,7 @@ msgstr "Ikke startet"
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/tooltips.py:594
-#: ../src/tooltips.py:597
+#: ../src/tooltips.py:594 ../src/tooltips.py:597
 msgid "Completed"
 msgstr "Komplett"
 
@@ -5057,8 +5317,7 @@ msgstr "?Client:Ukjent"
 msgid "?OS:Unknown"
 msgstr "?OS:Ukjent"
 
-#: ../src/vcard.py:247
-#: ../src/vcard.py:449
+#: ../src/vcard.py:247 ../src/vcard.py:449
 #, python-format
 msgid "since %s"
 msgstr "siden %s"
@@ -5068,29 +5327,40 @@ msgid "Affiliation:"
 msgstr "Tilhørighet: "
 
 #: ../src/vcard.py:285
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
-msgstr "Denne kontakten er interessert i din tilstedeværelses informasjon, men du er ikke interessert i hans/hennes status."
+msgid ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
+msgstr ""
+"Denne kontakten er interessert i din tilstedeværelses informasjon, men du er "
+"ikke interessert i hans/hennes status."
 
 #: ../src/vcard.py:287
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
-msgstr "Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/hun er ikke interessert i din."
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
+msgstr ""
+"Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/"
+"hun er ikke interessert i din."
 
 #: ../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"
+msgstr ""
+"Du og kontakten er interessert i hverandres tilstedeværelses informasjon"
 
 #. None
 #: ../src/vcard.py:291
-msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
-msgstr "Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller han/hun i din."
+msgid ""
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
+msgstr ""
+"Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller "
+"han/hun i din."
 
 #: ../src/vcard.py:299
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Du venter på kontaktens svar på din abonnerings forespørsel"
 
-#: ../src/vcard.py:311
-#: ../src/vcard.py:338
-#: ../src/vcard.py:482
+#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
 msgid " resource with priority "
 msgstr " ressurs med prioritet"
 
@@ -5098,17 +5368,14 @@ msgstr " ressurs med prioritet"
 msgid "creating logs database"
 msgstr "lager logg database"
 
-#: ../src/common/check_paths.py:89
-#: ../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:90
-#: ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:108
-#: ../src/common/check_paths.py:116
+#: ../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"
 
@@ -5143,8 +5410,10 @@ msgid "Not available as a result of being idle"
 msgstr "Ikke tilgjengelig på grunn av inaktivitet"
 
 #: ../src/common/config.py:82
-msgid "List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr "Liste (mellomrom separert) av rader (kontoer og grupper) som er kollapset."
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"Liste (mellomrom separert) av rader (kontoer og grupper) som er kollapset."
 
 #: ../src/common/config.py:87
 msgid "Enable link-local/zeroconf messaging"
@@ -5165,44 +5434,74 @@ msgstr ""
 "'never' - aldri vis klokkeslett."
 
 #: ../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 "Skriv klokkeslett i samtaler med Fuzzy Clock. Verdien av fuzziness fra 1 til 4, eller 0 for å deaktiver fuzzyclock. 1 er den mest presise klokke, 4 er den mindre presise. Dette brukes bare dersom print_time er 'sometimes'."
+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 ""
+"Skriv klokkeslett i samtaler med Fuzzy Clock. Verdien av fuzziness fra 1 til "
+"4, eller 0 for å deaktiver fuzzyclock. 1 er den mest presise klokke, 4 er "
+"den mindre presise. Dette brukes bare dersom print_time er 'sometimes'."
 
 #: ../src/common/config.py:95
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _ par som mulige formaterings symboler."
 
 #: ../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."
+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:99
-msgid "Uses ReStructured text markup for HTML, plus ascii formatting if selected. (If you want to use this, install docutils)"
-msgstr "Bruker ReStrukturert tekstoppmerking for HTML, pluss ascii formatering dersom valgt. (Dersom du ønsker å bruke dette, må du installere docutils)"
+msgid ""
+"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
+"(If you want to use this, install docutils)"
+msgstr ""
+"Bruker ReStrukturert tekstoppmerking for HTML, pluss ascii formatering "
+"dersom valgt. (Dersom du ønsker å bruke dette, må du installere docutils)"
 
 #: ../src/common/config.py:108
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Tegn å legge til etter kallenavn når du bruker kallenavn fullføring (tab) i gruppesamtaler."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Tegn å legge til etter kallenavn når du bruker kallenavn fullføring (tab) i "
+"gruppesamtaler."
 
 #: ../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 "Tegnforslag å legge til nytt kallenavn når det ønskede kallenavnet er opptatt av noen andre i samtalegruppen."
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Tegnforslag å legge til nytt kallenavn når det ønskede kallenavnet er "
+"opptatt av noen andre i samtalegruppen."
 
 #: ../src/common/config.py:142
 msgid "Add * and [n] in roster title?"
 msgstr "Legg * og [n] inn i kontaktliste tittelen?"
 
 #: ../src/common/config.py:143
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
-msgstr "Hvor mange linjer skal huskes fra forrige samtale når et samtale vindu/fane blir åpnet på nytt."
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Hvor mange linjer skal huskes fra forrige samtale når et samtale vindu/fane "
+"blir åpnet på nytt."
 
 #: ../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."
+msgstr ""
+"Hvor mange minutter skal de siste linjene fra forrige konversasjon vare."
 
 #: ../src/common/config.py:145
-msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
-msgstr "Send meldinger med Ctrl+Enter og med Enter lag ny linje (Mirabilis ICQ Klient standard oppførsel)."
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Send meldinger med Ctrl+Enter og med Enter lag ny linje (Mirabilis ICQ "
+"Klient standard oppførsel)."
 
 #: ../src/common/config.py:147
 msgid "How many lines to store for Ctrl+KeyUP."
@@ -5210,44 +5509,77 @@ msgstr "Hvor mange linjer skal lagres for Ctrl+PilOPP."
 
 #: ../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 "Enten bruk egendefinert url med %s i seg hvor %s er ordet/frasen eller 'WIKTIONARY' som betyr bruk wiktionary."
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Enten bruk egendefinert url med %s i seg hvor %s er ordet/frasen eller "
+"'WIKTIONARY' som betyr bruk wiktionary."
 
 #: ../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 "Dersom True så lytt til D-Bus signaler fra NetworkManager og endre status for kontoer (gitt at de ikke har listen_to_network_manager satt til False og at de synkroniserer med global status) basert på statusen til nettverks tilkoblingen."
+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 ""
+"Dersom True så lytt til D-Bus signaler fra NetworkManager og endre status "
+"for kontoer (gitt at de ikke har listen_to_network_manager satt til False og "
+"at de synkroniserer med global status) basert på statusen til nettverks "
+"tilkoblingen."
 
 #: ../src/common/config.py:155
-msgid "Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr "Sendt samtale status melding. Kan være alle, bare_skriving, avslått."
 
 #: ../src/common/config.py:156
-msgid "Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled."
-msgstr "Vist samtale status melding i samtalevindu. Kan være alle, bare_skriving, avslått."
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Vist samtale status melding i samtalevindu. Kan være alle, bare_skriving, "
+"avslått."
 
 #: ../src/common/config.py:158
-msgid "When not printing time for every message (print_time==sometimes), print it every x minutes."
-msgstr "Når man ikke viser klokkeslett for hver melding (print_time==av-og-til), vis det hvert x minutt."
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Når man ikke viser klokkeslett for hver melding (print_time==av-og-til), vis "
+"det hvert x minutt."
 
 #: ../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:160
-msgid "Always ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Spør alltid før lukking av gruppesamtale fane/vindu i denne mellomrom separerte listen av rom jider."
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"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:161
-msgid "Never ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Aldri spør før lukking av gruppesamtale fane/vindu i denne mellomroms separerte listen av rom jider."
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"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:164
-msgid "Overrides the host we send for File Transfer in case of address translation/port forwarding."
-msgstr "Overstyrer maskinen navnet vi sender for Fil Overføring i tilfeller med adresse oversetting/port videresending."
+msgid ""
+"Overrides the host we send for File Transfer in case of address translation/"
+"port forwarding."
+msgstr ""
+"Overstyrer maskinen navnet vi sender for Fil Overføring i tilfeller med "
+"adresse oversetting/port videresending."
 
 #: ../src/common/config.py:166
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
@@ -5270,36 +5602,66 @@ msgid "Show close button in tab?"
 msgstr "Vis lukk knapp på fanen?"
 
 #: ../src/common/config.py:189
-msgid "A semicolon-separated list of words that will be highlighted in group chats."
+msgid ""
+"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 gruppesamtaler."
 
 #: ../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 "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. "
+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 ""
+"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: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: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 "Dersom True vil Gajim ise et ikon på hver fane som inneholder uleste meldinger. Avhengig av valgte tema kan dette ikonet være animert."
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+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:193
-msgid "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window."
-msgstr "Dersom True vil Gajim vise status meldingen, om den ikke er tom, for hver kontakt under kontaktens navn i kontaktliste vinduet."
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"Dersom True vil Gajim vise status meldingen, om den ikke er tom, for hver "
+"kontakt under kontaktens navn i kontaktliste vinduet."
 
 #: ../src/common/config.py: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 "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."
+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 ""
+"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: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 "Dersom False vil du ikke lenger kunne se status linjer i samtaler når en kontakt endrer hans eller hennes status og/eller status melding. "
+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 ""
+"Dersom False vil du ikke lenger kunne se status linjer i samtaler når en "
+"kontakt endrer hans eller hennes status og/eller status melding. "
 
 #: ../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 group chat."
-msgstr "kan være \"none\",\"all\" eller \"in_and_out\". Dersom \"none\" vil Gajim ikke lenger vise status linje i gruppesamtaler når et medlem endrer hans/hennes status melding. Dersom \"all\" vil Gajim vise alle status meldinger. Dersom \"in_and_out\" vil Gajim bare vise FOO kommer/drar fra gruppesamtalen."
+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 ""
+"kan være \"none\",\"all\" eller \"in_and_out\". Dersom \"none\" vil Gajim "
+"ikke lenger vise status linje i gruppesamtaler når et medlem endrer hans/"
+"hennes status melding. Dersom \"all\" vil Gajim vise alle status meldinger. "
+"Dersom \"in_and_out\" vil Gajim bare vise FOO kommer/drar fra gruppesamtalen."
 
 #: ../src/common/config.py:199
 msgid "Background color of contacts when they just signed in."
@@ -5310,8 +5672,10 @@ msgid "Background color of contacts when they just signed out."
 msgstr "Bakgrunnsfargen for kontakter når de akkurat har logget ut."
 
 #: ../src/common/config.py:202
-msgid "If True, restored messages will use a smaller font than the default one."
-msgstr "Dersom True vil gjenopprettede meldinger bruke en mindre font en standard."
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+"Dersom True vil gjenopprettede meldinger bruke en mindre font en standard."
 
 #: ../src/common/config.py:203
 msgid "Don't show avatar for the transport itself."
@@ -5322,12 +5686,24 @@ msgid "Don't show roster in the system taskbar."
 msgstr "Ikke vis kontaktlisten i systemstatus-feltet."
 
 #: ../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 "Dersom True og de installerte GTK+ og PyGTK versjonene er minst 2.8, vil vindusbehandleren blinke (vanlig oppførsel i de fleste vindusbehandlere) når det er ventende hendelser."
+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 ""
+"Dersom True og de installerte GTK+ og PyGTK versjonene er minst 2.8, vil "
+"vindusbehandleren blinke (vanlig oppførsel i de fleste vindusbehandlere) når "
+"det er ventende hendelser."
 
 #: ../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 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"
+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 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:210
@@ -5336,13 +5712,17 @@ msgid ""
 "'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 ""
 "Kontrollerer vinduet hvor nye meldinger skal plasseres.\n"
 "'always' - Alle meldinger sendes til ett vindu.\n"
 "'never' - Alle meldinger får egne vindu.\n"
 "'peracct' - Meldinger for hver konto sendes til egne vindu.\n"
-"'pertype' - Hver meldingstype (f.eks., samtaler og gruppesamtaler) sendes til forskjellige vinduer. Merk, endring av dette valget krever omstart av Gajim før det aktiveres"
+"'pertype' - Hver meldingstype (f.eks., samtaler og gruppesamtaler) sendes "
+"til forskjellige vinduer. Merk, endring av dette valget krever omstart av "
+"Gajim før det aktiveres"
 
 #: ../src/common/config.py:211
 msgid "If False, you will no longer see the avatar in the chat window."
@@ -5373,8 +5753,12 @@ msgid "Hides the group chat occupants list in group chat window."
 msgstr "Gjemmer rommets medlemsliste i gruppesamtale vinduet."
 
 #: ../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 "I en samtale, vis kallenavnet i starten av linjen bare når det ikke er den samme person som snakker som i den forrige meldingen."
+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 ""
+"I en samtale, vis kallenavnet i starten av linjen bare når det ikke er den "
+"samme person som snakker som i den forrige meldingen."
 
 #: ../src/common/config.py:219
 msgid "Indentation when using merge consecutive nickame."
@@ -5382,23 +5766,38 @@ msgstr "Innrykk når man bruker sammenslåing av like kallenavn."
 
 #: ../src/common/config.py:220
 msgid "List of colors that will be used to color nicknames in group chats."
-msgstr "Liste av farger som vil bli brukt til å farge kallenavn i gruppesamtaler."
+msgstr ""
+"Liste av farger som vil bli brukt til å farge kallenavn i gruppesamtaler."
 
 #: ../src/common/config.py:221
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab går til neste skrivefane når ingenting er ulest."
 
 #: ../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 "Skal vi vise bekreft metakontakt opprettings dialogen eller ikke?Tomt innhold mener at vi aldri viser dialogen."
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Skal vi vise bekreft metakontakt opprettings dialogen eller ikke?Tomt "
+"innhold mener at vi aldri viser dialogen."
 
 #: ../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 "Dersom True vil du kunne sette en negativ prioritet til din konto i kontoinnstillingene. VÆR FORSIKTIG, når du er logget inn med en negativ prioritet vil du ikke motta noen meldinger fra din server."
+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 ""
+"Dersom True vil du kunne sette en negativ prioritet til din konto i "
+"kontoinnstillingene. VÆR FORSIKTIG, når du er logget inn med en negativ "
+"prioritet vil du ikke motta noen meldinger fra din server."
 
 #: ../src/common/config.py:234
-msgid "Priority will change automatically according to your status. Priorities are defined in autopriority_* options."
-msgstr "Prioritet vil endre automatisk i følge med din status. Prioritetene defineres i autopriority_* valgene."
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Prioritet vil endre automatisk i følge med din status. Prioritetene "
+"defineres i autopriority_* valgene."
 
 #. yes, no, ask
 #: ../src/common/config.py:263
@@ -5406,15 +5805,18 @@ msgid "Jabberd2 workaround"
 msgstr "Jabberd2 omvei"
 
 #: ../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 "Dersom valgt vil Gajim bruke din IP og proxier definert i file_transfer_proxies valget for filoverføring."
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Dersom valgt vil Gajim bruke din IP og proxier definert i "
+"file_transfer_proxies valget for filoverføring."
 
 #: ../src/common/config.py:326
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Er OpenPGP tilgjengelig for denne kontakten?"
 
-#: ../src/common/config.py:327
-#: ../src/common/config.py:330
+#: ../src/common/config.py:327 ../src/common/config.py:330
 msgid "Language for which we want to check misspelled words"
 msgstr "Språk som vi ønsker å sjekke feilstavede ord med"
 
@@ -5426,10 +5828,8 @@ msgstr "alle eller mellomroms separert status"
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', eller 'both'"
 
-#: ../src/common/config.py:338
-#: ../src/common/config.py:340
-#: ../src/common/config.py:341
-#: ../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 "'yes', 'no' eller ''"
@@ -5502,26 +5902,28 @@ msgstr "Jeg er ikke tilgjengelig."
 msgid "Do not disturb."
 msgstr "Ikke forstyrr."
 
-#: ../src/common/config.py:366
-#: ../src/common/config.py:367
+#: ../src/common/config.py:366 ../src/common/config.py:367
 msgid "Bye!"
 msgstr "Hade bra!"
 
 #: ../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."
-msgstr "Lyd som spilles når en samtalerom melding inneholder et av ordene i muc_highlight_words, eller når en samtalerom melding inneholder ditt kallenavn."
+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 ""
+"Lyd som spilles når en samtalerom melding inneholder et av ordene i "
+"muc_highlight_words, eller når en samtalerom melding inneholder ditt "
+"kallenavn."
 
 #: ../src/common/config.py:377
 msgid "Sound to play when any MUC message arrives."
 msgstr "Lyd som spilles når en ny samtalerom melding mottas."
 
-#: ../src/common/config.py:386
-#: ../src/common/optparser.py:197
+#: ../src/common/config.py:386 ../src/common/optparser.py:197
 msgid "green"
 msgstr "grønn"
 
-#: ../src/common/config.py:390
-#: ../src/common/optparser.py:183
+#: ../src/common/config.py:390 ../src/common/optparser.py:183
 msgid "grocery"
 msgstr "varehandel"
 
@@ -5545,15 +5947,19 @@ msgstr "Feil maskinnavn"
 
 #: ../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 "Maskinen du konfigurerte som ft_override_host_to_send avanserte valg er ikke gyldig, så den ignoreres."
+msgid ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"Maskinen du konfigurerte som ft_override_host_to_send avanserte valg er ikke "
+"gyldig, så den ignoreres."
 
 #: ../src/common/connection_handlers.py:590
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registrerings informasjon for transport %s har ikke kommet tidsnok"
 
-#: ../src/common/connection_handlers.py:1519
+#: ../src/common/connection_handlers.py:1523
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Kallenavn ikke lovlig: %s"
@@ -5561,72 +5967,78 @@ msgstr "Kallenavn ikke lovlig: %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
+#: ../src/common/connection_handlers.py:1585
+#: ../src/common/connection_handlers.py:1588
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1597
+#: ../src/common/connection_handlers.py:1600
+#: ../src/common/connection_handlers.py:1608
 msgid "Unable to join group chat"
 msgstr "Klarer ikke å gå inn i gruppesamtale"
 
-#: ../src/common/connection_handlers.py:1582
+#: ../src/common/connection_handlers.py:1586
 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:1585
+#: ../src/common/connection_handlers.py:1589
 msgid "You are banned from this group chat."
 msgstr "Du er uønsket i dette samtalerommet."
 
-#: ../src/common/connection_handlers.py:1588
+#: ../src/common/connection_handlers.py:1592
 msgid "Such group chat does not exist."
 msgstr "Et slikt samtalerom finnes ikke."
 
-#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1595
 msgid "Group chat creation is restricted."
 msgstr "Gruppesamtale oppretting er begrenset."
 
-#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1598
 msgid "Your registered nickname must be used."
 msgstr "Ditt registrerte kallenavn må bli brukt. "
 
-#: ../src/common/connection_handlers.py:1597
+#: ../src/common/connection_handlers.py:1601
 msgid "You are not in the members list."
 msgstr "Du er ikke medlems listen."
 
-#: ../src/common/connection_handlers.py:1605
+#: ../src/common/connection_handlers.py:1609
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
-"Ditt ønskede kallenavn er i bruk eller er registrert av en annen samtalebruker.\n"
+"Ditt ønskede kallenavn er i bruk eller er registrert av en annen "
+"samtalebruker.\n"
 "Vennligst skriv et annet kallenavn under:"
 
-#: ../src/common/connection_handlers.py:1651
+#: ../src/common/connection_handlers.py:1659
 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:1672
+#: ../src/common/connection_handlers.py:1680
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi abonnerer nå på %s"
 
-#: ../src/common/connection_handlers.py:1674
+#: ../src/common/connection_handlers.py:1682
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "frakoblings ønske fra %s"
 
-#: ../src/common/connection_handlers.py:1676
+#: ../src/common/connection_handlers.py:1684
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "vi abonnerer ikke lenger på %s"
 
-#: ../src/common/connection_handlers.py:1846
+#: ../src/common/connection_handlers.py:1854
 #, python-format
-msgid "JID %s is not RFC compliant. It will not be added to your roster. Use roster management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr "JID %s er ikke RFC kompatibel. Den vil ikke bli lagt til kontaktlisten. Bruk kontaktliste administrasjons verktøy som http://jru.jabberstudio.org/ for å fjerne den"
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s er ikke RFC kompatibel. Den vil ikke bli lagt til kontaktlisten. Bruk "
+"kontaktliste administrasjons verktøy som http://jru.jabberstudio.org/ for å "
+"fjerne den"
 
 #: ../src/common/connection.py:164
 #: ../src/common/zeroconf/connection_zeroconf.py:196
@@ -5638,8 +6050,7 @@ msgstr "Tilkobling til konto \"%s\" har blitt mistet"
 msgid "Reconnect manually."
 msgstr "Automatisk tilkobling."
 
-#: ../src/common/connection.py:176
-#: ../src/common/connection.py:203
+#: ../src/common/connection.py:176 ../src/common/connection.py:203
 #, python-format
 msgid "Transport %s answered wrongly to register request: %s"
 msgstr "Transporten %s svarte feil på registrerings forespørselen: %s"
@@ -5649,9 +6060,8 @@ msgstr "Transporten %s svarte feil på registrerings forespørselen: %s"
 msgid "Invalid answer"
 msgstr "Ugyldig svar"
 
-#: ../src/common/connection.py:394
-#: ../src/common/connection.py:429
-#: ../src/common/connection.py:871
+#: ../src/common/connection.py:394 ../src/common/connection.py:429
+#: ../src/common/connection.py:877
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
@@ -5708,7 +6118,7 @@ msgstr "Jeg er %s"
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Denne meldingen er *kryptert* (Se: JEP:`27`]"
 
-#: ../src/common/connection.py:758
+#: ../src/common/connection.py:764
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -5718,7 +6128,7 @@ msgstr ""
 "Tittel: %s\n"
 "%s"
 
-#: ../src/common/connection.py:897
+#: ../src/common/connection.py:903
 msgid "Not fetched because of invisible status"
 msgstr "Ikke hentet på grunn av usynlig status"
 
@@ -5733,11 +6143,14 @@ msgstr "D-Bus egenskapene til Gajim kan ikke brukes"
 
 #: ../src/common/exceptions.py:22
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (også kjent som python-pysqlite2) avhengighet mangler. Avslutter..."
+msgstr ""
+"pysqlite2 (også kjent som python-pysqlite2) avhengighet mangler. Avslutter..."
 
 #: ../src/common/exceptions.py:30
 msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr "Tjeneste ikke tilgjengelig: Gajim kjører ikke, eller remote_control er satt til False"
+msgstr ""
+"Tjeneste ikke tilgjengelig: Gajim kjører ikke, eller remote_control er satt "
+"til False"
 
 #: ../src/common/exceptions.py:38
 msgid "D-Bus is not present on this machine or python module is missing"
@@ -5801,68 +6214,55 @@ msgstr "tolv"
 
 #. 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
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 msgid "%0 o'clock"
 msgstr "klokken %0"
 
-#: ../src/common/fuzzyclock.py:47
-#: ../src/common/fuzzyclock.py:55
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 msgid "five past %0"
 msgstr "fem over %0"
 
-#: ../src/common/fuzzyclock.py:47
-#: ../src/common/fuzzyclock.py:56
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
 msgid "ten past %0"
 msgstr "ti over %0"
 
-#: ../src/common/fuzzyclock.py:48
-#: ../src/common/fuzzyclock.py:56
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
 msgid "quarter past %0"
 msgstr "kvart over %0"
 
-#: ../src/common/fuzzyclock.py:48
-#: ../src/common/fuzzyclock.py:57
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
 msgid "twenty past %0"
 msgstr "ti på halv %1"
 
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:57
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
 msgid "twenty five past %0"
 msgstr "fem på halv %1"
 
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:58
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
 msgid "half past %0"
 msgstr "halv %1"
 
-#: ../src/common/fuzzyclock.py:50
-#: ../src/common/fuzzyclock.py:58
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
 msgid "twenty five to %1"
 msgstr "fem over halv %1"
 
-#: ../src/common/fuzzyclock.py:50
-#: ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
 msgid "twenty to %1"
 msgstr "ti over halv %1"
 
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
 msgid "quarter to %1"
 msgstr "kvart på %1"
 
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
 msgid "ten to %1"
 msgstr "ti til %1"
 
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
 msgid "five to %1"
 msgstr "fem på %1"
 
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
 msgid "%1 o'clock"
 msgstr "%1"
 
@@ -6036,10 +6436,6 @@ msgstr "?Subscription we already have:Ingen"
 msgid "To"
 msgstr "Til"
 
-#: ../src/common/helpers.py:259
-msgid "From"
-msgstr "Fra"
-
 #: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Begge"
@@ -6117,36 +6513,35 @@ msgstr "tok pause i skriving av en melding"
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanen"
 
-#: ../src/common/helpers.py:880
+#: ../src/common/helpers.py:881
 #, python-format
 msgid " %d unread message"
 msgid_plural " %d unread messages"
 msgstr[0] "%d ulest melding"
 msgstr[1] "%d uleste meldinger"
 
-#: ../src/common/helpers.py:886
+#: ../src/common/helpers.py:887
 #, python-format
 msgid " %d unread single message"
 msgid_plural " %d unread single messages"
 msgstr[0] "%d ulest enkelt melding"
 msgstr[1] "%d uleste enkelt meldinger"
 
-#: ../src/common/helpers.py:892
+#: ../src/common/helpers.py:893
 #, python-format
 msgid " %d unread group chat message"
 msgid_plural " %d unread group chat messages"
 msgstr[0] "%d ulest gruppesamtale melding"
 msgstr[1] "%d uleste gruppesamtale meldinger"
 
-#: ../src/common/helpers.py:898
+#: ../src/common/helpers.py:899
 #, python-format
 msgid " %d unread private message"
 msgid_plural " %d unread private messages"
 msgstr[0] "%d ulest privat melding"
 msgstr[1] "%d uleste private meldinger"
 
-#: ../src/common/helpers.py:908
-#: ../src/common/helpers.py:910
+#: ../src/common/helpers.py:909 ../src/common/helpers.py:911
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -6161,8 +6556,7 @@ msgstr "feil: kan ikke åpne %s for lesing"
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:192
-#: ../src/common/optparser.py:193
+#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
 msgid "cyan"
 msgstr "turkis"
 
@@ -6176,7 +6570,8 @@ msgid "Gajim account %s"
 msgstr "Gajim konto %s"
 
 #: ../src/common/zeroconf/client_zeroconf.py:189
-msgid "Connection to host could not be established: Incorrect answer from server."
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
 msgstr "Tilkobling til maskinen kunne ikke opprettes: Feil svar fra serveren."
 
 #: ../src/common/zeroconf/client_zeroconf.py:205
@@ -6184,8 +6579,11 @@ msgid "Connection to host could not be established"
 msgstr "Tilkobling til maskin kunne ikke opprettes"
 
 #: ../src/common/zeroconf/client_zeroconf.py:334
-msgid "Connection to host could not be established: Timeout while sending data."
-msgstr "Tilkobling til maskinen kunne ikke opprettes: Tidsutløp under sending av data."
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"Tilkobling til maskinen kunne ikke opprettes: Tidsutløp under sending av "
+"data."
 
 #: ../src/common/zeroconf/client_zeroconf.py:629
 msgid "Contact is offline. Your message could not be sent."
@@ -6233,8 +6631,12 @@ msgid "Could not change status of account \"%s\""
 msgstr "Kunne ikke endre status til 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 "Du er ikke tilkoblet eller er usynlig for andre. Din melding kunne ikke sendes."
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+"Du er ikke tilkoblet eller er usynlig for andre. Din melding kunne ikke "
+"sendes."
 
 #. we're not english
 #: ../src/common/zeroconf/connection_zeroconf.py:353
@@ -6249,10 +6651,13 @@ msgstr "Feil ved tilføying av tjeneste. %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)"
@@ -6279,42 +6684,57 @@ msgstr "Feil ved tilføying av tjeneste. %s"
 #, fuzzy
 #~ msgid "Not Available "
 #~ msgstr "Ikke tilgjengelig"
+
 #~ msgid "Contact _Info"
 #~ msgstr "Kontakt_Info"
+
 #~ msgid "Contact Information"
 #~ msgstr "Kontaktinformasjon"
+
 #~ msgid "Jabber"
 #~ msgstr "Jabber"
+
 #~ msgid "Invalid room or server name"
 #~ msgstr "Ugyldig rom eller servernavn"
+
 #~ msgid "Unknown D-Bus version: %s"
 #~ msgstr "Ukjent D-Bus versjon: %s"
+
 #~ msgid "vCard publication succeeded"
 #~ msgstr "vCard publisering vellykket"
+
 #~ msgid "Your personal information has been published successfully."
 #~ msgstr "Din personlige informasjon har blitt publisert uten feil."
+
 #~ msgid "Migrating Logs..."
 #~ msgstr "Migrerer Logger..."
-#~ msgid "Please wait while logs are being migrated..."
-#~ msgstr "Vennligst vent mens loggene blir migrert..."
+
 #~ msgid "_Join New Room"
 #~ msgstr "_Bli med i Nytt Rom"
+
 #~ msgid "Gajim - %d unread message"
 #~ msgid_plural "Gajim - %d unread messages"
 #~ msgstr[0] "Gajim - %d ulest melding"
 #~ msgstr[1] "Gajim - %d uleste meldinger"
+
 #~ msgid "Since %s"
 #~ msgstr "Siden %s"
+
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Automatisk godkjenn kontakt"
+
 #~ msgid "Send File"
 #~ msgstr "Send Fil"
+
 #~ msgid "Underline"
 #~ msgstr "Strek Under"
+
 #~ msgid "Would you like to overwrite it?"
 #~ msgstr "Ønsker du å overskrive den?"
+
 #~ msgid "_Join New Room..."
 #~ msgstr "_Bli med i Nytt Rom"
+
 #~ msgid "Usage: /%s, sets the groupchat window to compact mode."
 #~ msgstr ""
 #~ "Bruksanvisning: /%s, setter gruppesamtale vinduet til kompakt modus."
@@ -6322,6 +6742,7 @@ msgstr "Feil ved tilføying av tjeneste. %s"
 #, fuzzy
 #~ msgid "<b>Please modify your special notification below</b>"
 #~ msgstr "<b>Vennligst velg ett av valgene under:</b>"
+
 #~ msgid "Delete Message of the Day"
 #~ msgstr "Slett Melding for Dagen"
 
@@ -6332,101 +6753,140 @@ msgstr "Feil ved tilføying av tjeneste. %s"
 #, fuzzy
 #~ msgid "I want to listen to:"
 #~ msgstr "%s ønsker å sende deg en fil:"
+
 #~ msgid "Send _New Message..."
 #~ msgstr "Send _Ny Melding..."
+
 #~ msgid "Set Message of the Day"
 #~ msgstr "Velg Melding for Dagen"
+
 #~ msgid "Update Message of the Day"
 #~ msgstr "Oppdater Melding for Dagen"
+
 #~ msgid "_XML Console..."
 #~ msgstr "_XML Konsoll..."
+
 #~ msgid "Choose Avatar"
 #~ msgstr "Velg Bilde"
+
 #~ msgid "Use compact view when you open a chat window"
 #~ msgstr "Bruk kompakt utseende når du åpner et samtale vindu"
+
 #~ msgid "Use compact view when you open a group chat window"
 #~ msgstr "Bruk kompakt utseende når du åpner et gruppe samtale vindu"
+
 #~ msgid "plain"
 #~ msgstr "enkel"
+
 #~ msgid "Send"
 #~ msgstr "Send"
+
 #~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
 #~ msgstr "%(nickname)s i rom %(room_name)s har sendt deg en ny melding."
+
 #~ msgid "%s has sent you a new message."
 #~ msgstr "%s har sendt deg en ny melding."
 
 #, fuzzy
 #~ msgid "GUI Migration failed"
 #~ msgstr "vCard publisering feilet"
+
 #~ msgid "Logs have been successfully migrated to the database."
 #~ msgstr "Loggene ble migrert til databasen uten feil."
+
 #~ msgid "If checked, Gajim will also have a trayicon"
 #~ msgstr "Dresom valgt vil Gajim ha et statusikon (trayicon)"
 
 #, fuzzy
 #~ msgid "Start Chat with Contact"
 #~ msgstr "Start samtale med konto %s"
+
 #~ msgid "All contacts in this group are offline or have errors"
 #~ msgstr "Alle kontakter in denne gruppen er frakoblet eller har feil"
+
 #~ msgid "Size: "
 #~ msgstr "Størrelse: "
+
 #~ msgid "Session bus is not available"
 #~ msgstr "Sesjons buss ikke tilgjengelig"
+
 #~ msgid "Sound"
 #~ msgstr "Lyd"
+
 #~ msgid "Text"
 #~ msgstr "Tekst"
+
 #~ msgid "Image"
 #~ msgstr "Bilde"
+
 #~ msgid "From %s"
 #~ msgstr "Fra %s"
+
 #~ msgid "To %s"
 #~ msgstr "Til %s"
+
 #~ msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 #~ msgstr "Du har blitt invitert til %(room_jid)s rommet av %(contact_jid)s"
+
 #~ msgid "Manage Emoticons"
 #~ msgstr "Behandle Uttrykksikoner"
+
 #~ msgid "Or choose a preset message:"
 #~ msgstr "Eller velg en forhåndsvalgt melding:"
+
 #~ msgid "Use _emoticons"
 #~ msgstr "Bruk _uttrykksikoner"
+
 #~ msgid "_Set Image..."
 #~ msgstr "_Velg Bilde..."
+
 #~ msgid "Switch to %s"
 #~ msgstr "Endre til %s"
+
 #~ msgid "using account "
 #~ msgstr "bruker konto"
+
 #~ msgid "The filesize of image \"%s\" is too large"
 #~ msgstr "Filstørrelsen på bilde \"%s\" er for stor"
+
 #~ msgid "The file must not be more than 32 kilobytes."
 #~ msgstr "Filen må ikke være mer enn 32 kilobyte."
+
 #~ msgid "Timeout"
 #~ msgstr "Tidsavbrudd"
-#~ msgid "A protocol error has occured:"
-#~ msgstr "En protokoll feil har skjedd:"
+
 #~ msgid "account: "
 #~ msgstr "konto:"
+
 #~ msgid "Are you sure you want to leave rooms \"%s\"?"
 #~ msgstr "Er du sikker på at du vil gå ut av rommene \"%s\"?"
+
 #~ msgid "If you close this window, you will be disconnected from these rooms."
 #~ msgstr ""
 #~ "Dersom du lukker dette vinduet, så vil du bli frakoblet fra disse rommene."
+
 #~ msgid "Activate/Disable notification for when a file transfer is complete"
 #~ msgstr "Aktiver/Deaktiver melding om at filoverføring er komplett"
+
 #~ msgid "Removing selected file transfer"
 #~ msgstr "Fjern valgte filoverføring"
+
 #~ msgid "Stoping selected file transfer"
 #~ msgstr "Stopp valgte filoverføring"
+
 #~ msgid ""
 #~ "If you close this tab and you have history disabled, the message will be "
 #~ "lost."
 #~ msgstr ""
 #~ "Dersom du lukke denne fanen og du har slått av historikk, vil meldingen "
 #~ "bli borte."
+
 #~ msgid "Cannot remove last group"
 #~ msgstr "Kan ikke fjerne den siste gruppen"
+
 #~ msgid "At least one contact group must be present."
 #~ msgstr "Du må ha minst en kontakt gruppe."
+
 #~ msgid ""
 #~ "pysqlite2 (aka python-pysqlite2) dependency is missing. After you install "
 #~ "pysqlite3, if you want to migrate your logs to the new database, please "
@@ -6436,12 +6896,13 @@ msgstr "Feil ved tilføying av tjeneste. %s"
 #~ "installert pysqlite2, og om du ønsker å migrere loggene dine til den nye "
 #~ "databasen, vennligst les:http://trac.gajim.org/wiki/MigrateLogToDot9DB "
 #~ "Avslutter..."
+
 #~ msgid "Image is too big"
 #~ msgstr "Bilde er for stort"
+
 #~ msgid ""
 #~ "Image for emoticon has to be less than or equal to 24 pixels in width and "
 #~ "24 in height."
 #~ msgstr ""
 #~ "Bilde for uttrykksikon må være mindre enn eller lik 24 piksler i bredde "
 #~ "og 24 i høyde."
-
diff --git a/po/nl.po b/po/nl.po
index 120093892..7fd15ca8f 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-12-02 17:15+0100\n"
+"POT-Creation-Date: 2006-12-09 10:02+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"
@@ -324,16 +324,16 @@ msgid "Manage..."
 msgstr "Beheer..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1637
-#: ../src/config.py:3430
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1642
+#: ../src/config.py:3435
 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:1219
-#: ../src/config.py:1224 ../src/config.py:1408 ../src/config.py:1627
-#: ../src/config.py:1636 ../src/config.py:1695 ../src/config.py:1769
-#: ../src/config.py:2640 ../src/config.py:3420 ../src/config.py:3429
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1224
+#: ../src/config.py:1229 ../src/config.py:1413 ../src/config.py:1632
+#: ../src/config.py:1641 ../src/config.py:1700 ../src/config.py:1774
+#: ../src/config.py:2645 ../src/config.py:3425 ../src/config.py:3434
 #: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Geen"
@@ -526,6 +526,46 @@ msgstr "Re_gistreer"
 msgid "_User ID:"
 msgstr "Gebruikers ID:"
 
+#: ../data/glade/adhoc_commands_window.glade.h:1
+#, fuzzy
+msgid "<b>An error has occured:</b>"
+msgstr "Een protocolfout is opgetreden:"
+
+#: ../data/glade/adhoc_commands_window.glade.h:2
+msgid "<b>Choose command to execute:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:3
+msgid "Ad-hoc Commands - Gajim"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:4
+msgid "Check once more"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:5
+#, fuzzy
+msgid "Error description..."
+msgstr "Beschrijving"
+
+#: ../data/glade/adhoc_commands_window.glade.h:6
+#, fuzzy
+msgid "Please wait while retrieving command list..."
+msgstr "Een ogenblik geduld terwijl je logboeken omgezet worden..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:7
+#, fuzzy
+msgid "Please wait while the command is sending..."
+msgstr "Een ogenblik geduld terwijl je logboeken omgezet worden..."
+
+#: ../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>Beschrijving</b>"
@@ -674,13 +714,13 @@ msgstr "Speel _geluiden af"
 #: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
-"Contact Connected\n"
-"Contact Disconnected\n"
-"Contact Change Status\n"
-"Group Chat Message Highlight\n"
-"Group Chat Message Received\n"
-"File Transfert Resquest\n"
-"File Transfert Started\n"
+"Contact Connected \n"
+"Contact Disconnected \n"
+"Contact Change Status \n"
+"Group Chat Message Highlight \n"
+"Group Chat Message Received \n"
+"File Transfert Resquest \n"
+"File Transfert Started \n"
 "File Transfert Finished"
 msgstr ""
 
@@ -754,6 +794,46 @@ msgstr "Poort: "
 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 "Land:"
+
+#: ../data/glade/atom_entry_window.glade.h:4
+#, fuzzy
+msgid "Feed name:"
+msgstr "thema naam"
+
+#: ../data/glade/atom_entry_window.glade.h:5
+#, fuzzy
+msgid "Last modified:"
+msgstr "Naam:"
+
+#: ../data/glade/atom_entry_window.glade.h:6
+#, fuzzy
+msgid "New entry received"
+msgstr "Als een nieuwe gebeurtenis ontvangen is"
+
+#: ../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 "Verander Wachtwoord"
@@ -842,7 +922,7 @@ msgstr "_Compacte Weergave    Alt+C"
 msgid "_History"
 msgstr "_Geschiedenis"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/glade/data_form_window.glade.h:1 ../src/dataforms_widget.py:76
 #, fuzzy
 msgid "Fill in the form."
 msgstr "In de groep"
@@ -1063,6 +1143,21 @@ msgstr "Ver_stuur Privé Bericht"
 msgid "_Voice"
 msgstr "_Stem"
 
+#: ../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:259
+msgid "From"
+msgstr "Van"
+
+#. holds subject
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141
+#: ../src/history_manager.py:172
+#, fuzzy
+msgid "Subject"
+msgstr "Onderwerp:"
+
 #: ../data/glade/history_manager.glade.h:1
 msgid ""
 "<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
@@ -1222,7 +1317,7 @@ 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:1116
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP Versleuteling"
 
@@ -1350,7 +1445,7 @@ msgstr ""
 msgid "B_efore nickname:"
 msgstr "Voor bijnaam:"
 
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:841
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
 msgid "Chat"
 msgstr "Gesprek"
 
@@ -2500,36 +2595,36 @@ 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:841
+#: ../src/chat_control.py:844
 #, fuzzy
 msgid "Chats"
 msgstr "Gesprek"
 
-#: ../src/chat_control.py:1042
+#: ../src/chat_control.py:1030
 #, fuzzy, python-format
 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:1130
+#: ../src/chat_control.py:1118
 #, 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:1266
+#: ../src/chat_control.py:1254
 msgid "Encryption enabled"
 msgstr "Versleuteling ingeschakeld"
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1259
 msgid "Encryption disabled"
 msgstr "Versleuteling uitgeschakeld"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1413 ../src/conversation_textview.py:493
-#: ../src/dialogs.py:629 ../src/gajim.py:727 ../src/gajim.py:728
-#: ../src/gajim.py:1067 ../src/roster_window.py:328
+#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495
+#: ../src/dialogs.py:629 ../src/gajim.py:733 ../src/gajim.py:734
+#: ../src/gajim.py:1073 ../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
@@ -2540,12 +2635,12 @@ msgid "Not in Roster"
 msgstr "niet in het rooster"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1545
 #, 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:1558
+#: ../src/chat_control.py:1546
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2553,333 +2648,333 @@ msgstr ""
 "Als je deze tab sluit en geschiedenis uitgeschakeld hebt zal dit bericht "
 "verlorgen gaan."
 
-#: ../src/config.py:130 ../src/config.py:589
+#: ../src/config.py:135 ../src/config.py:594
 msgid "Disabled"
 msgstr ""
 
-#: ../src/config.py:216
+#: ../src/config.py:221
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Elke %s _minuten"
 
-#: ../src/config.py:358
+#: ../src/config.py:363
 msgid "Active"
 msgstr "Actief"
 
-#: ../src/config.py:366
+#: ../src/config.py:371
 msgid "Event"
 msgstr "Gebeurtenis"
 
-#: ../src/config.py:679 ../src/gajim.py:2086
+#: ../src/config.py:684 ../src/gajim.py:2094
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Er is geen verbinding beschikbaar"
 
-#: ../src/config.py:680 ../src/gajim.py:2087
+#: ../src/config.py:685 ../src/gajim.py:2095
 #, 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:1032
+#: ../src/config.py:1037
 msgid "status message title"
 msgstr "titel statusbericht"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1037
 msgid "status message text"
 msgstr "statusbericht"
 
-#: ../src/config.py:1067
+#: ../src/config.py:1072
 msgid "First Message Received"
 msgstr ""
 
-#: ../src/config.py:1068
+#: ../src/config.py:1073
 #, fuzzy
 msgid "Next Message Received"
 msgstr "Nieuw Bericht"
 
-#: ../src/config.py:1069
+#: ../src/config.py:1074
 #, fuzzy
 msgid "Contact Connected"
 msgstr "Contactnaam"
 
-#: ../src/config.py:1070
+#: ../src/config.py:1075
 #, fuzzy
 msgid "Contact Disconnected"
 msgstr "Contact is Ingelogd"
 
-#: ../src/config.py:1071
+#: ../src/config.py:1076
 #, fuzzy
 msgid "Message Sent"
 msgstr "_Bericht"
 
-#: ../src/config.py:1072
+#: ../src/config.py:1077
 msgid "Group Chat Message Highlight"
 msgstr ""
 
-#: ../src/config.py:1073
+#: ../src/config.py:1078
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: ../src/config.py:1080
+#: ../src/config.py:1085
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Uitnodiging Ontvangen"
 
-#: ../src/config.py:1283
+#: ../src/config.py:1288
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP is niet bruikbaar op deze computer"
 
-#: ../src/config.py:1329
+#: ../src/config.py:1334
 msgid "You are currently connected to the server"
 msgstr "Je bent momenteel verbonden met de server"
 
-#: ../src/config.py:1330
+#: ../src/config.py:1335
 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:1333 ../src/config.py:1925
+#: ../src/config.py:1338 ../src/config.py:1930
 msgid "Unread events"
 msgstr ""
 
-#: ../src/config.py:1334
+#: ../src/config.py:1339
 #, 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:1338
+#: ../src/config.py:1343
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:1339
+#: ../src/config.py:1344
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 
-#: ../src/config.py:1343 ../src/config.py:1347
+#: ../src/config.py:1348 ../src/config.py:1352
 msgid "Invalid account name"
 msgstr "Ongeldige account naam"
 
-#: ../src/config.py:1344
+#: ../src/config.py:1349
 msgid "Account name cannot be empty."
 msgstr "Account naam kan niet leeg zijn."
 
-#: ../src/config.py:1348
+#: ../src/config.py:1353
 msgid "Account name cannot contain spaces."
 msgstr "Account naam mag geen spaties bevatten."
 
-#: ../src/config.py:1356 ../src/config.py:1362 ../src/config.py:1372
-#: ../src/config.py:3030
+#: ../src/config.py:1361 ../src/config.py:1367 ../src/config.py:1377
+#: ../src/config.py:3035
 msgid "Invalid Jabber ID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1368
 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:1422
+#: ../src/config.py:1427
 msgid "Invalid entry"
 msgstr "Ongeldige invoer"
 
-#: ../src/config.py:1423
+#: ../src/config.py:1428
 msgid "Custom port must be a port number."
 msgstr "Aangepaste poort moet een geldig poortnummer zijn."
 
-#: ../src/config.py:1549 ../src/common/config.py:363
+#: ../src/config.py:1554 ../src/common/config.py:363
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1559
+#: ../src/config.py:1564
 msgid "Relogin now?"
 msgstr ""
 
-#: ../src/config.py:1560
+#: ../src/config.py:1565
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 
-#: ../src/config.py:1586
+#: ../src/config.py:1591
 msgid "No such account available"
 msgstr "Account bestaat niet"
 
-#: ../src/config.py:1587
+#: ../src/config.py:1592
 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:1594 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/config.py:1599 ../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:1595
+#: ../src/config.py:1600
 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:1599
+#: ../src/config.py:1604
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1600
+#: ../src/config.py:1605
 #, 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:1624 ../src/config.py:3417
+#: ../src/config.py:1629 ../src/config.py:3422
 msgid "Failed to get secret keys"
 msgstr "Kon de geheime sleutel niet ophalen"
 
-#: ../src/config.py:1625 ../src/config.py:3418
+#: ../src/config.py:1630 ../src/config.py:3423
 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:1628 ../src/config.py:3421
+#: ../src/config.py:1633 ../src/config.py:3426
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Versleuteling"
 
-#: ../src/config.py:1629 ../src/config.py:3422
+#: ../src/config.py:1634 ../src/config.py:3427
 msgid "Choose your OpenPGP key"
 msgstr "Kies je OpenPGP sleutel"
 
 #. Name column
-#: ../src/config.py:1859 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/config.py:1864 ../src/disco.py:740 ../src/disco.py:1466
 #: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Naam"
 
-#: ../src/config.py:1862
+#: ../src/config.py:1867
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1931
 msgid "Read all pending events before removing this account."
 msgstr ""
 
-#: ../src/config.py:1963
+#: ../src/config.py:1968
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Je hebt geen actieve account"
 
-#: ../src/config.py:1964
+#: ../src/config.py:1969
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:2023
+#: ../src/config.py:2028
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:2024
+#: ../src/config.py:2029
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2256
+#: ../src/config.py:2261
 #, python-format
 msgid "Edit %s"
 msgstr "Wijzig %s"
 
-#: ../src/config.py:2258
+#: ../src/config.py:2263
 #, python-format
 msgid "Register to %s"
 msgstr "Registreer met %s"
 
 #. list at the begining
-#: ../src/config.py:2330
+#: ../src/config.py:2335
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:2331
+#: ../src/config.py:2336
 #, fuzzy
 msgid "Member List"
 msgstr "_Lid"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2337
 #, fuzzy
 msgid "Owner List"
 msgstr "_Eigenaar"
 
-#: ../src/config.py:2333
+#: ../src/config.py:2338
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrator"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2366 ../src/disco.py:747 ../src/history_manager.py:154
+#: ../src/config.py:2371 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2374
+#: ../src/config.py:2379
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:2379
+#: ../src/config.py:2384
 #, fuzzy
 msgid "Nick"
 msgstr "Uit_schoppen"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2388
 #, fuzzy
 msgid "Role"
 msgstr "Rol:"
 
-#: ../src/config.py:2404
+#: ../src/config.py:2409
 #, fuzzy
 msgid "Banning..."
 msgstr "%s verbannen"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2406
+#: ../src/config.py:2411
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2413
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:2409
+#: ../src/config.py:2414
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2411
+#: ../src/config.py:2416
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:2412
+#: ../src/config.py:2417
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2419
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrator"
 
-#: ../src/config.py:2415
+#: ../src/config.py:2420
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2416
+#: ../src/config.py:2421
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2889,102 +2984,102 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2521
+#: ../src/config.py:2526
 #, python-format
 msgid "Removing %s account"
 msgstr "Account %s wordt verwijdert"
 
-#: ../src/config.py:2538 ../src/roster_window.py:2667
+#: ../src/config.py:2543 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Wachtwoord Vereist"
 
-#: ../src/config.py:2539 ../src/roster_window.py:2668
+#: ../src/config.py:2544 ../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:2540 ../src/roster_window.py:2669
+#: ../src/config.py:2545 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Sla wachtwoord op"
 
-#: ../src/config.py:2554
+#: ../src/config.py:2559
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" heeft verbinding met de server"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2560
 msgid "If you remove it, the connection will be lost."
 msgstr "Als je het verwijdert, wordt de verbinding verbroken."
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 #, fuzzy
 msgid "Default"
 msgstr "Wis MOTD"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Print tijd:"
 
-#: ../src/config.py:2640
+#: ../src/config.py:2645
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2710
+#: ../src/config.py:2715
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Groupsgesprek"
 
-#: ../src/config.py:2742
+#: ../src/config.py:2747
 msgid "This bookmark has invalid data"
 msgstr "Deze bladwijzer bevat ongeldige informatie"
 
-#: ../src/config.py:2743
+#: ../src/config.py:2748
 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:3005
+#: ../src/config.py:3010
 msgid "Invalid username"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/config.py:3006
+#: ../src/config.py:3011
 msgid "You must provide a username to configure this account."
 msgstr "Je moet een gebruikersnaam invullen om deze account te configureren."
 
-#: ../src/config.py:3016 ../src/dialogs.py:1316
+#: ../src/config.py:3021 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Ongeldig wachtwoord"
 
-#: ../src/config.py:3017
+#: ../src/config.py:3022
 msgid "You must enter a password for the new account."
 msgstr "Je moet een wachtwoord invullen voor de nieuwe account"
 
-#: ../src/config.py:3021 ../src/dialogs.py:1321
+#: ../src/config.py:3026 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Wachtwoord komt niet overeen"
 
-#: ../src/config.py:3022 ../src/dialogs.py:1322
+#: ../src/config.py:3027 ../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:3041
+#: ../src/config.py:3046
 #, fuzzy
 msgid "Duplicate Jabber ID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/config.py:3042
+#: ../src/config.py:3047
 #, fuzzy
 msgid "This account is already configured in Gajim."
 msgstr "Deze contact staat al op je rooster"
 
-#: ../src/config.py:3059
+#: ../src/config.py:3064
 msgid "Account has been added successfully"
 msgstr "Account is met succes toegevoegd"
 
-#: ../src/config.py:3060 ../src/config.py:3095
+#: ../src/config.py:3065 ../src/config.py:3100
 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."
@@ -2992,23 +3087,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:3094
+#: ../src/config.py:3099
 msgid "Your new account has been created successfully"
 msgstr "Je nieuwe account is met succes aangemaakt"
 
-#: ../src/config.py:3112
+#: ../src/config.py:3117
 msgid "An error occured during account creation"
 msgstr "Er is een gout opgetreden bij het aanmaken van de account"
 
-#: ../src/config.py:3170
+#: ../src/config.py:3175
 msgid "Account name is in use"
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:3171
+#: ../src/config.py:3176
 msgid "You already have an account using this name."
 msgstr "Je hebt al een account met deze naam."
 
-#: ../src/conversation_textview.py:271
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3016,57 +3111,66 @@ msgstr ""
 "Tekst onder deze streep is gezegd nadat je laatst op dit groepsgesprek gelet "
 "hebt."
 
-#: ../src/conversation_textview.py:340
+#: ../src/conversation_textview.py:342
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Acties voor \"%s\""
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Lees _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Zoek op in het _Woordenboek"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:373
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 "\"%s\" ontbreekt in de URL van het woordenboek en het is geen WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:386
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "\"%s\" ontbreekt in de URL van de Web Zoekmachine"
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "_Zoek op het Web"
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:397
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:755
+#: ../src/conversation_textview.py:757
 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:759
+#: ../src/conversation_textview.py:761
 #, python-format
 msgid "%i days ago"
 msgstr "%i dagen geleden"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:791
+#: ../src/conversation_textview.py:793
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Onderwerp: %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
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
@@ -3339,29 +3443,29 @@ msgstr "Nieuw Enkel Bericht"
 msgid "New Private Message"
 msgstr "Nieuw Privé Bericht"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1161 ../src/notify.py:424
+#: ../src/dialogs.py:1369 ../src/gajim.py:1168 ../src/notify.py:424
 msgid "New E-mail"
 msgstr ""
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1314 ../src/notify.py:418
+#: ../src/dialogs.py:1371 ../src/gajim.py:1321 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Bestandsoverdracht Verzoek"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1134 ../src/gajim.py:1290
+#: ../src/dialogs.py:1373 ../src/gajim.py:1140 ../src/gajim.py:1297
 #: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Bestandsoverdracht Fout"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1353 ../src/gajim.py:1375
-#: ../src/gajim.py:1392 ../src/notify.py:422
+#: ../src/dialogs.py:1375 ../src/gajim.py:1360 ../src/gajim.py:1382
+#: ../src/gajim.py:1399 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Bestandsoverdracht Voltooid"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1356 ../src/notify.py:422
+#: ../src/dialogs.py:1376 ../src/gajim.py:1363 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Bestandsoverdracht Gestopt"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1032 ../src/notify.py:426
+#: ../src/dialogs.py:1378 ../src/gajim.py:1038 ../src/notify.py:426
 #, fuzzy
 msgid "Groupchat Invitation"
 msgstr "?Group Chat Contact Role:Geen"
@@ -3723,32 +3827,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:682
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
 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:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "This file already exists"
 msgstr "Dit bestands bestaat al"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3881,57 +3985,58 @@ msgstr "Verbinding"
 msgid "Subject: %s"
 msgstr "Onderwerp: %s\n"
 
-#: ../src/gajim.py:703
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:703 ../src/gajim.py:716
 #, fuzzy, python-format
 msgid "error while sending %s ( %s )"
 msgstr "fout tijdens versturen"
 
-#: ../src/gajim.py:743
+#: ../src/gajim.py:749
 msgid "Authorization accepted"
 msgstr "Machtiging geaccepteerd"
 
-#: ../src/gajim.py:744
+#: ../src/gajim.py:750
 #, 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:752
+#: ../src/gajim.py:758
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" heeft het abonnement op jou opgezegd"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:759
 msgid "You will always see him or her as offline."
 msgstr "Je zult hem altijd als offline zien."
 
-#: ../src/gajim.py:796
+#: ../src/gajim.py:802
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kan geen contact maken met \"%s\""
 
-#: ../src/gajim.py:797 ../src/common/connection.py:395
+#: ../src/gajim.py:803 ../src/common/connection.py:395
 msgid "Check your connection or try again later."
 msgstr "Controleer de verbinding of probeer later nogmaals."
 
-#: ../src/gajim.py:945 ../src/roster_window.py:1201
+#: ../src/gajim.py:951 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s is nu %s (%s)"
 
-#: ../src/gajim.py:1042
+#: ../src/gajim.py:1048
 msgid "Your passphrase is incorrect"
 msgstr "Je wachtwoord is incorrect"
 
-#: ../src/gajim.py:1043
+#: ../src/gajim.py:1049
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Je bent momenteel verbonden zonder OpenPGP sleutel."
 
-#: ../src/gajim.py:1145
+#: ../src/gajim.py:1151
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1147
+#: ../src/gajim.py:1153
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3941,61 +4046,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:1156
+#: ../src/gajim.py:1162
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1311
+#: ../src/gajim.py:1318
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wil je een bestand sturen."
 
-#: ../src/gajim.py:1376
+#: ../src/gajim.py:1383
 #, 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:1380
+#: ../src/gajim.py:1387
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Bestandsoverdracht van %(filename)s van %(name)s gestopt."
 
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1400
 #, 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:1397
+#: ../src/gajim.py:1404
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Bestandsoverdracht van %(filename)s aan %(name)s gestopt."
 
-#: ../src/gajim.py:1503
+#: ../src/gajim.py:1510
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1504
+#: ../src/gajim.py:1511
 #, 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:1842
+#: ../src/gajim.py:1850
 msgid "Could not save your settings and preferences"
 msgstr "Kan je instellingen en voorkeuren niet opslaan"
 
-#: ../src/gajim.py:2034
+#: ../src/gajim.py:2042
 #, fuzzy
 msgid "Network Manager support not available"
 msgstr "Er is geen verbinding beschikbaar"
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2117
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Sessiebeheer ondersteuning is niet beschikbaar (gnome.ui module ontbreekt)"
@@ -4349,122 +4454,122 @@ msgstr "Je kunt je huidige thema niet verwijderen"
 msgid "Please first choose another for your current theme."
 msgstr "Kies eerst een ander thema."
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 #, fuzzy
 msgid "Private Chat"
 msgstr "Start Gesprek"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 #, fuzzy
 msgid "Private Chats"
 msgstr "Start Gesprek"
 
-#: ../src/groupchat_control.py:120
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Sturen van privé bericht mislukt"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:124
 #, 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
+#: ../src/groupchat_control.py:143
 msgid "Group Chat"
 msgstr "Groupsgesprek"
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 #, fuzzy
 msgid "Group Chats"
 msgstr "Groupsgesprek"
 
-#: ../src/groupchat_control.py:315
+#: ../src/groupchat_control.py:317
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Verander Bij_naam"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:810
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s is uit de ruimte geschopt: %(reason)s"
 
-#: ../src/groupchat_control.py:814
+#: ../src/groupchat_control.py:816
 #, 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:821
+#: ../src/groupchat_control.py:823
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s is uit de ruimte verbannen: %(reason)s"
 
-#: ../src/groupchat_control.py:825
+#: ../src/groupchat_control.py:827
 #, 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:833
+#: ../src/groupchat_control.py:835
 #, python-format
 msgid "You are now known as %s"
 msgstr "Je staat nu bekend als %s"
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:837
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s is nu bekend als %s"
 
-#: ../src/groupchat_control.py:915
+#: ../src/groupchat_control.py:917
 #, python-format
 msgid "%s has left"
 msgstr "%s heeft de ruimte verlaten"
 
-#: ../src/groupchat_control.py:920
+#: ../src/groupchat_control.py:922
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "In de groep"
 
 #. No status message
-#: ../src/groupchat_control.py:922 ../src/roster_window.py:1204
+#: ../src/groupchat_control.py:924 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s is nu %s"
 
-#: ../src/groupchat_control.py:1041 ../src/groupchat_control.py:1059
-#: ../src/groupchat_control.py:1152 ../src/groupchat_control.py:1169
+#: ../src/groupchat_control.py:1043 ../src/groupchat_control.py:1061
+#: ../src/groupchat_control.py:1154 ../src/groupchat_control.py:1171
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Bijnaam niet gevonden: %s"
 
-#: ../src/groupchat_control.py:1075
+#: ../src/groupchat_control.py:1077
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "Deze ruimte heeft geen onderwerp"
 
-#: ../src/groupchat_control.py:1088
+#: ../src/groupchat_control.py:1090
 #, 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:1095 ../src/groupchat_control.py:1123
+#: ../src/groupchat_control.py:1097 ../src/groupchat_control.py:1125
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s blijkt geen geldige JID te zijn"
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1208
 #, 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:1229
+#: ../src/groupchat_control.py:1231
 #, python-format
 msgid "Commands: %s"
 msgstr "Commando's: %s"
 
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1233
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4477,7 +4582,7 @@ msgstr ""
 "\" bevat. Als de JID zich momenteel in de ruimte bevindt, zal hij eruit "
 "geschopt worden. Ondersteunt GEEN spaties in de bijnaam."
 
-#: ../src/groupchat_control.py:1238
+#: ../src/groupchat_control.py:1240
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4485,12 +4590,12 @@ msgstr ""
 "Gebruik: /%s <bijnaam>, opent een privé gespreksvenster met de opgegeven "
 "gebruiker."
 
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1244
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Gebruik: /%s, leegt het tekst venster."
 
-#: ../src/groupchat_control.py:1244
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4499,12 +4604,12 @@ msgstr ""
 "Gebruik: /%s [reden], sluit de huidige tab of venster, en laat reden achter "
 "indien opgegeven."
 
-#: ../src/groupchat_control.py:1247
+#: ../src/groupchat_control.py:1249
 #, fuzzy, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Gebruik: /%s, leegt het tekst venster."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1252
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4513,7 +4618,7 @@ msgstr ""
 "Gebruik: /%s <JID> [reden], nodigt JID uit de huidige ruimte binnen te "
 "komen, met optioneel de opgegeven reden."
 
-#: ../src/groupchat_control.py:1254
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4522,7 +4627,7 @@ msgstr ""
 "Gebruik: /%s <ruimte>@<server>[/bijnaam], biedt aan ruimte@server binnen te "
 "gaan, optioneel met de opgegeven bijnaam."
 
-#: ../src/groupchat_control.py:1258
+#: ../src/groupchat_control.py:1260
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4533,7 +4638,7 @@ msgstr ""
 "bijnaam van de ruimte, optioneel met de opgegeven reden. Ondersteunt GEEN "
 "spaties in de bijnaam."
 
-#: ../src/groupchat_control.py:1263
+#: ../src/groupchat_control.py:1265
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current group chat. Use third "
@@ -4542,7 +4647,7 @@ msgstr ""
 "Gebruik: /%s <actie>, stuurt actie naar de huidige ruimte. Hij-vorm "
 "gebruiken. (bijv. /%s loopt...)"
 
-#: ../src/groupchat_control.py:1267
+#: ../src/groupchat_control.py:1269
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4551,99 +4656,99 @@ msgstr ""
 "Gebruik: /%s <bijnaam> [bericht], opent een privé gespreksvenster en stuurt "
 "bericht naar de gebruiker met de opgegeven bijnaam."
 
-#: ../src/groupchat_control.py:1272
+#: ../src/groupchat_control.py:1274
 #, 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:1276
+#: ../src/groupchat_control.py:1278
 #, fuzzy, python-format
 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:1280
+#: ../src/groupchat_control.py:1282
 #, 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:1283
+#: ../src/groupchat_control.py:1285
 #, 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:1286
+#: ../src/groupchat_control.py:1288
 #, python-format
 msgid "No help info for /%s"
 msgstr "Geen hulp beschikbaar voor /%s"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1337
 #, 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:1337
+#: ../src/groupchat_control.py:1339
 #, 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:1341 ../src/roster_window.py:3961
+#: ../src/groupchat_control.py:1343 ../src/roster_window.py:3961
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "Vraag mij dit niet nogmaals"
 
-#: ../src/groupchat_control.py:1375
+#: ../src/groupchat_control.py:1377
 msgid "Changing Subject"
 msgstr "Onderwerp Veranderen"
 
-#: ../src/groupchat_control.py:1376
+#: ../src/groupchat_control.py:1378
 msgid "Please specify the new subject:"
 msgstr "Geef het nieuwe onderwerp op:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1387
 msgid "Changing Nickname"
 msgstr "Bijnaam Veranderen"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1388
 msgid "Please specify the new nickname you want to use:"
 msgstr "Geef de nieuwe bijnaam op die je wilt gebruiken:"
 
-#: ../src/groupchat_control.py:1411
+#: ../src/groupchat_control.py:1413
 msgid "Bookmark already set"
 msgstr "Bladwijzer bestaat al"
 
-#: ../src/groupchat_control.py:1412
+#: ../src/groupchat_control.py:1414
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Ruimte \"%s\" heeft al een bladwijzer."
 
-#: ../src/groupchat_control.py:1421
+#: ../src/groupchat_control.py:1423
 msgid "Bookmark has been added successfully"
 msgstr "Bladwijzer is met succes toegevoegd"
 
-#: ../src/groupchat_control.py:1422
+#: ../src/groupchat_control.py:1424
 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:1548
+#: ../src/groupchat_control.py:1550
 #, python-format
 msgid "Kicking %s"
 msgstr "%s uit de ruimte schoppen"
 
-#: ../src/groupchat_control.py:1549 ../src/groupchat_control.py:1831
+#: ../src/groupchat_control.py:1551 ../src/groupchat_control.py:1833
 msgid "You may specify a reason below:"
 msgstr "Je kunt hieronder een reden opgeven:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1830
+#: ../src/groupchat_control.py:1832
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
@@ -4690,16 +4795,16 @@ 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:727
+#: ../src/gtkgui_helpers.py:728
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:729
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:737
+#: ../src/gtkgui_helpers.py:738
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Sla Bestand op als..."
@@ -4733,12 +4838,6 @@ msgstr "Bijnaam:"
 msgid "Message"
 msgstr "_Bericht"
 
-#. holds subject
-#: ../src/history_manager.py:141 ../src/history_manager.py:172
-#, fuzzy
-msgid "Subject"
-msgstr "Onderwerp:"
-
 #: ../src/history_manager.py:186
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -5969,7 +6068,7 @@ 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:1515
+#: ../src/common/connection_handlers.py:1523
 #, fuzzy, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Bijnaam niet gevonden: %s"
@@ -5977,46 +6076,46 @@ msgstr "Bijnaam niet gevonden: %s"
 #. password required to join
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1577
-#: ../src/common/connection_handlers.py:1580
-#: ../src/common/connection_handlers.py:1583
-#: ../src/common/connection_handlers.py:1586
-#: ../src/common/connection_handlers.py:1589
-#: ../src/common/connection_handlers.py:1592
+#: ../src/common/connection_handlers.py:1585
+#: ../src/common/connection_handlers.py:1588
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1597
 #: ../src/common/connection_handlers.py:1600
+#: ../src/common/connection_handlers.py:1608
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Niet in staat de ruimte binnen te gaan"
 
-#: ../src/common/connection_handlers.py:1578
+#: ../src/common/connection_handlers.py:1586
 #, 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:1581
+#: ../src/common/connection_handlers.py:1589
 #, fuzzy
 msgid "You are banned from this group chat."
 msgstr "Je bent uit deze ruimte verbannen."
 
-#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1592
 #, fuzzy
 msgid "Such group chat does not exist."
 msgstr "Die ruimte bestaat niet."
 
-#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1595
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "Ruimte creatie is beperkt."
 
-#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1598
 msgid "Your registered nickname must be used."
 msgstr "Je geregistreerde bijnaam moet gebruikt worden."
 
-#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1601
 msgid "You are not in the members list."
 msgstr "Je staat niet in de ledenlijst"
 
-#: ../src/common/connection_handlers.py:1601
+#: ../src/common/connection_handlers.py:1609
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -6025,27 +6124,27 @@ msgstr ""
 "gebruiker.\n"
 "Geef een andere bijnaam op:"
 
-#: ../src/common/connection_handlers.py:1651
+#: ../src/common/connection_handlers.py:1659
 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:1672
+#: ../src/common/connection_handlers.py:1680
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "we zijn nu op %s geabonneert"
 
-#: ../src/common/connection_handlers.py:1674
+#: ../src/common/connection_handlers.py:1682
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "afmelding verzocht van %s"
 
-#: ../src/common/connection_handlers.py:1676
+#: ../src/common/connection_handlers.py:1684
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "we zijn nu van %s afgemeld"
 
-#: ../src/common/connection_handlers.py:1846
+#: ../src/common/connection_handlers.py:1854
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -6077,7 +6176,7 @@ msgid "Invalid answer"
 msgstr "Ongeldig wachtwoord"
 
 #: ../src/common/connection.py:394 ../src/common/connection.py:429
-#: ../src/common/connection.py:872
+#: ../src/common/connection.py:877
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
@@ -6135,7 +6234,7 @@ msgstr "Ik ben %s"
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Dit bericht is versleuteld]"
 
-#: ../src/common/connection.py:759
+#: ../src/common/connection.py:764
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6145,7 +6244,7 @@ msgstr ""
 "Onderwerp: %s\n"
 "%s"
 
-#: ../src/common/connection.py:898
+#: ../src/common/connection.py:903
 msgid "Not fetched because of invisible status"
 msgstr ""
 
@@ -6461,10 +6560,6 @@ msgstr "?Subscription we already have:Geen"
 msgid "To"
 msgstr "Aan"
 
-#: ../src/common/helpers.py:259
-msgid "From"
-msgstr "Van"
-
 #: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Beide"
@@ -6741,9 +6836,6 @@ msgstr "fout tijdens versturen"
 #~ msgid "Migrating Logs..."
 #~ msgstr "Logboeken worden omgezet..."
 
-#~ msgid "Please wait while logs are being migrated..."
-#~ msgstr "Een ogenblik geduld terwijl je logboeken omgezet worden..."
-
 #~ msgid "_Join New Room"
 #~ msgstr "Nieuwe Ruimte _Binnengaan"
 
@@ -6889,9 +6981,6 @@ msgstr "fout tijdens versturen"
 #~ msgid "Timeout"
 #~ msgstr "Timeout"
 
-#~ msgid "A protocol error has occured:"
-#~ msgstr "Een protocolfout is opgetreden:"
-
 #~ msgid "account: "
 #~ msgstr "account: "
 
diff --git a/po/no.po b/po/no.po
index 7fcb2e143..e1146dfdf 100644
--- a/po/no.po
+++ b/po/no.po
@@ -2,11 +2,12 @@
 # This file is distributed under the same license as the Gajim package.
 # Stian B. Barmen <stian@jabber.no>, 2005.
 #
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-26 22:15+0100\n"
+"POT-Creation-Date: 2006-12-09 10:02+0100\n"
 "PO-Revision-Date: 2006-12-05 11:35+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team: \n"
@@ -84,7 +85,8 @@ msgstr "<b>Vennligst fyll in data for din nye konto</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:6
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr "Klikk for å se tjenester (som MSN og ICQ transporter) på jabber serveren"
+msgstr ""
+"Klikk for å se tjenester (som MSN og ICQ transporter) på jabber serveren"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
 msgid "Connect when I press Finish"
@@ -215,8 +217,16 @@ msgid "Chan_ge Password"
 msgstr "En_dre Passord"
 
 #: ../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 "Velg denne slik at Gajim vil prøve å koble til port 5223 som gamle servere forventes å ha SSL muligheter. Merk at Gajim bruker TLS kryptering som standard dersom dette tilbys av servere, og med dette valget blir TLS deaktivert."
+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 ""
+"Velg denne slik at Gajim vil prøve å koble til port 5223 som gamle servere "
+"forventes å ha SSL muligheter. Merk at Gajim bruker TLS kryptering som "
+"standard dersom dette tilbys av servere, og med dette valget blir TLS "
+"deaktivert."
 
 #: ../data/glade/account_modification_window.glade.h:10
 #: ../data/glade/zeroconf_properties_window.glade.h:4
@@ -236,11 +246,8 @@ 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:453
-#: ../src/notify.py:475
-#: ../src/notify.py:487
-#: ../src/common/helpers.py:904
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
+#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:905
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -248,12 +255,9 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:15
 #: ../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
+#: ../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"
 
@@ -262,27 +266,48 @@ msgid "Hostname: "
 msgstr "Maskinnavn:"
 
 #: ../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 "Dersom valgt vil Gajim sende ut noen flere IP adresser i tillegg til din egen, så filoverføringen har større mulighet for å fungere. "
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Dersom valgt vil Gajim sende ut noen flere IP adresser i tillegg til din "
+"egen, så filoverføringen har større mulighet for å fungere. "
 
 #: ../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 "Dersom valgt vil Gajim sende hold-i-live pakker så man ikke får en frakobling på grunn av inaktivitet"
+msgid ""
+"If checked, Gajim will send keep-alive packets so it prevents connection "
+"timeout which results in disconnection"
+msgstr ""
+"Dersom valgt vil Gajim sende hold-i-live pakker så man ikke får en "
+"frakobling på grunn av inaktivitet"
 
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/zeroconf_properties_window.glade.h:8
-msgid "If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you"
-msgstr "Dersom valgt vil Gajim lagre passord i ~/.gajim/config med 'les' rettighet bare for deg"
+msgid ""
+"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+"permission only for you"
+msgstr ""
+"Dersom valgt vil Gajim lagre passord i ~/.gajim/config med 'les' rettighet "
+"bare for deg"
 
 #: ../data/glade/account_modification_window.glade.h:21
 #: ../data/glade/zeroconf_properties_window.glade.h:9
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "Dersom valgt, vil Gajim automatisk koble seg til jabber med denne kontoen ved oppstart"
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Dersom valgt, vil Gajim automatisk koble seg til jabber med denne kontoen "
+"ved oppstart"
 
 #: ../data/glade/account_modification_window.glade.h:22
 #: ../data/glade/zeroconf_properties_window.glade.h:10
-msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly"
-msgstr "Dersom valgt vil endringer til global status (håndtert av kombomenyen nederst i kontaktvinduet) endre status på denne kontoen. "
+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 ""
+"Dersom valgt vil endringer til global status (håndtert av kombomenyen "
+"nederst i kontaktvinduet) endre status på denne kontoen. "
 
 #: ../data/glade/account_modification_window.glade.h:23
 msgid "Information about you, as stored in the server"
@@ -293,26 +318,17 @@ msgid "Manage..."
 msgstr "Behandle..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16
-#: ../src/config.py:1636
-#: ../src/config.py:3429
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1642
+#: ../src/config.py:3435
 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: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
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1224
+#: ../src/config.py:1229 ../src/config.py:1413 ../src/config.py:1632
+#: ../src/config.py:1641 ../src/config.py:1700 ../src/config.py:1774
+#: ../src/config.py:2645 ../src/config.py:3425 ../src/config.py:3434
+#: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Ingen"
 
@@ -330,8 +346,14 @@ msgid "Priori_ty:"
 msgstr "Priorit_et:"
 
 #: ../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 brukes av Jabber for å finne ut hvem som skal få hendelser fra jabber serveren når to eller flere klienter er tilkoblet med samme konto. Klienten med den høyeste prioriteten vil få hendelsen"
+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 brukes av Jabber for å finne ut hvem som skal få hendelser fra "
+"jabber serveren når to eller flere klienter er tilkoblet med samme konto. "
+"Klienten med den høyeste prioriteten vil få hendelsen"
 
 #: ../data/glade/account_modification_window.glade.h:32
 msgid "Priority will change automatically according to your status."
@@ -346,8 +368,18 @@ msgid "Resour_ce: "
 msgstr "Ressu_rs:"
 
 #: ../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 "Ressurs navnet blir sendt til Jabber serveren for å separere JID'en din i to eller flere deler alt etter hvor mange ganger du er tilkoblet til serveren (samtidig). Dette gjør at du kan være tilkoblet med samme konto med ressurs navn 'Hjeme' og 'Jobb' på samme tid. Ressursen med høyest prioritet vil få hendelsene. (se under)"
+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 ""
+"Ressurs navnet blir sendt til Jabber serveren for å separere JID'en din i to "
+"eller flere deler alt etter hvor mange ganger du er tilkoblet til serveren "
+"(samtidig). Dette gjør at du kan være tilkoblet med samme konto med ressurs "
+"navn 'Hjeme' og 'Jobb' på samme tid. Ressursen med høyest prioritet vil få "
+"hendelsene. (se under)"
 
 #: ../data/glade/account_modification_window.glade.h:36
 #: ../data/glade/zeroconf_properties_window.glade.h:18
@@ -398,15 +430,25 @@ msgstr "Kontoer"
 
 #: ../data/glade/accounts_window.glade.h:2
 msgid ""
-"If checked, all local contacts that use a Bonjour compatible chat client (like iChat, Trillian or Gaim) will be shown in roster. You don't need to be connected to a jabber server for it to work.\n"
-"This is only available if python-avahi is installed and avahi-daemon is running."
+"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 ""
-"Dersom valgt vil alle lokale kontakter som bruker en Bonjour kompatibel samtale klient (som iChat, Trillian eller Gaim) vil vises i kontaktlisten. Du trenger ikke være koblet til en jabber server for at det skal virke.\n"
-"Dette er bare tilgjengelig dersom python-avahi er installert og avahi-tjenesten kjører."
+"Dersom valgt vil alle lokale kontakter som bruker en Bonjour kompatibel "
+"samtale klient (som iChat, Trillian eller Gaim) vil vises i kontaktlisten. "
+"Du trenger ikke være koblet til en jabber server for at det skal virke.\n"
+"Dette er bare tilgjengelig dersom python-avahi er installert og avahi-"
+"tjenesten kjører."
 
 #: ../data/glade/accounts_window.glade.h:4
-msgid "If you have 2 or more accounts and it is checked, Gajim will list all contacts as if you had one account"
-msgstr "Dersom du har 2 eller flere kontoer og denne er valgt, vil Gajim liste alle kontakter som om du hadde en konto"
+msgid ""
+"If you have 2 or more accounts and it is checked, Gajim will list all "
+"contacts as if you had one account"
+msgstr ""
+"Dersom du har 2 eller flere kontoer og denne er valgt, vil Gajim liste alle "
+"kontakter som om du hadde en konto"
 
 #: ../data/glade/accounts_window.glade.h:5
 msgid "Mer_ge accounts"
@@ -481,13 +523,54 @@ msgstr "_Registrer"
 msgid "_User ID:"
 msgstr "_Bruker ID:"
 
+#: ../data/glade/adhoc_commands_window.glade.h:1
+#, fuzzy
+msgid "<b>An error has occured:</b>"
+msgstr "En protokoll feil har skjedd:"
+
+#: ../data/glade/adhoc_commands_window.glade.h:2
+msgid "<b>Choose command to execute:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:3
+msgid "Ad-hoc Commands - Gajim"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:4
+msgid "Check once more"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:5
+#, fuzzy
+msgid "Error description..."
+msgstr "Beskrivelse"
+
+#: ../data/glade/adhoc_commands_window.glade.h:6
+#, fuzzy
+msgid "Please wait while retrieving command list..."
+msgstr "Vennligst vent mens loggene blir migrert..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:7
+#, fuzzy
+msgid "Please wait while the command is sending..."
+msgstr "Vennligst vent mens loggene blir migrert..."
+
+#: ../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>Beskrivelse</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>MERK:</b> Du må starte gajim på nytt for å aktivere noen instillinger"
+msgstr ""
+"<b>MERK:</b> Du må starte gajim på nytt for å aktivere noen instillinger"
 
 #: ../data/glade/advanced_configuration_window.glade.h:3
 msgid "Advanced Configuration Editor"
@@ -620,13 +703,13 @@ msgstr "Spill av en lyd"
 #: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
-"Contact Connected\n"
-"Contact Disconnected\n"
-"Contact Change Status\n"
-"Group Chat Message Highlight\n"
-"Group Chat Message Received\n"
-"File Transfert Resquest\n"
-"File Transfert Started\n"
+"Contact Connected \n"
+"Contact Disconnected \n"
+"Contact Change Status \n"
+"Group Chat Message Highlight \n"
+"Group Chat Message Received \n"
+"File Transfert Resquest \n"
+"File Transfert Started \n"
 "File Transfert Finished"
 msgstr ""
 "Motta en Melding\n"
@@ -644,8 +727,11 @@ msgid "When "
 msgstr "Når"
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
-msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr "_Aktiver vindu behandlerens HasterHint for å få samtalevinduet i oppgavelinjen til å blinke"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+msgstr ""
+"_Aktiver vindu behandlerens HasterHint for å få samtalevinduet i "
+"oppgavelinjen til å blinke"
 
 #: ../data/glade/advanced_notifications_window.glade.h:29
 msgid "_Disable auto opening chat window"
@@ -705,6 +791,46 @@ msgstr "for "
 msgid "when I'm in"
 msgstr "når jeg er i"
 
+#: ../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 "Land:"
+
+#: ../data/glade/atom_entry_window.glade.h:4
+#, fuzzy
+msgid "Feed name:"
+msgstr "tema navn"
+
+#: ../data/glade/atom_entry_window.glade.h:5
+#, fuzzy
+msgid "Last modified:"
+msgstr "Etternavn:"
+
+#: ../data/glade/atom_entry_window.glade.h:6
+#, fuzzy
+msgid "New entry received"
+msgstr "Når en ny hendelse blir motatt"
+
+#: ../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 "Endre Passord"
@@ -790,7 +916,7 @@ msgstr "_Kompakt Utseende    Alt+C"
 msgid "_History"
 msgstr "_Historie"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/glade/data_form_window.glade.h:1 ../src/dataforms_widget.py:76
 msgid "Fill in the form."
 msgstr "Fyll inn skjemaet."
 
@@ -843,15 +969,18 @@ msgid "Shows a list of file transfers between you and other"
 msgstr "Viser en liste over overføringer mellom deg og andre"
 
 #: ../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 "Dette valget fjerner en filoverføring fra listen. Dersom den er aktiv vil den først bli stoppet og så fjernet."
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
+msgstr ""
+"Dette valget fjerner en filoverføring fra listen. Dersom den er aktiv vil "
+"den først bli stoppet og så fjernet."
 
 #: ../data/glade/filetransfers.glade.h:12
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Når en fil overføring er komplett vis en sprettopp informasjon"
 
-#: ../data/glade/filetransfers.glade.h:13
-#: ../src/filetransfers_window.py:761
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
 msgid "_Continue"
 msgstr "_Fortsett"
 
@@ -859,8 +988,7 @@ msgstr "_Fortsett"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Gi meg beskjed når filoverføring er komplett"
 
-#: ../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 "_Åpne Foreldre Katalog"
 
@@ -1004,6 +1132,21 @@ msgstr "_Send Privat Melding"
 msgid "_Voice"
 msgstr "_Stemme"
 
+#: ../data/glade/groups_post_window.glade.h:1
+#, fuzzy
+msgid "Create new post"
+msgstr "Ny post"
+
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:259
+msgid "From"
+msgstr "Fra"
+
+#. holds subject
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141
+#: ../src/history_manager.py:172
+msgid "Subject"
+msgstr "Tittel"
+
 #: ../data/glade/history_manager.glade.h:1
 msgid ""
 "<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
@@ -1011,14 +1154,16 @@ msgid ""
 "You can select logs from the left and/or search database from below.\n"
 "\n"
 "<b>WARNING:</b>\n"
-"If you plan to do massive deletions, please make sure Gajim is not running. Generally avoid deletions with contacts you currently chat with."
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 "<big><b>Velkommen til Gajim Historiske Logg Behandler</b></big>\n"
 "\n"
 "Du kan velge logger fra venstre og/eller søke databasen under.\n"
 "\n"
 "<b>ADVARSEL:</b>\n"
-"Dersom du planlegger å gjøre store slette operasjoner, pass på at Gajim ikke kjører. Generelt bør man unngå å slette fra kontakter du er i samtale med."
+"Dersom du planlegger å gjøre store slette operasjoner, pass på at Gajim ikke "
+"kjører. Generelt bør man unngå å slette fra kontakter du er i samtale med."
 
 #: ../data/glade/history_manager.glade.h:7
 msgid "Delete"
@@ -1069,8 +1214,7 @@ msgstr "Nekt"
 msgid "Invitation Received"
 msgstr "Invitasjon motatt"
 
-#: ../data/glade/join_groupchat_window.glade.h:1
-#: ../src/dialogs.py:1146
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
 msgid "Join Group Chat"
 msgstr "Bli med i Gruppesamtale"
 
@@ -1095,8 +1239,7 @@ msgstr "Nylig:"
 msgid "Room:"
 msgstr "Rom:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../src/disco.py:1150
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1150
 #: ../src/disco.py:1517
 msgid "_Join"
 msgstr "_Bli med"
@@ -1163,8 +1306,7 @@ 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:1099
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP Kryptering"
 
@@ -1243,15 +1385,22 @@ msgstr "Tillat _OS informasjon å bli sendt"
 
 #: ../data/glade/preferences_window.glade.h:18
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Tillat sprettopp/melding når jeg er _borte/ikke tilgjengelig/opptatt/usynlig"
+msgstr ""
+"Tillat sprettopp/melding når jeg er _borte/ikke tilgjengelig/opptatt/usynlig"
 
 #: ../data/glade/preferences_window.glade.h:19
 msgid "Also known as iChat style"
 msgstr "Også kjent som iChat stil"
 
 #: ../data/glade/preferences_window.glade.h:20
-msgid "An example: If you have enabled status message for away, Gajim won't ask you anymore for a status message when you change your status to away; it will use the default one set here"
-msgstr "Et eksempel: Dersom du har slått på status melding for borte, så vil Gajim ikke spør flere ganger etter melding når du endrer status til borte; den vil bruke standard meldingen du lager her"
+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 ""
+"Et eksempel: Dersom du har slått på status melding for borte, så vil Gajim "
+"ikke spør flere ganger etter melding når du endrer status til borte; den vil "
+"bruke standard meldingen du lager her"
 
 #: ../data/glade/preferences_window.glade.h:21
 msgid "Ask status message when I:"
@@ -1283,14 +1432,19 @@ msgstr ""
 msgid "B_efore nickname:"
 msgstr "F_ør kallenavn:"
 
-#: ../data/glade/preferences_window.glade.h:30
-#: ../src/chat_control.py:839
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
 msgid "Chat"
 msgstr "Samtale"
 
 #: ../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 "Velg dette valget bare dersom noen i kontaktlisten spammer/irriterer deg. Bruk med varsomhet, fordi det blokkerer alle meldinger fra alle kontakter som ikke er i kontaktlisten"
+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 ""
+"Velg dette valget bare dersom noen i kontaktlisten spammer/irriterer deg. "
+"Bruk med varsomhet, fordi det blokkerer alle meldinger fra alle kontakter "
+"som ikke er i kontaktlisten"
 
 #: ../data/glade/preferences_window.glade.h:32
 msgid "Configure color and font of the interface"
@@ -1333,56 +1487,108 @@ msgid "Events"
 msgstr "Hendelser"
 
 #: ../data/glade/preferences_window.glade.h:42
-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 å vise i samtale vinduer."
+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 å "
+"vise i samtale vinduer."
 
 #: ../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 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."
+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 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: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"
+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: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"
+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: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 vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen om at en kontakt har akkurat logget inn"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed in"
+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: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 vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen om at en kontakt har akkurat logget ut"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+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: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"
+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:50
-msgid "If checked, Gajim will also include information about the sender of the new emails"
-msgstr "Desrom valgt vil Gajim også inkludere informasjon om senderen av nye e-post"
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+"Desrom valgt vil Gajim også inkludere informasjon om senderen av nye e-post"
 
 #: ../data/glade/preferences_window.glade.h:51
-msgid "If checked, Gajim will display avatars of contacts in roster window and in group chats"
-msgstr "Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet og i gruppesamtaler"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet "
+"og i gruppesamtaler"
 
 #: ../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 "Dersom valg vil Gajim vise status melding til kontakter under kontakt navnet i kontaktliste vinduet og i gruppesamtaler"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+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: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 "Dersom valgt vil Gajim huske kontaktliste og samtalevindu posisjoner på skjermen, samt størrelsen på de til neste gang du åpner de"
+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 ""
+"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: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 "Dersom valgt vil Gajim bruke protkoll-spesifikke ikoner. (En kontakt fra MSN vil ha msn ikoner for status pålogget, borte, opptatt, osv...)"
+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 ""
+"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:55
-msgid "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons"
-msgstr "Dersom ikke deaktiver, vil Gajim bytte ut ascii smil som ':)' med animerte eller statiske grafiske uttrykksikoner"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Dersom ikke deaktiver, vil Gajim bytte ut ascii smil som ':)' med animerte "
+"eller statiske grafiske uttrykksikoner"
 
 #: ../data/glade/preferences_window.glade.h:56
 msgid "Ignore rich content in incoming messages"
@@ -1457,8 +1663,12 @@ msgid "Sign _out"
 msgstr "Logger _ut"
 
 #: ../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 "Noen meldinger kan inkludere rikt innhold (formatering, farger osv). Dersom valgt vil Gajim kun vise rå meldings tekst."
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Noen meldinger kan inkludere rikt innhold (formatering, farger osv). Dersom "
+"valgt vil Gajim kun vise rå meldings tekst."
 
 #: ../data/glade/preferences_window.glade.h:76
 msgid "Status"
@@ -1489,16 +1699,28 @@ msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "Bruk Ikon i s_ystemstatusfelt (også kjent som systray)"
 
 #: ../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 "Når en ny hendelse (melding, fil overføring osv.) blir motatt, vil følgende metoder kunne bli brukt for å informere deg om det. Vennligst merk at ny melding hendelser vil bare skje dersom du får en ny melding fra en kontakt du ikke er i samtale med."
+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 ""
+"Når en ny hendelse (melding, fil overføring osv.) blir motatt, vil følgende "
+"metoder kunne bli brukt for å informere deg om det. Vennligst merk at ny "
+"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:84
 msgid "When new event is received"
 msgstr "Når en ny hendelse blir motatt"
 
 #: ../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 "Virker for Rhythmbox og Muine avspillere. For flere avspillere kan du besøke http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+"Virker for Rhythmbox og Muine avspillere. For flere avspillere kan du besøke "
+"http://trac.gajim.org/wiki/GajimAndMusicPlayer"
 
 #: ../data/glade/preferences_window.glade.h:86
 msgid "_Advanced Notifications Control..."
@@ -1628,8 +1850,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Rekkefølge:"
 
-#: ../data/glade/privacy_list_window.glade.h:11
-#: ../src/dialogs.py:1841
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
 msgid "Privacy List"
 msgstr "Liste over Utestengte"
 
@@ -1782,8 +2003,7 @@ msgid "Prefix:"
 msgstr "Tittel:"
 
 #: ../data/glade/profile_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:37
-#: ../src/vcard.py:273
+#: ../data/glade/vcard_information_window.glade.h:37 ../src/vcard.py:273
 msgid "Role:"
 msgstr "Rolle:"
 
@@ -1878,8 +2098,7 @@ msgstr "_Forby han/henne å se min status"
 
 #. 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:1948 ../src/roster_window.py:2045
 #: ../src/roster_window.py:2152
 msgid "_Remove from Roster"
 msgstr "_Fjern fra Kontaktliste"
@@ -1934,8 +2153,7 @@ msgstr "_Innhold"
 msgid "_Discover Services"
 msgstr "_Oppdag Tjenester"
 
-#: ../data/glade/roster_window.glade.h:14
-#: ../src/disco.py:1255
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1255
 #: ../src/roster_window.py:2123
 msgid "_Edit"
 msgstr "_Rediger"
@@ -2080,8 +2298,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:416
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -2160,10 +2377,12 @@ msgstr "Personlige"
 
 #: ../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"
+"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 ""
-"Dersom standard porten som brukes til inngående meldinger ikke passer for ditt oppsett kan du velge en annen her.\n"
+"Dersom standard porten som brukes til inngående meldinger ikke passer for "
+"ditt oppsett kan du velge en annen her.\n"
 "Du kan også vurdere å endre mulige brannmur innstillinger."
 
 #: ../data/glade/zeroconf_properties_window.glade.h:15
@@ -2289,14 +2508,19 @@ msgstr "Svensk"
 msgid "Chinese (Ch)"
 msgstr "Kinesisk (Ch)"
 
-#: ../src/chat_control.py:201
-#: ../src/dialogs.py:1497
+#: ../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 ""
-"Dersom dette ikke er språket du ønsker å utheve feilstavede ord i, så vennligst endre $LANG slik at det stemmer. For eksempel for Fransk gjør du export LANG=fr_FR eller export LANG=fr_FR.UTF-8 i ~/.bash_profile eller i den globale /etc/profile.\n"
+"Dersom dette ikke er språket du ønsker å utheve feilstavede ord i, så "
+"vennligst endre $LANG slik at det stemmer. For eksempel for Fransk gjør du "
+"export LANG=fr_FR eller export LANG=fr_FR.UTF-8 i ~/.bash_profile eller i "
+"den globale /etc/profile.\n"
 "\n"
 "Utheving av feilstavede ord funksjonen vil ikke bli brukt."
 
@@ -2305,351 +2529,334 @@ msgid "Spelling language"
 msgstr "Stavekontroll språk"
 
 #. we are not connected
-#: ../src/chat_control.py:262
-#: ../src/chat_control.py:468
+#: ../src/chat_control.py:262 ../src/chat_control.py:468
 msgid "A connection is not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/chat_control.py:263
-#: ../src/chat_control.py:469
+#: ../src/chat_control.py:263 ../src/chat_control.py:469
 msgid "Your message can not be sent until you are connected."
 msgstr "Meldingen din kan ikke sendes før du er tilkoblet."
 
-#: ../src/chat_control.py:839
+#: ../src/chat_control.py:844
 msgid "Chats"
 msgstr "Samtaler"
 
-#: ../src/chat_control.py:1025
+#: ../src/chat_control.py:1030
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s fra gruppesamtale %(room_name)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1113
+#: ../src/chat_control.py:1118
 #, 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:1239
+#: ../src/chat_control.py:1254
 msgid "Encryption enabled"
 msgstr "Kryptering påslått"
 
-#: ../src/chat_control.py:1244
+#: ../src/chat_control.py:1259
 msgid "Encryption disabled"
 msgstr "Kryptering avslått"
 
 #. add_to_roster_menuitem
-#: ../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/chat_control.py:1401 ../src/conversation_textview.py:495
+#: ../src/dialogs.py:629 ../src/gajim.py:733 ../src/gajim.py:734
+#: ../src/gajim.py:1073 ../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:1530
+#: ../src/chat_control.py:1545
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du fikk akkurat en ny melding fra \"%s\""
 
-#: ../src/chat_control.py:1531
-msgid "If you close this tab and you have history disabled, this message will be lost."
-msgstr "Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli mistet."
+#: ../src/chat_control.py:1546
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
+"mistet."
 
-#: ../src/config.py:129
-#: ../src/config.py:588
+#: ../src/config.py:135 ../src/config.py:594
 msgid "Disabled"
 msgstr "Deaktivert"
 
-#: ../src/config.py:215
+#: ../src/config.py:221
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Hvert %s _minutt"
 
-#: ../src/config.py:357
+#: ../src/config.py:363
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:365
+#: ../src/config.py:371
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../src/config.py:678
-#: ../src/gajim.py:2072
+#: ../src/config.py:684 ../src/gajim.py:2094
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordliste for språk %s er ikke tilgjengelig"
 
-#: ../src/config.py:679
-#: ../src/gajim.py:2073
+#: ../src/config.py:685 ../src/gajim.py:2095
 #, python-format
-msgid "You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option."
-msgstr "Du må installere %s ordbok for å bruke stavekontroll, eller velge et annet språk ved å sette stavekontro_llspråk valget."
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+"Du må installere %s ordbok for å bruke stavekontroll, eller velge et annet "
+"språk ved å sette stavekontro_llspråk valget."
 
-#: ../src/config.py:1031
+#: ../src/config.py:1037
 msgid "status message title"
 msgstr "status melding tittel"
 
-#: ../src/config.py:1031
+#: ../src/config.py:1037
 msgid "status message text"
 msgstr "status melding tekst"
 
-#: ../src/config.py:1066
+#: ../src/config.py:1072
 msgid "First Message Received"
 msgstr "Første Melding Motatt"
 
-#: ../src/config.py:1067
+#: ../src/config.py:1073
 msgid "Next Message Received"
 msgstr "Neste Melding Motatt"
 
-#: ../src/config.py:1068
+#: ../src/config.py:1074
 msgid "Contact Connected"
 msgstr "Kontakt Koblet til"
 
-#: ../src/config.py:1069
+#: ../src/config.py:1075
 msgid "Contact Disconnected"
 msgstr "Kontakt Frakoblet"
 
-#: ../src/config.py:1070
+#: ../src/config.py:1076
 msgid "Message Sent"
 msgstr "Melding Sendt"
 
-#: ../src/config.py:1071
+#: ../src/config.py:1077
 msgid "Group Chat Message Highlight"
 msgstr "Gruppe Samtale Melding Utheving"
 
-#: ../src/config.py:1072
+#: ../src/config.py:1078
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Melding Motatt"
 
-#: ../src/config.py:1079
+#: ../src/config.py:1085
 msgid "GMail Email Received"
 msgstr "Gmail E-post Motatt"
 
-#: ../src/config.py:1282
+#: ../src/config.py:1288
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP er ikke tilgjenglig på denne maskinen"
 
-#: ../src/config.py:1328
+#: ../src/config.py:1334
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
 
-#: ../src/config.py:1329
+#: ../src/config.py:1335
 msgid "To change the account name, you must be disconnected."
 msgstr "For å endre konto navnet må du ikke være tilkoblet."
 
-#: ../src/config.py:1332
-#: ../src/config.py:1924
+#: ../src/config.py:1338 ../src/config.py:1930
 msgid "Unread events"
 msgstr "Uleste hendelser"
 
-#: ../src/config.py:1333
+#: ../src/config.py:1339
 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:1337
+#: ../src/config.py:1343
 msgid "Account Name Already Used"
 msgstr "Konto Navnet er Allerede i Bruk"
 
-#: ../src/config.py:1338
-msgid "This name is already used by another of your accounts. Please choose another name."
-msgstr "Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst velg et annet navn."
+#: ../src/config.py:1344
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
+msgstr ""
+"Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst velg "
+"et annet navn."
 
-#: ../src/config.py:1342
-#: ../src/config.py:1346
+#: ../src/config.py:1348 ../src/config.py:1352
 msgid "Invalid account name"
 msgstr "Ugyldig konto navn"
 
-#: ../src/config.py:1343
+#: ../src/config.py:1349
 msgid "Account name cannot be empty."
 msgstr "Konto navn kan ikke være tomt."
 
-#: ../src/config.py:1347
+#: ../src/config.py:1353
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
 
-#: ../src/config.py:1355
-#: ../src/config.py:1361
-#: ../src/config.py:1371
-#: ../src/config.py:3029
+#: ../src/config.py:1361 ../src/config.py:1367 ../src/config.py:1377
+#: ../src/config.py:3035
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/config.py:1362
+#: ../src/config.py:1368
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "En Jabber ID må skrives som \"bruker@servernavn\"."
 
-#: ../src/config.py:1421
+#: ../src/config.py:1427
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:1422
+#: ../src/config.py:1428
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
 
-#: ../src/config.py:1548
-#: ../src/common/config.py:363
+#: ../src/config.py:1554 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Snart tilbake."
 
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 msgid "Relogin now?"
 msgstr "Logge inn på nytt nå?"
 
-#: ../src/config.py:1559
+#: ../src/config.py:1565
 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."
+msgstr ""
+"Dersom du ønsker at endringene skal tre i kraft umiddelbart, må du logge inn "
+"på nytt."
 
-#: ../src/config.py:1585
+#: ../src/config.py:1591
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
 
-#: ../src/config.py:1586
+#: ../src/config.py:1592
 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:1593
-#: ../src/dialogs.py:1128
-#: ../src/dialogs.py:1297
-#: ../src/disco.py:417
-#: ../src/profile_window.py:307
+#: ../src/config.py:1599 ../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:1594
+#: ../src/config.py:1600
 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:1598
+#: ../src/config.py:1604
 msgid "Your server doesn't support Vcard"
 msgstr "Din server støtter ikke Vcard"
 
-#: ../src/config.py:1599
+#: ../src/config.py:1605
 msgid "Your server can't save your personal information."
 msgstr "Din server kan ikke lagre din personlige informasjon."
 
-#: ../src/config.py:1623
-#: ../src/config.py:3416
+#: ../src/config.py:1629 ../src/config.py:3422
 msgid "Failed to get secret keys"
 msgstr "Klarte ikke å hente hemmelig nøkkel"
 
-#: ../src/config.py:1624
-#: ../src/config.py:3417
+#: ../src/config.py:1630 ../src/config.py:3423
 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:1627
-#: ../src/config.py:3420
+#: ../src/config.py:1633 ../src/config.py:3426
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøkkel Valg"
 
-#: ../src/config.py:1628
-#: ../src/config.py:3421
+#: ../src/config.py:1634 ../src/config.py:3427
 msgid "Choose your OpenPGP key"
 msgstr "Velg din OpenPGP nøkkel"
 
 #. Name column
-#: ../src/config.py:1858
-#: ../src/disco.py:740
-#: ../src/disco.py:1466
-#: ../src/disco.py:1704
-#: ../src/history_window.py:78
+#: ../src/config.py:1864 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/config.py:1861
+#: ../src/config.py:1867
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1925
+#: ../src/config.py:1931
 msgid "Read all pending events before removing this account."
 msgstr "Les alle ventende meldinger før du fjerner denne kontoen."
 
-#: ../src/config.py:1962
+#: ../src/config.py:1968
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har åpne samtaler på konto %s"
 
-#: ../src/config.py:1963
+#: ../src/config.py:1969
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alle samtaler og gruppesamtaler vil bli lukket. Ønsker du å fortsette?"
 
-#: ../src/config.py:2022
+#: ../src/config.py:2028
 msgid "Account Local already exists."
 msgstr "Konto Lokal eksisterer allerede."
 
-#: ../src/config.py:2023
+#: ../src/config.py:2029
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Vennligst omdøp eller fjern den før du slår på link-lokal meldinger."
 
-#: ../src/config.py:2255
+#: ../src/config.py:2261
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:2257
+#: ../src/config.py:2263
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
 #. list at the begining
-#: ../src/config.py:2329
+#: ../src/config.py:2335
 msgid "Ban List"
 msgstr "Listen over Utestengte"
 
-#: ../src/config.py:2330
+#: ../src/config.py:2336
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:2331
+#: ../src/config.py:2337
 msgid "Owner List"
 msgstr "Eier Liste"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2338
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2365
-#: ../src/disco.py:747
-#: ../src/history_manager.py:154
+#: ../src/config.py:2371 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 msgid "Reason"
 msgstr "Grunn"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Nick"
 msgstr "Kallenavn"
 
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2403
+#: ../src/config.py:2409
 msgid "Banning..."
 msgstr "Utvis..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2405
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2657,11 +2864,11 @@ msgstr ""
 "<b>Hvem ønsker du å utvise?</b>\n"
 "\n"
 
-#: ../src/config.py:2407
+#: ../src/config.py:2413
 msgid "Adding Member..."
 msgstr "Legger til Medlem..."
 
-#: ../src/config.py:2408
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2669,11 +2876,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2410
+#: ../src/config.py:2416
 msgid "Adding Owner..."
 msgstr "Legger til Eier..."
 
-#: ../src/config.py:2411
+#: ../src/config.py:2417
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2681,11 +2888,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til eier?</b>\n"
 "\n"
 
-#: ../src/config.py:2413
+#: ../src/config.py:2419
 msgid "Adding Administrator..."
 msgstr "Legger til Administrator..."
 
-#: ../src/config.py:2414
+#: ../src/config.py:2420
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2693,7 +2900,7 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2415
+#: ../src/config.py:2421
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2709,174 +2916,186 @@ msgstr ""
 "4. domene (domene selv treffer, smt treffer alle bruker@domene,\n"
 "domene/ressurs, eller adresser i et underdomene."
 
-#: ../src/config.py:2520
+#: ../src/config.py:2526
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2537
-#: ../src/roster_window.py:2667
+#: ../src/config.py:2543 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/config.py:2538
-#: ../src/roster_window.py:2668
+#: ../src/config.py:2544 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/config.py:2539
-#: ../src/roster_window.py:2669
+#: ../src/config.py:2545 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../src/config.py:2553
+#: ../src/config.py:2559
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilkoblet til serveren"
 
-#: ../src/config.py:2554
+#: ../src/config.py:2560
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen mistes."
 
-#: ../src/config.py:2638
+#: ../src/config.py:2644
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2638
+#: ../src/config.py:2644
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2645
 msgid "Enter and leave only"
 msgstr "Gå inn og legg igjen bare"
 
-#: ../src/config.py:2709
+#: ../src/config.py:2715
 msgid "New Group Chat"
 msgstr "Ny Gruppesamtale"
 
-#: ../src/config.py:2741
+#: ../src/config.py:2747
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
 
-#: ../src/config.py:2742
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
+#: ../src/config.py:2748
+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:3004
+#: ../src/config.py:3010
 msgid "Invalid username"
 msgstr "Ugyldig brukernavn"
 
-#: ../src/config.py:3005
+#: ../src/config.py:3011
 msgid "You must provide a username to configure this account."
 msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
 
-#: ../src/config.py:3015
-#: ../src/dialogs.py:1316
+#: ../src/config.py:3021 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Ugyldig passord"
 
-#: ../src/config.py:3016
+#: ../src/config.py:3022
 msgid "You must enter a password for the new account."
 msgstr "Du må skrive inn et passord for den nye kontoen"
 
-#: ../src/config.py:3020
-#: ../src/dialogs.py:1321
+#: ../src/config.py:3026 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: ../src/config.py:3021
-#: ../src/dialogs.py:1322
+#: ../src/config.py:3027 ../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:3040
+#: ../src/config.py:3046
 msgid "Duplicate Jabber ID"
 msgstr "Duplikat Jabber ID"
 
-#: ../src/config.py:3041
+#: ../src/config.py:3047
 msgid "This account is already configured in Gajim."
 msgstr "Kontakten er allerede konfigurert i Gajim."
 
-#: ../src/config.py:3058
+#: ../src/config.py:3064
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
 
-#: ../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 "Du kan sette avanserte konto instillinger ved å trykke på Avansert knappen, eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra hovedvinduet."
+#: ../src/config.py:3065 ../src/config.py:3100
+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 ""
+"Du kan sette avanserte konto instillinger ved å trykke på Avansert knappen, "
+"eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
+"hovedvinduet."
 
-#: ../src/config.py:3093
+#: ../src/config.py:3099
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
 
-#: ../src/config.py:3111
+#: ../src/config.py:3117
 msgid "An error occured during account creation"
 msgstr "Det skjedde en feil ved oppretting av kontoen"
 
-#: ../src/config.py:3169
+#: ../src/config.py:3175
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
 
-#: ../src/config.py:3170
+#: ../src/config.py:3176
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
 
-#: ../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 under denne linjen er hva som har blitt sagt siden sist du fulgte med i denne gruppe samtalen"
+#: ../src/conversation_textview.py:273
+msgid ""
+"Text below this line is what has been said since the last time you paid "
+"attention to this group chat"
+msgstr ""
+"Tekst under denne linjen er hva som har blitt sagt siden sist du fulgte med "
+"i denne gruppe samtalen"
 
-#: ../src/conversation_textview.py:340
+#: ../src/conversation_textview.py:342
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Les_Wikipedia Artikkel"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Slå det opp i _Ordbok"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:373
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Ordbok URL mangler en \"%s\" og den må ikke være WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:386
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Søk URL mangler en \"%s\""
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "Web _Søk etter den"
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:397
 msgid "Open as _Link"
 msgstr "Åpne som _Link"
 
-#: ../src/conversation_textview.py:752
+#: ../src/conversation_textview.py:757
 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:756
+#: ../src/conversation_textview.py:761
 #, python-format
 msgid "%i days ago"
 msgstr "%i dager siden"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:788
+#: ../src/conversation_textview.py:793
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %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>"
@@ -2943,31 +3162,23 @@ msgstr "Yahoo Adresse:"
 #: ../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"
+msgstr ""
+"Vennligst fyll inn dataene til kontakten du ønsker å legge til kontoen %s"
 
 #: ../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: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
+#: ../src/dialogs.py:467 ../src/disco.py:102 ../src/disco.py:103
+#: ../src/disco.py:1252 ../src/gajim.py:491 ../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:609
-#: ../src/dialogs.py:615
+#: ../src/dialogs.py:609 ../src/dialogs.py:615
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruker ID"
 
@@ -3015,7 +3226,8 @@ msgstr "TUSEN TAKK:"
 #. and add it manually as translatable
 #: ../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."
+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:776
@@ -3028,8 +3240,12 @@ msgid "Unable to bind to port %s."
 msgstr "Klarer ikke å lytte til port %s."
 
 #: ../src/dialogs.py:907
-msgid "Maybe you have another running instance of Gajim. File Transfer will be canceled."
-msgstr "Kanskje du har en annen kjørende instans av Gajim. Filoverføring vil bli avbrutt."
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"canceled."
+msgstr ""
+"Kanskje du har en annen kjørende instans av Gajim. Filoverføring vil bli "
+"avbrutt."
 
 #: ../src/dialogs.py:1058
 #, python-format
@@ -3041,8 +3257,7 @@ msgstr "Abonnerings ønske for konto %s fra %s"
 msgid "Subscription request from %s"
 msgstr "Abonnerings ønske fra %s"
 
-#: ../src/dialogs.py:1121
-#: ../src/roster_window.py:681
+#: ../src/dialogs.py:1121 ../src/roster_window.py:681
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du er allerede i gruppesamtale %s"
@@ -3056,13 +3271,11 @@ msgstr "Du kan ikke gå inn i en gruppe samtale uten å være tilkoblet."
 msgid "Join Group Chat with account %s"
 msgstr "Bli med i samtalegruppe med konto %s"
 
-#: ../src/dialogs.py:1212
-#: ../src/dialogs.py:1218
+#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
 msgid "Invalid group chat Jabber ID"
 msgstr "Ugyldig gruppesamtale Jabber ID"
 
-#: ../src/dialogs.py:1213
-#: ../src/dialogs.py:1219
+#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
 
@@ -3093,21 +3306,16 @@ msgstr ""
 "å sende en samtale melding til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1276
-#: ../src/dialogs.py:1635
-#: ../src/dialogs.py:1764
+#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
 msgid "Connection not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/dialogs.py:1277
-#: ../src/dialogs.py:1636
-#: ../src/dialogs.py:1765
+#: ../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:1286
-#: ../src/dialogs.py:1289
+#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
 msgid "Invalid JID"
 msgstr "Ugyldig JID"
 
@@ -3126,81 +3334,56 @@ msgstr "Du må skrive inn et passord."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1364
-#: ../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 "Kontakt Logget På"
 
-#: ../src/dialogs.py:1366
-#: ../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 "Kontakt Logget Av"
 
 #. chat message
-#: ../src/dialogs.py:1368
-#: ../src/notify.py:238
-#: ../src/notify.py:415
+#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
 msgid "New Message"
 msgstr "Ny Melding"
 
 #. single message
-#: ../src/dialogs.py:1368
-#: ../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 "Ny Melding"
 
 #. private message
-#: ../src/dialogs.py:1369
-#: ../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 "Ny Privat Melding"
 
-#: ../src/dialogs.py:1369
-#: ../src/gajim.py:1159
-#: ../src/notify.py:424
+#: ../src/dialogs.py:1369 ../src/gajim.py:1168 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:1371
-#: ../src/gajim.py:1300
-#: ../src/notify.py:418
+#: ../src/dialogs.py:1371 ../src/gajim.py:1321 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/dialogs.py:1373
-#: ../src/gajim.py:1132
-#: ../src/gajim.py:1276
+#: ../src/dialogs.py:1373 ../src/gajim.py:1140 ../src/gajim.py:1297
 #: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Fil Overføring Feilet"
 
-#: ../src/dialogs.py:1375
-#: ../src/gajim.py:1339
-#: ../src/gajim.py:1361
-#: ../src/gajim.py:1378
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1375 ../src/gajim.py:1360 ../src/gajim.py:1382
+#: ../src/gajim.py:1399 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Fil Overføring Komplett"
 
-#: ../src/dialogs.py:1376
-#: ../src/gajim.py:1342
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1376 ../src/gajim.py:1363 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Fil Overføring Stoppet"
 
-#: ../src/dialogs.py:1378
-#: ../src/gajim.py:1030
-#: ../src/notify.py:426
+#: ../src/dialogs.py:1378 ../src/gajim.py:1038 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Gruppesamtale invitasjon"
 
-#: ../src/dialogs.py:1380
-#: ../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 "Kontakt Endret Status"
 
@@ -3311,8 +3494,7 @@ msgstr "Kommentar: %s"
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/dialogs.py:2298
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
 msgid "All files"
 msgstr "Alle filer"
 
@@ -3378,11 +3560,14 @@ msgid "The service could not be found"
 msgstr "Tjenesten ble ikke funnet"
 
 #: ../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 "Det er ingen tjeneste på adressen du oppgav, eller den svarer ikke. Sjekk adressen og prøv igjen."
+msgid ""
+"There is no service at the address you entered, or it is not responding. "
+"Check the address and try again."
+msgstr ""
+"Det er ingen tjeneste på adressen du oppgav, eller den svarer ikke. Sjekk "
+"adressen og prøv igjen."
 
-#: ../src/disco.py:646
-#: ../src/disco.py:927
+#: ../src/disco.py:646 ../src/disco.py:927
 msgid "The service is not browsable"
 msgstr "Ikke mulig å utforske tjeneste"
 
@@ -3403,8 +3588,7 @@ msgstr "_Utforsk"
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjenesten innholer ingen elementer å utforske."
 
-#: ../src/disco.py:1142
-#: ../src/disco.py:1257
+#: ../src/disco.py:1142 ../src/disco.py:1257
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
@@ -3456,22 +3640,19 @@ msgstr "Tid"
 msgid "Progress"
 msgstr "Fremdrift"
 
-#: ../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 "Filnavn: %s"
 
-#: ../src/filetransfers_window.py:164
-#: ../src/filetransfers_window.py:298
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
 #, python-format
 msgid "Size: %s"
 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/filetransfers_window.py:173 ../src/filetransfers_window.py:183
 #: ../src/history_manager.py:463
 msgid "You"
 msgstr "Du"
@@ -3481,8 +3662,7 @@ msgstr "Du"
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:175
-#: ../src/filetransfers_window.py:564
+#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
 #: ../src/tooltips.py:573
 msgid "Recipient: "
 msgstr "Mottaker: "
@@ -3496,13 +3676,11 @@ msgstr "Lagret i: %s"
 msgid "File transfer completed"
 msgstr "Fil overføring komplett"
 
-#: ../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 "Fil overføring avbrutt"
 
-#: ../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 "Tilkoblingen kan ikke opprettes."
 
@@ -3552,35 +3730,33 @@ 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:682
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kan ikke overskrive eksisterende fil \"%s\""
 
-#: ../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 "En fil med dette navnet eksisterer og du har ikke rettigheter til å overskrive den."
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+msgid ""
+"A file with this name already exists and you do not have permission to "
+"overwrite it."
+msgstr ""
+"En fil med dette navnet eksisterer og du har ikke rettigheter til å "
+"overskrive den."
 
-#: ../src/filetransfers_window.py:326
-#: ../src/gtkgui_helpers.py:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "This file already exists"
 msgstr "Denne filen finnes fra før"
 
-#: ../src/filetransfers_window.py:326
-#: ../src/gtkgui_helpers.py:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "What do you want to do?"
 msgstr "Hva ønsker du å gjøre?"
 
-#: ../src/filetransfers_window.py:338
-#: ../src/gtkgui_helpers.py:698
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Katalogen \"%s\" er ikke skrivbar"
 
-#: ../src/filetransfers_window.py:338
-#: ../src/gtkgui_helpers.py:699
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
 msgid "You do not have permission to create files in this directory."
 msgstr "Du har ikke rettigheter til å lage filer i denne katalogen."
 
@@ -3604,8 +3780,7 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:536
-#: ../src/filetransfers_window.py:539
+#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
 msgid "Invalid File"
 msgstr "Ugyldig Fil"
 
@@ -3617,13 +3792,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:563
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:563
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../src/filetransfers_window.py:562
-#: ../src/tooltips.py:567
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:567
 msgid "Sender: "
 msgstr "Avsender: "
 
@@ -3657,32 +3830,41 @@ msgstr "GTK+ mangler libglade støtte"
 
 #: ../src/gajim.py:62
 #, python-format
-msgid "Please remove your current GTK+ runtime and install the latest stable version from %s"
-msgstr "Vennligst fjern din gjeldende GTK+ installasjon og installer siste stabile versjon fra %s"
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Vennligst fjern din gjeldende GTK+ installasjon og installer siste stabile "
+"versjon fra %s"
 
 #: ../src/gajim.py:64
-msgid "Please make sure that GTK+ and PyGTK have libglade support in your system."
+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:69
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim trenger PySQLite2 for å kjøre"
 
-#: ../src/gajim.py:76
+#: ../src/gajim.py:77
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim trenger pywin32 for å kjøre"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:78
 #, python-format
-msgid "Please make sure that Pywin32 is installed on your system. You can get it at %s"
-msgstr "Vennligst pass på at Pywin32 er installert på ditt system. Du kan hente den på %s"
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+"Vennligst pass på at Pywin32 er installert på ditt system. Du kan hente den "
+"på %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:189
+#: ../src/gajim.py:190
 msgid "Gajim is already running"
 msgstr "Gajim kjører allerede"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:191
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -3690,78 +3872,76 @@ msgstr ""
 "En annen instans av Gajim ser ut til å kjøre\n"
 "Start likevel?"
 
-#: ../src/gajim.py:297
+#: ../src/gajim.py:298
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Autentisering for %s (id: %s)"
 
-#: ../src/gajim.py:298
+#: ../src/gajim.py:299
 msgid "Do you accept this request?"
 msgstr "Godtar du denne forespørselen?"
 
-#: ../src/gajim.py:344
-#: ../src/notify.py:430
+#: ../src/gajim.py:345 ../src/notify.py:430
 msgid "Connection Failed"
 msgstr "Tilkobling Feilet"
 
-#: ../src/gajim.py:656
+#: ../src/gajim.py:658
 #, python-format
 msgid "Subject: %s"
 msgstr "Tittel: %s"
 
-#: ../src/gajim.py:701
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:703 ../src/gajim.py:716
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "feil ved sending %s ( %s )"
 
-#: ../src/gajim.py:741
+#: ../src/gajim.py:749
 msgid "Authorization accepted"
 msgstr "Godkjenningsforespørel akseptert"
 
-#: ../src/gajim.py:742
+#: ../src/gajim.py:750
 #, 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:750
+#: ../src/gajim.py:758
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" fjernet abonnementet fra deg"
 
-#: ../src/gajim.py:751
+#: ../src/gajim.py:759
 msgid "You will always see him or her as offline."
 msgstr "Du vil alltid se han eller henne som frakoblet."
 
-#: ../src/gajim.py:794
+#: ../src/gajim.py:802
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke opprettes"
 
-#: ../src/gajim.py:795
-#: ../src/common/connection.py:395
+#: ../src/gajim.py:803 ../src/common/connection.py:395
 msgid "Check your connection or try again later."
 msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
 
-#: ../src/gajim.py:943
-#: ../src/roster_window.py:1201
+#: ../src/gajim.py:951 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s er nå %s (%s)"
 
-#: ../src/gajim.py:1040
+#: ../src/gajim.py:1048
 msgid "Your passphrase is incorrect"
 msgstr "Passord setningen din er ikke riktig"
 
-#: ../src/gajim.py:1041
+#: ../src/gajim.py:1049
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
 
-#: ../src/gajim.py:1143
+#: ../src/gajim.py:1151
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny e-post på %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1145
+#: ../src/gajim.py:1153
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3771,7 +3951,7 @@ msgstr[1] "Du har %d nye e-post samtaler"
 #. 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
+#: ../src/gajim.py:1162
 #, python-format
 msgid ""
 "\n"
@@ -3780,54 +3960,55 @@ msgstr ""
 "\n"
 "Fra: %(from_address)s"
 
-#: ../src/gajim.py:1297
+#: ../src/gajim.py:1318
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/gajim.py:1362
+#: ../src/gajim.py:1383
 #, 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:1366
+#: ../src/gajim.py:1387
 #, 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:1379
+#: ../src/gajim.py:1400
 #, 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:1383
+#: ../src/gajim.py:1404
 #, 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:1489
+#: ../src/gajim.py:1510
 msgid "Username Conflict"
 msgstr "Brukernavn Konflikt"
 
-#: ../src/gajim.py:1490
+#: ../src/gajim.py:1511
 msgid "Please type a new username for your local account"
 msgstr "Vennligst skriv inn et nytt brukernavn for din lokale konto"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1828
+#: ../src/gajim.py:1850
 msgid "Could not save your settings and preferences"
 msgstr "Kan ikke lagre dine innstillinger og valg"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2042
 msgid "Network Manager support not available"
 msgstr "Network Manager støtte er ikke tilgjengelig"
 
-#: ../src/gajim.py:2095
+#: ../src/gajim.py:2117
 msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Sesjons Administrasjons støtte ikke tilgjengelig (mangler gnome.ui modul)"
+msgstr ""
+"Sesjons Administrasjons støtte ikke tilgjengelig (mangler gnome.ui modul)"
 
 #: ../src/gajim-remote.py:66
 msgid "Shows a help on specific command"
@@ -3851,19 +4032,18 @@ msgid "Popups a window with the next pending event"
 msgstr "Aktiver nytt vindu med den neste ventende hendelsen"
 
 #: ../src/gajim-remote.py:82
-msgid "Prints a list of all contacts in the roster. Each contact appear on a separate line"
-msgstr "Skriv ut en liste over alle kontakter i kontaklisten. Hver kontakt kommer på en egen linje"
-
-#: ../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
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appear on a "
+"separate line"
+msgstr ""
+"Skriv ut en liste over alle kontakter i kontaklisten. Hver kontakt kommer på "
+"en egen linje"
+
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 #: ../src/gajim-remote.py:220
 msgid "account"
 msgstr "konto"
@@ -3887,10 +4067,11 @@ msgstr "status"
 
 #: ../src/gajim-remote.py:96
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
-msgstr "en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, usynlig"
+msgstr ""
+"en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, "
+"usynlig"
 
-#: ../src/gajim-remote.py:97
-#: ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
 #: ../src/gajim-remote.py:132
 msgid "message"
 msgstr "melding"
@@ -3900,8 +4081,12 @@ msgid "status message"
 msgstr "status melding"
 
 #: ../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 "endre status til konto \"konto\". Dersom uspesifisert, prøv å endre status til alle kontoer som har \"synkroniser med global status\" valget påslått"
+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 ""
+"endre status til konto \"konto\". Dersom uspesifisert, prøv å endre status "
+"til alle kontoer som har \"synkroniser med global status\" valget påslått"
 
 #: ../src/gajim-remote.py:104
 msgid "Shows the chat dialog so that you can send messages to a contact"
@@ -3911,43 +4096,50 @@ msgstr "Vis samtale vinduet så du kan sende meldinger til en kontakt"
 msgid "JID of the contact that you want to chat with"
 msgstr "JID til kontakten du ønsker å snakke med"
 
-#: ../src/gajim-remote.py:108
-#: ../src/gajim-remote.py:186
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "om spesifisert vil kontakten fjernes fra listen på denne kontoen"
 
 #: ../src/gajim-remote.py: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 "Sender ny samtale melding til en kontakt i kontaktlisten. Både OpenPGP nøkkelen og konto er valgfri. Dersom du ønsker å sette bare 'konto', uten 'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
+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 ""
+"Sender ny samtale melding til en kontakt i kontaktlisten. Både OpenPGP "
+"nøkkelen og konto er valgfri. Dersom du ønsker å sette bare 'konto', uten "
+"'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: ../src/gajim-remote.py:117
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
 msgid "JID of the contact that will receive the message"
 msgstr "JID til kontakten som vil motta meldingen"
 
-#: ../src/gajim-remote.py:118
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
 msgid "message contents"
 msgstr "meldings innhold"
 
-#: ../src/gajim-remote.py:119
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "pgp key"
 msgstr "pgp nøkkel"
 
-#: ../src/gajim-remote.py:119
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "if specified, the message will be encrypted using this public key"
-msgstr "dersom spesifisert vil meldingen bli kryptert med denne offentlige nøkkelen"
+msgstr ""
+"dersom spesifisert vil meldingen bli kryptert med denne offentlige nøkkelen"
 
-#: ../src/gajim-remote.py:121
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
 msgid "if specified, the message will be sent using this account"
 msgstr "dersom spesifisert, vil meldingen bli sendt med denne kontoen"
 
 #: ../src/gajim-remote.py: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 "Sender ny enkelt melding til en kontakt i kontaktlisten. Både OpenPGP nøkkelen og konto er valgfritt. Dersom du ønsker å sette bare 'konto', uten 'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
+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 ""
+"Sender ny enkelt melding til en kontakt i kontaktlisten. Både OpenPGP "
+"nøkkelen og konto er valgfritt. Dersom du ønsker å sette bare 'konto', uten "
+"'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
 #: ../src/gajim-remote.py:131
 msgid "subject"
@@ -3961,10 +4153,8 @@ msgstr "meldings tittel"
 msgid "Gets detailed info on a contact"
 msgstr "Henter detaljert informasjon om en kontakt"
 
-#: ../src/gajim-remote.py:142
-#: ../src/gajim-remote.py:155
-#: ../src/gajim-remote.py:185
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
 msgid "JID of the contact"
 msgstr "JID til kontakten"
 
@@ -4042,11 +4232,16 @@ msgstr "Legger til en ny kontakt til denne kontoen."
 
 #: ../src/gajim-remote.py:200
 msgid "Returns current status (the global one unless account is specified)"
-msgstr "Returnerer innstillinger (globale innstillinger om ikke en konto er spesifisert)"
+msgstr ""
+"Returnerer innstillinger (globale innstillinger om ikke en konto er "
+"spesifisert)"
 
 #: ../src/gajim-remote.py:207
-msgid "Returns current status message(the global one unless account is specified)"
-msgstr "Returnerer gjeldende status melding (den globale om ikke en konto er spesifisert)"
+msgid ""
+"Returns current status message(the global one unless account is specified)"
+msgstr ""
+"Returnerer gjeldende status melding (den globale om ikke en konto er "
+"spesifisert)"
 
 #: ../src/gajim-remote.py:214
 msgid "Returns number of unreaded messages"
@@ -4069,8 +4264,12 @@ msgid "XML to send"
 msgstr "XML for sending"
 
 #: ../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 "Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt til alle kontoer"
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt "
+"til alle kontoer"
 
 #: ../src/gajim-remote.py:249
 msgid "Missing argument \"contact_jid\""
@@ -4142,254 +4341,295 @@ msgstr "Du kan ikke slette ditt gjeldene tema"
 msgid "Please first choose another for your current theme."
 msgstr "Vennligst velg en annen for ditt gjeldende tema."
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chat"
 msgstr "Privat Samtale"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chats"
 msgstr "Private Samtaler"
 
-#: ../src/groupchat_control.py:120
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Sending av privat melding feilet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Du er ikke lenger i samtalerommet \"%s\" eller \"%s\" har dratt."
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chat"
 msgstr "Gruppe Samtale"
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chats"
 msgstr "Gruppe Samtaler"
 
-#: ../src/groupchat_control.py:315
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Skriv inn Kallenavn"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:789
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
 
-#: ../src/groupchat_control.py:793
+#: ../src/groupchat_control.py:816
 #, 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:800
+#: ../src/groupchat_control.py:823
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:804
+#: ../src/groupchat_control.py:827
 #, 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:812
+#: ../src/groupchat_control.py:835
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
 
-#: ../src/groupchat_control.py:814
+#: ../src/groupchat_control.py:837
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
 
-#: ../src/groupchat_control.py:894
+#: ../src/groupchat_control.py:917
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
 
-#: ../src/groupchat_control.py:899
+#: ../src/groupchat_control.py:922
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har blitt med i gruppesamtalen"
 
 #. No status message
-#: ../src/groupchat_control.py:901
-#: ../src/roster_window.py:1204
+#: ../src/groupchat_control.py:924 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s er nå %s"
 
-#: ../src/groupchat_control.py:1020
-#: ../src/groupchat_control.py:1038
-#: ../src/groupchat_control.py:1131
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1043 ../src/groupchat_control.py:1061
+#: ../src/groupchat_control.py:1154 ../src/groupchat_control.py:1171
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Kallenavn ikke funnet: %s"
 
-#: ../src/groupchat_control.py:1054
+#: ../src/groupchat_control.py:1077
 msgid "This group chat has no subject"
 msgstr "Dette gruppesamtalerommet har ikke tittel"
 
-#: ../src/groupchat_control.py:1067
+#: ../src/groupchat_control.py:1090
 #, 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:1074
-#: ../src/groupchat_control.py:1102
+#: ../src/groupchat_control.py:1097 ../src/groupchat_control.py:1125
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s ser ikke ut til å være en gyldig JID"
 
-#: ../src/groupchat_control.py:1185
+#: ../src/groupchat_control.py:1208
 #, 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)"
+msgstr ""
+"Ingen slik kommando: /%s (dersom du ønsker å sende dette, så skriv /say før "
+"teksten)"
 
-#: ../src/groupchat_control.py:1208
+#: ../src/groupchat_control.py:1231
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandoer: %s"
 
-#: ../src/groupchat_control.py:1210
+#: ../src/groupchat_control.py:1233
 #, 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 "Bruksanvisning: /%s <kallenavn|JID> [grunn], utviser JIDen fra samtalerommet. 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."
+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 ""
+"Bruksanvisning: /%s <kallenavn|JID> [grunn], utviser JIDen fra "
+"samtalerommet. 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:1217
+#: ../src/groupchat_control.py:1240
 #, python-format
-msgid "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
-msgstr "Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu til den spesifiserte brukeren."
+msgid ""
+"Usage: /%s <nickname>, opens a private chat window to the specified occupant."
+msgstr ""
+"Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu til den "
+"spesifiserte brukeren."
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1244
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Bruksanvisning: /%s, tømmer tekst vinduet."
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1246
 #, python-format
-msgid "Usage: /%s [reason], closes the current window or tab, displaying reason if specified."
-msgstr "Bruksanvisning: /%s [årsak], lukker gjeldende vindu eller fane, viser årsak dersom spesifisert."
+msgid ""
+"Usage: /%s [reason], closes the current window or tab, displaying reason if "
+"specified."
+msgstr ""
+"Bruksanvisning: /%s [årsak], lukker gjeldende vindu eller fane, viser årsak "
+"dersom spesifisert."
 
-#: ../src/groupchat_control.py:1226
+#: ../src/groupchat_control.py:1249
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Bruk: /%s, gjemmer samtale knappene."
 
-#: ../src/groupchat_control.py:1229
+#: ../src/groupchat_control.py:1252
 #, python-format
-msgid "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally providing a reason."
-msgstr "Bruksanvisning: /%s <JID> [grunn], inviterer JID til gjeldende rom, og viser en grunn dersom spesifisert."
+msgid ""
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
+"providing a reason."
+msgstr ""
+"Bruksanvisning: /%s <JID> [grunn], inviterer JID til gjeldende rom, og viser "
+"en grunn dersom spesifisert."
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1256
 #, python-format
-msgid "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally using specified nickname."
-msgstr "Bruksanvisning: /%s <rom>@<server>[/kallenavn], inviterer til rom@server og gir mulighet for å spesifisere valgfritt kallenavn."
+msgid ""
+"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
+"using specified nickname."
+msgstr ""
+"Bruksanvisning: /%s <rom>@<server>[/kallenavn], inviterer til rom@server og "
+"gir mulighet for å spesifisere valgfritt kallenavn."
 
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1260
 #, 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 "Bruksanvisning: /%s <kallenavn> [grunn], fjerner brukeren spesifisert av kallenavn fra rommet og viser om spesifisert en grunn. Støtter ikke mellomrom i kallenavn."
+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 ""
+"Bruksanvisning: /%s <kallenavn> [grunn], fjerner brukeren spesifisert av "
+"kallenavn fra rommet og viser om spesifisert en grunn. Støtter ikke "
+"mellomrom i kallenavn."
 
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1265
 #, python-format
-msgid "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 explodes.)"
+msgid ""
+"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 explodes.)"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1269
 #, python-format
-msgid "Usage: /%s <nickname> [message], opens a private message windowand sends message to the occupant specified by nickname."
-msgstr "Bruk: /%s <kallenavn> [melding], åpner et privat meldingsvindu og sender meldingen til brukeren spesifisert av kallenavn."
+msgid ""
+"Usage: /%s <nickname> [message], opens a private message windowand sends "
+"message to the occupant specified by nickname."
+msgstr ""
+"Bruk: /%s <kallenavn> [melding], åpner et privat meldingsvindu og sender "
+"meldingen til brukeren spesifisert av kallenavn."
 
-#: ../src/groupchat_control.py:1251
+#: ../src/groupchat_control.py:1274
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende samtalerom."
+msgstr ""
+"Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende "
+"samtalerom."
 
-#: ../src/groupchat_control.py:1255
+#: ../src/groupchat_control.py:1278
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Bruksanvisning: /%s , viser navnene til deltakere i samtalerommet."
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1282
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr "Bruksanvisning: /%s [tittel], viser eller oppdaterer samtalerom tittel."
+msgstr ""
+"Bruksanvisning: /%s [tittel], viser eller oppdaterer samtalerom tittel."
 
-#: ../src/groupchat_control.py:1262
+#: ../src/groupchat_control.py:1285
 #, python-format
-msgid "Usage: /%s <message>, sends a message without looking for other commands."
-msgstr "Bruksanvisning: /%s <melding>, sender en melding uten å se etter andre kommandoer."
+msgid ""
+"Usage: /%s <message>, sends a message without looking for other commands."
+msgstr ""
+"Bruksanvisning: /%s <melding>, sender en melding uten å se etter andre "
+"kommandoer."
 
-#: ../src/groupchat_control.py:1265
+#: ../src/groupchat_control.py:1288
 #, python-format
 msgid "No help info for /%s"
 msgstr "Ingen hjelpe informasjon for /%s"
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Er du sikker på at du vil gå ut av samtalerommet \"%s\"?"
 
-#: ../src/groupchat_control.py:1316
-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 samtalerommet."
+#: ../src/groupchat_control.py:1339
+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 samtalerommet."
 
-#: ../src/groupchat_control.py:1320
-#: ../src/roster_window.py:3961
+#: ../src/groupchat_control.py:1343 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "_Ikke spør meg igjen"
 
-#: ../src/groupchat_control.py:1354
+#: ../src/groupchat_control.py:1377
 msgid "Changing Subject"
 msgstr "Endrer Tittel"
 
-#: ../src/groupchat_control.py:1355
+#: ../src/groupchat_control.py:1378
 msgid "Please specify the new subject:"
 msgstr "Vennlist skriv inn ny tittel:"
 
-#: ../src/groupchat_control.py:1364
+#: ../src/groupchat_control.py:1387
 msgid "Changing Nickname"
 msgstr "Endrer Kallenavn"
 
-#: ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1388
 msgid "Please specify the new nickname you want to use:"
 msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
 
-#: ../src/groupchat_control.py:1390
+#: ../src/groupchat_control.py:1413
 msgid "Bookmark already set"
 msgstr "Bokmerke allerede satt"
 
-#: ../src/groupchat_control.py:1391
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Gruppesamtalen \"%s\" er allerede i dine bokmerker."
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1423
 msgid "Bookmark has been added successfully"
 msgstr "Bokmerke har blitt lagt til"
 
-#: ../src/groupchat_control.py:1401
+#: ../src/groupchat_control.py:1424
 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:1527
+#: ../src/groupchat_control.py:1550
 #, python-format
 msgid "Kicking %s"
 msgstr "Utkasting %s"
 
-#: ../src/groupchat_control.py:1528
-#: ../src/groupchat_control.py:1810
+#: ../src/groupchat_control.py:1551 ../src/groupchat_control.py:1833
 msgid "You may specify a reason below:"
 msgstr "Du kan spesifisere grunn under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1809
+#: ../src/groupchat_control.py:1832
 #, python-format
 msgid "Banning %s"
 msgstr "Utvise %s"
@@ -4399,8 +4639,12 @@ msgid "A programming error has been detected"
 msgstr "En programmerings feil har blitt detektert"
 
 #: ../src/gtkexcepthook.py:42
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
-msgstr "Det er sannsynligvis ikke kritisk, men bør rapporteres til utviklerene likevel."
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
+msgstr ""
+"Det er sannsynligvis ikke kritisk, men bør rapporteres til utviklerene "
+"likevel."
 
 #: ../src/gtkexcepthook.py:48
 msgid "_Report Bug"
@@ -4411,8 +4655,7 @@ msgid "Details"
 msgstr "Detaljer"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:153
-#: ../src/gtkgui_helpers.py:168
+#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Feil: kan ikke åpne %s for lesing"
@@ -4432,16 +4675,16 @@ msgstr "Feil under traversering av fil:"
 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:727
+#: ../src/gtkgui_helpers.py:728
 msgid "Extension not supported"
 msgstr "Utvidelse ikke støttet"
 
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:729
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr "Bilde kan ikke lagres i %(type)s format. Lagre som %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:737
+#: ../src/gtkgui_helpers.py:738
 msgid "Save Image as..."
 msgstr "Lagre Bilde som..."
 
@@ -4455,42 +4698,39 @@ msgid "Contacts"
 msgstr "Kontakter"
 
 #. holds time
-#: ../src/history_manager.py:120
-#: ../src/history_manager.py:160
+#: ../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:126
-#: ../src/history_manager.py:178
+#: ../src/history_manager.py:126 ../src/history_manager.py:178
 msgid "Nickname"
 msgstr "Kallenavn"
 
 #. holds message
-#: ../src/history_manager.py:134
-#: ../src/history_manager.py:166
+#: ../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:141
-#: ../src/history_manager.py:172
-msgid "Subject"
-msgstr "Tittel"
-
 #: ../src/history_manager.py:186
-msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
+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: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 ""
-"Normalt vil tildelt database plass ikke frigjøres, den vil bare be merket som ledig. Dersom du virkelig ønsker å redusere fil størrelsen klikker du JA, ellers klikker du NEI.\n"
+"Normalt vil tildelt database plass ikke frigjøres, den vil bare be merket "
+"som ledig. Dersom du virkelig ønsker å redusere fil størrelsen klikker du "
+"JA, ellers klikker du NEI.\n"
 "\n"
 "I tilfelle du klikker JA, vennligst vent..."
 
@@ -4509,8 +4749,7 @@ 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:518
-#: ../src/history_manager.py:554
+#: ../src/history_manager.py:518 ../src/history_manager.py:554
 msgid "This is an irreversible operation."
 msgstr "Denne operasjonen kan ikke angres."
 
@@ -4520,8 +4759,7 @@ msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ønsker du virkelig å slette den valgte meldingen?"
 msgstr[1] "Ønsker du virkelig å slette de valgte meldingene?"
 
-#: ../src/history_window.py:103
-#: ../src/history_window.py:105
+#: ../src/history_window.py:103 ../src/history_window.py:105
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Samtale Historikk med %s"
@@ -4531,8 +4769,7 @@ msgstr "Samtale Historikk med %s"
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s er nå %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:265
-#: ../src/notify.py:198
+#: ../src/history_window.py:265 ../src/notify.py:198
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s er nå %(status)s"
@@ -4591,15 +4828,12 @@ msgstr "%(nickname)s: %(message)s"
 msgid "New Message from %(nickname)s"
 msgstr "Ny Melding fra %(nickname)s"
 
-#: ../src/profile_window.py:72
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:72 ../src/profile_window.py:376
 msgid "Retrieving profile..."
 msgstr "Henter profil..."
 
-#: ../src/profile_window.py:107
-#: ../src/profile_window.py:203
-#: ../src/profile_window.py:212
-#: ../src/profile_window.py:370
+#: ../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 "Klikk for å sette ditt kontaktbilde"
 
@@ -4633,34 +4867,33 @@ msgid "vCard publication failed"
 msgstr "vCard publisering feilet"
 
 #: ../src/profile_window.py:348
-msgid "There was an error while publishing your personal information, try again later."
-msgstr "Det skjedde en feil med publisering av din personlige informasjon, prøv igjen senere."
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Det skjedde en feil med publisering av din personlige informasjon, prøv "
+"igjen senere."
 
 #: ../src/profile_window.py: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:168
-#: ../src/roster_window.py:223
+#: ../src/roster_window.py:168 ../src/roster_window.py:223
 msgid "Merged accounts"
 msgstr "Samlede kontoer"
 
-#: ../src/roster_window.py:340
-#: ../src/common/helpers.py:42
+#: ../src/roster_window.py:340 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "Observerere"
 
-#: ../src/roster_window.py:686
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:686 ../src/roster_window.py:3132
 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"
 
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:878
-#: ../src/systray.py:187
-#: ../src/systray.py:192
+#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
 #, python-format
 msgid "using account %s"
 msgstr "bruker kontoen %s"
@@ -4703,8 +4936,7 @@ msgstr "Historikk Behandler"
 msgid "_Join New Group Chat"
 msgstr "_Bli med i Gruppesamtale"
 
-#: ../src/roster_window.py:1384
-#: ../src/roster_window.py:3325
+#: ../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"
@@ -4719,8 +4951,12 @@ msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
 #: ../src/roster_window.py:1389
-msgid "You will no longer be able to send and receive messages to contacts from this transport."
-msgstr "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra denne transporten."
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"this transport."
+msgstr ""
+"Du vil ikke lenger kunne sende og motta meldinger med kontakter fra denne "
+"transporten."
 
 #: ../src/roster_window.py:1392
 msgid "Transports will be removed"
@@ -4728,8 +4964,12 @@ msgstr "Transportene vil bli fjernet"
 
 #: ../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 "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra disse transportene:%s"
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr ""
+"Du vil ikke lenger kunne sende og motta meldinger med kontakter fra disse "
+"transportene:%s"
 
 #. it's jid
 #: ../src/roster_window.py:1417
@@ -4771,8 +5011,7 @@ msgstr "Tilegn OpenPGP Nøkkel"
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: ../src/roster_window.py:1788
-#: ../src/roster_window.py:1963
+#: ../src/roster_window.py:1788 ../src/roster_window.py:1963
 msgid "_New group chat"
 msgstr "_Ny gruppe samtale"
 
@@ -4780,8 +5019,7 @@ msgstr "_Ny gruppe samtale"
 msgid "I would like to add you to my roster"
 msgstr "Jeg ønsker å legge deg til min kontaktliste"
 
-#: ../src/roster_window.py:2008
-#: ../src/roster_window.py:2055
+#: ../src/roster_window.py:2008 ../src/roster_window.py:2055
 msgid "Send Group M_essage"
 msgstr "Send Gruppe M_elding"
 
@@ -4805,8 +5043,7 @@ msgstr "_Logg på"
 msgid "Log _off"
 msgstr "Logg _av"
 
-#: ../src/roster_window.py:2232
-#: ../src/roster_window.py:2303
+#: ../src/roster_window.py:2232 ../src/roster_window.py:2303
 msgid "_Change Status Message"
 msgstr "_Endre Status Melding"
 
@@ -4826,7 +5063,9 @@ msgstr "Abonnerings forespørsel er sendt"
 #: ../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."
+msgstr ""
+"Dersom \"%s\" aksepterer denne forespørselen vil du få vite hans eller "
+"hennes status."
 
 #: ../src/roster_window.py:2413
 msgid "Authorization has been removed"
@@ -4843,12 +5082,20 @@ msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
 #: ../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 "Ved å fjerne denne kontakten fjerner du også godkjenningen som gjør at han eller henne alltid vil se deg som frakoblet."
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Ved å fjerne denne kontakten fjerner du også godkjenningen som gjør at han "
+"eller henne alltid vil se deg som frakoblet."
 
 #: ../src/roster_window.py:2626
-msgid "By removing this contact you also by default remove authorization resulting in him or her always seeing you as offline."
-msgstr "Ved å fjerne denne kontakten fjerner du også godkjenningen som resulterer i at han eller henne alltid vil se deg som frakoblet."
+msgid ""
+"By removing this contact you also by default remove authorization resulting "
+"in him or her always seeing you as offline."
+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:2629
 msgid "I want this contact to know my status after removal"
@@ -4866,7 +5113,8 @@ msgid ""
 "you also remove authorization resulting in them always seeing you as offline."
 msgstr ""
 "Ved å fjerne disse kontaktene:%s\n"
-"fjerner du også autorisasjonen som gjør at de alltid vil se deg som frakoblet."
+"fjerner du også autorisasjonen som gjør at de alltid vil se deg som "
+"frakoblet."
 
 #: ../src/roster_window.py:2709
 msgid "Passphrase Required"
@@ -4889,15 +5137,17 @@ msgstr "Feil Passordsetning"
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
 
-#: ../src/roster_window.py:2781
-#: ../src/roster_window.py:2841
+#: ../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: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 "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: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 ""
+"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:2799
 msgid "No account available"
@@ -4912,26 +5162,41 @@ msgstr "Du må lage en konto før du kan snakke med andre kontakter."
 msgid "♪ \"%(title)s\" by %(artist)s ♪"
 msgstr "♪ \"%(title)s\" etter %(artist)s ♪"
 
-#: ../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 "Meldinger vil kun være tilgjengelig for lesing senere dersom du har historikk påslått."
+#: ../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 ""
+"Meldinger vil kun være tilgjengelig for lesing senere dersom du har "
+"historikk påslått."
 
 #: ../src/roster_window.py:3911
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakter lagring støttes ikke av din server"
 
 #: ../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 "Din server støtter ikke lagring av metakontakt informasjon. Så denne informasjonen vil ikke bli lagret på neste oppkobling."
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be save on next reconnection."
+msgstr ""
+"Din server støtter ikke lagring av metakontakt informasjon. Så denne "
+"informasjonen vil ikke bli lagret på neste oppkobling."
 
 #: ../src/roster_window.py:3955
-msgid "You are about to create a metacontact. Are you sure you want to continue?"
-msgstr "Du skal til å lage en metakontakt. Er du sikker på at du ønsker å fortsette?"
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr ""
+"Du skal til å lage en metakontakt. Er du sikker på at du ønsker å fortsette?"
 
 #: ../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 "Metakontakter er en måte å gruppere flere kontakter på en linje. Generelt brukes dette når samme person har flere Jabber kontoer eller transport kontoer."
+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 ""
+"Metakontakter er en måte å gruppere flere kontakter på en linje. Generelt "
+"brukes dette når samme person har flere Jabber kontoer eller transport "
+"kontoer."
 
 #: ../src/roster_window.py:4124
 #, python-format
@@ -4955,13 +5220,11 @@ msgstr "_Endre Status Melding..."
 msgid "Hide this menu"
 msgstr "Gjem dette vinduet"
 
-#: ../src/tooltips.py:309
-#: ../src/tooltips.py:492
+#: ../src/tooltips.py:309 ../src/tooltips.py:492
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:312
-#: ../src/tooltips.py:496
+#: ../src/tooltips.py:312 ../src/tooltips.py:496
 msgid "Resource: "
 msgstr "Ressurs: "
 
@@ -4970,8 +5233,7 @@ msgstr "Ressurs: "
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s av denne samtalegruppen"
 
-#: ../src/tooltips.py:430
-#: ../src/tooltips.py:610
+#: ../src/tooltips.py:430 ../src/tooltips.py:610
 msgid "Status: "
 msgstr "Status: "
 
@@ -5010,8 +5272,7 @@ msgstr "Type: "
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: ../src/tooltips.py:588
-#: ../src/tooltips.py:609
+#: ../src/tooltips.py:588 ../src/tooltips.py:609
 msgid "Not started"
 msgstr "Ikke startet"
 
@@ -5019,8 +5280,7 @@ msgstr "Ikke startet"
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/tooltips.py:594
-#: ../src/tooltips.py:597
+#: ../src/tooltips.py:594 ../src/tooltips.py:597
 msgid "Completed"
 msgstr "Komplett"
 
@@ -5057,8 +5317,7 @@ msgstr "?Client:Ukjent"
 msgid "?OS:Unknown"
 msgstr "?OS:Ukjent"
 
-#: ../src/vcard.py:247
-#: ../src/vcard.py:449
+#: ../src/vcard.py:247 ../src/vcard.py:449
 #, python-format
 msgid "since %s"
 msgstr "siden %s"
@@ -5068,29 +5327,40 @@ msgid "Affiliation:"
 msgstr "Tilhørighet: "
 
 #: ../src/vcard.py:285
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
-msgstr "Denne kontakten er interessert i din tilstedeværelses informasjon, men du er ikke interessert i hans/hennes status."
+msgid ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
+msgstr ""
+"Denne kontakten er interessert i din tilstedeværelses informasjon, men du er "
+"ikke interessert i hans/hennes status."
 
 #: ../src/vcard.py:287
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
-msgstr "Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/hun er ikke interessert i din."
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
+msgstr ""
+"Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/"
+"hun er ikke interessert i din."
 
 #: ../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"
+msgstr ""
+"Du og kontakten er interessert i hverandres tilstedeværelses informasjon"
 
 #. None
 #: ../src/vcard.py:291
-msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
-msgstr "Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller han/hun i din."
+msgid ""
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
+msgstr ""
+"Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller "
+"han/hun i din."
 
 #: ../src/vcard.py:299
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Du venter på kontaktens svar på din abonnerings forespørsel"
 
-#: ../src/vcard.py:311
-#: ../src/vcard.py:338
-#: ../src/vcard.py:482
+#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
 msgid " resource with priority "
 msgstr " ressurs med prioritet"
 
@@ -5098,17 +5368,14 @@ msgstr " ressurs med prioritet"
 msgid "creating logs database"
 msgstr "lager logg database"
 
-#: ../src/common/check_paths.py:89
-#: ../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:90
-#: ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:108
-#: ../src/common/check_paths.py:116
+#: ../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"
 
@@ -5143,8 +5410,10 @@ msgid "Not available as a result of being idle"
 msgstr "Ikke tilgjengelig på grunn av inaktivitet"
 
 #: ../src/common/config.py:82
-msgid "List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr "Liste (mellomrom separert) av rader (kontoer og grupper) som er kollapset."
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"Liste (mellomrom separert) av rader (kontoer og grupper) som er kollapset."
 
 #: ../src/common/config.py:87
 msgid "Enable link-local/zeroconf messaging"
@@ -5165,44 +5434,74 @@ msgstr ""
 "'never' - aldri vis klokkeslett."
 
 #: ../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 "Skriv klokkeslett i samtaler med Fuzzy Clock. Verdien av fuzziness fra 1 til 4, eller 0 for å deaktiver fuzzyclock. 1 er den mest presise klokke, 4 er den mindre presise. Dette brukes bare dersom print_time er 'sometimes'."
+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 ""
+"Skriv klokkeslett i samtaler med Fuzzy Clock. Verdien av fuzziness fra 1 til "
+"4, eller 0 for å deaktiver fuzzyclock. 1 er den mest presise klokke, 4 er "
+"den mindre presise. Dette brukes bare dersom print_time er 'sometimes'."
 
 #: ../src/common/config.py:95
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _ par som mulige formaterings symboler."
 
 #: ../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."
+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:99
-msgid "Uses ReStructured text markup for HTML, plus ascii formatting if selected. (If you want to use this, install docutils)"
-msgstr "Bruker ReStrukturert tekstoppmerking for HTML, pluss ascii formatering dersom valgt. (Dersom du ønsker å bruke dette, må du installere docutils)"
+msgid ""
+"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
+"(If you want to use this, install docutils)"
+msgstr ""
+"Bruker ReStrukturert tekstoppmerking for HTML, pluss ascii formatering "
+"dersom valgt. (Dersom du ønsker å bruke dette, må du installere docutils)"
 
 #: ../src/common/config.py:108
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Tegn å legge til etter kallenavn når du bruker kallenavn fullføring (tab) i gruppesamtaler."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Tegn å legge til etter kallenavn når du bruker kallenavn fullføring (tab) i "
+"gruppesamtaler."
 
 #: ../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 "Tegnforslag å legge til nytt kallenavn når det ønskede kallenavnet er opptatt av noen andre i samtalegruppen."
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Tegnforslag å legge til nytt kallenavn når det ønskede kallenavnet er "
+"opptatt av noen andre i samtalegruppen."
 
 #: ../src/common/config.py:142
 msgid "Add * and [n] in roster title?"
 msgstr "Legg * og [n] inn i kontaktliste tittelen?"
 
 #: ../src/common/config.py:143
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
-msgstr "Hvor mange linjer skal huskes fra forrige samtale når et samtale vindu/fane blir åpnet på nytt."
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Hvor mange linjer skal huskes fra forrige samtale når et samtale vindu/fane "
+"blir åpnet på nytt."
 
 #: ../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."
+msgstr ""
+"Hvor mange minutter skal de siste linjene fra forrige konversasjon vare."
 
 #: ../src/common/config.py:145
-msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
-msgstr "Send meldinger med Ctrl+Enter og med Enter lag ny linje (Mirabilis ICQ Klient standard oppførsel)."
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Send meldinger med Ctrl+Enter og med Enter lag ny linje (Mirabilis ICQ "
+"Klient standard oppførsel)."
 
 #: ../src/common/config.py:147
 msgid "How many lines to store for Ctrl+KeyUP."
@@ -5210,44 +5509,77 @@ msgstr "Hvor mange linjer skal lagres for Ctrl+PilOPP."
 
 #: ../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 "Enten bruk egendefinert url med %s i seg hvor %s er ordet/frasen eller 'WIKTIONARY' som betyr bruk wiktionary."
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Enten bruk egendefinert url med %s i seg hvor %s er ordet/frasen eller "
+"'WIKTIONARY' som betyr bruk wiktionary."
 
 #: ../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 "Dersom True så lytt til D-Bus signaler fra NetworkManager og endre status for kontoer (gitt at de ikke har listen_to_network_manager satt til False og at de synkroniserer med global status) basert på statusen til nettverks tilkoblingen."
+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 ""
+"Dersom True så lytt til D-Bus signaler fra NetworkManager og endre status "
+"for kontoer (gitt at de ikke har listen_to_network_manager satt til False og "
+"at de synkroniserer med global status) basert på statusen til nettverks "
+"tilkoblingen."
 
 #: ../src/common/config.py:155
-msgid "Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr "Sendt samtale status melding. Kan være alle, bare_skriving, avslått."
 
 #: ../src/common/config.py:156
-msgid "Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled."
-msgstr "Vist samtale status melding i samtalevindu. Kan være alle, bare_skriving, avslått."
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Vist samtale status melding i samtalevindu. Kan være alle, bare_skriving, "
+"avslått."
 
 #: ../src/common/config.py:158
-msgid "When not printing time for every message (print_time==sometimes), print it every x minutes."
-msgstr "Når man ikke viser klokkeslett for hver melding (print_time==av-og-til), vis det hvert x minutt."
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Når man ikke viser klokkeslett for hver melding (print_time==av-og-til), vis "
+"det hvert x minutt."
 
 #: ../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:160
-msgid "Always ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Spør alltid før lukking av gruppesamtale fane/vindu i denne mellomrom separerte listen av rom jider."
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"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:161
-msgid "Never ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Aldri spør før lukking av gruppesamtale fane/vindu i denne mellomroms separerte listen av rom jider."
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"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:164
-msgid "Overrides the host we send for File Transfer in case of address translation/port forwarding."
-msgstr "Overstyrer maskinen navnet vi sender for Fil Overføring i tilfeller med adresse oversetting/port videresending."
+msgid ""
+"Overrides the host we send for File Transfer in case of address translation/"
+"port forwarding."
+msgstr ""
+"Overstyrer maskinen navnet vi sender for Fil Overføring i tilfeller med "
+"adresse oversetting/port videresending."
 
 #: ../src/common/config.py:166
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
@@ -5270,36 +5602,66 @@ msgid "Show close button in tab?"
 msgstr "Vis lukk knapp på fanen?"
 
 #: ../src/common/config.py:189
-msgid "A semicolon-separated list of words that will be highlighted in group chats."
+msgid ""
+"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 gruppesamtaler."
 
 #: ../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 "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. "
+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 ""
+"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: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: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 "Dersom True vil Gajim ise et ikon på hver fane som inneholder uleste meldinger. Avhengig av valgte tema kan dette ikonet være animert."
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+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:193
-msgid "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window."
-msgstr "Dersom True vil Gajim vise status meldingen, om den ikke er tom, for hver kontakt under kontaktens navn i kontaktliste vinduet."
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"Dersom True vil Gajim vise status meldingen, om den ikke er tom, for hver "
+"kontakt under kontaktens navn i kontaktliste vinduet."
 
 #: ../src/common/config.py: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 "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."
+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 ""
+"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: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 "Dersom False vil du ikke lenger kunne se status linjer i samtaler når en kontakt endrer hans eller hennes status og/eller status melding. "
+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 ""
+"Dersom False vil du ikke lenger kunne se status linjer i samtaler når en "
+"kontakt endrer hans eller hennes status og/eller status melding. "
 
 #: ../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 group chat."
-msgstr "kan være \"none\",\"all\" eller \"in_and_out\". Dersom \"none\" vil Gajim ikke lenger vise status linje i gruppesamtaler når et medlem endrer hans/hennes status melding. Dersom \"all\" vil Gajim vise alle status meldinger. Dersom \"in_and_out\" vil Gajim bare vise FOO kommer/drar fra gruppesamtalen."
+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 ""
+"kan være \"none\",\"all\" eller \"in_and_out\". Dersom \"none\" vil Gajim "
+"ikke lenger vise status linje i gruppesamtaler når et medlem endrer hans/"
+"hennes status melding. Dersom \"all\" vil Gajim vise alle status meldinger. "
+"Dersom \"in_and_out\" vil Gajim bare vise FOO kommer/drar fra gruppesamtalen."
 
 #: ../src/common/config.py:199
 msgid "Background color of contacts when they just signed in."
@@ -5310,8 +5672,10 @@ msgid "Background color of contacts when they just signed out."
 msgstr "Bakgrunnsfargen for kontakter når de akkurat har logget ut."
 
 #: ../src/common/config.py:202
-msgid "If True, restored messages will use a smaller font than the default one."
-msgstr "Dersom True vil gjenopprettede meldinger bruke en mindre font en standard."
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+"Dersom True vil gjenopprettede meldinger bruke en mindre font en standard."
 
 #: ../src/common/config.py:203
 msgid "Don't show avatar for the transport itself."
@@ -5322,12 +5686,24 @@ msgid "Don't show roster in the system taskbar."
 msgstr "Ikke vis kontaktlisten i systemstatus-feltet."
 
 #: ../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 "Dersom True og de installerte GTK+ og PyGTK versjonene er minst 2.8, vil vindusbehandleren blinke (vanlig oppførsel i de fleste vindusbehandlere) når det er ventende hendelser."
+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 ""
+"Dersom True og de installerte GTK+ og PyGTK versjonene er minst 2.8, vil "
+"vindusbehandleren blinke (vanlig oppførsel i de fleste vindusbehandlere) når "
+"det er ventende hendelser."
 
 #: ../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 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"
+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 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:210
@@ -5336,13 +5712,17 @@ msgid ""
 "'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 ""
 "Kontrollerer vinduet hvor nye meldinger skal plasseres.\n"
 "'always' - Alle meldinger sendes til ett vindu.\n"
 "'never' - Alle meldinger får egne vindu.\n"
 "'peracct' - Meldinger for hver konto sendes til egne vindu.\n"
-"'pertype' - Hver meldingstype (f.eks., samtaler og gruppesamtaler) sendes til forskjellige vinduer. Merk, endring av dette valget krever omstart av Gajim før det aktiveres"
+"'pertype' - Hver meldingstype (f.eks., samtaler og gruppesamtaler) sendes "
+"til forskjellige vinduer. Merk, endring av dette valget krever omstart av "
+"Gajim før det aktiveres"
 
 #: ../src/common/config.py:211
 msgid "If False, you will no longer see the avatar in the chat window."
@@ -5373,8 +5753,12 @@ msgid "Hides the group chat occupants list in group chat window."
 msgstr "Gjemmer rommets medlemsliste i gruppesamtale vinduet."
 
 #: ../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 "I en samtale, vis kallenavnet i starten av linjen bare når det ikke er den samme person som snakker som i den forrige meldingen."
+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 ""
+"I en samtale, vis kallenavnet i starten av linjen bare når det ikke er den "
+"samme person som snakker som i den forrige meldingen."
 
 #: ../src/common/config.py:219
 msgid "Indentation when using merge consecutive nickame."
@@ -5382,23 +5766,38 @@ msgstr "Innrykk når man bruker sammenslåing av like kallenavn."
 
 #: ../src/common/config.py:220
 msgid "List of colors that will be used to color nicknames in group chats."
-msgstr "Liste av farger som vil bli brukt til å farge kallenavn i gruppesamtaler."
+msgstr ""
+"Liste av farger som vil bli brukt til å farge kallenavn i gruppesamtaler."
 
 #: ../src/common/config.py:221
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab går til neste skrivefane når ingenting er ulest."
 
 #: ../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 "Skal vi vise bekreft metakontakt opprettings dialogen eller ikke?Tomt innhold mener at vi aldri viser dialogen."
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Skal vi vise bekreft metakontakt opprettings dialogen eller ikke?Tomt "
+"innhold mener at vi aldri viser dialogen."
 
 #: ../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 "Dersom True vil du kunne sette en negativ prioritet til din konto i kontoinnstillingene. VÆR FORSIKTIG, når du er logget inn med en negativ prioritet vil du ikke motta noen meldinger fra din server."
+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 ""
+"Dersom True vil du kunne sette en negativ prioritet til din konto i "
+"kontoinnstillingene. VÆR FORSIKTIG, når du er logget inn med en negativ "
+"prioritet vil du ikke motta noen meldinger fra din server."
 
 #: ../src/common/config.py:234
-msgid "Priority will change automatically according to your status. Priorities are defined in autopriority_* options."
-msgstr "Prioritet vil endre automatisk i følge med din status. Prioritetene defineres i autopriority_* valgene."
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Prioritet vil endre automatisk i følge med din status. Prioritetene "
+"defineres i autopriority_* valgene."
 
 #. yes, no, ask
 #: ../src/common/config.py:263
@@ -5406,15 +5805,18 @@ msgid "Jabberd2 workaround"
 msgstr "Jabberd2 omvei"
 
 #: ../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 "Dersom valgt vil Gajim bruke din IP og proxier definert i file_transfer_proxies valget for filoverføring."
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Dersom valgt vil Gajim bruke din IP og proxier definert i "
+"file_transfer_proxies valget for filoverføring."
 
 #: ../src/common/config.py:326
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Er OpenPGP tilgjengelig for denne kontakten?"
 
-#: ../src/common/config.py:327
-#: ../src/common/config.py:330
+#: ../src/common/config.py:327 ../src/common/config.py:330
 msgid "Language for which we want to check misspelled words"
 msgstr "Språk som vi ønsker å sjekke feilstavede ord med"
 
@@ -5426,10 +5828,8 @@ msgstr "alle eller mellomroms separert status"
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', eller 'both'"
 
-#: ../src/common/config.py:338
-#: ../src/common/config.py:340
-#: ../src/common/config.py:341
-#: ../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 "'yes', 'no' eller ''"
@@ -5502,26 +5902,28 @@ msgstr "Jeg er ikke tilgjengelig."
 msgid "Do not disturb."
 msgstr "Ikke forstyrr."
 
-#: ../src/common/config.py:366
-#: ../src/common/config.py:367
+#: ../src/common/config.py:366 ../src/common/config.py:367
 msgid "Bye!"
 msgstr "Hade bra!"
 
 #: ../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."
-msgstr "Lyd som spilles når en samtalerom melding inneholder et av ordene i muc_highlight_words, eller når en samtalerom melding inneholder ditt kallenavn."
+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 ""
+"Lyd som spilles når en samtalerom melding inneholder et av ordene i "
+"muc_highlight_words, eller når en samtalerom melding inneholder ditt "
+"kallenavn."
 
 #: ../src/common/config.py:377
 msgid "Sound to play when any MUC message arrives."
 msgstr "Lyd som spilles når en ny samtalerom melding mottas."
 
-#: ../src/common/config.py:386
-#: ../src/common/optparser.py:197
+#: ../src/common/config.py:386 ../src/common/optparser.py:197
 msgid "green"
 msgstr "grønn"
 
-#: ../src/common/config.py:390
-#: ../src/common/optparser.py:183
+#: ../src/common/config.py:390 ../src/common/optparser.py:183
 msgid "grocery"
 msgstr "varehandel"
 
@@ -5545,15 +5947,19 @@ msgstr "Feil maskinnavn"
 
 #: ../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 "Maskinen du konfigurerte som ft_override_host_to_send avanserte valg er ikke gyldig, så den ignoreres."
+msgid ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"Maskinen du konfigurerte som ft_override_host_to_send avanserte valg er ikke "
+"gyldig, så den ignoreres."
 
 #: ../src/common/connection_handlers.py:590
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registrerings informasjon for transport %s har ikke kommet tidsnok"
 
-#: ../src/common/connection_handlers.py:1519
+#: ../src/common/connection_handlers.py:1523
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Kallenavn ikke lovlig: %s"
@@ -5561,72 +5967,78 @@ msgstr "Kallenavn ikke lovlig: %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
+#: ../src/common/connection_handlers.py:1585
+#: ../src/common/connection_handlers.py:1588
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1597
+#: ../src/common/connection_handlers.py:1600
+#: ../src/common/connection_handlers.py:1608
 msgid "Unable to join group chat"
 msgstr "Klarer ikke å gå inn i gruppesamtale"
 
-#: ../src/common/connection_handlers.py:1582
+#: ../src/common/connection_handlers.py:1586
 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:1585
+#: ../src/common/connection_handlers.py:1589
 msgid "You are banned from this group chat."
 msgstr "Du er uønsket i dette samtalerommet."
 
-#: ../src/common/connection_handlers.py:1588
+#: ../src/common/connection_handlers.py:1592
 msgid "Such group chat does not exist."
 msgstr "Et slikt samtalerom finnes ikke."
 
-#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1595
 msgid "Group chat creation is restricted."
 msgstr "Gruppesamtale oppretting er begrenset."
 
-#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1598
 msgid "Your registered nickname must be used."
 msgstr "Ditt registrerte kallenavn må bli brukt. "
 
-#: ../src/common/connection_handlers.py:1597
+#: ../src/common/connection_handlers.py:1601
 msgid "You are not in the members list."
 msgstr "Du er ikke medlems listen."
 
-#: ../src/common/connection_handlers.py:1605
+#: ../src/common/connection_handlers.py:1609
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
-"Ditt ønskede kallenavn er i bruk eller er registrert av en annen samtalebruker.\n"
+"Ditt ønskede kallenavn er i bruk eller er registrert av en annen "
+"samtalebruker.\n"
 "Vennligst skriv et annet kallenavn under:"
 
-#: ../src/common/connection_handlers.py:1651
+#: ../src/common/connection_handlers.py:1659
 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:1672
+#: ../src/common/connection_handlers.py:1680
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi abonnerer nå på %s"
 
-#: ../src/common/connection_handlers.py:1674
+#: ../src/common/connection_handlers.py:1682
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "frakoblings ønske fra %s"
 
-#: ../src/common/connection_handlers.py:1676
+#: ../src/common/connection_handlers.py:1684
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "vi abonnerer ikke lenger på %s"
 
-#: ../src/common/connection_handlers.py:1846
+#: ../src/common/connection_handlers.py:1854
 #, python-format
-msgid "JID %s is not RFC compliant. It will not be added to your roster. Use roster management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr "JID %s er ikke RFC kompatibel. Den vil ikke bli lagt til kontaktlisten. Bruk kontaktliste administrasjons verktøy som http://jru.jabberstudio.org/ for å fjerne den"
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s er ikke RFC kompatibel. Den vil ikke bli lagt til kontaktlisten. Bruk "
+"kontaktliste administrasjons verktøy som http://jru.jabberstudio.org/ for å "
+"fjerne den"
 
 #: ../src/common/connection.py:164
 #: ../src/common/zeroconf/connection_zeroconf.py:196
@@ -5638,8 +6050,7 @@ msgstr "Tilkobling til konto \"%s\" har blitt mistet"
 msgid "Reconnect manually."
 msgstr "Automatisk tilkobling."
 
-#: ../src/common/connection.py:176
-#: ../src/common/connection.py:203
+#: ../src/common/connection.py:176 ../src/common/connection.py:203
 #, python-format
 msgid "Transport %s answered wrongly to register request: %s"
 msgstr "Transporten %s svarte feil på registrerings forespørselen: %s"
@@ -5649,9 +6060,8 @@ msgstr "Transporten %s svarte feil på registrerings forespørselen: %s"
 msgid "Invalid answer"
 msgstr "Ugyldig svar"
 
-#: ../src/common/connection.py:394
-#: ../src/common/connection.py:429
-#: ../src/common/connection.py:871
+#: ../src/common/connection.py:394 ../src/common/connection.py:429
+#: ../src/common/connection.py:877
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
@@ -5708,7 +6118,7 @@ msgstr "Jeg er %s"
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Denne meldingen er *kryptert* (Se: JEP:`27`]"
 
-#: ../src/common/connection.py:758
+#: ../src/common/connection.py:764
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -5718,7 +6128,7 @@ msgstr ""
 "Tittel: %s\n"
 "%s"
 
-#: ../src/common/connection.py:897
+#: ../src/common/connection.py:903
 msgid "Not fetched because of invisible status"
 msgstr "Ikke hentet på grunn av usynlig status"
 
@@ -5733,11 +6143,14 @@ msgstr "D-Bus egenskapene til Gajim kan ikke brukes"
 
 #: ../src/common/exceptions.py:22
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (også kjent som python-pysqlite2) avhengighet mangler. Avslutter..."
+msgstr ""
+"pysqlite2 (også kjent som python-pysqlite2) avhengighet mangler. Avslutter..."
 
 #: ../src/common/exceptions.py:30
 msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr "Tjeneste ikke tilgjengelig: Gajim kjører ikke, eller remote_control er satt til False"
+msgstr ""
+"Tjeneste ikke tilgjengelig: Gajim kjører ikke, eller remote_control er satt "
+"til False"
 
 #: ../src/common/exceptions.py:38
 msgid "D-Bus is not present on this machine or python module is missing"
@@ -5801,68 +6214,55 @@ msgstr "tolv"
 
 #. 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
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 msgid "%0 o'clock"
 msgstr "klokken %0"
 
-#: ../src/common/fuzzyclock.py:47
-#: ../src/common/fuzzyclock.py:55
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 msgid "five past %0"
 msgstr "fem over %0"
 
-#: ../src/common/fuzzyclock.py:47
-#: ../src/common/fuzzyclock.py:56
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
 msgid "ten past %0"
 msgstr "ti over %0"
 
-#: ../src/common/fuzzyclock.py:48
-#: ../src/common/fuzzyclock.py:56
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
 msgid "quarter past %0"
 msgstr "kvart over %0"
 
-#: ../src/common/fuzzyclock.py:48
-#: ../src/common/fuzzyclock.py:57
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
 msgid "twenty past %0"
 msgstr "ti på halv %1"
 
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:57
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
 msgid "twenty five past %0"
 msgstr "fem på halv %1"
 
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:58
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
 msgid "half past %0"
 msgstr "halv %1"
 
-#: ../src/common/fuzzyclock.py:50
-#: ../src/common/fuzzyclock.py:58
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
 msgid "twenty five to %1"
 msgstr "fem over halv %1"
 
-#: ../src/common/fuzzyclock.py:50
-#: ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
 msgid "twenty to %1"
 msgstr "ti over halv %1"
 
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
 msgid "quarter to %1"
 msgstr "kvart på %1"
 
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
 msgid "ten to %1"
 msgstr "ti til %1"
 
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
 msgid "five to %1"
 msgstr "fem på %1"
 
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
 msgid "%1 o'clock"
 msgstr "%1"
 
@@ -6036,10 +6436,6 @@ msgstr "?Subscription we already have:Ingen"
 msgid "To"
 msgstr "Til"
 
-#: ../src/common/helpers.py:259
-msgid "From"
-msgstr "Fra"
-
 #: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Begge"
@@ -6117,36 +6513,35 @@ msgstr "tok pause i skriving av en melding"
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanen"
 
-#: ../src/common/helpers.py:880
+#: ../src/common/helpers.py:881
 #, python-format
 msgid " %d unread message"
 msgid_plural " %d unread messages"
 msgstr[0] "%d ulest melding"
 msgstr[1] "%d uleste meldinger"
 
-#: ../src/common/helpers.py:886
+#: ../src/common/helpers.py:887
 #, python-format
 msgid " %d unread single message"
 msgid_plural " %d unread single messages"
 msgstr[0] "%d ulest enkelt melding"
 msgstr[1] "%d uleste enkelt meldinger"
 
-#: ../src/common/helpers.py:892
+#: ../src/common/helpers.py:893
 #, python-format
 msgid " %d unread group chat message"
 msgid_plural " %d unread group chat messages"
 msgstr[0] "%d ulest gruppesamtale melding"
 msgstr[1] "%d uleste gruppesamtale meldinger"
 
-#: ../src/common/helpers.py:898
+#: ../src/common/helpers.py:899
 #, python-format
 msgid " %d unread private message"
 msgid_plural " %d unread private messages"
 msgstr[0] "%d ulest privat melding"
 msgstr[1] "%d uleste private meldinger"
 
-#: ../src/common/helpers.py:908
-#: ../src/common/helpers.py:910
+#: ../src/common/helpers.py:909 ../src/common/helpers.py:911
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -6161,8 +6556,7 @@ msgstr "feil: kan ikke åpne %s for lesing"
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:192
-#: ../src/common/optparser.py:193
+#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
 msgid "cyan"
 msgstr "turkis"
 
@@ -6176,7 +6570,8 @@ msgid "Gajim account %s"
 msgstr "Gajim konto %s"
 
 #: ../src/common/zeroconf/client_zeroconf.py:189
-msgid "Connection to host could not be established: Incorrect answer from server."
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
 msgstr "Tilkobling til maskinen kunne ikke opprettes: Feil svar fra serveren."
 
 #: ../src/common/zeroconf/client_zeroconf.py:205
@@ -6184,8 +6579,11 @@ msgid "Connection to host could not be established"
 msgstr "Tilkobling til maskin kunne ikke opprettes"
 
 #: ../src/common/zeroconf/client_zeroconf.py:334
-msgid "Connection to host could not be established: Timeout while sending data."
-msgstr "Tilkobling til maskinen kunne ikke opprettes: Tidsutløp under sending av data."
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"Tilkobling til maskinen kunne ikke opprettes: Tidsutløp under sending av "
+"data."
 
 #: ../src/common/zeroconf/client_zeroconf.py:629
 msgid "Contact is offline. Your message could not be sent."
@@ -6233,8 +6631,12 @@ msgid "Could not change status of account \"%s\""
 msgstr "Kunne ikke endre status til 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 "Du er ikke tilkoblet eller er usynlig for andre. Din melding kunne ikke sendes."
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+"Du er ikke tilkoblet eller er usynlig for andre. Din melding kunne ikke "
+"sendes."
 
 #. we're not english
 #: ../src/common/zeroconf/connection_zeroconf.py:353
@@ -6249,10 +6651,13 @@ msgstr "Feil ved tilføying av tjeneste. %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)"
@@ -6279,42 +6684,57 @@ msgstr "Feil ved tilføying av tjeneste. %s"
 #, fuzzy
 #~ msgid "Not Available "
 #~ msgstr "Ikke tilgjengelig"
+
 #~ msgid "Contact _Info"
 #~ msgstr "Kontakt_Info"
+
 #~ msgid "Contact Information"
 #~ msgstr "Kontaktinformasjon"
+
 #~ msgid "Jabber"
 #~ msgstr "Jabber"
+
 #~ msgid "Invalid room or server name"
 #~ msgstr "Ugyldig rom eller servernavn"
+
 #~ msgid "Unknown D-Bus version: %s"
 #~ msgstr "Ukjent D-Bus versjon: %s"
+
 #~ msgid "vCard publication succeeded"
 #~ msgstr "vCard publisering vellykket"
+
 #~ msgid "Your personal information has been published successfully."
 #~ msgstr "Din personlige informasjon har blitt publisert uten feil."
+
 #~ msgid "Migrating Logs..."
 #~ msgstr "Migrerer Logger..."
-#~ msgid "Please wait while logs are being migrated..."
-#~ msgstr "Vennligst vent mens loggene blir migrert..."
+
 #~ msgid "_Join New Room"
 #~ msgstr "_Bli med i Nytt Rom"
+
 #~ msgid "Gajim - %d unread message"
 #~ msgid_plural "Gajim - %d unread messages"
 #~ msgstr[0] "Gajim - %d ulest melding"
 #~ msgstr[1] "Gajim - %d uleste meldinger"
+
 #~ msgid "Since %s"
 #~ msgstr "Siden %s"
+
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Automatisk godkjenn kontakt"
+
 #~ msgid "Send File"
 #~ msgstr "Send Fil"
+
 #~ msgid "Underline"
 #~ msgstr "Strek Under"
+
 #~ msgid "Would you like to overwrite it?"
 #~ msgstr "Ønsker du å overskrive den?"
+
 #~ msgid "_Join New Room..."
 #~ msgstr "_Bli med i Nytt Rom"
+
 #~ msgid "Usage: /%s, sets the groupchat window to compact mode."
 #~ msgstr ""
 #~ "Bruksanvisning: /%s, setter gruppesamtale vinduet til kompakt modus."
@@ -6322,6 +6742,7 @@ msgstr "Feil ved tilføying av tjeneste. %s"
 #, fuzzy
 #~ msgid "<b>Please modify your special notification below</b>"
 #~ msgstr "<b>Vennligst velg ett av valgene under:</b>"
+
 #~ msgid "Delete Message of the Day"
 #~ msgstr "Slett Melding for Dagen"
 
@@ -6332,101 +6753,140 @@ msgstr "Feil ved tilføying av tjeneste. %s"
 #, fuzzy
 #~ msgid "I want to listen to:"
 #~ msgstr "%s ønsker å sende deg en fil:"
+
 #~ msgid "Send _New Message..."
 #~ msgstr "Send _Ny Melding..."
+
 #~ msgid "Set Message of the Day"
 #~ msgstr "Velg Melding for Dagen"
+
 #~ msgid "Update Message of the Day"
 #~ msgstr "Oppdater Melding for Dagen"
+
 #~ msgid "_XML Console..."
 #~ msgstr "_XML Konsoll..."
+
 #~ msgid "Choose Avatar"
 #~ msgstr "Velg Bilde"
+
 #~ msgid "Use compact view when you open a chat window"
 #~ msgstr "Bruk kompakt utseende når du åpner et samtale vindu"
+
 #~ msgid "Use compact view when you open a group chat window"
 #~ msgstr "Bruk kompakt utseende når du åpner et gruppe samtale vindu"
+
 #~ msgid "plain"
 #~ msgstr "enkel"
+
 #~ msgid "Send"
 #~ msgstr "Send"
+
 #~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
 #~ msgstr "%(nickname)s i rom %(room_name)s har sendt deg en ny melding."
+
 #~ msgid "%s has sent you a new message."
 #~ msgstr "%s har sendt deg en ny melding."
 
 #, fuzzy
 #~ msgid "GUI Migration failed"
 #~ msgstr "vCard publisering feilet"
+
 #~ msgid "Logs have been successfully migrated to the database."
 #~ msgstr "Loggene ble migrert til databasen uten feil."
+
 #~ msgid "If checked, Gajim will also have a trayicon"
 #~ msgstr "Dresom valgt vil Gajim ha et statusikon (trayicon)"
 
 #, fuzzy
 #~ msgid "Start Chat with Contact"
 #~ msgstr "Start samtale med konto %s"
+
 #~ msgid "All contacts in this group are offline or have errors"
 #~ msgstr "Alle kontakter in denne gruppen er frakoblet eller har feil"
+
 #~ msgid "Size: "
 #~ msgstr "Størrelse: "
+
 #~ msgid "Session bus is not available"
 #~ msgstr "Sesjons buss ikke tilgjengelig"
+
 #~ msgid "Sound"
 #~ msgstr "Lyd"
+
 #~ msgid "Text"
 #~ msgstr "Tekst"
+
 #~ msgid "Image"
 #~ msgstr "Bilde"
+
 #~ msgid "From %s"
 #~ msgstr "Fra %s"
+
 #~ msgid "To %s"
 #~ msgstr "Til %s"
+
 #~ msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 #~ msgstr "Du har blitt invitert til %(room_jid)s rommet av %(contact_jid)s"
+
 #~ msgid "Manage Emoticons"
 #~ msgstr "Behandle Uttrykksikoner"
+
 #~ msgid "Or choose a preset message:"
 #~ msgstr "Eller velg en forhåndsvalgt melding:"
+
 #~ msgid "Use _emoticons"
 #~ msgstr "Bruk _uttrykksikoner"
+
 #~ msgid "_Set Image..."
 #~ msgstr "_Velg Bilde..."
+
 #~ msgid "Switch to %s"
 #~ msgstr "Endre til %s"
+
 #~ msgid "using account "
 #~ msgstr "bruker konto"
+
 #~ msgid "The filesize of image \"%s\" is too large"
 #~ msgstr "Filstørrelsen på bilde \"%s\" er for stor"
+
 #~ msgid "The file must not be more than 32 kilobytes."
 #~ msgstr "Filen må ikke være mer enn 32 kilobyte."
+
 #~ msgid "Timeout"
 #~ msgstr "Tidsavbrudd"
-#~ msgid "A protocol error has occured:"
-#~ msgstr "En protokoll feil har skjedd:"
+
 #~ msgid "account: "
 #~ msgstr "konto:"
+
 #~ msgid "Are you sure you want to leave rooms \"%s\"?"
 #~ msgstr "Er du sikker på at du vil gå ut av rommene \"%s\"?"
+
 #~ msgid "If you close this window, you will be disconnected from these rooms."
 #~ msgstr ""
 #~ "Dersom du lukker dette vinduet, så vil du bli frakoblet fra disse rommene."
+
 #~ msgid "Activate/Disable notification for when a file transfer is complete"
 #~ msgstr "Aktiver/Deaktiver melding om at filoverføring er komplett"
+
 #~ msgid "Removing selected file transfer"
 #~ msgstr "Fjern valgte filoverføring"
+
 #~ msgid "Stoping selected file transfer"
 #~ msgstr "Stopp valgte filoverføring"
+
 #~ msgid ""
 #~ "If you close this tab and you have history disabled, the message will be "
 #~ "lost."
 #~ msgstr ""
 #~ "Dersom du lukke denne fanen og du har slått av historikk, vil meldingen "
 #~ "bli borte."
+
 #~ msgid "Cannot remove last group"
 #~ msgstr "Kan ikke fjerne den siste gruppen"
+
 #~ msgid "At least one contact group must be present."
 #~ msgstr "Du må ha minst en kontakt gruppe."
+
 #~ msgid ""
 #~ "pysqlite2 (aka python-pysqlite2) dependency is missing. After you install "
 #~ "pysqlite3, if you want to migrate your logs to the new database, please "
@@ -6436,12 +6896,13 @@ msgstr "Feil ved tilføying av tjeneste. %s"
 #~ "installert pysqlite2, og om du ønsker å migrere loggene dine til den nye "
 #~ "databasen, vennligst les:http://trac.gajim.org/wiki/MigrateLogToDot9DB "
 #~ "Avslutter..."
+
 #~ msgid "Image is too big"
 #~ msgstr "Bilde er for stort"
+
 #~ msgid ""
 #~ "Image for emoticon has to be less than or equal to 24 pixels in width and "
 #~ "24 in height."
 #~ msgstr ""
 #~ "Bilde for uttrykksikon må være mindre enn eller lik 24 piksler i bredde "
 #~ "og 24 i høyde."
-
diff --git a/po/pl.po b/po/pl.po
index cdc41a54a..f199bc729 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-12-04 11:51+0100\n"
+"POT-Creation-Date: 2006-12-09 10:02+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"
@@ -320,16 +320,16 @@ msgid "Manage..."
 msgstr "Zarządzaj..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1637
-#: ../src/config.py:3430
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1642
+#: ../src/config.py:3435
 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:1219
-#: ../src/config.py:1224 ../src/config.py:1408 ../src/config.py:1627
-#: ../src/config.py:1636 ../src/config.py:1695 ../src/config.py:1769
-#: ../src/config.py:2640 ../src/config.py:3420 ../src/config.py:3429
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1224
+#: ../src/config.py:1229 ../src/config.py:1413 ../src/config.py:1632
+#: ../src/config.py:1641 ../src/config.py:1700 ../src/config.py:1774
+#: ../src/config.py:2645 ../src/config.py:3425 ../src/config.py:3434
 #: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Żaden"
@@ -699,59 +699,77 @@ msgid "Play a sound"
 msgstr "Odtwórz dźwięk"
 
 #: ../data/glade/advanced_notifications_window.glade.h:18
-msgid "Receive a Message"
-msgstr "Odbierz wiadomość"
+msgid ""
+"Receive a Message\n"
+"Contact Connected \n"
+"Contact Disconnected \n"
+"Contact Change Status \n"
+"Group Chat Message Highlight \n"
+"Group Chat Message Received \n"
+"File Transfert Resquest \n"
+"File Transfert Started \n"
+"File Transfert Finished"
+msgstr ""
+"otrzymam wiadomość\n"
+"połączy się kontakt\n"
+"kontakt się rozłączy\n"
+"kontakt zmieni status\n"
+"na czacie pojawi się słowo kluczowe\n"
+"otrzymam wiadomość na czacie\n"
+"pojawi się żądanie przesłania pliku\n"
+"rozpocznie się transfer pliku\n"
+"zakończy się transfer pliku"
 
-#: ../data/glade/advanced_notifications_window.glade.h:19
+#: ../data/glade/advanced_notifications_window.glade.h:27
 msgid "When "
 msgstr "Jeżeli "
 
-#: ../data/glade/advanced_notifications_window.glade.h:20
+#: ../data/glade/advanced_notifications_window.glade.h:28
 msgid ""
 "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr "_Migaj obramowaniem zminimalizowanego okna rozmowy"
 
-#: ../data/glade/advanced_notifications_window.glade.h:21
+#: ../data/glade/advanced_notifications_window.glade.h:29
 msgid "_Disable auto opening chat window"
 msgstr "Wyłącz _automatyczne otwieranie okna czatu"
 
-#: ../data/glade/advanced_notifications_window.glade.h:22
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing popup window"
 msgstr "_Wyłącz wyskakujące okienka"
 
-#: ../data/glade/advanced_notifications_window.glade.h:23
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable existing sound for this event"
 msgstr "_Wyłącz dźwięki dla tego zdarzenia"
 
-#: ../data/glade/advanced_notifications_window.glade.h:24
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in roster"
 msgstr "Wyłącz _pokazywanie zdarzenia na liście kontaktów"
 
-#: ../data/glade/advanced_notifications_window.glade.h:25
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Disable showing event in systray"
 msgstr "Wyłącz pokazywanie _zdarzenia w obszarze powiadamiania"
 
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Inform me with a popup window"
 msgstr "_Powiadom mnie wyskakującym okienkiem"
 
-#: ../data/glade/advanced_notifications_window.glade.h:27
+#: ../data/glade/advanced_notifications_window.glade.h:35
 msgid "_Open chat window with user"
 msgstr "_Otwórz okno rozmowy z kontaktem"
 
-#: ../data/glade/advanced_notifications_window.glade.h:28
+#: ../data/glade/advanced_notifications_window.glade.h:36
 msgid "_Show event in roster"
 msgstr "_Pokaż zdarzenie na liście kontaktów"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/glade/advanced_notifications_window.glade.h:37
 msgid "_Show event in systray"
 msgstr "Pokaż _zdarzenie w obszarze powiadamiania"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/glade/advanced_notifications_window.glade.h:38
 msgid "and I "
 msgstr "podczas, gdy "
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/glade/advanced_notifications_window.glade.h:39
 msgid ""
 "contact(s)\n"
 "group(s)\n"
@@ -761,11 +779,11 @@ msgstr ""
 "grupy(grup)\n"
 "wszystkich"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:42
 msgid "for "
 msgstr "dla "
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:43
 msgid "when I'm in"
 msgstr "kiedy mam "
 
@@ -1281,7 +1299,7 @@ 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:1101
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
 msgid "OpenPGP Encryption"
 msgstr "Szyfrowanie OpenPGP"
 
@@ -1408,7 +1426,7 @@ msgstr ""
 msgid "B_efore nickname:"
 msgstr "_Przed pseudonimem:"
 
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:841
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
 msgid "Chat"
 msgstr "Rozmowa"
 
@@ -1788,6 +1806,10 @@ msgstr "_URL:"
 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>"
@@ -1864,10 +1886,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
@@ -2517,35 +2535,35 @@ msgstr "Połączenie jest niemożliwe"
 msgid "Your message can not be sent until you are connected."
 msgstr "Nie możesz wysłać wiadomości dopóki nie będziesz połączony."
 
-#: ../src/chat_control.py:841
+#: ../src/chat_control.py:844
 msgid "Chats"
 msgstr "Rozmowy"
 
-#: ../src/chat_control.py:1027
+#: ../src/chat_control.py:1030
 #, python-format
 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:1115
+#: ../src/chat_control.py:1118
 #, 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:1251
+#: ../src/chat_control.py:1254
 msgid "Encryption enabled"
 msgstr "Szyfrowanie włączone"
 
-#: ../src/chat_control.py:1256
+#: ../src/chat_control.py:1259
 msgid "Encryption disabled"
 msgstr "Szyfrowanie wyłączone"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1398 ../src/conversation_textview.py:495
-#: ../src/dialogs.py:629 ../src/gajim.py:727 ../src/gajim.py:728
-#: ../src/gajim.py:1067 ../src/roster_window.py:328
+#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495
+#: ../src/dialogs.py:629 ../src/gajim.py:733 ../src/gajim.py:734
+#: ../src/gajim.py:1073 ../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
@@ -2556,12 +2574,12 @@ msgid "Not in Roster"
 msgstr "spoza listy kontaktów"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1542
+#: ../src/chat_control.py:1545
 #, 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:1543
+#: ../src/chat_control.py:1546
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2569,29 +2587,29 @@ msgstr ""
 "Jeśli zamkniesz tę kartę, a nie masz uaktywnionej opcji historii, to "
 "utracisz tę wiadomość."
 
-#: ../src/config.py:130 ../src/config.py:589
+#: ../src/config.py:135 ../src/config.py:594
 msgid "Disabled"
 msgstr "Wyłączone"
 
-#: ../src/config.py:216
+#: ../src/config.py:221
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Co %s _minut"
 
-#: ../src/config.py:358
+#: ../src/config.py:363
 msgid "Active"
 msgstr "Aktywny"
 
-#: ../src/config.py:366
+#: ../src/config.py:371
 msgid "Event"
 msgstr "Zdarzenie"
 
-#: ../src/config.py:679 ../src/gajim.py:2087
+#: ../src/config.py:684 ../src/gajim.py:2094
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Brak słownika dla tego języka (%s)"
 
-#: ../src/config.py:680 ../src/gajim.py:2088
+#: ../src/config.py:685 ../src/gajim.py:2095
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -2600,248 +2618,248 @@ msgstr ""
 "Musisz zainstalować słownik %s aby aktywować sprawdzanie pisowni lub wybrać "
 "inny język korzystać z opcji speller_langugage."
 
-#: ../src/config.py:1032
+#: ../src/config.py:1037
 msgid "status message title"
 msgstr "nagłówek informacji o statusie"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1037
 msgid "status message text"
 msgstr "treść informacji o statusie"
 
-#: ../src/config.py:1067
+#: ../src/config.py:1072
 msgid "First Message Received"
 msgstr "Otrzymano pierwszą wiadomość"
 
-#: ../src/config.py:1068
+#: ../src/config.py:1073
 msgid "Next Message Received"
 msgstr "Otrzymałeś nową wiadomość"
 
-#: ../src/config.py:1069
+#: ../src/config.py:1074
 msgid "Contact Connected"
 msgstr "Kontakt połączył się"
 
-#: ../src/config.py:1070
+#: ../src/config.py:1075
 msgid "Contact Disconnected"
 msgstr "Kontakt rozłączył się"
 
-#: ../src/config.py:1071
+#: ../src/config.py:1076
 msgid "Message Sent"
 msgstr "Wiadomość została wysłana"
 
-#: ../src/config.py:1072
+#: ../src/config.py:1077
 msgid "Group Chat Message Highlight"
 msgstr "Podświetlenie wiadomości z czatu"
 
-#: ../src/config.py:1073
+#: ../src/config.py:1078
 msgid "Group Chat Message Received"
 msgstr "Otrzymano wiadomość na czacie"
 
-#: ../src/config.py:1080
+#: ../src/config.py:1085
 msgid "GMail Email Received"
 msgstr "Nowa poczta na koncie Gmail"
 
-#: ../src/config.py:1283
+#: ../src/config.py:1288
 msgid "OpenPGP is not usable in this computer"
 msgstr "Nie można używać OpenPGP na tym komputerze"
 
-#: ../src/config.py:1329
+#: ../src/config.py:1334
 msgid "You are currently connected to the server"
 msgstr "Jesteś połączony z serwerem"
 
-#: ../src/config.py:1330
+#: ../src/config.py:1335
 msgid "To change the account name, you must be disconnected."
 msgstr "Aby zmienić nazwę konta, musisz być rozłączony."
 
-#: ../src/config.py:1333 ../src/config.py:1925
+#: ../src/config.py:1338 ../src/config.py:1930
 msgid "Unread events"
 msgstr "Nieprzeczytane wiadomości"
 
-#: ../src/config.py:1334
+#: ../src/config.py:1339
 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:1338
+#: ../src/config.py:1343
 msgid "Account Name Already Used"
 msgstr "Konto o takiej nazwie już istnieje"
 
-#: ../src/config.py:1339
+#: ../src/config.py:1344
 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:1343 ../src/config.py:1347
+#: ../src/config.py:1348 ../src/config.py:1352
 msgid "Invalid account name"
 msgstr "Niepoprawna nazwa konta"
 
-#: ../src/config.py:1344
+#: ../src/config.py:1349
 msgid "Account name cannot be empty."
 msgstr "Nazwa konta nie może być pusta."
 
-#: ../src/config.py:1348
+#: ../src/config.py:1353
 msgid "Account name cannot contain spaces."
 msgstr "Nazwa konta nie może zawierać spacji."
 
-#: ../src/config.py:1356 ../src/config.py:1362 ../src/config.py:1372
-#: ../src/config.py:3030
+#: ../src/config.py:1361 ../src/config.py:1367 ../src/config.py:1377
+#: ../src/config.py:3035
 msgid "Invalid Jabber ID"
 msgstr "Niepoprawny Jabber ID"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1368
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musi być postaci \"użytkownik@nazwaserwera\"."
 
-#: ../src/config.py:1422
+#: ../src/config.py:1427
 msgid "Invalid entry"
 msgstr "Niepoprawny wpis"
 
-#: ../src/config.py:1423
+#: ../src/config.py:1428
 msgid "Custom port must be a port number."
 msgstr "Wybrany port musi być numerem portu."
 
-#: ../src/config.py:1549 ../src/common/config.py:363
+#: ../src/config.py:1554 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Zaraz wracam."
 
-#: ../src/config.py:1559
+#: ../src/config.py:1564
 msgid "Relogin now?"
 msgstr "Czy zalogować się ponownie?"
 
-#: ../src/config.py:1560
+#: ../src/config.py:1565
 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:1586
+#: ../src/config.py:1591
 msgid "No such account available"
 msgstr "Takie konto nie jest dostępne"
 
-#: ../src/config.py:1587
+#: ../src/config.py:1592
 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:1594 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/config.py:1599 ../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:1595
+#: ../src/config.py:1600
 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:1599
+#: ../src/config.py:1604
 msgid "Your server doesn't support Vcard"
 msgstr "Twój serwer nie akceptuje Vcard"
 
-#: ../src/config.py:1600
+#: ../src/config.py:1605
 msgid "Your server can't save your personal information."
 msgstr "Twój serwer nie potrafi zapisać informacji osobistych."
 
-#: ../src/config.py:1624 ../src/config.py:3417
+#: ../src/config.py:1629 ../src/config.py:3422
 msgid "Failed to get secret keys"
 msgstr "Pobieranie kluczy prywatnych nie powiodło się"
 
-#: ../src/config.py:1625 ../src/config.py:3418
+#: ../src/config.py:1630 ../src/config.py:3423
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr ""
 "Wystąpił problem w trakcie odzyskiwania Twoich kluczy prywatnych OpenPGP."
 
-#: ../src/config.py:1628 ../src/config.py:3421
+#: ../src/config.py:1633 ../src/config.py:3426
 msgid "OpenPGP Key Selection"
 msgstr "Wybór klucza OpenPGP"
 
-#: ../src/config.py:1629 ../src/config.py:3422
+#: ../src/config.py:1634 ../src/config.py:3427
 msgid "Choose your OpenPGP key"
 msgstr "Wybierz klucz OpenPGP"
 
 #. Name column
-#: ../src/config.py:1859 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/config.py:1864 ../src/disco.py:740 ../src/disco.py:1466
 #: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../src/config.py:1862
+#: ../src/config.py:1867
 msgid "Server"
 msgstr "Serwer"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1931
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Przejrzyj wszystkie niepotwierdzone zdarzenia przed usunięciem tego konta."
 
-#: ../src/config.py:1963
+#: ../src/config.py:1968
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Masz otwarte okno rozmowy na koncie %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:1969
 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:2023
+#: ../src/config.py:2028
 msgid "Account Local already exists."
 msgstr "Konto o takiej nazwie już istnieje."
 
-#: ../src/config.py:2024
+#: ../src/config.py:2029
 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:2256
+#: ../src/config.py:2261
 #, python-format
 msgid "Edit %s"
 msgstr "Modyfikuj %s"
 
-#: ../src/config.py:2258
+#: ../src/config.py:2263
 #, python-format
 msgid "Register to %s"
 msgstr "Zarejestruj na %s"
 
 #. list at the begining
-#: ../src/config.py:2330
+#: ../src/config.py:2335
 msgid "Ban List"
 msgstr "Lista kontaktów zablokowanych"
 
-#: ../src/config.py:2331
+#: ../src/config.py:2336
 msgid "Member List"
 msgstr "_Lista uczestników"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2337
 msgid "Owner List"
 msgstr "_Lista właścicieli"
 
-#: ../src/config.py:2333
+#: ../src/config.py:2338
 msgid "Administrator List"
 msgstr "_Administratorzy"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2366 ../src/disco.py:747 ../src/history_manager.py:154
+#: ../src/config.py:2371 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2374
+#: ../src/config.py:2379
 msgid "Reason"
 msgstr "Powód"
 
-#: ../src/config.py:2379
+#: ../src/config.py:2384
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2388
 msgid "Role"
 msgstr "Funkcja:"
 
-#: ../src/config.py:2404
+#: ../src/config.py:2409
 msgid "Banning..."
 msgstr "Blokuję użytkownika..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2406
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2849,11 +2867,11 @@ msgstr ""
 "<b>Którego użytkownika chcesz zablokować?</b>\n"
 "\n"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2413
 msgid "Adding Member..."
 msgstr "Dodaję członka..."
 
-#: ../src/config.py:2409
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2861,11 +2879,11 @@ msgstr ""
 "<b>Status którego użytkownika chcesz zmienić?</b>\n"
 "\n"
 
-#: ../src/config.py:2411
+#: ../src/config.py:2416
 msgid "Adding Owner..."
 msgstr "Dodaję właściciela..."
 
-#: ../src/config.py:2412
+#: ../src/config.py:2417
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2873,11 +2891,11 @@ msgstr ""
 "<b>Którego użytkownika chcesz uczynić właścicielem pokoju?</b>\n"
 "\n"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2419
 msgid "Adding Administrator..."
 msgstr "Dodaję administratora..."
 
-#: ../src/config.py:2415
+#: ../src/config.py:2420
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2885,7 +2903,7 @@ msgstr ""
 "<b>Którego użytkownika chcesz uczynić administratorem?</b>\n"
 "\n"
 
-#: ../src/config.py:2416
+#: ../src/config.py:2421
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2901,95 +2919,95 @@ 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:2521
+#: ../src/config.py:2526
 #, python-format
 msgid "Removing %s account"
 msgstr "Usuwanie konta %s"
 
-#: ../src/config.py:2538 ../src/roster_window.py:2667
+#: ../src/config.py:2543 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Wymagane hasło"
 
-#: ../src/config.py:2539 ../src/roster_window.py:2668
+#: ../src/config.py:2544 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Wpisz hasło dla konta %s"
 
-#: ../src/config.py:2540 ../src/roster_window.py:2669
+#: ../src/config.py:2545 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Zapisz hasło"
 
-#: ../src/config.py:2554
+#: ../src/config.py:2559
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" jest połączone z serwerem."
 
-#: ../src/config.py:2555
+#: ../src/config.py:2560
 msgid "If you remove it, the connection will be lost."
 msgstr "Jeśli to usuniesz, połączenie zostanie zerwane."
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 msgid "Default"
 msgstr "Domyślny"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 msgid "?print_status:All"
 msgstr "?print_status:Wszystkie"
 
-#: ../src/config.py:2640
+#: ../src/config.py:2645
 msgid "Enter and leave only"
 msgstr "Jedynie wejdź i wyjdź"
 
-#: ../src/config.py:2710
+#: ../src/config.py:2715
 msgid "New Group Chat"
 msgstr "Nowa rozmowa grupowa"
 
-#: ../src/config.py:2742
+#: ../src/config.py:2747
 msgid "This bookmark has invalid data"
 msgstr "Ta zakładka zawiera niepoprawne dane"
 
-#: ../src/config.py:2743
+#: ../src/config.py:2748
 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:3005
+#: ../src/config.py:3010
 msgid "Invalid username"
 msgstr "Niepoprawna nazwa użytkownika"
 
-#: ../src/config.py:3006
+#: ../src/config.py:3011
 msgid "You must provide a username to configure this account."
 msgstr "Musisz wpisać nazwę użytkownika aby skonfigurować to konto."
 
-#: ../src/config.py:3016 ../src/dialogs.py:1316
+#: ../src/config.py:3021 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Niepoprawne hasło"
 
-#: ../src/config.py:3017
+#: ../src/config.py:3022
 msgid "You must enter a password for the new account."
 msgstr "Musisz wpisać hasło dla nowego konta."
 
-#: ../src/config.py:3021 ../src/dialogs.py:1321
+#: ../src/config.py:3026 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Hasła nie zgadzają się"
 
-#: ../src/config.py:3022 ../src/dialogs.py:1322
+#: ../src/config.py:3027 ../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:3041
+#: ../src/config.py:3046
 msgid "Duplicate Jabber ID"
 msgstr "Taki Jabber ID już istnieje!"
 
-#: ../src/config.py:3042
+#: ../src/config.py:3047
 msgid "This account is already configured in Gajim."
 msgstr "Konto o takiej nazwie jest już skonfigurowane."
 
-#: ../src/config.py:3059
+#: ../src/config.py:3064
 msgid "Account has been added successfully"
 msgstr "Konto zostało pomyślnie dodane"
 
-#: ../src/config.py:3060 ../src/config.py:3095
+#: ../src/config.py:3065 ../src/config.py:3100
 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."
@@ -2997,19 +3015,19 @@ 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:3094
+#: ../src/config.py:3099
 msgid "Your new account has been created successfully"
 msgstr "Twoje konto zostało założone"
 
-#: ../src/config.py:3112
+#: ../src/config.py:3117
 msgid "An error occured during account creation"
 msgstr "Wystąpił błąd w trakcie tworzenia konta"
 
-#: ../src/config.py:3170
+#: ../src/config.py:3175
 msgid "Account name is in use"
 msgstr "Nazwa konta jest już zajęta"
 
-#: ../src/config.py:3171
+#: ../src/config.py:3176
 msgid "You already have an account using this name."
 msgstr "Masz już konto o takiej nazwie."
 
@@ -3341,29 +3359,29 @@ msgstr "Nowa wiadomość"
 msgid "New Private Message"
 msgstr "Wyślij prywatną wiadomość"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1162 ../src/notify.py:424
+#: ../src/dialogs.py:1369 ../src/gajim.py:1168 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Nowy adres e-mail"
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1315 ../src/notify.py:418
+#: ../src/dialogs.py:1371 ../src/gajim.py:1321 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Pytanie o przysłanie pliku"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1134 ../src/gajim.py:1291
+#: ../src/dialogs.py:1373 ../src/gajim.py:1140 ../src/gajim.py:1297
 #: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Błąd przesyłania pliku"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1354 ../src/gajim.py:1376
-#: ../src/gajim.py:1393 ../src/notify.py:422
+#: ../src/dialogs.py:1375 ../src/gajim.py:1360 ../src/gajim.py:1382
+#: ../src/gajim.py:1399 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Zakończono przesyłanie pliku"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1357 ../src/notify.py:422
+#: ../src/dialogs.py:1376 ../src/gajim.py:1363 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Przesyłanie pliku zatrzymane"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1032 ../src/notify.py:426
+#: ../src/dialogs.py:1378 ../src/gajim.py:1038 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Zaproszenie na czat"
 
@@ -3505,15 +3523,15 @@ msgid "Adding Special Notification for %s"
 msgstr "Dodaję specjalne powiadomienia dla %s"
 
 #. # means number
-#: ../src/dialogs.py:2481
+#: ../src/dialogs.py:2478
 msgid "#"
 msgstr "Nr"
 
-#: ../src/dialogs.py:2487
+#: ../src/dialogs.py:2484
 msgid "Condition"
 msgstr "Warunek"
 
-#: ../src/dialogs.py:2608
+#: ../src/dialogs.py:2605
 msgid "when I am "
 msgstr "kiedy mam "
 
@@ -3787,6 +3805,214 @@ 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:77
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim wymaga do działania pakietu pywin32"
+
+#: ../src/gajim.py:78
+#, 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:190
+msgid "Gajim is already running"
+msgstr "Gajim jest już uruchomiony"
+
+#: ../src/gajim.py:191
+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:298
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "Autoryzacja HTTP (%s) dla %s (id: %s)"
+
+#: ../src/gajim.py:299
+msgid "Do you accept this request?"
+msgstr "Czy akceptujesz tę prośbę?"
+
+#: ../src/gajim.py:345 ../src/notify.py:430
+msgid "Connection Failed"
+msgstr "Połączenie nie powiodło się"
+
+#: ../src/gajim.py:658
+#, python-format
+msgid "Subject: %s"
+msgstr "Temat: %s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:703 ../src/gajim.py:716
+#, python-format
+msgid "error while sending %s ( %s )"
+msgstr "błąd przy wysyłaniu %s ( %s )"
+
+#: ../src/gajim.py:749
+msgid "Authorization accepted"
+msgstr "Autoryzacja przyjęta"
+
+#: ../src/gajim.py:750
+#, 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:758
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Kontakt \"%s\" cofnął Ci autoryzację"
+
+#: ../src/gajim.py:759
+msgid "You will always see him or her as offline."
+msgstr "Zawsze będziesz widział ten kontakt jako niepołączony."
+
+#: ../src/gajim.py:802
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Nie można ustanowić połączenia z \"%s\""
+
+#: ../src/gajim.py:803 ../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:951 ../src/roster_window.py:1201
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s ma teraz status %s (%s)"
+
+#: ../src/gajim.py:1048
+msgid "Your passphrase is incorrect"
+msgstr "Twoje hasło jest niepoprawne"
+
+#: ../src/gajim.py:1049
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Jesteś aktualnie połączony bez obsługi OpenPGP."
+
+#: ../src/gajim.py:1151
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Nowa poczta w skrzynce %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1153
+#, 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:1162
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+"\n"
+"Od: %(from_address)s"
+
+#: ../src/gajim.py:1318
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s chce przesłać ci plik."
+
+#: ../src/gajim.py:1383
+#, 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:1387
+#, 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:1400
+#, 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:1404
+#, 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:1510
+msgid "Username Conflict"
+msgstr "Konflikt nazw użytkownika"
+
+#: ../src/gajim.py:1511
+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:1850
+msgid "Could not save your settings and preferences"
+msgstr "Nie można zapisać twoich ustawień i opcji"
+
+#: ../src/gajim.py:2042
+msgid "Network Manager support not available"
+msgstr "Brak wsparcia dla Network Managera"
+
+#: ../src/gajim.py:2117
+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"
@@ -4099,213 +4325,6 @@ msgstr ""
 "Argument \"%s\" nie jest określony. \n"
 "Wpisz \"%s·help·%s\" aby uzyskać więcej informacji"
 
-#: ../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:77
-msgid "Gajim needs pywin32 to run"
-msgstr "Gajim wymaga do działania pakietu pywin32"
-
-#: ../src/gajim.py:78
-#, 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:190
-msgid "Gajim is already running"
-msgstr "Gajim jest już uruchomiony"
-
-#: ../src/gajim.py:191
-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:298
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "Autoryzacja HTTP (%s) dla %s (id: %s)"
-
-#: ../src/gajim.py:299
-msgid "Do you accept this request?"
-msgstr "Czy akceptujesz tę prośbę?"
-
-#: ../src/gajim.py:345 ../src/notify.py:430
-msgid "Connection Failed"
-msgstr "Połączenie nie powiodło się"
-
-#: ../src/gajim.py:658
-#, python-format
-msgid "Subject: %s"
-msgstr "Temat: %s"
-
-#: ../src/gajim.py:703
-#, python-format
-msgid "error while sending %s ( %s )"
-msgstr "błąd przy wysyłaniu %s ( %s )"
-
-#: ../src/gajim.py:743
-msgid "Authorization accepted"
-msgstr "Autoryzacja przyjęta"
-
-#: ../src/gajim.py:744
-#, 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:752
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Kontakt \"%s\" cofnął Ci autoryzację"
-
-#: ../src/gajim.py:753
-msgid "You will always see him or her as offline."
-msgstr "Zawsze będziesz widział ten kontakt jako niepołączony."
-
-#: ../src/gajim.py:796
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Nie można ustanowić połączenia z \"%s\""
-
-#: ../src/gajim.py:797 ../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:945 ../src/roster_window.py:1201
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s ma teraz status %s (%s)"
-
-#: ../src/gajim.py:1042
-msgid "Your passphrase is incorrect"
-msgstr "Twoje hasło jest niepoprawne"
-
-#: ../src/gajim.py:1043
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Jesteś aktualnie połączony bez obsługi OpenPGP."
-
-#: ../src/gajim.py:1145
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Nowa poczta w skrzynce %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1147
-#, 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:1156
-#, python-format
-msgid ""
-"\n"
-"From: %(from_address)s"
-msgstr ""
-"\n"
-"Od: %(from_address)s"
-
-#: ../src/gajim.py:1312
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s chce przesłać ci plik."
-
-#: ../src/gajim.py:1377
-#, 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:1381
-#, 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:1394
-#, 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:1398
-#, 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:1504
-msgid "Username Conflict"
-msgstr "Konflikt nazw użytkownika"
-
-#: ../src/gajim.py:1505
-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:1843
-msgid "Could not save your settings and preferences"
-msgstr "Nie można zapisać twoich ustawień i opcji"
-
-#: ../src/gajim.py:2035
-msgid "Network Manager support not available"
-msgstr "Brak wsparcia dla Network Managera"
-
-#: ../src/gajim.py:2110
-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"
@@ -4323,118 +4342,118 @@ msgstr "Nie możesz skasować obecnie używanego motywu"
 msgid "Please first choose another for your current theme."
 msgstr "Ustaw najpierw inny motyw."
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chat"
 msgstr "Rozmowa prywatna"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chats"
 msgstr "Rozmowy prywatne"
 
-#: ../src/groupchat_control.py:120
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Wysyłanie prywatnej wiadomości nie powiodło się"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Nie jesteś już w pokoju \"%s\" lub \"%s\" opuścił go."
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chat"
 msgstr "Pokój"
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chats"
 msgstr "Czaty"
 
-#: ../src/groupchat_control.py:315
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Wstaw pseudonim"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:810
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s został wyrzucony: %(reason)s"
 
-#: ../src/groupchat_control.py:814
+#: ../src/groupchat_control.py:816
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s został wyrzucony przez %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:821
+#: ../src/groupchat_control.py:823
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s został zabanowany: %(reason)s"
 
-#: ../src/groupchat_control.py:825
+#: ../src/groupchat_control.py:827
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s został zabanowany przez %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:833
+#: ../src/groupchat_control.py:835
 #, python-format
 msgid "You are now known as %s"
 msgstr "Występujesz teraz jako %s"
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:837
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s występuje teraz jako %s"
 
-#: ../src/groupchat_control.py:915
+#: ../src/groupchat_control.py:917
 #, python-format
 msgid "%s has left"
 msgstr "%s wychodzi"
 
-#: ../src/groupchat_control.py:920
+#: ../src/groupchat_control.py:922
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s dołączył do pokoju"
 
 #. No status message
-#: ../src/groupchat_control.py:922 ../src/roster_window.py:1204
+#: ../src/groupchat_control.py:924 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s ma teraz status %s"
 
-#: ../src/groupchat_control.py:1041 ../src/groupchat_control.py:1059
-#: ../src/groupchat_control.py:1152 ../src/groupchat_control.py:1169
+#: ../src/groupchat_control.py:1043 ../src/groupchat_control.py:1061
+#: ../src/groupchat_control.py:1154 ../src/groupchat_control.py:1171
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Pseudonim nie został odnaleziony: %s"
 
-#: ../src/groupchat_control.py:1075
+#: ../src/groupchat_control.py:1077
 msgid "This group chat has no subject"
 msgstr "Ten pokój nie ma tematu"
 
-#: ../src/groupchat_control.py:1088
+#: ../src/groupchat_control.py:1090
 #, 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:1095 ../src/groupchat_control.py:1123
+#: ../src/groupchat_control.py:1097 ../src/groupchat_control.py:1125
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s nie wygląda na poprawny JID"
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1208
 #, 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:1229
+#: ../src/groupchat_control.py:1231
 #, python-format
 msgid "Commands: %s"
 msgstr "Polecenia: %s"
 
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1233
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4446,18 +4465,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:1238
+#: ../src/groupchat_control.py:1240
 #, 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:1242
+#: ../src/groupchat_control.py:1244
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Użycie: /%s czyście okno tekstowe."
 
-#: ../src/groupchat_control.py:1244
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4466,12 +4485,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:1247
+#: ../src/groupchat_control.py:1249
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Użycie: /%s ukrywa przyciski czatu."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1252
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4480,7 +4499,7 @@ msgstr ""
 "Użycie: /%s <JID> [powód] zaprasza JID do aktualnego pokoju, opcjonalnie "
 "wyświetlając powód."
 
-#: ../src/groupchat_control.py:1254
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4489,7 +4508,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:1258
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4499,7 +4518,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:1263
+#: ../src/groupchat_control.py:1265
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current group chat. Use third "
@@ -4508,7 +4527,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:1267
+#: ../src/groupchat_control.py:1269
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4517,92 +4536,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:1272
+#: ../src/groupchat_control.py:1274
 #, 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:1276
+#: ../src/groupchat_control.py:1278
 #, 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:1280
+#: ../src/groupchat_control.py:1282
 #, 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:1283
+#: ../src/groupchat_control.py:1285
 #, 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:1286
+#: ../src/groupchat_control.py:1288
 #, python-format
 msgid "No help info for /%s"
 msgstr "Brak informacji o pomocy dla /%s"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1337
 #, 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:1337
+#: ../src/groupchat_control.py:1339
 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:1341 ../src/roster_window.py:3961
+#: ../src/groupchat_control.py:1343 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "_Nie pytaj mnie o to ponownie"
 
-#: ../src/groupchat_control.py:1375
+#: ../src/groupchat_control.py:1377
 msgid "Changing Subject"
 msgstr "Zmiana tematu"
 
-#: ../src/groupchat_control.py:1376
+#: ../src/groupchat_control.py:1378
 msgid "Please specify the new subject:"
 msgstr "Wpisz nowy temat:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1387
 msgid "Changing Nickname"
 msgstr "Zmiana pseudonimu"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1388
 msgid "Please specify the new nickname you want to use:"
 msgstr "Wpisz nowy pseudonim, którego chcesz używać:"
 
-#: ../src/groupchat_control.py:1411
+#: ../src/groupchat_control.py:1413
 msgid "Bookmark already set"
 msgstr "Zakładka została już dodana"
 
-#: ../src/groupchat_control.py:1412
+#: ../src/groupchat_control.py:1414
 #, 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:1421
+#: ../src/groupchat_control.py:1423
 msgid "Bookmark has been added successfully"
 msgstr "Zakładka została dodana"
 
-#: ../src/groupchat_control.py:1422
+#: ../src/groupchat_control.py:1424
 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:1548
+#: ../src/groupchat_control.py:1550
 #, python-format
 msgid "Kicking %s"
 msgstr "Wyrzuć %s"
 
-#: ../src/groupchat_control.py:1549 ../src/groupchat_control.py:1831
+#: ../src/groupchat_control.py:1551 ../src/groupchat_control.py:1833
 msgid "You may specify a reason below:"
 msgstr "Podaj przyczynę:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1830
+#: ../src/groupchat_control.py:1832
 #, python-format
 msgid "Banning %s"
 msgstr "Zabanuj %s"
@@ -5941,99 +5960,6 @@ msgstr "human"
 msgid "marine"
 msgstr "morski"
 
-#: ../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
-#, python-format
-msgid "Transport %s answered wrongly to register request: %s"
-msgstr ""
-"Transport %s udzielił nieprawidłowej odpowiedzi na żądnie rejestracji: %s"
-
-#. 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:872
-#: ../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:759
-#: ../src/common/zeroconf/connection_zeroconf.py:397
-#, python-format
-msgid ""
-"Subject: %s\n"
-"%s"
-msgstr ""
-"Temat: %s\n"
-"%s"
-
-#: ../src/common/connection.py:898
-msgid "Not fetched because of invisible status"
-msgstr "Nie wysłano z powodu statusu 'niewidoczny'"
-
 #: ../src/common/connection_handlers.py:52
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 msgid "Unable to load idle module"
@@ -6139,6 +6065,99 @@ 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
+#, python-format
+msgid "Transport %s answered wrongly to register request: %s"
+msgstr ""
+"Transport %s udzielił nieprawidłowej odpowiedzi na żądnie rejestracji: %s"
+
+#. 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:877
+#: ../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:764
+#: ../src/common/zeroconf/connection_zeroconf.py:397
+#, python-format
+msgid ""
+"Subject: %s\n"
+"%s"
+msgstr ""
+"Temat: %s\n"
+"%s"
+
+#: ../src/common/connection.py:903
+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:33
 msgid "D-Bus python bindings are missing in this computer"
@@ -6659,26 +6678,8 @@ msgstr "[Ta wiadomość jest zaszyfrowana]"
 msgid "Error while adding service. %s"
 msgstr "Błąd przy dodawaniu usługi %s"
 
-#~ msgid ""
-#~ "Receive a Message\n"
-#~ "Contact Connected\n"
-#~ "Contact Disconnected\n"
-#~ "Contact Change Status\n"
-#~ "Group Chat Message Highlight\n"
-#~ "Group Chat Message Received\n"
-#~ "File Transfert Resquest\n"
-#~ "File Transfert Started\n"
-#~ "File Transfert Finished"
-#~ msgstr ""
-#~ "otrzymam wiadomość\n"
-#~ "połączy się kontakt\n"
-#~ "kontakt się rozłączy\n"
-#~ "kontakt zmieni status\n"
-#~ "na czacie pojawi się słowo kluczowe\n"
-#~ "otrzymam wiadomość na czacie\n"
-#~ "pojawi się żądanie przesłania pliku\n"
-#~ "rozpocznie się transfer pliku\n"
-#~ "zakończy się transfer pliku"
+#~ msgid "Receive a Message"
+#~ msgstr "Odbierz wiadomość"
 
 #~ msgid "JID: "
 #~ msgstr "JID: "
diff --git a/po/pt.po b/po/pt.po
index 2900fe24d..1b705f420 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-12-02 17:15+0100\n"
+"POT-Creation-Date: 2006-12-09 10:02+0100\n"
 "PO-Revision-Date: 2005-08-18 18:21-0300\n"
 "Last-Translator: Miguel Fonseca <miguelcsf@gmail.com>\n"
 "Language-Team: none\n"
@@ -320,16 +320,16 @@ msgid "Manage..."
 msgstr "Gerir..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1637
-#: ../src/config.py:3430
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1642
+#: ../src/config.py:3435
 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:1219
-#: ../src/config.py:1224 ../src/config.py:1408 ../src/config.py:1627
-#: ../src/config.py:1636 ../src/config.py:1695 ../src/config.py:1769
-#: ../src/config.py:2640 ../src/config.py:3420 ../src/config.py:3429
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1224
+#: ../src/config.py:1229 ../src/config.py:1413 ../src/config.py:1632
+#: ../src/config.py:1641 ../src/config.py:1700 ../src/config.py:1774
+#: ../src/config.py:2645 ../src/config.py:3425 ../src/config.py:3434
 #: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Nenhum"
@@ -522,6 +522,50 @@ msgstr "Re_gistar"
 msgid "_User ID:"
 msgstr "ID do Utilizador:"
 
+#: ../data/glade/adhoc_commands_window.glade.h:1
+#, fuzzy
+msgid "<b>An error has occured:</b>"
+msgstr "Ocorreu um erro de protocolo:"
+
+#: ../data/glade/adhoc_commands_window.glade.h:2
+msgid "<b>Choose command to execute:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:3
+msgid "Ad-hoc Commands - Gajim"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:4
+msgid "Check once more"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:5
+#, fuzzy
+msgid "Error description..."
+msgstr "Descrição"
+
+#: ../data/glade/adhoc_commands_window.glade.h:6
+#, fuzzy
+msgid "Please wait while retrieving command list..."
+msgstr ""
+"Por favor, aguarde enquanto que a migração dos seus registos de conversas é "
+"feita "
+
+#: ../data/glade/adhoc_commands_window.glade.h:7
+#, fuzzy
+msgid "Please wait while the command is sending..."
+msgstr ""
+"Por favor, aguarde enquanto que a migração dos seus registos de conversas é "
+"feita "
+
+#: ../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>Descrição</b>"
@@ -670,13 +714,13 @@ msgstr "Tocar _Sons"
 #: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
-"Contact Connected\n"
-"Contact Disconnected\n"
-"Contact Change Status\n"
-"Group Chat Message Highlight\n"
-"Group Chat Message Received\n"
-"File Transfert Resquest\n"
-"File Transfert Started\n"
+"Contact Connected \n"
+"Contact Disconnected \n"
+"Contact Change Status \n"
+"Group Chat Message Highlight \n"
+"Group Chat Message Received \n"
+"File Transfert Resquest \n"
+"File Transfert Started \n"
 "File Transfert Finished"
 msgstr ""
 
@@ -749,6 +793,46 @@ msgstr "Porta:"
 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 "País:"
+
+#: ../data/glade/atom_entry_window.glade.h:4
+#, fuzzy
+msgid "Feed name:"
+msgstr "nome do tema"
+
+#: ../data/glade/atom_entry_window.glade.h:5
+#, fuzzy
+msgid "Last modified:"
+msgstr "Nome:"
+
+#: ../data/glade/atom_entry_window.glade.h:6
+#, fuzzy
+msgid "New entry received"
+msgstr "Quando um novo evento é recebido"
+
+#: ../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 "Mudar Senha"
@@ -837,7 +921,7 @@ msgstr "Vista _Compacta    Alt+C"
 msgid "_History"
 msgstr "_Histórico"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/glade/data_form_window.glade.h:1 ../src/dataforms_widget.py:76
 #, fuzzy
 msgid "Fill in the form."
 msgstr "Neste grupo"
@@ -1060,6 +1144,21 @@ msgstr "E_nviar Mensagem Privada"
 msgid "_Voice"
 msgstr "_Voz"
 
+#: ../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:259
+msgid "From"
+msgstr "De"
+
+#. holds subject
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141
+#: ../src/history_manager.py:172
+#, fuzzy
+msgid "Subject"
+msgstr "Assunto:"
+
 #: ../data/glade/history_manager.glade.h:1
 msgid ""
 "<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
@@ -1217,7 +1316,7 @@ 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:1116
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
 msgid "OpenPGP Encryption"
 msgstr "Encriptação OpenPGP"
 
@@ -1344,7 +1443,7 @@ msgstr ""
 msgid "B_efore nickname:"
 msgstr "Antes da alcunha:"
 
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:841
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
 msgid "Chat"
 msgstr "Conversa"
 
@@ -2500,34 +2599,34 @@ 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:841
+#: ../src/chat_control.py:844
 #, fuzzy
 msgid "Chats"
 msgstr "Conversa"
 
-#: ../src/chat_control.py:1042
+#: ../src/chat_control.py:1030
 #, fuzzy, python-format
 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:1130
+#: ../src/chat_control.py:1118
 #, 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:1266
+#: ../src/chat_control.py:1254
 msgid "Encryption enabled"
 msgstr "Encriptação activada"
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1259
 msgid "Encryption disabled"
 msgstr "Encriptação desactivada"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1413 ../src/conversation_textview.py:493
-#: ../src/dialogs.py:629 ../src/gajim.py:727 ../src/gajim.py:728
-#: ../src/gajim.py:1067 ../src/roster_window.py:328
+#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495
+#: ../src/dialogs.py:629 ../src/gajim.py:733 ../src/gajim.py:734
+#: ../src/gajim.py:1073 ../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
@@ -2538,12 +2637,12 @@ msgid "Not in Roster"
 msgstr "Fora da lista"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1545
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Recebeu uma nova mensagem de \"%s\""
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1546
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2551,327 +2650,327 @@ msgstr ""
 "Se fechar esta aba e o histórico estiver desactivado, esta mensagem será "
 "perdida."
 
-#: ../src/config.py:130 ../src/config.py:589
+#: ../src/config.py:135 ../src/config.py:594
 msgid "Disabled"
 msgstr ""
 
-#: ../src/config.py:216
+#: ../src/config.py:221
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Todos os %s _minutos"
 
-#: ../src/config.py:358
+#: ../src/config.py:363
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:366
+#: ../src/config.py:371
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:679 ../src/gajim.py:2086
+#: ../src/config.py:684 ../src/gajim.py:2094
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Uma ligação não está disponível"
 
-#: ../src/config.py:680 ../src/gajim.py:2087
+#: ../src/config.py:685 ../src/gajim.py:2095
 #, 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:1032
+#: ../src/config.py:1037
 msgid "status message title"
 msgstr "título da mensagem de estado"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1037
 msgid "status message text"
 msgstr "texto da mensagem de estado"
 
-#: ../src/config.py:1067
+#: ../src/config.py:1072
 msgid "First Message Received"
 msgstr ""
 
-#: ../src/config.py:1068
+#: ../src/config.py:1073
 #, fuzzy
 msgid "Next Message Received"
 msgstr "Nova Mensagem"
 
-#: ../src/config.py:1069
+#: ../src/config.py:1074
 #, fuzzy
 msgid "Contact Connected"
 msgstr "Nome do Contacto"
 
-#: ../src/config.py:1070
+#: ../src/config.py:1075
 #, fuzzy
 msgid "Contact Disconnected"
 msgstr "Contacto Entrou"
 
-#: ../src/config.py:1071
+#: ../src/config.py:1076
 #, fuzzy
 msgid "Message Sent"
 msgstr "Mensagem"
 
-#: ../src/config.py:1072
+#: ../src/config.py:1077
 msgid "Group Chat Message Highlight"
 msgstr ""
 
-#: ../src/config.py:1073
+#: ../src/config.py:1078
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: ../src/config.py:1080
+#: ../src/config.py:1085
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Convite Recebido"
 
-#: ../src/config.py:1283
+#: ../src/config.py:1288
 msgid "OpenPGP is not usable in this computer"
 msgstr "Não é possível usar OpenPGP neste computador"
 
-#: ../src/config.py:1329
+#: ../src/config.py:1334
 msgid "You are currently connected to the server"
 msgstr "Está neste momento ligado ao servidor"
 
-#: ../src/config.py:1330
+#: ../src/config.py:1335
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, deve estar disconectado."
 
-#: ../src/config.py:1333 ../src/config.py:1925
+#: ../src/config.py:1338 ../src/config.py:1930
 msgid "Unread events"
 msgstr ""
 
-#: ../src/config.py:1334
+#: ../src/config.py:1339
 #, 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:1338
+#: ../src/config.py:1343
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:1339
+#: ../src/config.py:1344
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 
-#: ../src/config.py:1343 ../src/config.py:1347
+#: ../src/config.py:1348 ../src/config.py:1352
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
 
-#: ../src/config.py:1344
+#: ../src/config.py:1349
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio"
 
-#: ../src/config.py:1348
+#: ../src/config.py:1353
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços"
 
-#: ../src/config.py:1356 ../src/config.py:1362 ../src/config.py:1372
-#: ../src/config.py:3030
+#: ../src/config.py:1361 ../src/config.py:1367 ../src/config.py:1377
+#: ../src/config.py:3035
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1368
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Um Jabber ID deve estar no formato \"utilizador@nomedoservidor\"."
 
-#: ../src/config.py:1422
+#: ../src/config.py:1427
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:1423
+#: ../src/config.py:1428
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta"
 
-#: ../src/config.py:1549 ../src/common/config.py:363
+#: ../src/config.py:1554 ../src/common/config.py:363
 msgid "Be right back."
 msgstr ""
 
-#: ../src/config.py:1559
+#: ../src/config.py:1564
 msgid "Relogin now?"
 msgstr ""
 
-#: ../src/config.py:1560
+#: ../src/config.py:1565
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 
-#: ../src/config.py:1586
+#: ../src/config.py:1591
 msgid "No such account available"
 msgstr "Tal conta não está disponível"
 
-#: ../src/config.py:1587
+#: ../src/config.py:1592
 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:1594 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/config.py:1599 ../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:1595
+#: ../src/config.py:1600
 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:1599
+#: ../src/config.py:1604
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1600
+#: ../src/config.py:1605
 #, 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:1624 ../src/config.py:3417
+#: ../src/config.py:1629 ../src/config.py:3422
 msgid "Failed to get secret keys"
 msgstr "Erro ao receber as chaves secretas"
 
-#: ../src/config.py:1625 ../src/config.py:3418
+#: ../src/config.py:1630 ../src/config.py:3423
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Houve um problema ao receber as suas chaves secretas OpenPGP."
 
-#: ../src/config.py:1628 ../src/config.py:3421
+#: ../src/config.py:1633 ../src/config.py:3426
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "Encriptação OpenPGP"
 
-#: ../src/config.py:1629 ../src/config.py:3422
+#: ../src/config.py:1634 ../src/config.py:3427
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
 #. Name column
-#: ../src/config.py:1859 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/config.py:1864 ../src/disco.py:740 ../src/disco.py:1466
 #: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1862
+#: ../src/config.py:1867
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1931
 msgid "Read all pending events before removing this account."
 msgstr ""
 
-#: ../src/config.py:1963
+#: ../src/config.py:1968
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Não tem nenhuma conta activa"
 
-#: ../src/config.py:1964
+#: ../src/config.py:1969
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:2023
+#: ../src/config.py:2028
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:2024
+#: ../src/config.py:2029
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2256
+#: ../src/config.py:2261
 #, python-format
 msgid "Edit %s"
 msgstr "_Editar %s"
 
-#: ../src/config.py:2258
+#: ../src/config.py:2263
 #, python-format
 msgid "Register to %s"
 msgstr "Registar para %s"
 
 #. list at the begining
-#: ../src/config.py:2330
+#: ../src/config.py:2335
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:2331
+#: ../src/config.py:2336
 #, fuzzy
 msgid "Member List"
 msgstr "_Membro"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2337
 #, fuzzy
 msgid "Owner List"
 msgstr "_Dono"
 
-#: ../src/config.py:2333
+#: ../src/config.py:2338
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrador"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2366 ../src/disco.py:747 ../src/history_manager.py:154
+#: ../src/config.py:2371 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2374
+#: ../src/config.py:2379
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:2379
+#: ../src/config.py:2384
 #, fuzzy
 msgid "Nick"
 msgstr "_Expulsar"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2388
 #, fuzzy
 msgid "Role"
 msgstr "Função:"
 
-#: ../src/config.py:2404
+#: ../src/config.py:2409
 #, fuzzy
 msgid "Banning..."
 msgstr "Banindo %s"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2406
+#: ../src/config.py:2411
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2413
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:2409
+#: ../src/config.py:2414
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2411
+#: ../src/config.py:2416
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:2412
+#: ../src/config.py:2417
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2419
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrador"
 
-#: ../src/config.py:2415
+#: ../src/config.py:2420
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2416
+#: ../src/config.py:2421
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2881,102 +2980,102 @@ msgid ""
 "domain/resource, or address containing a subdomain."
 msgstr ""
 
-#: ../src/config.py:2521
+#: ../src/config.py:2526
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2538 ../src/roster_window.py:2667
+#: ../src/config.py:2543 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Senha Necessária"
 
-#: ../src/config.py:2539 ../src/roster_window.py:2668
+#: ../src/config.py:2544 ../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:2540 ../src/roster_window.py:2669
+#: ../src/config.py:2545 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Guardar senha"
 
-#: ../src/config.py:2554
+#: ../src/config.py:2559
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Conta \"%s\" está ligada ao servidor"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2560
 msgid "If you remove it, the connection will be lost."
 msgstr "Se remover isto, a ligação será perdida."
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 #, fuzzy
 msgid "Default"
 msgstr "Apagar MOTD"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Mostrar hora:"
 
-#: ../src/config.py:2640
+#: ../src/config.py:2645
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2710
+#: ../src/config.py:2715
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Chat"
 
-#: ../src/config.py:2742
+#: ../src/config.py:2747
 msgid "This bookmark has invalid data"
 msgstr "Este bookmark tem dados inválidos"
 
-#: ../src/config.py:2743
+#: ../src/config.py:2748
 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:3005
+#: ../src/config.py:3010
 msgid "Invalid username"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/config.py:3006
+#: ../src/config.py:3011
 msgid "You must provide a username to configure this account."
 msgstr "Deve introduzir um nome de utilizador para configurar esta conta."
 
-#: ../src/config.py:3016 ../src/dialogs.py:1316
+#: ../src/config.py:3021 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Senha Inválida"
 
-#: ../src/config.py:3017
+#: ../src/config.py:3022
 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:3021 ../src/dialogs.py:1321
+#: ../src/config.py:3026 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "As senhas não conferem"
 
-#: ../src/config.py:3022 ../src/dialogs.py:1322
+#: ../src/config.py:3027 ../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:3041
+#: ../src/config.py:3046
 #, fuzzy
 msgid "Duplicate Jabber ID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/config.py:3042
+#: ../src/config.py:3047
 #, fuzzy
 msgid "This account is already configured in Gajim."
 msgstr "Este contacto já se encontra na sua lista de contactos."
 
-#: ../src/config.py:3059
+#: ../src/config.py:3064
 msgid "Account has been added successfully"
 msgstr "A conta foi adicionada com sucesso"
 
-#: ../src/config.py:3060 ../src/config.py:3095
+#: ../src/config.py:3065 ../src/config.py:3100
 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."
@@ -2985,23 +3084,23 @@ msgstr ""
 "tarde clicando no item de menu Contas dentro do menu Editar a partir da "
 "janela principal."
 
-#: ../src/config.py:3094
+#: ../src/config.py:3099
 msgid "Your new account has been created successfully"
 msgstr "A sua nova conta foi criada com sucesso"
 
-#: ../src/config.py:3112
+#: ../src/config.py:3117
 msgid "An error occured during account creation"
 msgstr "Ocorreu um erro ao criar a conta"
 
-#: ../src/config.py:3170
+#: ../src/config.py:3175
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:3171
+#: ../src/config.py:3176
 msgid "You already have an account using this name."
 msgstr "Já tem uma conta usando este nome."
 
-#: ../src/conversation_textview.py:271
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3009,56 +3108,65 @@ 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:340
+#: ../src/conversation_textview.py:342
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Acções para \"%s\""
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Ler Artigo _Wikipedia"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Procurar no _Dicionário"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:373
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Falta um \"%s\" no URL do Dicionário e como tal não é WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:386
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL de Procura na Web não existe \"%s\""
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "_Pesquisar na Web sobre o assunto"
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:397
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:755
+#: ../src/conversation_textview.py:757
 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:759
+#: ../src/conversation_textview.py:761
 #, python-format
 msgid "%i days ago"
 msgstr "Há %i dias atrás"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:791
+#: ../src/conversation_textview.py:793
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %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
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
@@ -3327,30 +3435,30 @@ msgstr "Nova Mensagem Instantânea"
 msgid "New Private Message"
 msgstr "Nova Mensagem Privada"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1161 ../src/notify.py:424
+#: ../src/dialogs.py:1369 ../src/gajim.py:1168 ../src/notify.py:424
 #, fuzzy
 msgid "New E-mail"
 msgstr "E-Mail"
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1314 ../src/notify.py:418
+#: ../src/dialogs.py:1371 ../src/gajim.py:1321 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Pedido de Transferência de Ficheiro"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1134 ../src/gajim.py:1290
+#: ../src/dialogs.py:1373 ../src/gajim.py:1140 ../src/gajim.py:1297
 #: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Erro na Transferência de Ficheiro"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1353 ../src/gajim.py:1375
-#: ../src/gajim.py:1392 ../src/notify.py:422
+#: ../src/dialogs.py:1375 ../src/gajim.py:1360 ../src/gajim.py:1382
+#: ../src/gajim.py:1399 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Transferência de Ficheiro Completa"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1356 ../src/notify.py:422
+#: ../src/dialogs.py:1376 ../src/gajim.py:1363 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Transferência de Ficheiro Parada"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1032 ../src/notify.py:426
+#: ../src/dialogs.py:1378 ../src/gajim.py:1038 ../src/notify.py:426
 #, fuzzy
 msgid "Groupchat Invitation"
 msgstr "?Função do Contacto no Chat:Nenhuma"
@@ -3711,32 +3819,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:682
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
 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:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "This file already exists"
 msgstr "Este ficheiro já existe"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3873,57 +3981,58 @@ msgstr "Ligação"
 msgid "Subject: %s"
 msgstr "Assunto: %s\n"
 
-#: ../src/gajim.py:703
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:703 ../src/gajim.py:716
 #, fuzzy, python-format
 msgid "error while sending %s ( %s )"
 msgstr "erro ao enviar"
 
-#: ../src/gajim.py:743
+#: ../src/gajim.py:749
 msgid "Authorization accepted"
 msgstr "Autorização aceite"
 
-#: ../src/gajim.py:744
+#: ../src/gajim.py:750
 #, 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:752
+#: ../src/gajim.py:758
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contacto \"%s\" removeu a sua subscrição para si"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:759
 msgid "You will always see him or her as offline."
 msgstr "Vê-lo-á sempre como estando offline."
 
-#: ../src/gajim.py:796
+#: ../src/gajim.py:802
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contacto com \"%s\" não pode ser estabelecido"
 
-#: ../src/gajim.py:797 ../src/common/connection.py:395
+#: ../src/gajim.py:803 ../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:945 ../src/roster_window.py:1201
+#: ../src/gajim.py:951 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s está agora  %s (%s)"
 
-#: ../src/gajim.py:1042
+#: ../src/gajim.py:1048
 msgid "Your passphrase is incorrect"
 msgstr "A sua chave de acesso está incorrecta"
 
-#: ../src/gajim.py:1043
+#: ../src/gajim.py:1049
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Está neste momento ligado sem a sua chave OpenPGP."
 
-#: ../src/gajim.py:1145
+#: ../src/gajim.py:1151
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1147
+#: ../src/gajim.py:1153
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3933,61 +4042,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:1156
+#: ../src/gajim.py:1162
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1311
+#: ../src/gajim.py:1318
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer enviar-lhe um ficheiro."
 
-#: ../src/gajim.py:1376
+#: ../src/gajim.py:1383
 #, 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:1380
+#: ../src/gajim.py:1387
 #, 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:1393
+#: ../src/gajim.py:1400
 #, 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:1397
+#: ../src/gajim.py:1404
 #, 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:1503
+#: ../src/gajim.py:1510
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1504
+#: ../src/gajim.py:1511
 #, 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:1842
+#: ../src/gajim.py:1850
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar as suas definições e preferências"
 
-#: ../src/gajim.py:2034
+#: ../src/gajim.py:2042
 #, fuzzy
 msgid "Network Manager support not available"
 msgstr "Uma ligação não está disponível"
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2117
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Session Management não é suportado (módulo gnome.ui em falta)"
 
@@ -4338,122 +4447,122 @@ msgstr "Não pode apagar o seu tema actual"
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, escolha primeiro outro para o seu tema actual."
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 #, fuzzy
 msgid "Private Chat"
 msgstr "Iniciar Conversa"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 #, fuzzy
 msgid "Private Chats"
 msgstr "Iniciar Conversa"
 
-#: ../src/groupchat_control.py:120
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Falha ao enviar uma mensagem privada"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:124
 #, 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
+#: ../src/groupchat_control.py:143
 msgid "Group Chat"
 msgstr "Chat"
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 #, fuzzy
 msgid "Group Chats"
 msgstr "Chat"
 
-#: ../src/groupchat_control.py:315
+#: ../src/groupchat_control.py:317
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Muda Alcu_nha"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:810
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi expulso: %(reason)s"
 
-#: ../src/groupchat_control.py:814
+#: ../src/groupchat_control.py:816
 #, 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:821
+#: ../src/groupchat_control.py:823
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi banido: %(reason)s"
 
-#: ../src/groupchat_control.py:825
+#: ../src/groupchat_control.py:827
 #, 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:833
+#: ../src/groupchat_control.py:835
 #, python-format
 msgid "You are now known as %s"
 msgstr "É agora conhecido como %s"
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:837
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s agora é conhecido como %s"
 
-#: ../src/groupchat_control.py:915
+#: ../src/groupchat_control.py:917
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
-#: ../src/groupchat_control.py:920
+#: ../src/groupchat_control.py:922
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Neste grupo"
 
 #. No status message
-#: ../src/groupchat_control.py:922 ../src/roster_window.py:1204
+#: ../src/groupchat_control.py:924 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s está agora %s"
 
-#: ../src/groupchat_control.py:1041 ../src/groupchat_control.py:1059
-#: ../src/groupchat_control.py:1152 ../src/groupchat_control.py:1169
+#: ../src/groupchat_control.py:1043 ../src/groupchat_control.py:1061
+#: ../src/groupchat_control.py:1154 ../src/groupchat_control.py:1171
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Alcunha não encontrada: %s"
 
-#: ../src/groupchat_control.py:1075
+#: ../src/groupchat_control.py:1077
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "Esta sala não tem assunto"
 
-#: ../src/groupchat_control.py:1088
+#: ../src/groupchat_control.py:1090
 #, 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:1095 ../src/groupchat_control.py:1123
+#: ../src/groupchat_control.py:1097 ../src/groupchat_control.py:1125
 #, 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:1206
+#: ../src/groupchat_control.py:1208
 #, 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:1229
+#: ../src/groupchat_control.py:1231
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandos: %s"
 
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1233
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4465,7 +4574,7 @@ msgstr ""
 "pode ser substituida, mas não se conter \"@\". Se o JID estiver neste "
 "momento na sala, este será também expulso. Não suporta espaços numa alcunha."
 
-#: ../src/groupchat_control.py:1238
+#: ../src/groupchat_control.py:1240
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4473,12 +4582,12 @@ msgstr ""
 "Uso: /%s <alcunha>, abre uma janela de conversa privada com o ocupante "
 "especificado."
 
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1244
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uso: /%s, limpa a janela de texto."
 
-#: ../src/groupchat_control.py:1244
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4487,12 +4596,12 @@ msgstr ""
 "Uso: /%s [razão], fecha a janela ou aba actual, exibindo a razão se "
 "especificada."
 
-#: ../src/groupchat_control.py:1247
+#: ../src/groupchat_control.py:1249
 #, fuzzy, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Uso: /%s, limpa a janela de texto."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1252
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4501,7 +4610,7 @@ msgstr ""
 "Uso: /%s <JID> [razão], convida o JID para a sala actual, fornecendo "
 "opcionalmente uma razão."
 
-#: ../src/groupchat_control.py:1254
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4510,7 +4619,7 @@ msgstr ""
 "Uso: /%s <sala>@<servidor>[/alcunha], convida a juntar-se a sala@servidor, "
 "usando opcionalmente uma alcunha especificada."
 
-#: ../src/groupchat_control.py:1258
+#: ../src/groupchat_control.py:1260
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4520,7 +4629,7 @@ msgstr ""
 "Uso: /%s <alcunha> [razão], remove o ocupante especificado pela alcunha da "
 "sala e opcionalmente exibe uma razão. Não suporta espaços na alcunha."
 
-#: ../src/groupchat_control.py:1263
+#: ../src/groupchat_control.py:1265
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current group chat. Use third "
@@ -4529,7 +4638,7 @@ msgstr ""
 "Uso: /%s <acção>, envia uma acção para a sala actual. Utilize a terceira "
 "pessoa. (Por exemplo, /%s explode.)"
 
-#: ../src/groupchat_control.py:1267
+#: ../src/groupchat_control.py:1269
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4538,94 +4647,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:1272
+#: ../src/groupchat_control.py:1274
 #, 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:1276
+#: ../src/groupchat_control.py:1278
 #, fuzzy, python-format
 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:1280
+#: ../src/groupchat_control.py:1282
 #, 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:1283
+#: ../src/groupchat_control.py:1285
 #, 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:1286
+#: ../src/groupchat_control.py:1288
 #, python-format
 msgid "No help info for /%s"
 msgstr "Não há informações de ajuda para /%s"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1337
 #, 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:1337
+#: ../src/groupchat_control.py:1339
 #, 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:1341 ../src/roster_window.py:3961
+#: ../src/groupchat_control.py:1343 ../src/roster_window.py:3961
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "_Não voltar a perguntar"
 
-#: ../src/groupchat_control.py:1375
+#: ../src/groupchat_control.py:1377
 msgid "Changing Subject"
 msgstr "Mudar Assunto"
 
-#: ../src/groupchat_control.py:1376
+#: ../src/groupchat_control.py:1378
 msgid "Please specify the new subject:"
 msgstr "Por favor, especifique o novo assunto:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1387
 msgid "Changing Nickname"
 msgstr "Mudar Alcunha"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1388
 msgid "Please specify the new nickname you want to use:"
 msgstr "Por favor, especifique a nova alcunha a usar:"
 
-#: ../src/groupchat_control.py:1411
+#: ../src/groupchat_control.py:1413
 msgid "Bookmark already set"
 msgstr "Bookmark já está configurado"
 
-#: ../src/groupchat_control.py:1412
+#: ../src/groupchat_control.py:1414
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Sala \"%s\" já existe nos seus bookmarks."
 
-#: ../src/groupchat_control.py:1421
+#: ../src/groupchat_control.py:1423
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark foi adicionado com sucesso"
 
-#: ../src/groupchat_control.py:1422
+#: ../src/groupchat_control.py:1424
 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:1548
+#: ../src/groupchat_control.py:1550
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando %s"
 
-#: ../src/groupchat_control.py:1549 ../src/groupchat_control.py:1831
+#: ../src/groupchat_control.py:1551 ../src/groupchat_control.py:1833
 msgid "You may specify a reason below:"
 msgstr "Pode especificar uma razão em baixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1830
+#: ../src/groupchat_control.py:1832
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
@@ -4671,16 +4780,16 @@ msgstr "Erro na interpretação (parsing) do ficheiro:"
 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:727
+#: ../src/gtkgui_helpers.py:728
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:729
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:737
+#: ../src/gtkgui_helpers.py:738
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Guardar Ficheiro como..."
@@ -4714,12 +4823,6 @@ msgstr "Alcunha:"
 msgid "Message"
 msgstr "Mensagem"
 
-#. holds subject
-#: ../src/history_manager.py:141 ../src/history_manager.py:172
-#, fuzzy
-msgid "Subject"
-msgstr "Assunto:"
-
 #: ../src/history_manager.py:186
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -5934,7 +6037,7 @@ 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:1515
+#: ../src/common/connection_handlers.py:1523
 #, fuzzy, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Alcunha não encontrada: %s"
@@ -5942,46 +6045,46 @@ msgstr "Alcunha não encontrada: %s"
 #. password required to join
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1577
-#: ../src/common/connection_handlers.py:1580
-#: ../src/common/connection_handlers.py:1583
-#: ../src/common/connection_handlers.py:1586
-#: ../src/common/connection_handlers.py:1589
-#: ../src/common/connection_handlers.py:1592
+#: ../src/common/connection_handlers.py:1585
+#: ../src/common/connection_handlers.py:1588
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1597
 #: ../src/common/connection_handlers.py:1600
+#: ../src/common/connection_handlers.py:1608
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Impossível entrar na sala"
 
-#: ../src/common/connection_handlers.py:1578
+#: ../src/common/connection_handlers.py:1586
 #, 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:1581
+#: ../src/common/connection_handlers.py:1589
 #, fuzzy
 msgid "You are banned from this group chat."
 msgstr "Está banido/a desta sala."
 
-#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1592
 #, fuzzy
 msgid "Such group chat does not exist."
 msgstr "Tal sala não existe."
 
-#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1595
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "Criação de salas encontra-se restrita."
 
-#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1598
 msgid "Your registered nickname must be used."
 msgstr "A sua alcunha registada tem de ser usada."
 
-#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1601
 msgid "You are not in the members list."
 msgstr "Não está na lista de membros."
 
-#: ../src/common/connection_handlers.py:1601
+#: ../src/common/connection_handlers.py:1609
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5989,27 +6092,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:1651
+#: ../src/common/connection_handlers.py:1659
 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:1672
+#: ../src/common/connection_handlers.py:1680
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "estamos agora subscritos a %s"
 
-#: ../src/common/connection_handlers.py:1674
+#: ../src/common/connection_handlers.py:1682
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "pedido de remoção de subscrição por %s"
 
-#: ../src/common/connection_handlers.py:1676
+#: ../src/common/connection_handlers.py:1684
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "já não estamos subscritos a %s"
 
-#: ../src/common/connection_handlers.py:1846
+#: ../src/common/connection_handlers.py:1854
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -6041,7 +6144,7 @@ msgid "Invalid answer"
 msgstr "Senha Inválida"
 
 #: ../src/common/connection.py:394 ../src/common/connection.py:429
-#: ../src/common/connection.py:872
+#: ../src/common/connection.py:877
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
@@ -6099,7 +6202,7 @@ msgstr "Estou %s"
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Esta mensagem é encriptada]"
 
-#: ../src/common/connection.py:759
+#: ../src/common/connection.py:764
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6109,7 +6212,7 @@ msgstr ""
 "Assunto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:898
+#: ../src/common/connection.py:903
 msgid "Not fetched because of invisible status"
 msgstr ""
 
@@ -6426,10 +6529,6 @@ msgstr "Nenhuma"
 msgid "To"
 msgstr "Para"
 
-#: ../src/common/helpers.py:259
-msgid "From"
-msgstr "De"
-
 #: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Ambos"
@@ -6705,11 +6804,6 @@ msgstr "erro ao enviar"
 #~ msgid "Migrating Logs..."
 #~ msgstr "Fazendo a 'migração' dos logs..."
 
-#~ msgid "Please wait while logs are being migrated..."
-#~ msgstr ""
-#~ "Por favor, aguarde enquanto que a migração dos seus registos de conversas "
-#~ "é feita "
-
 #~ msgid "_Join New Room"
 #~ msgstr "_Juntar-se a uma Nova Sala"
 
@@ -6853,9 +6947,6 @@ msgstr "erro ao enviar"
 #~ msgid "Timeout"
 #~ msgstr "Timeout"
 
-#~ msgid "A protocol error has occured:"
-#~ msgstr "Ocorreu um erro de protocolo:"
-
 #~ msgid "account: "
 #~ msgstr "conta: "
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7b3e075b3..6cce4e1f7 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-12-02 17:15+0100\n"
+"POT-Creation-Date: 2006-12-09 10:02+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"
@@ -323,16 +323,16 @@ msgid "Manage..."
 msgstr "Gerenciar..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1637
-#: ../src/config.py:3430
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1642
+#: ../src/config.py:3435
 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:1219
-#: ../src/config.py:1224 ../src/config.py:1408 ../src/config.py:1627
-#: ../src/config.py:1636 ../src/config.py:1695 ../src/config.py:1769
-#: ../src/config.py:2640 ../src/config.py:3420 ../src/config.py:3429
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1224
+#: ../src/config.py:1229 ../src/config.py:1413 ../src/config.py:1632
+#: ../src/config.py:1641 ../src/config.py:1700 ../src/config.py:1774
+#: ../src/config.py:2645 ../src/config.py:3425 ../src/config.py:3434
 #: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Nenhum"
@@ -524,6 +524,46 @@ msgstr "Re_gistrar"
 msgid "_User ID:"
 msgstr "ID do Usuário:"
 
+#: ../data/glade/adhoc_commands_window.glade.h:1
+#, fuzzy
+msgid "<b>An error has occured:</b>"
+msgstr "Um erro de protocolo ocorreu:"
+
+#: ../data/glade/adhoc_commands_window.glade.h:2
+msgid "<b>Choose command to execute:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:3
+msgid "Ad-hoc Commands - Gajim"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:4
+msgid "Check once more"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:5
+#, fuzzy
+msgid "Error description..."
+msgstr "Descrição"
+
+#: ../data/glade/adhoc_commands_window.glade.h:6
+#, fuzzy
+msgid "Please wait while retrieving command list..."
+msgstr "Espere por favor, enquanto os registros estão sendo migrados..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:7
+#, fuzzy
+msgid "Please wait while the command is sending..."
+msgstr "Espere por favor, enquanto os registros estão sendo migrados..."
+
+#: ../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>Descrição</b>"
@@ -674,13 +714,13 @@ msgstr "Tocar _Sons"
 #: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
-"Contact Connected\n"
-"Contact Disconnected\n"
-"Contact Change Status\n"
-"Group Chat Message Highlight\n"
-"Group Chat Message Received\n"
-"File Transfert Resquest\n"
-"File Transfert Started\n"
+"Contact Connected \n"
+"Contact Disconnected \n"
+"Contact Change Status \n"
+"Group Chat Message Highlight \n"
+"Group Chat Message Received \n"
+"File Transfert Resquest \n"
+"File Transfert Started \n"
 "File Transfert Finished"
 msgstr ""
 
@@ -753,6 +793,46 @@ msgstr "Porta:"
 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 "País:"
+
+#: ../data/glade/atom_entry_window.glade.h:4
+#, fuzzy
+msgid "Feed name:"
+msgstr "nome do tema"
+
+#: ../data/glade/atom_entry_window.glade.h:5
+#, fuzzy
+msgid "Last modified:"
+msgstr "Nome:"
+
+#: ../data/glade/atom_entry_window.glade.h:6
+#, fuzzy
+msgid "New entry received"
+msgstr "Quando novo evento é recebido"
+
+#: ../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 "Mudar Senha"
@@ -838,7 +918,7 @@ msgstr "Visão _Compacta    Alt+C"
 msgid "_History"
 msgstr "_Histórico"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/glade/data_form_window.glade.h:1 ../src/dataforms_widget.py:76
 #, fuzzy
 msgid "Fill in the form."
 msgstr "Neste grupo"
@@ -1059,6 +1139,20 @@ msgstr "_Enviar Mensagem Privada"
 msgid "_Voice"
 msgstr "_Voz"
 
+#: ../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:259
+msgid "From"
+msgstr "De"
+
+#. holds subject
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141
+#: ../src/history_manager.py:172
+msgid "Subject"
+msgstr "Assunto"
+
 #: ../data/glade/history_manager.glade.h:1
 msgid ""
 "<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
@@ -1221,7 +1315,7 @@ 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:1116
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
 msgid "OpenPGP Encryption"
 msgstr "Criptografia OpenPGP"
 
@@ -1345,7 +1439,7 @@ msgstr ""
 msgid "B_efore nickname:"
 msgstr "_Antes do apelido:"
 
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:841
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
 msgid "Chat"
 msgstr "Conversa"
 
@@ -2480,33 +2574,33 @@ 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:841
+#: ../src/chat_control.py:844
 msgid "Chats"
 msgstr "Conversas"
 
-#: ../src/chat_control.py:1042
+#: ../src/chat_control.py:1030
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1130
+#: ../src/chat_control.py:1118
 #, 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:1266
+#: ../src/chat_control.py:1254
 msgid "Encryption enabled"
 msgstr "Criptografia habilitada"
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1259
 msgid "Encryption disabled"
 msgstr "Criptografia desabilitada"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1413 ../src/conversation_textview.py:493
-#: ../src/dialogs.py:629 ../src/gajim.py:727 ../src/gajim.py:728
-#: ../src/gajim.py:1067 ../src/roster_window.py:328
+#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495
+#: ../src/dialogs.py:629 ../src/gajim.py:733 ../src/gajim.py:734
+#: ../src/gajim.py:1073 ../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
@@ -2517,12 +2611,12 @@ msgid "Not in Roster"
 msgstr "Fora da lista"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1545
 #, 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:1558
+#: ../src/chat_control.py:1546
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2530,101 +2624,101 @@ msgstr ""
 "Se você fechar esta aba e o histórico estiver desabilitado, esta mensagem "
 "será perdida."
 
-#: ../src/config.py:130 ../src/config.py:589
+#: ../src/config.py:135 ../src/config.py:594
 msgid "Disabled"
 msgstr "Desabilitado"
 
-#: ../src/config.py:216
+#: ../src/config.py:221
 #, python-format
 msgid "Every %s _minutes"
 msgstr "A cada %s _minutos"
 
-#: ../src/config.py:358
+#: ../src/config.py:363
 msgid "Active"
 msgstr "Ativo"
 
-#: ../src/config.py:366
+#: ../src/config.py:371
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:679 ../src/gajim.py:2086
+#: ../src/config.py:684 ../src/gajim.py:2094
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Uma conexão não está disponível"
 
-#: ../src/config.py:680 ../src/gajim.py:2087
+#: ../src/config.py:685 ../src/gajim.py:2095
 #, 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:1032
+#: ../src/config.py:1037
 msgid "status message title"
 msgstr "título da mensagem de status"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1037
 msgid "status message text"
 msgstr "texto da mensagem de status"
 
-#: ../src/config.py:1067
+#: ../src/config.py:1072
 msgid "First Message Received"
 msgstr "Primeira Mensagem Recebida"
 
-#: ../src/config.py:1068
+#: ../src/config.py:1073
 msgid "Next Message Received"
 msgstr "Nova Mensagem Recebida"
 
-#: ../src/config.py:1069
+#: ../src/config.py:1074
 msgid "Contact Connected"
 msgstr "Contato Conectado"
 
-#: ../src/config.py:1070
+#: ../src/config.py:1075
 msgid "Contact Disconnected"
 msgstr "Contato Desconectou"
 
-#: ../src/config.py:1071
+#: ../src/config.py:1076
 msgid "Message Sent"
 msgstr "Mensagem Enviada"
 
-#: ../src/config.py:1072
+#: ../src/config.py:1077
 msgid "Group Chat Message Highlight"
 msgstr "Mensagem Destacada de Conferência"
 
-#: ../src/config.py:1073
+#: ../src/config.py:1078
 msgid "Group Chat Message Received"
 msgstr "Mensagem de Conferência Recebida"
 
-#: ../src/config.py:1080
+#: ../src/config.py:1085
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Convite Recebido"
 
-#: ../src/config.py:1283
+#: ../src/config.py:1288
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP não disponível neste computador"
 
-#: ../src/config.py:1329
+#: ../src/config.py:1334
 msgid "You are currently connected to the server"
 msgstr "Você está atualmente conectado ao servidor"
 
-#: ../src/config.py:1330
+#: ../src/config.py:1335
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, você deve estar disconectado."
 
-#: ../src/config.py:1333 ../src/config.py:1925
+#: ../src/config.py:1338 ../src/config.py:1930
 msgid "Unread events"
 msgstr "Eventos não lidos"
 
-#: ../src/config.py:1334
+#: ../src/config.py:1339
 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:1338
+#: ../src/config.py:1343
 msgid "Account Name Already Used"
 msgstr "Nome de conta já está em uso"
 
-#: ../src/config.py:1339
+#: ../src/config.py:1344
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2632,175 +2726,175 @@ msgstr ""
 "Este nome já está sendo usado por outra de suas contas. Por favor, escolha "
 "outro nome."
 
-#: ../src/config.py:1343 ../src/config.py:1347
+#: ../src/config.py:1348 ../src/config.py:1352
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
 
-#: ../src/config.py:1344
+#: ../src/config.py:1349
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio."
 
-#: ../src/config.py:1348
+#: ../src/config.py:1353
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços."
 
-#: ../src/config.py:1356 ../src/config.py:1362 ../src/config.py:1372
-#: ../src/config.py:3030
+#: ../src/config.py:1361 ../src/config.py:1367 ../src/config.py:1377
+#: ../src/config.py:3035
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID Inválido:"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1368
 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:1422
+#: ../src/config.py:1427
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:1423
+#: ../src/config.py:1428
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta."
 
-#: ../src/config.py:1549 ../src/common/config.py:363
+#: ../src/config.py:1554 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Estou de volta."
 
-#: ../src/config.py:1559
+#: ../src/config.py:1564
 msgid "Relogin now?"
 msgstr "Re-autenticar agora?"
 
-#: ../src/config.py:1560
+#: ../src/config.py:1565
 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:1586
+#: ../src/config.py:1591
 msgid "No such account available"
 msgstr "Conta não disponível"
 
-#: ../src/config.py:1587
+#: ../src/config.py:1592
 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:1594 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/config.py:1599 ../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:1595
+#: ../src/config.py:1600
 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:1599
+#: ../src/config.py:1604
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1600
+#: ../src/config.py:1605
 #, 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:1624 ../src/config.py:3417
+#: ../src/config.py:1629 ../src/config.py:3422
 msgid "Failed to get secret keys"
 msgstr "Falha enquanto recebia as chaves secretas"
 
-#: ../src/config.py:1625 ../src/config.py:3418
+#: ../src/config.py:1630 ../src/config.py:3423
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Houve um problema no recebimento de suas chaves secretas OpenPGP."
 
-#: ../src/config.py:1628 ../src/config.py:3421
+#: ../src/config.py:1633 ../src/config.py:3426
 msgid "OpenPGP Key Selection"
 msgstr "Seleção de Chave OpenPGP"
 
-#: ../src/config.py:1629 ../src/config.py:3422
+#: ../src/config.py:1634 ../src/config.py:3427
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
 #. Name column
-#: ../src/config.py:1859 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/config.py:1864 ../src/disco.py:740 ../src/disco.py:1466
 #: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1862
+#: ../src/config.py:1867
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1931
 msgid "Read all pending events before removing this account."
 msgstr "Ler todos os eventos pendentes antes de remover esta conta."
 
-#: ../src/config.py:1963
+#: ../src/config.py:1968
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Você não tem uma conta ativa"
 
-#: ../src/config.py:1964
+#: ../src/config.py:1969
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:2023
+#: ../src/config.py:2028
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Nome de conta já está em uso"
 
-#: ../src/config.py:2024
+#: ../src/config.py:2029
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2256
+#: ../src/config.py:2261
 #, python-format
 msgid "Edit %s"
 msgstr "_Editar %s"
 
-#: ../src/config.py:2258
+#: ../src/config.py:2263
 #, python-format
 msgid "Register to %s"
 msgstr "Registro para %s"
 
 #. list at the begining
-#: ../src/config.py:2330
+#: ../src/config.py:2335
 msgid "Ban List"
 msgstr "Lista de Banidos"
 
-#: ../src/config.py:2331
+#: ../src/config.py:2336
 msgid "Member List"
 msgstr "Lista de Membros"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2337
 msgid "Owner List"
 msgstr "Lista de Donos"
 
-#: ../src/config.py:2333
+#: ../src/config.py:2338
 msgid "Administrator List"
 msgstr "Lista de Administradores"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2366 ../src/disco.py:747 ../src/history_manager.py:154
+#: ../src/config.py:2371 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2374
+#: ../src/config.py:2379
 msgid "Reason"
 msgstr "Razão"
 
-#: ../src/config.py:2379
+#: ../src/config.py:2384
 msgid "Nick"
 msgstr "Apelido"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2388
 msgid "Role"
 msgstr "Lista"
 
-#: ../src/config.py:2404
+#: ../src/config.py:2409
 msgid "Banning..."
 msgstr "Banindo..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2406
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2808,11 +2902,11 @@ msgstr ""
 "<b>Quem você quer banir?</b>\n"
 "\n"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2413
 msgid "Adding Member..."
 msgstr "Adicionando Membro..."
 
-#: ../src/config.py:2409
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2820,11 +2914,11 @@ msgstr ""
 "<b>Quem você quer fazer como membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2411
+#: ../src/config.py:2416
 msgid "Adding Owner..."
 msgstr "Adicionando Proprietário..."
 
-#: ../src/config.py:2412
+#: ../src/config.py:2417
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2832,11 +2926,11 @@ msgstr ""
 "<b>Quem você quer tornar um dono?</b>\n"
 "\n"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2419
 msgid "Adding Administrator..."
 msgstr "Adicionando Administrador..."
 
-#: ../src/config.py:2415
+#: ../src/config.py:2420
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2844,7 +2938,7 @@ msgstr ""
 "<b>Quem você quer tornar um administrador?</b>\n"
 "\n"
 
-#: ../src/config.py:2416
+#: ../src/config.py:2421
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2860,100 +2954,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:2521
+#: ../src/config.py:2526
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2538 ../src/roster_window.py:2667
+#: ../src/config.py:2543 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Senha é obrigatória"
 
-#: ../src/config.py:2539 ../src/roster_window.py:2668
+#: ../src/config.py:2544 ../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:2540 ../src/roster_window.py:2669
+#: ../src/config.py:2545 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Salvar senha"
 
-#: ../src/config.py:2554
+#: ../src/config.py:2559
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Conta \"%s\" está conectada ao servidor"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2560
 msgid "If you remove it, the connection will be lost."
 msgstr "Se você remover-lo, a conexão será perdida."
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 #, fuzzy
 msgid "Default"
 msgstr "Deletar"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Imprimir tempo:"
 
-#: ../src/config.py:2640
+#: ../src/config.py:2645
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2710
+#: ../src/config.py:2715
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Conferência"
 
-#: ../src/config.py:2742
+#: ../src/config.py:2747
 msgid "This bookmark has invalid data"
 msgstr "Bookmark tem dados inválidos"
 
-#: ../src/config.py:2743
+#: ../src/config.py:2748
 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:3005
+#: ../src/config.py:3010
 msgid "Invalid username"
 msgstr "Nome de usuário inválido"
 
-#: ../src/config.py:3006
+#: ../src/config.py:3011
 msgid "You must provide a username to configure this account."
 msgstr "Você deve entrar com um nome para configurar esta conta."
 
-#: ../src/config.py:3016 ../src/dialogs.py:1316
+#: ../src/config.py:3021 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Senha Inválida"
 
-#: ../src/config.py:3017
+#: ../src/config.py:3022
 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:3021 ../src/dialogs.py:1321
+#: ../src/config.py:3026 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Senhas não conferem"
 
-#: ../src/config.py:3022 ../src/dialogs.py:1322
+#: ../src/config.py:3027 ../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:3041
+#: ../src/config.py:3046
 msgid "Duplicate Jabber ID"
 msgstr "Jabber ID Duplicado"
 
-#: ../src/config.py:3042
+#: ../src/config.py:3047
 msgid "This account is already configured in Gajim."
 msgstr "Esta conta já está configurada no Gajim."
 
-#: ../src/config.py:3059
+#: ../src/config.py:3064
 msgid "Account has been added successfully"
 msgstr "Conta foi adicionada com sucesso"
 
-#: ../src/config.py:3060 ../src/config.py:3095
+#: ../src/config.py:3065 ../src/config.py:3100
 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."
@@ -2962,23 +3056,23 @@ msgstr ""
 "Avançado, ou mais tarde clicando em Contas no item de menu da janela "
 "principal."
 
-#: ../src/config.py:3094
+#: ../src/config.py:3099
 msgid "Your new account has been created successfully"
 msgstr "Sua nova conta foi criada com sucesso"
 
-#: ../src/config.py:3112
+#: ../src/config.py:3117
 msgid "An error occured during account creation"
 msgstr "Um erro ocorreu durante a criação da conta"
 
-#: ../src/config.py:3170
+#: ../src/config.py:3175
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:3171
+#: ../src/config.py:3176
 msgid "You already have an account using this name."
 msgstr "Você já tem uma conta usando este nome."
 
-#: ../src/conversation_textview.py:271
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2986,56 +3080,65 @@ 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:340
+#: ../src/conversation_textview.py:342
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Ações para \"%s\""
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Ler Artigo da _Wikipedia"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Procurar no _Dicionário"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:373
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL do Dicionário não existe \"%s\" e isto não é WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:386
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL de Procura na Web não existe \"%s\""
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "_Procura na Web por isto"
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:397
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:755
+#: ../src/conversation_textview.py:757
 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:759
+#: ../src/conversation_textview.py:761
 #, python-format
 msgid "%i days ago"
 msgstr "%i dias atrás"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:791
+#: ../src/conversation_textview.py:793
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %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
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
@@ -3305,29 +3408,29 @@ msgstr "Nova Mensagem"
 msgid "New Private Message"
 msgstr "Enviar Mensagem Privada"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1161 ../src/notify.py:424
+#: ../src/dialogs.py:1369 ../src/gajim.py:1168 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Novo E-Mail"
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1314 ../src/notify.py:418
+#: ../src/dialogs.py:1371 ../src/gajim.py:1321 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Solicitação de Transferência de Arquivos"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1134 ../src/gajim.py:1290
+#: ../src/dialogs.py:1373 ../src/gajim.py:1140 ../src/gajim.py:1297
 #: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Erro na Transferência de Arquivos"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1353 ../src/gajim.py:1375
-#: ../src/gajim.py:1392 ../src/notify.py:422
+#: ../src/dialogs.py:1375 ../src/gajim.py:1360 ../src/gajim.py:1382
+#: ../src/gajim.py:1399 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Transferência do Arquivo Completa"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1356 ../src/notify.py:422
+#: ../src/dialogs.py:1376 ../src/gajim.py:1363 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Transferência do Arquivo Parada"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1032 ../src/notify.py:426
+#: ../src/dialogs.py:1378 ../src/gajim.py:1038 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Convite para Conferência"
 
@@ -3687,31 +3790,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:682
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
 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:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "This file already exists"
 msgstr "Este arquivo já existe"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "What do you want to do?"
 msgstr "O que você quer fazer?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3845,57 +3948,58 @@ msgstr "Conexão"
 msgid "Subject: %s"
 msgstr "Assunto: %s\n"
 
-#: ../src/gajim.py:703
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:703 ../src/gajim.py:716
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "erro no envio %s ( %s )"
 
-#: ../src/gajim.py:743
+#: ../src/gajim.py:749
 msgid "Authorization accepted"
 msgstr "Autorização aceita"
 
-#: ../src/gajim.py:744
+#: ../src/gajim.py:750
 #, 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:752
+#: ../src/gajim.py:758
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contato \"%s\" removeu sua inscrição"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:759
 msgid "You will always see him or her as offline."
 msgstr "Você sempre o verá como offline."
 
-#: ../src/gajim.py:796
+#: ../src/gajim.py:802
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contato com \"%s\" não pode ser estabelecido"
 
-#: ../src/gajim.py:797 ../src/common/connection.py:395
+#: ../src/gajim.py:803 ../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:945 ../src/roster_window.py:1201
+#: ../src/gajim.py:951 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s agora está %s (%s)"
 
-#: ../src/gajim.py:1042
+#: ../src/gajim.py:1048
 msgid "Your passphrase is incorrect"
 msgstr "Sua frase de acesso está incorreta"
 
-#: ../src/gajim.py:1043
+#: ../src/gajim.py:1049
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Você está atualmente conectado sem sua chave OpenPGP."
 
-#: ../src/gajim.py:1145
+#: ../src/gajim.py:1151
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novo E-mail em %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1147
+#: ../src/gajim.py:1153
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3905,61 +4009,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:1156
+#: ../src/gajim.py:1162
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1311
+#: ../src/gajim.py:1318
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer te enviar um arquivo:"
 
-#: ../src/gajim.py:1376
+#: ../src/gajim.py:1383
 #, 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:1380
+#: ../src/gajim.py:1387
 #, 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:1393
+#: ../src/gajim.py:1400
 #, 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:1397
+#: ../src/gajim.py:1404
 #, 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:1503
+#: ../src/gajim.py:1510
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1504
+#: ../src/gajim.py:1511
 #, 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:1842
+#: ../src/gajim.py:1850
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar suas preferências"
 
-#: ../src/gajim.py:2034
+#: ../src/gajim.py:2042
 #, fuzzy
 msgid "Network Manager support not available"
 msgstr "Uma conexão não está disponível"
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2117
 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."
@@ -4303,119 +4407,119 @@ msgstr "Você não pode apagar o seu tema corrente"
 msgid "Please first choose another for your current theme."
 msgstr "Por favor escolha outro para seu tema corrente."
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chat"
 msgstr "Conversa Privada"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chats"
 msgstr "ConversasPrivada"
 
-#: ../src/groupchat_control.py:120
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Falha ao Enviar uma mensagem privada"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:124
 #, 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
+#: ../src/groupchat_control.py:143
 msgid "Group Chat"
 msgstr "Conferência"
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chats"
 msgstr "Conferências"
 
-#: ../src/groupchat_control.py:315
+#: ../src/groupchat_control.py:317
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Mudar _Apelido"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:810
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi chutado: %(reason)s"
 
-#: ../src/groupchat_control.py:814
+#: ../src/groupchat_control.py:816
 #, 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:821
+#: ../src/groupchat_control.py:823
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s  foi banido: %(reason)s"
 
-#: ../src/groupchat_control.py:825
+#: ../src/groupchat_control.py:827
 #, 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:833
+#: ../src/groupchat_control.py:835
 #, python-format
 msgid "You are now known as %s"
 msgstr "Você agora é conhecido como %s"
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:837
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s agora é conhecido como %s"
 
-#: ../src/groupchat_control.py:915
+#: ../src/groupchat_control.py:917
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
-#: ../src/groupchat_control.py:920
+#: ../src/groupchat_control.py:922
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Neste grupo"
 
 #. No status message
-#: ../src/groupchat_control.py:922 ../src/roster_window.py:1204
+#: ../src/groupchat_control.py:924 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s agora está %s"
 
-#: ../src/groupchat_control.py:1041 ../src/groupchat_control.py:1059
-#: ../src/groupchat_control.py:1152 ../src/groupchat_control.py:1169
+#: ../src/groupchat_control.py:1043 ../src/groupchat_control.py:1061
+#: ../src/groupchat_control.py:1154 ../src/groupchat_control.py:1171
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Apelido não encontrado: %s"
 
-#: ../src/groupchat_control.py:1075
+#: ../src/groupchat_control.py:1077
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "Esta sala não tem assunto"
 
-#: ../src/groupchat_control.py:1088
+#: ../src/groupchat_control.py:1090
 #, 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:1095 ../src/groupchat_control.py:1123
+#: ../src/groupchat_control.py:1097 ../src/groupchat_control.py:1125
 #, 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:1206
+#: ../src/groupchat_control.py:1208
 #, 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:1229
+#: ../src/groupchat_control.py:1231
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandos: %s"
 
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1233
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4428,7 +4532,7 @@ msgstr ""
 "atualmente na sala, ele/ela será chutado também.  Não suporta espaços no "
 "apelido."
 
-#: ../src/groupchat_control.py:1238
+#: ../src/groupchat_control.py:1240
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4436,12 +4540,12 @@ msgstr ""
 "Uso: /%s <apelido>, abre uma janela de conferência privada para um ocupante "
 "específico."
 
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1244
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uso: /%s, apaga o texto da janela."
 
-#: ../src/groupchat_control.py:1244
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4450,12 +4554,12 @@ msgstr ""
 "Uso: /%s [rasão], fecha a janela corrente ou a aba, mostrando a razão se "
 "especificada."
 
-#: ../src/groupchat_control.py:1247
+#: ../src/groupchat_control.py:1249
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Uso: /%s, esconde os botões do bate-papo."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1252
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4464,7 +4568,7 @@ msgstr ""
 "Uso: /%s <JID> [ razão ], convida JID à  sala atual, fornecendo "
 "opcionalmente uma razão."
 
-#: ../src/groupchat_control.py:1254
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4473,7 +4577,7 @@ msgstr ""
 "Uso: /%s <sala>@<servidor>[/apelido], oferece para entrar na sala@servidor "
 "opcionalmente usando um apelido específico."
 
-#: ../src/groupchat_control.py:1258
+#: ../src/groupchat_control.py:1260
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4483,7 +4587,7 @@ msgstr ""
 "Uso: /%s <apelido> [razão], remove o ocupante especificado pelo apelido da "
 "sala e indica opcionalmente uma razão.  Não suporta espaços no apelido."
 
-#: ../src/groupchat_control.py:1263
+#: ../src/groupchat_control.py:1265
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current group chat. Use third "
@@ -4492,7 +4596,7 @@ msgstr ""
 "Uso: /%s <ação>, emite a ação à  sala atual. Use a terceira pessoa (por "
 "exemplo: /%s explodes.)"
 
-#: ../src/groupchat_control.py:1267
+#: ../src/groupchat_control.py:1269
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4501,94 +4605,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:1272
+#: ../src/groupchat_control.py:1274
 #, 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:1276
+#: ../src/groupchat_control.py:1278
 #, fuzzy, python-format
 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:1280
+#: ../src/groupchat_control.py:1282
 #, 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:1283
+#: ../src/groupchat_control.py:1285
 #, 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:1286
+#: ../src/groupchat_control.py:1288
 #, python-format
 msgid "No help info for /%s"
 msgstr "Sem ajuda para /%s"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1337
 #, 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:1337
+#: ../src/groupchat_control.py:1339
 #, 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:1341 ../src/roster_window.py:3961
+#: ../src/groupchat_control.py:1343 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "_Não me pergunte novamente"
 
-#: ../src/groupchat_control.py:1375
+#: ../src/groupchat_control.py:1377
 msgid "Changing Subject"
 msgstr "Mudando Assunto"
 
-#: ../src/groupchat_control.py:1376
+#: ../src/groupchat_control.py:1378
 msgid "Please specify the new subject:"
 msgstr "Por favor, especifique o novo assunto:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1387
 msgid "Changing Nickname"
 msgstr "Mudando Apelido"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1388
 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:1411
+#: ../src/groupchat_control.py:1413
 msgid "Bookmark already set"
 msgstr "Bookmark já configurado"
 
-#: ../src/groupchat_control.py:1412
+#: ../src/groupchat_control.py:1414
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Sala \"%s\" já existe nos bookmarks."
 
-#: ../src/groupchat_control.py:1421
+#: ../src/groupchat_control.py:1423
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark foi adicionado com sucesso"
 
-#: ../src/groupchat_control.py:1422
+#: ../src/groupchat_control.py:1424
 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:1548
+#: ../src/groupchat_control.py:1550
 #, python-format
 msgid "Kicking %s"
 msgstr "Chutando %s"
 
-#: ../src/groupchat_control.py:1549 ../src/groupchat_control.py:1831
+#: ../src/groupchat_control.py:1551 ../src/groupchat_control.py:1833
 msgid "You may specify a reason below:"
 msgstr "Você deve especificar uma razão abaixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1830
+#: ../src/groupchat_control.py:1832
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
@@ -4633,16 +4737,16 @@ 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:727
+#: ../src/gtkgui_helpers.py:728
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:729
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:737
+#: ../src/gtkgui_helpers.py:738
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Salvar Arquivo como..."
@@ -4673,11 +4777,6 @@ msgstr "Apelido"
 msgid "Message"
 msgstr "Mensagem"
 
-#. holds subject
-#: ../src/history_manager.py:141 ../src/history_manager.py:172
-msgid "Subject"
-msgstr "Assunto"
-
 #: ../src/history_manager.py:186
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -5920,7 +6019,7 @@ 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:1515
+#: ../src/common/connection_handlers.py:1523
 #, fuzzy, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Apelido não encontrado: %s"
@@ -5928,46 +6027,46 @@ msgstr "Apelido não encontrado: %s"
 #. password required to join
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1577
-#: ../src/common/connection_handlers.py:1580
-#: ../src/common/connection_handlers.py:1583
-#: ../src/common/connection_handlers.py:1586
-#: ../src/common/connection_handlers.py:1589
-#: ../src/common/connection_handlers.py:1592
+#: ../src/common/connection_handlers.py:1585
+#: ../src/common/connection_handlers.py:1588
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1597
 #: ../src/common/connection_handlers.py:1600
+#: ../src/common/connection_handlers.py:1608
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Impossível ingressar na sala"
 
-#: ../src/common/connection_handlers.py:1578
+#: ../src/common/connection_handlers.py:1586
 #, fuzzy
 msgid "A password is required to join this group chat."
 msgstr "Uma senha é requerida para entrar nesta sala."
 
-#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1589
 #, fuzzy
 msgid "You are banned from this group chat."
 msgstr "Você está banido desta sala."
 
-#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1592
 #, fuzzy
 msgid "Such group chat does not exist."
 msgstr "Tal sala não existe."
 
-#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1595
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "A criação de sala é restrita."
 
-#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1598
 msgid "Your registered nickname must be used."
 msgstr "Seu nickname registado deve ser usado."
 
-#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1601
 msgid "You are not in the members list."
 msgstr "Você não está na lista de membros."
 
-#: ../src/common/connection_handlers.py:1601
+#: ../src/common/connection_handlers.py:1609
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5975,27 +6074,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:1651
+#: ../src/common/connection_handlers.py:1659
 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:1672
+#: ../src/common/connection_handlers.py:1680
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nós estamos agora inscritos para %s"
 
-#: ../src/common/connection_handlers.py:1674
+#: ../src/common/connection_handlers.py:1682
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Remoção de Inscrição solicitada por %s"
 
-#: ../src/common/connection_handlers.py:1676
+#: ../src/common/connection_handlers.py:1684
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nós estamos agora sem inscrição para %s"
 
-#: ../src/common/connection_handlers.py:1846
+#: ../src/common/connection_handlers.py:1854
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -6026,7 +6125,7 @@ msgid "Invalid answer"
 msgstr "Resposta inválida"
 
 #: ../src/common/connection.py:394 ../src/common/connection.py:429
-#: ../src/common/connection.py:872
+#: ../src/common/connection.py:877
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
@@ -6084,7 +6183,7 @@ msgstr "Eu estou %s"
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Esta mensagem está criptografada]"
 
-#: ../src/common/connection.py:759
+#: ../src/common/connection.py:764
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6094,7 +6193,7 @@ msgstr ""
 "Assunto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:898
+#: ../src/common/connection.py:903
 msgid "Not fetched because of invisible status"
 msgstr ""
 
@@ -6414,10 +6513,6 @@ msgstr "?Inscrição existente:Nenhuma"
 msgid "To"
 msgstr "Para"
 
-#: ../src/common/helpers.py:259
-msgid "From"
-msgstr "De"
-
 #: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Ambos"
@@ -6693,9 +6788,6 @@ msgstr "erro no envio %s ( %s )"
 #~ msgid "Migrating Logs..."
 #~ msgstr "Migrando Logs..."
 
-#~ msgid "Please wait while logs are being migrated..."
-#~ msgstr "Espere por favor, enquanto os registros estão sendo migrados..."
-
 #~ msgid "_Join New Room"
 #~ msgstr "_Ingressar na Nova Sala"
 
@@ -6841,9 +6933,6 @@ msgstr "erro no envio %s ( %s )"
 #~ msgid "Timeout"
 #~ msgstr "Tempo excedido"
 
-#~ msgid "A protocol error has occured:"
-#~ msgstr "Um erro de protocolo ocorreu:"
-
 #~ msgid "account: "
 #~ msgstr "conta: "
 
diff --git a/po/ru.po b/po/ru.po
index 0b660f02d..8f1468e92 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-12-02 17:15+0100\n"
+"POT-Creation-Date: 2006-12-09 10:02+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"
@@ -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:1637
-#: ../src/config.py:3430
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1642
+#: ../src/config.py:3435
 msgid "No key selected"
 msgstr "Не выбран ключ"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1219
-#: ../src/config.py:1224 ../src/config.py:1408 ../src/config.py:1627
-#: ../src/config.py:1636 ../src/config.py:1695 ../src/config.py:1769
-#: ../src/config.py:2640 ../src/config.py:3420 ../src/config.py:3429
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1224
+#: ../src/config.py:1229 ../src/config.py:1413 ../src/config.py:1632
+#: ../src/config.py:1641 ../src/config.py:1700 ../src/config.py:1774
+#: ../src/config.py:2645 ../src/config.py:3425 ../src/config.py:3434
 #: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Нет"
@@ -530,6 +530,42 @@ 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>"
@@ -681,13 +717,13 @@ msgstr "Проигрывать _звук"
 #: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
-"Contact Connected\n"
-"Contact Disconnected\n"
-"Contact Change Status\n"
-"Group Chat Message Highlight\n"
-"Group Chat Message Received\n"
-"File Transfert Resquest\n"
-"File Transfert Started\n"
+"Contact Connected \n"
+"Contact Disconnected \n"
+"Contact Change Status \n"
+"Group Chat Message Highlight \n"
+"Group Chat Message Received \n"
+"File Transfert Resquest \n"
+"File Transfert Started \n"
 "File Transfert Finished"
 msgstr ""
 
@@ -759,6 +795,46 @@ 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 "Изменить пароль"
@@ -844,7 +920,7 @@ msgstr "_Компактный вид    Alt-C"
 msgid "_History"
 msgstr "_История"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/glade/data_form_window.glade.h:1 ../src/dataforms_widget.py:76
 msgid "Fill in the form."
 msgstr "Заполните форму."
 
@@ -1058,6 +1134,21 @@ msgstr "_Отправить личное сообщение"
 msgid "_Voice"
 msgstr "_Право говорить"
 
+#: ../data/glade/groups_post_window.glade.h:1
+#, fuzzy
+msgid "Create new post"
+msgstr "Новое сообщение"
+
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:259
+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"
@@ -1219,7 +1310,7 @@ msgstr "Использовать аутентификацию"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Щелкните, чтобы вставить смайлик (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1116
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
 msgid "OpenPGP Encryption"
 msgstr "Шифрование OpenPGP"
 
@@ -1341,7 +1432,7 @@ msgstr ""
 msgid "B_efore nickname:"
 msgstr "_До ника:"
 
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:841
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
 msgid "Chat"
 msgstr "Чат"
 
@@ -2443,33 +2534,33 @@ msgstr "Подключение недоступно"
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваше сообщение не может быть отправлено, пока вы не подключитесь."
 
-#: ../src/chat_control.py:841
+#: ../src/chat_control.py:844
 msgid "Chats"
 msgstr "Чаты"
 
-#: ../src/chat_control.py:1042
+#: ../src/chat_control.py:1030
 #, 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:1130
+#: ../src/chat_control.py:1118
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s не выдал OpenPGP ключ или вы не присвоили ему такового"
 
-#: ../src/chat_control.py:1266
+#: ../src/chat_control.py:1254
 msgid "Encryption enabled"
 msgstr "Шифрование включено"
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1259
 msgid "Encryption disabled"
 msgstr "Шифрование отключено"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1413 ../src/conversation_textview.py:493
-#: ../src/dialogs.py:629 ../src/gajim.py:727 ../src/gajim.py:728
-#: ../src/gajim.py:1067 ../src/roster_window.py:328
+#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495
+#: ../src/dialogs.py:629 ../src/gajim.py:733 ../src/gajim.py:734
+#: ../src/gajim.py:1073 ../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
@@ -2480,12 +2571,12 @@ msgid "Not in Roster"
 msgstr "Не в ростере"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1545
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Вы получили новое сообщение от \"%s\""
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1546
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2493,102 +2584,102 @@ msgstr ""
 "Если вы закроете эту вкладку и у вас отключена функция ведения истории "
 "сообщений, то это сообщение будет утеряно."
 
-#: ../src/config.py:130 ../src/config.py:589
+#: ../src/config.py:135 ../src/config.py:594
 msgid "Disabled"
 msgstr "Отключено"
 
-#: ../src/config.py:216
+#: ../src/config.py:221
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Каждые %s _минут"
 
-#: ../src/config.py:358
+#: ../src/config.py:363
 msgid "Active"
 msgstr "Активен"
 
-#: ../src/config.py:366
+#: ../src/config.py:371
 msgid "Event"
 msgstr "Событие"
 
-#: ../src/config.py:679 ../src/gajim.py:2086
+#: ../src/config.py:684 ../src/gajim.py:2094
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Нет словаря для языка %s"
 
-#: ../src/config.py:680 ../src/gajim.py:2087
+#: ../src/config.py:685 ../src/gajim.py:2095
 #, 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:1032
+#: ../src/config.py:1037
 msgid "status message title"
 msgstr "заголовок сообщения сервера"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1037
 msgid "status message text"
 msgstr "текст сообщения сервера"
 
-#: ../src/config.py:1067
+#: ../src/config.py:1072
 msgid "First Message Received"
 msgstr "Получено первое сообщение"
 
-#: ../src/config.py:1068
+#: ../src/config.py:1073
 msgid "Next Message Received"
 msgstr "Получено следующее сообщение"
 
-#: ../src/config.py:1069
+#: ../src/config.py:1074
 msgid "Contact Connected"
 msgstr "Контакт подключился"
 
-#: ../src/config.py:1070
+#: ../src/config.py:1075
 msgid "Contact Disconnected"
 msgstr "Контакт отключился"
 
-#: ../src/config.py:1071
+#: ../src/config.py:1076
 msgid "Message Sent"
 msgstr "Сообщение отправлено"
 
-#: ../src/config.py:1072
+#: ../src/config.py:1077
 msgid "Group Chat Message Highlight"
 msgstr "Вас упомянули в комнате"
 
-#: ../src/config.py:1073
+#: ../src/config.py:1078
 msgid "Group Chat Message Received"
 msgstr "Получено сообщение в комнате"
 
-#: ../src/config.py:1080
+#: ../src/config.py:1085
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Получено приглашение"
 
-#: ../src/config.py:1283
+#: ../src/config.py:1288
 msgid "OpenPGP is not usable in this computer"
 msgstr "Невозможно использовать OpenPGP"
 
-#: ../src/config.py:1329
+#: ../src/config.py:1334
 msgid "You are currently connected to the server"
 msgstr "Вы сейчас подсоединены к серверу"
 
-#: ../src/config.py:1330
+#: ../src/config.py:1335
 msgid "To change the account name, you must be disconnected."
 msgstr "Для смены имени учетной записи необходимо отключиться."
 
-#: ../src/config.py:1333 ../src/config.py:1925
+#: ../src/config.py:1338 ../src/config.py:1930
 msgid "Unread events"
 msgstr "Непросмотренные события"
 
-#: ../src/config.py:1334
+#: ../src/config.py:1339
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Для смены имени учетной записи необходимо просмотреть ожидающие события."
 
-#: ../src/config.py:1338
+#: ../src/config.py:1343
 msgid "Account Name Already Used"
 msgstr "Такое имя учетной записи уже используется"
 
-#: ../src/config.py:1339
+#: ../src/config.py:1344
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2596,176 +2687,176 @@ msgstr ""
 "Это имя уже используется в другой вашей учетной записи. Пожалуйста, выберите "
 "другое."
 
-#: ../src/config.py:1343 ../src/config.py:1347
+#: ../src/config.py:1348 ../src/config.py:1352
 msgid "Invalid account name"
 msgstr "Неверное имя учетной записи"
 
-#: ../src/config.py:1344
+#: ../src/config.py:1349
 msgid "Account name cannot be empty."
 msgstr "Имя учетной записи не может быть пустым."
 
-#: ../src/config.py:1348
+#: ../src/config.py:1353
 msgid "Account name cannot contain spaces."
 msgstr "Имя учетной записи не может содержать пробелы."
 
-#: ../src/config.py:1356 ../src/config.py:1362 ../src/config.py:1372
-#: ../src/config.py:3030
+#: ../src/config.py:1361 ../src/config.py:1367 ../src/config.py:1377
+#: ../src/config.py:3035
 msgid "Invalid Jabber ID"
 msgstr "Неверный Jabber ID"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1368
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID должен иметь формат \"имя_пользователя@сервер\"."
 
-#: ../src/config.py:1422
+#: ../src/config.py:1427
 msgid "Invalid entry"
 msgstr "Неверная запись"
 
-#: ../src/config.py:1423
+#: ../src/config.py:1428
 msgid "Custom port must be a port number."
 msgstr "В качестве номера порта должно выступать число"
 
-#: ../src/config.py:1549 ../src/common/config.py:363
+#: ../src/config.py:1554 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Скоро буду."
 
-#: ../src/config.py:1559
+#: ../src/config.py:1564
 msgid "Relogin now?"
 msgstr "Переподключиться сейчас?"
 
-#: ../src/config.py:1560
+#: ../src/config.py:1565
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Если вы хотите чтобы изменения были применены немедленно, вы должны "
 "переподключиться."
 
-#: ../src/config.py:1586
+#: ../src/config.py:1591
 msgid "No such account available"
 msgstr "Такая учетная запись недоступна"
 
-#: ../src/config.py:1587
+#: ../src/config.py:1592
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Перед редактированием личных данных необходимо сначала создать учетную "
 "запись."
 
-#: ../src/config.py:1594 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/config.py:1599 ../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:1595
+#: ../src/config.py:1600
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Чтобы отредактировать личную информацию, нужно подсоединиться к серверу."
 
-#: ../src/config.py:1599
+#: ../src/config.py:1604
 msgid "Your server doesn't support Vcard"
 msgstr "Сервер не поддерживает Vcard"
 
-#: ../src/config.py:1600
+#: ../src/config.py:1605
 msgid "Your server can't save your personal information."
 msgstr "Ваш сервер не может хранить личную информацию."
 
-#: ../src/config.py:1624 ../src/config.py:3417
+#: ../src/config.py:1629 ../src/config.py:3422
 msgid "Failed to get secret keys"
 msgstr "Не удалось получить секретный ключ"
 
-#: ../src/config.py:1625 ../src/config.py:3418
+#: ../src/config.py:1630 ../src/config.py:3423
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Возникла проблема с получением вашего секретного ключа OpenPGP."
 
-#: ../src/config.py:1628 ../src/config.py:3421
+#: ../src/config.py:1633 ../src/config.py:3426
 msgid "OpenPGP Key Selection"
 msgstr "Выбор ключа OpenPGP"
 
-#: ../src/config.py:1629 ../src/config.py:3422
+#: ../src/config.py:1634 ../src/config.py:3427
 msgid "Choose your OpenPGP key"
 msgstr "Выберите свой ключ OpenPGP"
 
 #. Name column
-#: ../src/config.py:1859 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/config.py:1864 ../src/disco.py:740 ../src/disco.py:1466
 #: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Имя"
 
-#: ../src/config.py:1862
+#: ../src/config.py:1867
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1931
 msgid "Read all pending events before removing this account."
 msgstr "Просмотрите все ожидающие события перед удалением учетной записи."
 
-#: ../src/config.py:1963
+#: ../src/config.py:1968
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "У вас есть окна чата под учётной записью %s"
 
-#: ../src/config.py:1964
+#: ../src/config.py:1969
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Все окна чатов и комнат будут закрыты. Продолжить?"
 
-#: ../src/config.py:2023
+#: ../src/config.py:2028
 msgid "Account Local already exists."
 msgstr "Учётная запись Local уже существует."
 
-#: ../src/config.py:2024
+#: ../src/config.py:2029
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Переименуйте или удалите её, прежде чем включать локальные сообщения."
 
-#: ../src/config.py:2256
+#: ../src/config.py:2261
 #, python-format
 msgid "Edit %s"
 msgstr "Править %s"
 
-#: ../src/config.py:2258
+#: ../src/config.py:2263
 #, python-format
 msgid "Register to %s"
 msgstr "Зарегистрировать %s"
 
 #. list at the begining
-#: ../src/config.py:2330
+#: ../src/config.py:2335
 msgid "Ban List"
 msgstr "Черный список"
 
-#: ../src/config.py:2331
+#: ../src/config.py:2336
 msgid "Member List"
 msgstr "Список участников"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2337
 msgid "Owner List"
 msgstr "Список владельцев"
 
-#: ../src/config.py:2333
+#: ../src/config.py:2338
 msgid "Administrator List"
 msgstr "Список администрираторов"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2366 ../src/disco.py:747 ../src/history_manager.py:154
+#: ../src/config.py:2371 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2374
+#: ../src/config.py:2379
 msgid "Reason"
 msgstr "Причина"
 
-#: ../src/config.py:2379
+#: ../src/config.py:2384
 msgid "Nick"
 msgstr "Ник"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2388
 msgid "Role"
 msgstr "Обязанность"
 
-#: ../src/config.py:2404
+#: ../src/config.py:2409
 msgid "Banning..."
 msgstr "Баню..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2406
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2773,11 +2864,11 @@ msgstr ""
 "<b>Кого вы хотите забанить?</b>\n"
 "\n"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2413
 msgid "Adding Member..."
 msgstr "Добавляю участника..."
 
-#: ../src/config.py:2409
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2785,11 +2876,11 @@ msgstr ""
 "<b>Кого вы хотите сделать участником?</b>\n"
 "\n"
 
-#: ../src/config.py:2411
+#: ../src/config.py:2416
 msgid "Adding Owner..."
 msgstr "Добавляю владельца..."
 
-#: ../src/config.py:2412
+#: ../src/config.py:2417
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2797,11 +2888,11 @@ msgstr ""
 "<b>Кого вы хотите сделать владельцем?</b>\n"
 "\n"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2419
 msgid "Adding Administrator..."
 msgstr "Добавляю администратора..."
 
-#: ../src/config.py:2415
+#: ../src/config.py:2420
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2809,7 +2900,7 @@ msgstr ""
 "<b>Кого вы хотите сделать администратором?</b>\n"
 "\n"
 
-#: ../src/config.py:2416
+#: ../src/config.py:2421
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2825,97 +2916,97 @@ msgstr ""
 "4. domain (сам домен, т.е. как любое сочетание user@domain,\n"
 "domain/resource, так и адрес, содержащий этот поддомен)"
 
-#: ../src/config.py:2521
+#: ../src/config.py:2526
 #, python-format
 msgid "Removing %s account"
 msgstr "Удаление учетной записи %s"
 
-#: ../src/config.py:2538 ../src/roster_window.py:2667
+#: ../src/config.py:2543 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Требуется пароль"
 
-#: ../src/config.py:2539 ../src/roster_window.py:2668
+#: ../src/config.py:2544 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введите пароль для учетной записи %s"
 
-#: ../src/config.py:2540 ../src/roster_window.py:2669
+#: ../src/config.py:2545 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Сохранить пароль"
 
-#: ../src/config.py:2554
+#: ../src/config.py:2559
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Учетная запись \"%s\" подключена к серверу"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2560
 msgid "If you remove it, the connection will be lost."
 msgstr "Если вы удалите его, произойдет отключение."
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 msgid "Default"
 msgstr "По умолчанию"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 msgid "?print_status:All"
 msgstr "Все"
 
-#: ../src/config.py:2640
+#: ../src/config.py:2645
 msgid "Enter and leave only"
 msgstr "Только приход и уход"
 
-#: ../src/config.py:2710
+#: ../src/config.py:2715
 msgid "New Group Chat"
 msgstr "Новая комната"
 
-#: ../src/config.py:2742
+#: ../src/config.py:2747
 msgid "This bookmark has invalid data"
 msgstr "Эта закладка содержит неверные данные"
 
-#: ../src/config.py:2743
+#: ../src/config.py:2748
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Пожалуйста, удостоверьтесь, что заполнены поля с именем сервера и комнаты, "
 "либо удалите эту закладку."
 
-#: ../src/config.py:3005
+#: ../src/config.py:3010
 msgid "Invalid username"
 msgstr "Неверное имя пользователя"
 
-#: ../src/config.py:3006
+#: ../src/config.py:3011
 msgid "You must provide a username to configure this account."
 msgstr "Для настройки учетной записи необходимо ввести имя пользователя."
 
-#: ../src/config.py:3016 ../src/dialogs.py:1316
+#: ../src/config.py:3021 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Неверный пароль"
 
-#: ../src/config.py:3017
+#: ../src/config.py:3022
 msgid "You must enter a password for the new account."
 msgstr "Необходимо ввести пароль для новой учетной записи."
 
-#: ../src/config.py:3021 ../src/dialogs.py:1321
+#: ../src/config.py:3026 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Пароли не совпадают"
 
-#: ../src/config.py:3022 ../src/dialogs.py:1322
+#: ../src/config.py:3027 ../src/dialogs.py:1322
 msgid "The passwords typed in both fields must be identical."
 msgstr "Пароли, введенные в оба поля, должны быть одинаковы."
 
-#: ../src/config.py:3041
+#: ../src/config.py:3046
 msgid "Duplicate Jabber ID"
 msgstr "Дублирующийся Jabber ID"
 
-#: ../src/config.py:3042
+#: ../src/config.py:3047
 msgid "This account is already configured in Gajim."
 msgstr "Этот контакт уже настроен в Gajim."
 
-#: ../src/config.py:3059
+#: ../src/config.py:3064
 msgid "Account has been added successfully"
 msgstr "Учетная запись успешно добавлена"
 
-#: ../src/config.py:3060 ../src/config.py:3095
+#: ../src/config.py:3065 ../src/config.py:3100
 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."
@@ -2924,23 +3015,23 @@ msgstr ""
 "Вы можете настроить ее используя \n"
 "\"Настройка->Учетные записи\" из главного окна."
 
-#: ../src/config.py:3094
+#: ../src/config.py:3099
 msgid "Your new account has been created successfully"
 msgstr "Ваша новая учетная запись успешно создана"
 
-#: ../src/config.py:3112
+#: ../src/config.py:3117
 msgid "An error occured during account creation"
 msgstr "Произошла ошибка при создании учетной записи"
 
-#: ../src/config.py:3170
+#: ../src/config.py:3175
 msgid "Account name is in use"
 msgstr "Такое имя учетной записи уже используется"
 
-#: ../src/config.py:3171
+#: ../src/config.py:3176
 msgid "You already have an account using this name."
 msgstr "У вас уже есть учетная запись с таким именем."
 
-#: ../src/conversation_textview.py:271
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2948,56 +3039,65 @@ msgstr ""
 "Текст под этой линией был сказан после того, как вы последний раз "
 "заглядывали в эту комнату"
 
-#: ../src/conversation_textview.py:340
+#: ../src/conversation_textview.py:342
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Действия для \"%s\""
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Смотреть статью в _Wikipedia"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Искать в _словаре"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:373
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL словаря пропущен в \"%s\" и это не WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:386
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL Web-поиска отсутствует в \"%s\""
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "_Поиск по Web"
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:397
 msgid "Open as _Link"
 msgstr "Открыть как ссылку"
 
-#: ../src/conversation_textview.py:755
+#: ../src/conversation_textview.py:757
 msgid "Yesterday"
 msgstr "Вчера"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:759
+#: ../src/conversation_textview.py:761
 #, python-format
 msgid "%i days ago"
 msgstr "%i дней назад"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:791
+#: ../src/conversation_textview.py:793
 #, python-format
 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>"
@@ -3259,29 +3359,29 @@ msgstr "Новое одиночное сообщение"
 msgid "New Private Message"
 msgstr "Новое личное сообщение"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1161 ../src/notify.py:424
+#: ../src/dialogs.py:1369 ../src/gajim.py:1168 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Новое письмо"
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1314 ../src/notify.py:418
+#: ../src/dialogs.py:1371 ../src/gajim.py:1321 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Запрос передачи"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1134 ../src/gajim.py:1290
+#: ../src/dialogs.py:1373 ../src/gajim.py:1140 ../src/gajim.py:1297
 #: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Ошибка передачи"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1353 ../src/gajim.py:1375
-#: ../src/gajim.py:1392 ../src/notify.py:422
+#: ../src/dialogs.py:1375 ../src/gajim.py:1360 ../src/gajim.py:1382
+#: ../src/gajim.py:1399 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Передача файла завершена"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1356 ../src/notify.py:422
+#: ../src/dialogs.py:1376 ../src/gajim.py:1363 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Передача остановлена"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1032 ../src/notify.py:426
+#: ../src/dialogs.py:1378 ../src/gajim.py:1038 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Приглашение в комнату"
 
@@ -3632,31 +3732,31 @@ msgstr "Описание: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s хочет отправить вам файл:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:682
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Не могу заместить существующий файл \"%s\""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
 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:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "This file already exists"
 msgstr "Файл уже существует"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "What do you want to do?"
 msgstr "Что вы хотите сделать?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Директория \"%s\" не доступна для записи"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
 msgid "You do not have permission to create files in this directory."
 msgstr "У вас нет права создавать файлы в этой директории."
 
@@ -3788,57 +3888,58 @@ msgstr "Соединение разорвалось"
 msgid "Subject: %s"
 msgstr "Тема: %s"
 
-#: ../src/gajim.py:703
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:703 ../src/gajim.py:716
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "ошибка при отправке %s ( %s )"
 
-#: ../src/gajim.py:743
+#: ../src/gajim.py:749
 msgid "Authorization accepted"
 msgstr "Авторизация принята"
 
-#: ../src/gajim.py:744
+#: ../src/gajim.py:750
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контакт \"%s\" авторизовал вас, теперь вы можете видеть его статус."
 
-#: ../src/gajim.py:752
+#: ../src/gajim.py:758
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контакт \"%s\" отозвал подписку с вами"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:759
 msgid "You will always see him or her as offline."
 msgstr "Вы всегда будете видеть его или её в оффлайне."
 
-#: ../src/gajim.py:796
+#: ../src/gajim.py:802
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Связь с \"%s\" не может быть установлена"
 
-#: ../src/gajim.py:797 ../src/common/connection.py:395
+#: ../src/gajim.py:803 ../src/common/connection.py:395
 msgid "Check your connection or try again later."
 msgstr "Проверьте настройки сети или попробуйте еще раз позже."
 
-#: ../src/gajim.py:945 ../src/roster_window.py:1201
+#: ../src/gajim.py:951 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s %s (%s)"
 
-#: ../src/gajim.py:1042
+#: ../src/gajim.py:1048
 msgid "Your passphrase is incorrect"
 msgstr "Ваша парольная фраза неверна"
 
-#: ../src/gajim.py:1043
+#: ../src/gajim.py:1049
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Вы сейчас соединены без OpenPGP ключа."
 
-#: ../src/gajim.py:1145
+#: ../src/gajim.py:1151
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Новое письмо на %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1147
+#: ../src/gajim.py:1153
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3849,7 +3950,7 @@ 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:1156
+#: ../src/gajim.py:1162
 #, python-format
 msgid ""
 "\n"
@@ -3858,53 +3959,53 @@ msgstr ""
 "\n"
 "От: %(from_address)s"
 
-#: ../src/gajim.py:1311
+#: ../src/gajim.py:1318
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s хочет отправить вам файл."
 
-#: ../src/gajim.py:1376
+#: ../src/gajim.py:1383
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Успешно получен файл %(filename)s от %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1387
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Передача файла %(filename)s от %(name)s приостановлена."
 
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1400
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "%(name)s успешно получил отправленный вами файл %(filename)s."
 
 #. ft stopped
-#: ../src/gajim.py:1397
+#: ../src/gajim.py:1404
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Передача файла %(filename)s к %(name)s приостановлена."
 
-#: ../src/gajim.py:1503
+#: ../src/gajim.py:1510
 msgid "Username Conflict"
 msgstr "Такое имя уже есть"
 
-#: ../src/gajim.py:1504
+#: ../src/gajim.py:1511
 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:1842
+#: ../src/gajim.py:1850
 msgid "Could not save your settings and preferences"
 msgstr "Не могу сохранить ваши установки и настройки"
 
-#: ../src/gajim.py:2034
+#: ../src/gajim.py:2042
 msgid "Network Manager support not available"
 msgstr "Network Manager не используется"
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2117
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Отсутствует поддержка управления сессиями (отсутствует модуль gnome.ui)"
@@ -4241,118 +4342,118 @@ msgstr "Вы не можете удалить вашу текущую тему"
 msgid "Please first choose another for your current theme."
 msgstr "Пожалуйста, выберите сначала другую тему."
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chat"
 msgstr "Личная беседа"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chats"
 msgstr "Личные беседы"
 
-#: ../src/groupchat_control.py:120
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Не удалось отправить личное сообщение"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Вы больше не находитесь в комнате \"%s\" или \"%s\" вышел."
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chat"
 msgstr "Комната"
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chats"
 msgstr "Комнаты"
 
-#: ../src/groupchat_control.py:315
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "Вставить ник"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:810
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s выгнали из комнаты: %(reason)s"
 
-#: ../src/groupchat_control.py:814
+#: ../src/groupchat_control.py:816
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(who)s выгнал %(nick)s из комнаты: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:821
+#: ../src/groupchat_control.py:823
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s запретили заходить в комнату: %(reason)s"
 
-#: ../src/groupchat_control.py:825
+#: ../src/groupchat_control.py:827
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s запретил %(nick)s заходить в комнату: %(reason)s"
 
-#: ../src/groupchat_control.py:833
+#: ../src/groupchat_control.py:835
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вы теперь известны как %s"
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:837
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s теперь известен как %s"
 
-#: ../src/groupchat_control.py:915
+#: ../src/groupchat_control.py:917
 #, python-format
 msgid "%s has left"
 msgstr "%s ушел"
 
-#: ../src/groupchat_control.py:920
+#: ../src/groupchat_control.py:922
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s зашёл в комнату"
 
 #. No status message
-#: ../src/groupchat_control.py:922 ../src/roster_window.py:1204
+#: ../src/groupchat_control.py:924 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s %s"
 
-#: ../src/groupchat_control.py:1041 ../src/groupchat_control.py:1059
-#: ../src/groupchat_control.py:1152 ../src/groupchat_control.py:1169
+#: ../src/groupchat_control.py:1043 ../src/groupchat_control.py:1061
+#: ../src/groupchat_control.py:1154 ../src/groupchat_control.py:1171
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Ник не обнаружен: %s"
 
-#: ../src/groupchat_control.py:1075
+#: ../src/groupchat_control.py:1077
 msgid "This group chat has no subject"
 msgstr "У этой комнаты нет темы"
 
-#: ../src/groupchat_control.py:1088
+#: ../src/groupchat_control.py:1090
 #, 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:1095 ../src/groupchat_control.py:1123
+#: ../src/groupchat_control.py:1097 ../src/groupchat_control.py:1125
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s не является нормальным JID"
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1208
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Нет такой команды: /%s (если вы хотите её просто передать, то добавьте к ней "
 "префикс /say)"
 
-#: ../src/groupchat_control.py:1229
+#: ../src/groupchat_control.py:1231
 #, python-format
 msgid "Commands: %s"
 msgstr "Команды: %s"
 
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1233
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4365,19 +4466,19 @@ msgstr ""
 "данный момент находится в комнате, то он/она/оно так же будет выгнан. НЕ "
 "поддерживает пробелы в никах."
 
-#: ../src/groupchat_control.py:1238
+#: ../src/groupchat_control.py:1240
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
 msgstr ""
 "Использование: /%s <ник>, открывает окно привата с указанным посетителем."
 
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1244
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Использование: /%s, очищает текстовое окно."
 
-#: ../src/groupchat_control.py:1244
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4386,12 +4487,12 @@ msgstr ""
 "Использование: /%s [причина], закрывает текущее окно или вкладку, с приводя "
 "причину, если она указана."
 
-#: ../src/groupchat_control.py:1247
+#: ../src/groupchat_control.py:1249
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Использование: /%s, скрывает кнопки беседы."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1252
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4400,7 +4501,7 @@ msgstr ""
 "Использование: /%s <JID> [причина], приглашает JID в текущую комнату, с "
 "возможным указанием причины."
 
-#: ../src/groupchat_control.py:1254
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4409,7 +4510,7 @@ msgstr ""
 "Использование: /%s <комната>@<сервер>[/ник], предлагает присоединиться к "
 "комната@сервер, с возможным указанием ника."
 
-#: ../src/groupchat_control.py:1258
+#: ../src/groupchat_control.py:1260
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4419,7 +4520,7 @@ msgstr ""
 "Использование: /%s <ник> [причина], удаляет посетителя с указанным ником из "
 "комнаты с возможным указанием причины. НЕ поддерживает пробелы в нике."
 
-#: ../src/groupchat_control.py:1263
+#: ../src/groupchat_control.py:1265
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current group chat. Use third "
@@ -4428,7 +4529,7 @@ msgstr ""
 "Использование: /%s <действие>, совершает действие в текущей комнате. "
 "Используйте третье лицо (например, «/%s взрывается».)"
 
-#: ../src/groupchat_control.py:1267
+#: ../src/groupchat_control.py:1269
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4437,23 +4538,23 @@ msgstr ""
 "Использование: /%s <ник> [сообщение], открывает окно личной беседы и "
 "отсылает сообщение посетителю с указанным ником."
 
-#: ../src/groupchat_control.py:1272
+#: ../src/groupchat_control.py:1274
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Использование: /%s <ник>, меняет ваш ник в текущей комнате."
 
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1278
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Использование: /%s, показывает список присутствующих в комнате."
 
-#: ../src/groupchat_control.py:1280
+#: ../src/groupchat_control.py:1282
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Использование: /%s [тема], показывает или изменяет текущую тему комнаты."
 
-#: ../src/groupchat_control.py:1283
+#: ../src/groupchat_control.py:1285
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -4461,70 +4562,70 @@ msgstr ""
 "Использование: /%s <сообщение>, отсылает сообщение без поиска других команд "
 "в нем."
 
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1288
 #, python-format
 msgid "No help info for /%s"
 msgstr "Нет подсказки для /%s"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Вы точно хотите выйти из комнаты \"%s\"?"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1339
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Если вы закроете это окно, то вы выйдете из этой комнаты."
 
-#: ../src/groupchat_control.py:1341 ../src/roster_window.py:3961
+#: ../src/groupchat_control.py:1343 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "Не _переспрашивать"
 
-#: ../src/groupchat_control.py:1375
+#: ../src/groupchat_control.py:1377
 msgid "Changing Subject"
 msgstr "Изменяет тему"
 
-#: ../src/groupchat_control.py:1376
+#: ../src/groupchat_control.py:1378
 msgid "Please specify the new subject:"
 msgstr "Пожалуйста, введите новую тему:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1387
 msgid "Changing Nickname"
 msgstr "Изменяет ник"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1388
 msgid "Please specify the new nickname you want to use:"
 msgstr "Пожалуйста, введите новый ник, который вы хотите использовать:"
 
-#: ../src/groupchat_control.py:1411
+#: ../src/groupchat_control.py:1413
 msgid "Bookmark already set"
 msgstr "Закладка уже установлена"
 
-#: ../src/groupchat_control.py:1412
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Комната \"%s\" уже есть в ваших закладках."
 
-#: ../src/groupchat_control.py:1421
+#: ../src/groupchat_control.py:1423
 msgid "Bookmark has been added successfully"
 msgstr "Закладка успешно добавлена"
 
-#: ../src/groupchat_control.py:1422
+#: ../src/groupchat_control.py:1424
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Вы можете управлять закладками через меню \"Действия\" в ростере."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1548
+#: ../src/groupchat_control.py:1550
 #, python-format
 msgid "Kicking %s"
 msgstr "Кикнуть %s"
 
-#: ../src/groupchat_control.py:1549 ../src/groupchat_control.py:1831
+#: ../src/groupchat_control.py:1551 ../src/groupchat_control.py:1833
 msgid "You may specify a reason below:"
 msgstr "Вы можете указать причину ниже:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1830
+#: ../src/groupchat_control.py:1832
 #, python-format
 msgid "Banning %s"
 msgstr "Забанить %s"
@@ -4570,18 +4671,18 @@ msgstr "Ошибка обработки файла:"
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Не могу писать в %s. Управление сессиями будет недоступно"
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:728
 msgid "Extension not supported"
 msgstr "Расширение не поддерживается"
 
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:729
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Изображение нельзя сохранить в формате %(type)s. Сохранить как %"
 "(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:737
+#: ../src/gtkgui_helpers.py:738
 msgid "Save Image as..."
 msgstr "Сохранить изображение как..."
 
@@ -4611,11 +4712,6 @@ 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 "
@@ -5825,7 +5921,7 @@ msgstr ""
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1515
+#: ../src/common/connection_handlers.py:1523
 #, fuzzy, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Ник не обнаружен: %s"
@@ -5833,67 +5929,67 @@ msgstr "Ник не обнаружен: %s"
 #. password required to join
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1577
-#: ../src/common/connection_handlers.py:1580
-#: ../src/common/connection_handlers.py:1583
-#: ../src/common/connection_handlers.py:1586
-#: ../src/common/connection_handlers.py:1589
-#: ../src/common/connection_handlers.py:1592
+#: ../src/common/connection_handlers.py:1585
+#: ../src/common/connection_handlers.py:1588
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1597
 #: ../src/common/connection_handlers.py:1600
+#: ../src/common/connection_handlers.py:1608
 msgid "Unable to join group chat"
 msgstr "Не получается войти в комнату"
 
-#: ../src/common/connection_handlers.py:1578
+#: ../src/common/connection_handlers.py:1586
 msgid "A password is required to join this group chat."
 msgstr "Чтобы войти в эту комнату, нужен пароль."
 
-#: ../src/common/connection_handlers.py:1581
+#: ../src/common/connection_handlers.py:1589
 msgid "You are banned from this group chat."
 msgstr "Вам запрещено входить в эту комнату."
 
-#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1592
 msgid "Such group chat does not exist."
 msgstr "Такой комнаты нет."
 
-#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1595
 msgid "Group chat creation is restricted."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1598
 msgid "Your registered nickname must be used."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1601
 msgid "You are not in the members list."
 msgstr "Вас нет в списке членов комнаты."
 
-#: ../src/common/connection_handlers.py:1601
+#: ../src/common/connection_handlers.py:1609
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1651
+#: ../src/common/connection_handlers.py:1659
 msgid "I would like to add you to my roster."
 msgstr "Вы не возражаете, если я добавлю Вас в свой ростер?"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1672
+#: ../src/common/connection_handlers.py:1680
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1674
+#: ../src/common/connection_handlers.py:1682
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "%s хочет отменить подписку"
 
-#: ../src/common/connection_handlers.py:1676
+#: ../src/common/connection_handlers.py:1684
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1846
+#: ../src/common/connection_handlers.py:1854
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -5921,7 +6017,7 @@ msgid "Invalid answer"
 msgstr "Неверный ответ"
 
 #: ../src/common/connection.py:394 ../src/common/connection.py:429
-#: ../src/common/connection.py:872
+#: ../src/common/connection.py:877
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
@@ -5978,7 +6074,7 @@ msgstr "%s"
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Это сообщение *зашифровано*, см. :JEP:`27`]"
 
-#: ../src/common/connection.py:759
+#: ../src/common/connection.py:764
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -5988,7 +6084,7 @@ msgstr ""
 "Тема: %s\n"
 "%s"
 
-#: ../src/common/connection.py:898
+#: ../src/common/connection.py:903
 msgid "Not fetched because of invisible status"
 msgstr ""
 
@@ -6298,10 +6394,6 @@ msgstr "Нет"
 msgid "To"
 msgstr "К"
 
-#: ../src/common/helpers.py:259
-msgid "From"
-msgstr "От"
-
 #: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Оба"
@@ -6513,46 +6605,3 @@ msgstr "[Это сообщение зашифровано]"
 #, 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 6d7f306b2..1feed54f0 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-12-02 17:15+0100\n"
+"POT-Creation-Date: 2006-12-09 10:02+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"
@@ -321,16 +321,16 @@ msgid "Manage..."
 msgstr "Upraviť..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1637
-#: ../src/config.py:3430
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1642
+#: ../src/config.py:3435
 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:1219
-#: ../src/config.py:1224 ../src/config.py:1408 ../src/config.py:1627
-#: ../src/config.py:1636 ../src/config.py:1695 ../src/config.py:1769
-#: ../src/config.py:2640 ../src/config.py:3420 ../src/config.py:3429
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1224
+#: ../src/config.py:1229 ../src/config.py:1413 ../src/config.py:1632
+#: ../src/config.py:1641 ../src/config.py:1700 ../src/config.py:1774
+#: ../src/config.py:2645 ../src/config.py:3425 ../src/config.py:3434
 #: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Nič"
@@ -524,6 +524,46 @@ msgstr "Re_gistrácia"
 msgid "_User ID:"
 msgstr "Používateľské ID:"
 
+#: ../data/glade/adhoc_commands_window.glade.h:1
+#, fuzzy
+msgid "<b>An error has occured:</b>"
+msgstr "Objavila sa chyba v protokole:"
+
+#: ../data/glade/adhoc_commands_window.glade.h:2
+msgid "<b>Choose command to execute:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:3
+msgid "Ad-hoc Commands - Gajim"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:4
+msgid "Check once more"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:5
+#, fuzzy
+msgid "Error description..."
+msgstr "Popis"
+
+#: ../data/glade/adhoc_commands_window.glade.h:6
+#, fuzzy
+msgid "Please wait while retrieving command list..."
+msgstr "Prosím počkajte, pokým prebieha migrácia záznamov z komunikácie..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:7
+#, fuzzy
+msgid "Please wait while the command is sending..."
+msgstr "Prosím počkajte, pokým prebieha migrácia záznamov z komunikácie..."
+
+#: ../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>Popis</b>"
@@ -674,13 +714,13 @@ msgstr "Prehrať _zvuky"
 #: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
-"Contact Connected\n"
-"Contact Disconnected\n"
-"Contact Change Status\n"
-"Group Chat Message Highlight\n"
-"Group Chat Message Received\n"
-"File Transfert Resquest\n"
-"File Transfert Started\n"
+"Contact Connected \n"
+"Contact Disconnected \n"
+"Contact Change Status \n"
+"Group Chat Message Highlight \n"
+"Group Chat Message Received \n"
+"File Transfert Resquest \n"
+"File Transfert Started \n"
 "File Transfert Finished"
 msgstr ""
 
@@ -752,6 +792,46 @@ msgstr "Port: "
 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 "Krajina:"
+
+#: ../data/glade/atom_entry_window.glade.h:4
+#, fuzzy
+msgid "Feed name:"
+msgstr "názov témy"
+
+#: ../data/glade/atom_entry_window.glade.h:5
+#, fuzzy
+msgid "Last modified:"
+msgstr "Meno:"
+
+#: ../data/glade/atom_entry_window.glade.h:6
+#, fuzzy
+msgid "New entry received"
+msgstr "Keď je prijatá nová udalosť"
+
+#: ../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 "Zmeniť heslo"
@@ -837,7 +917,7 @@ msgstr "_Kompaktný pohľad    Alt+C"
 msgid "_History"
 msgstr "_História"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/glade/data_form_window.glade.h:1 ../src/dataforms_widget.py:76
 #, fuzzy
 msgid "Fill in the form."
 msgstr "V skupine"
@@ -1054,6 +1134,21 @@ msgstr "_Poslať súkromnú správu"
 msgid "_Voice"
 msgstr "_Hlas"
 
+#: ../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:259
+msgid "From"
+msgstr "Od"
+
+#. holds subject
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141
+#: ../src/history_manager.py:172
+#, fuzzy
+msgid "Subject"
+msgstr "Predmet:"
+
 #: ../data/glade/history_manager.glade.h:1
 #, fuzzy
 msgid ""
@@ -1214,7 +1309,7 @@ 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:1116
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP šifrovanie"
 
@@ -1340,7 +1435,7 @@ msgstr ""
 msgid "B_efore nickname:"
 msgstr "Pred prezývkou:"
 
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:841
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
 msgid "Chat"
 msgstr "Rozhovor"
 
@@ -2492,33 +2587,33 @@ 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:841
+#: ../src/chat_control.py:844
 msgid "Chats"
 msgstr "Rozhovory"
 
-#: ../src/chat_control.py:1042
+#: ../src/chat_control.py:1030
 #, fuzzy, python-format
 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:1130
+#: ../src/chat_control.py:1118
 #, 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:1266
+#: ../src/chat_control.py:1254
 msgid "Encryption enabled"
 msgstr "Šifrovanie zapnuté"
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1259
 msgid "Encryption disabled"
 msgstr "Šifrovanie vypnuté"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1413 ../src/conversation_textview.py:493
-#: ../src/dialogs.py:629 ../src/gajim.py:727 ../src/gajim.py:728
-#: ../src/gajim.py:1067 ../src/roster_window.py:328
+#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495
+#: ../src/dialogs.py:629 ../src/gajim.py:733 ../src/gajim.py:734
+#: ../src/gajim.py:1073 ../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
@@ -2529,288 +2624,288 @@ msgid "Not in Roster"
 msgstr "Nie je v zozname"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1545
 #, 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:1558
+#: ../src/chat_control.py:1546
 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:130 ../src/config.py:589
+#: ../src/config.py:135 ../src/config.py:594
 msgid "Disabled"
 msgstr "Vypnuté"
 
-#: ../src/config.py:216
+#: ../src/config.py:221
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Každých %s _minút"
 
-#: ../src/config.py:358
+#: ../src/config.py:363
 msgid "Active"
 msgstr "Aktívne"
 
-#: ../src/config.py:366
+#: ../src/config.py:371
 msgid "Event"
 msgstr "Udalosť"
 
-#: ../src/config.py:679 ../src/gajim.py:2086
+#: ../src/config.py:684 ../src/gajim.py:2094
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Pripojenie nie je dostupné"
 
-#: ../src/config.py:680 ../src/gajim.py:2087
+#: ../src/config.py:685 ../src/gajim.py:2095
 #, 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:1032
+#: ../src/config.py:1037
 msgid "status message title"
 msgstr "titulok správy o stave"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1037
 msgid "status message text"
 msgstr "text správy o stave"
 
-#: ../src/config.py:1067
+#: ../src/config.py:1072
 msgid "First Message Received"
 msgstr "Prvá prijatá správa"
 
-#: ../src/config.py:1068
+#: ../src/config.py:1073
 msgid "Next Message Received"
 msgstr "Ďalšia prijatá správa správa"
 
-#: ../src/config.py:1069
+#: ../src/config.py:1074
 msgid "Contact Connected"
 msgstr "Kotakt pripojený"
 
-#: ../src/config.py:1070
+#: ../src/config.py:1075
 msgid "Contact Disconnected"
 msgstr "Kontakt odpojený"
 
-#: ../src/config.py:1071
+#: ../src/config.py:1076
 msgid "Message Sent"
 msgstr "Správa odoslaná"
 
-#: ../src/config.py:1072
+#: ../src/config.py:1077
 msgid "Group Chat Message Highlight"
 msgstr "Zvýraznenie správy v skupinovej diskusii"
 
-#: ../src/config.py:1073
+#: ../src/config.py:1078
 msgid "Group Chat Message Received"
 msgstr "Prijatá správa v skupinovej diskusii"
 
-#: ../src/config.py:1080
+#: ../src/config.py:1085
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Prijaté pozvanie"
 
-#: ../src/config.py:1283
+#: ../src/config.py:1288
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP nie je použiteľné na tomto počítači"
 
-#: ../src/config.py:1329
+#: ../src/config.py:1334
 msgid "You are currently connected to the server"
 msgstr "Ste pripojený(á) na server"
 
-#: ../src/config.py:1330
+#: ../src/config.py:1335
 msgid "To change the account name, you must be disconnected."
 msgstr "Pre zmenu názvu účtu, musíte byť odpojený."
 
-#: ../src/config.py:1333 ../src/config.py:1925
+#: ../src/config.py:1338 ../src/config.py:1930
 msgid "Unread events"
 msgstr ""
 
-#: ../src/config.py:1334
+#: ../src/config.py:1339
 #, 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:1338
+#: ../src/config.py:1343
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "Názov účtu je už používané"
 
-#: ../src/config.py:1339
+#: ../src/config.py:1344
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 
-#: ../src/config.py:1343 ../src/config.py:1347
+#: ../src/config.py:1348 ../src/config.py:1352
 msgid "Invalid account name"
 msgstr "Nesprávny názov účtu"
 
-#: ../src/config.py:1344
+#: ../src/config.py:1349
 msgid "Account name cannot be empty."
 msgstr "Názov účtu nemôže byť prázdny."
 
-#: ../src/config.py:1348
+#: ../src/config.py:1353
 msgid "Account name cannot contain spaces."
 msgstr "Názov účtu nemôže obsahovať medzery."
 
-#: ../src/config.py:1356 ../src/config.py:1362 ../src/config.py:1372
-#: ../src/config.py:3030
+#: ../src/config.py:1361 ../src/config.py:1367 ../src/config.py:1377
+#: ../src/config.py:3035
 msgid "Invalid Jabber ID"
 msgstr "Nespravné Jabber ID"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1368
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabbe ID musí byť v tvare \"používateľ@menoserveru\""
 
-#: ../src/config.py:1422
+#: ../src/config.py:1427
 msgid "Invalid entry"
 msgstr "Nesprávny záznam"
 
-#: ../src/config.py:1423
+#: ../src/config.py:1428
 msgid "Custom port must be a port number."
 msgstr "Port musí byť číslo."
 
-#: ../src/config.py:1549 ../src/common/config.py:363
+#: ../src/config.py:1554 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Za chvíľu som späť."
 
-#: ../src/config.py:1559
+#: ../src/config.py:1564
 msgid "Relogin now?"
 msgstr "Prihlásiť znovu?"
 
-#: ../src/config.py:1560
+#: ../src/config.py:1565
 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:1586
+#: ../src/config.py:1591
 msgid "No such account available"
 msgstr "Taký účet nie je k dispozícii"
 
-#: ../src/config.py:1587
+#: ../src/config.py:1592
 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:1594 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/config.py:1599 ../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:1595
+#: ../src/config.py:1600
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez pripojenia nemôžete meniť osobné informácie."
 
-#: ../src/config.py:1599
+#: ../src/config.py:1604
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1600
+#: ../src/config.py:1605
 #, 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:1624 ../src/config.py:3417
+#: ../src/config.py:1629 ../src/config.py:3422
 msgid "Failed to get secret keys"
 msgstr "Nepodarilo sa získať tajné kľúče"
 
-#: ../src/config.py:1625 ../src/config.py:3418
+#: ../src/config.py:1630 ../src/config.py:3423
 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:1628 ../src/config.py:3421
+#: ../src/config.py:1633 ../src/config.py:3426
 msgid "OpenPGP Key Selection"
 msgstr "Výber OpenPGP kľúča"
 
-#: ../src/config.py:1629 ../src/config.py:3422
+#: ../src/config.py:1634 ../src/config.py:3427
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte váš OpenPGP kľúč"
 
 #. Name column
-#: ../src/config.py:1859 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/config.py:1864 ../src/disco.py:740 ../src/disco.py:1466
 #: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Meno"
 
-#: ../src/config.py:1862
+#: ../src/config.py:1867
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1931
 msgid "Read all pending events before removing this account."
 msgstr ""
 
-#: ../src/config.py:1963
+#: ../src/config.py:1968
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Nemáte žiadny aktívny účet"
 
-#: ../src/config.py:1964
+#: ../src/config.py:1969
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:2023
+#: ../src/config.py:2028
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Názov účtu je už používané"
 
-#: ../src/config.py:2024
+#: ../src/config.py:2029
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2256
+#: ../src/config.py:2261
 #, python-format
 msgid "Edit %s"
 msgstr "Upraviť %s"
 
-#: ../src/config.py:2258
+#: ../src/config.py:2263
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovať na %s"
 
 #. list at the begining
-#: ../src/config.py:2330
+#: ../src/config.py:2335
 msgid "Ban List"
 msgstr "Čierna listina"
 
-#: ../src/config.py:2331
+#: ../src/config.py:2336
 msgid "Member List"
 msgstr "Zoznam členov"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2337
 msgid "Owner List"
 msgstr "Zoznam vlastníkov"
 
-#: ../src/config.py:2333
+#: ../src/config.py:2338
 msgid "Administrator List"
 msgstr "Zoznam správcov"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2366 ../src/disco.py:747 ../src/history_manager.py:154
+#: ../src/config.py:2371 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2374
+#: ../src/config.py:2379
 msgid "Reason"
 msgstr "Dôvod"
 
-#: ../src/config.py:2379
+#: ../src/config.py:2384
 msgid "Nick"
 msgstr "Prezývka"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2388
 msgid "Role"
 msgstr "Rola"
 
-#: ../src/config.py:2404
+#: ../src/config.py:2409
 msgid "Banning..."
 msgstr "Zakazujem..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2406
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2818,11 +2913,11 @@ msgstr ""
 "<b>Koho chcete zakázať?</b>\n"
 "\n"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2413
 msgid "Adding Member..."
 msgstr "Pridáva sa člen..."
 
-#: ../src/config.py:2409
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2830,11 +2925,11 @@ msgstr ""
 "<b>Koho chcete pridať k členom?</b>\n"
 "\n"
 
-#: ../src/config.py:2411
+#: ../src/config.py:2416
 msgid "Adding Owner..."
 msgstr "Pridáva sa vlastník..."
 
-#: ../src/config.py:2412
+#: ../src/config.py:2417
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2842,11 +2937,11 @@ msgstr ""
 "<b>Koho chcete určiť za vlastníka?</b>\n"
 "\n"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2419
 msgid "Adding Administrator..."
 msgstr "Pridáva sa Administrátor..."
 
-#: ../src/config.py:2415
+#: ../src/config.py:2420
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2854,7 +2949,7 @@ msgstr ""
 "<b>koho chcete určiť za vlastníka?</b>\n"
 "\n"
 
-#: ../src/config.py:2416
+#: ../src/config.py:2421
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2870,102 +2965,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:2521
+#: ../src/config.py:2526
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuje sa účet %s"
 
-#: ../src/config.py:2538 ../src/roster_window.py:2667
+#: ../src/config.py:2543 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Heslo je požadované"
 
-#: ../src/config.py:2539 ../src/roster_window.py:2668
+#: ../src/config.py:2544 ../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:2540 ../src/roster_window.py:2669
+#: ../src/config.py:2545 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Uložiť heslo"
 
-#: ../src/config.py:2554
+#: ../src/config.py:2559
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Účet \"%s\" je pripojený na server"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2560
 msgid "If you remove it, the connection will be lost."
 msgstr "Ak dôjde k odstráneniu, stratíte spojenie."
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 #, fuzzy
 msgid "Default"
 msgstr "Zmazať"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Čas tlače:"
 
-#: ../src/config.py:2640
+#: ../src/config.py:2645
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2710
+#: ../src/config.py:2715
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Skupinový rozhovor"
 
-#: ../src/config.py:2742
+#: ../src/config.py:2747
 msgid "This bookmark has invalid data"
 msgstr "Táto záložka obsahuje chybné údaje"
 
-#: ../src/config.py:2743
+#: ../src/config.py:2748
 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:3005
+#: ../src/config.py:3010
 msgid "Invalid username"
 msgstr "Nesprávne meno používateľa"
 
-#: ../src/config.py:3006
+#: ../src/config.py:3011
 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:3016 ../src/dialogs.py:1316
+#: ../src/config.py:3021 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Nesprávne heslo"
 
-#: ../src/config.py:3017
+#: ../src/config.py:3022
 msgid "You must enter a password for the new account."
 msgstr "Musíte vložiť heslo pre nový účet."
 
-#: ../src/config.py:3021 ../src/dialogs.py:1321
+#: ../src/config.py:3026 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Heslá sa nezhodujú"
 
-#: ../src/config.py:3022 ../src/dialogs.py:1322
+#: ../src/config.py:3027 ../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:3041
+#: ../src/config.py:3046
 #, fuzzy
 msgid "Duplicate Jabber ID"
 msgstr "Nespravné Jabber ID"
 
-#: ../src/config.py:3042
+#: ../src/config.py:3047
 #, fuzzy
 msgid "This account is already configured in Gajim."
 msgstr "Tento kontakt je už uvedený v zozname."
 
-#: ../src/config.py:3059
+#: ../src/config.py:3064
 msgid "Account has been added successfully"
 msgstr "Účet bol úspešne pridaný"
 
-#: ../src/config.py:3060 ../src/config.py:3095
+#: ../src/config.py:3065 ../src/config.py:3100
 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."
@@ -2974,23 +3069,23 @@ msgstr ""
 "možnosti, alebo neskôr kliknutím na položku Účty v menu Upraviť, v hlavnom "
 "okne"
 
-#: ../src/config.py:3094
+#: ../src/config.py:3099
 msgid "Your new account has been created successfully"
 msgstr "Váš nový účet bol vytvorený úspešne"
 
-#: ../src/config.py:3112
+#: ../src/config.py:3117
 msgid "An error occured during account creation"
 msgstr "Nastala chyba pri vytváraní účtu"
 
-#: ../src/config.py:3170
+#: ../src/config.py:3175
 msgid "Account name is in use"
 msgstr "Názov účtu je už používané"
 
-#: ../src/config.py:3171
+#: ../src/config.py:3176
 msgid "You already have an account using this name."
 msgstr "Už máte účet s týmto názvom."
 
-#: ../src/conversation_textview.py:271
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2998,56 +3093,65 @@ msgstr ""
 "Text pod touto čiarou bol povedaný za dobu čo ste jej nevenovali pozornosť "
 "skupinovému rozhovoru"
 
-#: ../src/conversation_textview.py:340
+#: ../src/conversation_textview.py:342
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Akcie pre \"%s\""
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Čítať článok na _Wikipédii"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Vyhľadať to v _Slovníku"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:373
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL Slovníka chýba \"%s\" a nie je WIKTIONÁRNE"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:386
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL pre web vyhľadávanie chýba \"%s\""
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "_Hľadať na webe"
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:397
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:755
+#: ../src/conversation_textview.py:757
 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:759
+#: ../src/conversation_textview.py:761
 #, python-format
 msgid "%i days ago"
 msgstr "Pred %i dňami"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:791
+#: ../src/conversation_textview.py:793
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Predmet: %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
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
@@ -3318,29 +3422,29 @@ msgstr "Nová jednoduchá správa"
 msgid "New Private Message"
 msgstr "Nová privátna správa"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1161 ../src/notify.py:424
+#: ../src/dialogs.py:1369 ../src/gajim.py:1168 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Nový E-mail"
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1314 ../src/notify.py:418
+#: ../src/dialogs.py:1371 ../src/gajim.py:1321 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Požiadavka na prenos súboru"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1134 ../src/gajim.py:1290
+#: ../src/dialogs.py:1373 ../src/gajim.py:1140 ../src/gajim.py:1297
 #: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Chyba pri prenose súboru"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1353 ../src/gajim.py:1375
-#: ../src/gajim.py:1392 ../src/notify.py:422
+#: ../src/dialogs.py:1375 ../src/gajim.py:1360 ../src/gajim.py:1382
+#: ../src/gajim.py:1399 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Prenos súboru dokončený"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1356 ../src/notify.py:422
+#: ../src/dialogs.py:1376 ../src/gajim.py:1363 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Prenos súboru zastavený"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1032 ../src/notify.py:426
+#: ../src/dialogs.py:1378 ../src/gajim.py:1038 ../src/notify.py:426
 #, fuzzy
 msgid "Groupchat Invitation"
 msgstr "?Skupinová diskusia - rola: Nič"
@@ -3701,31 +3805,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:682
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
 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:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "This file already exists"
 msgstr "Tento súbor už existuje"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "What do you want to do?"
 msgstr "Čo si prajete vykonať?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3859,58 +3963,59 @@ msgstr "Spojenie"
 msgid "Subject: %s"
 msgstr "Predmet: %s\n"
 
-#: ../src/gajim.py:703
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:703 ../src/gajim.py:716
 #, fuzzy, python-format
 msgid "error while sending %s ( %s )"
 msgstr "chyba pri odosielaní"
 
-#: ../src/gajim.py:743
+#: ../src/gajim.py:749
 msgid "Authorization accepted"
 msgstr "Autorizácia akceptovaná"
 
-#: ../src/gajim.py:744
+#: ../src/gajim.py:750
 #, 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:752
+#: ../src/gajim.py:758
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" vás odobral zo svojho zoznamu"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:759
 msgid "You will always see him or her as offline."
 msgstr "Vždy uvidíte jeho alebo ju ako offline."
 
-#: ../src/gajim.py:796
+#: ../src/gajim.py:802
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Spojenie s \"%s\" nie je možné nadviazať"
 
-#: ../src/gajim.py:797 ../src/common/connection.py:395
+#: ../src/gajim.py:803 ../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:945 ../src/roster_window.py:1201
+#: ../src/gajim.py:951 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s je teraz %s (%s)"
 
-#: ../src/gajim.py:1042
+#: ../src/gajim.py:1048
 msgid "Your passphrase is incorrect"
 msgstr "Vaša passfráza je nesprávna"
 
-#: ../src/gajim.py:1043
+#: ../src/gajim.py:1049
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Momentálne ste pripojený(á) bez vášho OpenPGP kľúča."
 
-#: ../src/gajim.py:1145
+#: ../src/gajim.py:1151
 #, 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:1147
+#: ../src/gajim.py:1153
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3921,61 +4026,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:1156
+#: ../src/gajim.py:1162
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1311
+#: ../src/gajim.py:1318
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vám chce poslať súbor."
 
-#: ../src/gajim.py:1376
+#: ../src/gajim.py:1383
 #, 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:1380
+#: ../src/gajim.py:1387
 #, 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:1393
+#: ../src/gajim.py:1400
 #, 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:1397
+#: ../src/gajim.py:1404
 #, 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:1503
+#: ../src/gajim.py:1510
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1504
+#: ../src/gajim.py:1511
 #, 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:1842
+#: ../src/gajim.py:1850
 msgid "Could not save your settings and preferences"
 msgstr "Nie je možné uložiť nastavenia."
 
-#: ../src/gajim.py:2034
+#: ../src/gajim.py:2042
 #, fuzzy
 msgid "Network Manager support not available"
 msgstr "Pripojenie nie je dostupné"
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2117
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Podpora Správy sedenia nie je dostupná (chýba modul gnome.ui)"
 
@@ -4315,120 +4420,120 @@ msgstr "Nemôžete zmazať aktuálnu tému"
 msgid "Please first choose another for your current theme."
 msgstr "Prosím, vyberte najskôr inú tému."
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chat"
 msgstr "Súkromný rozhovor"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chats"
 msgstr "Súkromné rozhovory"
 
-#: ../src/groupchat_control.py:120
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Odoslanie súkromnej správy sa nepodarilo"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:124
 #, 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
+#: ../src/groupchat_control.py:143
 msgid "Group Chat"
 msgstr "Skupinový rozhovor"
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chats"
 msgstr "Skupinové diskusie"
 
-#: ../src/groupchat_control.py:315
+#: ../src/groupchat_control.py:317
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Zmeniť _prezývku"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:810
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s bol vykopnutý: %(reason)s"
 
-#: ../src/groupchat_control.py:814
+#: ../src/groupchat_control.py:816
 #, 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:821
+#: ../src/groupchat_control.py:823
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s bol zakázaný: %(reason)s"
 
-#: ../src/groupchat_control.py:825
+#: ../src/groupchat_control.py:827
 #, 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:833
+#: ../src/groupchat_control.py:835
 #, python-format
 msgid "You are now known as %s"
 msgstr "Teraz ste známy(a) ako %s"
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:837
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s je známy(a) ako %s"
 
-#: ../src/groupchat_control.py:915
+#: ../src/groupchat_control.py:917
 #, python-format
 msgid "%s has left"
 msgstr "%s odišiel"
 
-#: ../src/groupchat_control.py:920
+#: ../src/groupchat_control.py:922
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "V skupine"
 
 #. No status message
-#: ../src/groupchat_control.py:922 ../src/roster_window.py:1204
+#: ../src/groupchat_control.py:924 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s je teraz %s"
 
-#: ../src/groupchat_control.py:1041 ../src/groupchat_control.py:1059
-#: ../src/groupchat_control.py:1152 ../src/groupchat_control.py:1169
+#: ../src/groupchat_control.py:1043 ../src/groupchat_control.py:1061
+#: ../src/groupchat_control.py:1154 ../src/groupchat_control.py:1171
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Prezývka nenájdená: %s"
 
-#: ../src/groupchat_control.py:1075
+#: ../src/groupchat_control.py:1077
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "Táto miestnosť nemá nastavenú tému"
 
-#: ../src/groupchat_control.py:1088
+#: ../src/groupchat_control.py:1090
 #, 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:1095 ../src/groupchat_control.py:1123
+#: ../src/groupchat_control.py:1097 ../src/groupchat_control.py:1125
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s nevyzerá ako správny JID"
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1208
 #, 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:1229
+#: ../src/groupchat_control.py:1231
 #, python-format
 msgid "Commands: %s"
 msgstr "Príkazy: %s"
 
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1233
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4440,19 +4545,19 @@ msgstr ""
 "človeka môže byť zmenená, ale nesmie obsahovať \"@\". Ak je JID práve v "
 "miestnosti, on/ona/ono bude vykoponutý(á). Nepodporuje medzery v prezývkach."
 
-#: ../src/groupchat_control.py:1238
+#: ../src/groupchat_control.py:1240
 #, 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:1242
+#: ../src/groupchat_control.py:1244
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Použiteie: /%s, vyčistí textové okno."
 
-#: ../src/groupchat_control.py:1244
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4461,12 +4566,12 @@ msgstr ""
 "Použitie: /%s [dôvod], zatvorí aktuálnu záložku v okne a zobrazí "
 "zdôvodnenie, pokiaľ je špecifikované."
 
-#: ../src/groupchat_control.py:1247
+#: ../src/groupchat_control.py:1249
 #, fuzzy, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Použiteie: /%s, vyčistí textové okno."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1252
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4475,7 +4580,7 @@ msgstr ""
 "Použitie: /%s <JID> [dôvod], pozve JID do aktuálnej miestosti, prípadne sa "
 "zobrazí aj oddôvodnenie."
 
-#: ../src/groupchat_control.py:1254
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4484,7 +4589,7 @@ msgstr ""
 "Použitie: /%s <miestnosť>@<server>[/prezývka], ponúkne možnosť pripojiť sa "
 "do miestnosť@server pre nick, ak je špecifikovaný."
 
-#: ../src/groupchat_control.py:1258
+#: ../src/groupchat_control.py:1260
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4494,7 +4599,7 @@ msgstr ""
 "Použitie: /%s <prezývka> [dôvod], odstráni navštevníka z miestnosti podľa "
 "prezývky, prípadne zobrazí dôvod. Nepodporuje medzery v menách."
 
-#: ../src/groupchat_control.py:1263
+#: ../src/groupchat_control.py:1265
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current group chat. Use third "
@@ -4503,7 +4608,7 @@ msgstr ""
 "Použitie: /%s <akcia>, odošle akciu pre aktuálnu miestnosť. Používajte "
 "tretiu osobu. (napr. /%s exlodoval(a).)"
 
-#: ../src/groupchat_control.py:1267
+#: ../src/groupchat_control.py:1269
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4512,92 +4617,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:1272
+#: ../src/groupchat_control.py:1274
 #, 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:1276
+#: ../src/groupchat_control.py:1278
 #, fuzzy, python-format
 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:1280
+#: ../src/groupchat_control.py:1282
 #, 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:1283
+#: ../src/groupchat_control.py:1285
 #, 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:1286
+#: ../src/groupchat_control.py:1288
 #, python-format
 msgid "No help info for /%s"
 msgstr "Žiadne informácie s pomocou pre /%s"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1337
 #, 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:1337
+#: ../src/groupchat_control.py:1339
 #, 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:1341 ../src/roster_window.py:3961
+#: ../src/groupchat_control.py:1343 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "Znovu sa už _nepýtať"
 
-#: ../src/groupchat_control.py:1375
+#: ../src/groupchat_control.py:1377
 msgid "Changing Subject"
 msgstr "Zmena predmetu"
 
-#: ../src/groupchat_control.py:1376
+#: ../src/groupchat_control.py:1378
 msgid "Please specify the new subject:"
 msgstr "Prosím, špecifikujte nový predmet:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1387
 msgid "Changing Nickname"
 msgstr "Zmena prezývky"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1388
 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:1411
+#: ../src/groupchat_control.py:1413
 msgid "Bookmark already set"
 msgstr "Záložka je už nastavená"
 
-#: ../src/groupchat_control.py:1412
+#: ../src/groupchat_control.py:1414
 #, 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:1421
+#: ../src/groupchat_control.py:1423
 msgid "Bookmark has been added successfully"
 msgstr "Záložka bola úspešne pridaná"
 
-#: ../src/groupchat_control.py:1422
+#: ../src/groupchat_control.py:1424
 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:1548
+#: ../src/groupchat_control.py:1550
 #, python-format
 msgid "Kicking %s"
 msgstr "Vykopnúť %s"
 
-#: ../src/groupchat_control.py:1549 ../src/groupchat_control.py:1831
+#: ../src/groupchat_control.py:1551 ../src/groupchat_control.py:1833
 msgid "You may specify a reason below:"
 msgstr "Môžete špecifikovať dôvod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1830
+#: ../src/groupchat_control.py:1832
 #, python-format
 msgid "Banning %s"
 msgstr "Zakázať %s"
@@ -4643,17 +4748,17 @@ msgstr "Chyba štruktúry súboru:"
 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:727
+#: ../src/gtkgui_helpers.py:728
 #, fuzzy
 msgid "Extension not supported"
 msgstr "Dbus nie je podporovaný."
 
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:729
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:737
+#: ../src/gtkgui_helpers.py:738
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Uložiť súbor ako..."
@@ -4686,12 +4791,6 @@ msgstr "Prezývka:"
 msgid "Message"
 msgstr "Správa"
 
-#. holds subject
-#: ../src/history_manager.py:141 ../src/history_manager.py:172
-#, fuzzy
-msgid "Subject"
-msgstr "Predmet:"
-
 #: ../src/history_manager.py:186
 #, fuzzy
 msgid ""
@@ -5935,7 +6034,7 @@ 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:1515
+#: ../src/common/connection_handlers.py:1523
 #, fuzzy, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Prezývka nenájdená: %s"
@@ -5943,46 +6042,46 @@ msgstr "Prezývka nenájdená: %s"
 #. password required to join
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1577
-#: ../src/common/connection_handlers.py:1580
-#: ../src/common/connection_handlers.py:1583
-#: ../src/common/connection_handlers.py:1586
-#: ../src/common/connection_handlers.py:1589
-#: ../src/common/connection_handlers.py:1592
+#: ../src/common/connection_handlers.py:1585
+#: ../src/common/connection_handlers.py:1588
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1597
 #: ../src/common/connection_handlers.py:1600
+#: ../src/common/connection_handlers.py:1608
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Nie je možné vstúpiť do miestnosti"
 
-#: ../src/common/connection_handlers.py:1578
+#: ../src/common/connection_handlers.py:1586
 #, 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:1581
+#: ../src/common/connection_handlers.py:1589
 #, fuzzy
 msgid "You are banned from this group chat."
 msgstr "Vstup do miestnosti vám bol zakázaný."
 
-#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1592
 #, fuzzy
 msgid "Such group chat does not exist."
 msgstr "Takáto miestnosť neexistuje."
 
-#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1595
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "Vytváranie miestností je obmedzené."
 
-#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1598
 msgid "Your registered nickname must be used."
 msgstr "Musíte použiť vašu zaregistrovanú prezývku."
 
-#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1601
 msgid "You are not in the members list."
 msgstr "Nie ste v zozname."
 
-#: ../src/common/connection_handlers.py:1601
+#: ../src/common/connection_handlers.py:1609
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5990,27 +6089,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:1651
+#: ../src/common/connection_handlers.py:1659
 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:1672
+#: ../src/common/connection_handlers.py:1680
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "sme prihlásení k %s"
 
-#: ../src/common/connection_handlers.py:1674
+#: ../src/common/connection_handlers.py:1682
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "požiadavka na odhlásenie od %s"
 
-#: ../src/common/connection_handlers.py:1676
+#: ../src/common/connection_handlers.py:1684
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "sme odhlásení od %s"
 
-#: ../src/common/connection_handlers.py:1846
+#: ../src/common/connection_handlers.py:1854
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -6041,7 +6140,7 @@ msgid "Invalid answer"
 msgstr "Nesprávna odpoveď"
 
 #: ../src/common/connection.py:394 ../src/common/connection.py:429
-#: ../src/common/connection.py:872
+#: ../src/common/connection.py:877
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
@@ -6099,7 +6198,7 @@ msgstr "Som %s"
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Táto správa je šifrovaná]"
 
-#: ../src/common/connection.py:759
+#: ../src/common/connection.py:764
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6109,7 +6208,7 @@ msgstr ""
 "Predmet: %s\n"
 "%s"
 
-#: ../src/common/connection.py:898
+#: ../src/common/connection.py:903
 msgid "Not fetched because of invisible status"
 msgstr ""
 
@@ -6427,10 +6526,6 @@ msgstr "?Zápis už máme:Nič"
 msgid "To"
 msgstr "Pre"
 
-#: ../src/common/helpers.py:259
-msgid "From"
-msgstr "Od"
-
 #: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Oba"
@@ -6710,9 +6805,6 @@ msgstr "chyba pri odosielaní"
 #~ msgid "Migrating Logs..."
 #~ msgstr "Presúvanie záznamov histórie..."
 
-#~ msgid "Please wait while logs are being migrated..."
-#~ msgstr "Prosím počkajte, pokým prebieha migrácia záznamov z komunikácie..."
-
 #~ msgid "_Join New Room"
 #~ msgstr "_Pripojiť do novej miestnosti"
 
@@ -6913,9 +7005,6 @@ msgstr "chyba pri odosielaní"
 #~ msgid "Timeout"
 #~ msgstr "Čas vypršal"
 
-#~ msgid "A protocol error has occured:"
-#~ msgstr "Objavila sa chyba v protokole:"
-
 #~ msgid "account: "
 #~ msgstr "účet:"
 
diff --git a/po/sv.po b/po/sv.po
index 2526712f6..5a5754915 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-12-02 17:15+0100\n"
+"POT-Creation-Date: 2006-12-09 10:02+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"
@@ -323,16 +323,16 @@ msgid "Manage..."
 msgstr "Hantera..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1637
-#: ../src/config.py:3430
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1642
+#: ../src/config.py:3435
 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:1219
-#: ../src/config.py:1224 ../src/config.py:1408 ../src/config.py:1627
-#: ../src/config.py:1636 ../src/config.py:1695 ../src/config.py:1769
-#: ../src/config.py:2640 ../src/config.py:3420 ../src/config.py:3429
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1224
+#: ../src/config.py:1229 ../src/config.py:1413 ../src/config.py:1632
+#: ../src/config.py:1641 ../src/config.py:1700 ../src/config.py:1774
+#: ../src/config.py:2645 ../src/config.py:3425 ../src/config.py:3434
 #: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "Ingen"
@@ -524,6 +524,46 @@ msgstr "Re_gistrera"
 msgid "_User ID:"
 msgstr "Användar-ID:"
 
+#: ../data/glade/adhoc_commands_window.glade.h:1
+#, fuzzy
+msgid "<b>An error has occured:</b>"
+msgstr "Ett protokollfel har inträffat:"
+
+#: ../data/glade/adhoc_commands_window.glade.h:2
+msgid "<b>Choose command to execute:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:3
+msgid "Ad-hoc Commands - Gajim"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:4
+msgid "Check once more"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:5
+#, fuzzy
+msgid "Error description..."
+msgstr "Beskrivning"
+
+#: ../data/glade/adhoc_commands_window.glade.h:6
+#, fuzzy
+msgid "Please wait while retrieving command list..."
+msgstr "Vänligen vänta medan logfiler blir migrerade..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:7
+#, fuzzy
+msgid "Please wait while the command is sending..."
+msgstr "Vänligen vänta medan logfiler blir migrerade..."
+
+#: ../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>Beskrivning</b>"
@@ -675,13 +715,13 @@ msgstr "_Spela ljud"
 #: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
-"Contact Connected\n"
-"Contact Disconnected\n"
-"Contact Change Status\n"
-"Group Chat Message Highlight\n"
-"Group Chat Message Received\n"
-"File Transfert Resquest\n"
-"File Transfert Started\n"
+"Contact Connected \n"
+"Contact Disconnected \n"
+"Contact Change Status \n"
+"Group Chat Message Highlight \n"
+"Group Chat Message Received \n"
+"File Transfert Resquest \n"
+"File Transfert Started \n"
 "File Transfert Finished"
 msgstr ""
 
@@ -754,6 +794,46 @@ msgstr "Port: "
 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 "Land:"
+
+#: ../data/glade/atom_entry_window.glade.h:4
+#, fuzzy
+msgid "Feed name:"
+msgstr "temanamn"
+
+#: ../data/glade/atom_entry_window.glade.h:5
+#, fuzzy
+msgid "Last modified:"
+msgstr "Namn:"
+
+#: ../data/glade/atom_entry_window.glade.h:6
+#, fuzzy
+msgid "New entry received"
+msgstr "När en ny händelse är mottagen"
+
+#: ../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 "Byt lösenord"
@@ -839,7 +919,7 @@ msgstr "_Kompakt vy Alt+C"
 msgid "_History"
 msgstr "_Historik"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/glade/data_form_window.glade.h:1 ../src/dataforms_widget.py:76
 #, fuzzy
 msgid "Fill in the form."
 msgstr "I gruppen"
@@ -1058,6 +1138,20 @@ msgstr "_Skicka privat meddelande"
 msgid "_Voice"
 msgstr "_Röst"
 
+#: ../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:259
+msgid "From"
+msgstr "Från"
+
+#. holds subject
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141
+#: ../src/history_manager.py:172
+msgid "Subject"
+msgstr "Ämne"
+
 #: ../data/glade/history_manager.glade.h:1
 msgid ""
 "<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
@@ -1217,7 +1311,7 @@ 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:1116
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP-kryptering"
 
@@ -1341,7 +1435,7 @@ msgstr ""
 msgid "B_efore nickname:"
 msgstr "För_e smeknamn:"
 
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:841
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
 msgid "Chat"
 msgstr "Chatt"
 
@@ -2478,34 +2572,34 @@ 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:841
+#: ../src/chat_control.py:844
 msgid "Chats"
 msgstr "Chatts"
 
-#: ../src/chat_control.py:1042
+#: ../src/chat_control.py:1030
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1130
+#: ../src/chat_control.py:1118
 #, 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:1266
+#: ../src/chat_control.py:1254
 msgid "Encryption enabled"
 msgstr "Kryptering aktiverad"
 
-#: ../src/chat_control.py:1271
+#: ../src/chat_control.py:1259
 msgid "Encryption disabled"
 msgstr "Kryptering deaktiverad"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1413 ../src/conversation_textview.py:493
-#: ../src/dialogs.py:629 ../src/gajim.py:727 ../src/gajim.py:728
-#: ../src/gajim.py:1067 ../src/roster_window.py:328
+#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495
+#: ../src/dialogs.py:629 ../src/gajim.py:733 ../src/gajim.py:734
+#: ../src/gajim.py:1073 ../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
@@ -2516,12 +2610,12 @@ msgid "Not in Roster"
 msgstr "Inte i registret"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1557
+#: ../src/chat_control.py:1545
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du mottog just ett meddelande från \"%s\""
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1546
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2529,277 +2623,277 @@ msgstr ""
 "Om du stänger den här fliken och du har historik avslaget kommer meddelandet "
 "att förloras."
 
-#: ../src/config.py:130 ../src/config.py:589
+#: ../src/config.py:135 ../src/config.py:594
 msgid "Disabled"
 msgstr "Avstängd"
 
-#: ../src/config.py:216
+#: ../src/config.py:221
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Var %s _minut"
 
-#: ../src/config.py:358
+#: ../src/config.py:363
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:366
+#: ../src/config.py:371
 msgid "Event"
 msgstr "Händelse"
 
-#: ../src/config.py:679 ../src/gajim.py:2086
+#: ../src/config.py:684 ../src/gajim.py:2094
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "En förbindelse är inte tillgänglig"
 
-#: ../src/config.py:680 ../src/gajim.py:2087
+#: ../src/config.py:685 ../src/gajim.py:2095
 #, 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:1032
+#: ../src/config.py:1037
 msgid "status message title"
 msgstr "titel för statusmeddelande"
 
-#: ../src/config.py:1032
+#: ../src/config.py:1037
 msgid "status message text"
 msgstr "text för statusmeddelande"
 
-#: ../src/config.py:1067
+#: ../src/config.py:1072
 msgid "First Message Received"
 msgstr "Första meddelandet har mottagits"
 
-#: ../src/config.py:1068
+#: ../src/config.py:1073
 msgid "Next Message Received"
 msgstr "Nytt Meddelande Har Mottagits"
 
-#: ../src/config.py:1069
+#: ../src/config.py:1074
 msgid "Contact Connected"
 msgstr "Kontakt Ansluten"
 
-#: ../src/config.py:1070
+#: ../src/config.py:1075
 msgid "Contact Disconnected"
 msgstr "Kontakt Loggade Ut"
 
-#: ../src/config.py:1071
+#: ../src/config.py:1076
 msgid "Message Sent"
 msgstr "Meddelande Skickat"
 
-#: ../src/config.py:1072
+#: ../src/config.py:1077
 msgid "Group Chat Message Highlight"
 msgstr "Markering av Meddelande i Gruppchatt"
 
-#: ../src/config.py:1073
+#: ../src/config.py:1078
 msgid "Group Chat Message Received"
 msgstr "Meddelande Mottaget i Gruppchatt"
 
-#: ../src/config.py:1080
+#: ../src/config.py:1085
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Inbjudan mottagen"
 
-#: ../src/config.py:1283
+#: ../src/config.py:1288
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP är inte användbart på den här datorn"
 
-#: ../src/config.py:1329
+#: ../src/config.py:1334
 msgid "You are currently connected to the server"
 msgstr "Du är för närvarande ansluten till servern"
 
-#: ../src/config.py:1330
+#: ../src/config.py:1335
 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:1333 ../src/config.py:1925
+#: ../src/config.py:1338 ../src/config.py:1930
 msgid "Unread events"
 msgstr "Olästa händelser"
 
-#: ../src/config.py:1334
+#: ../src/config.py:1339
 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:1338
+#: ../src/config.py:1343
 msgid "Account Name Already Used"
 msgstr "Kontonamnet används redan"
 
-#: ../src/config.py:1339
+#: ../src/config.py:1344
 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:1343 ../src/config.py:1347
+#: ../src/config.py:1348 ../src/config.py:1352
 msgid "Invalid account name"
 msgstr "Ogiltigt kontonamn"
 
-#: ../src/config.py:1344
+#: ../src/config.py:1349
 msgid "Account name cannot be empty."
 msgstr "Kontonamnet kan inte vara tomt."
 
-#: ../src/config.py:1348
+#: ../src/config.py:1353
 msgid "Account name cannot contain spaces."
 msgstr "Kontonamnet kan inte innehålla mellanslag."
 
-#: ../src/config.py:1356 ../src/config.py:1362 ../src/config.py:1372
-#: ../src/config.py:3030
+#: ../src/config.py:1361 ../src/config.py:1367 ../src/config.py:1377
+#: ../src/config.py:3035
 msgid "Invalid Jabber ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/config.py:1363
+#: ../src/config.py:1368
 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:1422
+#: ../src/config.py:1427
 msgid "Invalid entry"
 msgstr "Ogiltig post"
 
-#: ../src/config.py:1423
+#: ../src/config.py:1428
 msgid "Custom port must be a port number."
 msgstr "Inställd port måste vara ett portnummer."
 
-#: ../src/config.py:1549 ../src/common/config.py:363
+#: ../src/config.py:1554 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "Strax tillbaka"
 
-#: ../src/config.py:1559
+#: ../src/config.py:1564
 msgid "Relogin now?"
 msgstr "Logga in igen nu?"
 
-#: ../src/config.py:1560
+#: ../src/config.py:1565
 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:1586
+#: ../src/config.py:1591
 msgid "No such account available"
 msgstr "Inget sådant konto tillgängligt"
 
-#: ../src/config.py:1587
+#: ../src/config.py:1592
 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:1594 ../src/dialogs.py:1128 ../src/dialogs.py:1297
+#: ../src/config.py:1599 ../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:1595
+#: ../src/config.py:1600
 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:1599
+#: ../src/config.py:1604
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:1600
+#: ../src/config.py:1605
 #, 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:1624 ../src/config.py:3417
+#: ../src/config.py:1629 ../src/config.py:3422
 msgid "Failed to get secret keys"
 msgstr "Lyckades inte hämta hemliga nycklar"
 
-#: ../src/config.py:1625 ../src/config.py:3418
+#: ../src/config.py:1630 ../src/config.py:3423
 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:1628 ../src/config.py:3421
+#: ../src/config.py:1633 ../src/config.py:3426
 msgid "OpenPGP Key Selection"
 msgstr "Val av OpenPGP-nyckel"
 
-#: ../src/config.py:1629 ../src/config.py:3422
+#: ../src/config.py:1634 ../src/config.py:3427
 msgid "Choose your OpenPGP key"
 msgstr "Välj din OpenPGP-nyckel"
 
 #. Name column
-#: ../src/config.py:1859 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/config.py:1864 ../src/disco.py:740 ../src/disco.py:1466
 #: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "Namn"
 
-#: ../src/config.py:1862
+#: ../src/config.py:1867
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1926
+#: ../src/config.py:1931
 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:1963
+#: ../src/config.py:1968
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har inget aktivt konto"
 
-#: ../src/config.py:1964
+#: ../src/config.py:1969
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:2023
+#: ../src/config.py:2028
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Kontonamnet används redan"
 
-#: ../src/config.py:2024
+#: ../src/config.py:2029
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2256
+#: ../src/config.py:2261
 #, python-format
 msgid "Edit %s"
 msgstr "Redigera %s"
 
-#: ../src/config.py:2258
+#: ../src/config.py:2263
 #, python-format
 msgid "Register to %s"
 msgstr "Registrera till %s"
 
 #. list at the begining
-#: ../src/config.py:2330
+#: ../src/config.py:2335
 msgid "Ban List"
 msgstr "Ban-lista"
 
-#: ../src/config.py:2331
+#: ../src/config.py:2336
 msgid "Member List"
 msgstr "Medlemslista"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2337
 msgid "Owner List"
 msgstr "Ägarelista"
 
-#: ../src/config.py:2333
+#: ../src/config.py:2338
 msgid "Administrator List"
 msgstr "Administratörlista"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2366 ../src/disco.py:747 ../src/history_manager.py:154
+#: ../src/config.py:2371 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2374
+#: ../src/config.py:2379
 msgid "Reason"
 msgstr "Anledning"
 
-#: ../src/config.py:2379
+#: ../src/config.py:2384
 msgid "Nick"
 msgstr "Smeknamn"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2388
 msgid "Role"
 msgstr "Roll"
 
-#: ../src/config.py:2404
+#: ../src/config.py:2409
 msgid "Banning..."
 msgstr "Bannlyser..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2406
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2807,11 +2901,11 @@ msgstr ""
 "<b>Vem vill du bannlysa?</b>\n"
 "\n"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2413
 msgid "Adding Member..."
 msgstr "Lägger till medlem..."
 
-#: ../src/config.py:2409
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2819,21 +2913,21 @@ msgstr ""
 "<b>Vem vill du göra till medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2411
+#: ../src/config.py:2416
 msgid "Adding Owner..."
 msgstr "Lägger till ägare..."
 
-#: ../src/config.py:2412
+#: ../src/config.py:2417
 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:2414
+#: ../src/config.py:2419
 msgid "Adding Administrator..."
 msgstr "Lägger till Administratör..."
 
-#: ../src/config.py:2415
+#: ../src/config.py:2420
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2841,7 +2935,7 @@ msgstr ""
 "<b>Vem vill du göra till administratör?</b>\n"
 "\n"
 
-#: ../src/config.py:2416
+#: ../src/config.py:2421
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2857,98 +2951,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:2521
+#: ../src/config.py:2526
 #, python-format
 msgid "Removing %s account"
 msgstr "Tar bort %s konto"
 
-#: ../src/config.py:2538 ../src/roster_window.py:2667
+#: ../src/config.py:2543 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "Lösenord Krävs"
 
-#: ../src/config.py:2539 ../src/roster_window.py:2668
+#: ../src/config.py:2544 ../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:2540 ../src/roster_window.py:2669
+#: ../src/config.py:2545 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "Spara lösenord"
 
-#: ../src/config.py:2554
+#: ../src/config.py:2559
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" är anslutet till servern"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2560
 msgid "If you remove it, the connection will be lost."
 msgstr "Om du tar bort det kommer anslutningen att förloras."
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 #, fuzzy
 msgid "Default"
 msgstr "Radera"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2644
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Skriv ut tid:"
 
-#: ../src/config.py:2640
+#: ../src/config.py:2645
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2710
+#: ../src/config.py:2715
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Gruppchatt"
 
-#: ../src/config.py:2742
+#: ../src/config.py:2747
 msgid "This bookmark has invalid data"
 msgstr "Det här bokmärket har ogiltig data"
 
-#: ../src/config.py:2743
+#: ../src/config.py:2748
 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:3005
+#: ../src/config.py:3010
 msgid "Invalid username"
 msgstr "Ogiltigt användarnamn"
 
-#: ../src/config.py:3006
+#: ../src/config.py:3011
 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:3016 ../src/dialogs.py:1316
+#: ../src/config.py:3021 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "Ogiltigt lösenord"
 
-#: ../src/config.py:3017
+#: ../src/config.py:3022
 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:3021 ../src/dialogs.py:1321
+#: ../src/config.py:3026 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "Lösenorden stämmer inte överens"
 
-#: ../src/config.py:3022 ../src/dialogs.py:1322
+#: ../src/config.py:3027 ../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:3041
+#: ../src/config.py:3046
 msgid "Duplicate Jabber ID"
 msgstr "Dubblett av Jabber-ID"
 
-#: ../src/config.py:3042
+#: ../src/config.py:3047
 msgid "This account is already configured in Gajim."
 msgstr "Detta kontot är redan konfigurerat i Gajim."
 
-#: ../src/config.py:3059
+#: ../src/config.py:3064
 msgid "Account has been added successfully"
 msgstr "Kontot har blivit tillagt"
 
-#: ../src/config.py:3060 ../src/config.py:3095
+#: ../src/config.py:3065 ../src/config.py:3100
 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."
@@ -2956,23 +3050,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:3094
+#: ../src/config.py:3099
 msgid "Your new account has been created successfully"
 msgstr "Ditt nya konto har skapats"
 
-#: ../src/config.py:3112
+#: ../src/config.py:3117
 msgid "An error occured during account creation"
 msgstr "Ett fel uppstod när kontot skulle skapas"
 
-#: ../src/config.py:3170
+#: ../src/config.py:3175
 msgid "Account name is in use"
 msgstr "Kontonamnet används redan"
 
-#: ../src/config.py:3171
+#: ../src/config.py:3176
 msgid "You already have an account using this name."
 msgstr "Du har redan ett konto med det namnet."
 
-#: ../src/conversation_textview.py:271
+#: ../src/conversation_textview.py:273
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -2980,56 +3074,65 @@ msgstr ""
 "Texten under denna linje är vad som har sagts sedan du senast hade fokus på "
 "denna gruppchatt"
 
-#: ../src/conversation_textview.py:340
+#: ../src/conversation_textview.py:342
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Åtgärder för \"%s\""
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "Läs _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "Kolla upp det i _Uppslagsbok"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:373
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL för uppslagsbok saknar ett \"%s\" och det är inte en WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:386
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL för webbsökning saknar ett \"%s\""
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "_Sök på webben efter det"
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:397
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:755
+#: ../src/conversation_textview.py:757
 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:759
+#: ../src/conversation_textview.py:761
 #, python-format
 msgid "%i days ago"
 msgstr "%i dagar sen"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:791
+#: ../src/conversation_textview.py:793
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Ämne: %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
 #, fuzzy, python-format
 msgid "Contact name: <i>%s</i>"
@@ -3298,29 +3401,29 @@ msgstr "Nytt Enstaka Meddelande"
 msgid "New Private Message"
 msgstr "Skicka Privat Meddelande"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1161 ../src/notify.py:424
+#: ../src/dialogs.py:1369 ../src/gajim.py:1168 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1314 ../src/notify.py:418
+#: ../src/dialogs.py:1371 ../src/gajim.py:1321 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "Förfrågan om Filöverföring"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1134 ../src/gajim.py:1290
+#: ../src/dialogs.py:1373 ../src/gajim.py:1140 ../src/gajim.py:1297
 #: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "Fel i Filöverföring"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1353 ../src/gajim.py:1375
-#: ../src/gajim.py:1392 ../src/notify.py:422
+#: ../src/dialogs.py:1375 ../src/gajim.py:1360 ../src/gajim.py:1382
+#: ../src/gajim.py:1399 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "Filöverföring Klar"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1356 ../src/notify.py:422
+#: ../src/dialogs.py:1376 ../src/gajim.py:1363 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "Filöverföring Stoppad"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1032 ../src/notify.py:426
+#: ../src/dialogs.py:1378 ../src/gajim.py:1038 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "Inbjudan till Gruppchatt"
 
@@ -3680,31 +3783,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:682
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:684
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
 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:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "This file already exists"
 msgstr "Den här filen finns redan"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "What do you want to do?"
 msgstr "Vad vill du göra?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:698
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -3837,57 +3940,58 @@ msgstr "Förbindelse"
 msgid "Subject: %s"
 msgstr "Ämne: %s\n"
 
-#: ../src/gajim.py:703
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:703 ../src/gajim.py:716
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "problem vid sändning %s ( %s )"
 
-#: ../src/gajim.py:743
+#: ../src/gajim.py:749
 msgid "Authorization accepted"
 msgstr "Auktorisering accepterad"
 
-#: ../src/gajim.py:744
+#: ../src/gajim.py:750
 #, 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:752
+#: ../src/gajim.py:758
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" tog bort prenumerationen från dig"
 
-#: ../src/gajim.py:753
+#: ../src/gajim.py:759
 msgid "You will always see him or her as offline."
 msgstr "Du kommer alltid se honom eller henne som frånkopplad."
 
-#: ../src/gajim.py:796
+#: ../src/gajim.py:802
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan inte etableras"
 
-#: ../src/gajim.py:797 ../src/common/connection.py:395
+#: ../src/gajim.py:803 ../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:945 ../src/roster_window.py:1201
+#: ../src/gajim.py:951 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s är nu %s (%s)"
 
-#: ../src/gajim.py:1042
+#: ../src/gajim.py:1048
 msgid "Your passphrase is incorrect"
 msgstr "Din lösenfras är inkorrekt."
 
-#: ../src/gajim.py:1043
+#: ../src/gajim.py:1049
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du är för närvarande ansluten utan din OpenPGP-nyckel."
 
-#: ../src/gajim.py:1145
+#: ../src/gajim.py:1151
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny Epost på %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1147
+#: ../src/gajim.py:1153
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3897,61 +4001,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:1156
+#: ../src/gajim.py:1162
 #, python-format
 msgid ""
 "\n"
 "From: %(from_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1311
+#: ../src/gajim.py:1318
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vill skicka en fil till dig."
 
-#: ../src/gajim.py:1376
+#: ../src/gajim.py:1383
 #, 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:1380
+#: ../src/gajim.py:1387
 #, 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:1393
+#: ../src/gajim.py:1400
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "%(filename)s har skickats till %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1397
+#: ../src/gajim.py:1404
 #, 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:1503
+#: ../src/gajim.py:1510
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1504
+#: ../src/gajim.py:1511
 #, 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:1842
+#: ../src/gajim.py:1850
 msgid "Could not save your settings and preferences"
 msgstr "Kunde inte spara dina inställningar"
 
-#: ../src/gajim.py:2034
+#: ../src/gajim.py:2042
 #, fuzzy
 msgid "Network Manager support not available"
 msgstr "En förbindelse är inte tillgänglig"
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2117
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Session Management-stöd inte tillgängligt (saknar gnome.ui-modul)"
 
@@ -4292,119 +4396,119 @@ msgstr "Du kan inte ta bort ditt nuvarande tema"
 msgid "Please first choose another for your current theme."
 msgstr "Vänligen välj ett annat tema först."
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chat"
 msgstr "Privat Chatt"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chats"
 msgstr "Privat Chatt"
 
-#: ../src/groupchat_control.py:120
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "Skicka privat meddelande misslyckades"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:124
 #, 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
+#: ../src/groupchat_control.py:143
 msgid "Group Chat"
 msgstr "Gruppchatt"
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chats"
 msgstr "Gruppchatt"
 
-#: ../src/groupchat_control.py:315
+#: ../src/groupchat_control.py:317
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Byt smek_namn"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:810
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blivit sparkad: %(reason)s"
 
-#: ../src/groupchat_control.py:814
+#: ../src/groupchat_control.py:816
 #, 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:821
+#: ../src/groupchat_control.py:823
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s har blivit bannlyst: %(reason)s"
 
-#: ../src/groupchat_control.py:825
+#: ../src/groupchat_control.py:827
 #, 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:833
+#: ../src/groupchat_control.py:835
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du är nu känd som %s"
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:837
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s är nu känd som %s"
 
-#: ../src/groupchat_control.py:915
+#: ../src/groupchat_control.py:917
 #, python-format
 msgid "%s has left"
 msgstr "%s har lämnat"
 
-#: ../src/groupchat_control.py:920
+#: ../src/groupchat_control.py:922
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "I gruppen"
 
 #. No status message
-#: ../src/groupchat_control.py:922 ../src/roster_window.py:1204
+#: ../src/groupchat_control.py:924 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s är nu %s"
 
-#: ../src/groupchat_control.py:1041 ../src/groupchat_control.py:1059
-#: ../src/groupchat_control.py:1152 ../src/groupchat_control.py:1169
+#: ../src/groupchat_control.py:1043 ../src/groupchat_control.py:1061
+#: ../src/groupchat_control.py:1154 ../src/groupchat_control.py:1171
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Smeknamnet kunde inte hittas: %s"
 
-#: ../src/groupchat_control.py:1075
+#: ../src/groupchat_control.py:1077
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "Det här rummet har inget ämne"
 
-#: ../src/groupchat_control.py:1088
+#: ../src/groupchat_control.py:1090
 #, 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:1095 ../src/groupchat_control.py:1123
+#: ../src/groupchat_control.py:1097 ../src/groupchat_control.py:1125
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s verkar inte vara ett giltigt JID"
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1208
 #, 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:1229
+#: ../src/groupchat_control.py:1231
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandon: %s"
 
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1233
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4417,7 +4521,7 @@ msgstr ""
 "befinner sig i rummet kommer han/hon/den/det också att att bli sparkad. "
 "Stödjer INTE mellanslag i smeknamn."
 
-#: ../src/groupchat_control.py:1238
+#: ../src/groupchat_control.py:1240
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -4425,12 +4529,12 @@ msgstr ""
 "Användning: /%s <semknamn>, öppnar ett privat chattfönster till den "
 "specificerade deltagaren."
 
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1244
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Användning: /%s, tömmer fönstret från text."
 
-#: ../src/groupchat_control.py:1244
+#: ../src/groupchat_control.py:1246
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4439,12 +4543,12 @@ msgstr ""
 "Användning: /%s [anledning], stänger aktuellt fönster eller flik och visar "
 "anledning om sådan specificerades."
 
-#: ../src/groupchat_control.py:1247
+#: ../src/groupchat_control.py:1249
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Användning: /%s, gömmer knapparna."
 
-#: ../src/groupchat_control.py:1250
+#: ../src/groupchat_control.py:1252
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4453,7 +4557,7 @@ msgstr ""
 "Användning: /%s <JID> [anledning], bjuder in JID till aktivt rum med en "
 "valbar anledning."
 
-#: ../src/groupchat_control.py:1254
+#: ../src/groupchat_control.py:1256
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4462,7 +4566,7 @@ msgstr ""
 "Användning: /%s <rum>@<server>[/smeknamn], erbjuder att delta i rum@server "
 "med valbart smeknamn"
 
-#: ../src/groupchat_control.py:1258
+#: ../src/groupchat_control.py:1260
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4472,7 +4576,7 @@ msgstr ""
 "Användning: /%s <smeknamn> [anledning], tar bort medlemmen specificerad med "
 "smeknamn och visar en valbar anledning. Stödjer INTE mellanslag i smeknamnet."
 
-#: ../src/groupchat_control.py:1263
+#: ../src/groupchat_control.py:1265
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current group chat. Use third "
@@ -4481,7 +4585,7 @@ msgstr ""
 "Användning: /%s <handling>, skickar handling till aktivt rum. Använd tredje "
 "person. (t.ex. /%s exploderar.)"
 
-#: ../src/groupchat_control.py:1267
+#: ../src/groupchat_control.py:1269
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message windowand sends "
@@ -4490,22 +4594,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:1272
+#: ../src/groupchat_control.py:1274
 #, 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:1276
+#: ../src/groupchat_control.py:1278
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Användning /%s [ämne], visar eller uppdaterar nuvarande ämne."
 
-#: ../src/groupchat_control.py:1280
+#: ../src/groupchat_control.py:1282
 #, 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:1283
+#: ../src/groupchat_control.py:1285
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -4513,72 +4617,72 @@ msgstr ""
 "Användning: /%s <meddelande>, skickar meddelande utan att leta efter andra "
 "kommandon."
 
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1288
 #, python-format
 msgid "No help info for /%s"
 msgstr "Ingen hjälp för /%s"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1337
 #, 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:1337
+#: ../src/groupchat_control.py:1339
 #, 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:1341 ../src/roster_window.py:3961
+#: ../src/groupchat_control.py:1343 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "Fråga mig i_nte igen"
 
-#: ../src/groupchat_control.py:1375
+#: ../src/groupchat_control.py:1377
 msgid "Changing Subject"
 msgstr "Ändrar Ämne"
 
-#: ../src/groupchat_control.py:1376
+#: ../src/groupchat_control.py:1378
 msgid "Please specify the new subject:"
 msgstr "Ange det nya ämnet:"
 
-#: ../src/groupchat_control.py:1385
+#: ../src/groupchat_control.py:1387
 msgid "Changing Nickname"
 msgstr "Byter Smeknamn"
 
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1388
 msgid "Please specify the new nickname you want to use:"
 msgstr "Ange det nya smeknamnet du vill använda:"
 
-#: ../src/groupchat_control.py:1411
+#: ../src/groupchat_control.py:1413
 msgid "Bookmark already set"
 msgstr "Bokmärke finns redan"
 
-#: ../src/groupchat_control.py:1412
+#: ../src/groupchat_control.py:1414
 #, 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:1421
+#: ../src/groupchat_control.py:1423
 msgid "Bookmark has been added successfully"
 msgstr "Bokmärke har blivit ordentligt tillagt"
 
-#: ../src/groupchat_control.py:1422
+#: ../src/groupchat_control.py:1424
 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:1548
+#: ../src/groupchat_control.py:1550
 #, python-format
 msgid "Kicking %s"
 msgstr "Sparkar %s"
 
-#: ../src/groupchat_control.py:1549 ../src/groupchat_control.py:1831
+#: ../src/groupchat_control.py:1551 ../src/groupchat_control.py:1833
 msgid "You may specify a reason below:"
 msgstr "Du kan ange en orsak här under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1830
+#: ../src/groupchat_control.py:1832
 #, python-format
 msgid "Banning %s"
 msgstr "Bannlyser %s"
@@ -4625,16 +4729,16 @@ 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:727
+#: ../src/gtkgui_helpers.py:728
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:729
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:737
+#: ../src/gtkgui_helpers.py:738
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Spara fil som..."
@@ -4665,11 +4769,6 @@ msgstr "Smeknamn"
 msgid "Message"
 msgstr "Meddelande"
 
-#. holds subject
-#: ../src/history_manager.py:141 ../src/history_manager.py:172
-msgid "Subject"
-msgstr "Ämne"
-
 #: ../src/history_manager.py:186
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -5906,7 +6005,7 @@ 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:1515
+#: ../src/common/connection_handlers.py:1523
 #, fuzzy, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Smeknamnet kunde inte hittas: %s"
@@ -5914,46 +6013,46 @@ msgstr "Smeknamnet kunde inte hittas: %s"
 #. password required to join
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1577
-#: ../src/common/connection_handlers.py:1580
-#: ../src/common/connection_handlers.py:1583
-#: ../src/common/connection_handlers.py:1586
-#: ../src/common/connection_handlers.py:1589
-#: ../src/common/connection_handlers.py:1592
+#: ../src/common/connection_handlers.py:1585
+#: ../src/common/connection_handlers.py:1588
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1597
 #: ../src/common/connection_handlers.py:1600
+#: ../src/common/connection_handlers.py:1608
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Lyckades inte gå med i rummet"
 
-#: ../src/common/connection_handlers.py:1578
+#: ../src/common/connection_handlers.py:1586
 #, 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:1581
+#: ../src/common/connection_handlers.py:1589
 #, fuzzy
 msgid "You are banned from this group chat."
 msgstr "Du är bannlyst från detta rummet."
 
-#: ../src/common/connection_handlers.py:1584
+#: ../src/common/connection_handlers.py:1592
 #, fuzzy
 msgid "Such group chat does not exist."
 msgstr "Det finns inget sådant rum."
 
-#: ../src/common/connection_handlers.py:1587
+#: ../src/common/connection_handlers.py:1595
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "Möjligheten att skapa rum är begränsad."
 
-#: ../src/common/connection_handlers.py:1590
+#: ../src/common/connection_handlers.py:1598
 msgid "Your registered nickname must be used."
 msgstr "Ditt registrerade smeknamn måste användas."
 
-#: ../src/common/connection_handlers.py:1593
+#: ../src/common/connection_handlers.py:1601
 msgid "You are not in the members list."
 msgstr "Du är inte med i medlemslistan."
 
-#: ../src/common/connection_handlers.py:1601
+#: ../src/common/connection_handlers.py:1609
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5962,27 +6061,27 @@ msgstr ""
 "deltagare.\n"
 "Vänligen ange ett annat smeknamn nedan:"
 
-#: ../src/common/connection_handlers.py:1651
+#: ../src/common/connection_handlers.py:1659
 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:1672
+#: ../src/common/connection_handlers.py:1680
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi prenumererar nu på %s"
 
-#: ../src/common/connection_handlers.py:1674
+#: ../src/common/connection_handlers.py:1682
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "avprenumerationsförfrågan från %s"
 
-#: ../src/common/connection_handlers.py:1676
+#: ../src/common/connection_handlers.py:1684
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "vi prenumererar inte längre på %s"
 
-#: ../src/common/connection_handlers.py:1846
+#: ../src/common/connection_handlers.py:1854
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -6013,7 +6112,7 @@ msgid "Invalid answer"
 msgstr "Ogiltigt lösenord"
 
 #: ../src/common/connection.py:394 ../src/common/connection.py:429
-#: ../src/common/connection.py:872
+#: ../src/common/connection.py:877
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
@@ -6071,7 +6170,7 @@ msgstr "Jag är %s"
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Det här meddelandet är krypterat]"
 
-#: ../src/common/connection.py:759
+#: ../src/common/connection.py:764
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -6081,7 +6180,7 @@ msgstr ""
 "Ämne: %s\n"
 "%s"
 
-#: ../src/common/connection.py:898
+#: ../src/common/connection.py:903
 msgid "Not fetched because of invisible status"
 msgstr ""
 
@@ -6400,10 +6499,6 @@ msgstr "?Prenumeration vi redan har:Ingen"
 msgid "To"
 msgstr "Till"
 
-#: ../src/common/helpers.py:259
-msgid "From"
-msgstr "Från"
-
 #: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "Båda"
@@ -6678,9 +6773,6 @@ msgstr "problem vid sändning %s ( %s )"
 #~ msgid "Migrating Logs..."
 #~ msgstr "Migrerar Logfiler"
 
-#~ msgid "Please wait while logs are being migrated..."
-#~ msgstr "Vänligen vänta medan logfiler blir migrerade..."
-
 #~ msgid "_Join New Room"
 #~ msgstr "Anslut till nytt _rum"
 
@@ -6847,9 +6939,6 @@ msgstr "problem vid sändning %s ( %s )"
 #~ msgid "Timeout"
 #~ msgstr "Timeout"
 
-#~ msgid "A protocol error has occured:"
-#~ msgstr "Ett protokollfel har inträffat:"
-
 #~ msgid "account: "
 #~ msgstr "konto: "
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0b3a7d702..851e2c389 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,11 +5,12 @@
 # wwld <wwld@radio.lzusiyu.org>, 2005.
 # kangkang <kanger@gamil.com>, 2005.
 #
+#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-26 22:15+0100\n"
+"POT-Creation-Date: 2006-12-09 10:02+0100\n"
 "PO-Revision-Date: 2006-12-04 01:07+0800\n"
 "Last-Translator: kangkang <kanger@gmail.com>\n"
 "Language-Team: sIyU <jabber@lzusiyu.org>\n"
@@ -219,8 +220,14 @@ msgid "Chan_ge Password"
 msgstr "更换密码(_G)"
 
 #: ../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 "检查这里， Gajim 将连接代理服务器具有 SSL 能力的 5523 端口。注意， Gajim 使用 TLS 加密接受服务器广播，而使用该选项将禁用 TLS"
+msgid ""
+"Check this so Gajim will connect in port 5223 where legacy servers are "
+"expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
+"default if broadcasted by the server, and with this option enabled TLS will "
+"be disabled"
+msgstr ""
+"检查这里， Gajim 将连接代理服务器具有 SSL 能力的 5523 端口。注意， Gajim 使"
+"用 TLS 加密接受服务器广播，而使用该选项将禁用 TLS"
 
 #: ../data/glade/account_modification_window.glade.h:10
 #: ../data/glade/zeroconf_properties_window.glade.h:4
@@ -240,11 +247,8 @@ msgid "Edit Personal Information..."
 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:904
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
+#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:905
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -252,12 +256,9 @@ msgstr "Gajim"
 #: ../data/glade/account_modification_window.glade.h:15
 #: ../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
+#: ../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 "常规"
 
@@ -266,27 +267,42 @@ msgid "Hostname: "
 msgstr "主机名："
 
 #: ../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 "如选定， Gajim 将广播除了你的 IP 外的更多 IP，文件传输将有较多机会可以工作。"
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"如选定， Gajim 将广播除了你的 IP 外的更多 IP，文件传输将有较多机会可以工作。"
 
 #: ../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"
+msgid ""
+"If checked, Gajim will send keep-alive packets so it prevents connection "
+"timeout which results in disconnection"
 msgstr "如果选定，Gajim 会发送数据包防止超时造成的连接断开"
 
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/zeroconf_properties_window.glade.h:8
-msgid "If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you"
-msgstr "如果选定，Gajim 会以已读许可方式为您个人把密码保存在 ~/.gajim/config 文件中"
+msgid ""
+"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+"permission only for you"
+msgstr ""
+"如果选定，Gajim 会以已读许可方式为您个人把密码保存在 ~/.gajim/config 文件中"
 
 #: ../data/glade/account_modification_window.glade.h:21
 #: ../data/glade/zeroconf_properties_window.glade.h:9
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
 msgstr "如果选定，Gajim 会在运行时使用本帐户自动连接 jabber"
 
 #: ../data/glade/account_modification_window.glade.h:22
 #: ../data/glade/zeroconf_properties_window.glade.h:10
-msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly"
-msgstr "如果选定，改变全局状态(在名单窗口下方复选框中调节)就会相应地改变当前帐户的状态"
+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 ""
+"如果选定，改变全局状态(在名单窗口下方复选框中调节)就会相应地改变当前帐户的状"
+"态"
 
 #: ../data/glade/account_modification_window.glade.h:23
 msgid "Information about you, as stored in the server"
@@ -297,26 +313,17 @@ msgid "Manage..."
 msgstr "管理..."
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16
-#: ../src/config.py:1636
-#: ../src/config.py:3429
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1642
+#: ../src/config.py:3435
 msgid "No key selected"
 msgstr "没有选择钥匙"
 
 #. None means no proxy profile selected
-#: ../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
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1224
+#: ../src/config.py:1229 ../src/config.py:1413 ../src/config.py:1632
+#: ../src/config.py:1641 ../src/config.py:1700 ../src/config.py:1774
+#: ../src/config.py:2645 ../src/config.py:3425 ../src/config.py:3434
+#: ../src/dialogs.py:281 ../src/dialogs.py:283
 msgid "None"
 msgstr "无"
 
@@ -334,8 +341,13 @@ msgid "Priori_ty:"
 msgstr "优先级(_T):"
 
 #: ../data/glade/account_modification_window.glade.h:31
-msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events"
-msgstr "优先级是当多个客户端使用同一帐户连接到服务器时， Jabber 决定事件响应对象的依据。"
+msgid ""
+"Priority is used in Jabber to determine who gets the events from the jabber "
+"server when two or more clients are connected using the same account; The "
+"client with the highest priority gets the events"
+msgstr ""
+"优先级是当多个客户端使用同一帐户连接到服务器时， Jabber 决定事件响应对象的依"
+"据。"
 
 #: ../data/glade/account_modification_window.glade.h:32
 msgid "Priority will change automatically according to your status."
@@ -350,8 +362,16 @@ msgid "Resour_ce: "
 msgstr "资源(_C)："
 
 #: ../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 "资源被发往 Jabber 服务器后，通过同时连接到服务器的多个客户端将 JID 分成若干部分。您可以利用“家庭”和“工作”两个资源同时连接到服务器。拥有更高优先级的资源得到服务器的事件响应。"
+msgid ""
+"Resource is sent to the Jabber server in order to separate the same JID in "
+"two or more parts depending on the number of the clients connected in the "
+"same server with the same account. So you might be connected in the same "
+"account with resource 'Home' and 'Work' at the same time. The resource which "
+"has the highest priority will get the events. (see below)"
+msgstr ""
+"资源被发往 Jabber 服务器后，通过同时连接到服务器的多个客户端将 JID 分成若干部"
+"分。您可以利用“家庭”和“工作”两个资源同时连接到服务器。拥有更高优先级的资源得"
+"到服务器的事件响应。"
 
 #: ../data/glade/account_modification_window.glade.h:36
 #: ../data/glade/zeroconf_properties_window.glade.h:18
@@ -402,15 +422,23 @@ msgstr "帐户"
 
 #: ../data/glade/accounts_window.glade.h:2
 msgid ""
-"If checked, all local contacts that use a Bonjour compatible chat client (like iChat, Trillian or Gaim) will be shown in roster. You don't need to be connected to a jabber server for it to work.\n"
-"This is only available if python-avahi is installed and avahi-daemon is running."
+"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 ""
-"如果选择，所有使用群体兼容聊天客户端(如iChat，Trillian 或 Gaim)的本地联系人将在名单中显示。您将可使它工作而不用连接到 Jabber 服务器。\n"
+"如果选择，所有使用群体兼容聊天客户端(如iChat，Trillian 或 Gaim)的本地联系人将"
+"在名单中显示。您将可使它工作而不用连接到 Jabber 服务器。\n"
 "只在 python-avahi 安装且 avahi 守护进程运行时有效。"
 
 #: ../data/glade/accounts_window.glade.h:4
-msgid "If you have 2 or more accounts and it is checked, Gajim will list all contacts as if you had one account"
-msgstr "如果选定，当您拥有多个帐户时，Gajim 会在列表中列出所有联系人，而看上去他们就像属于同一个帐户"
+msgid ""
+"If you have 2 or more accounts and it is checked, Gajim will list all "
+"contacts as if you had one account"
+msgstr ""
+"如果选定，当您拥有多个帐户时，Gajim 会在列表中列出所有联系人，而看上去他们就"
+"像属于同一个帐户"
 
 #: ../data/glade/accounts_window.glade.h:5
 msgid "Mer_ge accounts"
@@ -484,6 +512,46 @@ msgstr "注册(_G)："
 msgid "_User ID:"
 msgstr "用户 ID(_U):"
 
+#: ../data/glade/adhoc_commands_window.glade.h:1
+#, fuzzy
+msgid "<b>An error has occured:</b>"
+msgstr "发生了一个协议错误："
+
+#: ../data/glade/adhoc_commands_window.glade.h:2
+msgid "<b>Choose command to execute:</b>"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:3
+msgid "Ad-hoc Commands - Gajim"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:4
+msgid "Check once more"
+msgstr ""
+
+#: ../data/glade/adhoc_commands_window.glade.h:5
+#, fuzzy
+msgid "Error description..."
+msgstr "描述"
+
+#: ../data/glade/adhoc_commands_window.glade.h:6
+#, fuzzy
+msgid "Please wait while retrieving command list..."
+msgstr "请等待日志被移动..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:7
+#, fuzzy
+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>"
@@ -623,13 +691,13 @@ msgstr "播放声音"
 #: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
-"Contact Connected\n"
-"Contact Disconnected\n"
-"Contact Change Status\n"
-"Group Chat Message Highlight\n"
-"Group Chat Message Received\n"
-"File Transfert Resquest\n"
-"File Transfert Started\n"
+"Contact Connected \n"
+"Contact Disconnected \n"
+"Contact Change Status \n"
+"Group Chat Message Highlight \n"
+"Group Chat Message Received \n"
+"File Transfert Resquest \n"
+"File Transfert Started \n"
 "File Transfert Finished"
 msgstr ""
 "接受消息\n"
@@ -647,7 +715,8 @@ msgid "When "
 msgstr "当"
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
-msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr "激活窗口管理器事件提示使任务栏的聊天窗口闪烁(_A)"
 
 #: ../data/glade/advanced_notifications_window.glade.h:29
@@ -708,6 +777,46 @@ 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 "主题名称"
+
+#: ../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 "更换密码"
@@ -793,7 +902,7 @@ msgstr "紧凑模式(_C)  Alt+C"
 msgid "_History"
 msgstr "历史(_H)"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/glade/data_form_window.glade.h:1 ../src/dataforms_widget.py:76
 msgid "Fill in the form."
 msgstr "填写表格。"
 
@@ -846,15 +955,16 @@ msgid "Shows a list of file transfers between you and other"
 msgstr "显示文件传输列表"
 
 #: ../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"
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
 msgstr "该操作会从列表中移除文件传输。如果该传输处于活动状态，将被先中止后移除"
 
 #: ../data/glade/filetransfers.glade.h:12
 msgid "When a file transfer is complete show a popup notification"
 msgstr "传输完成后显示弹出气泡提示"
 
-#: ../data/glade/filetransfers.glade.h:13
-#: ../src/filetransfers_window.py:761
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
 msgid "_Continue"
 msgstr "继续(_C)"
 
@@ -862,8 +972,7 @@ msgstr "继续(_C)"
 msgid "_Notify me when a file transfer is complete"
 msgstr "文件传输完成时提醒我(_N)"
 
-#: ../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 "打开文件夹(_O)"
 
@@ -1007,6 +1116,21 @@ msgstr "发送私聊消息(_S)"
 msgid "_Voice"
 msgstr "语音(_V)"
 
+#: ../data/glade/groups_post_window.glade.h:1
+#, fuzzy
+msgid "Create new post"
+msgstr "新发表"
+
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:259
+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"
@@ -1014,14 +1138,16 @@ msgid ""
 "You can select logs from the left and/or search database from below.\n"
 "\n"
 "<b>WARNING:</b>\n"
-"If you plan to do massive deletions, please make sure Gajim is not running. Generally avoid deletions with contacts you currently chat with."
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 "<big><b>欢迎使用 Gajim 历史记录管理器</b></big>\n"
 "\n"
 "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."
 
 #: ../data/glade/history_manager.glade.h:7
 msgid "Delete"
@@ -1072,8 +1198,7 @@ msgstr "拒绝"
 msgid "Invitation Received"
 msgstr "收到邀请"
 
-#: ../data/glade/join_groupchat_window.glade.h:1
-#: ../src/dialogs.py:1146
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
 msgid "Join Group Chat"
 msgstr "加入群聊"
 
@@ -1098,8 +1223,7 @@ msgstr "最近："
 msgid "Room:"
 msgstr "房间："
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../src/disco.py:1150
+#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1150
 #: ../src/disco.py:1517
 msgid "_Join"
 msgstr "加入(_J)"
@@ -1166,8 +1290,7 @@ msgstr "使用验证"
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "点这里插入表情符 (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2
-#: ../src/chat_control.py:1099
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP 加密"
 
@@ -1253,8 +1376,13 @@ msgid "Also known as iChat style"
 msgstr "也就是 i 聊天风格"
 
 #: ../data/glade/preferences_window.glade.h:20
-msgid "An example: If you have enabled status message for away, Gajim won't ask you anymore for a status message when you change your status to away; it will use the default one set here"
-msgstr "例如：当您允许离开的状态消息，当您改变状态至离开时 Gajim 将不再询问您状态消息；将会使用默认设置的消息"
+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 ""
+"例如：当您允许离开的状态消息，当您改变状态至离开时 Gajim 将不再询问您状态消"
+"息；将会使用默认设置的消息"
 
 #: ../data/glade/preferences_window.glade.h:21
 msgid "Ask status message when I:"
@@ -1286,14 +1414,18 @@ msgstr ""
 msgid "B_efore nickname:"
 msgstr "在昵称前：(_E)"
 
-#: ../data/glade/preferences_window.glade.h:30
-#: ../src/chat_control.py:839
+#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
 msgid "Chat"
 msgstr "聊天"
 
 #: ../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 "当被不在名单中的联系人骚扰时，检查此选项。它会屏蔽所有名单之外联系人的消息，请谨慎使用。"
+msgid ""
+"Check this option, only if someone you don't have in the roster spams/annoys "
+"you. Use with caution, cause it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"当被不在名单中的联系人骚扰时，检查此选项。它会屏蔽所有名单之外联系人的消息，"
+"请谨慎使用。"
 
 #: ../data/glade/preferences_window.glade.h:32
 msgid "Configure color and font of the interface"
@@ -1336,55 +1468,88 @@ msgid "Events"
 msgstr "事件"
 
 #: ../data/glade/preferences_window.glade.h:42
-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 可以收发您与联系人所进行谈话的相关信息。此处您可是指定您想在聊天窗口中显示的聊天状态。"
+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 send to the other party."
-msgstr "Gajim 可以收发您与联系人所进行谈话的相关信息。此处您可是指定发给第三方的角色。"
+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"
+msgid ""
+"Gajim will automatically show new events by poping up the relative window"
 msgstr "Gajim 会自动弹出相关窗口以显示新的事件"
 
 #: ../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"
+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:46
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed in"
+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:47
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out"
+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:48
-msgid "Gajim will only change the icon of the contact that triggered the new event"
+msgid ""
+"Gajim will only change the icon of the contact that triggered the new event"
 msgstr "Gajim 仅会改变触发了新事件的联系人图标"
 
 #: ../data/glade/preferences_window.glade.h:50
-msgid "If checked, Gajim will also include information about the sender of the new emails"
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
 msgstr "如果选中，Gajim 将包含关于新的电子邮件发送者的信息"
 
 #: ../data/glade/preferences_window.glade.h:51
-msgid "If checked, Gajim will display avatars of contacts in roster window and in group chats"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
 msgstr "如果选定，Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
 
 #: ../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"
+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: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"
+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: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 "如果选定，Gajim 会以协议特定方式显示状态图标。(例如，MSN 联系人会以 MSN 相同图标方式显示，以表示在线，离开，忙，等等...)"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"如果选定，Gajim 会以协议特定方式显示状态图标。(例如，MSN 联系人会以 MSN 相同"
+"图标方式显示，以表示在线，离开，忙，等等...)"
 
 #: ../data/glade/preferences_window.glade.h:55
-msgid "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons"
+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:56
@@ -1460,8 +1625,12 @@ msgid "Sign _out"
 msgstr "退出登录(_O)"
 
 #: ../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 "一些消息会包含丰富的内容(例如 格式，颜色) 。如果选定，Gajim 将显示原本的消息内容。"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"一些消息会包含丰富的内容(例如 格式，颜色) 。如果选定，Gajim 将显示原本的消息"
+"内容。"
 
 #: ../data/glade/preferences_window.glade.h:76
 msgid "Status"
@@ -1492,16 +1661,26 @@ msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "使用托盘图标(aka. 提示区域图表)(_R)"
 
 #: ../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 "下列方式可用来提示您收到新的事件（消息，文件传输请求等）。请注意，只有未和您进行聊天的用户发送的新消息才会触发新消息事件"
+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 ""
+"下列方式可用来提示您收到新的事件（消息，文件传输请求等）。请注意，只有未和您"
+"进行聊天的用户发送的新消息才会触发新消息事件"
 
 #: ../data/glade/preferences_window.glade.h:84
 msgid "When new event is received"
 msgstr "当新事件发生时"
 
 #: ../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 "为 Rhythmbox 和 Muine 播放器工作。 更多的播放器，请访问 http://trac.gajim.org/wiki/GajimAndMusicPlayer。"
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+"为 Rhythmbox 和 Muine 播放器工作。 更多的播放器，请访问 http://trac.gajim."
+"org/wiki/GajimAndMusicPlayer。"
 
 #: ../data/glade/preferences_window.glade.h:86
 msgid "_Advanced Notifications Control..."
@@ -1631,8 +1810,7 @@ msgstr "Jabber ID"
 msgid "Order:"
 msgstr "订阅："
 
-#: ../data/glade/privacy_list_window.glade.h:11
-#: ../src/dialogs.py:1841
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
 msgid "Privacy List"
 msgstr "私人列表"
 
@@ -1785,8 +1963,7 @@ msgid "Prefix:"
 msgstr "前缀："
 
 #: ../data/glade/profile_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:37
-#: ../src/vcard.py:273
+#: ../data/glade/vcard_information_window.glade.h:37 ../src/vcard.py:273
 msgid "Role:"
 msgstr "角色："
 
@@ -1881,8 +2058,7 @@ msgstr "禁止他/她查看我的状态(_F)"
 
 #. 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:1948 ../src/roster_window.py:2045
 #: ../src/roster_window.py:2152
 msgid "_Remove from Roster"
 msgstr "从名单中移除(_R)"
@@ -1937,8 +2113,7 @@ msgstr "内容(_C)"
 msgid "_Discover Services"
 msgstr "发掘服务(_D)"
 
-#: ../data/glade/roster_window.glade.h:14
-#: ../src/disco.py:1255
+#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1255
 #: ../src/roster_window.py:2123
 msgid "_Edit"
 msgstr "编辑(_E)"
@@ -2083,8 +2258,7 @@ msgstr "联系人"
 
 #: ../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
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
 msgid "Jabber ID:"
 msgstr "Jabber ID"
 
@@ -2163,7 +2337,8 @@ msgstr "个人"
 
 #: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
-"If the default port that is used for incoming messages is unfitting for your setup you can select another one here.\n"
+"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 ""
 "如果用于接受消息的默认端口不适合您的设置您可以在这里选择另外一个。\n"
@@ -2292,14 +2467,18 @@ msgstr "Swedish"
 msgid "Chinese (Ch)"
 msgstr "中文"
 
-#: ../src/chat_control.py:201
-#: ../src/dialogs.py:1497
+#: ../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 ""
-"如果拼写检查不匹配您所使用用的语言，请正确设定您的 $LANG 。例如，中文用户就在 ~/.bash_profile 中键入 LANG=zh_CN 或 LANG=zh_CN.UTF-8 ，或在 /etc/profile 中进行全局设定。\n"
+"如果拼写检查不匹配您所使用用的语言，请正确设定您的 $LANG 。例如，中文用户就"
+"在 ~/.bash_profile 中键入 LANG=zh_CN 或 LANG=zh_CN.UTF-8 ，或在 /etc/profile "
+"中进行全局设定。\n"
 "\n"
 "拼写检查功能未启用"
 
@@ -2308,351 +2487,327 @@ msgid "Spelling language"
 msgstr "拼写检查"
 
 #. we are not connected
-#: ../src/chat_control.py:262
-#: ../src/chat_control.py:468
+#: ../src/chat_control.py:262 ../src/chat_control.py:468
 msgid "A connection is not available"
 msgstr "连接不可用"
 
-#: ../src/chat_control.py:263
-#: ../src/chat_control.py:469
+#: ../src/chat_control.py:263 ../src/chat_control.py:469
 msgid "Your message can not be sent until you are connected."
 msgstr "连接之后您的消息才能发送"
 
-#: ../src/chat_control.py:839
+#: ../src/chat_control.py:844
 msgid "Chats"
 msgstr "聊天"
 
-#: ../src/chat_control.py:1025
+#: ../src/chat_control.py:1030
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "群聊 %(room_name)s 的 %(nickname)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1113
+#: ../src/chat_control.py:1118
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr " %s 没有广播 OpenPGP 公钥或您未指定"
 
-#: ../src/chat_control.py:1239
+#: ../src/chat_control.py:1254
 msgid "Encryption enabled"
 msgstr "启用加密"
 
-#: ../src/chat_control.py:1244
+#: ../src/chat_control.py:1259
 msgid "Encryption disabled"
 msgstr "禁用加密"
 
 #. add_to_roster_menuitem
-#: ../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/chat_control.py:1401 ../src/conversation_textview.py:495
+#: ../src/dialogs.py:629 ../src/gajim.py:733 ../src/gajim.py:734
+#: ../src/gajim.py:1073 ../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:1530
+#: ../src/chat_control.py:1545
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "收到一条来自 “%s” 的消息"
 
-#: ../src/chat_control.py:1531
-msgid "If you close this tab and you have history disabled, this message will be lost."
+#: ../src/chat_control.py:1546
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
 msgstr "如果您关闭此标签并且禁用历史，此消息会丢失。"
 
-#: ../src/config.py:129
-#: ../src/config.py:588
+#: ../src/config.py:135 ../src/config.py:594
 msgid "Disabled"
 msgstr "禁用"
 
-#: ../src/config.py:215
+#: ../src/config.py:221
 #, python-format
 msgid "Every %s _minutes"
 msgstr "每 %s 分钟(m)"
 
-#: ../src/config.py:357
+#: ../src/config.py:363
 msgid "Active"
 msgstr "活动"
 
-#: ../src/config.py:365
+#: ../src/config.py:371
 msgid "Event"
 msgstr "事件"
 
-#: ../src/config.py:678
-#: ../src/gajim.py:2072
+#: ../src/config.py:684 ../src/gajim.py:2094
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "语言 %s 的字典不可用"
 
-#: ../src/config.py:679
-#: ../src/gajim.py:2073
+#: ../src/config.py:685 ../src/gajim.py:2095
 #, python-format
-msgid "You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option."
-msgstr "您需安装 %s 字典以使用拼写检查，或者设置拼写检查选项以选择另外一种语言。(_L)"
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+"您需安装 %s 字典以使用拼写检查，或者设置拼写检查选项以选择另外一种语言。(_L)"
 
-#: ../src/config.py:1031
+#: ../src/config.py:1037
 msgid "status message title"
 msgstr "状态消息标题"
 
-#: ../src/config.py:1031
+#: ../src/config.py:1037
 msgid "status message text"
 msgstr "状态消息文本"
 
-#: ../src/config.py:1066
+#: ../src/config.py:1072
 msgid "First Message Received"
 msgstr "最初收到的消息"
 
-#: ../src/config.py:1067
+#: ../src/config.py:1073
 msgid "Next Message Received"
 msgstr "收到的下一条消息"
 
-#: ../src/config.py:1068
+#: ../src/config.py:1074
 msgid "Contact Connected"
 msgstr "已连接的联系人"
 
-#: ../src/config.py:1069
+#: ../src/config.py:1075
 msgid "Contact Disconnected"
 msgstr "联系人已断开连接"
 
-#: ../src/config.py:1070
+#: ../src/config.py:1076
 msgid "Message Sent"
 msgstr "消息已发送"
 
-#: ../src/config.py:1071
+#: ../src/config.py:1077
 msgid "Group Chat Message Highlight"
 msgstr "群聊消息突出显示"
 
-#: ../src/config.py:1072
+#: ../src/config.py:1078
 msgid "Group Chat Message Received"
 msgstr "收到的群聊消息"
 
-#: ../src/config.py:1079
+#: ../src/config.py:1085
 msgid "GMail Email Received"
 msgstr "收到 GMail 邮件"
 
-#: ../src/config.py:1282
+#: ../src/config.py:1288
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP 在本机不可用"
 
-#: ../src/config.py:1328
+#: ../src/config.py:1334
 msgid "You are currently connected to the server"
 msgstr "正在连接到服务器"
 
-#: ../src/config.py:1329
+#: ../src/config.py:1335
 msgid "To change the account name, you must be disconnected."
 msgstr "如要改变账户名称，需断开连接。"
 
-#: ../src/config.py:1332
-#: ../src/config.py:1924
+#: ../src/config.py:1338 ../src/config.py:1930
 msgid "Unread events"
 msgstr "未读取的事件"
 
-#: ../src/config.py:1333
+#: ../src/config.py:1339
 msgid "To change the account name, you must read all pending events."
 msgstr "如要更改账户名称，需先处理所有未决事件"
 
-#: ../src/config.py:1337
+#: ../src/config.py:1343
 msgid "Account Name Already Used"
 msgstr "帐户名已经被占用"
 
-#: ../src/config.py:1338
-msgid "This name is already used by another of your accounts. Please choose another name."
+#: ../src/config.py:1344
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
 msgstr "该名称已被您的另一个帐号使用。请选择其他名称"
 
-#: ../src/config.py:1342
-#: ../src/config.py:1346
+#: ../src/config.py:1348 ../src/config.py:1352
 msgid "Invalid account name"
 msgstr "无效的账户名称"
 
-#: ../src/config.py:1343
+#: ../src/config.py:1349
 msgid "Account name cannot be empty."
 msgstr "账户名不能为空。"
 
-#: ../src/config.py:1347
+#: ../src/config.py:1353
 msgid "Account name cannot contain spaces."
 msgstr "账户名不能包含空格。"
 
-#: ../src/config.py:1355
-#: ../src/config.py:1361
-#: ../src/config.py:1371
-#: ../src/config.py:3029
+#: ../src/config.py:1361 ../src/config.py:1367 ../src/config.py:1377
+#: ../src/config.py:3035
 msgid "Invalid Jabber ID"
 msgstr "无效的 Jabber ID"
 
-#: ../src/config.py:1362
+#: ../src/config.py:1368
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID 的格式为 “用户@服务器名”。"
 
-#: ../src/config.py:1421
+#: ../src/config.py:1427
 msgid "Invalid entry"
 msgstr "无效输入"
 
-#: ../src/config.py:1422
+#: ../src/config.py:1428
 msgid "Custom port must be a port number."
 msgstr "自定义端口必须为端口号。"
 
-#: ../src/config.py:1548
-#: ../src/common/config.py:363
+#: ../src/config.py:1554 ../src/common/config.py:363
 msgid "Be right back."
 msgstr "很快回来。"
 
-#: ../src/config.py:1558
+#: ../src/config.py:1564
 msgid "Relogin now?"
 msgstr "现在重新登录？"
 
-#: ../src/config.py:1559
+#: ../src/config.py:1565
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "如果想使所有调整立即生效，您必须重新登录。"
 
-#: ../src/config.py:1585
+#: ../src/config.py:1591
 msgid "No such account available"
 msgstr "没有有效账户"
 
-#: ../src/config.py:1586
+#: ../src/config.py:1592
 msgid "You must create your account before editing your personal information."
 msgstr "您必须在编辑个人信息前创建账户。"
 
-#: ../src/config.py:1593
-#: ../src/dialogs.py:1128
-#: ../src/dialogs.py:1297
-#: ../src/disco.py:417
-#: ../src/profile_window.py:307
+#: ../src/config.py:1599 ../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:1594
+#: ../src/config.py:1600
 msgid "Without a connection, you can not edit your personal information."
 msgstr "无法脱机编辑个人信息。"
 
-#: ../src/config.py:1598
+#: ../src/config.py:1604
 msgid "Your server doesn't support Vcard"
 msgstr "您的服务器不支持 Vcard"
 
-#: ../src/config.py:1599
+#: ../src/config.py:1605
 msgid "Your server can't save your personal information."
 msgstr "您的服务器无法保存您的个人信息。"
 
-#: ../src/config.py:1623
-#: ../src/config.py:3416
+#: ../src/config.py:1629 ../src/config.py:3422
 msgid "Failed to get secret keys"
 msgstr "获取密钥失败"
 
-#: ../src/config.py:1624
-#: ../src/config.py:3417
+#: ../src/config.py:1630 ../src/config.py:3423
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "在取回 OpenPGP 密钥时发生错误。"
 
-#: ../src/config.py:1627
-#: ../src/config.py:3420
+#: ../src/config.py:1633 ../src/config.py:3426
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP 密钥选择"
 
-#: ../src/config.py:1628
-#: ../src/config.py:3421
+#: ../src/config.py:1634 ../src/config.py:3427
 msgid "Choose your OpenPGP key"
 msgstr "选择您的 OpenPGP 钥匙"
 
 #. Name column
-#: ../src/config.py:1858
-#: ../src/disco.py:740
-#: ../src/disco.py:1466
-#: ../src/disco.py:1704
-#: ../src/history_window.py:78
+#: ../src/config.py:1864 ../src/disco.py:740 ../src/disco.py:1466
+#: ../src/disco.py:1704 ../src/history_window.py:78
 msgid "Name"
 msgstr "名称"
 
-#: ../src/config.py:1861
+#: ../src/config.py:1867
 msgid "Server"
 msgstr "服务器"
 
-#: ../src/config.py:1925
+#: ../src/config.py:1931
 msgid "Read all pending events before removing this account."
 msgstr "移除帐号前请阅读所有未决事件。"
 
-#: ../src/config.py:1962
+#: ../src/config.py:1968
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "您已在账户 %s 打开聊天"
 
-#: ../src/config.py:1963
+#: ../src/config.py:1969
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "所有的聊天和群聊窗口将会关闭。您想继续吗？"
 
-#: ../src/config.py:2022
+#: ../src/config.py:2028
 msgid "Account Local already exists."
 msgstr "帐户本地已存在。"
 
-#: ../src/config.py:2023
+#: ../src/config.py:2029
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "请在使用本地消息前重命名或移除它。"
 
-#: ../src/config.py:2255
+#: ../src/config.py:2261
 #, python-format
 msgid "Edit %s"
 msgstr "编辑 %s"
 
-#: ../src/config.py:2257
+#: ../src/config.py:2263
 #, python-format
 msgid "Register to %s"
 msgstr "注册到 %s"
 
 #. list at the begining
-#: ../src/config.py:2329
+#: ../src/config.py:2335
 msgid "Ban List"
 msgstr "封禁名单"
 
-#: ../src/config.py:2330
+#: ../src/config.py:2336
 msgid "Member List"
 msgstr "成员列表"
 
-#: ../src/config.py:2331
+#: ../src/config.py:2337
 msgid "Owner List"
 msgstr "房主列表"
 
-#: ../src/config.py:2332
+#: ../src/config.py:2338
 msgid "Administrator List"
 msgstr "管理员列表"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2365
-#: ../src/disco.py:747
-#: ../src/history_manager.py:154
+#: ../src/config.py:2371 ../src/disco.py:747 ../src/history_manager.py:154
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2373
+#: ../src/config.py:2379
 msgid "Reason"
 msgstr "原因"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2384
 msgid "Nick"
 msgstr "昵称"
 
-#: ../src/config.py:2382
+#: ../src/config.py:2388
 msgid "Role"
 msgstr "角色"
 
-#: ../src/config.py:2403
+#: ../src/config.py:2409
 msgid "Banning..."
 msgstr "封禁..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2405
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2660,11 +2815,11 @@ msgstr ""
 "<b>想做封禁谁？</b>\n"
 "\n"
 
-#: ../src/config.py:2407
+#: ../src/config.py:2413
 msgid "Adding Member..."
 msgstr "正在添加成员..."
 
-#: ../src/config.py:2408
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2672,11 +2827,11 @@ msgstr ""
 "<b>想要将谁加为成员？</b>\n"
 "\n"
 
-#: ../src/config.py:2410
+#: ../src/config.py:2416
 msgid "Adding Owner..."
 msgstr "添加房主..."
 
-#: ../src/config.py:2411
+#: ../src/config.py:2417
 msgid ""
 "<b>Whom do you want to make a owner?</b>\n"
 "\n"
@@ -2684,11 +2839,11 @@ msgstr ""
 "<b>想要将谁加为房主？</b>\n"
 "\n"
 
-#: ../src/config.py:2413
+#: ../src/config.py:2419
 msgid "Adding Administrator..."
 msgstr "添加管理员..."
 
-#: ../src/config.py:2414
+#: ../src/config.py:2420
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2696,7 +2851,7 @@ msgstr ""
 "<b>想要指定谁为管理员？</b>\n"
 "\n"
 
-#: ../src/config.py:2415
+#: ../src/config.py:2421
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2712,174 +2867,183 @@ msgstr ""
 "4. domain (该域本身匹配, 例如任何 user@domain,\n"
 "domain/resource, 或者地址包含一个子域."
 
-#: ../src/config.py:2520
+#: ../src/config.py:2526
 #, python-format
 msgid "Removing %s account"
 msgstr "移除账户 %s"
 
-#: ../src/config.py:2537
-#: ../src/roster_window.py:2667
+#: ../src/config.py:2543 ../src/roster_window.py:2667
 msgid "Password Required"
 msgstr "需要密码"
 
-#: ../src/config.py:2538
-#: ../src/roster_window.py:2668
+#: ../src/config.py:2544 ../src/roster_window.py:2668
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "输入帐户 %s 的密码"
 
-#: ../src/config.py:2539
-#: ../src/roster_window.py:2669
+#: ../src/config.py:2545 ../src/roster_window.py:2669
 msgid "Save password"
 msgstr "保存密码"
 
-#: ../src/config.py:2553
+#: ../src/config.py:2559
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "账户 “%s” 已连接到服务器"
 
-#: ../src/config.py:2554
+#: ../src/config.py:2560
 msgid "If you remove it, the connection will be lost."
 msgstr "如果移除，将会丢失连接"
 
-#: ../src/config.py:2638
+#: ../src/config.py:2644
 msgid "Default"
 msgstr "默认"
 
-#: ../src/config.py:2638
+#: ../src/config.py:2644
 msgid "?print_status:All"
 msgstr "?print_status:全部"
 
-#: ../src/config.py:2639
+#: ../src/config.py:2645
 msgid "Enter and leave only"
 msgstr "只是登录和离开"
 
-#: ../src/config.py:2709
+#: ../src/config.py:2715
 msgid "New Group Chat"
 msgstr "新群聊"
 
-#: ../src/config.py:2741
+#: ../src/config.py:2747
 msgid "This bookmark has invalid data"
 msgstr "此书签含无效数据"
 
-#: ../src/config.py:2742
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
+#: ../src/config.py:2748
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "请确认填写服务器与房间字段或移除此书签。"
 
-#: ../src/config.py:3004
+#: ../src/config.py:3010
 msgid "Invalid username"
 msgstr "无效用户名"
 
-#: ../src/config.py:3005
+#: ../src/config.py:3011
 msgid "You must provide a username to configure this account."
 msgstr "必须提供用户名来配置此账户。"
 
-#: ../src/config.py:3015
-#: ../src/dialogs.py:1316
+#: ../src/config.py:3021 ../src/dialogs.py:1316
 msgid "Invalid password"
 msgstr "无效密码"
 
-#: ../src/config.py:3016
+#: ../src/config.py:3022
 msgid "You must enter a password for the new account."
 msgstr "必须为新账户输入密码。"
 
-#: ../src/config.py:3020
-#: ../src/dialogs.py:1321
+#: ../src/config.py:3026 ../src/dialogs.py:1321
 msgid "Passwords do not match"
 msgstr "密码不符"
 
-#: ../src/config.py:3021
-#: ../src/dialogs.py:1322
+#: ../src/config.py:3027 ../src/dialogs.py:1322
 msgid "The passwords typed in both fields must be identical."
 msgstr "两次密码输入不一致。"
 
-#: ../src/config.py:3040
+#: ../src/config.py:3046
 msgid "Duplicate Jabber ID"
 msgstr "复制 Jabber ID"
 
-#: ../src/config.py:3041
+#: ../src/config.py:3047
 msgid "This account is already configured in Gajim."
 msgstr "此帐号已在 Gajim 中配置过。"
 
-#: ../src/config.py:3058
+#: ../src/config.py:3064
 msgid "Account has been added successfully"
 msgstr "成功添加账户"
 
-#: ../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 "您可以通过点击高级按钮进行高级设置，或稍后点击主窗口中编辑菜单下的账户菜单项。"
+#: ../src/config.py:3065 ../src/config.py:3100
+msgid ""
+"You can set advanced account options by pressing Advanced button, or later "
+"by clicking in Accounts menuitem under Edit menu from the main window."
+msgstr ""
+"您可以通过点击高级按钮进行高级设置，或稍后点击主窗口中编辑菜单下的账户菜单"
+"项。"
 
-#: ../src/config.py:3093
+#: ../src/config.py:3099
 msgid "Your new account has been created successfully"
 msgstr "注册新账户成功"
 
-#: ../src/config.py:3111
+#: ../src/config.py:3117
 msgid "An error occured during account creation"
 msgstr "创建帐户过程中发生错误"
 
-#: ../src/config.py:3169
+#: ../src/config.py:3175
 msgid "Account name is in use"
 msgstr "帐户名已经被使用"
 
-#: ../src/config.py:3170
+#: ../src/config.py:3176
 msgid "You already have an account using this name."
 msgstr "有同名账户。"
 
-#: ../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"
+#: ../src/conversation_textview.py:273
+msgid ""
+"Text below this line is what has been said since the last time you paid "
+"attention to this group chat"
 msgstr "以下文字是您上次发言至今的群聊内容"
 
-#: ../src/conversation_textview.py:340
+#: ../src/conversation_textview.py:342
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "“%s”的动作(_A)"
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:354
 msgid "Read _Wikipedia Article"
 msgstr "读取 Wikipedia 文章(_W)"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:359
 msgid "Look it up in _Dictionary"
 msgstr "从字典(_D)中搜索"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:373
+#: ../src/conversation_textview.py:375
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "字典地址缺少 “%s” 并且它不是 WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:386
+#: ../src/conversation_textview.py:388
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "网站搜索地址缺少 “%s”"
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:391
 msgid "Web _Search for it"
 msgstr "用网页搜索(_S)"
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:397
 msgid "Open as _Link"
 msgstr "作为链接打开(_L)："
 
-#: ../src/conversation_textview.py:752
+#: ../src/conversation_textview.py:757
 msgid "Yesterday"
 msgstr "昨天"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:761
 #, python-format
 msgid "%i days ago"
 msgstr "%i 天前"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:788
+#: ../src/conversation_textview.py:793
 #, python-format
 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>"
@@ -2952,25 +3116,16 @@ msgstr "请为账户 %s 填入您想增加的联系人数据"
 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: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
+#: ../src/dialogs.py:467 ../src/disco.py:102 ../src/disco.py:103
+#: ../src/disco.py:1252 ../src/gajim.py:491 ../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:609
-#: ../src/dialogs.py:615
+#: ../src/dialogs.py:609 ../src/dialogs.py:615
 msgid "Invalid User ID"
 msgstr "无效的用户 ID"
 
@@ -3034,7 +3189,9 @@ msgid "Unable to bind to port %s."
 msgstr "无法绑定端口%s。"
 
 #: ../src/dialogs.py:907
-msgid "Maybe you have another running instance of Gajim. File Transfer will be canceled."
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"canceled."
 msgstr "或许您正在运行另一个 Gajim 实例。文件传输将被取消。"
 
 #: ../src/dialogs.py:1058
@@ -3047,8 +3204,7 @@ msgstr "该认证要求来自帐户 %s 由 %s 发送"
 msgid "Subscription request from %s"
 msgstr "来自 %s 的认证请求"
 
-#: ../src/dialogs.py:1121
-#: ../src/roster_window.py:681
+#: ../src/dialogs.py:1121 ../src/roster_window.py:681
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "您已经在群聊房间 %s 。"
@@ -3062,13 +3218,11 @@ msgstr "请在加入群聊前先连接到服务器。"
 msgid "Join Group Chat with account %s"
 msgstr "使用账户 %s 加入群聊"
 
-#: ../src/dialogs.py:1212
-#: ../src/dialogs.py:1218
+#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
 msgid "Invalid group chat Jabber ID"
 msgstr "无效的群聊 Jabber ID"
 
-#: ../src/dialogs.py:1213
-#: ../src/dialogs.py:1219
+#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "群聊 Jabber ID 包含非法字符。"
 
@@ -3097,21 +3251,16 @@ msgid ""
 msgstr "填写您想发送聊天消息到的联系人 ID 或昵称："
 
 #. if offline or connecting
-#: ../src/dialogs.py:1276
-#: ../src/dialogs.py:1635
-#: ../src/dialogs.py:1764
+#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
 msgid "Connection not available"
 msgstr "连接不可用"
 
-#: ../src/dialogs.py:1277
-#: ../src/dialogs.py:1636
-#: ../src/dialogs.py:1765
+#: ../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:1286
-#: ../src/dialogs.py:1289
+#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
 msgid "Invalid JID"
 msgstr "无效的 Jabber ID"
 
@@ -3130,81 +3279,56 @@ msgstr "此处必须输入密码"
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:1364
-#: ../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:1366
-#: ../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:1368
-#: ../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:1368
-#: ../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:1369
-#: ../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:1369
-#: ../src/gajim.py:1159
-#: ../src/notify.py:424
+#: ../src/dialogs.py:1369 ../src/gajim.py:1168 ../src/notify.py:424
 msgid "New E-mail"
 msgstr "新的电子邮件"
 
-#: ../src/dialogs.py:1371
-#: ../src/gajim.py:1300
-#: ../src/notify.py:418
+#: ../src/dialogs.py:1371 ../src/gajim.py:1321 ../src/notify.py:418
 msgid "File Transfer Request"
 msgstr "文件传输请求"
 
-#: ../src/dialogs.py:1373
-#: ../src/gajim.py:1132
-#: ../src/gajim.py:1276
+#: ../src/dialogs.py:1373 ../src/gajim.py:1140 ../src/gajim.py:1297
 #: ../src/notify.py:420
 msgid "File Transfer Error"
 msgstr "文件传输错误"
 
-#: ../src/dialogs.py:1375
-#: ../src/gajim.py:1339
-#: ../src/gajim.py:1361
-#: ../src/gajim.py:1378
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1375 ../src/gajim.py:1360 ../src/gajim.py:1382
+#: ../src/gajim.py:1399 ../src/notify.py:422
 msgid "File Transfer Completed"
 msgstr "文件传输完成"
 
-#: ../src/dialogs.py:1376
-#: ../src/gajim.py:1342
-#: ../src/notify.py:422
+#: ../src/dialogs.py:1376 ../src/gajim.py:1363 ../src/notify.py:422
 msgid "File Transfer Stopped"
 msgstr "文件传输已停止"
 
-#: ../src/dialogs.py:1378
-#: ../src/gajim.py:1030
-#: ../src/notify.py:426
+#: ../src/dialogs.py:1378 ../src/gajim.py:1038 ../src/notify.py:426
 msgid "Groupchat Invitation"
 msgstr "群聊邀请"
 
-#: ../src/dialogs.py:1380
-#: ../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 "联系人状态改变"
 
@@ -3315,8 +3439,7 @@ msgstr "注释： %s"
 msgid "Choose Sound"
 msgstr "选择声音"
 
-#: ../src/dialogs.py:2298
-#: ../src/dialogs.py:2343
+#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
 msgid "All files"
 msgstr "全部文件"
 
@@ -3382,11 +3505,12 @@ msgid "The service could not be found"
 msgstr "找不到该服务"
 
 #: ../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."
+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:646
-#: ../src/disco.py:927
+#: ../src/disco.py:646 ../src/disco.py:927
 msgid "The service is not browsable"
 msgstr "该服务无法浏览"
 
@@ -3407,8 +3531,7 @@ msgstr "浏览(_B)"
 msgid "This service does not contain any items to browse."
 msgstr "此服务不包含任何项目可浏览。"
 
-#: ../src/disco.py:1142
-#: ../src/disco.py:1257
+#: ../src/disco.py:1142 ../src/disco.py:1257
 msgid "Re_gister"
 msgstr "注册(_G)"
 
@@ -3460,22 +3583,19 @@ msgstr "时间"
 msgid "Progress"
 msgstr "进程"
 
-#: ../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 "文件名： %s"
 
-#: ../src/filetransfers_window.py:164
-#: ../src/filetransfers_window.py:298
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
 #, python-format
 msgid "Size: %s"
 msgstr "大小： %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:173
-#: ../src/filetransfers_window.py:183
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183
 #: ../src/history_manager.py:463
 msgid "You"
 msgstr "您"
@@ -3485,8 +3605,7 @@ msgstr "您"
 msgid "Sender: %s"
 msgstr "发送者： %s"
 
-#: ../src/filetransfers_window.py:175
-#: ../src/filetransfers_window.py:564
+#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:564
 #: ../src/tooltips.py:573
 msgid "Recipient: "
 msgstr "接收者： %s"
@@ -3500,13 +3619,11 @@ msgstr "保存在： %s"
 msgid "File transfer completed"
 msgstr "文件传输已完成"
 
-#: ../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 "文件传输已取消"
 
-#: ../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 "无法与对方建立连接。"
 
@@ -3556,35 +3673,31 @@ msgstr "描述： %s"
 msgid "%s wants to send you a file:"
 msgstr "%s 想发送给您一个文件："
 
-#: ../src/filetransfers_window.py:318
-#: ../src/gtkgui_helpers.py:682
+#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "无法覆盖现有文件\"%s\""
 
-#: ../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."
+#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+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:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "This file already exists"
 msgstr "文件已经存在"
 
-#: ../src/filetransfers_window.py:326
-#: ../src/gtkgui_helpers.py:688
+#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
 msgid "What do you want to do?"
 msgstr "想做什么？"
 
-#: ../src/filetransfers_window.py:338
-#: ../src/gtkgui_helpers.py:698
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "目录 \"%s\" 不可写"
 
-#: ../src/filetransfers_window.py:338
-#: ../src/gtkgui_helpers.py:699
+#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
 msgid "You do not have permission to create files in this directory."
 msgstr "您没有权限在这个目录里创建文件。"
 
@@ -3608,8 +3721,7 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:536
-#: ../src/filetransfers_window.py:539
+#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
 msgid "Invalid File"
 msgstr "无效文件"
 
@@ -3621,13 +3733,11 @@ msgstr "文件："
 msgid "It is not possible to send empty files"
 msgstr "无法发送空文件"
 
-#: ../src/filetransfers_window.py:560
-#: ../src/tooltips.py:563
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:563
 msgid "Name: "
 msgstr "名称："
 
-#: ../src/filetransfers_window.py:562
-#: ../src/tooltips.py:567
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:567
 msgid "Sender: "
 msgstr "发送者："
 
@@ -3661,32 +3771,37 @@ msgstr "GTK+ 运行时环境缺少 libglade 支持"
 
 #: ../src/gajim.py:62
 #, python-format
-msgid "Please remove your current GTK+ runtime and install the latest stable version from %s"
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
 msgstr "请移除当前的 GTK+ 运行时环境并从 %s 安装最新稳定版本"
 
 #: ../src/gajim.py:64
-msgid "Please make sure that GTK+ and PyGTK have libglade support in your system."
+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
+#: ../src/gajim.py:77
 msgid "Gajim needs pywin32 to run"
 msgstr "运行 Gajim 需要 pywin32"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:78
 #, python-format
-msgid "Please make sure that Pywin32 is installed on your system. You can get it at %s"
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
 msgstr "请确认 Pywin32 已经安装在您的系统中。您可以从 %s取得它"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:189
+#: ../src/gajim.py:190
 msgid "Gajim is already running"
 msgstr "Gajim 已经在运行"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:191
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -3694,78 +3809,76 @@ msgstr ""
 "Gajim 另一个实例似乎正在运行 \n"
 "运行？"
 
-#: ../src/gajim.py:297
+#: ../src/gajim.py:298
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) 授权给 %s (id: %s)"
 
-#: ../src/gajim.py:298
+#: ../src/gajim.py:299
 msgid "Do you accept this request?"
 msgstr "是否接受这个请求？"
 
-#: ../src/gajim.py:344
-#: ../src/notify.py:430
+#: ../src/gajim.py:345 ../src/notify.py:430
 msgid "Connection Failed"
 msgstr "连接失败"
 
-#: ../src/gajim.py:656
+#: ../src/gajim.py:658
 #, python-format
 msgid "Subject: %s"
 msgstr "主题：%s"
 
-#: ../src/gajim.py:701
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:703 ../src/gajim.py:716
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "发送 %s ( %s ) 时出现错误"
 
-#: ../src/gajim.py:741
+#: ../src/gajim.py:749
 msgid "Authorization accepted"
 msgstr "授权被接受"
 
-#: ../src/gajim.py:742
+#: ../src/gajim.py:750
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "联系人“%s”已授权您查看他/她的状态。"
 
-#: ../src/gajim.py:750
+#: ../src/gajim.py:758
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "联系人“%s”移除了来自您的认证"
 
-#: ../src/gajim.py:751
+#: ../src/gajim.py:759
 msgid "You will always see him or her as offline."
 msgstr "您将一直看到他/她的状态为离线。"
 
-#: ../src/gajim.py:794
+#: ../src/gajim.py:802
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "无法与对方“ %s ”建立连接。"
 
-#: ../src/gajim.py:795
-#: ../src/common/connection.py:395
+#: ../src/gajim.py:803 ../src/common/connection.py:395
 msgid "Check your connection or try again later."
 msgstr "检查连接并稍后重试。"
 
-#: ../src/gajim.py:943
-#: ../src/roster_window.py:1201
+#: ../src/gajim.py:951 ../src/roster_window.py:1201
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s 正在 %s (%s)."
 
-#: ../src/gajim.py:1040
+#: ../src/gajim.py:1048
 msgid "Your passphrase is incorrect"
 msgstr "您的密文不正确"
 
-#: ../src/gajim.py:1041
+#: ../src/gajim.py:1049
 msgid "You are currently connected without your OpenPGP key."
 msgstr "已建立没有 OpenPGP 密钥的连接"
 
-#: ../src/gajim.py:1143
+#: ../src/gajim.py:1151
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr " %(gmail_mail_address)s 上的新邮件"
 
-#: ../src/gajim.py:1145
+#: ../src/gajim.py:1153
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3774,7 +3887,7 @@ 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:1154
+#: ../src/gajim.py:1162
 #, python-format
 msgid ""
 "\n"
@@ -3783,52 +3896,52 @@ msgstr ""
 "\n"
 "从：%(from_address)s"
 
-#: ../src/gajim.py:1297
+#: ../src/gajim.py:1318
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s 想发送给您一个文件。"
 
-#: ../src/gajim.py:1362
+#: ../src/gajim.py:1383
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "您成功的从 %(name)s 收到文件  %(filename)s。"
 
 #. ft stopped
-#: ../src/gajim.py:1366
+#: ../src/gajim.py:1387
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
 
-#: ../src/gajim.py:1379
+#: ../src/gajim.py:1400
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "您成功的给 %(name)s 发送了文件 %(filename)s。"
 
 #. ft stopped
-#: ../src/gajim.py:1383
+#: ../src/gajim.py:1404
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
 
-#: ../src/gajim.py:1489
+#: ../src/gajim.py:1510
 msgid "Username Conflict"
 msgstr "用户名冲突"
 
-#: ../src/gajim.py:1490
+#: ../src/gajim.py:1511
 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:1828
+#: ../src/gajim.py:1850
 msgid "Could not save your settings and preferences"
 msgstr "无法保存您的设置。"
 
-#: ../src/gajim.py:2020
+#: ../src/gajim.py:2042
 msgid "Network Manager support not available"
 msgstr "网络管理支持不可用"
 
-#: ../src/gajim.py:2095
+#: ../src/gajim.py:2117
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "会话管理器支持不可用(丢失 gnome.ui 模块)"
 
@@ -3854,19 +3967,16 @@ msgid "Popups a window with the next pending event"
 msgstr "为下一条未读消息弹出窗口"
 
 #: ../src/gajim-remote.py:82
-msgid "Prints a list of all contacts in the roster. Each contact appear on a separate line"
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appear on a "
+"separate line"
 msgstr "打印名单中所有联系人。每个联系人一行。"
 
-#: ../src/gajim-remote.py: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: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 "账户"
@@ -3892,8 +4002,7 @@ msgstr "状态"
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "下列中的一项： 离线，在线，聊天，离开，不可用, dnd, 隐身"
 
-#: ../src/gajim-remote.py:97
-#: ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
 #: ../src/gajim-remote.py:132
 msgid "message"
 msgstr "消息"
@@ -3903,7 +4012,9 @@ msgid "status message"
 msgstr "状态消息"
 
 #: ../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"
+msgid ""
+"change status of account \"account\". If not specified, try to change status "
+"of all accounts that have \"sync with global status\" option set"
 msgstr "改变账户的状态。如果不指明，将改变设置“与全局同步”选项的账户"
 
 #: ../src/gajim-remote.py:104
@@ -3914,43 +4025,47 @@ msgstr "显示对话框用于给联系人发送消息"
 msgid "JID of the contact that you want to chat with"
 msgstr "您想聊天的 JID"
 
-#: ../src/gajim-remote.py:108
-#: ../src/gajim-remote.py:186
+#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "如指定，将从此帐户列表下移出联系人"
 
 #: ../src/gajim-remote.py: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 "发送新聊天消息至名单中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择“帐户”而不需要“ OpenPGP 密钥”，只需将“ OpenPGP 密钥”置为空。"
+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 ""
+"发送新聊天消息至名单中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择“帐户”而"
+"不需要“ OpenPGP 密钥”，只需将“ OpenPGP 密钥”置为空。"
 
-#: ../src/gajim-remote.py:117
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
 msgid "JID of the contact that will receive the message"
 msgstr "联系人的JID将收到消息"
 
-#: ../src/gajim-remote.py:118
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
 msgid "message contents"
 msgstr "消息内容"
 
-#: ../src/gajim-remote.py:119
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "pgp key"
 msgstr "PGP 钥匙"
 
-#: ../src/gajim-remote.py:119
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "如指定，该消息将使用本公共密钥加密"
 
-#: ../src/gajim-remote.py:121
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
 msgid "if specified, the message will be sent using this account"
 msgstr "如指定，消息将被用此账户发送"
 
 #: ../src/gajim-remote.py: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 "发送新单条消息至名单中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择“帐户”而不需要“ OpenPGP 密钥”，只需将“ OpenPGP 密钥”置为空。"
+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 ""
+"发送新单条消息至名单中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择“帐户”而"
+"不需要“ OpenPGP 密钥”，只需将“ OpenPGP 密钥”置为空。"
 
 #: ../src/gajim-remote.py:131
 msgid "subject"
@@ -3964,10 +4079,8 @@ msgstr "消息主题"
 msgid "Gets detailed info on a contact"
 msgstr "获得联系人的详细信息"
 
-#: ../src/gajim-remote.py:142
-#: ../src/gajim-remote.py:155
-#: ../src/gajim-remote.py:185
-#: ../src/gajim-remote.py:194
+#: ../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 "
 
@@ -4048,7 +4161,8 @@ msgid "Returns current status (the global one unless account is specified)"
 msgstr "返回当前状态(如不指定账户将返回全局设置)"
 
 #: ../src/gajim-remote.py:207
-msgid "Returns current status message(the global one unless account is specified)"
+msgid ""
+"Returns current status message(the global one unless account is specified)"
 msgstr "返回当前状态信息(如不指定账户将返回全局设置)"
 
 #: ../src/gajim-remote.py:214
@@ -4072,7 +4186,9 @@ msgid "XML to send"
 msgstr "发送 XML"
 
 #: ../src/gajim-remote.py:227
-msgid "Account in which the xml will be sent; if not specified, xml will be sent to all accounts"
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
 msgstr "XML 将被发送的账户；如果不指定，XML 将被发送至所有账户"
 
 #: ../src/gajim-remote.py:249
@@ -4145,254 +4261,274 @@ msgstr "无法删除当前主题"
 msgid "Please first choose another for your current theme."
 msgstr "请先选择其他主题作为当前主题"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chat"
 msgstr "私聊"
 
-#: ../src/groupchat_control.py:103
+#: ../src/groupchat_control.py:105
 msgid "Private Chats"
 msgstr "私聊"
 
-#: ../src/groupchat_control.py:120
+#: ../src/groupchat_control.py:122
 msgid "Sending private message failed"
 msgstr "发送私有消息失败"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:124
 #, python-format
 msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "您不再在群聊“%s”中或“%s”已离开。"
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chat"
 msgstr "群聊"
 
-#: ../src/groupchat_control.py:141
+#: ../src/groupchat_control.py:143
 msgid "Group Chats"
 msgstr "群聊"
 
-#: ../src/groupchat_control.py:315
+#: ../src/groupchat_control.py:317
 msgid "Insert Nickname"
 msgstr "插入昵称"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:789
+#: ../src/groupchat_control.py:812
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s 被踢出：%(reason)s"
 
-#: ../src/groupchat_control.py:793
+#: ../src/groupchat_control.py:816
 #, 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:800
+#: ../src/groupchat_control.py:823
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s 被封禁：%(reason)s"
 
-#: ../src/groupchat_control.py:804
+#: ../src/groupchat_control.py:827
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 封禁：%(reason)s"
 
-#: ../src/groupchat_control.py:812
+#: ../src/groupchat_control.py:835
 #, python-format
 msgid "You are now known as %s"
 msgstr "您现在成了 %s "
 
-#: ../src/groupchat_control.py:814
+#: ../src/groupchat_control.py:837
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s 现在成了 %s"
 
-#: ../src/groupchat_control.py:894
+#: ../src/groupchat_control.py:917
 #, python-format
 msgid "%s has left"
 msgstr " %s 离开了"
 
-#: ../src/groupchat_control.py:899
+#: ../src/groupchat_control.py:922
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s 加入群聊"
 
 #. No status message
-#: ../src/groupchat_control.py:901
-#: ../src/roster_window.py:1204
+#: ../src/groupchat_control.py:924 ../src/roster_window.py:1204
 #, python-format
 msgid "%s is now %s"
 msgstr "%s 正在 %s"
 
-#: ../src/groupchat_control.py:1020
-#: ../src/groupchat_control.py:1038
-#: ../src/groupchat_control.py:1131
-#: ../src/groupchat_control.py:1148
+#: ../src/groupchat_control.py:1043 ../src/groupchat_control.py:1061
+#: ../src/groupchat_control.py:1154 ../src/groupchat_control.py:1171
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "昵称未找到： %s "
 
-#: ../src/groupchat_control.py:1054
+#: ../src/groupchat_control.py:1077
 msgid "This group chat has no subject"
 msgstr "这个群聊没有主题"
 
-#: ../src/groupchat_control.py:1067
+#: ../src/groupchat_control.py:1090
 #, 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:1074
-#: ../src/groupchat_control.py:1102
+#: ../src/groupchat_control.py:1097 ../src/groupchat_control.py:1125
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr " %s 可能不是有效的 JID "
 
-#: ../src/groupchat_control.py:1185
+#: ../src/groupchat_control.py:1208
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr "没有此命令：/%s ( 如果想送出，请用请用前缀 /say )"
 
-#: ../src/groupchat_control.py:1208
+#: ../src/groupchat_control.py:1231
 #, python-format
 msgid "Commands: %s"
 msgstr "命令： %s "
 
-#: ../src/groupchat_control.py:1210
+#: ../src/groupchat_control.py:1233
 #, 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 "用法：/%s <昵称|JID> [原因]，从此群聊封禁 JID。昵称可能被代替，除了包含“@”。如果 JID 在群聊里，他/她/它将被踢出。注意：不支持包含空格的昵称。"
+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 ""
+"用法：/%s <昵称|JID> [原因]，从此群聊封禁 JID。昵称可能被代替，除了包含“@”。"
+"如果 JID 在群聊里，他/她/它将被踢出。注意：不支持包含空格的昵称。"
 
-#: ../src/groupchat_control.py:1217
+#: ../src/groupchat_control.py:1240
 #, python-format
-msgid "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
+msgid ""
+"Usage: /%s <nickname>, opens a private chat window to the specified occupant."
 msgstr "用法：/%s <昵称>, 为指定房主打开一个私聊窗口"
 
-#: ../src/groupchat_control.py:1221
+#: ../src/groupchat_control.py:1244
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "用法：/%s，清除文本窗口。"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1246
 #, python-format
-msgid "Usage: /%s [reason], closes the current window or tab, displaying reason if specified."
+msgid ""
+"Usage: /%s [reason], closes the current window or tab, displaying reason if "
+"specified."
 msgstr "用法：/%s [原因]，关闭当前窗口或标签，如果指定将显示原因。"
 
-#: ../src/groupchat_control.py:1226
+#: ../src/groupchat_control.py:1249
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "用法：/%s，隐藏聊天按钮。"
 
-#: ../src/groupchat_control.py:1229
+#: ../src/groupchat_control.py:1252
 #, python-format
-msgid "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally providing a reason."
+msgid ""
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
+"providing a reason."
 msgstr "用法：/%s <JID> [原因]，邀请 JID 到当前群聊，可以提供一个原因。"
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1256
 #, python-format
-msgid "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally using specified nickname."
+msgid ""
+"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
+"using specified nickname."
 msgstr "用法: /%s <房间>@<服务器>[/昵称], 申请以指定昵称加入“房间@服务器”。"
 
-#: ../src/groupchat_control.py:1237
+#: ../src/groupchat_control.py:1260
 #, 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 "用法：/%s <昵称> [原因]，通过昵称移除群聊房主，原因可选。注意：不支持含空格的昵称。"
+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 ""
+"用法：/%s <昵称> [原因]，通过昵称移除群聊房主，原因可选。注意：不支持含空格的"
+"昵称。"
 
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1265
 #, python-format
-msgid "Usage: /%s <action>, sends action to the current group chat. Use third person. (e.g. /%s explodes.)"
-msgstr "用法：/%s <动作>，发送动作到当前群聊。使用第三人称。(例如：/%s exploeds)"
+msgid ""
+"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:1246
+#: ../src/groupchat_control.py:1269
 #, python-format
-msgid "Usage: /%s <nickname> [message], opens a private message windowand sends message to the occupant specified by nickname."
-msgstr "用法： /%s <昵称> [消息], 打开一个私聊窗口并且向指定昵称的联系人发送消息 "
+msgid ""
+"Usage: /%s <nickname> [message], opens a private message windowand sends "
+"message to the occupant specified by nickname."
+msgstr ""
+"用法： /%s <昵称> [消息], 打开一个私聊窗口并且向指定昵称的联系人发送消息 "
 
-#: ../src/groupchat_control.py:1251
+#: ../src/groupchat_control.py:1274
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "用法：/%s <昵称>，在当前群聊中改变昵称。"
 
-#: ../src/groupchat_control.py:1255
+#: ../src/groupchat_control.py:1278
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "用法：/%s [主题]，显示或更新群聊的拥有者。"
 
-#: ../src/groupchat_control.py:1259
+#: ../src/groupchat_control.py:1282
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "用法：/%s [主题]，显示或更新当前群聊的主题。"
 
-#: ../src/groupchat_control.py:1262
+#: ../src/groupchat_control.py:1285
 #, python-format
-msgid "Usage: /%s <message>, sends a message without looking for other commands."
+msgid ""
+"Usage: /%s <message>, sends a message without looking for other commands."
 msgstr "用法：/%s <消息>，不使用其他命令发送消息。"
 
-#: ../src/groupchat_control.py:1265
+#: ../src/groupchat_control.py:1288
 #, python-format
 msgid "No help info for /%s"
 msgstr "没有 /%s 的帮助信息"
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1337
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "确定要离开群聊“ %s ”？"
 
-#: ../src/groupchat_control.py:1316
-msgid "If you close this window, you will be disconnected from this group chat."
+#: ../src/groupchat_control.py:1339
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr "如果关闭此窗口，您将断开此群聊的连接。"
 
-#: ../src/groupchat_control.py:1320
-#: ../src/roster_window.py:3961
+#: ../src/groupchat_control.py:1343 ../src/roster_window.py:3961
 msgid "Do _not ask me again"
 msgstr "不再提问此问题(_N)"
 
-#: ../src/groupchat_control.py:1354
+#: ../src/groupchat_control.py:1377
 msgid "Changing Subject"
 msgstr "正在更换话题"
 
-#: ../src/groupchat_control.py:1355
+#: ../src/groupchat_control.py:1378
 msgid "Please specify the new subject:"
 msgstr "请指定新话题："
 
-#: ../src/groupchat_control.py:1364
+#: ../src/groupchat_control.py:1387
 msgid "Changing Nickname"
 msgstr "正在更换昵称"
 
-#: ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1388
 msgid "Please specify the new nickname you want to use:"
 msgstr "请指定您想使用的新昵称："
 
-#: ../src/groupchat_control.py:1390
+#: ../src/groupchat_control.py:1413
 msgid "Bookmark already set"
 msgstr "书签已设定"
 
-#: ../src/groupchat_control.py:1391
+#: ../src/groupchat_control.py:1414
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "群聊“%s”已在您的书签中。"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1423
 msgid "Bookmark has been added successfully"
 msgstr "书签添加成功"
 
-#: ../src/groupchat_control.py:1401
+#: ../src/groupchat_control.py:1424
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "您可以通过“动作”菜单管理您的名单。"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1550
 #, python-format
 msgid "Kicking %s"
 msgstr "踢出 %s"
 
-#: ../src/groupchat_control.py:1528
-#: ../src/groupchat_control.py:1810
+#: ../src/groupchat_control.py:1551 ../src/groupchat_control.py:1833
 msgid "You may specify a reason below:"
 msgstr "您可以指定一个原因："
 
 #. ask for reason
-#: ../src/groupchat_control.py:1809
+#: ../src/groupchat_control.py:1832
 #, python-format
 msgid "Banning %s"
 msgstr "封禁 %s"
@@ -4402,7 +4538,9 @@ msgid "A programming error has been detected"
 msgstr "发现一个程序错误"
 
 #: ../src/gtkexcepthook.py:42
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
 msgstr "它可能不是致命的，但仍应该提交给开发者。"
 
 #: ../src/gtkexcepthook.py:48
@@ -4414,8 +4552,7 @@ msgid "Details"
 msgstr "细节"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:153
-#: ../src/gtkgui_helpers.py:168
+#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "错误：无法按读打开文件 %s"
@@ -4435,16 +4572,16 @@ msgstr "分析文件错误："
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "不能写入到 %s 。会话管理支持功能未启用"
 
-#: ../src/gtkgui_helpers.py:727
+#: ../src/gtkgui_helpers.py:728
 msgid "Extension not supported"
 msgstr "不支持扩展"
 
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:729
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr "图片不能被保存为 %(type)s 格式。保存为 %(new_filename)s？"
 
-#: ../src/gtkgui_helpers.py:737
+#: ../src/gtkgui_helpers.py:738
 msgid "Save Image as..."
 msgstr "图片另存为..."
 
@@ -4458,42 +4595,38 @@ msgid "Contacts"
 msgstr "联系人"
 
 #. holds time
-#: ../src/history_manager.py:120
-#: ../src/history_manager.py:160
+#: ../src/history_manager.py:120 ../src/history_manager.py:160
 #: ../src/history_window.py:86
 msgid "Date"
 msgstr "日期"
 
 #. holds nickname
-#: ../src/history_manager.py:126
-#: ../src/history_manager.py:178
+#: ../src/history_manager.py:126 ../src/history_manager.py:178
 msgid "Nickname"
 msgstr "昵称"
 
 #. holds message
-#: ../src/history_manager.py:134
-#: ../src/history_manager.py:166
+#: ../src/history_manager.py:134 ../src/history_manager.py:166
 #: ../src/history_window.py:94
 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 RUNNING)"
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
 msgstr "您确定要清除数据库？（强烈建议 GAJIM 运行时不要进行此操作）"
 
 #: ../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 ""
-"通常已占用的数据库空间不会被释放，以便于恢复操作。如果您的确需要压缩数据库的体积，点击 “是”，否则点击“否”。\n"
+"通常已占用的数据库空间不会被释放，以便于恢复操作。如果您的确需要压缩数据库的"
+"体积，点击 “是”，否则点击“否”。\n"
 "\n"
 "如果您点击“是”，请等待..."
 
@@ -4511,8 +4644,7 @@ 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:518
-#: ../src/history_manager.py:554
+#: ../src/history_manager.py:518 ../src/history_manager.py:554
 msgid "This is an irreversible operation."
 msgstr "该操作是不可撤消的。"
 
@@ -4521,8 +4653,7 @@ msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "您确定要删除所选定的消息？"
 
-#: ../src/history_window.py:103
-#: ../src/history_window.py:105
+#: ../src/history_window.py:103 ../src/history_window.py:105
 #, python-format
 msgid "Conversation History with %s"
 msgstr "与 %s 的聊天历史"
@@ -4532,8 +4663,7 @@ msgstr "与 %s 的聊天历史"
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s 的状态是 %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:265
-#: ../src/notify.py:198
+#: ../src/history_window.py:265 ../src/notify.py:198
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s 的状态是 %(status)s"
@@ -4592,15 +4722,12 @@ msgstr "%(nickname)s： %(message)s"
 msgid "New Message from %(nickname)s"
 msgstr "来自 %(nickname)s 的新消息"
 
-#: ../src/profile_window.py:72
-#: ../src/profile_window.py:376
+#: ../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
+#: ../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 "单击以设置您的明细"
 
@@ -4634,34 +4761,31 @@ msgid "vCard publication failed"
 msgstr "vCard 发布失败"
 
 #: ../src/profile_window.py:348
-msgid "There was an error while publishing your personal information, try again later."
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
 msgstr "发布您的个人信息时发生错误，请稍后重试。"
 
 #: ../src/profile_window.py:374
 msgid "Without a connection, you can not get your contact information."
 msgstr "无法脱机获取个人信息。"
 
-#: ../src/roster_window.py:168
-#: ../src/roster_window.py:223
+#: ../src/roster_window.py:168 ../src/roster_window.py:223
 msgid "Merged accounts"
 msgstr "已合并的帐户"
 
-#: ../src/roster_window.py:340
-#: ../src/common/helpers.py:42
+#: ../src/roster_window.py:340 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr "旁观者"
 
-#: ../src/roster_window.py:686
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:686 ../src/roster_window.py:3132
 msgid "You cannot join a group chat while you are invisible"
 msgstr "隐身时无法加入群聊"
 
 #. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:878
-#: ../src/systray.py:187
-#: ../src/systray.py:192
+#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
 #, python-format
 msgid "using account %s"
 msgstr "使用账户 %s"
@@ -4704,8 +4828,7 @@ msgstr "历史管理器"
 msgid "_Join New Group Chat"
 msgstr "加入新群聊(_J)"
 
-#: ../src/roster_window.py:1384
-#: ../src/roster_window.py:3325
+#: ../src/roster_window.py:1384 ../src/roster_window.py:3325
 #: ../src/roster_window.py:3332
 msgid "You have unread messages"
 msgstr "您有未读消息"
@@ -4720,7 +4843,9 @@ msgid "Transport \"%s\" will be removed"
 msgstr "代理“%s”将被移除"
 
 #: ../src/roster_window.py:1389
-msgid "You will no longer be able to send and receive messages to contacts from this transport."
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"this transport."
 msgstr "您将无法从此代理收发消息。"
 
 #: ../src/roster_window.py:1392
@@ -4729,7 +4854,9 @@ msgstr "代理将被移除"
 
 #: ../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"
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
 msgstr "您将无法从这些代理的联系人收发消息：%s"
 
 #. it's jid
@@ -4772,8 +4899,7 @@ msgstr "指定您的 OpenPGP 钥匙"
 msgid "Select a key to apply to the contact"
 msgstr "选择一个键应用于联系人。"
 
-#: ../src/roster_window.py:1788
-#: ../src/roster_window.py:1963
+#: ../src/roster_window.py:1788 ../src/roster_window.py:1963
 msgid "_New group chat"
 msgstr "新群聊(_N)"
 
@@ -4781,8 +4907,7 @@ msgstr "新群聊(_N)"
 msgid "I would like to add you to my roster"
 msgstr "我想加您为好友"
 
-#: ../src/roster_window.py:2008
-#: ../src/roster_window.py:2055
+#: ../src/roster_window.py:2008 ../src/roster_window.py:2055
 msgid "Send Group M_essage"
 msgstr "发送群组消息(_E)"
 
@@ -4806,8 +4931,7 @@ msgstr "登入(_L)"
 msgid "Log _off"
 msgstr "退出登录(_O)"
 
-#: ../src/roster_window.py:2232
-#: ../src/roster_window.py:2303
+#: ../src/roster_window.py:2232 ../src/roster_window.py:2303
 msgid "_Change Status Message"
 msgstr "更改状态消息(_C)"
 
@@ -4844,11 +4968,15 @@ msgid "Contact \"%s\" will be removed from your roster"
 msgstr "联系人“%s”将从您的名单中移除"
 
 #: ../src/roster_window.py:2621
-msgid "By removing this contact you also remove authorization resulting in him or her always seeing you as offline."
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
 msgstr "移除此联系人的同时将移除认证，导致他/她将一直看到您为离线。"
 
 #: ../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."
+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:2629
@@ -4890,14 +5018,14 @@ msgstr "错误字段"
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "请重新输入您的 GPG 字段或点“取消”"
 
-#: ../src/roster_window.py:2781
-#: ../src/roster_window.py:2841
+#: ../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: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?"
+#: ../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:2799
@@ -4913,9 +5041,10 @@ msgstr "您必须在与他人聊天前新建账户。"
 msgid "♪ \"%(title)s\" by %(artist)s ♪"
 msgstr "♪ \"%(title)s\" %(artist)s ♪"
 
-#: ../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."
+#: ../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:3911
@@ -4923,16 +5052,25 @@ 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 "您的服务器不支持存储元联系人信息。所以这些信息在下次重新连接时将不被保存。"
+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
-msgid "You are about to create a metacontact. Are you sure you want to continue?"
+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 "元联系人是一种分组若干联系人的方法。一般而言这用在当一个人有若干 Jabber 账户或代理账户时。"
+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 ""
+"元联系人是一种分组若干联系人的方法。一般而言这用在当一个人有若干 Jabber 账户"
+"或代理账户时。"
 
 #: ../src/roster_window.py:4124
 #, python-format
@@ -4956,13 +5094,11 @@ msgstr "更改状态消息_(C)..."
 msgid "Hide this menu"
 msgstr "隐藏本菜单"
 
-#: ../src/tooltips.py:309
-#: ../src/tooltips.py:492
+#: ../src/tooltips.py:309 ../src/tooltips.py:492
 msgid "Jabber ID: "
 msgstr "Jabber ID："
 
-#: ../src/tooltips.py:312
-#: ../src/tooltips.py:496
+#: ../src/tooltips.py:312 ../src/tooltips.py:496
 msgid "Resource: "
 msgstr "资源："
 
@@ -4971,8 +5107,7 @@ msgstr "资源："
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "此群聊的 %(owner_or_admin_or_member)s"
 
-#: ../src/tooltips.py:430
-#: ../src/tooltips.py:610
+#: ../src/tooltips.py:430 ../src/tooltips.py:610
 msgid "Status: "
 msgstr "状态"
 
@@ -5011,8 +5146,7 @@ msgstr "类型"
 msgid "Transferred: "
 msgstr "已传输："
 
-#: ../src/tooltips.py:588
-#: ../src/tooltips.py:609
+#: ../src/tooltips.py:588 ../src/tooltips.py:609
 msgid "Not started"
 msgstr "未开始"
 
@@ -5020,8 +5154,7 @@ msgstr "未开始"
 msgid "Stopped"
 msgstr "已停止"
 
-#: ../src/tooltips.py:594
-#: ../src/tooltips.py:597
+#: ../src/tooltips.py:594 ../src/tooltips.py:597
 msgid "Completed"
 msgstr "已完成"
 
@@ -5058,8 +5191,7 @@ msgstr "?Client: 未知"
 msgid "?OS:Unknown"
 msgstr "?OS: 未知"
 
-#: ../src/vcard.py:247
-#: ../src/vcard.py:449
+#: ../src/vcard.py:247 ../src/vcard.py:449
 #, python-format
 msgid "since %s"
 msgstr "自 %s"
@@ -5069,11 +5201,15 @@ msgid "Affiliation:"
 msgstr "关系："
 
 #: ../src/vcard.py:285
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
+msgid ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
 msgstr "此联系人对您的状态信息感兴趣，但您不关心他/她的状态"
 
 #: ../src/vcard.py:287
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
 msgstr "您对此联系人的状态信息感兴趣，但他/她不关心您的状态"
 
 #: ../src/vcard.py:289
@@ -5082,16 +5218,16 @@ msgstr "您与此联系人同时对对方的状态信息感兴趣"
 
 #. None
 #: ../src/vcard.py:291
-msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
+msgid ""
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
 msgstr "您与他/她互不关心对方的状态信息"
 
 #: ../src/vcard.py:299
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "等待联系人回应您的认证请求"
 
-#: ../src/vcard.py:311
-#: ../src/vcard.py:338
-#: ../src/vcard.py:482
+#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
 msgid " resource with priority "
 msgstr "带有优先级的资源"
 
@@ -5099,17 +5235,14 @@ msgstr "带有优先级的资源"
 msgid "creating logs database"
 msgstr "建立日志数据库"
 
-#: ../src/common/check_paths.py:89
-#: ../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:90
-#: ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:108
-#: ../src/common/check_paths.py:116
+#: ../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 即将退出"
 
@@ -5144,7 +5277,8 @@ msgid "Not available as a result of being idle"
 msgstr "发呆导致的不可用"
 
 #: ../src/common/config.py:82
-msgid "List (space separated) of rows (accounts and groups) that are collapsed."
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "折叠的列(账户和组)的列表(空格分隔)。"
 
 #: ../src/common/config.py:87
@@ -5166,27 +5300,41 @@ msgstr ""
 "'从不' - 从不打印时间。"
 
 #: ../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 "使用模糊时钟打印时间。模糊度的值从 1 到 4，或者 0 禁用模糊时钟。1 是最精确的时钟，4 是最不精确的。只在打印时间为 '有时' 时生效。"
+msgid ""
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. "
+"This is used only if print_time is 'sometimes'."
+msgstr ""
+"使用模糊时钟打印时间。模糊度的值从 1 到 4，或者 0 禁用模糊时钟。1 是最精确的"
+"时钟，4 是最不精确的。只在打印时间为 '有时' 时生效。"
 
 #: ../src/common/config.py:95
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "如可能对 * / _ 格式化字串。"
 
 #: ../src/common/config.py:96
-msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr "如果为真，不要移除 */_。所以 *abc* 将被加粗但 * * 不会被移除"
 
 #: ../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 "为 HTML 使用重构文本标记，如果选择加入 ASCII 格式。(如果您想使用此功能，请安装 docutils)"
+msgid ""
+"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
+"(If you want to use this, install docutils)"
+msgstr ""
+"为 HTML 使用重构文本标记，如果选择加入 ASCII 格式。(如果您想使用此功能，请安"
+"装 docutils)"
 
 #: ../src/common/config.py:108
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
 msgstr "当在群聊中使用昵称补全时加到昵称后的字母"
 
 #: ../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."
+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:142
@@ -5194,7 +5342,9 @@ msgid "Add * and [n] in roster title?"
 msgstr "加入 * 和 [n] 在名单标题？"
 
 #: ../src/common/config.py:143
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
 msgstr "聊天标签/窗口被重新打开时显示的历史谈话行数"
 
 #: ../src/common/config.py:144
@@ -5202,7 +5352,9 @@ msgid "How many minutes should last lines from previous conversation last."
 msgstr "距上次谈话结束的分钟数"
 
 #: ../src/common/config.py:145
-msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
 msgstr "用 Ctrl+回车 发行消息，回车开始新行(紫茉莉 ICQ 客户端默认操作)。"
 
 #: ../src/common/config.py:147
@@ -5211,27 +5363,41 @@ msgstr "Ctrl+上箭头 存储行数。"
 
 #: ../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 "自定义地址 %s 在 %s 是单词/短语时，或 'WIKTIONARY' 意味着使用 wiktionary。"
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"自定义地址 %s 在 %s 是单词/短语时，或 'WIKTIONARY' 意味着使用 wiktionary。"
 
 #: ../src/common/config.py: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 "如果为真，监听 NetworkManager 和状态改变(被没有监听网络管理器设置为假和它们使用全局状态同步提供)的基于网络连接的 D-Bus 信号。"
+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 ""
+"如果为真，监听 NetworkManager 和状态改变(被没有监听网络管理器设置为假和它们使"
+"用全局状态同步提供)的基于网络连接的 D-Bus 信号。"
 
 #: ../src/common/config.py:155
-msgid "Sent chat state notifications. Can be one of all, composing_only, disabled."
+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."
+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."
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
 msgstr "当不是每条消息打印时间(打印时间为有时)时，每几分钟打印它。"
 
 #: ../src/common/config.py:159
@@ -5239,15 +5405,21 @@ msgid "Ask before closing a group chat tab/window."
 msgstr "关闭群聊标签/窗口前询问。"
 
 #: ../src/common/config.py:160
-msgid "Always ask before closing group chat tab/window in this space separated list of group chat jids."
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
 msgstr "关闭这个空格分隔的列表中的群聊 JID 标签/窗口前总是询问。"
 
 #: ../src/common/config.py:161
-msgid "Never ask before closing group chat tab/window in this space separated list of group chat jids."
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
 msgstr "关闭这个空格分隔的列表中的群聊 JID 标签/窗口前不再询问。"
 
 #: ../src/common/config.py:164
-msgid "Overrides the host we send for File Transfer in case of address translation/port forwarding."
+msgid ""
+"Overrides the host we send for File Transfer in case of address translation/"
+"port forwarding."
 msgstr "为防止地址翻译转发，忽略用以发起文件传输的主机"
 
 #: ../src/common/config.py:166
@@ -5271,36 +5443,61 @@ msgid "Show close button in tab?"
 msgstr "在标签上显示关闭键？"
 
 #: ../src/common/config.py:189
-msgid "A semicolon-separated list of words that will be highlighted in group chats."
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "用分号隔开的群聊中将高亮显示的单词列表。"
 
 #: ../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 "如选是， 单击窗口管理器的 X 键，会退出 Gajim。这一设定仅当启用了系统托盘图标时才会生效。"
+msgid ""
+"If True, quits Gajim when X button of Window Manager is clicked. This "
+"setting is taken into account only if trayicon is used."
+msgstr ""
+"如选是， 单击窗口管理器的 X 键，会退出 Gajim。这一设定仅当启用了系统托盘图标"
+"时才会生效。"
 
 #: ../src/common/config.py:191
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "如选是， Gajim 会在每次启动时为 xmpp:// 注册。"
 
 #: ../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 "如选是， Gajim 会在每个含有未读消息的标签上显示一个图标。根据主题，该图标可能是动态的。"
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"如选是， Gajim 会在每个含有未读消息的标签上显示一个图标。根据主题，该图标可能"
+"是动态的。"
 
 #: ../src/common/config.py:193
-msgid "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window."
-msgstr "如选是， Gajim 将显示状态消息，如果不为空，将在名单窗口中每一个联系人名字的下方显示状态信息。"
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"如选是， Gajim 将显示状态消息，如果不为空，将在名单窗口中每一个联系人名字的下"
+"方显示状态信息。"
 
 #: ../src/common/config.py: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."
+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: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."
+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: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 group chat."
-msgstr "可以是 \"无\"， \"全部\" 或 \"登入与登出\"。如果是 \"无\"，当成员改变他/她的状态或他/她的状态消息时 Gajim 将不再打印状态行。如果是 \"全部\" Gajim 将打印所有的状态消息。如果是 \"登入与登出\"， Gajim 将只打印群聊中登入与登出消息。"
+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 ""
+"可以是 \"无\"， \"全部\" 或 \"登入与登出\"。如果是 \"无\"，当成员改变他/她的"
+"状态或他/她的状态消息时 Gajim 将不再打印状态行。如果是 \"全部\" Gajim 将打印"
+"所有的状态消息。如果是 \"登入与登出\"， Gajim 将只打印群聊中登入与登出消息。"
 
 #: ../src/common/config.py:199
 msgid "Background color of contacts when they just signed in."
@@ -5311,7 +5508,8 @@ 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."
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
 msgstr "如果为真，还原消息将用较小的字体。"
 
 #: ../src/common/config.py:203
@@ -5323,12 +5521,22 @@ msgid "Don't show roster in the system taskbar."
 msgstr "不在系统任务栏显示名单。"
 
 #: ../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 "如选是并且 GTK+ 和 PyGTK 版本高于2.8，当有未决事件时窗口将会闪动(大部分窗口管理器的默认响应)"
+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 ""
+"如选是并且 GTK+ 和 PyGTK 版本高于2.8，当有未决事件时窗口将会闪动(大部分窗口管"
+"理器的默认响应)"
 
 #: ../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 presences."
-msgstr "有人加入被密码保护的群聊时，Jabberd1.4 不需要 SHA 信息。将此选项置为“否”以停止在群聊中发送 SHA 信息。"
+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 不需要 SHA 信息。将此选项置为“否”以停"
+"止在群聊中发送 SHA 信息。"
 
 #. always, never, peracct, pertype should not be translated
 #: ../src/common/config.py:210
@@ -5337,13 +5545,16 @@ msgid ""
 "'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 ""
 "选择新消息在窗口中的位置。\n"
 "'总是' - 所有消息都发送到一个窗口。\n"
 "'从不' - 所有消息都打开单独的窗口。\n"
 "'每一个帐号' - 每个帐号的消息都发送到一个单独的窗口。\n"
-"'每种类型' - 每种类型的消息 (例如, 单独聊天 及 群聊) 都发送到一个单独的窗口。注意，改变该选项后必须重启 Gajim 使设置生效。"
+"'每种类型' - 每种类型的消息 (例如, 单独聊天 及 群聊) 都发送到一个单独的窗口。"
+"注意，改变该选项后必须重启 Gajim 使设置生效。"
 
 #: ../src/common/config.py:211
 msgid "If False, you will no longer see the avatar in the chat window."
@@ -5374,7 +5585,9 @@ msgid "Hides the group chat occupants list in group chat window."
 msgstr "在群聊窗口中隐藏房主列表。"
 
 #: ../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."
+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:219
@@ -5390,15 +5603,24 @@ msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "当没有新消息时按 Ctrl-Tab 转到下一个撰写标签。"
 
 #: ../src/common/config.py:222
-msgid "Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog."
+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 "如果为真，您将可以在修改账户窗口中为您的账户可以设置一个否定优先级。注意！当您使用否定优先级登入时您将从服务器收不到任何消息。"
+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."
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
 msgstr "优先级将根据您的状态自动改变。优先级在 autopriority_* 选项中定义。"
 
 #. yes, no, ask
@@ -5407,15 +5629,18 @@ msgid "Jabberd2 workaround"
 msgstr "Jabberd2 工作区"
 
 #: ../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 "如果选定， Gajim 将会使把您当前的 IP 和代理服务器设置用于文件传输代理服务器设置(_P)"
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"如果选定， Gajim 将会使把您当前的 IP 和代理服务器设置用于文件传输代理服务器设"
+"置(_P)"
 
 #: ../src/common/config.py:326
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "是否为此联系人使用 OpenPGP?"
 
-#: ../src/common/config.py:327
-#: ../src/common/config.py:330
+#: ../src/common/config.py:327 ../src/common/config.py:330
 msgid "Language for which we want to check misspelled words"
 msgstr "想要检查拼写的语言"
 
@@ -5427,10 +5652,8 @@ msgstr "全部或空格分隔的状态"
 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: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 "'是'，'否'或''"
@@ -5503,26 +5726,25 @@ msgstr "我现在不可用。"
 msgid "Do not disturb."
 msgstr "不分发。"
 
-#: ../src/common/config.py:366
-#: ../src/common/config.py:367
+#: ../src/common/config.py:366 ../src/common/config.py:367
 msgid "Bye!"
 msgstr "再见！"
 
 #: ../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."
+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 "当收到的群聊消息包含 “MUC 高亮单词”或您的昵称时播放的声音。"
 
 #: ../src/common/config.py:377
 msgid "Sound to play when any MUC message arrives."
 msgstr "当 MUC 信息到达时的声音"
 
-#: ../src/common/config.py:386
-#: ../src/common/optparser.py:197
+#: ../src/common/config.py:386 ../src/common/optparser.py:197
 msgid "green"
 msgstr "绿色"
 
-#: ../src/common/config.py:390
-#: ../src/common/optparser.py:183
+#: ../src/common/config.py:390 ../src/common/optparser.py:183
 msgid "grocery"
 msgstr "杂货店"
 
@@ -5546,7 +5768,9 @@ msgstr "错误主机"
 
 #: ../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."
+msgid ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
 msgstr "您配置主机为 ft_override_host_to_send 高级选项无效，忽略。"
 
 #: ../src/common/connection_handlers.py:590
@@ -5554,7 +5778,7 @@ msgstr "您配置主机为 ft_override_host_to_send 高级选项无效，忽略�
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "代理 %s 所需的注册信息未按时抵达"
 
-#: ../src/common/connection_handlers.py:1519
+#: ../src/common/connection_handlers.py:1523
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "昵称不允许： %s "
@@ -5562,41 +5786,41 @@ msgstr "昵称不允许： %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
+#: ../src/common/connection_handlers.py:1585
+#: ../src/common/connection_handlers.py:1588
+#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1597
+#: ../src/common/connection_handlers.py:1600
+#: ../src/common/connection_handlers.py:1608
 msgid "Unable to join group chat"
 msgstr "无法加入群聊"
 
-#: ../src/common/connection_handlers.py:1582
+#: ../src/common/connection_handlers.py:1586
 msgid "A password is required to join this group chat."
 msgstr "该群聊要求密码才能加入。"
 
-#: ../src/common/connection_handlers.py:1585
+#: ../src/common/connection_handlers.py:1589
 msgid "You are banned from this group chat."
 msgstr "您被该群聊封禁。"
 
-#: ../src/common/connection_handlers.py:1588
+#: ../src/common/connection_handlers.py:1592
 msgid "Such group chat does not exist."
 msgstr "不存在这样的群聊"
 
-#: ../src/common/connection_handlers.py:1591
+#: ../src/common/connection_handlers.py:1595
 msgid "Group chat creation is restricted."
 msgstr "群聊创建受限。"
 
-#: ../src/common/connection_handlers.py:1594
+#: ../src/common/connection_handlers.py:1598
 msgid "Your registered nickname must be used."
 msgstr "您注册的昵称已被使用"
 
-#: ../src/common/connection_handlers.py:1597
+#: ../src/common/connection_handlers.py:1601
 msgid "You are not in the members list."
 msgstr "您不在成员名单中。"
 
-#: ../src/common/connection_handlers.py:1605
+#: ../src/common/connection_handlers.py:1609
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -5604,30 +5828,34 @@ msgstr ""
 "您申请的昵称正在使用或被其他人占有。\n"
 "从下列昵称中另外指定一个："
 
-#: ../src/common/connection_handlers.py:1651
+#: ../src/common/connection_handlers.py:1659
 msgid "I would like to add you to my roster."
 msgstr "我申请添加您到联系人名单"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1672
+#: ../src/common/connection_handlers.py:1680
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr " %s 请求认证"
 
-#: ../src/common/connection_handlers.py:1674
+#: ../src/common/connection_handlers.py:1682
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr " %s 请求解除认证"
 
-#: ../src/common/connection_handlers.py:1676
+#: ../src/common/connection_handlers.py:1684
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s 解除了认证"
 
-#: ../src/common/connection_handlers.py:1846
+#: ../src/common/connection_handlers.py:1854
 #, python-format
-msgid "JID %s is not RFC compliant. It will not be added to your roster. Use roster management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr "JID %s 不识配 RFC，未被加入名单。请使用诸如 http://jru.jabberstudio.org/ 的名单管理工具移除。"
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s 不识配 RFC，未被加入名单。请使用诸如 http://jru.jabberstudio.org/ 的名"
+"单管理工具移除。"
 
 #: ../src/common/connection.py:164
 #: ../src/common/zeroconf/connection_zeroconf.py:196
@@ -5639,8 +5867,7 @@ msgstr "帐户“%s”的连接丢失"
 msgid "Reconnect manually."
 msgstr "手动重连。"
 
-#: ../src/common/connection.py:176
-#: ../src/common/connection.py:203
+#: ../src/common/connection.py:176 ../src/common/connection.py:203
 #, python-format
 msgid "Transport %s answered wrongly to register request: %s"
 msgstr "服务代理 %s 对注册请求响应错误：%s"
@@ -5650,9 +5877,8 @@ msgstr "服务代理 %s 对注册请求响应错误：%s"
 msgid "Invalid answer"
 msgstr "无效答案"
 
-#: ../src/common/connection.py:394
-#: ../src/common/connection.py:429
-#: ../src/common/connection.py:871
+#: ../src/common/connection.py:394 ../src/common/connection.py:429
+#: ../src/common/connection.py:877
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Could not connect to \"%s\""
@@ -5709,7 +5935,7 @@ msgstr "我是 %s"
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[本条消息已 *加密* (见 :JEP:`27`]"
 
-#: ../src/common/connection.py:758
+#: ../src/common/connection.py:764
 #: ../src/common/zeroconf/connection_zeroconf.py:397
 #, python-format
 msgid ""
@@ -5719,7 +5945,7 @@ msgstr ""
 "主题：%s\n"
 "%s"
 
-#: ../src/common/connection.py:897
+#: ../src/common/connection.py:903
 msgid "Not fetched because of invisible status"
 msgstr "由于隐身状态不获取"
 
@@ -5802,68 +6028,55 @@ 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
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 msgid "%0 o'clock"
 msgstr "%0 点钟"
 
-#: ../src/common/fuzzyclock.py:47
-#: ../src/common/fuzzyclock.py:55
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 msgid "five past %0"
 msgstr "五过 %0"
 
-#: ../src/common/fuzzyclock.py:47
-#: ../src/common/fuzzyclock.py:56
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
 msgid "ten past %0"
 msgstr "十过 %0"
 
-#: ../src/common/fuzzyclock.py:48
-#: ../src/common/fuzzyclock.py:56
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
 msgid "quarter past %0"
 msgstr "四分之一过 %0"
 
-#: ../src/common/fuzzyclock.py:48
-#: ../src/common/fuzzyclock.py:57
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
 msgid "twenty past %0"
 msgstr "二十过 %0"
 
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:57
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
 msgid "twenty five past %0"
 msgstr "二十五过 %0"
 
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:58
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
 msgid "half past %0"
 msgstr "半过 %0"
 
-#: ../src/common/fuzzyclock.py:50
-#: ../src/common/fuzzyclock.py:58
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
 msgid "twenty five to %1"
 msgstr "二十五到 %1"
 
-#: ../src/common/fuzzyclock.py:50
-#: ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
 msgid "twenty to %1"
 msgstr "二十到 %1"
 
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
 msgid "quarter to %1"
 msgstr "四分之一到 %1"
 
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
 msgid "ten to %1"
 msgstr "十到 %1"
 
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
 msgid "five to %1"
 msgstr "五到 %1"
 
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
 msgid "%1 o'clock"
 msgstr "%1 点"
 
@@ -6037,10 +6250,6 @@ msgstr "?Subscription we already have: 无"
 msgid "To"
 msgstr "到"
 
-#: ../src/common/helpers.py:259
-msgid "From"
-msgstr "来自"
-
 #: ../src/common/helpers.py:261
 msgid "Both"
 msgstr "双方"
@@ -6118,32 +6327,31 @@ msgstr "中断输入消息"
 msgid "has closed the chat window or tab"
 msgstr "关闭了聊天窗口或标签"
 
-#: ../src/common/helpers.py:880
+#: ../src/common/helpers.py:881
 #, python-format
 msgid " %d unread message"
 msgid_plural " %d unread messages"
 msgstr[0] " %d 条未读消息 "
 
-#: ../src/common/helpers.py:886
+#: ../src/common/helpers.py:887
 #, python-format
 msgid " %d unread single message"
 msgid_plural " %d unread single messages"
 msgstr[0] " %d 条未读单独消息"
 
-#: ../src/common/helpers.py:892
+#: ../src/common/helpers.py:893
 #, python-format
 msgid " %d unread group chat message"
 msgid_plural " %d unread group chat messages"
 msgstr[0] " %d 条未读群聊消息"
 
-#: ../src/common/helpers.py:898
+#: ../src/common/helpers.py:899
 #, python-format
 msgid " %d unread private message"
 msgid_plural " %d unread private messages"
 msgstr[0] " %d 未读私人消息"
 
-#: ../src/common/helpers.py:908
-#: ../src/common/helpers.py:910
+#: ../src/common/helpers.py:909 ../src/common/helpers.py:911
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -6158,8 +6366,7 @@ msgstr "错误：无法按读打开文件 %s"
 msgid "gtk+"
 msgstr "gtk+"
 
-#: ../src/common/optparser.py:192
-#: ../src/common/optparser.py:193
+#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
 msgid "cyan"
 msgstr "青色"
 
@@ -6173,7 +6380,8 @@ msgid "Gajim account %s"
 msgstr "Gajim 帐户 %s"
 
 #: ../src/common/zeroconf/client_zeroconf.py:189
-msgid "Connection to host could not be established: Incorrect answer from server."
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
 msgstr "到主机的连接无法建立：服务器应答不正确。"
 
 #: ../src/common/zeroconf/client_zeroconf.py:205
@@ -6181,7 +6389,8 @@ 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."
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
 msgstr "到主机的连接无法建立：发送数据超时。"
 
 #: ../src/common/zeroconf/client_zeroconf.py:629
@@ -6230,7 +6439,9 @@ 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."
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
 msgstr "没有连接或隐身。您的消息将不会被发送。"
 
 #. we're not english
@@ -6246,10 +6457,13 @@ msgstr "添加服务错误。 %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)"
@@ -6276,47 +6490,63 @@ msgstr "添加服务错误。 %s"
 #, fuzzy
 #~ msgid "Not Available "
 #~ msgstr "不可用"
+
 #~ msgid "Contact _Info"
 #~ msgstr "联系人信息(_I)"
+
 #~ msgid "Contact Information"
 #~ msgstr "联系人信息"
+
 #~ msgid "Jabber"
 #~ msgstr "Jabber"
+
 #~ msgid "Invalid room or server name"
 #~ msgstr "无效房间或服务器名"
+
 #~ msgid "Unknown D-Bus version: %s"
 #~ msgstr "未知的 D-Bus 版本： %s"
+
 #~ msgid "vCard publication succeeded"
 #~ msgstr " vCard 发布成功"
+
 #~ msgid "Your personal information has been published successfully."
 #~ msgstr "您的个人信息被成功发布。"
+
 #~ msgid "Migrating Logs..."
 #~ msgstr "正在移动日志..."
-#~ msgid "Please wait while logs are being migrated..."
-#~ msgstr "请等待日志被移动..."
+
 #~ msgid "_Join New Room"
 #~ msgstr "加入新房间(_J)"
+
 #~ msgid "Gajim - %d unread message"
 #~ msgid_plural "Gajim - %d unread messages"
 #~ msgstr[0] "Gajim - %d 条未读消息 "
+
 #~ msgid "Since %s"
 #~ msgstr "自 %s"
+
 #~ msgid "Automatically authorize contact"
 #~ msgstr "自动向联系人授权"
+
 #~ msgid "Send File"
 #~ msgstr "发送文件"
+
 #~ msgid "Underline"
 #~ msgstr "下划线"
+
 #~ msgid "Would you like to overwrite it?"
 #~ msgstr "确认覆盖该文件？"
+
 #~ msgid "_Join New Room..."
 #~ msgstr "加入新房间(_J)..."
+
 #~ msgid "Usage: /%s, sets the groupchat window to compact mode."
 #~ msgstr "用法：/%s，设置群聊窗口为紧凑模式。"
 
 #, fuzzy
 #~ msgid "<b>Please modify your special notification below</b>"
 #~ msgstr "<b>请选择一个选项</b>："
+
 #~ msgid "Delete Message of the Day"
 #~ msgstr "删除每日消息"
 
@@ -6327,98 +6557,137 @@ msgstr "添加服务错误。 %s"
 #, fuzzy
 #~ msgid "I want to listen to:"
 #~ msgstr "%s 想发送给您一个文件："
+
 #~ msgid "Send _New Message..."
 #~ msgstr "发送新消息(_N)"
+
 #~ msgid "Set Message of the Day"
 #~ msgstr "设定每日消息"
+
 #~ msgid "Update Message of the Day"
 #~ msgstr "更新每日消息"
+
 #~ msgid "_XML Console..."
 #~ msgstr "XML 控制(_X)..."
+
 #~ msgid "Choose Avatar"
 #~ msgstr "选择明细"
+
 #~ msgid "Use compact view when you open a chat window"
 #~ msgstr "开启新聊天窗口时使用紧凑模式"
+
 #~ msgid "Use compact view when you open a group chat window"
 #~ msgstr "开启新群聊窗口时使用紧凑模式"
+
 #~ msgid "plain"
 #~ msgstr "高原"
+
 #~ msgid "Send"
 #~ msgstr "发送"
+
 #~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
 #~ msgstr "房间 %(room_name)s 的 %(nickname)s 向您发送了一条新消息。"
+
 #~ msgid "%s has sent you a new message."
 #~ msgstr "%s 给您发送了一条新消息。"
 
 #, fuzzy
 #~ msgid "GUI Migration failed"
 #~ msgstr "vCard 发布失败"
+
 #~ msgid "Logs have been successfully migrated to the database."
 #~ msgstr "日志被成功移动到数据库。"
+
 #~ msgid "If checked, Gajim will also have a trayicon"
 #~ msgstr "如果选定，Gajim 同样可以显示系统托盘图标"
 
 #, fuzzy
 #~ msgid "Start Chat with Contact"
 #~ msgstr "使用账户 %s 加入群聊"
+
 #~ msgid "All contacts in this group are offline or have errors"
 #~ msgstr "该组中所有联系人离线或有错误"
+
 #~ msgid "Size: "
 #~ msgstr "大小："
+
 #~ msgid "Session bus is not available"
 #~ msgstr "会话总线不可用"
+
 #~ msgid "Sound"
 #~ msgstr "声音"
+
 #~ msgid "Text"
 #~ msgstr "文本"
+
 #~ msgid "Image"
 #~ msgstr "形象"
+
 #~ msgid "From %s"
 #~ msgstr "来自 %s"
+
 #~ msgid "To %s"
 #~ msgstr "到 %s"
+
 #~ msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 #~ msgstr "您被邀请到 %(room_jid)s 房间，邀请人 %(contact_jid)s "
+
 #~ msgid "Manage Emoticons"
 #~ msgstr "表情符管理"
+
 #~ msgid "Or choose a preset message:"
 #~ msgstr "或选择一条当前消息："
+
 #~ msgid "Use _emoticons"
 #~ msgstr "使用表情符(_E)"
+
 #~ msgid "_Set Image..."
 #~ msgstr "选择形象(_S)..."
+
 #~ msgid "Switch to %s"
 #~ msgstr "切换到 %s"
+
 #~ msgid "using account "
 #~ msgstr "使用帐户"
+
 #~ msgid "The filesize of image \"%s\" is too large"
 #~ msgstr "图像文件 “%s” 太大"
+
 #~ msgid "The file must not be more than 32 kilobytes."
 #~ msgstr "文件必须小于 32 kB 。"
+
 #~ msgid "Timeout"
 #~ msgstr "超时"
-#~ msgid "A protocol error has occured:"
-#~ msgstr "发生了一个协议错误："
+
 #~ msgid "account: "
 #~ msgstr "账户："
+
 #~ msgid "Cannot remove last group"
 #~ msgstr "无法移除上一个群"
+
 #~ msgid "At least one contact group must be present."
 #~ msgstr "至少保留一个联系群组"
+
 #~ msgid "Are you sure you want to leave rooms \"%s\"?"
 #~ msgstr "确定要离开房间“ %s ”？"
+
 #~ msgid "If you close this window, you will be disconnected from these rooms."
 #~ msgstr "如果关闭此窗口，您将断开这些房间的连接。"
+
 #~ msgid "Activate/Disable notification for when a file transfer is complete"
 #~ msgstr "启用/关闭文件传送完成提示"
+
 #~ msgid "Removing selected file transfer"
 #~ msgstr "正在移除指定的文件传输"
+
 #~ msgid "Stoping selected file transfer"
 #~ msgstr "中止选定的文件传输"
+
 #~ msgid ""
 #~ "If you close this tab and you have history disabled, the message will be "
 #~ "lost."
 #~ msgstr "如果您关闭此标签并且禁用历史，消息会丢失。"
+
 #~ msgid ""
 #~ "pysqlite2 (aka python-pysqlite2) dependency is missing. After you install "
 #~ "pysqlite3, if you want to migrate your logs to the new database, please "
@@ -6427,4 +6696,3 @@ msgstr "添加服务错误。 %s"
 #~ "pysqlite2 (即 python-pysqlite2) 依赖丢失。在您安装 pysqlite3 后，如果您想"
 #~ "移动日志到新的数据库，请参阅：http://trac.gajim.org/wiki/"
 #~ "MigrateLogToDot9DB 退出..."
-