diff --git a/po/bg/LC_MESSAGES/gajim.po b/po/bg/LC_MESSAGES/gajim.po
index 8ecd87fd2..ec3219e1c 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-08 22:23+0300\n"
+"POT-Creation-Date: 2005-08-09 00:11+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"
@@ -177,9 +177,9 @@ msgstr ""
 #: ../src/common/connection.py:1882
 #, python-format
 msgid ""
-"%s seconds have passed and server did not reply to our keepalive. If you "
+"%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 "
-"keepalive packets by modifying this account"
+"keep-alive packets by modifying this account."
 msgstr ""
 
 #: ../src/common/connection.py:1888 ../src/common/connection.py:1897
@@ -325,7 +325,7 @@ msgstr "Стойност"
 msgid "Type"
 msgstr "Тип"
 
-#: ../src/chat.py:122 ../src/gtkgui.glade.h:64
+#: ../src/chat.py:122 ../src/gtkgui.glade.h:67
 msgid "Chat"
 msgstr "Разговор"
 
@@ -669,26 +669,26 @@ msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 
-#: ../src/config.py:2807
+#: ../src/config.py:2808
 msgid ""
-"Your account has been added to your gajim configuration.\n"
-"You can set advanced account options using \"Edit->Accounts\" in the main "
-"window menu."
+"Account has been added successfully.\n"
+"You can set advanced options by using \"Edit->Accounts\" from the main "
+"window."
 msgstr ""
 
-#: ../src/config.py:2818
+#: ../src/config.py:2819
 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:2832
+#: ../src/config.py:2833
 #, fuzzy
 msgid "You need to enter a username to add an account."
 msgstr "Трябва да въведете име за този акаунт"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2837
 #, fuzzy
 msgid "You need to enter a valid server address to add an account."
 msgstr "За да регистрирате нов акаунт, трябва да въведете парола"
@@ -1808,54 +1808,61 @@ msgid "After time:"
 msgstr "След времето:"
 
 #: ../src/gtkgui.glade.h:37
+msgid ""
+"All chat states\n"
+"Composing only\n"
+"Disabled"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:40
 msgid "Allow _OS information to be sent"
 msgstr "Позволяване изпращането на информация за _ОС"
 
-#: ../src/gtkgui.glade.h:38
+#: ../src/gtkgui.glade.h:41
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Позволяване на прозорци/уведомления при Отсъствам/Не съм на разположение/"
 "Зает/Невидим"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:42
 msgid "Also known as iChat style"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:43
 msgid "Always use compact _view"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 #, fuzzy
 msgid "Ask status message when I:"
 msgstr "Питане за съобщение за състояние при преминаване в режим: "
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 msgid "Ask:"
 msgstr "Питане за:"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 #, fuzzy
 msgid "Assign Open_PGP Key"
 msgstr "Задаване на OpenPGP ключ"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Упълномощаване на контакта, така че да знае кога сте свързани"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Auto _away after:"
 msgstr "Автоматично \"_Отсъствам\" след:"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 msgid "Auto _not available after:"
 msgstr "Автоматично \"_Не съм на разположение\" след:"
 
-#: ../src/gtkgui.glade.h:47
+#: ../src/gtkgui.glade.h:50
 msgid "Auto join"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:48
+#: ../src/gtkgui.glade.h:51
 #, fuzzy
 msgid ""
 "Autodetect at every application startup\n"
@@ -1864,73 +1871,73 @@ msgid ""
 "Custom"
 msgstr "Стандартни програми на GNOME"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:55
 msgid "Automatically authorize contact"
 msgstr "Автоматично упълномощаване на контакта"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:56
 msgid "Background color"
 msgstr "Цвят на фона"
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:57
 msgid "Banner:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:58
 msgid "Before nickname:"
 msgstr "Преди псевдонима:"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:59
 msgid "Before time:"
 msgstr "Преди времето:"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:60
 msgid "Birthday:"
 msgstr "Рожден ден:"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:61
 msgid "Bold"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:62
 msgid "C_onnect at startup"
 msgstr "С_вързване при стартиране"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:63
 msgid "Chan_ge"
 msgstr "Пром_яна"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:64
 msgid "Change Password"
 msgstr "Промяна на парола"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:65
 #, fuzzy
 msgid "Change _Nickname"
 msgstr "Псе_вдоним:"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:66
 msgid "Change _Subject"
 msgstr "Промяна на _темата"
 
-#: ../src/gtkgui.glade.h:65
+#: ../src/gtkgui.glade.h:68
 msgid "Chat state noti_fications:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:66
+#: ../src/gtkgui.glade.h:69
 msgid "Chat with"
 msgstr "Разговор с"
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:70
 #, fuzzy
 msgid "Check for new _version at application startup"
 msgstr "Проверка за нова в_ерсия при стартиране"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:71
 msgid "Check if you want to register for a new jabber account"
 msgstr "Изберете, ако искате да регистрирате нов Jabber акаунт"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:72
 #, fuzzy
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
@@ -1941,7 +1948,7 @@ msgstr ""
 "дразни. Използвайте я внимателно, тъй като блокира всички съобщения от всеки "
 "контакт, който не е в списъка."
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:73
 #, fuzzy
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
@@ -1953,52 +1960,45 @@ msgstr ""
 "се очаква да предоставят възможности по SSL. Забележете, че Gajim използва "
 "TLS криптиране по подразбиране и избирайки тази опция, изключвате TLS"
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:74
 #, fuzzy
 msgid "Choose _Key..."
 msgstr "Избор на _ключ"
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:75
 msgid "City:"
 msgstr "Град:"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:76
 msgid "Click to change account's password"
 msgstr "Натиснете, за да смените паролата на акаунта"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:77
 #, fuzzy
 msgid "Click to get contact's extended information"
 msgstr "Натиснете за допълнителна информация за контакта"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:78
 msgid "Click to see features like on jabber servers"
 msgstr "Натиснете, за да видите функционалностите на Jabber сървърите"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:79
 #, fuzzy
 msgid "Click to see past conversation in this room"
 msgstr "Натиснете, за да видите стари разговори с този контакт"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:80
 msgid "Click to see past conversations with this contact"
 msgstr "Натиснете, за да видите стари разговори с този контакт"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:81
 msgid "Client:"
 msgstr "Клиент:"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:82
 msgid "Company:"
 msgstr "Компания:"
 
-#: ../src/gtkgui.glade.h:80
-msgid ""
-"Composing only\n"
-"All chat states\n"
-"Disabled"
-msgstr ""
-
 #: ../src/gtkgui.glade.h:83
 msgid "Configure _Room"
 msgstr "Настройки на _стаята"
diff --git a/po/de/LC_MESSAGES/gajim.po b/po/de/LC_MESSAGES/gajim.po
index 8fae2e9ec..6d8dc7f35 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-08 22:23+0300\n"
+"POT-Creation-Date: 2005-08-09 00:11+0300\n"
 "PO-Revision-Date: 2005-06-01 18:11+0200\n"
 "Last-Translator: Christoph Neuroth <delmonico@gmx.net>\n"
 "Language-Team: German\n"
@@ -180,9 +180,9 @@ msgstr ""
 #: ../src/common/connection.py:1882
 #, python-format
 msgid ""
-"%s seconds have passed and server did not reply to our keepalive. If you "
+"%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 "
-"keepalive packets by modifying this account"
+"keep-alive packets by modifying this account."
 msgstr ""
 
 #: ../src/common/connection.py:1888 ../src/common/connection.py:1897
@@ -328,7 +328,7 @@ msgstr "Wert"
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/chat.py:122 ../src/gtkgui.glade.h:64
+#: ../src/chat.py:122 ../src/gtkgui.glade.h:67
 msgid "Chat"
 msgstr "Unterhaltung"
 
@@ -674,26 +674,26 @@ msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 
-#: ../src/config.py:2807
+#: ../src/config.py:2808
 msgid ""
-"Your account has been added to your gajim configuration.\n"
-"You can set advanced account options using \"Edit->Accounts\" in the main "
-"window menu."
+"Account has been added successfully.\n"
+"You can set advanced options by using \"Edit->Accounts\" from the main "
+"window."
 msgstr ""
 
-#: ../src/config.py:2818
+#: ../src/config.py:2819
 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:2832
+#: ../src/config.py:2833
 #, fuzzy
 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:2836
+#: ../src/config.py:2837
 #, fuzzy
 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"
@@ -1814,54 +1814,61 @@ msgid "After time:"
 msgstr "Nach der Zeit:"
 
 #: ../src/gtkgui.glade.h:37
+msgid ""
+"All chat states\n"
+"Composing only\n"
+"Disabled"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:40
 msgid "Allow _OS information to be sent"
 msgstr "Sende _Betriebssystem-Information"
 
