diff --git a/po/bg/LC_MESSAGES/gajim.po b/po/bg/LC_MESSAGES/gajim.po
index 87fff86ba..b61dff3ac 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-13 01:27+0300\n"
+"POT-Creation-Date: 2005-08-13 13:43+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"
@@ -832,7 +832,7 @@ msgstr "Gajim"
 msgid "Gajim - %s"
 msgstr "Gajim"
 
-#: ../src/dialogs.py:733 ../src/dialogs.py:842 ../src/dialogs.py:1851
+#: ../src/dialogs.py:733 ../src/dialogs.py:842 ../src/dialogs.py:1856
 #, fuzzy
 msgid "Name: "
 msgstr "_Име: "
@@ -851,12 +851,12 @@ msgstr "Отваряне на страницата за изтегляне"
 msgid "Upload"
 msgstr ""
 
-#: ../src/dialogs.py:745 ../src/dialogs.py:1853
+#: ../src/dialogs.py:745 ../src/dialogs.py:1858
 #, fuzzy
 msgid "Sender: "
 msgstr "_Отказване"
 
-#: ../src/dialogs.py:750 ../src/dialogs.py:1855
+#: ../src/dialogs.py:750 ../src/dialogs.py:1860
 #, fuzzy
 msgid "Recipient: "
 msgstr "Скоро посетени:"
@@ -1100,7 +1100,7 @@ msgstr ""
 msgid "Filename: %s"
 msgstr "_Име: "
 
-#: ../src/dialogs.py:1626 ../src/dialogs.py:1708
+#: ../src/dialogs.py:1626 ../src/dialogs.py:1713
 #, fuzzy, python-format
 msgid "Size: %s"
 msgstr "_Отказване"
@@ -1138,54 +1138,56 @@ msgstr ""
 msgid "File transfer stopped by the contact of the other side"
 msgstr ""
 
-#: ../src/dialogs.py:1678
+#. FIXME: user better name for this function
+#. atm it's like it shows popup for incoming file transfer request
+#: ../src/dialogs.py:1680
 #, fuzzy
 msgid "Choose File to Send..."
 msgstr "Избор на _ключ"
 
-#: ../src/dialogs.py:1681
+#: ../src/dialogs.py:1683
 #, fuzzy
 msgid "Send"
 msgstr "_Отказване"
 
-#: ../src/dialogs.py:1705
+#: ../src/dialogs.py:1710
 #, fuzzy, python-format
 msgid "File: %s"
 msgstr "Филтър:"
 
-#: ../src/dialogs.py:1711
+#: ../src/dialogs.py:1716
 #, fuzzy, python-format
 msgid "Type: %s"
 msgstr "Тип"
 
-#: ../src/dialogs.py:1714
+#: ../src/dialogs.py:1719
 #, fuzzy, python-format
 msgid "Description: %s"
 msgstr "Записване:"
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1721
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr ""
 
-#: ../src/dialogs.py:1719
+#: ../src/dialogs.py:1724
 msgid "Save File as..."
 msgstr ""
 
-#: ../src/dialogs.py:1733
+#: ../src/dialogs.py:1738
 msgid "This file already exists"
 msgstr ""
 
-#: ../src/dialogs.py:1734
+#: ../src/dialogs.py:1739
 msgid "Would you like to overwrite it?"
 msgstr ""
 
-#: ../src/dialogs.py:2027
+#: ../src/dialogs.py:2032
 #, fuzzy
 msgid "Pause"
 msgstr "Стойност"
 
-#: ../src/dialogs.py:2039 ../src/gtkgui.glade.h:307
+#: ../src/dialogs.py:2044 ../src/gtkgui.glade.h:307
 #, fuzzy
 msgid "_Continue"
 msgstr "Свъзване"
@@ -1393,7 +1395,7 @@ msgstr ""
 msgid "Banning %s"
 msgstr ""
 
-#: ../src/groupchat_window.py:968 ../src/tabbed_chat_window.py:327
+#: ../src/groupchat_window.py:968 ../src/tabbed_chat_window.py:340
 msgid "If you close this tab, the message will be lost."
 msgstr ""
 
@@ -1605,50 +1607,50 @@ msgstr "като "
 msgid "All contacts in this group are offline or have errors"
 msgstr "Всички контакти в тази група са изключени или има грешки"
 
-#: ../src/tabbed_chat_window.py:112 ../src/gtkgui.glade.h:184
+#: ../src/tabbed_chat_window.py:125 ../src/gtkgui.glade.h:184
 #, fuzzy
 msgid "OpenPGP Encryption"
 msgstr "Натиснете, за да конфигурирате стаята"
 
-#: ../src/tabbed_chat_window.py:115
+#: ../src/tabbed_chat_window.py:128
 #, python-format
 msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:258 ../src/tabbed_chat_window.py:326
+#: ../src/tabbed_chat_window.py:271 ../src/tabbed_chat_window.py:339
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:259
+#: ../src/tabbed_chat_window.py:272
 msgid "If you close the window, this message will be lost."
 msgstr ""
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:492
+#: ../src/tabbed_chat_window.py:512
 #, fuzzy
 msgid "A connection is not available"
 msgstr "Автоматично \"_Не съм на разположение\" след:"
 
-#: ../src/tabbed_chat_window.py:493
+#: ../src/tabbed_chat_window.py:513
 msgid "Your message can not be sent until you are connected."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:581
+#: ../src/tabbed_chat_window.py:601
 #, fuzzy
 msgid "Sending private message failed"
 msgstr "_Ново съобщение"
 
-#: ../src/tabbed_chat_window.py:582
+#: ../src/tabbed_chat_window.py:602
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:685
+#: ../src/tabbed_chat_window.py:705
 msgid "Encryption enabled"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:690
+#: ../src/tabbed_chat_window.py:710
 msgid "Encryption disabled"
 msgstr ""
 
diff --git a/po/de/LC_MESSAGES/gajim.po b/po/de/LC_MESSAGES/gajim.po
index 514d6ab52..1c11c6a89 100644
--- a/po/de/LC_MESSAGES/gajim.po
+++ b/po/de/LC_MESSAGES/gajim.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-13 01:27+0300\n"
+"POT-Creation-Date: 2005-08-13 13:43+0300\n"
 "PO-Revision-Date: 2005-06-01 18:11+0200\n"
 "Last-Translator: Christoph Neuroth <delmonico@gmx.net>\n"
 "Language-Team: German\n"
@@ -811,7 +811,7 @@ msgstr "Gajim"
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/dialogs.py:733 ../src/dialogs.py:842 ../src/dialogs.py:1851
+#: ../src/dialogs.py:733 ../src/dialogs.py:842 ../src/dialogs.py:1856
 msgid "Name: "
 msgstr "Name: "
 
@@ -827,11 +827,11 @@ msgstr "Download"
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/dialogs.py:745 ../src/dialogs.py:1853
+#: ../src/dialogs.py:745 ../src/dialogs.py:1858
 msgid "Sender: "
 msgstr "Absender: "
 
-#: ../src/dialogs.py:750 ../src/dialogs.py:1855
+#: ../src/dialogs.py:750 ../src/dialogs.py:1860
 msgid "Recipient: "
 msgstr "Empfänger: "
 
@@ -1059,7 +1059,7 @@ msgstr "Fortschritt"
 msgid "Filename: %s"
 msgstr "Dateiname: %s"
 
-#: ../src/dialogs.py:1626 ../src/dialogs.py:1708
+#: ../src/dialogs.py:1626 ../src/dialogs.py:1713
 #, python-format
 msgid "Size: %s"
 msgstr "Größe: %s"
@@ -1095,51 +1095,53 @@ msgstr "Verbindung zum Teilnehmer kann nicht hergestellt werden"
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Gegenseite hat Dateitransfer gestoppt"
 
-#: ../src/dialogs.py:1678
+#. FIXME: user better name for this function
+#. atm it's like it shows popup for incoming file transfer request
+#: ../src/dialogs.py:1680
 msgid "Choose File to Send..."
 msgstr "Datei auswählen..."
 
-#: ../src/dialogs.py:1681
+#: ../src/dialogs.py:1683
 msgid "Send"
 msgstr "Senden"
 
-#: ../src/dialogs.py:1705
+#: ../src/dialogs.py:1710
 #, python-format
 msgid "File: %s"
 msgstr "Datei: %s"
 
-#: ../src/dialogs.py:1711
+#: ../src/dialogs.py:1716
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/dialogs.py:1714
+#: ../src/dialogs.py:1719
 #, python-format
 msgid "Description: %s"
 msgstr "Beschreibung: %s"
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1721
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s möchte ihnen eine Datei senden:"
 
-#: ../src/dialogs.py:1719
+#: ../src/dialogs.py:1724
 msgid "Save File as..."
 msgstr "Datei speichern unter..."
 
-#: ../src/dialogs.py:1733
+#: ../src/dialogs.py:1738
 msgid "This file already exists"
 msgstr "Diese Datei existiert schon"
 
-#: ../src/dialogs.py:1734
+#: ../src/dialogs.py:1739
 msgid "Would you like to overwrite it?"
 msgstr "Möchten Sie die Datei überschreiben?"
 
-#: ../src/dialogs.py:2027
+#: ../src/dialogs.py:2032
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/dialogs.py:2039 ../src/gtkgui.glade.h:307
+#: ../src/dialogs.py:2044 ../src/gtkgui.glade.h:307
 msgid "_Continue"
 msgstr "_Fortsetzen"
 
@@ -1344,7 +1346,7 @@ msgstr "Sie können eine Begründung angeben:"
 msgid "Banning %s"
 msgstr "%s verbannen"
 
-#: ../src/groupchat_window.py:968 ../src/tabbed_chat_window.py:327
+#: ../src/groupchat_window.py:968 ../src/tabbed_chat_window.py:340
 msgid "If you close this tab, the message will be lost."
 msgstr "Wenn Sie diesen Reiter schließen, ist die Nachricht verloren."
 
@@ -1549,48 +1551,48 @@ msgstr "als "
 msgid "All contacts in this group are offline or have errors"
 msgstr "Alle Kontakte dieser Gruppe sind abgemeldet oder haben Fehler"
 
-#: ../src/tabbed_chat_window.py:112 ../src/gtkgui.glade.h:184
+#: ../src/tabbed_chat_window.py:125 ../src/gtkgui.glade.h:184
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP-Verschlüsselung"
 
