diff --git a/po/bg/LC_MESSAGES/gajim.po b/po/bg/LC_MESSAGES/gajim.po
index d9227bedb7d86a91397222c606fc6a495c24ed1a..11373078ee8f9ad80838a53b655de6348e93e2ae 100644
--- a/po/bg/LC_MESSAGES/gajim.po
+++ b/po/bg/LC_MESSAGES/gajim.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.7.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 01:26+0300\n"
+"POT-Creation-Date: 2005-08-09 18:26+0300\n"
 "PO-Revision-Date: 2005-06-01 18:52+0300\n"
 "Last-Translator: Yavor Doganov <yavor@doganov.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -26,91 +26,91 @@ msgstr ""
 msgid "Not available as a result of being idle"
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:267
 msgid "Sleeping"
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:268
 msgid "Back soon"
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:268
 msgid "Back in some minutes."
 msgstr "Ще се върна след малко."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:269
 msgid "Eating"
 msgstr "Хапвам"
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:269
 msgid "I'm eating, so leave me a message."
 msgstr "Хапвам, оставете съобщение."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:270
 msgid "Movie"
 msgstr "Филм"
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:270
 msgid "I'm watching a movie."
 msgstr "Гледам филм."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:271
 msgid "Working"
 msgstr "Работя"
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:271
 msgid "I'm working."
 msgstr "Работя."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:272
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:272
 msgid "I'm on the phone."
 msgstr "Говоря по телефона."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:273
 msgid "Out"
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:273
 msgid "I'm out enjoying life"
 msgstr ""
 
-#: ../src/common/connection.py:291 ../src/common/connection.py:301
+#: ../src/common/connection.py:290 ../src/common/connection.py:300
 #, fuzzy, python-format
 msgid ""
 "Subject: %s\n"
 "%s"
 msgstr "Тема:"
 
-#: ../src/common/connection.py:351 ../src/common/connection.py:1496
+#: ../src/common/connection.py:350 ../src/common/connection.py:1496
 msgid "I would like to add you to my roster."
 msgstr "Бих искал(а) да ви добавя към списъка си."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:358
+#: ../src/common/connection.py:357
 #, fuzzy, python-format
 msgid "we are now subscribed to %s"
 msgstr "Вече сте отписани от %s"
 
-#: ../src/common/connection.py:360
+#: ../src/common/connection.py:359
 #, fuzzy, python-format
 msgid "unsubscribe request from %s"
 msgstr "Искане за записване от %s"
 
-#: ../src/common/connection.py:362
+#: ../src/common/connection.py:361
 #, fuzzy, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "Вече сте отписани от %s"
 
-#: ../src/common/connection.py:399
+#: ../src/common/connection.py:398
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr ""
 
-#: ../src/common/connection.py:400
+#: ../src/common/connection.py:399
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 
@@ -186,93 +186,94 @@ msgstr ""
 msgid "error appeared while processing xmpp:"
 msgstr ""
 
-#: ../src/common/helpers.py:28
+#: ../src/common/helpers.py:30
 msgid "Busy"
 msgstr "Зает"
 
-#: ../src/common/helpers.py:30
+#: ../src/common/helpers.py:32
 msgid "Not Available"
 msgstr "Не съм на разположение"
 
-#: ../src/common/helpers.py:32
+#: ../src/common/helpers.py:34
 msgid "Free for Chat"
 msgstr "Свободен за разговор"
 
-#: ../src/common/helpers.py:34
+#: ../src/common/helpers.py:36
 msgid "Available"
 msgstr "На линия"
 
-#: ../src/common/helpers.py:36
+#: ../src/common/helpers.py:38
 msgid "Connecting"
 msgstr "Свъзване"
 
-#: ../src/common/helpers.py:38
+#: ../src/common/helpers.py:40
 msgid "Away"
 msgstr "Отсъствам"
 
-#: ../src/common/helpers.py:40
+#: ../src/common/helpers.py:42
 msgid "Offline"
 msgstr "Изключен"
 
-#: ../src/common/helpers.py:42
+#: ../src/common/helpers.py:44
 msgid "Invisible"
 msgstr "Невидим"
 
-#: ../src/common/helpers.py:44
+#: ../src/common/helpers.py:46
 msgid "Not in the roster"
 msgstr "Не е в списъка"
 
-#: ../src/common/helpers.py:46 ../src/vcard.py:249 ../src/vcard.py:251
+#: ../src/common/helpers.py:48 ../src/vcard.py:249 ../src/vcard.py:251
 msgid "Unknown"
 msgstr ""
 
-#: ../src/common/helpers.py:48
+#: ../src/common/helpers.py:50
 msgid "Has errors"
 msgstr "Има грешки"
 
-#: ../src/common/helpers.py:53 ../src/common/helpers.py:67
-#: ../src/groupchat_window.py:271 ../src/gtkgui.glade.h:173
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:69
+#: ../src/groupchat_window.py:271 ../src/gtkgui.glade.h:174
 #, fuzzy
 msgid "None"
 msgstr "Възел"
 
-#: ../src/common/helpers.py:55
+#: ../src/common/helpers.py:57
 msgid "To"
 msgstr ""
 
-#: ../src/common/helpers.py:57
+#: ../src/common/helpers.py:59
 #, fuzzy
 msgid "From"
 msgstr "Стая:"
 
-#: ../src/common/helpers.py:59
+#: ../src/common/helpers.py:61
 msgid "Both"
 msgstr ""
 
-#: ../src/common/helpers.py:69
+#: ../src/common/helpers.py:71
 #, fuzzy
 msgid "Subscribe"
 msgstr "_Записване"
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "is paying attention to the conversation"
 msgstr ""
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:112
 msgid "is doing something else"
 msgstr ""
 
-#: ../src/common/helpers.py:112
+#: ../src/common/helpers.py:114
 #, fuzzy
 msgid "is composing a message..."
 msgstr "Входящо съобщение:"
 
-#: ../src/common/helpers.py:114
+#. paused means he was compoing but has stopped for a while
+#: ../src/common/helpers.py:117
 #, fuzzy
-msgid "paused composing a message..."
+msgid "paused composing a message"
 msgstr "Входящо съобщение:"
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 #, fuzzy
 msgid "has closed the chat window or tab"
 msgstr "Използване на един прозорец за разговор със _страници"
@@ -304,15 +305,6 @@ msgstr ""
 msgid "Unable to write file in %s\n"
 msgstr ""
 
-#: ../src/common/optparser.py:84
-msgid "No space left on device"
-msgstr ""
-
-#: ../src/common/optparser.py:100
-#, python-format
-msgid "Unable to open %s for writing\n"
-msgstr ""
-
 #: ../src/advanced.py:52
 msgid "Preference Name"
 msgstr "Име на опцията"
@@ -329,7 +321,7 @@ msgstr "Тип"
 msgid "Chat"
 msgstr "Разговор"
 
-#: ../src/chat.py:124 ../src/gtkgui.glade.h:127
+#: ../src/chat.py:124 ../src/gtkgui.glade.h:128
 #, fuzzy
 msgid "Group Chat"
 msgstr "Стая"
@@ -409,163 +401,163 @@ msgstr ""
 msgid "Subject: %s\n"
 msgstr "Тема:"
 
-#: ../src/config.py:198 ../src/config.py:428
+#: ../src/config.py:199 ../src/config.py:436
 #, fuzzy, python-format
 msgid "Every %s _minutes"
 msgstr "Всеки 5 _минути"
 
-#: ../src/config.py:301
+#: ../src/config.py:307
 msgid "Active"
 msgstr "Активен"
 
-#: ../src/config.py:309
+#: ../src/config.py:315
 msgid "Event"
 msgstr "Събитие"
 
-#: ../src/config.py:315
+#: ../src/config.py:321
 msgid "Sound"
 msgstr "Звук"
 
-#: ../src/config.py:918
+#: ../src/config.py:930
 #, fuzzy
 msgid "status message title"
 msgstr "Съобщение за състояние:"
 
-#: ../src/config.py:918
+#: ../src/config.py:930
 #, fuzzy
 msgid "status message text"
 msgstr "Съобщение за състояние:"
 
-#: ../src/config.py:971
+#: ../src/config.py:983
 msgid "Choose Sound"
 msgstr "Избор на звук"
 
-#: ../src/config.py:978 ../src/config.py:1923 ../src/vcard.py:131
+#: ../src/config.py:990 ../src/config.py:1935 ../src/vcard.py:131
 msgid "All files"
 msgstr "Всички файлове"
 
-#: ../src/config.py:983
+#: ../src/config.py:995
 msgid "Wav Sounds"
 msgstr "Формат WAV"
 
-#: ../src/config.py:1152
+#: ../src/config.py:1164
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP не може да бъде използван на този компютър"
 
-#: ../src/config.py:1177
+#: ../src/config.py:1189
 #, fuzzy
 msgid "You are currently connected to the server"
 msgstr "Трябва да сте свързани, за да разглеждате услугите"
 
-#: ../src/config.py:1178
+#: ../src/config.py:1190
 msgid "To change the account name, you must be disconnected."
 msgstr ""
 
-#: ../src/config.py:1181 ../src/config.py:1185
+#: ../src/config.py:1193 ../src/config.py:1197
 msgid "Invalid account name"
 msgstr ""
 
-#: ../src/config.py:1182
+#: ../src/config.py:1194
 #, fuzzy
 msgid "Account name cannot be empty."
 msgstr "Паролата трябва да съдържа символи"
 
-#: ../src/config.py:1186
+#: ../src/config.py:1198
 #, fuzzy
 msgid "Account name cannot contain spaces."
 msgstr "Паролата трябва да съдържа символи"
 
-#: ../src/config.py:1190
+#: ../src/config.py:1202
 #, fuzzy
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/config.py:1191
+#: ../src/config.py:1203
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr ""
 
-#: ../src/config.py:1198 ../src/dialogs.py:1107
+#: ../src/config.py:1210 ../src/dialogs.py:1107
 #, fuzzy
 msgid "Invalid password"
 msgstr "Запазване на паро_ла"
 
-#: ../src/config.py:1199
+#: ../src/config.py:1211
 #, fuzzy
 msgid "You must enter a password for the new account."
 msgstr "За да регистрирате нов акаунт, трябва да въведете парола"
 
-#: ../src/config.py:1236
+#: ../src/config.py:1248
 msgid "Invalid entry"
 msgstr ""
 
-#: ../src/config.py:1237
+#: ../src/config.py:1249
 #, fuzzy
 msgid "Custom port must be a port number."
 msgstr "Порта на сървъра посредник трябва да е номер на порт"
 
-#: ../src/config.py:1324
+#: ../src/config.py:1336
 msgid "Account name is in use"
 msgstr ""
 
-#: ../src/config.py:1325
+#: ../src/config.py:1337
 #, fuzzy
 msgid "You already have an account using this name."
 msgstr "Вече има регистриран акаунт"
 
-#: ../src/config.py:1387
+#: ../src/config.py:1399
 #, fuzzy
 msgid "No such account available"
 msgstr "Не съм на разположение"
 
-#: ../src/config.py:1388
+#: ../src/config.py:1400
 #, fuzzy
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Трябва първо да създадете акаунт и след това да редактирате личните данни"
 
-#: ../src/config.py:1395 ../src/config.py:2005 ../src/dialogs.py:981
+#: ../src/config.py:1407 ../src/config.py:2017 ../src/dialogs.py:981
 #: ../src/dialogs.py:1087 ../src/vcard.py:374 ../src/vcard.py:402
 #, fuzzy
 msgid "You are not connected to the server"
 msgstr "Трябва да сте свързани, за да разглеждате услугите"
 
-#: ../src/config.py:1396
+#: ../src/config.py:1408
 #, fuzzy
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Трябва да сте свързани, за да редактирате личните данни"
 
-#: ../src/config.py:1423
+#: ../src/config.py:1435
 #, fuzzy
 msgid "Failed to get secret keys"
 msgstr "Грешка при извличане на частните ключове"
 
-#: ../src/config.py:1424
+#: ../src/config.py:1436
 msgid "There was a problem retrieving your GPG secret keys."
 msgstr ""
 
-#: ../src/config.py:1427 ../src/gtkgui.glade.h:183
+#: ../src/config.py:1439 ../src/gtkgui.glade.h:183
 msgid "Passphrase"
 msgstr "Парола"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1440
 #, fuzzy
 msgid "Choose your OpenPGP key"
 msgstr "<b>Изберете вашия OpenPGP ключ</b>"
 
-#: ../src/config.py:1436 ../src/gtkgui.glade.h:172
+#: ../src/config.py:1448 ../src/gtkgui.glade.h:173
 msgid "No key selected"
 msgstr "Няма избран ключ"
 
-#: ../src/config.py:1667 ../src/config.py:2028
+#: ../src/config.py:1679 ../src/config.py:2040
 msgid "Name"
 msgstr "Име"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1682
 msgid "Server"
 msgstr "Сървър"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1775 ../src/config.py:2247 ../src/dialogs.py:112
+#: ../src/config.py:1787 ../src/config.py:2259 ../src/dialogs.py:112
 #: ../src/dialogs.py:282 ../src/dialogs.py:318 ../src/roster_window.py:123
 #: ../src/roster_window.py:128 ../src/roster_window.py:152
 #: ../src/roster_window.py:1928 ../src/roster_window.py:1930
@@ -573,122 +565,122 @@ msgstr "Сървър"
 msgid "Transports"
 msgstr ""
 
-#: ../src/config.py:1790
+#: ../src/config.py:1802
 #, python-format
 msgid "Edit %s"
 msgstr "Редактиране на %s"
 
-#: ../src/config.py:1792
+#: ../src/config.py:1804
 #, python-format
 msgid "Register to %s"
 msgstr "Регистриране в %s"
 
-#: ../src/config.py:1812
+#: ../src/config.py:1824
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/config.py:1820
+#: ../src/config.py:1832
 msgid "Image"
 msgstr "Изображение"
 
-#: ../src/config.py:1867
+#: ../src/config.py:1879
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/config.py:1867
+#: ../src/config.py:1879
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
 msgstr ""
 
-#: ../src/config.py:1917
+#: ../src/config.py:1929
 #, fuzzy
 msgid "Choose Image"
 msgstr "Избор на _ключ"
 
-#: ../src/config.py:1928 ../src/vcard.py:136
+#: ../src/config.py:1940 ../src/vcard.py:136
 #, fuzzy
 msgid "Images"
 msgstr "Изображение"
 
-#: ../src/config.py:2006
+#: ../src/config.py:2018
 #, fuzzy
 msgid "Without a connection, you can not browse available services"
 msgstr "Трябва да сте свързани, за да разглеждате услугите"
 
-#: ../src/config.py:2011
+#: ../src/config.py:2023
 #, fuzzy, python-format
 msgid "Service Discovery using %s account"
 msgstr "Откриване на услуги"
 
-#: ../src/config.py:2013
+#: ../src/config.py:2025
 msgid "Service Discovery"
 msgstr "Откриване на услуги"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2045
 msgid "Service"
 msgstr "Услуга"
 
-#: ../src/config.py:2038
+#: ../src/config.py:2050
 msgid "Node"
 msgstr "Възел"
 
-#: ../src/config.py:2250 ../src/gtkgui.glade.h:305
+#: ../src/config.py:2262 ../src/gtkgui.glade.h:305
 msgid "_Edit"
 msgstr "_Редактиране"
 
-#: ../src/config.py:2252 ../src/gtkgui.glade.h:201
+#: ../src/config.py:2264 ../src/gtkgui.glade.h:201
 msgid "Re_gister"
 msgstr "_Регистриране"
 
-#: ../src/config.py:2424
+#: ../src/config.py:2436
 #, python-format
 msgid "Removing %s account"
 msgstr "Премахване на акаунт %s"
 
-#: ../src/config.py:2431
+#: ../src/config.py:2443
 #, fuzzy, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Трябва да сте свързани, за да разглеждате услугите"
 
-#: ../src/config.py:2432
+#: ../src/config.py:2444
 msgid "If you remove it, the connection will be lost."
 msgstr ""
 
-#: ../src/config.py:2557
+#: ../src/config.py:2569
 #, fuzzy
 msgid "New Room"
 msgstr "Стая:"
 
-#: ../src/config.py:2587
+#: ../src/config.py:2599
 msgid "This bookmark has invalid data"
 msgstr ""
 
-#: ../src/config.py:2588
+#: ../src/config.py:2600
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 
-#: ../src/config.py:2808
+#: ../src/config.py:2820
 msgid ""
 "Account has been added successfully.\n"
 "You can set advanced options by using \"Edit->Accounts\" from the main "
 "window."
 msgstr ""
 
-#: ../src/config.py:2819
+#: ../src/config.py:2831
 msgid ""
 "Your new account has been created and added to your gajim configuration.\n"
 "You can set advanced account options using \"Edit->Accounts\" in the main "
 "window menu."
 msgstr ""
 
-#: ../src/config.py:2833
+#: ../src/config.py:2845
 #, fuzzy
 msgid "You need to enter a username to add an account."
 msgstr "Трябва да въведете име за този акаунт"
 
-#: ../src/config.py:2837
+#: ../src/config.py:2849
 #, fuzzy
 msgid "You need to enter a valid server address to add an account."
 msgstr "За да регистрирате нов акаунт, трябва да въведете парола"
@@ -785,7 +777,7 @@ msgstr "Gajim - %s непрочетени съобщения"
 msgid "Gajim - 1 unread message"
 msgstr "Gajim - 1 непрочетено съобщение"
 
-#: ../src/dialogs.py:696 ../src/gtkgui.glade.h:116
+#: ../src/dialogs.py:696 ../src/gtkgui.glade.h:117
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -794,7 +786,7 @@ msgstr "Gajim"
 msgid "Gajim - %s"
 msgstr "Gajim"
 
-#: ../src/dialogs.py:733 ../src/dialogs.py:834 ../src/dialogs.py:1777
+#: ../src/dialogs.py:733 ../src/dialogs.py:834 ../src/dialogs.py:1778
 #, fuzzy
 msgid "Name: "
 msgstr "_Име: "
@@ -813,12 +805,12 @@ msgstr "Отваряне на страницата за изтегляне"
 msgid "Upload"
 msgstr ""
 
-#: ../src/dialogs.py:745 ../src/dialogs.py:1779
+#: ../src/dialogs.py:745 ../src/dialogs.py:1780
 #, fuzzy
 msgid "Sender: "
 msgstr "_Отказване"
 
-#: ../src/dialogs.py:748 ../src/dialogs.py:1781
+#: ../src/dialogs.py:748 ../src/dialogs.py:1782
 #, fuzzy
 msgid "Recipient: "
 msgstr "Скоро посетени:"
@@ -898,7 +890,7 @@ msgstr ""
 msgid "Join Group Chat as %s"
 msgstr "Влизане в стая като "
 
-#: ../src/dialogs.py:997 ../src/gtkgui.glade.h:153
+#: ../src/dialogs.py:997 ../src/gtkgui.glade.h:154
 #, fuzzy
 msgid "Join Group Chat"
 msgstr "Влизане в стая"
@@ -909,7 +901,7 @@ msgid "New Message as %s"
 msgstr "Ново съобщение като "
 
 #: ../src/dialogs.py:1062 ../src/dialogs.py:1157 ../src/gajim.py:462
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:170
 msgid "New Message"
 msgstr "Ново съобщение"
 
@@ -1131,17 +1123,17 @@ msgstr ""
 msgid "Would you like to overwrite it?"
 msgstr ""
 
-#: ../src/dialogs.py:1880 ../src/gtkgui.glade.h:338
+#: ../src/dialogs.py:1881 ../src/gtkgui.glade.h:338
 #, fuzzy
 msgid "_Pause"
 msgstr "Състояние"
 
-#: ../src/dialogs.py:1883 ../src/dialogs.py:1915
+#: ../src/dialogs.py:1884 ../src/dialogs.py:1916
 #, fuzzy
 msgid "_Continue"
 msgstr "Свъзване"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1912
 #, fuzzy
 msgid "Pause"
 msgstr "Стойност"
@@ -1161,7 +1153,7 @@ msgid "error while sending"
 msgstr "грешка при изпращане"
 
 #: ../src/gajim.py:536 ../src/gajim.py:546 ../src/roster_window.py:125
-#: ../src/roster_window.py:1036 ../src/gtkgui.glade.h:124
+#: ../src/roster_window.py:1036 ../src/gtkgui.glade.h:125
 msgid "General"
 msgstr "Общи"
 
@@ -1208,7 +1200,8 @@ msgstr "Запазване на _паролата (несигурно)"
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Паролата ви за GPG е грешна, така че сте свързани без GPG ключ"
 
-#: ../src/gajim.py:1025
+#. it is good to notify the user, in case he cannot see the output of the console
+#: ../src/gajim.py:1027
 msgid "Cannot save your preferences"
 msgstr ""
 
@@ -1344,7 +1337,7 @@ msgstr ""
 msgid "Banning %s"
 msgstr ""
 
-#: ../src/groupchat_window.py:961 ../src/tabbed_chat_window.py:323
+#: ../src/groupchat_window.py:961 ../src/tabbed_chat_window.py:327
 msgid "If you close this tab, the message will be lost."
 msgstr ""
 
@@ -1608,40 +1601,40 @@ msgstr "Натиснете, за да конфигурирате стаята"
 msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:254 ../src/tabbed_chat_window.py:322
+#: ../src/tabbed_chat_window.py:258 ../src/tabbed_chat_window.py:326
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:255
+#: ../src/tabbed_chat_window.py:259
 msgid "If you close the window, this message will be lost."
 msgstr ""
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:488
+#: ../src/tabbed_chat_window.py:492
 #, fuzzy
 msgid "A connection is not available"
 msgstr "Автоматично \"_Не съм на разположение\" след:"
 
-#: ../src/tabbed_chat_window.py:489
+#: ../src/tabbed_chat_window.py:493
 msgid "Your message can not be sent until you are connected."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:577
+#: ../src/tabbed_chat_window.py:581
 #, fuzzy
 msgid "Sending private message failed"
 msgstr "_Ново съобщение"
 
-#: ../src/tabbed_chat_window.py:578
+#: ../src/tabbed_chat_window.py:582
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:681
+#: ../src/tabbed_chat_window.py:685
 msgid "Encryption enabled"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:686
+#: ../src/tabbed_chat_window.py:690
 msgid "Encryption disabled"
 msgstr ""
 
@@ -1688,30 +1681,32 @@ msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Редактор на настройките за напреднали</b>"
 
 #: ../src/gtkgui.glade.h:4
-msgid "<b>Changes in latest version</b>"
-msgstr "<b>Промени в последната версия</b>"
+#, fuzzy
+msgid "<b>Applications</b>"
+msgstr "<b>Други програми</b>"
 
 #: ../src/gtkgui.glade.h:5
-msgid "<b>Custom Applications</b>"
-msgstr "<b>Други програми</b>"
+msgid "<b>Changes in latest version</b>"
+msgstr "<b>Промени в последната версия</b>"
 
 #: ../src/gtkgui.glade.h:6
+#, fuzzy
+msgid "<b>Custom</b>"
+msgstr "<b>Дневник</b>"
+
+#: ../src/gtkgui.glade.h:7
 msgid "<b>Format of a chat line</b>"
 msgstr "<b>Формат на реда в разговор</b>"
 
-#: ../src/gtkgui.glade.h:7
+#: ../src/gtkgui.glade.h:8
 #, fuzzy
 msgid "<b>Interface Customization</b>"
 msgstr "<b>Други програми</b>"
 
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Jabber Traffic</b>"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:9
-msgid "<b>Links</b>"
-msgstr "<b>Връзки</b>"
-
 #: ../src/gtkgui.glade.h:10
 msgid "<b>Log</b>"
 msgstr "<b>Дневник</b>"
@@ -2137,33 +2132,38 @@ msgid "File _Transfers"
 msgstr "Използване на _набор икони на транспортите"
 
 #: ../src/gtkgui.glade.h:111
+#, fuzzy
+msgid "File manager:"
+msgstr "Използване на _набор икони на транспортите"
+
+#: ../src/gtkgui.glade.h:112
 msgid "Filter:"
 msgstr "Филтър:"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 #, fuzzy
 msgid "Font:"
 msgstr "Акаунт:"
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:114
 msgid "Format: YYYY-MM-DD"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:115
 #, fuzzy
 msgid "From:"
 msgstr "Стая:"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:116
 #, fuzzy
 msgid "GPG Encryption"
 msgstr "Натиснете, за да конфигурирате стаята"
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Gajim Themes Customization"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2171,13 +2171,13 @@ msgstr ""
 "Автоматично ще се показва новото съобщение в нов прозорец за разговор или "
 "страница в съществуващ прозорец"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
 msgstr "Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:121
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2185,7 +2185,7 @@ msgstr ""
 "Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана при "
 "свързване на контакти"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:122
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2193,75 +2193,75 @@ msgstr ""
 "Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана при "
 "изключване на контакти"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:123
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr "Само ще се променя иконата на контакта, който е изпратил съобщението"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
 msgid "Gajim: First Time Wizard"
 msgstr "Gajim: Помощник при първоначално стартиране"
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:126
 #, fuzzy
 msgid "Given:"
 msgstr "Клиент:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:127
 msgid "Go"
 msgstr "Отиване"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:129
 msgid "Group:"
 msgstr "Група:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:130
 #, fuzzy
 msgid "HTTP Connect"
 msgstr "Свъзване"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:131
 msgid "Homepage:"
 msgstr "Уеб страница:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:132
 #, fuzzy
 msgid "Hostname: "
 msgstr "_Хост:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:133
 msgid "I already have an account I want to use"
 msgstr "Вече има регистриран акаунт"
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "I want to _register for a new account"
 msgstr "Искате да _регистрирате нов Jabber акаунт"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:135
 msgid "I would like to add you to my contact list."
 msgstr "Бих искал(а) да ви добавя към списъка си."
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "Ако е избрано, Gajim ще има и икона в областта за уведомяване"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid ""
 "If checked, Gajim will broadcast capability to send and receive meta-"
 "information related to a conversation you may have with a contact such as "
 "composing a message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 #, fuzzy
 msgid "If checked, Gajim will join this groupchat on startup"
 msgstr "Ако е избрано, Gajim ще има и икона в областта за уведомяване"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:139
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Ако е избрано, ще се запомни паролата за този акаунт"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:140
 #, fuzzy
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
@@ -2270,7 +2270,7 @@ msgstr ""
 "Ако е избрано, ще се запомни размера на списъка и позицията му на екрана за "
 "следващото стартиране на програмата"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2278,13 +2278,13 @@ msgstr ""
 "Ако е избрано, усмивките в ASCII като \":)\" ще се изобразяват със "
 "съответните графични емотикони"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for only you and of course the administrator"
@@ -2292,7 +2292,7 @@ msgstr ""
 "Ако е избрано, паролата ще се запази в ~/.gajim/config с права за четене "
 "само за потребителя и администратора"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:144
 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, "
@@ -2302,7 +2302,7 @@ msgstr ""
 "е. контакт от MSN ще има еквивалентната за MSN икона за състоянията \"На "
 "линия\", \"Отсъства\", \"Зает\" и т.н.)."
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:145
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2310,7 +2310,7 @@ msgstr ""
 "Ако е избрано, при стартиране Gajim ще се свързва автоматично, използвайки "
 "този акаунт"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:146
 msgid ""
 "If checked, all chat and group chat windows will have the information area "
 "in the top and the buttons area in the bottom hidden. You can quick toggle "
@@ -2318,7 +2318,7 @@ msgid ""
 "a permanent one"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:147
 #, fuzzy
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
@@ -2327,125 +2327,121 @@ msgstr ""
 "Ако имате 2 или повече акаунта и тази опция е избрана, Gajim ще изобразява "
 "всички контакти като от един акаунт"
 
-#: ../src/gtkgui.glade.h:147
+#: ../src/gtkgui.glade.h:148
 msgid "Incoming message:"
 msgstr "Входящо съобщение:"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:149
 msgid "Info/Query"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:150
 msgid "Information about you are stored on the server as vCard"
 msgstr "Личните данни се запазват на сървъра като vCard"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:151
 msgid "Italic"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:152
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:153
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:155
 #, fuzzy
 msgid "Join _Group Chat"
 msgstr "Влизане в _стая"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:156
 #, fuzzy
 msgid "Join _Group Chat..."
 msgstr "Влизане в _стая"
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:157
 msgid "Location"
 msgstr "Местонахождение"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:158
 msgid "Log history"
 msgstr "Запазване на разговорите"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:159
 msgid "Log presences in _contact's log file"
 msgstr "Запазване на състоянията в дневника на _контакта"
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:160
 msgid "Log presences in an _external file"
 msgstr "Запазване на състоянията във външен _файл"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:161
 #, fuzzy
 msgid "Manage Accounts"
 msgstr "_Смесване на акаунти"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:162
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:163
 #, fuzzy
 msgid "Manage Emoticons"
 msgstr "Използване на _емотикони"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:164
 msgid "Manage Proxy Profiles"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:165
 msgid "Manage..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:166
 msgid "Middle:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:167
 #, fuzzy
 msgid "Mo_derator"
 msgstr "Даване на _ръководни функции"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:168
 #, fuzzy
 msgid "More"
 msgstr "Филм"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:169
 msgid "Name:"
 msgstr "Име:"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:171
 msgid "New version of Gajim available"
 msgstr "Има нова версия на Gajim"
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:172
 msgid "Nickname:"
 msgstr "Псевдоним:"
 
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:175
 msgid "Notify me about contacts that: "
 msgstr "Уведомяване за контакти при: "
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:176
 msgid "OS:"
 msgstr "ОС:"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:177
 #, fuzzy
 msgid "On every _message"
 msgstr "На _всеки ред"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:178
 msgid "Open Download Page"
 msgstr "Отваряне на страницата за изтегляне"
 
-#: ../src/gtkgui.glade.h:178
-msgid "Open _with:"
-msgstr "От_варяне с:"
-
 #: ../src/gtkgui.glade.h:179
 msgid "Open..."
 msgstr "Отваряне..."
@@ -3287,184 +3283,191 @@ msgstr "минути"
 msgid "show a help on specific command"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:74
+#. parameter, named "on_command". User gets help for the command, specified by this parameter
+#: ../scripts/gajim-remote.py:75
 msgid "on_command"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:74
+#: ../scripts/gajim-remote.py:76
 msgid "show help on command"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:78
+#: ../scripts/gajim-remote.py:80
 msgid "Shows or hides the roster window"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:82
+#: ../scripts/gajim-remote.py:84
 msgid "Popup a window with the next unread message"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:86
+#: ../scripts/gajim-remote.py:88
 #, fuzzy
 msgid ""
 "Print a list of all contacts in the roster. Each contact appear on a "
 "separate line"
 msgstr "Прене_брегване на събития от контакти, които не са в списъка"
 
-#: ../scripts/gajim-remote.py:89 ../scripts/gajim-remote.py:104
-#: ../scripts/gajim-remote.py:116 ../scripts/gajim-remote.py:130
+#: ../scripts/gajim-remote.py:91 ../scripts/gajim-remote.py:106
+#: ../scripts/gajim-remote.py:118 ../scripts/gajim-remote.py:132
 #, fuzzy
 msgid "account"
 msgstr "Акаунт"
 
-#: ../scripts/gajim-remote.py:89
+#: ../scripts/gajim-remote.py:91
 msgid "show only contacts of the given account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:95
+#: ../scripts/gajim-remote.py:97
 #, fuzzy
 msgid "Print a list of registered accounts"
 msgstr "Искате да _регистрирате нов Jabber акаунт"
 
-#: ../scripts/gajim-remote.py:99
+#: ../scripts/gajim-remote.py:101
 msgid "Change the status of account or accounts"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:101
+#: ../scripts/gajim-remote.py:103
 #, fuzzy
 msgid "status"
 msgstr "Състояние"
 
-#: ../scripts/gajim-remote.py:101
+#: ../scripts/gajim-remote.py:103
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 
-#: ../scripts/gajim-remote.py:103 ../scripts/gajim-remote.py:127
+#: ../scripts/gajim-remote.py:105 ../scripts/gajim-remote.py:129
 #, fuzzy
 msgid "message"
 msgstr "_Ново съобщение"
 
-#: ../scripts/gajim-remote.py:103
+#: ../scripts/gajim-remote.py:105
 #, fuzzy
 msgid "status message"
 msgstr "Съобщение за състояние:"
 
-#: ../scripts/gajim-remote.py:104
+#: ../scripts/gajim-remote.py:106
 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 ""
 
-#: ../scripts/gajim-remote.py:110
+#: ../scripts/gajim-remote.py:112
 msgid "Show the chat dialog so that you can send message to a contact"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:113
+#: ../scripts/gajim-remote.py:115
 #, fuzzy
 msgid "jid of the contact that you want to chat with"
 msgstr "Попълнете данните за нов акаунт"
 
-#: ../scripts/gajim-remote.py:116
+#: ../scripts/gajim-remote.py:118
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:121
+#: ../scripts/gajim-remote.py:123
 msgid ""
 "Send new message to a contact in the roster. Both OpenPGP key and account "
 "are optional. If you want to set only 'account', whitout 'pgp key', just set "
 "'pgp key' to ''."
 msgstr ""
 
-#: ../scripts/gajim-remote.py:125
+#: ../scripts/gajim-remote.py:127
 #, fuzzy
 msgid "jid of the contact that will receive the message"
 msgstr "Само ще се променя иконата на контакта, който е изпратил съобщението"
 
-#: ../scripts/gajim-remote.py:127
+#: ../scripts/gajim-remote.py:129
 msgid "message contents"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:128
+#: ../scripts/gajim-remote.py:130
 msgid "pgp key"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:128
+#: ../scripts/gajim-remote.py:130
 msgid "if specified, the message will be encrypted using this pulic key"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:130
+#: ../scripts/gajim-remote.py:132
 msgid "if specified, the message will be sent using this account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:135
+#: ../scripts/gajim-remote.py:137
 msgid "Get detailed info on a contact"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:137
+#: ../scripts/gajim-remote.py:139
 #, fuzzy
 msgid "jid of the contact"
 msgstr "Добавяне на нов контакт"
 
-#: ../scripts/gajim-remote.py:158
+#: ../scripts/gajim-remote.py:160
 msgid "Missing argument \"contact_jid\""
 msgstr ""
 
-#: ../scripts/gajim-remote.py:163 ../scripts/gajim-remote.py:476
+#: ../scripts/gajim-remote.py:165 ../scripts/gajim-remote.py:478
 #, fuzzy
 msgid "Service not available"
 msgstr "Автоматично \"_Не съм на разположение\" след:"
 
-#: ../scripts/gajim-remote.py:181
+#: ../scripts/gajim-remote.py:183
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 msgstr ""
 
-#: ../scripts/gajim-remote.py:184
+#: ../scripts/gajim-remote.py:186
 msgid "You have no active account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:203
+#: ../scripts/gajim-remote.py:205
 #, fuzzy
 msgid "Session bus is not available."
 msgstr "Автоматично \"_Не съм на разположение\" след:"
 
-#: ../scripts/gajim-remote.py:212
+#: ../scripts/gajim-remote.py:214
 #, python-format
 msgid "Unknow dbus version: %s"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:238
+#: ../scripts/gajim-remote.py:240
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
 "\t"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:244
+#: ../scripts/gajim-remote.py:246
 #, python-format
 msgid "%s not found"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:248
+#: ../scripts/gajim-remote.py:250
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:307
+#: ../scripts/gajim-remote.py:309
 #, python-format
 msgid "Unknown type %s "
 msgstr ""
 
-#: ../scripts/gajim-remote.py:449
+#: ../scripts/gajim-remote.py:451
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 msgstr ""
 
+#~ msgid "<b>Links</b>"
+#~ msgstr "<b>Връзки</b>"
+
+#~ msgid "Open _with:"
+#~ msgstr "От_варяне с:"
+
 #, fuzzy
 #~ msgid "Switch to"
 #~ msgstr "Регистриране в %s"
diff --git a/po/de/LC_MESSAGES/gajim.po b/po/de/LC_MESSAGES/gajim.po
index fd5d10dbef820cf9a1289f2307dc4d243cffae91..eba05031e061c0ed653746358f53918b866f9e49 100644
--- a/po/de/LC_MESSAGES/gajim.po
+++ b/po/de/LC_MESSAGES/gajim.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 01:26+0300\n"
+"POT-Creation-Date: 2005-08-09 18:26+0300\n"
 "PO-Revision-Date: 2005-06-01 18:11+0200\n"
 "Last-Translator: Christoph Neuroth <delmonico@gmx.net>\n"
 "Language-Team: German\n"
@@ -27,93 +27,94 @@ msgstr ""
 msgid "Not available as a result of being idle"
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:267
 msgid "Sleeping"
-msgstr ""
+msgstr "Schlafen"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:268
 msgid "Back soon"
-msgstr ""
+msgstr "Bald zurück"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:268
 msgid "Back in some minutes."
 msgstr "Ich bin in ein paar Minuten zurück."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:269
 msgid "Eating"
 msgstr "Essen"
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:269
 msgid "I'm eating, so leave me a message."
 msgstr "Ich bin gerade am essen."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:270
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:270
 msgid "I'm watching a movie."
 msgstr "Ich sehe mir einen Film an."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:271
 msgid "Working"
 msgstr "Arbeit"
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:271
 msgid "I'm working."
 msgstr "Ich bin am arbeiten."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:272
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:272
 msgid "I'm on the phone."
 msgstr "I bin am telefonieren."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:273
 msgid "Out"
 msgstr "Draußen"
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:273
 msgid "I'm out enjoying life"
 msgstr "Ich bin draußen und genieße das Leben"
 
-#: ../src/common/connection.py:291 ../src/common/connection.py:301
+#: ../src/common/connection.py:290 ../src/common/connection.py:300
 #, fuzzy, python-format
 msgid ""
 "Subject: %s\n"
 "%s"
 msgstr "Thema:"
 
-#: ../src/common/connection.py:351 ../src/common/connection.py:1496
+#: ../src/common/connection.py:350 ../src/common/connection.py:1496
 msgid "I would like to add you to my roster."
 msgstr "Ich würde dich gerne zu meiner Liste hinzufügen."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:358
-#, fuzzy, python-format
+#: ../src/common/connection.py:357
+#, python-format
 msgid "we are now subscribed to %s"
-msgstr "%s hat das Abonement beendet"
+msgstr "wir haben jetzt %s abonniert"
 
-#: ../src/common/connection.py:360
+#: ../src/common/connection.py:359
 #, fuzzy, python-format
 msgid "unsubscribe request from %s"
-msgstr "Abonnement-Anforderung von %s"
+msgstr "Anfrage zur Kündigung des Abonnements von %s"
 
-#: ../src/common/connection.py:362
-#, fuzzy, python-format
+#: ../src/common/connection.py:361
+#, python-format
 msgid "we are now unsubscribed from %s"
-msgstr "%s hat das Abonement beendet"
+msgstr "%s hat das Abonnement beendet"
 
-#: ../src/common/connection.py:399
+#: ../src/common/connection.py:398
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
-msgstr ""
+msgstr "Verbindung mit Konto \"%s\" abgebrochen"
 
-#: ../src/common/connection.py:400
+#: ../src/common/connection.py:399
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
+"Um weiter Senden um Empfangen zu können, müssen Sie sich erneut verbinden."
 
 #: ../src/common/connection.py:1133
 msgid "Error:"
@@ -151,16 +152,15 @@ msgstr "Ich bin %s"
 #. We didn't set a passphrase
 #: ../src/common/connection.py:1367
 msgid "OpenPGP Key was not given"
-msgstr ""
+msgstr "Kein OpenPGP-Schlüssel gewählt"
 
 #: ../src/common/connection.py:1368
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
-msgstr ""
+msgstr "Sie werden ohne OpenPGP mit %s verbunden."
 
 #. we're not english
 #: ../src/common/connection.py:1458
-#, fuzzy
 msgid "[This message is encrypted]"
 msgstr "[Diese Nachricht ist verschlüsselt]"
 
@@ -176,7 +176,7 @@ msgid "Gajim disconnected you from %s"
 msgstr "Gajim hat die Verbindung nach %s unterbrochen"
 
 #: ../src/common/connection.py:1882
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "%s seconds have passed and server did not reply to our keep-alive. If you "
 "believe such disconnection should not have happend, you can disable sending "
@@ -190,89 +190,90 @@ msgstr ""
 msgid "error appeared while processing xmpp:"
 msgstr ""
 
-#: ../src/common/helpers.py:28
+#: ../src/common/helpers.py:30
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: ../src/common/helpers.py:30
+#: ../src/common/helpers.py:32
 msgid "Not Available"
 msgstr "Nicht verfügbar"
 
-#: ../src/common/helpers.py:32
+#: ../src/common/helpers.py:34
 msgid "Free for Chat"
 msgstr "Frei zum Chatten"
 
-#: ../src/common/helpers.py:34
+#: ../src/common/helpers.py:36
 msgid "Available"
 msgstr "Angemeldet"
 
-#: ../src/common/helpers.py:36
+#: ../src/common/helpers.py:38
 msgid "Connecting"
 msgstr "Verbinde"
 
-#: ../src/common/helpers.py:38
+#: ../src/common/helpers.py:40
 msgid "Away"
 msgstr "Abwesend"
 
-#: ../src/common/helpers.py:40
+#: ../src/common/helpers.py:42
 msgid "Offline"
 msgstr "Abgemeldet"
 
-#: ../src/common/helpers.py:42
+#: ../src/common/helpers.py:44
 msgid "Invisible"
 msgstr "Unsichtbar"
 
-#: ../src/common/helpers.py:44
+#: ../src/common/helpers.py:46
 msgid "Not in the roster"
 msgstr "Nicht in der Liste"
 
-#: ../src/common/helpers.py:46 ../src/vcard.py:249 ../src/vcard.py:251
+#: ../src/common/helpers.py:48 ../src/vcard.py:249 ../src/vcard.py:251
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../src/common/helpers.py:48
+#: ../src/common/helpers.py:50
 msgid "Has errors"
 msgstr "Hat Fehler"
 
-#: ../src/common/helpers.py:53 ../src/common/helpers.py:67
-#: ../src/groupchat_window.py:271 ../src/gtkgui.glade.h:173
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:69
+#: ../src/groupchat_window.py:271 ../src/gtkgui.glade.h:174
 msgid "None"
 msgstr "Kein"
 
-#: ../src/common/helpers.py:55
+#: ../src/common/helpers.py:57
 msgid "To"
-msgstr ""
+msgstr "An"
 
-#: ../src/common/helpers.py:57
-#, fuzzy
+#: ../src/common/helpers.py:59
 msgid "From"
-msgstr "Raum:"
+msgstr "Von"
 
-#: ../src/common/helpers.py:59
+#: ../src/common/helpers.py:61
 msgid "Both"
 msgstr "Beide"
 
-#: ../src/common/helpers.py:69
+#: ../src/common/helpers.py:71
 msgid "Subscribe"
 msgstr "_Abonnieren"
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "is paying attention to the conversation"
 msgstr "beobachtet diese Unterhaltung"
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:112
 msgid "is doing something else"
 msgstr "tut etwas anderes"
 
-#: ../src/common/helpers.py:112
+#: ../src/common/helpers.py:114
 msgid "is composing a message..."
 msgstr "schreibt im Moment..."
 
-#: ../src/common/helpers.py:114
-msgid "paused composing a message..."
+#. paused means he was compoing but has stopped for a while
+#: ../src/common/helpers.py:117
+#, fuzzy
+msgid "paused composing a message"
 msgstr "schreibt im Moment nicht mehr..."
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 msgid "has closed the chat window or tab"
 msgstr "hat das Chat-Fenster oder den Reiter geschlossen"
 
@@ -303,15 +304,6 @@ msgstr ""
 msgid "Unable to write file in %s\n"
 msgstr ""
 
-#: ../src/common/optparser.py:84
-msgid "No space left on device"
-msgstr ""
-
-#: ../src/common/optparser.py:100
-#, python-format
-msgid "Unable to open %s for writing\n"
-msgstr ""
-
 #: ../src/advanced.py:52
 msgid "Preference Name"
 msgstr "Name der Einstellung"
@@ -328,15 +320,14 @@ msgstr "Typ"
 msgid "Chat"
 msgstr "Unterhaltung"
 
-#: ../src/chat.py:124 ../src/gtkgui.glade.h:127
+#: ../src/chat.py:124 ../src/gtkgui.glade.h:128
 msgid "Group Chat"
 msgstr "Chatraum"
 
 #. if we have 2 or more accounts
 #: ../src/chat.py:135
-#, fuzzy
 msgid "account: "
-msgstr " (Konto: "
+msgstr " Konto: "
 
 #. Groups maynot change name from or to 'not in the roster'
 #: ../src/chat.py:236 ../src/chat.py:904 ../src/dialogs.py:112
@@ -355,7 +346,6 @@ msgid "Switch to %s"
 msgstr "Wechseln zu %s"
 
 #: ../src/chat.py:488
-#, fuzzy
 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 "
@@ -406,287 +396,273 @@ msgstr "Im _Internet suchen"
 msgid "Subject: %s\n"
 msgstr "Thema:"
 
-#: ../src/config.py:198 ../src/config.py:428
+#: ../src/config.py:199 ../src/config.py:436
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Alle %s _Minuten"
 
-#: ../src/config.py:301
+#: ../src/config.py:307
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:309
+#: ../src/config.py:315
 msgid "Event"
 msgstr "Ereignis"
 
-#: ../src/config.py:315
+#: ../src/config.py:321
 msgid "Sound"
 msgstr "Klang"
 
-#: ../src/config.py:918
+#: ../src/config.py:930
 #, fuzzy
 msgid "status message title"
 msgstr "Status-Nachricht:"
 
-#: ../src/config.py:918
+#: ../src/config.py:930
 #, fuzzy
 msgid "status message text"
 msgstr "Status-Nachricht:"
 
-#: ../src/config.py:971
+#: ../src/config.py:983
 msgid "Choose Sound"
 msgstr "Klang wählen"
 
-#: ../src/config.py:978 ../src/config.py:1923 ../src/vcard.py:131
+#: ../src/config.py:990 ../src/config.py:1935 ../src/vcard.py:131
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: ../src/config.py:983
+#: ../src/config.py:995
 msgid "Wav Sounds"
 msgstr "Wav Klänge"
 
-#: ../src/config.py:1152
+#: ../src/config.py:1164
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP kann auf diesem Computer nicht genutzt werden"
 
-#: ../src/config.py:1177
-#, fuzzy
+#: ../src/config.py:1189
 msgid "You are currently connected to the server"
-msgstr "Sie müssen angemeldet sein um Dienste zu durchforsten"
+msgstr "Sie sind momentan mit dem Server verbunden"
 
-#: ../src/config.py:1178
+#: ../src/config.py:1190
 msgid "To change the account name, you must be disconnected."
-msgstr ""
+msgstr "Um den Kontonamen zu ändern, müssen Sie die Verbindung beenden."
 
-#: ../src/config.py:1181 ../src/config.py:1185
+#: ../src/config.py:1193 ../src/config.py:1197
 msgid "Invalid account name"
-msgstr ""
+msgstr "Ungültiger Kontoname"
 
-#: ../src/config.py:1182
-#, fuzzy
+#: ../src/config.py:1194
 msgid "Account name cannot be empty."
-msgstr "Sie müssen ein Passwort eingeben"
+msgstr "Der Kontoname darf nicht leer sein."
 
-#: ../src/config.py:1186
-#, fuzzy
+#: ../src/config.py:1198
 msgid "Account name cannot contain spaces."
-msgstr "Sie müssen ein Passwort eingeben"
+msgstr "Der Kontoname darf keine Leerzeichen enthalten."
 
-#: ../src/config.py:1190
-#, fuzzy
+#: ../src/config.py:1202
 msgid "Invalid Jabber ID"
-msgstr "Jabber-ID:"
+msgstr "Ungültige Jabber-ID"
 
-#: ../src/config.py:1191
+#: ../src/config.py:1203
 msgid "A Jabber ID must be in the form \"user@servername\"."
-msgstr ""
+msgstr "Eine Jabber-ID muss die Form \"benutzer@servername\" haben."
 
-#: ../src/config.py:1198 ../src/dialogs.py:1107
-#, fuzzy
+#: ../src/config.py:1210 ../src/dialogs.py:1107
 msgid "Invalid password"
-msgstr "Pass_wort speichern"
+msgstr "Ungültiges Passwort"
 
-#: ../src/config.py:1199
-#, fuzzy
+#: ../src/config.py:1211
 msgid "You must enter a password for the new account."
-msgstr "Sie müssen ein Passwort eingeben, um ein neues Konto zu erstellen"
+msgstr "Sie müssen ein Passwort für das neue Konto eingeben."
 
-#: ../src/config.py:1236
+#: ../src/config.py:1248
 msgid "Invalid entry"
-msgstr ""
+msgstr "Ungültiger Eintrag"
 
-#: ../src/config.py:1237
-#, fuzzy
+#: ../src/config.py:1249
 msgid "Custom port must be a port number."
 msgstr "Proxy Port muss eine Port-Nummer sein"
 
-#: ../src/config.py:1324
+#: ../src/config.py:1336
 msgid "Account name is in use"
-msgstr ""
+msgstr "Kontoname ist schon vergeben"
 
-#: ../src/config.py:1325
-#, fuzzy
+#: ../src/config.py:1337
 msgid "You already have an account using this name."
-msgstr "Ich habe bereits ein Konto, das ich benutzen möchte"
+msgstr "Sie haben bereits ein Konto mit diesem Namen."
 
-#: ../src/config.py:1387
-#, fuzzy
+#: ../src/config.py:1399
 msgid "No such account available"
-msgstr "Nicht verfügbar"
+msgstr "Account nicht verfügbar"
 
-#: ../src/config.py:1388
-#, fuzzy
+#: ../src/config.py:1400
 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:1395 ../src/config.py:2005 ../src/dialogs.py:981
+#: ../src/config.py:1407 ../src/config.py:2017 ../src/dialogs.py:981
 #: ../src/dialogs.py:1087 ../src/vcard.py:374 ../src/vcard.py:402
 msgid "You are not connected to the server"
 msgstr "Sie sind nicht mit dem Server verbunden"
 
-#: ../src/config.py:1396
+#: ../src/config.py:1408
 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:1423
-#, fuzzy
+#: ../src/config.py:1435
 msgid "Failed to get secret keys"
 msgstr "Holen der geheimen Schlüssel fehlgeschlagen"
 
-#: ../src/config.py:1424
+#: ../src/config.py:1436
 msgid "There was a problem retrieving your GPG secret keys."
-msgstr ""
+msgstr "Es gab ein Problem beim Holen ihres geheimen GPG Schlüssels."
 
-#: ../src/config.py:1427 ../src/gtkgui.glade.h:183
+#: ../src/config.py:1439 ../src/gtkgui.glade.h:183
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1440
 msgid "Choose your OpenPGP key"
 msgstr "Wählen Sie ihren OpenPGP Schlüssel"
 
-#: ../src/config.py:1436 ../src/gtkgui.glade.h:172
+#: ../src/config.py:1448 ../src/gtkgui.glade.h:173
 msgid "No key selected"
 msgstr "Kein Schlüssel gewählt"
 
-#: ../src/config.py:1667 ../src/config.py:2028
+#: ../src/config.py:1679 ../src/config.py:2040
 msgid "Name"
 msgstr "Name"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1682
 msgid "Server"
 msgstr "Server"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1775 ../src/config.py:2247 ../src/dialogs.py:112
+#: ../src/config.py:1787 ../src/config.py:2259 ../src/dialogs.py:112
 #: ../src/dialogs.py:282 ../src/dialogs.py:318 ../src/roster_window.py:123
 #: ../src/roster_window.py:128 ../src/roster_window.py:152
 #: ../src/roster_window.py:1928 ../src/roster_window.py:1930
 #: ../src/roster_window.py:2007 ../src/systray.py:214
 msgid "Transports"
-msgstr ""
+msgstr "Transports"
 
-#: ../src/config.py:1790
+#: ../src/config.py:1802
 #, python-format
 msgid "Edit %s"
 msgstr "%s ändern"
 
-#: ../src/config.py:1792
+#: ../src/config.py:1804
 #, python-format
 msgid "Register to %s"
 msgstr "Auf %s registrieren"
 
-#: ../src/config.py:1812
+#: ../src/config.py:1824
 msgid "Text"
 msgstr "Text"
 
-#: ../src/config.py:1820
+#: ../src/config.py:1832
 msgid "Image"
 msgstr "Bild"
 
-#: ../src/config.py:1867
+#: ../src/config.py:1879
 msgid "Image is too big"
-msgstr ""
+msgstr "Das Bild ist zu groß"
 
-#: ../src/config.py:1867
+#: ../src/config.py:1879
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
 msgstr ""
+"Das Bild darf eine Höhe und Breite von je 24 Pixeln nicht überschreiten."
 
-#: ../src/config.py:1917
-#, fuzzy
+#: ../src/config.py:1929
 msgid "Choose Image"
-msgstr "_Schlüssel wählen"
+msgstr "Bild auswählen"
 
-#: ../src/config.py:1928 ../src/vcard.py:136
-#, fuzzy
+#: ../src/config.py:1940 ../src/vcard.py:136
 msgid "Images"
-msgstr "Bild"
+msgstr "Bilder"
 
-#: ../src/config.py:2006
-#, fuzzy
+#: ../src/config.py:2018
 msgid "Without a connection, you can not browse available services"
 msgstr "Sie müssen angemeldet sein um Dienste zu durchforsten"
 
-#: ../src/config.py:2011
+#: ../src/config.py:2023
 #, python-format
 msgid "Service Discovery using %s account"
 msgstr "Dienste Durchsuchen für Konto %s"
 
-#: ../src/config.py:2013
+#: ../src/config.py:2025
 msgid "Service Discovery"
 msgstr "Dienste Durchsuchen"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2045
 msgid "Service"
 msgstr "Dienst"
 
-#: ../src/config.py:2038
+#: ../src/config.py:2050
 msgid "Node"
 msgstr "Node"
 
-#: ../src/config.py:2250 ../src/gtkgui.glade.h:305
+#: ../src/config.py:2262 ../src/gtkgui.glade.h:305
 msgid "_Edit"
 msgstr "_Ändern"
 
-#: ../src/config.py:2252 ../src/gtkgui.glade.h:201
+#: ../src/config.py:2264 ../src/gtkgui.glade.h:201
 msgid "Re_gister"
 msgstr "Re_gistrieren"
 
-#: ../src/config.py:2424
+#: ../src/config.py:2436
 #, python-format
 msgid "Removing %s account"
 msgstr "Entferne Konto %s"
 
-#: ../src/config.py:2431
+#: ../src/config.py:2443
 #, fuzzy, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Sie müssen angemeldet sein um Dienste zu durchforsten"
 
-#: ../src/config.py:2432
+#: ../src/config.py:2444
 msgid "If you remove it, the connection will be lost."
 msgstr ""
 
-#: ../src/config.py:2557
+#: ../src/config.py:2569
 msgid "New Room"
 msgstr "Neuer Raum"
 
-#: ../src/config.py:2587
+#: ../src/config.py:2599
 msgid "This bookmark has invalid data"
-msgstr ""
+msgstr "Dieser Bookmark hat ungültige Daten"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2600
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 
-#: ../src/config.py:2808
+#: ../src/config.py:2820
 msgid ""
 "Account has been added successfully.\n"
 "You can set advanced options by using \"Edit->Accounts\" from the main "
 "window."
 msgstr ""
 
-#: ../src/config.py:2819
+#: ../src/config.py:2831
 msgid ""
 "Your new account has been created and added to your gajim configuration.\n"
 "You can set advanced account options using \"Edit->Accounts\" in the main "
 "window menu."
 msgstr ""
 
-#: ../src/config.py:2833
-#, fuzzy
+#: ../src/config.py:2845
 msgid "You need to enter a username to add an account."
 msgstr "Sie müssen einen Namen für dieses Konto eingeben"
 
-#: ../src/config.py:2837
-#, fuzzy
+#: ../src/config.py:2849
 msgid "You need to enter a valid server address to add an account."
-msgstr "Sie müssen ein Passwort eingeben, um ein neues Konto zu erstellen"
+msgstr ""
+"Sie müssen einen gültigen Server angeben, um ein neues Konto zu erstellen."
 
 #: ../src/dialogs.py:54
 #, python-format
@@ -706,7 +682,7 @@ msgstr "Letzte Gruppe kann nicht entfernt werden"
 
 #: ../src/dialogs.py:99
 msgid "At least one contact group must be present."
-msgstr ""
+msgstr "Ein Kontakt muss zu mindestens einer Gruppe gehören"
 
 #: ../src/dialogs.py:120
 msgid "Group"
@@ -753,7 +729,7 @@ msgstr "Gajim - Ein GTK+ Jabber-Client"
 #: ../src/dialogs.py:395
 #, python-format
 msgid "Version %s"
-msgstr ""
+msgstr "Version %s"
 
 #: ../src/dialogs.py:406
 msgid "A GTK jabber client"
@@ -772,7 +748,7 @@ msgstr "Gajim - %s ungelesene Nachrichten"
 msgid "Gajim - 1 unread message"
 msgstr "Gajim - Eine ungelesene Nachricht"
 
-#: ../src/dialogs.py:696 ../src/gtkgui.glade.h:116
+#: ../src/dialogs.py:696 ../src/gtkgui.glade.h:117
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -781,29 +757,27 @@ msgstr "Gajim"
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/dialogs.py:733 ../src/dialogs.py:834 ../src/dialogs.py:1777
+#: ../src/dialogs.py:733 ../src/dialogs.py:834 ../src/dialogs.py:1778
 msgid "Name: "
 msgstr "Name: "
 
 #: ../src/dialogs.py:739
-#, fuzzy
 msgid "Type: "
-msgstr "Typ"
+msgstr "Typ: "
 
 #: ../src/dialogs.py:741
-#, fuzzy
 msgid "Download"
-msgstr "Download-Seite öffnen"
+msgstr "Download"
 
 #: ../src/dialogs.py:743
 msgid "Upload"
-msgstr ""
+msgstr "Upload"
 
-#: ../src/dialogs.py:745 ../src/dialogs.py:1779
+#: ../src/dialogs.py:745 ../src/dialogs.py:1780
 msgid "Sender: "
-msgstr "Sender: "
+msgstr "Absender: "
 
-#: ../src/dialogs.py:748 ../src/dialogs.py:1781
+#: ../src/dialogs.py:748 ../src/dialogs.py:1782
 msgid "Recipient: "
 msgstr "Empfänger: "
 
@@ -874,7 +848,7 @@ msgstr "Sie können einem Chatraum erst beitreten, wenn Sie verbunden sind."
 msgid "Join Group Chat as %s"
 msgstr "Betrete Chatraum als"
 
-#: ../src/dialogs.py:997 ../src/gtkgui.glade.h:153
+#: ../src/dialogs.py:997 ../src/gtkgui.glade.h:154
 #, fuzzy
 msgid "Join Group Chat"
 msgstr "Betrete Chatraum"
@@ -885,7 +859,7 @@ msgid "New Message as %s"
 msgstr "Neue Nachricht als "
 
 #: ../src/dialogs.py:1062 ../src/dialogs.py:1157 ../src/gajim.py:462
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:170
 msgid "New Message"
 msgstr "Neue Nachricht"
 
@@ -965,7 +939,7 @@ msgstr "_Transport-Symbole verwenden"
 
 #: ../src/dialogs.py:1172 ../src/gajim.py:812
 msgid "File Transfer Completed"
-msgstr ""
+msgstr "Dateiübertragung Abgeschlossen"
 
 #: ../src/dialogs.py:1172 ../src/gajim.py:815
 #, fuzzy
@@ -1018,42 +992,39 @@ msgid "XML Console"
 msgstr "XML Konsole"
 
 #: ../src/dialogs.py:1548
-#, fuzzy
 msgid "File"
-msgstr "Filter:"
+msgstr "Datei"
 
 #: ../src/dialogs.py:1561
 msgid "Progress"
 msgstr "Fortschritt"
 
 #: ../src/dialogs.py:1577 ../src/dialogs.py:1602
-#, fuzzy, python-format
+#, python-format
 msgid "Filename: %s"
-msgstr "_Name: "
+msgstr "Dateiname: %s"
 
 #: ../src/dialogs.py:1579 ../src/dialogs.py:1641
-#, fuzzy, python-format
+#, python-format
 msgid "Size: %s"
-msgstr "_Ablehnen"
+msgstr "Größe: %s"
 
 #: ../src/dialogs.py:1581 ../src/dialogs.py:1604
-#, fuzzy, python-format
+#, python-format
 msgid "Sender: %s"
-msgstr "_Ablehnen"
+msgstr "Absender: %s"
 
 #: ../src/dialogs.py:1583
-#, fuzzy
 msgid "File transfer completed"
-msgstr "_Transport-Symbole verwenden"
+msgstr "Dateiübertragung abgeschlossen"
 
 #: ../src/dialogs.py:1589 ../src/dialogs.py:1595
-#, fuzzy
 msgid "File transfer canceled"
-msgstr "_Transport-Symbole verwenden"
+msgstr "Dateiübertragung abgebrochen"
 
 #: ../src/dialogs.py:1589
 msgid "Connection with peer cannot be established."
-msgstr ""
+msgstr "Verbindung zum Teilnehmer kann nicht hergestellt werden"
 
 #: ../src/dialogs.py:1596
 msgid "You are unable to connect to remote host. He may be behind a NAT."
@@ -1103,20 +1074,18 @@ msgstr "Diese Datei existiert schon"
 msgid "Would you like to overwrite it?"
 msgstr "Möchten Sie die Datei überschreiben?"
 
-#: ../src/dialogs.py:1880 ../src/gtkgui.glade.h:338
-#, fuzzy
+#: ../src/dialogs.py:1881 ../src/gtkgui.glade.h:338
 msgid "_Pause"
-msgstr "Status"
+msgstr "_Pause"
 
-#: ../src/dialogs.py:1883 ../src/dialogs.py:1915
+#: ../src/dialogs.py:1884 ../src/dialogs.py:1916
 #, fuzzy
 msgid "_Continue"
 msgstr "Verbinde"
 
-#: ../src/dialogs.py:1911
-#, fuzzy
+#: ../src/dialogs.py:1912
 msgid "Pause"
-msgstr "Wert"
+msgstr "Pause"
 
 #. ('HTTP_AUTH', account, (method, url, iq_obj))
 #: ../src/gajim.py:204
@@ -1126,49 +1095,48 @@ msgstr "Autorisierung erneut anfordern"
 
 #: ../src/gajim.py:205
 msgid "Do you accept this request?"
-msgstr ""
+msgstr "Akzeptieren Sie diese Anfrage?"
 
 #: ../src/gajim.py:510
 msgid "error while sending"
 msgstr "Fehler beim Senden"
 
 #: ../src/gajim.py:536 ../src/gajim.py:546 ../src/roster_window.py:125
-#: ../src/roster_window.py:1036 ../src/gtkgui.glade.h:124
+#: ../src/roster_window.py:1036 ../src/gtkgui.glade.h:125
 msgid "General"
 msgstr "Allgemein"
 
 #: ../src/gajim.py:550
-#, fuzzy
 msgid "Authorization accepted"
-msgstr "Autorisierung erneut senden"
+msgstr "Autorisierung akzeptiert"
 
 #: ../src/gajim.py:551
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his status."
-msgstr ""
+msgstr "Der Kontakt \"%s\" hat Sie autorisiert seinen Staus zu sehen."
 
 #: ../src/gajim.py:557
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
-msgstr ""
+msgstr "Kontakt \"%s\" hat das Abonnement zurückgezogen"
 
 #: ../src/gajim.py:558
 msgid "You will always see him as offline."
-msgstr ""
+msgstr "Sie sehen den Kontakt ab sofort als offline."
 
 #: ../src/gajim.py:573
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
-msgstr ""
+msgstr "Der Kontakt mit \"%s\" kann nicht hergestellt werden"
 
 #: ../src/gajim.py:591
 msgid "Account registration successful"
-msgstr ""
+msgstr "Konto-Registrierung erfolgreich"
 
 #: ../src/gajim.py:592
 #, python-format
 msgid "The account \"%s\" has been registered with the Jabber server."
-msgstr ""
+msgstr "Das Konto \"%s\" wurde auf dem Jabber-Server registriert."
 
 #: ../src/gajim.py:704
 msgid "Your passphrase is incorrect"
@@ -1178,9 +1146,10 @@ msgstr "Ihre Passphrase ist falsch"
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Sie wurden ohne ihren GPG-Schlüssel verbunden"
 
-#: ../src/gajim.py:1025
+#. it is good to notify the user, in case he cannot see the output of the console
+#: ../src/gajim.py:1027
 msgid "Cannot save your preferences"
-msgstr ""
+msgstr "Kann Einstellungen nicht speichern"
 
 #: ../src/gajim_themes_window.py:63
 msgid "Theme"
@@ -1316,7 +1285,7 @@ msgstr "Sie können eine Begründung angeben:"
 msgid "Banning %s"
 msgstr "%s verbannen"
 
-#: ../src/groupchat_window.py:961 ../src/tabbed_chat_window.py:323
+#: ../src/groupchat_window.py:961 ../src/tabbed_chat_window.py:327
 msgid "If you close this tab, the message will be lost."
 msgstr "Wenn Sie diesen Reiter schließen, ist die Nachricht verloren."
 
@@ -1417,9 +1386,9 @@ msgid "using %s account"
 msgstr "Entferne Konto %s"
 
 #: ../src/roster_window.py:475
-#, fuzzy, python-format
+#, python-format
 msgid "as %s"
-msgstr "als "
+msgstr "als %s"
 
 #: ../src/roster_window.py:486
 #, fuzzy, python-format
@@ -1574,38 +1543,38 @@ msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
 msgstr ""
 "%s hat keinen OpenPGP-Schlüssel verbreitet und Sie haben keinen zugewiesen"
 
-#: ../src/tabbed_chat_window.py:254 ../src/tabbed_chat_window.py:322
+#: ../src/tabbed_chat_window.py:258 ../src/tabbed_chat_window.py:326
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Sie haben eine neue Nachricht von \"%s\""
 
-#: ../src/tabbed_chat_window.py:255
+#: ../src/tabbed_chat_window.py:259
 msgid "If you close the window, this message will be lost."
 msgstr "Wenn Sie das Fenster schließen, ist die Nachricht verloren."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:488
+#: ../src/tabbed_chat_window.py:492
 msgid "A connection is not available"
 msgstr "Keine Verbindung verfügbar"
 
-#: ../src/tabbed_chat_window.py:489
+#: ../src/tabbed_chat_window.py:493
 msgid "Your message can not be sent until you are connected."
 msgstr "Ihre Nachricht kann erst gesendet werden, wenn Sie verbunden sind."
 
-#: ../src/tabbed_chat_window.py:577
+#: ../src/tabbed_chat_window.py:581
 msgid "Sending private message failed"
 msgstr "Senden privater Nachricht fehlgeschlagen"
 
-#: ../src/tabbed_chat_window.py:578
+#: ../src/tabbed_chat_window.py:582
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Sie sind nicht mehr im Raum \"%s\" oder \"%s\" hat den Raum verlassen."
 
-#: ../src/tabbed_chat_window.py:681
+#: ../src/tabbed_chat_window.py:685
 msgid "Encryption enabled"
 msgstr "Verschlüsselung aktiviert"
 
-#: ../src/tabbed_chat_window.py:686
+#: ../src/tabbed_chat_window.py:690
 msgid "Encryption disabled"
 msgstr "Verschlüsselung deaktiviert"
 
@@ -1650,29 +1619,31 @@ msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Erweiterter Konfigurations-Editor</b>"
 
 #: ../src/gtkgui.glade.h:4
-msgid "<b>Changes in latest version</b>"
-msgstr "<b>Änderungen in der neuesten Version</b>"
+#, fuzzy
+msgid "<b>Applications</b>"
+msgstr "<b>Benutzerdefinierte Anwendungen</b>"
 
 #: ../src/gtkgui.glade.h:5
-msgid "<b>Custom Applications</b>"
-msgstr "<b>Benutzerdefinierte Anwendungen</b>"
+msgid "<b>Changes in latest version</b>"
+msgstr "<b>Änderungen in der neuesten Version</b>"
 
 #: ../src/gtkgui.glade.h:6
+#, fuzzy
+msgid "<b>Custom</b>"
+msgstr "<b>Log</b>"
+
+#: ../src/gtkgui.glade.h:7
 msgid "<b>Format of a chat line</b>"
 msgstr "<b>Format der Chat-Zeile</b>"
 
-#: ../src/gtkgui.glade.h:7
+#: ../src/gtkgui.glade.h:8
 msgid "<b>Interface Customization</b>"
 msgstr "<b>Benutzerdefiniertes Aussehen</b>"
 
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Verkehrsdaten</b>"
 
-#: ../src/gtkgui.glade.h:9
-msgid "<b>Links</b>"
-msgstr "<b>Links</b>"
-
 #: ../src/gtkgui.glade.h:10
 msgid "<b>Log</b>"
 msgstr "<b>Log</b>"
@@ -1747,12 +1718,11 @@ msgstr "Konten"
 
 #: ../src/gtkgui.glade.h:28
 msgid "Activate/Disable notification for complete transfer"
-msgstr ""
+msgstr "Benachrichtigung für beendete Dateitransfers ein/ausschalten"
 
 #: ../src/gtkgui.glade.h:29
-#, fuzzy
 msgid "Ad_vanced Actions"
-msgstr "_Aktionen"
+msgstr "Er_weiterte Aktionen"
 
 #: ../src/gtkgui.glade.h:30
 msgid "Add New Contact"
@@ -1783,14 +1753,13 @@ msgid "After time:"
 msgstr "Nach der Zeit:"
 
 #: ../src/gtkgui.glade.h:37
-#, fuzzy
 msgid ""
 "All chat states\n"
 "Composing only\n"
 "Disabled"
 msgstr ""
-"Nur beim Schreiben\n"
 "Immer\n"
+"Nur beim Schreiben\n"
 "Deaktiviert"
 
 #: ../src/gtkgui.glade.h:40
@@ -2007,15 +1976,15 @@ msgstr "Standard _Status-Symbole:"
 
 #: ../src/gtkgui.glade.h:91
 msgid "Delete MOTD"
-msgstr ""
+msgstr "Lösche MOTD"
 
 #: ../src/gtkgui.glade.h:92
 msgid "Delete Message of the Day"
-msgstr ""
+msgstr "Lösche Nachricht des Tages"
 
 #: ../src/gtkgui.glade.h:93
 msgid "Deletes Message of the Day"
-msgstr ""
+msgstr "Löscht die Nachricht des Tages"
 
 #: ../src/gtkgui.glade.h:94
 msgid "Deny authorization from contact so he cannot know when you're connected"
@@ -2028,9 +1997,8 @@ msgid "Department:"
 msgstr "Abteilung:"
 
 #: ../src/gtkgui.glade.h:96
-#, fuzzy
 msgid "E-Mail"
-msgstr "E-Mail:"
+msgstr "E-Mail"
 
 #: ../src/gtkgui.glade.h:97
 msgid "E-Mail:"
@@ -2089,30 +2057,35 @@ msgid "File _Transfers"
 msgstr "Dateiübertragung"
 
 #: ../src/gtkgui.glade.h:111
+#, fuzzy
+msgid "File manager:"
+msgstr "Dateiübertragung"
+
+#: ../src/gtkgui.glade.h:112
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 msgid "Font:"
 msgstr "Schriftart:"
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:114
 msgid "Format: YYYY-MM-DD"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:115
 msgid "From:"
 msgstr "Von:"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:116
 msgid "GPG Encryption"
 msgstr "GPG Verschlüsselung"
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Gajim Themes Customization"
 msgstr "Gajim Stil Einstellungen"
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2120,7 +2093,7 @@ msgstr ""
 "Gajim zeigt die neu erhaltene Nachricht in einem neuen Chat-Fenster oder "
 "einem Reiter in einem existieren Chat-Fenster"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2128,7 +2101,7 @@ msgstr ""
 "Gajim wird Sie über neue Nachrichten mit einem Popup in der rechten unteren "
 "Ecke des Bildschirms benachrichtigen"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:121
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2136,7 +2109,7 @@ msgstr ""
 "Gajim wird Sie über ein Popup-Fenster in der rechten unteren Ecke des "
 "Bildschirmes über Kontakte informieren, die sich gerade angemeldet haben"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:122
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2144,75 +2117,73 @@ msgstr ""
 "Gajim wird Sie über ein Popup-Fenster in der rechten unteren Bildschirmecke "
 "über Kontakte informieren, die sich gerade abgemeldet haben"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:123
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr ""
 "Gajim wird nur das Symbol des Kontaktes ändern, von dem die neue Nachricht "
 "kommt"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
 msgid "Gajim: First Time Wizard"
 msgstr "Gajim: Einstiegs-Assistent"
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:126
 msgid "Given:"
 msgstr "Vorname:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:127
 msgid "Go"
 msgstr "Los"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:129
 msgid "Group:"
 msgstr "Gruppe:"
 
-#: ../src/gtkgui.glade.h:129
-#, fuzzy
+#: ../src/gtkgui.glade.h:130
 msgid "HTTP Connect"
-msgstr "Verbinde"
+msgstr "HTTP Connect"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:131
 msgid "Homepage:"
 msgstr "Homepage:"
 
-#: ../src/gtkgui.glade.h:131
-#, fuzzy
+#: ../src/gtkgui.glade.h:132
 msgid "Hostname: "
-msgstr "_Server:"
+msgstr "Hostname: "
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:133
 msgid "I already have an account I want to use"
 msgstr "Ich habe bereits ein Konto, das ich benutzen möchte"
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "I want to _register for a new account"
 msgstr "Ich möchte ein neues Konto _erstellen"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:135
 msgid "I would like to add you to my contact list."
 msgstr "Ich würde Sie gerne zu meiner Kontaktliste hinzufügen."
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "Wenn gewählt wird Gajim ein Tray-Symbol verwenden"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid ""
 "If checked, Gajim will broadcast capability to send and receive meta-"
 "information related to a conversation you may have with a contact such as "
 "composing a message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 msgid "If checked, Gajim will join this groupchat on startup"
 msgstr "Wenn gewählt tritt Gajim dem Chatraum beim Programmstart bei"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:139
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Falls gewählt, speichert Gajim das Passwort für dieses Konto"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:140
 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"
@@ -2220,7 +2191,7 @@ msgstr ""
 "Wenn gewählt, merkt sich Gajim die Position und Größe der Kontaktliste auf "
 "dem Bildschirm"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2228,7 +2199,7 @@ msgstr ""
 "Wenn gewählt wird Gajim ASCII-Smilies wie ':)' mit äquivalenten graphischen "
 "Emoticons ersetzen"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2236,7 +2207,7 @@ msgstr ""
 "Wenn aktiviert, sendet Gajim regelmäßig keep-alive-Pakete um den "
 "Verbindungsabbruch aufgrund einer Zeitüberschreitung zu verhindern"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for only you and of course the administrator"
@@ -2244,7 +2215,7 @@ msgstr ""
 "Wenn Sie diese Option wählen, wird Gajim das Passwort in ~/.gajim/config mit "
 "'lese' -Rechten für Sie und ihren Administrator speichern"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:144
 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, "
@@ -2254,7 +2225,7 @@ msgstr ""
 "verwenden (Ein Kontakt aus MSN wird z.B. das äquivalente MSN-Symbol für den "
 "Status \"Anwesend\", \"Abwesend\", \"Beschäftigt\", etc... haben)"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:145
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2262,8 +2233,7 @@ msgstr ""
 "Wenn Sie diese Option wählen, wird Gajim während des Startvorgangs "
 "automatisch zu diesem Konto verbinden"
 
-#: ../src/gtkgui.glade.h:145
-#, fuzzy
+#: ../src/gtkgui.glade.h:146
 msgid ""
 "If checked, all chat and group chat windows will have the information area "
 "in the top and the buttons area in the bottom hidden. You can quick toggle "
@@ -2275,7 +2245,7 @@ msgstr ""
 "zwischen der kompakten und der normalen Ansicht umschalten. Achtung: die "
 "jeweils letzte Ansicht wird nicht beibehalten!"
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:147
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2283,120 +2253,114 @@ msgstr ""
 "Wenn Sie zwei oder mehr Konten haben und diese Option gewählt ist, wird "
 "Gajim alle Kontakte auflisten, als hätten Sie ein Konto"
 
-#: ../src/gtkgui.glade.h:147
+#: ../src/gtkgui.glade.h:148
 msgid "Incoming message:"
 msgstr "Eingehende Nachricht:"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:149
 msgid "Info/Query"
 msgstr "Info/Query"
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:150
 msgid "Information about you are stored on the server as vCard"
 msgstr "Informationen über Sie werden als vCard auf dem Server gespeichert"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:151
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:152
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:153
 msgid "Jabber ID:"
 msgstr "Jabber-ID:"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:155
 msgid "Join _Group Chat"
 msgstr "_Chatraum beitreten"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:156
 msgid "Join _Group Chat..."
 msgstr "_Chatraum beitreten"
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:157
 msgid "Location"
 msgstr "Ort"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:158
 msgid "Log history"
 msgstr "Log-Verlauf"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:159
 msgid "Log presences in _contact's log file"
 msgstr "Anwesenheit in _Kontakt-Logdateien schreiben"
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:160
 msgid "Log presences in an _external file"
 msgstr "Anwesenheit in eine _externe Datei speichern"
 
-#: ../src/gtkgui.glade.h:160
-#, fuzzy
+#: ../src/gtkgui.glade.h:161
 msgid "Manage Accounts"
-msgstr "Konten _zusammenführen"
+msgstr "Konten Verwalten"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:162
 msgid "Manage Bookmarks"
 msgstr "Verwalte Bookmarks"
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:163
 msgid "Manage Emoticons"
 msgstr "Emoticons anpassen"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:164
 msgid "Manage Proxy Profiles"
 msgstr "Proxy Verwaltung"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:165
 msgid "Manage..."
 msgstr "Verwalten..."
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:166
 msgid "Middle:"
 msgstr "Mittelname"
 
-#: ../src/gtkgui.glade.h:166
-#, fuzzy
+#: ../src/gtkgui.glade.h:167
 msgid "Mo_derator"
-msgstr "Als _Moderator einsetzen"
+msgstr "Mo_derator"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:168
 msgid "More"
 msgstr "Mehr"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:169
 msgid "Name:"
 msgstr "Name:"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:171
 msgid "New version of Gajim available"
 msgstr "Es ist eine neue Version von Gajim verfügbar"
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:172
 msgid "Nickname:"
 msgstr "Spitzname:"
 
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:175
 msgid "Notify me about contacts that: "
 msgstr "Über Kontakte benachrichtigen, die sich "
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:176
 msgid "OS:"
 msgstr "BS:"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:177
 msgid "On every _message"
 msgstr "In jeder _Zeile"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:178
 msgid "Open Download Page"
 msgstr "Download-Seite öffnen"
 
-#: ../src/gtkgui.glade.h:178
-msgid "Open _with:"
-msgstr "Öffnen _mit:"
-
 #: ../src/gtkgui.glade.h:179
 msgid "Open..."
 msgstr "Öffnen..."
@@ -2418,7 +2382,6 @@ msgid "Password:"
 msgstr "Passwort:"
 
 #: ../src/gtkgui.glade.h:185
-#, fuzzy
 msgid "Personal Details"
 msgstr "Persönliche Details"
 
@@ -2439,9 +2402,8 @@ msgid "Please fill in the data for your new account"
 msgstr "Bitte füllen Sie die Daten für Ihr neues Konto aus"
 
 #: ../src/gtkgui.glade.h:190
-#, fuzzy
 msgid "Port: "
-msgstr "_Port:"
+msgstr "Port: "
 
 #: ../src/gtkgui.glade.h:191
 msgid "Position:"
@@ -2480,16 +2442,15 @@ msgstr ""
 
 #: ../src/gtkgui.glade.h:198
 msgid "Profile, Avatar"
-msgstr ""
+msgstr "Profile, Avatar"
 
 #: ../src/gtkgui.glade.h:199
 msgid "Protocol:"
 msgstr "Protokoll:"
 
 #: ../src/gtkgui.glade.h:200
-#, fuzzy
 msgid "Proxy:"
-msgstr "Proxy"
+msgstr "Proxy:"
 
 #: ../src/gtkgui.glade.h:202
 msgid "Re_quest Authorization from"
@@ -2516,9 +2477,8 @@ msgid "Remove file transfer from the list."
 msgstr ""
 
 #: ../src/gtkgui.glade.h:208
-#, fuzzy
 msgid "Reply to this message"
-msgstr "Status-Nachricht:"
+msgstr "Nachricht beantworten"
 
 #: ../src/gtkgui.glade.h:209
 msgid "Reset to Default Colors"
@@ -2600,18 +2560,17 @@ msgid "Send keep-alive packets"
 msgstr "Sende keep-alive Pakete"
 
 #: ../src/gtkgui.glade.h:226
-#, fuzzy
 msgid "Send message"
-msgstr "Eingehende Nachricht:"
+msgstr "Nachricht senden"
 
 #: ../src/gtkgui.glade.h:227
 msgid "Send message and close window"
-msgstr ""
+msgstr "Nachricht senden und Fenster schließen"
 
 #: ../src/gtkgui.glade.h:228
-#, fuzzy
 msgid "Sends a message to currently connected users to this server"
-msgstr "Sie müssen angemeldet sein um Dienste zu durchforsten"
+msgstr ""
+"Sendet eine Nachricht an die momentan angemeldeten Nutzer dieses Servers"
 
 #: ../src/gtkgui.glade.h:229
 msgid "Server:"
@@ -2766,13 +2725,12 @@ msgid ""
 msgstr ""
 
 #: ../src/gtkgui.glade.h:264
-#, fuzzy
 msgid "Title:"
-msgstr "Filter:"
+msgstr "Titel:"
 
 #: ../src/gtkgui.glade.h:265
 msgid "To:"
-msgstr ""
+msgstr "An:"
 
 #: ../src/gtkgui.glade.h:266
 msgid "Toggle _GPG Encryption"
@@ -2783,21 +2741,20 @@ msgid "Type:"
 msgstr "Art:"
 
 #: ../src/gtkgui.glade.h:268
-#, fuzzy
 msgid "Underline"
-msgstr "Angemeldet"
+msgstr "Unterstreichen"
 
 #: ../src/gtkgui.glade.h:269
 msgid "Update MOTD"
-msgstr ""
+msgstr "MOTD Aktualisieren"
 
 #: ../src/gtkgui.glade.h:270
 msgid "Update Message of the Day"
-msgstr ""
+msgstr "Aktualisiere Nachricht des Tages (MOTD)"
 
 #: ../src/gtkgui.glade.h:271
 msgid "Updates Message of the Day"
-msgstr ""
+msgstr "Aktualisiert Nachricht des Tages (MOTD)"
 
 #: ../src/gtkgui.glade.h:272
 msgid "Use _SSL (legacy)"
@@ -2869,9 +2826,8 @@ msgid "_Actions"
 msgstr "_Aktionen"
 
 #: ../src/gtkgui.glade.h:288
-#, fuzzy
 msgid "_Add Contact..."
-msgstr "Kontakt _Hinzufügen"
+msgstr "Kontakt _Hinzufügen..."
 
 #: ../src/gtkgui.glade.h:289
 msgid "_Add to Roster"
@@ -2882,9 +2838,8 @@ msgid "_Address:"
 msgstr "_Adresse:"
 
 #: ../src/gtkgui.glade.h:291
-#, fuzzy
 msgid "_Admin"
-msgstr "Zum _Administrator erheben"
+msgstr "_Admin"
 
 #: ../src/gtkgui.glade.h:292
 msgid "_Administrator"
@@ -3084,9 +3039,8 @@ msgid "_Preferences"
 msgstr "_Einstellungen"
 
 #: ../src/gtkgui.glade.h:343
-#, fuzzy
 msgid "_Presence"
-msgstr "_Einstellungen"
+msgstr "_Präsenz"
 
 #: ../src/gtkgui.glade.h:344
 msgid "_Previous"
@@ -3137,9 +3091,8 @@ msgid "_Send Private Message"
 msgstr "Private Nachricht _Senden"
 
 #: ../src/gtkgui.glade.h:357
-#, fuzzy
 msgid "_Send Server Message"
-msgstr "_Neue Nachricht"
+msgstr "_Sende Servernachricht"
 
 #: ../src/gtkgui.glade.h:358
 msgid "_Send Single Message"
@@ -3154,7 +3107,6 @@ msgid "_Service Discovery"
 msgstr "_Dienste Durchsuchen"
 
 #: ../src/gtkgui.glade.h:361
-#, fuzzy
 msgid "_Service Discovery..."
 msgstr "_Dienste Durchsuchen"
 
@@ -3212,186 +3164,200 @@ msgstr "Minuten"
 msgid "show a help on specific command"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:74
+#. parameter, named "on_command". User gets help for the command, specified by this parameter
+#: ../scripts/gajim-remote.py:75
 msgid "on_command"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:74
+#: ../scripts/gajim-remote.py:76
 msgid "show help on command"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:78
+#: ../scripts/gajim-remote.py:80
 msgid "Shows or hides the roster window"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:82
+#: ../scripts/gajim-remote.py:84
 msgid "Popup a window with the next unread message"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:86
+#: ../scripts/gajim-remote.py:88
 #, fuzzy
 msgid ""
 "Print a list of all contacts in the roster. Each contact appear on a "
 "separate line"
 msgstr "Ereignisse von Kontakten, die nicht in der Liste sind, _ignorieren"
 
-#: ../scripts/gajim-remote.py:89 ../scripts/gajim-remote.py:104
-#: ../scripts/gajim-remote.py:116 ../scripts/gajim-remote.py:130
+#: ../scripts/gajim-remote.py:91 ../scripts/gajim-remote.py:106
+#: ../scripts/gajim-remote.py:118 ../scripts/gajim-remote.py:132
 #, fuzzy
 msgid "account"
 msgstr "Konto"
 
-#: ../scripts/gajim-remote.py:89
+#: ../scripts/gajim-remote.py:91
 msgid "show only contacts of the given account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:95
+#: ../scripts/gajim-remote.py:97
 #, fuzzy
 msgid "Print a list of registered accounts"
 msgstr "Ich möchte ein neues Konto _erstellen"
 
-#: ../scripts/gajim-remote.py:99
+#: ../scripts/gajim-remote.py:101
 msgid "Change the status of account or accounts"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:101
+#: ../scripts/gajim-remote.py:103
 #, fuzzy
 msgid "status"
 msgstr "Status"
 
-#: ../scripts/gajim-remote.py:101
+#: ../scripts/gajim-remote.py:103
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 
-#: ../scripts/gajim-remote.py:103 ../scripts/gajim-remote.py:127
+#: ../scripts/gajim-remote.py:105 ../scripts/gajim-remote.py:129
 #, fuzzy
 msgid "message"
 msgstr "_Neue Nachricht"
 
-#: ../scripts/gajim-remote.py:103
+#: ../scripts/gajim-remote.py:105
 #, fuzzy
 msgid "status message"
 msgstr "Status-Nachricht:"
 
-#: ../scripts/gajim-remote.py:104
+#: ../scripts/gajim-remote.py:106
 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 ""
 
-#: ../scripts/gajim-remote.py:110
+#: ../scripts/gajim-remote.py:112
 msgid "Show the chat dialog so that you can send message to a contact"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:113
+#: ../scripts/gajim-remote.py:115
 #, fuzzy
 msgid "jid of the contact that you want to chat with"
 msgstr "Bitte füllen Sie die Daten für Ihr neues Konto aus"
 
-#: ../scripts/gajim-remote.py:116
+#: ../scripts/gajim-remote.py:118
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:121
+#: ../scripts/gajim-remote.py:123
 msgid ""
 "Send new message to a contact in the roster. Both OpenPGP key and account "
 "are optional. If you want to set only 'account', whitout 'pgp key', just set "
 "'pgp key' to ''."
 msgstr ""
 
-#: ../scripts/gajim-remote.py:125
+#: ../scripts/gajim-remote.py:127
 #, fuzzy
 msgid "jid of the contact that will receive the message"
 msgstr ""
 "Gajim wird nur das Symbol des Kontaktes ändern, von dem die neue Nachricht "
 "kommt"
 
-#: ../scripts/gajim-remote.py:127
+#: ../scripts/gajim-remote.py:129
 msgid "message contents"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:128
+#: ../scripts/gajim-remote.py:130
 msgid "pgp key"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:128
+#: ../scripts/gajim-remote.py:130
 msgid "if specified, the message will be encrypted using this pulic key"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:130
+#: ../scripts/gajim-remote.py:132
 msgid "if specified, the message will be sent using this account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:135
+#: ../scripts/gajim-remote.py:137
 msgid "Get detailed info on a contact"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:137
-#, fuzzy
+#: ../scripts/gajim-remote.py:139
 msgid "jid of the contact"
-msgstr "Neuen Kontakt hinzufügen"
+msgstr "jid des neuen Kontakts"
 
-#: ../scripts/gajim-remote.py:158
+#: ../scripts/gajim-remote.py:160
 msgid "Missing argument \"contact_jid\""
-msgstr ""
+msgstr "Fehlendes Argument \"contact_jid\""
 
-#: ../scripts/gajim-remote.py:163 ../scripts/gajim-remote.py:476
-#, fuzzy
+#: ../scripts/gajim-remote.py:165 ../scripts/gajim-remote.py:478
 msgid "Service not available"
-msgstr "Automatisch _nicht verfügbar nach:"
+msgstr "Dienst nicht verfügbar"
 
-#: ../scripts/gajim-remote.py:181
+#: ../scripts/gajim-remote.py:183
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 msgstr ""
+"'%s' ist nicht in ihrer Kontaktliste.\n"
+"Bitte geben Sie ein Konto zum Senden der Nachricht an."
 
-#: ../scripts/gajim-remote.py:184
+#: ../scripts/gajim-remote.py:186
 msgid "You have no active account"
-msgstr ""
+msgstr "Sie haben keine aktives Konto"
 
-#: ../scripts/gajim-remote.py:203
-#, fuzzy
+#: ../scripts/gajim-remote.py:205
 msgid "Session bus is not available."
-msgstr "Automatisch _nicht verfügbar nach:"
+msgstr "Session-Bus nicht verfügbar."
 
-#: ../scripts/gajim-remote.py:212
+#: ../scripts/gajim-remote.py:214
 #, python-format
 msgid "Unknow dbus version: %s"
-msgstr ""
+msgstr "Unbekannte D-BUS-Version: %s"
 
-#: ../scripts/gajim-remote.py:238
+#: ../scripts/gajim-remote.py:240
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
 "\t"
 msgstr ""
+"Verwendung: %s %s %s \n"
+"\t"
 
-#: ../scripts/gajim-remote.py:244
+#: ../scripts/gajim-remote.py:246
 #, python-format
 msgid "%s not found"
-msgstr ""
+msgstr "%s nicht gefunden"
 
-#: ../scripts/gajim-remote.py:248
+#: ../scripts/gajim-remote.py:250
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:307
+#: ../scripts/gajim-remote.py:309
 #, python-format
 msgid "Unknown type %s "
-msgstr ""
+msgstr "Unbekannter Typ %s "
 
-#: ../scripts/gajim-remote.py:449
+#: ../scripts/gajim-remote.py:451
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 msgstr ""
 
+#~ msgid "No space left on device"
+#~ msgstr "Keine Platz auf dem Gerät übrig"
+
+#~ msgid "Unable to open %s for writing\n"
+#~ msgstr "Kann %s nicht zum Schreiben öffnen\n"
+
+#~ msgid "<b>Links</b>"
+#~ msgstr "<b>Links</b>"
+
+#~ msgid "Open _with:"
+#~ msgstr "Öffnen _mit:"
+
 #~ msgid "Switch to"
 #~ msgstr "Wechseln zu"
 
diff --git a/po/el/LC_MESSAGES/gajim.po b/po/el/LC_MESSAGES/gajim.po
index e06696530a7cfb8c72ac5b268b7a3bc1604e977d..6642790065c27bea8bdf5aae366754e13a6a5294 100644
--- a/po/el/LC_MESSAGES/gajim.po
+++ b/po/el/LC_MESSAGES/gajim.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 01:26+0300\n"
+"POT-Creation-Date: 2005-08-09 18:26+0300\n"
 "PO-Revision-Date: 2005-05-17 12:19+0300\n"
 "Last-Translator: Nikos Kouremenos <kourem@gmail.com>\n"
 "Language-Team: \n"
@@ -24,59 +24,59 @@ msgstr "Απομακρυσμένος λόγω αδράνειας"
 msgid "Not available as a result of being idle"
 msgstr "Μη διαθέσιμος λόγω αδράνειας"
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:267
 msgid "Sleeping"
 msgstr "Κοιμάμαι"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:268
 msgid "Back soon"
 msgstr "Πίσω σύντομα"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:268
 msgid "Back in some minutes."
 msgstr "Πίσω σε λίγα λεπτά."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:269
 msgid "Eating"
 msgstr "Τρώω"
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:269
 msgid "I'm eating, so leave me a message."
 msgstr "Τώρα τρώω, οπότε αφήστε μήνυμα."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:270
 msgid "Movie"
 msgstr "Ταινία"
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:270
 msgid "I'm watching a movie."
 msgstr "Βλέπω μια ταινία."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:271
 msgid "Working"
 msgstr "Δουλειά"
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:271
 msgid "I'm working."
 msgstr "Δουλεύω."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:272
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:272
 msgid "I'm on the phone."
 msgstr "Είμαι στο τηλέφωνο."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:273
 msgid "Out"
 msgstr "Έξω"
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:273
 msgid "I'm out enjoying life"
 msgstr "Είμαι έξω στην ζωή"
 
-#: ../src/common/connection.py:291 ../src/common/connection.py:301
+#: ../src/common/connection.py:290 ../src/common/connection.py:300
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -85,32 +85,32 @@ msgstr ""
 "Θέμα: %s\n"
 "%s"
 
-#: ../src/common/connection.py:351 ../src/common/connection.py:1496
+#: ../src/common/connection.py:350 ../src/common/connection.py:1496
 msgid "I would like to add you to my roster."
 msgstr "Επιθυμώ να σε προσθέσω στην λίστα επαφών μου."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:358
+#: ../src/common/connection.py:357
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "Ο %s μόλις σας εξουσιοδότησε"
 
-#: ../src/common/connection.py:360
+#: ../src/common/connection.py:359
 #, fuzzy, python-format
 msgid "unsubscribe request from %s"
 msgstr "Αίτηση εγγραφής από %s"
 
-#: ../src/common/connection.py:362
+#: ../src/common/connection.py:361
 #, fuzzy, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "Ο %s μόλις σας αφαίρεσε την εξουσιοδότηση"
 
-#: ../src/common/connection.py:399
+#: ../src/common/connection.py:398
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Η σύνδεση με τον λογαριασμό \"%s\" χάθηκε"
 
-#: ../src/common/connection.py:400
+#: ../src/common/connection.py:399
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Για να συνεχίσετε να στέλνετε και να λαμβάνετε μηνύματα, πρέπει να "
@@ -189,88 +189,90 @@ msgstr ""
 msgid "error appeared while processing xmpp:"
 msgstr "σφάλμα κατά την επεξεργασία xmpp:"
 
-#: ../src/common/helpers.py:28
+#: ../src/common/helpers.py:30
 msgid "Busy"
 msgstr "Απασχολημένος"
 
-#: ../src/common/helpers.py:30
+#: ../src/common/helpers.py:32
 msgid "Not Available"
 msgstr "Μη διαθέσιμος"
 
-#: ../src/common/helpers.py:32
+#: ../src/common/helpers.py:34
 msgid "Free for Chat"
 msgstr "Διαθέσιμος για Κουβέντα"
 
-#: ../src/common/helpers.py:34
+#: ../src/common/helpers.py:36
 msgid "Available"
 msgstr "Διαθέσιμος"
 
-#: ../src/common/helpers.py:36
+#: ../src/common/helpers.py:38
 msgid "Connecting"
 msgstr "Συνδέεται"
 
-#: ../src/common/helpers.py:38
+#: ../src/common/helpers.py:40
 msgid "Away"
 msgstr "Απομακρυσμένος"
 
-#: ../src/common/helpers.py:40
+#: ../src/common/helpers.py:42
 msgid "Offline"
 msgstr "Αποσυνδεδεμένος"
 
-#: ../src/common/helpers.py:42
+#: ../src/common/helpers.py:44
 msgid "Invisible"
 msgstr "Αφανής"
 
-#: ../src/common/helpers.py:44
+#: ../src/common/helpers.py:46
 msgid "Not in the roster"
 msgstr "Εκτός λίστας επαφών"
 
-#: ../src/common/helpers.py:46 ../src/vcard.py:249 ../src/vcard.py:251
+#: ../src/common/helpers.py:48 ../src/vcard.py:249 ../src/vcard.py:251
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: ../src/common/helpers.py:48
+#: ../src/common/helpers.py:50
 msgid "Has errors"
 msgstr "Έχει προβλήματα"
 
-#: ../src/common/helpers.py:53 ../src/common/helpers.py:67
-#: ../src/groupchat_window.py:271 ../src/gtkgui.glade.h:173
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:69
+#: ../src/groupchat_window.py:271 ../src/gtkgui.glade.h:174
 msgid "None"
 msgstr "Τίποτα"
 
-#: ../src/common/helpers.py:55
+#: ../src/common/helpers.py:57
 msgid "To"
 msgstr "Προς"
 
-#: ../src/common/helpers.py:57
+#: ../src/common/helpers.py:59
 msgid "From"
 msgstr "Από"
 
-#: ../src/common/helpers.py:59
+#: ../src/common/helpers.py:61
 msgid "Both"
 msgstr "Και τα δυο"
 
-#: ../src/common/helpers.py:69
+#: ../src/common/helpers.py:71
 msgid "Subscribe"
 msgstr "Εγγραφή"
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "is paying attention to the conversation"
 msgstr "έχει την προσοχή του στην κουβέντα"
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:112
 msgid "is doing something else"
 msgstr "κάνει κάτι άλλο"
 
-#: ../src/common/helpers.py:112
+#: ../src/common/helpers.py:114
 msgid "is composing a message..."
 msgstr "γράφει ένα μήνυμα..."
 
-#: ../src/common/helpers.py:114
-msgid "paused composing a message..."
+#. paused means he was compoing but has stopped for a while
+#: ../src/common/helpers.py:117
+#, fuzzy
+msgid "paused composing a message"
 msgstr "σταμάτησε για λίγο να γράφει ένα μήνυμα..."
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 msgid "has closed the chat window or tab"
 msgstr "έκλεισε το παράθυρο ή την καρτέλα"
 
@@ -301,15 +303,6 @@ msgstr "σφάλμα: αδύνατη η ανάγνωση του %s\n"
 msgid "Unable to write file in %s\n"
 msgstr "Αδύνατη η εγγραφή αρχείου σε %s\n"
 
-#: ../src/common/optparser.py:84
-msgid "No space left on device"
-msgstr ""
-
-#: ../src/common/optparser.py:100
-#, python-format
-msgid "Unable to open %s for writing\n"
-msgstr "Αδύνατη η εγγραφή αρχείου %s\n"
-
 #: ../src/advanced.py:52
 msgid "Preference Name"
 msgstr "Όνομα Προτίμησης"
@@ -326,7 +319,7 @@ msgstr "Είδος"
 msgid "Chat"
 msgstr "Κουβέντα"
 
-#: ../src/chat.py:124 ../src/gtkgui.glade.h:127
+#: ../src/chat.py:124 ../src/gtkgui.glade.h:128
 msgid "Group Chat"
 msgstr "Ομαδική Κουβέντα"
 
@@ -402,151 +395,151 @@ msgstr "Δικτυακή Αναζήτηση γι' αυτό"
 msgid "Subject: %s\n"
 msgstr "Θέμα: %s\n"
 
-#: ../src/config.py:198 ../src/config.py:428
+#: ../src/config.py:199 ../src/config.py:436
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Κάθε %s _λεπτά"
 
-#: ../src/config.py:301
+#: ../src/config.py:307
 msgid "Active"
 msgstr "Ενεργοποιημένο"
 
-#: ../src/config.py:309
+#: ../src/config.py:315
 msgid "Event"
 msgstr "Γεγονός"
 
-#: ../src/config.py:315
+#: ../src/config.py:321
 msgid "Sound"
 msgstr "Ήχος"
 
-#: ../src/config.py:918
+#: ../src/config.py:930
 msgid "status message title"
 msgstr "τίτλος μηνύματος κατάστασης"
 
-#: ../src/config.py:918
+#: ../src/config.py:930
 msgid "status message text"
 msgstr "κείμενο μηνύματος κατάστασης"
 
-#: ../src/config.py:971
+#: ../src/config.py:983
 msgid "Choose Sound"
 msgstr "Επιλογή Ήχου"
 
-#: ../src/config.py:978 ../src/config.py:1923 ../src/vcard.py:131
+#: ../src/config.py:990 ../src/config.py:1935 ../src/vcard.py:131
 msgid "All files"
 msgstr "Όλα τα αρχεία"
 
-#: ../src/config.py:983
+#: ../src/config.py:995
 msgid "Wav Sounds"
 msgstr "Αρχεία Wav"
 
-#: ../src/config.py:1152
+#: ../src/config.py:1164
 msgid "OpenPGP is not usable in this computer"
 msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
 
-#: ../src/config.py:1177
+#: ../src/config.py:1189
 msgid "You are currently connected to the server"
 msgstr "Αυτή τη στιγμή είστε συνδεδεμένος στον διακομιστή"
 
-#: ../src/config.py:1178
+#: ../src/config.py:1190
 msgid "To change the account name, you must be disconnected."
 msgstr "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να αποσυνδεθείτε."
 
-#: ../src/config.py:1181 ../src/config.py:1185
+#: ../src/config.py:1193 ../src/config.py:1197
 msgid "Invalid account name"
 msgstr "Μη έγκυρο όνομα λογαριασμού"
 
-#: ../src/config.py:1182
+#: ../src/config.py:1194
 msgid "Account name cannot be empty."
 msgstr "Το όνομα λογαριασμού δεν μπορεί να ειναι κενό."
 
-#: ../src/config.py:1186
+#: ../src/config.py:1198
 msgid "Account name cannot contain spaces."
 msgstr "Το όνομα λογαριασμού δεν μπορεί να έχει κενά."
 
-#: ../src/config.py:1190
+#: ../src/config.py:1202
 msgid "Invalid Jabber ID"
 msgstr "Μη έγκυρο Jabber ID"
 
-#: ../src/config.py:1191
+#: ../src/config.py:1203
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr ""
 "Ένα Jabber ID πρέπει να είναι στην μορφή \"όνομα_χρήστη@όνομα_διακομιστήs\"."
 
-#: ../src/config.py:1198 ../src/dialogs.py:1107
+#: ../src/config.py:1210 ../src/dialogs.py:1107
 msgid "Invalid password"
 msgstr "Μη έγκυρος κωδικός"
 
-#: ../src/config.py:1199
+#: ../src/config.py:1211
 msgid "You must enter a password for the new account."
 msgstr "Πρέπει να δώσετε έναν κωδικό για τον νέο λογαριασμό."
 
-#: ../src/config.py:1236
+#: ../src/config.py:1248
 msgid "Invalid entry"
 msgstr "Μη έγκυρη καταχώρηση"
 
-#: ../src/config.py:1237
+#: ../src/config.py:1249
 msgid "Custom port must be a port number."
 msgstr "Ο χειροποίητος αριθμός θύρας του μεσολαβητή πρέπει να είναι αριθμός."
 
-#: ../src/config.py:1324
+#: ../src/config.py:1336
 msgid "Account name is in use"
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#: ../src/config.py:1325
+#: ../src/config.py:1337
 msgid "You already have an account using this name."
 msgstr "Έχετε ήδη ένα λογαριασμό με αυτό το όνομα."
 
-#: ../src/config.py:1387
+#: ../src/config.py:1399
 msgid "No such account available"
 msgstr "Τέτοιος λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/config.py:1388
+#: ../src/config.py:1400
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Πρέπει πρώτα να δημιουργήσετε τον λογαριασμό σας προτού ξεκινήσετε να "
 "τροποποιείτε τις προσωπικές σας πληροφορίες"
 
-#: ../src/config.py:1395 ../src/config.py:2005 ../src/dialogs.py:981
+#: ../src/config.py:1407 ../src/config.py:2017 ../src/dialogs.py:981
 #: ../src/dialogs.py:1087 ../src/vcard.py:374 ../src/vcard.py:402
 msgid "You are not connected to the server"
 msgstr "Δεν είστε συνδεδεμένος στον διακομιστή"
 
-#: ../src/config.py:1396
+#: ../src/config.py:1408
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να τροποποιήσετε τις προσωπικές σας "
 "πληροφορίες"
 
-#: ../src/config.py:1423
+#: ../src/config.py:1435
 msgid "Failed to get secret keys"
 msgstr "Σφάλμα κατά την λήψη μυστικών κλειδιών"
 
-#: ../src/config.py:1424
+#: ../src/config.py:1436
 msgid "There was a problem retrieving your GPG secret keys."
 msgstr ""
 
-#: ../src/config.py:1427 ../src/gtkgui.glade.h:183
+#: ../src/config.py:1439 ../src/gtkgui.glade.h:183
 msgid "Passphrase"
 msgstr "Κωδικοφράση"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1440
 msgid "Choose your OpenPGP key"
 msgstr "Επιλέξτε το OpenPGP κλειδί σας"
 
-#: ../src/config.py:1436 ../src/gtkgui.glade.h:172
+#: ../src/config.py:1448 ../src/gtkgui.glade.h:173
 msgid "No key selected"
 msgstr "Καμία επιλογή κλειδιού"
 
-#: ../src/config.py:1667 ../src/config.py:2028
+#: ../src/config.py:1679 ../src/config.py:2040
 msgid "Name"
 msgstr "Όνομα"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1682
 msgid "Server"
 msgstr "Διακομιστής"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1775 ../src/config.py:2247 ../src/dialogs.py:112
+#: ../src/config.py:1787 ../src/config.py:2259 ../src/dialogs.py:112
 #: ../src/dialogs.py:282 ../src/dialogs.py:318 ../src/roster_window.py:123
 #: ../src/roster_window.py:128 ../src/roster_window.py:152
 #: ../src/roster_window.py:1928 ../src/roster_window.py:1930
@@ -554,29 +547,29 @@ msgstr "Διακομιστής"
 msgid "Transports"
 msgstr "Μεταφορές"
 
-#: ../src/config.py:1790
+#: ../src/config.py:1802
 #, python-format
 msgid "Edit %s"
 msgstr "Επεξεργασία %s"
 
-#: ../src/config.py:1792
+#: ../src/config.py:1804
 #, python-format
 msgid "Register to %s"
 msgstr "Εγγραφή στο %s"
 
-#: ../src/config.py:1812
+#: ../src/config.py:1824
 msgid "Text"
 msgstr "Κείμενο"
 
-#: ../src/config.py:1820
+#: ../src/config.py:1832
 msgid "Image"
 msgstr "Εικόνα"
 
-#: ../src/config.py:1867
+#: ../src/config.py:1879
 msgid "Image is too big"
 msgstr "Η εικόνα είναι πολύ μεγάλη"
 
-#: ../src/config.py:1867
+#: ../src/config.py:1879
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
@@ -584,73 +577,73 @@ msgstr ""
 "Η εικόνα για τα σύμβολα πρέπει να είναι μικρότερη ή ίση με 24 pixel σε μήκος "
 "και 24 pixel se ύψος."
 
-#: ../src/config.py:1917
+#: ../src/config.py:1929
 msgid "Choose Image"
 msgstr "Επιλογή Εικόνας"
 
-#: ../src/config.py:1928 ../src/vcard.py:136
+#: ../src/config.py:1940 ../src/vcard.py:136
 msgid "Images"
 msgstr "Εικόνες"
 
-#: ../src/config.py:2006
+#: ../src/config.py:2018
 msgid "Without a connection, you can not browse available services"
 msgstr "Πρέπει να συνδεθείτε για να περιηγηθείτε στις υπηρεσίες"
 
-#: ../src/config.py:2011
+#: ../src/config.py:2023
 #, python-format
 msgid "Service Discovery using %s account"
 msgstr "Ανακάλυψη Υπηρεσιών χρησιμοποιώντας τον λογαριασμό %s"
 
-#: ../src/config.py:2013
+#: ../src/config.py:2025
 msgid "Service Discovery"
 msgstr "Ανακάλυψη Υπηρεσιών"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2045
 msgid "Service"
 msgstr "Υπηρεσία"
 
-#: ../src/config.py:2038
+#: ../src/config.py:2050
 msgid "Node"
 msgstr "Κόμβος"
 
-#: ../src/config.py:2250 ../src/gtkgui.glade.h:305
+#: ../src/config.py:2262 ../src/gtkgui.glade.h:305
 msgid "_Edit"
 msgstr "Επε_ξεργασία"
 
-#: ../src/config.py:2252 ../src/gtkgui.glade.h:201
+#: ../src/config.py:2264 ../src/gtkgui.glade.h:201
 msgid "Re_gister"
 msgstr "_Εγγραφή"
 
-#: ../src/config.py:2424
+#: ../src/config.py:2436
 #, python-format
 msgid "Removing %s account"
 msgstr "Aφαιρώντας τον λογαριασμό %s"
 
-#: ../src/config.py:2431
+#: ../src/config.py:2443
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με τον διακομιστή"
 
-#: ../src/config.py:2432
+#: ../src/config.py:2444
 msgid "If you remove it, the connection will be lost."
 msgstr "Αν αφαιρεθεί, η σύνδεση θα χαθεί."
 
-#: ../src/config.py:2557
+#: ../src/config.py:2569
 msgid "New Room"
 msgstr "Νέο Δωμάτιο"
 
-#: ../src/config.py:2587
+#: ../src/config.py:2599
 msgid "This bookmark has invalid data"
 msgstr "Αυτός ο σελιδοδείκτης έχει μη έγκυρα δεδομένα"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2600
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Παρακαλώ συμπληρώστε τα πεδία του διακομιστή και του δωματίου ή διαφορετικά "
 "αφαιρέστε τον σελιδοδείκτη."
 
-#: ../src/config.py:2808
+#: ../src/config.py:2820
 msgid ""
 "Account has been added successfully.\n"
 "You can set advanced options by using \"Edit->Accounts\" from the main "
@@ -660,19 +653,19 @@ msgstr ""
 "Μπορείτε να δείτε όλες τις ρυθμίσεις του λογαριασμού σας κάνοντας "
 "\"Επεξεργασία->Λογαριασμοί\" από το κεντρικό παράθυρο"
 
-#: ../src/config.py:2819
+#: ../src/config.py:2831
 msgid ""
 "Your new account has been created and added to your gajim configuration.\n"
 "You can set advanced account options using \"Edit->Accounts\" in the main "
 "window menu."
 msgstr ""
 
-#: ../src/config.py:2833
+#: ../src/config.py:2845
 #, fuzzy
 msgid "You need to enter a username to add an account."
 msgstr "Πρέπει να δώσετε έναν κωδικό για τον νέο λογαριασμό."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2849
 #, fuzzy
 msgid "You need to enter a valid server address to add an account."
 msgstr "Πρέπει να δώσετε έναν κωδικό για τον νέο λογαριασμό."
@@ -765,7 +758,7 @@ msgstr "Gajim - %s μη αναγνωσμένα μηνύματα"
 msgid "Gajim - 1 unread message"
 msgstr "Gajim - 1 μη αναγνωσμένο μήνυμα"
 
-#: ../src/dialogs.py:696 ../src/gtkgui.glade.h:116
+#: ../src/dialogs.py:696 ../src/gtkgui.glade.h:117
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -774,7 +767,7 @@ msgstr "Gajim"
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/dialogs.py:733 ../src/dialogs.py:834 ../src/dialogs.py:1777
+#: ../src/dialogs.py:733 ../src/dialogs.py:834 ../src/dialogs.py:1778
 msgid "Name: "
 msgstr "Όνομα: "
 
@@ -792,12 +785,12 @@ msgstr "Άνοιγμα Σελίδας για Μεταφόρτωση"
 msgid "Upload"
 msgstr ""
 
-#: ../src/dialogs.py:745 ../src/dialogs.py:1779
+#: ../src/dialogs.py:745 ../src/dialogs.py:1780
 #, fuzzy
 msgid "Sender: "
 msgstr "Αποστολέας: "
 
-#: ../src/dialogs.py:748 ../src/dialogs.py:1781
+#: ../src/dialogs.py:748 ../src/dialogs.py:1782
 #, fuzzy
 msgid "Recipient: "
 msgstr "Πρόσφατα:"
@@ -875,7 +868,7 @@ msgstr ""
 msgid "Join Group Chat as %s"
 msgstr "Συμμετοχή σε Ομαδική Συζήτηση ως %s"
 
-#: ../src/dialogs.py:997 ../src/gtkgui.glade.h:153
+#: ../src/dialogs.py:997 ../src/gtkgui.glade.h:154
 msgid "Join Group Chat"
 msgstr "Συμμετοχή σε Ομαδική Συζήτηση"
 
@@ -885,7 +878,7 @@ msgid "New Message as %s"
 msgstr "Νέο Μήνυμα ως %s"
 
 #: ../src/dialogs.py:1062 ../src/dialogs.py:1157 ../src/gajim.py:462
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:170
 msgid "New Message"
 msgstr "Νέο Μήνυμα"
 
@@ -1107,17 +1100,17 @@ msgstr ""
 msgid "Would you like to overwrite it?"
 msgstr ""
 
-#: ../src/dialogs.py:1880 ../src/gtkgui.glade.h:338
+#: ../src/dialogs.py:1881 ../src/gtkgui.glade.h:338
 #, fuzzy
 msgid "_Pause"
 msgstr "_Παύση"
 
-#: ../src/dialogs.py:1883 ../src/dialogs.py:1915
+#: ../src/dialogs.py:1884 ../src/dialogs.py:1916
 #, fuzzy
 msgid "_Continue"
 msgstr "_Συνέχιση"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1912
 msgid "Pause"
 msgstr "Παύση"
 
@@ -1136,7 +1129,7 @@ msgid "error while sending"
 msgstr "σφάλμα κατά την αποστολή"
 
 #: ../src/gajim.py:536 ../src/gajim.py:546 ../src/roster_window.py:125
-#: ../src/roster_window.py:1036 ../src/gtkgui.glade.h:124
+#: ../src/roster_window.py:1036 ../src/gtkgui.glade.h:125
 msgid "General"
 msgstr "Γενικά"
 
@@ -1181,7 +1174,8 @@ msgstr "H κωδική φράση είναι λανθασμένη"
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Συνδεθήκατε χωρίς την χρήση του OpenPGP κλειδιού σας"
 
-#: ../src/gajim.py:1025
+#. it is good to notify the user, in case he cannot see the output of the console
+#: ../src/gajim.py:1027
 msgid "Cannot save your preferences"
 msgstr ""
 
@@ -1322,7 +1316,7 @@ msgstr ""
 msgid "Banning %s"
 msgstr ""
 
-#: ../src/groupchat_window.py:961 ../src/tabbed_chat_window.py:323
+#: ../src/groupchat_window.py:961 ../src/tabbed_chat_window.py:327
 msgid "If you close this tab, the message will be lost."
 msgstr ""
 
@@ -1589,43 +1583,43 @@ msgstr "Πατήστε για να τροποποιήσετε τις παραμ
 msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:254 ../src/tabbed_chat_window.py:322
+#: ../src/tabbed_chat_window.py:258 ../src/tabbed_chat_window.py:326
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:255
+#: ../src/tabbed_chat_window.py:259
 msgid "If you close the window, this message will be lost."
 msgstr ""
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:488
+#: ../src/tabbed_chat_window.py:492
 #, fuzzy
 msgid "A connection is not available"
 msgstr "Αυτόματα _μη διαθέσιμος μετά:"
 
-#: ../src/tabbed_chat_window.py:489
+#: ../src/tabbed_chat_window.py:493
 #, fuzzy
 msgid "Your message can not be sent until you are connected."
 msgstr ""
 "Δεν μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
 "συνδεδεμένος."
 
-#: ../src/tabbed_chat_window.py:577
+#: ../src/tabbed_chat_window.py:581
 #, fuzzy
 msgid "Sending private message failed"
 msgstr "_Νέο Μήνυμα"
 
-#: ../src/tabbed_chat_window.py:578
+#: ../src/tabbed_chat_window.py:582
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:681
+#: ../src/tabbed_chat_window.py:685
 msgid "Encryption enabled"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:686
+#: ../src/tabbed_chat_window.py:690
 msgid "Encryption disabled"
 msgstr ""
 
@@ -1675,30 +1669,32 @@ msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Επεξεργασία Ρυθμίσεων για Προχωρημένους</b>"
 
 #: ../src/gtkgui.glade.h:4
-msgid "<b>Changes in latest version</b>"
-msgstr "<b>Αλλαγές στην τελευταία έκδοση</b>"
+#, fuzzy
+msgid "<b>Applications</b>"
+msgstr "<b>Δικές μου Εφαρμογές</b>"
 
 #: ../src/gtkgui.glade.h:5
-msgid "<b>Custom Applications</b>"
-msgstr "<b>Δικές μου Εφαρμογές</b>"
+msgid "<b>Changes in latest version</b>"
+msgstr "<b>Αλλαγές στην τελευταία έκδοση</b>"
 
 #: ../src/gtkgui.glade.h:6
+#, fuzzy
+msgid "<b>Custom</b>"
+msgstr "<b>Ιστορικό</b>"
+
+#: ../src/gtkgui.glade.h:7
 msgid "<b>Format of a chat line</b>"
 msgstr "<b>Μορφή μια γραμμής κουβέντας</b>"
 
-#: ../src/gtkgui.glade.h:7
+#: ../src/gtkgui.glade.h:8
 #, fuzzy
 msgid "<b>Interface Customization</b>"
 msgstr "<b>Δικές μου Εφαρμογές</b>"
 
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Jabber Traffic</b>"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:9
-msgid "<b>Links</b>"
-msgstr "<b>Δεσμοί</b>"
-
 #: ../src/gtkgui.glade.h:10
 msgid "<b>Log</b>"
 msgstr "<b>Ιστορικό</b>"
@@ -2126,33 +2122,38 @@ msgid "File _Transfers"
 msgstr "Χρήση Σετ _εικονιδίων κατάστασης:"
 
 #: ../src/gtkgui.glade.h:111
+#, fuzzy
+msgid "File manager:"
+msgstr "Χρήση Σετ _εικονιδίων κατάστασης:"
+
+#: ../src/gtkgui.glade.h:112
 msgid "Filter:"
 msgstr "Φιλτράρισμα:"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 #, fuzzy
 msgid "Font:"
 msgstr "Λογαριασμός:"
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:114
 msgid "Format: YYYY-MM-DD"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:115
 #, fuzzy
 msgid "From:"
 msgstr "Δωμάτιο:"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:116
 #, fuzzy
 msgid "GPG Encryption"
 msgstr "Πατήστε για να τροποποιήσετε τις παραμέτρους για το δωμάτιο"
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Gajim Themes Customization"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2160,7 +2161,7 @@ msgstr ""
 "Το Gajim θα εμφανίσει αυτόματα το νέο εισερχόμενο μήνυμα σε ένα νέο παράθυρο "
 "κουβέντας ή σε μια καρτέλα ενός ήδη υπάρχοντος παραθύρου κουβέντας"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2168,7 +2169,7 @@ msgstr ""
 "Το Gajim θα σας ειδοποιήσει για το νέο μήνυμα μέσω ενός αναδυόμενου "
 "παραθύρου στο κάτω δεξιά μέρος της οθόνης"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:121
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2176,7 +2177,7 @@ msgstr ""
 "Το Gajim θα σας ειδοποιήσει μέσω ενός αναδυόμενου παραθύρου στο κάτω δεξιά "
 "μέρος της οθόνης για τις επαφές που μόλις συνδέθηκαν στο Jabber"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:122
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2184,77 +2185,77 @@ msgstr ""
 "Το Gajim θα σας ειδοποιήσει μέσω ενός αναδυόμενου παραθύρου στο κάτω δεξιά "
 "μέρος της οθόνης για τις επαφές που μόλις αποσυνδέθηκαν στο Jabber"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:123
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr "Το Gajim θα αλλάξει μόνο το εικονίδιο της επαφής που έστειλε το μήνυμα"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
 msgid "Gajim: First Time Wizard"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:126
 #, fuzzy
 msgid "Given:"
 msgstr "Εφαρμογή:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:127
 msgid "Go"
 msgstr "Πάμε"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:129
 msgid "Group:"
 msgstr "Ομάδα:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:130
 #, fuzzy
 msgid "HTTP Connect"
 msgstr "Συνδέεται"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:131
 msgid "Homepage:"
 msgstr "Προσωπ. Σελίδα:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:132
 #, fuzzy
 msgid "Hostname: "
 msgstr "_Κεντρικός υπολογιστής:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:133
 msgid "I already have an account I want to use"
 msgstr "Έχω ήδη ένα λογαριασμό που θέλω να χρησιμοποιήσω"
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "I want to _register for a new account"
 msgstr "_Επιλέξτε εάν επιθυμείτε να καταχωρήσετε νέο jabber λογαρισμό"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:135
 msgid "I would like to add you to my contact list."
 msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου."
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "If checked, Gajim will also have a trayicon"
 msgstr ""
 "Αν επιλεγεγεί, το Gajim θα έχει δικό του ειδονίδιο στην περιοχή γνωστοποίησης"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid ""
 "If checked, Gajim will broadcast capability to send and receive meta-"
 "information related to a conversation you may have with a contact such as "
 "composing a message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 #, fuzzy
 msgid "If checked, Gajim will join this groupchat on startup"
 msgstr ""
 "Αν επιλεγεγεί, το Gajim θα έχει δικό του ειδονίδιο στην περιοχή γνωστοποίησης"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:139
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Εάν επιλεγεί, το Gajim θα θυμάται τον κωδικό για αυτόν το λογαριασμό"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:140
 #, fuzzy
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
@@ -2263,7 +2264,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα θυμάται την θέση και το μέγεθος του κύριου "
 "παραθύρου την επόμενη φορά που θα εκτελεστεί"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2271,13 +2272,13 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα μετατρέπει όλα ascii σύμβολα όπως το ':)' με τα "
 "αντίστοιχα γραφικά σύμβολα"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for only you and of course the administrator"
@@ -2285,7 +2286,7 @@ msgstr ""
 "Εάν επιλεγεί, το Gajim θα αποθηκεύσει τον κωδικό στο ~/.gajim/config με "
 "δικαίωμα ανάγνωσης μόνο για εσάς και φυσικά τον διαχειριστή του Η/Υ σας"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:144
 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, "
@@ -2295,7 +2296,7 @@ msgstr ""
 "πρωτόκολλο της επαφής. (πχ. Μια επαφή από το MSN θα έχει το αντίστοιχο msn "
 "εικονίδιο για τις καταστάσεις διαθέσιμος, απομακρυσμένος κλπ..)"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:145
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2303,7 +2304,7 @@ msgstr ""
 "Εάν επιλεγεί, το Gajim, όταν εκτελεστεί, θα συνδεθεί αυτόματα στο Jabber "
 "χρησιμοποιώντας αυτόν το λογαριασμό"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:146
 msgid ""
 "If checked, all chat and group chat windows will have the information area "
 "in the top and the buttons area in the bottom hidden. You can quick toggle "
@@ -2311,7 +2312,7 @@ msgid ""
 "a permanent one"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:147
 #, fuzzy
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
@@ -2320,118 +2321,114 @@ msgstr ""
 "Εάν έχετε 2 ή περισσότερους λογαριασμούς και έχει επιλεγεί, το Gajim θα "
 "εμφανίζει τις επαφές σας σαν να είχατε ένα λογαριασμό"
 
-#: ../src/gtkgui.glade.h:147
+#: ../src/gtkgui.glade.h:148
 msgid "Incoming message:"
 msgstr "Εισερχόμενο μήνυμα:"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:149
 msgid "Info/Query"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:150
 msgid "Information about you are stored on the server as vCard"
 msgstr "Οι πληροφορίες για εσάς αποθηκεύονται στον διακομιστή ως vCard"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:151
 msgid "Italic"
 msgstr "Πλάγια"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:152
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:153
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:155
 msgid "Join _Group Chat"
 msgstr "Συμμετοχή σε _Ομαδική Συζήτηση"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:156
 msgid "Join _Group Chat..."
 msgstr "Συμμετοχή σε _Ομαδική Συζήτηση..."
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:157
 msgid "Location"
 msgstr "Περιοχή"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:158
 msgid "Log history"
 msgstr "Καταγραφή ιστορικού"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:159
 msgid "Log presences in _contact's log file"
 msgstr "Αποθήκευση παρουσιών στο αρ_χείο με το ιστορικό της επαφής"
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:160
 msgid "Log presences in an _external file"
 msgstr "Αποθήκευση παρουσιών σε _εξωτερικό αρχείο"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:161
 msgid "Manage Accounts"
 msgstr "Διαχείρηση Λογαριασμών"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:162
 msgid "Manage Bookmarks"
 msgstr "Διαχείρηση Σελιδοδεικτών"
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:163
 msgid "Manage Emoticons"
 msgstr "Διαχείρηση Συμβόλων"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:164
 msgid "Manage Proxy Profiles"
 msgstr "Διαχείρηση Προφίλ Μεσολαβητή"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:165
 msgid "Manage..."
 msgstr "Διαχείρηση..."
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:166
 msgid "Middle:"
 msgstr "Μέσο:"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:167
 msgid "Mo_derator"
 msgstr "_Παροχή Δικαιώματος Συντονισμού"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:168
 msgid "More"
 msgstr "Περισσότερα"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:169
 msgid "Name:"
 msgstr "Όνομα:"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:171
 msgid "New version of Gajim available"
 msgstr "Μια νέα έκδοση του Gajim είναι διαθέσιμη"
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:172
 msgid "Nickname:"
 msgstr "Όνομα χρήστη:"
 
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:175
 msgid "Notify me about contacts that: "
 msgstr "Ειδοποίηση όταν μια επαφή:"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:176
 msgid "OS:"
 msgstr "Λειτ. Σύστημα:"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:177
 msgid "On every _message"
 msgstr "Σε κάθε _μήνυμα"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:178
 msgid "Open Download Page"
 msgstr "Άνοιγμα Σελίδας για Μεταφόρτωση"
 
-#: ../src/gtkgui.glade.h:178
-msgid "Open _with:"
-msgstr "Άνοιγμα _με:"
-
 #: ../src/gtkgui.glade.h:179
 msgid "Open..."
 msgstr "Άνοιγμα..."
@@ -3273,182 +3270,192 @@ msgstr "λεπτά"
 msgid "show a help on specific command"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:74
+#. parameter, named "on_command". User gets help for the command, specified by this parameter
+#: ../scripts/gajim-remote.py:75
 msgid "on_command"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:74
+#: ../scripts/gajim-remote.py:76
 msgid "show help on command"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:78
+#: ../scripts/gajim-remote.py:80
 msgid "Shows or hides the roster window"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:82
+#: ../scripts/gajim-remote.py:84
 msgid "Popup a window with the next unread message"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:86
+#: ../scripts/gajim-remote.py:88
 #, fuzzy
 msgid ""
 "Print a list of all contacts in the roster. Each contact appear on a "
 "separate line"
 msgstr "_Αγνόησε γεγονότα από επαφές που δεν είναι στη λίστα επαφών"
 
-#: ../scripts/gajim-remote.py:89 ../scripts/gajim-remote.py:104
-#: ../scripts/gajim-remote.py:116 ../scripts/gajim-remote.py:130
+#: ../scripts/gajim-remote.py:91 ../scripts/gajim-remote.py:106
+#: ../scripts/gajim-remote.py:118 ../scripts/gajim-remote.py:132
 #, fuzzy
 msgid "account"
 msgstr "Λογαριασμός"
 
-#: ../scripts/gajim-remote.py:89
+#: ../scripts/gajim-remote.py:91
 msgid "show only contacts of the given account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:95
+#: ../scripts/gajim-remote.py:97
 #, fuzzy
 msgid "Print a list of registered accounts"
 msgstr "_Επιλέξτε εάν επιθυμείτε να καταχωρήσετε νέο jabber λογαρισμό"
 
-#: ../scripts/gajim-remote.py:99
+#: ../scripts/gajim-remote.py:101
 msgid "Change the status of account or accounts"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:101
+#: ../scripts/gajim-remote.py:103
 #, fuzzy
 msgid "status"
 msgstr "Κατάσταση"
 
-#: ../scripts/gajim-remote.py:101
+#: ../scripts/gajim-remote.py:103
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 
-#: ../scripts/gajim-remote.py:103 ../scripts/gajim-remote.py:127
+#: ../scripts/gajim-remote.py:105 ../scripts/gajim-remote.py:129
 #, fuzzy
 msgid "message"
 msgstr "_Νέο Μήνυμα"
 
-#: ../scripts/gajim-remote.py:103
+#: ../scripts/gajim-remote.py:105
 #, fuzzy
 msgid "status message"
 msgstr "Μήνυμα κατάστασης:"
 
-#: ../scripts/gajim-remote.py:104
+#: ../scripts/gajim-remote.py:106
 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 ""
 
-#: ../scripts/gajim-remote.py:110
+#: ../scripts/gajim-remote.py:112
 msgid "Show the chat dialog so that you can send message to a contact"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:113
+#: ../scripts/gajim-remote.py:115
 msgid "jid of the contact that you want to chat with"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:116
+#: ../scripts/gajim-remote.py:118
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:121
+#: ../scripts/gajim-remote.py:123
 msgid ""
 "Send new message to a contact in the roster. Both OpenPGP key and account "
 "are optional. If you want to set only 'account', whitout 'pgp key', just set "
 "'pgp key' to ''."
 msgstr ""
 
-#: ../scripts/gajim-remote.py:125
+#: ../scripts/gajim-remote.py:127
 #, fuzzy
 msgid "jid of the contact that will receive the message"
 msgstr "Το Gajim θα αλλάξει μόνο το εικονίδιο της επαφής που έστειλε το μήνυμα"
 
-#: ../scripts/gajim-remote.py:127
+#: ../scripts/gajim-remote.py:129
 msgid "message contents"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:128
+#: ../scripts/gajim-remote.py:130
 msgid "pgp key"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:128
+#: ../scripts/gajim-remote.py:130
 msgid "if specified, the message will be encrypted using this pulic key"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:130
+#: ../scripts/gajim-remote.py:132
 msgid "if specified, the message will be sent using this account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:135
+#: ../scripts/gajim-remote.py:137
 msgid "Get detailed info on a contact"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:137
+#: ../scripts/gajim-remote.py:139
 msgid "jid of the contact"
 msgstr "jid της επαφής"
 
-#: ../scripts/gajim-remote.py:158
+#: ../scripts/gajim-remote.py:160
 msgid "Missing argument \"contact_jid\""
 msgstr ""
 
-#: ../scripts/gajim-remote.py:163 ../scripts/gajim-remote.py:476
+#: ../scripts/gajim-remote.py:165 ../scripts/gajim-remote.py:478
 #, fuzzy
 msgid "Service not available"
 msgstr "Αυτόματα _μη διαθέσιμος μετά:"
 
-#: ../scripts/gajim-remote.py:181
+#: ../scripts/gajim-remote.py:183
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 msgstr ""
 
-#: ../scripts/gajim-remote.py:184
+#: ../scripts/gajim-remote.py:186
 msgid "You have no active account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:203
+#: ../scripts/gajim-remote.py:205
 #, fuzzy
 msgid "Session bus is not available."
 msgstr "Αυτόματα _μη διαθέσιμος μετά:"
 
-#: ../scripts/gajim-remote.py:212
+#: ../scripts/gajim-remote.py:214
 #, python-format
 msgid "Unknow dbus version: %s"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:238
+#: ../scripts/gajim-remote.py:240
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
 "\t"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:244
+#: ../scripts/gajim-remote.py:246
 #, python-format
 msgid "%s not found"
 msgstr "μη υπαρκτό %s"
 
-#: ../scripts/gajim-remote.py:248
+#: ../scripts/gajim-remote.py:250
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:307
+#: ../scripts/gajim-remote.py:309
 #, python-format
 msgid "Unknown type %s "
 msgstr "Άγνωστος τύπο %s "
 
-#: ../scripts/gajim-remote.py:449
+#: ../scripts/gajim-remote.py:451
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 msgstr ""
 
+#~ msgid "Unable to open %s for writing\n"
+#~ msgstr "Αδύνατη η εγγραφή αρχείου %s\n"
+
+#~ msgid "<b>Links</b>"
+#~ msgstr "<b>Δεσμοί</b>"
+
+#~ msgid "Open _with:"
+#~ msgstr "Άνοιγμα _με:"
+
 #, fuzzy
 #~ msgid "Switch to"
 #~ msgstr "Αλλαγή σε %s"
diff --git a/po/es/LC_MESSAGES/gajim.po b/po/es/LC_MESSAGES/gajim.po
index 8911c856f9c9450e934f75c21012dd4f4dc81e1d..a09899433fd715232be02b58042d80361ef03b80 100644
--- a/po/es/LC_MESSAGES/gajim.po
+++ b/po/es/LC_MESSAGES/gajim.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 01:26+0300\n"
+"POT-Creation-Date: 2005-08-09 18:26+0300\n"
 "PO-Revision-Date: 2005-05-21 20:03+0100\n"
 "Last-Translator: Membris Khan <membriskhan@gmail.com>\n"
 "Language-Team: none\n"
@@ -25,91 +25,91 @@ msgstr ""
 msgid "Not available as a result of being idle"
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:267
 msgid "Sleeping"
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:268
 msgid "Back soon"
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:268
 msgid "Back in some minutes."
 msgstr "Vuelvo en unos minutos."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:269
 msgid "Eating"
 msgstr "Comiendo"
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:269
 msgid "I'm eating, so leave me a message."
 msgstr "Estoy comiendo, déjame un mensaje."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:270
 msgid "Movie"
 msgstr "Película"
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:270
 msgid "I'm watching a movie."
 msgstr "Estoy viendo una película."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:271
 msgid "Working"
 msgstr "Trabajando"
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:271
 msgid "I'm working."
 msgstr "Estoy trabajando."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:272
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:272
 msgid "I'm on the phone."
 msgstr "Estoy al teléfono."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:273
 msgid "Out"
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:273
 msgid "I'm out enjoying life"
 msgstr ""
 
-#: ../src/common/connection.py:291 ../src/common/connection.py:301
+#: ../src/common/connection.py:290 ../src/common/connection.py:300
 #, fuzzy, python-format
 msgid ""
 "Subject: %s\n"
 "%s"
 msgstr "Tema:"
 
-#: ../src/common/connection.py:351 ../src/common/connection.py:1496
+#: ../src/common/connection.py:350 ../src/common/connection.py:1496
 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.py:358
+#: ../src/common/connection.py:357
 #, fuzzy, python-format
 msgid "we are now subscribed to %s"
 msgstr "%s te ha desagregado"
 
-#: ../src/common/connection.py:360
+#: ../src/common/connection.py:359
 #, fuzzy, python-format
 msgid "unsubscribe request from %s"
 msgstr "Petición de adición de %s"
 
-#: ../src/common/connection.py:362
+#: ../src/common/connection.py:361
 #, fuzzy, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s te ha desagregado"
 
-#: ../src/common/connection.py:399
+#: ../src/common/connection.py:398
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr ""
 
-#: ../src/common/connection.py:400
+#: ../src/common/connection.py:399
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 
@@ -186,93 +186,94 @@ msgstr ""
 msgid "error appeared while processing xmpp:"
 msgstr ""
 
-#: ../src/common/helpers.py:28
+#: ../src/common/helpers.py:30
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:30
+#: ../src/common/helpers.py:32
 msgid "Not Available"
 msgstr "No disponible"
 
-#: ../src/common/helpers.py:32
+#: ../src/common/helpers.py:34
 msgid "Free for Chat"
 msgstr "Libre para hablar"
 
-#: ../src/common/helpers.py:34
+#: ../src/common/helpers.py:36
 msgid "Available"
 msgstr "En línea"
 
-#: ../src/common/helpers.py:36
+#: ../src/common/helpers.py:38
 msgid "Connecting"
 msgstr "Conexión"
 
-#: ../src/common/helpers.py:38
+#: ../src/common/helpers.py:40
 msgid "Away"
 msgstr "Ausente"
 
-#: ../src/common/helpers.py:40
+#: ../src/common/helpers.py:42
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:42
+#: ../src/common/helpers.py:44
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../src/common/helpers.py:44
+#: ../src/common/helpers.py:46
 msgid "Not in the roster"
 msgstr "No está en el roster"
 
-#: ../src/common/helpers.py:46 ../src/vcard.py:249 ../src/vcard.py:251
+#: ../src/common/helpers.py:48 ../src/vcard.py:249 ../src/vcard.py:251
 msgid "Unknown"
 msgstr ""
 
-#: ../src/common/helpers.py:48
+#: ../src/common/helpers.py:50
 msgid "Has errors"
 msgstr "Tiene errores"
 
-#: ../src/common/helpers.py:53 ../src/common/helpers.py:67
-#: ../src/groupchat_window.py:271 ../src/gtkgui.glade.h:173
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:69
+#: ../src/groupchat_window.py:271 ../src/gtkgui.glade.h:174
 #, fuzzy
 msgid "None"
 msgstr "Nodo"
 
-#: ../src/common/helpers.py:55
+#: ../src/common/helpers.py:57
 msgid "To"
 msgstr ""
 
-#: ../src/common/helpers.py:57
+#: ../src/common/helpers.py:59
 #, fuzzy
 msgid "From"
 msgstr "Salón:"
 
-#: ../src/common/helpers.py:59
+#: ../src/common/helpers.py:61
 msgid "Both"
 msgstr ""
 
-#: ../src/common/helpers.py:69
+#: ../src/common/helpers.py:71
 #, fuzzy
 msgid "Subscribe"
 msgstr "_Añadir"
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "is paying attention to the conversation"
 msgstr ""
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:112
 msgid "is doing something else"
 msgstr ""
 
-#: ../src/common/helpers.py:112
+#: ../src/common/helpers.py:114
 #, fuzzy
 msgid "is composing a message..."
 msgstr "Mensaje entrante:"
 
-#: ../src/common/helpers.py:114
+#. paused means he was compoing but has stopped for a while
+#: ../src/common/helpers.py:117
 #, fuzzy
-msgid "paused composing a message..."
+msgid "paused composing a message"
 msgstr "Mensaje entrante:"
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 #, fuzzy
 msgid "has closed the chat window or tab"
 msgstr "Usar una sola ventana de conversación con pestañas"
@@ -304,15 +305,6 @@ msgstr ""
 msgid "Unable to write file in %s\n"
 msgstr ""
 
-#: ../src/common/optparser.py:84
-msgid "No space left on device"
-msgstr ""
-
-#: ../src/common/optparser.py:100
-#, python-format
-msgid "Unable to open %s for writing\n"
-msgstr ""
-
 #: ../src/advanced.py:52
 msgid "Preference Name"
 msgstr "Opción"
@@ -329,7 +321,7 @@ msgstr "Tipo"
 msgid "Chat"
 msgstr "Charla"
 
-#: ../src/chat.py:124 ../src/gtkgui.glade.h:127
+#: ../src/chat.py:124 ../src/gtkgui.glade.h:128
 #, fuzzy
 msgid "Group Chat"
 msgstr "Grupos de charla"
@@ -409,162 +401,162 @@ msgstr ""
 msgid "Subject: %s\n"
 msgstr "Tema:"
 
-#: ../src/config.py:198 ../src/config.py:428
+#: ../src/config.py:199 ../src/config.py:436
 #, fuzzy, python-format
 msgid "Every %s _minutes"
 msgstr "Cada 5 _minutos"
 
-#: ../src/config.py:301
+#: ../src/config.py:307
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:309
+#: ../src/config.py:315
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:315
+#: ../src/config.py:321
 msgid "Sound"
 msgstr "Sonido"
 
-#: ../src/config.py:918
+#: ../src/config.py:930
 #, fuzzy
 msgid "status message title"
 msgstr "Mensaje de estado:"
 
-#: ../src/config.py:918
+#: ../src/config.py:930
 #, fuzzy
 msgid "status message text"
 msgstr "Mensaje de estado:"
 
-#: ../src/config.py:971
+#: ../src/config.py:983
 msgid "Choose Sound"
 msgstr "Elegir sonido"
 
-#: ../src/config.py:978 ../src/config.py:1923 ../src/vcard.py:131
+#: ../src/config.py:990 ../src/config.py:1935 ../src/vcard.py:131
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: ../src/config.py:983
+#: ../src/config.py:995
 msgid "Wav Sounds"
 msgstr "Sonidos Wav"
 
-#: ../src/config.py:1152
+#: ../src/config.py:1164
 msgid "OpenPGP is not usable in this computer"
 msgstr "GPG no es usable en este ordenador"
 
-#: ../src/config.py:1177
+#: ../src/config.py:1189
 #, fuzzy
 msgid "You are currently connected to the server"
 msgstr "Debes estar conectado para navegar los servicios"
 
-#: ../src/config.py:1178
+#: ../src/config.py:1190
 msgid "To change the account name, you must be disconnected."
 msgstr ""
 
-#: ../src/config.py:1181 ../src/config.py:1185
+#: ../src/config.py:1193 ../src/config.py:1197
 msgid "Invalid account name"
 msgstr ""
 
-#: ../src/config.py:1182
+#: ../src/config.py:1194
 #, fuzzy
 msgid "Account name cannot be empty."
 msgstr "Tu contraseña no puede estar vacía"
 
-#: ../src/config.py:1186
+#: ../src/config.py:1198
 #, fuzzy
 msgid "Account name cannot contain spaces."
 msgstr "Tu contraseña no puede estar vacía"
 
-#: ../src/config.py:1190
+#: ../src/config.py:1202
 #, fuzzy
 msgid "Invalid Jabber ID"
 msgstr "ID de Jabber:"
 
-#: ../src/config.py:1191
+#: ../src/config.py:1203
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr ""
 
-#: ../src/config.py:1198 ../src/dialogs.py:1107
+#: ../src/config.py:1210 ../src/dialogs.py:1107
 #, fuzzy
 msgid "Invalid password"
 msgstr "_Guardar contraseña"
 
-#: ../src/config.py:1199
+#: ../src/config.py:1211
 #, fuzzy
 msgid "You must enter a password for the new account."
 msgstr "Debes introducir una contraseña para registrar una cuenta nueva"
 
-#: ../src/config.py:1236
+#: ../src/config.py:1248
 msgid "Invalid entry"
 msgstr ""
 
-#: ../src/config.py:1237
+#: ../src/config.py:1249
 #, fuzzy
 msgid "Custom port must be a port number."
 msgstr "El puerto del Proxy tiene que ser un número de puerto"
 
-#: ../src/config.py:1324
+#: ../src/config.py:1336
 msgid "Account name is in use"
 msgstr ""
 
-#: ../src/config.py:1325
+#: ../src/config.py:1337
 #, fuzzy
 msgid "You already have an account using this name."
 msgstr "Ya tengo una cuenta y quiero usarla"
 
-#: ../src/config.py:1387
+#: ../src/config.py:1399
 #, fuzzy
 msgid "No such account available"
 msgstr "No disponible"
 
-#: ../src/config.py:1388
+#: ../src/config.py:1400
 #, fuzzy
 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:1395 ../src/config.py:2005 ../src/dialogs.py:981
+#: ../src/config.py:1407 ../src/config.py:2017 ../src/dialogs.py:981
 #: ../src/dialogs.py:1087 ../src/vcard.py:374 ../src/vcard.py:402
 #, fuzzy
 msgid "You are not connected to the server"
 msgstr "Debes estar conectado para navegar los servicios"
 
-#: ../src/config.py:1396
+#: ../src/config.py:1408
 #, fuzzy
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Debes estar conectado para editar tu información personal"
 
-#: ../src/config.py:1423
+#: ../src/config.py:1435
 #, fuzzy
 msgid "Failed to get secret keys"
 msgstr "Error obteniendo las claves secretas"
 
-#: ../src/config.py:1424
+#: ../src/config.py:1436
 msgid "There was a problem retrieving your GPG secret keys."
 msgstr ""
 
-#: ../src/config.py:1427 ../src/gtkgui.glade.h:183
+#: ../src/config.py:1439 ../src/gtkgui.glade.h:183
 msgid "Passphrase"
 msgstr "Contraseña"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1440
 #, fuzzy
 msgid "Choose your OpenPGP key"
 msgstr "<b>Elegir clave OpenPGP</b>"
 
-#: ../src/config.py:1436 ../src/gtkgui.glade.h:172
+#: ../src/config.py:1448 ../src/gtkgui.glade.h:173
 msgid "No key selected"
 msgstr "No se ha seleccionado ninguna clave"
 
-#: ../src/config.py:1667 ../src/config.py:2028
+#: ../src/config.py:1679 ../src/config.py:2040
 msgid "Name"
 msgstr "Nombre"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1682
 msgid "Server"
 msgstr "Servidor"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1775 ../src/config.py:2247 ../src/dialogs.py:112
+#: ../src/config.py:1787 ../src/config.py:2259 ../src/dialogs.py:112
 #: ../src/dialogs.py:282 ../src/dialogs.py:318 ../src/roster_window.py:123
 #: ../src/roster_window.py:128 ../src/roster_window.py:152
 #: ../src/roster_window.py:1928 ../src/roster_window.py:1930
@@ -572,122 +564,122 @@ msgstr "Servidor"
 msgid "Transports"
 msgstr ""
 
-#: ../src/config.py:1790
+#: ../src/config.py:1802
 #, python-format
 msgid "Edit %s"
 msgstr "_Editar %s"
 
-#: ../src/config.py:1792
+#: ../src/config.py:1804
 #, python-format
 msgid "Register to %s"
 msgstr "Registrar a %s"
 
-#: ../src/config.py:1812
+#: ../src/config.py:1824
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/config.py:1820
+#: ../src/config.py:1832
 msgid "Image"
 msgstr "Imagen"
 
-#: ../src/config.py:1867
+#: ../src/config.py:1879
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/config.py:1867
+#: ../src/config.py:1879
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
 msgstr ""
 
-#: ../src/config.py:1917
+#: ../src/config.py:1929
 #, fuzzy
 msgid "Choose Image"
 msgstr "Elegir _clave"
 
-#: ../src/config.py:1928 ../src/vcard.py:136
+#: ../src/config.py:1940 ../src/vcard.py:136
 #, fuzzy
 msgid "Images"
 msgstr "Imagen"
 
-#: ../src/config.py:2006
+#: ../src/config.py:2018
 #, fuzzy
 msgid "Without a connection, you can not browse available services"
 msgstr "Debes estar conectado para navegar los servicios"
 
-#: ../src/config.py:2011
+#: ../src/config.py:2023
 #, fuzzy, python-format
 msgid "Service Discovery using %s account"
 msgstr "Gestión de servicios"
 
-#: ../src/config.py:2013
+#: ../src/config.py:2025
 msgid "Service Discovery"
 msgstr "Gestión de servicios"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2045
 msgid "Service"
 msgstr "Servicio"
 
-#: ../src/config.py:2038
+#: ../src/config.py:2050
 msgid "Node"
 msgstr "Nodo"
 
-#: ../src/config.py:2250 ../src/gtkgui.glade.h:305
+#: ../src/config.py:2262 ../src/gtkgui.glade.h:305
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/config.py:2252 ../src/gtkgui.glade.h:201
+#: ../src/config.py:2264 ../src/gtkgui.glade.h:201
 msgid "Re_gister"
 msgstr "_Suscribir"
 
-#: ../src/config.py:2424
+#: ../src/config.py:2436
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminando la cuenta %s"
 
-#: ../src/config.py:2431
+#: ../src/config.py:2443
 #, fuzzy, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Debes estar conectado para navegar los servicios"
 
-#: ../src/config.py:2432
+#: ../src/config.py:2444
 msgid "If you remove it, the connection will be lost."
 msgstr ""
 
-#: ../src/config.py:2557
+#: ../src/config.py:2569
 #, fuzzy
 msgid "New Room"
 msgstr "Salón:"
 
-#: ../src/config.py:2587
+#: ../src/config.py:2599
 msgid "This bookmark has invalid data"
 msgstr ""
 
-#: ../src/config.py:2588
+#: ../src/config.py:2600
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 
-#: ../src/config.py:2808
+#: ../src/config.py:2820
 msgid ""
 "Account has been added successfully.\n"
 "You can set advanced options by using \"Edit->Accounts\" from the main "
 "window."
 msgstr ""
 
-#: ../src/config.py:2819
+#: ../src/config.py:2831
 msgid ""
 "Your new account has been created and added to your gajim configuration.\n"
 "You can set advanced account options using \"Edit->Accounts\" in the main "
 "window menu."
 msgstr ""
 
-#: ../src/config.py:2833
+#: ../src/config.py:2845
 #, fuzzy
 msgid "You need to enter a username to add an account."
 msgstr "Debes introducir un nombre para esta cuenta"
 
-#: ../src/config.py:2837
+#: ../src/config.py:2849
 #, fuzzy
 msgid "You need to enter a valid server address to add an account."
 msgstr "Debes introducir una contraseña para registrar una cuenta nueva"
@@ -779,7 +771,7 @@ msgstr "Gajim - %s mensajes sin leer"
 msgid "Gajim - 1 unread message"
 msgstr "Gajim - 1 mensaje sin leer"
 
-#: ../src/dialogs.py:696 ../src/gtkgui.glade.h:116
+#: ../src/dialogs.py:696 ../src/gtkgui.glade.h:117
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -788,7 +780,7 @@ msgstr "Gajim"
 msgid "Gajim - %s"
 msgstr "Gajim"
 
-#: ../src/dialogs.py:733 ../src/dialogs.py:834 ../src/dialogs.py:1777
+#: ../src/dialogs.py:733 ../src/dialogs.py:834 ../src/dialogs.py:1778
 #, fuzzy
 msgid "Name: "
 msgstr "_Nombre: "
@@ -807,12 +799,12 @@ msgstr "Abrir página de descarga"
 msgid "Upload"
 msgstr ""
 
-#: ../src/dialogs.py:745 ../src/dialogs.py:1779
+#: ../src/dialogs.py:745 ../src/dialogs.py:1780
 #, fuzzy
 msgid "Sender: "
 msgstr "_Denegar"
 
-#: ../src/dialogs.py:748 ../src/dialogs.py:1781
+#: ../src/dialogs.py:748 ../src/dialogs.py:1782
 #, fuzzy
 msgid "Recipient: "
 msgstr "Recientemente:"
@@ -892,7 +884,7 @@ msgstr ""
 msgid "Join Group Chat as %s"
 msgstr "Entrar a un grupo de chat como "
 
-#: ../src/dialogs.py:997 ../src/gtkgui.glade.h:153
+#: ../src/dialogs.py:997 ../src/gtkgui.glade.h:154
 #, fuzzy
 msgid "Join Group Chat"
 msgstr "Entrar a un grupo de chat"
@@ -903,7 +895,7 @@ msgid "New Message as %s"
 msgstr "Nuevo mensaje como "
 
 #: ../src/dialogs.py:1062 ../src/dialogs.py:1157 ../src/gajim.py:462
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:170
 msgid "New Message"
 msgstr "Nuevo mensaje"
 
@@ -1125,17 +1117,17 @@ msgstr ""
 msgid "Would you like to overwrite it?"
 msgstr ""
 
-#: ../src/dialogs.py:1880 ../src/gtkgui.glade.h:338
+#: ../src/dialogs.py:1881 ../src/gtkgui.glade.h:338
 #, fuzzy
 msgid "_Pause"
 msgstr "Estado"
 
-#: ../src/dialogs.py:1883 ../src/dialogs.py:1915
+#: ../src/dialogs.py:1884 ../src/dialogs.py:1916
 #, fuzzy
 msgid "_Continue"
 msgstr "Conexión"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1912
 #, fuzzy
 msgid "Pause"
 msgstr "Valor"
@@ -1155,7 +1147,7 @@ msgid "error while sending"
 msgstr "error durante el envío"
 
 #: ../src/gajim.py:536 ../src/gajim.py:546 ../src/roster_window.py:125
-#: ../src/roster_window.py:1036 ../src/gtkgui.glade.h:124
+#: ../src/roster_window.py:1036 ../src/gtkgui.glade.h:125
 msgid "General"
 msgstr "General"
 
@@ -1202,7 +1194,8 @@ msgstr "Guardar contraseña (inseguro)"
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Tu contraseña GPG es incorrecta, estás conectado sin tu clave GPG"
 
-#: ../src/gajim.py:1025
+#. it is good to notify the user, in case he cannot see the output of the console
+#: ../src/gajim.py:1027
 msgid "Cannot save your preferences"
 msgstr ""
 
@@ -1338,7 +1331,7 @@ msgstr ""
 msgid "Banning %s"
 msgstr ""
 
-#: ../src/groupchat_window.py:961 ../src/tabbed_chat_window.py:323
+#: ../src/groupchat_window.py:961 ../src/tabbed_chat_window.py:327
 msgid "If you close this tab, the message will be lost."
 msgstr ""
 
@@ -1602,40 +1595,40 @@ msgstr "Click para configurar las opciones del salón"
 msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:254 ../src/tabbed_chat_window.py:322
+#: ../src/tabbed_chat_window.py:258 ../src/tabbed_chat_window.py:326
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:255
+#: ../src/tabbed_chat_window.py:259
 msgid "If you close the window, this message will be lost."
 msgstr ""
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:488
+#: ../src/tabbed_chat_window.py:492
 #, fuzzy
 msgid "A connection is not available"
 msgstr "Poner _no disponible después de:"
 
-#: ../src/tabbed_chat_window.py:489
+#: ../src/tabbed_chat_window.py:493
 msgid "Your message can not be sent until you are connected."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:577
+#: ../src/tabbed_chat_window.py:581
 #, fuzzy
 msgid "Sending private message failed"
 msgstr "_Nuevo mensaje"
 
-#: ../src/tabbed_chat_window.py:578
+#: ../src/tabbed_chat_window.py:582
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:681
+#: ../src/tabbed_chat_window.py:685
 msgid "Encryption enabled"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:686
+#: ../src/tabbed_chat_window.py:690
 msgid "Encryption disabled"
 msgstr ""
 
@@ -1682,30 +1675,32 @@ msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Editor de configuración avanzada</b>"
 
 #: ../src/gtkgui.glade.h:4
-msgid "<b>Changes in latest version</b>"
-msgstr "<b>Cambios de la última versión</b>"
+#, fuzzy
+msgid "<b>Applications</b>"
+msgstr "<b>Programas</b>"
 
 #: ../src/gtkgui.glade.h:5
-msgid "<b>Custom Applications</b>"
-msgstr "<b>Programas</b>"
+msgid "<b>Changes in latest version</b>"
+msgstr "<b>Cambios de la última versión</b>"
 
 #: ../src/gtkgui.glade.h:6
+#, fuzzy
+msgid "<b>Custom</b>"
+msgstr "<b>Registro</b>"
+
+#: ../src/gtkgui.glade.h:7
 msgid "<b>Format of a chat line</b>"
 msgstr "<b>Formato del renglón</b>"
 
-#: ../src/gtkgui.glade.h:7
+#: ../src/gtkgui.glade.h:8
 #, fuzzy
 msgid "<b>Interface Customization</b>"
 msgstr "<b>Programas</b>"
 
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Jabber Traffic</b>"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:9
-msgid "<b>Links</b>"
-msgstr "<b>Enlaces</b>"
-
 #: ../src/gtkgui.glade.h:10
 msgid "<b>Log</b>"
 msgstr "<b>Registro</b>"
@@ -2132,33 +2127,38 @@ msgid "File _Transfers"
 msgstr "_Usar los iconos del transporte"
 
 #: ../src/gtkgui.glade.h:111
+#, fuzzy
+msgid "File manager:"
+msgstr "_Usar los iconos del transporte"
+
+#: ../src/gtkgui.glade.h:112
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 #, fuzzy
 msgid "Font:"
 msgstr "Cuentas:"
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:114
 msgid "Format: YYYY-MM-DD"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:115
 #, fuzzy
 msgid "From:"
 msgstr "Salón:"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:116
 #, fuzzy
 msgid "GPG Encryption"
 msgstr "Click para configurar las opciones del salón"
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Gajim Themes Customization"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2166,7 +2166,7 @@ msgstr ""
 "Gajim mostrará automáticamente los nuevos mensajes recibidos en una ventana "
 "de charla o pestaña en una ventana de chat existente"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2174,7 +2174,7 @@ msgstr ""
 "Gajim te notificará de nuevos mensajes a través de un mensaje emergente en "
 "la esquina inferior derecha de la pantalla"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:121
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2182,7 +2182,7 @@ msgstr ""
 "Gajim notificará con un mensaje emergente en la parte inferior derecha de la "
 "pantalla cuando un contacto se conecte"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:122
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2190,79 +2190,79 @@ msgstr ""
 "Gajim notificará con un mensaje emergente en la parte inferior derecha de la "
 "pantalla cuando un contacto se desconecte"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:123
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr "Gajim sólo cambiará el icono del contacto que envía el nuevo mensaje"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
 msgid "Gajim: First Time Wizard"
 msgstr "Gajim: Asistente para la primera vez"
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:126
 #, fuzzy
 msgid "Given:"
 msgstr "Cliente:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:127
 msgid "Go"
 msgstr "Ir"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:129
 msgid "Group:"
 msgstr "Grupo:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:130
 #, fuzzy
 msgid "HTTP Connect"
 msgstr "Conexión"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:131
 msgid "Homepage:"
 msgstr "Página web:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:132
 #, fuzzy
 msgid "Hostname: "
 msgstr "_Servidor:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:133
 msgid "I already have an account I want to use"
 msgstr "Ya tengo una cuenta y quiero usarla"
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "I want to _register for a new account"
 msgstr "Quiero _registrar una nueva cuenta de Jabber"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:135
 msgid "I would like to add you to my contact list."
 msgstr "Me gustaría añadirte a mi lista de contactos."
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "If checked, Gajim will also have a trayicon"
 msgstr ""
 "Si está marcado, Gajim alojará un icono en el área de notificación del "
 "sistema"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid ""
 "If checked, Gajim will broadcast capability to send and receive meta-"
 "information related to a conversation you may have with a contact such as "
 "composing a message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 #, fuzzy
 msgid "If checked, Gajim will join this groupchat on startup"
 msgstr ""
 "Si está marcado, Gajim alojará un icono en el área de notificación del "
 "sistema"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:139
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Si está marcado, Gajim recordará la contraseña para esta cuenta"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:140
 #, fuzzy
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
@@ -2271,7 +2271,7 @@ msgstr ""
 "Si está marcado, Gajim recordará la posición y tamaño de la ventana de "
 "contactos para futuras ejecuciones"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2279,13 +2279,13 @@ msgstr ""
 "Si está marcado, Gajim reemplazará emoticonos de texto como ':)' por su "
 "equivalente en iconos"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for only you and of course the administrator"
@@ -2293,7 +2293,7 @@ msgstr ""
 "Si está marcado, Gajim guardará la contraseña en ~/.gajim/config con acceso "
 "de lectura para tí y el administrador únicamente"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:144
 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, "
@@ -2303,7 +2303,7 @@ msgstr ""
 "un contacto de MSN tendrá el icono de msn equivalente para su estado en "
 "línea, ausente, ocupado, etc...)"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:145
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2311,7 +2311,7 @@ msgstr ""
 "Si está marcado, Gajim, cuando se inicie, conectará automáticamente a Jabber "
 "usando esta cuenta."
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:146
 msgid ""
 "If checked, all chat and group chat windows will have the information area "
 "in the top and the buttons area in the bottom hidden. You can quick toggle "
@@ -2319,7 +2319,7 @@ msgid ""
 "a permanent one"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:147
 #, fuzzy
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
@@ -2328,125 +2328,121 @@ msgstr ""
 "Si tienes dos o más cuentas y está marcado, Gajim listará todos los "
 "contactos de forma mixta"
 
-#: ../src/gtkgui.glade.h:147
+#: ../src/gtkgui.glade.h:148
 msgid "Incoming message:"
 msgstr "Mensaje entrante:"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:149
 msgid "Info/Query"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:150
 msgid "Information about you are stored on the server as vCard"
 msgstr "Tu información se ha guardado en el servidor como vCard"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:151
 msgid "Italic"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:152
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:153
 msgid "Jabber ID:"
 msgstr "ID de Jabber:"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:155
 #, fuzzy
 msgid "Join _Group Chat"
 msgstr "Entrar a un grupo de charla"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:156
 #, fuzzy
 msgid "Join _Group Chat..."
 msgstr "Entrar a un grupo de charla"
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:157
 msgid "Location"
 msgstr "Dirección"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:158
 msgid "Log history"
 msgstr "Histórico"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:159
 msgid "Log presences in _contact's log file"
 msgstr "Registrar los estados en el registo del contacto"
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:160
 msgid "Log presences in an _external file"
 msgstr "Registrar los estados en un archivo externo"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:161
 #, fuzzy
 msgid "Manage Accounts"
 msgstr "_Combinar las cuentas"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:162
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:163
 #, fuzzy
 msgid "Manage Emoticons"
 msgstr "Usar _emoticonos"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:164
 msgid "Manage Proxy Profiles"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:165
 msgid "Manage..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:166
 msgid "Middle:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:167
 #, fuzzy
 msgid "Mo_derator"
 msgstr "_Dar moderación"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:168
 #, fuzzy
 msgid "More"
 msgstr "Película"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:169
 msgid "Name:"
 msgstr "Nombre:"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:171
 msgid "New version of Gajim available"
 msgstr "Nueva versión de Gajim disponible"
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:172
 msgid "Nickname:"
 msgstr "Alias:"
 
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:175
 msgid "Notify me about contacts that: "
 msgstr "Notificar cuand un contacto: "
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:176
 msgid "OS:"
 msgstr "SO:"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:177
 #, fuzzy
 msgid "On every _message"
 msgstr "En cada _línea"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:178
 msgid "Open Download Page"
 msgstr "Abrir página de descarga"
 
-#: ../src/gtkgui.glade.h:178
-msgid "Open _with:"
-msgstr "Abrir con:"
-
 #: ../src/gtkgui.glade.h:179
 msgid "Open..."
 msgstr "Abrir..."
@@ -3287,184 +3283,191 @@ msgstr "minutos"
 msgid "show a help on specific command"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:74
+#. parameter, named "on_command". User gets help for the command, specified by this parameter
+#: ../scripts/gajim-remote.py:75
 msgid "on_command"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:74
+#: ../scripts/gajim-remote.py:76
 msgid "show help on command"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:78
+#: ../scripts/gajim-remote.py:80
 msgid "Shows or hides the roster window"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:82
+#: ../scripts/gajim-remote.py:84
 msgid "Popup a window with the next unread message"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:86
+#: ../scripts/gajim-remote.py:88
 #, fuzzy
 msgid ""
 "Print a list of all contacts in the roster. Each contact appear on a "
 "separate line"
 msgstr "_Ignorar mensajes de contactos que no están en la lista de contactos"
 
-#: ../scripts/gajim-remote.py:89 ../scripts/gajim-remote.py:104
-#: ../scripts/gajim-remote.py:116 ../scripts/gajim-remote.py:130
+#: ../scripts/gajim-remote.py:91 ../scripts/gajim-remote.py:106
+#: ../scripts/gajim-remote.py:118 ../scripts/gajim-remote.py:132
 #, fuzzy
 msgid "account"
 msgstr "Cuenta"
 
-#: ../scripts/gajim-remote.py:89
+#: ../scripts/gajim-remote.py:91
 msgid "show only contacts of the given account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:95
+#: ../scripts/gajim-remote.py:97
 #, fuzzy
 msgid "Print a list of registered accounts"
 msgstr "Quiero _registrar una nueva cuenta de Jabber"
 
-#: ../scripts/gajim-remote.py:99
+#: ../scripts/gajim-remote.py:101
 msgid "Change the status of account or accounts"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:101
+#: ../scripts/gajim-remote.py:103
 #, fuzzy
 msgid "status"
 msgstr "Estado"
 
-#: ../scripts/gajim-remote.py:101
+#: ../scripts/gajim-remote.py:103
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 
-#: ../scripts/gajim-remote.py:103 ../scripts/gajim-remote.py:127
+#: ../scripts/gajim-remote.py:105 ../scripts/gajim-remote.py:129
 #, fuzzy
 msgid "message"
 msgstr "_Nuevo mensaje"
 
-#: ../scripts/gajim-remote.py:103
+#: ../scripts/gajim-remote.py:105
 #, fuzzy
 msgid "status message"
 msgstr "Mensaje de estado:"
 
-#: ../scripts/gajim-remote.py:104
+#: ../scripts/gajim-remote.py:106
 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 ""
 
-#: ../scripts/gajim-remote.py:110
+#: ../scripts/gajim-remote.py:112
 msgid "Show the chat dialog so that you can send message to a contact"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:113
+#: ../scripts/gajim-remote.py:115
 #, fuzzy
 msgid "jid of the contact that you want to chat with"
 msgstr "Por favor, introduce los datos para tu nueva cuenta"
 
-#: ../scripts/gajim-remote.py:116
+#: ../scripts/gajim-remote.py:118
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:121
+#: ../scripts/gajim-remote.py:123
 msgid ""
 "Send new message to a contact in the roster. Both OpenPGP key and account "
 "are optional. If you want to set only 'account', whitout 'pgp key', just set "
 "'pgp key' to ''."
 msgstr ""
 
-#: ../scripts/gajim-remote.py:125
+#: ../scripts/gajim-remote.py:127
 #, fuzzy
 msgid "jid of the contact that will receive the message"
 msgstr "Gajim sólo cambiará el icono del contacto que envía el nuevo mensaje"
 
-#: ../scripts/gajim-remote.py:127
+#: ../scripts/gajim-remote.py:129
 msgid "message contents"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:128
+#: ../scripts/gajim-remote.py:130
 msgid "pgp key"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:128
+#: ../scripts/gajim-remote.py:130
 msgid "if specified, the message will be encrypted using this pulic key"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:130
+#: ../scripts/gajim-remote.py:132
 msgid "if specified, the message will be sent using this account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:135
+#: ../scripts/gajim-remote.py:137
 msgid "Get detailed info on a contact"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:137
+#: ../scripts/gajim-remote.py:139
 #, fuzzy
 msgid "jid of the contact"
 msgstr "Añadir un contacto"
 
-#: ../scripts/gajim-remote.py:158
+#: ../scripts/gajim-remote.py:160
 msgid "Missing argument \"contact_jid\""
 msgstr ""
 
-#: ../scripts/gajim-remote.py:163 ../scripts/gajim-remote.py:476
+#: ../scripts/gajim-remote.py:165 ../scripts/gajim-remote.py:478
 #, fuzzy
 msgid "Service not available"
 msgstr "Poner _no disponible después de:"
 
-#: ../scripts/gajim-remote.py:181
+#: ../scripts/gajim-remote.py:183
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 msgstr ""
 
-#: ../scripts/gajim-remote.py:184
+#: ../scripts/gajim-remote.py:186
 msgid "You have no active account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:203
+#: ../scripts/gajim-remote.py:205
 #, fuzzy
 msgid "Session bus is not available."
 msgstr "Poner _no disponible después de:"
 
-#: ../scripts/gajim-remote.py:212
+#: ../scripts/gajim-remote.py:214
 #, python-format
 msgid "Unknow dbus version: %s"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:238
+#: ../scripts/gajim-remote.py:240
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
 "\t"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:244
+#: ../scripts/gajim-remote.py:246
 #, python-format
 msgid "%s not found"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:248
+#: ../scripts/gajim-remote.py:250
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:307
+#: ../scripts/gajim-remote.py:309
 #, python-format
 msgid "Unknown type %s "
 msgstr ""
 
-#: ../scripts/gajim-remote.py:449
+#: ../scripts/gajim-remote.py:451
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 msgstr ""
 
+#~ msgid "<b>Links</b>"
+#~ msgstr "<b>Enlaces</b>"
+
+#~ msgid "Open _with:"
+#~ msgstr "Abrir con:"
+
 #, fuzzy
 #~ msgid "Switch to"
 #~ msgstr "Registrar a %s"
diff --git a/po/fr/LC_MESSAGES/gajim.po b/po/fr/LC_MESSAGES/gajim.po
index 86cd1413187eb381eb6b6d261a0d2142c792844a..6ffb70065b4ebac265b8a0be1f0da2754f4ebfeb 100644
--- a/po/fr/LC_MESSAGES/gajim.po
+++ b/po/fr/LC_MESSAGES/gajim.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.7.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 01:26+0300\n"
+"POT-Creation-Date: 2005-08-09 18:26+0300\n"
 "PO-Revision-Date: 2005-06-01 20:37+0200\n"
 "Last-Translator: Yann Le Boulanger <asterix@lagaule.org>\n"
 "Language-Team:  none\n"
@@ -27,59 +27,59 @@ msgstr ""
 msgid "Not available as a result of being idle"
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:267
 msgid "Sleeping"
 msgstr "Dors"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:268
 msgid "Back soon"
 msgstr "Bientôt de retour"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:268
 msgid "Back in some minutes."
 msgstr "De retour dans quelques minutes."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:269
 msgid "Eating"
 msgstr "Mange"
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:269
 msgid "I'm eating, so leave me a message."
 msgstr "Je mange, donc laissez moi un message."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:270
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:270
 msgid "I'm watching a movie."
 msgstr "Je regarde un film."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:271
 msgid "Working"
 msgstr "Travail"
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:271
 msgid "I'm working."
 msgstr "Je travaille."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:272
 msgid "Phone"
 msgstr "Téléphone"
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:272
 msgid "I'm on the phone."
 msgstr "Je suis au téléphone."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:273
 msgid "Out"
 msgstr "Dehors"
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:273
 msgid "I'm out enjoying life"
 msgstr "Je suis dehors à profiter de la vie"
 
-#: ../src/common/connection.py:291 ../src/common/connection.py:301
+#: ../src/common/connection.py:290 ../src/common/connection.py:300
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -88,32 +88,32 @@ msgstr ""
 "Sujet : %s\n"
 "%s"
 
-#: ../src/common/connection.py:351 ../src/common/connection.py:1496
+#: ../src/common/connection.py:350 ../src/common/connection.py:1496
 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.py:358
+#: ../src/common/connection.py:357
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nous sommes maintenant inscrit chez %s"
 
-#: ../src/common/connection.py:360
+#: ../src/common/connection.py:359
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Requête de désinscription de la part de %s"
 
-#: ../src/common/connection.py:362
+#: ../src/common/connection.py:361
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nous sommes maintenant désinscription de la part de %s"
 
-#: ../src/common/connection.py:399
+#: ../src/common/connection.py:398
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "La connexion du compte \"%s\" a été perdue"
 
-#: ../src/common/connection.py:400
+#: ../src/common/connection.py:399
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Pour continuer à envoyer et recevoir des messages, vous devez vous "
@@ -189,91 +189,93 @@ msgstr ""
 msgid "error appeared while processing xmpp:"
 msgstr "une erreur est survenue en traitant xmpp :"
 
-#: ../src/common/helpers.py:28
+#: ../src/common/helpers.py:30
 msgid "Busy"
 msgstr "Occupé"
 
-#: ../src/common/helpers.py:30
+#: ../src/common/helpers.py:32
 msgid "Not Available"
 msgstr "Non Disponible"
 
-#: ../src/common/helpers.py:32
+#: ../src/common/helpers.py:34
 msgid "Free for Chat"
 msgstr "Disponible pour Discuter"
 
-#: ../src/common/helpers.py:34
+#: ../src/common/helpers.py:36
 msgid "Available"
 msgstr "Disponible"
 
-#: ../src/common/helpers.py:36
+#: ../src/common/helpers.py:38
 msgid "Connecting"
 msgstr "Connexion"
 
-#: ../src/common/helpers.py:38
+#: ../src/common/helpers.py:40
 msgid "Away"
 msgstr "Absent"
 
-#: ../src/common/helpers.py:40
+#: ../src/common/helpers.py:42
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: ../src/common/helpers.py:42
+#: ../src/common/helpers.py:44
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../src/common/helpers.py:44
+#: ../src/common/helpers.py:46
 msgid "Not in the roster"
 msgstr "Non dans la liste"
 
-#: ../src/common/helpers.py:46 ../src/vcard.py:249 ../src/vcard.py:251
+#: ../src/common/helpers.py:48 ../src/vcard.py:249 ../src/vcard.py:251
 msgid "Unknown"
 msgstr ""
 
-#: ../src/common/helpers.py:48
+#: ../src/common/helpers.py:50
 msgid "Has errors"
 msgstr "À des erreurs"
 
-#: ../src/common/helpers.py:53 ../src/common/helpers.py:67
-#: ../src/groupchat_window.py:271 ../src/gtkgui.glade.h:173
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:69
+#: ../src/groupchat_window.py:271 ../src/gtkgui.glade.h:174
 msgid "None"
 msgstr "Aucun"
 
-#: ../src/common/helpers.py:55
+#: ../src/common/helpers.py:57
 #, fuzzy
 msgid "To"
 msgstr "À:"
 
-#: ../src/common/helpers.py:57
+#: ../src/common/helpers.py:59
 #, fuzzy
 msgid "From"
 msgstr "De :"
 
-#: ../src/common/helpers.py:59
+#: ../src/common/helpers.py:61
 msgid "Both"
 msgstr ""
 
-#: ../src/common/helpers.py:69
+#: ../src/common/helpers.py:71
 #, fuzzy
 msgid "Subscribe"
 msgstr "_Ajouter"
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "is paying attention to the conversation"
 msgstr "prête attention à la conversation"
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:112
 msgid "is doing something else"
 msgstr "fait quelque chose d'autre"
 
-#: ../src/common/helpers.py:112
+#: ../src/common/helpers.py:114
 msgid "is composing a message..."
 msgstr "est en train d'écrire un message..."
 
-#: ../src/common/helpers.py:114
-msgid "paused composing a message..."
+#. paused means he was compoing but has stopped for a while
+#: ../src/common/helpers.py:117
+#, fuzzy
+msgid "paused composing a message"
 msgstr "a arrêté d'écrire un message..."
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 msgid "has closed the chat window or tab"
 msgstr "a fermé la fenêtre ou l'onglet de discution"
 
@@ -304,16 +306,6 @@ msgstr "erreur: impossible d'ouvrir %s en lecture\n"
 msgid "Unable to write file in %s\n"
 msgstr "Impossible d'ecrire dans %s\n"
 
-#: ../src/common/optparser.py:84
-#, fuzzy
-msgid "No space left on device"
-msgstr "Espace disque insuffisant."
-
-#: ../src/common/optparser.py:100
-#, fuzzy, python-format
-msgid "Unable to open %s for writing\n"
-msgstr "Impossible d'ouvrir %s en écriture\n"
-
 #: ../src/advanced.py:52
 msgid "Preference Name"
 msgstr "Option"
@@ -330,7 +322,7 @@ msgstr "Type"
 msgid "Chat"
 msgstr "Discussion"
 
-#: ../src/chat.py:124 ../src/gtkgui.glade.h:127
+#: ../src/chat.py:124 ../src/gtkgui.glade.h:128
 msgid "Group Chat"
 msgstr "Groupes de Discussion"
 
@@ -407,146 +399,146 @@ msgstr "_Rechercher sur Internet"
 msgid "Subject: %s\n"
 msgstr "Sujet : %s\n"
 
-#: ../src/config.py:198 ../src/config.py:428
+#: ../src/config.py:199 ../src/config.py:436
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Toutes les %s _minutes"
 
-#: ../src/config.py:301
+#: ../src/config.py:307
 msgid "Active"
 msgstr "Actif"
 
-#: ../src/config.py:309
+#: ../src/config.py:315
 msgid "Event"
 msgstr "Événement"
 
-#: ../src/config.py:315
+#: ../src/config.py:321
 msgid "Sound"
 msgstr "Son"
 
-#: ../src/config.py:918
+#: ../src/config.py:930
 msgid "status message title"
 msgstr "titre du message d'état"
 
-#: ../src/config.py:918
+#: ../src/config.py:930
 msgid "status message text"
 msgstr "texte du message d'état :"
 
-#: ../src/config.py:971
+#: ../src/config.py:983
 msgid "Choose Sound"
 msgstr "Choisissez un Son"
 
-#: ../src/config.py:978 ../src/config.py:1923 ../src/vcard.py:131
+#: ../src/config.py:990 ../src/config.py:1935 ../src/vcard.py:131
 msgid "All files"
 msgstr "Tous les fichiers"
 
-#: ../src/config.py:983
+#: ../src/config.py:995
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/config.py:1152
+#: ../src/config.py:1164
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP n'est pas utilisable sur cet ordinateur"
 
-#: ../src/config.py:1177
+#: ../src/config.py:1189
 msgid "You are currently connected to the server"
 msgstr "Vous êtes actuellement connecté au serveur"
 
-#: ../src/config.py:1178
+#: ../src/config.py:1190
 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:1181 ../src/config.py:1185
+#: ../src/config.py:1193 ../src/config.py:1197
 msgid "Invalid account name"
 msgstr "Nom de compte invalide"
 
-#: ../src/config.py:1182
+#: ../src/config.py:1194
 msgid "Account name cannot be empty."
 msgstr "Le nom du compte ne peut pas être vide."
 
-#: ../src/config.py:1186
+#: ../src/config.py:1198
 msgid "Account name cannot contain spaces."
 msgstr "Le nom du compte ne peut pas contenir d'espaces."
 
-#: ../src/config.py:1190
+#: ../src/config.py:1202
 msgid "Invalid Jabber ID"
 msgstr "Identifiant Jabber invalide"
 
-#: ../src/config.py:1191
+#: ../src/config.py:1203
 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:1198 ../src/dialogs.py:1107
+#: ../src/config.py:1210 ../src/dialogs.py:1107
 msgid "Invalid password"
 msgstr "Mot de passe invalide"
 
-#: ../src/config.py:1199
+#: ../src/config.py:1211
 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:1236
+#: ../src/config.py:1248
 msgid "Invalid entry"
 msgstr "Entrée invalide"
 
-#: ../src/config.py:1237
+#: ../src/config.py:1249
 msgid "Custom port must be a port number."
 msgstr "Le port personnalisé doit être un numéro de port"
 
-#: ../src/config.py:1324
+#: ../src/config.py:1336
 msgid "Account name is in use"
 msgstr "Le nom du compte est utilisé"
 
-#: ../src/config.py:1325
+#: ../src/config.py:1337
 msgid "You already have an account using this name."
 msgstr "Vous avez déjà un compte avec ce nom."
 
-#: ../src/config.py:1387
+#: ../src/config.py:1399
 msgid "No such account available"
 msgstr "Compte non disponible"
 
-#: ../src/config.py:1388
+#: ../src/config.py:1400
 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:1395 ../src/config.py:2005 ../src/dialogs.py:981
+#: ../src/config.py:1407 ../src/config.py:2017 ../src/dialogs.py:981
 #: ../src/dialogs.py:1087 ../src/vcard.py:374 ../src/vcard.py:402
 msgid "You are not connected to the server"
 msgstr "Vous n'êtes pas connecté au serveur"
 
-#: ../src/config.py:1396
+#: ../src/config.py:1408
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Vous devez être connecté pour éditer vos informations."
 
-#: ../src/config.py:1423
+#: ../src/config.py:1435
 msgid "Failed to get secret keys"
 msgstr "Erreur en récupérant les clés secrètes"
 
-#: ../src/config.py:1424
+#: ../src/config.py:1436
 msgid "There was a problem retrieving your GPG secret keys."
 msgstr "Il y a eut un problème durant la récupération de vos clés GPG privées."
 
-#: ../src/config.py:1427 ../src/gtkgui.glade.h:183
+#: ../src/config.py:1439 ../src/gtkgui.glade.h:183
 msgid "Passphrase"
 msgstr "Mot de passe"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1440
 msgid "Choose your OpenPGP key"
 msgstr "Choisissez votre clé OpenPGP"
 
-#: ../src/config.py:1436 ../src/gtkgui.glade.h:172
+#: ../src/config.py:1448 ../src/gtkgui.glade.h:173
 msgid "No key selected"
 msgstr "Pas de clé sélectionnée"
 
-#: ../src/config.py:1667 ../src/config.py:2028
+#: ../src/config.py:1679 ../src/config.py:2040
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1682
 msgid "Server"
 msgstr "Serveur"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1775 ../src/config.py:2247 ../src/dialogs.py:112
+#: ../src/config.py:1787 ../src/config.py:2259 ../src/dialogs.py:112
 #: ../src/dialogs.py:282 ../src/dialogs.py:318 ../src/roster_window.py:123
 #: ../src/roster_window.py:128 ../src/roster_window.py:152
 #: ../src/roster_window.py:1928 ../src/roster_window.py:1930
@@ -554,29 +546,29 @@ msgstr "Serveur"
 msgid "Transports"
 msgstr "Transports"
 
-#: ../src/config.py:1790
+#: ../src/config.py:1802
 #, python-format
 msgid "Edit %s"
 msgstr "_Éditer %s"
 
-#: ../src/config.py:1792
+#: ../src/config.py:1804
 #, python-format
 msgid "Register to %s"
 msgstr "S'enregistrer à %s"
 
-#: ../src/config.py:1812
+#: ../src/config.py:1824
 msgid "Text"
 msgstr "Texte"
 
-#: ../src/config.py:1820
+#: ../src/config.py:1832
 msgid "Image"
 msgstr "Image"
 
-#: ../src/config.py:1867
+#: ../src/config.py:1879
 msgid "Image is too big"
 msgstr "L'image est trop grande"
 
-#: ../src/config.py:1867
+#: ../src/config.py:1879
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
@@ -584,92 +576,92 @@ msgstr ""
 "L'image pour l'émoticône doit être inférieure ou égale à 24 points en "
 "largeur et 24 points en hauteur."
 
-#: ../src/config.py:1917
+#: ../src/config.py:1929
 msgid "Choose Image"
 msgstr "Choisissez une Image"
 
-#: ../src/config.py:1928 ../src/vcard.py:136
+#: ../src/config.py:1940 ../src/vcard.py:136
 msgid "Images"
 msgstr "Images"
 
-#: ../src/config.py:2006
+#: ../src/config.py:2018
 msgid "Without a connection, you can not browse available services"
 msgstr "Vous devez être connecté pour voir les services"
 
-#: ../src/config.py:2011
+#: ../src/config.py:2023
 #, python-format
 msgid "Service Discovery using %s account"
 msgstr "Gestion des Services du compte %s"
 
-#: ../src/config.py:2013
+#: ../src/config.py:2025
 msgid "Service Discovery"
 msgstr "Gestion des Services"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2045
 msgid "Service"
 msgstr "Service"
 
-#: ../src/config.py:2038
+#: ../src/config.py:2050
 msgid "Node"
 msgstr "Noeud"
 
-#: ../src/config.py:2250 ../src/gtkgui.glade.h:305
+#: ../src/config.py:2262 ../src/gtkgui.glade.h:305
 msgid "_Edit"
 msgstr "_Éditer"
 
-#: ../src/config.py:2252 ../src/gtkgui.glade.h:201
+#: ../src/config.py:2264 ../src/gtkgui.glade.h:201
 msgid "Re_gister"
 msgstr "_Souscrire"
 
-#: ../src/config.py:2424
+#: ../src/config.py:2436
 #, python-format
 msgid "Removing %s account"
 msgstr "Supprimer le compte %s"
 
-#: ../src/config.py:2431
+#: ../src/config.py:2443
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Le compte \"%s\" est connecté au serveur"
 
-#: ../src/config.py:2432
+#: ../src/config.py:2444
 msgid "If you remove it, the connection will be lost."
 msgstr "Si vous l'enlevez, la connection sera perdue."
 
-#: ../src/config.py:2557
+#: ../src/config.py:2569
 msgid "New Room"
 msgstr "Nouveau Salon"
 
-#: ../src/config.py:2587
+#: ../src/config.py:2599
 msgid "This bookmark has invalid data"
 msgstr "Ce marque-pages contient des données invalides"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2600
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Assurez-vous de remplir les champs serveur et salon ou enlevez ce marque-"
 "pages"
 
-#: ../src/config.py:2808
+#: ../src/config.py:2820
 msgid ""
 "Account has been added successfully.\n"
 "You can set advanced options by using \"Edit->Accounts\" from the main "
 "window."
 msgstr ""
 
-#: ../src/config.py:2819
+#: ../src/config.py:2831
 msgid ""
 "Your new account has been created and added to your gajim configuration.\n"
 "You can set advanced account options using \"Edit->Accounts\" in the main "
 "window menu."
 msgstr ""
 
-#: ../src/config.py:2833
+#: ../src/config.py:2845
 #, fuzzy
 msgid "You need to enter a username to add an account."
 msgstr "Vous devez entrer un mot de passe pour enregistrer un nouveau compte."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2849
 #, fuzzy
 msgid "You need to enter a valid server address to add an account."
 msgstr "Vous devez entrer un mot de passe pour enregistrer un nouveau compte."
@@ -758,7 +750,7 @@ msgstr "Gajim - %s messages non-lus"
 msgid "Gajim - 1 unread message"
 msgstr "Gajim - 1 message non-lu"
 
-#: ../src/dialogs.py:696 ../src/gtkgui.glade.h:116
+#: ../src/dialogs.py:696 ../src/gtkgui.glade.h:117
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -767,7 +759,7 @@ msgstr "Gajim"
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/dialogs.py:733 ../src/dialogs.py:834 ../src/dialogs.py:1777
+#: ../src/dialogs.py:733 ../src/dialogs.py:834 ../src/dialogs.py:1778
 msgid "Name: "
 msgstr "Nom : "
 
@@ -785,11 +777,11 @@ msgstr "Ouvrir la page de téléchargement"
 msgid "Upload"
 msgstr ""
 
-#: ../src/dialogs.py:745 ../src/dialogs.py:1779
+#: ../src/dialogs.py:745 ../src/dialogs.py:1780
 msgid "Sender: "
 msgstr "Expéditeur : "
 
-#: ../src/dialogs.py:748 ../src/dialogs.py:1781
+#: ../src/dialogs.py:748 ../src/dialogs.py:1782
 #, fuzzy
 msgid "Recipient: "
 msgstr "Récemment :"
@@ -867,7 +859,7 @@ msgstr ""
 msgid "Join Group Chat as %s"
 msgstr "Rejoindre un Groupe de Discussion en tant que %s"
 
-#: ../src/dialogs.py:997 ../src/gtkgui.glade.h:153
+#: ../src/dialogs.py:997 ../src/gtkgui.glade.h:154
 msgid "Join Group Chat"
 msgstr "Rejoindre un Groupe de Discussion"
 
@@ -877,7 +869,7 @@ msgid "New Message as %s"
 msgstr "Nouveau message en tant que %s"
 
 #: ../src/dialogs.py:1062 ../src/dialogs.py:1157 ../src/gajim.py:462
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:170
 msgid "New Message"
 msgstr "Nouveau message"
 
@@ -1096,15 +1088,15 @@ msgstr ""
 msgid "Would you like to overwrite it?"
 msgstr ""
 
-#: ../src/dialogs.py:1880 ../src/gtkgui.glade.h:338
+#: ../src/dialogs.py:1881 ../src/gtkgui.glade.h:338
 msgid "_Pause"
 msgstr "_Pause"
 
-#: ../src/dialogs.py:1883 ../src/dialogs.py:1915
+#: ../src/dialogs.py:1884 ../src/dialogs.py:1916
 msgid "_Continue"
 msgstr "_Continuer"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1912
 msgid "Pause"
 msgstr "Pause"
 
@@ -1123,7 +1115,7 @@ msgid "error while sending"
 msgstr "erreur en envoyant"
 
 #: ../src/gajim.py:536 ../src/gajim.py:546 ../src/roster_window.py:125
-#: ../src/roster_window.py:1036 ../src/gtkgui.glade.h:124
+#: ../src/roster_window.py:1036 ../src/gtkgui.glade.h:125
 msgid "General"
 msgstr "Général"
 
@@ -1167,7 +1159,8 @@ msgstr "Votre mot de passe est incorrecte"
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Vous êtes actuellement connecté sans votre clé OpenPGP."
 
-#: ../src/gajim.py:1025
+#. it is good to notify the user, in case he cannot see the output of the console
+#: ../src/gajim.py:1027
 msgid "Cannot save your preferences"
 msgstr "Impossible de sauver vos préférences"
 
@@ -1302,7 +1295,7 @@ msgstr "Vous pouvez saisir une raison en-dessous :"
 msgid "Banning %s"
 msgstr "Bannissement de %s"
 
-#: ../src/groupchat_window.py:961 ../src/tabbed_chat_window.py:323
+#: ../src/groupchat_window.py:961 ../src/tabbed_chat_window.py:327
 msgid "If you close this tab, the message will be lost."
 msgstr "Si vous fermez cet onglet, le message sera perdu."
 
@@ -1560,40 +1553,40 @@ msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
 msgstr ""
 "%s n'a pas envoye de clé OpenPGP et vous ne lui en avez pas assigné une"
 
-#: ../src/tabbed_chat_window.py:254 ../src/tabbed_chat_window.py:322
+#: ../src/tabbed_chat_window.py:258 ../src/tabbed_chat_window.py:326
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Vous venez de recevoir un nouveau message de \"%s\""
 
-#: ../src/tabbed_chat_window.py:255
+#: ../src/tabbed_chat_window.py:259
 msgid "If you close the window, this message will be lost."
 msgstr "Si vous fermez cette fenêtre, ce message sera perdu."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:488
+#: ../src/tabbed_chat_window.py:492
 msgid "A connection is not available"
 msgstr "Aucune connexion disponible"
 
-#: ../src/tabbed_chat_window.py:489
+#: ../src/tabbed_chat_window.py:493
 #, fuzzy
 msgid "Your message can not be sent until you are connected."
 msgstr "Votre message ne peut être envoyé tant que vous n'êtes pas connecté."
 
-#: ../src/tabbed_chat_window.py:577
+#: ../src/tabbed_chat_window.py:581
 #, fuzzy
 msgid "Sending private message failed"
 msgstr "_Envoyer un message privé"
 
-#: ../src/tabbed_chat_window.py:578
+#: ../src/tabbed_chat_window.py:582
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:681
+#: ../src/tabbed_chat_window.py:685
 msgid "Encryption enabled"
 msgstr "Encryption activée"
 
-#: ../src/tabbed_chat_window.py:686
+#: ../src/tabbed_chat_window.py:690
 msgid "Encryption disabled"
 msgstr "Encryption désactivée"
 
@@ -1638,29 +1631,31 @@ msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Éditeur de Configuration Avancé</b>"
 
 #: ../src/gtkgui.glade.h:4
-msgid "<b>Changes in latest version</b>"
-msgstr "<b>Changements dans la dernière version</b>"
+#, fuzzy
+msgid "<b>Applications</b>"
+msgstr "<b>Applications</b>"
 
 #: ../src/gtkgui.glade.h:5
-msgid "<b>Custom Applications</b>"
-msgstr "<b>Applications</b>"
+msgid "<b>Changes in latest version</b>"
+msgstr "<b>Changements dans la dernière version</b>"
 
 #: ../src/gtkgui.glade.h:6
+#, fuzzy
+msgid "<b>Custom</b>"
+msgstr "<b>Archivage</b>"
+
+#: ../src/gtkgui.glade.h:7
 msgid "<b>Format of a chat line</b>"
 msgstr "<b>Format de la ligne de discussion</b>"
 
-#: ../src/gtkgui.glade.h:7
+#: ../src/gtkgui.glade.h:8
 msgid "<b>Interface Customization</b>"
 msgstr "<b>Personnalisation de l'interface</b>"
 
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Trafic Jabber</b>"
 
-#: ../src/gtkgui.glade.h:9
-msgid "<b>Links</b>"
-msgstr "<b>Liens</b>"
-
 #: ../src/gtkgui.glade.h:10
 msgid "<b>Log</b>"
 msgstr "<b>Archivage</b>"
@@ -2077,32 +2072,37 @@ msgid "File _Transfers"
 msgstr "Transfert de Fichier"
 
 #: ../src/gtkgui.glade.h:111
+#, fuzzy
+msgid "File manager:"
+msgstr "Transfert de Fichier"
+
+#: ../src/gtkgui.glade.h:112
 msgid "Filter:"
 msgstr "Filtre :"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 #, fuzzy
 msgid "Font:"
 msgstr "Comptes :"
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:114
 msgid "Format: YYYY-MM-DD"
 msgstr "Format : AAAA-MM-JJ"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:115
 msgid "From:"
 msgstr "De :"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:116
 #, fuzzy
 msgid "GPG Encryption"
 msgstr "Encryption OpenPGP"
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Gajim Themes Customization"
 msgstr "Personalisation des Thèmes de Gajim"
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2111,7 +2111,7 @@ msgstr ""
 "nouvelle fenêtre de discussion ou dans un onglet d'une fenêtre de discussion "
 "existante"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2119,7 +2119,7 @@ msgstr ""
 "Gajim vous signalera les nouveaux messages dans un popup en bas à droite de "
 "l'écran"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:121
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2127,7 +2127,7 @@ msgstr ""
 "Gajim vous signalera par une fenêtre popup en bas à droite de l'écran qu'un "
 "contact s'est connecté"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:122
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2135,59 +2135,59 @@ msgstr ""
 "Gajim vous signalera par une fenêtre popup en bas à droite de l'écran qu'un "
 "contact s'est déconnecté"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:123
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr ""
 "Gajim ne fera que changer l'icône du contact qui a envoyé le nouveau message"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
 msgid "Gajim: First Time Wizard"
 msgstr "Gajim : Assistant"
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:126
 msgid "Given:"
 msgstr "Prénom :"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:127
 msgid "Go"
 msgstr "Parcourir"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:129
 msgid "Group:"
 msgstr "Groupe :"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:130
 msgid "HTTP Connect"
 msgstr "Connexion HTTP"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:131
 msgid "Homepage:"
 msgstr "Site perso :"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:132
 msgid "Hostname: "
 msgstr "_Serveur :"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:133
 msgid "I already have an account I want to use"
 msgstr "J'ai déjà un compte que je veux utiliser"
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "I want to _register for a new account"
 msgstr "Je veux _créer un nouveau compte"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:135
 msgid "I would like to add you to my contact list."
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "If checked, Gajim will also have a trayicon"
 msgstr ""
 "Si cette case est cochée, Gajim placera une icône dans la zone de "
 "notification"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid ""
 "If checked, Gajim will broadcast capability to send and receive meta-"
 "information related to a conversation you may have with a contact such as "
@@ -2197,16 +2197,16 @@ msgstr ""
 "des meta-informations concernant les cnversation que vous avez avec vos "
 "contacts, telles que en train d'écrire un message"
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 msgid "If checked, Gajim will join this groupchat on startup"
 msgstr "Si cette case est cochée, Gajim se connectera à ce salon au démarrage"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:139
 msgid "If checked, Gajim will remember the password for this account"
 msgstr ""
 "Si cette case est cochée, Gajim va retenir le mot de passe pour ce compte"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:140
 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"
@@ -2215,7 +2215,7 @@ msgstr ""
 "principale et des fenêtres de discussion pour vos prochaines utilisations de "
 "Gajim"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2223,7 +2223,7 @@ msgstr ""
 "Si cette case est cochée, Gajim va remplacer les frimousses ASCII comme « :) "
 "» par un équivalent graphique"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2231,7 +2231,7 @@ msgstr ""
 "Si coché, Gajim enverra des paquets de maintien de connection pour prévenir "
 "des temps de latence pouvant entraîner des déconnections"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for only you and of course the administrator"
@@ -2239,7 +2239,7 @@ msgstr ""
 "Si cette case est cochée, Gajim va sauvegarder le mot de passe dans ~/.gajim/"
 "config avec accès en lecture pour vous et l'administrateur uniquement"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:144
 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, "
@@ -2249,7 +2249,7 @@ msgstr ""
 "protocoles. (Par ex. un contat MSN aura les icônes de MSN pour les états "
 "disponible, absent, occupé, etc)"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:145
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2257,7 +2257,7 @@ msgstr ""
 "Si cette case est cochée, au démarrage, Gajim se connectera automatiquement "
 "à jabber en utilisant ce compte."
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:146
 #, fuzzy
 msgid ""
 "If checked, all chat and group chat windows will have the information area "
@@ -2270,7 +2270,7 @@ msgstr ""
 "boutons. Vous pouvez rappidement basculer la vue compacte avec Ctrl+C. "
 "NOTE : Le dernier état quand vous fermez la fenêtre n'est pas permanent"
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:147
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2278,120 +2278,116 @@ msgstr ""
 "Si vous avez 2 comptes ou plus et que cette case est cochée, Gajim va lister "
 "tous les contacts comme si vous n'aviez qu'un seul compte"
 
-#: ../src/gtkgui.glade.h:147
+#: ../src/gtkgui.glade.h:148
 msgid "Incoming message:"
 msgstr "Message entrant :"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:149
 msgid "Info/Query"
 msgstr "Information/Demande"
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:150
 msgid "Information about you are stored on the server as vCard"
 msgstr ""
 "Les informations vous concernant sont stockées\n"
 "sur le serveur, dans une vCard"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:151
 msgid "Italic"
 msgstr "Italique"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:152
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:153
 msgid "Jabber ID:"
 msgstr "Identifiant Jabber :"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:155
 msgid "Join _Group Chat"
 msgstr "Rejoindre un _Groupe de Discussion"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:156
 msgid "Join _Group Chat..."
 msgstr "Rejoindre un _Groupe de Discussion..."
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:157
 msgid "Location"
 msgstr "Adresse"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:158
 msgid "Log history"
 msgstr "Historique"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:159
 msgid "Log presences in _contact's log file"
 msgstr "Archiver les présences dans l'archive du _contact"
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:160
 msgid "Log presences in an _external file"
 msgstr "Archiver les présences dans un fichier e_xterne"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:161
 msgid "Manage Accounts"
 msgstr "Gérer les comptes"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:162
 msgid "Manage Bookmarks"
 msgstr "Gérer les Marque-pages"
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:163
 msgid "Manage Emoticons"
 msgstr "Gérer les frimousses"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:164
 msgid "Manage Proxy Profiles"
 msgstr "Gérer les profils de Proxy"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:165
 msgid "Manage..."
 msgstr "Modifier..."
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:166
 msgid "Middle:"
 msgstr "Racine:"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:167
 msgid "Mo_derator"
 msgstr "Mo_dérateur"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:168
 msgid "More"
 msgstr "Plus"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:169
 msgid "Name:"
 msgstr "Nom :"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:171
 msgid "New version of Gajim available"
 msgstr "Une nouvelle version de Gajim est disponible"
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:172
 msgid "Nickname:"
 msgstr "Surnom :"
 
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:175
 msgid "Notify me about contacts that: "
 msgstr "Me Signaler quand un contact : "
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:176
 msgid "OS:"
 msgstr "Syst. d'exploit. :"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:177
 msgid "On every _message"
 msgstr "À chaque message"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:178
 msgid "Open Download Page"
 msgstr "Ouvrir la page de téléchargement"
 
-#: ../src/gtkgui.glade.h:178
-msgid "Open _with:"
-msgstr "Ouvrir avec :"
-
 #: ../src/gtkgui.glade.h:179
 msgid "Open..."
 msgstr "Ouvrir..."
@@ -3209,185 +3205,200 @@ msgstr "minutes"
 msgid "show a help on specific command"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:74
+#. parameter, named "on_command". User gets help for the command, specified by this parameter
+#: ../scripts/gajim-remote.py:75
 msgid "on_command"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:74
+#: ../scripts/gajim-remote.py:76
 msgid "show help on command"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:78
+#: ../scripts/gajim-remote.py:80
 msgid "Shows or hides the roster window"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:82
+#: ../scripts/gajim-remote.py:84
 msgid "Popup a window with the next unread message"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:86
+#: ../scripts/gajim-remote.py:88
 msgid ""
 "Print a list of all contacts in the roster. Each contact appear on a "
 "separate line"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:89 ../scripts/gajim-remote.py:104
-#: ../scripts/gajim-remote.py:116 ../scripts/gajim-remote.py:130
+#: ../scripts/gajim-remote.py:91 ../scripts/gajim-remote.py:106
+#: ../scripts/gajim-remote.py:118 ../scripts/gajim-remote.py:132
 #, fuzzy
 msgid "account"
 msgstr "Compte"
 
-#: ../scripts/gajim-remote.py:89
+#: ../scripts/gajim-remote.py:91
 msgid "show only contacts of the given account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:95
+#: ../scripts/gajim-remote.py:97
 #, fuzzy
 msgid "Print a list of registered accounts"
 msgstr "Je veux _créer un nouveau compte"
 
-#: ../scripts/gajim-remote.py:99
+#: ../scripts/gajim-remote.py:101
 msgid "Change the status of account or accounts"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:101
+#: ../scripts/gajim-remote.py:103
 #, fuzzy
 msgid "status"
 msgstr "État"
 
-#: ../scripts/gajim-remote.py:101
+#: ../scripts/gajim-remote.py:103
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 
-#: ../scripts/gajim-remote.py:103 ../scripts/gajim-remote.py:127
+#: ../scripts/gajim-remote.py:105 ../scripts/gajim-remote.py:129
 #, fuzzy
 msgid "message"
 msgstr "_Message"
 
-#: ../scripts/gajim-remote.py:103
+#: ../scripts/gajim-remote.py:105
 #, fuzzy
 msgid "status message"
 msgstr "Message d'état :"
 
-#: ../scripts/gajim-remote.py:104
+#: ../scripts/gajim-remote.py:106
 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 ""
 
-#: ../scripts/gajim-remote.py:110
+#: ../scripts/gajim-remote.py:112
 msgid "Show the chat dialog so that you can send message to a contact"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:113
+#: ../scripts/gajim-remote.py:115
 #, fuzzy
 msgid "jid of the contact that you want to chat with"
 msgstr "Remplissez les informations sur le contact à ajouter"
 
-#: ../scripts/gajim-remote.py:116
+#: ../scripts/gajim-remote.py:118
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:121
+#: ../scripts/gajim-remote.py:123
 msgid ""
 "Send new message to a contact in the roster. Both OpenPGP key and account "
 "are optional. If you want to set only 'account', whitout 'pgp key', just set "
 "'pgp key' to ''."
 msgstr ""
 
-#: ../scripts/gajim-remote.py:125
+#: ../scripts/gajim-remote.py:127
 #, fuzzy
 msgid "jid of the contact that will receive the message"
 msgstr ""
 "Gajim ne fera que changer l'icône du contact qui a envoyé le nouveau message"
 
-#: ../scripts/gajim-remote.py:127
+#: ../scripts/gajim-remote.py:129
 #, fuzzy
 msgid "message contents"
 msgstr "texte du message d'état :"
 
-#: ../scripts/gajim-remote.py:128
+#: ../scripts/gajim-remote.py:130
 msgid "pgp key"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:128
+#: ../scripts/gajim-remote.py:130
 msgid "if specified, the message will be encrypted using this pulic key"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:130
+#: ../scripts/gajim-remote.py:132
 msgid "if specified, the message will be sent using this account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:135
+#: ../scripts/gajim-remote.py:137
 msgid "Get detailed info on a contact"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:137
+#: ../scripts/gajim-remote.py:139
 #, fuzzy
 msgid "jid of the contact"
 msgstr "Ajouter un nouveau contact"
 
-#: ../scripts/gajim-remote.py:158
+#: ../scripts/gajim-remote.py:160
 msgid "Missing argument \"contact_jid\""
 msgstr ""
 
-#: ../scripts/gajim-remote.py:163 ../scripts/gajim-remote.py:476
+#: ../scripts/gajim-remote.py:165 ../scripts/gajim-remote.py:478
 #, fuzzy
 msgid "Service not available"
 msgstr "Le bus de session n'est pas disponible"
 
-#: ../scripts/gajim-remote.py:181
+#: ../scripts/gajim-remote.py:183
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 msgstr ""
 
-#: ../scripts/gajim-remote.py:184
+#: ../scripts/gajim-remote.py:186
 msgid "You have no active account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:203
+#: ../scripts/gajim-remote.py:205
 #, fuzzy
 msgid "Session bus is not available."
 msgstr "Le bus de session n'est pas disponible"
 
-#: ../scripts/gajim-remote.py:212
+#: ../scripts/gajim-remote.py:214
 #, python-format
 msgid "Unknow dbus version: %s"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:238
+#: ../scripts/gajim-remote.py:240
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
 "\t"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:244
+#: ../scripts/gajim-remote.py:246
 #, python-format
 msgid "%s not found"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:248
+#: ../scripts/gajim-remote.py:250
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:307
+#: ../scripts/gajim-remote.py:309
 #, python-format
 msgid "Unknown type %s "
 msgstr ""
 
-#: ../scripts/gajim-remote.py:449
+#: ../scripts/gajim-remote.py:451
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 msgstr ""
 
+#, fuzzy
+#~ msgid "No space left on device"
+#~ msgstr "Espace disque insuffisant."
+
+#, fuzzy
+#~ msgid "Unable to open %s for writing\n"
+#~ msgstr "Impossible d'ouvrir %s en écriture\n"
+
+#~ msgid "<b>Links</b>"
+#~ msgstr "<b>Liens</b>"
+
+#~ msgid "Open _with:"
+#~ msgstr "Ouvrir avec :"
+
 #, fuzzy
 #~ msgid "Switch to"
 #~ msgstr "Basculer vers %s"
diff --git a/po/gajim.pot b/po/gajim.pot
index fa16883beb37df2d333033d89038b68548375487..fccb9b4fa4c39a71049ad172bfbd12ccbf5098d9 100644
--- a/po/gajim.pot
+++ b/po/gajim.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 01:26+0300\n"
+"POT-Creation-Date: 2005-08-09 18:26+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,91 +25,91 @@ msgstr ""
 msgid "Not available as a result of being idle"
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:267
 msgid "Sleeping"
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:268
 msgid "Back soon"
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:268
 msgid "Back in some minutes."
 msgstr ""
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:269
 msgid "Eating"
 msgstr ""
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:269
 msgid "I'm eating, so leave me a message."
 msgstr ""
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:270
 msgid "Movie"
 msgstr ""
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:270
 msgid "I'm watching a movie."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:271
 msgid "Working"
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:271
 msgid "I'm working."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:272
 msgid "Phone"
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:272
 msgid "I'm on the phone."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:273
 msgid "Out"
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:273
 msgid "I'm out enjoying life"
 msgstr ""
 
-#: ../src/common/connection.py:291 ../src/common/connection.py:301
+#: ../src/common/connection.py:290 ../src/common/connection.py:300
 #, python-format
 msgid ""
 "Subject: %s\n"
 "%s"
 msgstr ""
 
-#: ../src/common/connection.py:351 ../src/common/connection.py:1496
+#: ../src/common/connection.py:350 ../src/common/connection.py:1496
 msgid "I would like to add you to my roster."
 msgstr ""
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:358
+#: ../src/common/connection.py:357
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr ""
 
-#: ../src/common/connection.py:360
+#: ../src/common/connection.py:359
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr ""
 
-#: ../src/common/connection.py:362
+#: ../src/common/connection.py:361
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr ""
 
-#: ../src/common/connection.py:399
+#: ../src/common/connection.py:398
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr ""
 
-#: ../src/common/connection.py:400
+#: ../src/common/connection.py:399
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 
@@ -183,88 +183,89 @@ msgstr ""
 msgid "error appeared while processing xmpp:"
 msgstr ""
 
-#: ../src/common/helpers.py:28
+#: ../src/common/helpers.py:30
 msgid "Busy"
 msgstr ""
 
-#: ../src/common/helpers.py:30
+#: ../src/common/helpers.py:32
 msgid "Not Available"
 msgstr ""
 
-#: ../src/common/helpers.py:32
+#: ../src/common/helpers.py:34
 msgid "Free for Chat"
 msgstr ""
 
-#: ../src/common/helpers.py:34
+#: ../src/common/helpers.py:36
 msgid "Available"
 msgstr ""
 
-#: ../src/common/helpers.py:36
+#: ../src/common/helpers.py:38
 msgid "Connecting"
 msgstr ""
 
-#: ../src/common/helpers.py:38
+#: ../src/common/helpers.py:40
 msgid "Away"
 msgstr ""
 
-#: ../src/common/helpers.py:40
+#: ../src/common/helpers.py:42
 msgid "Offline"
 msgstr ""
 
-#: ../src/common/helpers.py:42
+#: ../src/common/helpers.py:44
 msgid "Invisible"
 msgstr ""
 
-#: ../src/common/helpers.py:44
+#: ../src/common/helpers.py:46
 msgid "Not in the roster"
 msgstr ""
 
-#: ../src/common/helpers.py:46 ../src/vcard.py:249 ../src/vcard.py:251
+#: ../src/common/helpers.py:48 ../src/vcard.py:249 ../src/vcard.py:251
 msgid "Unknown"
 msgstr ""
 
-#: ../src/common/helpers.py:48
+#: ../src/common/helpers.py:50
 msgid "Has errors"
 msgstr ""
 
-#: ../src/common/helpers.py:53 ../src/common/helpers.py:67
-#: ../src/groupchat_window.py:271 ../src/gtkgui.glade.h:173
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:69
+#: ../src/groupchat_window.py:271 ../src/gtkgui.glade.h:174
 msgid "None"
 msgstr ""
 
-#: ../src/common/helpers.py:55
+#: ../src/common/helpers.py:57
 msgid "To"
 msgstr ""
 
-#: ../src/common/helpers.py:57
+#: ../src/common/helpers.py:59
 msgid "From"
 msgstr ""
 
-#: ../src/common/helpers.py:59
+#: ../src/common/helpers.py:61
 msgid "Both"
 msgstr ""
 
-#: ../src/common/helpers.py:69
+#: ../src/common/helpers.py:71
 msgid "Subscribe"
 msgstr ""
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "is paying attention to the conversation"
 msgstr ""
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:112
 msgid "is doing something else"
 msgstr ""
 
-#: ../src/common/helpers.py:112
+#: ../src/common/helpers.py:114
 msgid "is composing a message..."
 msgstr ""
 
-#: ../src/common/helpers.py:114
-msgid "paused composing a message..."
+#. paused means he was compoing but has stopped for a while
+#: ../src/common/helpers.py:117
+msgid "paused composing a message"
 msgstr ""
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 msgid "has closed the chat window or tab"
 msgstr ""
 
@@ -295,15 +296,6 @@ msgstr ""
 msgid "Unable to write file in %s\n"
 msgstr ""
 
-#: ../src/common/optparser.py:84
-msgid "No space left on device"
-msgstr ""
-
-#: ../src/common/optparser.py:100
-#, python-format
-msgid "Unable to open %s for writing\n"
-msgstr ""
-
 #: ../src/advanced.py:52
 msgid "Preference Name"
 msgstr ""
@@ -320,7 +312,7 @@ msgstr ""
 msgid "Chat"
 msgstr ""
 
-#: ../src/chat.py:124 ../src/gtkgui.glade.h:127
+#: ../src/chat.py:124 ../src/gtkgui.glade.h:128
 msgid "Group Chat"
 msgstr ""
 
@@ -390,146 +382,146 @@ msgstr ""
 msgid "Subject: %s\n"
 msgstr ""
 
-#: ../src/config.py:198 ../src/config.py:428
+#: ../src/config.py:199 ../src/config.py:436
 #, python-format
 msgid "Every %s _minutes"
 msgstr ""
 
-#: ../src/config.py:301
+#: ../src/config.py:307
 msgid "Active"
 msgstr ""
 
-#: ../src/config.py:309
+#: ../src/config.py:315
 msgid "Event"
 msgstr ""
 
-#: ../src/config.py:315
+#: ../src/config.py:321
 msgid "Sound"
 msgstr ""
 
-#: ../src/config.py:918
+#: ../src/config.py:930
 msgid "status message title"
 msgstr ""
 
-#: ../src/config.py:918
+#: ../src/config.py:930
 msgid "status message text"
 msgstr ""
 
-#: ../src/config.py:971
+#: ../src/config.py:983
 msgid "Choose Sound"
 msgstr ""
 
-#: ../src/config.py:978 ../src/config.py:1923 ../src/vcard.py:131
+#: ../src/config.py:990 ../src/config.py:1935 ../src/vcard.py:131
 msgid "All files"
 msgstr ""
 
-#: ../src/config.py:983
+#: ../src/config.py:995
 msgid "Wav Sounds"
 msgstr ""
 
-#: ../src/config.py:1152
+#: ../src/config.py:1164
 msgid "OpenPGP is not usable in this computer"
 msgstr ""
 
-#: ../src/config.py:1177
+#: ../src/config.py:1189
 msgid "You are currently connected to the server"
 msgstr ""
 
-#: ../src/config.py:1178
+#: ../src/config.py:1190
 msgid "To change the account name, you must be disconnected."
 msgstr ""
 
-#: ../src/config.py:1181 ../src/config.py:1185
+#: ../src/config.py:1193 ../src/config.py:1197
 msgid "Invalid account name"
 msgstr ""
 
-#: ../src/config.py:1182
+#: ../src/config.py:1194
 msgid "Account name cannot be empty."
 msgstr ""
 
-#: ../src/config.py:1186
+#: ../src/config.py:1198
 msgid "Account name cannot contain spaces."
 msgstr ""
 
-#: ../src/config.py:1190
+#: ../src/config.py:1202
 msgid "Invalid Jabber ID"
 msgstr ""
 
-#: ../src/config.py:1191
+#: ../src/config.py:1203
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr ""
 
-#: ../src/config.py:1198 ../src/dialogs.py:1107
+#: ../src/config.py:1210 ../src/dialogs.py:1107
 msgid "Invalid password"
 msgstr ""
 
-#: ../src/config.py:1199
+#: ../src/config.py:1211
 msgid "You must enter a password for the new account."
 msgstr ""
 
-#: ../src/config.py:1236
+#: ../src/config.py:1248
 msgid "Invalid entry"
 msgstr ""
 
-#: ../src/config.py:1237
+#: ../src/config.py:1249
 msgid "Custom port must be a port number."
 msgstr ""
 
-#: ../src/config.py:1324
+#: ../src/config.py:1336
 msgid "Account name is in use"
 msgstr ""
 
-#: ../src/config.py:1325
+#: ../src/config.py:1337
 msgid "You already have an account using this name."
 msgstr ""
 
-#: ../src/config.py:1387
+#: ../src/config.py:1399
 msgid "No such account available"
 msgstr ""
 
-#: ../src/config.py:1388
+#: ../src/config.py:1400
 msgid "You must create your account before editing your personal information."
 msgstr ""
 
-#: ../src/config.py:1395 ../src/config.py:2005 ../src/dialogs.py:981
+#: ../src/config.py:1407 ../src/config.py:2017 ../src/dialogs.py:981
 #: ../src/dialogs.py:1087 ../src/vcard.py:374 ../src/vcard.py:402
 msgid "You are not connected to the server"
 msgstr ""
 
-#: ../src/config.py:1396
+#: ../src/config.py:1408
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 
-#: ../src/config.py:1423
+#: ../src/config.py:1435
 msgid "Failed to get secret keys"
 msgstr ""
 
-#: ../src/config.py:1424
+#: ../src/config.py:1436
 msgid "There was a problem retrieving your GPG secret keys."
 msgstr ""
 
-#: ../src/config.py:1427 ../src/gtkgui.glade.h:183
+#: ../src/config.py:1439 ../src/gtkgui.glade.h:183
 msgid "Passphrase"
 msgstr ""
 
-#: ../src/config.py:1428
+#: ../src/config.py:1440
 msgid "Choose your OpenPGP key"
 msgstr ""
 
-#: ../src/config.py:1436 ../src/gtkgui.glade.h:172
+#: ../src/config.py:1448 ../src/gtkgui.glade.h:173
 msgid "No key selected"
 msgstr ""
 
-#: ../src/config.py:1667 ../src/config.py:2028
+#: ../src/config.py:1679 ../src/config.py:2040
 msgid "Name"
 msgstr ""
 
-#: ../src/config.py:1670
+#: ../src/config.py:1682
 msgid "Server"
 msgstr ""
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1775 ../src/config.py:2247 ../src/dialogs.py:112
+#: ../src/config.py:1787 ../src/config.py:2259 ../src/dialogs.py:112
 #: ../src/dialogs.py:282 ../src/dialogs.py:318 ../src/roster_window.py:123
 #: ../src/roster_window.py:128 ../src/roster_window.py:152
 #: ../src/roster_window.py:1928 ../src/roster_window.py:1930
@@ -537,117 +529,117 @@ msgstr ""
 msgid "Transports"
 msgstr ""
 
-#: ../src/config.py:1790
+#: ../src/config.py:1802
 #, python-format
 msgid "Edit %s"
 msgstr ""
 
-#: ../src/config.py:1792
+#: ../src/config.py:1804
 #, python-format
 msgid "Register to %s"
 msgstr ""
 
-#: ../src/config.py:1812
+#: ../src/config.py:1824
 msgid "Text"
 msgstr ""
 
-#: ../src/config.py:1820
+#: ../src/config.py:1832
 msgid "Image"
 msgstr ""
 
-#: ../src/config.py:1867
+#: ../src/config.py:1879
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/config.py:1867
+#: ../src/config.py:1879
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
 msgstr ""
 
-#: ../src/config.py:1917
+#: ../src/config.py:1929
 msgid "Choose Image"
 msgstr ""
 
-#: ../src/config.py:1928 ../src/vcard.py:136
+#: ../src/config.py:1940 ../src/vcard.py:136
 msgid "Images"
 msgstr ""
 
-#: ../src/config.py:2006
+#: ../src/config.py:2018
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 
-#: ../src/config.py:2011
+#: ../src/config.py:2023
 #, python-format
 msgid "Service Discovery using %s account"
 msgstr ""
 
-#: ../src/config.py:2013
+#: ../src/config.py:2025
 msgid "Service Discovery"
 msgstr ""
 
-#: ../src/config.py:2033
+#: ../src/config.py:2045
 msgid "Service"
 msgstr ""
 
-#: ../src/config.py:2038
+#: ../src/config.py:2050
 msgid "Node"
 msgstr ""
 
-#: ../src/config.py:2250 ../src/gtkgui.glade.h:305
+#: ../src/config.py:2262 ../src/gtkgui.glade.h:305
 msgid "_Edit"
 msgstr ""
 
-#: ../src/config.py:2252 ../src/gtkgui.glade.h:201
+#: ../src/config.py:2264 ../src/gtkgui.glade.h:201
 msgid "Re_gister"
 msgstr ""
 
-#: ../src/config.py:2424
+#: ../src/config.py:2436
 #, python-format
 msgid "Removing %s account"
 msgstr ""
 
-#: ../src/config.py:2431
+#: ../src/config.py:2443
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr ""
 
-#: ../src/config.py:2432
+#: ../src/config.py:2444
 msgid "If you remove it, the connection will be lost."
 msgstr ""
 
-#: ../src/config.py:2557
+#: ../src/config.py:2569
 msgid "New Room"
 msgstr ""
 
-#: ../src/config.py:2587
+#: ../src/config.py:2599
 msgid "This bookmark has invalid data"
 msgstr ""
 
-#: ../src/config.py:2588
+#: ../src/config.py:2600
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 
-#: ../src/config.py:2808
+#: ../src/config.py:2820
 msgid ""
 "Account has been added successfully.\n"
 "You can set advanced options by using \"Edit->Accounts\" from the main "
 "window."
 msgstr ""
 
-#: ../src/config.py:2819
+#: ../src/config.py:2831
 msgid ""
 "Your new account has been created and added to your gajim configuration.\n"
 "You can set advanced account options using \"Edit->Accounts\" in the main "
 "window menu."
 msgstr ""
 
-#: ../src/config.py:2833
+#: ../src/config.py:2845
 msgid "You need to enter a username to add an account."
 msgstr ""
 
-#: ../src/config.py:2837
+#: ../src/config.py:2849
 msgid "You need to enter a valid server address to add an account."
 msgstr ""
 
@@ -735,7 +727,7 @@ msgstr ""
 msgid "Gajim - 1 unread message"
 msgstr ""
 
-#: ../src/dialogs.py:696 ../src/gtkgui.glade.h:116
+#: ../src/dialogs.py:696 ../src/gtkgui.glade.h:117
 msgid "Gajim"
 msgstr ""
 
@@ -744,7 +736,7 @@ msgstr ""
 msgid "Gajim - %s"
 msgstr ""
 
-#: ../src/dialogs.py:733 ../src/dialogs.py:834 ../src/dialogs.py:1777
+#: ../src/dialogs.py:733 ../src/dialogs.py:834 ../src/dialogs.py:1778
 msgid "Name: "
 msgstr ""
 
@@ -760,11 +752,11 @@ msgstr ""
 msgid "Upload"
 msgstr ""
 
-#: ../src/dialogs.py:745 ../src/dialogs.py:1779
+#: ../src/dialogs.py:745 ../src/dialogs.py:1780
 msgid "Sender: "
 msgstr ""
 
-#: ../src/dialogs.py:748 ../src/dialogs.py:1781
+#: ../src/dialogs.py:748 ../src/dialogs.py:1782
 msgid "Recipient: "
 msgstr ""
 
@@ -835,7 +827,7 @@ msgstr ""
 msgid "Join Group Chat as %s"
 msgstr ""
 
-#: ../src/dialogs.py:997 ../src/gtkgui.glade.h:153
+#: ../src/dialogs.py:997 ../src/gtkgui.glade.h:154
 msgid "Join Group Chat"
 msgstr ""
 
@@ -845,7 +837,7 @@ msgid "New Message as %s"
 msgstr ""
 
 #: ../src/dialogs.py:1062 ../src/dialogs.py:1157 ../src/gajim.py:462
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:170
 msgid "New Message"
 msgstr ""
 
@@ -1050,15 +1042,15 @@ msgstr ""
 msgid "Would you like to overwrite it?"
 msgstr ""
 
-#: ../src/dialogs.py:1880 ../src/gtkgui.glade.h:338
+#: ../src/dialogs.py:1881 ../src/gtkgui.glade.h:338
 msgid "_Pause"
 msgstr ""
 
-#: ../src/dialogs.py:1883 ../src/dialogs.py:1915
+#: ../src/dialogs.py:1884 ../src/dialogs.py:1916
 msgid "_Continue"
 msgstr ""
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1912
 msgid "Pause"
 msgstr ""
 
@@ -1077,7 +1069,7 @@ msgid "error while sending"
 msgstr ""
 
 #: ../src/gajim.py:536 ../src/gajim.py:546 ../src/roster_window.py:125
-#: ../src/roster_window.py:1036 ../src/gtkgui.glade.h:124
+#: ../src/roster_window.py:1036 ../src/gtkgui.glade.h:125
 msgid "General"
 msgstr ""
 
@@ -1121,7 +1113,8 @@ msgstr ""
 msgid "You are currently connected without your OpenPGP key."
 msgstr ""
 
-#: ../src/gajim.py:1025
+#. it is good to notify the user, in case he cannot see the output of the console
+#: ../src/gajim.py:1027
 msgid "Cannot save your preferences"
 msgstr ""
 
@@ -1252,7 +1245,7 @@ msgstr ""
 msgid "Banning %s"
 msgstr ""
 
-#: ../src/groupchat_window.py:961 ../src/tabbed_chat_window.py:323
+#: ../src/groupchat_window.py:961 ../src/tabbed_chat_window.py:327
 msgid "If you close this tab, the message will be lost."
 msgstr ""
 
@@ -1503,38 +1496,38 @@ msgstr ""
 msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:254 ../src/tabbed_chat_window.py:322
+#: ../src/tabbed_chat_window.py:258 ../src/tabbed_chat_window.py:326
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:255
+#: ../src/tabbed_chat_window.py:259
 msgid "If you close the window, this message will be lost."
 msgstr ""
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:488
+#: ../src/tabbed_chat_window.py:492
 msgid "A connection is not available"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:489
+#: ../src/tabbed_chat_window.py:493
 msgid "Your message can not be sent until you are connected."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:577
+#: ../src/tabbed_chat_window.py:581
 msgid "Sending private message failed"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:578
+#: ../src/tabbed_chat_window.py:582
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:681
+#: ../src/tabbed_chat_window.py:685
 msgid "Encryption enabled"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:686
+#: ../src/tabbed_chat_window.py:690
 msgid "Encryption disabled"
 msgstr ""
 
@@ -1578,27 +1571,27 @@ msgid "<b>Advanced Configuration Editor</b>"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:4
-msgid "<b>Changes in latest version</b>"
+msgid "<b>Applications</b>"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:5
-msgid "<b>Custom Applications</b>"
+msgid "<b>Changes in latest version</b>"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:6
-msgid "<b>Format of a chat line</b>"
+msgid "<b>Custom</b>"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:7
-msgid "<b>Interface Customization</b>"
+msgid "<b>Format of a chat line</b>"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:8
-msgid "<b>Jabber Traffic</b>"
+msgid "<b>Interface Customization</b>"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:9
-msgid "<b>Links</b>"
+msgid "<b>Jabber Traffic</b>"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:10
@@ -1996,155 +1989,159 @@ msgid "File _Transfers"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:111
-msgid "Filter:"
+msgid "File manager:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:112
-msgid "Font:"
+msgid "Filter:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:113
-msgid "Format: YYYY-MM-DD"
+msgid "Font:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:114
-msgid "From:"
+msgid "Format: YYYY-MM-DD"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:115
+msgid "From:"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:116
 msgid "GPG Encryption"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Gajim Themes Customization"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:121
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:122
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:123
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
 msgid "Gajim: First Time Wizard"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:126
 msgid "Given:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:127
 msgid "Go"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:129
 msgid "Group:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:130
 msgid "HTTP Connect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:131
 msgid "Homepage:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:132
 msgid "Hostname: "
 msgstr ""
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:133
 msgid "I already have an account I want to use"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "I want to _register for a new account"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:135
 msgid "I would like to add you to my contact list."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "If checked, Gajim will also have a trayicon"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid ""
 "If checked, Gajim will broadcast capability to send and receive meta-"
 "information related to a conversation you may have with a contact such as "
 "composing a message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 msgid "If checked, Gajim will join this groupchat on startup"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:139
 msgid "If checked, Gajim will remember the password for this account"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:140
 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 ""
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for only you and of course the administrator"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:144
 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 ""
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:145
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:146
 msgid ""
 "If checked, all chat and group chat windows will have the information area "
 "in the top and the buttons area in the bottom hidden. You can quick toggle "
@@ -2152,122 +2149,118 @@ msgid ""
 "a permanent one"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:147
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:147
+#: ../src/gtkgui.glade.h:148
 msgid "Incoming message:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:149
 msgid "Info/Query"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:150
 msgid "Information about you are stored on the server as vCard"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:151
 msgid "Italic"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:152
 msgid "Jabber"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:153
 msgid "Jabber ID:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:155
 msgid "Join _Group Chat"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:156
 msgid "Join _Group Chat..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:157
 msgid "Location"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:158
 msgid "Log history"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:159
 msgid "Log presences in _contact's log file"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:160
 msgid "Log presences in an _external file"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:161
 msgid "Manage Accounts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:162
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:163
 msgid "Manage Emoticons"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:164
 msgid "Manage Proxy Profiles"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:165
 msgid "Manage..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:166
 msgid "Middle:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:167
 msgid "Mo_derator"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:168
 msgid "More"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:169
 msgid "Name:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:171
 msgid "New version of Gajim available"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:172
 msgid "Nickname:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:174
-msgid "Notify me about contacts that: "
-msgstr ""
-
 #: ../src/gtkgui.glade.h:175
-msgid "OS:"
+msgid "Notify me about contacts that: "
 msgstr ""
 
 #: ../src/gtkgui.glade.h:176
-msgid "On every _message"
+msgid "OS:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:177
-msgid "Open Download Page"
+msgid "On every _message"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:178
-msgid "Open _with:"
+msgid "Open Download Page"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:179
@@ -3053,167 +3046,168 @@ msgstr ""
 msgid "show a help on specific command"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:74
+#. parameter, named "on_command". User gets help for the command, specified by this parameter
+#: ../scripts/gajim-remote.py:75
 msgid "on_command"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:74
+#: ../scripts/gajim-remote.py:76
 msgid "show help on command"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:78
+#: ../scripts/gajim-remote.py:80
 msgid "Shows or hides the roster window"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:82
+#: ../scripts/gajim-remote.py:84
 msgid "Popup a window with the next unread message"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:86
+#: ../scripts/gajim-remote.py:88
 msgid ""
 "Print a list of all contacts in the roster. Each contact appear on a "
 "separate line"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:89 ../scripts/gajim-remote.py:104
-#: ../scripts/gajim-remote.py:116 ../scripts/gajim-remote.py:130
+#: ../scripts/gajim-remote.py:91 ../scripts/gajim-remote.py:106
+#: ../scripts/gajim-remote.py:118 ../scripts/gajim-remote.py:132
 msgid "account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:89
+#: ../scripts/gajim-remote.py:91
 msgid "show only contacts of the given account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:95
+#: ../scripts/gajim-remote.py:97
 msgid "Print a list of registered accounts"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:99
+#: ../scripts/gajim-remote.py:101
 msgid "Change the status of account or accounts"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:101
+#: ../scripts/gajim-remote.py:103
 msgid "status"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:101
+#: ../scripts/gajim-remote.py:103
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 
-#: ../scripts/gajim-remote.py:103 ../scripts/gajim-remote.py:127
+#: ../scripts/gajim-remote.py:105 ../scripts/gajim-remote.py:129
 msgid "message"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:103
+#: ../scripts/gajim-remote.py:105
 msgid "status message"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:104
+#: ../scripts/gajim-remote.py:106
 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 ""
 
-#: ../scripts/gajim-remote.py:110
+#: ../scripts/gajim-remote.py:112
 msgid "Show the chat dialog so that you can send message to a contact"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:113
+#: ../scripts/gajim-remote.py:115
 msgid "jid of the contact that you want to chat with"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:116
+#: ../scripts/gajim-remote.py:118
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:121
+#: ../scripts/gajim-remote.py:123
 msgid ""
 "Send new message to a contact in the roster. Both OpenPGP key and account "
 "are optional. If you want to set only 'account', whitout 'pgp key', just set "
 "'pgp key' to ''."
 msgstr ""
 
-#: ../scripts/gajim-remote.py:125
+#: ../scripts/gajim-remote.py:127
 msgid "jid of the contact that will receive the message"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:127
+#: ../scripts/gajim-remote.py:129
 msgid "message contents"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:128
+#: ../scripts/gajim-remote.py:130
 msgid "pgp key"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:128
+#: ../scripts/gajim-remote.py:130
 msgid "if specified, the message will be encrypted using this pulic key"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:130
+#: ../scripts/gajim-remote.py:132
 msgid "if specified, the message will be sent using this account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:135
+#: ../scripts/gajim-remote.py:137
 msgid "Get detailed info on a contact"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:137
+#: ../scripts/gajim-remote.py:139
 msgid "jid of the contact"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:158
+#: ../scripts/gajim-remote.py:160
 msgid "Missing argument \"contact_jid\""
 msgstr ""
 
-#: ../scripts/gajim-remote.py:163 ../scripts/gajim-remote.py:476
+#: ../scripts/gajim-remote.py:165 ../scripts/gajim-remote.py:478
 msgid "Service not available"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:181
+#: ../scripts/gajim-remote.py:183
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 msgstr ""
 
-#: ../scripts/gajim-remote.py:184
+#: ../scripts/gajim-remote.py:186
 msgid "You have no active account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:203
+#: ../scripts/gajim-remote.py:205
 msgid "Session bus is not available."
 msgstr ""
 
-#: ../scripts/gajim-remote.py:212
+#: ../scripts/gajim-remote.py:214
 #, python-format
 msgid "Unknow dbus version: %s"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:238
+#: ../scripts/gajim-remote.py:240
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
 "\t"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:244
+#: ../scripts/gajim-remote.py:246
 #, python-format
 msgid "%s not found"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:248
+#: ../scripts/gajim-remote.py:250
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:307
+#: ../scripts/gajim-remote.py:309
 #, python-format
 msgid "Unknown type %s "
 msgstr ""
 
-#: ../scripts/gajim-remote.py:449
+#: ../scripts/gajim-remote.py:451
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
diff --git a/po/pl/LC_MESSAGES/gajim.po b/po/pl/LC_MESSAGES/gajim.po
index e9a017a4b122c875ebb5294954dd08ab0957fbff..b986eca360c8ae878064225cb01cfd15f9a3c1c5 100644
--- a/po/pl/LC_MESSAGES/gajim.po
+++ b/po/pl/LC_MESSAGES/gajim.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 01:26+0300\n"
+"POT-Creation-Date: 2005-08-09 18:26+0300\n"
 "PO-Revision-Date: 2005-08-01 21:46+0200\n"
 "Last-Translator: Witek KieraÅ› <pambuk@gmail.com>\n"
 "Language-Team: none\n"
@@ -26,59 +26,59 @@ msgstr ""
 msgid "Not available as a result of being idle"
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:267
 msgid "Sleeping"
 msgstr "ÅšpiÄ™"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:268
 msgid "Back soon"
 msgstr "Niedługo wrócę"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:268
 msgid "Back in some minutes."
 msgstr "Wrócę za jakiś czas."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:269
 msgid "Eating"
 msgstr "Jem"
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:269
 msgid "I'm eating, so leave me a message."
 msgstr "Jem. Zostaw wiadomość."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:270
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:270
 msgid "I'm watching a movie."
 msgstr "OglÄ…dam film."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:271
 msgid "Working"
 msgstr "Praca"
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:271
 msgid "I'm working."
 msgstr "PracujÄ™."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:272
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:272
 msgid "I'm on the phone."
 msgstr "Rozmawiam przez telefon."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:273
 msgid "Out"
 msgstr "Wyszedłem"
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:273
 msgid "I'm out enjoying life"
 msgstr "Wyszedłem cieszyć się życiem."
 
-#: ../src/common/connection.py:291 ../src/common/connection.py:301
+#: ../src/common/connection.py:290 ../src/common/connection.py:300
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -87,32 +87,32 @@ msgstr ""
 "Temat: %s\n"
 "%s"
 
-#: ../src/common/connection.py:351 ../src/common/connection.py:1496
+#: ../src/common/connection.py:350 ../src/common/connection.py:1496
 msgid "I would like to add you to my roster."
 msgstr "Chciałbym dodać Cię do listy kontaktów."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:358
+#: ../src/common/connection.py:357
 #, fuzzy, python-format
 msgid "we are now subscribed to %s"
 msgstr "Zapisaliśmy się do %s"
 
-#: ../src/common/connection.py:360
+#: ../src/common/connection.py:359
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Prośba o cofnięcie autoryzacji od %s"
 
-#: ../src/common/connection.py:362
+#: ../src/common/connection.py:361
 #, fuzzy, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "Wypisaliśmy się z %s"
 
-#: ../src/common/connection.py:399
+#: ../src/common/connection.py:398
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Połączenie z kontem \"%s\"zostało zerwane."
 
-#: ../src/common/connection.py:400
+#: ../src/common/connection.py:399
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "Aby dalej wysyłać i odbierać wiadomości musisz się ponownie połączyć."
 
@@ -186,92 +186,94 @@ msgstr ""
 msgid "error appeared while processing xmpp:"
 msgstr "w trakcie przetwarzania xmpp wystąpił błąd:"
 
-#: ../src/common/helpers.py:28
+#: ../src/common/helpers.py:30
 msgid "Busy"
 msgstr "Zajęty"
 
-#: ../src/common/helpers.py:30
+#: ../src/common/helpers.py:32
 msgid "Not Available"
 msgstr "Nieobecny"
 
-#: ../src/common/helpers.py:32
+#: ../src/common/helpers.py:34
 msgid "Free for Chat"
 msgstr "Chętny do rozmowy"
 
-#: ../src/common/helpers.py:34
+#: ../src/common/helpers.py:36
 msgid "Available"
 msgstr "Dostępny"
 
-#: ../src/common/helpers.py:36
+#: ../src/common/helpers.py:38
 msgid "Connecting"
 msgstr "Łączę się"
 
-#: ../src/common/helpers.py:38
+#: ../src/common/helpers.py:40
 msgid "Away"
 msgstr "Zaraz wracam"
 
-#: ../src/common/helpers.py:40
+#: ../src/common/helpers.py:42
 msgid "Offline"
 msgstr "Rozłączony"
 
-#: ../src/common/helpers.py:42
+#: ../src/common/helpers.py:44
 msgid "Invisible"
 msgstr "Niewidoczny"
 
-#: ../src/common/helpers.py:44
+#: ../src/common/helpers.py:46
 msgid "Not in the roster"
 msgstr "Spoza listy kontaktów"
 
-#: ../src/common/helpers.py:46 ../src/vcard.py:249 ../src/vcard.py:251
+#: ../src/common/helpers.py:48 ../src/vcard.py:249 ../src/vcard.py:251
 #, fuzzy
 msgid "Unknown"
 msgstr "Nieznany typ %s "
 
-#: ../src/common/helpers.py:48
+#: ../src/common/helpers.py:50
 msgid "Has errors"
 msgstr "Wystąpiły błądy"
 
-#: ../src/common/helpers.py:53 ../src/common/helpers.py:67
-#: ../src/groupchat_window.py:271 ../src/gtkgui.glade.h:173
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:69
+#: ../src/groupchat_window.py:271 ../src/gtkgui.glade.h:174
 msgid "None"
 msgstr "Żaden"
 
-#: ../src/common/helpers.py:55
+#: ../src/common/helpers.py:57
 #, fuzzy
 msgid "To"
 msgstr "Do:"
 
-#: ../src/common/helpers.py:57
+#: ../src/common/helpers.py:59
 #, fuzzy
 msgid "From"
 msgstr "Od:"
 
-#: ../src/common/helpers.py:59
+#: ../src/common/helpers.py:61
 msgid "Both"
 msgstr ""
 
-#: ../src/common/helpers.py:69
+#: ../src/common/helpers.py:71
 #, fuzzy
 msgid "Subscribe"
 msgstr "_Autoryzuj"
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "is paying attention to the conversation"
 msgstr "jest skupiony na rozmowie"
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:112
 msgid "is doing something else"
 msgstr "robi coÅ› innego"
 
-#: ../src/common/helpers.py:112
+#: ../src/common/helpers.py:114
 msgid "is composing a message..."
 msgstr "pisze wiadomość..."
 
-#: ../src/common/helpers.py:114
-msgid "paused composing a message..."
+#. paused means he was compoing but has stopped for a while
+#: ../src/common/helpers.py:117
+#, fuzzy
+msgid "paused composing a message"
 msgstr "przerwał pisanie wiadomości..."
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 msgid "has closed the chat window or tab"
 msgstr "zamknÄ…Å‚ okno lub kartÄ™ rozmowy"
 
@@ -302,16 +304,6 @@ msgstr "błąd: nie można otworzyć %s do odczytu\n"
 msgid "Unable to write file in %s\n"
 msgstr "Nie można zapisać pliku w %s\n"
 
-#: ../src/common/optparser.py:84
-#, fuzzy
-msgid "No space left on device"
-msgstr "Brak miejsca na dysku."
-
-#: ../src/common/optparser.py:100
-#, fuzzy, python-format
-msgid "Unable to open %s for writing\n"
-msgstr "Nie można otworzyć %s do zapisu\n"
-
 #: ../src/advanced.py:52
 msgid "Preference Name"
 msgstr "Nazwa opcji"
@@ -328,7 +320,7 @@ msgstr "Typ"
 msgid "Chat"
 msgstr "Rozmowa"
 
-#: ../src/chat.py:124 ../src/gtkgui.glade.h:127
+#: ../src/chat.py:124 ../src/gtkgui.glade.h:128
 msgid "Group Chat"
 msgstr "Chat"
 
@@ -405,146 +397,146 @@ msgstr "Szukaj w _Internecie"
 msgid "Subject: %s\n"
 msgstr "Temat: %s\n"
 
-#: ../src/config.py:198 ../src/config.py:428
+#: ../src/config.py:199 ../src/config.py:436
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Co %s _minut(y)"
 
-#: ../src/config.py:301
+#: ../src/config.py:307
 msgid "Active"
 msgstr "Aktywny"
 
-#: ../src/config.py:309
+#: ../src/config.py:315
 msgid "Event"
 msgstr "Zdarzenie"
 
-#: ../src/config.py:315
+#: ../src/config.py:321
 msgid "Sound"
 msgstr "Dźwięk"
 
-#: ../src/config.py:918
+#: ../src/config.py:930
 msgid "status message title"
 msgstr "nagłówek informacji o statusie"
 
-#: ../src/config.py:918
+#: ../src/config.py:930
 msgid "status message text"
 msgstr "treść informacji o statusie"
 
-#: ../src/config.py:971
+#: ../src/config.py:983
 msgid "Choose Sound"
 msgstr "Wybierz dźwięk"
 
-#: ../src/config.py:978 ../src/config.py:1923 ../src/vcard.py:131
+#: ../src/config.py:990 ../src/config.py:1935 ../src/vcard.py:131
 msgid "All files"
 msgstr "Wszystkie pliki"
 
-#: ../src/config.py:983
+#: ../src/config.py:995
 msgid "Wav Sounds"
 msgstr "Dźwięki w Wav"
 
-#: ../src/config.py:1152
+#: ../src/config.py:1164
 msgid "OpenPGP is not usable in this computer"
 msgstr "Nie można używać OpenPGP na tym komputerze"
 
-#: ../src/config.py:1177
+#: ../src/config.py:1189
 msgid "You are currently connected to the server"
 msgstr "Jesteś połączony z serwerem"
 
-#: ../src/config.py:1178
+#: ../src/config.py:1190
 msgid "To change the account name, you must be disconnected."
 msgstr "Aby zmienić nazwę konta, musisz być rozłączony."
 
-#: ../src/config.py:1181 ../src/config.py:1185
+#: ../src/config.py:1193 ../src/config.py:1197
 msgid "Invalid account name"
 msgstr "Niepoprawna nazwa konta"
 
-#: ../src/config.py:1182
+#: ../src/config.py:1194
 msgid "Account name cannot be empty."
 msgstr "Nazwa konta nie może być pusta."
 
-#: ../src/config.py:1186
+#: ../src/config.py:1198
 msgid "Account name cannot contain spaces."
 msgstr "Nazwa konta nie może zawierać spacji."
 
-#: ../src/config.py:1190
+#: ../src/config.py:1202
 msgid "Invalid Jabber ID"
 msgstr "Niepoprawny Jabber ID"
 
-#: ../src/config.py:1191
+#: ../src/config.py:1203
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musi być postaci \"użytkownik@nazwaserwera\"."
 
-#: ../src/config.py:1198 ../src/dialogs.py:1107
+#: ../src/config.py:1210 ../src/dialogs.py:1107
 msgid "Invalid password"
 msgstr "Niepoprawne hasło"
 
-#: ../src/config.py:1199
+#: ../src/config.py:1211
 msgid "You must enter a password for the new account."
 msgstr "Musisz wpisać hasło dla nowego konta."
 
-#: ../src/config.py:1236
+#: ../src/config.py:1248
 msgid "Invalid entry"
 msgstr "Niepoprawny wpis"
 
-#: ../src/config.py:1237
+#: ../src/config.py:1249
 msgid "Custom port must be a port number."
 msgstr "Wybrany port musi być numerem portu."
 
-#: ../src/config.py:1324
+#: ../src/config.py:1336
 msgid "Account name is in use"
 msgstr "Nazwa konta jest już zajęta"
 
-#: ../src/config.py:1325
+#: ../src/config.py:1337
 msgid "You already have an account using this name."
 msgstr "Masz już konto o takiej nazwie."
 
-#: ../src/config.py:1387
+#: ../src/config.py:1399
 msgid "No such account available"
 msgstr "Takie konto nie jest dostępne"
 
-#: ../src/config.py:1388
+#: ../src/config.py:1400
 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:1395 ../src/config.py:2005 ../src/dialogs.py:981
+#: ../src/config.py:1407 ../src/config.py:2017 ../src/dialogs.py:981
 #: ../src/dialogs.py:1087 ../src/vcard.py:374 ../src/vcard.py:402
 msgid "You are not connected to the server"
 msgstr "Nie jesteś połączony z serwerem"
 
-#: ../src/config.py:1396
+#: ../src/config.py:1408
 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:1423
+#: ../src/config.py:1435
 msgid "Failed to get secret keys"
 msgstr "Pobieranie kluczy prywatnych nie powiodło się"
 
-#: ../src/config.py:1424
+#: ../src/config.py:1436
 msgid "There was a problem retrieving your GPG secret keys."
 msgstr "Wystąpił problem w trakcie odzyskiwania Twoich kluczy prywatnych GPG."
 
-#: ../src/config.py:1427 ../src/gtkgui.glade.h:183
+#: ../src/config.py:1439 ../src/gtkgui.glade.h:183
 msgid "Passphrase"
 msgstr "Hasło"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1440
 msgid "Choose your OpenPGP key"
 msgstr "Wybierz klucz OpenPGP"
 
-#: ../src/config.py:1436 ../src/gtkgui.glade.h:172
+#: ../src/config.py:1448 ../src/gtkgui.glade.h:173
 msgid "No key selected"
 msgstr "Nie wybrano żadnego klucza"
 
-#: ../src/config.py:1667 ../src/config.py:2028
+#: ../src/config.py:1679 ../src/config.py:2040
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1682
 msgid "Server"
 msgstr "Serwer"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1775 ../src/config.py:2247 ../src/dialogs.py:112
+#: ../src/config.py:1787 ../src/config.py:2259 ../src/dialogs.py:112
 #: ../src/dialogs.py:282 ../src/dialogs.py:318 ../src/roster_window.py:123
 #: ../src/roster_window.py:128 ../src/roster_window.py:152
 #: ../src/roster_window.py:1928 ../src/roster_window.py:1930
@@ -552,29 +544,29 @@ msgstr "Serwer"
 msgid "Transports"
 msgstr "Transporty"
 
-#: ../src/config.py:1790
+#: ../src/config.py:1802
 #, python-format
 msgid "Edit %s"
 msgstr "Modyfikuj %s"
 
-#: ../src/config.py:1792
+#: ../src/config.py:1804
 #, python-format
 msgid "Register to %s"
 msgstr "Zarejestruj na %s"
 
-#: ../src/config.py:1812
+#: ../src/config.py:1824
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/config.py:1820
+#: ../src/config.py:1832
 msgid "Image"
 msgstr "Obrazek"
 
-#: ../src/config.py:1867
+#: ../src/config.py:1879
 msgid "Image is too big"
 msgstr "Obrazek jest za duży"
 
-#: ../src/config.py:1867
+#: ../src/config.py:1879
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
@@ -582,90 +574,90 @@ msgstr ""
 "Obrazek emotki musi mieć rozmiar mniejszy lub równy 24 pikselom długości i "
 "24 pikselom szerokości"
 
-#: ../src/config.py:1917
+#: ../src/config.py:1929
 msgid "Choose Image"
 msgstr "Wybierz obrazek"
 
-#: ../src/config.py:1928 ../src/vcard.py:136
+#: ../src/config.py:1940 ../src/vcard.py:136
 msgid "Images"
 msgstr "Obrazki"
 
-#: ../src/config.py:2006
+#: ../src/config.py:2018
 msgid "Without a connection, you can not browse available services"
 msgstr "Nie możesz przeglądać usług, jeśli nie jesteś połączony."
 
-#: ../src/config.py:2011
+#: ../src/config.py:2023
 #, python-format
 msgid "Service Discovery using %s account"
 msgstr "Przeglądanie usług dla konta %s"
 
-#: ../src/config.py:2013
+#: ../src/config.py:2025
 msgid "Service Discovery"
 msgstr "Przeglądanie usług"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2045
 msgid "Service"
 msgstr "Usługi"
 
-#: ../src/config.py:2038
+#: ../src/config.py:2050
 msgid "Node"
 msgstr "Węzeł"
 
-#: ../src/config.py:2250 ../src/gtkgui.glade.h:305
+#: ../src/config.py:2262 ../src/gtkgui.glade.h:305
 msgid "_Edit"
 msgstr "_Modyfikuj"
 
-#: ../src/config.py:2252 ../src/gtkgui.glade.h:201
+#: ../src/config.py:2264 ../src/gtkgui.glade.h:201
 msgid "Re_gister"
 msgstr "Za_rejestruj"
 
-#: ../src/config.py:2424
+#: ../src/config.py:2436
 #, python-format
 msgid "Removing %s account"
 msgstr "Usuwanie konta %s"
 
-#: ../src/config.py:2431
+#: ../src/config.py:2443
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" jest połączone z serwerem."
 
-#: ../src/config.py:2432
+#: ../src/config.py:2444
 msgid "If you remove it, the connection will be lost."
 msgstr "Jeśli to usuniesz, połączenie zostanie zerwane."
 
-#: ../src/config.py:2557
+#: ../src/config.py:2569
 msgid "New Room"
 msgstr "Nowy Pokój"
 
-#: ../src/config.py:2587
+#: ../src/config.py:2599
 msgid "This bookmark has invalid data"
 msgstr "Ta zakładka zawiera niepoprawne dane"
 
-#: ../src/config.py:2588
+#: ../src/config.py:2600
 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:2808
+#: ../src/config.py:2820
 msgid ""
 "Account has been added successfully.\n"
 "You can set advanced options by using \"Edit->Accounts\" from the main "
 "window."
 msgstr ""
 
-#: ../src/config.py:2819
+#: ../src/config.py:2831
 msgid ""
 "Your new account has been created and added to your gajim configuration.\n"
 "You can set advanced account options using \"Edit->Accounts\" in the main "
 "window menu."
 msgstr ""
 
-#: ../src/config.py:2833
+#: ../src/config.py:2845
 #, fuzzy
 msgid "You need to enter a username to add an account."
 msgstr "Musisz wpisać hasło dla nowego konta."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2849
 #, fuzzy
 msgid "You need to enter a valid server address to add an account."
 msgstr "Musisz wpisać hasło dla nowego konta."
@@ -755,7 +747,7 @@ msgstr "Gajim - %s nieprzeczytane wiadomości"
 msgid "Gajim - 1 unread message"
 msgstr "Gajim - 1 nieprzeczytana wiadomość"
 
-#: ../src/dialogs.py:696 ../src/gtkgui.glade.h:116
+#: ../src/dialogs.py:696 ../src/gtkgui.glade.h:117
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -764,7 +756,7 @@ msgstr "Gajim"
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/dialogs.py:733 ../src/dialogs.py:834 ../src/dialogs.py:1777
+#: ../src/dialogs.py:733 ../src/dialogs.py:834 ../src/dialogs.py:1778
 msgid "Name: "
 msgstr "Nazwa: "
 
@@ -782,11 +774,11 @@ msgstr "Otwórz stronę pobierania"
 msgid "Upload"
 msgstr ""
 
-#: ../src/dialogs.py:745 ../src/dialogs.py:1779
+#: ../src/dialogs.py:745 ../src/dialogs.py:1780
 msgid "Sender: "
 msgstr "Nadawca: "
 
-#: ../src/dialogs.py:748 ../src/dialogs.py:1781
+#: ../src/dialogs.py:748 ../src/dialogs.py:1782
 #, fuzzy
 msgid "Recipient: "
 msgstr "Ostatnio:"
@@ -864,7 +856,7 @@ msgstr "Nie możesz dołączyć do chatu gdy nie jesteś połączony."
 msgid "Join Group Chat as %s"
 msgstr "Dołącz do chatu jako %s."
 
-#: ../src/dialogs.py:997 ../src/gtkgui.glade.h:153
+#: ../src/dialogs.py:997 ../src/gtkgui.glade.h:154
 msgid "Join Group Chat"
 msgstr "Dołącz do chatu"
 
@@ -874,7 +866,7 @@ msgid "New Message as %s"
 msgstr "Nowa wiadomość jako %s"
 
 #: ../src/dialogs.py:1062 ../src/dialogs.py:1157 ../src/gajim.py:462
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:170
 msgid "New Message"
 msgstr "Nowa wiadomość"
 
@@ -1099,15 +1091,15 @@ msgstr ""
 msgid "Would you like to overwrite it?"
 msgstr ""
 
-#: ../src/dialogs.py:1880 ../src/gtkgui.glade.h:338
+#: ../src/dialogs.py:1881 ../src/gtkgui.glade.h:338
 msgid "_Pause"
 msgstr "_Zatrzymaj"
 
-#: ../src/dialogs.py:1883 ../src/dialogs.py:1915
+#: ../src/dialogs.py:1884 ../src/dialogs.py:1916
 msgid "_Continue"
 msgstr "_Kontynuuj"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1912
 msgid "Pause"
 msgstr "Zatrzymaj"
 
@@ -1126,7 +1118,7 @@ msgid "error while sending"
 msgstr "błąd przy wysyłaniu"
 
 #: ../src/gajim.py:536 ../src/gajim.py:546 ../src/roster_window.py:125
-#: ../src/roster_window.py:1036 ../src/gtkgui.glade.h:124
+#: ../src/roster_window.py:1036 ../src/gtkgui.glade.h:125
 msgid "General"
 msgstr "Ogólne"
 
@@ -1172,7 +1164,8 @@ msgstr "Twoje hasło GPG jest niepoprawne."
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Jesteś aktualnie połączony bez obsługi GPG."
 
-#: ../src/gajim.py:1025
+#. it is good to notify the user, in case he cannot see the output of the console
+#: ../src/gajim.py:1027
 msgid "Cannot save your preferences"
 msgstr "Nie można zapisać twoich ustawień."
 
@@ -1305,7 +1298,7 @@ msgstr "Podaj przyczynÄ™:"
 msgid "Banning %s"
 msgstr "Zabanuj %s"
 
-#: ../src/groupchat_window.py:961 ../src/tabbed_chat_window.py:323
+#: ../src/groupchat_window.py:961 ../src/tabbed_chat_window.py:327
 msgid "If you close this tab, the message will be lost."
 msgstr "Jeśłi zamkniesz kartę, to utracisz tę wiadomość."
 
@@ -1564,40 +1557,40 @@ msgstr ""
 "Ani %s nie przesyła swojego klucza OpenPGP ani Ty nie przypisałeś mu żadnego "
 "klucza."
 
-#: ../src/tabbed_chat_window.py:254 ../src/tabbed_chat_window.py:322
+#: ../src/tabbed_chat_window.py:258 ../src/tabbed_chat_window.py:326
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Właśnie otrzymałeś nową wiadomość od \"%s\""
 
-#: ../src/tabbed_chat_window.py:255
+#: ../src/tabbed_chat_window.py:259
 msgid "If you close the window, this message will be lost."
 msgstr "Jeśli zamkniesz okno, to utracisz tę wiadomość."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:488
+#: ../src/tabbed_chat_window.py:492
 msgid "A connection is not available"
 msgstr "Połączenie jest niemożliwe"
 
-#: ../src/tabbed_chat_window.py:489
+#: ../src/tabbed_chat_window.py:493
 #, fuzzy
 msgid "Your message can not be sent until you are connected."
 msgstr "Nie możesz wysłać wiadomości dopóki nie będziesz połączony."
 
-#: ../src/tabbed_chat_window.py:577
+#: ../src/tabbed_chat_window.py:581
 #, fuzzy
 msgid "Sending private message failed"
 msgstr "_Wyślij prywatną wiadomość"
 
-#: ../src/tabbed_chat_window.py:578
+#: ../src/tabbed_chat_window.py:582
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:681
+#: ../src/tabbed_chat_window.py:685
 msgid "Encryption enabled"
 msgstr "Szyfrowanie włączone"
 
-#: ../src/tabbed_chat_window.py:686
+#: ../src/tabbed_chat_window.py:690
 msgid "Encryption disabled"
 msgstr "Szyfrowanie wyłączone"
 
@@ -1642,29 +1635,31 @@ msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Edytor zaawansowanych konfiguracji</b>"
 
 #: ../src/gtkgui.glade.h:4
-msgid "<b>Changes in latest version</b>"
-msgstr "<b>Zmiany w najnowszej wersji</b>"
+#, fuzzy
+msgid "<b>Applications</b>"
+msgstr "<b>Własne aplikacje</b>"
 
 #: ../src/gtkgui.glade.h:5
-msgid "<b>Custom Applications</b>"
-msgstr "<b>Własne aplikacje</b>"
+msgid "<b>Changes in latest version</b>"
+msgstr "<b>Zmiany w najnowszej wersji</b>"
 
 #: ../src/gtkgui.glade.h:6
+#, fuzzy
+msgid "<b>Custom</b>"
+msgstr "<b>Loguj</b>"
+
+#: ../src/gtkgui.glade.h:7
 msgid "<b>Format of a chat line</b>"
 msgstr "<b>Format linii rozmowy</b>"
 
-#: ../src/gtkgui.glade.h:7
+#: ../src/gtkgui.glade.h:8
 msgid "<b>Interface Customization</b>"
 msgstr "<b>Własne ustawienia interfejsu</b>"
 
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Traffic</b>"
 
-#: ../src/gtkgui.glade.h:9
-msgid "<b>Links</b>"
-msgstr "<b>Linki</b>"
-
 #: ../src/gtkgui.glade.h:10
 msgid "<b>Log</b>"
 msgstr "<b>Loguj</b>"
@@ -2079,32 +2074,37 @@ msgid "File _Transfers"
 msgstr "Przesyłane pliki."
 
 #: ../src/gtkgui.glade.h:111
+#, fuzzy
+msgid "File manager:"
+msgstr "Przesyłane pliki."
+
+#: ../src/gtkgui.glade.h:112
 msgid "Filter:"
 msgstr "Filtr:"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 #, fuzzy
 msgid "Font:"
 msgstr "Konto:"
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:114
 msgid "Format: YYYY-MM-DD"
 msgstr "Format: RRRR-MM-DD"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:115
 msgid "From:"
 msgstr "Od:"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:116
 #, fuzzy
 msgid "GPG Encryption"
 msgstr "Szyfrowanie OpenPGP"
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Gajim Themes Customization"
 msgstr "Wybieranie motywów dla Gajim"
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2112,7 +2112,7 @@ msgstr ""
 "Gajim automatycznie wyświetli nową wiadomość w nowym oknie lub w nowej "
 "karcie otwartego okna rozmowy."
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2120,7 +2120,7 @@ msgstr ""
 "Gajim powiadomi Cię o nadejściu nowej wiadomości wyświetlając okienko w "
 "prawy dolnym rogu ekranu."
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:121
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2128,7 +2128,7 @@ msgstr ""
 "Gajim powiadomi automatycznie przy pomocy okna w prawym dolnym rogu o "
 "kontaktach, które są dostępne."
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:122
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2136,56 +2136,56 @@ msgstr ""
 "Gajim powiadomi automatycznie przy pomocy okna w prawym dolnym rogu o "
 "kontaktach które są dostępne."
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:123
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr "Gajim zmieni jedynie ikonę kontaktu, który przysłał nową wiadomość."
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
 msgid "Gajim: First Time Wizard"
 msgstr "Gajim: Pierwsze uruchomienie programu"
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:126
 msgid "Given:"
 msgstr "Dany:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:127
 msgid "Go"
 msgstr "Idź"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:129
 msgid "Group:"
 msgstr "Grupa:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:130
 msgid "HTTP Connect"
 msgstr "Połączenie HTTP"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:131
 msgid "Homepage:"
 msgstr "Strona domowa:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:132
 msgid "Hostname: "
 msgstr "Nazwa hosta: "
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:133
 msgid "I already have an account I want to use"
 msgstr "Mam już konto i chcę z niego korzystać."
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "I want to _register for a new account"
 msgstr "Chcę zarejestrować nowe konto Jabbera."
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:135
 msgid "I would like to add you to my contact list."
 msgstr "Chciałbym dodać Cię do listy kontaktów."
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "Zaznaczenie spowoduje włączenie ikony Gajima w tacce systemowej."
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid ""
 "If checked, Gajim will broadcast capability to send and receive meta-"
 "information related to a conversation you may have with a contact such as "
@@ -2195,15 +2195,15 @@ msgstr ""
 "możliwościwysyłania i odbierania meta-informacji związanych z rozmową, którą "
 "prowadzisz z kontaktem, np. infomację o pisaniu wiadomości."
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 msgid "If checked, Gajim will join this groupchat on startup"
 msgstr "Zaznaczenie spowoduje łączenie z tym pokojem przy starcie programu."
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:139
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Włączenie tej opcji spowoduje zapamiętanie hasła dla tego konta."
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:140
 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"
@@ -2211,7 +2211,7 @@ msgstr ""
 "Zaznaczenie tej opcji spowoduje zapamiętanie położenia głównego okna "
 "programu na ekranie oraz jego rozmiaru."
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2219,7 +2219,7 @@ msgstr ""
 "Zaznaczenie tej opcji spowoduje zastÄ…pienie emotek tekstowy jak ':)' "
 "emotkami graficznymi."
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2227,7 +2227,7 @@ msgstr ""
 "Zaznaczenie tej opcji spowoduje wysyłanie pakietów podtrzymujących "
 "połączenie, co zapobiega rozłączaniu."
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for only you and of course the administrator"
@@ -2235,7 +2235,7 @@ msgstr ""
 "Zaznaczanie tej opcji spowoduje nadanie praw do odczytu pliku ~/.gajim/"
 "config tylko Tobie i oczywiście administratorowi."
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:144
 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, "
@@ -2245,7 +2245,7 @@ msgstr ""
 "trasportu, np. kontakt z MSN będzie miał odpowiednie ikony statusu dostępny, "
 "zaraz wracam, zajęty, itd."
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:145
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2253,7 +2253,7 @@ msgstr ""
 "Zaznaczanie tej opcji spowoduje automatyczne łączenie z siecią Jabber z "
 "wykorzystaniem tego konta."
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:146
 #, fuzzy
 msgid ""
 "If checked, all chat and group chat windows will have the information area "
@@ -2266,7 +2266,7 @@ msgstr ""
 "włączać i wyłączać widok zwarty wciskając Ctrl+C. UWAGA: Ostatni stan okna/"
 "karty nie jest zapisywny na stałe."
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:147
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2274,120 +2274,116 @@ msgstr ""
 "Jeśli masz dwa konta lub więcej, to dzięki tej opcji Gajim pokaże wszystkie "
 "kontakty w taki sposób, jakby było to jedno konto."
 
-#: ../src/gtkgui.glade.h:147
+#: ../src/gtkgui.glade.h:148
 msgid "Incoming message:"
 msgstr "Nadejście wiadomości:"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:149
 msgid "Info/Query"
 msgstr "Informacja/Zapytanie"
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:150
 msgid "Information about you are stored on the server as vCard"
 msgstr ""
 "Informacje o Tobie sÄ… przechowywane na serwerze\n"
 "jako vCard."
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:151
 msgid "Italic"
 msgstr "Kursywa"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:152
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:153
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:155
 msgid "Join _Group Chat"
 msgstr "Dołącz do _chatu"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:156
 msgid "Join _Group Chat..."
 msgstr "Dołącz do _chatu..."
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:157
 msgid "Location"
 msgstr "Miejsce"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:158
 msgid "Log history"
 msgstr "Historia"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:159
 msgid "Log presences in _contact's log file"
 msgstr "Zapisuj zmiany statusu w logach kontaktu"
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:160
 msgid "Log presences in an _external file"
 msgstr "Zapisuj zmiany statusu w _zewnętrznym pliku"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:161
 msgid "Manage Accounts"
 msgstr "ZarzÄ…dzaj kontami"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:162
 msgid "Manage Bookmarks"
 msgstr "Zarządzaj zakładkami"
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:163
 msgid "Manage Emoticons"
 msgstr "ZarzÄ…dzaj emotkami"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:164
 msgid "Manage Proxy Profiles"
 msgstr "Zarządzaj profilami pośrednika"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:165
 msgid "Manage..."
 msgstr "ZarzÄ…dzaj..."
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:166
 msgid "Middle:"
 msgstr "Drugie imiÄ™:"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:167
 msgid "Mo_derator"
 msgstr "Mo_derator"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:168
 msgid "More"
 msgstr "Więcej"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:169
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:171
 msgid "New version of Gajim available"
 msgstr "Dostępna jest nowa wersja Gajima"
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:172
 msgid "Nickname:"
 msgstr "Pseudonim:"
 
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:175
 msgid "Notify me about contacts that: "
 msgstr "Powiadom mnie o kontaktach zmieniajÄ…cych status na: "
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:176
 msgid "OS:"
 msgstr "System operacyjny:"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:177
 msgid "On every _message"
 msgstr "W każdej _wiadomości"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:178
 msgid "Open Download Page"
 msgstr "Otwórz stronę pobierania"
 
-#: ../src/gtkgui.glade.h:178
-msgid "Open _with:"
-msgstr "Ot_wórz przy pomocy:"
-
 #: ../src/gtkgui.glade.h:179
 msgid "Open..."
 msgstr "Otwórz..."
@@ -3204,23 +3200,24 @@ msgstr "minutach"
 msgid "show a help on specific command"
 msgstr "pokaż pomoc dla wybranego polecenia"
 
-#: ../scripts/gajim-remote.py:74
+#. parameter, named "on_command". User gets help for the command, specified by this parameter
+#: ../scripts/gajim-remote.py:75
 msgid "on_command"
 msgstr "on_command"
 
-#: ../scripts/gajim-remote.py:74
+#: ../scripts/gajim-remote.py:76
 msgid "show help on command"
 msgstr "pokaż pomoc polecenia"
 
-#: ../scripts/gajim-remote.py:78
+#: ../scripts/gajim-remote.py:80
 msgid "Shows or hides the roster window"
 msgstr "Pokazuje lub ukrywa okno listy kontaktów."
 
-#: ../scripts/gajim-remote.py:82
+#: ../scripts/gajim-remote.py:84
 msgid "Popup a window with the next unread message"
 msgstr "Pokaż okno z następną nieprzeczytaną wiadomością"
 
-#: ../scripts/gajim-remote.py:86
+#: ../scripts/gajim-remote.py:88
 msgid ""
 "Print a list of all contacts in the roster. Each contact appear on a "
 "separate line"
@@ -3228,42 +3225,42 @@ msgstr ""
 "Wypisz listę wszystkich kontaktów. Każdy kontakt zostanie wypisany w osobnej "
 "linii."
 
-#: ../scripts/gajim-remote.py:89 ../scripts/gajim-remote.py:104
-#: ../scripts/gajim-remote.py:116 ../scripts/gajim-remote.py:130
+#: ../scripts/gajim-remote.py:91 ../scripts/gajim-remote.py:106
+#: ../scripts/gajim-remote.py:118 ../scripts/gajim-remote.py:132
 msgid "account"
 msgstr "konto"
 
-#: ../scripts/gajim-remote.py:89
+#: ../scripts/gajim-remote.py:91
 msgid "show only contacts of the given account"
 msgstr "pokaż tylko kontakty z danego konta"
 
-#: ../scripts/gajim-remote.py:95
+#: ../scripts/gajim-remote.py:97
 msgid "Print a list of registered accounts"
 msgstr "Wypisz listÄ™ zarejestrowanych kont"
 
-#: ../scripts/gajim-remote.py:99
+#: ../scripts/gajim-remote.py:101
 msgid "Change the status of account or accounts"
 msgstr "Zmień status kont lub kont."
 
-#: ../scripts/gajim-remote.py:101
+#: ../scripts/gajim-remote.py:103
 msgid "status"
 msgstr "status"
 
-#: ../scripts/gajim-remote.py:101
+#: ../scripts/gajim-remote.py:103
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "jeden z: rozłączony, dostępny, chętny do rozmowy, zaraz wracam, xa, zajęty, "
 "niewidoczny "
 
-#: ../scripts/gajim-remote.py:103 ../scripts/gajim-remote.py:127
+#: ../scripts/gajim-remote.py:105 ../scripts/gajim-remote.py:129
 msgid "message"
 msgstr "wiadomość"
 
-#: ../scripts/gajim-remote.py:103
+#: ../scripts/gajim-remote.py:105
 msgid "status message"
 msgstr "nformacja o statusie"
 
-#: ../scripts/gajim-remote.py:104
+#: ../scripts/gajim-remote.py:106
 #, fuzzy
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
@@ -3273,21 +3270,21 @@ msgstr ""
 "zmienićstatus wszystkich kont, które mają ustawioną opcję synchronizacji ze "
 "statusemglobalnym."
 
-#: ../scripts/gajim-remote.py:110
+#: ../scripts/gajim-remote.py:112
 msgid "Show the chat dialog so that you can send message to a contact"
 msgstr "Pokaż okno dialogowe umożliwiające wysłanie wiadomości do kontaktu."
 
-#: ../scripts/gajim-remote.py:113
+#: ../scripts/gajim-remote.py:115
 msgid "jid of the contact that you want to chat with"
 msgstr "JID osoby, z którą chcesz porozmawiać"
 
-#: ../scripts/gajim-remote.py:116
+#: ../scripts/gajim-remote.py:118
 #, fuzzy
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "jeśli jest podany, to kontakt jest pobierany z listy kontaktów tego konta"
 
-#: ../scripts/gajim-remote.py:121
+#: ../scripts/gajim-remote.py:123
 #, fuzzy
 msgid ""
 "Send new message to a contact in the roster. Both OpenPGP key and account "
@@ -3298,46 +3295,46 @@ msgstr ""
 "opcjonalne. jeśli chce ustawić jedynie 'konto' bez 'klucza pgp', to "
 "ustaw'klucz pgp' na ''."
 
-#: ../scripts/gajim-remote.py:125
+#: ../scripts/gajim-remote.py:127
 msgid "jid of the contact that will receive the message"
 msgstr "JID osoby, która otrzyma wiadomość"
 
-#: ../scripts/gajim-remote.py:127
+#: ../scripts/gajim-remote.py:129
 msgid "message contents"
 msgstr "zawartość wiadomości"
 
-#: ../scripts/gajim-remote.py:128
+#: ../scripts/gajim-remote.py:130
 msgid "pgp key"
 msgstr "klucz pgp"
 
-#: ../scripts/gajim-remote.py:128
+#: ../scripts/gajim-remote.py:130
 #, fuzzy
 msgid "if specified, the message will be encrypted using this pulic key"
 msgstr ""
 "jeśli jest podany, to wiadomość zostanie zaszyfrowana tym kluczem publicznym"
 
-#: ../scripts/gajim-remote.py:130
+#: ../scripts/gajim-remote.py:132
 #, fuzzy
 msgid "if specified, the message will be sent using this account"
 msgstr "jeśli jest podane, to wiadomość zostanie wysłana z tego konta"
 
-#: ../scripts/gajim-remote.py:135
+#: ../scripts/gajim-remote.py:137
 msgid "Get detailed info on a contact"
 msgstr "Pobierz szczegółowe informacje o kontakcie."
 
-#: ../scripts/gajim-remote.py:137
+#: ../scripts/gajim-remote.py:139
 msgid "jid of the contact"
 msgstr "JID kontaktu"
 
-#: ../scripts/gajim-remote.py:158
+#: ../scripts/gajim-remote.py:160
 msgid "Missing argument \"contact_jid\""
 msgstr "Brak argumentu \"contact_jid\""
 
-#: ../scripts/gajim-remote.py:163 ../scripts/gajim-remote.py:476
+#: ../scripts/gajim-remote.py:165 ../scripts/gajim-remote.py:478
 msgid "Service not available"
 msgstr "Usługa jest niedostępna"
 
-#: ../scripts/gajim-remote.py:181
+#: ../scripts/gajim-remote.py:183
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -3346,20 +3343,20 @@ msgstr ""
 "'%s' nie znajduje się na twojej liście kontaktów.\n"
 "Podaj konto, na które ma zostać wysłana ta wiadomość."
 
-#: ../scripts/gajim-remote.py:184
+#: ../scripts/gajim-remote.py:186
 msgid "You have no active account"
 msgstr "Żadne z twoich kont nie jest aktywne."
 
-#: ../scripts/gajim-remote.py:203
+#: ../scripts/gajim-remote.py:205
 msgid "Session bus is not available."
 msgstr "Magistrala sesji nie jest dosŧępna."
 
-#: ../scripts/gajim-remote.py:212
+#: ../scripts/gajim-remote.py:214
 #, python-format
 msgid "Unknow dbus version: %s"
 msgstr "Nieznana wersji dbus: %s"
 
-#: ../scripts/gajim-remote.py:238
+#: ../scripts/gajim-remote.py:240
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -3368,12 +3365,12 @@ msgstr ""
 "Zużycie:·%s·%s·%s·\n"
 "\t"
 
-#: ../scripts/gajim-remote.py:244
+#: ../scripts/gajim-remote.py:246
 #, fuzzy, python-format
 msgid "%s not found"
 msgstr "Nie znaleziono %s"
 
-#: ../scripts/gajim-remote.py:248
+#: ../scripts/gajim-remote.py:250
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -3382,12 +3379,12 @@ msgstr ""
 "Użycie: polecenie %s [argument]\n"
 "Gdzie polecenie to jedna z następujący fraz:\n"
 
-#: ../scripts/gajim-remote.py:307
+#: ../scripts/gajim-remote.py:309
 #, python-format
 msgid "Unknown type %s "
 msgstr "Nieznany typ %s "
 
-#: ../scripts/gajim-remote.py:449
+#: ../scripts/gajim-remote.py:451
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3396,6 +3393,20 @@ msgstr ""
 "Argument \"%s\" nie jest określony. \n"
 "Wpisz \"%s·help·%s\" aby uzyskać więcej informacji."
 
+#, fuzzy
+#~ msgid "No space left on device"
+#~ msgstr "Brak miejsca na dysku."
+
+#, fuzzy
+#~ msgid "Unable to open %s for writing\n"
+#~ msgstr "Nie można otworzyć %s do zapisu\n"
+
+#~ msgid "<b>Links</b>"
+#~ msgstr "<b>Linki</b>"
+
+#~ msgid "Open _with:"
+#~ msgstr "Ot_wórz przy pomocy:"
+
 #, fuzzy
 #~ msgid "Switch to"
 #~ msgstr "Zmień na %s"
diff --git a/po/pt/LC_MESSAGES/gajim.po b/po/pt/LC_MESSAGES/gajim.po
index 9bdfc21d72a0626ed55471daa60792dc45670a36..7dbd88fdbe42a168f62c4b64d797cb55570c9f84 100644
--- a/po/pt/LC_MESSAGES/gajim.po
+++ b/po/pt/LC_MESSAGES/gajim.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 01:26+0300\n"
+"POT-Creation-Date: 2005-08-09 18:26+0300\n"
 "PO-Revision-Date: 2005-03-22 17:47-0300\n"
 "Last-Translator: Junix <junix@infolink.com.br>\n"
 "Language-Team: none\n"
@@ -24,92 +24,92 @@ msgstr ""
 msgid "Not available as a result of being idle"
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:267
 msgid "Sleeping"
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:268
 msgid "Back soon"
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:268
 msgid "Back in some minutes."
 msgstr "Volto em alguns minutos"
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:269
 msgid "Eating"
 msgstr "Comendo"
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:269
 msgid "I'm eating, so leave me a message."
 msgstr "Eu estou comendo, então deixe-me uma mensagem"
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:270
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:270
 msgid "I'm watching a movie."
 msgstr "Estou assistindo um filme."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:271
 #, fuzzy
 msgid "Working"
 msgstr "Trabalhando"
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:271
 msgid "I'm working."
 msgstr "Estou trabalhando"
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:272
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:272
 msgid "I'm on the phone."
 msgstr "Estou no telefone."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:273
 msgid "Out"
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:273
 msgid "I'm out enjoying life"
 msgstr ""
 
-#: ../src/common/connection.py:291 ../src/common/connection.py:301
+#: ../src/common/connection.py:290 ../src/common/connection.py:300
 #, fuzzy, python-format
 msgid ""
 "Subject: %s\n"
 "%s"
 msgstr "Assunto:"
 
-#: ../src/common/connection.py:351 ../src/common/connection.py:1496
+#: ../src/common/connection.py:350 ../src/common/connection.py:1496
 msgid "I would like to add you to my roster."
 msgstr "Eu gostaria de adicionar você à minha lista"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:358
+#: ../src/common/connection.py:357
 #, fuzzy, python-format
 msgid "we are now subscribed to %s"
 msgstr "Você foi removido da lista por %s"
 
-#: ../src/common/connection.py:360
+#: ../src/common/connection.py:359
 #, fuzzy, python-format
 msgid "unsubscribe request from %s"
 msgstr "Inscrição requerida para %s"
 
-#: ../src/common/connection.py:362
+#: ../src/common/connection.py:361
 #, fuzzy, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "Você foi removido da lista por %s"
 
-#: ../src/common/connection.py:399
+#: ../src/common/connection.py:398
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr ""
 
-#: ../src/common/connection.py:400
+#: ../src/common/connection.py:399
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 
@@ -185,94 +185,95 @@ msgstr ""
 msgid "error appeared while processing xmpp:"
 msgstr ""
 
-#: ../src/common/helpers.py:28
+#: ../src/common/helpers.py:30
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:30
+#: ../src/common/helpers.py:32
 msgid "Not Available"
 msgstr "Não Disponível"
 
-#: ../src/common/helpers.py:32
+#: ../src/common/helpers.py:34
 msgid "Free for Chat"
 msgstr "Livre para Conversa"
 
-#: ../src/common/helpers.py:34
+#: ../src/common/helpers.py:36
 #, fuzzy
 msgid "Available"
 msgstr "Não Disponível"
 
-#: ../src/common/helpers.py:36
+#: ../src/common/helpers.py:38
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:38
+#: ../src/common/helpers.py:40
 msgid "Away"
 msgstr "Afastado"
 
-#: ../src/common/helpers.py:40
+#: ../src/common/helpers.py:42
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:42
+#: ../src/common/helpers.py:44
 msgid "Invisible"
 msgstr "Invisível"
 
-#: ../src/common/helpers.py:44
+#: ../src/common/helpers.py:46
 msgid "Not in the roster"
 msgstr "Fora da lista"
 
-#: ../src/common/helpers.py:46 ../src/vcard.py:249 ../src/vcard.py:251
+#: ../src/common/helpers.py:48 ../src/vcard.py:249 ../src/vcard.py:251
 msgid "Unknown"
 msgstr ""
 
-#: ../src/common/helpers.py:48
+#: ../src/common/helpers.py:50
 msgid "Has errors"
 msgstr "Com erros"
 
-#: ../src/common/helpers.py:53 ../src/common/helpers.py:67
-#: ../src/groupchat_window.py:271 ../src/gtkgui.glade.h:173
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:69
+#: ../src/groupchat_window.py:271 ../src/gtkgui.glade.h:174
 #, fuzzy
 msgid "None"
 msgstr "Nó"
 
-#: ../src/common/helpers.py:55
+#: ../src/common/helpers.py:57
 msgid "To"
 msgstr ""
 
-#: ../src/common/helpers.py:57
+#: ../src/common/helpers.py:59
 #, fuzzy
 msgid "From"
 msgstr "Sala:"
 
-#: ../src/common/helpers.py:59
+#: ../src/common/helpers.py:61
 msgid "Both"
 msgstr ""
 
-#: ../src/common/helpers.py:69
+#: ../src/common/helpers.py:71
 #, fuzzy
 msgid "Subscribe"
 msgstr "_Inscrição"
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "is paying attention to the conversation"
 msgstr ""
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:112
 msgid "is doing something else"
 msgstr ""
 
-#: ../src/common/helpers.py:112
+#: ../src/common/helpers.py:114
 #, fuzzy
 msgid "is composing a message..."
 msgstr "Mensagem recebida:"
 
-#: ../src/common/helpers.py:114
+#. paused means he was compoing but has stopped for a while
+#: ../src/common/helpers.py:117
 #, fuzzy
-msgid "paused composing a message..."
+msgid "paused composing a message"
 msgstr "Mensagem recebida:"
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 #, fuzzy
 msgid "has closed the chat window or tab"
 msgstr "_Usar uma única janela de conversa com abas"
@@ -304,15 +305,6 @@ msgstr ""
 msgid "Unable to write file in %s\n"
 msgstr ""
 
-#: ../src/common/optparser.py:84
-msgid "No space left on device"
-msgstr ""
-
-#: ../src/common/optparser.py:100
-#, python-format
-msgid "Unable to open %s for writing\n"
-msgstr ""
-
 #: ../src/advanced.py:52
 msgid "Preference Name"
 msgstr "Preferências Nome"
@@ -329,7 +321,7 @@ msgstr "Tipo"
 msgid "Chat"
 msgstr "Conversa"
 
-#: ../src/chat.py:124 ../src/gtkgui.glade.h:127
+#: ../src/chat.py:124 ../src/gtkgui.glade.h:128
 #, fuzzy
 msgid "Group Chat"
 msgstr "Conferência"
@@ -402,162 +394,162 @@ msgstr ""
 msgid "Subject: %s\n"
 msgstr "Assunto:"
 
-#: ../src/config.py:198 ../src/config.py:428
+#: ../src/config.py:199 ../src/config.py:436
 #, fuzzy, python-format
 msgid "Every %s _minutes"
 msgstr "De 5 em 5 _minutos"
 
-#: ../src/config.py:301
+#: ../src/config.py:307
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:309
+#: ../src/config.py:315
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:315
+#: ../src/config.py:321
 msgid "Sound"
 msgstr "Som"
 
-#: ../src/config.py:918
+#: ../src/config.py:930
 #, fuzzy
 msgid "status message title"
 msgstr "Mensagem de status:"
 
-#: ../src/config.py:918
+#: ../src/config.py:930
 #, fuzzy
 msgid "status message text"
 msgstr "Mensagem de status:"
 
-#: ../src/config.py:971
+#: ../src/config.py:983
 msgid "Choose Sound"
 msgstr "Escolher Som"
 
-#: ../src/config.py:978 ../src/config.py:1923 ../src/vcard.py:131
+#: ../src/config.py:990 ../src/config.py:1935 ../src/vcard.py:131
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/config.py:983
+#: ../src/config.py:995
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/config.py:1152
+#: ../src/config.py:1164
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP não é usado neste computador"
 
-#: ../src/config.py:1177
+#: ../src/config.py:1189
 #, fuzzy
 msgid "You are currently connected to the server"
 msgstr "Você deve estar conectado para visualizar os serviços"
 
-#: ../src/config.py:1178
+#: ../src/config.py:1190
 msgid "To change the account name, you must be disconnected."
 msgstr ""
 
-#: ../src/config.py:1181 ../src/config.py:1185
+#: ../src/config.py:1193 ../src/config.py:1197
 msgid "Invalid account name"
 msgstr ""
 
-#: ../src/config.py:1182
+#: ../src/config.py:1194
 #, fuzzy
 msgid "Account name cannot be empty."
 msgstr "Sua senha não pode ser vazia"
 
-#: ../src/config.py:1186
+#: ../src/config.py:1198
 #, fuzzy
 msgid "Account name cannot contain spaces."
 msgstr "Sua senha não pode ser vazia"
 
-#: ../src/config.py:1190
+#: ../src/config.py:1202
 #, fuzzy
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/config.py:1191
+#: ../src/config.py:1203
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr ""
 
-#: ../src/config.py:1198 ../src/dialogs.py:1107
+#: ../src/config.py:1210 ../src/dialogs.py:1107
 #, fuzzy
 msgid "Invalid password"
 msgstr "Salvar senha"
 
-#: ../src/config.py:1199
+#: ../src/config.py:1211
 #, fuzzy
 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:1236
+#: ../src/config.py:1248
 msgid "Invalid entry"
 msgstr ""
 
-#: ../src/config.py:1237
+#: ../src/config.py:1249
 #, fuzzy
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta"
 
-#: ../src/config.py:1324
+#: ../src/config.py:1336
 msgid "Account name is in use"
 msgstr ""
 
-#: ../src/config.py:1325
+#: ../src/config.py:1337
 #, fuzzy
 msgid "You already have an account using this name."
 msgstr "Eu já tenho uma conta e quero usar"
 
-#: ../src/config.py:1387
+#: ../src/config.py:1399
 #, fuzzy
 msgid "No such account available"
 msgstr "Não Disponível"
 
-#: ../src/config.py:1388
+#: ../src/config.py:1400
 #, fuzzy
 msgid "You must create your account before editing your personal information."
 msgstr "Você deve primeiro criar sua conta antes de editar suas informações"
 
-#: ../src/config.py:1395 ../src/config.py:2005 ../src/dialogs.py:981
+#: ../src/config.py:1407 ../src/config.py:2017 ../src/dialogs.py:981
 #: ../src/dialogs.py:1087 ../src/vcard.py:374 ../src/vcard.py:402
 #, fuzzy
 msgid "You are not connected to the server"
 msgstr "Você deve estar conectado para visualizar os serviços"
 
-#: ../src/config.py:1396
+#: ../src/config.py:1408
 #, fuzzy
 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:1423
+#: ../src/config.py:1435
 #, fuzzy
 msgid "Failed to get secret keys"
 msgstr "Erro enquanto recebe as chaves secretas"
 
-#: ../src/config.py:1424
+#: ../src/config.py:1436
 msgid "There was a problem retrieving your GPG secret keys."
 msgstr ""
 
-#: ../src/config.py:1427 ../src/gtkgui.glade.h:183
+#: ../src/config.py:1439 ../src/gtkgui.glade.h:183
 msgid "Passphrase"
 msgstr "Frase de acesso"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1440
 #, fuzzy
 msgid "Choose your OpenPGP key"
 msgstr "<b>Escolha sua chave OpenPGP</b>"
 
-#: ../src/config.py:1436 ../src/gtkgui.glade.h:172
+#: ../src/config.py:1448 ../src/gtkgui.glade.h:173
 msgid "No key selected"
 msgstr "Nenhuma chave selecionada"
 
-#: ../src/config.py:1667 ../src/config.py:2028
+#: ../src/config.py:1679 ../src/config.py:2040
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1682
 msgid "Server"
 msgstr "Servidor"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1775 ../src/config.py:2247 ../src/dialogs.py:112
+#: ../src/config.py:1787 ../src/config.py:2259 ../src/dialogs.py:112
 #: ../src/dialogs.py:282 ../src/dialogs.py:318 ../src/roster_window.py:123
 #: ../src/roster_window.py:128 ../src/roster_window.py:152
 #: ../src/roster_window.py:1928 ../src/roster_window.py:1930
@@ -565,122 +557,122 @@ msgstr "Servidor"
 msgid "Transports"
 msgstr ""
 
-#: ../src/config.py:1790
+#: ../src/config.py:1802
 #, python-format
 msgid "Edit %s"
 msgstr "_Editar %s"
 
-#: ../src/config.py:1792
+#: ../src/config.py:1804
 #, python-format
 msgid "Register to %s"
 msgstr "Registro para %s"
 
-#: ../src/config.py:1812
+#: ../src/config.py:1824
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/config.py:1820
+#: ../src/config.py:1832
 msgid "Image"
 msgstr "Imagem"
 
-#: ../src/config.py:1867
+#: ../src/config.py:1879
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/config.py:1867
+#: ../src/config.py:1879
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
 msgstr ""
 
-#: ../src/config.py:1917
+#: ../src/config.py:1929
 #, fuzzy
 msgid "Choose Image"
 msgstr "_Escolha chave"
 
-#: ../src/config.py:1928 ../src/vcard.py:136
+#: ../src/config.py:1940 ../src/vcard.py:136
 #, fuzzy
 msgid "Images"
 msgstr "Imagem"
 
-#: ../src/config.py:2006
+#: ../src/config.py:2018
 #, fuzzy
 msgid "Without a connection, you can not browse available services"
 msgstr "Você deve estar conectado para visualizar os serviços"
 
-#: ../src/config.py:2011
+#: ../src/config.py:2023
 #, fuzzy, python-format
 msgid "Service Discovery using %s account"
 msgstr "Buscar Serviço"
 
-#: ../src/config.py:2013
+#: ../src/config.py:2025
 msgid "Service Discovery"
 msgstr "Buscar Serviço"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2045
 msgid "Service"
 msgstr "Serviço"
 
-#: ../src/config.py:2038
+#: ../src/config.py:2050
 msgid "Node"
 msgstr "Nó"
 
-#: ../src/config.py:2250 ../src/gtkgui.glade.h:305
+#: ../src/config.py:2262 ../src/gtkgui.glade.h:305
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/config.py:2252 ../src/gtkgui.glade.h:201
+#: ../src/config.py:2264 ../src/gtkgui.glade.h:201
 msgid "Re_gister"
 msgstr "Re_gistrar"
 
-#: ../src/config.py:2424
+#: ../src/config.py:2436
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2431
+#: ../src/config.py:2443
 #, fuzzy, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Você deve estar conectado para visualizar os serviços"
 
-#: ../src/config.py:2432
+#: ../src/config.py:2444
 msgid "If you remove it, the connection will be lost."
 msgstr ""
 
-#: ../src/config.py:2557
+#: ../src/config.py:2569
 #, fuzzy
 msgid "New Room"
 msgstr "Sala:"
 
-#: ../src/config.py:2587
+#: ../src/config.py:2599
 msgid "This bookmark has invalid data"
 msgstr ""
 
-#: ../src/config.py:2588
+#: ../src/config.py:2600
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 
-#: ../src/config.py:2808
+#: ../src/config.py:2820
 msgid ""
 "Account has been added successfully.\n"
 "You can set advanced options by using \"Edit->Accounts\" from the main "
 "window."
 msgstr ""
 
-#: ../src/config.py:2819
+#: ../src/config.py:2831
 msgid ""
 "Your new account has been created and added to your gajim configuration.\n"
 "You can set advanced account options using \"Edit->Accounts\" in the main "
 "window menu."
 msgstr ""
 
-#: ../src/config.py:2833
+#: ../src/config.py:2845
 #, fuzzy
 msgid "You need to enter a username to add an account."
 msgstr "Você deve entrar com um nome para esta conta"
 
-#: ../src/config.py:2837
+#: ../src/config.py:2849
 #, fuzzy
 msgid "You need to enter a valid server address to add an account."
 msgstr "Você deve entrar com uma senha para registrar uma nova conta"
@@ -772,7 +764,7 @@ msgstr "Gajim - %s mensagens não lidas"
 msgid "Gajim - 1 unread message"
 msgstr "Gajim - 1 mensagem não lida"
 
-#: ../src/dialogs.py:696 ../src/gtkgui.glade.h:116
+#: ../src/dialogs.py:696 ../src/gtkgui.glade.h:117
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -781,7 +773,7 @@ msgstr "Gajim"
 msgid "Gajim - %s"
 msgstr "Gajim"
 
-#: ../src/dialogs.py:733 ../src/dialogs.py:834 ../src/dialogs.py:1777
+#: ../src/dialogs.py:733 ../src/dialogs.py:834 ../src/dialogs.py:1778
 #, fuzzy
 msgid "Name: "
 msgstr "_Nome: "
@@ -800,12 +792,12 @@ msgstr "Abrir Página para Download"
 msgid "Upload"
 msgstr ""
 
-#: ../src/dialogs.py:745 ../src/dialogs.py:1779
+#: ../src/dialogs.py:745 ../src/dialogs.py:1780
 #, fuzzy
 msgid "Sender: "
 msgstr "_Negar"
 
-#: ../src/dialogs.py:748 ../src/dialogs.py:1781
+#: ../src/dialogs.py:748 ../src/dialogs.py:1782
 #, fuzzy
 msgid "Recipient: "
 msgstr "Recentemente:"
@@ -885,7 +877,7 @@ msgstr ""
 msgid "Join Group Chat as %s"
 msgstr "Ingressar numa conferência"
 
-#: ../src/dialogs.py:997 ../src/gtkgui.glade.h:153
+#: ../src/dialogs.py:997 ../src/gtkgui.glade.h:154
 #, fuzzy
 msgid "Join Group Chat"
 msgstr "Ingressar numa conferência"
@@ -896,7 +888,7 @@ msgid "New Message as %s"
 msgstr "Nova Mensagem como "
 
 #: ../src/dialogs.py:1062 ../src/dialogs.py:1157 ../src/gajim.py:462
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:170
 msgid "New Message"
 msgstr "Nova Mensagem"
 
@@ -1118,17 +1110,17 @@ msgstr ""
 msgid "Would you like to overwrite it?"
 msgstr ""
 
-#: ../src/dialogs.py:1880 ../src/gtkgui.glade.h:338
+#: ../src/dialogs.py:1881 ../src/gtkgui.glade.h:338
 #, fuzzy
 msgid "_Pause"
 msgstr "Status"
 
-#: ../src/dialogs.py:1883 ../src/dialogs.py:1915
+#: ../src/dialogs.py:1884 ../src/dialogs.py:1916
 #, fuzzy
 msgid "_Continue"
 msgstr "Conectando"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1912
 #, fuzzy
 msgid "Pause"
 msgstr "Valor"
@@ -1148,7 +1140,7 @@ msgid "error while sending"
 msgstr "erro no envio"
 
 #: ../src/gajim.py:536 ../src/gajim.py:546 ../src/roster_window.py:125
-#: ../src/roster_window.py:1036 ../src/gtkgui.glade.h:124
+#: ../src/roster_window.py:1036 ../src/gtkgui.glade.h:125
 msgid "General"
 msgstr "Geral"
 
@@ -1197,7 +1189,8 @@ msgstr ""
 "Sua frase de acesso GPG está errada, então você está conectado sem sua chave "
 "GPG"
 
-#: ../src/gajim.py:1025
+#. it is good to notify the user, in case he cannot see the output of the console
+#: ../src/gajim.py:1027
 msgid "Cannot save your preferences"
 msgstr ""
 
@@ -1333,7 +1326,7 @@ msgstr ""
 msgid "Banning %s"
 msgstr ""
 
-#: ../src/groupchat_window.py:961 ../src/tabbed_chat_window.py:323
+#: ../src/groupchat_window.py:961 ../src/tabbed_chat_window.py:327
 msgid "If you close this tab, the message will be lost."
 msgstr ""
 
@@ -1597,40 +1590,40 @@ msgstr "Clique para configurar as opçôes da sala"
 msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:254 ../src/tabbed_chat_window.py:322
+#: ../src/tabbed_chat_window.py:258 ../src/tabbed_chat_window.py:326
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:255
+#: ../src/tabbed_chat_window.py:259
 msgid "If you close the window, this message will be lost."
 msgstr ""
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:488
+#: ../src/tabbed_chat_window.py:492
 #, fuzzy
 msgid "A connection is not available"
 msgstr "Marcar como _afastado depois:"
 
-#: ../src/tabbed_chat_window.py:489
+#: ../src/tabbed_chat_window.py:493
 msgid "Your message can not be sent until you are connected."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:577
+#: ../src/tabbed_chat_window.py:581
 #, fuzzy
 msgid "Sending private message failed"
 msgstr "_Nova Mensagem"
 
-#: ../src/tabbed_chat_window.py:578
+#: ../src/tabbed_chat_window.py:582
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:681
+#: ../src/tabbed_chat_window.py:685
 msgid "Encryption enabled"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:686
+#: ../src/tabbed_chat_window.py:690
 msgid "Encryption disabled"
 msgstr ""
 
@@ -1677,30 +1670,32 @@ msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Configuração Avançado do Editor</b>"
 
 #: ../src/gtkgui.glade.h:4
-msgid "<b>Changes in latest version</b>"
-msgstr "<b>Mudanças na última versão</b>"
+#, fuzzy
+msgid "<b>Applications</b>"
+msgstr "<b>Aplicações Customizadas</b>"
 
 #: ../src/gtkgui.glade.h:5
-msgid "<b>Custom Applications</b>"
-msgstr "<b>Aplicações Customizadas</b>"
+msgid "<b>Changes in latest version</b>"
+msgstr "<b>Mudanças na última versão</b>"
 
 #: ../src/gtkgui.glade.h:6
+#, fuzzy
+msgid "<b>Custom</b>"
+msgstr "<b>Registros</b>"
+
+#: ../src/gtkgui.glade.h:7
 msgid "<b>Format of a chat line</b>"
 msgstr "<b>Formato da linha de conversa</b>"
 
-#: ../src/gtkgui.glade.h:7
+#: ../src/gtkgui.glade.h:8
 #, fuzzy
 msgid "<b>Interface Customization</b>"
 msgstr "<b>Aplicações Customizadas</b>"
 
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Jabber Traffic</b>"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:9
-msgid "<b>Links</b>"
-msgstr "<b>Links</b>"
-
 #: ../src/gtkgui.glade.h:10
 msgid "<b>Log</b>"
 msgstr "<b>Registros</b>"
@@ -2126,33 +2121,38 @@ msgid "File _Transfers"
 msgstr "_Mensagem de status:"
 
 #: ../src/gtkgui.glade.h:111
+#, fuzzy
+msgid "File manager:"
+msgstr "_Mensagem de status:"
+
+#: ../src/gtkgui.glade.h:112
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 #, fuzzy
 msgid "Font:"
 msgstr "Conta:"
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:114
 msgid "Format: YYYY-MM-DD"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:115
 #, fuzzy
 msgid "From:"
 msgstr "Sala:"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:116
 #, fuzzy
 msgid "GPG Encryption"
 msgstr "Clique para configurar as opçôes da sala"
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Gajim Themes Customization"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2160,7 +2160,7 @@ msgstr ""
 "Gajim automaticamente mostrará a nova mensagem recebida em uma nova janela "
 "de conversa ou aba em uma janela existente"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2168,7 +2168,7 @@ msgstr ""
 "Gajim notificará você para nova mensagem via popup na lateral inferior "
 "direita da tela"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:121
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2176,7 +2176,7 @@ msgstr ""
 "Gajim notificará você através de uma janela popup na parte inferior direita "
 "da tela sobre os contatos que se conectaram"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:122
 #, fuzzy
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
@@ -2185,76 +2185,76 @@ msgstr ""
 "Gajim notificará você através de uma janela popup na parte inferior direita "
 "da tela sobre os contatos que se conectaram"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:123
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr "Gajim somente mudará o ícone do contato que enviou a nova mensagem"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
 msgid "Gajim: First Time Wizard"
 msgstr "Gajim: Primeira vez Wizard"
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:126
 #, fuzzy
 msgid "Given:"
 msgstr "Cliente:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:127
 msgid "Go"
 msgstr "Ir"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:129
 msgid "Group:"
 msgstr "Grupo:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:130
 #, fuzzy
 msgid "HTTP Connect"
 msgstr "Conectando"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:131
 msgid "Homepage:"
 msgstr "Homepage:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:132
 #, fuzzy
 msgid "Hostname: "
 msgstr "_Host:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:133
 msgid "I already have an account I want to use"
 msgstr "Eu já tenho uma conta e quero usar"
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 #, fuzzy
 msgid "I want to _register for a new account"
 msgstr "Habilitar se você quer _registrar uma nova conta jabber"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:135
 msgid "I would like to add you to my contact list."
 msgstr "Por favor, eu gostaria de lhe adicionar à minha lista."
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "Se habilitado, o Gajim também terá um ícone de bandeja"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid ""
 "If checked, Gajim will broadcast capability to send and receive meta-"
 "information related to a conversation you may have with a contact such as "
 "composing a message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 #, fuzzy
 msgid "If checked, Gajim will join this groupchat on startup"
 msgstr "Se habilitado, o Gajim também terá um ícone de bandeja"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:139
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Se habilitado, o Gajim lembrará a senha para esta conta"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:140
 #, fuzzy
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
@@ -2263,7 +2263,7 @@ msgstr ""
 "Se habilitado, o Gajim lembrará a posição da janela principal na próxima vez "
 "que você executar"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2271,13 +2271,13 @@ msgstr ""
 "Se habilitado, isto trocará caracteres ascii em carinhas :) com o gráfico "
 "equivalente emoticons"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for only you and of course the administrator"
@@ -2285,14 +2285,14 @@ msgstr ""
 "Se checado o Gajim gravará sua senha em ~/.gajim/config com permissão de "
 "'leitura' somente para você e claro, o administrador"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:144
 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 ""
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:145
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2300,7 +2300,7 @@ msgstr ""
 "Se habilitado, o Gajim, quando carregado, conectará automaticamente ao "
 "jabber usando esta conta"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:146
 msgid ""
 "If checked, all chat and group chat windows will have the information area "
 "in the top and the buttons area in the bottom hidden. You can quick toggle "
@@ -2308,7 +2308,7 @@ msgid ""
 "a permanent one"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:147
 #, fuzzy
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
@@ -2317,125 +2317,121 @@ msgstr ""
 "Se você tem duas ou mais contas e isto é marcado, Gajim listará todos os "
 "contatos como se você tivesse somente uma conta"
 
-#: ../src/gtkgui.glade.h:147
+#: ../src/gtkgui.glade.h:148
 msgid "Incoming message:"
 msgstr "Mensagem recebida:"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:149
 msgid "Info/Query"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:150
 msgid "Information about you are stored on the server as vCard"
 msgstr "Informações sobre você está gravado no servidor como vCard"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:151
 msgid "Italic"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:152
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:153
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:155
 #, fuzzy
 msgid "Join _Group Chat"
 msgstr "_Ingressar numa Conferência"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:156
 #, fuzzy
 msgid "Join _Group Chat..."
 msgstr "_Ingressar numa Conferência"
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:157
 msgid "Location"
 msgstr "Bairro:"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:158
 msgid "Log history"
 msgstr "Histórico dos registros"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:159
 msgid "Log presences in _contact's log file"
 msgstr "Registrar presenças no ficheiro de log do contato"
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:160
 msgid "Log presences in an _external file"
 msgstr "Registrar as presenças em um ficheiro _externo"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:161
 #, fuzzy
 msgid "Manage Accounts"
 msgstr "_Fundir contas"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:162
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:163
 #, fuzzy
 msgid "Manage Emoticons"
 msgstr "Usar _emoticons"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:164
 msgid "Manage Proxy Profiles"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:165
 msgid "Manage..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:166
 msgid "Middle:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:167
 #, fuzzy
 msgid "Mo_derator"
 msgstr "_Concede moderação"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:168
 #, fuzzy
 msgid "More"
 msgstr "Filme"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:169
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:171
 msgid "New version of Gajim available"
 msgstr "Nova versão do Gajim está disponível"
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:172
 msgid "Nickname:"
 msgstr "Apelido:"
 
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:175
 msgid "Notify me about contacts that: "
 msgstr "Notifique-me sobre contatos saindo: "
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:176
 msgid "OS:"
 msgstr "SO:"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:177
 #, fuzzy
 msgid "On every _message"
 msgstr "Em todas as _linhas"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:178
 msgid "Open Download Page"
 msgstr "Abrir Página para Download"
 
-#: ../src/gtkgui.glade.h:178
-msgid "Open _with:"
-msgstr "Abrir _com:"
-
 #: ../src/gtkgui.glade.h:179
 msgid "Open..."
 msgstr "Abrir..."
@@ -3279,184 +3275,191 @@ msgstr "minutos"
 msgid "show a help on specific command"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:74
+#. parameter, named "on_command". User gets help for the command, specified by this parameter
+#: ../scripts/gajim-remote.py:75
 msgid "on_command"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:74
+#: ../scripts/gajim-remote.py:76
 msgid "show help on command"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:78
+#: ../scripts/gajim-remote.py:80
 msgid "Shows or hides the roster window"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:82
+#: ../scripts/gajim-remote.py:84
 msgid "Popup a window with the next unread message"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:86
+#: ../scripts/gajim-remote.py:88
 #, fuzzy
 msgid ""
 "Print a list of all contacts in the roster. Each contact appear on a "
 "separate line"
 msgstr "_Ignore eventos de contatos que não estão na lista"
 
-#: ../scripts/gajim-remote.py:89 ../scripts/gajim-remote.py:104
-#: ../scripts/gajim-remote.py:116 ../scripts/gajim-remote.py:130
+#: ../scripts/gajim-remote.py:91 ../scripts/gajim-remote.py:106
+#: ../scripts/gajim-remote.py:118 ../scripts/gajim-remote.py:132
 #, fuzzy
 msgid "account"
 msgstr "Conta"
 
-#: ../scripts/gajim-remote.py:89
+#: ../scripts/gajim-remote.py:91
 msgid "show only contacts of the given account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:95
+#: ../scripts/gajim-remote.py:97
 #, fuzzy
 msgid "Print a list of registered accounts"
 msgstr "Habilitar se você quer _registrar uma nova conta jabber"
 
-#: ../scripts/gajim-remote.py:99
+#: ../scripts/gajim-remote.py:101
 msgid "Change the status of account or accounts"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:101
+#: ../scripts/gajim-remote.py:103
 #, fuzzy
 msgid "status"
 msgstr "Status"
 
-#: ../scripts/gajim-remote.py:101
+#: ../scripts/gajim-remote.py:103
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 
-#: ../scripts/gajim-remote.py:103 ../scripts/gajim-remote.py:127
+#: ../scripts/gajim-remote.py:105 ../scripts/gajim-remote.py:129
 #, fuzzy
 msgid "message"
 msgstr "_Nova Mensagem"
 
-#: ../scripts/gajim-remote.py:103
+#: ../scripts/gajim-remote.py:105
 #, fuzzy
 msgid "status message"
 msgstr "Mensagem de status:"
 
-#: ../scripts/gajim-remote.py:104
+#: ../scripts/gajim-remote.py:106
 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 ""
 
-#: ../scripts/gajim-remote.py:110
+#: ../scripts/gajim-remote.py:112
 msgid "Show the chat dialog so that you can send message to a contact"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:113
+#: ../scripts/gajim-remote.py:115
 #, fuzzy
 msgid "jid of the contact that you want to chat with"
 msgstr "Por favor preencha os dados para sua nova conta"
 
-#: ../scripts/gajim-remote.py:116
+#: ../scripts/gajim-remote.py:118
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:121
+#: ../scripts/gajim-remote.py:123
 msgid ""
 "Send new message to a contact in the roster. Both OpenPGP key and account "
 "are optional. If you want to set only 'account', whitout 'pgp key', just set "
 "'pgp key' to ''."
 msgstr ""
 
-#: ../scripts/gajim-remote.py:125
+#: ../scripts/gajim-remote.py:127
 #, fuzzy
 msgid "jid of the contact that will receive the message"
 msgstr "Gajim somente mudará o ícone do contato que enviou a nova mensagem"
 
-#: ../scripts/gajim-remote.py:127
+#: ../scripts/gajim-remote.py:129
 msgid "message contents"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:128
+#: ../scripts/gajim-remote.py:130
 msgid "pgp key"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:128
+#: ../scripts/gajim-remote.py:130
 msgid "if specified, the message will be encrypted using this pulic key"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:130
+#: ../scripts/gajim-remote.py:132
 msgid "if specified, the message will be sent using this account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:135
+#: ../scripts/gajim-remote.py:137
 msgid "Get detailed info on a contact"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:137
+#: ../scripts/gajim-remote.py:139
 #, fuzzy
 msgid "jid of the contact"
 msgstr "Adicionar Novo Contato"
 
-#: ../scripts/gajim-remote.py:158
+#: ../scripts/gajim-remote.py:160
 msgid "Missing argument \"contact_jid\""
 msgstr ""
 
-#: ../scripts/gajim-remote.py:163 ../scripts/gajim-remote.py:476
+#: ../scripts/gajim-remote.py:165 ../scripts/gajim-remote.py:478
 #, fuzzy
 msgid "Service not available"
 msgstr "Marcar como _afastado depois:"
 
-#: ../scripts/gajim-remote.py:181
+#: ../scripts/gajim-remote.py:183
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 msgstr ""
 
-#: ../scripts/gajim-remote.py:184
+#: ../scripts/gajim-remote.py:186
 msgid "You have no active account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:203
+#: ../scripts/gajim-remote.py:205
 #, fuzzy
 msgid "Session bus is not available."
 msgstr "Marcar como _afastado depois:"
 
-#: ../scripts/gajim-remote.py:212
+#: ../scripts/gajim-remote.py:214
 #, python-format
 msgid "Unknow dbus version: %s"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:238
+#: ../scripts/gajim-remote.py:240
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
 "\t"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:244
+#: ../scripts/gajim-remote.py:246
 #, python-format
 msgid "%s not found"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:248
+#: ../scripts/gajim-remote.py:250
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:307
+#: ../scripts/gajim-remote.py:309
 #, python-format
 msgid "Unknown type %s "
 msgstr ""
 
-#: ../scripts/gajim-remote.py:449
+#: ../scripts/gajim-remote.py:451
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 msgstr ""
 
+#~ msgid "<b>Links</b>"
+#~ msgstr "<b>Links</b>"
+
+#~ msgid "Open _with:"
+#~ msgstr "Abrir _com:"
+
 #, fuzzy
 #~ msgid "Switch to"
 #~ msgstr "Registro para %s"
diff --git a/po/ru/LC_MESSAGES/gajim.po b/po/ru/LC_MESSAGES/gajim.po
index 2bd6968ca428af461f85af069909aba719ad938d..a268ca62e4c74d66728bc02429413c73723339c7 100644
--- a/po/ru/LC_MESSAGES/gajim.po
+++ b/po/ru/LC_MESSAGES/gajim.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-09 01:26+0300\n"
+"POT-Creation-Date: 2005-08-09 18:26+0300\n"
 "PO-Revision-Date: 2005-06-01 14:36+0700\n"
 "Last-Translator: Yakov Bezrukov <nebulam51@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -28,91 +28,91 @@ msgstr ""
 msgid "Not available as a result of being idle"
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:267
 msgid "Sleeping"
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:268
 msgid "Back soon"
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:268
 msgid "Back in some minutes."
 msgstr "Вернусь через несколько минут"
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:269
 msgid "Eating"
 msgstr "Ем"
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:269
 msgid "I'm eating, so leave me a message."
 msgstr "Я вкушаю пищу, так что оставьте сообщение секретарю."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:270
 msgid "Movie"
 msgstr "Я в кино"
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:270
 msgid "I'm watching a movie."
 msgstr "Я смотрю кино"
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:271
 msgid "Working"
 msgstr "Работа"
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:271
 msgid "I'm working."
 msgstr "Я работаю"
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:272
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:272
 msgid "I'm on the phone."
 msgstr "Я говорю по телефону"
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:273
 msgid "Out"
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:273
 msgid "I'm out enjoying life"
 msgstr ""
 
-#: ../src/common/connection.py:291 ../src/common/connection.py:301
+#: ../src/common/connection.py:290 ../src/common/connection.py:300
 #, fuzzy, python-format
 msgid ""
 "Subject: %s\n"
 "%s"
 msgstr "Тема:"
 
-#: ../src/common/connection.py:351 ../src/common/connection.py:1496
+#: ../src/common/connection.py:350 ../src/common/connection.py:1496
 msgid "I would like to add you to my roster."
 msgstr "Вы не возражаете, если я добавлю Вас в свой ростер?"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:358
+#: ../src/common/connection.py:357
 #, fuzzy, python-format
 msgid "we are now subscribed to %s"
 msgstr "%s отменил подписку с вами"
 
-#: ../src/common/connection.py:360
+#: ../src/common/connection.py:359
 #, fuzzy, python-format
 msgid "unsubscribe request from %s"
 msgstr "Запрос на подписку от %s"
 
-#: ../src/common/connection.py:362
+#: ../src/common/connection.py:361
 #, fuzzy, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s отменил подписку с вами"
 
-#: ../src/common/connection.py:399
+#: ../src/common/connection.py:398
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr ""
 
-#: ../src/common/connection.py:400
+#: ../src/common/connection.py:399
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 
@@ -188,93 +188,94 @@ msgstr ""
 msgid "error appeared while processing xmpp:"
 msgstr ""
 
-#: ../src/common/helpers.py:28
+#: ../src/common/helpers.py:30
 msgid "Busy"
 msgstr "Занят"
 
-#: ../src/common/helpers.py:30
+#: ../src/common/helpers.py:32
 msgid "Not Available"
 msgstr "Недоступен"
 
-#: ../src/common/helpers.py:32
+#: ../src/common/helpers.py:34
 msgid "Free for Chat"
 msgstr "Готов Поболтать"
 
-#: ../src/common/helpers.py:34
+#: ../src/common/helpers.py:36
 msgid "Available"
 msgstr "Доступен"
 
-#: ../src/common/helpers.py:36
+#: ../src/common/helpers.py:38
 msgid "Connecting"
 msgstr "Соединяюсь"
 
-#: ../src/common/helpers.py:38
+#: ../src/common/helpers.py:40
 msgid "Away"
 msgstr "Ушел"
 
-#: ../src/common/helpers.py:40
+#: ../src/common/helpers.py:42
 msgid "Offline"
 msgstr "Отключен"
 
-#: ../src/common/helpers.py:42
+#: ../src/common/helpers.py:44
 msgid "Invisible"
 msgstr "Невидимка"
 
-#: ../src/common/helpers.py:44
+#: ../src/common/helpers.py:46
 msgid "Not in the roster"
 msgstr "Не в ростере"
 
-#: ../src/common/helpers.py:46 ../src/vcard.py:249 ../src/vcard.py:251
+#: ../src/common/helpers.py:48 ../src/vcard.py:249 ../src/vcard.py:251
 msgid "Unknown"
 msgstr ""
 
-#: ../src/common/helpers.py:48
+#: ../src/common/helpers.py:50
 msgid "Has errors"
 msgstr "Есть ошибка"
 
-#: ../src/common/helpers.py:53 ../src/common/helpers.py:67
-#: ../src/groupchat_window.py:271 ../src/gtkgui.glade.h:173
+#: ../src/common/helpers.py:55 ../src/common/helpers.py:69
+#: ../src/groupchat_window.py:271 ../src/gtkgui.glade.h:174
 #, fuzzy
 msgid "None"
 msgstr "Узел"
 
-#: ../src/common/helpers.py:55
+#: ../src/common/helpers.py:57
 msgid "To"
 msgstr ""
 
-#: ../src/common/helpers.py:57
+#: ../src/common/helpers.py:59
 #, fuzzy
 msgid "From"
 msgstr "Комната:"
 
-#: ../src/common/helpers.py:59
+#: ../src/common/helpers.py:61
 msgid "Both"
 msgstr ""
 
-#: ../src/common/helpers.py:69
+#: ../src/common/helpers.py:71
 #, fuzzy
 msgid "Subscribe"
 msgstr "_Подписаться"
 
-#: ../src/common/helpers.py:108
+#: ../src/common/helpers.py:110
 msgid "is paying attention to the conversation"
 msgstr ""
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:112
 msgid "is doing something else"
 msgstr ""
 
-#: ../src/common/helpers.py:112
+#: ../src/common/helpers.py:114
 #, fuzzy
 msgid "is composing a message..."
 msgstr "Входящее сообщение:"
 
-#: ../src/common/helpers.py:114
+#. paused means he was compoing but has stopped for a while
+#: ../src/common/helpers.py:117
 #, fuzzy
-msgid "paused composing a message..."
+msgid "paused composing a message"
 msgstr "Входящее сообщение:"
 
-#: ../src/common/helpers.py:116
+#: ../src/common/helpers.py:119
 #, fuzzy
 msgid "has closed the chat window or tab"
 msgstr "Использовать единое окно чата с _табами"
@@ -306,15 +307,6 @@ msgstr ""
 msgid "Unable to write file in %s\n"
 msgstr ""
 
-#: ../src/common/optparser.py:84
-msgid "No space left on device"
-msgstr ""
-
-#: ../src/common/optparser.py:100
-#, python-format
-msgid "Unable to open %s for writing\n"
-msgstr ""
-
 #: ../src/advanced.py:52
 msgid "Preference Name"
 msgstr "Название Опции"
@@ -331,7 +323,7 @@ msgstr "Тип"
 msgid "Chat"
 msgstr "Чат"
 
-#: ../src/chat.py:124 ../src/gtkgui.glade.h:127
+#: ../src/chat.py:124 ../src/gtkgui.glade.h:128
 #, fuzzy
 msgid "Group Chat"
 msgstr "Комната"
@@ -412,162 +404,162 @@ msgstr ""
 msgid "Subject: %s\n"
 msgstr "Тема:"
 
-#: ../src/config.py:198 ../src/config.py:428
+#: ../src/config.py:199 ../src/config.py:436
 #, fuzzy, python-format
 msgid "Every %s _minutes"
 msgstr "Каждые пять _минут"
 
-#: ../src/config.py:301
+#: ../src/config.py:307
 msgid "Active"
 msgstr "Активен"
 
-#: ../src/config.py:309
+#: ../src/config.py:315
 msgid "Event"
 msgstr "Событие"
 
-#: ../src/config.py:315
+#: ../src/config.py:321
 msgid "Sound"
 msgstr "Звук"
 
-#: ../src/config.py:918
+#: ../src/config.py:930
 #, fuzzy
 msgid "status message title"
 msgstr "Сообщение сервера:"
 
-#: ../src/config.py:918
+#: ../src/config.py:930
 #, fuzzy
 msgid "status message text"
 msgstr "Сообщение сервера:"
 
-#: ../src/config.py:971
+#: ../src/config.py:983
 msgid "Choose Sound"
 msgstr "Выберите Звуковой Файл"
 
-#: ../src/config.py:978 ../src/config.py:1923 ../src/vcard.py:131
+#: ../src/config.py:990 ../src/config.py:1935 ../src/vcard.py:131
 msgid "All files"
 msgstr "Все файлы"
 
-#: ../src/config.py:983
+#: ../src/config.py:995
 msgid "Wav Sounds"
 msgstr "В Формате Wav"
 
-#: ../src/config.py:1152
+#: ../src/config.py:1164
 msgid "OpenPGP is not usable in this computer"
 msgstr "Невозможно использовать OpenPGP"
 
-#: ../src/config.py:1177
+#: ../src/config.py:1189
 #, fuzzy
 msgid "You are currently connected to the server"
 msgstr "Для просмотра сервисов необходимо сначала подсоединиться к серверу"
 
-#: ../src/config.py:1178
+#: ../src/config.py:1190
 msgid "To change the account name, you must be disconnected."
 msgstr ""
 
-#: ../src/config.py:1181 ../src/config.py:1185
+#: ../src/config.py:1193 ../src/config.py:1197
 msgid "Invalid account name"
 msgstr ""
 
-#: ../src/config.py:1182
+#: ../src/config.py:1194
 #, fuzzy
 msgid "Account name cannot be empty."
 msgstr "Пароль не может быть пустым"
 
-#: ../src/config.py:1186
+#: ../src/config.py:1198
 #, fuzzy
 msgid "Account name cannot contain spaces."
 msgstr "Пароль не может быть пустым"
 
-#: ../src/config.py:1190
+#: ../src/config.py:1202
 #, fuzzy
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/config.py:1191
+#: ../src/config.py:1203
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr ""
 
-#: ../src/config.py:1198 ../src/dialogs.py:1107
+#: ../src/config.py:1210 ../src/dialogs.py:1107
 #, fuzzy
 msgid "Invalid password"
 msgstr "Сохранить _пароль"
 
-#: ../src/config.py:1199
+#: ../src/config.py:1211
 #, fuzzy
 msgid "You must enter a password for the new account."
 msgstr "Необходимо ввести пароль для регистрации аккаунта"
 
-#: ../src/config.py:1236
+#: ../src/config.py:1248
 msgid "Invalid entry"
 msgstr ""
 
-#: ../src/config.py:1237
+#: ../src/config.py:1249
 #, fuzzy
 msgid "Custom port must be a port number."
 msgstr "В качестве номера порта прокси должно выступать число"
 
-#: ../src/config.py:1324
+#: ../src/config.py:1336
 msgid "Account name is in use"
 msgstr ""
 
-#: ../src/config.py:1325
+#: ../src/config.py:1337
 #, fuzzy
 msgid "You already have an account using this name."
 msgstr "У меня уже есть аккаунт, который я хочу использовать"
 
-#: ../src/config.py:1387
+#: ../src/config.py:1399
 #, fuzzy
 msgid "No such account available"
 msgstr "Недоступен"
 
-#: ../src/config.py:1388
+#: ../src/config.py:1400
 #, fuzzy
 msgid "You must create your account before editing your personal information."
 msgstr "Перед редактированием личных данных необходимо сначала создать аккаунт"
 
-#: ../src/config.py:1395 ../src/config.py:2005 ../src/dialogs.py:981
+#: ../src/config.py:1407 ../src/config.py:2017 ../src/dialogs.py:981
 #: ../src/dialogs.py:1087 ../src/vcard.py:374 ../src/vcard.py:402
 #, fuzzy
 msgid "You are not connected to the server"
 msgstr "Для просмотра сервисов необходимо сначала подсоединиться к серверу"
 
-#: ../src/config.py:1396
+#: ../src/config.py:1408
 #, fuzzy
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Чтобы отредактировать личную информацию нужно подсоединиться к серверу"
 
-#: ../src/config.py:1423
+#: ../src/config.py:1435
 #, fuzzy
 msgid "Failed to get secret keys"
 msgstr "ошибка при использовании секретного ключа"
 
-#: ../src/config.py:1424
+#: ../src/config.py:1436
 msgid "There was a problem retrieving your GPG secret keys."
 msgstr ""
 
-#: ../src/config.py:1427 ../src/gtkgui.glade.h:183
+#: ../src/config.py:1439 ../src/gtkgui.glade.h:183
 msgid "Passphrase"
 msgstr "Парольная фраза:"
 
-#: ../src/config.py:1428
+#: ../src/config.py:1440
 #, fuzzy
 msgid "Choose your OpenPGP key"
 msgstr "<b>Выберите свой OpenPGP ключ</b>"
 
-#: ../src/config.py:1436 ../src/gtkgui.glade.h:172
+#: ../src/config.py:1448 ../src/gtkgui.glade.h:173
 msgid "No key selected"
 msgstr "Не выбран ключ"
 
-#: ../src/config.py:1667 ../src/config.py:2028
+#: ../src/config.py:1679 ../src/config.py:2040
 msgid "Name"
 msgstr "Имя"
 
-#: ../src/config.py:1670
+#: ../src/config.py:1682
 msgid "Server"
 msgstr "Сервер"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1775 ../src/config.py:2247 ../src/dialogs.py:112
+#: ../src/config.py:1787 ../src/config.py:2259 ../src/dialogs.py:112
 #: ../src/dialogs.py:282 ../src/dialogs.py:318 ../src/roster_window.py:123
 #: ../src/roster_window.py:128 ../src/roster_window.py:152
 #: ../src/roster_window.py:1928 ../src/roster_window.py:1930
@@ -575,122 +567,122 @@ msgstr "Сервер"
 msgid "Transports"
 msgstr ""
 
-#: ../src/config.py:1790
+#: ../src/config.py:1802
 #, python-format
 msgid "Edit %s"
 msgstr "Редактировать %s"
 
-#: ../src/config.py:1792
+#: ../src/config.py:1804
 #, python-format
 msgid "Register to %s"
 msgstr "Зарегистрировать %s"
 
-#: ../src/config.py:1812
+#: ../src/config.py:1824
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/config.py:1820
+#: ../src/config.py:1832
 msgid "Image"
 msgstr "Картинка"
 
-#: ../src/config.py:1867
+#: ../src/config.py:1879
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/config.py:1867
+#: ../src/config.py:1879
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
 msgstr ""
 
-#: ../src/config.py:1917
+#: ../src/config.py:1929
 #, fuzzy
 msgid "Choose Image"
 msgstr "Использовать _ключ"
 
-#: ../src/config.py:1928 ../src/vcard.py:136
+#: ../src/config.py:1940 ../src/vcard.py:136
 #, fuzzy
 msgid "Images"
 msgstr "Картинка"
 
-#: ../src/config.py:2006
+#: ../src/config.py:2018
 #, fuzzy
 msgid "Without a connection, you can not browse available services"
 msgstr "Для просмотра сервисов необходимо сначала подсоединиться к серверу"
 
-#: ../src/config.py:2011
+#: ../src/config.py:2023
 #, fuzzy, python-format
 msgid "Service Discovery using %s account"
 msgstr "Обзор Сервисов"
 
-#: ../src/config.py:2013
+#: ../src/config.py:2025
 msgid "Service Discovery"
 msgstr "Обзор Сервисов"
 
-#: ../src/config.py:2033
+#: ../src/config.py:2045
 msgid "Service"
 msgstr "Сервис"
 
-#: ../src/config.py:2038
+#: ../src/config.py:2050
 msgid "Node"
 msgstr "Узел"
 
-#: ../src/config.py:2250 ../src/gtkgui.glade.h:305
+#: ../src/config.py:2262 ../src/gtkgui.glade.h:305
 msgid "_Edit"
 msgstr "_Редактировать"
 
-#: ../src/config.py:2252 ../src/gtkgui.glade.h:201
+#: ../src/config.py:2264 ../src/gtkgui.glade.h:201
 msgid "Re_gister"
 msgstr "Пере_регистрировать"
 
-#: ../src/config.py:2424
+#: ../src/config.py:2436
 #, python-format
 msgid "Removing %s account"
 msgstr "Удаление аккаунта %s"
 
-#: ../src/config.py:2431
+#: ../src/config.py:2443
 #, fuzzy, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Для просмотра сервисов необходимо сначала подсоединиться к серверу"
 
-#: ../src/config.py:2432
+#: ../src/config.py:2444
 msgid "If you remove it, the connection will be lost."
 msgstr ""
 
-#: ../src/config.py:2557
+#: ../src/config.py:2569
 #, fuzzy
 msgid "New Room"
 msgstr "Комната:"
 
-#: ../src/config.py:2587
+#: ../src/config.py:2599
 msgid "This bookmark has invalid data"
 msgstr ""
 
-#: ../src/config.py:2588
+#: ../src/config.py:2600
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 
-#: ../src/config.py:2808
+#: ../src/config.py:2820
 msgid ""
 "Account has been added successfully.\n"
 "You can set advanced options by using \"Edit->Accounts\" from the main "
 "window."
 msgstr ""
 
-#: ../src/config.py:2819
+#: ../src/config.py:2831
 msgid ""
 "Your new account has been created and added to your gajim configuration.\n"
 "You can set advanced account options using \"Edit->Accounts\" in the main "
 "window menu."
 msgstr ""
 
-#: ../src/config.py:2833
+#: ../src/config.py:2845
 #, fuzzy
 msgid "You need to enter a username to add an account."
 msgstr "Необходимо ввести имя аккаунта"
 
-#: ../src/config.py:2837
+#: ../src/config.py:2849
 #, fuzzy
 msgid "You need to enter a valid server address to add an account."
 msgstr "Необходимо ввести пароль для регистрации аккаунта"
@@ -782,7 +774,7 @@ msgstr "Gajim - %s непрочитанных сообщений"
 msgid "Gajim - 1 unread message"
 msgstr "Gajim - 1 непрочитанное сообщение"
 
-#: ../src/dialogs.py:696 ../src/gtkgui.glade.h:116
+#: ../src/dialogs.py:696 ../src/gtkgui.glade.h:117
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -791,7 +783,7 @@ msgstr "Gajim"
 msgid "Gajim - %s"
 msgstr "Gajim"
 
-#: ../src/dialogs.py:733 ../src/dialogs.py:834 ../src/dialogs.py:1777
+#: ../src/dialogs.py:733 ../src/dialogs.py:834 ../src/dialogs.py:1778
 #, fuzzy
 msgid "Name: "
 msgstr "_Имя: "
@@ -810,12 +802,12 @@ msgstr "Открыть Страницу Загрузки"
 msgid "Upload"
 msgstr ""
 
-#: ../src/dialogs.py:745 ../src/dialogs.py:1779
+#: ../src/dialogs.py:745 ../src/dialogs.py:1780
 #, fuzzy
 msgid "Sender: "
 msgstr "Сервер:"
 
-#: ../src/dialogs.py:748 ../src/dialogs.py:1781
+#: ../src/dialogs.py:748 ../src/dialogs.py:1782
 #, fuzzy
 msgid "Recipient: "
 msgstr "Недавно:"
@@ -895,7 +887,7 @@ msgstr ""
 msgid "Join Group Chat as %s"
 msgstr "Войти в Комнату как "
 
-#: ../src/dialogs.py:997 ../src/gtkgui.glade.h:153
+#: ../src/dialogs.py:997 ../src/gtkgui.glade.h:154
 #, fuzzy
 msgid "Join Group Chat"
 msgstr "Войти в Комнату"
@@ -906,7 +898,7 @@ msgid "New Message as %s"
 msgstr "Новое Сообщение как "
 
 #: ../src/dialogs.py:1062 ../src/dialogs.py:1157 ../src/gajim.py:462
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:170
 msgid "New Message"
 msgstr "Новое Сообшение"
 
@@ -1126,17 +1118,17 @@ msgstr ""
 msgid "Would you like to overwrite it?"
 msgstr ""
 
-#: ../src/dialogs.py:1880 ../src/gtkgui.glade.h:338
+#: ../src/dialogs.py:1881 ../src/gtkgui.glade.h:338
 #, fuzzy
 msgid "_Pause"
 msgstr "Статус"
 
-#: ../src/dialogs.py:1883 ../src/dialogs.py:1915
+#: ../src/dialogs.py:1884 ../src/dialogs.py:1916
 #, fuzzy
 msgid "_Continue"
 msgstr "Соединяюсь"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:1912
 #, fuzzy
 msgid "Pause"
 msgstr "Значение"
@@ -1156,7 +1148,7 @@ msgid "error while sending"
 msgstr "ошибка при отправке"
 
 #: ../src/gajim.py:536 ../src/gajim.py:546 ../src/roster_window.py:125
-#: ../src/roster_window.py:1036 ../src/gtkgui.glade.h:124
+#: ../src/roster_window.py:1036 ../src/gtkgui.glade.h:125
 msgid "General"
 msgstr "Общие"
 
@@ -1203,7 +1195,8 @@ msgstr "Сохранить _паротную фразу (небезопасно)
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Неверный пароль GPG, так что соединяемся без GPG ключа"
 
-#: ../src/gajim.py:1025
+#. it is good to notify the user, in case he cannot see the output of the console
+#: ../src/gajim.py:1027
 msgid "Cannot save your preferences"
 msgstr ""
 
@@ -1341,7 +1334,7 @@ msgstr ""
 msgid "Banning %s"
 msgstr ""
 
-#: ../src/groupchat_window.py:961 ../src/tabbed_chat_window.py:323
+#: ../src/groupchat_window.py:961 ../src/tabbed_chat_window.py:327
 msgid "If you close this tab, the message will be lost."
 msgstr ""
 
@@ -1605,40 +1598,40 @@ msgstr "Настройки комнаты"
 msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:254 ../src/tabbed_chat_window.py:322
+#: ../src/tabbed_chat_window.py:258 ../src/tabbed_chat_window.py:326
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:255
+#: ../src/tabbed_chat_window.py:259
 msgid "If you close the window, this message will be lost."
 msgstr ""
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:488
+#: ../src/tabbed_chat_window.py:492
 #, fuzzy
 msgid "A connection is not available"
 msgstr "_Недоступен после:"
 
-#: ../src/tabbed_chat_window.py:489
+#: ../src/tabbed_chat_window.py:493
 msgid "Your message can not be sent until you are connected."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:577
+#: ../src/tabbed_chat_window.py:581
 #, fuzzy
 msgid "Sending private message failed"
 msgstr "_Новое Сообщение"
 
-#: ../src/tabbed_chat_window.py:578
+#: ../src/tabbed_chat_window.py:582
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:681
+#: ../src/tabbed_chat_window.py:685
 msgid "Encryption enabled"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:686
+#: ../src/tabbed_chat_window.py:690
 msgid "Encryption disabled"
 msgstr ""
 
@@ -1686,30 +1679,32 @@ msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Расширенный редактор настроек</b>"
 
 #: ../src/gtkgui.glade.h:4
-msgid "<b>Changes in latest version</b>"
-msgstr "<b>Изменения в последней версии</b>"
+#, fuzzy
+msgid "<b>Applications</b>"
+msgstr "<b>Приложения Позователея</b>"
 
 #: ../src/gtkgui.glade.h:5
-msgid "<b>Custom Applications</b>"
-msgstr "<b>Приложения Позователея</b>"
+msgid "<b>Changes in latest version</b>"
+msgstr "<b>Изменения в последней версии</b>"
 
 #: ../src/gtkgui.glade.h:6
+#, fuzzy
+msgid "<b>Custom</b>"
+msgstr "<b>Лог</b>"
+
+#: ../src/gtkgui.glade.h:7
 msgid "<b>Format of a chat line</b>"
 msgstr "<b>Формат строки в чате</b>"
 
-#: ../src/gtkgui.glade.h:7
+#: ../src/gtkgui.glade.h:8
 #, fuzzy
 msgid "<b>Interface Customization</b>"
 msgstr "<b>Приложения Позователея</b>"
 
-#: ../src/gtkgui.glade.h:8
+#: ../src/gtkgui.glade.h:9
 msgid "<b>Jabber Traffic</b>"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:9
-msgid "<b>Links</b>"
-msgstr "<b>Ссылки</b>"
-
 #: ../src/gtkgui.glade.h:10
 msgid "<b>Log</b>"
 msgstr "<b>Лог</b>"
@@ -2133,33 +2128,38 @@ msgid "File _Transfers"
 msgstr "Использовать иконки для _транспортов"
 
 #: ../src/gtkgui.glade.h:111
+#, fuzzy
+msgid "File manager:"
+msgstr "Использовать иконки для _транспортов"
+
+#: ../src/gtkgui.glade.h:112
 msgid "Filter:"
 msgstr "Фильтр:"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 #, fuzzy
 msgid "Font:"
 msgstr "Аккаунты:"
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:114
 msgid "Format: YYYY-MM-DD"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:115
 #, fuzzy
 msgid "From:"
 msgstr "Комната:"
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:116
 #, fuzzy
 msgid "GPG Encryption"
 msgstr "Настройки комнаты"
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:118
 msgid "Gajim Themes Customization"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:119
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2167,7 +2167,7 @@ msgstr ""
 "Gajim будет автоматически показывать новое полученное соощение в новом окне "
 "чата или табе в существующем окне чата"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:120
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2175,7 +2175,7 @@ msgstr ""
 "Gajim будет уведомлять вас о новом сообщении с помощью сообщения в правом "
 "нижнем углу экрана"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:121
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2183,7 +2183,7 @@ msgstr ""
 "Gajim будет уведомлять вас о присоединившемся контакте с помощью сообщения в "
 "правом нижнем углу экрана"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:122
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2191,83 +2191,83 @@ msgstr ""
 "Gajim будет уведомлять вас о отсоединившемся контакте с помощью сообщения в "
 "правом нижнем углу экрана"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:123
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr ""
 "Gajim будет лишь менять иконку у контакта, от которого пришло сообщение"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:124
 msgid "Gajim: First Time Wizard"
 msgstr "Gajim: Мастер первого запуска"
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:126
 #, fuzzy
 msgid "Given:"
 msgstr "Клиент:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:127
 msgid "Go"
 msgstr "Вперед"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:129
 msgid "Group:"
 msgstr "Группа:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:130
 #, fuzzy
 msgid "HTTP Connect"
 msgstr "Соединяюсь"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:131
 msgid "Homepage:"
 msgstr "Веб-страница"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:132
 #, fuzzy
 msgid "Hostname: "
 msgstr "_Хост: "
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:133
 msgid "I already have an account I want to use"
 msgstr "У меня уже есть аккаунт, который я хочу использовать"
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:134
 msgid "I want to _register for a new account"
 msgstr "Я хочу зарегистрировать новый jabber-аккаунт"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:135
 msgid "I would like to add you to my contact list."
 msgstr "Вы не возражаете, если я добавлю Вас в контакт лист?"
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:136
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "Если отмечено, Gajim будет прятаться а трей"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:137
 msgid ""
 "If checked, Gajim will broadcast capability to send and receive meta-"
 "information related to a conversation you may have with a contact such as "
 "composing a message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:137
+#: ../src/gtkgui.glade.h:138
 #, fuzzy
 msgid "If checked, Gajim will join this groupchat on startup"
 msgstr "Если отмечено, Gajim будет прятаться а трей"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:139
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Если отмечено, Gajim запомнит пароль аккаунта"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:140
 #, fuzzy
 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 запомнит позицию и размер окна ростера"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2275,13 +2275,13 @@ msgstr ""
 "Если отмечено, Gajim будет заменять текстовые смайлики, например ':)' их "
 "графическим эквивалентом"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for only you and of course the administrator"
@@ -2289,7 +2289,7 @@ msgstr ""
 "Если отмечено, то Gajim сохранит пароль в ~/.gajim/config с доступом на "
 "чтение только для вас. И администратора системы, конечно же. "
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:144
 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, "
@@ -2299,7 +2299,7 @@ msgstr ""
 "(например: Контакты с MSN будут иметь соответствующие иконки msn для "
 "статусов в сети, ушел, занят и т.д....)"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:145
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2307,7 +2307,7 @@ msgstr ""
 "Если отмечено, Gajim, после запуска, будет автоматически подсоединяться к "
 "jabber серверу с использование этого аккаунта"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:146
 msgid ""
 "If checked, all chat and group chat windows will have the information area "
 "in the top and the buttons area in the bottom hidden. You can quick toggle "
@@ -2315,7 +2315,7 @@ msgid ""
 "a permanent one"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:146
+#: ../src/gtkgui.glade.h:147
 #, fuzzy
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
@@ -2324,125 +2324,121 @@ msgstr ""
 "Если у вас 2 и более аккаунтов, то отметив здесь, вы заставите Gajim "
 "выводить вместе контакты из всех аккаунтов"
 
-#: ../src/gtkgui.glade.h:147
+#: ../src/gtkgui.glade.h:148
 msgid "Incoming message:"
 msgstr "Входящее сообщение:"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:149
 msgid "Info/Query"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:150
 msgid "Information about you are stored on the server as vCard"
 msgstr "Информация о вас хранится на сервере как vCard"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:151
 msgid "Italic"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:152
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:153
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:155
 #, fuzzy
 msgid "Join _Group Chat"
 msgstr "Войти в _Комнату"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:156
 #, fuzzy
 msgid "Join _Group Chat..."
 msgstr "Войти в _Комнату"
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:157
 msgid "Location"
 msgstr "Положение:"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:158
 msgid "Log history"
 msgstr "История:"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:159
 msgid "Log presences in _contact's log file"
 msgstr "Вести лог состояний в логе _контакта"
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:160
 msgid "Log presences in an _external file"
 msgstr "Вести лог состояний во внешнем файле"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:161
 #, fuzzy
 msgid "Manage Accounts"
 msgstr "_Объединить аккаунты"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:162
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:163
 #, fuzzy
 msgid "Manage Emoticons"
 msgstr "Использовать _иконки"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:164
 msgid "Manage Proxy Profiles"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:165
 msgid "Manage..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:166
 msgid "Middle:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:167
 #, fuzzy
 msgid "Mo_derator"
 msgstr "_Дать Права Модератора"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:168
 #, fuzzy
 msgid "More"
 msgstr "Я в кино"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:169
 msgid "Name:"
 msgstr "Имя:"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:171
 msgid "New version of Gajim available"
 msgstr "Доступна новая версия Gajim"
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:172
 msgid "Nickname:"
 msgstr "Ник:"
 
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:175
 msgid "Notify me about contacts that: "
 msgstr "Уведомлять о контактах которые: "
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:176
 msgid "OS:"
 msgstr "ОС:"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:177
 #, fuzzy
 msgid "On every _message"
 msgstr "В _каждой строке"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:178
 msgid "Open Download Page"
 msgstr "Открыть Страницу Загрузки"
 
-#: ../src/gtkgui.glade.h:178
-msgid "Open _with:"
-msgstr "_Открыть с помощью:"
-
 #: ../src/gtkgui.glade.h:179
 msgid "Open..."
 msgstr "Открыть..."
@@ -3282,184 +3278,191 @@ msgstr "минут"
 msgid "show a help on specific command"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:74
+#. parameter, named "on_command". User gets help for the command, specified by this parameter
+#: ../scripts/gajim-remote.py:75
 msgid "on_command"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:74
+#: ../scripts/gajim-remote.py:76
 msgid "show help on command"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:78
+#: ../scripts/gajim-remote.py:80
 msgid "Shows or hides the roster window"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:82
+#: ../scripts/gajim-remote.py:84
 msgid "Popup a window with the next unread message"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:86
+#: ../scripts/gajim-remote.py:88
 msgid ""
 "Print a list of all contacts in the roster. Each contact appear on a "
 "separate line"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:89 ../scripts/gajim-remote.py:104
-#: ../scripts/gajim-remote.py:116 ../scripts/gajim-remote.py:130
+#: ../scripts/gajim-remote.py:91 ../scripts/gajim-remote.py:106
+#: ../scripts/gajim-remote.py:118 ../scripts/gajim-remote.py:132
 #, fuzzy
 msgid "account"
 msgstr "Аккаунты"
 
-#: ../scripts/gajim-remote.py:89
+#: ../scripts/gajim-remote.py:91
 msgid "show only contacts of the given account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:95
+#: ../scripts/gajim-remote.py:97
 #, fuzzy
 msgid "Print a list of registered accounts"
 msgstr "Я хочу зарегистрировать новый jabber-аккаунт"
 
-#: ../scripts/gajim-remote.py:99
+#: ../scripts/gajim-remote.py:101
 msgid "Change the status of account or accounts"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:101
+#: ../scripts/gajim-remote.py:103
 #, fuzzy
 msgid "status"
 msgstr "Статус"
 
-#: ../scripts/gajim-remote.py:101
+#: ../scripts/gajim-remote.py:103
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 
-#: ../scripts/gajim-remote.py:103 ../scripts/gajim-remote.py:127
+#: ../scripts/gajim-remote.py:105 ../scripts/gajim-remote.py:129
 #, fuzzy
 msgid "message"
 msgstr "_Новое Сообщение"
 
-#: ../scripts/gajim-remote.py:103
+#: ../scripts/gajim-remote.py:105
 #, fuzzy
 msgid "status message"
 msgstr "Сообщение сервера:"
 
-#: ../scripts/gajim-remote.py:104
+#: ../scripts/gajim-remote.py:106
 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 ""
 
-#: ../scripts/gajim-remote.py:110
+#: ../scripts/gajim-remote.py:112
 msgid "Show the chat dialog so that you can send message to a contact"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:113
+#: ../scripts/gajim-remote.py:115
 #, fuzzy
 msgid "jid of the contact that you want to chat with"
 msgstr "Пожалуйста, заполните данные для вашего нового аккаунта"
 
-#: ../scripts/gajim-remote.py:116
+#: ../scripts/gajim-remote.py:118
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:121
+#: ../scripts/gajim-remote.py:123
 msgid ""
 "Send new message to a contact in the roster. Both OpenPGP key and account "
 "are optional. If you want to set only 'account', whitout 'pgp key', just set "
 "'pgp key' to ''."
 msgstr ""
 
-#: ../scripts/gajim-remote.py:125
+#: ../scripts/gajim-remote.py:127
 #, fuzzy
 msgid "jid of the contact that will receive the message"
 msgstr ""
 "Gajim будет лишь менять иконку у контакта, от которого пришло сообщение"
 
-#: ../scripts/gajim-remote.py:127
+#: ../scripts/gajim-remote.py:129
 msgid "message contents"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:128
+#: ../scripts/gajim-remote.py:130
 msgid "pgp key"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:128
+#: ../scripts/gajim-remote.py:130
 msgid "if specified, the message will be encrypted using this pulic key"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:130
+#: ../scripts/gajim-remote.py:132
 msgid "if specified, the message will be sent using this account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:135
+#: ../scripts/gajim-remote.py:137
 msgid "Get detailed info on a contact"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:137
+#: ../scripts/gajim-remote.py:139
 #, fuzzy
 msgid "jid of the contact"
 msgstr "Добавить Новый Контакт"
 
-#: ../scripts/gajim-remote.py:158
+#: ../scripts/gajim-remote.py:160
 msgid "Missing argument \"contact_jid\""
 msgstr ""
 
-#: ../scripts/gajim-remote.py:163 ../scripts/gajim-remote.py:476
+#: ../scripts/gajim-remote.py:165 ../scripts/gajim-remote.py:478
 #, fuzzy
 msgid "Service not available"
 msgstr "_Недоступен после:"
 
-#: ../scripts/gajim-remote.py:181
+#: ../scripts/gajim-remote.py:183
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 msgstr ""
 
-#: ../scripts/gajim-remote.py:184
+#: ../scripts/gajim-remote.py:186
 msgid "You have no active account"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:203
+#: ../scripts/gajim-remote.py:205
 #, fuzzy
 msgid "Session bus is not available."
 msgstr "_Недоступен после:"
 
-#: ../scripts/gajim-remote.py:212
+#: ../scripts/gajim-remote.py:214
 #, python-format
 msgid "Unknow dbus version: %s"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:238
+#: ../scripts/gajim-remote.py:240
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
 "\t"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:244
+#: ../scripts/gajim-remote.py:246
 #, python-format
 msgid "%s not found"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:248
+#: ../scripts/gajim-remote.py:250
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:307
+#: ../scripts/gajim-remote.py:309
 #, python-format
 msgid "Unknown type %s "
 msgstr ""
 
-#: ../scripts/gajim-remote.py:449
+#: ../scripts/gajim-remote.py:451
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 msgstr ""
 
+#~ msgid "<b>Links</b>"
+#~ msgstr "<b>Ссылки</b>"
+
+#~ msgid "Open _with:"
+#~ msgstr "_Открыть с помощью:"
+
 #, fuzzy
 #~ msgid "Switch to"
 #~ msgstr "Зарегистрировать %s"
diff --git a/src/common/config.py b/src/common/config.py
index ab6d71e1920709e4abacd60c18b9ece085f8a4cd..2df2199f067016c94a0ce001f81906e45fecba6a 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -83,6 +83,7 @@ class Config:
 		'openwith': [ opt_str, 'gnome-open' ],
 		'custombrowser': [ opt_str, 'firefox' ],
 		'custommailapp': [ opt_str, 'mozilla-thunderbird -compose' ],
+		'custom_file_manager': [ opt_str, 'xffm' ],
 		'gc-x-position': [opt_int, 0],
 		'gc-y-position': [opt_int, 0],
 		'gc-width': [opt_int, 675],
diff --git a/src/config.py b/src/config.py
index 34f616c92a07a40ac83fb9b69c6a4a1afcd67020..ed90d008273cbbc59cd2eacedd46290f051ad181 100644
--- a/src/config.py
+++ b/src/config.py
@@ -378,26 +378,28 @@ class PreferencesWindow:
 
 		#open links with
 		if os.name == 'nt':
-			self.links_frame = self.xml.get_widget('links_frame')
-			self.links_frame.set_no_show_all(True)
+			self.applications_frame = self.xml.get_widget('applications_frame')
+			self.applications_frame.set_no_show_all(True)
 		else:
-			self.links_open_with_combobox = self.xml.get_widget('links_open_with_combobox')
+			self.applications_combobox = self.xml.get_widget('applications_combobox')
 			if gajim.config.get('autodetect_browser_mailer'):
-				self.links_open_with_combobox.set_active(0)
+				self.applications_combobox.set_active(0)
 				gtkgui_helpers.autodetect_browser_mailer()
 			# autodetect_browser_mailer is now False.
 			# so user has 'Always Use GNOME/KDE' or Custom
 			elif gajim.config.get('openwith') == 'gnome-open':
-				self.links_open_with_combobox.set_active(1)
+				self.applications_combobox.set_active(1)
 			elif gajim.config.get('openwith') == 'kfmclient exec':
-				self.links_open_with_combobox.set_active(2)
+				self.applications_combobox.set_active(2)
 			elif gajim.config.get('openwith') == 'custom':
-				self.links_open_with_combobox.set_active(3)
+				self.applications_combobox.set_active(3)
 				self.xml.get_widget('custom_apps_frame').set_sensitive(True)
 			self.xml.get_widget('custom_browser_entry').set_text(
 				gajim.config.get('custombrowser'))
 			self.xml.get_widget('custom_mail_client_entry').set_text(
 				gajim.config.get('custommailapp'))
+			self.xml.get_widget('custom_file_manager_entry').set_text(
+			gajim.config.set('custom_file_manager', widget.get_text())
 				
 		#log presences in user file
 		st = gajim.config.get('log_notif_in_user_file')
@@ -855,7 +857,7 @@ class PreferencesWindow:
 	def on_msg_treemodel_row_deleted(self, model, path):
 		self.save_status_messages(model)
 
-	def on_links_open_with_combobox_changed(self, widget):
+	def on_applications_combobox_changed(self, widget):
 		gajim.config.set('autodetect_browser_mailer', False)
 		if widget.get_active() == 3:
 			self.xml.get_widget('custom_apps_frame').set_sensitive(True)
@@ -878,6 +880,10 @@ class PreferencesWindow:
 		gajim.config.set('custommailapp', widget.get_text())
 		self.plugin.save_config()
 
+	def on_custom_file_manager_entry_changed(self, widget):
+		gajim.config.set('custom_file_manager', widget.get_text())
+		self.plugin.save_config()
+
 	def on_log_in_contact_checkbutton_toggled(self, widget):
 		gajim.config.set('log_notif_in_user_file', widget.get_active())
 		self.plugin.save_config()
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index 01a42b44ece6ba1c96435e67cedbd487df853fec..080221003c7acc5a4ebb612fdc218a75cb05347a 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -5287,13 +5287,14 @@ Disabled</property>
 	      <property name="spacing">6</property>
 
 	      <child>
-		<widget class="GtkFrame" id="links_frame">
+		<widget class="GtkFrame" id="applications_frame">
+		  <property name="visible">True</property>
 		  <property name="label_xalign">0</property>
 		  <property name="label_yalign">0.5</property>
 		  <property name="shadow_type">GTK_SHADOW_NONE</property>
 
 		  <child>
-		    <widget class="GtkAlignment" id="alignment42">
+		    <widget class="GtkAlignment" id="alignment89">
 		      <property name="border_width">6</property>
 		      <property name="visible">True</property>
 		      <property name="xalign">0.5</property>
@@ -5312,47 +5313,13 @@ Disabled</property>
 			  <property name="spacing">6</property>
 
 			  <child>
-			    <widget class="GtkHBox" id="hbox2918">
+			    <widget class="GtkComboBox" id="applications_combobox">
 			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label197">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Open _with:</property>
-				  <property name="use_underline">True</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkComboBox" id="links_open_with_combobox">
-				  <property name="visible">True</property>
-				  <property name="items" translatable="yes">Autodetect at every application startup
+			      <property name="items" translatable="yes">Autodetect at every application startup
 Always use GNOME default applications
 Always use KDE default applications
 Custom</property>
-				  <signal name="changed" handler="on_links_open_with_combobox_changed" last_modification_time="Sat, 05 Mar 2005 16:44:57 GMT"/>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
+			      <signal name="changed" handler="on_applications_combobox_changed" last_modification_time="Tue, 09 Aug 2005 15:12:31 GMT"/>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -5385,7 +5352,7 @@ Custom</property>
 				  <child>
 				    <widget class="GtkTable" id="table22">
 				      <property name="visible">True</property>
-				      <property name="n_rows">2</property>
+				      <property name="n_rows">3</property>
 				      <property name="n_columns">2</property>
 				      <property name="homogeneous">False</property>
 				      <property name="row_spacing">6</property>
@@ -5484,6 +5451,52 @@ Custom</property>
 					  <property name="y_options"></property>
 					</packing>
 				      </child>
+
+				      <child>
+					<widget class="GtkLabel" id="label355">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">File manager:</property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					</widget>
+					<packing>
+					  <property name="left_attach">0</property>
+					  <property name="right_attach">1</property>
+					  <property name="top_attach">2</property>
+					  <property name="bottom_attach">3</property>
+					  <property name="x_options">fill</property>
+					  <property name="y_options"></property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkEntry" id="custom_file_manager_entry">
+					  <property name="visible">True</property>
+					  <property name="can_focus">True</property>
+					  <property name="editable">True</property>
+					  <property name="visibility">True</property>
+					  <property name="max_length">0</property>
+					  <property name="text" translatable="yes"></property>
+					  <property name="has_frame">True</property>
+					  <property name="invisible_char">*</property>
+					  <property name="activates_default">False</property>
+					  <signal name="changed" handler="on_custom_file_manager_entry_changed" last_modification_time="Tue, 09 Aug 2005 14:55:18 GMT"/>
+					</widget>
+					<packing>
+					  <property name="left_attach">1</property>
+					  <property name="right_attach">2</property>
+					  <property name="top_attach">2</property>
+					  <property name="bottom_attach">3</property>
+					  <property name="y_options"></property>
+					</packing>
+				      </child>
 				    </widget>
 				  </child>
 				</widget>
@@ -5492,7 +5505,7 @@ Custom</property>
 			      <child>
 				<widget class="GtkLabel" id="label198">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">&lt;b&gt;Custom Applications&lt;/b&gt;</property>
+				  <property name="label" translatable="yes">&lt;b&gt;Custom&lt;/b&gt;</property>
 				  <property name="use_underline">False</property>
 				  <property name="use_markup">True</property>
 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -5520,9 +5533,9 @@ Custom</property>
 		  </child>
 
 		  <child>
-		    <widget class="GtkLabel" id="label196">
+		    <widget class="GtkLabel" id="label355">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Links&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Applications&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>