-#: ../src/gtkgui.glade.h:38
+#: ../src/gtkgui.glade.h:41
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Popups/Benachrichtigungen zulassen, wenn ich _abwesend/NA/beschäftigt/"
 "unsichtbar bin"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:42
 msgid "Also known as iChat style"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:43
 msgid "Always use compact _view"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 #, fuzzy
 msgid "Ask status message when I:"
 msgstr "Frage nach Status-Nachricht beim: "
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 msgid "Ask:"
 msgstr "Frage:"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 #, fuzzy
 msgid "Assign Open_PGP Key"
 msgstr "OpenPGP-Schlüssel zuweisen"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Kontakt autorisieren, sodass er sehen kann, wann Sie verbunden sind"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Auto _away after:"
 msgstr "Automatisch _abwesend nach:"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 msgid "Auto _not available after:"
 msgstr "Automatisch _nicht verfügbar nach:"
 
-#: ../src/gtkgui.glade.h:47
+#: ../src/gtkgui.glade.h:50
 msgid "Auto join"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:48
+#: ../src/gtkgui.glade.h:51
 #, fuzzy
 msgid ""
 "Autodetect at every application startup\n"
@@ -1870,73 +1877,73 @@ msgid ""
 "Custom"
 msgstr "GNOME Standard-Anwendungen"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:55
 msgid "Automatically authorize contact"
 msgstr "Kontakt automatisch autorisieren"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:56
 msgid "Background color"
 msgstr "Hintergrundfarbe"
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:57
 msgid "Banner:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:58
 msgid "Before nickname:"
 msgstr "Vor dem Spitznamen:"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:59
 msgid "Before time:"
 msgstr "Vor der Zeit:"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:60
 msgid "Birthday:"
 msgstr "Geburtstag:"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:61
 msgid "Bold"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:62
 msgid "C_onnect at startup"
 msgstr "Beim Pr_ogrammstart verbinden"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:63
 msgid "Chan_ge"
 msgstr "_Ändern"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:64
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:65
 #, fuzzy
 msgid "Change _Nickname"
 msgstr "_Spitzname:"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:66
 msgid "Change _Subject"
 msgstr "_Thema ändern"
 
-#: ../src/gtkgui.glade.h:65
+#: ../src/gtkgui.glade.h:68
 msgid "Chat state noti_fications:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:66
+#: ../src/gtkgui.glade.h:69
 msgid "Chat with"
 msgstr "Unterhalten mit"
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:70
 #, fuzzy
 msgid "Check for new _version at application startup"
 msgstr "Beim Start auf neue _Versionen prüfen"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:71
 msgid "Check if you want to register for a new jabber account"
 msgstr "Prüfen Sie, ob Sie ein neues Konto erstellen möchten"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:72
 #, fuzzy
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
@@ -1947,7 +1954,7 @@ msgstr ""
 "sie zuspammt oder belästigt. Verwenden Sie sie mit Vorsicht, da sie alle "
 "Nachrichten von allen Kontakten blockiert, die nicht in ihrer Liste sind."
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:73
 #, fuzzy
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
@@ -1960,52 +1967,45 @@ msgstr ""
 "standardmäßig TLS-Verschlüsselung benutzt wenn sie vom Server verwendet wird "
 "und sie TLS mit dieser Option deaktivieren"
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:74
 #, fuzzy
 msgid "Choose _Key..."
 msgstr "_Schlüssel wählen"
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:75
 msgid "City:"
 msgstr "Stadt:"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:76
 msgid "Click to change account's password"
 msgstr "Klicken, um das Konto-Passwort zu ändern"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:77
 #, fuzzy
 msgid "Click to get contact's extended information"
 msgstr "Klicken, um die erweiterten Informationen des Kontaktes zu sehen"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:78
 msgid "Click to see features like on jabber servers"
 msgstr "Klicken, um die Fähigkeiten auf Jabber-Servern zu sehen."
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:79
 #, fuzzy
 msgid "Click to see past conversation in this room"
 msgstr "Klicken, um die früheren Unterhaltungen mit diesem Kontakt zu sehen"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:80
 msgid "Click to see past conversations with this contact"
 msgstr "Klicken, um die früheren Unterhaltungen mit diesem Kontakt zu sehen"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:81
 msgid "Client:"
 msgstr "Client:"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:82
 msgid "Company:"
 msgstr "Firma:"
 
-#: ../src/gtkgui.glade.h:80
-msgid ""
-"Composing only\n"
-"All chat states\n"
-"Disabled"
-msgstr ""
-
 #: ../src/gtkgui.glade.h:83
 msgid "Configure _Room"
 msgstr "_Raum einrichten"
diff --git a/po/el/LC_MESSAGES/gajim.po b/po/el/LC_MESSAGES/gajim.po
index 13689cbc1..a7989f525 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-08 22:23+0300\n"
+"POT-Creation-Date: 2005-08-09 00:11+0300\n"
 "PO-Revision-Date: 2005-05-17 12:19+0300\n"
 "Last-Translator: Nikos Kouremenos <kourem@gmail.com>\n"
 "Language-Team: \n"
@@ -18,19 +18,19 @@ msgstr ""
 
 #: ../src/common/config.py:51
 msgid "Away as a result of being idle"
-msgstr ""
+msgstr "Απομακρυσμένος λόγω αδράνειας"
 
 #: ../src/common/config.py:54
 msgid "Not available as a result of being idle"
-msgstr ""
+msgstr "Μη διαθέσιμος λόγω αδράνειας"
 
 #: ../src/common/config.py:263
 msgid "Sleeping"
-msgstr ""
+msgstr "Κοιμάμαι"
 
 #: ../src/common/config.py:264
 msgid "Back soon"
-msgstr ""
+msgstr "Πίσω σύντομα"
 
 #: ../src/common/config.py:264
 msgid "Back in some minutes."
@@ -70,18 +70,20 @@ msgstr "Είμαι στο τηλέφωνο."
 
 #: ../src/common/config.py:269
 msgid "Out"
-msgstr ""
+msgstr "Έξω"
 
 #: ../src/common/config.py:269
 msgid "I'm out enjoying life"
-msgstr ""
+msgstr "Είμαι έξω στην ζωή"
 
 #: ../src/common/connection.py:291 ../src/common/connection.py:301
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Subject: %s\n"
 "%s"
-msgstr "Θέμα:"
+msgstr ""
+"Θέμα: %s\n"
+"%s"
 
 #: ../src/common/connection.py:351 ../src/common/connection.py:1496
 msgid "I would like to add you to my roster."
@@ -89,9 +91,9 @@ msgstr "Επιθυμώ να σε προσθέσω στην λίστα επαφώ
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
 #: ../src/common/connection.py:358
-#, fuzzy, python-format
+#, python-format
 msgid "we are now subscribed to %s"
-msgstr "Ο %s μόλις σας αφαίρεσε την εξουσιοδότηση"
+msgstr "Ο %s μόλις σας εξουσιοδότησε"
 
 #: ../src/common/connection.py:360
 #, fuzzy, python-format
@@ -106,62 +108,61 @@ msgstr "Ο %s μόλις σας αφαίρεσε την εξουσιοδότησ
 #: ../src/common/connection.py:399
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
-msgstr ""
+msgstr "Η σύνδεση με τον λογαριασμό \"%s\" χάθηκε"
 
 #: ../src/common/connection.py:400
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
+"Για να συνεχίσετε να στέλνετε και να λαμβάνετε μηνύματα, πρέπει να "
+"επανασυνδεθείτε."
 
 #: ../src/common/connection.py:1133
-#, fuzzy
 msgid "Error:"
-msgstr "Σφάλμα: "
+msgstr "Σφάλμα:"
 
 #: ../src/common/connection.py:1200 ../src/common/connection.py:1258
 #: ../src/common/connection.py:1598
-#, fuzzy, python-format
+#, python-format
 msgid "Could not connect to \"%s\""
-msgstr "Η σύνδεση με %s στάθηκε αδύνατη."
+msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη."
 
 #: ../src/common/connection.py:1201 ../src/common/connection.py:1259
 msgid "Check your connection or try again later"
-msgstr ""
+msgstr "Ελέγξτε την σύνδεση σας ή δοκιμάστε αργότερα"
 
 #: ../src/common/connection.py:1204 ../src/common/connection.py:1601
 #, python-format
 msgid "Connected to server with %s"
-msgstr ""
+msgstr "Σύνδεση με τον διακομιστή με %s"
 
 #: ../src/common/connection.py:1270
-#, fuzzy, python-format
+#, python-format
 msgid "Authentication failed with \"%s\""
-msgstr ""
-"Η πιστοποίηση ταυτότητας με %s απέτυχε, παρακαλώ ελέγξτε το συνθηματικό σας"
+msgstr "Η πιστοποίηση ταυτότητας με \"%s\" απέτυχε"
 
 #: ../src/common/connection.py:1272
 msgid "Please check your login and password for correctness."
-msgstr ""
+msgstr "Παρακαλώ ελέγξτε το συνθηματικό σας."
 
 #: ../src/common/connection.py:1362 ../src/roster_window.py:1273
 #, python-format
 msgid "I'm %s"