-#: ../src/tabbed_chat_window.py:115
+#: ../src/tabbed_chat_window.py:128
 #, python-format
 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:258 ../src/tabbed_chat_window.py:326
+#: ../src/tabbed_chat_window.py:271 ../src/tabbed_chat_window.py:339
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Sie haben eine neue Nachricht von \"%s\""
 
-#: ../src/tabbed_chat_window.py:259
+#: ../src/tabbed_chat_window.py:272
 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:492
+#: ../src/tabbed_chat_window.py:512
 msgid "A connection is not available"
 msgstr "Keine Verbindung verfügbar"
 
-#: ../src/tabbed_chat_window.py:493
+#: ../src/tabbed_chat_window.py:513
 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:581
+#: ../src/tabbed_chat_window.py:601
 msgid "Sending private message failed"
 msgstr "Senden privater Nachricht fehlgeschlagen"
 
-#: ../src/tabbed_chat_window.py:582
+#: ../src/tabbed_chat_window.py:602
 #, 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:685
+#: ../src/tabbed_chat_window.py:705
 msgid "Encryption enabled"
 msgstr "Verschlüsselung aktiviert"
 
-#: ../src/tabbed_chat_window.py:690
+#: ../src/tabbed_chat_window.py:710
 msgid "Encryption disabled"
 msgstr "Verschlüsselung deaktiviert"
 
diff --git a/po/el/LC_MESSAGES/gajim.po b/po/el/LC_MESSAGES/gajim.po
index 28ca80eb8..968b36240 100644
--- a/po/el/LC_MESSAGES/gajim.po
+++ b/po/el/LC_MESSAGES/gajim.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-13 01:27+0300\n"
-"PO-Revision-Date: 2005-08-10 01:45+0300\n"
+"POT-Creation-Date: 2005-08-13 13:43+0300\n"
+"PO-Revision-Date: 2005-08-13 12:17+0300\n"
 "Last-Translator: Filippos Papadopoulos <filip@cs.uoi.gr>\n"
 "Language-Team: Hellenic-Ελληνικά-Greek <filip@cs.uoi.gr>\n"
 "MIME-Version: 1.0\n"
@@ -99,14 +99,14 @@ msgid "we are now subscribed to %s"
 msgstr "Ο %s μόλις σας εξουσιοδότησε"
 
 #: ../src/common/connection.py:347
-#, fuzzy, python-format
+#, python-format
 msgid "unsubscribe request from %s"
-msgstr "Αίτηση εγγραφής από %s"
+msgstr "αίτηση αφαίρεσης εξουσιοδότησης από %s"
 
 #: ../src/common/connection.py:349
-#, fuzzy, python-format
+#, python-format
 msgid "we are now unsubscribed from %s"
-msgstr "Ο %s μόλις σας αφαίρεσε την εξουσιοδότηση"
+msgstr "πραγματοποιήθηκε αφαίρεσης εξουσιοδότησης από %s"
 
 #: ../src/common/connection.py:386
 #, python-format
@@ -165,7 +165,7 @@ msgstr "Θα συνδεθείτε με %s χωρίς OpenPGP."
 #. we're not english
 #: ../src/common/connection.py:1491
 msgid "[This message is encrypted]"
-msgstr "[Aυτό το μήνυμα είναι κρυπογραφημένο]"
+msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
 #: ../src/common/connection.py:1632 ../src/gajim.py:525
 msgid "Check your connection or try again later."
@@ -178,13 +178,13 @@ msgid "Gajim disconnected you from %s"
 msgstr "Το Gajim σας αποσύνδεσε από %s"
 
 #: ../src/common/connection.py:1915
-#, 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 happened, you can disable sending "
 "keep-alive packets by modifying this account."
 msgstr ""
-"Πέρασαν %s δευτερόλεπτα και ο διακομιστής δεν απάντηστε στο keepalive. Αν "
+"Πέρασαν %s δευτερόλεπτα και ο διακομιστής δεν απάντησε στο keepalive. Αν "
 "πιστεύετε ότι δεν θα έπρεπε να έχετε αποσυνδεθεί, τότε απενεργοποιήστε την "
 "αποστολή πακέτων keepalive στις επιλογές αυτού του λογαριασμού."
 
@@ -196,43 +196,43 @@ msgstr "σφάλμα κατά την επεξεργασία xmpp:"
 #: ../src/common/helpers.py:43
 #, python-format
 msgid "%s GiB"
-msgstr ""
+msgstr "%s GiB"
 
 #. GB means gigabyte
 #: ../src/common/helpers.py:46
 #, python-format
 msgid "%s GB"
-msgstr ""
+msgstr "%s GB"
 
 #. MiB means mibibyte
 #: ../src/common/helpers.py:50
 #, python-format
 msgid "%s MiB"
-msgstr ""
+msgstr "%s MiB"
 
 #. MB means megabyte
 #: ../src/common/helpers.py:53
 #, python-format
 msgid "%s MB"
-msgstr ""
+msgstr "%s MB"
 
 #. KiB means kibibyte
 #: ../src/common/helpers.py:57
 #, python-format
 msgid "%s KiB"
-msgstr ""
+msgstr "%s KiB"
 
 #. KB means kilo bytes
 #: ../src/common/helpers.py:60
 #, python-format
 msgid "%s KB"
-msgstr ""
+msgstr "%s KB"
 
 #. B means bytes
 #: ../src/common/helpers.py:63
 #, python-format
 msgid "%s B"
-msgstr ""
+msgstr "%s B"
 
 #: ../src/common/helpers.py:70
 msgid "Busy"
@@ -318,9 +318,8 @@ msgstr "γράφει ένα μήνυμα..."
 
 #. paused means he was compoing but has stopped for a while
 #: ../src/common/helpers.py:157
-#, fuzzy
 msgid "paused composing a message"
-msgstr "σταμάτησε για λίγο να γράφει ένα μήνυμα..."
+msgstr "σταμάτησε για λίγο να γράφει ένα μήνυμα"
 
 #: ../src/common/helpers.py:159
 msgid "has closed the chat window or tab"
@@ -711,14 +710,14 @@ msgid ""
 msgstr ""
 
 #: ../src/config.py:2857
-#, fuzzy
 msgid "You need to enter a username to add an account."
-msgstr "Πρέπει να δώσετε έναν κωδικό για τον νέο λογαριασμό."
+msgstr "Πρέπει να δώσετε ένα όνομα χρήστη για προσθήκη νέου λογαριασμού."
 
 #: ../src/config.py:2861
-#, fuzzy
 msgid "You need to enter a valid server address to add an account."
-msgstr "Πρέπει να δώσετε έναν κωδικό για τον νέο λογαριασμό."
+msgstr ""
+"Πρέπει να δώσετε μία έγκυρη διεύθυνση διακομιστή για προσθήκη νέου "
+"λογαριασμού."
 
 #: ../src/dialogs.py:54
 #, python-format
@@ -817,43 +816,37 @@ msgstr "Gajim"
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/dialogs.py:733 ../src/dialogs.py:842 ../src/dialogs.py:1851
+#: ../src/dialogs.py:733 ../src/dialogs.py:842 ../src/dialogs.py:1856
 msgid "Name: "
 msgstr "Όνομα: "
 
 #: ../src/dialogs.py:739
-#, fuzzy
 msgid "Type: "
-msgstr "Είδος"
+msgstr "Τύπος: "
 
 #: ../src/dialogs.py:741
-#, fuzzy
 msgid "Download"
-msgstr "Άνοιγμα Σελίδας για Μεταφόρτωση"
+msgstr "Λήψη"
 
 #: ../src/dialogs.py:743
 msgid "Upload"
 msgstr ""
 
-#: ../src/dialogs.py:745 ../src/dialogs.py:1853
-#, fuzzy
+#: ../src/dialogs.py:745 ../src/dialogs.py:1858
 msgid "Sender: "
 msgstr "Αποστολέας: "
 
-#: ../src/dialogs.py:750 ../src/dialogs.py:1855
-#, fuzzy
+#: ../src/dialogs.py:750 ../src/dialogs.py:1860
 msgid "Recipient: "
-msgstr "Πρόσφατα:"
+msgstr "Παραλήπτης: "
 
 #: ../src/dialogs.py:761
-#, fuzzy
 msgid "Size: "
-msgstr "Mέγεθος: %s"
+msgstr "Mέγεθος: "
 
 #: ../src/dialogs.py:763
-#, fuzzy
 msgid "Transferred: "
-msgstr "Η Μεταφορά Αρχείου Διακόπηκε"
+msgstr "Μεταφέρθηκαν: "
 
 #: ../src/dialogs.py:768 ../src/dialogs.py:865 ../src/dialogs.py:878
 msgid "Status: "
@@ -872,18 +865,16 @@ msgid "completed"
 msgstr ""
 
 #: ../src/dialogs.py:784
-#, fuzzy
 msgid "paused"
-msgstr "Παύση"
+msgstr "παύση"
 
 #: ../src/dialogs.py:787
 msgid "stalled"
 msgstr ""
 
 #: ../src/dialogs.py:789
-#, fuzzy
 msgid "transferring"
-msgstr "Χρήση Σετ _εικονιδίων κατάστασης:"
+msgstr "μεταφορά"
 
 #: ../src/dialogs.py:844
 msgid "Subscription: "
@@ -942,9 +933,8 @@ msgstr ""
 
 #. if offline or connecting
 #: ../src/dialogs.py:1079 ../src/dialogs.py:1392 ../src/dialogs.py:1513
-#, fuzzy
 msgid "Connection not available"
-msgstr "Αυτόματα _μη διαθέσιμος μετά:"
+msgstr "Σύνδεση μη διαθέσιμη"
 
 #: ../src/dialogs.py:1080 ../src/dialogs.py:1393 ../src/dialogs.py:1514
 #, python-format
@@ -971,9 +961,8 @@ msgid "You must enter a password."
 msgstr "Πρέπει να πληκτρολογήσετε ένα κωδικό."
 
 #: ../src/dialogs.py:1120
-#, fuzzy
 msgid "Passwords do not match"
-msgstr "Οι κωδικοί δεν είναι ίδιοι"
+msgstr "Οι κωδικοί δεν ταιριάζουν"
 
 #: ../src/dialogs.py:1121
 msgid "The passwords typed in both fields must be identical."
@@ -997,14 +986,12 @@ msgid "From %s"
 msgstr "Από %s"
 
 #: ../src/dialogs.py:1171 ../src/gajim.py:741