-msgstr ""
+msgstr "Είμαι %s"
 
 #. We didn't set a passphrase
 #: ../src/common/connection.py:1367
 msgid "OpenPGP Key was not given"
-msgstr ""
+msgstr "Δεν δόθηκε OpenPGP κλειδί"
 
 #: ../src/common/connection.py:1368
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
-msgstr ""
+msgstr "Θα συνδεθείτε με %s χωρίς OpenPGP."
 
 #. we're not english
 #: ../src/common/connection.py:1458
-#, fuzzy
 msgid "[This message is encrypted]"
-msgstr "[αυτό το μήνυμα είναι κρυπογραφημένο]"
+msgstr "[Aυτό το μήνυμα είναι κρυπογραφημένο]"
 
 #: ../src/common/connection.py:1599 ../src/gajim.py:574
 msgid "Check your connection or try again later."
@@ -171,19 +172,22 @@ msgstr "Ελέγξτε την σύνδεση σας ή δοκιμάστε αργ
 #: ../src/common/connection.py:1881
 #, python-format
 msgid "Gajim disconnected you from %s"
-msgstr ""
+msgstr "Το Gajim σας αποσύνδεσε από %s"
 
 #: ../src/common/connection.py:1882
 #, python-format
 msgid ""
-"%s seconds have passed and server did not reply to our keepalive. If you "
+"%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 "
-"keepalive packets by modifying this account"
+"keep-alive packets by modifying this account."
 msgstr ""
+"Πέρασαν %s δευτερόλεπτα και ο διακομιστής δεν απάντηστε στο keepalive. Αν "
+"πιστεύετε ότι δεν θα έπρεπε να έχετε αποσυνδεθεί, τότε απενεργοποιήστε την "
+"αποστολή πακέτων keepalive στις επιλογές αυτού του λογαριασμού."
 
 #: ../src/common/connection.py:1888 ../src/common/connection.py:1897
 msgid "error appeared while processing xmpp:"
-msgstr ""
+msgstr "σφάλμα κατά την επεξεργασία xmpp:"
 
 #: ../src/common/helpers.py:28
 msgid "Busy"
@@ -222,9 +226,8 @@ msgid "Not in the roster"
 msgstr "Εκτός λίστας επαφών"
 
 #: ../src/common/helpers.py:46 ../src/vcard.py:249 ../src/vcard.py:251
-#, fuzzy
 msgid "Unknown"
-msgstr "Άγνωστος τύπο %s "
+msgstr "Άγνωστο"
 
 #: ../src/common/helpers.py:48
 msgid "Has errors"
@@ -232,59 +235,53 @@ msgstr "Έχει προβλήματα"
 
 #: ../src/common/helpers.py:53 ../src/common/helpers.py:67
 #: ../src/groupchat_window.py:271 ../src/gtkgui.glade.h:173
-#, fuzzy
 msgid "None"
-msgstr "Κόμβος"
+msgstr "Τίποτα"
 
 #: ../src/common/helpers.py:55
 msgid "To"
-msgstr ""
+msgstr "Προς"
 
 #: ../src/common/helpers.py:57
-#, fuzzy
 msgid "From"
-msgstr "Δωμάτιο:"
+msgstr "Από"
 
 #: ../src/common/helpers.py:59
 msgid "Both"
-msgstr ""
+msgstr "Και τα δυο"
 
 #: ../src/common/helpers.py:69
-#, fuzzy
 msgid "Subscribe"
-msgstr "_Εγγραφή"
+msgstr "Εγγραφή"
 
 #: ../src/common/helpers.py:108
 msgid "is paying attention to the conversation"
-msgstr ""
+msgstr "έχει την προσοχή του στην κουβέντα"
 
 #: ../src/common/helpers.py:110
 msgid "is doing something else"
-msgstr ""
+msgstr "κάνει κάτι άλλο"
 
 #: ../src/common/helpers.py:112
-#, fuzzy
 msgid "is composing a message..."
-msgstr "Εισερχόμενο μήνυμα:"
+msgstr "γράφει ένα μήνυμα..."
 
 #: ../src/common/helpers.py:114
-#, fuzzy
 msgid "paused composing a message..."
-msgstr "Εισερχόμενο μήνυμα:"
+msgstr "σταμάτησε για λίγο να γράφει ένα μήνυμα..."
 
 #: ../src/common/helpers.py:116
-#, fuzzy
 msgid "has closed the chat window or tab"
-msgstr "Χρήση ενός παραθύρου για κουβέντες με καρτέλες"
+msgstr "έκλεισε το παράθυρο ή την καρτέλα"
 
 #: ../src/common/logger.py:41 ../src/common/logger.py:46
 #, python-format
 msgid "%s is file but it should be a directory"
-msgstr ""
+msgstr "Το %s είναι αρχείο αλλά πρέπει να είναι φάκελος"
 
 #: ../src/common/logger.py:42 ../src/common/logger.py:47
 msgid "Gajim will now exit"
-msgstr ""
+msgstr "To Gajim τώρα θα κλείσει"
 
 #. dot_gajim doesn't exist
 #. is '' on win9x so avoid that
@@ -292,17 +289,17 @@ msgstr ""
 #: ../src/common/logger.py:57
 #, python-format
 msgid "creating %s directory"
-msgstr ""
+msgstr "δημιουργία φακέλου %s"
 
 #: ../src/common/optparser.py:50
 #, python-format
 msgid "error: cannot open %s for reading\n"
-msgstr ""
+msgstr "σφάλμα: αδύνατη η ανάγνωση του %s\n"
 
 #: ../src/common/optparser.py:76
 #, python-format
 msgid "Unable to write file in %s\n"
-msgstr ""
+msgstr "Αδύνατη η εγγραφή αρχείου σε %s\n"
 
 #: ../src/common/optparser.py:84
 msgid "No space left on device"
@@ -311,11 +308,11 @@ msgstr ""
 #: ../src/common/optparser.py:100
 #, python-format
 msgid "Unable to open %s for writing\n"
-msgstr ""
+msgstr "Αδύνατη η εγγραφή αρχείου %s\n"
 
 #: ../src/advanced.py:52
 msgid "Preference Name"
-msgstr "Όνομα προτίμησης"
+msgstr "Όνομα Προτίμησης"
 
 #: ../src/advanced.py:59
 msgid "Value"
@@ -325,7 +322,7 @@ msgstr "Τιμή"
 msgid "Type"
 msgstr "Είδος"
 
-#: ../src/chat.py:122 ../src/gtkgui.glade.h:64
+#: ../src/chat.py:122 ../src/gtkgui.glade.h:67
 msgid "Chat"
 msgstr "Κουβέντα"
 
@@ -653,26 +650,29 @@ msgstr ""
 "Παρακαλώ συμπληρώστε τα πεδία του διακομιστή και του δωματίου ή διαφορετικά "
 "αφαιρέστε τον σελιδοδείκτη."
 
-#: ../src/config.py:2807
+#: ../src/config.py:2808
 msgid ""
-"Your account has been added to your gajim configuration.\n"
-"You can set advanced account options using \"Edit->Accounts\" in the main "
-"window menu."
+"Account has been added successfully.\n"
+"You can set advanced options by using \"Edit->Accounts\" from the main "
+"window."
 msgstr ""
+"Ο λογαριασμός προστέθηκε με επιτυχία.\n"
+"Μπορείτε να δείτε όλες τις ρυθμίσεις του λογαριασμού σας κάνοντας "
+"\"Επεξεργασία->Λογαριασμοί\" από το κεντρικό παράθυρο"
 
-#: ../src/config.py:2818
+#: ../src/config.py:2819
 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:2832
+#: ../src/config.py:2833
 #, fuzzy
 msgid "You need to enter a username to add an account."
 msgstr "Πρέπει να δώσετε έναν κωδικό για τον νέο λογαριασμό."
 
-#: ../src/config.py:2836
+#: ../src/config.py:2837
 #, fuzzy
 msgid "You need to enter a valid server address to add an account."
 msgstr "Πρέπει να δώσετε έναν κωδικό για τον νέο λογαριασμό."
@@ -1795,55 +1795,62 @@ msgid "After time:"
 msgstr "Μετά από χρόνο:"
 
 #: ../src/gtkgui.glade.h:37
+msgid ""
+"All chat states\n"
+"Composing only\n"
+"Disabled"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:40
 msgid "Allow _OS information to be sent"
 msgstr "Επίτρεψη αποστολής πληροφοριών για το λειτ. σύστημα"
 