-#, fuzzy
 msgid "File Transfer Request"
-msgstr "Χρήση Σετ _εικονιδίων κατάστασης:"
+msgstr "Αίτηση μεταφοράς αρχείου"
 
 #: ../src/dialogs.py:1177 ../src/gajim.py:703 ../src/gajim.py:723
-#, fuzzy
 msgid "File Transfer Error"
-msgstr "Η Μεταφορά Αρχείου Διακόπηκε"
+msgstr "Σφάλμα μεταφοράς αρχείου"
 
 #: ../src/dialogs.py:1181 ../src/gajim.py:776
 msgid "File Transfer Completed"
@@ -1015,9 +1002,9 @@ msgid "File Transfer Stopped"
 msgstr "Η Μεταφορά Αρχείου Διακόπηκε"
 
 #: ../src/dialogs.py:1200
-#, fuzzy, python-format
+#, python-format
 msgid "To %s"
-msgstr "Από %s"
+msgstr "σε %s"
 
 #: ../src/dialogs.py:1357
 #, python-format
@@ -1040,7 +1027,7 @@ msgstr "Έγινε λήψη του %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
 #: ../src/dialogs.py:1423
-#, fuzzy, python-format
+#, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
@@ -1081,7 +1068,7 @@ msgstr "Πρόοδος"
 msgid "Filename: %s"
 msgstr "Όνομα αρχείου: %s"
 
-#: ../src/dialogs.py:1626 ../src/dialogs.py:1708
+#: ../src/dialogs.py:1626 ../src/dialogs.py:1713
 #, python-format
 msgid "Size: %s"
 msgstr "Mέγεθος: %s"
@@ -1092,89 +1079,85 @@ msgid "Sender: %s"
 msgstr "Αποστολέας: %s"
 
 #: ../src/dialogs.py:1632
-#, fuzzy, python-format
+#, python-format
 msgid "Saved in: %s"
-msgstr "Αποστολέας: %s"
+msgstr "Αποθηκεύτηκε στο: %s"
 
 #: ../src/dialogs.py:1634
 msgid "File transfer completed"
 msgstr "Η μεταφορά αρχείου ολοκληρώθηκε"
 
 #: ../src/dialogs.py:1635 ../src/gtkgui.glade.h:341
-#, fuzzy
 msgid "_Open Containing Folder"
 msgstr "_Άνοιγμα του περιέχοντος φακέλου"
 
 #: ../src/dialogs.py:1656 ../src/dialogs.py:1662
-#, fuzzy
 msgid "File transfer canceled"
-msgstr "Η μεταφορά αρχείου ολοκληρώθηκε"
+msgstr "Η μεταφορά αρχείου ακυρώθηκε"
 
 #: ../src/dialogs.py:1656 ../src/dialogs.py:1663
-#, fuzzy
 msgid "Connection with peer cannot be established."
-msgstr "Δεν ήταν δυνατή η επαφή με \"%s\""
+msgstr "Η σύνδεση με τον τον απομακρυσμένο ομότιμο δεν ήταν εφικτή."
 
 #: ../src/dialogs.py:1673
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Η μεταφορά αρχείου σταμάτησε από την επαφή της άλλης πλευράς"
 
-#: ../src/dialogs.py:1678
-#, fuzzy
+#. FIXME: user better name for this function
+#. atm it's like it shows popup for incoming file transfer request
+#: ../src/dialogs.py:1680
 msgid "Choose File to Send..."
-msgstr "Επιλογή _Κλειδιού"
+msgstr "Επιλέξτε το αρχείο που θα σταλεί..."
 
-#: ../src/dialogs.py:1681
-#, fuzzy
+#: ../src/dialogs.py:1683
 msgid "Send"
-msgstr "_Άρνηση"
+msgstr "Αποστολή"
 
-#: ../src/dialogs.py:1705
+#: ../src/dialogs.py:1710
 #, python-format
 msgid "File: %s"
 msgstr "Αρχείο: %s"
 
-#: ../src/dialogs.py:1711
-#, fuzzy, python-format
+#: ../src/dialogs.py:1716
+#, python-format
 msgid "Type: %s"
 msgstr "Τύπος: %s"
 
-#: ../src/dialogs.py:1714
+#: ../src/dialogs.py:1719
 #, python-format
 msgid "Description: %s"
 msgstr "Περιγραφή: %s"
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1721
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "O %s επιθυμεί να σας στείλει ένα αρχείο:"
 
-#: ../src/dialogs.py:1719
+#: ../src/dialogs.py:1724
 msgid "Save File as..."
 msgstr "Αποθήκευση Αρχείου ως..."
 
-#: ../src/dialogs.py:1733
+#: ../src/dialogs.py:1738
 msgid "This file already exists"
 msgstr ""
 
-#: ../src/dialogs.py:1734
+#: ../src/dialogs.py:1739
 msgid "Would you like to overwrite it?"
 msgstr ""
 
-#: ../src/dialogs.py:2027
+#: ../src/dialogs.py:2032
 msgid "Pause"
 msgstr "Παύση"
 
-#: ../src/dialogs.py:2039 ../src/gtkgui.glade.h:307
-#, fuzzy
+#: ../src/dialogs.py:2044 ../src/gtkgui.glade.h:307
 msgid "_Continue"
-msgstr "_Συνέχιση"
+msgstr "_Συνέχεια"
 
 #. ('HTTP_AUTH', account, (method, url, iq_obj))
 #: ../src/gajim.py:152
-#, fuzzy, python-format
+#, python-format
 msgid "HTTP (%s) Authorization for %s"
-msgstr "Εκ νέου Αίτηση Εξουσιοδότησης από"
+msgstr "HTTP (%s) Εξουσιοδότηση για %s"
 
 #: ../src/gajim.py:153
 msgid "Do you accept this request?"
@@ -1226,24 +1209,22 @@ msgid "Your passphrase is incorrect"
 msgstr "H κωδική φράση είναι λανθασμένη"
 
 #: ../src/gajim.py:660
-#, fuzzy
 msgid "You are currently connected without your OpenPGP key."
-msgstr "Συνδεθήκατε χωρίς την χρήση του OpenPGP κλειδιού σας"
+msgstr "Είστε συνδεδεμένοι χωρίς την χρήση του OpenPGP κλειδιού σας"
 
 #. it is good to notify the user, in case he cannot see the output of the console
 #: ../src/gajim.py:1000
 msgid "Cannot save your preferences"
-msgstr ""
+msgstr "Αδυναμία αποθήκευσης των προτιμήσεων σας"
 
 #: ../src/gajim_themes_window.py:63
 msgid "Theme"
-msgstr ""
+msgstr "Θέμα"
 
 #: ../src/gajim_themes_window.py:125 ../src/gajim_themes_window.py:127
 #: ../src/gajim_themes_window.py:128
-#, fuzzy
 msgid "theme_name"
-msgstr "Μετονομασία"
+msgstr "όνομα_θέματος"
 
 #: ../src/groupchat_window.py:125 ../src/groupchat_window.py:967
 #, python-format
@@ -1255,23 +1236,18 @@ msgid "If you close this window, this message will be lost."
 msgstr ""
 
 #: ../src/groupchat_window.py:141
-#, fuzzy, python-format
+#, python-format
 msgid "Are you sure you want to leave room \"%s\"?"
 msgid_plural "Are you sure you want to leave rooms \"%s\"?"
-msgstr[0] ""
-"Είστε σίγουρος ότι θέλετε να αφαιρέσετε την επαφή %s (%s) από την λίστα "
-"επαφών σας;"
-msgstr[1] ""
-"Είστε σίγουρος ότι θέλετε να αφαιρέσετε την επαφή %s (%s) από την λίστα "
-"επαφών σας;"
+msgstr[0] "Είστε σίγουροι ότι θέλετε να φύγετε από το δωμάτιο \"%s\";"
+msgstr[1] "Είστε σίγουροι ότι θέλετε να φύγετε από τα δωμάτια \"%s\";"
 
 #: ../src/groupchat_window.py:146
-#, fuzzy
 msgid "If you close this window, you will be disconnected from this room."
 msgid_plural ""
 "If you close this window, you will be disconnected from these rooms."
 msgstr[0] "Αν κλείσετε αυτό το παράθυρο, θα αποσυνδεθείτε από αυτό το δωμάτιο."
-msgstr[1] "Αν κλείσετε αυτό το παράθυρο, θα αποσυνδεθείτε από αυτό το δωμάτιο."
+msgstr[1] "Αν κλείσετε αυτό το παράθυρο, θα αποσυνδεθείτε από αυτά τα δωμάτια."
 
 #: ../src/groupchat_window.py:151
 msgid "Do not ask me again"
@@ -1286,62 +1262,58 @@ msgid "?Group Chat Contact Role:None"
 msgstr ""
 
 #: ../src/groupchat_window.py:280
-#, fuzzy
 msgid "Moderators"
-msgstr "_Παροχή Δικαιώματος Συντονισμού"
+msgstr "Διαχειριστές"
 
 #: ../src/groupchat_window.py:282
 msgid "Participants"
-msgstr ""
+msgstr "Συμμετέχοντες"
 
 #: ../src/groupchat_window.py:284
-#, fuzzy
 msgid "Visitors"
-msgstr "Ιστορικό"
+msgstr "Επισκέπτες"
 
 #: ../src/groupchat_window.py:344
 #, python-format
 msgid "%s has been kicked by %s: %s"
-msgstr "Ο %s πετάχθηκε έξω από τον %s: %s"
+msgstr "Ο %s πετάχτηκε έξω από τον %s: %s"
 
 #: ../src/groupchat_window.py:350
-#, fuzzy, python-format
+#, python-format
 msgid "%s has been banned by %s: %s"
-msgstr "Ο %s πετάχθηκε έξω από τον %s: %s"
+msgstr "Ο %s έχει απαγορευτεί από τον %s: %s"
 
 #. Someone changed his nick
 #: ../src/groupchat_window.py:353
-#, fuzzy, python-format
+#, python-format
 msgid "%s is now known as %s"
-msgstr "%s είναι τώρα %s (%s)"
+msgstr "Ο %s είναι τώρα γνωστός ως %s"
 
 #: ../src/groupchat_window.py:384
 #, python-format
 msgid "%s has left"
-msgstr ""
+msgstr "Ο %s έχει φύγει"
 
 #: ../src/groupchat_window.py:386
-#, fuzzy, python-format
+#, python-format
 msgid "%s is now %s"
-msgstr "%s είναι τώρα %s (%s)"
+msgstr "Ο %s είναι τώρα %s"
 
 #: ../src/groupchat_window.py:416
-#, fuzzy
 msgid "Changing Subject"
-msgstr "Αλλαγή _Θέματος"
+msgstr "Αλλαγή Θέματος"
 
 #: ../src/groupchat_window.py:417
 msgid "Please specify the new subject:"
-msgstr ""
+msgstr "Παρακαλώ καθορίστε το νέο θέμα:"
 
 #: ../src/groupchat_window.py:426
-#, fuzzy
 msgid "Changing Nickname"
-msgstr "Όνομα χρήστη:"
+msgstr "Αλλαγή Ψευδωνύμου"
 
 #: ../src/groupchat_window.py:427
 msgid "Please specify the new nickname you want to use:"
-msgstr ""
+msgstr "Παρακαλώ καθορίστε το νέο ψευδώνυμο που θέλετε να χρησιμοποιείτε:"
 
 #: ../src/groupchat_window.py:450
 msgid "Bookmark already set"
@@ -1376,46 +1348,45 @@ msgstr ""
 msgid "Banning %s"
 msgstr ""
 
-#: ../src/groupchat_window.py:968 ../src/tabbed_chat_window.py:327
+#: ../src/groupchat_window.py:968 ../src/tabbed_chat_window.py:340
 msgid "If you close this tab, the message will be lost."
 msgstr ""
 
 #: ../src/history_window.py:138
-#, fuzzy, python-format
+#, python-format
 msgid "%s is now %s: %s"
-msgstr "%s είναι τώρα %s (%s)"
+msgstr "Ο %s είναι τώρα %s: %s"
 
 #: ../src/history_window.py:155
-#, fuzzy, python-format
+#, python-format
 msgid "Status is now: %s: %s"
-msgstr "Η κατάσταση είναι τώρα: "
+msgstr "Η κατάσταση είναι τώρα: %s: %s"
 
 #: ../src/history_window.py:177 ../src/history_window.py:179
-#, fuzzy, python-format
+#, python-format
 msgid "Conversation History with %s"
-msgstr "Ιστορικό Κουβέντας"
+msgstr "Ιστορικό Συνομιλίας με τον %s"
 
 #: ../src/remote_control.py:52
 msgid "D-Bus python bindings are missing in this computer"
-msgstr ""
+msgstr "Δεν υπάρχει υποστήριξη D-Bus για την python σε αυτόν τον υπολογιστή"
 
 #: ../src/remote_control.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr ""
 
 #: ../src/remote_control.py:404
-#, fuzzy
 msgid "Session bus is not available"
-msgstr "Αυτόματα _μη διαθέσιμος μετά:"
+msgstr "To Session bus δεν είναι διαθέσιμο"
 
 #: ../src/remote_control.py:412
 msgid "D-Bus is not present on this machine"
 msgstr ""
 
 #: ../src/roster_window.py:264
-#, fuzzy, python-format
+#, python-format
 msgid "You are already in room %s"
-msgstr "Είστε ήδη στον δωμάτιο "
+msgstr "Βρίσκεστε ήδη στο δωμάτιο %s"
 
 #: ../src/roster_window.py:411
 msgid "New _Room"
@@ -1426,29 +1397,29 @@ msgid "Manage Bookmarks..."
 msgstr ""
 
 #: ../src/roster_window.py:440
-#, fuzzy, python-format
+#, python-format
 msgid "to %s account"
-msgstr " λογαριασμό"
+msgstr "στον λογαριασμό %s"
 
 #: ../src/roster_window.py:452
-#, fuzzy, python-format
+#, python-format
 msgid "using %s account"
-msgstr "Aφαιρώντας τον λογαριασμό %s"
+msgstr "χρήση του λογαριασμού %s"
 
 #: ../src/roster_window.py:468
-#, fuzzy, python-format
+#, python-format
 msgid "as %s"
-msgstr "ως "
+msgstr "ως %s"
 
 #: ../src/roster_window.py:479
-#, fuzzy, python-format
+#, python-format
 msgid "for account %s"
-msgstr "λογαριασμός: "
+msgstr "για τον λογαριασμό %s"
 
 #: ../src/roster_window.py:620
 #, python-format
 msgid "%s is now %s (%s)"
-msgstr "%s είναι τώρα %s (%s)"
+msgstr "Ο %s είναι τώρα %s (%s)"
 
 #: ../src/roster_window.py:695
 #, python-format
@@ -1456,13 +1427,13 @@ msgid "Transport \"%s\" will be removed"
 msgstr ""
 
 #: ../src/roster_window.py:695
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from %s."
-msgstr "Πρέπει να είστε συνδεδεμένος για να στείλετε ένα μήνυμα σε μια επαφή"
+msgstr ""
+"Δεν θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από το %s."
 
 #: ../src/roster_window.py:738
-#, fuzzy
 msgid "Assign OpenPGP Key"
 msgstr "Ανάθεση OpenPGP κλειδιού"
 
@@ -1487,18 +1458,16 @@ msgid "Log _off"
 msgstr "_Αποσύνδεση"
 
 #: ../src/roster_window.py:912
-#, fuzzy
 msgid "Edit"
-msgstr "Επε_ξεργασία"
+msgstr "Επεξεργασία"
 
 #: ../src/roster_window.py:918 ../src/gtkgui.glade.h:358
 msgid "_Remove from Roster"
 msgstr ""
 
 #: ../src/roster_window.py:1020
-#, fuzzy
 msgid "Authorization has been sent"
-msgstr "Εκ νέου Αποστολή Εξουσιοδότησης προς"
+msgstr "Η εξουσιοδότηση έχει σταλεί"
 
 #: ../src/roster_window.py:1021
 #, python-format
@@ -1506,9 +1475,8 @@ msgid "Now \"%s\" will know your status."
 msgstr ""
 
 #: ../src/roster_window.py:1043
-#, fuzzy
 msgid "Subscription request has been sent"
-msgstr "Αίτηση εγγραφής από %s"
+msgstr "Η αίτηση εγγραφής έχει σταλεί"
 
 #: ../src/roster_window.py:1044
 #, python-format
@@ -1528,9 +1496,8 @@ msgid ""
 msgstr ""
 
 #: ../src/roster_window.py:1204
-#, fuzzy
 msgid "Password Required"
-msgstr "Κωδικός:"
+msgstr "Απαιτείται Κωδικός"
 
 #: ../src/roster_window.py:1205
 #, python-format
@@ -1538,14 +1505,12 @@ msgid "Enter your password for account %s"
 msgstr "Πληκτρολογήστε τον κωδικό σας για το λογαριασμό %s"
 
 #: ../src/roster_window.py:1206
-#, fuzzy
 msgid "Save password"
-msgstr "_Αποθήκευση"
+msgstr "Αποθήκευση κωδικού"
 
 #: ../src/roster_window.py:1236
-#, fuzzy
 msgid "Passphrase Required"
-msgstr "Κωδικοφράση"
+msgstr "Απαιτείται κωδικοφράση"
 
 #: ../src/roster_window.py:1237
 #, python-format
@@ -1553,26 +1518,22 @@ msgid "Enter GPG key passphrase for account %s"
 msgstr "Πληκτρολογήστε την GPG κωδικοφράση για το λογαριασμό %s"
 
 #: ../src/roster_window.py:1238
-#, fuzzy
 msgid "Save passphrase"
-msgstr "Κωδικοφράση"
+msgstr "Αποθήκευση της Κωδικοφράσης"
 
 #: ../src/roster_window.py:1285
-#, fuzzy
 msgid "No account available"
-msgstr "Μη διαθέσιμος"
+msgstr "Κανένας λογαριασμός δεν είναι διαθέσιμος"
 
 #: ../src/roster_window.py:1286
-#, fuzzy
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
-"Πρέπει να δημιουργήσετε ένα λογαριασμό προτού μπορέτε να συνδεθείτε στο "
-"Jabber"
+"Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
+"άλλες επαφές."
 
 #: ../src/roster_window.py:1590 ../src/roster_window.py:1596
-#, fuzzy
 msgid "You have unread messages"
-msgstr "Gajim - %s μη αναγνωσμένα μηνύματα"
+msgstr "Έχετε μη-αναγνωσμένα μηνύματα"
 
 #: ../src/roster_window.py:1591 ../src/roster_window.py:1597
 msgid ""
@@ -1591,58 +1552,51 @@ msgid "All contacts in this group are offline or have errors"
 msgstr ""
 "Όλες οι επαφές σε αυτή την ομάδα είναι αποσυνδεδέμενες ή έχουν πρόβλημα"
 
-#: ../src/tabbed_chat_window.py:112 ../src/gtkgui.glade.h:184
-#, fuzzy
+#: ../src/tabbed_chat_window.py:125 ../src/gtkgui.glade.h:184
 msgid "OpenPGP Encryption"
-msgstr "Πατήστε για να τροποποιήσετε τις παραμέτρους για το δωμάτιο"
+msgstr "Κρυπτογράφηση OpenPGP"
 
-#: ../src/tabbed_chat_window.py:115
+#: ../src/tabbed_chat_window.py:128
 #, python-format
 msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:258 ../src/tabbed_chat_window.py:326
+#: ../src/tabbed_chat_window.py:271 ../src/tabbed_chat_window.py:339
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:259
+#: ../src/tabbed_chat_window.py:272
 msgid "If you close the window, this message will be lost."
 msgstr ""
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:492
-#, fuzzy
+#: ../src/tabbed_chat_window.py:512
 msgid "A connection is not available"
-msgstr "Αυτόματα _μη διαθέσιμος μετά:"
+msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
 
-#: ../src/tabbed_chat_window.py:493
-#, fuzzy
+#: ../src/tabbed_chat_window.py:513
 msgid "Your message can not be sent until you are connected."
-msgstr ""
-"Δεν μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
-"συνδεδεμένος."
+msgstr "Δεν μπορεί να από το μήνυμα σας εκτός αν είστε συνδεδεμένος."
 
-#: ../src/tabbed_chat_window.py:581
-#, fuzzy
+#: ../src/tabbed_chat_window.py:601
 msgid "Sending private message failed"
-msgstr "_Νέο Μήνυμα"
+msgstr "Αποτυχία αποστολής προσωπικού μηνύματος"
 