-#: ../src/gtkgui.glade.h:38
+#: ../src/gtkgui.glade.h:41
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Επίτρεψη εμφανίσεων/γνωστοποιήσεων όταν είμαι απομακρ./μη διαθ./απασχολ./"
 "αφανής"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:42
 msgid "Also known as iChat style"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:43
 msgid "Always use compact _view"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 #, fuzzy
 msgid "Ask status message when I:"
 msgstr "Ερώτηση μηνύματος κατάστασης όταν γίνομαι:"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 msgid "Ask:"
 msgstr "Ζήτα:"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 #, fuzzy
 msgid "Assign Open_PGP Key"
 msgstr "Ανάθεση OpenPGP κλειδιού"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Authorize contact so he can know when you're connected"
 msgstr ""
 "Εξουσιοδοτήστε μια επαφή ώστε να μπορεί να ξέρει πότε είστε συνδεδεμένος"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Auto _away after:"
 msgstr "Αυτόματα _απομακρυσμένος μετά:"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 msgid "Auto _not available after:"
 msgstr "Αυτόματα _μη διαθέσιμος μετά:"
 
-#: ../src/gtkgui.glade.h:47
+#: ../src/gtkgui.glade.h:50
 msgid "Auto join"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:48
+#: ../src/gtkgui.glade.h:51
 #, fuzzy
 msgid ""
 "Autodetect at every application startup\n"
@@ -1852,73 +1859,73 @@ msgid ""
 "Custom"
 msgstr "Προεπιλεγμένες από το GNOME εφαρμογές"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:55
 msgid "Automatically authorize contact"
 msgstr "Αυτόματη εξουσιοδότηση επαφής"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:56
 msgid "Background color"
 msgstr "Χρώμα φόντου"
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:57
 msgid "Banner:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:58
 msgid "Before nickname:"
 msgstr "Πριν το ψευδώνυμο:"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:59
 msgid "Before time:"
 msgstr "Πριν από χρόνο:"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:60
 msgid "Birthday:"
 msgstr "Γενέθλια:"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:61
 msgid "Bold"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:62
 msgid "C_onnect at startup"
 msgstr "Σύνδεση κατά την ε_κκίνηση"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:63
 msgid "Chan_ge"
 msgstr "Α_λλαγή"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:64
 msgid "Change Password"
 msgstr "Αλλαγή Κωδικού"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:65
 #, fuzzy
 msgid "Change _Nickname"
 msgstr "_Όνομα χρήστη:"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:66
 msgid "Change _Subject"
 msgstr "Αλλαγή _Θέματος"
 
-#: ../src/gtkgui.glade.h:65
+#: ../src/gtkgui.glade.h:68
 msgid "Chat state noti_fications:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:66
+#: ../src/gtkgui.glade.h:69
 msgid "Chat with"
 msgstr "Κουβέντα με"
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:70
 #, fuzzy
 msgid "Check for new _version at application startup"
 msgstr "Έλεγχος για νέα έκδοση κατά την εκκίνηση"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:71
 msgid "Check if you want to register for a new jabber account"
 msgstr "_Επιλέξτε εάν επιθυμείτε να καταχωρήσετε νέο jabber λογαρισμό"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:72
 #, fuzzy
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
@@ -1929,7 +1936,7 @@ msgstr ""
 "spamή άλλα ενοχλητικά μηνύματα. Χρησιμοποιήστε το με προσοχή, γιατί "
 "μπλοκάρει όλα τα μηνύματα από κάθε επαφή που δεν έχετε στην λίστα επαφών σας"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:73
 #, fuzzy
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
@@ -1942,52 +1949,45 @@ msgstr ""
 "κρυπτογράφηση TLS αυτόματα αν αυτή η δυνατότητα του γνωστοποιηθεί από τον "
 "διακομιστή, και ότι με αυτή την επιλογή απενεργοποιήτε το TLS"
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:74
 #, fuzzy
 msgid "Choose _Key..."
 msgstr "Επιλογή _Κλειδιού"
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:75
 msgid "City:"
 msgstr "Πόλη:"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:76
 msgid "Click to change account's password"
 msgstr "Πατήστε για να αλλάξετε τον κωδικό του λογαριασμού"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:77
 #, fuzzy
 msgid "Click to get contact's extended information"
 msgstr "Πατήστε για να έχετε περισσότερες πληροφορίες για αυτή την επαφή"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:78
 msgid "Click to see features like on jabber servers"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:79
 #, fuzzy
 msgid "Click to see past conversation in this room"
 msgstr "Πατήστε για να δείτε παλιότερες συζητήσεις με αυτή την επαφή"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:80
 msgid "Click to see past conversations with this contact"
 msgstr "Πατήστε για να δείτε παλιότερες συζητήσεις με αυτή την επαφή"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:81
 msgid "Client:"
 msgstr "Εφαρμογή:"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:82
 msgid "Company:"
 msgstr "Εταιρία:"
 
-#: ../src/gtkgui.glade.h:80
-msgid ""
-"Composing only\n"
-"All chat states\n"
-"Disabled"
-msgstr ""
-
 #: ../src/gtkgui.glade.h:83
 msgid "Configure _Room"
 msgstr "Τροποποίηση _Δωματίου"
diff --git a/po/es/LC_MESSAGES/gajim.po b/po/es/LC_MESSAGES/gajim.po
index bdc0e6e89..70d607b97 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-08 22:23+0300\n"
+"POT-Creation-Date: 2005-08-09 00:11+0300\n"
 "PO-Revision-Date: 2005-05-21 20:03+0100\n"
 "Last-Translator: Membris Khan <membriskhan@gmail.com>\n"
 "Language-Team: none\n"
@@ -177,9 +177,9 @@ msgstr ""
 #: ../src/common/connection.py:1882
 #, python-format
 msgid ""
-"%s seconds have passed and server did not reply to our keepalive. If you "
+"%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 "
-"keepalive packets by modifying this account"
+"keep-alive packets by modifying this account."
 msgstr ""
 
 #: ../src/common/connection.py:1888 ../src/common/connection.py:1897
@@ -325,7 +325,7 @@ msgstr "Valor"
 msgid "Type"
 msgstr "Tipo"
 
-#: ../src/chat.py:122 ../src/gtkgui.glade.h:64
+#: ../src/chat.py:122 ../src/gtkgui.glade.h:67
 msgid "Chat"
 msgstr "Charla"
 
@@ -668,26 +668,26 @@ msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 
-#: ../src/config.py:2807
+#: ../src/config.py:2808
 msgid ""
-"Your account has been added to your gajim configuration.\n"
-"You can set advanced account options using \"Edit->Accounts\" in the main "
-"window menu."
+"Account has been added successfully.\n"
+"You can set advanced options by using \"Edit->Accounts\" from the main "
+"window."
 msgstr ""
 
-#: ../src/config.py:2818
+#: ../src/config.py:2819
 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:2832
+#: ../src/config.py:2833
 #, fuzzy
 msgid "You need to enter a username to add an account."
 msgstr "Debes introducir un nombre para esta cuenta"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2837
 #, 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"
@@ -1802,54 +1802,61 @@ msgid "After time:"
 msgstr "Después de la hora:"
 
 #: ../src/gtkgui.glade.h:37
+msgid ""
+"All chat states\n"
+"Composing only\n"
+"Disabled"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:40
 msgid "Allow _OS information to be sent"
 msgstr "Permitir envío de información sobre el sistema operativo"
 
-#: ../src/gtkgui.glade.h:38
+#: ../src/gtkgui.glade.h:41
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Permitir notificaciones emergente cuando estoy _ausente, no disponible, "
 "ocupado o invisible."
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:42
 msgid "Also known as iChat style"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:43
 msgid "Always use compact _view"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 #, fuzzy
 msgid "Ask status message when I:"
 msgstr "Preguntar mensaje de estado cuando esté: "
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 msgid "Ask:"
 msgstr "Pregunta:"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 #, fuzzy
 msgid "Assign Open_PGP Key"
 msgstr "Asignar clave OpenPGP"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Autorizar contacto para que pueda saber cuándo estás conectado"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Auto _away after:"
 msgstr "Poner _ausente después de:"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 msgid "Auto _not available after:"
 msgstr "Poner _no disponible después de:"
 
-#: ../src/gtkgui.glade.h:47
+#: ../src/gtkgui.glade.h:50
 msgid "Auto join"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:48
+#: ../src/gtkgui.glade.h:51
 #, fuzzy
 msgid ""
 "Autodetect at every application startup\n"
@@ -1858,73 +1865,73 @@ msgid ""
 "Custom"
 msgstr "aplicaciones por defecto de GNOME"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:55
 msgid "Automatically authorize contact"
 msgstr "Autorizar contactos automáticamente"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:56
 msgid "Background color"
 msgstr "Color de fondo"
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:57
 msgid "Banner:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:58
 msgid "Before nickname:"
 msgstr "Antes del nombre:"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:59
 msgid "Before time:"
 msgstr "Antes de la hora:"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:60
 msgid "Birthday:"
 msgstr "Cumpleaños:"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:61
 msgid "Bold"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:62
 msgid "C_onnect at startup"
 msgstr "C_onectar al inicio"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:63
 msgid "Chan_ge"
 msgstr "C_ambiar"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:64
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:65
 #, fuzzy
 msgid "Change _Nickname"
 msgstr "_Alias:"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:66
 msgid "Change _Subject"
 msgstr "Cambiar el _tema"
 
-#: ../src/gtkgui.glade.h:65
+#: ../src/gtkgui.glade.h:68
 msgid "Chat state noti_fications:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:66
+#: ../src/gtkgui.glade.h:69
 msgid "Chat with"
 msgstr "Charlar con"
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:70
 #, fuzzy
 msgid "Check for new _version at application startup"
 msgstr "_Comprobar disponibilidad de nuevas versiones al iniciar"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:71
 msgid "Check if you want to register for a new jabber account"
 msgstr "Comprueba si quieres registrar una nueva cuenta de Jabber"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:72
 #, fuzzy
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
@@ -1935,7 +1942,7 @@ msgstr ""
 "Úsalo con precaución ya que bloqueará todos los mensajes de cualquier "
 "contacto que no esté en tu lista de contactos."
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:73
 #, fuzzy
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
@@ -1947,52 +1954,45 @@ msgstr ""
 "use SSL. Observa que Gajim usa encripatdo TLS por defecto si estádisponible "
 "en el servidor, y que con esta opción se desactiva el TLS"
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:74
 #, fuzzy
 msgid "Choose _Key..."
 msgstr "Elegir _clave"
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:75
 msgid "City:"
 msgstr "Ciudad:"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:76
 msgid "Click to change account's password"
 msgstr "Click para cambiar la contraseña de la cuenta"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:77
 #, fuzzy
 msgid "Click to get contact's extended information"
 msgstr "Click para información extendida sobre el contacto"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:78
 msgid "Click to see features like on jabber servers"
 msgstr "Click para ver características de los servidores de Jabber"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:79
 #, fuzzy
 msgid "Click to see past conversation in this room"
 msgstr "Click para ver anteriores conversaciones con este contacto"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:80
 msgid "Click to see past conversations with this contact"
 msgstr "Click para ver anteriores conversaciones con este contacto"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:81
 msgid "Client:"
 msgstr "Cliente:"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:82
 msgid "Company:"
 msgstr "Compañía:"
 
-#: ../src/gtkgui.glade.h:80
-msgid ""
-"Composing only\n"
-"All chat states\n"
-"Disabled"
-msgstr ""
-
 #: ../src/gtkgui.glade.h:83
 msgid "Configure _Room"
 msgstr "Configurar el salón"
diff --git a/po/fr/LC_MESSAGES/gajim.po b/po/fr/LC_MESSAGES/gajim.po
index 532e0c69f..b10c630e5 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-08 22:23+0300\n"
+"POT-Creation-Date: 2005-08-09 00:11+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"
@@ -180,9 +180,9 @@ msgstr ""
 #: ../src/common/connection.py:1882
 #, python-format
 msgid ""
-"%s seconds have passed and server did not reply to our keepalive. If you "
+"%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 "
-"keepalive packets by modifying this account"
+"keep-alive packets by modifying this account."
 msgstr ""
 
 #: ../src/common/connection.py:1888 ../src/common/connection.py:1897
@@ -326,7 +326,7 @@ msgstr "Valeur"
 msgid "Type"
 msgstr "Type"
 
-#: ../src/chat.py:122 ../src/gtkgui.glade.h:64
+#: ../src/chat.py:122 ../src/gtkgui.glade.h:67
 msgid "Chat"
 msgstr "Discussion"
 
@@ -650,26 +650,26 @@ msgstr ""
 "Assurez-vous de remplir les champs serveur et salon ou enlevez ce marque-"
 "pages"
 
-#: ../src/config.py:2807
+#: ../src/config.py:2808
 msgid ""
-"Your account has been added to your gajim configuration.\n"
-"You can set advanced account options using \"Edit->Accounts\" in the main "
-"window menu."
+"Account has been added successfully.\n"
+"You can set advanced options by using \"Edit->Accounts\" from the main "
+"window."
 msgstr ""
 
-#: ../src/config.py:2818
+#: ../src/config.py:2819
 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:2832
+#: ../src/config.py:2833
 #, 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:2836
+#: ../src/config.py:2837
 #, 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."
@@ -1752,54 +1752,61 @@ msgid "After time:"
 msgstr "Après l'heure :"
 
 #: ../src/gtkgui.glade.h:37
+msgid ""
+"All chat states\n"
+"Composing only\n"
+"Disabled"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:40
 msgid "Allow _OS information to be sent"
 msgstr ""
 "Autoriser l'envoi des informations concernant votre _système d'exploitation"
 
-#: ../src/gtkgui.glade.h:38
+#: ../src/gtkgui.glade.h:41
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Autoriser les popups/notifications lorsque je suis _absent/indisponible/"
 "occupé/invisible"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:42
 msgid "Also known as iChat style"
 msgstr "Aussi appellé style iChat"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:43
 msgid "Always use compact _view"
 msgstr "Toujours utiliser la _vue compacte"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 #, fuzzy
 msgid "Ask status message when I:"
 msgstr "Demander le message d'état lorsque l'on passe : "
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 msgid "Ask:"
 msgstr "Demande :"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 msgid "Assign Open_PGP Key"
 msgstr "Assigner une clé Open_PGP"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Autoriser le contact pour qu'il sache quand vous êtes connecté"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Auto _away after:"
 msgstr "Passer _absent après :"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 msgid "Auto _not available after:"
 msgstr "Passer _indisponible après :"
 
-#: ../src/gtkgui.glade.h:47
+#: ../src/gtkgui.glade.h:50
 msgid "Auto join"
 msgstr "Rejoindre automatiquement"
 
-#: ../src/gtkgui.glade.h:48
+#: ../src/gtkgui.glade.h:51
 #, fuzzy
 msgid ""
 "Autodetect at every application startup\n"
@@ -1811,73 +1818,73 @@ msgstr ""
 "Toujours utiliser l'applications par défaut de KDE\n"
 "Personnalisé"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:55
 msgid "Automatically authorize contact"
 msgstr "Autoriser le contact automatiquement"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:56
 msgid "Background color"
 msgstr "Couleur du fond"
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:57
 msgid "Banner:"
 msgstr "Bannière:"
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:58
 msgid "Before nickname:"
 msgstr "Avant le surnom :"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:59
 msgid "Before time:"
 msgstr "Avant l'heure :"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:60
 msgid "Birthday:"
 msgstr "Anniversaire :"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:61
 msgid "Bold"
 msgstr "Gras"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:62
 msgid "C_onnect at startup"
 msgstr "C_onnexion au démarrage"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:63
 msgid "Chan_ge"
 msgstr "Chan_ger"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:64
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:65
 msgid "Change _Nickname"
 msgstr "Changer de Sur_nom"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:66
 msgid "Change _Subject"
 msgstr "Changer le _Sujet"
 
-#: ../src/gtkgui.glade.h:65
+#: ../src/gtkgui.glade.h:68
 #, fuzzy
 msgid "Chat state noti_fications:"
 msgstr "Envoyer et recevoir les noti_fications d'état de discution"
 
-#: ../src/gtkgui.glade.h:66
+#: ../src/gtkgui.glade.h:69
 msgid "Chat with"
 msgstr "Discuter avec"
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:70
 #, fuzzy
 msgid "Check for new _version at application startup"
 msgstr "_Vérifier l'existence d'une nouvelle version au démarrage"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:71
 msgid "Check if you want to register for a new jabber account"
 msgstr "A cocher si vous voulez créer un nouveau compte Jabber"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:72
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1887,7 +1894,7 @@ msgstr ""
 "vous spamme/ennuie. Utilisez avec précaution, car cette option bloque tous "
 "les messages des contacts qui ne sont pas dans votre liste"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:73
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
 "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
@@ -1899,49 +1906,42 @@ msgstr ""
 "TLS par défaut si le serveur annonce qu'il le supporte, et avec cette option "
 "vous désactivez le TLS"
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:74
 msgid "Choose _Key..."
 msgstr "Choisissez une _clé"
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:75
 msgid "City:"
 msgstr "Ville :"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:76
 msgid "Click to change account's password"
 msgstr "Cliquez pour changer le mot de passe du compte"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:77
 msgid "Click to get contact's extended information"
 msgstr "Cliquez pour plus d'informations sur le contact"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:78
 msgid "Click to see features like on jabber servers"
 msgstr "Cliquez pour voir les fonctionnalités du serveur jabber"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:79
 msgid "Click to see past conversation in this room"
 msgstr "Cliquez ici pour voir les précédentes conversations de ce salon"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:80
 msgid "Click to see past conversations with this contact"
 msgstr "Cliquez ici pour voir les précédentes conversations avec ce contact"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:81
 msgid "Client:"
 msgstr "Client :"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:82
 msgid "Company:"
 msgstr "Companie :"
 