-#: ../src/tabbed_chat_window.py:582
+#: ../src/tabbed_chat_window.py:602
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:685
+#: ../src/tabbed_chat_window.py:705
 msgid "Encryption enabled"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:690
+#: ../src/tabbed_chat_window.py:710
 msgid "Encryption disabled"
 msgstr ""
 
 #: ../src/vcard.py:126
-#, fuzzy
 msgid "Choose Avatar"
 msgstr "Επιλογή Εικόνας"
 
@@ -3502,11 +3456,3 @@ msgid ""
 msgstr ""
 "Το όρισμα \"%s\" δεν έχει οριστεί. \n"
 "Πληκτρολογήστε \"%s help %s\" για περισσότερες πληροφορίες"
-
-#, fuzzy
-#~ msgid "Open containing folder"
-#~ msgstr "_Άνοιγμα του περιέχοντος φακέλου"
-
-#, fuzzy
-#~ msgid "GPG Encryption"
-#~ msgstr "Πατήστε για να τροποποιήσετε τις παραμέτρους για το δωμάτιο"
diff --git a/po/es/LC_MESSAGES/gajim.po b/po/es/LC_MESSAGES/gajim.po
index 6788035d8..6827c768c 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-13 01:27+0300\n"
+"POT-Creation-Date: 2005-08-13 13:43+0300\n"
 "PO-Revision-Date: 2005-05-21 20:03+0100\n"
 "Last-Translator: Membris Khan <membriskhan@gmail.com>\n"
 "Language-Team: none\n"
@@ -826,7 +826,7 @@ msgstr "Gajim"
 msgid "Gajim - %s"
 msgstr "Gajim"
 
-#: ../src/dialogs.py:733 ../src/dialogs.py:842 ../src/dialogs.py:1851
+#: ../src/dialogs.py:733 ../src/dialogs.py:842 ../src/dialogs.py:1856
 #, fuzzy
 msgid "Name: "
 msgstr "_Nombre: "
@@ -845,12 +845,12 @@ msgstr "Abrir página de descarga"
 msgid "Upload"
 msgstr ""
 
-#: ../src/dialogs.py:745 ../src/dialogs.py:1853
+#: ../src/dialogs.py:745 ../src/dialogs.py:1858
 #, fuzzy
 msgid "Sender: "
 msgstr "_Denegar"
 
-#: ../src/dialogs.py:750 ../src/dialogs.py:1855
+#: ../src/dialogs.py:750 ../src/dialogs.py:1860
 #, fuzzy
 msgid "Recipient: "
 msgstr "Recientemente:"
@@ -1094,7 +1094,7 @@ msgstr ""
 msgid "Filename: %s"
 msgstr "_Nombre: "
 
-#: ../src/dialogs.py:1626 ../src/dialogs.py:1708
+#: ../src/dialogs.py:1626 ../src/dialogs.py:1713
 #, fuzzy, python-format
 msgid "Size: %s"
 msgstr "_Denegar"
@@ -1132,54 +1132,56 @@ msgstr ""
 msgid "File transfer stopped by the contact of the other side"
 msgstr ""
 
-#: ../src/dialogs.py:1678
+#. FIXME: user better name for this function
+#. atm it's like it shows popup for incoming file transfer request
+#: ../src/dialogs.py:1680
 #, fuzzy
 msgid "Choose File to Send..."
 msgstr "Elegir _clave"
 
-#: ../src/dialogs.py:1681
+#: ../src/dialogs.py:1683
 #, fuzzy
 msgid "Send"
 msgstr "_Denegar"
 
-#: ../src/dialogs.py:1705
+#: ../src/dialogs.py:1710
 #, fuzzy, python-format
 msgid "File: %s"
 msgstr "Filtro:"
 
-#: ../src/dialogs.py:1711
+#: ../src/dialogs.py:1716
 #, fuzzy, python-format
 msgid "Type: %s"
 msgstr "Tipo"
 
-#: ../src/dialogs.py:1714
+#: ../src/dialogs.py:1719
 #, fuzzy, python-format
 msgid "Description: %s"
 msgstr "Subscripción:"
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1721
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr ""
 
-#: ../src/dialogs.py:1719
+#: ../src/dialogs.py:1724
 msgid "Save File as..."
 msgstr ""
 
-#: ../src/dialogs.py:1733
+#: ../src/dialogs.py:1738
 msgid "This file already exists"
 msgstr ""
 
-#: ../src/dialogs.py:1734
+#: ../src/dialogs.py:1739
 msgid "Would you like to overwrite it?"
 msgstr ""
 
-#: ../src/dialogs.py:2027
+#: ../src/dialogs.py:2032
 #, fuzzy
 msgid "Pause"
 msgstr "Valor"
 
-#: ../src/dialogs.py:2039 ../src/gtkgui.glade.h:307
+#: ../src/dialogs.py:2044 ../src/gtkgui.glade.h:307
 #, fuzzy
 msgid "_Continue"
 msgstr "Conexión"
@@ -1387,7 +1389,7 @@ msgstr ""
 msgid "Banning %s"
 msgstr ""
 
-#: ../src/groupchat_window.py:968 ../src/tabbed_chat_window.py:327
+#: ../src/groupchat_window.py:968 ../src/tabbed_chat_window.py:340
 msgid "If you close this tab, the message will be lost."
 msgstr ""
 
@@ -1599,50 +1601,50 @@ msgstr "con "
 msgid "All contacts in this group are offline or have errors"
 msgstr "Todos los contactos de este grupo están desconectados o tienen errores"
 
-#: ../src/tabbed_chat_window.py:112 ../src/gtkgui.glade.h:184
+#: ../src/tabbed_chat_window.py:125 ../src/gtkgui.glade.h:184
 #, fuzzy
 msgid "OpenPGP Encryption"
 msgstr "Click para configurar las opciones del salón"
 
-#: ../src/tabbed_chat_window.py:115
+#: ../src/tabbed_chat_window.py:128
 #, python-format
 msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:258 ../src/tabbed_chat_window.py:326
+#: ../src/tabbed_chat_window.py:271 ../src/tabbed_chat_window.py:339
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:259
+#: ../src/tabbed_chat_window.py:272
 msgid "If you close the window, this message will be lost."
 msgstr ""
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:492
+#: ../src/tabbed_chat_window.py:512
 #, fuzzy
 msgid "A connection is not available"
 msgstr "Poner _no disponible después de:"
 
-#: ../src/tabbed_chat_window.py:493
+#: ../src/tabbed_chat_window.py:513
 msgid "Your message can not be sent until you are connected."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:581
+#: ../src/tabbed_chat_window.py:601
 #, fuzzy
 msgid "Sending private message failed"
 msgstr "_Nuevo mensaje"
 
-#: ../src/tabbed_chat_window.py:582
+#: ../src/tabbed_chat_window.py:602
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:685
+#: ../src/tabbed_chat_window.py:705
 msgid "Encryption enabled"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:690
+#: ../src/tabbed_chat_window.py:710
 msgid "Encryption disabled"
 msgstr ""
 
diff --git a/po/fr/LC_MESSAGES/gajim.po b/po/fr/LC_MESSAGES/gajim.po
index 10c2a27c5..8bf74ab62 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-13 01:27+0300\n"
+"POT-Creation-Date: 2005-08-13 13:43+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"
@@ -812,7 +812,7 @@ msgstr "Gajim"
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/dialogs.py:733 ../src/dialogs.py:842 ../src/dialogs.py:1851
+#: ../src/dialogs.py:733 ../src/dialogs.py:842 ../src/dialogs.py:1856
 msgid "Name: "
 msgstr "Nom : "
 
@@ -828,11 +828,11 @@ msgstr "Télécharger"
 msgid "Upload"
 msgstr "Envoyer"
 
-#: ../src/dialogs.py:745 ../src/dialogs.py:1853
+#: ../src/dialogs.py:745 ../src/dialogs.py:1858
 msgid "Sender: "
 msgstr "Expéditeur : "
 
-#: ../src/dialogs.py:750 ../src/dialogs.py:1855
+#: ../src/dialogs.py:750 ../src/dialogs.py:1860
 msgid "Recipient: "
 msgstr "Destinataire : "
 
@@ -1065,7 +1065,7 @@ msgstr "Progression"
 msgid "Filename: %s"
 msgstr "Nom du Fichier : %s"
 
-#: ../src/dialogs.py:1626 ../src/dialogs.py:1708
+#: ../src/dialogs.py:1626 ../src/dialogs.py:1713
 #, python-format
 msgid "Size: %s"
 msgstr "Taille : %s"
@@ -1101,51 +1101,53 @@ msgstr "La connexion avec le contact ne peut être établi."
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Transfert de fichier arrêté par le contact de l'autre coté"
 
-#: ../src/dialogs.py:1678
+#. FIXME: user better name for this function
+#. atm it's like it shows popup for incoming file transfer request
+#: ../src/dialogs.py:1680
 msgid "Choose File to Send..."
 msgstr "Choisissez un Fichier à Envoyer..."
 
-#: ../src/dialogs.py:1681
+#: ../src/dialogs.py:1683
 msgid "Send"
 msgstr "Envoyer"
 
-#: ../src/dialogs.py:1705
+#: ../src/dialogs.py:1710
 #, python-format
 msgid "File: %s"
 msgstr "Fichier : %s"
 
-#: ../src/dialogs.py:1711
+#: ../src/dialogs.py:1716
 #, python-format
 msgid "Type: %s"
 msgstr "Type : %s"
 
-#: ../src/dialogs.py:1714
+#: ../src/dialogs.py:1719
 #, python-format
 msgid "Description: %s"
 msgstr "Description : %s"
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1721
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s souhaite vous envoyer un fichier :"
 
-#: ../src/dialogs.py:1719
+#: ../src/dialogs.py:1724
 msgid "Save File as..."
 msgstr "Enregistrer le Fichier sous..."
 
-#: ../src/dialogs.py:1733
+#: ../src/dialogs.py:1738
 msgid "This file already exists"
 msgstr "Ce fichier existe déjà"
 
-#: ../src/dialogs.py:1734
+#: ../src/dialogs.py:1739
 msgid "Would you like to overwrite it?"
 msgstr "Voulez-vous l'écraser ?"
 