-#: ../src/gtkgui.glade.h:80
-msgid ""
-"Composing only\n"
-"All chat states\n"
-"Disabled"
-msgstr ""
-
 #: ../src/gtkgui.glade.h:83
 msgid "Configure _Room"
 msgstr "Configurer le _Groupe"
diff --git a/po/gajim.pot b/po/gajim.pot
index b11986d19..c69509db0 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-08 22:23+0300\n"
+"POT-Creation-Date: 2005-08-09 00:11+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"
@@ -174,9 +174,9 @@ msgstr ""
 #: ../src/common/connection.py:1882
 #, python-format
 msgid ""
-"%s seconds have passed and server did not reply to our keepalive. If you "
+"%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 "
-"keepalive packets by modifying this account"
+"keep-alive packets by modifying this account."
 msgstr ""
 
 #: ../src/common/connection.py:1888 ../src/common/connection.py:1897
@@ -316,7 +316,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: ../src/chat.py:122 ../src/gtkgui.glade.h:64
+#: ../src/chat.py:122 ../src/gtkgui.glade.h:67
 msgid "Chat"
 msgstr ""
 
@@ -629,25 +629,25 @@ msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 
-#: ../src/config.py:2807
+#: ../src/config.py:2808
 msgid ""
-"Your account has been added to your gajim configuration.\n"
-"You can set advanced account options using \"Edit->Accounts\" in the main "
-"window menu."
+"Account has been added successfully.\n"
+"You can set advanced options by using \"Edit->Accounts\" from the main "
+"window."
 msgstr ""
 
-#: ../src/config.py:2818
+#: ../src/config.py:2819
 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:2832
+#: ../src/config.py:2833
 msgid "You need to enter a username to add an account."
 msgstr ""
 
-#: ../src/config.py:2836
+#: ../src/config.py:2837
 msgid "You need to enter a valid server address to add an account."
 msgstr ""
 
@@ -1692,50 +1692,57 @@ msgid "After time:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:37
-msgid "Allow _OS information to be sent"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:38
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:39
-msgid "Also known as iChat style"
+msgid ""
+"All chat states\n"
+"Composing only\n"
+"Disabled"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:40
-msgid "Always use compact _view"
+msgid "Allow _OS information to be sent"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:41
-msgid "Ask status message when I:"
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:42
-msgid "Ask:"
+msgid "Also known as iChat style"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:43
-msgid "Assign Open_PGP Key"
+msgid "Always use compact _view"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:44
-msgid "Authorize contact so he can know when you're connected"
+msgid "Ask status message when I:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:45
-msgid "Auto _away after:"
+msgid "Ask:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:46
-msgid "Auto _not available after:"
+msgid "Assign Open_PGP Key"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:47
-msgid "Auto join"
+msgid "Authorize contact so he can know when you're connected"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:48
+msgid "Auto _away after:"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:49
+msgid "Auto _not available after:"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:50
+msgid "Auto join"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:51
 msgid ""
 "Autodetect at every application startup\n"
 "Always use GNOME default applications\n"
@@ -1743,78 +1750,78 @@ msgid ""
 "Custom"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:55
 msgid "Automatically authorize contact"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:56
 msgid "Background color"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:57
 msgid "Banner:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:58
 msgid "Before nickname:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:59
 msgid "Before time:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:60
 msgid "Birthday:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:61
 msgid "Bold"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:62
 msgid "C_onnect at startup"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:63
 msgid "Chan_ge"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:64
 msgid "Change Password"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:65
 msgid "Change _Nickname"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:66
 msgid "Change _Subject"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:65
+#: ../src/gtkgui.glade.h:68
 msgid "Chat state noti_fications:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:66
+#: ../src/gtkgui.glade.h:69
 msgid "Chat with"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:70
 msgid "Check for new _version at application startup"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:71
 msgid "Check if you want to register for a new jabber account"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:72
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
 "not in the roster"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:73
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
 "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
@@ -1822,49 +1829,42 @@ msgid ""
 "be disabled"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:74
 msgid "Choose _Key..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:75
 msgid "City:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:76
 msgid "Click to change account's password"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:77
 msgid "Click to get contact's extended information"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:78
 msgid "Click to see features like on jabber servers"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:79
 msgid "Click to see past conversation in this room"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:80
 msgid "Click to see past conversations with this contact"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:81
 msgid "Client:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:82
 msgid "Company:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:80
-msgid ""
-"Composing only\n"
-"All chat states\n"
-"Disabled"
-msgstr ""
-
 #: ../src/gtkgui.glade.h:83
 msgid "Configure _Room"
 msgstr ""
diff --git a/po/pl/LC_MESSAGES/gajim.po b/po/pl/LC_MESSAGES/gajim.po
index 098587a6d..f2183b9d1 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-08 22:23+0300\n"
+"POT-Creation-Date: 2005-08-09 00:11+0300\n"
 "PO-Revision-Date: 2005-08-01 21:46+0200\n"
 "Last-Translator: Witek Kieraś <pambuk@gmail.com>\n"
 "Language-Team: none\n"
@@ -177,9 +177,9 @@ msgstr ""
 #: ../src/common/connection.py:1882
 #, python-format
 msgid ""
-"%s seconds have passed and server did not reply to our keepalive. If you "
+"%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 "
-"keepalive packets by modifying this account"
+"keep-alive packets by modifying this account."
 msgstr ""
 
 #: ../src/common/connection.py:1888 ../src/common/connection.py:1897
@@ -324,7 +324,7 @@ msgstr "Wartość"
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/chat.py:122 ../src/gtkgui.glade.h:64
+#: ../src/chat.py:122 ../src/gtkgui.glade.h:67
 msgid "Chat"
 msgstr "Rozmowa"
 
@@ -646,26 +646,26 @@ 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:2807
+#: ../src/config.py:2808
 msgid ""
-"Your account has been added to your gajim configuration.\n"
-"You can set advanced account options using \"Edit->Accounts\" in the main "
-"window menu."
+"Account has been added successfully.\n"
+"You can set advanced options by using \"Edit->Accounts\" from the main "
+"window."
 msgstr ""
 
-#: ../src/config.py:2818
+#: ../src/config.py:2819
 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:2832
+#: ../src/config.py:2833
 #, fuzzy
 msgid "You need to enter a username to add an account."
 msgstr "Musisz wpisać hasło dla nowego konta."
 
-#: ../src/config.py:2836
+#: ../src/config.py:2837
 #, fuzzy
 msgid "You need to enter a valid server address to add an account."
 msgstr "Musisz wpisać hasło dla nowego konta."
@@ -1756,52 +1756,59 @@ msgid "After time:"
 msgstr "Po czasie:"
 
 #: ../src/gtkgui.glade.h:37
+msgid ""
+"All chat states\n"
+"Composing only\n"
+"Disabled"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:40
 msgid "Allow _OS information to be sent"
 msgstr "Zezwól na wysyłanie informacji o systemie _operacyjnym"
 
-#: ../src/gtkgui.glade.h:38
+#: ../src/gtkgui.glade.h:41
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Pokazuj powiadomienia gdy mam status zaraz wracam/xa/zajęty/niewidoczny"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:42
 msgid "Also known as iChat style"
 msgstr "Znany także jako styl iChat"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:43
 msgid "Always use compact _view"
 msgstr "Zawsze stosuj widok _zwarty"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 #, fuzzy
 msgid "Ask status message when I:"
 msgstr "Pytaj o opis przy zmianie statusu na: "
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 msgid "Ask:"
 msgstr "Pytaj:"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 msgid "Assign Open_PGP Key"
 msgstr "Przypisz klucz Open_PGP"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Autoryzuj kontakt - będzie wówczas wiedział, kiedy jesteś połączony"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Auto _away after:"
 msgstr "Automatyczny status 'Zaraz wracam' po:"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 msgid "Auto _not available after:"
 msgstr "Automatyczny status 'Nieobecny' po:"
 
-#: ../src/gtkgui.glade.h:47
+#: ../src/gtkgui.glade.h:50
 msgid "Auto join"
 msgstr "Automatycznie połącz"
 
-#: ../src/gtkgui.glade.h:48
+#: ../src/gtkgui.glade.h:51
 #, fuzzy
 msgid ""
 "Autodetect at every application startup\n"
@@ -1814,73 +1821,73 @@ msgstr ""
 "Zawsze używaj domyślnych aplikacji KDE\n"
 "Własne"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:55
 msgid "Automatically authorize contact"
 msgstr "Automatycznie autoryzuj kontakt"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:56
 msgid "Background color"
 msgstr "Kolor tła"
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:57
 msgid "Banner:"
 msgstr "Banner:"
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:58
 msgid "Before nickname:"
 msgstr "Przed pseudonimem:"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:59
 msgid "Before time:"
 msgstr "Przed czasem:"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:60
 msgid "Birthday:"
 msgstr "Urodziny:"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:61
 msgid "Bold"
 msgstr "Wytłuszczone"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:62
 msgid "C_onnect at startup"
 msgstr "P_ołącz przy starcie programu"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:63
 msgid "Chan_ge"
 msgstr "Z_mień"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:64
 msgid "Change Password"
 msgstr "Zmień hasło"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:65
 msgid "Change _Nickname"
 msgstr "Zmień Pseudo_nim"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:66
 msgid "Change _Subject"
 msgstr "Zmień _temat"
 
-#: ../src/gtkgui.glade.h:65
+#: ../src/gtkgui.glade.h:68
 #, fuzzy
 msgid "Chat state noti_fications:"
 msgstr "Wysyłaj i odbieraj _powiadomienia o stanie rozmowy."
 
-#: ../src/gtkgui.glade.h:66
+#: ../src/gtkgui.glade.h:69
 msgid "Chat with"
 msgstr "Rozmowa z"
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:70
 #, fuzzy
 msgid "Check for new _version at application startup"
 msgstr "Przy starcie sprawdzaj czy są dostępne nowe _wersje"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:71
 msgid "Check if you want to register for a new jabber account"
 msgstr "Zaznacz jeśli chcesz zarejestrować nowe konto Jabbera"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:72
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1890,7 +1897,7 @@ msgstr ""
 "wiadomościami Stosuj ją ostrożnie, ponieważ powoduje ona blokowanie "
 "wszystkich wiadomości osób, których nie masz na liście kontaktów."
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:73
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
 "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
@@ -1901,49 +1908,42 @@ msgstr ""
 "serwerów udostępnia usługę SSL. Gajim używa szyfrowania TLS domyślnie, jeśli "
 "tylko serwer daje taką możliwość. Ta opcja wyłącza TLS."
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:74
 msgid "Choose _Key..."
 msgstr "Wybierz _Klucz..."
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:75
 msgid "City:"
 msgstr "Miasto:"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:76
 msgid "Click to change account's password"
 msgstr "Kliknij, aby zmienić hasło dla konta"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:77
 msgid "Click to get contact's extended information"
 msgstr "Kliknij by obejrzeć rozrzeszone informacje o kontakcie"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:78
 msgid "Click to see features like on jabber servers"
 msgstr "Kliknij by zobaczyć możliwości serwerów jabbera"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:79
 msgid "Click to see past conversation in this room"
 msgstr "Kliknij by zobaczyć poprzednie rozmowy w tym pokoju"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:80
 msgid "Click to see past conversations with this contact"
 msgstr "Kliknij by zobaczyć poprzednie rozmowy z tym kontaktem"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:81
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:82
 msgid "Company:"
 msgstr "Firma:"
 
-#: ../src/gtkgui.glade.h:80
-msgid ""
-"Composing only\n"
-"All chat states\n"
-"Disabled"
-msgstr ""
-
 #: ../src/gtkgui.glade.h:83
 msgid "Configure _Room"
 msgstr "Konfiguruj _pokój"
diff --git a/po/pt/LC_MESSAGES/gajim.po b/po/pt/LC_MESSAGES/gajim.po
index 7ac2edb09..dba3d0034 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-08 22:23+0300\n"
+"POT-Creation-Date: 2005-08-09 00:11+0300\n"
 "PO-Revision-Date: 2005-03-22 17:47-0300\n"
 "Last-Translator: Junix <junix@infolink.com.br>\n"
 "Language-Team: none\n"
@@ -176,9 +176,9 @@ msgstr ""
 #: ../src/common/connection.py:1882
 #, python-format
 msgid ""
-"%s seconds have passed and server did not reply to our keepalive. If you "
+"%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 "
-"keepalive packets by modifying this account"
+"keep-alive packets by modifying this account."
 msgstr ""
 
 #: ../src/common/connection.py:1888 ../src/common/connection.py:1897
@@ -325,7 +325,7 @@ msgstr "Valor"
 msgid "Type"
 msgstr "Tipo"
 
-#: ../src/chat.py:122 ../src/gtkgui.glade.h:64
+#: ../src/chat.py:122 ../src/gtkgui.glade.h:67
 msgid "Chat"
 msgstr "Conversa"
 
@@ -661,26 +661,26 @@ msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 
-#: ../src/config.py:2807
+#: ../src/config.py:2808
 msgid ""
-"Your account has been added to your gajim configuration.\n"
-"You can set advanced account options using \"Edit->Accounts\" in the main "
-"window menu."
+"Account has been added successfully.\n"
+"You can set advanced options by using \"Edit->Accounts\" from the main "
+"window."
 msgstr ""
 
-#: ../src/config.py:2818
+#: ../src/config.py:2819
 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:2832
+#: ../src/config.py:2833
 #, 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:2836
+#: ../src/config.py:2837
 #, 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"
@@ -1798,55 +1798,62 @@ msgid "After time:"
 msgstr "Depois da hora:"
 
 #: ../src/gtkgui.glade.h:37
+msgid ""
+"All chat states\n"
+"Composing only\n"
+"Disabled"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:40
 msgid "Allow _OS information to be sent"
 msgstr "Permitir o envio de informações do _SO "
 
-#: ../src/gtkgui.glade.h:38
+#: ../src/gtkgui.glade.h:41
 #, fuzzy
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Permite popup/notificação quando eu estou _afastado/na/ocupado/invisível"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:42
 msgid "Also known as iChat style"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:43
 msgid "Always use compact _view"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 #, fuzzy
 msgid "Ask status message when I:"
 msgstr "Peça a mensagem de status ao ir: "
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 msgid "Ask:"
 msgstr "Pergutar:"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 #, fuzzy
 msgid "Assign Open_PGP Key"
 msgstr "Atribua chave OpenPGP"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Autorize o contato para ele saber quando você está conectado"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Auto _away after:"
 msgstr "Marcar como _afastado depois"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 #, fuzzy
 msgid "Auto _not available after:"
 msgstr "Marcar como _afastado depois:"
 
-#: ../src/gtkgui.glade.h:47
+#: ../src/gtkgui.glade.h:50
 msgid "Auto join"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:48
+#: ../src/gtkgui.glade.h:51
 #, fuzzy
 msgid ""
 "Autodetect at every application startup\n"
@@ -1855,73 +1862,73 @@ msgid ""
 "Custom"
 msgstr "Aplicações padrão GNOME"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:55
 msgid "Automatically authorize contact"
 msgstr "Autorizar automaticamente um contato"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:56
 msgid "Background color"
 msgstr "Cor de fundo"
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:57
 msgid "Banner:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:58
 msgid "Before nickname:"
 msgstr "Antes do apelido:"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:59
 msgid "Before time:"
 msgstr "Antes da hora:"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:60
 msgid "Birthday:"
 msgstr "Aniversário"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:61
 msgid "Bold"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:62
 msgid "C_onnect at startup"
 msgstr "C_onectar na inicialização"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:63
 msgid "Chan_ge"
 msgstr "_Mudar"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:64
 msgid "Change Password"
 msgstr "Mudar Senha"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:65
 #, fuzzy
 msgid "Change _Nickname"
 msgstr "_Apelido:"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:66
 msgid "Change _Subject"
 msgstr "Muda _Assunto"
 
-#: ../src/gtkgui.glade.h:65
+#: ../src/gtkgui.glade.h:68
 msgid "Chat state noti_fications:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:66
+#: ../src/gtkgui.glade.h:69
 msgid "Chat with"
 msgstr "Conversa com"
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:70
 #, fuzzy
 msgid "Check for new _version at application startup"
 msgstr "Checar uma nova versão ao iniciar"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:71
 msgid "Check if you want to register for a new jabber account"
 msgstr "Habilitar se você quer registrar uma nova conta jabber"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:72
 #, fuzzy
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
@@ -1932,7 +1939,7 @@ msgstr ""
 "annoysUse com cuidado, porque isto bloqueia todas as mensagens de qualquer "
 "contato que você não possui em sua lista e queria lhe enviar uma mensagem"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:73
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
 "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
@@ -1940,52 +1947,45 @@ msgid ""
 "be disabled"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:74
 #, fuzzy
 msgid "Choose _Key..."
 msgstr "_Escolha chave"
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:75
 msgid "City:"
 msgstr "Cidade:"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:76
 msgid "Click to change account's password"
 msgstr "Clique para mudar a senha da conta"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:77
 #, fuzzy
 msgid "Click to get contact's extended information"
 msgstr "Clique para informações completas do contato"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:78
 msgid "Click to see features like on jabber servers"
 msgstr "Clique para ver os recursos como servidores jabber"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:79
 #, fuzzy
 msgid "Click to see past conversation in this room"
 msgstr "Clique para ver conversas passadas com este contato"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:80
 msgid "Click to see past conversations with this contact"
 msgstr "Clique para ver conversas passadas com este contato"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:81
 msgid "Client:"
 msgstr "Cliente:"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:82
 msgid "Company:"
 msgstr "Empresa:"
 