-#: ../src/dialogs.py:2027
+#: ../src/dialogs.py:2032
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/dialogs.py:2039 ../src/gtkgui.glade.h:307
+#: ../src/dialogs.py:2044 ../src/gtkgui.glade.h:307
 msgid "_Continue"
 msgstr "_Continuer"
 
@@ -1346,7 +1348,7 @@ msgstr "Vous pouvez saisir une raison en-dessous :"
 msgid "Banning %s"
 msgstr "Bannissement de %s"
 
-#: ../src/groupchat_window.py:968 ../src/tabbed_chat_window.py:327
+#: ../src/groupchat_window.py:968 ../src/tabbed_chat_window.py:340
 msgid "If you close this tab, the message will be lost."
 msgstr "Si vous fermez cet onglet, le message sera perdu."
 
@@ -1552,48 +1554,48 @@ msgstr "avec "
 msgid "All contacts in this group are offline or have errors"
 msgstr "Tous les contacts de ce groupe sont déconnectés ou ont des erreurs"
 
-#: ../src/tabbed_chat_window.py:112 ../src/gtkgui.glade.h:184
+#: ../src/tabbed_chat_window.py:125 ../src/gtkgui.glade.h:184
 msgid "OpenPGP Encryption"
 msgstr "Encryption OpenPGP"
 
-#: ../src/tabbed_chat_window.py:115
+#: ../src/tabbed_chat_window.py:128
 #, python-format
 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:258 ../src/tabbed_chat_window.py:326
+#: ../src/tabbed_chat_window.py:271 ../src/tabbed_chat_window.py:339
 #, 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:259
+#: ../src/tabbed_chat_window.py:272
 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:492
+#: ../src/tabbed_chat_window.py:512
 msgid "A connection is not available"
 msgstr "Aucune connexion disponible"
 
-#: ../src/tabbed_chat_window.py:493
+#: ../src/tabbed_chat_window.py:513
 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:581
+#: ../src/tabbed_chat_window.py:601
 msgid "Sending private message failed"
 msgstr "Envoi du message privé échoué"
 
-#: ../src/tabbed_chat_window.py:582
+#: ../src/tabbed_chat_window.py:602
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Vous n'êtes plus dans le salon \"%s\" ou \"%s\" l'a quitté."
 
-#: ../src/tabbed_chat_window.py:685
+#: ../src/tabbed_chat_window.py:705
 msgid "Encryption enabled"
 msgstr "Encryption activée"
 
-#: ../src/tabbed_chat_window.py:690
+#: ../src/tabbed_chat_window.py:710
 msgid "Encryption disabled"
 msgstr "Encryption désactivée"
 
diff --git a/po/gajim.pot b/po/gajim.pot
index 56d5e7b94..42a4b841c 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-13 01:27+0300\n"
+"POT-Creation-Date: 2005-08-13 13:43+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"
@@ -781,7 +781,7 @@ msgstr ""
 msgid "Gajim - %s"
 msgstr ""
 
-#: ../src/dialogs.py:733 ../src/dialogs.py:842 ../src/dialogs.py:1851
+#: ../src/dialogs.py:733 ../src/dialogs.py:842 ../src/dialogs.py:1856
 msgid "Name: "
 msgstr ""
 
@@ -797,11 +797,11 @@ msgstr ""
 msgid "Upload"
 msgstr ""
 
-#: ../src/dialogs.py:745 ../src/dialogs.py:1853
+#: ../src/dialogs.py:745 ../src/dialogs.py:1858
 msgid "Sender: "
 msgstr ""
 
-#: ../src/dialogs.py:750 ../src/dialogs.py:1855
+#: ../src/dialogs.py:750 ../src/dialogs.py:1860
 msgid "Recipient: "
 msgstr ""
 
@@ -1022,7 +1022,7 @@ msgstr ""
 msgid "Filename: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1626 ../src/dialogs.py:1708
+#: ../src/dialogs.py:1626 ../src/dialogs.py:1713
 #, python-format
 msgid "Size: %s"
 msgstr ""
@@ -1057,51 +1057,53 @@ msgstr ""
 msgid "File transfer stopped by the contact of the other side"
 msgstr ""
 
-#: ../src/dialogs.py:1678
+#. FIXME: user better name for this function
+#. atm it's like it shows popup for incoming file transfer request
+#: ../src/dialogs.py:1680
 msgid "Choose File to Send..."
 msgstr ""
 
-#: ../src/dialogs.py:1681
+#: ../src/dialogs.py:1683
 msgid "Send"
 msgstr ""
 
-#: ../src/dialogs.py:1705
+#: ../src/dialogs.py:1710
 #, python-format
 msgid "File: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1711
+#: ../src/dialogs.py:1716
 #, python-format
 msgid "Type: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1714
+#: ../src/dialogs.py:1719
 #, python-format
 msgid "Description: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1721
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr ""
 
-#: ../src/dialogs.py:1719
+#: ../src/dialogs.py:1724
 msgid "Save File as..."
 msgstr ""
 
-#: ../src/dialogs.py:1733
+#: ../src/dialogs.py:1738
 msgid "This file already exists"
 msgstr ""
 
-#: ../src/dialogs.py:1734
+#: ../src/dialogs.py:1739
 msgid "Would you like to overwrite it?"
 msgstr ""
 
-#: ../src/dialogs.py:2027
+#: ../src/dialogs.py:2032
 msgid "Pause"
 msgstr ""
 
-#: ../src/dialogs.py:2039 ../src/gtkgui.glade.h:307
+#: ../src/dialogs.py:2044 ../src/gtkgui.glade.h:307
 msgid "_Continue"
 msgstr ""
 
@@ -1300,7 +1302,7 @@ msgstr ""
 msgid "Banning %s"
 msgstr ""
 
-#: ../src/groupchat_window.py:968 ../src/tabbed_chat_window.py:327
+#: ../src/groupchat_window.py:968 ../src/tabbed_chat_window.py:340
 msgid "If you close this tab, the message will be lost."
 msgstr ""
 
@@ -1500,47 +1502,47 @@ msgstr ""
 msgid "All contacts in this group are offline or have errors"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:112 ../src/gtkgui.glade.h:184
+#: ../src/tabbed_chat_window.py:125 ../src/gtkgui.glade.h:184
 msgid "OpenPGP Encryption"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:115
+#: ../src/tabbed_chat_window.py:128
 #, python-format
 msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:258 ../src/tabbed_chat_window.py:326
+#: ../src/tabbed_chat_window.py:271 ../src/tabbed_chat_window.py:339
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:259
+#: ../src/tabbed_chat_window.py:272
 msgid "If you close the window, this message will be lost."
 msgstr ""
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:492
+#: ../src/tabbed_chat_window.py:512
 msgid "A connection is not available"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:493
+#: ../src/tabbed_chat_window.py:513
 msgid "Your message can not be sent until you are connected."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:581
+#: ../src/tabbed_chat_window.py:601
 msgid "Sending private message failed"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:582
+#: ../src/tabbed_chat_window.py:602
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:685
+#: ../src/tabbed_chat_window.py:705
 msgid "Encryption enabled"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:690
+#: ../src/tabbed_chat_window.py:710
 msgid "Encryption disabled"
 msgstr ""
 
diff --git a/po/nb/LC_MESSAGES/gajim.po b/po/nb/LC_MESSAGES/gajim.po
index 4d7a2ec05..0d0ae064f 100644
--- a/po/nb/LC_MESSAGES/gajim.po
+++ b/po/nb/LC_MESSAGES/gajim.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-13 01:27+0300\n"
+"POT-Creation-Date: 2005-08-13 13:43+0300\n"
 "PO-Revision-Date: 2005-08-12 14:31+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
@@ -802,7 +802,7 @@ msgstr "Gajim"
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/dialogs.py:733 ../src/dialogs.py:842 ../src/dialogs.py:1851
+#: ../src/dialogs.py:733 ../src/dialogs.py:842 ../src/dialogs.py:1856
 msgid "Name: "
 msgstr "Navn: "
 
@@ -818,11 +818,11 @@ msgstr "Last ned"
 msgid "Upload"
 msgstr "Last opp"
 
-#: ../src/dialogs.py:745 ../src/dialogs.py:1853
+#: ../src/dialogs.py:745 ../src/dialogs.py:1858
 msgid "Sender: "
 msgstr "Avsender: "
 
-#: ../src/dialogs.py:750 ../src/dialogs.py:1855
+#: ../src/dialogs.py:750 ../src/dialogs.py:1860
 msgid "Recipient: "
 msgstr "Mottaker: "
 
@@ -1050,7 +1050,7 @@ msgstr "Fremdrift"
 msgid "Filename: %s"
 msgstr "Filnavn: %s"
 
-#: ../src/dialogs.py:1626 ../src/dialogs.py:1708
+#: ../src/dialogs.py:1626 ../src/dialogs.py:1713
 #, python-format
 msgid "Size: %s"
 msgstr "Størrelse: %s"
@@ -1085,51 +1085,53 @@ msgstr "Tilkoblingen kan ikke opprettes."
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Fil overføringen ble stoppet av kontakten på den andre siden"
 
-#: ../src/dialogs.py:1678
+#. FIXME: user better name for this function
+#. atm it's like it shows popup for incoming file transfer request
+#: ../src/dialogs.py:1680
 msgid "Choose File to Send..."
 msgstr "Velg Fil for Sending..."
 
-#: ../src/dialogs.py:1681
+#: ../src/dialogs.py:1683
 msgid "Send"
 msgstr "Send"
 
-#: ../src/dialogs.py:1705
+#: ../src/dialogs.py:1710
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: ../src/dialogs.py:1711
+#: ../src/dialogs.py:1716
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: ../src/dialogs.py:1714
+#: ../src/dialogs.py:1719
 #, python-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1721
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s ønsker å sende deg en fil:"
 
-#: ../src/dialogs.py:1719
+#: ../src/dialogs.py:1724
 msgid "Save File as..."
 msgstr "Lagre Fil som..."
 
-#: ../src/dialogs.py:1733
+#: ../src/dialogs.py:1738
 msgid "This file already exists"
 msgstr "Denne filen finnes fra før"
 
-#: ../src/dialogs.py:1734
+#: ../src/dialogs.py:1739
 msgid "Would you like to overwrite it?"
 msgstr "Ønsker du å overskrive den?"
 
-#: ../src/dialogs.py:2027
+#: ../src/dialogs.py:2032
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/dialogs.py:2039 ../src/gtkgui.glade.h:307
+#: ../src/dialogs.py:2044 ../src/gtkgui.glade.h:307
 msgid "_Continue"
 msgstr "_Fortsett"
 