-#: ../src/gtkgui.glade.h:80
-msgid ""
-"Composing only\n"
-"All chat states\n"
-"Disabled"
-msgstr ""
-
 #: ../src/gtkgui.glade.h:83
 msgid "Configure _Room"
 msgstr "Configura _Sala"
diff --git a/po/ru/LC_MESSAGES/gajim.po b/po/ru/LC_MESSAGES/gajim.po
index 142a010f7..9e531934e 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-08 22:23+0300\n"
+"POT-Creation-Date: 2005-08-09 00:11+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"
@@ -179,9 +179,9 @@ msgstr ""
 #: ../src/common/connection.py:1882
 #, python-format
 msgid ""
-"%s seconds have passed and server did not reply to our keepalive. If you "
+"%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 "
-"keepalive packets by modifying this account"
+"keep-alive packets by modifying this account."
 msgstr ""
 
 #: ../src/common/connection.py:1888 ../src/common/connection.py:1897
@@ -327,7 +327,7 @@ msgstr "Значение"
 msgid "Type"
 msgstr "Тип"
 
-#: ../src/chat.py:122 ../src/gtkgui.glade.h:64
+#: ../src/chat.py:122 ../src/gtkgui.glade.h:67
 msgid "Chat"
 msgstr "Чат"
 
@@ -671,26 +671,26 @@ msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 
-#: ../src/config.py:2807
+#: ../src/config.py:2808
 msgid ""
-"Your account has been added to your gajim configuration.\n"
-"You can set advanced account options using \"Edit->Accounts\" in the main "
-"window menu."
+"Account has been added successfully.\n"
+"You can set advanced options by using \"Edit->Accounts\" from the main "
+"window."
 msgstr ""
 
-#: ../src/config.py:2818
+#: ../src/config.py:2819
 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:2832
+#: ../src/config.py:2833
 #, fuzzy
 msgid "You need to enter a username to add an account."
 msgstr "Необходимо ввести имя аккаунта"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2837
 #, fuzzy
 msgid "You need to enter a valid server address to add an account."
 msgstr "Необходимо ввести пароль для регистрации аккаунта"
@@ -1806,52 +1806,59 @@ msgid "After time:"
 msgstr "После времени:"
 
 #: ../src/gtkgui.glade.h:37
-msgid "Allow _OS information to be sent"
-msgstr "Отсылать информацию об _ОС"
-
-#: ../src/gtkgui.glade.h:38
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Позволять уведомления в режиме _ушел/недоступен/занят/невидимка"
-
-#: ../src/gtkgui.glade.h:39
-msgid "Also known as iChat style"
+msgid ""
+"All chat states\n"
+"Composing only\n"
+"Disabled"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:40
+msgid "Allow _OS information to be sent"
+msgstr "Отсылать информацию об _ОС"
+
+#: ../src/gtkgui.glade.h:41
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr "Позволять уведомления в режиме _ушел/недоступен/занят/невидимка"
+
+#: ../src/gtkgui.glade.h:42
+msgid "Also known as iChat style"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:43
 msgid "Always use compact _view"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:44
 #, fuzzy
 msgid "Ask status message when I:"
 msgstr "Запрашивать сообщение о статусе в момент: "
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:45
 msgid "Ask:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:46
 #, fuzzy
 msgid "Assign Open_PGP Key"
 msgstr "Назначить OpenPGP ключ"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:47
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Авторизовать контакт (Он будет видеть ваш статус)"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:48
 msgid "Auto _away after:"
 msgstr "_Ушел посе:"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:49
 msgid "Auto _not available after:"
 msgstr "_Недоступен после:"
 
-#: ../src/gtkgui.glade.h:47
+#: ../src/gtkgui.glade.h:50
 msgid "Auto join"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:48
+#: ../src/gtkgui.glade.h:51
 #, fuzzy
 msgid ""
 "Autodetect at every application startup\n"
@@ -1860,73 +1867,73 @@ msgid ""
 "Custom"
 msgstr "Приложение GNOME по умолчанию"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:55
 msgid "Automatically authorize contact"
 msgstr "Автоматически авторизовать контакт"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:56
 msgid "Background color"
 msgstr "Цвет фона"
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:57
 msgid "Banner:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:58
 msgid "Before nickname:"
 msgstr "До ника:"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:59
 msgid "Before time:"
 msgstr "До времени:"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:60
 msgid "Birthday:"
 msgstr "День рождения:"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:61
 msgid "Bold"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:62
 msgid "C_onnect at startup"
 msgstr "_Соединяться при старте"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:63
 msgid "Chan_ge"
 msgstr "_Изменить"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:64
 msgid "Change Password"
 msgstr "Изменить Пароль"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:65
 #, fuzzy
 msgid "Change _Nickname"
 msgstr "_Ник:"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:66
 msgid "Change _Subject"
 msgstr "Изменить _Тему"
 
-#: ../src/gtkgui.glade.h:65
+#: ../src/gtkgui.glade.h:68
 msgid "Chat state noti_fications:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:66
+#: ../src/gtkgui.glade.h:69
 msgid "Chat with"
 msgstr "Чат с"
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:70
 #, fuzzy
 msgid "Check for new _version at application startup"
 msgstr "Проверять на обновление при _старте"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:71
 msgid "Check if you want to register for a new jabber account"
 msgstr "Отметьте чтобы зарегистрировать новый jabber-аккаунт"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:72
 #, fuzzy
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
@@ -1937,7 +1944,7 @@ msgstr ""
 "вас. Используйте с осторожностью, потому что это заблокирует все сообщения "
 "от контактов не из вашего ротера."
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:73
 #, fuzzy
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
@@ -1950,52 +1957,45 @@ msgstr ""
 "использует TLS шифрование по умолчаниюесли сервер использует "
 "широковещательную передачу, с этой опцией TLS отключется"
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:74
 #, fuzzy
 msgid "Choose _Key..."
 msgstr "Использовать _ключ"
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:75
 msgid "City:"
 msgstr "Город:"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:76
 msgid "Click to change account's password"
 msgstr "Щелкните для изменения пароль"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:77
 #, fuzzy
 msgid "Click to get contact's extended information"
 msgstr "Расширенная информация о контакте"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:78
 msgid "Click to see features like on jabber servers"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:79
 #, fuzzy
 msgid "Click to see past conversation in this room"
 msgstr "Щелкните для просмотра бесед с этим человеком"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:80
 msgid "Click to see past conversations with this contact"
 msgstr "Щелкните для просмотра бесед с этим человеком"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:81
 msgid "Client:"
 msgstr "Клиент:"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:82
 msgid "Company:"
 msgstr "Компания:"
 
-#: ../src/gtkgui.glade.h:80
-msgid ""
-"Composing only\n"
-"All chat states\n"
-"Disabled"
-msgstr ""
-
 #: ../src/gtkgui.glade.h:83
 msgid "Configure _Room"
 msgstr "Настроить _Комнату"
diff --git a/src/common/connection.py b/src/common/connection.py
index 617d022da..e1d53f4c5 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -1879,7 +1879,7 @@ class Connection:
 							keep_alive_disconnect_after_foo_secs):
 						self.connection.disconnect() # disconnect if no answer
 						pritext = _('Gajim disconnected you from %s') % self.name
-						sectext = _('%s seconds have passed and server did not reply to our keepalive. If you believe such disconnection should not have happend, you can disable sending keepalive packets by modifying this account') % str(keep_alive_disconnect_after_foo_secs)
+						sectext = _('%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 keep-alive packets by modifying this account.') % str(keep_alive_disconnect_after_foo_secs)
 						self.dispatch('ERROR', (pritext, sectext))
 						return
 				if self.connection:
diff --git a/src/config.py b/src/config.py
index 97764a512..08518fa2e 100644
--- a/src/config.py
+++ b/src/config.py
@@ -2803,9 +2803,10 @@ class FirstTimeWizardWindow:
 			server = self.server_comboboxentry.get_active_text()
 			if self.check_data(user, server):
 				#TODO: write account to config file
+				# FIXME: do bold (markup)
 				self.finish_label.set_text(
-				_('Your account has been added to your gajim configuration.\n'
-'You can set advanced account options using "Edit->Accounts" in the main window menu.'))
+				_('Account has been added successfully.\n'
+'You can set advanced options by using "Edit->Accounts" from the main window.'))
 				self.go_to_last_page()
 
 		elif cur_page == 2:
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index 71bacc9df..c27beb665 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -4425,8 +4425,8 @@
 		  <child>
 		    <widget class="GtkComboBox" id="chat_states_combobox">
 		      <property name="visible">True</property>
-		      <property name="items" translatable="yes">Composing only
-All chat states
+		      <property name="items" translatable="yes">All chat states
+Composing only
 Disabled</property>
 		      <signal name="changed" handler="on_chat_states_combobox_changed" last_modification_time="Sun, 07 Aug 2005 19:15:49 GMT"/>
 		    </widget>