@@ -1330,7 +1332,7 @@ msgstr "Du kan spesifisere grunn under:"
 msgid "Banning %s"
 msgstr "Forbanner %s"
 
-#: ../src/groupchat_window.py:968 ../src/tabbed_chat_window.py:327
+#: ../src/groupchat_window.py:968 ../src/tabbed_chat_window.py:340
 msgid "If you close this tab, the message will be lost."
 msgstr "Dersom du lukke denne fanen, vil meldingen bli borte."
 
@@ -1534,47 +1536,47 @@ msgstr "som"
 msgid "All contacts in this group are offline or have errors"
 msgstr "Alle kontakter in denne gruppen er frakoblet eller har feil"
 
-#: ../src/tabbed_chat_window.py:112 ../src/gtkgui.glade.h:184
+#: ../src/tabbed_chat_window.py:125 ../src/gtkgui.glade.h:184
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP Kryptering"
 
-#: ../src/tabbed_chat_window.py:115
+#: ../src/tabbed_chat_window.py:128
 #, python-format
 msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
 msgstr "%s har ikke sendt en OpenPGP nøkkel og du har ikke tilegnet en"
 
-#: ../src/tabbed_chat_window.py:258 ../src/tabbed_chat_window.py:326
+#: ../src/tabbed_chat_window.py:271 ../src/tabbed_chat_window.py:339
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du fikk akkurat en ny melding fra \"%s\""
 
-#: ../src/tabbed_chat_window.py:259
+#: ../src/tabbed_chat_window.py:272
 msgid "If you close the window, this message will be lost."
 msgstr "Dersom du lukker vinduet vil du miste denne meldingen."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:492
+#: ../src/tabbed_chat_window.py:512
 msgid "A connection is not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/tabbed_chat_window.py:493
+#: ../src/tabbed_chat_window.py:513
 msgid "Your message can not be sent until you are connected."
 msgstr "Meldingen din kan ikke sendes før du er tilkoblet."
 
-#: ../src/tabbed_chat_window.py:581
+#: ../src/tabbed_chat_window.py:601
 msgid "Sending private message failed"
 msgstr "Sending av privat melding feilet"
 
-#: ../src/tabbed_chat_window.py:582
+#: ../src/tabbed_chat_window.py:602
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Du er ikke lenger i rommet \"%s\" eller \"%s\" har dratt."
 
-#: ../src/tabbed_chat_window.py:685
+#: ../src/tabbed_chat_window.py:705
 msgid "Encryption enabled"
 msgstr "Kryptering påslått"
 
-#: ../src/tabbed_chat_window.py:690
+#: ../src/tabbed_chat_window.py:710
 msgid "Encryption disabled"
 msgstr "Kryptering avslått"
 
diff --git a/po/pl/LC_MESSAGES/gajim.po b/po/pl/LC_MESSAGES/gajim.po
index b11336c09..3bedebed7 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-13 01:27+0300\n"
+"POT-Creation-Date: 2005-08-13 13:43+0300\n"
 "PO-Revision-Date: 2005-08-01 21:46+0200\n"
 "Last-Translator: Witek Kieraś <pambuk@gmail.com>\n"
 "Language-Team: none\n"
@@ -804,7 +804,7 @@ msgstr "Gajim"
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/dialogs.py:733 ../src/dialogs.py:842 ../src/dialogs.py:1851
+#: ../src/dialogs.py:733 ../src/dialogs.py:842 ../src/dialogs.py:1856
 msgid "Name: "
 msgstr "Nazwa: "
 
@@ -822,11 +822,11 @@ msgstr "Otwórz stronę pobierania"
 msgid "Upload"
 msgstr ""
 
-#: ../src/dialogs.py:745 ../src/dialogs.py:1853
+#: ../src/dialogs.py:745 ../src/dialogs.py:1858
 msgid "Sender: "
 msgstr "Nadawca: "
 
-#: ../src/dialogs.py:750 ../src/dialogs.py:1855
+#: ../src/dialogs.py:750 ../src/dialogs.py:1860
 #, fuzzy
 msgid "Recipient: "
 msgstr "Ostatnio:"
@@ -1067,7 +1067,7 @@ msgstr "Postęp"
 msgid "Filename: %s"
 msgstr "Nazwa Pliku: %s"
 
-#: ../src/dialogs.py:1626 ../src/dialogs.py:1708
+#: ../src/dialogs.py:1626 ../src/dialogs.py:1713
 #, python-format
 msgid "Size: %s"
 msgstr "Rozmiar: %s"
@@ -1107,54 +1107,56 @@ msgstr "Nie można ustanowić połączenia z \"%s\""
 msgid "File transfer stopped by the contact of the other side"
 msgstr "Przesyłanie pliku zostało zatrzymane przez drugą osobę."
 
-#: ../src/dialogs.py:1678
+#. FIXME: user better name for this function
+#. atm it's like it shows popup for incoming file transfer request
+#: ../src/dialogs.py:1680
 #, fuzzy
 msgid "Choose File to Send..."
 msgstr "Wybierz _Klucz..."
 
-#: ../src/dialogs.py:1681
+#: ../src/dialogs.py:1683
 #, fuzzy
 msgid "Send"
 msgstr "_Wyślij"
 
-#: ../src/dialogs.py:1705
+#: ../src/dialogs.py:1710
 #, python-format
 msgid "File: %s"
 msgstr "Plik: %s"
 
-#: ../src/dialogs.py:1711
+#: ../src/dialogs.py:1716
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/dialogs.py:1714
+#: ../src/dialogs.py:1719
 #, python-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1721
 #, fuzzy, python-format
 msgid "%s wants to send you a file:"
 msgstr "% chce przesłać plik"
 
-#: ../src/dialogs.py:1719
+#: ../src/dialogs.py:1724
 #, fuzzy
 msgid "Save File as..."
 msgstr "Zapisz plik jako..."
 
-#: ../src/dialogs.py:1733
+#: ../src/dialogs.py:1738
 msgid "This file already exists"
 msgstr ""
 
-#: ../src/dialogs.py:1734
+#: ../src/dialogs.py:1739
 msgid "Would you like to overwrite it?"
 msgstr ""
 
-#: ../src/dialogs.py:2027
+#: ../src/dialogs.py:2032
 msgid "Pause"
 msgstr "Zatrzymaj"
 
-#: ../src/dialogs.py:2039 ../src/gtkgui.glade.h:307
+#: ../src/dialogs.py:2044 ../src/gtkgui.glade.h:307
 msgid "_Continue"
 msgstr "_Kontynuuj"
 
@@ -1357,7 +1359,7 @@ msgstr "Podaj przyczynę:"
 msgid "Banning %s"
 msgstr "Zabanuj %s"
 
-#: ../src/groupchat_window.py:968 ../src/tabbed_chat_window.py:327
+#: ../src/groupchat_window.py:968 ../src/tabbed_chat_window.py:340
 msgid "If you close this tab, the message will be lost."
 msgstr "Jeśłi zamkniesz kartę, to utracisz tę wiadomość."
 
@@ -1563,51 +1565,51 @@ msgid "All contacts in this group are offline or have errors"
 msgstr ""
 "Wszystkie kontakty w tej grupie są niedostępne lub wystąpiły w nich błędy"
 
-#: ../src/tabbed_chat_window.py:112 ../src/gtkgui.glade.h:184
+#: ../src/tabbed_chat_window.py:125 ../src/gtkgui.glade.h:184
 msgid "OpenPGP Encryption"
 msgstr "Szyfrowanie OpenPGP"
 
-#: ../src/tabbed_chat_window.py:115
+#: ../src/tabbed_chat_window.py:128
 #, python-format
 msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
 msgstr ""
 "Ani %s nie przesyła swojego klucza OpenPGP ani Ty nie przypisałeś mu żadnego "
 "klucza."
 
-#: ../src/tabbed_chat_window.py:258 ../src/tabbed_chat_window.py:326
+#: ../src/tabbed_chat_window.py:271 ../src/tabbed_chat_window.py:339
 #, 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:259
+#: ../src/tabbed_chat_window.py:272
 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:492
+#: ../src/tabbed_chat_window.py:512
 msgid "A connection is not available"
 msgstr "Połączenie jest niemożliwe"
 
-#: ../src/tabbed_chat_window.py:493
+#: ../src/tabbed_chat_window.py:513
 #, 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:581
+#: ../src/tabbed_chat_window.py:601
 #, fuzzy
 msgid "Sending private message failed"
 msgstr "_Wyślij prywatną wiadomość"
 
-#: ../src/tabbed_chat_window.py:582
+#: ../src/tabbed_chat_window.py:602
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:685
+#: ../src/tabbed_chat_window.py:705
 msgid "Encryption enabled"
 msgstr "Szyfrowanie włączone"
 
-#: ../src/tabbed_chat_window.py:690
+#: ../src/tabbed_chat_window.py:710
 msgid "Encryption disabled"
 msgstr "Szyfrowanie wyłączone"
 
diff --git a/po/pt/LC_MESSAGES/gajim.po b/po/pt/LC_MESSAGES/gajim.po
index fb80ba59f..c6194a7fa 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-13 01:27+0300\n"
+"POT-Creation-Date: 2005-08-13 13:43+0300\n"
 "PO-Revision-Date: 2005-03-22 17:47-0300\n"
 "Last-Translator: Junix <junix@infolink.com.br>\n"
 "Language-Team: none\n"
@@ -819,7 +819,7 @@ msgstr "Gajim"
 msgid "Gajim - %s"
 msgstr "Gajim"
 
-#: ../src/dialogs.py:733 ../src/dialogs.py:842 ../src/dialogs.py:1851
+#: ../src/dialogs.py:733 ../src/dialogs.py:842 ../src/dialogs.py:1856
 #, fuzzy
 msgid "Name: "
 msgstr "_Nome: "
@@ -838,12 +838,12 @@ msgstr "Abrir Página para Download"
 msgid "Upload"
 msgstr ""
 
-#: ../src/dialogs.py:745 ../src/dialogs.py:1853
+#: ../src/dialogs.py:745 ../src/dialogs.py:1858
 #, fuzzy
 msgid "Sender: "
 msgstr "_Negar"
 
-#: ../src/dialogs.py:750 ../src/dialogs.py:1855
+#: ../src/dialogs.py:750 ../src/dialogs.py:1860
 #, fuzzy
 msgid "Recipient: "
 msgstr "Recentemente:"
@@ -1087,7 +1087,7 @@ msgstr ""
 msgid "Filename: %s"
 msgstr "_Nome: "
 
-#: ../src/dialogs.py:1626 ../src/dialogs.py:1708
+#: ../src/dialogs.py:1626 ../src/dialogs.py:1713
 #, fuzzy, python-format
 msgid "Size: %s"
 msgstr "_Negar"
@@ -1125,54 +1125,56 @@ msgstr ""
 msgid "File transfer stopped by the contact of the other side"
 msgstr ""
 
-#: ../src/dialogs.py:1678
+#. FIXME: user better name for this function
+#. atm it's like it shows popup for incoming file transfer request
+#: ../src/dialogs.py:1680
 #, fuzzy
 msgid "Choose File to Send..."
 msgstr "_Escolha chave"
 
-#: ../src/dialogs.py:1681
+#: ../src/dialogs.py:1683
 #, fuzzy
 msgid "Send"
 msgstr "_Negar"
 
-#: ../src/dialogs.py:1705
+#: ../src/dialogs.py:1710
 #, fuzzy, python-format
 msgid "File: %s"
 msgstr "Filtro:"
 
-#: ../src/dialogs.py:1711
+#: ../src/dialogs.py:1716
 #, fuzzy, python-format
 msgid "Type: %s"
 msgstr "Tipo"
 
-#: ../src/dialogs.py:1714
+#: ../src/dialogs.py:1719
 #, fuzzy, python-format
 msgid "Description: %s"
 msgstr "Inscrição:"
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1721
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr ""
 
-#: ../src/dialogs.py:1719
+#: ../src/dialogs.py:1724
 msgid "Save File as..."
 msgstr ""
 
-#: ../src/dialogs.py:1733
+#: ../src/dialogs.py:1738
 msgid "This file already exists"
 msgstr ""
 
-#: ../src/dialogs.py:1734
+#: ../src/dialogs.py:1739
 msgid "Would you like to overwrite it?"
 msgstr ""
 
-#: ../src/dialogs.py:2027
+#: ../src/dialogs.py:2032
 #, fuzzy
 msgid "Pause"
 msgstr "Valor"
 
-#: ../src/dialogs.py:2039 ../src/gtkgui.glade.h:307
+#: ../src/dialogs.py:2044 ../src/gtkgui.glade.h:307
 #, fuzzy
 msgid "_Continue"
 msgstr "Conectando"
@@ -1382,7 +1384,7 @@ msgstr ""
 msgid "Banning %s"
 msgstr ""
 
-#: ../src/groupchat_window.py:968 ../src/tabbed_chat_window.py:327
+#: ../src/groupchat_window.py:968 ../src/tabbed_chat_window.py:340
 msgid "If you close this tab, the message will be lost."
 msgstr ""
 
@@ -1594,50 +1596,50 @@ msgstr "como "
 msgid "All contacts in this group are offline or have errors"
 msgstr "Todos os contatos deste grupo estão offline ou existem erros"
 
-#: ../src/tabbed_chat_window.py:112 ../src/gtkgui.glade.h:184
+#: ../src/tabbed_chat_window.py:125 ../src/gtkgui.glade.h:184
 #, fuzzy
 msgid "OpenPGP Encryption"
 msgstr "Clique para configurar as opçôes da sala"
 
-#: ../src/tabbed_chat_window.py:115
+#: ../src/tabbed_chat_window.py:128
 #, python-format
 msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:258 ../src/tabbed_chat_window.py:326
+#: ../src/tabbed_chat_window.py:271 ../src/tabbed_chat_window.py:339
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:259
+#: ../src/tabbed_chat_window.py:272
 msgid "If you close the window, this message will be lost."
 msgstr ""
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:492
+#: ../src/tabbed_chat_window.py:512
 #, fuzzy
 msgid "A connection is not available"
 msgstr "Marcar como _afastado depois:"
 
-#: ../src/tabbed_chat_window.py:493
+#: ../src/tabbed_chat_window.py:513
 msgid "Your message can not be sent until you are connected."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:581
+#: ../src/tabbed_chat_window.py:601
 #, fuzzy
 msgid "Sending private message failed"
 msgstr "_Nova Mensagem"
 
-#: ../src/tabbed_chat_window.py:582
+#: ../src/tabbed_chat_window.py:602
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:685
+#: ../src/tabbed_chat_window.py:705
 msgid "Encryption enabled"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:690
+#: ../src/tabbed_chat_window.py:710
 msgid "Encryption disabled"
 msgstr ""
 
diff --git a/po/ru/LC_MESSAGES/gajim.po b/po/ru/LC_MESSAGES/gajim.po
index 85855743b..e7d7fb057 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-13 01:27+0300\n"
+"POT-Creation-Date: 2005-08-13 13:43+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"
@@ -829,7 +829,7 @@ msgstr "Gajim"
 msgid "Gajim - %s"
 msgstr "Gajim"
 
-#: ../src/dialogs.py:733 ../src/dialogs.py:842 ../src/dialogs.py:1851
+#: ../src/dialogs.py:733 ../src/dialogs.py:842 ../src/dialogs.py:1856
 #, fuzzy
 msgid "Name: "
 msgstr "_Имя: "
@@ -848,12 +848,12 @@ msgstr "Открыть Страницу Загрузки"
 msgid "Upload"
 msgstr ""
 
-#: ../src/dialogs.py:745 ../src/dialogs.py:1853
+#: ../src/dialogs.py:745 ../src/dialogs.py:1858
 #, fuzzy
 msgid "Sender: "
 msgstr "Сервер:"
 
-#: ../src/dialogs.py:750 ../src/dialogs.py:1855
+#: ../src/dialogs.py:750 ../src/dialogs.py:1860
 #, fuzzy
 msgid "Recipient: "
 msgstr "Недавно:"
@@ -1095,7 +1095,7 @@ msgstr ""
 msgid "Filename: %s"
 msgstr "_Имя: "
 
-#: ../src/dialogs.py:1626 ../src/dialogs.py:1708
+#: ../src/dialogs.py:1626 ../src/dialogs.py:1713
 #, fuzzy, python-format
 msgid "Size: %s"
 msgstr "_Отклонить"
@@ -1133,54 +1133,56 @@ msgstr ""
 msgid "File transfer stopped by the contact of the other side"
 msgstr ""
 
-#: ../src/dialogs.py:1678
+#. FIXME: user better name for this function
+#. atm it's like it shows popup for incoming file transfer request
+#: ../src/dialogs.py:1680
 #, fuzzy
 msgid "Choose File to Send..."
 msgstr "Использовать _ключ"
 
-#: ../src/dialogs.py:1681
+#: ../src/dialogs.py:1683
 #, fuzzy
 msgid "Send"
 msgstr "_Отклонить"
 
-#: ../src/dialogs.py:1705
+#: ../src/dialogs.py:1710
 #, fuzzy, python-format
 msgid "File: %s"
 msgstr "Фильтр:"
 
-#: ../src/dialogs.py:1711
+#: ../src/dialogs.py:1716
 #, fuzzy, python-format
 msgid "Type: %s"
 msgstr "Тип"
 
-#: ../src/dialogs.py:1714
+#: ../src/dialogs.py:1719
 #, fuzzy, python-format
 msgid "Description: %s"
 msgstr "Подписка:"
 
-#: ../src/dialogs.py:1716
+#: ../src/dialogs.py:1721
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr ""
 
-#: ../src/dialogs.py:1719
+#: ../src/dialogs.py:1724
 msgid "Save File as..."
 msgstr ""
 
-#: ../src/dialogs.py:1733
+#: ../src/dialogs.py:1738
 msgid "This file already exists"
 msgstr ""
 
-#: ../src/dialogs.py:1734
+#: ../src/dialogs.py:1739
 msgid "Would you like to overwrite it?"
 msgstr ""
 
-#: ../src/dialogs.py:2027
+#: ../src/dialogs.py:2032
 #, fuzzy
 msgid "Pause"
 msgstr "Значение"
 
-#: ../src/dialogs.py:2039 ../src/gtkgui.glade.h:307
+#: ../src/dialogs.py:2044 ../src/gtkgui.glade.h:307
 #, fuzzy
 msgid "_Continue"
 msgstr "Соединяюсь"
@@ -1390,7 +1392,7 @@ msgstr ""
 msgid "Banning %s"
 msgstr ""
 
-#: ../src/groupchat_window.py:968 ../src/tabbed_chat_window.py:327
+#: ../src/groupchat_window.py:968 ../src/tabbed_chat_window.py:340
 msgid "If you close this tab, the message will be lost."
 msgstr ""
 
@@ -1602,50 +1604,50 @@ msgstr "как "
 msgid "All contacts in this group are offline or have errors"
 msgstr "Все контакты в это группе отключены или имеют ошибки"
 
-#: ../src/tabbed_chat_window.py:112 ../src/gtkgui.glade.h:184
+#: ../src/tabbed_chat_window.py:125 ../src/gtkgui.glade.h:184
 #, fuzzy
 msgid "OpenPGP Encryption"
 msgstr "Настройки комнаты"
 
-#: ../src/tabbed_chat_window.py:115
+#: ../src/tabbed_chat_window.py:128
 #, python-format
 msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:258 ../src/tabbed_chat_window.py:326
+#: ../src/tabbed_chat_window.py:271 ../src/tabbed_chat_window.py:339
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:259
+#: ../src/tabbed_chat_window.py:272
 msgid "If you close the window, this message will be lost."
 msgstr ""
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:492
+#: ../src/tabbed_chat_window.py:512
 #, fuzzy
 msgid "A connection is not available"
 msgstr "_Недоступен после:"
 
-#: ../src/tabbed_chat_window.py:493
+#: ../src/tabbed_chat_window.py:513
 msgid "Your message can not be sent until you are connected."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:581
+#: ../src/tabbed_chat_window.py:601
 #, fuzzy
 msgid "Sending private message failed"
 msgstr "_Новое Сообщение"
 
-#: ../src/tabbed_chat_window.py:582
+#: ../src/tabbed_chat_window.py:602
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:685
+#: ../src/tabbed_chat_window.py:705
 msgid "Encryption enabled"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:690
+#: ../src/tabbed_chat_window.py:710
 msgid "Encryption disabled"
 msgstr ""