merge diff from trunk

12 files changed, 41865 insertions, 11676 deletions

diff --git a/po/LINGUAS b/po/LINGUAS
index 0bf5641a2..476281bef 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,2 +1,30 @@
 # available languages
-fr pt el pl es ru bg de nb cs nl pt_BR sv it eu sk no zh_CN br eo hr en_GB be sr gl_ES
+fr
+pt
+el
+pl
+es
+ru
+bg
+de
+nb
+cs
+nl
+pt_BR
+sv
+it
+eu
+sk
+no
+zh_CN
+br
+eo
+hr
+en_GB
+be
+be@latin
+sr
+sr@Latn
+gl
+lt
+da
diff --git a/po/cs.po b/po/cs.po
index dcbedded6..f56c61c84 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,11 +14,15 @@
 # Petr Mensik <pihhan@seznam.cz>, 2005.
 # Pihhan <pihhan@seznam.cz>, 2005, 2006.
 #
+#: ../src/gajim-remote.py:212 ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:245 ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:252 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254 ../src/gajim-remote.py:255
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-06 12:50+0100\n"
+"POT-Creation-Date: 2007-08-25 00:27+0200\n"
 "PO-Revision-Date: 2007-02-06 21:51+0100\n"
 "Last-Translator: Petr Menšík <pihhan@seznam.cz>\n"
 "Language-Team:  <cs@li.org>\n"
@@ -43,46 +47,53 @@ msgid "Jabber IM Client"
 msgstr "Jabber IM klient"
 
 #: ../data/glade/account_context_menu.glade.h:1
-msgid "Send Single _Message..."
-msgstr "Odeslat jednoduchou _zprávu..."
+#: ../data/glade/chat_context_menu.glade.h:1
+#: ../data/glade/roster_window.glade.h:8
+msgid "Join _Group Chat"
+msgstr "Vstoupit do _Diskuze"
 
 #: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "Přid_at kontakt..."
+#, fuzzy
+msgid "_Add Contact"
+msgstr "Přidat _kontakt"
 
 # FIXME: chtelo by to cesky vyraz pro service discovery
 #: ../data/glade/account_context_menu.glade.h:3
-msgid "_Discover Services..."
-msgstr "_Prohlížet služby..."
+#: ../data/glade/roster_window.glade.h:15
+msgid "_Discover Services"
+msgstr "_Prohlížet služby"
 
-#: ../data/glade/account_context_menu.glade.h:4
-#: ../src/disco.py:1145
-msgid "_Execute Command..."
+#: ../data/glade/account_context_menu.glade.h:4 ../src/disco.py:1143
+#, fuzzy
+msgid "_Execute Command"
 msgstr "Spustit _příkaz..."
 
 #: ../data/glade/account_context_menu.glade.h:5
-#: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Diskuze"
-
-#: ../data/glade/account_context_menu.glade.h:6
 #: ../data/glade/zeroconf_context_menu.glade.h:1
 msgid "_Modify Account..."
 msgstr "Upravit úč_et..."
 
-#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/account_context_menu.glade.h:6
 msgid "_Open Gmail Inbox"
 msgstr "_Otevři schránku Gmailu"
 
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/chat_context_menu.glade.h:7
+#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/subscription_request_popup_menu.glade.h:1
+#: ../data/glade/systray_context_menu.glade.h:7
+msgid "_Start Chat"
+msgstr "_Začít rozhovor"
+
 #: ../data/glade/account_context_menu.glade.h:8
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
 msgstr "_Stav"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:1
+#, fuzzy
 msgid ""
-"<b>Account is being created</b>\n"
+"<b>Connecting to server</b>\n"
 "\n"
 "Please wait..."
 msgstr ""
@@ -99,115 +110,131 @@ msgid "<b>Please fill in the data for your new account</b>"
 msgstr "<b>Prosím vyplňte údaje pro Váš nový účet</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:6
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr "Klikněte pro seznam vlastností (jako MSN, ICQ transporty) jabber serverů"
+msgid "<b>Please select a server</b>"
+msgstr ""
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+msgstr ""
+"Klikněte pro seznam vlastností (jako MSN, ICQ transporty) jabber serverů"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:8
 msgid "Connect when I press Finish"
 msgstr "Připojit když stisknu Dokončit"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/glade/account_creation_wizard_window.glade.h:9
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Průvodce vytváření účtu"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:9
+#: ../data/glade/account_creation_wizard_window.glade.h:10
 msgid "I already have an account I want to use"
 msgstr "Už mám účet který bych rád(a) použil(a)"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "I want to _register for a new account"
 msgstr "Chtěl(a) bych za_registrovat nový účet"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
-#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:22
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Pokud bude zaškrtnuto, Gajim si bude pamatovat heslo pro tento účet"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
-#: ../data/glade/manage_proxies_window.glade.h:7
-msgid "Pass_word:"
-msgstr "He_slo:"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:32
+msgid "Manage..."
+msgstr "Spravovat..."
+
+#: ../data/glade/account_creation_wizard_window.glade.h:14
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Proxy:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Save pass_word"
 msgstr "Uložit _heslo"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 msgid "Servers Features"
 msgstr "Vlastnosti serveru"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 msgid "Set my profile when I connect"
 msgstr "Nastavit profil, když se připojuji"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:53
+msgid "Use custom hostname/port"
+msgstr "Použít vlastní jméno počítače/port"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
 msgstr "Potřebujete mít účet pro připojení k síti Jabber."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:21
 msgid "Your JID:"
 msgstr "Vaše JID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Advanced"
 msgstr "_Rozšířené"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:23
 msgid "_Finish"
 msgstr "_Dokončit"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "_Počítač:"
+#: ../data/glade/account_creation_wizard_window.glade.h:24
+#, fuzzy
+msgid "_Hostname:"
+msgstr "Počítač: "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_modification_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Password:"
 msgstr "_Heslo:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:23
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 #: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "_Retype Password:"
-msgstr "Z_opakuj heslo:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:27
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
-msgid "_Use proxy"
-msgstr "_Používat proxy"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:28
 #: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_Username:"
 msgstr "_Uživatel:"
 
 #: ../data/glade/account_modification_window.glade.h:1
+#: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:8
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Příslušenství</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:2
 #: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:3
 #: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Osobní údaje</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:4
 msgid "Account"
 msgstr "Účet"
 
@@ -216,227 +243,344 @@ msgid "Account Modification"
 msgstr "Úprava účtu"
 
 #: ../data/glade/account_modification_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "Administration operations"
+msgstr "Seznam správců"
+
+#: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Auto-reconnect when connection is lost"
 msgstr "Automaticky se znovu připojit při ztrátě spojení"
 
-#: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:7
 #: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "_Připojit po startu Gajimu"
 
-#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:8
 msgid "Chan_ge Password"
 msgstr "_Změnit heslo"
 
-#: ../data/glade/account_modification_window.glade.h:9
-msgid "Check this so Gajim will connect in port 5223 where legacy servers are expected to have SSL capabilities. Note that Gajim uses TLS encryption by default if broadcasted by the server, and with this option enabled TLS will be disabled"
-msgstr "Zaškrtněte pokud se má Gajim připojit na port 5223, kde obvykle nabízejí starší servery SSL. Pozor- Gajim použije TLS šifrování standardně, pokud server ohlásí jeho podporu. Touto volbou bude TLS vypnuto"
-
 #: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:9
+msgid ""
+"Check this so Gajim will connect in port 5223 where legacy servers are "
+"expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
+"default if broadcasted by the server, and with this option enabled TLS will "
+"be disabled"
+msgstr ""
+"Zaškrtněte pokud se má Gajim připojit na port 5223, kde obvykle nabízejí "
+"starší servery SSL. Pozor- Gajim použije TLS šifrování standardně, pokud "
+"server ohlásí jeho podporu. Touto volbou bude TLS vypnuto"
+
+#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:10
 #: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Vyberte _klíč..."
 
-#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:11
 msgid "Click to change account's password"
 msgstr "Klikněte pro změnu hesla k účtu"
 
-#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:12
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:13
 msgid "Connection"
 msgstr "Spojení"
 
-#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/account_modification_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Edit Personal Information..."
 msgstr "Upravit osobní informace..."
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5
-#: ../src/notify.py:458
-#: ../src/notify.py:480
-#: ../src/notify.py:492
-#: ../src/common/helpers.py:914
+#. No configured account
+#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:6 ../src/notify.py:470
+#: ../src/notify.py:492 ../src/notify.py:504 ../src/common/helpers.py:964
+#: ../src/common/helpers.py:976
 msgid "Gajim"
 msgstr "Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:15
+#. General group cannot be changed
+#: ../data/glade/account_modification_window.glade.h:17
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/preferences_window.glade.h:51
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:346
-#: ../src/roster_window.py:1224
-#: ../src/roster_window.py:1435
-#: ../src/roster_window.py:2111
-#: ../src/roster_window.py:2153
-#: ../src/common/contacts.py:284
+#: ../src/roster_window.py:358 ../src/roster_window.py:623
+#: ../src/roster_window.py:1354 ../src/roster_window.py:1722
+#: ../src/roster_window.py:2112 ../src/roster_window.py:2628
+#: ../src/roster_window.py:2746 ../src/common/contacts.py:309
 msgid "General"
 msgstr "Obecné"
 
-#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:20
 msgid "Hostname: "
 msgstr "Počítač: "
 
-#: ../data/glade/account_modification_window.glade.h:17
-msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working."
-msgstr "Pokud je zaškrtnuto, Gajim ohlásí navíc několik dalších IP kromě Vaší IP, takže přenos souboru má větší šanci správného fungování."
-
 #: ../data/glade/account_modification_window.glade.h:19
-msgid "If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection"
-msgstr "Pokud zaškrtnuto, Gajim bude posílat keep-alive pakety, aby předešel ztrátě spojení způsobeném vypršením spojení"
-
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/zeroconf_properties_window.glade.h:8
-msgid "If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you"
-msgstr "Pokud zaškrtnuto, Gajim uloží heslo v ~/.gajim/config s právem čtení pouze pro Vás"
+#: ../data/glade/accounts_window.glade.h:21
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Pokud je zaškrtnuto, Gajim ohlásí navíc několik dalších IP kromě Vaší IP, "
+"takže přenos souboru má větší šanci správného fungování."
 
 #: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/zeroconf_properties_window.glade.h:9
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "Pokud zaškrtnuto, Gajim po spuštění se automaticky připojí pomocí tohoto účtu"
+#: ../data/glade/accounts_window.glade.h:23
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Pokud zaškrtnuto, Gajim bude posílat keep-alive pakety, aby předešel ztrátě "
+"spojení způsobeném vypršením spojení"
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:10
-msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly"
-msgstr "Pokud zaškrtnuto, jakákoliv změna globálního stavu (pomocí comboboxu na spodní straně Seznamu) změní stav tohoto účtu také"
+#: ../data/glade/accounts_window.glade.h:24
+#: ../data/glade/zeroconf_properties_window.glade.h:8
+msgid ""
+"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+"permission only for you"
+msgstr ""
+"Pokud zaškrtnuto, Gajim uloží heslo v ~/.gajim/config s právem čtení pouze "
+"pro Vás"
 
 #: ../data/glade/account_modification_window.glade.h:23
-msgid "Information about you, as stored in the server"
-msgstr "Informace o Vás, jak jsou uloženy na serveru"
+#: ../data/glade/accounts_window.glade.h:25
+#: ../data/glade/zeroconf_properties_window.glade.h:9
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Pokud zaškrtnuto, Gajim po spuštění se automaticky připojí pomocí tohoto účtu"
 
 #: ../data/glade/account_modification_window.glade.h:24
-msgid "Manage..."
-msgstr "Spravovat..."
+#: ../data/glade/accounts_window.glade.h:26
+#: ../data/glade/zeroconf_properties_window.glade.h:10
+msgid ""
+"If checked, any change to the global status (handled by the combobox at the "
+"bottom of the roster window) will change the status of this account "
+"accordingly"
+msgstr ""
+"Pokud zaškrtnuto, jakákoliv změna globálního stavu (pomocí comboboxu na "
+"spodní straně Seznamu) změní stav tohoto účtu také"
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16
-#: ../src/config.py:1608
-#: ../src/config.py:3405
+#: ../data/glade/accounts_window.glade.h:29
+msgid "Information about you, as stored in the server"
+msgstr "Informace o Vás, jak jsou uloženy na serveru"
+
+#: ../data/glade/account_modification_window.glade.h:27
+#: ../data/glade/accounts_window.glade.h:34
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1589
+#: ../src/config.py:2075
 msgid "No key selected"
 msgstr "Není zvolen žádný klíč"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../src/config.py:1188
-#: ../src/config.py:1193
-#: ../src/config.py:1377
-#: ../src/config.py:1598
-#: ../src/config.py:1607
-#: ../src/config.py:1667
-#: ../src/config.py:1741
-#: ../src/config.py:3395
-#: ../src/config.py:3404
-#: ../src/dialogs.py:281
-#: ../src/dialogs.py:283
+#. GPG Key
+#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:32 ../src/config.py:1175
+#: ../src/config.py:1246 ../src/config.py:1495 ../src/config.py:1500
+#: ../src/config.py:1971 ../src/config.py:2058 ../src/config.py:2074
+#: ../src/config.py:3167 ../src/config.py:3213 ../src/dialogs.py:285
+#: ../src/dialogs.py:287 ../src/roster_window.py:1826
+#: ../src/roster_window.py:1833 ../src/roster_window.py:1840
 msgid "None"
 msgstr "Žádný"
 
-#: ../data/glade/account_modification_window.glade.h:28
+#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/accounts_window.glade.h:37
 #: ../data/glade/profile_window.glade.h:26
 #: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Osobní údaje"
 
-#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:38
 msgid "Port: "
 msgstr "Port: "
 
-#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:39
 msgid "Priori_ty:"
 msgstr "Priori_ta:"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events"
-msgstr "Priorita je v Jabberu použita ke zjištění, kdo obdrží zprávu od jabber serveru, pokud je připojeno více klientů přes stejný účet. Zprávu obdrží klient s vyšší prioritou"
+#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:40
+msgid ""
+"Priority is used in Jabber to determine who gets the events from the jabber "
+"server when two or more clients are connected using the same account; The "
+"client with the highest priority gets the events"
+msgstr ""
+"Priorita je v Jabberu použita ke zjištění, kdo obdrží zprávu od jabber "
+"serveru, pokud je připojeno více klientů přes stejný účet. Zprávu obdrží "
+"klient s vyšší prioritou"
 
-#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr "Priorita se automaticky změní podle vašeho stavu."
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:42
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/accounts_window.glade.h:44
 msgid "Resour_ce:"
 msgstr "Zd_roj: "
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)"
-msgstr "Zdroj je odeslán Jabber serveru pro oddělení stejné JID na dvě nebo více částí závisejících na počtu připojených klientů na stejný server se stejným účtem. Takže můžete být připojeni ke stejnému účtu se zdroji 'Domov' a 'Práce' zároveň. Zdroj, který má nejvyšší prioritu obdrží zprávy. (více následuje)"
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/accounts_window.glade.h:45
+msgid ""
+"Resource is sent to the Jabber server in order to separate the same JID in "
+"two or more parts depending on the number of the clients connected in the "
+"same server with the same account. So you might be connected in the same "
+"account with resource 'Home' and 'Work' at the same time. The resource which "
+"has the highest priority will get the events. (see below)"
+msgstr ""
+"Zdroj je odeslán Jabber serveru pro oddělení stejné JID na dvě nebo více "
+"částí závisejících na počtu připojených klientů na stejný server se stejným "
+"účtem. Takže můžete být připojeni ke stejnému účtu se zdroji 'Domov' a "
+"'Práce' zároveň. Zdroj, který má nejvyšší prioritu obdrží zprávy. (více "
+"následuje)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/accounts_window.glade.h:46
 #: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Uložit _heslo (nebezpečné)"
 
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:47
 #: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Uložit _historii pro všechny kontakty"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Odesílat keep-alive pakety"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Synch_ronizovat stav účtu s globálním stavem"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:51
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "Zobrazit _odpojené kontakty"
+
+#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/accounts_window.glade.h:52
 msgid "Use _SSL (legacy)"
 msgstr "Použít _SSL (staré)"
 
-#: ../data/glade/account_modification_window.glade.h:42
-msgid "Use custom hostname/port"
-msgstr "Použít vlastní jméno počítače/port"
-
-#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:55
 msgid "Use file transfer proxies"
 msgstr "Použij proxy při přenosu souborů"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "N_astavit podle stavu"
 
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/account_modification_window.glade.h:49
 msgid "_Name:"
 msgstr "_Jméno: "
 
-#: ../data/glade/accounts_window.glade.h:1
-msgid "Accounts"
-msgstr "Účty"
+#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-Mail:"
 
-#: ../data/glade/accounts_window.glade.h:2
+#. XML Console enable checkbutton
+#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Povolit"
+
+#: ../data/glade/accounts_window.glade.h:17
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+msgid "First Name:"
+msgstr "Křestní:"
+
+#: ../data/glade/accounts_window.glade.h:27
+#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
-"If checked, all local contacts that use a Bonjour compatible chat client (like iChat, Trillian or Gaim) will be shown in roster. You don't need to be connected to a jabber server for it to work.\n"
-"This is only available if python-avahi is installed and avahi-daemon is running."
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
 msgstr ""
-"Pokud je zaškrtnuto, všechny místní kontakty používající Bonjour-kompatibilního klienta (iChat, Trillian nebo Gaim) se zobrazí v rosteru. Nemusíš být připojený(á) k jabber serveru, aby to fungovalo.\n"
-"Je to dostupné pouze v případě, že je nainstalováno python-avahi a avahi-daemon běží."
+"Pokud výchozí port použitý k přijímání zpráv nevyhovuje tvému nastavení, "
+"můžeš si zvolit jiný.\n"
+"Můžeš také zvážit změnu nastavení firewallu."
 
-#: ../data/glade/accounts_window.glade.h:4
-msgid "If you have 2 or more accounts and this is checked, Gajim will list all contacts as if you had one account"
-msgstr "Máte-li 2 nebo více účtů a je zaškrtnuto, Gajim zobrazí všechny kontakty jako by byly z jednoho účtu"
+#: ../data/glade/accounts_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:452
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:31
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+msgid "Last Name:"
+msgstr "Příjmení:"
+
+#: ../data/glade/accounts_window.glade.h:33
 msgid "Mer_ge accounts"
 msgstr "_Spojit účty"
 
-#: ../data/glade/accounts_window.glade.h:6
-msgid "_Enable link-local messaging"
-msgstr "_Povolit lokální zprávy"
+#. Rename
+#: ../data/glade/accounts_window.glade.h:43 ../src/roster_window.py:2698
+msgid "Re_name"
+msgstr "Přejme_novat"
 
-#: ../data/glade/accounts_window.glade.h:7
-msgid "_Modify"
-msgstr "_Upravit"
+#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+msgid "Use custom port:"
+msgstr "Použít vlastní port:"
 
-#: ../data/glade/accounts_window.glade.h:8
-#: ../data/glade/remove_account_window.glade.h:4
-msgid "_Remove"
-msgstr "Odst_ranit"
+#: ../data/glade/accounts_window.glade.h:59
+msgid "gtk-add"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:60
+msgid "gtk-close"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:61
+msgid "gtk-remove"
+msgstr ""
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
@@ -535,7 +679,9 @@ msgstr "<b>Popis</b>"
 
 #: ../data/glade/advanced_configuration_window.glade.h:2
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
-msgstr "<b>POZNÁMKA:</b> Měl(a) by jste restartovat gajim, aby se projevila všechna nastavení"
+msgstr ""
+"<b>POZNÁMKA:</b> Měl(a) by jste restartovat gajim, aby se projevila všechna "
+"nastavení"
 
 #: ../data/glade/advanced_configuration_window.glade.h:3
 msgid "Advanced Configuration Editor"
@@ -554,45 +700,41 @@ msgid "Deletes Message of the Day"
 msgstr "Smaže zprávu dne"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:3
+msgid "Edit _Privacy Lists"
+msgstr ""
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:4
 msgid "Sends a message to users currently connected to this server"
 msgstr "Poslat zprávu momentálně připojeným uživatelům tohoto serveru"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/glade/advanced_menuitem_menu.glade.h:5
 msgid "Set MOTD"
 msgstr "Nastavit MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/glade/advanced_menuitem_menu.glade.h:6
 msgid "Sets Message of the Day"
 msgstr "Nastaví Zprávu dne"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/glade/advanced_menuitem_menu.glade.h:7
 msgid "Show _XML Console"
 msgstr "Zobrazit _XML konzoli"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/glade/advanced_menuitem_menu.glade.h:8
 msgid "Update MOTD"
 msgstr "Upravit MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/glade/advanced_menuitem_menu.glade.h:9
 msgid "Updates Message of the Day"
 msgstr "Upraví Zprávu dne"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/glade/advanced_menuitem_menu.glade.h:10
 msgid "_Administrator"
 msgstr "_Správce"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
-msgid "_Privacy Lists"
-msgstr ""
-
 #: ../data/glade/advanced_menuitem_menu.glade.h:11
 msgid "_Send Server Message"
 msgstr "Ode_slat zprávu serveru"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:12
-msgid "_Send Single Message"
-msgstr "Ode_slat jednoduchou zprávu"
-
 #: ../data/glade/advanced_notifications_window.glade.h:1
 msgid " a window/tab opened with that contact "
 msgstr "okno/žáložka otevřená s tímto kontaktem"
@@ -623,8 +765,7 @@ msgid "All statuses"
 msgstr "Všechny stavy"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:91
-#: ../src/common/helpers.py:243
+#: ../src/common/commands.py:91 ../src/common/helpers.py:246
 msgid "Away"
 msgstr "Pryč"
 
@@ -641,7 +782,7 @@ msgid "Have "
 msgstr "Má"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:256
 msgid "Invisible"
 msgstr "Neviditelný"
 
@@ -650,7 +791,7 @@ msgid "Launch a command"
 msgstr "Provést příkaz"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:226
+#: ../src/common/helpers.py:229
 msgid "Not Available"
 msgstr "Nedostupný"
 
@@ -691,8 +832,10 @@ msgid "When "
 msgstr "Když"
 
 #: ../data/glade/advanced_notifications_window.glade.h:27
-msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr "_Aktivuj UrgencyHint window manageru pro blikání okna rozhovoru v liště úloh"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+msgstr ""
+"_Aktivuj UrgencyHint window manageru pro blikání okna rozhovoru v liště úloh"
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
 msgid "_Disable auto opening chat window"
@@ -741,7 +884,8 @@ msgid ""
 "everybody"
 msgstr ""
 "kontakty\n"
-"skupiny\všichni"
+"skupiny\n"
+"šichni"
 
 #: ../data/glade/advanced_notifications_window.glade.h:41
 msgid "for "
@@ -771,6 +915,82 @@ msgstr "Přijat nový záznam"
 msgid "You have received new entry:"
 msgstr "Dostal(a) jste novou položku: "
 
+#: ../data/glade/change_password_dialog.glade.h:1
+msgid "Change Password"
+msgstr "Změnit heslo"
+
+#: ../data/glade/change_password_dialog.glade.h:2
+msgid "Enter it again for confirmation:"
+msgstr "Zadejte znovu pro ověření:"
+
+#: ../data/glade/change_password_dialog.glade.h:3
+msgid "Enter new password:"
+msgstr "Zadejte heslo:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:1
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Napište nový popis stavu</b>"
+
+#: ../data/glade/change_status_message_dialog.glade.h:2
+msgid "Preset messages:"
+msgstr "Uložené stavy:"
+
+# FIXME: not accurate
+#: ../data/glade/change_status_message_dialog.glade.h:3
+msgid "Save as Preset..."
+msgstr "Uložit stav..."
+
+#: ../data/glade/chat_context_menu.glade.h:2
+#: ../data/glade/chat_control_popup_menu.glade.h:5
+#: ../data/glade/gc_occupants_menu.glade.h:4
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+msgid "_Add to Roster"
+msgstr "Přid_at do Seznamu"
+
+#: ../data/glade/chat_context_menu.glade.h:3
+msgid "_Copy JID/Email Address"
+msgstr "_Kopírovat JID/Emailovou adresu"
+
+#: ../data/glade/chat_context_menu.glade.h:4
+msgid "_Copy Link Location"
+msgstr "_Kopírovat odkaz"
+
+#: ../data/glade/chat_context_menu.glade.h:5
+msgid "_Open Email Composer"
+msgstr "_Otevři Emailový editor"
+
+#: ../data/glade/chat_context_menu.glade.h:6
+msgid "_Open Link in Browser"
+msgstr "_Otevřít v prohlížeči"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:1
+msgid "Click to see past conversations with this contact"
+msgstr "Klikněte pro starší konverzaci s tímto kontaktem"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:2
+msgid "Invite _Friends"
+msgstr ""
+
+#: ../data/glade/chat_control_popup_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:3
+#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
+msgid "Send _File"
+msgstr "Odeslat _Soubor"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:4
+msgid "Toggle Open_PGP Encryption"
+msgstr "Přepnout Open_PGP šifrování"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/gc_control_popup_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:2567
+msgid "_History"
+msgstr "_Historie"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Vyplňte formulář."
@@ -824,15 +1044,18 @@ msgid "Shows a list of file transfers between you and others"
 msgstr "Zobrazí výpis přenosů souborů mezi Vámi a ostatními"
 
 #: ../data/glade/filetransfers.glade.h:11
-msgid "This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed"
-msgstr "Tato akce smaže jeden přenos souboru z výpisu. Pokud je přenos aktivní, bude nejdříve zastaven a potom smazán"
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
+msgstr ""
+"Tato akce smaže jeden přenos souboru z výpisu. Pokud je přenos aktivní, bude "
+"nejdříve zastaven a potom smazán"
 
 #: ../data/glade/filetransfers.glade.h:12
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Zobraz upozornění, až bude přenos souboru dokončen"
 
-#: ../data/glade/filetransfers.glade.h:13
-#: ../src/filetransfers_window.py:769
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:774
 msgid "_Continue"
 msgstr "_Pokračovat"
 
@@ -840,8 +1063,7 @@ msgstr "_Pokračovat"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Upozornit mě po dokončení přenosu souboru"
 
-#: ../data/glade/filetransfers.glade.h:15
-#: ../src/filetransfers_window.py:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:186
 msgid "_Open Containing Folder"
 msgstr "_Otevřít obsahující složku"
 
@@ -948,62 +1170,57 @@ msgid "Configure _Room"
 msgstr "Nastavit _místnost"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Bookmark This Room"
+#, fuzzy
+msgid "_Bookmark"
 msgstr "_Přidej do záložek"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-msgid "_Compact View    Alt+C"
-msgstr "_Zjednodušený pohled    Alt+C"
+msgid "_Destroy Room"
+msgstr ""
 
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-#: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-msgid "_History"
-msgstr "_Historie"
+#: ../data/glade/gc_control_popup_menu.glade.h:8
+#, fuzzy
+msgid "_Manage Room"
+msgstr "Spravuj záložky"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:9
+msgid "_Minimize on close"
+msgstr ""
 
 #: ../data/glade/gc_occupants_menu.glade.h:1
 msgid "Mo_derator"
 msgstr "Mo_derátor"
 
 #: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "_Add to Roster"
-msgstr "Přid_at do Seznamu"
+#, fuzzy
+msgid "Occupant Actions"
+msgstr "_Akce účastníků"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Správce"
 
-#: ../data/glade/gc_occupants_menu.glade.h:4
+#: ../data/glade/gc_occupants_menu.glade.h:6
 msgid "_Ban"
 msgstr "_Zakázat"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
 msgid "_Kick"
 msgstr "Vy_kopnout"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Member"
 msgstr "Č_len"
 
-#: ../data/glade/gc_occupants_menu.glade.h:8
-msgid "_Occupant Actions"
-msgstr "_Akce účastníků"
-
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Owner"
 msgstr "_Vlastník"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Send Private Message"
 msgstr "_Odeslat soukromou zprávu"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Voice"
 msgstr "_Hlas"
 
@@ -1011,14 +1228,12 @@ msgstr "_Hlas"
 msgid "Create new post"
 msgstr "Vytvoř nový zápis"
 
-#: ../data/glade/groups_post_window.glade.h:2
-#: ../src/common/helpers.py:268
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:271
 msgid "From"
 msgstr "Odesílatel"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3
-#: ../src/history_manager.py:142
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:142
 #: ../src/history_manager.py:173
 msgid "Subject"
 msgstr "Předmět"
@@ -1030,14 +1245,16 @@ msgid ""
 "You can select logs from the left and/or search database from below.\n"
 "\n"
 "<b>WARNING:</b>\n"
-"If you plan to do massive deletions, please make sure Gajim is not running. Generally avoid deletions with contacts you currently chat with."
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 "<big><b>Vítejte do Gajimova Správce Historie</b></big>\n"
 "\n"
 "Můžete zvolit záznamy nalevo a/nebo prohledat databázi dole.\n"
 "\n"
 "<b>VAROVÁNÍ:</b>\n"
-"Pokud plánujete rozsáhlé promazání, ujistěte se, že Gajim neběží. Obecně se vyvarujte mazání historie kontaktu, se kterým si právě píšete."
+"Pokud plánujete rozsáhlé promazání, ujistěte se, že Gajim neběží. Obecně se "
+"vyvarujte mazání historie kontaktu, se kterým si právě píšete."
 
 #: ../data/glade/history_manager.glade.h:7
 msgid "Delete"
@@ -1073,75 +1290,14 @@ msgid "Search"
 msgstr "Najít"
 
 #: ../data/glade/history_window.glade.h:5
+#: ../data/glade/zeroconf_information_window.glade.h:10
+msgid "_Log conversation history"
+msgstr "_Zaznamenat historii konverzace"
+
+#: ../data/glade/history_window.glade.h:6 ../src/disco.py:1173
 msgid "_Search"
 msgstr "_Najít"
 
-#: ../data/glade/change_password_dialog.glade.h:1
-msgid "Change Password"
-msgstr "Změnit heslo"
-
-#: ../data/glade/change_password_dialog.glade.h:2
-msgid "Enter it again for confirmation:"
-msgstr "Zadejte znovu pro ověření:"
-
-#: ../data/glade/change_password_dialog.glade.h:3
-msgid "Enter new password:"
-msgstr "Zadejte heslo:"
-
-#: ../data/glade/change_status_message_dialog.glade.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>Napište nový popis stavu</b>"
-
-#: ../data/glade/change_status_message_dialog.glade.h:2
-msgid "Preset messages:"
-msgstr "Uložené stavy:"
-
-# FIXME: not accurate
-#: ../data/glade/change_status_message_dialog.glade.h:3
-msgid "Save as Preset..."
-msgstr "Uložit stav..."
-
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "Vstoupit do _Diskuze"
-
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "_Kopírovat JID/Emailovou adresu"
-
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopírovat odkaz"
-
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Otevři Emailový editor"
-
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "_Otevřít v prohlížeči"
-
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:20
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "_Začít rozhovor"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:1
-msgid "Click to see past conversations with this contact"
-msgstr "Klikněte pro starší konverzaci s tímto kontaktem"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
-msgid "Send _File"
-msgstr "Odeslat _Soubor"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-msgid "Toggle Open_PGP Encryption"
-msgstr "Přepnout Open_PGP šifrování"
-
 #: ../data/glade/invitation_received_dialog.glade.h:1
 msgid "Accept"
 msgstr "Přijmout"
@@ -1155,8 +1311,7 @@ msgstr "Odmítnout"
 msgid "Invitation Received"
 msgstr "Přijata pozvánka"
 
-#: ../data/glade/join_groupchat_window.glade.h:1
-#: ../src/dialogs.py:1148
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1264
 msgid "Join Group Chat"
 msgstr "Připojit se do diskuze"
 
@@ -1165,14 +1320,14 @@ msgid "Join this room automatically when I connect"
 msgstr "Připoj se do této místnosti automaticky po připojení"
 
 #: ../data/glade/join_groupchat_window.glade.h:3
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/glade/manage_bookmarks_window.glade.h:5
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "Nickname:"
 msgstr "Přezdívka:"
 
 #: ../data/glade/join_groupchat_window.glade.h:4
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Heslo:"
 
@@ -1181,13 +1336,12 @@ msgid "Recently:"
 msgstr "Nedávno:"
 
 #: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Místnost:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
-#: ../src/disco.py:1163
-#: ../src/disco.py:1546
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1161
+#: ../src/disco.py:1616
 msgid "_Join"
 msgstr "_Vstoupit"
 
@@ -1207,15 +1361,19 @@ msgstr "Pokud je zaškrtnuto, Gajim se připojí do této místnosti při spušt
 msgid "Manage Bookmarks"
 msgstr "Spravuj záložky"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:4
+msgid "Minimize on Auto Join"
+msgstr ""
+
+#: ../data/glade/manage_bookmarks_window.glade.h:7
 msgid "Print status:"
 msgstr "Vypiš stav:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Server:"
 msgstr "Server:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:10
 msgid "Title:"
 msgstr "Titul:"
 
@@ -1241,10 +1399,14 @@ msgstr "Spravuj profily Proxy"
 
 #: ../data/glade/manage_proxies_window.glade.h:6
 #: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:30
 msgid "Name:"
 msgstr "Jméno:"
 
+#: ../data/glade/manage_proxies_window.glade.h:7
+msgid "Pass_word:"
+msgstr "He_slo:"
+
 #: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Type:"
 msgstr "Typ:"
@@ -1253,18 +1415,21 @@ msgstr "Typ:"
 msgid "Use authentication"
 msgstr "Použij autentifikaci"
 
+#: ../data/glade/manage_proxies_window.glade.h:10
+msgid "_Host:"
+msgstr "_Počítač:"
+
 #: ../data/glade/message_window.glade.h:1
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Klikni pro vložení smajlíku (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2
-#: ../src/chat_control.py:1113
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1206
 msgid "OpenPGP Encryption"
 msgstr "OpenPGP Šifrování"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:4
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:12
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Akce"
@@ -1272,7 +1437,7 @@ msgstr "_Akce"
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:6
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:253
+#: ../src/filetransfers_window.py:243
 msgid "_Send"
 msgstr "Ode_slat"
 
@@ -1333,7 +1498,8 @@ msgstr "Povolit odeslání informace o _OS"
 
 #: ../data/glade/preferences_window.glade.h:17
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Povolit popup/upozornění pokud jsem _pryč/nedostupný/nerušit/neviditelný"
+msgstr ""
+"Povolit popup/upozornění pokud jsem _pryč/nedostupný/nerušit/neviditelný"
 
 #: ../data/glade/preferences_window.glade.h:18
 msgid "Also known as iChat style"
@@ -1344,8 +1510,13 @@ msgid "Always check to see if Gajim is the _default Jabber client on startup"
 msgstr "Vždy při startu zkontroluj, zda je Gajim _výchozí Jabber klient"
 
 #: ../data/glade/preferences_window.glade.h:20
-msgid "An example: If you have enabled status message for away, Gajim won't ask you anymore for a status message when you change your status to away; it will use the default one set here"
-msgstr "Příklad: Pokud povolíš stavovou zprávu pro pryč, Gajim se nadále nebude ptát na text zprávy když se přepneš do pryč; použije tady uvedenou zprávu"
+msgid ""
+"An example: If you have enabled status message for away, Gajim won't ask you "
+"anymore for a status message when you change your status to away; it will "
+"use the default one set here"
+msgstr ""
+"Příklad: Pokud povolíš stavovou zprávu pro pryč, Gajim se nadále nebude ptát "
+"na text zprávy když se přepneš do pryč; použije tady uvedenou zprávu"
 
 #: ../data/glade/preferences_window.glade.h:21
 msgid "Ask status message when I:"
@@ -1374,13 +1545,18 @@ msgstr ""
 "Vlastní"
 
 #: ../data/glade/preferences_window.glade.h:29
-#: ../src/chat_control.py:856
 msgid "Chat"
 msgstr "Rozhovor"
 
 #: ../data/glade/preferences_window.glade.h:30
-msgid "Check this option, only if someone you don't have in the roster spams/annoys you. Use with caution, because it blocks all messages from any contact that is not in the roster"
-msgstr "Zaškrtněte pouze pokud Vás obtěžuje někdo, koho nemáte v rosteru. Použijte s rozvahou, protože tato volba zakáže všechny zprávy od kontaktů, které ještě nemáte v rosteru"
+msgid ""
+"Check this option, only if someone you don't have in the roster spams/annoys "
+"you. Use with caution, because it blocks all messages from any contact that "
+"is not in the roster"
+msgstr ""
+"Zaškrtněte pouze pokud Vás obtěžuje někdo, koho nemáte v rosteru. Použijte s "
+"rozvahou, protože tato volba zakáže všechny zprávy od kontaktů, které ještě "
+"nemáte v rosteru"
 
 #: ../data/glade/preferences_window.glade.h:31
 msgid "Configure color and font of the interface"
@@ -1433,66 +1609,122 @@ msgid "Events"
 msgstr "Události"
 
 #: ../data/glade/preferences_window.glade.h:44
-msgid "Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to display in chat windows."
-msgstr "Gajim umí ohlašovat svoji schopnost posílat a přijímat meta-informace vztahující se k rozhovoru. Tady můžete nastavit, které stavy rozhovoru chcete zobrazovat v oknech rozhovoru."
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"display in chat windows."
+msgstr ""
+"Gajim umí ohlašovat svoji schopnost posílat a přijímat meta-informace "
+"vztahující se k rozhovoru. Tady můžete nastavit, které stavy rozhovoru "
+"chcete zobrazovat v oknech rozhovoru."
 
 #: ../data/glade/preferences_window.glade.h:45
-msgid "Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party."
-msgstr "Gajim umí ohlašovat svoji schopnost posílat a přijímat meta-informace vztahující se k rozhovoru. Tady můžete nastavit, které stavy rozhovoru chcete posílat svému protějšku."
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"send to the other party."
+msgstr ""
+"Gajim umí ohlašovat svoji schopnost posílat a přijímat meta-informace "
+"vztahující se k rozhovoru. Tady můžete nastavit, které stavy rozhovoru "
+"chcete posílat svému protějšku."
 
 #: ../data/glade/preferences_window.glade.h:46
-msgid "Gajim will automatically show new events by popping up the relevant window"
+msgid ""
+"Gajim will automatically show new events by popping up the relevant window"
 msgstr "Gajim automaticky zobrazí nové události vyskočením příslušného okna"
 
 #: ../data/glade/preferences_window.glade.h:47
-msgid "Gajim will notify you for new events via a popup in the bottom right of the screen"
-msgstr "Gajim Vás upozorní o nové zprávě pomocí popupu v pravém dolním rohu obrazovky"
+msgid ""
+"Gajim will notify you for new events via a popup in the bottom right of the "
+"screen"
+msgstr ""
+"Gajim Vás upozorní o nové zprávě pomocí popupu v pravém dolním rohu obrazovky"
 
 #: ../data/glade/preferences_window.glade.h:48
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed in"
-msgstr "Gajim Vás upozorní o nově připojených kontaktech pomocí popupu v pravém dolním rohu obrazovky"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed in"
+msgstr ""
+"Gajim Vás upozorní o nově připojených kontaktech pomocí popupu v pravém "
+"dolním rohu obrazovky"
 
 #: ../data/glade/preferences_window.glade.h:49
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out"
-msgstr "Gajim Vás upozorní o přávě odpojených kontaktech pomocí popupu v pravém dolním rohu obrazovky"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr ""
+"Gajim Vás upozorní o přávě odpojených kontaktech pomocí popupu v pravém "
+"dolním rohu obrazovky"
 
 #: ../data/glade/preferences_window.glade.h:50
-msgid "Gajim will only change the icon of the contact that triggered the new event"
+msgid ""
+"Gajim will only change the icon of the contact that triggered the new event"
 msgstr "Gajim pouze změní ikonu kontaktu, který vyvolal novou událost"
 
 #: ../data/glade/preferences_window.glade.h:52
-msgid "If checked, Gajim will also include information about the sender of the new emails"
-msgstr "Pokud zaškrtnuto, Gajim uvede také informaci o odesilateli zprávy nového emailu"
+#, fuzzy
+msgid "Hides buttons in chatwindows to "
+msgstr "Skryje tlačítka v okně diskuze."
 
 #: ../data/glade/preferences_window.glade.h:53
-msgid "If checked, Gajim will display avatars of contacts in roster window and in group chats"
-msgstr "Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a v diskuzích"
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+"Pokud zaškrtnuto, Gajim uvede také informaci o odesilateli zprávy nového "
+"emailu"
 
 #: ../data/glade/preferences_window.glade.h:54
-msgid "If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats"
-msgstr "Pokud zaškrtnuto, Gajim bude zobrazovat popisy stavů kontaktů pod jménem v okně Seznamu a v diskuzích"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a v "
+"diskuzích"
 
 #: ../data/glade/preferences_window.glade.h:55
-msgid "If checked, Gajim will remember the roster and chat window positions in the screen and the sizes of them next time you run it"
-msgstr "Pokud bude zaškrtnuto, Gajim si bude pamatovat polohy a velikosti Seznamu a oken rozhovorů po příštím spuštění"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+msgstr ""
+"Pokud zaškrtnuto, Gajim bude zobrazovat popisy stavů kontaktů pod jménem v "
+"okně Seznamu a v diskuzích"
 
 #: ../data/glade/preferences_window.glade.h:56
-msgid "If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)"
-msgstr "Pokud zaškrtnuto, Gajim použije ikony specifické pro protokol (např. kontakt z MSN bude mít odpovídající ikonu msn pro stavy připojen, pryč, nerušit, atd...)"
+msgid ""
+"If checked, Gajim will remember the roster and chat window positions in the "
+"screen and the sizes of them next time you run it"
+msgstr ""
+"Pokud bude zaškrtnuto, Gajim si bude pamatovat polohy a velikosti Seznamu a "
+"oken rozhovorů po příštím spuštění"
 
 #: ../data/glade/preferences_window.glade.h:57
-msgid "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons"
-msgstr "Pokud zaškrtnuto, Gajim nahradí ascii smajlíky jako ':)' za ekvivalentní animované nebo statické grafické smajlíky"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Pokud zaškrtnuto, Gajim použije ikony specifické pro protokol (např. kontakt "
+"z MSN bude mít odpovídající ikonu msn pro stavy připojen, pryč, nerušit, "
+"atd...)"
 
 #: ../data/glade/preferences_window.glade.h:58
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Pokud zaškrtnuto, Gajim nahradí ascii smajlíky jako ':)' za ekvivalentní "
+"animované nebo statické grafické smajlíky"
+
+#: ../data/glade/preferences_window.glade.h:59
 msgid "Ignore rich content in incoming messages"
 msgstr "Ignoruj formátování v příchozích zprávách"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:60
 msgid "Ma_nage..."
 msgstr "Sp_ravovat..."
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "Never\n"
 "Always\n"
@@ -1504,183 +1736,205 @@ msgstr ""
 "Podle účtu\n"
 "Podle typu"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
 msgid "Notify me about contacts that: "
 msgstr "Upozorni mě na kontakty které se: "
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
 msgid "Notify on new _GMail email"
 msgstr "Upozorni při novém _GMail emailu"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:67
 msgid "On every _message"
 msgstr "Při každé _zprávě"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
 msgid "One message _window:"
 msgstr "_Okno jednoduché zprávy:"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Outgoing Chat state noti_fications:"
 msgstr "Odchozí události stavu rozhovoru:"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Play _sounds"
 msgstr "Přehrávat _zvuky"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Preferences"
 msgstr "Nastavení"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:72
 msgid "Print time:"
 msgstr "Čas tisku:"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:73
 msgid "Save _position and size for roster and chat windows"
 msgstr "Uložit _pozici a velikost pro seznam a okna rozhovorů"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Set status message to reflect currently playing _music track"
-msgstr "Nastav stavouvou zprávu, aby odrážela momentálně přehrávanou _hudební stopu"
+msgstr ""
+"Nastav stavouvou zprávu, aby odrážela momentálně přehrávanou _hudební stopu"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Show only in _roster"
 msgstr "Zobrazit pouze v _Seznamu"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Sign _in"
 msgstr "_Přihlásí"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Sign _out"
 msgstr "_Odhlásí"
 
-#: ../data/glade/preferences_window.glade.h:77
-msgid "Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text."
-msgstr "Některé zprávy mohou obsahovat formátování (odsazení, barvy aj.). Pokud je zaškrtnuto, Gajim zobrazí pouze čistý text."
-
 #: ../data/glade/preferences_window.glade.h:78
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Některé zprávy mohou obsahovat formátování (odsazení, barvy aj.). Pokud je "
+"zaškrtnuto, Gajim zobrazí pouze čistý text."
+
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Status"
 msgstr "Stav"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:80
 msgid "T_heme:"
 msgstr "_Téma:"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:81
 msgid "The auto away status message"
 msgstr "Text stavu automaticky pryč"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:82
 msgid "The auto not available status message"
 msgstr "Text stavu nedostupný"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:83
 msgid "Treat all incoming messages as:"
 msgstr "Považovat všechny příchozí zprávy za: "
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:84
 msgid "Use _transports iconsets"
 msgstr "Používej ikony _transportů"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Use system _default"
 msgstr "Použij nastavení _systému"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Use t_rayicon (aka. notification area icon)"
 msgstr "_Ikona v systrayi (jinak řečeno v oznamovací oblasti)"
 
-#: ../data/glade/preferences_window.glade.h:86
-msgid "When a new event (message, file transfer request etc..) is received, the following methods may be used to inform you about it. Please note that events about new messages only occur if it is a new message from a contact you are not already chatting with"
-msgstr "Když nová událost (zpráva, žádost o přenos souboru, a podobně) je přijata, následující metody Vás mohou upozornit. Vězte prosím, že událost přijetí nové zprávy nastane pouze tehdy, pokud je od kontaktu, se kterým už nehovoříte"
-
 #: ../data/glade/preferences_window.glade.h:87
-msgid "When new event is received"
-msgstr "Když je přijata nová zpráva"
+msgid ""
+"When a new event (message, file transfer request etc..) is received, the "
+"following methods may be used to inform you about it. Please note that "
+"events about new messages only occur if it is a new message from a contact "
+"you are not already chatting with"
+msgstr ""
+"Když nová událost (zpráva, žádost o přenos souboru, a podobně) je přijata, "
+"následující metody Vás mohou upozornit. Vězte prosím, že událost přijetí "
+"nové zprávy nastane pouze tehdy, pokud je od kontaktu, se kterým už "
+"nehovoříte"
 
 #: ../data/glade/preferences_window.glade.h:88
-msgid "Works for Rhythmbox and Muine players. For more players, please visit http://trac.gajim.org/wiki/GajimAndMusicPlayer"
-msgstr "Pracuje s Rhythmbox a Munie přehrávači. Pro jiné přehrávače, navštivte http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgid "When new event is received"
+msgstr "Když je přijata nová zpráva"
 
 #: ../data/glade/preferences_window.glade.h:89
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+"Pracuje s Rhythmbox a Munie přehrávači. Pro jiné přehrávače, navštivte "
+"http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_Advanced Notifications Control..."
 msgstr "_Správa pokročilých notifikací..."
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Browser:"
 msgstr "_Prohlížeč:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:92
 msgid "_File manager:"
 msgstr "_Správce souborů:"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Font:"
 msgstr "_Písmo:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Highlight misspelled words"
 msgstr "Zvýrazňovat _slova s překlepy"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorovat události od kontaktů mimo můj Seznam"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Incoming message:"
 msgstr "_Příchozí zpráva:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:97
 msgid "_Log status changes of contacts"
 msgstr "Zaznamenávat změny _stavu kontaktů"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Mail client:"
 msgstr "E-_mailový klient:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:99
+#, fuzzy
+msgid "_Make message windows compact"
+msgstr "_Okno jednoduché zprávy:"
+
+#: ../data/glade/preferences_window.glade.h:100
 msgid "_Never"
 msgstr "_Nikdy"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
 msgid "_Notify me about it"
 msgstr "_Upozornit mě"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Open..."
 msgstr "_Otevřít..."
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Outgoing message:"
 msgstr "_Odchozí zpráva:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Player:"
 msgstr "_Přehrávač:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Pop it up"
 msgstr "Zobrazit o_kno se zprávou"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_Reset to Default Colors"
 msgstr "_Vrátit k výchozím barvám"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Sort contacts by status"
 msgstr "_Seřadit podle stavu"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Status message:"
 msgstr "_Stav:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:110
 msgid "minutes"
 msgstr "minutách"
 
@@ -1724,8 +1978,7 @@ msgstr "Jabber ID"
 msgid "Order:"
 msgstr "Pořadí:"
 
-#: ../data/glade/privacy_list_window.glade.h:11
-#: ../src/dialogs.py:1862
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2097
 msgid "Privacy List"
 msgstr ""
 
@@ -1802,111 +2055,104 @@ msgid "Company:"
 msgstr "Společnost:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 msgid "Country:"
 msgstr "Země:"
 
 #: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "Department:"
 msgstr "Oddělení:"
 
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:15
-#: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 msgid "Extra Address:"
 msgstr "Další adresa:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:19
 msgid "Family:"
 msgstr "Příjmení:"
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:16
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "Format: YYYY-MM-DD"
 msgstr "Formát: RRRR-MM-DD"
 
-#. Given Name
-#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/profile_window.glade.h:17
 #: ../data/glade/vcard_information_window.glade.h:22
+#, fuzzy
+msgid "Full Name"
+msgstr "Jméno"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:19
+#: ../data/glade/vcard_information_window.glade.h:24
 msgid "Given:"
 msgstr "Křestní:"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "Homepage:"
 msgstr "Dom. stránka:"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "Middle:"
 msgstr "Střední:"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:27
-msgid "More"
-msgstr "Více"
-
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:34
 msgid "Personal Info"
 msgstr "Osobní údaje"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "Phone No.:"
 msgstr "Telefon:"
 
 #: ../data/glade/profile_window.glade.h:28
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/glade/vcard_information_window.glade.h:36
 msgid "Position:"
 msgstr "Pozice:"
 
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:37
 msgid "Postal Code:"
 msgstr "PSČ:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:39
 msgid "Prefix:"
 msgstr "Titul:"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:38
-#: ../src/vcard.py:273
+#: ../data/glade/vcard_information_window.glade.h:41 ../src/vcard.py:302
 msgid "Role:"
 msgstr "Postavení:"
 
 #: ../data/glade/profile_window.glade.h:33
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "State:"
 msgstr "Stát:"
 
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Street:"
 msgstr "Ulice:"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "Suffix:"
 msgstr "Za jménem:"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Práce"
 
@@ -1922,6 +2168,16 @@ msgstr "Odstranit účet _pouze z Gajimu"
 msgid "Remove account from Gajim and from _server"
 msgstr "Odstranit účet z Gajimu i ze _serveru"
 
+#. Remove
+#. Remove group
+#. Remove
+#: ../data/glade/remove_account_window.glade.h:4
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+#: ../src/roster_window.py:2524 ../src/roster_window.py:2734
+#: ../src/roster_window.py:2870
+msgid "_Remove"
+msgstr "Odst_ranit"
+
 #: ../data/glade/roster_contact_context_menu.glade.h:1
 msgid "A_sk to see his/her status"
 msgstr "Požádat o zobrazení je(jí)ho _stavu"
@@ -1936,58 +2192,81 @@ msgstr "Přidat zvláštní _upozornění"
 msgid "Assign Open_PGP Key"
 msgstr "Přiřadit Open_PGP klíč"
 
+#. Edit Groups
 #: ../data/glade/roster_contact_context_menu.glade.h:4
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:2075
+#: ../src/roster_window.py:2497
 msgid "Edit _Groups"
 msgstr "Upravit _skupiny"
 
+#. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:2210
+#: ../src/roster_window.py:2827
 msgid "Execute Command..."
 msgstr "Provést příkaz..."
 
+#. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:2033
+#: ../src/roster_window.py:2440
 msgid "In_vite to"
 msgstr "_Pozvat do"
 
+#. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../src/roster_window.py:2664 ../src/roster_window.py:2798
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Poslat vlastní XML"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:8
 #: ../data/glade/systray_context_menu.glade.h:2
 msgid "Send Single _Message"
 msgstr "Odeslat jednoduchou _zprávu"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
+msgid "Set Custom _Avatar"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Začít _rozhovor"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 msgid "_Allow him/her to see my status"
 msgstr "_Dovol kontaktu vidět můj stav"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-msgid "_Forbid him/her to see my status"
-msgstr "_Zakaž mu/jí vidět můj stav"
-
-#. Remove group
 #: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:2027
-#: ../src/roster_window.py:2124
-#: ../src/roster_window.py:2231
-msgid "_Remove from Roster"
-msgstr "Odst_ranit ze Seznamu"
+#: ../src/roster_window.py:2514 ../src/roster_window.py:2725
+msgid "_Block"
+msgstr ""
 
 #: ../data/glade/roster_contact_context_menu.glade.h:15
+msgid "_Forbid him/her to see my status"
+msgstr "_Zakaž mu/jí vidět můj stav"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:17
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2219
+#, fuzzy
+msgid "_Manage Contact"
+msgstr "Přejmenovat kontakt"
+
+#. Rename
+#: ../data/glade/roster_contact_context_menu.glade.h:19
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:2854
 msgid "_Rename"
 msgstr "_Přejmenovat"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:20
 msgid "_Subscription"
 msgstr "_Autorizace"
 
+#: ../data/glade/roster_contact_context_menu.glade.h:21
+#: ../src/roster_window.py:2508 ../src/roster_window.py:2719
+msgid "_Unblock"
+msgstr ""
+
 #: ../data/glade/roster_window.glade.h:1
 msgid "A_ccounts"
 msgstr "Úč_ty"
@@ -1997,61 +2276,63 @@ msgid "Add _Contact"
 msgstr "Přidat _kontakt"
 
 #: ../data/glade/roster_window.glade.h:3
+#, fuzzy
+msgid "Fea_tures"
+msgstr "Vlastnosti serveru"
+
+#: ../data/glade/roster_window.glade.h:4
 msgid "File _Transfers"
 msgstr "_Přenosy souborů"
 
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/glade/roster_window.glade.h:5
 msgid "Frequently Asked Questions (online)"
 msgstr "Často kladené dotazy - FAQ (online)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/glade/roster_window.glade.h:7
 msgid "Help online"
 msgstr "Nápověda online"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:9
 msgid "Profile, A_vatar"
 msgstr "Profil, A_vatar"
 
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
 msgstr "Zobrazuj trans_porty"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "Zobrazit _odpojené kontakty"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:14
 msgid "_Contents"
 msgstr "_Obsah"
 
-# FIXME: chtelo by to cesky vyraz pro service discovery
-#: ../data/glade/roster_window.glade.h:13
-msgid "_Discover Services"
-msgstr "_Prohlížet služby"
-
-#: ../data/glade/roster_window.glade.h:14
-#: ../src/disco.py:1284
-#: ../src/roster_window.py:2202
+#: ../data/glade/roster_window.glade.h:16 ../src/disco.py:1349
 msgid "_Edit"
 msgstr "_Úpravy"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:17
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Preferences"
 msgstr "_Nastavení"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Quit"
 msgstr "_Konec"
 
 #: ../data/glade/roster_window.glade.h:21
+msgid "_Send Single Message"
+msgstr "Ode_slat jednoduchou zprávu"
+
+#: ../data/glade/roster_window.glade.h:23
 msgid "_View"
 msgstr "_Zobraz"
 
@@ -2128,7 +2409,9 @@ msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Autorizovat kontakt, aby věděl kdy jsi připojený(á)"
 
 #: ../data/glade/subscription_request_window.glade.h:3
-msgid "Deny authorization from contact so he or she cannot know when you're connected"
+msgid ""
+"Deny authorization from contact so he or she cannot know when you're "
+"connected"
 msgstr "Odmítne autorizaci od kontaktu, takže nezjistí kdy jste připojen(a)"
 
 #: ../data/glade/subscription_request_window.glade.h:4
@@ -2155,6 +2438,10 @@ msgstr "Zobrazit _Seznam"
 msgid "Sta_tus"
 msgstr "S_tav"
 
+#: ../data/glade/systray_context_menu.glade.h:6
+msgid "_Group Chat"
+msgstr "_Diskuze"
+
 #. Given Name
 #: ../data/glade/vcard_information_window.glade.h:5
 msgid "Ask:"
@@ -2169,44 +2456,46 @@ msgid "Comments"
 msgstr "Vlastní poznámky"
 
 #: ../data/glade/vcard_information_window.glade.h:11
+#, fuzzy
+msgid "Configured avatar:"
+msgstr "Nastavit _místnost"
+
+#: ../data/glade/vcard_information_window.glade.h:12
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:13
 msgid "Contact Information"
 msgstr "Informace o kontaktu"
 
-#: ../data/glade/vcard_information_window.glade.h:24
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13
-#: ../src/dialogs.py:416
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+#: ../data/glade/vcard_information_window.glade.h:29
+msgid "More"
+msgstr "Více"
 
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "OS:"
 msgstr "OS:"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:40
 #: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Zdroj:"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Stav:"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Subscription:"
 msgstr "Autorizace:"
 
-#: ../data/glade/vcard_information_window.glade.h:47
-#: ../data/glade/zeroconf_information_window.glade.h:10
-msgid "_Log conversation history"
-msgstr "_Zaznamenat historii konverzace"
+#: ../data/glade/vcard_information_window.glade.h:49
+#, fuzzy
+msgid "User avatar:"
+msgstr "Avatar:"
 
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
@@ -2216,11 +2505,6 @@ msgstr "<b>Provoz Jabberu</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>Vstup XML</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Povolit"
-
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2239,16 +2523,6 @@ msgstr "_Zpráva"
 msgid "_Presence"
 msgstr "_Status"
 
-#: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
-msgid "First Name:"
-msgstr "Křestní:"
-
-#: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
-msgid "Last Name:"
-msgstr "Příjmení:"
-
 #: ../data/glade/zeroconf_information_window.glade.h:6
 msgid "Local jid:"
 msgstr "Lokální jid: "
@@ -2257,22 +2531,10 @@ msgstr "Lokální jid: "
 msgid "Personal"
 msgstr "Osobní"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:11
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Pokud výchozí port použitý k přijímání zpráv nevyhovuje tvému nastavení, můžeš si zvolit jiný.\n"
-"Můžeš také zvážit změnu nastavení firewallu."
-
 #: ../data/glade/zeroconf_properties_window.glade.h:15
 msgid "Modify Account"
 msgstr "Upravit účet"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
-msgstr "Použít vlastní port:"
-
 #. For i18n
 #: ../src/advanced.py:51
 msgid "Activated"
@@ -2320,285 +2582,487 @@ msgstr "(Žádný)"
 msgid "Hidden"
 msgstr "Skryté"
 
-#: ../src/config.py:137
-#: ../src/config.py:586
+#. the next script, executed in the "po" directory,
+#. generates the following list.
+#. #!/bin/sh
+#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. echo "{_('en'):'en'",$LANG"}"
+#: ../src/chat_control.py:54
+msgid "English"
+msgstr "Angličtina"
+
+#: ../src/chat_control.py:54
+msgid "Belarusian"
+msgstr "Běloruština"
+
+#: ../src/chat_control.py:54
+msgid "Bulgarian"
+msgstr "Bulharština"
+
+#: ../src/chat_control.py:54
+msgid "Breton"
+msgstr "Bretonština"
+
+#: ../src/chat_control.py:54
+msgid "Czech"
+msgstr "Čeština"
+
+#: ../src/chat_control.py:54
+msgid "German"
+msgstr "Němčina"
+
+#: ../src/chat_control.py:54
+msgid "Greek"
+msgstr "Řečtina"
+
+#: ../src/chat_control.py:54
+msgid "British"
+msgstr "Britština"
+
+#: ../src/chat_control.py:54
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../src/chat_control.py:54
+msgid "Spanish"
+msgstr "Španělština"
+
+#: ../src/chat_control.py:54
+msgid "Basque"
+msgstr "Baskičtina"
+
+#: ../src/chat_control.py:54
+msgid "French"
+msgstr "Francouzština"
+
+#: ../src/chat_control.py:54
+msgid "Croatian"
+msgstr "Chorvatština"
+
+#: ../src/chat_control.py:54
+msgid "Italian"
+msgstr "Italština"
+
+#: ../src/chat_control.py:54
+msgid "Norwegian (b)"
+msgstr "Norština (b)"
+
+#: ../src/chat_control.py:54
+msgid "Dutch"
+msgstr "Holandština"
+
+#: ../src/chat_control.py:54
+msgid "Norwegian"
+msgstr "Norština"
+
+#: ../src/chat_control.py:54
+msgid "Polish"
+msgstr "Polština"
+
+#: ../src/chat_control.py:54
+msgid "Portuguese"
+msgstr "Portugalština"
+
+#: ../src/chat_control.py:54
+msgid "Brazilian Portuguese"
+msgstr "Brazilská portugalština"
+
+#: ../src/chat_control.py:54
+msgid "Russian"
+msgstr "Ruština"
+
+#: ../src/chat_control.py:54
+#, fuzzy
+msgid "Serbian"
+msgstr "Němčina"
+
+#: ../src/chat_control.py:54
+msgid "Slovak"
+msgstr "Slovenština"
+
+#: ../src/chat_control.py:54
+msgid "Swedish"
+msgstr "Švédština"
+
+#: ../src/chat_control.py:54
+msgid "Chinese (Ch)"
+msgstr "Čínština"
+
+#: ../src/chat_control.py:282
+msgid "Spelling language"
+msgstr "Kontrola jazyka"
+
+#. we are not connected
+#: ../src/chat_control.py:305 ../src/chat_control.py:511
+msgid "A connection is not available"
+msgstr "Spojení není dostupné"
+
+#: ../src/chat_control.py:306 ../src/chat_control.py:512
+msgid "Your message can not be sent until you are connected."
+msgstr "Va¹e zpráva nemù¾e být odeslána dokud se nepøipojíte."
+
+#: ../src/chat_control.py:1132
+#, python-format
+msgid "%(nickname)s from group chat %(room_name)s"
+msgstr "%(nickname)s z diskuze %(room_name)s"
+
+#. we talk about a contact here
+#: ../src/chat_control.py:1220
+#, python-format
+msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+msgstr "%s nerozesílá svůj OpenPGP klíč nebo nemá žádný přiřazen"
+
+#: ../src/chat_control.py:1259 ../src/groupchat_control.py:1394
+#, python-format
+msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+msgstr "Neznámý příkaz: /%s (pokud to chcete odeslat, napište před to /say)"
+
+#: ../src/chat_control.py:1266 ../src/groupchat_control.py:1417
+#, python-format
+msgid "Commands: %s"
+msgstr "Příkazy: %s"
+
+#: ../src/chat_control.py:1269 ../src/groupchat_control.py:1431
+#, python-format
+msgid "Usage: /%s, clears the text window."
+msgstr "Použití: /%s, smaže zprávy v okně."
+
+#: ../src/chat_control.py:1272 ../src/groupchat_control.py:1436
+#, python-format
+msgid "Usage: /%s, hide the chat buttons."
+msgstr "Použití: /%s, skryje tlačítka rozhovoru."
+
+#: ../src/chat_control.py:1275 ../src/groupchat_control.py:1452
+#, python-format
+msgid ""
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
+msgstr ""
+"Použití: /%s <akce>, pošle akci do aktuální místnosti. Použijte třetí osobu "
+"(například /%s explodoval.)"
+
+#: ../src/chat_control.py:1279
+#, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr ""
+
+#: ../src/chat_control.py:1282
+#, fuzzy, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "Použití: /%s, skryje tlačítka rozhovoru."
+
+#: ../src/chat_control.py:1285 ../src/groupchat_control.py:1475
+#, python-format
+msgid "No help info for /%s"
+msgstr "Žádná další nápověda pro /%s"
+
+#: ../src/chat_control.py:1422
+msgid "Encryption enabled"
+msgstr "Šifrování zapnuto"
+
+#: ../src/chat_control.py:1427
+msgid "Encryption disabled"
+msgstr "Šifrování vypnuto"
+
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1575 ../src/conversation_textview.py:559
+#: ../src/dialogs.py:673 ../src/gajim.py:887 ../src/gajim.py:888
+#: ../src/gajim.py:1357 ../src/roster_window.py:344
+#: ../src/roster_window.py:428 ../src/roster_window.py:1784
+#: ../src/roster_window.py:1794 ../src/roster_window.py:2039
+#: ../src/roster_window.py:2277 ../src/roster_window.py:3125
+#: ../src/roster_window.py:3332 ../src/roster_window.py:4682
+#: ../src/roster_window.py:4684 ../src/common/contacts.py:84
+#: ../src/common/helpers.py:44 ../src/common/helpers.py:258
+msgid "Not in Roster"
+msgstr "není v seznamu"
+
+#. %s is being replaced in the code with JID
+#: ../src/chat_control.py:1717
+#, python-format
+msgid "You just received a new message from \"%s\""
+msgstr "Právě jsi obdržela novou zprávu od \"%s\""
+
+#: ../src/chat_control.py:1718
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Pokud zavřete toto okno a historie je vypnutá, tato zpráva bude ztracena."
+
+#: ../src/config.py:136 ../src/config.py:593
 msgid "Disabled"
 msgstr "Vypnuto"
 
-#: ../src/config.py:231
+#: ../src/config.py:228
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Každých %s _minut"
 
-#: ../src/config.py:351
+#: ../src/config.py:348
 msgid "Active"
 msgstr "Aktivní"
 
-#: ../src/config.py:359
+#: ../src/config.py:356
 msgid "Event"
 msgstr "Událost"
 
-#: ../src/config.py:682
-#: ../src/gajim.py:2231
+#: ../src/config.py:710 ../src/dialogs.py:957
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Slovník pro jazyk %s není dostupný"
 
-#: ../src/config.py:683
-#: ../src/gajim.py:2232
+#: ../src/config.py:711
 #, python-format
-msgid "You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option."
-msgstr "Musíš nainstalovat %s slovník k použití kontroly pravopisu, nebo vybrat jiný jazyk nastavením volby speller_language."
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+"Musíš nainstalovat %s slovník k použití kontroly pravopisu, nebo vybrat jiný "
+"jazyk nastavením volby speller_language."
 
-#: ../src/config.py:1000
+#: ../src/config.py:1034
 msgid "status message title"
 msgstr "titulek stavu"
 
-#: ../src/config.py:1000
+#: ../src/config.py:1034
 msgid "status message text"
 msgstr "text stavu"
 
-#: ../src/config.py:1036
+#: ../src/config.py:1070
 msgid "First Message Received"
 msgstr "První zpráva přijata"
 
-#: ../src/config.py:1037
+#: ../src/config.py:1071
 msgid "Next Message Received"
 msgstr "Další zpráva přijata"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1072
 msgid "Contact Connected"
 msgstr "Kontakt se připojil"
 
-#: ../src/config.py:1039
+#: ../src/config.py:1073
 msgid "Contact Disconnected"
 msgstr "Kontakt se odpojil"
 
-#: ../src/config.py:1040
+#: ../src/config.py:1074
 msgid "Message Sent"
 msgstr "Zpráva odeslána"
 
-#: ../src/config.py:1041
+#: ../src/config.py:1075
 msgid "Group Chat Message Highlight"
 msgstr "Zvýraznění zprávy v diskuzi"
 
-#: ../src/config.py:1042
+#: ../src/config.py:1076
 msgid "Group Chat Message Received"
 msgstr "Přijetí zprávy v diskuzi"
 
-#: ../src/config.py:1049
+#: ../src/config.py:1083
 msgid "GMail Email Received"
 msgstr "Přišel GMail Email"
 
-#: ../src/config.py:1252
+#. Name column
+#: ../src/config.py:1352 ../src/dialogs.py:1396 ../src/dialogs.py:1460
+#: ../src/disco.py:737 ../src/disco.py:1560 ../src/disco.py:1806
+#: ../src/history_window.py:78
+msgid "Name"
+msgstr "Jméno"
+
+#: ../src/config.py:1460 ../src/common/config.py:373
+msgid "Be right back."
+msgstr "Hned jsem zpět."
+
+#: ../src/config.py:1464
+msgid "Relogin now?"
+msgstr "Připojit se teď znovu?"
+
+#: ../src/config.py:1465
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr "Pokud chcete, aby se změny projevily ihned, musíte se znovu přihlásit."
+
+#: ../src/config.py:1560 ../src/config.py:1659
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP není použitelné na tomto počítači"
 
-#: ../src/config.py:1298
+#: ../src/config.py:1695 ../src/config.py:1739
+msgid "Unread events"
+msgstr "Nepřečtené zprávy"
+
+#: ../src/config.py:1696
+msgid "Read all pending events before removing this account."
+msgstr "Přečtěte si všechny čekající zprávy, než smažete tento účet."
+
+#: ../src/config.py:1725
+#, python-format
+msgid "You have opened chat in account %s"
+msgstr "Otevřel(a) jsi rozhovor z účtu %s"
+
+#: ../src/config.py:1726
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+"Všechna okna rozhovorů a diskuzí budou zavřena. Opravdu chceš pokračovat?"
+
+#: ../src/config.py:1735
 msgid "You are currently connected to the server"
 msgstr "Nejste přávě připojen(a) k serveru"
 
-#: ../src/config.py:1299
+#: ../src/config.py:1736
 msgid "To change the account name, you must be disconnected."
 msgstr "Ke změně jména účtu se musite odpojit."
 
-#: ../src/config.py:1302
-#: ../src/config.py:1901
-msgid "Unread events"
-msgstr "Nepřečtené zprávy"
-
-#: ../src/config.py:1303
+#: ../src/config.py:1740
 msgid "To change the account name, you must read all pending events."
 msgstr "Před změnou jména účtu si musíte přečíst všechny čekající zprávy."
 
-#: ../src/config.py:1307
+#: ../src/config.py:1746
 msgid "Account Name Already Used"
 msgstr "Jméno účtu už existuje"
 
-#: ../src/config.py:1308
-msgid "This name is already used by another of your accounts. Please choose another name."
+#: ../src/config.py:1747
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
 msgstr "Toto jméno je už použito pro jiný účet. Zvolte jiné, prosím."
 
-#: ../src/config.py:1312
-#: ../src/config.py:1316
+#: ../src/config.py:1751 ../src/config.py:1755
 msgid "Invalid account name"
 msgstr "Neplatné jméno účtu"
 
-#: ../src/config.py:1313
+#: ../src/config.py:1752
 msgid "Account name cannot be empty."
 msgstr "Jméno účtu nemůže být prázdné."
 
-#: ../src/config.py:1317
+#: ../src/config.py:1756
 msgid "Account name cannot contain spaces."
 msgstr "Jméno účtu nesmí obsahovat mezery."
 
-#: ../src/config.py:1325
-#: ../src/config.py:1331
-#: ../src/config.py:1341
-#: ../src/config.py:3004
+#: ../src/config.py:1820
+#, fuzzy
+msgid "Rename Account"
+msgstr "Spravuj účty"
+
+#: ../src/config.py:1821
+#, fuzzy, python-format
+msgid "Enter a new name for account %s"
+msgstr "Zadej nové jméno pro skupinu %s."
+
+#: ../src/config.py:1839 ../src/config.py:1847 ../src/config.py:1887
+#: ../src/config.py:3106
 msgid "Invalid Jabber ID"
 msgstr "Neplatné Jabber ID"
 
-#: ../src/config.py:1332
+#: ../src/config.py:1848
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musí být ve tvaru \"uživatel@jménoserveru\"."
 
-#: ../src/config.py:1391
+#: ../src/config.py:2033 ../src/config.py:3177
 msgid "Invalid entry"
 msgstr "Neplatný záznam"
 
-#: ../src/config.py:1392
+#: ../src/config.py:2034 ../src/config.py:3178
 msgid "Custom port must be a port number."
 msgstr "Vlastní port musí být číslo portu."
 
-#: ../src/config.py:1520
-#: ../src/common/config.py:366
-msgid "Be right back."
-msgstr "Hned jsem zpět."
+#: ../src/config.py:2055
+msgid "Failed to get secret keys"
+msgstr "Selhalo získání privátního klíče"
 
-#: ../src/config.py:1530
-msgid "Relogin now?"
-msgstr "Připojit se teď znovu?"
+#: ../src/config.py:2056
+msgid "There was a problem retrieving your OpenPGP secret keys."
+msgstr "Nastala chyba při získávání Vašich OpenPGP privátních klíčů."
 
-#: ../src/config.py:1531
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr "Pokud chcete, aby se změny projevily ihned, musíte se znovu přihlásit."
+#: ../src/config.py:2059
+msgid "OpenPGP Key Selection"
+msgstr "Výběr OpenPGP klíče"
 
-#: ../src/config.py:1557
+#: ../src/config.py:2060
+msgid "Choose your OpenPGP key"
+msgstr "Vyberte Váš OpenPGP klíč"
+
+#: ../src/config.py:2117
 msgid "No such account available"
 msgstr "Takový účet není dostupný"
 
-#: ../src/config.py:1558
+#: ../src/config.py:2118
 msgid "You must create your account before editing your personal information."
 msgstr "Musíte vytvořit účet před úpravou vašich osobních údajů."
 
-#: ../src/config.py:1565
-#: ../src/dialogs.py:1130
-#: ../src/dialogs.py:1316
-#: ../src/disco.py:419
-#: ../src/profile_window.py:323
+#: ../src/config.py:2125 ../src/dialogs.py:1243 ../src/dialogs.py:1384
+#: ../src/dialogs.py:1564 ../src/disco.py:420 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Nejste připojen(a) k serveru"
 
-#: ../src/config.py:1566
+#: ../src/config.py:2126
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez připojení nemůžete upravovat osobní údaje."
 
-#: ../src/config.py:1570
+#: ../src/config.py:2130
 msgid "Your server doesn't support Vcard"
 msgstr "Váš server nepodporuje vizitky."
 
-#: ../src/config.py:1571
+#: ../src/config.py:2131
 msgid "Your server can't save your personal information."
 msgstr "Váš server neumí uložit Vaše osobní informace."
 
-#: ../src/config.py:1595
-#: ../src/config.py:3392
-msgid "Failed to get secret keys"
-msgstr "Selhalo získání privátního klíče"
-
-#: ../src/config.py:1596
-#: ../src/config.py:3393
-msgid "There was a problem retrieving your OpenPGP secret keys."
-msgstr "Nastala chyba při získávání Vašich OpenPGP privátních klíčů."
-
-#: ../src/config.py:1599
-#: ../src/config.py:3396
-msgid "OpenPGP Key Selection"
-msgstr "Výběr OpenPGP klíče"
-
-#: ../src/config.py:1600
-#: ../src/config.py:3397
-msgid "Choose your OpenPGP key"
-msgstr "Vyberte Váš OpenPGP klíč"
-
-#. Name column
-#: ../src/config.py:1835
-#: ../src/disco.py:740
-#: ../src/disco.py:1495
-#: ../src/disco.py:1733
-#: ../src/history_window.py:78
-msgid "Name"
-msgstr "Jméno"
-
-#: ../src/config.py:1838
-msgid "Server"
-msgstr "Server"
-
-#: ../src/config.py:1902
-msgid "Read all pending events before removing this account."
-msgstr "Přečtěte si všechny čekající zprávy, než smažete tento účet."
-
-#: ../src/config.py:1939
-#, python-format
-msgid "You have opened chat in account %s"
-msgstr "Otevřel(a) jsi rozhovor z účtu %s"
-
-#: ../src/config.py:1940
-msgid "All chat and groupchat windows will be closed. Do you want to continue?"
-msgstr "Všechna okna rozhovorů a diskuzí budou zavřena. Opravdu chceš pokračovat?"
-
-#: ../src/config.py:1999
+#: ../src/config.py:2162
 msgid "Account Local already exists."
 msgstr "Účet Local už existuje."
 
-#: ../src/config.py:2000
+#: ../src/config.py:2163
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Prosím přejmenujte nebo odstraňte před povolením lokálních zpráv."
 
-#: ../src/config.py:2234
+#: ../src/config.py:2339
 #, python-format
 msgid "Edit %s"
 msgstr "Uprav %s"
 
-#: ../src/config.py:2236
+#: ../src/config.py:2341
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovat k %s"
 
 #. list at the beginning
-#: ../src/config.py:2302
+#: ../src/config.py:2377
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:2303
+#: ../src/config.py:2378
 msgid "Member List"
 msgstr "Seznam členů"
 
-#: ../src/config.py:2304
+#: ../src/config.py:2379
 msgid "Owner List"
 msgstr "Seznam vlastníků"
 
-#: ../src/config.py:2305
+#: ../src/config.py:2380
 msgid "Administrator List"
 msgstr "Seznam správců"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2338
-#: ../src/disco.py:747
-#: ../src/history_manager.py:155
+#: ../src/config.py:2429 ../src/disco.py:744 ../src/history_manager.py:155
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2346
+#: ../src/config.py:2437
 msgid "Reason"
 msgstr "Důvod"
 
-#: ../src/config.py:2351
+#: ../src/config.py:2442
 msgid "Nick"
 msgstr "Přezdívka"
 
-#: ../src/config.py:2355
+#: ../src/config.py:2446
 msgid "Role"
 msgstr "Postavení"
 
-#: ../src/config.py:2376
+#: ../src/config.py:2471
 msgid "Banning..."
 msgstr "Zakazuji..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2378
+#: ../src/config.py:2473
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2606,37 +3070,37 @@ msgstr ""
 "<b>Koho chcete zakázat?</b>\n"
 "\n"
 
-#: ../src/config.py:2380
+#: ../src/config.py:2475
 msgid "Adding Member..."
 msgstr "Přidávám člena..."
 
-#: ../src/config.py:2381
+#: ../src/config.py:2476
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Kdo se má stát členem?</b>\n"
 
-#: ../src/config.py:2383
+#: ../src/config.py:2478
 msgid "Adding Owner..."
 msgstr "Přidávám vlastníka..."
 
-#: ../src/config.py:2384
+#: ../src/config.py:2479
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr "<b>Kdo se má stát vlastníkem?</b>\n"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2481
 msgid "Adding Administrator..."
 msgstr "Přidávám správce..."
 
-#: ../src/config.py:2387
+#: ../src/config.py:2482
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Kdo se má stát správcem?</b>\n"
 
-#: ../src/config.py:2388
+#: ../src/config.py:2483
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2649,779 +3113,777 @@ msgstr ""
 "1. uživatel@doména/zdroj (pouze zdroji, který je uveden).\n"
 "2. uživatel@doména (kterýkoliv zdroj odpovídá).\n"
 "3. doména/zdroj (pouze zdroji, který je uveden).\n"
-"4. doména (doména samotná odpovídá, stejně jako kterýkoliv uživatel@doména),\n"
+"4. doména (doména samotná odpovídá, stejně jako kterýkoliv "
+"uživatel@doména),\n"
 "doména/zdroj, nebo adresa obsahující poddoménu."
 
-#: ../src/config.py:2493
+#: ../src/config.py:2587
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuju účet %s"
 
-#: ../src/config.py:2510
-#: ../src/roster_window.py:2734
+#: ../src/config.py:2604 ../src/gajim.py:1300 ../src/roster_window.py:3391
 msgid "Password Required"
 msgstr "Vyžadováno heslo"
 
-#: ../src/config.py:2511
-#: ../src/roster_window.py:2730
+#: ../src/config.py:2605 ../src/roster_window.py:3387
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Zadejte heslo pro účet %s"
 
-#: ../src/config.py:2512
-#: ../src/roster_window.py:2735
+#: ../src/config.py:2606 ../src/roster_window.py:3392
 msgid "Save password"
 msgstr "Uložit heslo"
 
-#: ../src/config.py:2526
+#: ../src/config.py:2620
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Účet \"%s\" se připojil k serveru"
 
-#: ../src/config.py:2527
+#: ../src/config.py:2621
 msgid "If you remove it, the connection will be lost."
 msgstr "Pokud jej smažete, připojení bude ztraceno."
 
-#: ../src/config.py:2612
+#: ../src/config.py:2714
 msgid "Default"
 msgstr "Výchozí"
 
-#: ../src/config.py:2612
+#: ../src/config.py:2714
 msgid "?print_status:All"
 msgstr "?print_status:Všechny"
 
-#: ../src/config.py:2613
+#: ../src/config.py:2715
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2614
+#: ../src/config.py:2716
 msgid "?print_status:None"
 msgstr "?print_status:Žádný"
 
-#: ../src/config.py:2682
+#: ../src/config.py:2785
 msgid "New Group Chat"
 msgstr "Nová diskuze"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2818
 msgid "This bookmark has invalid data"
 msgstr "Tato záložka má neplatná data"
 
-#: ../src/config.py:2716
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
-msgstr "Prosím nezapomeňte vyplnit políčka server a místnost, nebo smažte tuto záložku."
+#: ../src/config.py:2819
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
+msgstr ""
+"Prosím nezapomeňte vyplnit políčka server a místnost, nebo smažte tuto "
+"záložku."
 
-#: ../src/config.py:2979
+#: ../src/config.py:3089
 msgid "Invalid username"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/config.py:2980
+#: ../src/config.py:3091
 msgid "You must provide a username to configure this account."
 msgstr "Musíte zadat uživatelské jméno před nastavením tohoto účtu."
 
-#: ../src/config.py:2990
-#: ../src/dialogs.py:1335
-msgid "Invalid password"
-msgstr "Neplatné heslo"
-
-#: ../src/config.py:2991
-msgid "You must enter a password for the new account."
-msgstr "Musíte zadat heslo pro nový účet."
-
-#: ../src/config.py:2995
-#: ../src/dialogs.py:1340
-msgid "Passwords do not match"
-msgstr "Hesla se neshodují"
-
-#: ../src/config.py:2996
-#: ../src/dialogs.py:1341
-msgid "The passwords typed in both fields must be identical."
-msgstr "Hesla zadaná v obou políčkách musí být identická."
-
-#: ../src/config.py:3015
+#: ../src/config.py:3117
 msgid "Duplicate Jabber ID"
 msgstr "Dvakrát použité Jabber ID"
 
-#: ../src/config.py:3016
+#: ../src/config.py:3118
 msgid "This account is already configured in Gajim."
 msgstr "Tento účet už je nastaven v Gajimu."
 
-#: ../src/config.py:3033
+#: ../src/config.py:3135
 msgid "Account has been added successfully"
 msgstr "Účet byl úspěšně přidán"
 
-#: ../src/config.py:3034
-#: ../src/config.py:3069
-msgid "You can set advanced account options by pressing the Advanced button, or later by choosing the Accounts menuitem under the Edit menu from the main window."
-msgstr "Můžete nastavit rozšířené volby účtu po stisknutí tlačítka Rozšířené, nebo později stisknutím v položce menu Účty v nabídce Úpravy hlavního okna."
+#: ../src/config.py:3136 ../src/config.py:3281
+msgid ""
+"You can set advanced account options by pressing the Advanced button, or "
+"later by choosing the Accounts menuitem under the Edit menu from the main "
+"window."
+msgstr ""
+"Můžete nastavit rozšířené volby účtu po stisknutí tlačítka Rozšířené, nebo "
+"později stisknutím v položce menu Účty v nabídce Úpravy hlavního okna."
 
-#: ../src/config.py:3068
-msgid "Your new account has been created successfully"
-msgstr "Váš účet byl úspěšně vytvořen"
+#: ../src/config.py:3153
+#, fuzzy
+msgid "Invalid server"
+msgstr "Neplatné uživatelské jméno"
 
-#: ../src/config.py:3086
+#: ../src/config.py:3154
+#, fuzzy
+msgid "Please provide a server on which you want to register."
+msgstr "Prosím zadejte novou přezdívku, kterou chcete používat:"
+
+#: ../src/config.py:3260 ../src/config.py:3299
 msgid "An error occurred during account creation"
 msgstr "Nastala chyba při vytváření účtu"
 
-#: ../src/config.py:3144
+#: ../src/config.py:3280
+msgid "Your new account has been created successfully"
+msgstr "Váš účet byl úspěšně vytvořen"
+
+#: ../src/config.py:3385
 msgid "Account name is in use"
 msgstr "Jméno účtu se používá"
 
-#: ../src/config.py:3145
+#: ../src/config.py:3386
 msgid "You already have an account using this name."
 msgstr "Již máte účet s tímto jménem."
 
-#: ../src/conversation_textview.py:273
-msgid "Text below this line is what has been said since the last time you paid attention to this group chat"
-msgstr "Text pod touto čarou označuje to, co bylo řečeno po posledním čtení této diskuze"
+#: ../src/conversation_textview.py:334
+msgid ""
+"Text below this line is what has been said since the last time you paid "
+"attention to this group chat"
+msgstr ""
+"Text pod touto čarou označuje to, co bylo řečeno po posledním čtení této "
+"diskuze"
 
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:406
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akce pro \"%s\""
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:418
 msgid "Read _Wikipedia Article"
 msgstr "Číst článkek na _Wikipedia"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:423
 msgid "Look it up in _Dictionary"
 msgstr "Vyhledat ve _slovníku"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:439
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL slovníku chybí \"%s\" a není to WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:388
+#: ../src/conversation_textview.py:452
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL pro hledání na webu chybí \"%s\""
 
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:455
 msgid "Web _Search for it"
 msgstr "_Hledat na Webu"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:461
 msgid "Open as _Link"
 msgstr "Otevřít jako _Odkaz"
 
-#. add_to_roster_menuitem
-#: ../src/conversation_textview.py:495
-#: ../src/dialogs.py:629
-#: ../src/gajim.py:850
-#: ../src/gajim.py:851
-#: ../src/gajim.py:1195
-#: ../src/chat_control.py:1412
-#: ../src/roster_window.py:332
-#: ../src/roster_window.py:410
-#: ../src/roster_window.py:1497
-#: ../src/roster_window.py:1507
-#: ../src/roster_window.py:1683
-#: ../src/roster_window.py:1889
-#: ../src/roster_window.py:2474
-#: ../src/roster_window.py:2675
-#: ../src/roster_window.py:3906
-#: ../src/roster_window.py:3908
-#: ../src/common/contacts.py:73
-#: ../src/common/helpers.py:43
-#: ../src/common/helpers.py:255
-msgid "Not in Roster"
-msgstr "není v seznamu"
-
-#: ../src/conversation_textview.py:754
+#: ../src/conversation_textview.py:925
 msgid "Yesterday"
 msgstr "Včera"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:758
+#: ../src/conversation_textview.py:929
 #, python-format
 msgid "%i days ago"
 msgstr "před %i dny"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:792
+#: ../src/conversation_textview.py:963
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Předmět: %s\n"
 
-#: ../src/dialogs.py:59
+#: ../src/dialogs.py:63
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Jméno kontaktu: <i>%s</i>"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:65
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:211
+#: ../src/dialogs.py:215
 msgid "Group"
 msgstr "Skupina"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:222
 msgid "In the group"
 msgstr "Ve skupině"
 
-#: ../src/dialogs.py:269
+#: ../src/dialogs.py:273
 msgid "KeyID"
 msgstr "ID klíče"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:276
 msgid "Contact name"
 msgstr "Jméno kontaktu"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:322
 #, python-format
 msgid "%s Status Message"
 msgstr "Text stavu %s"
 
-#: ../src/dialogs.py:320
+#: ../src/dialogs.py:324
 msgid "Status Message"
 msgstr "Text stavu"
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:424
 msgid "Save as Preset Status Message"
 msgstr "Uložit jako přednastavený stav"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:425
 msgid "Please type a name for this status message"
 msgstr "Napište jméno pro tento stav"
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:436
+#, fuzzy
+msgid "Overwrite Status Message?"
+msgstr "Text stavu"
+
+#: ../src/dialogs.py:437
+#, fuzzy
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr "Toto jméno je už použito pro jiný účet. Zvolte jiné, prosím."
+
+#: ../src/dialogs.py:453
 msgid "AIM Address:"
 msgstr "AIM adresa:"
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:454
 msgid "GG Number:"
 msgstr "GG číslo: "
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:455
 msgid "ICQ Number:"
 msgstr "ICQ číslo: "
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:456
 msgid "MSN Address:"
 msgstr "MSN adresa:"
 
-#: ../src/dialogs.py:421
+#: ../src/dialogs.py:457
 msgid "Yahoo! Address:"
 msgstr "Yahoo! adresa:"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:493
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Prosím vyplňte údaje kontaktu, který chcete přidat do účtu %s"
 
-#: ../src/dialogs.py:459
+#: ../src/dialogs.py:495
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Prosím vyplňte údaje o kontaktu, který chcete přidat"
 
-#: ../src/dialogs.py:609
-#: ../src/dialogs.py:615
+#: ../src/dialogs.py:653 ../src/dialogs.py:659
 msgid "Invalid User ID"
 msgstr "Neplatný identifikátor uživatele"
 
-#: ../src/dialogs.py:616
+#: ../src/dialogs.py:660
 msgid "The user ID must not contain a resource."
 msgstr "User ID nesmí obsahovat zdroj."
 
-#: ../src/dialogs.py:630
+#: ../src/dialogs.py:674
 msgid "Contact already in roster"
 msgstr "Kontakt už je v Seznamu"
 
-#: ../src/dialogs.py:631
+#: ../src/dialogs.py:675
 msgid "This contact is already listed in your roster."
 msgstr "Tento kontakt už je obsažen ve Vašem seznamu."
 
-#: ../src/dialogs.py:668
+#: ../src/dialogs.py:711
 msgid "User ID:"
 msgstr "Uživatel:"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:773
 msgid "A GTK+ jabber client"
 msgstr "GTK+ Jabber client"
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:774
 msgid "GTK+ Version:"
 msgstr "GTK+ verze: "
 
-#: ../src/dialogs.py:733
+#: ../src/dialogs.py:775
 msgid "PyGTK Version:"
 msgstr "PyGTK verze: "
 
-#: ../src/dialogs.py:747
+#: ../src/dialogs.py:789
 msgid "Current Developers:"
 msgstr "Aktivní vývojáři:"
 
-#: ../src/dialogs.py:749
+#: ../src/dialogs.py:791
 msgid "Past Developers:"
 msgstr "Vysloužilí vývojáři:"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:801
 msgid "THANKS:"
 msgstr "DÍKY:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:765
+#: ../src/dialogs.py:807
 msgid "Last but not least, we would like to thank all the package maintainers."
-msgstr "Poslední, nikoliv nejmenší, poděkování patří všem správcům instalačních balíčků."
+msgstr ""
+"Poslední, nikoliv nejmenší, poděkování patří všem správcům instalačních "
+"balíčků."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:778
+#: ../src/dialogs.py:820
 msgid "translator-credits"
 msgstr "Petr Menšík <pihhan@seznam.cz>"
 
-#: ../src/dialogs.py:908
+#: ../src/dialogs.py:950
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Nemohu naslouchat na portu %s."
 
-#: ../src/dialogs.py:909
-msgid "Maybe you have another running instance of Gajim. File Transfer will be cancelled."
+#: ../src/dialogs.py:951
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
 msgstr "Možná máš puštěnou jinou instanci Gajimu. Přenos souborů bude zrušen."
 
-#: ../src/dialogs.py:1060
+#: ../src/dialogs.py:958
+#, fuzzy, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option.\n"
+"\n"
+"Highlighting misspelled words feature will not be used"
+msgstr ""
+"Musíš nainstalovat %s slovník k použití kontroly pravopisu, nebo vybrat jiný "
+"jazyk nastavením volby speller_language."
+
+#: ../src/dialogs.py:1172
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Žádost o autorizaci pro účet %s od %s"
 
-#: ../src/dialogs.py:1063
+#: ../src/dialogs.py:1175
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Žádost o autorizaci od %s"
 
-#: ../src/dialogs.py:1123
-#: ../src/roster_window.py:686
+#: ../src/dialogs.py:1236 ../src/roster_window.py:762
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Už jsi v místnosti %s"
 
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1244
 msgid "You can not join a group chat unless you are connected."
 msgstr "Nemůžete vstoupit do diskuze pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:1146
+#: ../src/dialogs.py:1262
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Vstoupit do diskuze z účtu %s"
 
-#: ../src/dialogs.py:1214
-#: ../src/dialogs.py:1220
+#: ../src/dialogs.py:1332 ../src/dialogs.py:1338
+#: ../src/groupchat_control.py:1639
 msgid "Invalid group chat Jabber ID"
 msgstr "Neplatné Jabber ID diskuzní místnosti"
 
-#: ../src/dialogs.py:1215
-#: ../src/dialogs.py:1221
+#: ../src/dialogs.py:1333 ../src/dialogs.py:1339
+#: ../src/groupchat_control.py:1640
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID diskuze obsahuje nepřijatelné znaky."
 
-#: ../src/dialogs.py:1227
+#: ../src/dialogs.py:1345
 msgid "This is not a group chat"
 msgstr "Tohle není diskuze"
 
-#: ../src/dialogs.py:1228
+#: ../src/dialogs.py:1346
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s není jméno diskuze."
 
-#: ../src/dialogs.py:1267
+#: ../src/dialogs.py:1385
+#, fuzzy
+msgid "Without a connection, you can not synchronise your contacts."
+msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
+
+#: ../src/dialogs.py:1399
+msgid "Server"
+msgstr "Server"
+
+#: ../src/dialogs.py:1432
+#, fuzzy
+msgid "This account is not connected to the server"
+msgstr "Účet \"%s\" se připojil k serveru"
+
+#: ../src/dialogs.py:1433
+#, fuzzy
+msgid "You cannot synchronize with an account unless it is connected."
+msgstr "Nemůžete vstoupit do diskuze pokud nejste připojen(a)."
+
+#: ../src/dialogs.py:1457
+msgid "Synchronise"
+msgstr ""
+
+#: ../src/dialogs.py:1515
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Začít rozhovor z účtu %s"
 
-#: ../src/dialogs.py:1269
+#: ../src/dialogs.py:1517
 msgid "Start Chat"
 msgstr "Začít rozhovor"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1518
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
-msgstr "Vyplňte Jabber ID nebo přezdívku kontaktu, se kterým chcete začít rozhovor:"
+msgstr ""
+"Vyplňte Jabber ID nebo přezdívku kontaktu, se kterým chcete začít rozhovor:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1295
-#: ../src/dialogs.py:1654
-#: ../src/dialogs.py:1785
+#: ../src/dialogs.py:1543 ../src/dialogs.py:1889 ../src/dialogs.py:2020
 msgid "Connection not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/dialogs.py:1296
-#: ../src/dialogs.py:1655
-#: ../src/dialogs.py:1786
+#: ../src/dialogs.py:1544 ../src/dialogs.py:1890 ../src/dialogs.py:2021
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Prosím ujistěte se že jste připojen s účtem \"%s\"."
 
-#: ../src/dialogs.py:1305
-#: ../src/dialogs.py:1308
+#: ../src/dialogs.py:1553 ../src/dialogs.py:1556
 msgid "Invalid JID"
 msgstr "Neplatné JID"
 
-#: ../src/dialogs.py:1308
+#: ../src/dialogs.py:1556
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nemůžu dekódovat \"%s\"."
 
-#: ../src/dialogs.py:1317
+#: ../src/dialogs.py:1565
 msgid "Without a connection, you can not change your password."
 msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:1336
+#: ../src/dialogs.py:1583
+msgid "Invalid password"
+msgstr "Neplatné heslo"
+
+#: ../src/dialogs.py:1584
 msgid "You must enter a password."
 msgstr "Musíte zadat heslo."
 
+#: ../src/dialogs.py:1588
+msgid "Passwords do not match"
+msgstr "Hesla se neshodují"
+
+#: ../src/dialogs.py:1589
+msgid "The passwords typed in both fields must be identical."
+msgstr "Hesla zadaná v obou políčkách musí být identická."
+
 #. img to display
 #. default value
-#: ../src/dialogs.py:1383
-#: ../src/notify.py:212
-#: ../src/notify.py:416
+#: ../src/dialogs.py:1631 ../src/notify.py:218 ../src/notify.py:428
 msgid "Contact Signed In"
 msgstr "Kontakt se přihlásil"
 
-#: ../src/dialogs.py:1385
-#: ../src/notify.py:220
-#: ../src/notify.py:418
+#: ../src/dialogs.py:1633 ../src/notify.py:226 ../src/notify.py:430
 msgid "Contact Signed Out"
 msgstr "Kontakt se odhlásil"
 
 #. chat message
-#: ../src/dialogs.py:1387
-#: ../src/notify.py:239
-#: ../src/notify.py:420
+#: ../src/dialogs.py:1635 ../src/notify.py:249 ../src/notify.py:432
 msgid "New Message"
 msgstr "Nová zpráva"
 
 #. single message
-#: ../src/dialogs.py:1387
-#: ../src/notify.py:224
-#: ../src/notify.py:420
+#: ../src/dialogs.py:1635 ../src/notify.py:230 ../src/notify.py:432
 msgid "New Single Message"
 msgstr "Nová jednoduché zpráva"
 
 #. private message
-#: ../src/dialogs.py:1388
-#: ../src/notify.py:231
-#: ../src/notify.py:421
+#: ../src/dialogs.py:1636 ../src/notify.py:237 ../src/notify.py:433
 msgid "New Private Message"
 msgstr "Nová soukromá zpráva"
 
-#: ../src/dialogs.py:1388
-#: ../src/gajim.py:1290
-#: ../src/notify.py:429
+#: ../src/dialogs.py:1636 ../src/gajim.py:1453 ../src/notify.py:441
 msgid "New E-mail"
 msgstr "Nový E-mail"
 
-#: ../src/dialogs.py:1390
-#: ../src/gajim.py:1443
-#: ../src/notify.py:423
+#: ../src/dialogs.py:1638 ../src/gajim.py:1606 ../src/notify.py:435
 msgid "File Transfer Request"
 msgstr "Žádost o přenos souboru"
 
-#: ../src/dialogs.py:1392
-#: ../src/gajim.py:1262
-#: ../src/gajim.py:1419
-#: ../src/notify.py:425
+#: ../src/dialogs.py:1640 ../src/gajim.py:1425 ../src/gajim.py:1582
+#: ../src/notify.py:437
 msgid "File Transfer Error"
 msgstr "Chyba přenosu souboru"
 
-#: ../src/dialogs.py:1394
-#: ../src/gajim.py:1482
-#: ../src/gajim.py:1504
-#: ../src/gajim.py:1521
-#: ../src/notify.py:427
+#: ../src/dialogs.py:1642 ../src/gajim.py:1645 ../src/gajim.py:1667
+#: ../src/gajim.py:1684 ../src/notify.py:439
 msgid "File Transfer Completed"
 msgstr "Přenos souboru dokončen"
 
-#: ../src/dialogs.py:1395
-#: ../src/gajim.py:1485
-#: ../src/notify.py:427
+#: ../src/dialogs.py:1643 ../src/gajim.py:1648 ../src/notify.py:439
 msgid "File Transfer Stopped"
 msgstr "Přenos souboru zastaven"
 
-#: ../src/dialogs.py:1397
-#: ../src/gajim.py:1159
-#: ../src/notify.py:431
+#: ../src/dialogs.py:1645 ../src/gajim.py:1321 ../src/notify.py:443
 msgid "Groupchat Invitation"
 msgstr "Skupinová pozvánka"
 
-#: ../src/dialogs.py:1399
-#: ../src/notify.py:204
-#: ../src/notify.py:433
+#: ../src/dialogs.py:1647 ../src/notify.py:210 ../src/notify.py:445
 msgid "Contact Changed Status"
 msgstr "Kontakt změnil stav"
 
-#: ../src/dialogs.py:1516
-#: ../src/chat_control.py:208
-msgid ""
-"If that is not your language for which you want to highlight misspelled words, then please set your $LANG as appropriate. Eg. for French do export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it global in /etc/profile.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Pokud to není Váš jazyk, pro který chcete zvýrazňovat slova s překlepy, potom prosím nastavte proměnnou $LANG na správnou. Například. pro Češtinu spusťte export LANG=cs_CZ nebo export LANG=cs_CZ zapište do ~/.bash_profile nebo pro nastavení globálně do /etc/profile.\n"
-"\n"
-"Vlastnost zvýrazňování překlepů nebude použita"
-
-#: ../src/dialogs.py:1584
+#: ../src/dialogs.py:1819
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Jednoduchá zpráva z účtu %s"
 
-#: ../src/dialogs.py:1586
+#: ../src/dialogs.py:1821
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Jednoduchá zpráva z účtu %s"
 
-#: ../src/dialogs.py:1588
+#: ../src/dialogs.py:1823
 msgid "Single Message"
 msgstr "Jednoduchá zpráva"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1591
+#: ../src/dialogs.py:1826
 #, python-format
 msgid "Send %s"
 msgstr "Odeslat %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1614
+#: ../src/dialogs.py:1849
 #, python-format
 msgid "Received %s"
 msgstr "Přijaté %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1686
+#: ../src/dialogs.py:1921
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1687
+#: ../src/dialogs.py:1922
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napsal(a):\n"
 
-#: ../src/dialogs.py:1731
+#: ../src/dialogs.py:1966
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzole pro %s"
 
-#: ../src/dialogs.py:1733
+#: ../src/dialogs.py:1968
 msgid "XML Console"
 msgstr "XML Konzole"
 
-#: ../src/dialogs.py:1856
+#: ../src/dialogs.py:2091
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:1860
+#: ../src/dialogs.py:2095
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1908
+#: ../src/dialogs.py:2152
 #, python-format
 msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr "Pořadí: %s, akce: %s, typ: %s, hodnota: %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:2155
 #, python-format
 msgid "Order: %s, action: %s"
 msgstr "Pořadí: %s, akce: %s"
 
-#: ../src/dialogs.py:1953
+#: ../src/dialogs.py:2197
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Upravit pravidlo</b>"
 
-#: ../src/dialogs.py:2040
+#: ../src/dialogs.py:2284
 msgid "<b>Add a rule</b>"
 msgstr "<b>Přidat pravidlo</b>"
 
-#: ../src/dialogs.py:2136
+#: ../src/dialogs.py:2380
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2138
+#: ../src/dialogs.py:2382
 msgid "Privacy Lists"
 msgstr ""
 
-#: ../src/dialogs.py:2208
+#: ../src/dialogs.py:2452
 msgid "Invalid List Name"
 msgstr "Neplatné jméno seznamu"
 
-#: ../src/dialogs.py:2209
+#: ../src/dialogs.py:2453
 msgid "You must enter a name to create a privacy list."
 msgstr "Musíte zadat jméno pro vytvoření privacy listu."
 
-#. Don't translate $Contact
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2490
+#, fuzzy
+msgid "$Contact has invited you to join a discussion"
+msgstr "$Contact Vás pozval(a) do místnosti %(room_jid)s"
+
+#: ../src/dialogs.py:2492
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact Vás pozval(a) do místnosti %(room_jid)s"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:2255
+#: ../src/dialogs.py:2504
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentář: %s"
 
-#: ../src/dialogs.py:2317
+#: ../src/dialogs.py:2570
 msgid "Choose Sound"
 msgstr "Vyberte zvuk"
 
-#: ../src/dialogs.py:2327
-#: ../src/dialogs.py:2372
+#: ../src/dialogs.py:2580 ../src/dialogs.py:2628
 msgid "All files"
 msgstr "Všechny soubory"
 
-#: ../src/dialogs.py:2332
+#: ../src/dialogs.py:2585
 msgid "Wav Sounds"
 msgstr "Waw soubory"
 
-#: ../src/dialogs.py:2362
+#: ../src/dialogs.py:2618
 msgid "Choose Image"
 msgstr "Vyberte obrázek"
 
-#: ../src/dialogs.py:2377
+#: ../src/dialogs.py:2633
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/dialogs.py:2434
+#: ../src/dialogs.py:2697
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kdy %s může být:"
 
-#: ../src/dialogs.py:2436
+#: ../src/dialogs.py:2699
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Přidávám zvláštní notifikaci pro %s"
 
 #. # means number
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2770
 msgid "#"
 msgstr "č."
 
-#: ../src/dialogs.py:2513
+#: ../src/dialogs.py:2776
 msgid "Condition"
 msgstr "Podmínka"
 
-#: ../src/dialogs.py:2634
+#: ../src/dialogs.py:2894
 msgid "when I am "
 msgstr "když jsem "
 
-#: ../src/disco.py:103
+#: ../src/disco.py:104
 msgid "Others"
 msgstr "Ostatní"
 
-#: ../src/disco.py:104
-#: ../src/disco.py:105
-#: ../src/disco.py:1281
-#: ../src/gajim.py:604
-#: ../src/roster_window.py:271
-#: ../src/roster_window.py:329
-#: ../src/roster_window.py:368
-#: ../src/roster_window.py:450
-#: ../src/roster_window.py:482
-#: ../src/roster_window.py:484
-#: ../src/roster_window.py:3902
-#: ../src/roster_window.py:3904
-#: ../src/common/contacts.py:267
-#: ../src/common/contacts.py:282
-#: ../src/common/helpers.py:43
+#: ../src/disco.py:105 ../src/disco.py:106 ../src/disco.py:1346
+#: ../src/gajim.py:638 ../src/roster_window.py:281 ../src/roster_window.py:341
+#: ../src/roster_window.py:381 ../src/roster_window.py:489
+#: ../src/roster_window.py:521 ../src/roster_window.py:523
+#: ../src/roster_window.py:4678 ../src/roster_window.py:4680
+#: ../src/common/contacts.py:290 ../src/common/contacts.py:305
+#: ../src/common/helpers.py:44
 msgid "Transports"
 msgstr "Transporty"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:107
+#: ../src/disco.py:108
 msgid "Conference"
 msgstr "Diskuze"
 
-#: ../src/disco.py:420
+#: ../src/disco.py:421
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez spojení nemůžete prohlížet dostupné služby"
 
-#: ../src/disco.py:499
+#: ../src/disco.py:496
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Procházení služeb s použitím účtu %s"
 
-#: ../src/disco.py:501
+#: ../src/disco.py:498
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: ../src/disco.py:641
+#: ../src/disco.py:638
 msgid "The service could not be found"
 msgstr "Tato služba nebyla nalezena"
 
-#: ../src/disco.py:642
-msgid "There is no service at the address you entered, or it is not responding. Check the address and try again."
-msgstr "Služba na zadané adrese neexistuje, nebo neodpovídá. Zkontrolujte adresu a opakujte znovu."
+#: ../src/disco.py:639
+msgid ""
+"There is no service at the address you entered, or it is not responding. "
+"Check the address and try again."
+msgstr ""
+"Služba na zadané adrese neexistuje, nebo neodpovídá. Zkontrolujte adresu a "
+"opakujte znovu."
 
-#: ../src/disco.py:646
-#: ../src/disco.py:927
+#: ../src/disco.py:643 ../src/disco.py:924
 msgid "The service is not browsable"
 msgstr "Službu nelze prohlížet"
 
-#: ../src/disco.py:647
+#: ../src/disco.py:644
 msgid "This type of service does not contain any items to browse."
 msgstr "Tento typ služby neobsahuje žádné položky, které je možné prohlížet."
 
-#: ../src/disco.py:727
+#: ../src/disco.py:724
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Procházím %s pomocí účtu %s"
 
-#: ../src/disco.py:766
+#: ../src/disco.py:763
 msgid "_Browse"
 msgstr "_Prohlížet"
 
-#: ../src/disco.py:928
+#: ../src/disco.py:925
 msgid "This service does not contain any items to browse."
 msgstr "Tato služba neobsahuje žádné položky, které je možno prohlížet."
 
-#: ../src/disco.py:1155
-#: ../src/disco.py:1286
+#: ../src/disco.py:1153 ../src/disco.py:1351
 msgid "Re_gister"
 msgstr "Re_gistrace"
 
 # FIXME: tohle je blbe prelozene, najit v kontextu a vymyslet lepsi oznaceni
-#: ../src/disco.py:1323
+#: ../src/disco.py:1388
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Skenuji %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1504
+#: ../src/disco.py:1570
 msgid "Users"
 msgstr "Uživatelé"
 
 #. Description column
-#: ../src/disco.py:1511
+#: ../src/disco.py:1578
 msgid "Description"
 msgstr "Popis"
 
 #. Id column
-#: ../src/disco.py:1518
+#: ../src/disco.py:1586
 msgid "Id"
 msgstr "č."
 
-#: ../src/disco.py:1741
+#: ../src/disco.py:1815
 msgid "Subscribed"
 msgstr "Autorizován"
 
-#: ../src/disco.py:1767
+#: ../src/disco.py:1823
+#, fuzzy
+msgid "Node"
+msgstr "Žádný"
+
+#: ../src/disco.py:1880
 msgid "New post"
 msgstr "Nový záznam"
 
-#: ../src/disco.py:1773
+#: ../src/disco.py:1886
 msgid "_Subscribe"
 msgstr "_Žádat autorizaci"
 
-#: ../src/disco.py:1779
+#: ../src/disco.py:1892
 msgid "_Unsubscribe"
 msgstr "_Zrušit autorizaci"
 
@@ -3437,142 +3899,132 @@ msgstr "Čas"
 msgid "Progress"
 msgstr "Průběh"
 
-#: ../src/filetransfers_window.py:163
-#: ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:159 ../src/filetransfers_window.py:213
 #, python-format
 msgid "Filename: %s"
 msgstr "Soubor: %s"
 
-#: ../src/filetransfers_window.py:164
-#: ../src/filetransfers_window.py:298
+#: ../src/filetransfers_window.py:160 ../src/filetransfers_window.py:288
 #, python-format
 msgid "Size: %s"
 msgstr "Velikost: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:173
-#: ../src/filetransfers_window.py:183
+#: ../src/filetransfers_window.py:169 ../src/filetransfers_window.py:179
 #: ../src/history_manager.py:463
 msgid "You"
 msgstr "Vy"
 
-#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:170
 #, python-format
 msgid "Sender: %s"
 msgstr "Odesílatel: %s"
 
-#: ../src/filetransfers_window.py:175
-#: ../src/filetransfers_window.py:572
-#: ../src/tooltips.py:573
+#: ../src/filetransfers_window.py:171 ../src/filetransfers_window.py:577
+#: ../src/tooltips.py:586
 msgid "Recipient: "
 msgstr "Příjemce: "
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:182
 #, python-format
 msgid "Saved in: %s"
 msgstr "Uloženo do: %s"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:184
 msgid "File transfer completed"
 msgstr "Přenos soubor dokončen"
 
-#: ../src/filetransfers_window.py:204
-#: ../src/filetransfers_window.py:212
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:204
 msgid "File transfer cancelled"
 msgstr "Přenos souboru zrušen"
 
-#: ../src/filetransfers_window.py:204
-#: ../src/filetransfers_window.py:213
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:205
 msgid "Connection with peer cannot be established."
 msgstr "Spojení s protistranou se nepodařilo navázat."
 
-#: ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:214
 #, python-format
 msgid "Recipient: %s"
 msgstr "Příjemce: %s"
 
-#: ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:216
 #, python-format
 msgid "Error message: %s"
 msgstr "Chybová zpráva: %s"
 
-#: ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:217
 msgid "File transfer stopped by the contact at the other end"
 msgstr "Přenos souboru byl ukončen protistranou"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:234
 msgid "Choose File to Send..."
 msgstr "Vyber soubor k odeslání..."
 
-#: ../src/filetransfers_window.py:263
+#: ../src/filetransfers_window.py:253
 msgid "Gajim cannot access this file"
 msgstr "Gajim nemůže otevřít tento soubor"
 
-#: ../src/filetransfers_window.py:264
+#: ../src/filetransfers_window.py:254
 msgid "This file is being used by another process."
 msgstr "Tento soubor je používán jiným procesem."
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:286
 #, python-format
 msgid "File: %s"
 msgstr "Soubor: %s"
 
-#: ../src/filetransfers_window.py:301
+#: ../src/filetransfers_window.py:291
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:293
 #, python-format
 msgid "Description: %s"
 msgstr "Popis: %s"
 
-#: ../src/filetransfers_window.py:304
+#: ../src/filetransfers_window.py:294
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s Vám chce poslat soubor:"
 
-#: ../src/filetransfers_window.py:318
-#: ../src/gtkgui_helpers.py:748
+#: ../src/filetransfers_window.py:308 ../src/gtkgui_helpers.py:766
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nemohu přepsat existující soubor \"%s\""
 
-#: ../src/filetransfers_window.py:319
-#: ../src/gtkgui_helpers.py:750
-msgid "A file with this name already exists and you do not have permission to overwrite it."
+#: ../src/filetransfers_window.py:309 ../src/gtkgui_helpers.py:768
+msgid ""
+"A file with this name already exists and you do not have permission to "
+"overwrite it."
 msgstr "Soubor tohoto jména již existuje a ty nemáš oprávnění k jeho přepsání."
 
-#: ../src/filetransfers_window.py:326
-#: ../src/gtkgui_helpers.py:754
+#: ../src/filetransfers_window.py:316 ../src/gtkgui_helpers.py:772
 msgid "This file already exists"
 msgstr "Tento soubor už existuje"
 
-#: ../src/filetransfers_window.py:326
-#: ../src/gtkgui_helpers.py:754
+#: ../src/filetransfers_window.py:316 ../src/gtkgui_helpers.py:772
 msgid "What do you want to do?"
 msgstr "Co by jste rád(a) dělal(a)?"
 
-#: ../src/filetransfers_window.py:338
-#: ../src/gtkgui_helpers.py:764
+#: ../src/filetransfers_window.py:328 ../src/gtkgui_helpers.py:782
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Adresář \"%s\" není zapisovatelný"
 
-#: ../src/filetransfers_window.py:338
-#: ../src/gtkgui_helpers.py:765
+#: ../src/filetransfers_window.py:328 ../src/gtkgui_helpers.py:783
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemáš oprávnění k vytváření souborů v tomto adresáři."
 
-#: ../src/filetransfers_window.py:348
+#: ../src/filetransfers_window.py:338
 msgid "Save File as..."
 msgstr "Uložit jako..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:429
+#: ../src/filetransfers_window.py:419
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3580,97 +4032,104 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:505
+#: ../src/filetransfers_window.py:508
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:544
-#: ../src/filetransfers_window.py:547
+#: ../src/filetransfers_window.py:547 ../src/filetransfers_window.py:550
 msgid "Invalid File"
 msgstr "Neplatný soubor"
 
-#: ../src/filetransfers_window.py:544
+#: ../src/filetransfers_window.py:547
 msgid "File: "
 msgstr "Soubor: "
 
-#: ../src/filetransfers_window.py:548
+#: ../src/filetransfers_window.py:551
 msgid "It is not possible to send empty files"
 msgstr "Není možné posílat prázdné soubory"
 
-#: ../src/filetransfers_window.py:568
-#: ../src/tooltips.py:563
+#: ../src/filetransfers_window.py:573 ../src/tooltips.py:576
 msgid "Name: "
 msgstr "Jméno: "
 
-#: ../src/filetransfers_window.py:570
-#: ../src/tooltips.py:567
+#: ../src/filetransfers_window.py:575 ../src/tooltips.py:580
 msgid "Sender: "
 msgstr "Odesílatel: "
 
-#: ../src/filetransfers_window.py:758
+#: ../src/filetransfers_window.py:763
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/gajim.py:47
+#: ../src/gajim.py:49
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s není platný loglevel"
 
-#: ../src/gajim.py:122
+#: ../src/gajim.py:138
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim vyžaduje k běhu X server. Končím..."
 
-#: ../src/gajim.py:126
+#: ../src/gajim.py:142
 msgid "Gajim needs PyGTK 2.8 or above"
 msgstr "Gajim vyžaduje PyGTK 2.8 nebo novější"
 
-#: ../src/gajim.py:127
+#: ../src/gajim.py:143
 msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
 msgstr "Gajim vyžaduje PyGTK 2.8 nebo novější. Končím..."
 
-#: ../src/gajim.py:129
+#: ../src/gajim.py:145
 msgid "Gajim needs GTK 2.8 or above"
 msgstr "Gajim potřebuje GTK 2.8 nebo novější"
 
-#: ../src/gajim.py:130
+#: ../src/gajim.py:146
 msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
 msgstr "Gajim vyžaduje GTK 2.8 nebo novější. Končím..."
 
 # FIXME: runtime je jak?
-#: ../src/gajim.py:135
+#: ../src/gajim.py:151
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ runtime vyžaduje podporu libglade"
 
 # FIXME: runtime?
-#: ../src/gajim.py:137
+#: ../src/gajim.py:153
 #, python-format
-msgid "Please remove your current GTK+ runtime and install the latest stable version from %s"
-msgstr "Prosím odinstalujte stávající GTK+ runtime a nainstalujte poslední stabilní verzi z %s"
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Prosím odinstalujte stávající GTK+ runtime a nainstalujte poslední stabilní "
+"verzi z %s"
 
-#: ../src/gajim.py:139
-msgid "Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr "Ujistěte se prosím, že GTK+ a PyGTK ve Vašem systému podporují libglade."
+#: ../src/gajim.py:155
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr ""
+"Ujistěte se prosím, že GTK+ a PyGTK ve Vašem systému podporují libglade."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:160
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim vyžaduje PySQLite2"
 
-#: ../src/gajim.py:152
+#: ../src/gajim.py:168
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim potřebuje k běhu pywin32"
 
-#: ../src/gajim.py:153
+#: ../src/gajim.py:169
 #, python-format
-msgid "Please make sure that Pywin32 is installed on your system. You can get it at %s"
-msgstr "Prosím ujistěte se, že Pywin32 je nainstalován na vašem počítači. Můžete jej získat na %s"
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+"Prosím ujistěte se, že Pywin32 je nainstalován na vašem počítači. Můžete jej "
+"získat na %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:300
+#: ../src/gajim.py:311
 msgid "Gajim is already running"
 msgstr "Gajim již běží"
 
-#: ../src/gajim.py:301
+#: ../src/gajim.py:312
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -3678,89 +4137,138 @@ msgstr ""
 "Jiná instance Gajimu pravděpodobně již běží\n"
 "Přesto spustit?"
 
-#: ../src/gajim.py:408
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) Autorizace pro %s (id: %s)"
+#: ../src/gajim.py:335 ../src/common/connection_handlers.py:897
+#: ../src/common/connection_handlers.py:1538
+#: ../src/common/connection_handlers.py:1566
+#: ../src/common/connection_handlers.py:1577
+#: ../src/common/connection_handlers.py:1596
+#: ../src/common/connection_handlers.py:1755
+#: ../src/common/connection_handlers.py:1867 ../src/common/connection.py:913
+msgid "Disk Write Error"
+msgstr ""
 
-#: ../src/gajim.py:409
+#: ../src/gajim.py:428
 msgid "Do you accept this request?"
 msgstr "Chcete přijmout tuto žádost?"
 
-#: ../src/gajim.py:455
-#: ../src/notify.py:435
+#: ../src/gajim.py:431
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "HTTP (%s) Autorizace pro %s (id: %s)"
+
+#: ../src/gajim.py:478 ../src/notify.py:447
 msgid "Connection Failed"
 msgstr "Spojení selhalo"
 
-#: ../src/gajim.py:775
+#: ../src/gajim.py:810
 #, python-format
 msgid "Subject: %s"
 msgstr "Předmět: %s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
-#: ../src/gajim.py:820
-#: ../src/gajim.py:833
+#: ../src/gajim.py:857 ../src/gajim.py:870
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "chyba při odesílání %s ( %s )"
 
-#: ../src/gajim.py:866
+#: ../src/gajim.py:903
 msgid "Authorization accepted"
 msgstr "Autorizace přijata"
 
-#: ../src/gajim.py:867
+#: ../src/gajim.py:904
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakt \"%s\" Vás autorizoval k zobrazení jeho stavu."
 
-#: ../src/gajim.py:875
+#: ../src/gajim.py:912
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" Vám odebral autorizaci"
 
 # FIXME: hrozna veta
-#: ../src/gajim.py:876
+#: ../src/gajim.py:913
 msgid "You will always see him or her as offline."
 msgstr "Uvidíte jej nebo ji vždy jako odpojenou."
 
-#: ../src/gajim.py:919
+#: ../src/gajim.py:957
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt s \"%s\" nebyl navázán"
 
-#: ../src/gajim.py:920
-#: ../src/common/connection.py:423
+#: ../src/gajim.py:958 ../src/common/connection.py:463
 msgid "Check your connection or try again later."
 msgstr "Ověřte spojení nebo zkuste později."
 
-#: ../src/gajim.py:1069
-#: ../src/roster_window.py:1217
+#: ../src/gajim.py:1129 ../src/roster_window.py:1342
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s je nyní %s (%s)"
 
 #. No status message
-#: ../src/gajim.py:1072
-#: ../src/groupchat_control.py:952
-#: ../src/roster_window.py:1220
+#: ../src/gajim.py:1132 ../src/groupchat_control.py:1100
+#: ../src/roster_window.py:1345
 #, python-format
 msgid "%s is now %s"
 msgstr "%s je nyní %s"
 
-#: ../src/gajim.py:1169
+#. Can be a presence (see chg_contact_status in groupchat_contol.py)
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/gajim.py:1252 ../src/groupchat_control.py:912
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#: ../src/gajim.py:1254
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gajim.py:1256
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gajim.py:1259
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_contol.py)
+#: ../src/gajim.py:1262
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gajim.py:1264
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gajim.py:1266
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1268
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1270
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1301
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it"
+msgstr "Pro připojení do této místnosti je vyžadováno heslo."
+
+#: ../src/gajim.py:1331
 msgid "Your passphrase is incorrect"
 msgstr "Vaše heslo je neplatné"
 
-#: ../src/gajim.py:1170
+#: ../src/gajim.py:1332
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Momentálně jste připojen(a) bez vašeho OpenPGP klíče."
 
-#: ../src/gajim.py:1273
+#: ../src/gajim.py:1436
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nový E-mail pro %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1275
+#: ../src/gajim.py:1438
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3771,7 +4279,7 @@ msgstr[2] "Máte %d nepřečtených E-mailů"
 #. FIXME: emulate Gtalk client popups. find out what they parse and how
 #. they decide what to show
 #. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1284
+#: ../src/gajim.py:1447
 #, python-format
 msgid ""
 "\n"
@@ -3780,53 +4288,85 @@ msgstr ""
 "\n"
 "Od: %(from_address)s"
 
-#: ../src/gajim.py:1440
+#: ../src/gajim.py:1603
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Vám chce poslat soubor."
 
-#: ../src/gajim.py:1505
+#: ../src/gajim.py:1668
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Soubor %(filename)s od %(name)s byl úspěsně přijat."
 
 #. ft stopped
-#: ../src/gajim.py:1509
+#: ../src/gajim.py:1672
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Přenos souboru %(filename)s od %(name)s byl zastaven."
 
-#: ../src/gajim.py:1522
+#: ../src/gajim.py:1685
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Soubor %(filename)s byl uspěšně odeslán %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1526
+#: ../src/gajim.py:1689
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Přenos souboru %(filename)s pro %(name)s byl zastaven."
 
-#: ../src/gajim.py:1639
+#: ../src/gajim.py:1823
 msgid "Username Conflict"
 msgstr "Konflikt uživatelských jmen"
 
-#: ../src/gajim.py:1640
+#: ../src/gajim.py:1824
 msgid "Please type a new username for your local account"
 msgstr "Prosím zadejte nové uživatelské jméno pro lokální účet"
 
+#: ../src/gajim.py:1841
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gajim.py:1849
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gajim.py:1855
+msgid "Error."
+msgstr ""
+
+#: ../src/gajim.py:1880
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "Konflikt uživatelských jmen"
+
+#: ../src/gajim.py:1881
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
 # FIXME: jaky je rozdil mezi settings a preferences?
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1981
+#: ../src/gajim.py:2241
 msgid "Could not save your settings and preferences"
 msgstr "Nelze uložit Vaše nastavení"
 
-#: ../src/gajim.py:2179
+#. sorted alphanum
+#: ../src/gajim.py:2376 ../src/common/config.py:85 ../src/common/config.py:393
+#: ../src/common/optparser.py:193 ../src/common/optparser.py:411
+#: ../src/common/optparser.py:445
+#, fuzzy
+msgid "default"
+msgstr "Výchozí"
+
+#: ../src/gajim.py:2462
 msgid "Network Manager support not available"
 msgstr "Podpora Network Manageru není dostupná"
 
-#: ../src/gajim.py:2258
+#: ../src/gajim.py:2563
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Podpora Správce sezení není dostupná (schází gnome.ui modul)"
 
@@ -3852,22 +4392,20 @@ msgid "Pops up a window with the next pending event"
 msgstr "Zobrazí okno s další nepřečtenou událostí"
 
 #: ../src/gajim-remote.py:81
-msgid "Prints a list of all contacts in the roster. Each contact appears on a separate line"
-msgstr "Vytiskne seznam všech kontaktů v rosteru. Každý kontakt se objeví na samostatném řádku"
-
-#: ../src/gajim-remote.py:84
-#: ../src/gajim-remote.py:99
-#: ../src/gajim-remote.py:109
-#: ../src/gajim-remote.py:122
-#: ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:157
-#: ../src/gajim-remote.py:187
-#: ../src/gajim-remote.py:196
-#: ../src/gajim-remote.py:203
-#: ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:221
-#: ../src/gajim-remote.py:237
-#: ../src/gajim-remote.py:246
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appears on a "
+"separate line"
+msgstr ""
+"Vytiskne seznam všech kontaktů v rosteru. Každý kontakt se objeví na "
+"samostatném řádku"
+
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:205 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:246 ../src/gajim-remote.py:255
 msgid "account"
 msgstr "účet"
 
@@ -3890,11 +4428,11 @@ msgstr "stav"
 
 #: ../src/gajim-remote.py:97
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
-msgstr "jeden z: odpojen, připojen, ukecaný, pryč, nedostupný, nerušit, neviditelný "
+msgstr ""
+"jeden z: odpojen, připojen, ukecaný, pryč, nedostupný, nerušit, neviditelný "
 
-#: ../src/gajim-remote.py:98
-#: ../src/gajim-remote.py:119
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:144
 msgid "message"
 msgstr "zpráva"
 
@@ -3903,8 +4441,12 @@ msgid "status message"
 msgstr "text stavu"
 
 #: ../src/gajim-remote.py:99
-msgid "change status of account \"account\". If not specified, try to change status of all accounts that have \"sync with global status\" option set"
-msgstr "změnit stav účtu \"account\". Pokud není uveden, zkuste změnit stav všech účtů které mají povolenu volbu \"sync with global status\" "
+msgid ""
+"change status of account \"account\". If not specified, try to change status "
+"of all accounts that have \"sync with global status\" option set"
+msgstr ""
+"změnit stav účtu \"account\". Pokud není uveden, zkuste změnit stav všech "
+"účtů které mají povolenu volbu \"sync with global status\" "
 
 #: ../src/gajim-remote.py:105
 msgid "Shows the chat dialog so that you can send messages to a contact"
@@ -3914,43 +4456,51 @@ msgstr "Zobrazte okno rozhovoru, aby jste mohl(a) poslat zprávu kontaktu"
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kontaktu, se kterým chcete komunikovat"
 
-#: ../src/gajim-remote.py:109
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:196
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "pokud uvedeno, kontakt bude vzít ze seznamu kontaktů pro tento účet"
 
 #: ../src/gajim-remote.py:114
-msgid "Sends new chat message to a contact in the roster. Both OpenPGP key and account are optional. If you want to set only 'account', without 'OpenPGP key', just set 'OpenPGP key' to ''."
-msgstr "Poslat nový rozhovor kontaktu v Seznamu. Obojí OpenPGP klíč a účet jsou volitelné. Pokud chcete nastavit pouze 'account' bez 'OpenPGP key', nastavte prostě 'OpenPGP key' na ''."
+msgid ""
+"Sends new chat message to a contact in the roster. Both OpenPGP key and "
+"account are optional. If you want to set only 'account', without 'OpenPGP "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Poslat nový rozhovor kontaktu v Seznamu. Obojí OpenPGP klíč a účet jsou "
+"volitelné. Pokud chcete nastavit pouze 'account' bez 'OpenPGP key', nastavte "
+"prostě 'OpenPGP key' na ''."
 
-#: ../src/gajim-remote.py:118
-#: ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:131
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontaktu, který obdrží zprávu"
 
-#: ../src/gajim-remote.py:119
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144
 msgid "message contents"
 msgstr "Tělo zprávy"
 
-#: ../src/gajim-remote.py:120
-#: ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134
 msgid "pgp key"
 msgstr "pgp klíč"
 
-#: ../src/gajim-remote.py:120
-#: ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "pokud bude uvedeno, zpráva bude zašifrována tímto veřejným klíčem"
 
-#: ../src/gajim-remote.py:122
-#: ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:145
 msgid "if specified, the message will be sent using this account"
 msgstr "pokud bude uvedeno, zpráva bude odeslána z tohoto účtu"
 
 #: ../src/gajim-remote.py:127
-msgid "Sends new single message to a contact in the roster. Both OpenPGP key and account are optional. If you want to set only 'account', without 'OpenPGP key', just set 'OpenPGP key' to ''."
-msgstr "Poslat novou prostou zprávu kontaktu v Seznamu. Obojí OpenPGP klíč a účet jsou volitelné. Pokud chcete nastavit pouze 'account' bez 'OpenPGP key', nastavte prostě 'OpenPGP key' na ''."
+msgid ""
+"Sends new single message to a contact in the roster. Both OpenPGP key and "
+"account are optional. If you want to set only 'account', without 'OpenPGP "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Poslat novou prostou zprávu kontaktu v Seznamu. Obojí OpenPGP klíč a účet "
+"jsou volitelné. Pokud chcete nastavit pouze 'account' bez 'OpenPGP key', "
+"nastavte prostě 'OpenPGP key' na ''."
 
 #: ../src/gajim-remote.py:132
 msgid "subject"
@@ -3961,151 +4511,163 @@ msgid "message subject"
 msgstr "předmět zprávy"
 
 #: ../src/gajim-remote.py:141
+msgid "Sends new message to a groupchat you've joined."
+msgstr ""
+
+#: ../src/gajim-remote.py:143
+#, fuzzy
+msgid "JID of the room that will receive the message"
+msgstr "JID kontaktu, který obdrží zprávu"
+
+#: ../src/gajim-remote.py:150
 msgid "Gets detailed info on a contact"
 msgstr "Získej detailní informace o kontaktu"
 
-#: ../src/gajim-remote.py:143
-#: ../src/gajim-remote.py:156
-#: ../src/gajim-remote.py:186
-#: ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:165
+#: ../src/gajim-remote.py:195 ../src/gajim-remote.py:204
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:156
 msgid "Gets detailed info on a account"
 msgstr "Získej detailní informace o účtu"
 
-#: ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:158
 msgid "Name of the account"
 msgstr "Jméno účtu"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:162
 msgid "Sends file to a contact"
 msgstr "Pošle soubor kontaktu"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:164
 msgid "file"
 msgstr "soubor"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:164
 msgid "File path"
 msgstr "Cesta k souboru"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:166
 msgid "if specified, file will be sent using this account"
 msgstr "pokud bude uvedeno, zpráva bude odeslána z tohoto účtu"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "Lists all preferences and their values"
 msgstr "Vypíše všechna nastavení a jejich hodnoty"
 
 # FIXME: opravit, pokud je mozne prekladat i key & value
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:175
 msgid "Sets value of 'key' to 'value'."
 msgstr "Nastaví hodnotu klíče 'key' na hodnotu 'value'"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:177
 msgid "key=value"
 msgstr "klíč=hodnota"
 
 # FIXME: opet
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:177
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'klíč' je jméno volby, 'hodnota' je hodnota která se nastavuje"
 
-#: ../src/gajim-remote.py:173
+#: ../src/gajim-remote.py:182
 msgid "Deletes a preference item"
 msgstr "Smaže položku nastavení"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:184
 msgid "key"
 msgstr "klíč"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:184
 msgid "name of the preference to be deleted"
 msgstr "jméno volby, která bude smazána"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:188
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapíše aktuální nastavení do souboru .config"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:193
 msgid "Removes contact from roster"
 msgstr "Odstraní kontakt ze Seznamu"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:202
 msgid "Adds contact to roster"
 msgstr "Přidat kontakt do Seznamu"
 
-#: ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:204
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:205
 msgid "Adds new contact to this account"
 msgstr "Přidá nový kontakt do tohoto účtu"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:210
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Vrátí aktuální stav (globální, pokud není uveden účet)"
 
-#: ../src/gajim-remote.py:208
-msgid "Returns current status message(the global one unless account is specified)"
+#: ../src/gajim-remote.py:217
+msgid ""
+"Returns current status message(the global one unless account is specified)"
 msgstr "Vrací aktuální stav (globální, pokud není uveden účet)"
 
-#: ../src/gajim-remote.py:215
+#: ../src/gajim-remote.py:224
 msgid "Returns number of unread messages"
 msgstr "Vrací počet nepřečtených zpráv"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:228
 msgid "Opens 'Start Chat' dialog"
 msgstr "Otevře dialog 'Začít rozhovor'"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:230
 msgid "Starts chat, using this account"
 msgstr "Začít rozhovor z tohoto účtu"
 
-#: ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:234
 msgid "Sends custom XML"
 msgstr "Poslat vlastní XML"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:236
 msgid "XML to send"
 msgstr "XML k odeslání"
 
-#: ../src/gajim-remote.py:228
-msgid "Account in which the xml will be sent; if not specified, xml will be sent to all accounts"
-msgstr "Účet, ze kterého bude xml odesláno; pokud nebude uvedeno, xml bude odeslání ze všech účtů"
+#: ../src/gajim-remote.py:237
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Účet, ze kterého bude xml odesláno; pokud nebude uvedeno, xml bude odeslání "
+"ze všech účtů"
 
-#: ../src/gajim-remote.py:234
+#: ../src/gajim-remote.py:243
 msgid "Handle a xmpp:/ uri"
 msgstr "Obsluhovat xmpp:/ uri"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:245
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:241
+#: ../src/gajim-remote.py:250
 msgid "Join a MUC room"
 msgstr "_Vstoupit do místnosti MUC"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:252
 msgid "room"
 msgstr "místnost"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:253
 msgid "nick"
 msgstr "přezdívka"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:254
 msgid "password"
 msgstr "heslo"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:277
 msgid "Missing argument \"contact_jid\""
 msgstr "Chybí parametry \"contact_jid\""
 
-#: ../src/gajim-remote.py:287
+#: ../src/gajim-remote.py:296
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4114,11 +4676,11 @@ msgstr ""
 "'%s' není ve vašem Seznamu.\n"
 "Prosím uveďte účet, přes který bude odeslána zpráva."
 
-#: ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:299
 msgid "You have no active account"
 msgstr "Nemáte aktivní účet"
 
-#: ../src/gajim-remote.py:354
+#: ../src/gajim-remote.py:363
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -4127,16 +4689,16 @@ msgstr ""
 "Použití: %s %s %s \n"
 "\t %s"
 
-#: ../src/gajim-remote.py:357
+#: ../src/gajim-remote.py:366
 msgid "Arguments:"
 msgstr "Parametry:"
 
-#: ../src/gajim-remote.py:361
+#: ../src/gajim-remote.py:370
 #, python-format
 msgid "%s not found"
 msgstr "%s nebyl nalezen"
 
-#: ../src/gajim-remote.py:365
+#: ../src/gajim-remote.py:374
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -4145,7 +4707,7 @@ msgstr ""
 "Použití: %s příkaz [parametry]\n"
 "Příkaz je jeden z:\n"
 
-#: ../src/gajim-remote.py:438
+#: ../src/gajim-remote.py:447
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4154,7 +4716,7 @@ msgstr ""
 "Příliš mnoho parametrů. \n"
 "Napište \"%s help %s\" pro více informací"
 
-#: ../src/gajim-remote.py:442
+#: ../src/gajim-remote.py:451
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -4163,269 +4725,313 @@ msgstr ""
 "Parametry \"%s\" nebyl uveden. \n"
 "Napište \"%s help %s\" pro více informací"
 
-#: ../src/gajim-remote.py:460
+#: ../src/gajim-remote.py:469
 msgid "Wrong uri"
 msgstr "Nesprávné uri"
 
-#: ../src/gajim_themes_window.py:60
+#: ../src/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "Téma"
 
+#: ../src/gajim_themes_window.py:99
+#, fuzzy
+msgid "You cannot make changes to the default theme"
+msgstr "Nemůžete smazat právě používané téma"
+
+#: ../src/gajim_themes_window.py:100
+msgid "Please create a clean new theme with your desired name."
+msgstr ""
+
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:155
+#: ../src/gajim_themes_window.py:174
 msgid "theme name"
 msgstr "jméno tématu"
 
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:191
 msgid "You cannot delete your current theme"
 msgstr "Nemůžete smazat právě používané téma"
 
-#: ../src/gajim_themes_window.py:173
+#: ../src/gajim_themes_window.py:192
 msgid "Please first choose another for your current theme."
 msgstr "Vyberte prosím napřed jiné téma."
 
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Soukromý rozhovor"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Soukromé rozhovory"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:133
 msgid "Sending private message failed"
 msgstr "Odesílání soukromé zprávy selhalo"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:135
 #, python-format
 msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Už nejsi v místnosti \"%s\" nebo \"%s\" odešel(a)."
 
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Diskuze"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Diskuze"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:341
 msgid "Insert Nickname"
 msgstr "Vložit přezdívku"
 
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:915
+msgid "Room logging is enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:917
+#, fuzzy
+msgid "A new room has been created"
+msgstr "Váš účet byl úspěšně vytvořen"
+
+#: ../src/groupchat_control.py:920
+msgid "The server has assigned or modified your roomnick"
+msgstr ""
+
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:837
+#: ../src/groupchat_control.py:926
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s byli vyhozeni: %(reason)s"
 
-#: ../src/groupchat_control.py:841
+#: ../src/groupchat_control.py:930
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s byli vyhozeni od %(who)s: %(reason)s"
 
 # FIXME: preklad pro ban? zabanovani je hnusne
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:848
+#: ../src/groupchat_control.py:937
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s byli zakázáni: %(reason)s"
 
-#: ../src/groupchat_control.py:852
+#: ../src/groupchat_control.py:941
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s byl zakázán od %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:860
+#. Someone changed his or her nick
+#. We changed our nick
+#: ../src/groupchat_control.py:948
 #, python-format
 msgid "You are now known as %s"
 msgstr "Jste nyní znám(a) jako %s"
 
-#: ../src/groupchat_control.py:862
+#: ../src/groupchat_control.py:950
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s se přejmenoval na %s"
 
-#: ../src/groupchat_control.py:945
+#: ../src/groupchat_control.py:983 ../src/groupchat_control.py:987
+#: ../src/groupchat_control.py:992
+#, fuzzy, python-format
+msgid "%(nick)s has been removed from the room (%(reason)s)"
+msgstr "%(nick)s byli vyhozeni od %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:984
+#, fuzzy
+msgid "affiliation changed"
+msgstr "Přidružení:"
+
+#: ../src/groupchat_control.py:989
+msgid "room configuration changed to members-only"
+msgstr ""
+
+#: ../src/groupchat_control.py:994
+msgid "system shutdown"
+msgstr ""
+
+#: ../src/groupchat_control.py:1093
 #, python-format
 msgid "%s has left"
 msgstr "%s odešel(a)"
 
-#: ../src/groupchat_control.py:950
+#: ../src/groupchat_control.py:1098
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s vstoupil do místnosti"
 
-#: ../src/groupchat_control.py:1072
-#: ../src/groupchat_control.py:1090
-#: ../src/groupchat_control.py:1183
-#: ../src/groupchat_control.py:1200
+#: ../src/groupchat_control.py:1229 ../src/groupchat_control.py:1247
+#: ../src/groupchat_control.py:1340 ../src/groupchat_control.py:1357
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Přezdívka nenalezena: %s"
 
-#: ../src/groupchat_control.py:1106
+#: ../src/groupchat_control.py:1263
 msgid "This group chat has no subject"
 msgstr "Místnost nemá žádné téma"
 
-#: ../src/groupchat_control.py:1119
+#: ../src/groupchat_control.py:1276
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Pozval(a) %(contact_jid)s do %(room_jid)s."
 
 #. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1126
-#: ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1283 ../src/groupchat_control.py:1311
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s nevypadá jako platné JID"
 
-#: ../src/groupchat_control.py:1237
-#, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr "Neznámý příkaz: /%s (pokud to chcete odeslat, napište před to /say)"
-
-#: ../src/groupchat_control.py:1260
-#, python-format
-msgid "Commands: %s"
-msgstr "Příkazy: %s"
-
-#: ../src/groupchat_control.py:1262
-#, python-format
-msgid "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The nickname of an occupant may be substituted, but not if it contains \"@\". If the JID is currently in the group chat, he/she/it will also be kicked. Does NOT support spaces in nickname."
-msgstr "Použití: /%s <přezdívka|JID> [důvod], zakáže JID přístup do místnosti. Přezdívka nájemníka může být nahrazena, pokud neobsahuje \"@\". Pokud je JID právě v místnosti, bude vyhozen. NEpodporuje mezery v přezdívce."
-
-#: ../src/groupchat_control.py:1269
-#, python-format
-msgid "Usage: /%s <nickname>, opens a private chat window with the specified occupant."
-msgstr "Použití: /%s <přezdívka>, otevře okno soukromého rozhovoru uvedenému nájemníkovi."
-
-#: ../src/groupchat_control.py:1273
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Použití: /%s, smaže zprávy v okně."
-
-#: ../src/groupchat_control.py:1275
+#: ../src/groupchat_control.py:1420
 #, python-format
-msgid "Usage: /%s [reason], closes the current window or tab, displaying reason if specified."
-msgstr "Použití: /%s [důvod], uzavře toto okno nebo záložku, a vypíše důvod, pokud byl uveden."
+msgid ""
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
+msgstr ""
+"Použití: /%s <přezdívka|JID> [důvod], zakáže JID přístup do místnosti. "
+"Přezdívka nájemníka může být nahrazena, pokud neobsahuje \"@\". Pokud je JID "
+"právě v místnosti, bude vyhozen. NEpodporuje mezery v přezdívce."
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1427
 #, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Použití: /%s, skryje tlačítka rozhovoru."
+msgid ""
+"Usage: /%s <nickname>, opens a private chat window with the specified "
+"occupant."
+msgstr ""
+"Použití: /%s <přezdívka>, otevře okno soukromého rozhovoru uvedenému "
+"nájemníkovi."
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1433
 #, python-format
-msgid "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally providing a reason."
-msgstr "Použití: /%s <JID> [důvod], pozve JID do této místnosti, případně s uvedeným důvodem."
+msgid ""
+"Usage: /%s [reason], closes the current window or tab, displaying reason if "
+"specified."
+msgstr ""
+"Použití: /%s [důvod], uzavře toto okno nebo záložku, a vypíše důvod, pokud "
+"byl uveden."
 
-#: ../src/groupchat_control.py:1285
+#: ../src/groupchat_control.py:1439
 #, python-format
-msgid "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally using specified nickname."
-msgstr "Použití: /%s <místnost>@<server>[/přezdívka], nabízí vstup do místnosti místnost@server, případně s uvedenou přezdívkou."
+msgid ""
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
+"providing a reason."
+msgstr ""
+"Použití: /%s <JID> [důvod], pozve JID do této místnosti, případně s uvedeným "
+"důvodem."
 
-#: ../src/groupchat_control.py:1289
+#: ../src/groupchat_control.py:1443
 #, python-format
-msgid "Usage: /%s <nickname> [reason], removes the occupant specified by nickname from the group chat and optionally displays a reason. Does NOT support spaces in nickname."
-msgstr "Použití: /%s <přezdívka> [důvod], odstraní nájemníka určeného přezdívkou z místnosti a případně zobrazí důvod. NEpodporuje mezery v přezdívce."
+msgid ""
+"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
+"using specified nickname."
+msgstr ""
+"Použití: /%s <místnost>@<server>[/přezdívka], nabízí vstup do místnosti "
+"místnost@server, případně s uvedenou přezdívkou."
 
-#: ../src/groupchat_control.py:1294
+#: ../src/groupchat_control.py:1447
 #, python-format
-msgid "Usage: /%s <action>, sends action to the current group chat. Use third person. (e.g. /%s explodes.)"
-msgstr "Použití: /%s <akce>, pošle akci do aktuální místnosti. Použijte třetí osobu (například /%s explodoval.)"
+msgid ""
+"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
+msgstr ""
+"Použití: /%s <přezdívka> [důvod], odstraní nájemníka určeného přezdívkou z "
+"místnosti a případně zobrazí důvod. NEpodporuje mezery v přezdívce."
 
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1456
 #, python-format
-msgid "Usage: /%s <nickname> [message], opens a private message window and sends message to the occupant specified by nickname."
-msgstr "Použití: /%s <přezdívka> [zpráva], otevře okno se soukromou zprávou a odešle zprávu nájemníkovi určeném přezdívkou."
+msgid ""
+"Usage: /%s <nickname> [message], opens a private message window and sends "
+"message to the occupant specified by nickname."
+msgstr ""
+"Použití: /%s <přezdívka> [zpráva], otevře okno se soukromou zprávou a odešle "
+"zprávu nájemníkovi určeném přezdívkou."
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1461
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Použití: /%s <přezdívka>, změní Vaši přezdívku v aktuální místnosti"
 
-#: ../src/groupchat_control.py:1307
+#: ../src/groupchat_control.py:1465
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Použití: /%s , zobrazí jména nájemníků v místnosti."
 
-#: ../src/groupchat_control.py:1311
+#: ../src/groupchat_control.py:1469
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr "Použití: /%s [téma], zobrazí nebo aktualizuje téma v aktuální místnosti."
+msgstr ""
+"Použití: /%s [téma], zobrazí nebo aktualizuje téma v aktuální místnosti."
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1472
 #, python-format
-msgid "Usage: /%s <message>, sends a message without looking for other commands."
+msgid ""
+"Usage: /%s <message>, sends a message without looking for other commands."
 msgstr "Použití: /%s <zpráva>, odešle zprávu bez hledání jiných příkazů."
 
-#: ../src/groupchat_control.py:1317
-#, python-format
-msgid "No help info for /%s"
-msgstr "Žádná další nápověda pro /%s"
-
-#: ../src/groupchat_control.py:1380
+#: ../src/groupchat_control.py:1561
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Jste si jistý(á), že chcete opustit místnost \"%s\"?"
 
-#: ../src/groupchat_control.py:1382
-msgid "If you close this window, you will be disconnected from this group chat."
+#: ../src/groupchat_control.py:1563
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr "Pokud zavřete toto okno, budete odpojen(a) z této místnosti."
 
-#: ../src/groupchat_control.py:1386
-#: ../src/roster_window.py:4042
+#: ../src/groupchat_control.py:1567 ../src/roster_window.py:4826
 msgid "Do _not ask me again"
 msgstr "Příště _nezobrazovat"
 
-#: ../src/groupchat_control.py:1420
+#: ../src/groupchat_control.py:1601
 msgid "Changing Subject"
 msgstr "Měním Téma"
 
-#: ../src/groupchat_control.py:1421
+#: ../src/groupchat_control.py:1602
 msgid "Please specify the new subject:"
 msgstr "Prosím zadejte nové téma:"
 
-#: ../src/groupchat_control.py:1430
+#: ../src/groupchat_control.py:1611
 msgid "Changing Nickname"
 msgstr "Měním přezdívku"
 
-#: ../src/groupchat_control.py:1431
+#: ../src/groupchat_control.py:1612
 msgid "Please specify the new nickname you want to use:"
 msgstr "Prosím zadejte novou přezdívku, kterou chcete používat:"
 
-#: ../src/groupchat_control.py:1456
+#. Ask for a reason
+#: ../src/groupchat_control.py:1627
+#, fuzzy, python-format
+msgid "Destroying %s"
+msgstr "Popis: %s"
+
+#: ../src/groupchat_control.py:1628
+msgid ""
+"You are going to definitively destroy this room.\n"
+"You may specify a reason below:"
+msgstr ""
+
+#: ../src/groupchat_control.py:1630
+msgid "You may also enter an alternate venue:"
+msgstr ""
+
+#: ../src/groupchat_control.py:1661
 msgid "Bookmark already set"
 msgstr "Záložka je už nastavena"
 
-#: ../src/groupchat_control.py:1457
+#: ../src/groupchat_control.py:1662
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Diskuze \"%s\" už je ve Vašich záložkách."
 
-#: ../src/groupchat_control.py:1466
+#: ../src/groupchat_control.py:1671
 msgid "Bookmark has been added successfully"
 msgstr "Záložka byla úspěšně přidána"
 
-#: ../src/groupchat_control.py:1467
+#: ../src/groupchat_control.py:1672
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Můžete spravovat Vaše záložky přes menu Akce ve vašem Seznamu."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1595
+#: ../src/groupchat_control.py:1824
 #, python-format
 msgid "Kicking %s"
 msgstr "Vyhazuji %s"
 
-#: ../src/groupchat_control.py:1596
-#: ../src/groupchat_control.py:1879
+#: ../src/groupchat_control.py:1825 ../src/groupchat_control.py:2125
 msgid "You may specify a reason below:"
 msgstr "Můžete uvést důvod níže:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1878
+#: ../src/groupchat_control.py:2124
 #, python-format
 msgid "Banning %s"
 msgstr "Zakazuji %s"
@@ -4436,7 +5042,9 @@ msgid "A programming error has been detected"
 msgstr "Byla objevena chyba v programu"
 
 #: ../src/gtkexcepthook.py:42
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
 msgstr "Pravděpodobně není fatální, ale přesto by měla být ohlášena vývojářům."
 
 #: ../src/gtkexcepthook.py:48
@@ -4448,8 +5056,7 @@ msgid "Details"
 msgstr "Detaily"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:156
-#: ../src/gtkgui_helpers.py:171
+#: ../src/gtkgui_helpers.py:156 ../src/gtkgui_helpers.py:171
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Chyba: nemůžu otevřít %s pro čtení"
@@ -4470,32 +5077,33 @@ msgid "Could not write to %s. Session Management support will not work"
 msgstr "Nemůžu zapsat do %s. Podpora správy sezení nebude fungovat"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:692
+#: ../src/gtkgui_helpers.py:710
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim není výchozí Jabber klient"
 
-#: ../src/gtkgui_helpers.py:693
+#: ../src/gtkgui_helpers.py:711
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Chcete nastavit Gajim jako výchozí Jabber klient?"
 
-#: ../src/gtkgui_helpers.py:694
+#: ../src/gtkgui_helpers.py:712
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "Vždy zkontroluj při startu, zda je Gajim výchozí Jabber klient."
 
-#: ../src/gtkgui_helpers.py:793
+#: ../src/gtkgui_helpers.py:811
 msgid "Extension not supported"
 msgstr "Rozšíření není podporováno"
 
-#: ../src/gtkgui_helpers.py:794
+#: ../src/gtkgui_helpers.py:812
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
-msgstr "Obrázek nelze uložit ve formátu %(type)s. Uložit jako %(new_filename)s?"
+msgstr ""
+"Obrázek nelze uložit ve formátu %(type)s. Uložit jako %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:803
+#: ../src/gtkgui_helpers.py:821
 msgid "Save Image as..."
 msgstr "Uložit obrázek jako..."
 
-#: ../src/history_manager.py:65
+#: ../src/history_manager.py:68
 msgid "Cannot find history logs database"
 msgstr "Nemůžu nalézt databázi s historií"
 
@@ -4505,36 +5113,39 @@ msgid "Contacts"
 msgstr "Kontakty"
 
 #. holds time
-#: ../src/history_manager.py:121
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:121 ../src/history_manager.py:161
 #: ../src/history_window.py:86
 msgid "Date"
 msgstr "Datum"
 
 #. holds nickname
-#: ../src/history_manager.py:127
-#: ../src/history_manager.py:179
+#: ../src/history_manager.py:127 ../src/history_manager.py:179
 msgid "Nickname"
 msgstr "Přezdívka"
 
 #. holds message
-#: ../src/history_manager.py:135
-#: ../src/history_manager.py:167
+#: ../src/history_manager.py:135 ../src/history_manager.py:167
 #: ../src/history_window.py:94
 msgid "Message"
 msgstr "Zpráva"
 
 #: ../src/history_manager.py:187
-msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
 msgstr "Chcete pročistit databázi? (VELICE NEDOPORUČUJEME POKUD GAJIM BĚŽÍ)"
 
 #: ../src/history_manager.py:189
 msgid ""
-"Normally allocated database size will not be freed, it will just become reusable. If you really want to reduce database filesize, click YES, else click NO.\n"
+"Normally allocated database size will not be freed, it will just become "
+"reusable. If you really want to reduce database filesize, click YES, else "
+"click NO.\n"
 "\n"
 "In case you click YES, please wait..."
 msgstr ""
-"Běžně se velikost alokovaná databází neuvolňuje, pouze se označí k novému použití. Pokud opravdu chcete snížit velikost databáze, klikněte ANO, jinak NE.\n"
+"Běžně se velikost alokovaná databází neuvolňuje, pouze se označí k novému "
+"použití. Pokud opravdu chcete snížit velikost databáze, klikněte ANO, jinak "
+"NE.\n"
 "\n"
 "V případě kliknutí na ANO prosím vyčkejte..."
 
@@ -4554,8 +5165,7 @@ msgstr[0] "Vážně chcete smazat všechny záznamy historie vybraného kontaktu
 msgstr[1] "Vážně chcete smazat všechny záznamy historie vybraných kontaktů?"
 msgstr[2] ""
 
-#: ../src/history_manager.py:518
-#: ../src/history_manager.py:554
+#: ../src/history_manager.py:518 ../src/history_manager.py:554
 msgid "This is an irreversible operation."
 msgstr "Tato operace je nevratná."
 
@@ -4566,222 +5176,97 @@ msgstr[0] "Vážně chcete smazat vybranou zprávu?"
 msgstr[1] "Vážně chcete smazat vybrané zprávy?"
 msgstr[2] ""
 
-#: ../src/history_window.py:103
-#: ../src/history_window.py:105
+#: ../src/history_window.py:103 ../src/history_window.py:105
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historie rozhovorů s %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:266
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s je nyní %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:262
-#: ../src/notify.py:199
+#: ../src/history_window.py:270 ../src/notify.py:205
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s je nyní %(status)s"
 
-#: ../src/history_window.py:268
+#: ../src/history_window.py:276
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status je nyní %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:279
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status je nyní %(status)s"
 
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:52
-msgid "English"
-msgstr "Angličtina"
-
-#: ../src/chat_control.py:52
-msgid "Belarusian"
-msgstr "Běloruština"
-
-#: ../src/chat_control.py:52
-msgid "Bulgarian"
-msgstr "Bulharština"
-
-#: ../src/chat_control.py:52
-msgid "Breton"
-msgstr "Bretonština"
-
-#: ../src/chat_control.py:52
-msgid "Czech"
-msgstr "Čeština"
-
-#: ../src/chat_control.py:52
-msgid "German"
-msgstr "Němčina"
-
-#: ../src/chat_control.py:52
-msgid "Greek"
-msgstr "Řečtina"
-
-#: ../src/chat_control.py:52
-msgid "British"
-msgstr "Britština"
-
-#: ../src/chat_control.py:52
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../src/chat_control.py:52
-msgid "Spanish"
-msgstr "Španělština"
-
-#: ../src/chat_control.py:52
-msgid "Basque"
-msgstr "Baskičtina"
-
-#: ../src/chat_control.py:52
-msgid "French"
-msgstr "Francouzština"
-
-#: ../src/chat_control.py:52
-msgid "Croatian"
-msgstr "Chorvatština"
-
-#: ../src/chat_control.py:52
-msgid "Italian"
-msgstr "Italština"
-
-#: ../src/chat_control.py:52
-msgid "Norwegian (b)"
-msgstr "Norština (b)"
-
-#: ../src/chat_control.py:52
-msgid "Dutch"
-msgstr "Holandština"
-
-#: ../src/chat_control.py:52
-msgid "Norwegian"
-msgstr "Norština"
-
-#: ../src/chat_control.py:52
-msgid "Polish"
-msgstr "Polština"
-
-#: ../src/chat_control.py:52
-msgid "Portuguese"
-msgstr "Portugalština"
-
-#: ../src/chat_control.py:52
-msgid "Brazilian Portuguese"
-msgstr "Brazilská portugalština"
-
-#: ../src/chat_control.py:52
-msgid "Russian"
-msgstr "Ruština"
-
-#: ../src/chat_control.py:52
-msgid "Slovak"
-msgstr "Slovenština"
-
-#: ../src/chat_control.py:52
-msgid "Swedish"
-msgstr "Švédština"
-
-#: ../src/chat_control.py:52
-msgid "Chinese (Ch)"
-msgstr "Čínština"
-
-#: ../src/chat_control.py:247
-msgid "Spelling language"
-msgstr "Kontrola jazyka"
-
-#. we are not connected
-#: ../src/chat_control.py:270
-#: ../src/chat_control.py:476
-msgid "A connection is not available"
-msgstr "Spojení není dostupné"
+#: ../src/htmltextview.py:583 ../src/htmltextview.py:594
+#, fuzzy
+msgid "Timeout loading image"
+msgstr "Nezdařilo se načtení obrázku"
 
-#: ../src/chat_control.py:271
-#: ../src/chat_control.py:477
-msgid "Your message can not be sent until you are connected."
-msgstr "Va¹e zpráva nemù¾e být odeslána dokud se nepøipojíte."
+#: ../src/htmltextview.py:604
+msgid "Image is too big"
+msgstr ""
 
-#: ../src/chat_control.py:856
+#: ../src/message_window.py:287
 msgid "Chats"
 msgstr "Rozhovory"
 
-#: ../src/chat_control.py:1038
-#, python-format
-msgid "%(nickname)s from group chat %(room_name)s"
-msgstr "%(nickname)s z diskuze %(room_name)s"
-
-#. we talk about a contact here
-#: ../src/chat_control.py:1127
-#, python-format
-msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-msgstr "%s nerozesílá svůj OpenPGP klíč nebo nemá žádný přiřazen"
-
-#: ../src/chat_control.py:1263
-msgid "Encryption enabled"
-msgstr "Šifrování zapnuto"
-
-#: ../src/chat_control.py:1268
-msgid "Encryption disabled"
-msgstr "Šifrování vypnuto"
-
-#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1556
-#, python-format
-msgid "You just received a new message from \"%s\""
-msgstr "Právě jsi obdržela novou zprávu od \"%s\""
+#: ../src/message_window.py:289
+msgid "Group Chats"
+msgstr "Diskuze"
 
-#: ../src/chat_control.py:1557
-msgid "If you close this tab and you have history disabled, this message will be lost."
-msgstr "Pokud zavřete toto okno a historie je vypnutá, tato zpráva bude ztracena."
+#: ../src/message_window.py:291
+msgid "Private Chats"
+msgstr "Soukromé rozhovory"
 
-#: ../src/message_window.py:273
+#: ../src/message_window.py:293
 msgid "Messages"
 msgstr "Zprávy"
 
-#: ../src/message_window.py:274
+#: ../src/message_window.py:294
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
 
-#: ../src/notify.py:197
+#: ../src/notify.py:203
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Změnil(a) stav"
 
-#: ../src/notify.py:207
+#: ../src/notify.py:213
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s se přihlásil"
 
-#: ../src/notify.py:215
+#: ../src/notify.py:221
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s se odhlásil"
 
-#: ../src/notify.py:227
+#: ../src/notify.py:233
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nová jednoduché zpráva od %(nickname)s"
 
-#: ../src/notify.py:235
+#: ../src/notify.py:241
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nová soukromá zpráva z místnosti %s"
 
-#: ../src/notify.py:236
+#: ../src/notify.py:243
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:246
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Nová zpráva od %(nickname)s"
+
+#: ../src/notify.py:252
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nová zpráva od %(nickname)s"
@@ -4790,255 +5275,340 @@ msgstr "Nová zpráva od %(nickname)s"
 msgid "Retrieving profile..."
 msgstr "Stahuji profil..."
 
+#: ../src/profile_window.py:123 ../src/roster_window.py:1876
+#, fuzzy
+msgid "File is empty"
+msgstr "Cesta k souboru"
+
+#: ../src/profile_window.py:126 ../src/roster_window.py:1879
+#, fuzzy
+msgid "File does not exist"
+msgstr "Taková diskuze neexistuje."
+
 #. keep identation
-#: ../src/profile_window.py:143
+#. unknown format
+#: ../src/profile_window.py:140 ../src/profile_window.py:156
+#: ../src/roster_window.py:1881 ../src/roster_window.py:1892
 msgid "Could not load image"
 msgstr "Nezdařilo se načtení obrázku"
 
-#: ../src/profile_window.py:255
+#: ../src/profile_window.py:257
 msgid "Information received"
 msgstr "Informace přijata"
 
-#: ../src/profile_window.py:324
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr "Bez opětovného připojení nemůžete zveřejnit Vaše osobní údaje."
 
-#: ../src/profile_window.py:336
+#: ../src/profile_window.py:338
 msgid "Sending profile..."
 msgstr "Odesílám profil..."
 
-#: ../src/profile_window.py:351
+#: ../src/profile_window.py:353
 msgid "Information NOT published"
 msgstr "Informace NEBYLY zveřejněny"
 
-#: ../src/profile_window.py:358
+#: ../src/profile_window.py:360
 msgid "vCard publication failed"
 msgstr "publikování vizitky se nezdařilo"
 
-#: ../src/profile_window.py:359
-msgid "There was an error while publishing your personal information, try again later."
-msgstr "Nastala chyba při publikování Vašich osobních údajů, zkuste to později znovu."
+#: ../src/profile_window.py:361
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Nastala chyba při publikování Vašich osobních údajů, zkuste to později znovu."
 
-#: ../src/roster_window.py:171
-#: ../src/roster_window.py:226
+#: ../src/roster_window.py:181 ../src/roster_window.py:236
 msgid "Merged accounts"
 msgstr "Spojené účty"
 
-#: ../src/roster_window.py:344
-#: ../src/common/helpers.py:43
+#: ../src/roster_window.py:356 ../src/roster_window.py:621
+#: ../src/roster_window.py:2110 ../src/common/contacts.py:307
+#: ../src/common/helpers.py:44
 msgid "Observers"
 msgstr "Přihlížející"
 
-#: ../src/roster_window.py:691
-#: ../src/roster_window.py:3207
+#. Make special context menu if group is Groupchats
+#: ../src/roster_window.py:440 ../src/roster_window.py:445
+#: ../src/roster_window.py:1935 ../src/roster_window.py:1938
+#: ../src/roster_window.py:2607 ../src/roster_window.py:2610
+#: ../src/roster_window.py:2635 ../src/roster_window.py:4686
+#: ../src/roster_window.py:4688 ../src/common/commands.py:194
+#: ../src/common/contacts.py:97 ../src/common/helpers.py:44
+msgid "Groupchats"
+msgstr "Diskuze"
+
+#: ../src/roster_window.py:770 ../src/roster_window.py:3947
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nemůžete vstoupit do diskuze, pokud jste neviditelný(á)"
 
 #. new chat
+#. single message
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:883
-#: ../src/systray.py:187
-#: ../src/systray.py:192
+#. join gc
+#: ../src/roster_window.py:983 ../src/roster_window.py:993
+#: ../src/roster_window.py:1002 ../src/systray.py:207 ../src/systray.py:212
+#: ../src/systray.py:218
 #, python-format
 msgid "using account %s"
 msgstr "pomocí účtu %s"
 
-#. the 'manage gc bookmarks' item is shown
-#. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:908
+#: ../src/roster_window.py:1009
 #, python-format
 msgid "to %s account"
 msgstr "do účtu %s"
 
 #. disco
-#: ../src/roster_window.py:913
+#: ../src/roster_window.py:1014
 #, python-format
 msgid "using %s account"
 msgstr "pomocí účtu %s"
 
+#: ../src/roster_window.py:1095
+msgid "_Manage Bookmarks..."
+msgstr "Spravovat _záložky..."
+
 #. profile, avatar
-#: ../src/roster_window.py:988
+#: ../src/roster_window.py:1114
 #, python-format
 msgid "of account %s"
 msgstr "účtu %s"
 
-#: ../src/roster_window.py:1008
-msgid "_Manage Bookmarks..."
-msgstr "Spravovat _záložky..."
-
-#: ../src/roster_window.py:1037
+#: ../src/roster_window.py:1154
 #, python-format
 msgid "for account %s"
 msgstr "pro účet %s"
 
 #. History manager
-#: ../src/roster_window.py:1058
+#: ../src/roster_window.py:1175
 msgid "History Manager"
 msgstr "Správce historie"
 
-#: ../src/roster_window.py:1067
+#: ../src/roster_window.py:1184
 msgid "_Join New Group Chat"
 msgstr "_Připojit se do diskuze"
 
-#: ../src/roster_window.py:1397
-#: ../src/roster_window.py:3400
-#: ../src/roster_window.py:3407
+#: ../src/roster_window.py:1538 ../src/roster_window.py:4145
+#: ../src/roster_window.py:4152
 msgid "You have unread messages"
 msgstr "Máte nepřečtené zprávy"
 
-#: ../src/roster_window.py:1398
+#: ../src/roster_window.py:1539
 msgid "You must read them before removing this transport."
 msgstr "Musíš si je přečíst před smazáním transportu."
 
-#: ../src/roster_window.py:1401
+#: ../src/roster_window.py:1542
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude smazán"
 
-#: ../src/roster_window.py:1402
-msgid "You will no longer be able to send and receive messages from contacts using this transport."
-msgstr "Už více nebudete moci posílat i přijímat zprávy od kontaktů z tohoto transportu."
+#: ../src/roster_window.py:1543
+msgid ""
+"You will no longer be able to send and receive messages from contacts using "
+"this transport."
+msgstr ""
+"Už více nebudete moci posílat i přijímat zprávy od kontaktů z tohoto "
+"transportu."
 
-#: ../src/roster_window.py:1405
+#: ../src/roster_window.py:1546
 msgid "Transports will be removed"
 msgstr "Transport bude smazán"
 
-#: ../src/roster_window.py:1410
+#: ../src/roster_window.py:1551
 #, python-format
-msgid "You will no longer be able to send and receive messages to contacts from these transports:%s"
-msgstr "Už více nebudete moci posílat i přijímat zprávy od kontaktů z těchto transportů:%s"
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr ""
+"Už více nebudete moci posílat i přijímat zprávy od kontaktů z těchto "
+"transportů:%s"
 
 #. it's jid
-#: ../src/roster_window.py:1430
+#: ../src/roster_window.py:1717
 msgid "Rename Contact"
 msgstr "Přejmenovat kontakt"
 
-#: ../src/roster_window.py:1431
+#: ../src/roster_window.py:1718
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Zadej novou přezdívku pro kontakt %s."
 
-#: ../src/roster_window.py:1438
+#: ../src/roster_window.py:1725
 msgid "Rename Group"
 msgstr "Přejmenovat skupinu"
 
-#: ../src/roster_window.py:1439
+#: ../src/roster_window.py:1726
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Zadej nové jméno pro skupinu %s."
 
-#: ../src/roster_window.py:1514
+#: ../src/roster_window.py:1801
 msgid "Remove Group"
 msgstr "Odstranit skupinu"
 
-#: ../src/roster_window.py:1515
+#: ../src/roster_window.py:1802
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Chceš smazat skupinu %s z rosteru?"
 
-#: ../src/roster_window.py:1516
+#: ../src/roster_window.py:1803
 msgid "Remove also all contacts in this group from your roster"
 msgstr "Odstranit také všechny kontakty v této skupině z Vašeho rosteru"
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1834
 msgid "Assign OpenPGP Key"
 msgstr "Přiřadit OpenPGP klíč"
 
-#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:1835
 msgid "Select a key to apply to the contact"
 msgstr "Vybrat klíč k použítí s kontaktem"
 
-#: ../src/roster_window.py:1781
-#: ../src/roster_window.py:2042
-msgid "_New group chat"
-msgstr "_Nová diskuze"
+#: ../src/roster_window.py:2156
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "Nová diskuze"
 
-#: ../src/roster_window.py:1912
+#: ../src/roster_window.py:2298
 msgid "I would like to add you to my roster"
 msgstr "Rád bych si Vás přidal(a) do svého seznamu"
 
-#: ../src/roster_window.py:2087
-#: ../src/roster_window.py:2134
+#. Send Group Message
+#: ../src/roster_window.py:2432 ../src/roster_window.py:2644
 msgid "Send Group M_essage"
 msgstr "Ode_slat skupinovou zprávu"
 
-#: ../src/roster_window.py:2113
-msgid "Re_name"
-msgstr "Přejme_novat"
+#: ../src/roster_window.py:2451
+msgid "_New group chat"
+msgstr "_Nová diskuze"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:2489
+#, fuzzy
+msgid "_Manage Contacts"
+msgstr "Přejmenovat kontakt"
+
+#: ../src/roster_window.py:2550
+msgid "_Maximize"
+msgstr ""
+
+#: ../src/roster_window.py:2557
+#, fuzzy
+msgid "_Disconnect"
+msgstr "Kontakt se odpojil"
+
+#: ../src/roster_window.py:2636
+msgid "_Maximize All"
+msgstr ""
 
-#: ../src/roster_window.py:2140
+#: ../src/roster_window.py:2652
 msgid "To all users"
 msgstr "Všem uživatelům"
 
-#: ../src/roster_window.py:2143
+#: ../src/roster_window.py:2655
 msgid "To all online users"
 msgstr "Všem dostupným uživatelům"
 
-#: ../src/roster_window.py:2179
+#. Log Off
+#: ../src/roster_window.py:2772
+#, fuzzy
+msgid "_Log off"
+msgstr "_Odhlásit"
+
+#. Log on
+#: ../src/roster_window.py:2778
 msgid "_Log on"
 msgstr "Přih_lásit"
 
-#: ../src/roster_window.py:2189
-msgid "Log _off"
-msgstr "_Odhlásit"
+#. Send single message
+#: ../src/roster_window.py:2790
+#, fuzzy
+msgid "Send Single Message"
+msgstr "Ode_slat jednoduchou zprávu"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:2837
+#, fuzzy
+msgid "_Manage Transport"
+msgstr "Transporty"
+
+#. Modify Transport
+#: ../src/roster_window.py:2845
+#, fuzzy
+msgid "_Modify Transport"
+msgstr "Zobrazuj trans_porty"
+
+#. Information
+#: ../src/roster_window.py:2882
+#, fuzzy
+msgid "_Information"
+msgstr "Informace o kontaktu"
 
-#: ../src/roster_window.py:2311
-#: ../src/roster_window.py:2382
+#: ../src/roster_window.py:2959 ../src/roster_window.py:3033
 msgid "_Change Status Message"
 msgstr "Z_měnit popis stavu"
 
-#: ../src/roster_window.py:2454
+#: ../src/roster_window.py:3105
 msgid "Authorization has been sent"
 msgstr "Autorizace byla odeslána"
 
-#: ../src/roster_window.py:2455
+#: ../src/roster_window.py:3106
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nyní bude \"%s\" znát váš status."
 
-#: ../src/roster_window.py:2475
+#: ../src/roster_window.py:3126
 msgid "Subscription request has been sent"
 msgstr "Žádost o autorizaci byla odeslána"
 
-#: ../src/roster_window.py:2476
+#: ../src/roster_window.py:3127
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
-msgstr "Pokud \"%s\" povolí Vaši žádost o autorizaci, budete vidět jeho status."
+msgstr ""
+"Pokud \"%s\" povolí Vaši žádost o autorizaci, budete vidět jeho status."
 
-#: ../src/roster_window.py:2488
+#: ../src/roster_window.py:3139
 msgid "Authorization has been removed"
 msgstr "Autorizace byla zrušena"
 
-#: ../src/roster_window.py:2489
+#: ../src/roster_window.py:3140
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nyní Vás \"%s\" uvidí vždy jako odpojeného."
 
-#: ../src/roster_window.py:2681
+#: ../src/roster_window.py:3338
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" bude smazán z Vašeho rosteru"
 
-#: ../src/roster_window.py:2685
-msgid "By removing this contact you also remove authorization resulting in him or her always seeing you as offline."
-msgstr "Smazáním kontaktu také zrušíte autorizaci. Kontakt Vás tak vždy uvidí jako odpojeného."
+#: ../src/roster_window.py:3342
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Smazáním kontaktu také zrušíte autorizaci. Kontakt Vás tak vždy uvidí jako "
+"odpojeného."
 
-#: ../src/roster_window.py:2690
-msgid "By removing this contact you also by default remove authorization resulting in him or her always seeing you as offline."
-msgstr "Smazáním kontaktu také zrušíte autorizaci. Kontakt Vás tak vždy uvidí jako odpojeného."
+#: ../src/roster_window.py:3347
+msgid ""
+"By removing this contact you also by default remove authorization resulting "
+"in him or her always seeing you as offline."
+msgstr ""
+"Smazáním kontaktu také zrušíte autorizaci. Kontakt Vás tak vždy uvidí jako "
+"odpojeného."
 
-#: ../src/roster_window.py:2693
+#: ../src/roster_window.py:3350
 msgid "I want this contact to know my status after removal"
 msgstr "Chci aby tento kontakt věděl o mém stavu i po odstranění"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2697
+#: ../src/roster_window.py:3354
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakty budou smazány z Vašeho rosteru"
 
-#: ../src/roster_window.py:2701
+#: ../src/roster_window.py:3358
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -5047,194 +5617,228 @@ msgstr ""
 "Smazáním těchto kontaktů:%s\n"
 "také zrušíte autorizaci. Kontakty Vás tak vždy uvidí jako odpojeného."
 
-#: ../src/roster_window.py:2733
-msgid "Gnome Keyring is installed but not correctly started (environment variable probably not correctly set)"
-msgstr "Gnome Keyring je nainstalován ale není správně spuštěn (proměná prostředí není asi správně nastavena)"
+#: ../src/roster_window.py:3390
+msgid ""
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
+msgstr ""
+"Gnome Keyring je nainstalován ale není správně spuštěn (proměná prostředí "
+"není asi správně nastavena)"
+
+#: ../src/roster_window.py:3417
+msgid "GPG is not usable"
+msgstr ""
 
-#. TODO: make this string translatable
 #. %s is the account name here
-#: ../src/roster_window.py:2761
-#: ../src/common/connection.py:677
-#: ../src/common/zeroconf/connection_zeroconf.py:158
+#: ../src/roster_window.py:3417 ../src/common/connection.py:681
+#: ../src/common/zeroconf/connection_zeroconf.py:165
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Budete připojen(a) k %s bez OpenPGP."
 
-#: ../src/roster_window.py:2778
+#: ../src/roster_window.py:3434
 msgid "Passphrase Required"
 msgstr "Heslo Vyžadováno"
 
-#: ../src/roster_window.py:2779
+#: ../src/roster_window.py:3435
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Zadej heslo GPG klíče pro účet %s."
 
-#: ../src/roster_window.py:2784
+#: ../src/roster_window.py:3440
 msgid "Save passphrase"
 msgstr "Uložit heslo"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:3448
 msgid "Wrong Passphrase"
 msgstr "Nesprávné heslo"
 
-#: ../src/roster_window.py:2793
+#: ../src/roster_window.py:3449
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Prosím zopakujte Vaše heslo pro GPG klíč, nebo stiskněte Zrušit."
 
-#: ../src/roster_window.py:2850
-#: ../src/roster_window.py:2910
+#: ../src/roster_window.py:3532 ../src/roster_window.py:3609
 msgid "You are participating in one or more group chats"
 msgstr "Účinkujete v jedné nebo více diskuzích"
 
-#: ../src/roster_window.py:2851
-#: ../src/roster_window.py:2911
-msgid "Changing your status to invisible will result in disconnection from those group chats. Are you sure you want to go invisible?"
-msgstr "Změna vašeho stavu na neviditelný způsobí odpojení od těchto diskuzí. Jste si jistý(á), že se chcete stát neviditelným(ou)?"
+#: ../src/roster_window.py:3533 ../src/roster_window.py:3610
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+msgstr ""
+"Změna vašeho stavu na neviditelný způsobí odpojení od těchto diskuzí. Jste "
+"si jistý(á), že se chcete stát neviditelným(ou)?"
 
-#: ../src/roster_window.py:2868
+#: ../src/roster_window.py:3567
 msgid "No account available"
 msgstr "Žádný účet není dostupný"
 
-#: ../src/roster_window.py:2869
+#: ../src/roster_window.py:3568
 msgid "You must create an account before you can chat with other contacts."
-msgstr "Musíte vytvořit účet před tím, než budete moci hovořit s jinými uživateli."
+msgstr ""
+"Musíte vytvořit účet před tím, než budete moci hovořit s jinými uživateli."
 
-#: ../src/roster_window.py:2967
+#: ../src/roster_window.py:3696
 #, python-format
 msgid "\"%(title)s\" by %(artist)s"
 msgstr "\"%(title)s\" od %(artist)s"
 
-#: ../src/roster_window.py:3401
-#: ../src/roster_window.py:3408
-msgid "Messages will only be available for reading them later if you have history enabled."
-msgstr "Zprávy bude možné číst později pouze v případě, budete-li mít povolenou historii."
+#: ../src/roster_window.py:4146 ../src/roster_window.py:4153
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled."
+msgstr ""
+"Zprávy bude možné číst později pouze v případě, budete-li mít povolenou "
+"historii."
 
-#: ../src/roster_window.py:3992
+#: ../src/roster_window.py:4772
 msgid "Metacontacts storage not supported by your server"
 msgstr "Uložení metakontaktů není podporováno serverem"
 
-#: ../src/roster_window.py:3994
-msgid "Your server does not support storing metacontacts information. So those information will not be save on next reconnection."
-msgstr "Tvůj server nepodporuje ukládání metakontaktů. Tyto informace nebudou při přístím připojení uloženy."
+#: ../src/roster_window.py:4774
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be save on next reconnection."
+msgstr ""
+"Tvůj server nepodporuje ukládání metakontaktů. Tyto informace nebudou při "
+"přístím připojení uloženy."
 
-#: ../src/roster_window.py:4036
-msgid "You are about to create a metacontact. Are you sure you want to continue?"
+#: ../src/roster_window.py:4820
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Chystáte se vytvořit metacontact. Určitě chcete pokračovat?"
 
-#: ../src/roster_window.py:4038
-msgid "Metacontacts are a way to regroup several contacts in one line. Generally it is used when the same person has several Jabber accounts or transport accounts."
-msgstr "Metakontakty jsou způsob k organizaci několika kontaktů do jednoho. Obecně jsou užitečné, když jeden člověk má víc účtů v síti Jabber nebo účty v transportech."
-
-#: ../src/roster_window.py:4205
-#, python-format
-msgid "Drop %s in group %s"
-msgstr "Smazat %s ve skupině %s"
-
-#: ../src/roster_window.py:4212
-#, python-format
-msgid "Make %s and %s metacontacts"
-msgstr "Učiň %s a %s metakontakty"
+#: ../src/roster_window.py:4822
+msgid ""
+"Metacontacts are a way to regroup several contacts in one line. Generally it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+msgstr ""
+"Metakontakty jsou způsob k organizaci několika kontaktů do jednoho. Obecně "
+"jsou užitečné, když jeden člověk má víc účtů v síti Jabber nebo účty v "
+"transportech."
+
+#: ../src/roster_window.py:4920
+#, fuzzy, python-format
+msgid "Do you want to send that file to %s:"
+msgid_plural "Do you want to send those files to %s:"
+msgstr[0] "%s Vám chce poslat soubor:"
+msgstr[1] "%s Vám chce poslat soubor:"
+msgstr[2] "%s Vám chce poslat soubor:"
 
 # FIXME: nejak divne, asi spatne prelozene
-#: ../src/roster_window.py:4399
+#: ../src/roster_window.py:5202
 msgid "Change Status Message..."
 msgstr "Změnit popis stavu..."
 
-#: ../src/systray.py:144
+#: ../src/systray.py:164
 msgid "_Change Status Message..."
 msgstr "_Změnit popis stavu..."
 
-#: ../src/systray.py:232
+#: ../src/systray.py:249
 msgid "Hide this menu"
 msgstr "Skryje toto menu"
 
-#: ../src/tooltips.py:309
-#: ../src/tooltips.py:492
+#: ../src/tooltips.py:310 ../src/tooltips.py:503
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:312
-#: ../src/tooltips.py:496
+#: ../src/tooltips.py:313 ../src/tooltips.py:507
 msgid "Resource: "
 msgstr "Zdroj: "
 
-#: ../src/tooltips.py:317
+#: ../src/tooltips.py:318
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s této diskuze"
 
-#: ../src/tooltips.py:430
-#: ../src/tooltips.py:610
+#: ../src/tooltips.py:416
+msgid " [blocked]"
+msgstr ""
+
+#: ../src/tooltips.py:420
+msgid " [minimized]"
+msgstr ""
+
+#: ../src/tooltips.py:435 ../src/tooltips.py:623
 msgid "Status: "
 msgstr "Stav: "
 
-#: ../src/tooltips.py:461
+#: ../src/tooltips.py:465
 #, python-format
 msgid "Last status: %s"
 msgstr "Poslední stav: %s"
 
-#: ../src/tooltips.py:463
+#: ../src/tooltips.py:467
 #, python-format
 msgid " since %s"
 msgstr " od %s"
 
+#: ../src/tooltips.py:485
+#, fuzzy
+msgid "Connected"
+msgstr "Spojení"
+
+#: ../src/tooltips.py:487
+#, fuzzy
+msgid "Disconnected"
+msgstr "Kontakt se odpojil"
+
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:514
 msgid "Subscription: "
 msgstr "Autorizace: "
 
-#: ../src/tooltips.py:512
+#: ../src/tooltips.py:524
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:566
+#: ../src/tooltips.py:579
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:572
+#: ../src/tooltips.py:585
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:592
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:598
 msgid "Transferred: "
 msgstr "Přeneseno: "
 
-#: ../src/tooltips.py:588
-#: ../src/tooltips.py:609
+#: ../src/tooltips.py:601 ../src/tooltips.py:622
 msgid "Not started"
 msgstr "Nespuštěno"
 
-#: ../src/tooltips.py:592
+#: ../src/tooltips.py:605
 msgid "Stopped"
 msgstr "Zastaveno"
 
-#: ../src/tooltips.py:594
-#: ../src/tooltips.py:597
+#: ../src/tooltips.py:607 ../src/tooltips.py:610
 msgid "Completed"
 msgstr "Dokončeno"
 
-#: ../src/tooltips.py:601
+#: ../src/tooltips.py:614
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Pozastaveno"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:605
+#: ../src/tooltips.py:618
 msgid "Stalled"
 msgstr "Stagnuje"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:620
 msgid "Transferring"
 msgstr "Přenáším"
 
-#: ../src/tooltips.py:639
+#: ../src/tooltips.py:652
 msgid "This service has not yet responded with detailed information"
 msgstr "Tato služba dosud neodpověděla s detaily"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:655
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5242,51 +5846,79 @@ msgstr ""
 "Tato služba nemůže odpovědět s více podrobnostmi.\n"
 "Pravděpodobně je stará nebo rozbitá"
 
-#: ../src/vcard.py:217
+#: ../src/vcard.py:240
 msgid "?Client:Unknown"
 msgstr "?Client:Neznámý"
 
-#: ../src/vcard.py:219
+#: ../src/vcard.py:242
 msgid "?OS:Unknown"
 msgstr "?OS:Neznámý"
 
-#: ../src/vcard.py:247
-#: ../src/vcard.py:449
+#: ../src/vcard.py:267 ../src/vcard.py:277 ../src/vcard.py:467
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:277
+#: ../src/vcard.py:306
 msgid "Affiliation:"
 msgstr "Vztah:"
 
-#: ../src/vcard.py:285
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
+#: ../src/vcard.py:314
+msgid ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
 msgstr "Tento kontakt zajímá Váš stav, ale Vy se nezajímate o jeho stav"
 
-#: ../src/vcard.py:287
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
+#: ../src/vcard.py:316
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
 msgstr "Vy se zajímáte o stav kontaktu, ale on se nezajímá o Váš stav"
 
-#: ../src/vcard.py:289
+#: ../src/vcard.py:318
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Vy i kontakt se zajímáte o stav toho druhého"
 
 #. None
-#: ../src/vcard.py:291
-msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
+#: ../src/vcard.py:320
+msgid ""
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
 msgstr "Vy ani kontakt se nezajímáte o stav toho druhého"
 
-#: ../src/vcard.py:299
+#: ../src/vcard.py:328
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čekáte na odpověď kontaktu na vaši žádost o autorizaci"
 
-#: ../src/vcard.py:311
-#: ../src/vcard.py:338
-#: ../src/vcard.py:482
+#: ../src/vcard.py:332 ../src/vcard.py:369 ../src/vcard.py:492
 msgid " resource with priority "
 msgstr "zdroj s prioritou "
 
+#: ../src/common/check_paths.py:33
+msgid "creating logs database"
+msgstr "vytvářím databázi historie"
+
+#: ../src/common/check_paths.py:96 ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:114
+#, python-format
+msgid "%s is a file but it should be a directory"
+msgstr "%s je soubor, ale měl by být adresář"
+
+#: ../src/common/check_paths.py:97 ../src/common/check_paths.py:108
+#: ../src/common/check_paths.py:115 ../src/common/check_paths.py:123
+msgid "Gajim will now exit"
+msgstr "Gajim se nyní ukončí"
+
+#: ../src/common/check_paths.py:122
+#, python-format
+msgid "%s is a directory but should be a file"
+msgstr "%s je adresář, ale měl by to být soubor"
+
+#: ../src/common/check_paths.py:138
+#, python-format
+msgid "creating %s directory"
+msgstr "vytvářím adresář %s "
+
 #: ../src/common/commands.py:69
 msgid "Change status information"
 msgstr "Informace o změně stavu"
@@ -5344,47 +5976,54 @@ msgstr "Opustit diskuzi"
 msgid "Choose the groupchats you want to leave"
 msgstr "Vyber diskuze, které chceš opustit"
 
-#: ../src/common/commands.py:194
-msgid "Groupchats"
-msgstr "Diskuze"
-
 #: ../src/common/commands.py:230
 msgid "You left the following groupchats:"
 msgstr "Opustil(a) jste následující diskuze:"
 
-#: ../src/common/config.py:56
+#: ../src/common/commands.py:242
+#, fuzzy
+msgid "Forward unread messages"
+msgstr "%d nepřečtená zpráva"
+
+#: ../src/common/commands.py:262
+msgid "All unread messages have been forwarded."
+msgstr ""
+
+#: ../src/common/config.py:57
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Používej DBus a Notifikačního démona k zobrazování notifikací"
 
-#: ../src/common/config.py:61
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Čas v minutách, po kterém se Váš stav přepne na pryč."
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:63
 msgid "Away as a result of being idle"
 msgstr "Pryč jako výsledek nečinnosti"
 
-#: ../src/common/config.py:64
+#: ../src/common/config.py:65
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Čas v minutách, po kterém se Váš stav přepne na nedostupný."
 
-#: ../src/common/config.py:65
+#: ../src/common/config.py:66
 msgid "Not available as a result of being idle"
 msgstr "Nedostupný jako výsledek nečinnosti"
 
-#: ../src/common/config.py:83
-msgid "List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr "Seznam (oddělené mezerami) řádků (účtů a skupin), které budou \"zhroucené\"."
+#: ../src/common/config.py:84
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"Seznam (oddělené mezerami) řádků (účtů a skupin), které budou \"zhroucené\"."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Povolit lokální zprávy typu zeroconf"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:92
 msgid "Language used by speller"
 msgstr "Jazyk použitý kontrolou pravopisu"
 
-#: ../src/common/config.py:92
+#: ../src/common/config.py:93
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -5394,608 +6033,786 @@ msgstr ""
 "'někdy' - vypiš čas každou print_ichat_every_foo_minutes minutu.\n"
 "'nikdy' - nevypisuj čas."
 
-#: ../src/common/config.py:93
-msgid "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. This is used only if print_time is 'sometimes'."
-msgstr "Vypiš čas v rozhovorech s použitím Fuzzy Clock. Hodnota náhodnosti je od 1 to 4, nebo 0 pro vypnutí Fuzzy Clock. 1 je nejpřesnější čas, 4 nejméně přesný. Toto se použije jenom při print_time nastaveném na 'někdy'."
+#: ../src/common/config.py:94
+msgid ""
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
+"This is used only if print_time is 'sometimes'."
+msgstr ""
+"Vypiš čas v rozhovorech s použitím Fuzzy Clock. Hodnota náhodnosti je od 1 "
+"to 4, nebo 0 pro vypnutí Fuzzy Clock. 1 je nejpřesnější čas, 4 nejméně "
+"přesný. Toto se použije jenom při print_time nastaveném na 'někdy'."
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:97
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Ber * / _ páry jako možné formátovací znaky."
 
-#: ../src/common/config.py:97
-msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr "Pokud zapnuto, nemažte */_ . Potom *abc* bude tučně ale s * * neodstraněnými."
-
-#: ../src/common/config.py:100
-msgid "Uses ReStructured text markup to send HTML, plus ascii formatting if selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (If you want to use this, install docutils)"
-msgstr "Pokud je vybráno, použije ReStructured text markup k odeslání HTML, navíc s ascii formátování. Pro syntaxi navštivte http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (Pokud si to chcete prohlédnout, nainstalujte docutils)"
+#: ../src/common/config.py:98
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Pokud zapnuto, nemažte */_ . Potom *abc* bude tučně ale s * * neodstraněnými."
 
-#: ../src/common/config.py:109
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Znak, který se přidá za přezdívku po použití doplňování jména tabulátorem v diskuzi."
+#: ../src/common/config.py:101
+msgid ""
+"Uses ReStructured text markup to send HTML, plus ascii formatting if "
+"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html (If you want to use this, install docutils)"
+msgstr ""
+"Pokud je vybráno, použije ReStructured text markup k odeslání HTML, navíc s "
+"ascii formátování. Pro syntaxi navštivte http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html (Pokud si to chcete prohlédnout, "
+"nainstalujte docutils)"
 
 #: ../src/common/config.py:110
-msgid "Character to propose to add after desired nickname when desired nickname is used by someone else in group chat."
-msgstr "Znak navržený pro přidání za zamýšlenou přezdívku, pokud už ji používá někdo jiný v diskuzi."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Znak, který se přidá za přezdívku po použití doplňování jména tabulátorem v "
+"diskuzi."
 
-#: ../src/common/config.py:133
-msgid "This option let you customize timestamp that is printed in conversation. For exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on strftime for full documentation: http://docs.python.org/lib/module-time.html"
-msgstr "Tato volba umožní vlastní formátování času, který je zobrazován v rozhovorech. Například \"[%H:%M]\" zobrazí \"[hodina:minuta]\". Pro víc informací shlédněte dokumentaci pythonu funkce strftime na: http://docs.python.org/lib/module-time.html"
+#: ../src/common/config.py:111
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Znak navržený pro přidání za zamýšlenou přezdívku, pokud už ji používá někdo "
+"jiný v diskuzi."
 
 #: ../src/common/config.py:134
+msgid ""
+"This option let you customize timestamp that is printed in conversation. For "
+"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
+"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+msgstr ""
+"Tato volba umožní vlastní formátování času, který je zobrazován v "
+"rozhovorech. Například \"[%H:%M]\" zobrazí \"[hodina:minuta]\". Pro víc "
+"informací shlédněte dokumentaci pythonu funkce strftime na: http://docs."
+"python.org/lib/module-time.html"
+
+#: ../src/common/config.py:135
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Znaky, které budou vypisovány před přezdívkou v rozhovorech"
 
-#: ../src/common/config.py:135
+#: ../src/common/config.py:136
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Znaky, které budou vypisovány za přezdívkou v rozhovorech"
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:143
 msgid "Add * and [n] in roster title?"
 msgstr "Přidat * a [n] k titulku Seznamu?"
 
-#: ../src/common/config.py:143
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
-msgstr "Jak moc řádků si pamatovat z předchozího rozhovoru, když je okno/záložka rozhovoru znovu otevřena."
-
 #: ../src/common/config.py:144
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Jak moc řádků si pamatovat z předchozího rozhovoru, když je okno/záložka "
+"rozhovoru znovu otevřena."
+
+#: ../src/common/config.py:145
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Kolik minut by měly řádky z předchozího rozhovoru zůstat."
 
-#: ../src/common/config.py:145
-msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
-msgstr "Odeslat zprávu při Ctrl+Enter a při Enter přejít na nový řádek (výchozí chování klienta Mirabilis ICQ)."
+#: ../src/common/config.py:146
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Odeslat zprávu při Ctrl+Enter a při Enter přejít na nový řádek (výchozí "
+"chování klienta Mirabilis ICQ)."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:148
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Kolik řádků uložit pro Ctrl+Šipka nahoru."
 
-#: ../src/common/config.py:150
+#: ../src/common/config.py:151
 #, python-format
-msgid "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
-msgstr "Buď vlastní url s %s v těle, kde %s je slovo nebo fráze, nebo 'WIKTIONARY', která znamená že se použije wiktionary."
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Buď vlastní url s %s v těle, kde %s je slovo nebo fráze, nebo 'WIKTIONARY', "
+"která znamená že se použije wiktionary."
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:154
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Pokud zaškrtnuta, Gajim může být ovládán vzdáleně pomocí gajim-remote."
 
-#: ../src/common/config.py:154
-msgid "If True, listen to D-Bus signals from NetworkManager and change the status of accounts (provided they do not have listen_to_network_manager set to False and they sync with global status) based upon the status of the network connection."
-msgstr "Je-li povoleno, čeká na D-Bus signál z NetworkManager a změní stav účtů (pokud nemají nastaveno listen_to_network_manager nastavený na False a synchronizují se s globálním stavem) v závislosti na stavu síťového připojení."
-
 #: ../src/common/config.py:155
-msgid "Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr "Odešílat události stavu rozhovoru. Může být pouze jediná, composing_only, vypnutá."
+msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+"Je-li povoleno, čeká na D-Bus signál z NetworkManager a změní stav účtů "
+"(pokud nemají nastaveno listen_to_network_manager nastavený na False a "
+"synchronizují se s globálním stavem) v závislosti na stavu síťového "
+"připojení."
 
 #: ../src/common/config.py:156
-msgid "Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled."
-msgstr "Zobraz stavy rozhovoru v okně rozhovoru. Může být jedno z all, composing_only nebo disabled."
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+"Odešílat události stavu rozhovoru. Může být pouze jediná, composing_only, "
+"vypnutá."
 
-#: ../src/common/config.py:158
-msgid "When not printing time for every message (print_time==sometimes), print it every x minutes."
-msgstr "Když nevypisuji čas pro každou zprávu (print_time=='někdy'), vypisuj ji každých x minut."
+#: ../src/common/config.py:157
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Zobraz stavy rozhovoru v okně rozhovoru. Může být jedno z all, "
+"composing_only nebo disabled."
 
 #: ../src/common/config.py:159
-msgid "Ask before closing a group chat tab/window."
-msgstr "Ptát se před zavřením oken/záložek diskuzí."
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Když nevypisuji čas pro každou zprávu (print_time=='někdy'), vypisuj ji "
+"každých x minut."
 
 #: ../src/common/config.py:160
-msgid "Always ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Vždy se ptát před zavřením oken/panelů diskuzí uvedených v tomto seznamu mezerami oddělením Jabber ID místností."
+msgid "Ask before closing a group chat tab/window."
+msgstr "Ptát se před zavřením oken/záložek diskuzí."
 
 #: ../src/common/config.py:161
-msgid "Never ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Nikdy se neptát před zavřením oken/záložek diskuzí uvedených v tomto seznamu mezerami oddělenými Jabber ID místností."
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Vždy se ptát před zavřením oken/panelů diskuzí uvedených v tomto seznamu "
+"mezerami oddělením Jabber ID místností."
+
+#: ../src/common/config.py:162
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Nikdy se neptát před zavřením oken/záložek diskuzí uvedených v tomto seznamu "
+"mezerami oddělenými Jabber ID místností."
 
-#: ../src/common/config.py:164
-msgid "Comma separated list of hosts that we send, in addition of local interfaces, for File Transfer in case of address translation/port forwarding."
-msgstr "Čárkami oddělený seznam počítačů kterým posíláme, navíc k lokálním síťovým rozhraním, pro přenos souborů v případě překladu adres nebo přesměrováním portů."
+#: ../src/common/config.py:165
+msgid ""
+"Comma separated list of hosts that we send, in addition of local interfaces, "
+"for File Transfer in case of address translation/port forwarding."
+msgstr ""
+"Čárkami oddělený seznam počítačů kterým posíláme, navíc k lokálním síťovým "
+"rozhraním, pro přenos souborů v případě překladu adres nebo přesměrováním "
+"portů."
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:167
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard říká KiB = 1024 bytů, KB = 1000 bytů."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:169
 msgid "Notify of events in the system trayicon."
 msgstr "Upozorni na události v systémovém trayi."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:175
 msgid "Show tab when only one conversation?"
 msgstr "Zobrazit záložku při jediném rozhovoru?"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:176
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Zobrazit okraj panelu v oknech rozhovorů?"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:177
 msgid "Show close button in tab?"
 msgstr "Zobrazit tlačitko zavřít v záložce?"
 
-#: ../src/common/config.py:189
-msgid "A semicolon-separated list of words that will be highlighted in group chats."
-msgstr "Středníkem oddělený seznam slov, které budou zvýrazněny v diskuzích."
-
-#: ../src/common/config.py:190
-msgid "If True, quits Gajim when X button of Window Manager is clicked. This setting is taken into account only if trayicon is used."
-msgstr "Pokud zapnuto, ukonči Gajim když bude stisknuto tlačítko X v titulku okna. Toto nastavení se použije pouze tehdy, pokud je použita ikona v trayi."
+#: ../src/common/config.py:186
+msgid "Preview new messages in notification popup?"
+msgstr ""
 
 #: ../src/common/config.py:191
-msgid "If True, Gajim will check if it's the default jabber client on each startup."
-msgstr "Pokud zapnuto, Gajim zkontroluje, zda je výchozí jabber klient, při každém startu."
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr "Středníkem oddělený seznam slov, které budou zvýrazněny v diskuzích."
 
 #: ../src/common/config.py:192
-msgid "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated."
-msgstr "Pokud zapnuto, Gajim zobrazí ikonu v každé záložce obsahující nepřečtené zprávy. V závislosti na tématu, tato ikona může být animovaná."
+msgid ""
+"If True, quits Gajim when X button of Window Manager is clicked. This "
+"setting is taken into account only if trayicon is used."
+msgstr ""
+"Pokud zapnuto, ukonči Gajim když bude stisknuto tlačítko X v titulku okna. "
+"Toto nastavení se použije pouze tehdy, pokud je použita ikona v trayi."
 
 #: ../src/common/config.py:193
-msgid "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window."
-msgstr "Pokud zapnuto, Gajim zobrazí popis stavu, pokud není prázdný, pro každý kontakt pod jménem v okně Seznamu."
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr ""
+"Pokud zapnuto, Gajim zkontroluje, zda je výchozí jabber klient, při každém "
+"startu."
 
-#: ../src/common/config.py:195
-msgid "If True, Gajim will ask for avatar each contact that did not have an avatar last time or has one cached that is too old."
-msgstr "pokud zapnuto, Gajim se zeptá na avatara každého kontaktu který neměl naposledy avatara nebo kterého uložený je příliš starý."
+#: ../src/common/config.py:194
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Pokud zapnuto, Gajim zobrazí ikonu v každé záložce obsahující nepřečtené "
+"zprávy. V závislosti na tématu, tato ikona může být animovaná."
 
-#: ../src/common/config.py:196
-msgid "If False, Gajim will no longer print status line in chats when a contact changes his or her status and/or his or her status message."
-msgstr "Pokud vypnuto, Gajim nebude zobrazovat stavové řádky v rozhovorech, když kontakt změní jeho stav a/nebo jeho stavovou zprávu."
+#: ../src/common/config.py:195
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"Pokud zapnuto, Gajim zobrazí popis stavu, pokud není prázdný, pro každý "
+"kontakt pod jménem v okně Seznamu."
 
 #: ../src/common/config.py:197
-msgid "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no longer print status line in groupchats when a member changes his or her status and/or his or her status message. If \"all\" Gajim will print all status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves group chat."
-msgstr "může být \"none\", \"all\", \"in_and_out\". Pokud je \"none\", Gajim nebude nadále vypisovat stavy v diskuzích když účastník změní svůj stav nebo stavovou zprávu. Pokud je \"all\", Gajim bude vypisovat všechny změny stavů. Při \"in_and_out\" Gajim vypíše stav jenom při vstupu a odchodu z místnosti."
+msgid ""
+"If True, Gajim will ask for avatar each contact that did not have an avatar "
+"last time or has one cached that is too old."
+msgstr ""
+"pokud zapnuto, Gajim se zeptá na avatara každého kontaktu který neměl "
+"naposledy avatara nebo kterého uložený je příliš starý."
+
+#: ../src/common/config.py:198
+msgid ""
+"If False, Gajim will no longer print status line in chats when a contact "
+"changes his or her status and/or his or her status message."
+msgstr ""
+"Pokud vypnuto, Gajim nebude zobrazovat stavové řádky v rozhovorech, když "
+"kontakt změní jeho stav a/nebo jeho stavovou zprávu."
 
 #: ../src/common/config.py:199
+msgid ""
+"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"longer print status line in groupchats when a member changes his or her "
+"status and/or his or her status message. If \"all\" Gajim will print all "
+"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
+"group chat."
+msgstr ""
+"může být \"none\", \"all\", \"in_and_out\". Pokud je \"none\", Gajim nebude "
+"nadále vypisovat stavy v diskuzích když účastník změní svůj stav nebo "
+"stavovou zprávu. Pokud je \"all\", Gajim bude vypisovat všechny změny stavů. "
+"Při \"in_and_out\" Gajim vypíše stav jenom při vstupu a odchodu z místnosti."
+
+#: ../src/common/config.py:201
 msgid "Background color of contacts when they just signed in."
 msgstr "Barva pozadí kontaktů, jež se zrovna přihlásili."
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:202
 msgid "Background color of contacts when they just signed out."
 msgstr "Barva pozadí kontaktů, jež se přávě odhlásili."
 
-#: ../src/common/config.py:202
-msgid "If True, restored messages will use a smaller font than the default one."
-msgstr "Pokud je povoleno, minulé zprávy budou vypsány menším písmem, než je výchozí."
+#: ../src/common/config.py:204
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+"Pokud je povoleno, minulé zprávy budou vypsány menším písmem, než je výchozí."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:205
 msgid "Don't show avatar for the transport itself."
 msgstr "Nezobrazuj avatara pro transport samotný."
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:206
 msgid "Don't show roster in the system taskbar."
 msgstr "Nezobrazuj roster v liště úloh."
 
-#: ../src/common/config.py:205
-msgid "If True and installed GTK+ and PyGTK versions are at least 2.8, make the window flash (the default behaviour in most Window Managers) when holding pending events."
-msgstr "Pokud je True a instalované GTK+ a PyGTK verze jsou alespoň 2.8, blikej oknem (výchozí chování ve většině Window Managerů) pokud čekají nové události."
-
 #: ../src/common/config.py:207
-msgid "Jabberd1.4 does not like sha info when one join a password protected group chat. Turn this option to False to stop sending sha info in group chat presences."
-msgstr "Jabberd1.4 nemá rád sha informaci, pokud někdo vstupuje do místnosti chráněné heslem. Zaškrtněte tuto volbu na False, aby se sha informace neposílala v presenci u diskuzí."
+msgid ""
+"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
+"window flash (the default behaviour in most Window Managers) when holding "
+"pending events."
+msgstr ""
+"Pokud je True a instalované GTK+ a PyGTK verze jsou alespoň 2.8, blikej "
+"oknem (výchozí chování ve většině Window Managerů) pokud čekají nové "
+"události."
+
+#: ../src/common/config.py:209
+msgid ""
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. Turn this option to False to stop sending sha info in group chat "
+"presences."
+msgstr ""
+"Jabberd1.4 nemá rád sha informaci, pokud někdo vstupuje do místnosti "
+"chráněné heslem. Zaškrtněte tuto volbu na False, aby se sha informace "
+"neposílala v presenci u diskuzí."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:210
+#: ../src/common/config.py:212
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a specific window. Note, changing this option requires restarting Gajim before the changes will take effect."
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect."
 msgstr ""
 "Řídí okno, kam budou doručeny nové zprávy.\n"
 "'vždy' - Všechny zprávy jsou odeslány do jediného okna.\n"
 "'nikdy' - Všechny zprávy dostanou svoje vlastní okno.\n"
 "'peracct' - Zprávy pro každý účet jsou doručeny do zvláštních oken.\n"
-"'pertype' - Každý typ zprávy (např. rohovor vs diskuze) jsou odeslány do zvláštního okna. Vězte, že změna této volby vyžaduje restartování Gajimu, aby se projevila"
+"'pertype' - Každý typ zprávy (např. rohovor vs diskuze) jsou odeslány do "
+"zvláštního okna. Vězte, že změna této volby vyžaduje restartování Gajimu, "
+"aby se projevila"
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:213
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Pokud je False, nebudete nadále vidět avatary v okně rozhovoru"
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:214
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Pokud je True, stiskem escape zavřete panel nebo okno"
 
-#: ../src/common/config.py:213
-msgid "Hides the buttons in group chat window."
+#: ../src/common/config.py:215
+#, fuzzy
+msgid "Hides the buttons in chat windows."
 msgstr "Skryje tlačítka v okně diskuze."
 
-#: ../src/common/config.py:214
-msgid "Hides the buttons in two persons chat window."
-msgstr "Skryje tlačítka v okně rozhovoru dvou lidí."
-
-#: ../src/common/config.py:215
+#: ../src/common/config.py:216
 msgid "Hides the banner in a group chat window"
 msgstr "Skryje nadpis v okně diskuze"
 
-#: ../src/common/config.py:216
+#: ../src/common/config.py:217
 msgid "Hides the banner in two persons chat window"
 msgstr "Skryje nadpis v okně rozhovoru dvou lidí"
 
-#: ../src/common/config.py:217
+#: ../src/common/config.py:218
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Skryje seznam lidí místnosti v okně diskuze."
 
-#: ../src/common/config.py:218
-msgid "In a chat, show the nickname at the beginning of a line only when it's not the same person talking than in previous message."
-msgstr "V rozhovoru zobraz přezdívku na začátku řádku pouze v případě, když to není stejný člověk, jako v předchozí zprávě."
-
 #: ../src/common/config.py:219
-msgid "Indentation when using merge consecutive nickname."
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
 msgstr ""
+"V rozhovoru zobraz přezdívku na začátku řádku pouze v případě, když to není "
+"stejný člověk, jako v předchozí zprávě."
 
 #: ../src/common/config.py:220
-msgid "List of colors that will be used to color nicknames in group chats."
-msgstr "Seznam barev používaných k obarvení přezdívek v diskuzích."
+msgid "Indentation when using merge consecutive nickname."
+msgstr ""
 
 #: ../src/common/config.py:221
-msgid "Ctrl-Tab go to next composing tab when none is unread."
-msgstr "Ctrl-Tab jde na další rozepsanou záložku, když žádný není nepřečtená."
+#, fuzzy
+msgid "Smooth scroll message in conversation window"
+msgstr "Odeslat zprávu a zavřít okno"
 
 #: ../src/common/config.py:222
-msgid "Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog."
-msgstr "Mám zobrazit dialog vytvoření metakontaktu nebo ne? Prázdný řetezec znamená nikdy nezobrazovat dialog."
+msgid "List of colors that will be used to color nicknames in group chats."
+msgstr "Seznam barev používaných k obarvení přezdívek v diskuzích."
 
 #: ../src/common/config.py:223
-msgid "If True, you will be able to set a negative priority to your account in account modification window. BE CAREFUL, when you are logged in with a negative priority, you will NOT receive any message from your server."
-msgstr "Je-li povoleno, bude možné použít zápornou prioritu účtu v okně úprava účtu. BUĎ OPATRNÝ, když jsi přihlášen se zápornou prioritou, nedostaneš od serveru žádnou zprávu."
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr "Ctrl-Tab jde na další rozepsanou záložku, když žádný není nepřečtená."
 
 #: ../src/common/config.py:224
-msgid "If True, Gajim will use Gnome Keyring (if available) to store account passwords."
-msgstr "Je-li povoleno, Gajim použije Gnome Keyring (je-li dostupný) k uložení hesel k účtům."
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Mám zobrazit dialog vytvoření metakontaktu nebo ne? Prázdný řetezec znamená "
+"nikdy nezobrazovat dialog."
 
 #: ../src/common/config.py:225
-msgid "If True, Gajim will show number of online and total contacts in account and group rows."
-msgstr "Je-li povoleno, Gajim zobrazí počet dostupných a všech kontaktů v účtu a u řádků skupin."
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFUL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+"Je-li povoleno, bude možné použít zápornou prioritu účtu v okně úprava účtu. "
+"BUĎ OPATRNÝ, když jsi přihlášen se zápornou prioritou, nedostaneš od serveru "
+"žádnou zprávu."
 
 #: ../src/common/config.py:226
-msgid "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages as if they were of this type"
-msgstr "Může být prázdný, 'chat' nebo 'message'. Není-lí prázdné, považuj všechny příchozí zprávy jako uvedený typ"
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"Je-li povoleno, Gajim použije Gnome Keyring (je-li dostupný) k uložení hesel "
+"k účtům."
 
-#: ../src/common/config.py:237
-msgid "Priority will change automatically according to your status. Priorities are defined in autopriority_* options."
-msgstr "Priorita se změní automaticky podle tvého stavu. Priority jsou definovány v nastavení jako položky autopriority_*."
+#: ../src/common/config.py:227
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"Je-li povoleno, Gajim zobrazí počet dostupných a všech kontaktů v účtu a u "
+"řádků skupin."
+
+#: ../src/common/config.py:228
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+"Může být prázdný, 'chat' nebo 'message'. Není-lí prázdné, považuj všechny "
+"příchozí zprávy jako uvedený typ"
+
+#: ../src/common/config.py:229
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+
+#: ../src/common/config.py:230
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+
+#: ../src/common/config.py:231
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr ""
+
+#: ../src/common/config.py:232
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+
+#: ../src/common/config.py:243
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Priorita se změní automaticky podle tvého stavu. Priority jsou definovány v "
+"nastavení jako položky autopriority_*."
 
 #. yes, no, ask
-#: ../src/common/config.py:266
+#: ../src/common/config.py:273
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:270
-msgid "If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer."
-msgstr "Pokud je zaškrtnuto, Gajim použije Vaší IP a proxy servery definované ve volbě pro přenos souborů file_transfer_proxies."
+#: ../src/common/config.py:277
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Pokud je zaškrtnuto, Gajim použije Vaší IP a proxy servery definované ve "
+"volbě pro přenos souborů file_transfer_proxies."
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:336
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Je OpenPGP povoleno pro tento kontakt?"
 
-#: ../src/common/config.py:330
-#: ../src/common/config.py:333
+#: ../src/common/config.py:337 ../src/common/config.py:340
 msgid "Language for which we want to check misspelled words"
 msgstr "Jazyk, pro který chcete kontrolovat překlepy ve slovech"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:346
 msgid "all or space separated status"
 msgstr "všechny nebo mezerou oddělené stavy"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:347
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', nebo 'both'"
 
-#: ../src/common/config.py:341
-#: ../src/common/config.py:343
-#: ../src/common/config.py:344
-#: ../src/common/config.py:347
-#: ../src/common/config.py:348
+#: ../src/common/config.py:348 ../src/common/config.py:350
+#: ../src/common/config.py:351 ../src/common/config.py:354
+#: ../src/common/config.py:355
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' nebo ''"
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:361
 msgid "Sleeping"
 msgstr "Spím"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:362
 msgid "Back soon"
 msgstr "Hned jsem zpět"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:362
 msgid "Back in some minutes."
 msgstr "Jsem zpátky za pár minut."
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:363
 msgid "Eating"
 msgstr "Jím"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:363
 msgid "I'm eating, so leave me a message."
 msgstr "Právě jím, prosím zanechte mi zprávu."
 
-#: ../src/common/config.py:357
+#: ../src/common/config.py:364
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:357
+#: ../src/common/config.py:364
 msgid "I'm watching a movie."
 msgstr "Dívám se na film."
 
-#: ../src/common/config.py:358
+#: ../src/common/config.py:365
 msgid "Working"
 msgstr "Pracuji"
 
-#: ../src/common/config.py:358
+#: ../src/common/config.py:365
 msgid "I'm working."
 msgstr "Právě pracuji."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:366
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:366
 msgid "I'm on the phone."
 msgstr "Zrovna telefonuji."
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:367
 msgid "Out"
 msgstr "Venku"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:367
 msgid "I'm out enjoying life."
 msgstr "Užívám si života venku."
 
-#: ../src/common/config.py:364
+#: ../src/common/config.py:371
 msgid "I'm available."
 msgstr "Jsem dostupný."
 
-#: ../src/common/config.py:365
+#: ../src/common/config.py:372
 msgid "I'm free for chat."
 msgstr "Hledám někoho na pokec."
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:374
 msgid "I'm not available."
 msgstr "Nejsem dostupný."
 
-#: ../src/common/config.py:368
+#: ../src/common/config.py:375
 msgid "Do not disturb."
 msgstr "Nerušit."
 
-#: ../src/common/config.py:369
-#: ../src/common/config.py:370
+#: ../src/common/config.py:376 ../src/common/config.py:377
 msgid "Bye!"
 msgstr "Zdar!"
 
-#: ../src/common/config.py:379
-msgid "Sound to play when a group chat message contains one of the words in muc_highlight_words, or when a group chat message contains your nickname."
-msgstr "Zvuk, který bude přehrán, pokud zpráva diskuze obsahuje jedno ze slov v muc_highlight_words, nebo když obsahuje Vaši přezdívku."
+#: ../src/common/config.py:386
+msgid ""
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
+msgstr ""
+"Zvuk, který bude přehrán, pokud zpráva diskuze obsahuje jedno ze slov v "
+"muc_highlight_words, nebo když obsahuje Vaši přezdívku."
 
-#: ../src/common/config.py:380
+#: ../src/common/config.py:387
 msgid "Sound to play when any MUC message arrives."
 msgstr "Přehraný zvuk při příchodu jakékoliv MUC zprávy."
 
-#: ../src/common/config.py:389
-#: ../src/common/optparser.py:195
+#: ../src/common/config.py:396 ../src/common/optparser.py:207
 msgid "green"
 msgstr "zelený"
 
-#: ../src/common/config.py:393
-#: ../src/common/optparser.py:181
+#: ../src/common/config.py:400 ../src/common/optparser.py:193
 msgid "grocery"
 msgstr "potraviny"
 
-#: ../src/common/config.py:397
+#: ../src/common/config.py:404
 msgid "human"
 msgstr "člověk"
 
-#: ../src/common/config.py:401
+#: ../src/common/config.py:408
 msgid "marine"
 msgstr "mariňák"
 
-#: ../src/common/connection_handlers.py:52
+#: ../src/common/connection_handlers.py:54
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 msgid "Unable to load idle module"
 msgstr "Nelze nahrát idle modul"
 
-#: ../src/common/connection_handlers.py:180
-#: ../src/common/connection_handlers.py:215
+#: ../src/common/connection_handlers.py:182
+#: ../src/common/connection_handlers.py:217
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:236
 msgid "Wrong host"
 msgstr "Nesprávné jméno počítače"
 
-#: ../src/common/connection_handlers.py:180
+#: ../src/common/connection_handlers.py:182
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:236
 #, python-format
-msgid "The host %s you configured as the ft_add_hosts_to_send advanced option is not valid, so ignored."
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:216
+#: ../src/common/connection_handlers.py:218
 msgid "Invalid local address? :-O"
 msgstr "Neplatná místní adresa? :-O"
 
-#: ../src/common/connection_handlers.py:607
+#: ../src/common/connection_handlers.py:610
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registrační informace pro transport %s nedorazily včas"
 
-#: ../src/common/connection_handlers.py:1565
+#: ../src/common/connection_handlers.py:1642
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Přezdívka nepovolena: %s"
 
-#. password required to join
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1627
-#: ../src/common/connection_handlers.py:1630
-#: ../src/common/connection_handlers.py:1633
-#: ../src/common/connection_handlers.py:1636
-#: ../src/common/connection_handlers.py:1639
-#: ../src/common/connection_handlers.py:1642
-#: ../src/common/connection_handlers.py:1650
+#: ../src/common/connection_handlers.py:1712
+#: ../src/common/connection_handlers.py:1715
+#: ../src/common/connection_handlers.py:1718
+#: ../src/common/connection_handlers.py:1721
+#: ../src/common/connection_handlers.py:1725
+#: ../src/common/connection_handlers.py:1734
 msgid "Unable to join group chat"
 msgstr "Nelze se připojit se do diskuze"
 
-#: ../src/common/connection_handlers.py:1628
-msgid "A password is required to join this group chat."
-msgstr "Pro připojení do této místnosti je vyžadováno heslo."
-
-#: ../src/common/connection_handlers.py:1631
-msgid "You are banned from this group chat."
+#: ../src/common/connection_handlers.py:1713
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
 msgstr "Máš zakázán přístup do této diskuze."
 
-#: ../src/common/connection_handlers.py:1634
-msgid "Such group chat does not exist."
+#: ../src/common/connection_handlers.py:1716
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
 msgstr "Taková diskuze neexistuje."
 
-#: ../src/common/connection_handlers.py:1637
+#: ../src/common/connection_handlers.py:1719
 msgid "Group chat creation is restricted."
 msgstr "Vytváření místností není povoleno."
 
-#: ../src/common/connection_handlers.py:1640
-msgid "Your registered nickname must be used."
+#: ../src/common/connection_handlers.py:1722
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
 msgstr "Musí být použita přezdívka, jež máte zaregistrovánu."
 
-#: ../src/common/connection_handlers.py:1643
-msgid "You are not in the members list."
+#: ../src/common/connection_handlers.py:1726
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
 msgstr "Nejsi v seznamu členů."
 
-#: ../src/common/connection_handlers.py:1651
+#: ../src/common/connection_handlers.py:1735
+#, fuzzy, python-format
 msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
-"Tebou požadované přezdívka se již používá nebo je zaregistrována někým jiným.\n"
+"Tebou požadované přezdívka se již používá nebo je zaregistrována někým "
+"jiným.\n"
 "Níže vyber jinou přezdívku:"
 
-#: ../src/common/connection_handlers.py:1713
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers.py:1766
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Autorizace byla zrušena"
+
+#: ../src/common/connection_handlers.py:1773
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1800
 msgid "I would like to add you to my roster."
 msgstr "Rád(a) bych si tě přidal(a) do seznamu."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1734
+#: ../src/common/connection_handlers.py:1821
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "jsme nyní zapsáni k %s"
 
-#: ../src/common/connection_handlers.py:1736
+#: ../src/common/connection_handlers.py:1823
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Žádost o zrušení autorizace od %s"
 
-#: ../src/common/connection_handlers.py:1738
+#: ../src/common/connection_handlers.py:1825
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "byla nám zrušena autorizace od %s"
 
-#: ../src/common/connection_handlers.py:1914
+#: ../src/common/connection_handlers.py:1947
 #, python-format
-msgid "JID %s is not RFC compliant. It will not be added to your roster. Use roster management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr "JID %s neodpovídá RFC. Nebude přidáno do tvého rosteru. Použij nástroje pro správu rosteru jako je http://jru.jabberstudio.org/ k jeho odstranění"
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s neodpovídá RFC. Nebude přidáno do tvého rosteru. Použij nástroje pro "
+"správu rosteru jako je http://jru.jabberstudio.org/ k jeho odstranění"
 
-#: ../src/common/connection.py:187
-#: ../src/common/zeroconf/connection_zeroconf.py:196
+#: ../src/common/connection.py:241
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Spojení s účtem \"%s\" bylo ztraceno"
 
-#: ../src/common/connection.py:188
+#: ../src/common/connection.py:242
 msgid "Reconnect manually."
 msgstr "Znovu připojit ručně."
 
-#: ../src/common/connection.py:199
-#: ../src/common/connection.py:226
-#, python-format
-msgid "Transport %s answered wrongly to register request: %s"
+#: ../src/common/connection.py:253
+#, fuzzy, python-format
+msgid "Server %s answered wrongly to register request: %s"
 msgstr "Transport %s odpověděl chybně na požadavek registrace: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:225
+#: ../src/common/connection.py:261
 msgid "Invalid answer"
 msgstr "Neplatná odpověď"
 
-#: ../src/common/connection.py:422
-#: ../src/common/connection.py:521
-#: ../src/common/connection.py:979
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:262
+#, python-format
+msgid "Transport %s answered wrongly to register request: %s"
+msgstr "Transport %s odpověděl chybně na požadavek registrace: %s"
+
+#: ../src/common/connection.py:408
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Spojení selhalo"
+
+#: ../src/common/connection.py:462 ../src/common/connection.py:508
+#: ../src/common/connection.py:1055
+#: ../src/common/zeroconf/connection_zeroconf.py:237
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nemůžu se připojit k \"%s\""
 
-#: ../src/common/connection.py:436
+#: ../src/common/connection.py:476
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Připojen k server %s: %s s %s"
 
-#: ../src/common/connection.py:450
-#, python-format
-msgid "Security error connecting to \"%s\""
-msgstr "Bezpečnostní chyba při připojení k \"%s\""
-
-#: ../src/common/connection.py:451
-msgid "The server's key has changed, or someone is trying to hack your connection."
-msgstr "Klíč serveru se změnil, nebo se někdo pokouší prolomit tvoje spojení."
-
-#: ../src/common/connection.py:458
-#, python-format
-msgid "Unable to check fingerprint for %s. Connection could be insecure."
-msgstr "Nemohu zkontrolovat otisk pro %s. Spojení nemusí být zcela bezpečné."
-
-#: ../src/common/connection.py:500
-#, python-format
-msgid "Missing fingerprint in SSL connection to %s"
-msgstr "Schází otisk v SSL spojení k %s"
-
-#: ../src/common/connection.py:506
-#, python-format
-msgid "Fingerprint mismatch for %s: Got %s, expected %s"
-msgstr "Otisk se neshoduje pro %s: Dostal jsem %s, očekával jsem %s"
-
-#: ../src/common/connection.py:522
+#: ../src/common/connection.py:509
 msgid "Check your connection or try again later"
 msgstr "Ověřte připojení nebo zkuste později"
 
-#: ../src/common/connection.py:548
+#: ../src/common/connection.py:534
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentizace selhala s \"%s\""
 
-#: ../src/common/connection.py:549
+#: ../src/common/connection.py:535
 msgid "Please check your login and password for correctness."
 msgstr "Prosím zkontrolujte správnost jména a hesla."
 
-#: ../src/common/connection.py:576
+#: ../src/common/connection.py:578
 msgid "Error while removing privacy list"
 msgstr "chyba při odebírání privacy listu"
 
-#: ../src/common/connection.py:577
+#: ../src/common/connection.py:579
 #, python-format
-msgid "Privacy list %s has not been removed. It is maybe active in one of your connected resources. Deactivate it and try again."
-msgstr "Privacy list %s nebyl odstraněn. Možná je aktivní v jednom z připojených zdrojů. Zruště jeho používání a zkuste znovu."
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+msgstr ""
+"Privacy list %s nebyl odstraněn. Možná je aktivní v jednom z připojených "
+"zdrojů. Zruště jeho používání a zkuste znovu."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:675
-#: ../src/common/zeroconf/connection_zeroconf.py:156
+#: ../src/common/connection.py:679
+#: ../src/common/zeroconf/connection_zeroconf.py:163
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP heslo nebylo zadáno"
 
-#. do not show I'm invisible!
-#: ../src/common/connection.py:717
-msgid "invisible"
-msgstr "neviditelný"
-
-#: ../src/common/connection.py:718
-msgid "offline"
-msgstr "odpojen"
-
-#: ../src/common/connection.py:719
-#, python-format
-msgid "I'm %s"
-msgstr "Jsem %s"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:842
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Tato zpráva je *zašifrovaná* (Viz :JEP:`27`]"
 
-#: ../src/common/connection.py:866
-#: ../src/common/zeroconf/connection_zeroconf.py:397
+#: ../src/common/connection.py:904
+#: ../src/common/zeroconf/connection_zeroconf.py:423
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -6004,11 +6821,11 @@ msgstr ""
 "Předmět: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1005
+#: ../src/common/connection.py:1087
 msgid "Not fetched because of invisible status"
 msgstr "Nestáhnuto z důvodu stavu neviditelnosti"
 
-#: ../src/common/contacts.py:271
+#: ../src/common/contacts.py:294
 msgid "Not in roster"
 msgstr "Není v rosteru"
 
@@ -6023,17 +6840,18 @@ msgstr "Možnosti D-Bus nemohou být použity"
 
 #: ../src/common/exceptions.py:22
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "Závislost na pysqlite2 (neboli python-pysqlite2) není splněna. Končím..."
+msgstr ""
+"Závislost na pysqlite2 (neboli python-pysqlite2) není splněna. Končím..."
 
-#: ../src/common/exceptions.py:30
+#: ../src/common/exceptions.py:39
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr "Služba není dostupná. Gajim neběží, nebo remote_control je vypnutý"
 
-#: ../src/common/exceptions.py:38
+#: ../src/common/exceptions.py:47
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus není přítomna na tohto stroji nebo modul pythonu chybí"
 
-#: ../src/common/exceptions.py:46
+#: ../src/common/exceptions.py:55
 msgid ""
 "Session bus is not available.\n"
 "Try reading http://trac.gajim.org/wiki/GajimDBus"
@@ -6091,68 +6909,55 @@ msgstr "dvanáct"
 
 #. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
 #. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47
-#: ../src/common/fuzzyclock.py:55
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 msgid "$0 o'clock"
 msgstr "$0 hodin"
 
-#: ../src/common/fuzzyclock.py:47
-#: ../src/common/fuzzyclock.py:55
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
 msgid "five past $0"
 msgstr "pět po $0"
 
-#: ../src/common/fuzzyclock.py:48
-#: ../src/common/fuzzyclock.py:56
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
 msgid "ten past $0"
 msgstr "deset po $0"
 
-#: ../src/common/fuzzyclock.py:48
-#: ../src/common/fuzzyclock.py:56
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
 msgid "quarter past $0"
 msgstr "čtvrt po $0"
 
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:57
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
 msgid "twenty past $0"
 msgstr "dvacet po $0"
 
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:57
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
 msgid "twenty five past $0"
 msgstr "dvacet pět po $%"
 
-#: ../src/common/fuzzyclock.py:50
-#: ../src/common/fuzzyclock.py:58
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
 msgid "half past $0"
 msgstr "půl $1"
 
-#: ../src/common/fuzzyclock.py:50
-#: ../src/common/fuzzyclock.py:58
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
 msgid "twenty five to $1"
 msgstr "dvacet pět do $1"
 
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
 msgid "twenty to $1"
 msgstr "dvacet do $1"
 
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
 msgid "quarter to $1"
 msgstr "tři čtvrtě na $1"
 
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
 msgid "ten to $1"
 msgstr "za deset $1"
 
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
 msgid "five to $1"
 msgstr "za pět $1"
 
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:61
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
 msgid "$1 o'clock"
 msgstr "$1 hodin"
 
@@ -6204,287 +7009,252 @@ msgstr "Konec týdne"
 msgid "Weekend!"
 msgstr "Víkend!"
 
-#: ../src/common/helpers.py:114
+#: ../src/common/helpers.py:115
 msgid "Invalid character in username."
 msgstr "Neplatný znak v uživatelském jméně."
 
-#: ../src/common/helpers.py:119
+#: ../src/common/helpers.py:120
 msgid "Server address required."
 msgstr "Je potřeba adresa serveru."
 
-#: ../src/common/helpers.py:124
+#: ../src/common/helpers.py:125
 msgid "Invalid character in hostname."
 msgstr "Neplatný znak v hostname."
 
-#: ../src/common/helpers.py:130
+#: ../src/common/helpers.py:131
 msgid "Invalid character in resource."
 msgstr "Neplatný znak ve zdroji."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:174
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:177
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:180
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:184
+#: ../src/common/helpers.py:185
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:187
+#: ../src/common/helpers.py:188
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:191
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:222
 msgid "_Busy"
 msgstr "_Nerušit"
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:224
 msgid "Busy"
 msgstr "Nerušit"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:227
 msgid "_Not Available"
 msgstr "Ne_dostupný"
 
-#: ../src/common/helpers.py:229
+#: ../src/common/helpers.py:232
 msgid "_Free for Chat"
 msgstr "_Ukecaný"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:234
 msgid "Free for Chat"
 msgstr "Ukecaný"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
 msgid "_Available"
 msgstr "Přip_ojen"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:239
 msgid "Available"
 msgstr "Připojen"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:241
 msgid "Connecting"
 msgstr "Připojuji se"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:244
 msgid "A_way"
 msgstr "_Pryč"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:249
 msgid "_Offline"
 msgstr "_Odpojen"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:251
 msgid "Offline"
 msgstr "Odpojen"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:254
 msgid "_Invisible"
 msgstr "Ne_viditelný"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:260
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Neznámý"
 
-#: ../src/common/helpers.py:259
+#: ../src/common/helpers.py:262
 msgid "?contact has status:Has errors"
 msgstr "stav"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:267
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Žádná"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
 msgid "To"
 msgstr "Příjemce"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:273
 msgid "Both"
 msgstr "Oboustranná"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:281
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Není"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:283
 msgid "Subscribe"
 msgstr "Žádat autorizaci"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:292
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Žádná"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:295
 msgid "Moderators"
 msgstr "Moderátoři"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:297
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: ../src/common/helpers.py:297
+#: ../src/common/helpers.py:300
 msgid "Participants"
 msgstr "Účastníci"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:302
 msgid "Participant"
 msgstr "Účastník"
 
-#: ../src/common/helpers.py:302
+#: ../src/common/helpers.py:305
 msgid "Visitors"
 msgstr "Návštěvníci"
 
-#: ../src/common/helpers.py:304
+#: ../src/common/helpers.py:307
 msgid "Visitor"
 msgstr "Návštěvník"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:313
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Žádná"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:315
 msgid "Owner"
 msgstr "Vlastník"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:317
 msgid "Administrator"
 msgstr "Správce"
 
-#: ../src/common/helpers.py:316
+#: ../src/common/helpers.py:319
 msgid "Member"
 msgstr "Člen"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:358
 msgid "is paying attention to the conversation"
 msgstr "věnuje pozornost rozhovoru"
 
-#: ../src/common/helpers.py:357
+#: ../src/common/helpers.py:360
 msgid "is doing something else"
 msgstr "dělá něco jiného"
 
-#: ../src/common/helpers.py:359
+#: ../src/common/helpers.py:362
 msgid "is composing a message..."
 msgstr "píše zprávu..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:362
+#: ../src/common/helpers.py:365
 msgid "paused composing a message"
 msgstr "pozastavil(a) psaní zprávy"
 
-#: ../src/common/helpers.py:364
+#: ../src/common/helpers.py:367
 msgid "has closed the chat window or tab"
 msgstr "zavřel(a) okno zprávy"
 
-#: ../src/common/helpers.py:890
+#: ../src/common/helpers.py:913 ../src/common/helpers.py:920
+#, fuzzy, python-format
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "Odeslat zprávu"
+msgstr[1] "Odeslat zprávu"
+msgstr[2] "Odeslat zprávu"
+
+#: ../src/common/helpers.py:926
 #, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "%d nepřečtená zpráva"
-msgstr[1] "%d nepřečtené zprávy"
-msgstr[2] "%d nepřečtených zpráv"
+msgid " from room %s"
+msgstr ""
 
-#: ../src/common/helpers.py:896
+#: ../src/common/helpers.py:929 ../src/common/helpers.py:948
 #, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "%d nepřečtenou prostou zprávu"
-msgstr[1] "%d nepřečtené prosté zprávy"
-msgstr[2] "%d nepřečtených prostých zpráv"
+msgid " from user %s"
+msgstr ""
 
-#: ../src/common/helpers.py:902
+#: ../src/common/helpers.py:931
 #, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "%d nepřečtenou zprávu z diskuzí"
-msgstr[1] "%d nepřečtené zprávy z diskuzí"
-msgstr[2] "%d nepřečtených zpráv z diskuzí"
+msgid " from %s"
+msgstr ""
 
-#: ../src/common/helpers.py:908
+#: ../src/common/helpers.py:938 ../src/common/helpers.py:945
 #, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "%d nepřečtenou soukromou zprávu"
-msgstr[1] "%d nepřečtené soukromé zprávy"
-msgstr[2] "%d nepřečtených soukromých zpráv"
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/common/helpers.py:918
-#: ../src/common/helpers.py:920
+#: ../src/common/helpers.py:978
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/check_paths.py:33
-msgid "creating logs database"
-msgstr "vytvářím databázi historie"
-
-#: ../src/common/check_paths.py:89
-#: ../src/common/check_paths.py:100
-#: ../src/common/check_paths.py:107
-#, python-format
-msgid "%s is a file but it should be a directory"
-msgstr "%s je soubor, ale měl by být adresář"
-
-#: ../src/common/check_paths.py:90
-#: ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:108
-#: ../src/common/check_paths.py:116
-msgid "Gajim will now exit"
-msgstr "Gajim se nyní ukončí"
-
-#: ../src/common/check_paths.py:115
-#, python-format
-msgid "%s is a directory but should be a file"
-msgstr "%s je adresář, ale měl by to být soubor"
-
-#: ../src/common/check_paths.py:131
-#, python-format
-msgid "creating %s directory"
-msgstr "vytvářím adresář %s "
-
 #. we talk about a file
 #: ../src/common/optparser.py:59
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "chyba: nemůžu otevřít %s pro čtení"
 
-#: ../src/common/optparser.py:181
-msgid "gtk+"
-msgstr "gtk+"
-
-#: ../src/common/optparser.py:190
-#: ../src/common/optparser.py:191
+#: ../src/common/optparser.py:202 ../src/common/optparser.py:203
 msgid "cyan"
 msgstr "azurová"
 
-#: ../src/common/optparser.py:308
+#: ../src/common/optparser.py:319
 msgid "migrating logs database to indices"
 msgstr ""
 
@@ -6493,31 +7263,35 @@ msgstr ""
 msgid "Gajim account %s"
 msgstr "Gajim účet %s"
 
-#: ../src/common/zeroconf/client_zeroconf.py:189
-msgid "Connection to host could not be established: Incorrect answer from server."
-msgstr "Spojení k počítači nebylo navázáno: Neplatná odpověď serveru."
-
-#: ../src/common/zeroconf/client_zeroconf.py:205
+#: ../src/common/zeroconf/client_zeroconf.py:135
+#: ../src/common/zeroconf/client_zeroconf.py:218
 msgid "Connection to host could not be established"
 msgstr "Spojení s počítačem se nepodařilo navázat"
 
-#: ../src/common/zeroconf/client_zeroconf.py:334
-msgid "Connection to host could not be established: Timeout while sending data."
+#: ../src/common/zeroconf/client_zeroconf.py:192
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
+msgstr "Spojení k počítači nebylo navázáno: Neplatná odpověď serveru."
+
+#: ../src/common/zeroconf/client_zeroconf.py:352
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
 msgstr "Spojení k počítači nebylo navázáno:Vypršel čas při odesílání dat."
 
-#: ../src/common/zeroconf/client_zeroconf.py:627
+#: ../src/common/zeroconf/client_zeroconf.py:638
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt je offline. Vaše zpráva nemohla být odeslána."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:197
+#: ../src/common/zeroconf/connection_zeroconf.py:204
 msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "Pro pokračování v přijímání a odesílání zpráv se musíte znovu připojit."
+msgstr ""
+"Pro pokračování v přijímání a odesílání zpráv se musíte znovu připojit."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:227
 msgid "Avahi error"
 msgstr "Chyba Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:227
 #, python-format
 msgid ""
 "%s\n"
@@ -6526,66 +7300,206 @@ msgstr ""
 "%s\n"
 "Zasílání lokálních zpráv nemusí fungovat správně."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#: ../src/common/zeroconf/connection_zeroconf.py:238
 msgid "Please check if Avahi is installed."
 msgstr "Zkontrolujte zda je Avahi nainstalováno."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#: ../src/common/zeroconf/connection_zeroconf.py:231
+#: ../src/common/zeroconf/connection_zeroconf.py:247
+#: ../src/common/zeroconf/connection_zeroconf.py:251
 msgid "Could not start local service"
 msgstr "Nepodařilo se spustit lokální službu"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:228
+#: ../src/common/zeroconf/connection_zeroconf.py:248
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nemůžu naslouchat na portu %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:232
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:347
 msgid "Please check if avahi-daemon is running."
 msgstr "Zkontrolujte, zda avahi-daemon běží."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:324
+#: ../src/common/zeroconf/connection_zeroconf.py:346
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nemůžu změnit stav účtu \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:341
-msgid "You are not connected or not visible to others. Your message could not be sent."
-msgstr "Nejsi připojen nebo viditelný pro ostatní. Tvoje zpráva nemůže být odeslána."
+#: ../src/common/zeroconf/connection_zeroconf.py:363
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+"Nejsi připojen nebo viditelný pro ostatní. Tvoje zpráva nemůže být odeslána."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:353
+#: ../src/common/zeroconf/connection_zeroconf.py:375
 msgid "[This message is encrypted]"
 msgstr "[Tato zpráva je zašifrovaná]"
 
-#: ../src/common/zeroconf/zeroconf.py:180
-#, python-format
-msgid "Error while adding service. %s"
-msgstr "Chyba při přidávání služby. %s"
+#~ msgid "Send Single _Message..."
+#~ msgstr "Odeslat jednoduchou _zprávu..."
+
+#~ msgid "_Add Contact..."
+#~ msgstr "Přid_at kontakt..."
+
+# FIXME: chtelo by to cesky vyraz pro service discovery
+#~ msgid "_Discover Services..."
+#~ msgstr "_Prohlížet služby..."
+
+#~ msgid "_Retype Password:"
+#~ msgstr "Z_opakuj heslo:"
+
+#~ msgid "_Use proxy"
+#~ msgstr "_Používat proxy"
+
+#~ msgid "Accounts"
+#~ msgstr "Účty"
+
+#~ msgid ""
+#~ "If checked, all local contacts that use a Bonjour compatible chat client "
+#~ "(like iChat, Trillian or Gaim) will be shown in roster. You don't need to "
+#~ "be connected to a jabber server for it to work.\n"
+#~ "This is only available if python-avahi is installed and avahi-daemon is "
+#~ "running."
+#~ msgstr ""
+#~ "Pokud je zaškrtnuto, všechny místní kontakty používající Bonjour-"
+#~ "kompatibilního klienta (iChat, Trillian nebo Gaim) se zobrazí v rosteru. "
+#~ "Nemusíš být připojený(á) k jabber serveru, aby to fungovalo.\n"
+#~ "Je to dostupné pouze v případě, že je nainstalováno python-avahi a avahi-"
+#~ "daemon běží."
+
+#~ msgid ""
+#~ "If you have 2 or more accounts and this is checked, Gajim will list all "
+#~ "contacts as if you had one account"
+#~ msgstr ""
+#~ "Máte-li 2 nebo více účtů a je zaškrtnuto, Gajim zobrazí všechny kontakty "
+#~ "jako by byly z jednoho účtu"
+
+#~ msgid "_Enable link-local messaging"
+#~ msgstr "_Povolit lokální zprávy"
+
+#~ msgid "_Modify"
+#~ msgstr "_Upravit"
+
+#~ msgid "_Compact View    Alt+C"
+#~ msgstr "_Zjednodušený pohled    Alt+C"
+
+#~ msgid "_Remove from Roster"
+#~ msgstr "Odst_ranit ze Seznamu"
+
+#~ msgid "You must enter a password for the new account."
+#~ msgstr "Musíte zadat heslo pro nový účet."
+
+#~ msgid ""
+#~ "If that is not your language for which you want to highlight misspelled "
+#~ "words, then please set your $LANG as appropriate. Eg. for French do "
+#~ "export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to "
+#~ "make it global in /etc/profile.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Pokud to není Váš jazyk, pro který chcete zvýrazňovat slova s překlepy, "
+#~ "potom prosím nastavte proměnnou $LANG na správnou. Například. pro Češtinu "
+#~ "spusťte export LANG=cs_CZ nebo export LANG=cs_CZ zapište do ~/."
+#~ "bash_profile nebo pro nastavení globálně do /etc/profile.\n"
+#~ "\n"
+#~ "Vlastnost zvýrazňování překlepů nebude použita"
+
+#~ msgid "Private Chat"
+#~ msgstr "Soukromý rozhovor"
+
+#~ msgid "Group Chat"
+#~ msgstr "Diskuze"
+
+#~ msgid "Drop %s in group %s"
+#~ msgstr "Smazat %s ve skupině %s"
+
+#~ msgid "Make %s and %s metacontacts"
+#~ msgstr "Učiň %s a %s metakontakty"
+
+#~ msgid "Hides the buttons in two persons chat window."
+#~ msgstr "Skryje tlačítka v okně rozhovoru dvou lidí."
+
+#~ msgid "Security error connecting to \"%s\""
+#~ msgstr "Bezpečnostní chyba při připojení k \"%s\""
+
+#~ msgid ""
+#~ "The server's key has changed, or someone is trying to hack your "
+#~ "connection."
+#~ msgstr ""
+#~ "Klíč serveru se změnil, nebo se někdo pokouší prolomit tvoje spojení."
+
+#~ msgid "Unable to check fingerprint for %s. Connection could be insecure."
+#~ msgstr ""
+#~ "Nemohu zkontrolovat otisk pro %s. Spojení nemusí být zcela bezpečné."
+
+#~ msgid "Missing fingerprint in SSL connection to %s"
+#~ msgstr "Schází otisk v SSL spojení k %s"
+
+#~ msgid "Fingerprint mismatch for %s: Got %s, expected %s"
+#~ msgstr "Otisk se neshoduje pro %s: Dostal jsem %s, očekával jsem %s"
+
+#~ msgid "invisible"
+#~ msgstr "neviditelný"
+
+#~ msgid "offline"
+#~ msgstr "odpojen"
+
+#~ msgid "I'm %s"
+#~ msgstr "Jsem %s"
+
+#~ msgid " %d unread single message"
+#~ msgid_plural " %d unread single messages"
+#~ msgstr[0] "%d nepřečtenou prostou zprávu"
+#~ msgstr[1] "%d nepřečtené prosté zprávy"
+#~ msgstr[2] "%d nepřečtených prostých zpráv"
+
+#~ msgid " %d unread group chat message"
+#~ msgid_plural " %d unread group chat messages"
+#~ msgstr[0] "%d nepřečtenou zprávu z diskuzí"
+#~ msgstr[1] "%d nepřečtené zprávy z diskuzí"
+#~ msgstr[2] "%d nepřečtených zpráv z diskuzí"
+
+#~ msgid " %d unread private message"
+#~ msgid_plural " %d unread private messages"
+#~ msgstr[0] "%d nepřečtenou soukromou zprávu"
+#~ msgstr[1] "%d nepřečtené soukromé zprávy"
+#~ msgstr[2] "%d nepřečtených soukromých zpráv"
+
+#~ msgid "gtk+"
+#~ msgstr "gtk+"
+
+#~ msgid "Error while adding service. %s"
+#~ msgstr "Chyba při přidávání služby. %s"
 
 #~ msgid "A_fter nickname:"
 #~ msgstr "_Po přezdívce:"
+
 #~ msgid "B_efore nickname:"
 #~ msgstr "Pře_d přezdívkou:"
+
 #~ msgid "_After time:"
 #~ msgstr "_Po čase:"
+
 #~ msgid "_Before time:"
 #~ msgstr "Pře_d časem:"
+
 #~ msgid "_Publish"
 #~ msgstr "_Zveřejnit"
+
 #~ msgid "_Retrieve"
 #~ msgstr "_Získat"
+
 #~ msgid "Without a connection, you can not get your contact information."
 #~ msgstr "Bez opětovného připojení nemůžete získat Vaše osobní údaje."
 
 #, fuzzy
 #~ msgid "_New room"
 #~ msgstr "Nová místnost"
+
 #~ msgid "Role: "
 #~ msgstr "Role:"
-#~ msgid "Affiliation: "
-#~ msgstr "Přidružení:"
+
 #~ msgid ""
 #~ "Sound to play when any MUC message arrives. (This setting is taken into "
 #~ "account only if notify_on_all_muc_messages is True)"
@@ -6612,33 +7526,45 @@ msgstr "Chyba při přidávání služby. %s"
 #, fuzzy
 #~ msgid "Not Available "
 #~ msgstr "Nedostupný"
+
 #~ msgid "Contact _Info"
 #~ msgstr "_Informace o kontaktu"
+
 #~ msgid "Jabber"
 #~ msgstr "Jabber"
+
 #~ msgid "Invalid room or server name"
 #~ msgstr "Neplatná místnost nebo jméno serveru"
+
 #~ msgid "Unknown D-Bus version: %s"
 #~ msgstr "Neznámá verze D-Bus: %s"
+
 #~ msgid "vCard publication succeeded"
 #~ msgstr "publikování vizitky bylo úspěšné"
+
 #~ msgid "Your personal information has been published successfully."
 #~ msgstr "Vaše osobní údaje byly úspěšně publikovány."
+
 #~ msgid "Migrating Logs..."
 #~ msgstr "Převádím historii..."
+
 #~ msgid "Gajim - %d unread message"
 #~ msgid_plural "Gajim - %d unread messages"
 #~ msgstr[0] "Gajim - %d nepřečtenou zprávu"
 #~ msgstr[1] "Gajim - %d nepřečtené zprávy"
 #~ msgstr[2] "Gajim - %d nepřečtených zpráv"
+
 #~ msgid "Since %s"
 #~ msgstr "Od %s"
+
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Automaticky autorizovat kontakt"
+
 #~ msgid "Send File"
 #~ msgstr "Odeslat Soubor"
+
 #~ msgid "Underline"
 #~ msgstr "Podtržení"
+
 #~ msgid "_Join New Room..."
 #~ msgstr "_Vstoupit do nové místnosti..."
-
diff --git a/po/da.po b/po/da.po
new file mode 100644
index 000000000..fb22fe239
--- /dev/null
+++ b/po/da.po
@@ -0,0 +1,7648 @@
+# Danish translations for Gajim package.
+# Copyright (C) 2007 GAJIM'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the Gajim package.
+# Niels Felsted Thorsen <felsted@fsfe.org>, 2007.
+#
+#: ../src/gajim-remote.py:212 ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:245 ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:252 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254 ../src/gajim-remote.py:255
+msgid ""
+msgstr ""
+"Project-Id-Version: Gajim 0.11\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-09-09 11:23+0200\n"
+"PO-Revision-Date: 2007-09-30 17:47+0200\n"
+"Last-Translator: Niels Felsted Thorsen <felsted@fsfe.org>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Emacs 22.1.50.1, po-mode 2.02+0.4\n"
+
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "En GTK+ Jabber klient"
+
+#: ../data/gajim.desktop.in.in.h:2
+msgid "Gajim Instant Messenger"
+msgstr "Gajim Instant Messenger"
+
+#: ../data/gajim.desktop.in.in.h:3
+msgid "Jabber IM Client"
+msgstr "Jabber IM Klient"
+
+#: ../data/glade/account_context_menu.glade.h:1
+#: ../data/glade/roster_window.glade.h:8
+msgid "Join _Group Chat..."
+msgstr "Deltag i en _Gruppe Samtale..."
+
+#: ../data/glade/account_context_menu.glade.h:2
+msgid "_Add Contact..."
+msgstr "_Tilføj Kontakt..."
+
+#: ../data/glade/account_context_menu.glade.h:3
+#: ../data/glade/roster_window.glade.h:15
+msgid "_Discover Services"
+msgstr "Op_dag Tjenester"
+
+#: ../data/glade/account_context_menu.glade.h:4
+msgid "_Execute Command..."
+msgstr "_Udfør Kommando..."
+
+#: ../data/glade/account_context_menu.glade.h:5
+msgid "_Modify Account"
+msgstr "_Ændre Konto"
+
+#: ../data/glade/account_context_menu.glade.h:6
+msgid "_Open Gmail Inbox"
+msgstr "_Åbn Gmail Indboks"
+
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/roster_window.glade.h:22
+msgid "_Start Chat..."
+msgstr "_Start Samtale..."
+
+#: ../data/glade/account_context_menu.glade.h:8
+#: ../data/glade/zeroconf_context_menu.glade.h:2
+msgid "_Status"
+msgstr "_Status"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:1
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Tilslutter til server</b>\n"
+"\n"
+"Vent venligst..."
+
+#: ../data/glade/account_creation_wizard_window.glade.h:4
+msgid "<b>Please choose one of the options below:</b>"
+msgstr "<b>Vælg en af mulighederne under:</b>"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:5
+msgid "<b>Please fill in the data for your new account</b>"
+msgstr "Fyld ind data for din nye konto"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:6
+msgid "<b>Please select a server</b>"
+msgstr "<b>Vælg venligst en server<b>"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+msgstr ""
+"Tryk for at se egenskaber (som MSN, ICQ transporter) på jabber serveren"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:8
+msgid "Connect when I press Finish"
+msgstr "Tilslut når jeg trykke Færdig"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:9
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Konto Oprettelses Guide"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:10
+msgid "I already have an account I want to use"
+msgstr "Jeg har allerede en konto jeg vil bruge"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:11
+msgid "I want to _register for a new account"
+msgstr "Jeg vil _registrere en ny konto"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:22
+msgid "If checked, Gajim will remember the password for this account"
+msgstr "Hvis valgt vil Gajim huske adgangskoden for denne konto"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:32
+msgid "Manage..."
+msgstr "Kan håndteres..."
+
+#: ../data/glade/account_creation_wizard_window.glade.h:14
+msgid "Prox_y:"
+msgstr "Pro_xy:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:48
+msgid "Save pass_word"
+msgstr "Gem adgangs_kode"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:16
+msgid "Servers Features"
+msgstr "Server Egenskaber"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:17
+msgid "Set my profile when I connect"
+msgstr "Sæt min profil når jeg tilslutter"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:53
+msgid "Use custom hostname/port"
+msgstr "Brug tilpasset værtsnavn/port"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:19
+msgid ""
+"You need to have an account in order to connect\n"
+"to the Jabber network."
+msgstr ""
+"Du behøver en konto for at tilslutte dig\n"
+"til Jabber netværket"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:21
+msgid "Your JID:"
+msgstr "Din JID:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:13
+msgid "_Advanced"
+msgstr "_Avanceret"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:23
+msgid "_Finish"
+msgstr "_Færdig"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:24
+msgid "_Hostname:"
+msgstr "_Værtsnavn:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_modification_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:58
+msgid "_Password:"
+msgstr "_Adgangskode"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/manage_proxies_window.glade.h:11
+msgid "_Port:"
+msgstr "_Port:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:27
+msgid "_Server:"
+msgstr "_Server:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/manage_proxies_window.glade.h:12
+msgid "_Username:"
+msgstr "_Brugernavn:"
+
+#: ../data/glade/account_modification_window.glade.h:1
+#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/preferences_window.glade.h:8
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Diverse</b>"
+
+#: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:1
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
+
+#: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:2
+msgid "<b>Personal Information</b>"
+msgstr "<b>Personlig Information</b>"
+
+#: ../data/glade/account_modification_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:4
+msgid "Account"
+msgstr "Konto"
+
+#: ../data/glade/account_modification_window.glade.h:5
+msgid "Account Modification"
+msgstr "Ændring af Konto"
+
+#: ../data/glade/account_modification_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+msgid "Administration operations"
+msgstr "Administrative handlinger"
+
+#: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:6
+msgid "Auto-reconnect when connection is lost"
+msgstr "Tilslut automatisk hvis tilslutningen tabes"
+
+#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/zeroconf_properties_window.glade.h:3
+msgid "C_onnect on Gajim startup"
+msgstr "T_ilslut når Gajim startes"
+
+#: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:8
+msgid "Chan_ge Password"
+msgstr "Ænd_re Adgangskode"
+
+#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:9
+msgid ""
+"Check this so Gajim will connect in port 5223 where legacy servers are "
+"expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
+"default if broadcasted by the server, and with this option enabled TLS will "
+"be disabled"
+msgstr ""
+"Tjek denne således at Gajim vil tilslutte på port 5223 hvor gamle servere "
+"forventes at ha SSL muligheder. Bemærk at Gajim bruger TLS kryptering som "
+"standard hvis det er rundsendt af serveren, og med denne indstilling valgt "
+"vil TLS blive deaktiveret."
+
+#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/zeroconf_properties_window.glade.h:4
+msgid "Choose _Key..."
+msgstr "Vælg _Nøgle..."
+
+#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:11
+msgid "Click to change account's password"
+msgstr "Tryk for at ændre kontoens adgangskode"
+
+#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:12
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+"Tryk for at forespørge om autorisering for alle kontakter af en anden konto"
+
+#: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:13
+msgid "Connection"
+msgstr "Tilslutning"
+
+#: ../data/glade/account_modification_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:15
+msgid "Edit Personal Information..."
+msgstr "Redigere Personlig Information..."
+
+#. No configured account
+#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:6 ../src/notify.py:471
+#: ../src/notify.py:493 ../src/notify.py:505 ../src/common/helpers.py:964
+#: ../src/common/helpers.py:976
+msgid "Gajim"
+msgstr "Gajim"
+
+#. General group cannot be changed
+#: ../data/glade/account_modification_window.glade.h:17
+#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/zeroconf_properties_window.glade.h:7
+#: ../src/roster_window.py:359 ../src/roster_window.py:624
+#: ../src/roster_window.py:1360 ../src/roster_window.py:1728
+#: ../src/roster_window.py:2111 ../src/roster_window.py:2627
+#: ../src/roster_window.py:2745 ../src/common/contacts.py:309
+msgid "General"
+msgstr "General"
+
+#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:20
+msgid "Hostname: "
+msgstr "Værtsnavn:"
+
+#: ../data/glade/account_modification_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:21
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Hvis valgt vil Gajim rundsende flere IP adresser udover din egen IP adresse, "
+"filoverførsler har en større chance for at lykkes."
+
+#: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/accounts_window.glade.h:23
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Hvis valgt vil Gajim sende hold-i-live pakker for at forhindre at "
+"tilslutningen afbrydes pga et tidsudløb"
+
+#: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/accounts_window.glade.h:24
+#: ../data/glade/zeroconf_properties_window.glade.h:8
+msgid ""
+"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+"permission only for you"
+msgstr ""
+"Hvis valgt vil Gajim gemme adgangskoden i ~/.gajim/config med læse "
+"rettigheder kun for dig"
+
+#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/accounts_window.glade.h:25
+#: ../data/glade/zeroconf_properties_window.glade.h:9
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Hvis valgt vil Gajim vil Gajim, når den startes, automatisk tilslutte sig "
+"til jabber med denne konto"
+
+#: ../data/glade/account_modification_window.glade.h:24
+#: ../data/glade/accounts_window.glade.h:26
+#: ../data/glade/zeroconf_properties_window.glade.h:10
+msgid ""
+"If checked, any change to the global status (handled by the combobox at the "
+"bottom of the roster window) will change the status of this account "
+"accordingly"
+msgstr ""
+"Hvis valgt vil en hvilket som helst ændring til den globale status "
+"(håndteret med kombinationsfeltet i bunden af kontaktvinduet) ændre status "
+"på denne konto"
+
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/accounts_window.glade.h:29
+msgid "Information about you, as stored in the server"
+msgstr "Information om dig, som er gemt på serveren"
+
+#: ../data/glade/account_modification_window.glade.h:27
+#: ../data/glade/accounts_window.glade.h:34
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1524
+#: ../src/config.py:2010
+msgid "No key selected"
+msgstr "Ingen nøgle er valgt"
+
+#. None means no proxy profile selected
+#. GPG Key
+#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:32 ../src/config.py:1110
+#: ../src/config.py:1181 ../src/config.py:1430 ../src/config.py:1435
+#: ../src/config.py:1906 ../src/config.py:1993 ../src/config.py:2009
+#: ../src/config.py:3109 ../src/config.py:3155 ../src/dialogs.py:286
+#: ../src/dialogs.py:288 ../src/roster_window.py:1832
+#: ../src/roster_window.py:1839 ../src/roster_window.py:1846
+msgid "None"
+msgstr "Ingen"
+
+#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/accounts_window.glade.h:37
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/zeroconf_properties_window.glade.h:17
+msgid "Personal Information"
+msgstr "Personlig Information"
+
+#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:38
+msgid "Port: "
+msgstr "Port: "
+
+#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:39
+msgid "Priori_ty:"
+msgstr "Priori_tet:"
+
+#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:40
+msgid ""
+"Priority is used in Jabber to determine who gets the events from the jabber "
+"server when two or more clients are connected using the same account; The "
+"client with the highest priority gets the events"
+msgstr ""
+"Prioritet er brugt i Jabber for at bestemme hvem som får hændelser fra "
+"jabber serveren når to eller flere klienter er tilsluttet med den samme "
+"konto: Klienten med den højeste prioritet får hændelserne"
+
+#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/accounts_window.glade.h:41
+msgid "Priority will change automatically according to your status."
+msgstr "Prioritet vil automatisk ændres ifølge din status."
+
+#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:42
+msgid "Proxy:"
+msgstr "Proxy:"
+
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/accounts_window.glade.h:44
+msgid "Resour_ce:"
+msgstr "Ressour_ce:"
+
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/accounts_window.glade.h:45
+msgid ""
+"Resource is sent to the Jabber server in order to separate the same JID in "
+"two or more parts depending on the number of the clients connected in the "
+"same server with the same account. So you might be connected in the same "
+"account with resource 'Home' and 'Work' at the same time. The resource which "
+"has the highest priority will get the events. (see below)"
+msgstr ""
+"Ressource bliver sendt til Jabber serveren for at separere den samme JID i "
+"to eller flere dele afhængig af antallet klienter som tilsluttet til den "
+"samme server med den samme konto. Det vil sige du kan være tilsluttet med "
+"denne samme konto med ressourcerne 'Hjemme' og 'Arbejde' på den samme tid. "
+"Ressourcen med den højeste prioritet vil få hændelserne. (se under)"
+
+#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/accounts_window.glade.h:46
+#: ../data/glade/zeroconf_properties_window.glade.h:18
+msgid "Save _passphrase (insecure)"
+msgstr "Gem _pgp-løsen (ikke sikkert)"
+
+#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:47
+#: ../data/glade/zeroconf_properties_window.glade.h:19
+msgid "Save conversation _logs for all contacts"
+msgstr "Gem konversations _logger for alle kontakter"
+
+#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:49
+msgid "Send keep-alive packets"
+msgstr "Send hold-i-live pakker"
+
+#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:50
+#: ../data/glade/zeroconf_properties_window.glade.h:20
+msgid "Synch_ronize account status with global status"
+msgstr "Synk_roniser konto status med global status"
+
+#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/synchronise_select_account_dialog.glade.h:2
+msgid "Synchronise contacts"
+msgstr "Synkroniser kontakter"
+
+#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/accounts_window.glade.h:52
+msgid "Use _SSL (legacy)"
+msgstr "Brug _SSL (gammel type)"
+
+#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:55
+msgid "Use file transfer proxies"
+msgstr "Brug fil transport proxy"
+
+#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:56
+msgid "_Adjust to status"
+msgstr "_Tilpas til status"
+
+#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
+
+#: ../data/glade/account_modification_window.glade.h:49
+msgid "_Name:"
+msgstr "_Navn:"
+
+#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "Epost:"
+
+#. XML Console enable checkbutton
+#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Aktiver"
+
+#: ../data/glade/accounts_window.glade.h:17
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+msgid "First Name:"
+msgstr "Fornavn:"
+
+#: ../data/glade/accounts_window.glade.h:27
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+"Hvis den standard port der bruges til indkomne beskeder ikke passer dig "
+"eller\n"
+"din opsætning kan du vælge en anden her.\n"
+"Du bør også ændre opsætning tilsvarende på en evt. brandmur."
+
+#: ../data/glade/accounts_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:453
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/glade/accounts_window.glade.h:31
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+msgid "Last Name:"
+msgstr "Efternavn:"
+
+#: ../data/glade/accounts_window.glade.h:33
+msgid "Mer_ge accounts"
+msgstr "Fle_t kontoer"
+
+#. Rename
+#: ../data/glade/accounts_window.glade.h:43 ../src/roster_window.py:2697
+msgid "Re_name"
+msgstr "Om_døb"
+
+#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+msgid "Use custom port:"
+msgstr "Brug personlig port:"
+
+#: ../data/glade/accounts_window.glade.h:59
+msgid "gtk-add"
+msgstr "gtk-tilføj"
+
+#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/features_window.glade.h:4
+msgid "gtk-close"
+msgstr "gtk-luk"
+
+#: ../data/glade/accounts_window.glade.h:61
+msgid "gtk-remove"
+msgstr "gtk-fjern"
+
+#: ../data/glade/add_new_contact_window.glade.h:1
+msgid "A_ccount:"
+msgstr "K_onto:"
+
+#: ../data/glade/add_new_contact_window.glade.h:2
+msgid "A_llow this contact to view my status"
+msgstr "Ti_llad denne kontakt at se min status"
+
+#: ../data/glade/add_new_contact_window.glade.h:3
+msgid "Add New Contact"
+msgstr "Tilføj Ny Kontakt"
+
+#: ../data/glade/add_new_contact_window.glade.h:4
+msgid "I would like to add you to my contact list."
+msgstr "Jeg vil gerne tilføje dig til min kontakt liste."
+
+#: ../data/glade/add_new_contact_window.glade.h:5
+msgid ""
+"You have to register with this transport\n"
+"to be able to add a contact from this\n"
+"protocol. Click on register button to\n"
+"proceed."
+msgstr ""
+"Du må registrere dig for denne transport\n"
+"for at være i stand til at tilføje kontakter fra denne\n"
+"protokol. Klik på registrer knappen for at\n"
+"fortsætte."
+
+#: ../data/glade/add_new_contact_window.glade.h:9
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+msgstr ""
+"Du må være tilsluttet til transporten for at kunne\n"
+"tilføje en kontakt for denne protokol."
+
+#: ../data/glade/add_new_contact_window.glade.h:11
+msgid "_Group:"
+msgstr "_Gruppe:"
+
+#: ../data/glade/add_new_contact_window.glade.h:12
+msgid "_Nickname:"
+msgstr "_Kælenavn:"
+
+#: ../data/glade/add_new_contact_window.glade.h:13
+msgid "_Protocol:"
+msgstr "_Protokol:"
+
+#: ../data/glade/add_new_contact_window.glade.h:14
+msgid "_Register"
+msgstr "Kan _registreres"
+
+#: ../data/glade/add_new_contact_window.glade.h:15
+msgid "_User ID:"
+msgstr "_Bruger ID:"
+
+#: ../data/glade/adhoc_commands_window.glade.h:1
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>En fejl er opstået:</b>"
+
+#: ../data/glade/adhoc_commands_window.glade.h:2
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Vælg kommando som skal udføres:</b>"
+
+#: ../data/glade/adhoc_commands_window.glade.h:3
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc Kommandoer - Gajim"
+
+#: ../data/glade/adhoc_commands_window.glade.h:4
+msgid "Check once more"
+msgstr "Kontroller en gang til"
+
+#: ../data/glade/adhoc_commands_window.glade.h:5
+msgid "Error description..."
+msgstr "Fejl beskrivelse..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:6
+msgid "Please wait while retrieving command list..."
+msgstr "Vent mens kommandolisten bliver modtaget..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:7
+msgid "Please wait while the command is sending..."
+msgstr "Vent mens kommandoen bliver sendt..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:8
+msgid "Please wait..."
+msgstr "Vent venligst..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:9
+msgid "This jabber entity does not expose any commands."
+msgstr "Denne jabber enhed eksponerer ikke nogen kommandoer."
+
+#: ../data/glade/advanced_configuration_window.glade.h:1
+#: ../data/glade/features_window.glade.h:1
+msgid "<b>Description</b>"
+msgstr "<b>Beskrivelse</b>"
+
+#: ../data/glade/advanced_configuration_window.glade.h:2
+msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+msgstr ""
+"<b>NOTE:</b> Du skal genstarte Gajim for at nogle af ændringerne kan træde i "
+"kraft"
+
+#: ../data/glade/advanced_configuration_window.glade.h:3
+msgid "Advanced Configuration Editor"
+msgstr "Avanceret Konfigurations Behandler"
+
+#: ../data/glade/advanced_configuration_window.glade.h:4
+msgid "Filter:"
+msgstr "Filter:"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:1
+msgid "Delete MOTD"
+msgstr "Slet MOTD"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:2
+msgid "Deletes Message of the Day"
+msgstr "Slet Dagens Besked"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:3
+msgid "Edit _Privacy Lists..."
+msgstr "Rediger _Privatlivs Liste..."
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:4
+msgid "Sends a message to users currently connected to this server"
+msgstr "Send en besked til brugere som er tilsluttet denne server"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:5
+msgid "Set MOTD..."
+msgstr "Sæt MOTD..."
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:6
+msgid "Sets Message of the Day"
+msgstr "Sæt Dagens Besked"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:7
+msgid "Show _XML Console"
+msgstr "Vis _XML Konsol"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:8
+msgid "Update MOTD..."
+msgstr "Opdater MOTD..."
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:9
+msgid "Updates Message of the Day"
+msgstr "Opdater Dagens Besked"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:10
+msgid "_Administrator"
+msgstr "_Administrator"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:11
+msgid "_Send Server Message..."
+msgstr "_Send Server Besked..."
+
+#: ../data/glade/advanced_notifications_window.glade.h:1
+msgid " a window/tab opened with that contact "
+msgstr "et vindue/faneblad åbnede med denne kontakt "
+
+#: ../data/glade/advanced_notifications_window.glade.h:2
+msgid "<b>Actions</b>"
+msgstr "<b>Handlinger</b>"
+
+#: ../data/glade/advanced_notifications_window.glade.h:3
+msgid "<b>Conditions</b>"
+msgstr "<b>Betingelser</b>"
+
+#: ../data/glade/advanced_notifications_window.glade.h:4
+#: ../data/glade/preferences_window.glade.h:12
+msgid "<b>Sounds</b>"
+msgstr "<b>Lyde</b>"
+
+#: ../data/glade/advanced_notifications_window.glade.h:5
+msgid "Advanced Actions"
+msgstr "Avancerede Handlinger"
+
+#: ../data/glade/advanced_notifications_window.glade.h:6
+msgid "Advanced Notifications Control"
+msgstr "Avanceret Påmindelses Kontrol"
+
+#: ../data/glade/advanced_notifications_window.glade.h:7
+msgid "All statuses"
+msgstr "Status For Alle"
+
+#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../src/common/commands.py:91 ../src/common/helpers.py:246
+msgid "Away"
+msgstr "Borte"
+
+#: ../data/glade/advanced_notifications_window.glade.h:9
+msgid "Busy "
+msgstr "Travlt "
+
+#: ../data/glade/advanced_notifications_window.glade.h:10
+msgid "Don't have "
+msgstr "Har ikke"
+
+#: ../data/glade/advanced_notifications_window.glade.h:11
+msgid "Have "
+msgstr "Har"
+
+#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../src/common/helpers.py:256
+msgid "Invisible"
+msgstr "Usynlig"
+
+#: ../data/glade/advanced_notifications_window.glade.h:13
+msgid "Launch a command"
+msgstr "Kør en kommando"
+
+#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../src/common/helpers.py:229
+msgid "Not Available"
+msgstr "Ikke Tilgængelig"
+
+#: ../data/glade/advanced_notifications_window.glade.h:15
+msgid "One or more special statuses..."
+msgstr "En eller flere specielle statuser..."
+
+#: ../data/glade/advanced_notifications_window.glade.h:16
+msgid "Online / Free For Chat"
+msgstr "På net / Klar For Samtale"
+
+#: ../data/glade/advanced_notifications_window.glade.h:17
+msgid "Play a sound"
+msgstr "Spil en lyd"
+
+#: ../data/glade/advanced_notifications_window.glade.h:18
+msgid ""
+"Receive a Message\n"
+"Contact Disconnected \n"
+"Contact Change Status \n"
+"Group Chat Message Highlight \n"
+"Group Chat Message Received \n"
+"File Transfer Request \n"
+"File Transfer Started \n"
+"File Transfer Finished"
+msgstr ""
+"Modtag en Besked\n"
+"Kontakt Ikke Tilsluttet \n"
+"Kontakt Ændrede Status \n"
+"Gruppe Samtale Besked Fremhævelse \n"
+"Gruppe Samtale Besked Modtaget \n"
+"Fil Overførsel Forespørgsel \n"
+"Fil Overførsel Er Startet \n"
+"Fil Overførsel Er Sluttet"
+
+#: ../data/glade/advanced_notifications_window.glade.h:26
+msgid "When "
+msgstr "Når "
+
+#: ../data/glade/advanced_notifications_window.glade.h:27
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+msgstr ""
+"_Aktiver vindueshåndteringens ViktigFif for at få samtale vinduet til at "
+"blinke i opgavelinjen"
+
+#: ../data/glade/advanced_notifications_window.glade.h:28
+msgid "_Disable auto opening chat window"
+msgstr "_Deaktivér automatisk åbning af samtale vindue"
+
+#: ../data/glade/advanced_notifications_window.glade.h:29
+msgid "_Disable existing popup window"
+msgstr "_Deaktivér eksisterende pop op vinduer"
+
+#: ../data/glade/advanced_notifications_window.glade.h:30
+msgid "_Disable existing sound for this event"
+msgstr "_Deaktivér nuværende lyd for denne hændelse"
+
+#: ../data/glade/advanced_notifications_window.glade.h:31
+msgid "_Disable showing event in roster"
+msgstr "_Deaktivér visning af hændelse i kontaktvinduet"
+
+#: ../data/glade/advanced_notifications_window.glade.h:32
+msgid "_Disable showing event in systray"
+msgstr "_Deaktivér visning af hændelse i systembakken"
+
+#: ../data/glade/advanced_notifications_window.glade.h:33
+msgid "_Inform me with a popup window"
+msgstr "_Informer mig med et pop op vindue"
+
+#: ../data/glade/advanced_notifications_window.glade.h:34
+msgid "_Open chat window with user"
+msgstr "_Åbn samtale vindue med bruger"
+
+#: ../data/glade/advanced_notifications_window.glade.h:35
+msgid "_Show event in roster"
+msgstr "_Vis hændelse i kontaktvindue"
+
+#: ../data/glade/advanced_notifications_window.glade.h:36
+msgid "_Show event in systray"
+msgstr "_Vis hændelse i systembakken"
+
+#: ../data/glade/advanced_notifications_window.glade.h:37
+msgid "and I "
+msgstr "og jeg "
+
+#: ../data/glade/advanced_notifications_window.glade.h:38
+msgid ""
+"contact(s)\n"
+"group(s)\n"
+"everybody"
+msgstr ""
+"kontakt(er)\n"
+"gruppe(r)\n"
+"alle"
+
+#: ../data/glade/advanced_notifications_window.glade.h:41
+msgid "for "
+msgstr "for "
+
+#: ../data/glade/advanced_notifications_window.glade.h:42
+msgid "when I'm in"
+msgstr "når jeg er i"
+
+#: ../data/glade/atom_entry_window.glade.h:1
+msgid "Entry:"
+msgstr "Indgang:"
+
+#: ../data/glade/atom_entry_window.glade.h:2
+msgid "Feed name:"
+msgstr "Feed navn:"
+
+#: ../data/glade/atom_entry_window.glade.h:3
+msgid "Last modified:"
+msgstr "Sidst ændret:"
+
+#: ../data/glade/atom_entry_window.glade.h:4
+msgid "New entry received"
+msgstr "Ny hændelse modtaget"
+
+#: ../data/glade/atom_entry_window.glade.h:5
+msgid "You have received new entry:"
+msgstr "Du har modtaget en ny hændelse:"
+
+#: ../data/glade/blocked_contacts_window.glade.h:1
+msgid "Blocked Contacts"
+msgstr "Blokerede Kontakter"
+
+#: ../data/glade/change_password_dialog.glade.h:1
+msgid "Change Password"
+msgstr "Ændre Adgangskode"
+
+#: ../data/glade/change_password_dialog.glade.h:2
+msgid "Enter it again for confirmation:"
+msgstr "Skriv adgangskoden igen for at bekræfte:"
+
+#: ../data/glade/change_password_dialog.glade.h:3
+msgid "Enter new password:"
+msgstr "Skriv en ny adgangskode:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:1
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Skriv din nye status besked</b>"
+
+#: ../data/glade/change_status_message_dialog.glade.h:2
+msgid "Preset messages:"
+msgstr "Forvalgte beskeder:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:3
+msgid "Save as Preset..."
+msgstr "Gem som Forvalgt..."
+
+#: ../data/glade/chat_context_menu.glade.h:1
+msgid "Join _Group Chat"
+msgstr "Bliv med i en _Gruppe Samtale"
+
+#: ../data/glade/chat_context_menu.glade.h:2
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+msgid "_Add to Roster..."
+msgstr "_Tilføj til Kontaktliste..."
+
+#: ../data/glade/chat_context_menu.glade.h:3
+msgid "_Copy JID/Email Address"
+msgstr "_Kopier JID/E-post Adresse"
+
+#: ../data/glade/chat_context_menu.glade.h:4
+msgid "_Copy Link Location"
+msgstr "_Kopier Henvisning"
+
+#: ../data/glade/chat_context_menu.glade.h:5
+msgid "_Open Email Composer"
+msgstr "_Åbn E-post Program"
+
+#: ../data/glade/chat_context_menu.glade.h:6
+msgid "_Open Link in Browser"
+msgstr "_Åbn Henvisning i Netlæser"
+
+#: ../data/glade/chat_context_menu.glade.h:7
+#: ../data/glade/subscription_request_popup_menu.glade.h:1
+#: ../data/glade/systray_context_menu.glade.h:7
+msgid "_Start Chat"
+msgstr "_Start Samtale"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:1
+msgid "Click to see past conversations with this contact"
+msgstr "Klik for at se tidligere samtaler med denne kontakt"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:2
+msgid "Invite _Friends"
+msgstr "Inviter _Venner"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:3
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
+msgid "Send _File"
+msgstr "Send _Fil"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:4
+msgid "Toggle End to End Encryption"
+msgstr "Slå til/fra ende til ende Kryptering"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:5
+msgid "Toggle Open_PGP Encryption"
+msgstr "Slå til/fra Open_PGP Kryptering"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Tilføj til Kontaktliste"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:7
+#: ../data/glade/gc_control_popup_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:2566
+msgid "_History"
+msgstr "_Historie"
+
+#: ../data/glade/chat_to_muc_window.glade.h:1
+msgid "In_vite"
+msgstr "In_viter"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends !"
+msgstr "Inviter Venner !"
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+msgid "MUC server"
+msgstr "MUC server"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr "Vælg en MUC server."
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+"Du er ved at begynde en Multibruger samtale.\n"
+"Vælg de kontakter du vil invitere"
+
+#: ../data/glade/data_form_window.glade.h:1
+msgid "Fill in the form."
+msgstr "Udfyld formen."
+
+#: ../data/glade/data_form_window.glade.h:2
+msgid "Room Configuration"
+msgstr "Rum Konfigurering"
+
+#: ../data/glade/edit_groups_dialog.glade.h:1
+msgid "Edit Groups"
+msgstr "Rediger Grupper"
+
+#: ../data/glade/features_window.glade.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr "<b>Liste over mulige egenskaber i Gajim:</b> "
+
+#: ../data/glade/features_window.glade.h:3
+msgid "Features"
+msgstr "Egenskaber"
+
+#: ../data/glade/filetransfers.glade.h:1
+msgid "A list of active, completed and stopped file transfers"
+msgstr "En liste over aktive, færdige og stoppede filoverførsler"
+
+#: ../data/glade/filetransfers.glade.h:2
+msgid "Cancel file transfer"
+msgstr "Annuller filoverførsel"
+
+#: ../data/glade/filetransfers.glade.h:3
+msgid "Cancels the selected file transfer"
+msgstr "Annullerer den valgte filoverførsel"
+
+#: ../data/glade/filetransfers.glade.h:4
+msgid "Cancels the selected file transfer and removes incomplete file"
+msgstr "Annullerer den valgte filoverførsel og fjerner den ikke fuldførte fil"
+
+#: ../data/glade/filetransfers.glade.h:5
+msgid "Clean _up"
+msgstr "Ryd _op"
+
+#: ../data/glade/filetransfers.glade.h:6
+msgid "File Transfers"
+msgstr "Filoverførsler"
+
+#: ../data/glade/filetransfers.glade.h:7
+msgid "Hides the window"
+msgstr "Skjuler vinduet"
+
+#: ../data/glade/filetransfers.glade.h:8
+msgid "Remove file transfer from the list."
+msgstr "Fjern filoverførsler fra listen."
+
+#: ../data/glade/filetransfers.glade.h:9
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr "Fjerner færdige, annullerede og mislykkede filoverførsler fra listen"
+
+#: ../data/glade/filetransfers.glade.h:10
+msgid "Shows a list of file transfers between you and others"
+msgstr "Viser en liste over filoverførsler mellem dig og andre"
+
+#: ../data/glade/filetransfers.glade.h:11
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
+msgstr ""
+"Denne handling fjerner en enkelt filoverførsel fra listen. Hvis overførslen "
+"er i gang, bliver den først stoppet og derefter fjernet"
+
+#: ../data/glade/filetransfers.glade.h:12
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Når en filoverførsel er færdig, vis en pop op påmindelse"
+
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:774
+msgid "_Continue"
+msgstr "_Fortsæt"
+
+#: ../data/glade/filetransfers.glade.h:14
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Påmind mig når en filoverførsel er færdig"
+
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:186
+msgid "_Open Containing Folder"
+msgstr "_Åbn folderen med filen"
+
+#: ../data/glade/filetransfers.glade.h:16
+msgid "_Pause"
+msgstr "_Pause"
+
+#: ../data/glade/filetransfers.glade.h:17
+msgid "file transfers list"
+msgstr "filoverførsel liste"
+
+#: ../data/glade/gajim_themes_window.glade.h:1
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Samtalestatus Fane Farver</b>"
+
+#: ../data/glade/gajim_themes_window.glade.h:2
+msgid ""
+"Account row\n"
+"Group row\n"
+"Contact row\n"
+"Chat Banner"
+msgstr ""
+"Konto række\n"
+"Gruppe række\n"
+"Kontakt række\n"
+"Samtale Banner"
+
+#: ../data/glade/gajim_themes_window.glade.h:6
+msgid "Bold"
+msgstr "Fed"
+
+#: ../data/glade/gajim_themes_window.glade.h:7
+msgid "Composing"
+msgstr "Komponere"
+
+#: ../data/glade/gajim_themes_window.glade.h:8
+msgid "Font style:"
+msgstr "Font stil:"
+
+#: ../data/glade/gajim_themes_window.glade.h:9
+msgid "Gajim Themes Customization"
+msgstr "Gajim Tema Tilpasning"
+
+#: ../data/glade/gajim_themes_window.glade.h:10
+msgid "Gone"
+msgstr "Borte"
+
+#: ../data/glade/gajim_themes_window.glade.h:11
+msgid "Inactive"
+msgstr "Ikke aktiv"
+
+#: ../data/glade/gajim_themes_window.glade.h:12
+msgid "Italic"
+msgstr "Kursiv"
+
+#: ../data/glade/gajim_themes_window.glade.h:13
+msgid ""
+"MUC\n"
+"Messages"
+msgstr ""
+"MUC\n"
+"Beskeder"
+
+#: ../data/glade/gajim_themes_window.glade.h:15
+msgid ""
+"MUC Directed\n"
+"Messages"
+msgstr ""
+"MUC Sendte\n"
+"Meldinger"
+
+#: ../data/glade/gajim_themes_window.glade.h:17
+msgid "Paused"
+msgstr "Sat på pause"
+
+#: ../data/glade/gajim_themes_window.glade.h:18
+msgid "Text _color:"
+msgstr "Tekst _farve:"
+
+#: ../data/glade/gajim_themes_window.glade.h:19
+msgid "Text _font:"
+msgstr "Tekst _font:"
+
+#: ../data/glade/gajim_themes_window.glade.h:20
+msgid "_Background:"
+msgstr "_Baggrund:"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:1
+msgid "Change _Nickname..."
+msgstr "Ændre _Kælenavn..."
+
+#: ../data/glade/gc_control_popup_menu.glade.h:2
+msgid "Change _Subject..."
+msgstr "Ændre _Emne..."
+
+#: ../data/glade/gc_control_popup_menu.glade.h:3
+msgid "Click to see past conversation in this room"
+msgstr "Klik for at se tidligere samtaler i dette rum"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:4
+msgid "Configure _Room..."
+msgstr "Tilpas _Rum..."
+
+#: ../data/glade/gc_control_popup_menu.glade.h:5
+msgid "_Bookmark"
+msgstr "_Bogmærke"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+msgid "_Destroy Room"
+msgstr "_Slet rum"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:8
+msgid "_Manage Room"
+msgstr "Håndter Ru_m"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:9
+msgid "_Minimize on close"
+msgstr "_Minimer ved lukning"
+
+#: ../data/glade/gc_occupants_menu.glade.h:1
+msgid "Mo_derator"
+msgstr "Or_dstyrer"
+
+#: ../data/glade/gc_occupants_menu.glade.h:2
+msgid "Occupant Actions"
+msgstr "Beboer Handlinger"
+
+#: ../data/glade/gc_occupants_menu.glade.h:5
+msgid "_Admin"
+msgstr "_Administrator"
+
+#: ../data/glade/gc_occupants_menu.glade.h:6
+msgid "_Ban"
+msgstr "_Udvis"
+
+#: ../data/glade/gc_occupants_menu.glade.h:8
+msgid "_Kick"
+msgstr "_Kast ud"
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
+msgid "_Member"
+msgstr "_Medlem"
+
+#: ../data/glade/gc_occupants_menu.glade.h:10
+msgid "_Owner"
+msgstr "_Ejer"
+
+#: ../data/glade/gc_occupants_menu.glade.h:11
+msgid "_Send Private Message"
+msgstr "_Send en Privat Besked"
+
+#: ../data/glade/gc_occupants_menu.glade.h:12
+msgid "_Voice"
+msgstr "_Stemme"
+
+#: ../data/glade/groups_post_window.glade.h:1
+msgid "Create new post"
+msgstr "Lav en ny post"
+
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:271
+msgid "From"
+msgstr "Fra"
+
+#. holds subject
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:142
+#: ../src/history_manager.py:173
+msgid "Subject"
+msgstr "Emne"
+
+#: ../data/glade/history_manager.glade.h:1
+msgid ""
+"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
+"\n"
+"You can select logs from the left and/or search database from below.\n"
+"\n"
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
+msgstr ""
+"<big><b>Velkommen til Gajim Historie Log Håndterer</b><big>\n"
+"\n"
+"Du kan vælge logger til venstre og/eller søge i databasen under.\n"
+"\n"
+"<b>ADVARSEL:</b>\n"
+"Hvis du planlægger at gøre massive sletninger, vær sikker på at Gajim ikke "
+"kører. \n"
+"Generelt undgå at slette logger fra kontakter du samtidig snakker med."
+
+#: ../data/glade/history_manager.glade.h:7
+msgid "Delete"
+msgstr "Slet"
+
+#: ../data/glade/history_manager.glade.h:8
+msgid "Export"
+msgstr "Eksporter"
+
+#: ../data/glade/history_manager.glade.h:9
+msgid "Gajim History Logs Manager"
+msgstr "Gajim Loghistorie Håndterer"
+
+#: ../data/glade/history_manager.glade.h:10
+msgid "_Search Database"
+msgstr "_Søge Database"
+
+#: ../data/glade/history_window.glade.h:1
+msgid "Build custom query"
+msgstr "Byg tilpasset forespørgsel"
+
+#: ../data/glade/history_window.glade.h:2
+msgid "Conversation History"
+msgstr "Samtale Historie"
+
+#: ../data/glade/history_window.glade.h:3
+msgid "Query Builder..."
+msgstr "Forespørgsel Bygger..."
+
+#: ../data/glade/history_window.glade.h:4
+#: ../data/glade/search_window.glade.h:2
+msgid "Search"
+msgstr "Søg"
+
+#: ../data/glade/history_window.glade.h:5
+#: ../data/glade/zeroconf_information_window.glade.h:10
+msgid "_Log conversation history"
+msgstr "_Log samtale historie"
+
+#: ../data/glade/history_window.glade.h:6
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1172
+msgid "_Search"
+msgstr "_Søg"
+
+#: ../data/glade/invitation_received_dialog.glade.h:1
+msgid "Accept"
+msgstr "Godkend"
+
+#: ../data/glade/invitation_received_dialog.glade.h:2
+#: ../data/glade/privacy_list_window.glade.h:8
+msgid "Deny"
+msgstr "Nægt"
+
+#: ../data/glade/invitation_received_dialog.glade.h:3
+msgid "Invitation Received"
+msgstr "Invitation Modtaget"
+
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1265
+msgid "Join Group Chat"
+msgstr "Bliv med i en Gruppe Samtale"
+
+#: ../data/glade/join_groupchat_window.glade.h:2
+msgid "Join this room automatically when I connect"
+msgstr "Bliv med i dette rum automatisk når jeg tilsutter"
+
+#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:31
+msgid "Nickname:"
+msgstr "Kælenavn:"
+
+#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/manage_bookmarks_window.glade.h:6
+msgid "Password:"
+msgstr "Adgangskode:"
+
+#: ../data/glade/join_groupchat_window.glade.h:5
+msgid "Recently:"
+msgstr "For nylig:"
+
+#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:8
+msgid "Room:"
+msgstr "Rum:"
+
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1160
+#: ../src/disco.py:1615
+msgid "_Join"
+msgstr "_Bliv med:"
+
+#: ../data/glade/manage_accounts_window.glade.h:1
+msgid "Manage Accounts"
+msgstr "Håndter Kontoer"
+
+#: ../data/glade/manage_bookmarks_window.glade.h:1
+msgid "Auto join"
+msgstr "Bliv automatisk med"
+
+#: ../data/glade/manage_bookmarks_window.glade.h:2
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "Hvis valgt vil Gajim deltage i denne gruppe samtale ved start"
+
+#: ../data/glade/manage_bookmarks_window.glade.h:3
+msgid "Manage Bookmarks"
+msgstr "Håndter Bogmærker"
+
+#: ../data/glade/manage_bookmarks_window.glade.h:4
+msgid "Minimize on Auto Join"
+msgstr "Minimer ved Automatisk Deltagelse"
+
+#: ../data/glade/manage_bookmarks_window.glade.h:7
+msgid "Print status:"
+msgstr "Skriv status:"
+
+#: ../data/glade/manage_bookmarks_window.glade.h:9
+msgid "Server:"
+msgstr "Server:"
+
+#: ../data/glade/manage_bookmarks_window.glade.h:10
+msgid "Title:"
+msgstr "Titel:"
+
+#: ../data/glade/manage_proxies_window.glade.h:1
+msgid "<b>Properties</b>"
+msgstr "<b>Egenskaber</b>"
+
+#: ../data/glade/manage_proxies_window.glade.h:2
+msgid "<b>Settings</b>"
+msgstr "<b>Opsætning</b>"
+
+#: ../data/glade/manage_proxies_window.glade.h:3
+msgid ""
+"HTTP Connect\n"
+"SOCKS5"
+msgstr ""
+"HTTP Tilslutning\n"
+"SOCKS5"
+
+#: ../data/glade/manage_proxies_window.glade.h:5
+msgid "Manage Proxy Profiles"
+msgstr "Håndter Proxy Profiler"
+
+#: ../data/glade/manage_proxies_window.glade.h:6
+#: ../data/glade/profile_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:30
+msgid "Name:"
+msgstr "Navn:"
+
+#: ../data/glade/manage_proxies_window.glade.h:7
+msgid "Pass_word:"
+msgstr "Adgangs_kode"
+
+#: ../data/glade/manage_proxies_window.glade.h:8
+msgid "Type:"
+msgstr "Type:"
+
+#: ../data/glade/manage_proxies_window.glade.h:9
+msgid "Use authentication"
+msgstr "Brug Godkendelse"
+
+#: ../data/glade/manage_proxies_window.glade.h:10
+msgid "_Host:"
+msgstr "_Værtsmaskine:"
+
+#: ../data/glade/message_window.glade.h:1
+msgid "Click to insert an emoticon (Alt+M)"
+msgstr "Klik for at indsætte et følelsesikon (Alt+M)"
+
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1212
+msgid "OpenPGP Encryption"
+msgstr "OpenPGP Kryptering"
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:4
+#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/subscription_request_window.glade.h:6
+msgid "_Actions"
+msgstr "_Handlinger"
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:6
+#: ../data/glade/xml_console_window.glade.h:11
+#: ../src/filetransfers_window.py:243
+msgid "_Send"
+msgstr "_Send"
+
+#: ../data/glade/passphrase_dialog.glade.h:1
+msgid "Passphrase"
+msgstr "PGP-løsen"
+
+#: ../data/glade/preferences_window.glade.h:1
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Avanceret Konfigurations Behandler</b>"
+
+#: ../data/glade/preferences_window.glade.h:2
+msgid "<b>Applications</b>"
+msgstr "<b>Programmer</b>"
+
+#: ../data/glade/preferences_window.glade.h:3
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Samtale udseende</b>"
+
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:5
+msgid "<b>Custom</b>"
+msgstr "<b>Tilpasset Opsætning</b>"
+
+#: ../data/glade/preferences_window.glade.h:6
+msgid "<b>Format of a line</b>"
+msgstr "<b>Format for en linje</b>"
+
+#: ../data/glade/preferences_window.glade.h:7
+msgid "<b>GMail Options</b>"
+msgstr "<b>GMail Indstillinger</b>"
+
+#: ../data/glade/preferences_window.glade.h:9
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Nuværende Status Beskeder</b>"
+
+#: ../data/glade/preferences_window.glade.h:10
+msgid "<b>Privacy</b>"
+msgstr "<b>Privatliv</b>"
+
+#: ../data/glade/preferences_window.glade.h:11
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Kontaktvinduets Udseende</b>"
+
+#: ../data/glade/preferences_window.glade.h:13
+msgid "<b>Themes</b>"
+msgstr "<b>Temaer</b>"
+
+#: ../data/glade/preferences_window.glade.h:14
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Synlige Påmindelser</b>"
+
+#: ../data/glade/preferences_window.glade.h:15
+msgid "Advanced"
+msgstr "Avanceret"
+
+#: ../data/glade/preferences_window.glade.h:16
+msgid ""
+"All chat states\n"
+"Composing only\n"
+"Disabled"
+msgstr ""
+"Alle samtale tilstander\n"
+"Kun skrivning\n"
+"Ikke aktiveret"
+
+#: ../data/glade/preferences_window.glade.h:19
+msgid "Allow _OS information to be sent"
+msgstr "Tillad _OS information at blive sendt"
+
+#: ../data/glade/preferences_window.glade.h:20
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr ""
+"Tillad pop op påmindelser når jeg er _borte/ikke tilgængelig/travel/usynlig"
+
+#: ../data/glade/preferences_window.glade.h:21
+msgid "Always check to see if Gajim is the _default Jabber client on startup"
+msgstr "Altid kontroller om Gajim er standard Jabber klient ved start"
+
+#: ../data/glade/preferences_window.glade.h:22
+msgid ""
+"An example: If you have enabled status message for away, Gajim won't ask you "
+"anymore for a status message when you change your status to away; it will "
+"use the default one set here"
+msgstr ""
+"Et eksempel: Hvis du har aktiveret status beskeder for borte status, vil "
+"Gajim ikke spørge dig mere for en status besked når du ændrer din status til "
+"borte; Gajim vil bruge standard beskeden sat her"
+
+#: ../data/glade/preferences_window.glade.h:23
+msgid "Ask status message when I:"
+msgstr "Spørg om status besked når jeg:"
+
+#: ../data/glade/preferences_window.glade.h:24
+msgid "Auto _away after:"
+msgstr "_Automatisk borte efter:"
+
+#: ../data/glade/preferences_window.glade.h:25
+msgid "Auto _not available after:"
+msgstr "Automatisk _ikke tilgængelig efter:"
+
+#: ../data/glade/preferences_window.glade.h:26
+msgid ""
+"Autodetect on every Gajim startup\n"
+"Always use GNOME default applications\n"
+"Always use KDE default applications\n"
+"Always use XFCE4 default applications\n"
+"Custom"
+msgstr ""
+"Automatisk genkend hvergang Gajim starter\n"
+"Altid brug GNOME standard programmer\n"
+"Altid brug KDE standard programmer\n"
+"Altid brug XFCE4 standard programmer\n"
+"Tilpasset"
+
+#: ../data/glade/preferences_window.glade.h:31
+msgid ""
+"Check this option, only if someone you don't have in the roster spams/annoys "
+"you. Use with caution, because it blocks all messages from any contact that "
+"is not in the roster"
+msgstr ""
+"Kun tjek denne valgmulighed hvis nogen du ikke har i kontaktvinduet spammer/"
+"generer\n"
+"dig. Bruges varsomt, fordi den blokerer alle beskeder fra kontakter som \n"
+"ikke er i kontaktvinduet"
+
+#: ../data/glade/preferences_window.glade.h:32
+msgid "Configure color and font of the interface"
+msgstr "Konfigurér farve og skrifttyper for brugergrænsefladen"
+
+#: ../data/glade/preferences_window.glade.h:33
+msgid "Default Status Messages"
+msgstr "Standard Status Beskeder"
+
+#: ../data/glade/preferences_window.glade.h:34
+msgid ""
+"Determined by sender\n"
+"Chat message\n"
+"Single message"
+msgstr ""
+"Bestemt af senderen\n"
+"Samtale besked\n"
+"Enkel besked"
+
+#: ../data/glade/preferences_window.glade.h:37
+msgid "Display _extra email details"
+msgstr "Vis _ekstra e-post detaljer"
+
+#: ../data/glade/preferences_window.glade.h:38
+msgid "Display a_vatars of contacts in roster"
+msgstr "Vis a_vatarer for kontakter i kontaktvinduet"
+
+#: ../data/glade/preferences_window.glade.h:39
+msgid "Display status _messages of contacts in roster"
+msgstr "Vis status _beskeder for kontakter i kontaktvinduet"
+
+#: ../data/glade/preferences_window.glade.h:40
+msgid "Emoticons:"
+msgstr "Følelsesikoner:"
+
+#: ../data/glade/preferences_window.glade.h:41
+msgid "Events"
+msgstr "Hændelser"
+
+#: ../data/glade/preferences_window.glade.h:42
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"display in chat windows."
+msgstr "Gajim kan sende og modtage meta-information relateret til en samtale du har med en kontakt. Her kan du specificere hvilke typer samtalestatus du vil vise i samtalevinduerne."
+
+#: ../data/glade/preferences_window.glade.h:43
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"send to the other party."
+msgstr "Gajim kan sende og modtage meta-information relateret til en samtale du har med en kontakt. Her kan du specificere hvilke typer samtalestatus du vil sende til modparten."
+
+#: ../data/glade/preferences_window.glade.h:44
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr ""
+"Gajim vil påminde dig med et pop op vindue i højre bund af skærmen når en "
+"kontakt logger af"
+
+#: ../data/glade/preferences_window.glade.h:46
+msgid "Hides buttons in chatwindows to "
+msgstr "Skjuler knapperne i gruppesamtale vinduer til "
+
+#: ../data/glade/preferences_window.glade.h:47
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+"Hvis valgt vil Gajim også inkludere information om senderen af den nye e-post"
+
+#: ../data/glade/preferences_window.glade.h:48
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Hvis valgt vil Gajim vise avatarer af kontakter i kontaktvinduet og i gruppe "
+"samtaler"
+
+#: ../data/glade/preferences_window.glade.h:49
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+msgstr "Hvis valgt vil Gajim vise status beskeder af kontakter under kontaktnavnet i kontaktvinduet og i gruppe samtaler"
+
+#: ../data/glade/preferences_window.glade.h:50
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr "Hvis valgt vil Gajim bruge protokol specifikke status ikoner. (F.eks. En kontakt fra MSN vil have det tilsvarende msn ikon for status tilsluttet, borte, Travlt, etc...)"
+
+#: ../data/glade/preferences_window.glade.h:51
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr "Hvis valgt vil Gajim erstatte tekst smileys som denne ':)' med den tilsvarende animerede eller statiske grafiske følelsesikon"
+
+#: ../data/glade/preferences_window.glade.h:52
+msgid "Ignore rich content in incoming messages"
+msgstr "Ignorer rigt indhold i indkommende beskeder"
+
+#: ../data/glade/preferences_window.glade.h:53
+msgid "Ma_nage..."
+msgstr "Hå_ndtere..."
+
+#: ../data/glade/preferences_window.glade.h:54
+msgid ""
+"Never\n"
+"Always\n"
+"Per account\n"
+"Per type"
+msgstr ""
+"Aldrig\n"
+"Altid\n"
+"Per konto\n"
+"Per type"
+
+#: ../data/glade/preferences_window.glade.h:58
+msgid "Notify me about contacts that sign _in"
+msgstr "Påmind mig om kontakter logger _ind"
+
+#: ../data/glade/preferences_window.glade.h:59
+msgid "Notify me about contacts that sign _out"
+msgstr "Påmind mig om kontakter som logger u_d"
+
+#: ../data/glade/preferences_window.glade.h:60
+msgid "Notify on new _GMail email"
+msgstr "Påmind mig ved ny _GMail e-post"
+
+#: ../data/glade/preferences_window.glade.h:61
+msgid "Play _sounds"
+msgstr "Afspil _lyde"
+
+#: ../data/glade/preferences_window.glade.h:62
+msgid ""
+"Pop it up\n"
+"Notify me about it\n"
+"Show only in roster"
+msgstr ""
+"Pop det op\n"
+"Påmind mig om det\n"
+"Hvis kun i kontaktvinduet"
+
+#: ../data/glade/preferences_window.glade.h:65
+msgid "Preferences"
+msgstr "Indstillinger"
+
+#: ../data/glade/preferences_window.glade.h:66
+msgid "Privacy"
+msgstr "Privatliv"
+
+#: ../data/glade/preferences_window.glade.h:67
+msgid "Set status message to reflect currently playing _music track"
+msgstr ""
+"Sæt status besked til at vise det musik nu_mmer du spiller på det pågældende "
+"tidspunkt"
+
+#: ../data/glade/preferences_window.glade.h:68
+msgid "Sign _in"
+msgstr "Logge _ind"
+
+#: ../data/glade/preferences_window.glade.h:69
+msgid "Sign _out"
+msgstr "Log _af"
+
+#: ../data/glade/preferences_window.glade.h:70
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Nogle beskeder kan indeholde rigt indhold (formatering, farver osv.). Hvis valgt\n"
+"vil Gajim kun vise den rå tekst."
+
+#: ../data/glade/preferences_window.glade.h:71
+msgid "Status"
+msgstr "Status"
+
+#: ../data/glade/preferences_window.glade.h:72
+msgid "Status _iconset:"
+msgstr "Status _ikonsæt:"
+
+#: ../data/glade/preferences_window.glade.h:73
+msgid "T_heme:"
+msgstr "T_ema:"
+
+#: ../data/glade/preferences_window.glade.h:74
+msgid "The auto away status message"
+msgstr "Den automatiske status besked for borte"
+
+#: ../data/glade/preferences_window.glade.h:75
+msgid "The auto not available status message"
+msgstr "Den automatiske besked for ikke tilgængelig"
+
+#: ../data/glade/preferences_window.glade.h:76
+msgid "Treat all incoming messages as:"
+msgstr "Behandl alle indkomne beskeder som:"
+
+#: ../data/glade/preferences_window.glade.h:77
+msgid "Use _transports iconsets"
+msgstr "Brug _transporternes ikonsæt"
+
+#: ../data/glade/preferences_window.glade.h:78
+msgid "Use only one message _window:"
+msgstr "Brug kun et samtale _vindue:"
+
+#: ../data/glade/preferences_window.glade.h:79
+msgid "Use system _default"
+msgstr "Brug system stan_dard"
+
+#: ../data/glade/preferences_window.glade.h:80
+msgid "When new event is received:"
+msgstr "Når en ny hændelse er modtaget:"
+
+#: ../data/glade/preferences_window.glade.h:81
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+"Virker for afspiller som Rhythmbox og Muine. For andre afspiller besøg "
+"http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+
+#: ../data/glade/preferences_window.glade.h:82
+msgid "_Advanced Notifications Control..."
+msgstr "Avanceret Påmindelses Kontrol..."
+
+#: ../data/glade/preferences_window.glade.h:83
+msgid "_Browser:"
+msgstr "_Netlæser:"
+
+#: ../data/glade/preferences_window.glade.h:84
+msgid "_Display chat state notifications:"
+msgstr "Vis samtalestatus påmin_delser:"
+
+#: ../data/glade/preferences_window.glade.h:85
+msgid "_File manager:"
+msgstr "_Filhåndterer:"
+
+#: ../data/glade/preferences_window.glade.h:86
+msgid "_Font:"
+msgstr "_Font:"
+
+#: ../data/glade/preferences_window.glade.h:87
+msgid "_Highlight misspelled words"
+msgstr "Frem_hæv stavefejl"
+
+#: ../data/glade/preferences_window.glade.h:88
+msgid "_Ignore events from contacts not in the roster"
+msgstr "_Ignorer hændelser fra kontakter som ikke er i kontaktvinduet"
+
+#: ../data/glade/preferences_window.glade.h:89
+msgid "_Incoming message:"
+msgstr "_Indkommende besked:"
+
+#: ../data/glade/preferences_window.glade.h:90
+msgid "_Log status changes of contacts"
+msgstr "_Log status ændringer hos kontakter"
+
+#: ../data/glade/preferences_window.glade.h:91
+msgid "_Mail client:"
+msgstr "_E-post klient:"
+
+#: ../data/glade/preferences_window.glade.h:92
+msgid "_Make message windows compact"
+msgstr "Gør sa_mtalevinduer kompakte"
+
+#: ../data/glade/preferences_window.glade.h:93
+msgid "_Open..."
+msgstr "_Åbn..."
+
+#: ../data/glade/preferences_window.glade.h:94
+msgid "_Outgoing message:"
+msgstr "_Udgående besked:"
+
+#: ../data/glade/preferences_window.glade.h:95
+msgid "_Player:"
+msgstr "Afs_piller:"
+
+#: ../data/glade/preferences_window.glade.h:96
+msgid "_Reset to Default Colors"
+msgstr "_Nulstil til Standard Farver"
+
+#: ../data/glade/preferences_window.glade.h:97
+msgid "_Send chat state notifications:"
+msgstr "_Send samtalestatus påmindelser:"
+
+#: ../data/glade/preferences_window.glade.h:98
+msgid "_Sort contacts by status"
+msgstr "_Sorter kontakter efter status"
+
+#: ../data/glade/preferences_window.glade.h:99
+msgid "_Status message:"
+msgstr "_Status besked:"
+
+#: ../data/glade/preferences_window.glade.h:100
+msgid "_URL:"
+msgstr "_URL:"
+
+#: ../data/glade/preferences_window.glade.h:101
+msgid "minutes"
+msgstr "minutter"
+
+#: ../data/glade/privacy_lists_window.glade.h:1
+msgid "Privacy Lists:"
+msgstr "Privatlivs Lister:"
+
+#: ../data/glade/privacy_list_window.glade.h:1
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Tilføj / Ændre en regel</b>"
+
+#: ../data/glade/privacy_list_window.glade.h:2
+msgid "<b>List of rules</b>"
+msgstr "<b>Liste af regler</b>"
+
+#: ../data/glade/privacy_list_window.glade.h:3
+msgid "<i>Privacy List</i>"
+msgstr "<i>Privatlivs Liste</i>"
+
+#: ../data/glade/privacy_list_window.glade.h:4
+msgid "Active for this session"
+msgstr "Aktiv i denne session"
+
+#: ../data/glade/privacy_list_window.glade.h:5
+msgid "Active on each startup"
+msgstr "Aktiv efter hver start"
+
+#: ../data/glade/privacy_list_window.glade.h:6
+msgid "All"
+msgstr "Alle"
+
+#: ../data/glade/privacy_list_window.glade.h:7
+msgid "Allow"
+msgstr "Tillad"
+
+#: ../data/glade/privacy_list_window.glade.h:9
+msgid "JabberID"
+msgstr "Jabber ID"
+
+#: ../data/glade/privacy_list_window.glade.h:10
+msgid "Order:"
+msgstr "Bestil:"
+
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2104
+msgid "Privacy List"
+msgstr "Privatlivs Liste"
+
+#: ../data/glade/privacy_list_window.glade.h:12
+msgid "all by subscription"
+msgstr "Alle efter abonnering"
+
+#: ../data/glade/privacy_list_window.glade.h:13
+msgid "all in the group"
+msgstr "Alle i gruppen"
+
+#: ../data/glade/privacy_list_window.glade.h:14
+msgid ""
+"none\n"
+"both\n"
+"from\n"
+"to"
+msgstr ""
+"ingen\n"
+"begge\n"
+"fra\n"
+"til"
+
+#: ../data/glade/privacy_list_window.glade.h:18
+msgid "to send me messages"
+msgstr "at sende mig beskeder"
+
+#: ../data/glade/privacy_list_window.glade.h:19
+msgid "to send me queries"
+msgstr "at sende mig forespørgsler"
+
+#: ../data/glade/privacy_list_window.glade.h:20
+msgid "to send me status"
+msgstr "at sende mig status"
+
+#: ../data/glade/privacy_list_window.glade.h:21
+msgid "to view my status"
+msgstr "at se min status"
+
+#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:2
+#: ../data/glade/vcard_information_window.glade.h:2
+msgid "About"
+msgstr "Om"
+
+#: ../data/glade/profile_window.glade.h:3
+#: ../data/glade/vcard_information_window.glade.h:3
+msgid "Address"
+msgstr "Adress"
+
+#: ../data/glade/profile_window.glade.h:4
+msgid "Avatar:"
+msgstr "Avatar:"
+
+#: ../data/glade/profile_window.glade.h:5
+#: ../data/glade/vcard_information_window.glade.h:6
+msgid "Birthday:"
+msgstr "Fødselsdag:"
+
+#: ../data/glade/profile_window.glade.h:6
+#: ../data/glade/vcard_information_window.glade.h:7
+msgid "City:"
+msgstr "By:"
+
+#: ../data/glade/profile_window.glade.h:7
+msgid "Click to set your avatar"
+msgstr "Tryk for at se din avatar"
+
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:10
+msgid "Company:"
+msgstr "Firma:"
+
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:14
+msgid "Country:"
+msgstr "Land:"
+
+#: ../data/glade/profile_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:15
+msgid "Department:"
+msgstr "Afdeling:"
+
+#: ../data/glade/profile_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:17
+msgid "Extra Address:"
+msgstr "Ekstra Adresse:"
+
+#. Family Name
+#: ../data/glade/profile_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:19
+msgid "Family:"
+msgstr "Efternavn:"
+
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:21
+msgid "Format: YYYY-MM-DD"
+msgstr "Format: YYYY-MM-DD"
+
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:22
+msgid "Full Name"
+msgstr "Fuldt Navn"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:19
+#: ../data/glade/vcard_information_window.glade.h:24
+msgid "Given:"
+msgstr "Fornavn:"
+
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:25
+msgid "Homepage:"
+msgstr "Hjemmeside:"
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:28
+msgid "Middle:"
+msgstr "Mellemnavn:"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:34
+msgid "Personal Info"
+msgstr "Personlig Information"
+
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:35
+msgid "Phone No.:"
+msgstr "Telefonnr.:"
+
+#: ../data/glade/profile_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:36
+msgid "Position:"
+msgstr "Placering:"
+
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:37
+msgid "Postal Code:"
+msgstr "Postnummer:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "Prefix:"
+msgstr "Titel:"
+
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:41 ../src/vcard.py:302
+msgid "Role:"
+msgstr "Rolle:"
+
+#: ../data/glade/profile_window.glade.h:33
+#: ../data/glade/vcard_information_window.glade.h:42
+msgid "State:"
+msgstr "Amt:"
+
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:44
+msgid "Street:"
+msgstr "Gade:"
+
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:48
+msgid "Suffix:"
+msgstr "Endelse:"
+
+#: ../data/glade/profile_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:50
+msgid "Work"
+msgstr "Arbejde"
+
+#: ../data/glade/remove_account_window.glade.h:1
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Hvad vil du gøre?</b>"
+
+#: ../data/glade/remove_account_window.glade.h:2
+msgid "Remove account _only from Gajim"
+msgstr "Fjern kun k_ontoen fra Gajim"
+
+#: ../data/glade/remove_account_window.glade.h:3
+msgid "Remove account from Gajim and from _server"
+msgstr "Fjern konto fra Gajim og fra _serveren"
+
+#. Remove
+#. Remove group
+#. Remove
+#: ../data/glade/remove_account_window.glade.h:4
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+#: ../src/roster_window.py:2523 ../src/roster_window.py:2733
+#: ../src/roster_window.py:2869
+msgid "_Remove"
+msgstr "_Kan fjernes"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "_Spørg om at kunne se hans/hendes status"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:2
+msgid "Add Special _Notification..."
+msgstr "Tilføj Speciel Påmi_ndelse..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:3
+msgid "Assign Open_PGP Key..."
+msgstr "Tilskriv Open_PGP Nøgle..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:4
+msgid "Edit _Groups..."
+msgstr "Ændre _Grupper..."
+
+#. Execute Command
+#: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:2826
+msgid "Execute Command..."
+msgstr "Kør Kommando..."
+
+#. Invite to Groupchat
+#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:2439
+msgid "In_vite to"
+msgstr "In_viter til"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../src/roster_window.py:2663 ../src/roster_window.py:2797
+msgid "Send Cus_tom Status"
+msgstr "Send _Tilpasset Status"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+msgid "Send Single _Message..."
+msgstr "Send en Enkel _Besked"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:9
+msgid "Send _File..."
+msgstr "Send _Fil..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:10
+msgid "Set Custom _Avatar..."
+msgstr "Angiv Personlig _Avatar..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
+msgid "Start _Chat"
+msgstr "Start _samtale"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+msgid "_Allow him/her to see my status"
+msgstr "Till_ad ham/hende at se min status"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../src/roster_window.py:2513 ../src/roster_window.py:2724
+msgid "_Block"
+msgstr "_Bloker"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+msgid "_Forbid him/her to see my status"
+msgstr "_Nægt ham/hende at se min status"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
+msgid "_Manage Contact"
+msgstr "_Håndter Kontakt"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:19
+msgid "_Rename..."
+msgstr "_Omdøb..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:20
+msgid "_Subscription"
+msgstr "_Abonnement"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:21
+#: ../src/roster_window.py:2507 ../src/roster_window.py:2718
+msgid "_Unblock"
+msgstr "_Fjern blokering"
+
+#: ../data/glade/roster_window.glade.h:1
+msgid "A_ccounts"
+msgstr "_Kontoer"
+
+#: ../data/glade/roster_window.glade.h:2
+msgid "Add _Contact..."
+msgstr "_Tilføj Kontakt..."
+
+#: ../data/glade/roster_window.glade.h:3
+msgid "Fea_tures"
+msgstr "_Egenskaber"
+
+#: ../data/glade/roster_window.glade.h:4
+msgid "File _Transfers"
+msgstr "Filover_førsler"
+
+#: ../data/glade/roster_window.glade.h:5
+msgid "Frequently Asked Questions (online)"
+msgstr "Ofte Stillede Spørgsmål (på net)"
+
+#: ../data/glade/roster_window.glade.h:7
+msgid "Help online"
+msgstr "Hjælp på net"
+
+#: ../data/glade/roster_window.glade.h:9
+msgid "Profile, A_vatar"
+msgstr "Profil, A_vatar"
+
+#: ../data/glade/roster_window.glade.h:10
+msgid "Show Trans_ports"
+msgstr "Vis Trans_porter"
+
+#: ../data/glade/roster_window.glade.h:11
+msgid "Show _Offline Contacts"
+msgstr "Vis _Afkoblede Kontakter"
+
+#: ../data/glade/roster_window.glade.h:14
+msgid "_Contents"
+msgstr "_Indhold"
+
+#: ../data/glade/roster_window.glade.h:16 ../src/disco.py:1348
+msgid "_Edit"
+msgstr "R_ediger"
+
+#: ../data/glade/roster_window.glade.h:17
+msgid "_FAQ"
+msgstr "_OSS"
+
+#: ../data/glade/roster_window.glade.h:18
+msgid "_Help"
+msgstr "_Hjælp"
+
+#: ../data/glade/roster_window.glade.h:19
+msgid "_Preferences"
+msgstr "_Indstillinger"
+
+#: ../data/glade/roster_window.glade.h:20
+msgid "_Quit"
+msgstr "_Afslut"
+
+#: ../data/glade/roster_window.glade.h:21
+msgid "_Send Single Message..."
+msgstr "Send en Enkel _Besked..."
+
+#: ../data/glade/roster_window.glade.h:23
+msgid "_View"
+msgstr "_Vis"
+
+#: ../data/glade/search_window.glade.h:1
+msgid "Please wait while retrieving search form..."
+msgstr "Vent mens en søge form hentes..."
+
+#: ../data/glade/search_window.glade.h:3
+msgid "_Add contact"
+msgstr "Tilføj Kont_akt"
+
+#. Information
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:2881
+msgid "_Information"
+msgstr "_Information"
+
+#: ../data/glade/service_discovery_window.glade.h:1
+msgid "G_o"
+msgstr "N_aviger"
+
+#: ../data/glade/service_discovery_window.glade.h:2
+msgid "_Address:"
+msgstr "_Adresse:"
+
+#: ../data/glade/service_registration_window.glade.h:1
+msgid "Register to"
+msgstr "Registrer til"
+
+#: ../data/glade/service_registration_window.glade.h:2
+msgid "_Cancel"
+msgstr "_Afbryd"
+
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_OK"
+
+#: ../data/glade/single_message_window.glade.h:1
+msgid "0"
+msgstr "0"
+
+#: ../data/glade/single_message_window.glade.h:2
+msgid "From:"
+msgstr "Fra:"
+
+#: ../data/glade/single_message_window.glade.h:3
+msgid "Reply to this message"
+msgstr "Send et svar til denne besked"
+
+#: ../data/glade/single_message_window.glade.h:4
+msgid "Sen_d"
+msgstr "Sen_d"
+
+#: ../data/glade/single_message_window.glade.h:5
+msgid "Send message"
+msgstr "Send besked"
+
+#: ../data/glade/single_message_window.glade.h:6
+msgid "Send message and close window"
+msgstr "Send besked og luk vinduet"
+
+#: ../data/glade/single_message_window.glade.h:7
+msgid "Subject:"
+msgstr "Emne:"
+
+#: ../data/glade/single_message_window.glade.h:8
+msgid "To:"
+msgstr "Til:"
+
+#: ../data/glade/single_message_window.glade.h:9
+msgid "_Reply"
+msgstr "Sva_r"
+
+#: ../data/glade/single_message_window.glade.h:10
+msgid "_Send & Close"
+msgstr "_Send & Luk"
+
+#: ../data/glade/subscription_request_window.glade.h:1
+msgid "Au_thorize"
+msgstr "Au_torisere"
+
+#: ../data/glade/subscription_request_window.glade.h:2
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr ""
+"Autoriser kontakt så han eller hun kan opnå information om at du er "
+"tilsluttet"
+
+#: ../data/glade/subscription_request_window.glade.h:3
+msgid ""
+"Deny authorization from contact so he or she cannot know when you're "
+"connected"
+msgstr ""
+"Nægt autorisation fra kontakter så han eller hun ikke kan opnå information "
+"om at du er tilsluttet"
+
+#: ../data/glade/subscription_request_window.glade.h:4
+msgid "Subscription Request"
+msgstr "Abonnement Forespørgsel"
+
+#: ../data/glade/subscription_request_window.glade.h:7
+msgid "_Deny"
+msgstr "_Nægt"
+
+#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+msgid "Select the account with which you want to synchronise"
+msgstr "Vælg den konto som du vil synkronisere med"
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+msgid "Select the contacts you want to synchronise"
+msgstr "Vælg de kontakter som du vil synkronisere"
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+msgid "Synchronise : select contacts"
+msgstr "Synkronisering : vælg kontakter"
+
+#: ../data/glade/systray_context_menu.glade.h:1
+msgid "Mute Sounds"
+msgstr "Slå lyden af"
+
+#: ../data/glade/systray_context_menu.glade.h:2
+msgid "Send Single _Message"
+msgstr "Send en Enkel _Besked"
+
+#: ../data/glade/systray_context_menu.glade.h:3
+msgid "Show All Pending _Events"
+msgstr "Vis Alle Ventende Hænd_elser"
+
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
+msgstr "Vis _Kontaktvindue"
+
+#: ../data/glade/systray_context_menu.glade.h:5
+msgid "Sta_tus"
+msgstr "Sta_tus"
+
+#: ../data/glade/systray_context_menu.glade.h:6
+msgid "_Group Chat"
+msgstr "_Gruppe Chat"
+
+#. Given Name
+#: ../data/glade/vcard_information_window.glade.h:5
+msgid "Ask:"
+msgstr "Spørg:"
+
+#: ../data/glade/vcard_information_window.glade.h:8
+msgid "Client:"
+msgstr "Klient:"
+
+#: ../data/glade/vcard_information_window.glade.h:9
+msgid "Comments"
+msgstr "Kommentarer"
+
+#: ../data/glade/vcard_information_window.glade.h:11
+msgid "Configured avatar:"
+msgstr "Konfigureret avatar:"
+
+#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/zeroconf_information_window.glade.h:1
+msgid "Contact"
+msgstr "Kontakt"
+
+#: ../data/glade/vcard_information_window.glade.h:13
+msgid "Contact Information"
+msgstr "Kontakt Information"
+
+#: ../data/glade/vcard_information_window.glade.h:29
+msgid "More"
+msgstr "Mere"
+
+#: ../data/glade/vcard_information_window.glade.h:33
+msgid "OS:"
+msgstr "OS:"
+
+#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/zeroconf_information_window.glade.h:8
+msgid "Resource:"
+msgstr "Resource:"
+
+#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/zeroconf_information_window.glade.h:9
+msgid "Status:"
+msgstr "Status:"
+
+#. Family Name
+#: ../data/glade/vcard_information_window.glade.h:46
+msgid "Subscription:"
+msgstr "Abonnement:"
+
+#: ../data/glade/vcard_information_window.glade.h:49
+msgid "User avatar:"
+msgstr "Bruger avatar:"
+
+#: ../data/glade/xml_console_window.glade.h:1
+msgid "<b>Jabber Traffic</b>"
+msgstr "<b>Jabber Trafik</b>"
+
+#: ../data/glade/xml_console_window.glade.h:2
+msgid "<b>XML Input</b>"
+msgstr "<b>XML Inddata</b>"
+
+#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
+#: ../data/glade/xml_console_window.glade.h:6
+msgid "Info/Query"
+msgstr "Information/Forespørgsel (Info/Query)"
+
+#. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
+#: ../data/glade/xml_console_window.glade.h:8
+msgid "_IQ"
+msgstr "_IQ"
+
+#: ../data/glade/xml_console_window.glade.h:9
+msgid "_Message"
+msgstr "_Besked"
+
+#: ../data/glade/xml_console_window.glade.h:10
+msgid "_Presence"
+msgstr "_Tilstedeværelse"
+
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
+msgid "Add Special _Notification"
+msgstr "Tilføj Speciel _Påmindelse"
+
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
+msgid "Assign Open_PGP Key"
+msgstr "Tilskriv Open_PGP Nøgle"
+
+#. Edit Groups
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:2496
+msgid "Edit _Groups"
+msgstr "Ændre _Grupper"
+
+#. Rename
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:2853
+msgid "_Rename"
+msgstr "_Omdøb"
+
+#: ../data/glade/zeroconf_context_menu.glade.h:1
+msgid "_Modify Account..."
+msgstr "_Ændre Konto"
+
+#: ../data/glade/zeroconf_information_window.glade.h:6
+msgid "Local jid:"
+msgstr "Lokal jid:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:7
+msgid "Personal"
+msgstr "Personlig"
+
+#: ../data/glade/zeroconf_properties_window.glade.h:15
+msgid "Modify Account"
+msgstr "Ændre Konto"
+
+#. For i18n
+#: ../src/advanced.py:51
+msgid "Activated"
+msgstr "Aktiveret"
+
+#: ../src/advanced.py:51
+msgid "Deactivated"
+msgstr "Ikke aktiveret"
+
+#: ../src/advanced.py:53
+msgid "Boolean"
+msgstr "Boolean"
+
+#: ../src/advanced.py:54
+msgid "Integer"
+msgstr "Heltal"
+
+#: ../src/advanced.py:55
+msgid "Text"
+msgstr "Tekst"
+
+#: ../src/advanced.py:56
+msgid "Color"
+msgstr "Farve"
+
+#: ../src/advanced.py:65
+msgid "Preference Name"
+msgstr "Foretrukket Navn"
+
+#: ../src/advanced.py:71
+msgid "Value"
+msgstr "Værdi"
+
+#: ../src/advanced.py:79
+msgid "Type"
+msgstr "Type"
+
+#. we talk about option description in advanced configuration editor
+#: ../src/advanced.py:136
+msgid "(None)"
+msgstr "(Ingen)"
+
+#. we talk about password
+#: ../src/advanced.py:239
+msgid "Hidden"
+msgstr "Skjult"
+
+#. the next script, executed in the "po" directory,
+#. generates the following list.
+#. #!/bin/sh
+#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. echo "{_('en'):'en'",$LANG"}"
+#: ../src/chat_control.py:55
+msgid "English"
+msgstr "Engelsk"
+
+#: ../src/chat_control.py:55
+msgid "Belarusian"
+msgstr "Belarusian"
+
+#: ../src/chat_control.py:55
+msgid "Bulgarian"
+msgstr "Bulgarsk"
+
+#: ../src/chat_control.py:55
+msgid "Breton"
+msgstr "Bretonsk"
+
+#: ../src/chat_control.py:55
+msgid "Czech"
+msgstr "Tjekkisk"
+
+#: ../src/chat_control.py:55
+msgid "German"
+msgstr "Tysk"
+
+#: ../src/chat_control.py:55
+msgid "Greek"
+msgstr "Græsk"
+
+#: ../src/chat_control.py:55
+msgid "British"
+msgstr "Britisk"
+
+#: ../src/chat_control.py:55
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../src/chat_control.py:55
+msgid "Spanish"
+msgstr "Spansk"
+
+#: ../src/chat_control.py:55
+msgid "Basque"
+msgstr "Baskisk"
+
+#: ../src/chat_control.py:55
+msgid "French"
+msgstr "Fransk"
+
+#: ../src/chat_control.py:55
+msgid "Croatian"
+msgstr "Kroatisk"
+
+#: ../src/chat_control.py:55
+msgid "Italian"
+msgstr "Italiensk"
+
+#: ../src/chat_control.py:55
+msgid "Norwegian (b)"
+msgstr "Norsk (bokmål)"
+
+#: ../src/chat_control.py:55
+msgid "Dutch"
+msgstr "Hollandsk"
+
+#: ../src/chat_control.py:55
+msgid "Norwegian"
+msgstr "Norsk"
+
+#: ../src/chat_control.py:55
+msgid "Polish"
+msgstr "Polsk"
+
+#: ../src/chat_control.py:55
+msgid "Portuguese"
+msgstr "Portugisisk"
+
+#: ../src/chat_control.py:55
+msgid "Brazilian Portuguese"
+msgstr "Brasiliansk Portugisisk"
+
+#: ../src/chat_control.py:55
+msgid "Russian"
+msgstr "Russisk"
+
+#: ../src/chat_control.py:55
+msgid "Serbian"
+msgstr "Serbisk"
+
+#: ../src/chat_control.py:55
+msgid "Slovak"
+msgstr "Slovakisk"
+
+#: ../src/chat_control.py:55
+msgid "Swedish"
+msgstr "Svensk"
+
+#: ../src/chat_control.py:55
+msgid "Chinese (Ch)"
+msgstr "Kinesisk"
+
+#: ../src/chat_control.py:283
+msgid "Spelling language"
+msgstr "Sprog for stavekontrollen"
+
+#. we are not connected
+#: ../src/chat_control.py:306 ../src/chat_control.py:512
+msgid "A connection is not available"
+msgstr "En tilslutning er ikke tilgængelig"
+
+#: ../src/chat_control.py:307 ../src/chat_control.py:513
+msgid "Your message can not be sent until you are connected."
+msgstr "Din besked kan ikke blive sendt før du er tilsluttet."
+
+#: ../src/chat_control.py:1138
+#, python-format
+msgid "%(nickname)s from group chat %(room_name)s"
+msgstr "%(nickname)s fra gruppesamtale %(room_name)s"
+
+#. we talk about a contact here
+#: ../src/chat_control.py:1226
+#, python-format
+msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+msgstr "%s har ikke rundsendt en OpenPGP nøgle, og du har ikke tilskrevet en"
+
+#: ../src/chat_control.py:1265 ../src/groupchat_control.py:1395
+#, python-format
+msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+msgstr ""
+"Denne kommando findes ikke: /%s (hvis du vil sende dette, skriv /say før "
+"teksten"
+
+#: ../src/chat_control.py:1272 ../src/groupchat_control.py:1418
+#, python-format
+msgid "Commands: %s"
+msgstr "Kommandoer: %s"
+
+#: ../src/chat_control.py:1275 ../src/groupchat_control.py:1432
+#, python-format
+msgid "Usage: /%s, clears the text window."
+msgstr "Brug: /%s, rydder tekst vinduet"
+
+#: ../src/chat_control.py:1278 ../src/groupchat_control.py:1437
+#, python-format
+msgid "Usage: /%s, hide the chat buttons."
+msgstr "Brug: /%s, gem samtale knapper"
+
+#: ../src/chat_control.py:1281 ../src/groupchat_control.py:1453
+#, python-format
+msgid ""
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
+msgstr ""
+"Brug: /%s <handling>, sender handling til den nuværende gruppe samtale. Brug "
+"tredie person. (f.eks. /%s eksploderer.)"
+
+#: ../src/chat_control.py:1285
+#, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr "Brug: %s, sender en ping til kontakten"
+
+#: ../src/chat_control.py:1288
+#, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "Brug: /%s, send beskeden til kontakten"
+
+#: ../src/chat_control.py:1291 ../src/groupchat_control.py:1476
+#, python-format
+msgid "No help info for /%s"
+msgstr "Ingen hjælp for /%s"
+
+#: ../src/chat_control.py:1429 ../src/chat_control.py:1455
+msgid "Encryption enabled"
+msgstr "Kryptering aktiveret"
+
+#: ../src/chat_control.py:1434
+msgid "Session WILL be logged"
+msgstr "Session VIL blive logget"
+
+#: ../src/chat_control.py:1436
+msgid "Session WILL NOT be logged"
+msgstr "Session VIL IKKE blive logget"
+
+#: ../src/chat_control.py:1443
+msgid "The following message was NOT encrypted"
+msgstr "Den følgende besked var IKKE krypteret"
+
+#: ../src/chat_control.py:1447 ../src/chat_control.py:1460
+#: ../src/chat_control.py:2089
+msgid "Encryption disabled"
+msgstr "Kryptering ikke aktiveret"
+
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1617 ../src/conversation_textview.py:562
+#: ../src/dialogs.py:674 ../src/gajim.py:894 ../src/gajim.py:895
+#: ../src/gajim.py:1364 ../src/roster_window.py:345
+#: ../src/roster_window.py:429 ../src/roster_window.py:1790
+#: ../src/roster_window.py:1800 ../src/roster_window.py:2038
+#: ../src/roster_window.py:2276 ../src/roster_window.py:3124
+#: ../src/roster_window.py:3331 ../src/roster_window.py:4691
+#: ../src/roster_window.py:4693 ../src/common/contacts.py:84
+#: ../src/common/helpers.py:44 ../src/common/helpers.py:258
+msgid "Not in Roster"
+msgstr "Ikke i Kontaktvinduet"
+
+#. %s is being replaced in the code with JID
+#: ../src/chat_control.py:1761
+#, python-format
+msgid "You just received a new message from \"%s\""
+msgstr "Du har netop modtaget en besked fra \"%s\""
+
+#: ../src/chat_control.py:1762
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Hvis du lukker dette faneblad og ikke har aktiveret historie loggen, vil du\n"
+"miste denne besked."
+
+#: ../src/config.py:122 ../src/config.py:544
+msgid "Disabled"
+msgstr "Ikke aktiveret"
+
+#: ../src/config.py:288
+msgid "Active"
+msgstr "Aktiv"
+
+#: ../src/config.py:296
+msgid "Event"
+msgstr "Hændelse"
+
+#: ../src/config.py:617 ../src/dialogs.py:958
+#, python-format
+msgid "Dictionary for lang %s not available"
+msgstr "Ordbog for sproget %s er ikke tilgængelig"
+
+#: ../src/config.py:618
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+"For at bruge stavekontrollen må du installer en %s ordbog, eller vælge et "
+"andet sprog ved indstillingen for sprog til stavekontrollen."
+
+#: ../src/config.py:969
+msgid "status message title"
+msgstr "status besked Titel"
+
+#: ../src/config.py:969
+msgid "status message text"
+msgstr "status besked tekst"
+
+#: ../src/config.py:1005
+msgid "First Message Received"
+msgstr "Første Besked er Modtaget"
+
+#: ../src/config.py:1006
+msgid "Next Message Received"
+msgstr "Næste Besked er Modtaget"
+
+#: ../src/config.py:1007
+msgid "Contact Connected"
+msgstr "Kontakt er Tilsluttet"
+
+#: ../src/config.py:1008
+msgid "Contact Disconnected"
+msgstr "Kontakt er ikke Tilsluttet"
+
+#: ../src/config.py:1009
+msgid "Message Sent"
+msgstr "Besked er Sendt"
+
+#: ../src/config.py:1010
+msgid "Group Chat Message Highlight"
+msgstr "Gruppe Samtale Besked Fremhævning"
+
+#: ../src/config.py:1011
+msgid "Group Chat Message Received"
+msgstr "Gruppe Samtale Besked Modtaget"
+
+#: ../src/config.py:1018
+msgid "GMail Email Received"
+msgstr "GMail E-post Modtaget"
+
+#. Name column
+#: ../src/config.py:1287 ../src/dialogs.py:1397 ../src/dialogs.py:1461
+#: ../src/disco.py:736 ../src/disco.py:1559 ../src/disco.py:1805
+#: ../src/history_window.py:78
+msgid "Name"
+msgstr "Navn"
+
+#: ../src/config.py:1395 ../src/common/config.py:375
+msgid "Be right back."
+msgstr "Er straks tilbage."
+
+#: ../src/config.py:1399
+msgid "Relogin now?"
+msgstr "Log ind igen nu?"
+
+#: ../src/config.py:1400
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+"Hvis du vil at alle ændringerne skal træde i kraft nu, må du logge ind igen."
+
+#: ../src/config.py:1495 ../src/config.py:1594
+msgid "OpenPGP is not usable in this computer"
+msgstr "Det er ikke muligt at bruge OpenPGP på denne computer"
+
+#: ../src/config.py:1630 ../src/config.py:1674
+msgid "Unread events"
+msgstr "Ulæste hændelser"
+
+#: ../src/config.py:1631
+msgid "Read all pending events before removing this account."
+msgstr "Læs alle ventende hændelser før denne konto fjernes."
+
+#: ../src/config.py:1660
+#, python-format
+msgid "You have opened chat in account %s"
+msgstr "Du har en åben samtale med kontonavnet %s"
+
+#: ../src/config.py:1661
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+"Alle samtale og gruppesamtale vinduer vil blive lukket. Vil du fortsætte?"
+
+#: ../src/config.py:1670
+msgid "You are currently connected to the server"
+msgstr "Du er for øjeblikket tilsluttet til serveren"
+
+#: ../src/config.py:1671
+msgid "To change the account name, you must be disconnected."
+msgstr "For at ændre kontonavnet må du afbryde din tilslutning"
+
+#: ../src/config.py:1675
+msgid "To change the account name, you must read all pending events."
+msgstr "For at ændre kontonavnet må du læse alle ventende hændelser."
+
+#: ../src/config.py:1681
+msgid "Account Name Already Used"
+msgstr "Kontonavnet er allerede i brug"
+
+#: ../src/config.py:1682
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
+msgstr ""
+"Dette navn er allerede brugt til en af dine andre kontoer. Vælg venligst et "
+"andet navn."
+
+#: ../src/config.py:1686 ../src/config.py:1690
+msgid "Invalid account name"
+msgstr "Ugyldigt kontonavn"
+
+#: ../src/config.py:1687
+msgid "Account name cannot be empty."
+msgstr "Kontonavnet kan ikke være tomt."
+
+#: ../src/config.py:1691
+msgid "Account name cannot contain spaces."
+msgstr "Kontonavnet kan ikke indeholde mellemrom."
+
+#: ../src/config.py:1755
+msgid "Rename Account"
+msgstr "Omdøb Konto"
+
+#: ../src/config.py:1756
+#, python-format
+msgid "Enter a new name for account %s"
+msgstr "Indtast et nyt navn for kontoen %s"
+
+#: ../src/config.py:1774 ../src/config.py:1782 ../src/config.py:1822
+#: ../src/config.py:3048
+msgid "Invalid Jabber ID"
+msgstr "Ugyldigt Jabber ID"
+
+#: ../src/config.py:1783
+msgid "A Jabber ID must be in the form \"user@servername\"."
+msgstr "Et Jabber ID må være på formen \"bruger@servernavn\"."
+
+#: ../src/config.py:1968 ../src/config.py:3119
+msgid "Invalid entry"
+msgstr "Ugyldig indgang"
+
+#: ../src/config.py:1969 ../src/config.py:3120
+msgid "Custom port must be a port number."
+msgstr "Personlig port må være et port nummer."
+
+#: ../src/config.py:1990
+msgid "Failed to get secret keys"
+msgstr "Forsøg på at hente krypteringsnøgler mislykkedes"
+
+#: ../src/config.py:1991
+msgid "There was a problem retrieving your OpenPGP secret keys."
+msgstr "Der opstod et problem under forsøget på at hente dine OpenPGP nøgler."
+
+#: ../src/config.py:1994
+msgid "OpenPGP Key Selection"
+msgstr "OpenPGP Nøgle Valg"
+
+#: ../src/config.py:1995
+msgid "Choose your OpenPGP key"
+msgstr "Vælg din OpenPGP Nøgle"
+
+#: ../src/config.py:2052
+msgid "No such account available"
+msgstr "Ingen konto ved det navn er tilgængelig"
+
+#: ../src/config.py:2053
+msgid "You must create your account before editing your personal information."
+msgstr "Du må oprette en konto før du kan redigere din personlige information."
+
+#: ../src/config.py:2060 ../src/dialogs.py:1244 ../src/dialogs.py:1385
+#: ../src/dialogs.py:1565 ../src/disco.py:420 ../src/profile_window.py:325
+msgid "You are not connected to the server"
+msgstr "Du er ikke tilsluttet til serveren"
+
+#: ../src/config.py:2061
+msgid "Without a connection, you can not edit your personal information."
+msgstr "Uden en tilslutning kan du ikke redigere din personlige information."
+
+#: ../src/config.py:2065
+msgid "Your server doesn't support Vcard"
+msgstr "Din server understøtter ikke Vcard"
+
+#: ../src/config.py:2066
+msgid "Your server can't save your personal information."
+msgstr "Din server kan ikke gemme din personlige information."
+
+#: ../src/config.py:2097
+msgid "Account Local already exists."
+msgstr "Den Lokale Konto eksisterer allerede."
+
+#: ../src/config.py:2098
+msgid "Please rename or remove it before enabling link-local messaging."
+msgstr "Omdøb eller fjern den før du aktiverer link-local beskeder."
+
+#: ../src/config.py:2274
+#, python-format
+msgid "Edit %s"
+msgstr "Rediger %s"
+
+#: ../src/config.py:2276
+#, python-format
+msgid "Register to %s"
+msgstr "Registrer til %s"
+
+#. list at the beginning
+#: ../src/config.py:2312
+msgid "Ban List"
+msgstr "Liste over bandlyste"
+
+#: ../src/config.py:2313
+msgid "Member List"
+msgstr "Medlems Liste"
+
+#: ../src/config.py:2314
+msgid "Owner List"
+msgstr "Ejer Liste"
+
+#: ../src/config.py:2315
+msgid "Administrator List"
+msgstr "Administrator Liste"
+
+#. Address column
+#. holds JID (who said this)
+#: ../src/config.py:2364 ../src/disco.py:743 ../src/history_manager.py:155
+msgid "JID"
+msgstr "JID"
+
+#: ../src/config.py:2372
+msgid "Reason"
+msgstr "Grund"
+
+#: ../src/config.py:2377
+msgid "Nick"
+msgstr "Kælenavne"
+
+#: ../src/config.py:2381
+msgid "Role"
+msgstr "Rolle"
+
+#: ../src/config.py:2406
+msgid "Banning..."
+msgstr "Bandlysning..."
+
+#. You can move '\n' before user@domain if that line is TOO BIG
+#: ../src/config.py:2408
+msgid ""
+"<b>Whom do you want to ban?</b>\n"
+"\n"
+msgstr ""
+"<b>Hvem vil du bandlyse?</b>\n"
+"\n"
+
+#: ../src/config.py:2410
+msgid "Adding Member..."
+msgstr "Tilføj Medlem..."
+
+#: ../src/config.py:2411
+msgid ""
+"<b>Whom do you want to make a member?</b>\n"
+"\n"
+msgstr ""
+"<b>Hvem vil du gøre til medlem?</b>\n"
+"\n"
+
+#: ../src/config.py:2413
+msgid "Adding Owner..."
+msgstr "Tilføj Ejer..."
+
+#: ../src/config.py:2414
+msgid ""
+"<b>Whom do you want to make an owner?</b>\n"
+"\n"
+msgstr ""
+"<b>Hvem vil du gøre til ejer?</b>\n"
+"\n"
+
+#: ../src/config.py:2416
+msgid "Adding Administrator..."
+msgstr "Tilføj Administrator..."
+
+#: ../src/config.py:2417
+msgid ""
+"<b>Whom do you want to make an administrator?</b>\n"
+"\n"
+msgstr ""
+"<b>Hvem vil du gøre til administrator?</b>\n"
+"\n"
+
+#: ../src/config.py:2418
+msgid ""
+"Can be one of the following:\n"
+"1. user@domain/resource (only that resource matches).\n"
+"2. user@domain (any resource matches).\n"
+"3. domain/resource (only that resource matches).\n"
+"4. domain (the domain itself matches, as does any user@domain,\n"
+"domain/resource, or address containing a subdomain."
+msgstr ""
+"Kan være en af de følgende:\n"
+"1. bruger@domæne/resource (kun denne resource træffer).\n"
+"2. bruger@domæne (en hvilket som helst resource træffer).\n"
+"3. domæne/resource (kun denne resource træffer).\n"
+"4. domæne (domænet træffer, ligeledes et hvilken som helst bruger@domæne,\n"
+"domæne/resource, eller adresse indeholdende et subdomæne."
+
+#: ../src/config.py:2522
+#, python-format
+msgid "Removing %s account"
+msgstr "Fjerne kontoen med navnet %s"
+
+#: ../src/config.py:2539 ../src/gajim.py:1307 ../src/roster_window.py:3390
+msgid "Password Required"
+msgstr "Adgangskode er Påkrævet"
+
+#: ../src/config.py:2540 ../src/roster_window.py:3386
+#, python-format
+msgid "Enter your password for account %s"
+msgstr "Skriv din adgangskode for kontoen %s"
+
+#: ../src/config.py:2541 ../src/roster_window.py:3391
+msgid "Save password"
+msgstr "Gem adgangskode"
+
+#: ../src/config.py:2555
+#, python-format
+msgid "Account \"%s\" is connected to the server"
+msgstr "Kontoen \"%s\" er tilsluttet til serveren"
+
+#: ../src/config.py:2556
+msgid "If you remove it, the connection will be lost."
+msgstr "Hvis du fjerne den vil tilslutningen tabes."
+
+#: ../src/config.py:2649
+msgid "Default"
+msgstr "Standard"
+
+#: ../src/config.py:2649
+msgid "?print_status:All"
+msgstr "?print_status:Alle"
+
+#: ../src/config.py:2650
+msgid "Enter and leave only"
+msgstr "Gå kun ind og ud"
+
+#: ../src/config.py:2651
+msgid "?print_status:None"
+msgstr "?print_status:Ingen"
+
+#: ../src/config.py:2720
+msgid "New Group Chat"
+msgstr "Ny Gruppe Samtale"
+
+#: ../src/config.py:2753
+msgid "This bookmark has invalid data"
+msgstr "Dette bogmærke er ugyldigt"
+
+#: ../src/config.py:2754
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
+msgstr ""
+"Fyld ud server og rum tekstindtastningsfelterne eller fjern dette bogmærke."
+
+#: ../src/config.py:3031
+msgid "Invalid username"
+msgstr "Ugyldigt brugernavn"
+
+#: ../src/config.py:3033
+msgid "You must provide a username to configure this account."
+msgstr "Du må give et brugernavn for at konfigurere denne konto."
+
+#: ../src/config.py:3059
+msgid "Duplicate Jabber ID"
+msgstr "Jabber ID eksisterer"
+
+#: ../src/config.py:3060
+msgid "This account is already configured in Gajim."
+msgstr "Denne konto er allerede konfigureret i Gajim."
+
+#: ../src/config.py:3077
+msgid "Account has been added successfully"
+msgstr "Kontoen er blevet tilføjet med succes"
+
+#: ../src/config.py:3078 ../src/config.py:3223
+msgid ""
+"You can set advanced account options by pressing the Advanced button, or "
+"later by choosing the Accounts menuitem under the Edit menu from the main "
+"window."
+msgstr "Du kan sætte avancerede konto indstillinger ved at trykke Avanceret knappen, eller senere ved at vælge kontoens menupunkt under Rediger menuen fra hovedvinduet."
+
+#: ../src/config.py:3095
+msgid "Invalid server"
+msgstr "Ugyldigt server"
+
+#: ../src/config.py:3096
+msgid "Please provide a server on which you want to register."
+msgstr "Anfør en server som du vil registrere dig ved."
+
+#: ../src/config.py:3202 ../src/config.py:3241
+msgid "An error occurred during account creation"
+msgstr "Under oprettelsen af kontoen opstod der en fejl"
+
+#: ../src/config.py:3222
+msgid "Your new account has been created successfully"
+msgstr "Din nye konto er blevet oprettet med succes"
+
+#: ../src/config.py:3327
+msgid "Account name is in use"
+msgstr "Kontonavnet er i brug"
+
+#: ../src/config.py:3328
+msgid "You already have an account using this name."
+msgstr "Du har allered en konto med dette navn."
+
+#: ../src/conversation_textview.py:337
+msgid ""
+"Text below this line is what has been said since the last time you paid "
+"attention to this group chat"
+msgstr "Teksten under denne linje er hvad der er blevet sagt siden sidste gang du var opmærksom på denne gruppe samtale"
+
+#: ../src/conversation_textview.py:409
+#, python-format
+msgid "_Actions for \"%s\""
+msgstr "_Handlinger for \"%s\""
+
+#: ../src/conversation_textview.py:421
+msgid "Read _Wikipedia Article"
+msgstr "Læs _Wikipedia Artikel"
+
+#: ../src/conversation_textview.py:426
+msgid "Look it up in _Dictionary"
+msgstr "Slå dette op i Or_dbogen"
+
+#. we must have %s in the url if not WIKTIONARY
+#: ../src/conversation_textview.py:442
+#, python-format
+msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
+msgstr "Ordbogens URL mangler en \"%s\" og det må ikke være WIKTIONARY"
+
+#. we must have %s in the url
+#: ../src/conversation_textview.py:455
+#, python-format
+msgid "Web Search URL is missing an \"%s\""
+msgstr "Web søge URL'en mangler en \"%s\""
+
+#: ../src/conversation_textview.py:458
+msgid "Web _Search for it"
+msgstr "Søg på nettet efter det"
+
+#: ../src/conversation_textview.py:464
+msgid "Open as _Link"
+msgstr "Åbn som et _Link"
+
+#: ../src/conversation_textview.py:929
+msgid "Yesterday"
+msgstr "I går"
+
+#. the number is >= 2
+#. %i is day in year (1-365), %d (1-31) we want %i
+#: ../src/conversation_textview.py:933
+#, python-format
+msgid "%i days ago"
+msgstr "%i dage siden"
+
+#. if we have subject, show it too!
+#: ../src/conversation_textview.py:967
+#, python-format
+msgid "Subject: %s\n"
+msgstr "Emne: %s\n"
+
+#: ../src/dialogs.py:64
+#, python-format
+msgid "Contact name: <i>%s</i>"
+msgstr "Kontakt navn: <i>%s</i>"
+
+#: ../src/dialogs.py:66
+#, python-format
+msgid "Jabber ID: <i>%s</i>"
+msgstr "Jabber ID: <i>%s</i>"
+
+#: ../src/dialogs.py:216
+msgid "Group"
+msgstr "Gruppe"
+
+#: ../src/dialogs.py:223
+msgid "In the group"
+msgstr "I gruppen"
+
+#: ../src/dialogs.py:274
+msgid "KeyID"
+msgstr "Nøgle ID"
+
+#: ../src/dialogs.py:277
+msgid "Contact name"
+msgstr "Kontakt navn"
+
+#: ../src/dialogs.py:323
+#, python-format
+msgid "%s Status Message"
+msgstr "%s Status Besked"
+
+#: ../src/dialogs.py:325
+msgid "Status Message"
+msgstr "Status Besked"
+
+#: ../src/dialogs.py:425
+msgid "Save as Preset Status Message"
+msgstr "Gem som Forvalgt Status Besked"
+
+#: ../src/dialogs.py:426
+msgid "Please type a name for this status message"
+msgstr "Skriv et navn for denne status besked"
+
+#: ../src/dialogs.py:437
+msgid "Overwrite Status Message?"
+msgstr "Overskriv Status Besked?"
+
+#: ../src/dialogs.py:438
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr "Dette navn er allerede i brug. Vil du overskrive denne status besked?"
+
+#: ../src/dialogs.py:454
+msgid "AIM Address:"
+msgstr "AIM Adresse:"
+
+#: ../src/dialogs.py:455
+msgid "GG Number:"
+msgstr "GG Nummer:"
+
+#: ../src/dialogs.py:456
+msgid "ICQ Number:"
+msgstr "ICQ Nummer:"
+
+#: ../src/dialogs.py:457
+msgid "MSN Address:"
+msgstr "MSN Adresse:"
+
+#: ../src/dialogs.py:458
+msgid "Yahoo! Address:"
+msgstr "Yahoo! Adresse:"
+
+#: ../src/dialogs.py:495
+#, python-format
+msgid "Please fill in the data of the contact you want to add in account %s"
+msgstr "Fyld ind data for den kontakt som du vil tilføje kontoen med navnet %s"
+
+#: ../src/dialogs.py:497
+msgid "Please fill in the data of the contact you want to add"
+msgstr "Fyld ind data for den kontakt som du vil tilføje"
+
+#: ../src/dialogs.py:654 ../src/dialogs.py:660
+msgid "Invalid User ID"
+msgstr "Ugyldig Bruger ID"
+
+#: ../src/dialogs.py:661
+msgid "The user ID must not contain a resource."
+msgstr "Bruger ID'en må ikke indeholde en resource."
+
+#: ../src/dialogs.py:675
+msgid "Contact already in roster"
+msgstr "Kontakten er allerede i kontaktvinduet"
+
+#: ../src/dialogs.py:676
+msgid "This contact is already listed in your roster."
+msgstr "Denne kontakt er allered i dit kontaktvindue"
+
+#: ../src/dialogs.py:712
+msgid "User ID:"
+msgstr "Bruger ID:"
+
+#: ../src/dialogs.py:774
+msgid "A GTK+ jabber client"
+msgstr "En GTK+ jabber klient"
+
+#: ../src/dialogs.py:775
+msgid "GTK+ Version:"
+msgstr "GTK+ Version:"
+
+#: ../src/dialogs.py:776
+msgid "PyGTK Version:"
+msgstr "PyGTK Version:"
+
+#: ../src/dialogs.py:790
+msgid "Current Developers:"
+msgstr "Nuværende Programudviklere:"
+
+#: ../src/dialogs.py:792
+msgid "Past Developers:"
+msgstr "Tidligere Programudviklerer:"
+
+#: ../src/dialogs.py:802
+msgid "THANKS:"
+msgstr "TAK:"
+
+#. remove one english sentence
+#. and add it manually as translatable
+#: ../src/dialogs.py:808
+msgid "Last but not least, we would like to thank all the package maintainers."
+msgstr "Sidst men ikke mindst, vil vi gerne takke alle pakke vedligeholdere."
+
+#. here you write your name in the form Name FamilyName <someone@somewhere>
+#: ../src/dialogs.py:821
+msgid "translator-credits"
+msgstr "Niels Felsted Thorsen <felsted@fsfe.org>"
+
+#: ../src/dialogs.py:951
+#, python-format
+msgid "Unable to bind to port %s."
+msgstr "Ikke i stand til at tildele port %s."
+
+#: ../src/dialogs.py:952
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+"Måske har du en anden instans af Gajim kørende. Filoverførsler vil blive "
+"annulleret."
+
+#: ../src/dialogs.py:959
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option.\n"
+"\n"
+"Highlighting misspelled words feature will not be used"
+msgstr ""
+"Du må installere en %s ordbog for at bruge stavekontrol, eller vælge et "
+"andet sprog med stavekontrol sprog indstillingen.\n"
+"\n"
+"Egenskaben med at fremhæve stavefejl vil ikke blive brugt"
+
+#: ../src/dialogs.py:1173
+#, python-format
+msgid "Subscription request for account %s from %s"
+msgstr "Forespørgsel på abonnering for konto %s fra %s"
+
+#: ../src/dialogs.py:1176
+#, python-format
+msgid "Subscription request from %s"
+msgstr "Forespørgsel om abonnering fra %s"
+
+#: ../src/dialogs.py:1237 ../src/roster_window.py:763
+#, python-format
+msgid "You are already in group chat %s"
+msgstr "Du er allerede i en gruppe samtale %s"
+
+#: ../src/dialogs.py:1245
+msgid "You can not join a group chat unless you are connected."
+msgstr "Du kan kun deltage i en gruppe samtale hvis du er tilsluttet."
+
+#: ../src/dialogs.py:1263
+#, python-format
+msgid "Join Group Chat with account %s"
+msgstr "Deltag i Gruppe Samtale med kontoen %s"
+
+#: ../src/dialogs.py:1333 ../src/dialogs.py:1339
+#: ../src/groupchat_control.py:1646
+msgid "Invalid group chat Jabber ID"
+msgstr "Ugyldig gruppe samtale Jabber ID"
+
+#: ../src/dialogs.py:1334 ../src/dialogs.py:1340
+#: ../src/groupchat_control.py:1647
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "Gruppe samtale Jabber ID'en indeholder ikke tilladte tegn."
+
+#: ../src/dialogs.py:1346
+msgid "This is not a group chat"
+msgstr "Dette er ikke en gruppe samtale"
+
+#: ../src/dialogs.py:1347
+#, python-format
+msgid "%s is not the name of a group chat."
+msgstr "%s er ikke navnet på en gruppe samtale."
+
+#: ../src/dialogs.py:1386
+msgid "Without a connection, you can not synchronise your contacts."
+msgstr "Du kan kun synkronisere dine kontakter når du er tilsluttet."
+
+#: ../src/dialogs.py:1400
+msgid "Server"
+msgstr "Server"
+
+#: ../src/dialogs.py:1433
+msgid "This account is not connected to the server"
+msgstr "Denne konto er ikke tilsluttet til serveren"
+
+#: ../src/dialogs.py:1434
+msgid "You cannot synchronize with an account unless it is connected."
+msgstr "Du kan kun synkronisere med en konto hvis du er tilsluttet."
+
+#: ../src/dialogs.py:1458
+msgid "Synchronise"
+msgstr "Synkroniser"
+
+#: ../src/dialogs.py:1516
+#, python-format
+msgid "Start Chat with account %s"
+msgstr "Start en samtale med konto %s"
+
+#: ../src/dialogs.py:1518
+msgid "Start Chat"
+msgstr "Start Samtale"
+
+#: ../src/dialogs.py:1519
+msgid ""
+"Fill in the nickname or the Jabber ID of the contact you would like\n"
+"to send a chat message to:"
+msgstr ""
+"Udfyld kælenavnet eller Jabber ID'en for den kontakt du vil sende\n"
+"en besked til:"
+
+#. if offline or connecting
+#: ../src/dialogs.py:1544 ../src/dialogs.py:1891 ../src/dialogs.py:2027
+msgid "Connection not available"
+msgstr "Tilslutning er ikke tilgængelig"
+
+#: ../src/dialogs.py:1545 ../src/dialogs.py:1892 ../src/dialogs.py:2028
+#, python-format
+msgid "Please make sure you are connected with \"%s\"."
+msgstr "Vær venligst sikker på at du er tilsluttet med \"%s\"."
+
+#: ../src/dialogs.py:1554 ../src/dialogs.py:1557
+msgid "Invalid JID"
+msgstr "Ugyldig JID"
+
+#: ../src/dialogs.py:1557
+#, python-format
+msgid "Unable to parse \"%s\"."
+msgstr "Kan ikke fortolke \"%s\"."
+
+#: ../src/dialogs.py:1566
+msgid "Without a connection, you can not change your password."
+msgstr "Du kan kun ændre din adgangskode hvis du er tilsluttet."
+
+#: ../src/dialogs.py:1584
+msgid "Invalid password"
+msgstr "Ugyldig adgangskode"
+
+#: ../src/dialogs.py:1585
+msgid "You must enter a password."
+msgstr "Du må indtaste en adgangskode."
+
+#: ../src/dialogs.py:1589
+msgid "Passwords do not match"
+msgstr "Adgangskoderne er ikke ens"
+
+#: ../src/dialogs.py:1590
+msgid "The passwords typed in both fields must be identical."
+msgstr "Adgangskoderene i de to tekstindtastningsfelter må være identiske."
+
+#. img to display
+#. default value
+#: ../src/dialogs.py:1632 ../src/notify.py:219 ../src/notify.py:429
+msgid "Contact Signed In"
+msgstr "Kontakt Loggede Ind"
+
+#: ../src/dialogs.py:1634 ../src/notify.py:227 ../src/notify.py:431
+msgid "Contact Signed Out"
+msgstr "Kontakt Loggede Ud"
+
+#. chat message
+#: ../src/dialogs.py:1636 ../src/notify.py:250 ../src/notify.py:433
+msgid "New Message"
+msgstr "Ny Besked"
+
+#. single message
+#: ../src/dialogs.py:1636 ../src/notify.py:231 ../src/notify.py:433
+msgid "New Single Message"
+msgstr "Ny Enkel Besked"
+
+#. private message
+#: ../src/dialogs.py:1637 ../src/notify.py:238 ../src/notify.py:434
+msgid "New Private Message"
+msgstr "Ny Privat Besked"
+
+#: ../src/dialogs.py:1637 ../src/gajim.py:1460 ../src/notify.py:442
+msgid "New E-mail"
+msgstr "Ny E-post"
+
+#: ../src/dialogs.py:1639 ../src/gajim.py:1668 ../src/notify.py:436
+msgid "File Transfer Request"
+msgstr "Filoverførsel Forespørgsel"
+
+#: ../src/dialogs.py:1641 ../src/gajim.py:1432 ../src/gajim.py:1644
+#: ../src/notify.py:438
+msgid "File Transfer Error"
+msgstr "Filoverførsel Fejl"
+
+#: ../src/dialogs.py:1643 ../src/gajim.py:1707 ../src/gajim.py:1729
+#: ../src/gajim.py:1746 ../src/notify.py:440
+msgid "File Transfer Completed"
+msgstr "Filoverførsel er Fuldført"
+
+#: ../src/dialogs.py:1644 ../src/gajim.py:1710 ../src/notify.py:440
+msgid "File Transfer Stopped"
+msgstr "Filoverførsel Stoppede"
+
+#: ../src/dialogs.py:1646 ../src/gajim.py:1328 ../src/notify.py:444
+msgid "Groupchat Invitation"
+msgstr "Gruppesamtale Invitation"
+
+#: ../src/dialogs.py:1648 ../src/notify.py:211 ../src/notify.py:446
+msgid "Contact Changed Status"
+msgstr "Kontakt Ændrede Status"
+
+#: ../src/dialogs.py:1821
+#, python-format
+msgid "Single Message using account %s"
+msgstr "Enkel Besked med konto %s"
+
+#: ../src/dialogs.py:1823
+#, python-format
+msgid "Single Message in account %s"
+msgstr "Enkel Besked i konto %s"
+
+#: ../src/dialogs.py:1825
+msgid "Single Message"
+msgstr "Enkel Besked"
+
+#. prepare UI for Sending
+#: ../src/dialogs.py:1828
+#, python-format
+msgid "Send %s"
+msgstr "Send %s"
+
+#. prepare UI for Receiving
+#: ../src/dialogs.py:1851
+#, python-format
+msgid "Received %s"
+msgstr "Modtaget %s"
+
+#. we create a new blank window to send and we preset RE: and to jid
+#: ../src/dialogs.py:1928
+#, python-format
+msgid "RE: %s"
+msgstr "SV: %s"
+
+#: ../src/dialogs.py:1929
+#, python-format
+msgid "%s wrote:\n"
+msgstr "%s skrev:\n"
+
+#: ../src/dialogs.py:1973
+#, python-format
+msgid "XML Console for %s"
+msgstr "XML Konsol for %s"
+
+#: ../src/dialogs.py:1975
+msgid "XML Console"
+msgstr "XML Konsol"
+
+#: ../src/dialogs.py:2098
+#, python-format
+msgid "Privacy List <b><i>%s</i></b>"
+msgstr "Privatlivs Liste <b><i>%s</i></b>"
+
+#: ../src/dialogs.py:2102
+#, python-format
+msgid "Privacy List for %s"
+msgstr "Privatlivs Liste for %s"
+
+#: ../src/dialogs.py:2158
+#, python-format
+msgid "Order: %s, action: %s, type: %s, value: %s"
+msgstr "Rækkefølge: %s, handling: %s, type: %s, værdi: %s"
+
+#: ../src/dialogs.py:2161
+#, python-format
+msgid "Order: %s, action: %s"
+msgstr "Rækkefølge: %s, handling: %s"
+
+#: ../src/dialogs.py:2203
+msgid "<b>Edit a rule</b>"
+msgstr "<b>Rediger en regel</b>"
+
+#: ../src/dialogs.py:2290
+msgid "<b>Add a rule</b>"
+msgstr "<b>Tilføj en regel</b>"
+
+#: ../src/dialogs.py:2386
+#, python-format
+msgid "Privacy Lists for %s"
+msgstr "Privatlivs Liste for %s"
+
+#: ../src/dialogs.py:2388
+msgid "Privacy Lists"
+msgstr "Privatlivs lister"
+
+#: ../src/dialogs.py:2458
+msgid "Invalid List Name"
+msgstr "Ugyldig Listenavn"
+
+#: ../src/dialogs.py:2459
+msgid "You must enter a name to create a privacy list."
+msgstr "Du må indtaste et navn for at skabe en privatlivs liste."
+
+#: ../src/dialogs.py:2496
+msgid "$Contact has invited you to join a discussion"
+msgstr "$Contact har inviteret dig til at deltage i en diskussion"
+
+#: ../src/dialogs.py:2498
+#, python-format
+msgid "$Contact has invited you to group chat %(room_jid)s"
+msgstr ""
+"$Contact har inviteret dig til at deltage i en gruppe samtale %(room_jid)s"
+
+#. only if not None and not ''
+#: ../src/dialogs.py:2510
+#, python-format
+msgid "Comment: %s"
+msgstr "Kommentar: %s"
+
+#: ../src/dialogs.py:2576
+msgid "Choose Sound"
+msgstr "Vælg Lyd"
+
+#: ../src/dialogs.py:2586 ../src/dialogs.py:2634
+msgid "All files"
+msgstr "Alle filer"
+
+#: ../src/dialogs.py:2591
+msgid "Wav Sounds"
+msgstr "Wav Lyde"
+
+#: ../src/dialogs.py:2624
+msgid "Choose Image"
+msgstr "Vælg Billede"
+
+#: ../src/dialogs.py:2639
+msgid "Images"
+msgstr "Billeder"
+
+#: ../src/dialogs.py:2703
+#, python-format
+msgid "When %s becomes:"
+msgstr "Når %s bliver:"
+
+#: ../src/dialogs.py:2705
+#, python-format
+msgid "Adding Special Notification for %s"
+msgstr "Tilføj Speciel Påmindelse for %s"
+
+#. # means number
+#: ../src/dialogs.py:2776
+msgid "#"
+msgstr "#"
+
+#: ../src/dialogs.py:2782
+msgid "Condition"
+msgstr "Betingelse"
+
+#: ../src/dialogs.py:2900
+msgid "when I am "
+msgstr "når jeg er"
+
+#: ../src/disco.py:104
+msgid "Others"
+msgstr "Andre"
+
+#: ../src/disco.py:105 ../src/disco.py:106 ../src/disco.py:1345
+#: ../src/gajim.py:644 ../src/roster_window.py:282 ../src/roster_window.py:342
+#: ../src/roster_window.py:382 ../src/roster_window.py:490
+#: ../src/roster_window.py:522 ../src/roster_window.py:524
+#: ../src/roster_window.py:4687 ../src/roster_window.py:4689
+#: ../src/common/contacts.py:290 ../src/common/contacts.py:305
+#: ../src/common/helpers.py:44
+msgid "Transports"
+msgstr "Transporter"
+
+#. conference is a category for listing mostly groupchats in service discovery
+#: ../src/disco.py:108
+msgid "Conference"
+msgstr "Konference"
+
+#: ../src/disco.py:421
+msgid "Without a connection, you can not browse available services"
+msgstr "Du kan kun gennemse tilgængelige tjenester hvis du er tilsluttet"
+
+#: ../src/disco.py:495
+#, python-format
+msgid "Service Discovery using account %s"
+msgstr "Opdag Tjenester med kontoen %s"
+
+#: ../src/disco.py:497
+msgid "Service Discovery"
+msgstr "Opdag Tjenester"
+
+#: ../src/disco.py:637
+msgid "The service could not be found"
+msgstr "Tjenesten findes ikke"
+
+#: ../src/disco.py:638
+msgid ""
+"There is no service at the address you entered, or it is not responding. "
+"Check the address and try again."
+msgstr ""
+"Der er ikke nogen tjenester på den adresse som du indtastede, eller serveren "
+"gav intet svar. Kontroller adressen og prøv igen."
+
+#: ../src/disco.py:642 ../src/disco.py:923
+msgid "The service is not browsable"
+msgstr "Det er ikke mulig at gennemse denne tjeneste"
+
+#: ../src/disco.py:643
+msgid "This type of service does not contain any items to browse."
+msgstr "Denne type tjeneste har ingen elementer som kan gennemses."
+
+#: ../src/disco.py:723
+#, python-format
+msgid "Browsing %s using account %s"
+msgstr "Gennemse %s med konto %s"
+
+#: ../src/disco.py:762
+msgid "_Browse"
+msgstr "_Gennemse"
+
+#: ../src/disco.py:924
+msgid "This service does not contain any items to browse."
+msgstr "Denne tjeneste har ingen elementer som kan gennemses."
+
+#: ../src/disco.py:1142
+msgid "_Execute Command"
+msgstr "_Kør Kommando"
+
+#: ../src/disco.py:1152 ../src/disco.py:1350
+msgid "Re_gister"
+msgstr "Re_gistrer"
+
+#: ../src/disco.py:1387
+#, python-format
+msgid "Scanning %d / %d.."
+msgstr "Skanner %d / %d.."
+
+#. Users column
+#: ../src/disco.py:1569
+msgid "Users"
+msgstr "Brugere"
+
+#. Description column
+#: ../src/disco.py:1577
+msgid "Description"
+msgstr "Beskrivelse"
+
+#. Id column
+#: ../src/disco.py:1585
+msgid "Id"
+msgstr "Id"
+
+#: ../src/disco.py:1814
+msgid "Subscribed"
+msgstr "Abonnerede"
+
+#: ../src/disco.py:1822
+msgid "Node"
+msgstr "Knude"
+
+#: ../src/disco.py:1879
+msgid "New post"
+msgstr "Ny post"
+
+#: ../src/disco.py:1885
+msgid "_Subscribe"
+msgstr "_Abonner"
+
+#: ../src/disco.py:1891
+msgid "_Unsubscribe"
+msgstr "_Frameld abonnement"
+
+#: ../src/features_window.py:41
+msgid "PyOpenSSL"
+msgstr "PyOpenSSL"
+
+#: ../src/features_window.py:42
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr "Et bibliotek brugt til at validere server certifikater for at sikre en sikker forbindelse."
+
+#: ../src/features_window.py:43 ../src/features_window.py:44
+msgid "Requires python-pyopenssl."
+msgstr "Kræver python-pyopenssl."
+
+#: ../src/features_window.py:45
+msgid "Bonjour / Zeroconf"
+msgstr "Bonjour / Zeroconf"
+
+#: ../src/features_window.py:46
+msgid "Serverless chatting with autodetected clients in a local network."
+msgstr "Serverløs samtale med automatisk opdagede klienter i et lokalt netværk."
+
+#: ../src/features_window.py:47
+msgid "Requires python-avahi."
+msgstr "Kræver python-avahi."
+
+#: ../src/features_window.py:48
+msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgstr "Kræver pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+
+#: ../src/features_window.py:49
+msgid "gajim-remote"
+msgstr "gajim-fjernstyring"
+
+#: ../src/features_window.py:50
+msgid "A script to controle gajim via commandline."
+msgstr "Et script til at kontrollere gajim via kommandolinjen"
+
+#: ../src/features_window.py:51
+msgid "Requires python-dbus."
+msgstr "Kræver python-dbus."
+
+#: ../src/features_window.py:52 ../src/features_window.py:56
+#: ../src/features_window.py:60 ../src/features_window.py:64
+#: ../src/features_window.py:68 ../src/features_window.py:76
+#: ../src/features_window.py:80 ../src/features_window.py:92
+msgid "Feature not available under Windows."
+msgstr "Egenskab ikke tilgængelig under Windows."
+
+#: ../src/features_window.py:53
+msgid "OpenGPG"
+msgstr "OpenGPG"
+
+#: ../src/features_window.py:54
+msgid "Encrypting chatmessages with gpg keys."
+msgstr "Krypter samtale beskeder med gpg nøgler."
+
+#: ../src/features_window.py:55
+msgid "Requires gpg and python-GnuPGInterface."
+msgstr "Kræver gpg og python-GnuPGInterface."
+
+#: ../src/features_window.py:57
+msgid "network-manager"
+msgstr "network-manager"
+
+#: ../src/features_window.py:58
+msgid "Autodetection of network status."
+msgstr "Automatisk opdagelse af netværksstatus."
+
+#: ../src/features_window.py:59
+msgid "Requires gnome-network-manager and python-dbus."
+msgstr "Kræver gnome-network-manager og python-dbus."
+
+#: ../src/features_window.py:61
+msgid "Session Management"
+msgstr "Sessions Håndtering"
+
+#: ../src/features_window.py:62
+msgid "Gajim session is stored on logout and restored on login."
+msgstr "Gajim sessionen bliver gemt ved logud og genoprettet ved logind."
+
+#: ../src/features_window.py:63
+msgid "Requires python-gnome2."
+msgstr "Kræver python-gnome2."
+
+#: ../src/features_window.py:65
+msgid "gnome-keyring"
+msgstr "gnome-nøglering"
+
+#: ../src/features_window.py:66
+msgid "Passwords can be stored securely and not just in plaintext."
+msgstr "Adgangskoder kan blive gemt sikkert og ikke bare i ren tekst."
+
+#: ../src/features_window.py:67
+msgid "Requires gnome-keyring and python-gnome2-desktop."
+msgstr "Kræver gnome-keyring og python-gnome2-desktop."
+
+#: ../src/features_window.py:69
+msgid "SRV"
+msgstr "SRV"
+
+#: ../src/features_window.py:70
+msgid "Ability to connect to servers which is using SRV records."
+msgstr "Evnen til at tilslutte til servere som bruger SRV poster."
+
+#: ../src/features_window.py:71
+msgid "Requires dnsutils."
+msgstr "Kræver dnsutils."
+
+#: ../src/features_window.py:72
+msgid "Requires nslookup to use SRV records."
+msgstr "Kræver nslookup for at bruge SRV poster."
+
+#: ../src/features_window.py:73
+msgid "Spell Checker"
+msgstr "Stavekontrol"
+
+#: ../src/features_window.py:74
+msgid "Spellchecking of composed messages."
+msgstr "Stavekontrol af forfattede beskeder."
+
+#: ../src/features_window.py:75
+msgid ""
+"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
+"sources."
+msgstr "Kræver python-gnome2-extras eller kompilering af gtkspell modulet fra Gajim kildekoden."
+
+#: ../src/features_window.py:77
+msgid "Notification-daemon"
+msgstr "Påmindelses-dæmon"
+
+#: ../src/features_window.py:78
+msgid "Passive popups notifying for new events."
+msgstr "Passive pop op vinduer som påminder om nye hændelser."
+
+#: ../src/features_window.py:79
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr "Kræver python-notify eller python-dbus i forbindelse med påmindelses-dæmonen."
+
+#: ../src/features_window.py:81
+msgid "Trayicon"
+msgstr "Statusikon"
+
+#: ../src/features_window.py:82
+msgid "A icon in systemtray reflecting the current presence."
+msgstr "Et ikon i statusfeltet som viser din nuværende tilstedeværelse."
+
+#: ../src/features_window.py:83
+msgid ""
+"Requires python-gnome2-extras or compiled  trayicon module from Gajim "
+"sources."
+msgstr "Kræver python-gnome2-extras eller et kompileret statusikon modul fra Gajim kildekoden."
+
+#: ../src/features_window.py:84
+msgid "Requires PyGTK >= 2.10."
+msgstr "Kræver PyGTK >= 2.10."
+
+#: ../src/features_window.py:85
+msgid "Idle"
+msgstr "Tomgang"
+
+#: ../src/features_window.py:86
+msgid "Ability to measure idle time, in order to set auto status."
+msgstr "Evnen til at måle tomgangs tid, for at kunne sætte automatisk status."
+
+#: ../src/features_window.py:87 ../src/features_window.py:88
+msgid "Requires compilation of the idle module from Gajim sources."
+msgstr "Kræver kompilering af tomgangs modulet fra Gajim kildekoden."
+
+#: ../src/features_window.py:89
+msgid "LaTeX"
+msgstr "LaTeX"
+
+#: ../src/features_window.py:90
+msgid "Transform LaTeX espressions between $$ $$."
+msgstr "Omdan LaTeX udtryk mellem $$ $$."
+
+#: ../src/features_window.py:91
+msgid ""
+"Requires texlive-latex-base, dvips and imagemagick. You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr "Kræver texlive-latex-base, dvips og imagemagick. Du må sætte 'use_latex' til True i den avancerede konfigurations editor."
+
+#: ../src/features_window.py:93
+msgid "End to end encryption"
+msgstr "Ende til ende kryptering"
+
+#: ../src/features_window.py:94
+msgid "Encrypting chatmessages."
+msgstr "Krypterer samtale beskeder."
+
+#: ../src/features_window.py:95 ../src/features_window.py:96
+msgid "Requires python-crypto."
+msgstr "Kræver python-crypto."
+
+#: ../src/features_window.py:97
+msgid "RST Generator"
+msgstr "RST Generator"
+
+#: ../src/features_window.py:98
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr "Generer XHTML uddata fra RST kode (se http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)."
+
+#: ../src/features_window.py:99 ../src/features_window.py:100
+msgid "Requires python-docutils."
+msgstr "Kræver python-docutils."
+
+#: ../src/features_window.py:107 ../src/common/helpers.py:239
+msgid "Available"
+msgstr "Tilgængelig"
+
+#: ../src/features_window.py:114
+msgid "Feature"
+msgstr "Egenskab"
+
+#: ../src/filetransfers_window.py:72
+msgid "File"
+msgstr "Fil"
+
+#: ../src/filetransfers_window.py:87
+msgid "Time"
+msgstr "Tid"
+
+#: ../src/filetransfers_window.py:99
+msgid "Progress"
+msgstr "Fremgang"
+
+#: ../src/filetransfers_window.py:159 ../src/filetransfers_window.py:213
+#, python-format
+msgid "Filename: %s"
+msgstr "Filnavn: %s"
+
+#: ../src/filetransfers_window.py:160 ../src/filetransfers_window.py:288
+#, python-format
+msgid "Size: %s"
+msgstr "Størrelse: %s"
+
+#. You is a reply of who sent a file
+#. You is a reply of who received a file
+#: ../src/filetransfers_window.py:169 ../src/filetransfers_window.py:179
+#: ../src/history_manager.py:463
+msgid "You"
+msgstr "Du"
+
+#: ../src/filetransfers_window.py:170
+#, python-format
+msgid "Sender: %s"
+msgstr "Afsender: %s"
+
+#: ../src/filetransfers_window.py:171 ../src/filetransfers_window.py:577
+#: ../src/tooltips.py:586
+msgid "Recipient: "
+msgstr "Modtager: "
+
+#: ../src/filetransfers_window.py:182
+#, python-format
+msgid "Saved in: %s"
+msgstr "Gemt i: %s"
+
+#: ../src/filetransfers_window.py:184
+msgid "File transfer completed"
+msgstr "Filoverførsel er fuldført"
+
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:204
+msgid "File transfer cancelled"
+msgstr "Filoverførsel er afbrudt"
+
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:205
+msgid "Connection with peer cannot be established."
+msgstr "Tilslutning til ligeværdige kan ikke oprettes."
+
+#: ../src/filetransfers_window.py:214
+#, python-format
+msgid "Recipient: %s"
+msgstr "Modtager: %s"
+
+#: ../src/filetransfers_window.py:216
+#, python-format
+msgid "Error message: %s"
+msgstr "Fejl besked: %s"
+
+#: ../src/filetransfers_window.py:217
+msgid "File transfer stopped by the contact at the other end"
+msgstr "Filoverførslen blev stoppet af kontakten i den anden ende"
+
+#: ../src/filetransfers_window.py:234
+msgid "Choose File to Send..."
+msgstr "Vælg en Fil at Sende..."
+
+#: ../src/filetransfers_window.py:253
+msgid "Gajim cannot access this file"
+msgstr "Gajim kan ikke tilgå denne fil"
+
+#: ../src/filetransfers_window.py:254
+msgid "This file is being used by another process."
+msgstr "Denne fil bliver brugt af en anden proces."
+
+#: ../src/filetransfers_window.py:286
+#, python-format
+msgid "File: %s"
+msgstr "Fil: %s"
+
+#: ../src/filetransfers_window.py:291
+#, python-format
+msgid "Type: %s"
+msgstr "Type: %s"
+
+#: ../src/filetransfers_window.py:293
+#, python-format
+msgid "Description: %s"
+msgstr "Beskrivelse: %s"
+
+#: ../src/filetransfers_window.py:294
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s vil gerne sende dig en fil:"
+
+#: ../src/filetransfers_window.py:308 ../src/gtkgui_helpers.py:767
+#, python-format
+msgid "Cannot overwrite existing file \"%s\""
+msgstr "Kan ikke overskrive den eksisterende fil \"%s\""
+
+#: ../src/filetransfers_window.py:309 ../src/gtkgui_helpers.py:769
+msgid ""
+"A file with this name already exists and you do not have permission to "
+"overwrite it."
+msgstr ""
+"En fil med dette navn eksisterer allerede og du har ikke rettigheder til at "
+"overskrive den."
+
+#: ../src/filetransfers_window.py:316 ../src/gtkgui_helpers.py:773
+msgid "This file already exists"
+msgstr "Denne fil eksisterer allerede"
+
+#: ../src/filetransfers_window.py:316 ../src/gtkgui_helpers.py:773
+msgid "What do you want to do?"
+msgstr "Hvad vil du gøre?"
+
+#: ../src/filetransfers_window.py:328 ../src/gtkgui_helpers.py:783
+#, python-format
+msgid "Directory \"%s\" is not writable"
+msgstr "Kataloget \"%s\" er ikke skrivbart"
+
+#: ../src/filetransfers_window.py:328 ../src/gtkgui_helpers.py:784
+msgid "You do not have permission to create files in this directory."
+msgstr "Du har ikke rettigheder til at oprette filer i dette katalog."
+
+#: ../src/filetransfers_window.py:338
+msgid "Save File as..."
+msgstr "Gem Fil som..."
+
+#. Print remaining time in format 00:00:00
+#. You can change the places of (hours), (minutes), (seconds) -
+#. they are not translatable.
+#: ../src/filetransfers_window.py:419
+#, python-format
+msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
+msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
+
+#. This should make the string Kb/s,
+#. where 'Kb' part is taken from %s.
+#. Only the 's' after / (which means second) should be translated.
+#: ../src/filetransfers_window.py:508
+#, python-format
+msgid "(%(filesize_unit)s/s)"
+msgstr "(%(filesize_unit)s/s)"
+
+#: ../src/filetransfers_window.py:547 ../src/filetransfers_window.py:550
+msgid "Invalid File"
+msgstr "Ugyldig Fil"
+
+#: ../src/filetransfers_window.py:547
+msgid "File: "
+msgstr "Fil: "
+
+#: ../src/filetransfers_window.py:551
+msgid "It is not possible to send empty files"
+msgstr "Det er ikke mulig at sende tomme filer"
+
+#: ../src/filetransfers_window.py:573 ../src/tooltips.py:576
+msgid "Name: "
+msgstr "Navn: "
+
+#: ../src/filetransfers_window.py:575 ../src/tooltips.py:580
+msgid "Sender: "
+msgstr "Afsender: "
+
+#: ../src/filetransfers_window.py:763
+msgid "Pause"
+msgstr "Pause"
+
+#: ../src/gajim.py:50
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr "%s er ikke et gyldigt logniveau"
+
+#: ../src/gajim.py:143
+msgid "Gajim needs X server to run. Quiting..."
+msgstr "Gajim behøver en X server for at kunne køre. Slutter..."
+
+#: ../src/gajim.py:147
+msgid "Gajim needs PyGTK 2.8 or above"
+msgstr "Gajim behøver PyGTK 2.8 eller højere"
+
+#: ../src/gajim.py:148
+msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
+msgstr "Gajim behøver PyGTK 2.8 eller højere for at køre. Slutter..."
+
+#: ../src/gajim.py:150
+msgid "Gajim needs GTK 2.8 or above"
+msgstr "Gajim behøver GTK 2.8 eller højere"
+
+#: ../src/gajim.py:151
+msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
+msgstr "Gajim behøver GTK 2.8 eller højere for at køre. Slutter..."
+
+#: ../src/gajim.py:156
+msgid "GTK+ runtime is missing libglade support"
+msgstr "GTK+ udførselsmiljø mangler libglade understøttelse"
+
+#: ../src/gajim.py:158
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Fjern venligst dit nuværende GTK+ udførselsmiljø og installer den sidste "
+"stabile version fra %s"
+
+#: ../src/gajim.py:160
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr ""
+"Hver venligst sikker på at GTK+ og PyGTK har libglade understøttelse på dit "
+"system."
+
+#: ../src/gajim.py:165
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Gajim behøver PySQLite2 for at køre"
+
+#: ../src/gajim.py:173
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim behøver pywin32 for at køre"
+
+#: ../src/gajim.py:174
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+"Hver venligst sikker på at Pywin32 er installeret på dit system. Du kan få "
+"det fra %s"
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:317
+msgid "Gajim is already running"
+msgstr "Gajim kører allerede"
+
+#: ../src/gajim.py:318
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+"En anden instans af Gajim ser ud til at køre\n"
+"Kør alligevel?"
+
+#: ../src/gajim.py:341 ../src/common/connection_handlers.py:900
+#: ../src/common/connection_handlers.py:1601
+#: ../src/common/connection_handlers.py:1629
+#: ../src/common/connection_handlers.py:1639
+#: ../src/common/connection_handlers.py:1658
+#: ../src/common/connection_handlers.py:1889
+#: ../src/common/connection_handlers.py:2001 ../src/common/connection.py:925
+msgid "Disk Write Error"
+msgstr "Disk skrivefejl"
+
+#: ../src/gajim.py:434
+msgid "Do you accept this request?"
+msgstr "Accepterer du denne forespørsel?"
+
+#: ../src/gajim.py:437
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "HTTP (%s) Autorisering for %s (id: %s)"
+
+#: ../src/gajim.py:484 ../src/notify.py:448
+msgid "Connection Failed"
+msgstr "Tilslutning Fejlede"
+
+#: ../src/gajim.py:817
+#, python-format
+msgid "Subject: %s"
+msgstr "Emne: %s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:864 ../src/gajim.py:877
+#, python-format
+msgid "error while sending %s ( %s )"
+msgstr "fejl opstod under sending %s ( %s )"
+
+#: ../src/gajim.py:910
+msgid "Authorization accepted"
+msgstr "Autorisering accepteret"
+
+#: ../src/gajim.py:911
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Kontakten \"%s\" har godkendt dig til at se hans eller hendes status."
+
+#: ../src/gajim.py:919
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Kontakt \"%s\" har fjernet abonneringen på dig"
+
+#: ../src/gajim.py:920
+msgid "You will always see him or her as offline."
+msgstr "Du vil altid se ham eller hende som ikke tilsluttet."
+
+#: ../src/gajim.py:964
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Kontakt med \"%s\" kan ikke blive etableret"
+
+#: ../src/gajim.py:965 ../src/common/connection.py:466
+msgid "Check your connection or try again later."
+msgstr "Kontroller din tilslutning eller forsøg igen senere."
+
+#: ../src/gajim.py:1136 ../src/roster_window.py:1348
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s er nu %s (%s)"
+
+#. No status message
+#: ../src/gajim.py:1139 ../src/groupchat_control.py:1101
+#: ../src/roster_window.py:1351
+#, python-format
+msgid "%s is now %s"
+msgstr "%s er nu %s"
+
+#. Can be a presence (see chg_contact_status in groupchat_contol.py)
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/gajim.py:1259 ../src/groupchat_control.py:913
+msgid "Any occupant is allowed to see your full JID"
+msgstr "En hvilken som helst deltager har lov til at se din fulde JID"
+
+#: ../src/gajim.py:1261
+msgid "Room now shows unavailable member"
+msgstr "Rummet viser nu; ikke tilgængelige medlemmer"
+
+#: ../src/gajim.py:1263
+msgid "room now does not show unavailable members"
+msgstr "Rummet viser nu ikke; ikke tilgængelige medlemmer"
+
+#: ../src/gajim.py:1266
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr "En ændring i en non-privacy-related rum konfiguration har forekommet"
+
+#. Can be a presence (see chg_contact_status in groupchat_contol.py)
+#: ../src/gajim.py:1269
+msgid "Room logging is now enabled"
+msgstr "Rum logging er nu aktiveret"
+
+#: ../src/gajim.py:1271
+msgid "Room logging is now disabled"
+msgstr "Rum logging er nu deaktiveret"
+
+#: ../src/gajim.py:1273
+msgid "Room is now non-anonymous"
+msgstr "Rummet er nu ikke-anonymt"
+
+#: ../src/gajim.py:1275
+msgid "Room is now semi-anonymous"
+msgstr "Rummet er nu semi-anonymt"
+
+#: ../src/gajim.py:1277
+msgid "Room is now fully-anonymous"
+msgstr "Rummet er nu helt anonymt"
+
+#: ../src/gajim.py:1308
+#, python-format
+msgid "A Password is required to join the room %s. Please type it"
+msgstr "En adgangskode er påkrævet for at deltage i rummet %s. Skriv venligst din adgangskode"
+
+#: ../src/gajim.py:1338
+msgid "Your passphrase is incorrect"
+msgstr "Dit pgp-løsen er ikke korrekt"
+
+#: ../src/gajim.py:1339
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Du er for øjeblikket tilsluttet uden din OpenPGP nøgle."
+
+#: ../src/gajim.py:1443
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Ny e-post på %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1445
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Du har %d ny e-post samtale"
+msgstr[1] "Du har %d nye e-post samtaler"
+
+# Du har %d nye e-post samtaler
+#. FIXME: emulate Gtalk client popups. find out what they parse and how
+#. they decide what to show
+#. each message has a 'From', 'Subject' and 'Snippet' field
+#: ../src/gajim.py:1454
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+"\n"
+"Fra: %(from_address)s"
+
+#: ../src/gajim.py:1665
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s vil gerne sende dig en fil."
+
+#: ../src/gajim.py:1730
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Du har succesfuldt modtaget %(filename)s fra %(name)s"
+
+#. ft stopped
+#: ../src/gajim.py:1734
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Filoverførsel af %(filename)s fra %(name)s er stoppet."
+
+#: ../src/gajim.py:1747
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Du har succesfuldt sendt %(filename)s til %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1751
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Filoverførsel af %(filename)s til %(name)s er stoppet."
+
+#: ../src/gajim.py:1846
+msgid "Session negotiation cancelled"
+msgstr "Session forhandling annulleret"
+
+#: ../src/gajim.py:1847
+#, python-format
+msgid "The client at %s cancelled the session negotiation."
+msgstr "Klienten ved %s annullerede sessions forhandlingerne."
+
+#: ../src/gajim.py:1887 ../src/gajim.py:1928
+msgid "Confirm these session options"
+msgstr "Bekræft disse sessions indstillinger"
+
+#: ../src/gajim.py:1888
+#, python-format
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tAre these options acceptable?"
+msgstr ""
+"Den fjerne klient vil forhandle en session med disse egenskaber:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tKan disse indstillinger godkendes?"
+
+#: ../src/gajim.py:1929
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
+msgstr ""
+"Den fjerne klient valgte disse indstillinger:\n"
+"\n"
+"%s\n"
+"\n"
+"Fortsæt med sessionen?"
+
+#: ../src/gajim.py:2041
+msgid "Username Conflict"
+msgstr "Brugernavns Konflikt"
+
+#: ../src/gajim.py:2042
+msgid "Please type a new username for your local account"
+msgstr "Skriv et nyt brugernavn for din lokale konto"
+
+#: ../src/gajim.py:2059
+msgid "Ping?"
+msgstr "Ping?"
+
+#: ../src/gajim.py:2067
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s .s)"
+
+#: ../src/gajim.py:2073
+msgid "Error."
+msgstr "Fejl."
+
+#: ../src/gajim.py:2098
+msgid "Resource Conflict"
+msgstr "Ressource Konflikt"
+
+#: ../src/gajim.py:2099
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+"Du er allerede tilsluttet til denne konto med den samme ressource. Skriv "
+"venligst en ny"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:2461
+msgid "Could not save your settings and preferences"
+msgstr "Kunne ikke gemme din opsætning og indstillinger"
+
+#. sorted alphanum
+#: ../src/gajim.py:2596 ../src/common/config.py:86 ../src/common/config.py:395
+#: ../src/common/optparser.py:194 ../src/common/optparser.py:412
+#: ../src/common/optparser.py:446
+msgid "default"
+msgstr "standard"
+
+#: ../src/gajim.py:2683
+msgid "Network Manager support not available"
+msgstr "Netværks Manager understøttelse er ikke tilgængelig"
+
+#: ../src/gajim.py:2784
+msgid "Session Management support not available (missing gnome.ui module)"
+msgstr ""
+"Sesion håndterer understøttelse er ikke tilgængelig (mangler gnome.ui "
+"modulet)"
+
+#: ../src/gajim-remote.py:65
+msgid "Shows a help on specific command"
+msgstr "Viser hjælp for en specifik kommando"
+
+#. User gets help for the command, specified by this parameter
+#: ../src/gajim-remote.py:68
+msgid "command"
+msgstr "Kommando"
+
+#: ../src/gajim-remote.py:69
+msgid "show help on command"
+msgstr "Vis hjælp for kommando"
+
+#: ../src/gajim-remote.py:73
+msgid "Shows or hides the roster window"
+msgstr "Viser eller gemmer kontaktvinduet"
+
+#: ../src/gajim-remote.py:77
+msgid "Pops up a window with the next pending event"
+msgstr "Popper op et vindue ved næste hændelse"
+
+#: ../src/gajim-remote.py:81
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appears on a "
+"separate line"
+msgstr ""
+"Udskriver en liste af alle kontakter i kontaktvinduet. Hver kontakt placeres "
+"på en separat linie"
+
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:205 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:246 ../src/gajim-remote.py:255
+msgid "account"
+msgstr "Konto"
+
+#: ../src/gajim-remote.py:84
+msgid "show only contacts of the given account"
+msgstr "viser kun kontakter for den givne konto"
+
+#: ../src/gajim-remote.py:90
+msgid "Prints a list of registered accounts"
+msgstr "Udskriver en liste af registrerede kontoer"
+
+#: ../src/gajim-remote.py:94
+msgid "Changes the status of account or accounts"
+msgstr "Ændrer status for kontoen eller kontoer"
+
+#. offline, online, chat, away, xa, dnd, invisible should not be translated
+#: ../src/gajim-remote.py:97
+msgid "status"
+msgstr "status"
+
+#: ../src/gajim-remote.py:97
+msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+msgstr "en af: offline, online, chat, away, xa, dnd, invisible"
+
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:144
+msgid "message"
+msgstr "besked"
+
+#: ../src/gajim-remote.py:98
+msgid "status message"
+msgstr "status besked"
+
+#: ../src/gajim-remote.py:99
+msgid ""
+"change status of account \"account\". If not specified, try to change status "
+"of all accounts that have \"sync with global status\" option set"
+msgstr ""
+"Ændre status for konto \"konto\". Hvis ikke spesificeret, prøv at ændre "
+"status for alle kontoer der har sat \"synkroniser med generel status\" "
+"indstillingen"
+
+#: ../src/gajim-remote.py:105
+msgid "Shows the chat dialog so that you can send messages to a contact"
+msgstr "Vis samtale vinduet så du kan sende beskeder til en kontakt"
+
+#: ../src/gajim-remote.py:107
+msgid "JID of the contact that you want to chat with"
+msgstr "Kontaktens JID som du vil samtale med"
+
+#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:196
+msgid "if specified, contact is taken from the contact list of this account"
+msgstr "hvis specificeret vil kontakten tages fra kontaktlisten fra denne konto"
+
+#: ../src/gajim-remote.py:114
+msgid ""
+"Sends new chat message to a contact in the roster. Both OpenPGP key and "
+"account are optional. If you want to set only 'account', without 'OpenPGP "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Sender en ny besked til en kontakt i kontaktvinduet. Både OpenPGP nøgle og "
+"konto er valgfri. Hvis du ønsker at sætte en 'konto' uden 'OpenPGP nøgle', "
+"bare set 'OpenPGP nøgle' til ''."
+
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:131
+msgid "JID of the contact that will receive the message"
+msgstr "JID på den kontakt som skal modtage beskeden"
+
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144
+msgid "message contents"
+msgstr "besked indhold"
+
+#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134
+msgid "pgp key"
+msgstr "pgp nøgle"
+
+#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134
+msgid "if specified, the message will be encrypted using this public key"
+msgstr "hvis specificeret vil beskeden blive krypteret med denne nøgle"
+
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:145
+msgid "if specified, the message will be sent using this account"
+msgstr "hvis specificeret vil beskeden blive sendt med denne konto"
+
+#: ../src/gajim-remote.py:127
+msgid ""
+"Sends new single message to a contact in the roster. Both OpenPGP key and "
+"account are optional. If you want to set only 'account', without 'OpenPGP "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Sender en ny enkel besked til en kontakt i kontaktvinduet. Både OpenPGP "
+"nøgle og konto er valgfri. Hvis du ønsker at sætte en 'konto' uden 'OpenPGP "
+"nøgle', bare set 'OpenPGP nøgle' til ''."
+
+#: ../src/gajim-remote.py:132
+msgid "subject"
+msgstr "emne"
+
+#: ../src/gajim-remote.py:132
+msgid "message subject"
+msgstr "emne på besked"
+
+#: ../src/gajim-remote.py:141
+msgid "Sends new message to a groupchat you've joined."
+msgstr "Send en ny besked til en gruppesamtale du deltager i."
+
+#: ../src/gajim-remote.py:143
+msgid "JID of the room that will receive the message"
+msgstr "JID på den rum som skal modtage beskeden"
+
+#: ../src/gajim-remote.py:150
+msgid "Gets detailed info on a contact"
+msgstr "Få detaljeret information om kontakten"
+
+#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:165
+#: ../src/gajim-remote.py:195 ../src/gajim-remote.py:204
+msgid "JID of the contact"
+msgstr "Kontaktens JID"
+
+#: ../src/gajim-remote.py:156
+msgid "Gets detailed info on a account"
+msgstr "Få detaljeret information om kontoen"
+
+#: ../src/gajim-remote.py:158
+msgid "Name of the account"
+msgstr "Navn på kontoen"
+
+#: ../src/gajim-remote.py:162
+msgid "Sends file to a contact"
+msgstr "Send en fil til en kontakt"
+
+#: ../src/gajim-remote.py:164
+msgid "file"
+msgstr "fil"
+
+#: ../src/gajim-remote.py:164
+msgid "File path"
+msgstr "Filsti"
+
+#: ../src/gajim-remote.py:166
+msgid "if specified, file will be sent using this account"
+msgstr "hvis specificeret vil filen blive sendt med denne konto"
+
+#: ../src/gajim-remote.py:171
+msgid "Lists all preferences and their values"
+msgstr "Hvis alle indstillinger og deres værdier"
+
+#: ../src/gajim-remote.py:175
+msgid "Sets value of 'key' to 'value'."
+msgstr "Sætter værdien for 'nøglen' til 'værdi'."
+
+#: ../src/gajim-remote.py:177
+msgid "key=value"
+msgstr "nøgle=værdi"
+
+#: ../src/gajim-remote.py:177
+msgid "'key' is the name of the preference, 'value' is the value to set it to"
+msgstr ""
+"'nøgle' er navnet for indstillingen, 'værdi' er den værdi den er sat til"
+
+#: ../src/gajim-remote.py:182
+msgid "Deletes a preference item"
+msgstr "Sletter et indstillingspunkt"
+
+#: ../src/gajim-remote.py:184
+msgid "key"
+msgstr "nøgle"
+
+#: ../src/gajim-remote.py:184
+msgid "name of the preference to be deleted"
+msgstr "navn på den indstilling som skal slettes"
+
+#: ../src/gajim-remote.py:188
+msgid "Writes the current state of Gajim preferences to the .config file"
+msgstr ""
+"Skriver den nuværende tilstand af Gajims indstillinger til .config filen"
+
+#: ../src/gajim-remote.py:193
+msgid "Removes contact from roster"
+msgstr "Fjerner kontakt fra kontaktvinduet"
+
+#: ../src/gajim-remote.py:202
+msgid "Adds contact to roster"
+msgstr "Tilføjer kontakt til kontaktvinduet"
+
+#: ../src/gajim-remote.py:204
+msgid "jid"
+msgstr "jid"
+
+#: ../src/gajim-remote.py:205
+msgid "Adds new contact to this account"
+msgstr "Tilføjer ny kontakt til denne konto"
+
+#: ../src/gajim-remote.py:210
+msgid "Returns current status (the global one unless account is specified)"
+msgstr ""
+"Returnere den nuværende status (den globale status hvis ikke en konto er "
+"valgt)"
+
+#: ../src/gajim-remote.py:217
+msgid ""
+"Returns current status message(the global one unless account is specified)"
+msgstr ""
+"Returnere den nuværende statusbesked (den globale status besked hvis ikke en "
+"konto er valgt)"
+
+#: ../src/gajim-remote.py:224
+msgid "Returns number of unread messages"
+msgstr "Returnerer antal ikke læste beskeder"
+
+#: ../src/gajim-remote.py:228
+msgid "Opens 'Start Chat' dialog"
+msgstr "Åbner 'Start Samtale' vinduet"
+
+#: ../src/gajim-remote.py:230
+msgid "Starts chat, using this account"
+msgstr "Starter en samtale med denne konto"
+
+#: ../src/gajim-remote.py:234
+msgid "Sends custom XML"
+msgstr "Sender tilpasset XML"
+
+#: ../src/gajim-remote.py:236
+msgid "XML to send"
+msgstr "XML som skal sendes"
+
+#: ../src/gajim-remote.py:237
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Den konto hvor XML vil blive sendt; hvis ikke den er specificeret, vil XML "
+"blive sendt til alle kontoer"
+
+#: ../src/gajim-remote.py:243
+msgid "Handle a xmpp:/ uri"
+msgstr "Håndter en xmpp:/ uri"
+
+#: ../src/gajim-remote.py:245
+msgid "uri"
+msgstr "uri"
+
+#: ../src/gajim-remote.py:250
+msgid "Join a MUC room"
+msgstr "Deltag i et MUC rum"
+
+#: ../src/gajim-remote.py:252
+msgid "room"
+msgstr "rum"
+
+#: ../src/gajim-remote.py:253
+msgid "nick"
+msgstr "kælenavn"
+
+#: ../src/gajim-remote.py:254
+msgid "password"
+msgstr "adgangskode"
+
+#: ../src/gajim-remote.py:277
+msgid "Missing argument \"contact_jid\""
+msgstr "Manglende argument \"contact_jid\""
+
+#: ../src/gajim-remote.py:296
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"'%s' er ikke i dit kontaktvindue.\n"
+"Specificer venligst en konto for at sende beskeden."
+
+#: ../src/gajim-remote.py:299
+msgid "You have no active account"
+msgstr "Du har ingen aktiv konto"
+
+#: ../src/gajim-remote.py:363
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
+"Brug: %s %s %s \n"
+"\t %s"
+
+#: ../src/gajim-remote.py:366
+msgid "Arguments:"
+msgstr "Argumenter:"
+
+#: ../src/gajim-remote.py:370
+#, python-format
+msgid "%s not found"
+msgstr "%s ikke fundet"
+
+#: ../src/gajim-remote.py:374
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
+msgstr ""
+"Brug: %s kommando [argumenter]\n"
+"Kommando er en af:\n"
+
+#: ../src/gajim-remote.py:447
+#, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"For mange argumenter. \n"
+"Skriv \"%s help %s\" for mere information"
+
+#: ../src/gajim-remote.py:451
+#, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Argument \"%s\" er ikke specificeret. \n"
+"Skriv \"%s help %s\" for mere information"
+
+#: ../src/gajim-remote.py:469
+msgid "Wrong uri"
+msgstr "Forkert uri"
+
+#: ../src/gajim_themes_window.py:62
+msgid "Theme"
+msgstr "Tema"
+
+#: ../src/gajim_themes_window.py:100
+msgid "You cannot make changes to the default theme"
+msgstr "Du kan ikke lave ændringer til standard temaet"
+
+#: ../src/gajim_themes_window.py:101
+msgid "Please create a clean new theme with your desired name."
+msgstr "Opret et nyt tema med dit ønskede navn."
+
+#. don't confuse translators
+#: ../src/gajim_themes_window.py:175
+msgid "theme name"
+msgstr "Tema navn"
+
+#: ../src/gajim_themes_window.py:192
+msgid "You cannot delete your current theme"
+msgstr "Du kan ikke slette det nuværende tema"
+
+#: ../src/gajim_themes_window.py:193
+msgid "Please first choose another for your current theme."
+msgstr "Vælg venligst en anden for dit nuværende tema."
+
+#: ../src/groupchat_control.py:134
+msgid "Sending private message failed"
+msgstr "Sending af privat besked fejlede"
+
+#. in second %s code replaces with nickname
+#: ../src/groupchat_control.py:136
+#, python-format
+msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
+msgstr ""
+"Du er ikke længere i gruppe samtale \"%s\" eller \"%s\" har forladt rummet."
+
+#: ../src/groupchat_control.py:342
+msgid "Insert Nickname"
+msgstr "Indsæt Kælenavn"
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:916
+msgid "Room logging is enabled"
+msgstr "Rum logging er aktiveret"
+
+#: ../src/groupchat_control.py:918
+msgid "A new room has been created"
+msgstr "Et nyt rum er blevet oprettet"
+
+#: ../src/groupchat_control.py:921
+msgid "The server has assigned or modified your roomnick"
+msgstr "Serveren har fastsat eller ændret dit kælenavn for rummet"
+
+#. do not print 'kicked by None'
+#: ../src/groupchat_control.py:927
+#, python-format
+msgid "%(nick)s has been kicked: %(reason)s"
+msgstr "%(nick)s er blevet udvist: %(reason)s"
+
+#: ../src/groupchat_control.py:931
+#, python-format
+msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
+msgstr "%(nick)s er blevet udvist af %(who)s: %(reason)s"
+
+#. do not print 'banned by None'
+#: ../src/groupchat_control.py:938
+#, python-format
+msgid "%(nick)s has been banned: %(reason)s"
+msgstr "%(nick)s er blevet uønsket: %(reason)s"
+
+#: ../src/groupchat_control.py:942
+#, python-format
+msgid "%(nick)s has been banned by %(who)s: %(reason)s"
+msgstr "%(nick)s er blevet uønsket af %(who)s: %(reason)s"
+
+#. Someone changed his or her nick
+#. We changed our nick
+#: ../src/groupchat_control.py:949
+#, python-format
+msgid "You are now known as %s"
+msgstr "Du er nu kendt som %s"
+
+#: ../src/groupchat_control.py:951
+#, python-format
+msgid "%s is now known as %s"
+msgstr "%s er nu kendt som %s"
+
+#: ../src/groupchat_control.py:984 ../src/groupchat_control.py:988
+#: ../src/groupchat_control.py:993
+#, python-format
+msgid "%(nick)s has been removed from the room (%(reason)s)"
+msgstr "%(nick)s er blevet fjernet fra rummet %(reason)s"
+
+#: ../src/groupchat_control.py:985
+msgid "affiliation changed"
+msgstr "tilknytning ændret"
+
+#: ../src/groupchat_control.py:990
+msgid "room configuration changed to members-only"
+msgstr "Rum konfiguration er blevet ændret til 'kun for medlemmer'"
+
+#: ../src/groupchat_control.py:995
+msgid "system shutdown"
+msgstr "computeren slukkes"
+
+#: ../src/groupchat_control.py:1094
+#, python-format
+msgid "%s has left"
+msgstr "%s har forladt samtalen"
+
+#: ../src/groupchat_control.py:1099
+#, python-format
+msgid "%s has joined the group chat"
+msgstr "%s deltager nu i gruppe samtalen"
+
+#. Invalid Nickname
+#. invalid char
+#: ../src/groupchat_control.py:1212 ../src/groupchat_control.py:1494
+msgid "Invalid nickname"
+msgstr "Ugyldigt kælenavn"
+
+#: ../src/groupchat_control.py:1213 ../src/groupchat_control.py:1495
+msgid "The nickname has not allowed characters."
+msgstr "Kælenavnet har ikke tilladte tegn."
+
+#: ../src/groupchat_control.py:1236 ../src/groupchat_control.py:1254
+#: ../src/groupchat_control.py:1341 ../src/groupchat_control.py:1358
+#, python-format
+msgid "Nickname not found: %s"
+msgstr "Kælenavn ikke fundet: %s"
+
+#: ../src/groupchat_control.py:1270
+msgid "This group chat has no subject"
+msgstr "Denne gruppe samtale har ikke noget emne"
+
+#: ../src/groupchat_control.py:1281
+#, python-format
+msgid "Invited %(contact_jid)s to %(room_jid)s."
+msgstr "Inviterede %(contact_jid)s til %(room_jid)s."
+
+#. %s is something the user wrote but it is not a jid so we inform
+#: ../src/groupchat_control.py:1314
+#, python-format
+msgid "%s does not appear to be a valid JID"
+msgstr "%s ser ikke ud til at være et gyldigt JID"
+
+#: ../src/groupchat_control.py:1421
+#, python-format
+msgid ""
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
+msgstr ""
+"Brug: /%s <kælenavn|JID> [begrundelse], udviser denne JID fra gruppe "
+"samtalen. Kælenavnet til en bruger kan bruges, men ikke hvis det indeholder "
+"\"@\". Hvis en bruger med JID'en er tilstede i gruppe samtalen vil han/hun/"
+"den/det også blive udvist. Mellemrum i kælenavnet er ikke understøttet."
+
+#: ../src/groupchat_control.py:1428
+#, python-format
+msgid ""
+"Usage: /%s <nickname>, opens a private chat window with the specified "
+"occupant."
+msgstr "Brug: /%s <kælenavn>, åbner et privat samtale vindue med den specificerede bruger."
+
+#: ../src/groupchat_control.py:1434
+#, python-format
+msgid ""
+"Usage: /%s [reason], closes the current window or tab, displaying reason if "
+"specified."
+msgstr ""
+"Brug: /%s [begrundelse], lukker det nuværende vindue eller fan, visende "
+"begrundelsen hvis specificeret."
+
+#: ../src/groupchat_control.py:1440
+#, python-format
+msgid ""
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
+"providing a reason."
+msgstr "Brug: /%s <JID> [begrundelse], inviter JID til den nuværende gruppe samtale, visende begrundelsen hvis specificeret"
+
+#: ../src/groupchat_control.py:1444
+#, python-format
+msgid ""
+"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
+"using specified nickname."
+msgstr "Brug: /%s <rum>@<server>[/kælenavn], tilbyder at deltage i rum@server eventuelt med det specificerede kælenavn."
+
+#: ../src/groupchat_control.py:1448
+#, python-format
+msgid ""
+"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
+msgstr "Brug: /%s <kælenavn> [begrundelse], fjerner deltager med kælenavnet fra gruppe samtalen og hvis specificeret, viser en begrundelse"
+
+#: ../src/groupchat_control.py:1457
+#, python-format
+msgid ""
+"Usage: /%s <nickname> [message], opens a private message window and sends "
+"message to the occupant specified by nickname."
+msgstr "Brug: /%s <kælenavn> [besked], åbner et privat samtale vindue og sender beskeden til deltageren med det specificerede kælenavn."
+
+#: ../src/groupchat_control.py:1462
+#, python-format
+msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+msgstr ""
+"Brug: /%s <kælenavn>, ændrer dit kælenavn i den nuværende gruppe samtale."
+
+#: ../src/groupchat_control.py:1466
+#, python-format
+msgid "Usage: /%s , display the names of group chat occupants."
+msgstr "Brug: /%s , viser navnene på deltagerne i gruppe samtalen."
+
+#: ../src/groupchat_control.py:1470
+#, python-format
+msgid "Usage: /%s [topic], displays or updates the current group chat topic."
+msgstr ""
+"Brug: /%s [emne], viser eller opdaterer det nuværende gruppe samtale emne."
+
+#: ../src/groupchat_control.py:1473
+#, python-format
+msgid ""
+"Usage: /%s <message>, sends a message without looking for other commands."
+msgstr ""
+"Brug: /%s <besked>, sender en besked uden at kigge efter andre kommandoer."
+
+#: ../src/groupchat_control.py:1568
+#, python-format
+msgid "Are you sure you want to leave group chat \"%s\"?"
+msgstr "Er du sikker på du vil forlade gruppe samtalen \"%s\"?"
+
+#: ../src/groupchat_control.py:1570
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
+msgstr ""
+"Hvis du lukker dette vindue vil du blive frakoblet fra denne gruppe samtale."
+
+#: ../src/groupchat_control.py:1574 ../src/roster_window.py:4835
+msgid "Do _not ask me again"
+msgstr "Ikke spørg mig ige_n"
+
+#: ../src/groupchat_control.py:1608
+msgid "Changing Subject"
+msgstr "Ændre emne"
+
+#: ../src/groupchat_control.py:1609
+msgid "Please specify the new subject:"
+msgstr "Anfør et nyt emne:"
+
+#: ../src/groupchat_control.py:1618
+msgid "Changing Nickname"
+msgstr "Ændre kælenavn"
+
+#: ../src/groupchat_control.py:1619
+msgid "Please specify the new nickname you want to use:"
+msgstr "Anfør dit nye kælenavn:"
+
+#. Ask for a reason
+#: ../src/groupchat_control.py:1634
+#, python-format
+msgid "Destroying %s"
+msgstr "Fjern %s"
+
+#: ../src/groupchat_control.py:1635
+msgid ""
+"You are going to definitively destroy this room.\n"
+"You may specify a reason below:"
+msgstr ""
+"Du er ved at definitivt fjerne dette rum.\n"
+"Du kan anføre en grund herunder:"
+
+#: ../src/groupchat_control.py:1637
+msgid "You may also enter an alternate venue:"
+msgstr "Du kan også indtaste et alternativt mødested:"
+
+#: ../src/groupchat_control.py:1668
+msgid "Bookmark already set"
+msgstr "Bogmærke er allerede sat"
+
+#: ../src/groupchat_control.py:1669
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Gruppe samtale \"%s\" er allerede i dine bogmærker."
+
+#: ../src/groupchat_control.py:1678
+msgid "Bookmark has been added successfully"
+msgstr "Bogmærket er blevet tilføjet succesfuldt"
+
+#: ../src/groupchat_control.py:1679
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr ""
+"De kan håndtere dine bogmærker via Handlings menuen i dit kontaktvindue."
+
+#. ask for reason
+#: ../src/groupchat_control.py:1831
+#, python-format
+msgid "Kicking %s"
+msgstr "Sparker %s"
+
+#: ../src/groupchat_control.py:1832 ../src/groupchat_control.py:2132
+msgid "You may specify a reason below:"
+msgstr "Du kan anføre en begrundelse under:"
+
+#. ask for reason
+#: ../src/groupchat_control.py:2131
+#, python-format
+msgid "Banning %s"
+msgstr "Udeluk %s"
+
+#: ../src/gtkexcepthook.py:41
+msgid "A programming error has been detected"
+msgstr "En programmeringsfejl er blevet opdaget"
+
+#: ../src/gtkexcepthook.py:42
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
+msgstr ""
+"Den er sikkert ikke kritisk, men bør alligevel rapporteres til udviklerne."
+
+#: ../src/gtkexcepthook.py:48
+msgid "_Report Bug"
+msgstr "_Rapporter Fejl"
+
+#: ../src/gtkexcepthook.py:71
+msgid "Details"
+msgstr "Detaljer"
+
+#. we talk about file
+#: ../src/gtkgui_helpers.py:157 ../src/gtkgui_helpers.py:172
+#, python-format
+msgid "Error: cannot open %s for reading"
+msgstr "Fejl: kan ikke åbne %s for læsning"
+
+#: ../src/gtkgui_helpers.py:337
+msgid "Error reading file:"
+msgstr "Fejl ved læsning af fil:"
+
+#: ../src/gtkgui_helpers.py:340
+msgid "Error parsing file:"
+msgstr "Fejl ved fortolkning af fil:"
+
+#. do not traceback (could be a permission problem)
+#. we talk about a file here
+#: ../src/gtkgui_helpers.py:377
+#, python-format
+msgid "Could not write to %s. Session Management support will not work"
+msgstr ""
+"Kunne ikke skrive til %s. Sessions håndterings understøttelse vil ikke virke"
+
+#. xmpp: is currently handled by another program, so ask the user
+#: ../src/gtkgui_helpers.py:711
+msgid "Gajim is not the default Jabber client"
+msgstr "Gajim er ikke standard Jabber client"
+
+#: ../src/gtkgui_helpers.py:712
+msgid "Would you like to make Gajim the default Jabber client?"
+msgstr "Har du lyst til at gøre Gajim til standard Jabber client?"
+
+#: ../src/gtkgui_helpers.py:713
+msgid "Always check to see if Gajim is the default Jabber client on startup"
+msgstr "Altid kontroller om Gajim er standard Jabber client ved opstart"
+
+#: ../src/gtkgui_helpers.py:812
+msgid "Extension not supported"
+msgstr "Udvidelse er ikke understøttet"
+
+#: ../src/gtkgui_helpers.py:813
+#, python-format
+msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
+msgstr "Billede kan ikke gemmes i formatet %(type)s. Gem som %(new_filename)s?"
+
+#: ../src/gtkgui_helpers.py:822
+msgid "Save Image as..."
+msgstr "Gem Billede som..."
+
+#: ../src/history_manager.py:68
+msgid "Cannot find history logs database"
+msgstr "Kan ikke finde historik log databasen"
+
+#. holds jid
+#: ../src/history_manager.py:108
+msgid "Contacts"
+msgstr "Kontakter"
+
+#. holds time
+#: ../src/history_manager.py:121 ../src/history_manager.py:161
+#: ../src/history_window.py:86
+msgid "Date"
+msgstr "Dato"
+
+#. holds nickname
+#: ../src/history_manager.py:127 ../src/history_manager.py:179
+msgid "Nickname"
+msgstr "Kælenavn"
+
+#. holds message
+#: ../src/history_manager.py:135 ../src/history_manager.py:167
+#: ../src/history_window.py:94
+msgid "Message"
+msgstr "Besked"
+
+#: ../src/history_manager.py:187
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
+msgstr ""
+"Vil du rydde op i databasen? (DETTE ER IKKE ANBEFALET HVIS GAJIM KØRER)"
+
+#: ../src/history_manager.py:189
+msgid ""
+"Normally allocated database size will not be freed, it will just become "
+"reusable. If you really want to reduce database filesize, click YES, else "
+"click NO.\n"
+"\n"
+"In case you click YES, please wait..."
+msgstr ""
+"Normalt vil den allokerede database størrelse ikke blive frigjort, den vil "
+"bare kunne genbruges. Hvis du virkelig vil reducere database filstørrelsen, "
+"tryk JA, eller tryk NEJ.\n"
+"\n"
+"I tilfælde du trykker JA, venligst vent..."
+
+#: ../src/history_manager.py:401
+msgid "Exporting History Logs..."
+msgstr "Eksporter Historik Log..."
+
+#: ../src/history_manager.py:476
+#, python-format
+msgid "%(who)s on %(time)s said: %(message)s\n"
+msgstr "%(who)s klokken %(time)s sagde: %(message)s\n"
+
+#: ../src/history_manager.py:514
+msgid "Do you really want to delete logs of the selected contact?"
+msgid_plural "Do you really want to delete logs of the selected contacts?"
+msgstr[0] "Vil du virkelig slette loggen for den valgte kontakt?"
+msgstr[1] "Vil du virkelig slette loggene fra de valgte kontakter?"
+
+#: ../src/history_manager.py:518 ../src/history_manager.py:554
+msgid "This is an irreversible operation."
+msgstr "Dette er en irreversibel handling."
+
+#: ../src/history_manager.py:551
+msgid "Do you really want to delete the selected message?"
+msgid_plural "Do you really want to delete the selected messages?"
+msgstr[0] "Vil du virkelig slette den valgte besked?"
+msgstr[1] "Vil du virkelig slette de valgte beskeder?"
+
+#: ../src/history_window.py:103 ../src/history_window.py:105
+#, python-format
+msgid "Conversation History with %s"
+msgstr "Konversations Historik med %s"
+
+#: ../src/history_window.py:266
+#, python-format
+msgid "%(nick)s is now %(status)s: %(status_msg)s"
+msgstr "%(nick)s er nu %(status)s: %(status_msg)s"
+
+#: ../src/history_window.py:270 ../src/notify.py:206
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s er nu %(status)s"
+
+#: ../src/history_window.py:276
+#, python-format
+msgid "Status is now: %(status)s: %(status_msg)s"
+msgstr "Status er nu: %(status)s: %(status_msg)s"
+
+#: ../src/history_window.py:279
+#, python-format
+msgid "Status is now: %(status)s"
+msgstr "Status er nu: %(status)s"
+
+#: ../src/htmltextview.py:583 ../src/htmltextview.py:594
+msgid "Timeout loading image"
+msgstr "Tidsudløb nået for at laste billede"
+
+#: ../src/htmltextview.py:604
+msgid "Image is too big"
+msgstr "Billede er for stort"
+
+#: ../src/message_window.py:288
+msgid "Chats"
+msgstr "Samtaler"
+
+#: ../src/message_window.py:290
+msgid "Group Chats"
+msgstr "Gruppe Samtaler"
+
+#: ../src/message_window.py:292
+msgid "Private Chats"
+msgstr "Private Samtaler"
+
+#: ../src/message_window.py:294
+msgid "Messages"
+msgstr "Beskeder"
+
+#: ../src/message_window.py:295
+#, python-format
+msgid "%s - Gajim"
+msgstr "%s - Gajim"
+
+#: ../src/negotiation.py:13
+msgid "- messages will be logged"
+msgstr "- beskeder vil blive logget"
+
+#: ../src/negotiation.py:15
+msgid "- messages will not be logged"
+msgstr "- beskeder vil ikke blive logget"
+
+#: ../src/negotiation.py:18
+msgid "Verify the remote client's identity"
+msgstr "Bekræft den fjerne klients identitet"
+
+#: ../src/negotiation.py:18
+#, python-format
+msgid ""
+"You've begun an encrypted session with %s, but it can't be guaranteed that "
+"you're talking directly to the person you think you are.\n"
+"\n"
+"You should speak with them directly (in person or on the phone) and confirm "
+"that their Short Authentication String is identical to this one: %s"
+msgstr ""
+"Du er begyndt på en krypteret session med %s, men det kan ikke garanteres at du snakker direkte med den person du tror du gør.\n"
+"\n"
+"Du bør snakke med dem direkte (ansigt til ansigt eller på telefonen) og på den måde bekræfte at deres Korte Autoriserings Streng er identisk til denne: %s"
+
+#: ../src/notify.py:204
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s Ændrede Status"
+
+#: ../src/notify.py:214
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s Loggede Ind"
+
+#: ../src/notify.py:222
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s Loggede Ud"
+
+#: ../src/notify.py:234
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Ny Besked fra %(nickname)s"
+
+#: ../src/notify.py:242
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Ny Privat Besked fra gruppe samtale %s"
+
+#: ../src/notify.py:244
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/notify.py:247
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Besked fra %(nickname)s"
+
+#: ../src/notify.py:253
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Ny Besked fra %(nickname)s"
+
+#: ../src/profile_window.py:72
+msgid "Retrieving profile..."
+msgstr "Henter profil..."
+
+#: ../src/profile_window.py:123 ../src/roster_window.py:1882
+msgid "File is empty"
+msgstr "Filen er tom"
+
+#: ../src/profile_window.py:126 ../src/roster_window.py:1885
+msgid "File does not exist"
+msgstr "Filen eksisterer ikke"
+
+#. keep identation
+#. unknown format
+#: ../src/profile_window.py:140 ../src/profile_window.py:156
+#: ../src/roster_window.py:1887 ../src/roster_window.py:1898
+msgid "Could not load image"
+msgstr "Kunne ikke laste billede"
+
+#: ../src/profile_window.py:257
+msgid "Information received"
+msgstr "Information modtaget"
+
+#: ../src/profile_window.py:326
+msgid "Without a connection you can not publish your contact information."
+msgstr "Uden en tilslutning kan du ikke publicere din kontakt information."
+
+#: ../src/profile_window.py:338
+msgid "Sending profile..."
+msgstr "Sender profil..."
+
+#: ../src/profile_window.py:353
+msgid "Information NOT published"
+msgstr "Information er IKKE publiceret"
+
+#: ../src/profile_window.py:360
+msgid "vCard publication failed"
+msgstr "vCard publicering fejlede"
+
+#: ../src/profile_window.py:361
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Der var en fejl under publicering af din personlige information, prøv igen "
+"senere."
+
+#: ../src/roster_window.py:182 ../src/roster_window.py:237
+msgid "Merged accounts"
+msgstr "Flettede kontoer"
+
+#: ../src/roster_window.py:357 ../src/roster_window.py:622
+#: ../src/roster_window.py:2109 ../src/common/contacts.py:307
+#: ../src/common/helpers.py:44
+msgid "Observers"
+msgstr "Iagttagere"
+
+#. Make special context menu if group is Groupchats
+#: ../src/roster_window.py:441 ../src/roster_window.py:446
+#: ../src/roster_window.py:1934 ../src/roster_window.py:1937
+#: ../src/roster_window.py:2606 ../src/roster_window.py:2609
+#: ../src/roster_window.py:2634 ../src/roster_window.py:4695
+#: ../src/roster_window.py:4697 ../src/common/commands.py:194
+#: ../src/common/contacts.py:97 ../src/common/helpers.py:44
+msgid "Groupchats"
+msgstr "Gruppesamtaler"
+
+#: ../src/roster_window.py:771 ../src/roster_window.py:3951
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Du kan ikke deltage i en gruppe samtale mens du er usynlig"
+
+#. new chat
+#. single message
+#. for chat_with
+#. for single message
+#. join gc
+#: ../src/roster_window.py:984 ../src/roster_window.py:994
+#: ../src/roster_window.py:1003 ../src/systray.py:207 ../src/systray.py:212
+#: ../src/systray.py:218
+#, python-format
+msgid "using account %s"
+msgstr "med konto %s"
+
+#. add
+#: ../src/roster_window.py:1010
+#, python-format
+msgid "to %s account"
+msgstr "til %s konto"
+
+#. disco
+#: ../src/roster_window.py:1015
+#, python-format
+msgid "using %s account"
+msgstr "bruger %s konto"
+
+#: ../src/roster_window.py:1096
+msgid "_Manage Bookmarks..."
+msgstr "Håndter Bog_mærker..."
+
+#. profile, avatar
+#: ../src/roster_window.py:1115
+#, python-format
+msgid "of account %s"
+msgstr "fra konto %s"
+
+#: ../src/roster_window.py:1155
+#, python-format
+msgid "for account %s"
+msgstr "for konto %s"
+
+#. History manager
+#: ../src/roster_window.py:1176
+msgid "History Manager"
+msgstr "Historik Håndterer"
+
+#: ../src/roster_window.py:1185
+msgid "_Join New Group Chat"
+msgstr "_Deltag i Ny Gruppe Samtale"
+
+#: ../src/roster_window.py:1544 ../src/roster_window.py:4149
+#: ../src/roster_window.py:4156
+msgid "You have unread messages"
+msgstr "Du har ulæste beskeder"
+
+#: ../src/roster_window.py:1545
+msgid "You must read them before removing this transport."
+msgstr "Du må læse dem før du fjerner denne transport."
+
+#: ../src/roster_window.py:1548
+#, python-format
+msgid "Transport \"%s\" will be removed"
+msgstr "Transport \"%s\" vil blive fjernet"
+
+#: ../src/roster_window.py:1549
+msgid ""
+"You will no longer be able to send and receive messages from contacts using "
+"this transport."
+msgstr ""
+"Du vil ikke længere være i stand til at sende og modtage beskeder fra "
+"kontakter som bruger denne transport."
+
+#: ../src/roster_window.py:1552
+msgid "Transports will be removed"
+msgstr "Transporter vil blive fjernet"
+
+#: ../src/roster_window.py:1557
+#, python-format
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr ""
+"Du vil ikke længere være i stand til at sende og modtage beskeder fra "
+"kontakter som bruger disse transporter:%s"
+
+#. it's jid
+#: ../src/roster_window.py:1723
+msgid "Rename Contact"
+msgstr "Omdøb Kontakt"
+
+#: ../src/roster_window.py:1724
+#, python-format
+msgid "Enter a new nickname for contact %s"
+msgstr "Indtast et nyt kælenavn for kontakt %s"
+
+#: ../src/roster_window.py:1731
+msgid "Rename Group"
+msgstr "Omdøb Gruppe"
+
+#: ../src/roster_window.py:1732
+#, python-format
+msgid "Enter a new name for group %s"
+msgstr "Indtast et nyt navn for gruppen %s"
+
+#: ../src/roster_window.py:1807
+msgid "Remove Group"
+msgstr "Fjern Gruppen"
+
+#: ../src/roster_window.py:1808
+#, python-format
+msgid "Do you want to remove group %s from the roster?"
+msgstr "Vil du fjerne gruppen %s fra kontaktvinduet?"
+
+#: ../src/roster_window.py:1809
+msgid "Remove also all contacts in this group from your roster"
+msgstr "Fjern også alle kontakter i denne gruppe fra kontaktvinduet"
+
+#: ../src/roster_window.py:1840
+msgid "Assign OpenPGP Key"
+msgstr "Tildel OpenPGP Nøgle"
+
+#: ../src/roster_window.py:1841
+msgid "Select a key to apply to the contact"
+msgstr "Vælg den nøgle du vil anvende til kontakten"
+
+#: ../src/roster_window.py:2155
+msgid "_New Group Chat"
+msgstr "_Ny Gruppe Samtale"
+
+#: ../src/roster_window.py:2297
+msgid "I would like to add you to my roster"
+msgstr "Jeg vil gerne tilføje dig til mit kontaktvindue"
+
+#. Send Group Message
+#: ../src/roster_window.py:2431 ../src/roster_window.py:2643
+msgid "Send Group M_essage"
+msgstr "Send Gruppeb_esked"
+
+#: ../src/roster_window.py:2450
+msgid "_New group chat"
+msgstr "_Ny gruppe samtale"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:2488
+msgid "_Manage Contacts"
+msgstr "_Håndter Kontakter"
+
+#: ../src/roster_window.py:2549
+msgid "_Maximize"
+msgstr "_Maksimer"
+
+#: ../src/roster_window.py:2556
+msgid "_Disconnect"
+msgstr "Afbry_d tilslutningen"
+
+#: ../src/roster_window.py:2635
+msgid "_Maximize All"
+msgstr "_Maksimer alt"
+
+#: ../src/roster_window.py:2651
+msgid "To all users"
+msgstr "Til alle brugere"
+
+#: ../src/roster_window.py:2654
+msgid "To all online users"
+msgstr "Til alle brugere på net"
+
+#. Log Off
+#: ../src/roster_window.py:2771
+msgid "_Log off"
+msgstr "_Log af"
+
+#. Log on
+#: ../src/roster_window.py:2777
+msgid "_Log on"
+msgstr "_Log på"
+
+#. Send single message
+#: ../src/roster_window.py:2789
+msgid "Send Single Message"
+msgstr "Send Enkel Besked"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:2836
+msgid "_Manage Transport"
+msgstr "Hå_ndter Transport"
+
+#. Modify Transport
+#: ../src/roster_window.py:2844
+msgid "_Modify Transport"
+msgstr "_Modificer Transport"
+
+#: ../src/roster_window.py:2958 ../src/roster_window.py:3032
+msgid "_Change Status Message"
+msgstr "_Ændre Status Besked"
+
+#: ../src/roster_window.py:3104
+msgid "Authorization has been sent"
+msgstr "Godkendelse er blevet sendt"
+
+#: ../src/roster_window.py:3105
+#, python-format
+msgid "Now \"%s\" will know your status."
+msgstr "Nu vil %s vide din status."
+
+#: ../src/roster_window.py:3125
+msgid "Subscription request has been sent"
+msgstr "Forespørgsel på abonnering er blevet sendt"
+
+#: ../src/roster_window.py:3126
+#, python-format
+msgid "If \"%s\" accepts this request you will know his or her status."
+msgstr ""
+"Hvis %s accepterer denne forespørsel vil du kunne se hans eller hendes "
+"status."
+
+#: ../src/roster_window.py:3138
+msgid "Authorization has been removed"
+msgstr "Godkendelse er blevet fjernet"
+
+#: ../src/roster_window.py:3139
+#, python-format
+msgid "Now \"%s\" will always see you as offline."
+msgstr "Nu vil %s altid se dig som offline."
+
+#: ../src/roster_window.py:3337
+#, python-format
+msgid "Contact \"%s\" will be removed from your roster"
+msgstr "Kontakt %s vil blive fjernet fra dit kontaktvindue"
+
+#: ../src/roster_window.py:3341
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Ved at fjerne denne kontakt fjerner du også godkendelsen, så han eller hun "
+"vil altid se dig som offline."
+
+#: ../src/roster_window.py:3346
+msgid ""
+"By removing this contact you also by default remove authorization resulting "
+"in him or her always seeing you as offline."
+msgstr ""
+"Ved at fjerne denne kontakt fjerner du også samtidig godkendelsen, så han "
+"eller hun altid vil se dig som offline."
+
+#: ../src/roster_window.py:3349
+msgid "I want this contact to know my status after removal"
+msgstr "Jeg vil at denne kontakt kan se min status efter den er blevet fjernet"
+
+#. several contact to remove at the same time
+#: ../src/roster_window.py:3353
+msgid "Contacts will be removed from your roster"
+msgstr "Kontakter vil blive fjernet fra dit kontaktvindue"
+
+#: ../src/roster_window.py:3357
+#, python-format
+msgid ""
+"By removing these contacts:%s\n"
+"you also remove authorization resulting in them always seeing you as offline."
+msgstr ""
+"Ved at fjerne disse kontakter:%s\n"
+"fjerner du også godkendelsen, hvilket medfører at de altid vil se dig som "
+"offline."
+
+#: ../src/roster_window.py:3389
+msgid ""
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
+msgstr "Gnomes Nøglering er installeret men ikke startet korrekt (miljøvariabel er sandsynligvis ikke sat op rigtig)"
+
+#: ../src/roster_window.py:3416
+msgid "GPG is not usable"
+msgstr "GPG er ikke brugbar"
+
+#. %s is the account name here
+#: ../src/roster_window.py:3416 ../src/common/connection.py:684
+#: ../src/common/zeroconf/connection_zeroconf.py:165
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Du vil blive tilsluttet til %s uden OpenPGP."
+
+#: ../src/roster_window.py:3433
+msgid "Passphrase Required"
+msgstr "Adgangskode Påkrævet"
+
+#: ../src/roster_window.py:3434
+#, python-format
+msgid "Enter GPG key passphrase for account %s."
+msgstr "Indtast adgangskoden til GPG nøglen for konto %s."
+
+#: ../src/roster_window.py:3439
+msgid "Save passphrase"
+msgstr "Gem adgangskode"
+
+#: ../src/roster_window.py:3447
+msgid "Wrong Passphrase"
+msgstr "Forkert Adgangskode"
+
+#: ../src/roster_window.py:3448
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Indtast din GPG adgangskode igen eller annuller."
+
+#: ../src/roster_window.py:3531 ../src/roster_window.py:3608
+msgid "You are participating in one or more group chats"
+msgstr "Du deltager i en eller flere gruppesamtaler"
+
+#: ../src/roster_window.py:3532 ../src/roster_window.py:3609
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+msgstr ""
+"Hvis du ændrer din status til usynlig vil det resultere i at du bliver "
+"frakoblet fra disse gruppesamtaler. Er du sikker på du vil gøre dig usynlig?"
+
+#: ../src/roster_window.py:3566
+msgid "No account available"
+msgstr "Ingen konto tilgængelig"
+
+#: ../src/roster_window.py:3567
+msgid "You must create an account before you can chat with other contacts."
+msgstr ""
+"Du må oprette en konto før du kan begynde en samtale med andre kontakter."
+
+#: ../src/roster_window.py:3695
+#, python-format
+msgid "\"%(title)s\" by %(artist)s"
+msgstr "\"%(title)s\" by %(artist)s"
+
+#: ../src/roster_window.py:4150 ../src/roster_window.py:4157
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled."
+msgstr "Beskeder vil kun kunne læses senere hvis du har aktiveret historik."
+
+#: ../src/roster_window.py:4781
+msgid "Metacontacts storage not supported by your server"
+msgstr "Metakontakt lagring er ikke understøttet af din server"
+
+#: ../src/roster_window.py:4783
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be save on next reconnection."
+msgstr ""
+"Din server understøtter ikke muligheden for at gemme metakontakt "
+"information. Så denne information vil ikke blive gemt til næste gang du "
+"tilslutter dig."
+
+#: ../src/roster_window.py:4829
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr "Du er ved at oprette en metakontakt. Er du sikker på du vil fortsætte?"
+
+#: ../src/roster_window.py:4831
+msgid ""
+"Metacontacts are a way to regroup several contacts in one line. Generally it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+msgstr ""
+"Metakontakter er en måde at gruppere flere kontakter på en linie. Oftest "
+"bruges det når den samme person har flere Jabber eller transport kontoer."
+
+#: ../src/roster_window.py:4929
+#, python-format
+msgid "Do you want to send that file to %s:"
+msgid_plural "Do you want to send those files to %s:"
+msgstr[0] "Vil du sende denne fil til %s:"
+msgstr[1] "Vil du sende disse filer til %s:"
+
+#: ../src/roster_window.py:5211
+msgid "Change Status Message..."
+msgstr "Ændre Status Besked..."
+
+#: ../src/search_window.py:86
+msgid "Waiting for results"
+msgstr "Venter på resultater"
+
+#: ../src/search_window.py:126 ../src/search_window.py:199
+msgid "Error in received dataform"
+msgstr "Fejl i modtaget dataform"
+
+#: ../src/search_window.py:160
+msgid "No result"
+msgstr "Intet resultat"
+
+#: ../src/systray.py:164
+msgid "_Change Status Message..."
+msgstr "_Ændre Status Besked..."
+
+#: ../src/systray.py:249
+msgid "Hide this menu"
+msgstr "Skjul denne menu"
+
+#: ../src/tooltips.py:310 ../src/tooltips.py:503
+msgid "Jabber ID: "
+msgstr "Jabber ID: "
+
+#: ../src/tooltips.py:313 ../src/tooltips.py:507
+msgid "Resource: "
+msgstr "Ressource: "
+
+#: ../src/tooltips.py:318
+#, python-format
+msgid "%(owner_or_admin_or_member)s of this group chat"
+msgstr "%(owner_or_admin_or_member)s af denne gruppe samtale"
+
+#: ../src/tooltips.py:416
+msgid " [blocked]"
+msgstr " [blokeret]"
+
+#: ../src/tooltips.py:420
+msgid " [minimized]"
+msgstr " [minimeret]"
+
+#: ../src/tooltips.py:435 ../src/tooltips.py:623
+msgid "Status: "
+msgstr "Status: "
+
+#: ../src/tooltips.py:465
+#, python-format
+msgid "Last status: %s"
+msgstr "Sidste status: %s"
+
+#: ../src/tooltips.py:467
+#, python-format
+msgid " since %s"
+msgstr " siden %s"
+
+#: ../src/tooltips.py:485
+msgid "Connected"
+msgstr "Tilsluttet"
+
+#: ../src/tooltips.py:487
+msgid "Disconnected"
+msgstr "Tilslutning afbrudt"
+
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:514
+msgid "Subscription: "
+msgstr "Abonnering: "
+
+#: ../src/tooltips.py:524
+msgid "OpenPGP: "
+msgstr "OpenPGP: "
+
+#: ../src/tooltips.py:579
+msgid "Download"
+msgstr "Hent"
+
+#: ../src/tooltips.py:585
+msgid "Upload"
+msgstr "Send"
+
+#: ../src/tooltips.py:592
+msgid "Type: "
+msgstr "Type: "
+
+#: ../src/tooltips.py:598
+msgid "Transferred: "
+msgstr "Overført: "
+
+#: ../src/tooltips.py:601 ../src/tooltips.py:622
+msgid "Not started"
+msgstr "Ikke startet"
+
+#: ../src/tooltips.py:605
+msgid "Stopped"
+msgstr "Stoppet"
+
+#: ../src/tooltips.py:607 ../src/tooltips.py:610
+msgid "Completed"
+msgstr "Fuldført"
+
+#: ../src/tooltips.py:614
+msgid "?transfer status:Paused"
+msgstr "?transfer status:Midlertidig stoppet"
+
+#. stalled is not paused. it is like 'frozen' it stopped alone
+#: ../src/tooltips.py:618
+msgid "Stalled"
+msgstr "Hænger"
+
+#: ../src/tooltips.py:620
+msgid "Transferring"
+msgstr "Overfører"
+
+#: ../src/tooltips.py:652
+msgid "This service has not yet responded with detailed information"
+msgstr "Denne tjeneste har endnu ikke svaret med detaljeret information"
+
+#: ../src/tooltips.py:655
+msgid ""
+"This service could not respond with detailed information.\n"
+"It is most likely legacy or broken"
+msgstr ""
+"Denne tjeneste kunne ikke svare med detaljeret information.\n"
+"Den er højst sandsynlig ikke fungerende"
+
+#: ../src/vcard.py:240
+msgid "?Client:Unknown"
+msgstr "?Client:Ukendt"
+
+#: ../src/vcard.py:242
+msgid "?OS:Unknown"
+msgstr "?OS:Ukendt"
+
+#: ../src/vcard.py:267 ../src/vcard.py:277 ../src/vcard.py:467
+#, python-format
+msgid "since %s"
+msgstr "siden %s"
+
+#: ../src/vcard.py:306
+msgid "Affiliation:"
+msgstr "Tilknytning:"
+
+#: ../src/vcard.py:314
+msgid ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
+msgstr ""
+"Denne kontakt er interesseret i din tilstedeværelses information, men du er "
+"ikke interesseret i hans/hendes tilstedeværelse"
+
+#: ../src/vcard.py:316
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
+msgstr ""
+"Du er interesseret i kontaktens tilstedeværelses information, men han/hun er "
+"ikke interesseret i din"
+
+#: ../src/vcard.py:318
+msgid "You and the contact are interested in each other's presence information"
+msgstr ""
+"Du og kontakten er begge interessered i hinandens tilstedeværelses "
+"information"
+
+#. None
+#: ../src/vcard.py:320
+msgid ""
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
+msgstr ""
+"Du er ikke interesseret i kontaktens tilstedeværelse, og han/hun er ikke "
+"interesseret i din"
+
+#: ../src/vcard.py:328
+msgid "You are waiting contact's answer about your subscription request"
+msgstr "Du venter på kontaktens svar om din abonnements forespørsel"
+
+#: ../src/vcard.py:332 ../src/vcard.py:369 ../src/vcard.py:492
+msgid " resource with priority "
+msgstr " ressource med prioritet "
+
+#: ../src/common/check_paths.py:33
+msgid "creating logs database"
+msgstr "opretter log database"
+
+#: ../src/common/check_paths.py:96 ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:114
+#, python-format
+msgid "%s is a file but it should be a directory"
+msgstr "%s er en fil, men burde være et katalog"
+
+#: ../src/common/check_paths.py:97 ../src/common/check_paths.py:108
+#: ../src/common/check_paths.py:115 ../src/common/check_paths.py:123
+msgid "Gajim will now exit"
+msgstr "Gajim vil nu slutte"
+
+#: ../src/common/check_paths.py:122
+#, python-format
+msgid "%s is a directory but should be a file"
+msgstr "%s er et katalog men burde være en fil"
+
+#: ../src/common/check_paths.py:138
+#, python-format
+msgid "creating %s directory"
+msgstr "opretter %s katalog"
+
+#: ../src/common/commands.py:69
+msgid "Change status information"
+msgstr "Ændre status information"
+
+#: ../src/common/commands.py:82
+msgid "Change status"
+msgstr "Ændre status"
+
+#: ../src/common/commands.py:83
+msgid "Set the presence type and description"
+msgstr "Sæt tilstedeværelses type og beskrivelse"
+
+#: ../src/common/commands.py:89
+msgid "Free for chat"
+msgstr "Åben for samtaler"
+
+#: ../src/common/commands.py:90
+msgid "Online"
+msgstr "Online"
+
+#: ../src/common/commands.py:92
+msgid "Extended away"
+msgstr "Udvidet borte"
+
+#: ../src/common/commands.py:93
+msgid "Do not disturb"
+msgstr "Forstyr ikke"
+
+#: ../src/common/commands.py:94
+msgid "Offline - disconnect"
+msgstr "Ofline - ikke tilsluttet"
+
+#: ../src/common/commands.py:99
+msgid "Presence description:"
+msgstr "Tilstedeværelses beskrivelse:"
+
+#: ../src/common/commands.py:134
+msgid "The status has been changed."
+msgstr "Din status er blevet ændret."
+
+#: ../src/common/commands.py:179
+#, python-format
+msgid "%(nickname)s on %(room_jid)s"
+msgstr "%(nickname)s i %(room_jid)s"
+
+#: ../src/common/commands.py:183
+msgid "You have not joined a groupchat."
+msgstr "Du detlager ikke i en gruppesamtale."
+
+#: ../src/common/commands.py:189
+msgid "Leave Groupchats"
+msgstr "Forlad Gruppesamtaler"
+
+#: ../src/common/commands.py:190
+msgid "Choose the groupchats you want to leave"
+msgstr "Vælg de gruppesamtaler du vil forlade"
+
+#: ../src/common/commands.py:230
+msgid "You left the following groupchats:"
+msgstr "Du forlod de følgende gruppesamtaler:"
+
+#: ../src/common/commands.py:242
+msgid "Forward unread messages"
+msgstr "Videresend ulæste beskeder"
+
+#: ../src/common/commands.py:262
+msgid "All unread messages have been forwarded."
+msgstr "Alle ulæste beskeder er blevet videresendt."
+
+#: ../src/common/config.py:58
+msgid "Use D-Bus and Notification-Daemon to show notifications"
+msgstr "Brug D-Bus og Påmindelses-dæmonen (Notification-Daemon) til at vise påmindelser"
+
+#: ../src/common/config.py:63
+msgid "Time in minutes, after which your status changes to away."
+msgstr "Tid i minutter før din status ændres til borte."
+
+#: ../src/common/config.py:64
+msgid "Away as a result of being idle"
+msgstr "Borte som et resultat af tomgang"
+
+#: ../src/common/config.py:66
+msgid "Time in minutes, after which your status changes to not available."
+msgstr "Tid i minutter før din status ændres til ikke tilgængelig."
+
+#: ../src/common/config.py:67
+msgid "Not available as a result of being idle"
+msgstr "Ikke tilgængelig som et resultat af tomgang"
+
+#: ../src/common/config.py:85
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"Liste (separeret med mellemrum) af rækker (kontoer og grupper) som er "
+"kollapset."
+
+#: ../src/common/config.py:90
+msgid "Enable link-local/zeroconf messaging"
+msgstr "Aktiver link-local/zeroconf beskeder"
+
+#: ../src/common/config.py:93
+msgid "Language used by speller"
+msgstr "Sprog brugt af stavelseskontrollen"
+
+#: ../src/common/config.py:94
+msgid ""
+"'always' - print time for every message.\n"
+"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
+"'never' - never print time."
+msgstr ""
+"'altid' - skriv tid for hver besked.\n"
+"'nogen ganger' - skriv tid for hver print_ichat_every_foo_minutes minutter.\n"
+"'aldrig' - skriv aldrig tiden."
+
+#: ../src/common/config.py:95
+msgid ""
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
+"This is used only if print_time is 'sometimes'."
+msgstr ""
+"Print tiden i samtaler med en upræcis klokke. Værdien for hvor upræcis "
+"klokken skal være kan rangere fra 1 til 4, eller 0 for at deaktivere den "
+"upræcise klokke. 1 er den mest præcise klokke, 4 den mindst præcise. Dette "
+"bruges kun hvis print_time er 'nogen ganger'."
+
+#: ../src/common/config.py:98
+msgid "Treat * / _ pairs as possible formatting characters."
+msgstr "Behandle * / _ par som mulige formaterings tegn."
+
+#: ../src/common/config.py:99
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Hvis sandt, ikke fjern */_. Således at *abc* bliver skrevet med fed skrift "
+"men * * bliver ikke fjernet."
+
+#: ../src/common/config.py:102
+msgid ""
+"Uses ReStructured text markup to send HTML, plus ascii formatting if "
+"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html (If you want to use this, install docutils)"
+msgstr ""
+"Bruger ReStruktureret tekst redigering til at sende HTML, plus ascii "
+"formatering hvis valgt. For syntaks, se http://docutils.sourceforge.net/docs/"
+"ref/rst/restructuredtext.html (Hvis du vil bruge dette, installer docutils)"
+
+#: ../src/common/config.py:111
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Tegn som tilføjes efter kælenavn når der bruges kælenavnsfuldførelse (tab) i "
+"en gruppesamtale."
+
+#: ../src/common/config.py:112
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Tegnforslag til at tilføje efter det ønskede kælenavn, når det ønskede "
+"kælenavn er i brug af en anden i gruppesamtalen."
+
+#: ../src/common/config.py:135
+msgid ""
+"This option let you customize timestamp that is printed in conversation. For "
+"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
+"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+msgstr ""
+"Denne valgmulighed giver dig muligheden for at tilpasse hvordan "
+"klokkeslettet bliver skrevet i en samtale. For eksempel [%H:%M] vil vise "
+"[timer:minutter]. Se python dokumentationen for strftime: http://docs.python."
+"org/lib/module-time.html"
+
+#: ../src/common/config.py:136
+msgid "Characters that are printed before the nickname in conversations"
+msgstr "Tegn som bliver skrevet før kælenavnet i samtaler"
+
+#: ../src/common/config.py:137
+msgid "Characters that are printed after the nickname in conversations"
+msgstr "Tegn som bliver skrevet efter kælenavnet i samtaler"
+
+#: ../src/common/config.py:144
+msgid "Add * and [n] in roster title?"
+msgstr "Tilføj * og [n] i tittelen på kontaktvinduet?"
+
+#: ../src/common/config.py:145
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr "Hvor mange linjer skal huskes fra forrige samtale når et samtale vindue/faneblad genåbnes."
+
+#: ../src/common/config.py:146
+msgid "How many minutes should last lines from previous conversation last."
+msgstr "Hvor mange minutter skal sidste linjer fra forrige samtale vare."
+
+#: ../src/common/config.py:147
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Send besked med Ctrl+Enter og lave en ny linie med Enter (standard Mirabilis "
+"ICQ klient adfærd)."
+
+#: ../src/common/config.py:149
+msgid "How many lines to store for Ctrl+KeyUP."
+msgstr "Hvor mange linjer skal gemmes for Ctrl+KeyUP."
+
+#: ../src/common/config.py:152
+#, python-format
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Enten en tilpasset url som indeholder %s hvor %s er ordet/frasen, eller "
+"'WIKTIONARY' som betyder brug wiktionary."
+
+#: ../src/common/config.py:155
+msgid "If checked, Gajim can be controlled remotely using gajim-remote."
+msgstr ""
+"Hvis valgt kan Gajim blive kontrolleret eksternt ved hjælp af gajim-remote."
+
+#: ../src/common/config.py:156
+msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+"Hvis Sandt, lyt til D-Bus signaler fra NetworkManager og ændre status på "
+"kontoer (forudsat at de ikke har listen_to_network_manager sat til Falsk og "
+"de synkroniserer med global status) baseret på status af "
+"netværksforbindelsen."
+
+#: ../src/common/config.py:157
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+"Send samtale status påmindelser. Kan være en af disse: all, composing_only, "
+"disabled."
+
+#: ../src/common/config.py:158
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Vis samtale status påmindelser i samtale vinduer. Kan være en af disse: all, "
+"composing_only, disabled."
+
+#: ../src/common/config.py:160
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Når der ikke skrives tid for hver besked (print_time==sometimes), skriv "
+"tiden for hver x minutter."
+
+#: ../src/common/config.py:161
+msgid "Ask before closing a group chat tab/window."
+msgstr "Spørg før et gruppesamtale vindue/faneblad lukkes."
+
+#: ../src/common/config.py:162
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Altid spørg før et gruppesamtale vindue/faneblad lukkes, hvis den findes i "
+"denne mellemrums separerede liste af gruppesamtale jids."
+
+#: ../src/common/config.py:163
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Aldrig spørg før et gruppesamtale vindue/faneblad lukkes, hvis den findes i "
+"denne mellemrums separerede liste af gruppesamtale jids."
+
+#: ../src/common/config.py:166
+msgid ""
+"Comma separated list of hosts that we send, in addition of local interfaces, "
+"for File Transfer in case of address translation/port forwarding."
+msgstr "Komma separeret liste af værter som vi sender, i tillæg til lokale grænseflader, for filoverførsler i tilfælde af adresse omskrivning/port videresending."
+
+#: ../src/common/config.py:168
+msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
+msgstr "IEC standard siger KiB = 1024 byte, KB = 1000 byte."
+
+#: ../src/common/config.py:170
+msgid "Notify of events in the system trayicon."
+msgstr "Vis påmindelse af hændelser i statusfelt ikonet."
+
+#: ../src/common/config.py:176
+msgid "Show tab when only one conversation?"
+msgstr "Vis et faneblad når der kun er en samtale?"
+
+#: ../src/common/config.py:177
+msgid "Show tabbed notebook border in chat windows?"
+msgstr "Vis faneblade i samtalevinduer?"
+
+#: ../src/common/config.py:178
+msgid "Show close button in tab?"
+msgstr "Vis lukke knap i faneblad?"
+
+#: ../src/common/config.py:179
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr "Ved forhandling af en krypteret session, skal Gajim da antage at du vil have dine beskeder logget?"
+
+#: ../src/common/config.py:188
+msgid "Preview new messages in notification popup?"
+msgstr "Forhåndsvis nye beskeder i et påmindelses pop op vinduer?"
+
+#: ../src/common/config.py:193
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"En semikolon-separeret liste af ord som vil blive fremhævet i gruppesamtaler."
+
+#: ../src/common/config.py:194
+msgid ""
+"If True, quits Gajim when X button of Window Manager is clicked. This "
+"setting is taken into account only if trayicon is used."
+msgstr "Hvis Sandt, lukker Gajim når X knappen fra vindueshåndteringen klikkes. Denne indstilling tages der kun hensyn til hvis et statusfelt ikon bruges."
+
+#: ../src/common/config.py:195
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr ""
+"Hvis Sandt, vil Gajim kontrollere om den er standard jabber klient ved hver "
+"opstart."
+
+#: ../src/common/config.py:196
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Hvis Sandt, vil Gajim vise et ikon på hvert faneblad som indeholder ulæste "
+"beskeder. Afhængig af temaet, kan dette ikon være animeret."
+
+#: ../src/common/config.py:197
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"Hvis Sandt, vil Gajim vise status beskeder, hvis ikke tomme, for hver "
+"kontakt under kontaktnavnet i kontaktvinduet."
+
+#: ../src/common/config.py:199
+msgid ""
+"If True, Gajim will ask for avatar each contact that did not have an avatar "
+"last time or has one cached that is too old."
+msgstr ""
+"Hvis Sandt, vil Gajim spørge for en avatar for hver kontakt som ikke havde "
+"en avatar sidste gang eller har en gemt som er for gammel."
+
+#: ../src/common/config.py:200
+msgid ""
+"If False, Gajim will no longer print status line in chats when a contact "
+"changes his or her status and/or his or her status message."
+msgstr "Hvis Falsk, vil Gajim ikke længere skrive statuslinjer i samtaler når en kontakt ændrer hans eller hendes status og/eller hans eller hendes status besked."
+
+#: ../src/common/config.py:201
+msgid ""
+"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"longer print status line in groupchats when a member changes his or her "
+"status and/or his or her status message. If \"all\" Gajim will print all "
+"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
+"group chat."
+msgstr ""
+"kan være \"none\", \"all\" eller \"in_and_out\". Hvis \"nono\" vil Gajim "
+"ikke længere skrive statuslinier i gruppesamtaler når et medlem ændrer hans "
+"eller hendes status og/eller hans eller hendes status besked. Hvis \"all\" "
+"vil Gajim skrive alle status beskeder. Hvis \"in_and_out\" vil Gajim kun "
+"skrive FOO kommer/forlader gruppesamtalen."
+
+#: ../src/common/config.py:203
+msgid "Background color of contacts when they just signed in."
+msgstr "Baggrundsfarve på kontakter når de netop har tilsluttet sig."
+
+#: ../src/common/config.py:204
+msgid "Background color of contacts when they just signed out."
+msgstr "Baggrundsfarve på kontakter når de netop har afbrudt tilslutningen."
+
+#: ../src/common/config.py:206
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+"Hvis Sandt vil gamle beskeder fra forrige samtale bruge en mindre skrifttype "
+"end den som er standard."
+
+#: ../src/common/config.py:207
+msgid "Don't show avatar for the transport itself."
+msgstr "Ikke vis en avatar for selve transporten."
+
+#: ../src/common/config.py:208
+msgid "Don't show roster in the system taskbar."
+msgstr "Ikke hvis kontaktvindue i vindueslisten."
+
+#: ../src/common/config.py:209
+msgid ""
+"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
+"window flash (the default behaviour in most Window Managers) when holding "
+"pending events."
+msgstr "Hvis Sandt og GTK+ og PyGTK installerede versioner er mindst 2.8, blink med vinduet (standard adfærd i de fleste vindueshåndterere) når det indeholder ventende begivenheder."
+
+#: ../src/common/config.py:211
+msgid ""
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. Turn this option to False to stop sending sha info in group chat "
+"presences."
+msgstr ""
+"Jabberd1.4 kan ikke lide sha information når man deltager i en adgangskode "
+"beskyttet gruppesamtale. Sæt dette valg til Falsk for at stoppe med at sende "
+"sha information i gruppesamtaler."
+
+#. always, never, peracct, pertype should not be translated
+#: ../src/common/config.py:214
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'never' - All messages get their own window.\n"
+"'peracct' - Messages for each account are sent to a specific window.\n"
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect."
+msgstr ""
+"Kontrollerer vinduet hvor nye beskeder er placeret.\n"
+"'always' - Alle beskeder bliver vist i et enkelt vindue.\n"
+"'never' - Alle beskeder får deres eget vindue.\n"
+"'peracct' - Beskeder for den enkelte konto bliver sendt til specifikke "
+"vinduer.\n"
+"'pertype' - Hver besked type (for eks. samtaler versus gruppesamtaler) "
+"bliver sendt til et specifikt vindue. Note, ved ændring af denne indstilling "
+"kræves en genstart af Gajim før ændringen tager effekt."
+
+#: ../src/common/config.py:215
+msgid "If False, you will no longer see the avatar in the chat window."
+msgstr "Hvis Falsk vil du ikke længere se en avatar i samtale vinduet."
+
+#: ../src/common/config.py:216
+msgid "If True, pressing the escape key closes a tab/window."
+msgstr "Hvis Sandt vil tryk på escape tasten lukke et vindue/faneblad."
+
+#: ../src/common/config.py:217
+msgid "Hides the buttons in chat windows."
+msgstr "Skjuler knapperne i samtale vinduer."
+
+#: ../src/common/config.py:218
+msgid "Hides the banner in a group chat window"
+msgstr "Skjuler banneret i et gruppesamtale vindue"
+
+#: ../src/common/config.py:219
+msgid "Hides the banner in two persons chat window"
+msgstr "Skjuler banneret i et to personers samtalevindue"
+
+#: ../src/common/config.py:220
+msgid "Hides the group chat occupants list in group chat window."
+msgstr "Skjuler gruppesamtale deltagerlisten i gruppesamtale vinduer."
+
+#: ../src/common/config.py:221
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
+msgstr ""
+"I en samtale, vis kælenavn i begyndelsen af en linie kun når det ikke er den "
+"samme person som snakker som i forrige besked."
+
+#: ../src/common/config.py:222
+msgid "Indentation when using merge consecutive nickname."
+msgstr "Indrykning når man fletter ens kælenavne."
+
+#: ../src/common/config.py:223
+msgid "Smooth scroll message in conversation window"
+msgstr "Udglattet rulning af beskeder i samtale vinduet"
+
+#: ../src/common/config.py:224
+msgid "List of colors that will be used to color nicknames in group chats."
+msgstr ""
+"Liste af farver som vil blive brugt til at farve kælenavne i gruppesamtaler."
+
+#: ../src/common/config.py:225
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr "Ctrl-Tab gå til næste faneblad når ingen er ulæste."
+
+#: ../src/common/config.py:226
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Skal vi vise bekræftelses vinduet for oprettelse af metakontakter? Tom "
+"streng betyder at vi aldrig viser vinduet."
+
+#: ../src/common/config.py:227
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFUL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+"Hvis Sandt vil du være i stand til at sætte en negativ prioritet til din "
+"konto i kontoændrings vinduet. VÆR FORSIGTIG, når du er logget med en "
+"negativ prioritet vil du IKKE modtage nogen beskeder fra din server."
+
+#: ../src/common/config.py:228
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"Hvis Sandt vil Gajim bruge Gnome Nøglering (hvis tilgængelig) til at gemme "
+"konto adgangskoder."
+
+#: ../src/common/config.py:229
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"Hvis Sandt vil Gajim vise antallet af online og totale kontakter i konto og "
+"gruppe rækker."
+
+#: ../src/common/config.py:230
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+"Kan være tom, 'chat' eller 'normal'. Hvis ikke tom, behandl alle indkommende "
+"beskeder som om de var af denne type"
+
+#: ../src/common/config.py:231
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+"Hvis Sandt vil Gajim rulle ned/op og vælge den kontakt som sendte dig den "
+"sidste besked, hvis ikke allerede kontaktvinduet er åbent."
+
+#: ../src/common/config.py:232
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+"Hvis Sandt vil Gajim omdanne strengen mellem $$ og $$ til et billede med "
+"dvips og omdanne det inden det bliver sat ind i et samtale vindue."
+
+#: ../src/common/config.py:233
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr "Tid med inaktivitet der skal gå før vinduet til at ændre status lukkes."
+
+#: ../src/common/config.py:234
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr "Maksimum antal linjer som bliver skrevet i samtaler. De ældste linjer bliver slettet."
+
+#: ../src/common/config.py:245
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Prioriteten vil ændres automatisk ifølge din status. Prioriteter er "
+"defineret i autopriority_* indstillingerne."
+
+#. yes, no, ask
+#: ../src/common/config.py:275
+msgid "Jabberd2 workaround"
+msgstr "Jabberd2 tilpasning"
+
+#: ../src/common/config.py:279
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Hvis valgt vil Gajim bruge din IP og proxy defineret i file_transfer_proxies "
+"indstillingen for filoverførsler."
+
+#: ../src/common/config.py:338
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "Er OpenPGP aktiveret for denne kontakt?"
+
+#: ../src/common/config.py:339 ../src/common/config.py:342
+msgid "Language for which we want to check misspelled words"
+msgstr "Sprog som vi vil bruge til at kontrollere for stavefejl"
+
+#: ../src/common/config.py:348
+msgid "all or space separated status"
+msgstr "alt eller mellemrums separeret status"
+
+#: ../src/common/config.py:349
+msgid "'yes', 'no', or 'both'"
+msgstr "'ja', 'nej', eller 'begge'"
+
+#: ../src/common/config.py:350 ../src/common/config.py:352
+#: ../src/common/config.py:353 ../src/common/config.py:356
+#: ../src/common/config.py:357
+msgid "'yes', 'no' or ''"
+msgstr "'ja', 'nej' eller ''"
+
+#: ../src/common/config.py:363
+msgid "Sleeping"
+msgstr "Sover"
+
+#: ../src/common/config.py:364
+msgid "Back soon"
+msgstr "Snart tilbage"
+
+#: ../src/common/config.py:364
+msgid "Back in some minutes."
+msgstr "Tilbage om få minutter."
+
+#: ../src/common/config.py:365
+msgid "Eating"
+msgstr "Spiser"
+
+#: ../src/common/config.py:365
+msgid "I'm eating, so leave me a message."
+msgstr "Jeg spiser, så læg en besked."
+
+#: ../src/common/config.py:366
+msgid "Movie"
+msgstr "Film"
+
+#: ../src/common/config.py:366
+msgid "I'm watching a movie."
+msgstr "Jeg ser en film."
+
+#: ../src/common/config.py:367
+msgid "Working"
+msgstr "Arbejder"
+
+#: ../src/common/config.py:367
+msgid "I'm working."
+msgstr "Jeg arbejder."
+
+#: ../src/common/config.py:368
+msgid "Phone"
+msgstr "Telefon"
+
+#: ../src/common/config.py:368
+msgid "I'm on the phone."
+msgstr "Jeg snakker i telefon."
+
+#: ../src/common/config.py:369
+msgid "Out"
+msgstr "Ude"
+
+#: ../src/common/config.py:369
+msgid "I'm out enjoying life."
+msgstr "Jeg er ude og nyder livet."
+
+#: ../src/common/config.py:373
+msgid "I'm available."
+msgstr "Jeg er tilgængelig."
+
+#: ../src/common/config.py:374
+msgid "I'm free for chat."
+msgstr "Jeg er tilgængelig for en samtale."
+
+#: ../src/common/config.py:376
+msgid "I'm not available."
+msgstr "Jeg er ikke tilgængelig."
+
+#: ../src/common/config.py:377
+msgid "Do not disturb."
+msgstr "Ikke forstyr."
+
+#: ../src/common/config.py:378 ../src/common/config.py:379
+msgid "Bye!"
+msgstr "Farvel!"
+
+#: ../src/common/config.py:388
+msgid ""
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
+msgstr ""
+"Lyd som spilles når en gruppesamtale besked indeholder en af følgende ord i "
+"muc_highlight_words, eller når en gruppesamtale besked indeholder dit "
+"kælenavn."
+
+#: ../src/common/config.py:389
+msgid "Sound to play when any MUC message arrives."
+msgstr "Lyd som spilles når en hvilken som helst MUC besked ankommer."
+
+#: ../src/common/config.py:398 ../src/common/optparser.py:208
+msgid "green"
+msgstr "grøn"
+
+#: ../src/common/config.py:402 ../src/common/optparser.py:194
+msgid "grocery"
+msgstr "købmandsvarer"
+
+#: ../src/common/config.py:406
+msgid "human"
+msgstr "menneske"
+
+#: ../src/common/config.py:410
+msgid "marine"
+msgstr "marint"
+
+#: ../src/common/connection_handlers.py:56
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
+msgid "Unable to load idle module"
+msgstr "Ikke i stand til at indlæse tomgangs modulet"
+
+#: ../src/common/connection_handlers.py:184
+#: ../src/common/connection_handlers.py:219
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:236
+msgid "Wrong host"
+msgstr "Forkert vært"
+
+#: ../src/common/connection_handlers.py:184
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:236
+#, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"Værten %s du konfigurerte i ft_add_hosts_to_send avancerte indstillinger er "
+"ikke gyldig, så den bliver ignoreret."
+
+#: ../src/common/connection_handlers.py:220
+msgid "Invalid local address? :-O"
+msgstr "Invalid local address? :-O"
+
+#: ../src/common/connection_handlers.py:612
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "Registrerings information for transporten %s har ikke ankommet i tide"
+
+#: ../src/common/connection_handlers.py:1776
+#, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Kælenavn er ikke tilladt: %s"
+
+#. we are banned
+#. group chat does not exist
+#: ../src/common/connection_handlers.py:1846
+#: ../src/common/connection_handlers.py:1849
+#: ../src/common/connection_handlers.py:1852
+#: ../src/common/connection_handlers.py:1855
+#: ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1868
+msgid "Unable to join group chat"
+msgstr "Ikke i stand til at deltage i gruppesamtale."
+
+#: ../src/common/connection_handlers.py:1847
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Du er bandlyst fra gruppesamtalen %s."
+
+#: ../src/common/connection_handlers.py:1850
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "Gruppesamtalen %s eksisterer ikke."
+
+#: ../src/common/connection_handlers.py:1853
+msgid "Group chat creation is restricted."
+msgstr "Gruppesamtale oprettelse er begrænset."
+
+#: ../src/common/connection_handlers.py:1856
+#, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Dit registrerede kælenavn skal bruges i gruppesamtalen %s."
+
+#: ../src/common/connection_handlers.py:1860
+#, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Du er ikke i medlemslisten for gruppesamtalen %s."
+
+#: ../src/common/connection_handlers.py:1869
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Dit ønskede kælenavn i gruppesamtalen %s er i brug eller registreret af en anden indehaver.\n"
+"Specificer venligst et andet kælenavn under:"
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers.py:1900
+msgid "Room has been destroyed"
+msgstr "Rummet er blevet ødelagt"
+
+#: ../src/common/connection_handlers.py:1907
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr "Du kan deltage i dette rum i stedet: %s"
+
+#: ../src/common/connection_handlers.py:1934
+msgid "I would like to add you to my roster."
+msgstr "Jeg vil gerne tilføje dig til min kontaktliste."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:1955
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "vi abonnerer nu på %s"
+
+#: ../src/common/connection_handlers.py:1957
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "forespørsel om ophør på abonnement fra %s"
+
+#: ../src/common/connection_handlers.py:1959
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "nu abonnerer vi ikke længere på %s"
+
+#: ../src/common/connection_handlers.py:2081
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s er ikke RFC føjelig. Den vil ikke blive tilføjet til dit "
+"kontaktvindue. Brug kontaktvindue håndterings redskaber som http://jru."
+"jabberstudio.org/ til at fjerne det."
+
+#: ../src/common/connection.py:244
+#: ../src/common/zeroconf/connection_zeroconf.py:203
+#, python-format
+msgid "Connection with account \"%s\" has been lost"
+msgstr "Tilslutning til konto \"%s\" er blevet afbrudt"
+
+#: ../src/common/connection.py:245
+msgid "Reconnect manually."
+msgstr "Tilslut manuelt."
+
+#: ../src/common/connection.py:256
+#, python-format
+msgid "Server %s answered wrongly to register request: %s"
+msgstr "Server %s svarede forkert på indskrivnings forespørgslen: %s"
+
+#. wrong answer
+#: ../src/common/connection.py:264
+msgid "Invalid answer"
+msgstr "Forkert svar"
+
+#: ../src/common/connection.py:265
+#, python-format
+msgid "Transport %s answered wrongly to register request: %s"
+msgstr "Transport %s svarede forkert på indskrivnings forespørgslen: %s"
+
+#: ../src/common/connection.py:411
+msgid "Connection to proxy failed"
+msgstr "Tilslutning til proxy fejlede"
+
+#: ../src/common/connection.py:465 ../src/common/connection.py:511
+#: ../src/common/connection.py:1067
+#: ../src/common/zeroconf/connection_zeroconf.py:237
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Kunne ikke tilslutte til \"%s\""
+
+#: ../src/common/connection.py:479
+#, python-format
+msgid "Connected to server %s:%s with %s"
+msgstr "Tilsluttet til server %s:%s med %s"
+
+#: ../src/common/connection.py:512
+msgid "Check your connection or try again later"
+msgstr "Kontroller din tilslutning eller prøv igen senere"
+
+#: ../src/common/connection.py:537
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "Godkendelse fejlede med \"%s\""
+
+#: ../src/common/connection.py:538
+msgid "Please check your login and password for correctness."
+msgstr "Venligst kontroller om dit logind og adgangskode er korrekt."
+
+#: ../src/common/connection.py:581
+msgid "Error while removing privacy list"
+msgstr "Fejl under fjernelse af privatlivs liste"
+
+#: ../src/common/connection.py:582
+#, python-format
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+msgstr "Privatlivs liste %s er ikke blevet fjernet. Den er måske aktiv i en af dine tilsluttede ressourcer. Deaktivér den og prøv igen."
+
+#. We didn't set a passphrase
+#: ../src/common/connection.py:682
+#: ../src/common/zeroconf/connection_zeroconf.py:163
+msgid "OpenPGP passphrase was not given"
+msgstr "OpenPGP adgangskode blev ikke givet"
+
+#. we're not english
+#. one  in locale and one en
+#: ../src/common/connection.py:845
+msgid "[This message is *encrypted* (See :JEP:`27`]"
+msgstr "[Denne besked er *krypteret* (Se :JEP:`27`]"
+
+#: ../src/common/connection.py:916
+#: ../src/common/zeroconf/connection_zeroconf.py:423
+#, python-format
+msgid ""
+"Subject: %s\n"
+"%s"
+msgstr ""
+"Emne: %s\n"
+"%s"
+
+#: ../src/common/connection.py:1099
+msgid "Not fetched because of invisible status"
+msgstr "Ikke hentet på grund af usynlig status"
+
+#: ../src/common/contacts.py:294
+msgid "Not in roster"
+msgstr "Ikke i kontaktvindue"
+
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:33
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "D-Bus python bindinger mangler på denne computer"
+
+#: ../src/common/dbus_support.py:34
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "Gajims D-Bus evner kan ikke bruges"
+
+#: ../src/common/exceptions.py:22
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr "pysqlite2 (også kaldet python-pysqlite2) afhængighed mangler. Slutter..."
+
+#: ../src/common/exceptions.py:39
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr ""
+"Tjeneste ikke tilgængelig: Gajim kører ikke, eller remote_control er Falsk"
+
+#: ../src/common/exceptions.py:47
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr ""
+"D-Bus er ikke tilgængelig på denne maskine eller et python modul mangler"
+
+#: ../src/common/exceptions.py:55
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Sessions bussen er ikke tilgængelig.\n"
+"Prøv at læse http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "one"
+msgstr "en"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "two"
+msgstr "to"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "three"
+msgstr "tre"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "four"
+msgstr "fire"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "five"
+msgstr "fem"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr "seks"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "seven"
+msgstr "syv"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr "otte"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "nine"
+msgstr "ni"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr "ti"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eleven"
+msgstr "elleve"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr "tolv"
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "$0 o'clock"
+msgstr "klokken $0"
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past $0"
+msgstr "fem over $0"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "ten past $0"
+msgstr "ti over $0"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past $0"
+msgstr "kvart over $0"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty past $0"
+msgstr "tyve over $0"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past $0"
+msgstr "femogtyve over $0"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "half past $0"
+msgstr "halv $1"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to $1"
+msgstr "femogtyve minutter i $1"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "twenty to $1"
+msgstr "tyve minutter i $1"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to $1"
+msgstr "kvart på $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "ten to $1"
+msgstr "ti på $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "five to $1"
+msgstr "fem på $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
+msgid "$1 o'clock"
+msgstr "klokken $1"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Night"
+msgstr "Nat"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Early morning"
+msgstr "Tidlig morgen"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Morning"
+msgstr "Morgen"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Almost noon"
+msgstr "Næsten middag"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Noon"
+msgstr "Middag"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Afternoon"
+msgstr "Eftermiddag"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Evening"
+msgstr "Aften"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Late evening"
+msgstr "Sen aften"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Start of week"
+msgstr "Ugestart"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Middle of week"
+msgstr "Midten af ugen"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "End of week"
+msgstr "Slutten af ugen"
+
+#: ../src/common/fuzzyclock.py:68
+msgid "Weekend!"
+msgstr "Weekend!"
+
+#: ../src/common/helpers.py:115
+msgid "Invalid character in username."
+msgstr "Ugyldig karakter i brugernavn."
+
+#: ../src/common/helpers.py:120
+msgid "Server address required."
+msgstr "Server adresse påkrævet."
+
+#: ../src/common/helpers.py:125
+msgid "Invalid character in hostname."
+msgstr "Ugyldig karakter i værtsnavn."
+
+#: ../src/common/helpers.py:131
+msgid "Invalid character in resource."
+msgstr "Ugyldig karakter i ressource."
+
+#. GiB means gibibyte
+#: ../src/common/helpers.py:171
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:174
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:178
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:181
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:185
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:188
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:191
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:222
+msgid "_Busy"
+msgstr "_Travlt"
+
+#: ../src/common/helpers.py:224
+msgid "Busy"
+msgstr "Travlt"
+
+#: ../src/common/helpers.py:227
+msgid "_Not Available"
+msgstr "_Ikke tilgængelig"
+
+#: ../src/common/helpers.py:232
+msgid "_Free for Chat"
+msgstr "_Tilgængelig for samtale"
+
+#: ../src/common/helpers.py:234
+msgid "Free for Chat"
+msgstr "Tilgængelig for samtale"
+
+#: ../src/common/helpers.py:237
+msgid "_Available"
+msgstr "Ti_lgængelig"
+
+#: ../src/common/helpers.py:241
+msgid "Connecting"
+msgstr "Tilslutter"
+
+#: ../src/common/helpers.py:244
+msgid "A_way"
+msgstr "_Væk"
+
+#: ../src/common/helpers.py:249
+msgid "_Offline"
+msgstr "_Afkoblet"
+
+#: ../src/common/helpers.py:251
+msgid "Offline"
+msgstr "Afkoblet"
+
+#: ../src/common/helpers.py:254
+msgid "_Invisible"
+msgstr "_Usynlig"
+
+#: ../src/common/helpers.py:260
+msgid "?contact has status:Unknown"
+msgstr "?contact has status:Ukendt"
+
+#: ../src/common/helpers.py:262
+msgid "?contact has status:Has errors"
+msgstr "?contact has status:Har fejl"
+
+#: ../src/common/helpers.py:267
+msgid "?Subscription we already have:None"
+msgstr "?Subscription we already have:Intet"
+
+#: ../src/common/helpers.py:269
+msgid "To"
+msgstr "Til"
+
+#: ../src/common/helpers.py:273
+msgid "Both"
+msgstr "Begge"
+
+#: ../src/common/helpers.py:281
+msgid "?Ask (for Subscription):None"
+msgstr "?Ask (for Subscription):Intet"
+
+#: ../src/common/helpers.py:283
+msgid "Subscribe"
+msgstr "Abonner"
+
+#: ../src/common/helpers.py:292
+msgid "?Group Chat Contact Role:None"
+msgstr "?Group Chat Contact Role:Ingen"
+
+#: ../src/common/helpers.py:295
+msgid "Moderators"
+msgstr "Moderatorer"
+
+#: ../src/common/helpers.py:297
+msgid "Moderator"
+msgstr "Moderator"
+
+#: ../src/common/helpers.py:300
+msgid "Participants"
+msgstr "Deltagere"
+
+#: ../src/common/helpers.py:302
+msgid "Participant"
+msgstr "Deltager"
+
+#: ../src/common/helpers.py:305
+msgid "Visitors"
+msgstr "Besøgende"
+
+#: ../src/common/helpers.py:307
+msgid "Visitor"
+msgstr "Besøgende"
+
+#: ../src/common/helpers.py:313
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Group Chat Contact Affiliation:Ingen"
+
+#: ../src/common/helpers.py:315
+msgid "Owner"
+msgstr "Ejer"
+
+#: ../src/common/helpers.py:317
+msgid "Administrator"
+msgstr "Administrator"
+
+#: ../src/common/helpers.py:319
+msgid "Member"
+msgstr "Medlem"
+
+#: ../src/common/helpers.py:358
+msgid "is paying attention to the conversation"
+msgstr "er opmærksom på samtalen"
+
+#: ../src/common/helpers.py:360
+msgid "is doing something else"
+msgstr "gør noget andet"
+
+#: ../src/common/helpers.py:362
+msgid "is composing a message..."
+msgstr "komponerer en besked..."
+
+#. paused means he or she was composing but has stopped for a while
+#: ../src/common/helpers.py:365
+msgid "paused composing a message"
+msgstr "holder pause med at komponere en besked"
+
+#: ../src/common/helpers.py:367
+msgid "has closed the chat window or tab"
+msgstr "har lukket samtalevinduet eller fanebladet"
+
+#: ../src/common/helpers.py:913 ../src/common/helpers.py:920
+#, python-format
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "%d besked venter"
+msgstr[1] "%d beskeder venter"
+
+#: ../src/common/helpers.py:926
+#, python-format
+msgid " from room %s"
+msgstr "fra rum %s"
+
+#: ../src/common/helpers.py:929 ../src/common/helpers.py:948
+#, python-format
+msgid " from user %s"
+msgstr "fra bruger %s"
+
+#: ../src/common/helpers.py:931
+#, python-format
+msgid " from %s"
+msgstr " fra %s"
+
+#: ../src/common/helpers.py:938 ../src/common/helpers.py:945
+#, python-format
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/common/helpers.py:978
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
+#. we talk about a file
+#: ../src/common/optparser.py:60
+#, python-format
+msgid "error: cannot open %s for reading"
+msgstr "fejl: kan ikke åbne %s for læsning"
+
+#: ../src/common/optparser.py:203 ../src/common/optparser.py:204
+msgid "cyan"
+msgstr "cyan"
+
+#: ../src/common/optparser.py:320
+msgid "migrating logs database to indices"
+msgstr "flytter log databasen til flere indeks"
+
+#: ../src/common/passwords.py:82
+#, python-format
+msgid "Gajim account %s"
+msgstr "Gajim konto %s"
+
+#: ../src/common/zeroconf/client_zeroconf.py:135
+#: ../src/common/zeroconf/client_zeroconf.py:218
+msgid "Connection to host could not be established"
+msgstr "Tilslutning til vært kunne ikke etableres"
+
+#: ../src/common/zeroconf/client_zeroconf.py:192
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
+msgstr "Tilslutning til vært kunne ikke etableres: Forkert svar fra server."
+
+#: ../src/common/zeroconf/client_zeroconf.py:352
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"Tilslutning til vært kunne ikke etableres: Tidsudløb mens data var blevet "
+"sendt."
+
+#: ../src/common/zeroconf/client_zeroconf.py:638
+msgid "Contact is offline. Your message could not be sent."
+msgstr "Kontakt er afkoblet. Din besked kunne ikke sendes."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:204
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr ""
+"For at kunne fortsætte med at sende og modtage beskeder, må du tilslutte dig "
+"igen."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+msgid "Avahi error"
+msgstr "Avahi fejl"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+"%s\n"
+"Link-local beskeder vil sandsynligvis ikke virke ordentligt."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+msgid "Please check if Avahi is installed."
+msgstr "Kontroller venligst om Avahi er installeret."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:247
+#: ../src/common/zeroconf/connection_zeroconf.py:251
+msgid "Could not start local service"
+msgstr "Kunne ikke starte lokal tjeneste"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:248
+#, python-format
+msgid "Unable to bind to port %d."
+msgstr "Ikke i stand til at tildele port %d."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:347
+msgid "Please check if avahi-daemon is running."
+msgstr "Kontroller venligst om avahi-dæmonen kører."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:346
+#, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Kunne ikke ændre status på kontoen \"%s\""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:363
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+"Du er ikke tilsluttet eller synlig for andre. Din besked kunne ikke sendes."
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:375
+msgid "[This message is encrypted]"
+msgstr "[Denne besked er krypteret]"
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:178
+#: ../src/common/zeroconf/zeroconf_bonjour.py:187
+#, python-format
+msgid "Error while adding service. %s"
+msgstr "Fejl ved tilføjelse af tjeneste. %s"
+
diff --git a/po/de.po b/po/de.po
index ec658b229..2b640dfaa 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,14 +3,20 @@
 # This file is distributed under the same license as the gajim package.
 # Fridtjof Busse <fridtjof@fbunet.de>, 2005, 2006.
 # Benjamin Drung <benjamin.drung@gmail.com>, 2007.
+# Fabian Fingerle <otih@datensalat.eu>, 2007.
+# Sebastian Schäfer <sarek@uliweb.de>, 2007.
 #
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:253 ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:263
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-29 13:38+0200\n"
-"PO-Revision-Date: 2007-08-03 23:11+0100\n"
-"Last-Translator: Michael Skiba <michael@michael-skiba.de>\n"
+"POT-Creation-Date: 2007-11-23 11:00+0100\n"
+"PO-Revision-Date: 2007-11-04 16:37+0100\n"
+"Last-Translator: Nico Gulden <cilugnedon@gmx.de>\n"
 "Language-Team: German <translators@gajim.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,37 +36,36 @@ msgid "Jabber IM Client"
 msgstr "Jabber IM-Client"
 
 #: ../data/glade/account_context_menu.glade.h:1
-msgid "Send Single _Message..."
-msgstr "Einzelne _Nachricht senden..."
+#: ../data/glade/roster_window.glade.h:8
+msgid "Join _Group Chat..."
+msgstr "_Chatraum beitreten..."
 
 #: ../data/glade/account_context_menu.glade.h:2
 msgid "_Add Contact..."
 msgstr "Kontakt _hinzufügen..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-msgid "_Discover Services..."
-msgstr "_Durchsuche Dienste..."
+#: ../data/glade/roster_window.glade.h:15
+msgid "_Discover Services"
+msgstr "_Dienste durchsuchen"
 
 #: ../data/glade/account_context_menu.glade.h:4
-#: ../src/disco.py:1145
 msgid "_Execute Command..."
 msgstr "_Befehl ausführen..."
 
 #: ../data/glade/account_context_menu.glade.h:5
-#: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Gruppenchat"
+msgid "_Modify Account"
+msgstr "Konto bearbeiten"
 
 #: ../data/glade/account_context_menu.glade.h:6
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Konto bearbeiten..."
-
-#: ../data/glade/account_context_menu.glade.h:7
 msgid "_Open Gmail Inbox"
 msgstr "Google Mail Posteingang _öffnen"
 
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/roster_window.glade.h:23
+msgid "_Start Chat..."
+msgstr "_Chat starten"
+
 #: ../data/glade/account_context_menu.glade.h:8
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
@@ -68,7 +73,7 @@ msgstr "_Status"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:1
 msgid ""
-"<b>Account is being created</b>\n"
+"<b>Connecting to server</b>\n"
 "\n"
 "Please wait..."
 msgstr ""
@@ -85,49 +90,68 @@ msgid "<b>Please fill in the data for your new account</b>"
 msgstr "<b>Bitte geben Sie die Daten für Ihr neues Konto ein</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:6
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr "Klicken, um die Fähigkeiten (z.B. MSN-, ICQ-Transporte) auf Jabber-Servern zu sehen."
+msgid "<b>Please select a server</b>"
+msgstr "<b>Bitte einen Server wählen</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+msgstr ""
+"Klicken, um die Fähigkeiten (z.B. MSN-, ICQ-Transporte) auf Jabber-Servern "
+"zu sehen."
+
+#: ../data/glade/account_creation_wizard_window.glade.h:8
 msgid "Connect when I press Finish"
 msgstr "Verbinde, sobald ich Fertig klicke"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/glade/account_creation_wizard_window.glade.h:9
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kontoeinrichtungs-Assistent"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:9
-msgid "I already have an account I want to use"
-msgstr "Ich habe bereits ein Konto, das ich benutzen möchte"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:10
+msgid "I already have an account I want to _use"
+msgstr "Ich habe bereits ein Konto, das ich _benutzen möchte"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "I want to _register for a new account"
 msgstr "Ich möchte ein neues Konto _erstellen"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
-#: ../data/glade/account_modification_window.glade.h:19
+#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:23
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Falls aktiviert, speichert Gajim das Passwort für dieses Konto"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
-#: ../data/glade/manage_proxies_window.glade.h:7
-msgid "Pass_word:"
-msgstr "Pass_wort:"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:32
+msgid "Manage..."
+msgstr "_Verwalten..."
+
+#: ../data/glade/account_creation_wizard_window.glade.h:14
+msgid "Prox_y:"
+msgstr "Proxy:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:47
 msgid "Save pass_word"
 msgstr "Pass_wort speichern"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 msgid "Servers Features"
 msgstr "Fähigkeiten des Servers"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 msgid "Set my profile when I connect"
 msgstr "Setze mein Profil, wenn ich mich verbinde"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:53
+msgid "Use custom hostname/port"
+msgstr "Verwende benutzerdefinierten Hostnamen und Port"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -135,67 +159,64 @@ msgstr ""
 "Sie müssen ein Konto erstellen, bevor Sie sich zum Jabber-Netzwerk \n"
 "verbinden können."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:21
 msgid "Your JID:"
 msgstr "Ihre JID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Advanced"
 msgstr "_Erweitert"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:23
 msgid "_Finish"
 msgstr "_Beenden"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "_Server:"
+#: ../data/glade/account_creation_wizard_window.glade.h:24
+#, fuzzy
+msgid "_Hostname:"
+msgstr "_Hostname: "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:49
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_modification_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Password:"
 msgstr "_Passwort:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:23
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 #: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "_Retype Password:"
-msgstr "Passwort e_rneut eingeben:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:27
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
-msgid "_Use proxy"
-msgstr "_Proxy benutzen"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:28
 #: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_Username:"
 msgstr "_Benutzername:"
 
 #: ../data/glade/account_modification_window.glade.h:1
+#: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:8
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Verschiedenes</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:2
 #: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:3
 #: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Persönliche Informationen</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:4
 msgid "Account"
 msgstr "Konto"
 
@@ -204,239 +225,358 @@ msgid "Account Modification"
 msgstr "Kontoänderung"
 
 #: ../data/glade/account_modification_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
 msgid "Administration operations"
 msgstr "Administrative Aktionen"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Auto-reconnect when connection is lost"
 msgstr "Automatisch neu verbinden, wenn die Verbindung abbricht"
 
 #: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:7
 #: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "Beim Pr_ogrammstart verbinden"
 
 #: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:8
 msgid "Chan_ge Password"
 msgstr "Pass_wort ändern"
 
 #: ../data/glade/account_modification_window.glade.h:10
-msgid "Check this so Gajim will connect in port 5223 where legacy servers are expected to have SSL capabilities. Note that Gajim uses TLS encryption by default if broadcasted by the server, and with this option enabled TLS will be disabled"
-msgstr "Aktivieren Sie diese Option, damit Gajim auf Port 5223 verbindet, auf dem veraltete Server SSL-Fähigkeiten haben. Beachten Sie, dass Gajim standardmäßig TLS-Verschlüsselung benutzt, wenn sie vom Server verwendet wird und sie TLS mit dieser Option deaktivieren"
+#: ../data/glade/accounts_window.glade.h:9
+msgid ""
+"Check this so Gajim will connect in port 5223 where legacy servers are "
+"expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
+"default if broadcasted by the server, and with this option enabled TLS will "
+"be disabled"
+msgstr ""
+"Aktivieren Sie diese Option, damit Gajim auf Port 5223 verbindet, auf dem "
+"veraltete Server SSL-Fähigkeiten haben. Beachten Sie, dass Gajim "
+"standardmäßig TLS-Verschlüsselung benutzt, wenn sie vom Server verwendet "
+"wird und sie TLS mit dieser Option deaktivieren"
 
 #: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:10
 #: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "_Schlüssel wählen..."
 
 #: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:11
 msgid "Click to change account's password"
 msgstr "Klicken, um das Konto-Passwort zu ändern"
 
 #: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:12
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:13
 msgid "Connection"
 msgstr "Verbindung"
 
-#: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/account_modification_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Edit Personal Information..."
 msgstr "Persönliche Details bearbeiten ..."
 
-#: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/roster_window.glade.h:5
-#: ../src/notify.py:458
-#: ../src/notify.py:480
-#: ../src/notify.py:492
-#: ../src/common/helpers.py:914
+#. No configured account
+#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:6 ../src/notify.py:489
+#: ../src/notify.py:520 ../src/notify.py:532 ../src/common/helpers.py:998
+#: ../src/common/helpers.py:1010
 msgid "Gajim"
 msgstr "Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/preferences_window.glade.h:51
+#. General group cannot be changed
+#: ../data/glade/account_modification_window.glade.h:17
+#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/preferences_window.glade.h:45
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:347
-#: ../src/roster_window.py:1225
-#: ../src/roster_window.py:1435
-#: ../src/roster_window.py:2114
-#: ../src/roster_window.py:2156
-#: ../src/common/contacts.py:284
+#: ../src/roster_window.py:372 ../src/roster_window.py:637
+#: ../src/roster_window.py:1384 ../src/roster_window.py:1760
+#: ../src/roster_window.py:2145 ../src/roster_window.py:2657
+#: ../src/roster_window.py:2775 ../src/common/contacts.py:314
 msgid "General"
 msgstr "Allgemein"
 
-#: ../data/glade/account_modification_window.glade.h:17
+#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:20
 msgid "Hostname: "
 msgstr "Hostname: "
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working."
-msgstr "Wenn aktiviert, wird Gajim von mehr IPs als nur Ihrer eigenen senden, wodurch Datentransfers eine höhere Erfolgswahrscheinlichkeit bekommen."
-
-#: ../data/glade/account_modification_window.glade.h:20
-msgid "If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection"
-msgstr "Wenn aktiviert, sendet Gajim regelmäßig Keepalive-Pakete, um einen Verbindungsabbruch durch eine Zeitüberschreitung zu verhindern"
+#: ../data/glade/account_modification_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:21
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Wenn aktiviert, wird Gajim von mehr IPs als nur Ihrer eigenen senden, "
+"wodurch Datentransfers eine höhere Erfolgswahrscheinlichkeit bekommen."
 
 #: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/zeroconf_properties_window.glade.h:8
-msgid "If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you"
-msgstr "Wenn aktiviert, wird Gajim das Passwort in ~/.gajim/config mit Lese-Rechten nur für Sie speichern"
+#: ../data/glade/accounts_window.glade.h:24
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Wenn aktiviert, sendet Gajim regelmäßig Keepalive-Pakete, um einen "
+"Verbindungsabbruch durch eine Zeitüberschreitung zu verhindern"
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:9
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "Wenn aktiviert, wird Gajim während des Startvorgangs automatisch zu diesem Konto verbinden"
+#: ../data/glade/zeroconf_properties_window.glade.h:8
+msgid ""
+"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+"permission only for you"
+msgstr ""
+"Wenn aktiviert, wird Gajim das Passwort in ~/.gajim/config mit Lese-Rechten "
+"nur für Sie speichern"
 
 #: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/zeroconf_properties_window.glade.h:10
-msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly"
-msgstr "Wenn aktiviert, wird jede Änderung des globalen Status (verwaltet von der Combobox am Fuße des Kontaktfensters) auch den Status dieses Kontakts entsprechend ändern"
+#: ../data/glade/accounts_window.glade.h:25
+#: ../data/glade/zeroconf_properties_window.glade.h:9
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Wenn aktiviert, wird Gajim während des Startvorgangs automatisch zu diesem "
+"Konto verbinden"
 
 #: ../data/glade/account_modification_window.glade.h:24
-msgid "Information about you, as stored in the server"
-msgstr "Informationen über Sie, wie sie auf dem Server gespeichert sind"
+#: ../data/glade/accounts_window.glade.h:26
+#: ../data/glade/zeroconf_properties_window.glade.h:10
+msgid ""
+"If checked, any change to the global status (handled by the combobox at the "
+"bottom of the roster window) will change the status of this account "
+"accordingly"
+msgstr ""
+"Wenn aktiviert, wird jede Änderung des globalen Status (verwaltet von der "
+"Combobox am Fuße des Kontaktfensters) auch den Status dieses Kontakts "
+"entsprechend ändern"
 
 #: ../data/glade/account_modification_window.glade.h:25
-msgid "Manage..."
-msgstr "_Verwalten..."
+#: ../data/glade/accounts_window.glade.h:29
+msgid "Information about you, as stored in the server"
+msgstr "Informationen über Sie, wie sie auf dem Server gespeichert sind"
 
-#: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/zeroconf_properties_window.glade.h:16
-#: ../src/config.py:1623
-#: ../src/config.py:3301
+#: ../data/glade/account_modification_window.glade.h:27
+#: ../data/glade/accounts_window.glade.h:34
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1553
+#: ../src/config.py:2030
 msgid "No key selected"
 msgstr "Kein Schlüssel gewählt"
 
 #. None means no proxy profile selected
 #. GPG Key
-#: ../data/glade/account_modification_window.glade.h:28
-#: ../src/config.py:1196
-#: ../src/config.py:1201
-#: ../src/config.py:1385
-#: ../src/config.py:1613
-#: ../src/config.py:1622
-#: ../src/config.py:1682
-#: ../src/config.py:1756
-#: ../src/config.py:3291
-#: ../src/config.py:3300
-#: ../src/dialogs.py:281
-#: ../src/dialogs.py:283
-#: ../src/roster_window.py:1539
-#: ../src/roster_window.py:1546
-#: ../src/roster_window.py:1553
+#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:32 ../src/config.py:1142
+#: ../src/config.py:1213 ../src/config.py:1462 ../src/config.py:1467
+#: ../src/config.py:1928 ../src/config.py:2015 ../src/config.py:2029
+#: ../src/config.py:3111 ../src/config.py:3157 ../src/dialogs.py:344
+#: ../src/dialogs.py:346 ../src/roster_window.py:1864
+#: ../src/roster_window.py:1871 ../src/roster_window.py:1878
 msgid "None"
 msgstr "Kein"
 
-#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/accounts_window.glade.h:37
 #: ../data/glade/profile_window.glade.h:26
 #: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Persönliche Informationen"
 
-#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:38
 msgid "Port: "
 msgstr "Port: "
 
-#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:39
 msgid "Priori_ty:"
 msgstr "Priori_tät:"
 
-#: ../data/glade/account_modification_window.glade.h:32
-msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events"
-msgstr "Die Priorität wird von Jabber verwendet, um festzustellen, wer die Ereignisse des Jabber-Servers bekommt, wenn zwei oder mehr Clients mit dem selben Konto verbunden sind. Der Client mit der höchsten Priorität bekommt die Ereignisse"
-
 #: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:40
+msgid ""
+"Priority is used in Jabber to determine who gets the events from the jabber "
+"server when two or more clients are connected using the same account; The "
+"client with the highest priority gets the events"
+msgstr ""
+"Die Priorität wird von Jabber verwendet, um festzustellen, wer die "
+"Ereignisse des Jabber-Servers bekommt, wenn zwei oder mehr Clients mit dem "
+"selben Konto verbunden sind. Der Client mit der höchsten Priorität bekommt "
+"die Ereignisse"
+
+#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr "Die Priorität wird sich automatisch gemäß des Status ändern."
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:42
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/accounts_window.glade.h:44
 msgid "Resour_ce:"
 msgstr "Ressour_ce: "
 
-#: ../data/glade/account_modification_window.glade.h:36
-msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)"
-msgstr "Die Resource wird zum Jabber-Server geschickt, um die selbe JID in zwei oder mehr Teile zu trennen, abhängig von der Anzahl der Clients die mit dem selben Konto auf dem selben Server verbunden sind. Daher kann man gleichzeitig mit den Ressourcen \"Heim\" und \"Arbeit\" auf das selbe Konto verbinden. Die Ressource mit der höchsten Priorität wird die Nachrichten erhalten (siehe unten)."
-
 #: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/accounts_window.glade.h:45
+msgid ""
+"Resource is sent to the Jabber server in order to separate the same JID in "
+"two or more parts depending on the number of the clients connected in the "
+"same server with the same account. So you might be connected in the same "
+"account with resource 'Home' and 'Work' at the same time. The resource which "
+"has the highest priority will get the events. (see below)"
+msgstr ""
+"Die Resource wird zum Jabber-Server geschickt, um die selbe JID in zwei oder "
+"mehr Teile zu trennen, abhängig von der Anzahl der Clients die mit dem "
+"selben Konto auf dem selben Server verbunden sind. Daher kann man "
+"gleichzeitig mit den Ressourcen \"Heim\" und \"Arbeit\" auf das selbe Konto "
+"verbinden. Die Ressource mit der höchsten Priorität wird die Nachrichten "
+"erhalten (siehe unten)."
+
+#: ../data/glade/account_modification_window.glade.h:38
 #: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "_Passphrase speichern (unsicher)"
 
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:46
 #: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Unter_haltungsverlauf für alle Kontakte dieses Kontos speichern"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Send keep-alive packets"
 msgstr "Sende Keepalive-Pakete"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Konto-Status mit globalem _Status abgleichen"
 
-#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:50
+#: ../data/glade/synchronise_select_account_dialog.glade.h:2
 msgid "Synchronise contacts"
 msgstr "Synchronisiere Kontakte"
 
-#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/accounts_window.glade.h:52
 msgid "Use _SSL (legacy)"
 msgstr "_SSL verwenden (veraltet)"
 
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use custom hostname/port"
-msgstr "Verwende benutzerdefinierten Hostnamen und Port"
-
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:55
 msgid "Use file transfer proxies"
 msgstr "Verwende Datentransfer-Proxies"
 
-#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "Mit dem Status _abgleichen"
 
-#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/account_modification_window.glade.h:49
 msgid "_Name:"
 msgstr "_Name: "
 
-#: ../data/glade/accounts_window.glade.h:1
-msgid "Accounts"
-msgstr "Konten"
+#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-Mail:"
 
-#: ../data/glade/accounts_window.glade.h:2
+#. XML Console enable checkbutton
+#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Einschalten"
+
+#: ../data/glade/accounts_window.glade.h:17
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+msgid "First Name:"
+msgstr "Vorname:"
+
+#: ../data/glade/accounts_window.glade.h:22
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr ""
+"Falls aktiviert, wird Gajim das Passwort von einem GnuPG-Agent wie seahorse "
+"beziehen"
+
+#: ../data/glade/accounts_window.glade.h:27
+#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
-"If checked, all local contacts that use a Bonjour compatible chat client (like iChat, Trillian or Gaim) will be shown in roster. You don't need to be connected to a jabber server for it to work.\n"
-"This is only available if python-avahi is installed and avahi-daemon is running."
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
 msgstr ""
-"Wenn aktiviert, werden alle lokalen Kontakte, welche einen zu Bonjour kompatiblen Chat-Client (Wie z.B. iChat, Trillian oder Gaim) nutzen, in Ihrer Kontaktliste angezeigt. Dafür müssen Sie nicht mit einem Jabber-Server verbunden sein.\n"
-"Dies ist nur möglich, wenn python-avahi verfügbar ist und avahi-daemon läuft (Automatische Diensterkennung)."
+"Wenn der Standardport, der für eingehende Nachrichten benutzt wird, nicht "
+"für Ihre Konfiguration geeignet ist, können sie hier einen anderen Port "
+"festlegen.\n"
+"Möglicherweise ist es von Nöten, Ihre Firewall-Einstellungen zu ändern."
 
-#: ../data/glade/accounts_window.glade.h:4
-msgid "If you have 2 or more accounts and this is checked, Gajim will list all contacts as if you had one account"
-msgstr "Wenn Sie zwei oder mehr Konten haben und diese Option gewählt ist, wird Gajim alle Kontakte auflisten, als hätten Sie nur ein Konto"
+#: ../data/glade/accounts_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:511
+msgid "Jabber ID:"
+msgstr "Jabber-ID:"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:31
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+msgid "Last Name:"
+msgstr "Nachname:"
+
+#: ../data/glade/accounts_window.glade.h:33
 msgid "Mer_ge accounts"
 msgstr "Konten _zusammenführen"
 
-#: ../data/glade/accounts_window.glade.h:6
-msgid "_Enable link-local messaging"
-msgstr "_Kontakte im LAN anzeigen"
+#. Rename
+#: ../data/glade/accounts_window.glade.h:43 ../src/roster_window.py:2727
+msgid "Re_name"
+msgstr "_Umbenennen"
 
-#: ../data/glade/accounts_window.glade.h:7
-msgid "_Modify"
-msgstr "_Ändern"
+#: ../data/glade/accounts_window.glade.h:51
+msgid "Use GPG _Agent"
+msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:8
-#: ../data/glade/remove_account_window.glade.h:4
-msgid "_Remove"
-msgstr "_Entfernen"
+#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+msgid "Use custom port:"
+msgstr "Verwende benutzerdefinierten Port:"
+
+#: ../data/glade/accounts_window.glade.h:59
+msgid "gtk-add"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/features_window.glade.h:4
+msgid "gtk-close"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:61
+msgid "gtk-remove"
+msgstr ""
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
@@ -531,12 +671,15 @@ msgid "This jabber entity does not expose any commands."
 msgstr "Diese Jabber-Instanz gibt keine Kommandos von sich."
 
 #: ../data/glade/advanced_configuration_window.glade.h:1
+#: ../data/glade/features_window.glade.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Beschreibung</b>"
 
 #: ../data/glade/advanced_configuration_window.glade.h:2
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
-msgstr "<b>HINWEIS:</b> Sie sollten Gajim neu starten, damit alle Änderungen in Kraft treten"
+msgstr ""
+"<b>HINWEIS:</b> Sie sollten Gajim neu starten, damit alle Änderungen in "
+"Kraft treten"
 
 #: ../data/glade/advanced_configuration_window.glade.h:3
 msgid "Advanced Configuration Editor"
@@ -555,45 +698,42 @@ msgid "Deletes Message of the Day"
 msgstr "Löscht die Nachricht des Tages"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:3
+#, fuzzy
+msgid "Edit _Privacy Lists..."
+msgstr "_Privatlisten"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:4
 msgid "Sends a message to users currently connected to this server"
 msgstr "Sendet eine Nachricht an momentan angemeldete Benutzer des Servers"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
-msgid "Set MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:5
+msgid "Set MOTD..."
 msgstr "_Setze MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/glade/advanced_menuitem_menu.glade.h:6
 msgid "Sets Message of the Day"
 msgstr "Setzt Message of the Day"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/glade/advanced_menuitem_menu.glade.h:7
 msgid "Show _XML Console"
 msgstr "Zeige _XML Konsole"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
-msgid "Update MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:8
+msgid "Update MOTD..."
 msgstr "_Aktualisiere MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/glade/advanced_menuitem_menu.glade.h:9
 msgid "Updates Message of the Day"
 msgstr "Aktualisiert Message of the Day"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/glade/advanced_menuitem_menu.glade.h:10
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
-msgid "_Privacy Lists"
-msgstr "_Privatlisten"
-
 #: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message"
+msgid "_Send Server Message..."
 msgstr "_Sende Servernachricht"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:12
-msgid "_Send Single Message"
-msgstr "Sende _einzelne Nachricht"
-
 #: ../data/glade/advanced_notifications_window.glade.h:1
 msgid " a window/tab opened with that contact "
 msgstr " ein Fenster/Tab mit diesem Kontakt geöffnet "
@@ -607,7 +747,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>Ereignisse</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>Sounds</b>"
 msgstr "<b>Klänge</b>"
 
@@ -624,8 +764,7 @@ msgid "All statuses"
 msgstr "Alle Status "
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:91
-#: ../src/common/helpers.py:243
+#: ../src/common/commands.py:96 ../src/common/helpers.py:255
 msgid "Away"
 msgstr "Abwesend"
 
@@ -642,7 +781,7 @@ msgid "Have "
 msgstr "habe "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:265
 msgid "Invisible"
 msgstr "Unsichtbar"
 
@@ -651,7 +790,7 @@ msgid "Launch a command"
 msgstr "Starte ein Kommando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:226
+#: ../src/common/helpers.py:238
 msgid "Not Available"
 msgstr "Nicht verfügbar"
 
@@ -692,8 +831,11 @@ msgid "When "
 msgstr "Wenn "
 
 #: ../data/glade/advanced_notifications_window.glade.h:27
-msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr "_Aktivere den UrgencyHint des Fenstermanagers, um das Chatfenster in der Taskleiste blinken zu lassen"
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+msgstr ""
+"_Aktivere den UrgencyHint des Fenstermanagers, um das Chatfenster in der "
+"Taskleiste blinken zu lassen"
 
 #: ../data/glade/advanced_notifications_window.glade.h:28
 msgid "_Disable auto opening chat window"
@@ -773,6 +915,10 @@ msgstr "Neuen Eintrag empfangen"
 msgid "You have received new entry:"
 msgstr "Sie haben einen neuen Eintrag erhalten:"
 
+#: ../data/glade/blocked_contacts_window.glade.h:1
+msgid "Blocked Contacts"
+msgstr "blockierte Kontakte"
+
 #: ../data/glade/change_password_dialog.glade.h:1
 msgid "Change Password"
 msgstr "Passwort ändern"
@@ -802,10 +948,8 @@ msgid "Join _Group Chat"
 msgstr "_Gruppenchat beitreten"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-#: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "_Add to Roster"
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+msgid "_Add to Roster..."
 msgstr "Zur Kont_aktliste hinzufügen"
 
 #: ../data/glade/chat_context_menu.glade.h:3
@@ -825,7 +969,6 @@ msgid "_Open Link in Browser"
 msgstr "Link _öffnen"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
@@ -836,28 +979,64 @@ msgid "Click to see past conversations with this contact"
 msgstr "Klicken, um die früheren Unterhaltungen mit diesem Kontakt zu sehen"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#, fuzzy
+msgid "Invite _Contacts"
+msgstr "Kontakte verwalten"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "_Datei senden"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-msgid "Toggle Open_PGP Encryption"
-msgstr "Open_PGP-Verschlüsselung aktivieren"
+#: ../data/glade/chat_control_popup_menu.glade.h:4
+msgid "Toggle End to End Encryption"
+msgstr "OpenPGP-Verschlüsselung aktivieren"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-msgid "_Compact View    Alt+C"
-msgstr "_Kompakte Ansicht Alt+C"
+msgid "Toggle Open_PGP Encryption"
+msgstr "Open_PGP-Verschlüsselung aktivieren"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:8
-#: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "Zur Kont_aktliste hinzufügen"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:7
+#: ../data/glade/gc_control_popup_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_window.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:2596
 msgid "_History"
 msgstr "_Verlauf"
 
+#: ../data/glade/chat_to_muc_window.glade.h:1
+msgid "In_vite"
+msgstr "_Einladen zu"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends !"
+msgstr "Freunde einladen !"
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+#, fuzzy
+msgid "MUC server"
+msgstr "Beobachter"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr "Bitte wählen Sie einen MUC-Server aus."
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+"Sie beginnen einen Multi-User Chat.\n"
+"Wählen Sie die Kontakte, die Sie einladen möchten"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Formular ausfüllen"
@@ -870,6 +1049,15 @@ msgstr "Raum-Konfiguration"
 msgid "Edit Groups"
 msgstr "Gruppen bearbeiten"
 
+#: ../data/glade/features_window.glade.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr "<b>Liste möglicher Gajim-Features:</b>"
+
+#: ../data/glade/features_window.glade.h:3
+#, fuzzy
+msgid "Features"
+msgstr "Fähigkeiten des Servers"
+
 #: ../data/glade/filetransfers.glade.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Eine Liste der aktiven, fertigen und angehaltenen Dateitransfers"
@@ -884,7 +1072,8 @@ msgstr "Bricht den ausgewählten Dateitransfer ab"
 
 #: ../data/glade/filetransfers.glade.h:4
 msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Bricht den ausgewählten Dateitransfer ab und löscht unvollständige Daten"
+msgstr ""
+"Bricht den ausgewählten Dateitransfer ab und löscht unvollständige Daten"
 
 #: ../data/glade/filetransfers.glade.h:5
 msgid "Clean _up"
@@ -904,22 +1093,27 @@ msgstr "Entferne Dateitransfer von Liste"
 
 #: ../data/glade/filetransfers.glade.h:9
 msgid "Removes completed, cancelled and failed file transfers from the list"
-msgstr "Entfernt beendete, abgebrochene und fehlgeschlagene Dateitransfers von der Liste"
+msgstr ""
+"Entfernt beendete, abgebrochene und fehlgeschlagene Dateitransfers von der "
+"Liste"
 
 #: ../data/glade/filetransfers.glade.h:10
 msgid "Shows a list of file transfers between you and others"
 msgstr "Zeigt eine Liste von Dateiübertragungen an"
 
 #: ../data/glade/filetransfers.glade.h:11
-msgid "This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed"
-msgstr "Diese Aktion entfernt einen Dateitransfer von der Liste. Falls der Transfer aktiv ist, wird er erst gestoppt, dann entfernt"
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
+msgstr ""
+"Diese Aktion entfernt einen Dateitransfer von der Liste. Falls der Transfer "
+"aktiv ist, wird er erst gestoppt, dann entfernt"
 
 #: ../data/glade/filetransfers.glade.h:12
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Zeige eine Benachrichtigung, wenn die Datei komplett übertragen wurde."
 
-#: ../data/glade/filetransfers.glade.h:13
-#: ../src/filetransfers_window.py:761
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:790
 msgid "_Continue"
 msgstr "_Fortsetzen"
 
@@ -927,8 +1121,7 @@ msgstr "_Fortsetzen"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Benachrichtige mich, wenn der Dateitransfer abgeschlossen ist"
 
-#: ../data/glade/filetransfers.glade.h:15
-#: ../src/filetransfers_window.py:188
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:191
 msgid "_Open Containing Folder"
 msgstr "_Öffne Ordner"
 
@@ -1017,11 +1210,11 @@ msgid "_Background:"
 msgstr "_Hintergrund:"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname"
+msgid "Change _Nickname..."
 msgstr "_Spitzname ändern"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject"
+msgid "Change _Subject..."
 msgstr "_Thema ändern"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
@@ -1029,50 +1222,58 @@ msgid "Click to see past conversation in this room"
 msgstr "Klicken, um die früheren Unterhaltungen in diesem Raum zu sehen"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:4
-msgid "Configure _Room"
+msgid "Configure _Room..."
 msgstr "_Raum einrichten"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Bookmark This Room"
+msgid "_Bookmark"
 msgstr "Raum zu _Lesezeichen hinzufügen"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-msgid "_Destroy room"
-msgstr "_Raum zerstören"
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+msgid "_Destroy Room"
+msgstr "_Raum auflösen"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:8
+msgid "_Manage Room"
+msgstr "Raum verwalten"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:9
+msgid "_Minimize on close"
+msgstr "Beim Schließen _minimieren"
 
 #: ../data/glade/gc_occupants_menu.glade.h:1
 msgid "Mo_derator"
 msgstr "Mo_derator"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:2
+msgid "Occupant Actions"
+msgstr "Benutzer Aktionen"
+
+#: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/glade/gc_occupants_menu.glade.h:4
+#: ../data/glade/gc_occupants_menu.glade.h:6
 msgid "_Ban"
 msgstr "_Verbannen"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
 msgid "_Kick"
 msgstr "_Rausschmeißen"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Member"
 msgstr "_Mitglied"
 
-#: ../data/glade/gc_occupants_menu.glade.h:8
-msgid "_Occupant Actions"
-msgstr "_Benutzer Aktionen"
-
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Owner"
 msgstr "_Besitzer"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Send Private Message"
 msgstr "Private Nachricht _senden"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Voice"
 msgstr "_Stimme verleihen"
 
@@ -1080,15 +1281,13 @@ msgstr "_Stimme verleihen"
 msgid "Create new post"
 msgstr "Neue Nachricht"
 
-#: ../data/glade/groups_post_window.glade.h:2
-#: ../src/common/helpers.py:268
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:280
 msgid "From"
 msgstr "Von"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3
-#: ../src/history_manager.py:142
-#: ../src/history_manager.py:173
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:147
+#: ../src/history_manager.py:178
 msgid "Subject"
 msgstr "Betreff"
 
@@ -1099,14 +1298,17 @@ msgid ""
 "You can select logs from the left and/or search database from below.\n"
 "\n"
 "<b>WARNING:</b>\n"
-"If you plan to do massive deletions, please make sure Gajim is not running. Generally avoid deletions with contacts you currently chat with."
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 "<big><b>Willkommen zum Gajim Verlaufsmanager</b></big>\n"
 "\n"
 "Sie können Logs links auswählen und/oder unten die Datenbank durchsuchen.\n"
 "\n"
 "<b>WARNUNG:</b>\n"
-"Wenn Sie massiv Daten löschen möchten, stellen Sie sicher, dass Gajim nicht läuft. Vermeiden Sie generell Löschungen von Kontakten, mit denen Sie gerade chatten."
+"Wenn Sie massiv Daten löschen möchten, stellen Sie sicher, dass Gajim nicht "
+"läuft. Vermeiden Sie generell Löschungen von Kontakten, mit denen Sie gerade "
+"chatten."
 
 #: ../data/glade/history_manager.glade.h:7
 msgid "Delete"
@@ -1125,25 +1327,50 @@ msgid "_Search Database"
 msgstr "_Suche Datenbank"
 
 #: ../data/glade/history_window.glade.h:1
-msgid "Build custom query"
-msgstr "Personalisierte Anfrage bauen"
+msgid "<b>History Viewer</b>"
+msgstr "<b>Verlauf ansehen</b>"
 
 #: ../data/glade/history_window.glade.h:2
+msgid "<b>JID Selection</b>"
+msgstr "<b>JID Auswahl</b>"
+
+#: ../data/glade/history_window.glade.h:3
+msgid ""
+"Choose the chatlog you want to view. \n"
+"Enter the jid of a groupchat or a contact here. For online accounts you can "
+"even enter a a contact's nickname."
+msgstr ""
+
+#: ../data/glade/history_window.glade.h:5 ../src/history_window.py:224
 msgid "Conversation History"
 msgstr "Unterhaltungsverlauf"
 
-#: ../data/glade/history_window.glade.h:3
-msgid "Query Builder..."
-msgstr "Anfrage-Baukasten ..."
+#: ../data/glade/history_window.glade.h:6
+msgid ""
+"Current History\n"
+"All Chat Histories"
+msgstr ""
 
-#: ../data/glade/history_window.glade.h:4
+#: ../data/glade/history_window.glade.h:8
+#: ../data/glade/search_window.glade.h:2
 msgid "Search"
 msgstr "Suche"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/glade/history_window.glade.h:9
+#: ../data/glade/zeroconf_information_window.glade.h:10
+msgid "_Log conversation history"
+msgstr "Unterhaltungs-Ver_lauf"
+
+#: ../data/glade/history_window.glade.h:10
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1182
 msgid "_Search"
 msgstr "_Suche"
 
+#: ../data/glade/history_window.glade.h:11
+#, fuzzy
+msgid "in"
+msgstr "Neun"
+
 #: ../data/glade/invitation_received_dialog.glade.h:1
 msgid "Accept"
 msgstr "Akzeptieren"
@@ -1157,8 +1384,7 @@ msgstr "Ablehnen"
 msgid "Invitation Received"
 msgstr "Einladung empfangen"
 
-#: ../data/glade/join_groupchat_window.glade.h:1
-#: ../src/dialogs.py:1208
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1385
 msgid "Join Group Chat"
 msgstr "Betrete Gruppenchat"
 
@@ -1167,14 +1393,14 @@ msgid "Join this room automatically when I connect"
 msgstr "Betrete diesen Raum automatisch, wenn ich mich verbinde"
 
 #: ../data/glade/join_groupchat_window.glade.h:3
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/glade/manage_bookmarks_window.glade.h:5
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "Nickname:"
 msgstr "Spitzname:"
 
 #: ../data/glade/join_groupchat_window.glade.h:4
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Passwort:"
 
@@ -1183,13 +1409,12 @@ msgid "Recently:"
 msgstr "Kürzlich:"
 
 #: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Raum:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
-#: ../src/disco.py:1163
-#: ../src/disco.py:1546
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1170
+#: ../src/disco.py:1625
 msgid "_Join"
 msgstr "_Betreten"
 
@@ -1209,15 +1434,19 @@ msgstr "Wenn aktiviert, tritt Gajim dem Gruppenchat beim Programmstart bei"
 msgid "Manage Bookmarks"
 msgstr "Verwalte Lesezeichen"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:4
+msgid "Minimize on Auto Join"
+msgstr "Minimieren bei Auto-Join"
+
+#: ../data/glade/manage_bookmarks_window.glade.h:7
 msgid "Print status:"
 msgstr "Status anzeigen:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Server:"
 msgstr "Server:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:10
 msgid "Title:"
 msgstr "Titel:"
 
@@ -1243,10 +1472,14 @@ msgstr "Proxy Verwaltung"
 
 #: ../data/glade/manage_proxies_window.glade.h:6
 #: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:30
 msgid "Name:"
 msgstr "Name:"
 
+#: ../data/glade/manage_proxies_window.glade.h:7
+msgid "Pass_word:"
+msgstr "Pass_wort:"
+
 #: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Type:"
 msgstr "Art:"
@@ -1255,18 +1488,21 @@ msgstr "Art:"
 msgid "Use authentication"
 msgstr "Verwende Authentifizierung"
 
+#: ../data/glade/manage_proxies_window.glade.h:10
+msgid "_Host:"
+msgstr "_Server:"
+
 #: ../data/glade/message_window.glade.h:1
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Klicken Sie, um ein Emoticon einzufügen (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2
-#: ../src/chat_control.py:1109
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1268
 msgid "OpenPGP Encryption"
-msgstr "OpenPGP-Verschlüsselung"
+msgstr "Open_PGP-Verschlüsselung"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:4
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:12
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Aktionen"
@@ -1274,7 +1510,7 @@ msgstr "_Aktionen"
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:6
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:245
+#: ../src/filetransfers_window.py:252
 msgid "_Send"
 msgstr "_Senden"
 
@@ -1290,36 +1526,51 @@ msgstr "<b>Erweiterter Konfigurations-Editor</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Anwendungen</b>"
 
+#: ../data/glade/preferences_window.glade.h:3
+#, fuzzy
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Eine Regel bearbeiten</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/glade/preferences_window.glade.h:5
 msgid "<b>Custom</b>"
 msgstr "<b>Benutzerdefiniert</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/glade/preferences_window.glade.h:6
 msgid "<b>Format of a line</b>"
 msgstr "<b>Format einer Zeile</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/glade/preferences_window.glade.h:7
 msgid "<b>GMail Options</b>"
 msgstr "<b>Gmail-Optionen</b>"
 
-#: ../data/glade/preferences_window.glade.h:7
-msgid "<b>Interface Customization</b>"
-msgstr "<b>Benutzerdefiniertes Aussehen</b>"
-
 #: ../data/glade/preferences_window.glade.h:9
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Voreingestellte Status-Nachrichten</b>"
 
+#: ../data/glade/preferences_window.glade.h:10
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<i>Privatsphären-Liste</i>"
+
 #: ../data/glade/preferences_window.glade.h:11
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Roster-Aussehen</b>"
+
+#: ../data/glade/preferences_window.glade.h:13
+#, fuzzy
+msgid "<b>Themes</b>"
+msgstr "<b>Eigenschaften</b>"
+
+#: ../data/glade/preferences_window.glade.h:14
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Visuelle Benachrichtigungen</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/glade/preferences_window.glade.h:15
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/glade/preferences_window.glade.h:16
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1329,39 +1580,44 @@ msgstr ""
 "Nur beim Schreiben\n"
 "Deaktiviert"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/glade/preferences_window.glade.h:19
 msgid "Allow _OS information to be sent"
 msgstr "Sende _Betriebssystem-Information"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/glade/preferences_window.glade.h:20
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Popups/Benachrichtigungen _zulassen, wenn ich abwesend/NA/beschäftigt/unsichtbar bin"
-
-#: ../data/glade/preferences_window.glade.h:18
-msgid "Also known as iChat style"
-msgstr "Auch als iChat-Stil bekannt"
+msgstr ""
+"Popups/Benachrichtigungen _zulassen, wenn ich abwesend/NA/beschäftigt/"
+"unsichtbar bin"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/glade/preferences_window.glade.h:21
 msgid "Always check to see if Gajim is the _default Jabber client on startup"
 msgstr "Beim Starten überprüfen, ob Gajim der _Standard-Jabber-Client ist"
 
-#: ../data/glade/preferences_window.glade.h:20
-msgid "An example: If you have enabled status message for away, Gajim won't ask you anymore for a status message when you change your status to away; it will use the default one set here"
-msgstr "Ein Beispiel: Wenn Sie eine Status-Nachricht für Abwesend aktiviert haben, wird Sie Gajim nicht noch einmal nach einer Status-Nachricht fragen, wenn Sie Ihren Status zu Abwesend ändern; es wird die hier definierte Nachricht verwendet."
+#: ../data/glade/preferences_window.glade.h:22
+msgid ""
+"An example: If you have enabled status message for away, Gajim won't ask you "
+"anymore for a status message when you change your status to away; it will "
+"use the default one set here"
+msgstr ""
+"Ein Beispiel: Wenn Sie eine Status-Nachricht für Abwesend aktiviert haben, "
+"wird Sie Gajim nicht noch einmal nach einer Status-Nachricht fragen, wenn "
+"Sie Ihren Status zu Abwesend ändern; es wird die hier definierte Nachricht "
+"verwendet."
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Ask status message when I:"
 msgstr "Erfrage Status-Nachricht beim: "
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/glade/preferences_window.glade.h:24
 msgid "Auto _away after:"
 msgstr "Automatisch _abwesend nach:"
 
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:25
 msgid "Auto _not available after:"
 msgstr "Automatisch _nicht verfügbar nach:"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/glade/preferences_window.glade.h:26
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1372,28 +1628,28 @@ msgstr ""
 "Bei jedem Programmstart automatisch erkennen\n"
 "Immer GNOME Standard-Anwendungen verwenden\n"
 "Immer KDE Standard-Anwendungen verwenden\n"
+"Immer XFCE4 Standard-Anwendungen verwenden\n"
 "Benutzerdefiniert"
 
-#: ../data/glade/preferences_window.glade.h:29
-msgid "Chat"
-msgstr "Chat"
-
-#: ../data/glade/preferences_window.glade.h:30
-msgid "Check this option, only if someone you don't have in the roster spams/annoys you. Use with caution, because it blocks all messages from any contact that is not in the roster"
-msgstr "Aktivieren Sie diese Option nur, wenn jemand, der nicht in ihrer Liste ist, Spam an Sie verschickt oder Sie belästigt. Verwenden Sie diese Option mit Vorsicht, da sie alle Nachrichten von allen Kontakten blockiert, die nicht in ihrer Liste sind."
-
 #: ../data/glade/preferences_window.glade.h:31
+msgid ""
+"Check this option, only if someone you don't have in the roster spams/annoys "
+"you. Use with caution, because it blocks all messages from any contact that "
+"is not in the roster"
+msgstr ""
+"Aktivieren Sie diese Option nur, wenn jemand, der nicht in ihrer Liste ist, "
+"Spam an Sie verschickt oder Sie belästigt. Verwenden Sie diese Option mit "
+"Vorsicht, da sie alle Nachrichten von allen Kontakten blockiert, die nicht "
+"in ihrer Liste sind."
+
+#: ../data/glade/preferences_window.glade.h:32
 msgid "Configure color and font of the interface"
 msgstr "Farbe und Schriftart für die Oberfläche konfigurieren"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Default Status Messages"
 msgstr "Vorgegebene Status-Nachrichten"
 
-#: ../data/glade/preferences_window.glade.h:33
-msgid "Default status _iconset:"
-msgstr "Standard Status-S_ymbole:"
-
 #: ../data/glade/preferences_window.glade.h:34
 msgid ""
 "Determined by sender\n"
@@ -1417,82 +1673,96 @@ msgid "Display status _messages of contacts in roster"
 msgstr "Zeige die Status_nachrichten von Kontakten im Roster"
 
 #: ../data/glade/preferences_window.glade.h:40
-msgid "Displayed Chat state noti_fications:"
-msgstr "Zeige Benachrichtigung über Chatstatus:"
+msgid "Emoticons:"
+msgstr "Emoticons:"
 
 #: ../data/glade/preferences_window.glade.h:41
-msgid "E_very 5 minutes"
-msgstr "Alle 5 _Minuten"
+msgid "Events"
+msgstr "Ereignisse"
 
 #: ../data/glade/preferences_window.glade.h:42
-msgid "Emoticons:"
-msgstr "Emoticons:"
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"display in chat windows."
+msgstr ""
+"Gajim kann Meta-Information, die eine Unterhaltung mit einem Kontakt "
+"betrifft, empfangen und versenden. Hier können Sie definieren, welche "
+"Chatstatus Sie in Ihrem Chatfenster anzeigen möchten."
 
 #: ../data/glade/preferences_window.glade.h:43
-msgid "Events"
-msgstr "Ereignisse"
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"send to the other party."
+msgstr ""
+"Gajim kann Meta-Information, die eine Unterhaltung mit einem Kontakt "
+"betrifft, empfangen und versenden. Hier können Sie definieren, welche "
+"Chatstates Sie Ihrem Gegenüber senden möchten."
 
 #: ../data/glade/preferences_window.glade.h:44
-msgid "Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to display in chat windows."
-msgstr "Gajim kann Meta-Information, die eine Unterhaltung mit einem Kontakt betrifft, empfangen und versenden. Hier können Sie definieren, welche Chatstatus Sie in Ihrem Chatfenster anzeigen möchten."
-
-#: ../data/glade/preferences_window.glade.h:45
-msgid "Gajim can send and receive meta-information related to a conversation you may have with a contact. Here you can specify which chatstates you want to send to the other party."
-msgstr "Gajim kann Meta-Information, die eine Unterhaltung mit einem Kontakt betrifft, empfangen und versenden. Hier können Sie definieren, welche Chatstates Sie Ihrem Gegenüber senden möchten."
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr ""
+"Gajim wird Sie über ein Popup-Fenster in der rechten unteren Bildschirmecke "
+"über Kontakte informieren, die sich gerade abgemeldet haben"
 
 #: ../data/glade/preferences_window.glade.h:46
-msgid "Gajim will automatically show new events by popping up the relevant window"
-msgstr "Gajim wird neue Ereignisse automatisch anzeigen, indem das betreffende Fenster geöffnet wird"
+msgid "Hides buttons in chatwindows to "
+msgstr "Versteckt die Knöpfe im Gruppenchat-Fenster."
 
 #: ../data/glade/preferences_window.glade.h:47
-msgid "Gajim will notify you for new events via a popup in the bottom right of the screen"
-msgstr "Gajim wird Sie über neue Ereignisse mit einem Popup in der rechten unteren Ecke des Bildschirms benachrichtigen"
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+"Wenn aktiviert, wird Gajim auch Informationen über den Absender von neuen E-"
+"Mails hinzufügen."
 
 #: ../data/glade/preferences_window.glade.h:48
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed in"
-msgstr "Gajim wird Sie über ein Popup-Fenster in der rechten unteren Ecke des Bildschirmes über Kontakte informieren, die sich gerade angemeldet haben"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Wenn aktiviert, wird Gajim einen Avatar im Roster-Fenster und in "
+"Gruppenchats einblenden"
 
 #: ../data/glade/preferences_window.glade.h:49
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out"
-msgstr "Gajim wird Sie über ein Popup-Fenster in der rechten unteren Bildschirmecke über Kontakte informieren, die sich gerade abgemeldet haben"
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+msgstr ""
+"Wenn aktiviert, wird Gajim für jeden Kontakt unter dem Kontaktnamen im "
+"Roster und im Gruppenchat-Fenster die Statusnachricht anzeigen"
 
 #: ../data/glade/preferences_window.glade.h:50
-msgid "Gajim will only change the icon of the contact that triggered the new event"
-msgstr "Gajim wird nur das Symbol des Kontaktes ändern, von dem die neue Nachricht kommt"
-
-#: ../data/glade/preferences_window.glade.h:52
-msgid "If checked, Gajim will also include information about the sender of the new emails"
-msgstr "Wenn aktiviert, wird Gajim auch Informationen über den Absender von neuen E-Mails hinzufügen."
-
-#: ../data/glade/preferences_window.glade.h:53
-msgid "If checked, Gajim will display avatars of contacts in roster window and in group chats"
-msgstr "Wenn aktiviert, wird Gajim einen Avatar im Roster-Fenster und in Gruppenchats einblenden"
-
-#: ../data/glade/preferences_window.glade.h:54
-msgid "If checked, Gajim will display status messages of contacts under the contact name in roster window and in group chats"
-msgstr "Wenn aktiviert, wird Gajim für jeden Kontakt unter dem Kontaktnamen im Roster und im Gruppenchat-Fenster die Statusnachricht anzeigen"
-
-#: ../data/glade/preferences_window.glade.h:55
-msgid "If checked, Gajim will remember the roster and chat window positions in the screen and the sizes of them next time you run it"
-msgstr "Wenn aktiviert, erinnert sich Gajim an die Position und Größe der Kontaktliste auf dem Bildschirm beim nächsten Start"
-
-#: ../data/glade/preferences_window.glade.h:56
-msgid "If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)"
-msgstr "Wenn Sie diese Option aktivieren wird Gajim Protokoll-spezifische Symbole verwenden (Ein Kontakt aus MSN wird z.B. das äquivalente MSN-Symbol für den Status \"Anwesend\", \"Abwesend\", \"Beschäftigt\", etc. haben)"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Wenn Sie diese Option aktivieren wird Gajim Protokoll-spezifische Symbole "
+"verwenden (Ein Kontakt aus MSN wird z.B. das äquivalente MSN-Symbol für den "
+"Status \"Anwesend\", \"Abwesend\", \"Beschäftigt\", etc. haben)"
 
-#: ../data/glade/preferences_window.glade.h:57
-msgid "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons"
-msgstr "Wenn nicht deaktivert, wird Gajim ASCII-Smilies wie ':)' mit äquivalenten graphischen Emoticons ersetzen"
+#: ../data/glade/preferences_window.glade.h:51
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Wenn nicht deaktivert, wird Gajim ASCII-Smilies wie ':)' mit äquivalenten "
+"graphischen Emoticons ersetzen"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:52
 msgid "Ignore rich content in incoming messages"
 msgstr "Formatierten Inhalt in ankommenden Nachrichten ignorieren"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Ma_nage..."
 msgstr "_Verwalte..."
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "Never\n"
 "Always\n"
@@ -1504,183 +1774,187 @@ msgstr ""
 "Pro Account\n"
 "Pro Typ"
 
-#: ../data/glade/preferences_window.glade.h:64
-msgid "Notify me about contacts that: "
-msgstr "Über Kontakte benachrichtigen, die sich "
+#: ../data/glade/preferences_window.glade.h:58
+msgid "Notify me about contacts that sign _in"
+msgstr "Über Kontakte benachrichtigen, die sich einloggen"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:59
+msgid "Notify me about contacts that sign _out"
+msgstr "Über Kontakte benachrichtigen, die sich abmelden"
+
+#: ../data/glade/preferences_window.glade.h:60
 msgid "Notify on new _GMail email"
 msgstr "Über neue _Google Mail E-Mails benachrichtigen"
 
-#: ../data/glade/preferences_window.glade.h:66
-msgid "On every _message"
-msgstr "In jeder _Zeile"
-
-#: ../data/glade/preferences_window.glade.h:67
-msgid "One message _window:"
-msgstr "Ein _Nachrichtenfenster:"
-
-#: ../data/glade/preferences_window.glade.h:68
-msgid "Outgoing Chat state noti_fications:"
-msgstr "_Sende Chatstatus:"
-
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:61
 msgid "Play _sounds"
 msgstr "_Klänge abspielen"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:62
+msgid ""
+"Pop it up\n"
+"Notify me about it\n"
+"Show only in roster"
+msgstr ""
+"Popup öffnen\n"
+"Benachrichtige mich darüber\n"
+"Nur im Roster anzeigen"
+
+#: ../data/glade/preferences_window.glade.h:65
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../data/glade/preferences_window.glade.h:71
-msgid "Print time:"
-msgstr "Zeit anzeigen:"
-
-#: ../data/glade/preferences_window.glade.h:72
-msgid "Save _position and size for roster and chat windows"
-msgstr "Speichere _Position und Größe der Kontaktliste und Chatfenster"
+#: ../data/glade/preferences_window.glade.h:66
+#, fuzzy
+msgid "Privacy"
+msgstr "Privatliste"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Set status message to reflect currently playing _music track"
 msgstr "Setze Status-Nachricht auf den aktuell spielenden _Musiktitel"
 
-#: ../data/glade/preferences_window.glade.h:74
-msgid "Show only in _roster"
-msgstr "Nur in der _Kontaktliste anzeigen"
-
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Sign _in"
 msgstr "_anmelden"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Sign _out"
 msgstr "a_bmelden"
 
-#: ../data/glade/preferences_window.glade.h:77
-msgid "Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text."
-msgstr "Einige Nachrichten könnten formatierten Inhalt enthalten (Farben, Schriftarten etc.). Wenn aktiviert, wird Gajim nur den puren Nachrichtentext anzeigen."
+#: ../data/glade/preferences_window.glade.h:70
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Einige Nachrichten könnten formatierten Inhalt enthalten (Farben, "
+"Schriftarten etc.). Wenn aktiviert, wird Gajim nur den puren Nachrichtentext "
+"anzeigen."
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:72
+msgid "Status _iconset:"
+msgstr "Status-S_ymbole:"
+
+#: ../data/glade/preferences_window.glade.h:73
 msgid "T_heme:"
 msgstr "T_hema:"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:74
 msgid "The auto away status message"
 msgstr "Automatische Statusnachricht für Abwesend"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:75
 msgid "The auto not available status message"
 msgstr "Automatische Statusnachricht für Nicht verfügbar"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Treat all incoming messages as:"
 msgstr " Behandle alle eingehenden Nachrichten als:"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Use _transports iconsets"
 msgstr "_Transport-Symbole verwenden"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:78
+msgid "Use only one message _window:"
+msgstr "Nur ein _Nachrichtenfenster:"
+
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Use system _default"
 msgstr "Benutze System-_Voreinstellung"
 
-#: ../data/glade/preferences_window.glade.h:85
-msgid "Use t_rayicon (aka. notification area icon)"
-msgstr "Verwende _Trayicon (Benachrichtigungs-Icon)"
-
-#: ../data/glade/preferences_window.glade.h:86
-msgid "When a new event (message, file transfer request etc..) is received, the following methods may be used to inform you about it. Please note that events about new messages only occur if it is a new message from a contact you are not already chatting with"
-msgstr "Wenn ein neues Ereignis (Nachricht, Dateitransferanfrage usw.) empfangen wird, können die folgenden Methoden zur Benachrichtigung verwendet werden. Bitte beachten Sie, dass Ereignisse über neue Nachrichten nur auftreten, wenn Sie eine Nachricht von einem Kontakt erhalten, mit dem Sie nicht bereits chatten"
-
-#: ../data/glade/preferences_window.glade.h:87
-msgid "When new event is received"
+#: ../data/glade/preferences_window.glade.h:80
+msgid "When new event is received:"
 msgstr "Wenn neue Nachricht empfangen wird"
 
-#: ../data/glade/preferences_window.glade.h:88
-msgid "Works for Rhythmbox and Muine players. For more players, please visit http://trac.gajim.org/wiki/GajimAndMusicPlayer"
-msgstr "Funktioniert mit Rhythmbox und Muine. Für weitere Wiedergabeprogramme besuchen Sie bitte http://trac.gajim.org/wiki/GajimAndMusicPlayer (Englisch)"
+#: ../data/glade/preferences_window.glade.h:81
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+"Funktioniert mit Rhythmbox und Muine. Für weitere Wiedergabeprogramme "
+"besuchen Sie bitte http://trac.gajim.org/wiki/GajimAndMusicPlayer (Englisch)"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:82
 msgid "_Advanced Notifications Control..."
 msgstr "_Erweiterter Konfigurations-Editor..."
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:83
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:84
+msgid "_Display chat state notifications:"
+msgstr "Zeige Benachrichtigung über Chatstatus:"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "_File manager:"
 msgstr "_Dateimanager:"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Font:"
 msgstr "_Schriftart:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_Highlight misspelled words"
 msgstr "Falsch geschriebene Wörter _hervorheben"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Ignore events from contacts not in the roster"
 msgstr "Ereignisse von Kontakten, die nicht in der Liste sind, _ignorieren"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Incoming message:"
 msgstr "_Eingehende Nachricht:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_Log status changes of contacts"
 msgstr "_Logge die Statusveränderungen von Kontakten"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Mail client:"
 msgstr "_Mail-Programm:"
 
-#: ../data/glade/preferences_window.glade.h:98
-msgid "_Never"
-msgstr "_Nie"
-
-#: ../data/glade/preferences_window.glade.h:99
-msgid "_Notify me about it"
-msgstr "Be_nachrichtigen"
+#: ../data/glade/preferences_window.glade.h:92
+msgid "_Make message windows compact"
+msgstr "Nachrichtenfenster _kompakt anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Open..."
 msgstr "Ö_ffnen..."
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Outgoing message:"
 msgstr "_Ausgehende Nachricht:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Player:"
 msgstr "_Player:"
 
-#: ../data/glade/preferences_window.glade.h:103
-msgid "_Pop it up"
-msgstr "_Öffnen"
-
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Reset to Default Colors"
 msgstr "Auf Standard-Farben zu_rücksetzen"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:97
+msgid "_Send chat state notifications:"
+msgstr "Zeige Benachrichtigung über Chatstatus:"
+
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Sort contacts by status"
 msgstr "Kontakte nach Status _sortieren"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Status message:"
 msgstr "_Statusnachricht:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:100
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:101
 msgid "minutes"
 msgstr "Minuten"
 
@@ -1724,8 +1998,7 @@ msgstr "Jabber-ID:"
 msgid "Order:"
 msgstr "Reihenfolge:"
 
-#: ../data/glade/privacy_list_window.glade.h:11
-#: ../src/dialogs.py:2052
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2258
 msgid "Privacy List"
 msgstr "Privatliste"
 
@@ -1800,111 +2073,103 @@ msgid "Company:"
 msgstr "Firma:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 msgid "Country:"
 msgstr "Land:"
 
 #: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "Department:"
 msgstr "Abteilung:"
 
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:15
-#: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 msgid "Extra Address:"
 msgstr "Zusatz-Adresse:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:19
 msgid "Family:"
 msgstr "Nachname:"
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:16
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "Format: YYYY-MM-DD"
 msgstr "Format: JJJJ-MM-TT"
 
-#. Given Name
-#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/profile_window.glade.h:17
 #: ../data/glade/vcard_information_window.glade.h:22
+msgid "Full Name"
+msgstr "Name"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:19
+#: ../data/glade/vcard_information_window.glade.h:24
 msgid "Given:"
 msgstr "Vorname:"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "Homepage:"
 msgstr "Homepage:"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "Middle:"
 msgstr "Mittelname"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:27
-msgid "More"
-msgstr "Mehr"
-
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:34
 msgid "Personal Info"
 msgstr "Persönliche Details"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "Phone No.:"
 msgstr "Telefon-Nummer:"
 
 #: ../data/glade/profile_window.glade.h:28
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/glade/vcard_information_window.glade.h:36
 msgid "Position:"
 msgstr "Position:"
 
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:37
 msgid "Postal Code:"
 msgstr "Postleitzahl:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:39
 msgid "Prefix:"
 msgstr "Präfix"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:38
-#: ../src/vcard.py:273
+#: ../data/glade/vcard_information_window.glade.h:41 ../src/vcard.py:307
 msgid "Role:"
 msgstr "Rolle:"
 
 #: ../data/glade/profile_window.glade.h:33
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "State:"
 msgstr "Staat:"
 
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Street:"
 msgstr "Straße:"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "Suffix:"
 msgstr "Suffix:"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Arbeit"
 
@@ -1920,138 +2185,180 @@ msgstr "Konto entfernen (_nur in Gajim)"
 msgid "Remove account from Gajim and from _server"
 msgstr "Konto _entfernen (in Gajim und auf dem Server)"
 
+#. Remove
+#. Remove group
+#. Remove
+#: ../data/glade/remove_account_window.glade.h:4
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+#: ../src/roster_window.py:2553 ../src/roster_window.py:2763
+#: ../src/roster_window.py:2899
+msgid "_Remove"
+msgstr "_Entfernen"
+
 #: ../data/glade/roster_contact_context_menu.glade.h:1
 msgid "A_sk to see his/her status"
 msgstr "_Bitte Kontakt, seinen Status zu sehen"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
+msgid "Add Special _Notification..."
 msgstr "Spezielle Be_nachrichtigung hinzufügen"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
+msgid "Assign Open_PGP Key..."
 msgstr "Open_PGP-Schlüssel zuweisen"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:2078
-msgid "Edit _Groups"
+msgid "Edit _Groups..."
 msgstr "_Gruppen bearbeiten"
 
+#. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:2213
+#: ../src/roster_window.py:2856
 msgid "Execute Command..."
 msgstr "_Befehl ausführen..."
 
+#. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:2036
+#: ../src/roster_window.py:2469
 msgid "In_vite to"
 msgstr "_Einladen zu"
 
+#. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Einzelne Nachricht _senden..."
+#: ../src/roster_window.py:2693 ../src/roster_window.py:2827
+msgid "Send Cus_tom Status"
+msgstr "Benutzerdefinierten Status senden"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+msgid "Send Single _Message..."
+msgstr "Einzelne _Nachricht senden..."
 
 #: ../data/glade/roster_contact_context_menu.glade.h:9
+msgid "Send _File..."
+msgstr "_Datei senden"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:10
+msgid "Set Custom _Avatar..."
+msgstr "Benutzerdefinierten Avatar wählen..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "_Chat starten"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 msgid "_Allow him/her to see my status"
 msgstr "_Erlaube Kontakt, meinen Status zu sehen"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-msgid "_Forbid him/her to see my status"
-msgstr "_Verbiete Kontakt, meinen Status zu sehen"
-
-#. Remove group
 #: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:2030
-#: ../src/roster_window.py:2127
-#: ../src/roster_window.py:2234
-msgid "_Remove from Roster"
-msgstr "Entfernen von _Kontaktliste"
+#: ../src/roster_window.py:2543 ../src/roster_window.py:2754
+msgid "_Block"
+msgstr "_Blockieren"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:15
+msgid "_Forbid him/her to see my status"
+msgstr "_Verbiete Kontakt, meinen Status zu sehen"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:17
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2222
-msgid "_Rename"
+msgid "_Manage Contact"
+msgstr "Kontakt verwalten"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:19
+msgid "_Rename..."
 msgstr "_Umbenennen"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:20
 msgid "_Subscription"
 msgstr "_Abonnement"
 
+#: ../data/glade/roster_contact_context_menu.glade.h:21
+#: ../src/roster_window.py:2537 ../src/roster_window.py:2748
+msgid "_Unblock"
+msgstr "Entblocken"
+
 #: ../data/glade/roster_window.glade.h:1
 msgid "A_ccounts"
 msgstr "_Konten"
 
 #: ../data/glade/roster_window.glade.h:2
-msgid "Add _Contact"
-msgstr "_Kontakt hinzufügen"
+msgid "Add _Contact..."
+msgstr "Kontakt _hinzufügen..."
 
 #: ../data/glade/roster_window.glade.h:3
+#, fuzzy
+msgid "Fea_tures"
+msgstr "Fähigkeiten des Servers"
+
+#: ../data/glade/roster_window.glade.h:4
 msgid "File _Transfers"
 msgstr "_Dateitransfers"
 
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/glade/roster_window.glade.h:5
 msgid "Frequently Asked Questions (online)"
 msgstr "Häufig gestellte Fragen (online)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/glade/roster_window.glade.h:7
 msgid "Help online"
 msgstr "Online-Hilfe"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:9
 msgid "Profile, A_vatar"
 msgstr "Profile, A_vatar"
 
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
 msgstr "Zeige Trans_porte"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "_Abgemeldete Kontakte anzeigen"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:14
 msgid "_Contents"
 msgstr "In_halte"
 
-#: ../data/glade/roster_window.glade.h:13
-msgid "_Discover Services"
-msgstr "_Dienste durchsuchen"
-
-#: ../data/glade/roster_window.glade.h:14
-#: ../src/disco.py:1284
-#: ../src/roster_window.py:2205
+#: ../data/glade/roster_window.glade.h:16 ../src/disco.py:1358
 msgid "_Edit"
 msgstr "_Ändern"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:17
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Preferences"
 msgstr "_Einstellungen"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:21
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
+msgid "_Send Single Message..."
+msgstr "Einzelne _Nachricht senden..."
+
+#: ../data/glade/roster_window.glade.h:24
 msgid "_View"
 msgstr "_Ansicht"
 
+#: ../data/glade/search_window.glade.h:1
+msgid "Please wait while retrieving search form..."
+msgstr "Bitte warten Sie, während das Suchformular geladen wird ..."
+
+#: ../data/glade/search_window.glade.h:3
+msgid "_Add contact"
+msgstr "_Kontakt hinzufügen"
+
+#. Information
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:2911
+msgid "_Information"
+msgstr "Informationen"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "_Los"
@@ -2060,10 +2367,6 @@ msgstr "_Los"
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../data/glade/service_discovery_window.glade.h:3
-msgid "_Filter:"
-msgstr "_Filter:"
-
 #: ../data/glade/service_registration_window.glade.h:1
 msgid "Register to"
 msgstr "Registrieren auf"
@@ -2125,8 +2428,12 @@ msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Kontakt autorisieren, so dass er Ihren Status sehen kann"
 
 #: ../data/glade/subscription_request_window.glade.h:3
-msgid "Deny authorization from contact so he or she cannot know when you're connected"
-msgstr "Autorisierung des Kontakts verweigern, so dass er nicht sehen kann, wann Sie verbunden sind"
+msgid ""
+"Deny authorization from contact so he or she cannot know when you're "
+"connected"
+msgstr ""
+"Autorisierung des Kontakts verweigern, so dass er nicht sehen kann, wann Sie "
+"verbunden sind"
 
 #: ../data/glade/subscription_request_window.glade.h:4
 msgid "Subscription Request"
@@ -2136,10 +2443,29 @@ msgstr "Abonnementanfrage"
 msgid "_Deny"
 msgstr "_Ablehnen"
 
+#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#, fuzzy
+msgid "Select the account with which you want to synchronise"
+msgstr "JID des Kontakts mit dem Sie chatten möchten"
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#, fuzzy
+msgid "Select the contacts you want to synchronise"
+msgstr "JID der Kontakte die Sie synchronisieren möchten"
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+#, fuzzy
+msgid "Synchronise : select contacts"
+msgstr "Synchronisiere gewählte Kontakte"
+
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Mute Sounds"
 msgstr "_Klänge stummschalten"
 
+#: ../data/glade/systray_context_menu.glade.h:2
+msgid "Send Single _Message"
+msgstr "Einzelne Nachricht _senden..."
+
 #: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
 msgstr "Zeige alle schwebenden _Ereignisse"
@@ -2152,6 +2478,10 @@ msgstr "_Roster anzeigen"
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
+#: ../data/glade/systray_context_menu.glade.h:6
+msgid "_Group Chat"
+msgstr "_Gruppenchat"
+
 #. Given Name
 #: ../data/glade/vcard_information_window.glade.h:5
 msgid "Ask:"
@@ -2166,44 +2496,44 @@ msgid "Comments"
 msgstr "Kommentare"
 
 #: ../data/glade/vcard_information_window.glade.h:11
+msgid "Configured avatar:"
+msgstr "Gewählter Avatar:"
+
+#: ../data/glade/vcard_information_window.glade.h:12
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:13
 msgid "Contact Information"
 msgstr "Kontakt-Information"
 
-#: ../data/glade/vcard_information_window.glade.h:24
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13
-#: ../src/dialogs.py:416
-msgid "Jabber ID:"
-msgstr "Jabber-ID:"
+#: ../data/glade/vcard_information_window.glade.h:29
+msgid "More"
+msgstr "Mehr"
 
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "OS:"
 msgstr "BS:"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:40
 #: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Ressource:"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Status:"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Subscription:"
 msgstr "Abonnement:"
 
-#: ../data/glade/vcard_information_window.glade.h:47
-#: ../data/glade/zeroconf_information_window.glade.h:10
-msgid "_Log conversation history"
-msgstr "Unterhaltungs-Ver_lauf"
+#: ../data/glade/vcard_information_window.glade.h:49
+msgid "User avatar:"
+msgstr "Avatar auswählen"
 
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
@@ -2213,11 +2543,6 @@ msgstr "<b>Jabber Verkehrsdaten</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Direkteingabe</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Einschalten"
-
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2236,15 +2561,29 @@ msgstr "_Nachricht"
 msgid "_Presence"
 msgstr "_Anwesenheit"
 
-#: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
-msgid "First Name:"
-msgstr "Vorname:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
+msgid "Add Special _Notification"
+msgstr "Spezielle Be_nachrichtigung hinzufügen"
 
-#: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
-msgid "Last Name:"
-msgstr "Nachname:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
+msgid "Assign Open_PGP Key"
+msgstr "Open_PGP-Schlüssel zuweisen"
+
+#. Edit Groups
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:2526
+msgid "Edit _Groups"
+msgstr "_Gruppen bearbeiten"
+
+#. Rename
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:2883
+msgid "_Rename"
+msgstr "_Umbenennen"
+
+#: ../data/glade/zeroconf_context_menu.glade.h:1
+msgid "_Modify Account..."
+msgstr "_Konto bearbeiten..."
 
 #: ../data/glade/zeroconf_information_window.glade.h:6
 msgid "Local jid:"
@@ -2254,535 +2593,564 @@ msgstr "Lokale JID:"
 msgid "Personal"
 msgstr "Persönlich"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:11
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Wenn der Standardport, der für eingehende Nachrichten benutzt wird, nicht für Ihre Konfiguration geeignet ist, können sie hier einen anderen Port festlegen.\n"
-"Möglicherweise ist es von Nöten, Ihre Firewall-Einstellungen zu ändern."
-
 #: ../data/glade/zeroconf_properties_window.glade.h:15
 msgid "Modify Account"
 msgstr "Konto bearbeiten"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
-msgstr "Verwende benutzerdefinierten Port:"
-
 #. For i18n
-#: ../src/advanced.py:51
+#: ../src/advanced.py:56
 msgid "Activated"
 msgstr "Aktiviert"
 
-#: ../src/advanced.py:51
+#: ../src/advanced.py:56
 msgid "Deactivated"
 msgstr "Deaktiviert"
 
-#: ../src/advanced.py:53
+#: ../src/advanced.py:58
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced.py:54
+#: ../src/advanced.py:59
 msgid "Integer"
 msgstr "Ganzzahl"
 
-#: ../src/advanced.py:55
+#: ../src/advanced.py:60
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced.py:56
+#: ../src/advanced.py:61
 msgid "Color"
 msgstr "Farbe"
 
-#: ../src/advanced.py:65
+#: ../src/advanced.py:70
 msgid "Preference Name"
 msgstr "Einstellungsname"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:76
 msgid "Value"
 msgstr "Wert"
 
-#: ../src/advanced.py:79
+#: ../src/advanced.py:84
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:140
 msgid "(None)"
 msgstr "(Kein)"
 
 #. we talk about password
-#: ../src/advanced.py:239
+#: ../src/advanced.py:243
 msgid "Hidden"
 msgstr "Versteckt"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
-#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "English"
 msgstr "Englisch"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Belarusian"
 msgstr "Weißrussisch"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Bulgarian"
 msgstr "Bulgarisch"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Breton"
 msgstr "Bretonisch"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "German"
 msgstr "Deutsch"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Greek"
 msgstr "Griechisch"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "British"
 msgstr "Britisch"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Basque"
 msgstr "Baskisch"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "French"
 msgstr "Französisch"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Croatian"
 msgstr "Kroatisch"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Italian"
 msgstr "Italienisch"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Norwegian (b)"
 msgstr "Norwegisch (Bokmål)"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Norwegian"
 msgstr "Norwegisch"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Polish"
 msgstr "Polnisch"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Portuguese"
 msgstr "Portugiesisch"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Brazilian Portuguese"
 msgstr "Brasilianisch"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Russian"
 msgstr "Russsich"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Serbian"
 msgstr "Serbisch"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Slovak"
 msgstr "Slovakisch"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Chinese (Ch)"
 msgstr "Chinesisch"
 
-#: ../src/chat_control.py:207
-#: ../src/dialogs.py:1706
-msgid ""
-"If that is not your language for which you want to highlight misspelled words, then please set your $LANG as appropriate. Eg. for French do export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it global in /etc/profile.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Wenn das nicht die Sprache ist, für die Sie falschgeschriebene Wörter hervorheben möchten, setzen Sie bitte Ihre $LANG entsprechend. Z.B. für Französisch: export LANG=fr_FR oder export LANG=fr_FR.UTF-8 in ~/.bash_profile or global in /etc/profile.\n"
-"\n"
-"Falschgeschriebene Wörter werden nicht hervorgehoben"
-
-#: ../src/chat_control.py:246
+#: ../src/chat_control.py:313
 msgid "Spelling language"
 msgstr "Sprache für die Rechtschreibprüfung"
 
 #. we are not connected
-#: ../src/chat_control.py:269
-#: ../src/chat_control.py:475
+#: ../src/chat_control.py:336 ../src/chat_control.py:559
 msgid "A connection is not available"
 msgstr "Keine Verbindung verfügbar"
 
-#: ../src/chat_control.py:270
-#: ../src/chat_control.py:476
+#: ../src/chat_control.py:337 ../src/chat_control.py:560
 msgid "Your message can not be sent until you are connected."
 msgstr "Ihre Nachricht kann erst gesendet werden, wenn Sie verbunden sind."
 
-#: ../src/chat_control.py:1034
+#: ../src/chat_control.py:1186
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s aus Gruppenchat %(room_name)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1123
+#: ../src/chat_control.py:1282
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-msgstr "%s hat keinen OpenPGP-Schlüssel verbreitet und es wurde keiner zugewiesen"
+msgstr ""
+"%s hat keinen OpenPGP-Schlüssel verbreitet und es wurde keiner zugewiesen"
+
+#: ../src/chat_control.py:1325 ../src/groupchat_control.py:1433
+#, python-format
+msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+msgstr ""
+"Kein Kommando: /%s (wenn Sie dies senden wollen, setzen Sie /say voran)"
+
+#: ../src/chat_control.py:1332 ../src/groupchat_control.py:1456
+#, python-format
+msgid "Commands: %s"
+msgstr "Kommandos: %s"
 
-#: ../src/chat_control.py:1259
+#: ../src/chat_control.py:1335 ../src/groupchat_control.py:1470
+#, python-format
+msgid "Usage: /%s, clears the text window."
+msgstr "Bedienung: /%s, leert das Textfenster."
+
+#: ../src/chat_control.py:1338 ../src/groupchat_control.py:1475
+#, python-format
+msgid "Usage: /%s, hide the chat buttons."
+msgstr "Verwendung: /%s, versteckt die Chatbuttons."
+
+#: ../src/chat_control.py:1341 ../src/groupchat_control.py:1491
+#, python-format
+msgid ""
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
+msgstr ""
+"Bedienung: /%s <Aktion>, sendet die Aktion im aktuellen Gruppenchat. "
+"Verwende dritte Person, z.B. /%s explodiert)."
+
+#: ../src/chat_control.py:1345
+#, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr "Bedienung: /%s, sendet einen Ping zum Kontakt"
+
+#: ../src/chat_control.py:1348
+#, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "Verwendung: /%s, sendet eine Nachricht zum Kontakt"
+
+#: ../src/chat_control.py:1351 ../src/groupchat_control.py:1514
+#, python-format
+msgid "No help info for /%s"
+msgstr "Keine Hilfe vorhanden für /%s"
+
+#: ../src/chat_control.py:1489 ../src/chat_control.py:1515
 msgid "Encryption enabled"
 msgstr "Verschlüsselung aktiviert"
 
-#: ../src/chat_control.py:1264
+#: ../src/chat_control.py:1494
+msgid "Session WILL be logged"
+msgstr "Sitzung wird aufgezeichnet"
+
+#: ../src/chat_control.py:1496
+msgid "Session WILL NOT be logged"
+msgstr "Sitzung wird nicht aufgezeichnet"
+
+#: ../src/chat_control.py:1503
+msgid "The following message was NOT encrypted"
+msgstr "[Die folgende Nachricht wurde nicht verschlüsselt]"
+
+#: ../src/chat_control.py:1507 ../src/chat_control.py:1520
+#: ../src/chat_control.py:2166
 msgid "Encryption disabled"
 msgstr "Verschlüsselung deaktiviert"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1408
-#: ../src/conversation_textview.py:497
-#: ../src/dialogs.py:629
-#: ../src/gajim.py:850
-#: ../src/gajim.py:851
-#: ../src/gajim.py:1196
-#: ../src/roster_window.py:333
-#: ../src/roster_window.py:411
-#: ../src/roster_window.py:1497
-#: ../src/roster_window.py:1507
-#: ../src/roster_window.py:1686
-#: ../src/roster_window.py:1892
-#: ../src/roster_window.py:2477
-#: ../src/roster_window.py:2678
-#: ../src/roster_window.py:3916
-#: ../src/roster_window.py:3918
-#: ../src/common/contacts.py:73
-#: ../src/common/helpers.py:43
-#: ../src/common/helpers.py:255
+#: ../src/chat_control.py:1683 ../src/conversation_textview.py:705
+#: ../src/dialogs.py:732 ../src/gajim.py:911 ../src/gajim.py:912
+#: ../src/gajim.py:1436 ../src/gajim.py:1687 ../src/roster_window.py:358
+#: ../src/roster_window.py:442 ../src/roster_window.py:1822
+#: ../src/roster_window.py:1832 ../src/roster_window.py:2072
+#: ../src/roster_window.py:2306 ../src/roster_window.py:3154
+#: ../src/roster_window.py:3393 ../src/roster_window.py:4755
+#: ../src/roster_window.py:4757 ../src/common/contacts.py:89
+#: ../src/common/helpers.py:53 ../src/common/helpers.py:267
 msgid "Not in Roster"
 msgstr "Nicht in der Liste"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1552
+#: ../src/chat_control.py:1836
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Sie haben eine neue Nachricht von \"%s\""
 
-#: ../src/chat_control.py:1553
-msgid "If you close this tab and you have history disabled, this message will be lost."
-msgstr "Wenn sie das Fenster schließen und der Verlauf abgeschaltet ist, geht die Nachricht verloren."
+#: ../src/chat_control.py:1837
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Wenn sie das Fenster schließen und der Verlauf abgeschaltet ist, geht die "
+"Nachricht verloren."
 
-#: ../src/config.py:139
-#: ../src/config.py:588
+#: ../src/config.py:127 ../src/config.py:565
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: ../src/config.py:233
-#, python-format
-msgid "Every %s _minutes"
-msgstr "Alle %s _Minuten"
-
-#: ../src/config.py:353
+#: ../src/config.py:293
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:361
+#: ../src/config.py:301
 msgid "Event"
 msgstr "Ereignis"
 
-#: ../src/config.py:684
-#: ../src/gajim.py:2237
+#: ../src/config.py:407
+msgid "Always use OS/X default applications"
+msgstr ""
+
+#: ../src/config.py:408
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Benutzerdefiniert</b>"
+
+#: ../src/config.py:638 ../src/dialogs.py:1018
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Wörterburch für Sprache %s nicht verfügbar"
 
-#: ../src/config.py:685
-#: ../src/gajim.py:2238
+#: ../src/config.py:639
 #, python-format
-msgid "You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option."
-msgstr "Sie müssen das Wörterbuch %s installieren oder eine andere Sprache wählen, um die Rechtschreibprüfung zu nutzen."
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+"Sie müssen das Wörterbuch %s installieren oder eine andere Sprache wählen, "
+"um die Rechtschreibprüfung zu nutzen."
 
-#: ../src/config.py:1008
+#: ../src/config.py:1001
 msgid "status message title"
 msgstr "Statusbetreff"
 
-#: ../src/config.py:1008
+#: ../src/config.py:1001
 msgid "status message text"
 msgstr "Statusnachricht"
 
-#: ../src/config.py:1044
+#: ../src/config.py:1037
 msgid "First Message Received"
 msgstr "Erste empfangene Nachricht"
 
-#: ../src/config.py:1045
+#: ../src/config.py:1038
 msgid "Next Message Received"
 msgstr "Nächste empfangene Nachricht"
 
-#: ../src/config.py:1046
+#: ../src/config.py:1039
 msgid "Contact Connected"
 msgstr "Kontakt verbunden"
 
-#: ../src/config.py:1047
+#: ../src/config.py:1040
 msgid "Contact Disconnected"
 msgstr "Kontakt nicht verbunden"
 
-#: ../src/config.py:1048
+#: ../src/config.py:1041
 msgid "Message Sent"
 msgstr "Nachricht gesendet"
 
-#: ../src/config.py:1049
+#: ../src/config.py:1042
 msgid "Group Chat Message Highlight"
 msgstr "Gruppenchat Nachrichten-Hervorhebung"
 
-#: ../src/config.py:1050
+#: ../src/config.py:1043
 msgid "Group Chat Message Received"
 msgstr "Gruppenchat-Nachricht empfangen"
 
-#: ../src/config.py:1057
+#: ../src/config.py:1050
 msgid "GMail Email Received"
 msgstr "E-Mail über Googlemail empfangen"
 
-#: ../src/config.py:1260
+#. Name column
+#: ../src/config.py:1319 ../src/dialogs.py:1517 ../src/dialogs.py:1581
+#: ../src/disco.py:743 ../src/disco.py:1569 ../src/disco.py:1815
+#: ../src/history_window.py:113
+msgid "Name"
+msgstr "Name"
+
+#: ../src/config.py:1427 ../src/common/config.py:393
+msgid "Be right back."
+msgstr "Bin gleich zurück."
+
+#: ../src/config.py:1431
+msgid "Relogin now?"
+msgstr "Jetzt neu einloggen?"
+
+#: ../src/config.py:1432
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+"Wenn die Änderungen sofort übernommen werden sollen, müssen Sie sich neu "
+"einloggen."
+
+#: ../src/config.py:1527 ../src/config.py:1618
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP kann auf diesem Computer nicht genutzt werden"
 
-#: ../src/config.py:1306
+#: ../src/config.py:1654 ../src/config.py:1695
+msgid "Unread events"
+msgstr "Ungelesene Ereignisse"
+
+#: ../src/config.py:1655
+msgid "Read all pending events before removing this account."
+msgstr "Alle ungelesenen Ereignisse lesen, bevor der Account entfernt wird."
+
+#: ../src/config.py:1681
+#, python-format
+msgid "You have opened chat in account %s"
+msgstr "Sie haben mit Account %s einen Chat geöffnet"
+
+#: ../src/config.py:1682
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr "Alle Chatfenster werden geschlossen. Fortfahren?"
+
+#: ../src/config.py:1691
 msgid "You are currently connected to the server"
 msgstr "Sie sind mit dem Server verbunden"
 
-#: ../src/config.py:1307
+#: ../src/config.py:1692
 msgid "To change the account name, you must be disconnected."
 msgstr "Verbindung muss beendet werden, um Kontonamen zu ändern."
 
-#: ../src/config.py:1310
-#: ../src/config.py:1916
-msgid "Unread events"
-msgstr "Ungelesene Ereignisse"
-
-#: ../src/config.py:1311
+#: ../src/config.py:1696
 msgid "To change the account name, you must read all pending events."
 msgstr "Um Kontonamen zu ändern, müssen Sie alle neunen Ereignisse lesen."
 
-#: ../src/config.py:1315
+#: ../src/config.py:1702
 msgid "Account Name Already Used"
 msgstr "Kontoname wird bereits verwendet"
 
-#: ../src/config.py:1316
-msgid "This name is already used by another of your accounts. Please choose another name."
-msgstr "Dieser Name wird bereits für einen anderen Ihrer Accounts verwendet. Bitte wählenSie einen anderen Namen."
+#: ../src/config.py:1703
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
+msgstr ""
+"Dieser Name wird bereits für einen anderen Ihrer Accounts verwendet. Bitte "
+"wählenSie einen anderen Namen."
 
-#: ../src/config.py:1320
-#: ../src/config.py:1324
+#: ../src/config.py:1707 ../src/config.py:1711
 msgid "Invalid account name"
 msgstr "Ungültiger Kontoname"
 
-#: ../src/config.py:1321
+#: ../src/config.py:1708
 msgid "Account name cannot be empty."
 msgstr "Kontoname darf nicht leer sein."
 
-#: ../src/config.py:1325
+#: ../src/config.py:1712
 msgid "Account name cannot contain spaces."
 msgstr "Kontoname darf keine Leerzeichen enthalten."
 
-#: ../src/config.py:1333
-#: ../src/config.py:1339
-#: ../src/config.py:1349
-#: ../src/config.py:2900
+#: ../src/config.py:1776
+msgid "Rename Account"
+msgstr "Konto umbenennen"
+
+#: ../src/config.py:1777
+#, python-format
+msgid "Enter a new name for account %s"
+msgstr "Geben Sie einen neuen Namen für das Konto %s ein"
+
+#: ../src/config.py:1795 ../src/config.py:1803 ../src/config.py:1843
+#: ../src/config.py:3050 ../src/dataforms_widget.py:533
 msgid "Invalid Jabber ID"
 msgstr "Ungültige Jabber ID"
 
-#: ../src/config.py:1340
+#: ../src/config.py:1804
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID muss in der Form \"user@servername\" sein."
 
-#: ../src/config.py:1399
+#: ../src/config.py:1990 ../src/config.py:3121
 msgid "Invalid entry"
 msgstr "Ungültiger Eintrag"
 
-#: ../src/config.py:1400
+#: ../src/config.py:1991 ../src/config.py:3122
 msgid "Custom port must be a port number."
 msgstr "Proxy Port muss eine Portnummer sein."
 
-#: ../src/config.py:1528
-#: ../src/common/config.py:367
-msgid "Be right back."
-msgstr "Bin gleich zurück."
+#: ../src/config.py:2012
+msgid "Failed to get secret keys"
+msgstr "Holen der geheimen Schlüssel fehlgeschlagen"
 
-#: ../src/config.py:1538
-msgid "Relogin now?"
-msgstr "Jetzt neu einloggen?"
+#: ../src/config.py:2013
+msgid "There was a problem retrieving your OpenPGP secret keys."
+msgstr "Es gab ein Problem beim Holen ihres geheimen OpenPGP-Schlüssels."
 
-#: ../src/config.py:1539
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr "Wenn die Änderungen sofort übernommen werden sollen, müssen Sie sich neu einloggen."
+#: ../src/config.py:2016
+msgid "OpenPGP Key Selection"
+msgstr "OpenPGP Schlüssel-Auswahl"
 
-#: ../src/config.py:1565
+#: ../src/config.py:2017
+msgid "Choose your OpenPGP key"
+msgstr "Wählen Sie Ihren OpenPGP Schlüssel"
+
+#: ../src/config.py:2057
 msgid "No such account available"
 msgstr "Account nicht verfügbar"
 
-#: ../src/config.py:1566
+#: ../src/config.py:2058
 msgid "You must create your account before editing your personal information."
-msgstr "Sie müssen ein Konto erstellen, bevor Sie die persönlichen Informationen ändern können"
+msgstr ""
+"Sie müssen ein Konto erstellen, bevor Sie die persönlichen Informationen "
+"ändern können"
 
-#: ../src/config.py:1573
-#: ../src/dialogs.py:1190
-#: ../src/dialogs.py:1326
-#: ../src/dialogs.py:1506
-#: ../src/disco.py:419
-#: ../src/profile_window.py:323
+#: ../src/config.py:2065 ../src/dialogs.py:1364 ../src/dialogs.py:1505
+#: ../src/dialogs.py:1685 ../src/disco.py:427 ../src/profile_window.py:318
 msgid "You are not connected to the server"
 msgstr "Sie sind nicht mit dem Server verbunden"
 
-#: ../src/config.py:1574
+#: ../src/config.py:2066
 msgid "Without a connection, you can not edit your personal information."
-msgstr "Sie müssen angemeldet sein, um Ihre persönlichen Informationen zu bearbeiten"
+msgstr ""
+"Sie müssen angemeldet sein, um Ihre persönlichen Informationen zu bearbeiten"
 
-#: ../src/config.py:1578
+#: ../src/config.py:2070
 msgid "Your server doesn't support Vcard"
 msgstr "Ihr Server unterstützt vCard nicht"
 
-#: ../src/config.py:1579
+#: ../src/config.py:2071
 msgid "Your server can't save your personal information."
 msgstr "Ihr Server kann keine persönlichen Informationen speichern."
 
-#: ../src/config.py:1610
-#: ../src/config.py:3288
-msgid "Failed to get secret keys"
-msgstr "Holen der geheimen Schlüssel fehlgeschlagen"
-
-#: ../src/config.py:1611
-#: ../src/config.py:3289
-msgid "There was a problem retrieving your OpenPGP secret keys."
-msgstr "Es gab ein Problem beim Holen ihres geheimen OpenPGP-Schlüssels."
-
-#: ../src/config.py:1614
-#: ../src/config.py:3292
-msgid "OpenPGP Key Selection"
-msgstr "OpenPGP Schlüssel-Auswahl"
-
-#: ../src/config.py:1615
-#: ../src/config.py:3293
-msgid "Choose your OpenPGP key"
-msgstr "Wählen Sie Ihren OpenPGP Schlüssel"
-
-#. Name column
-#: ../src/config.py:1850
-#: ../src/dialogs.py:1338
-#: ../src/dialogs.py:1402
-#: ../src/disco.py:740
-#: ../src/disco.py:1495
-#: ../src/disco.py:1733
-#: ../src/history_window.py:78
-msgid "Name"
-msgstr "Name"
-
-#: ../src/config.py:1853
-#: ../src/dialogs.py:1341
-msgid "Server"
-msgstr "Server"
-
-#: ../src/config.py:1917
-msgid "Read all pending events before removing this account."
-msgstr "Alle ungelesenen Ereignisse lesen, bevor der Account entfernt wird."
-
-#: ../src/config.py:1954
-#, python-format
-msgid "You have opened chat in account %s"
-msgstr "Sie haben mit Account %s einen Chat geöffnet"
-
-#: ../src/config.py:1955
-msgid "All chat and groupchat windows will be closed. Do you want to continue?"
-msgstr "Alle Chatfenster werden geschlossen. Fortfahren?"
-
-#: ../src/config.py:2014
+#: ../src/config.py:2102
 msgid "Account Local already exists."
 msgstr "Ein Konto mit dem Namen 'Local' ist bereits vorhanden"
 
-#: ../src/config.py:2015
+#: ../src/config.py:2103
 msgid "Please rename or remove it before enabling link-local messaging."
-msgstr "Bitte benennen Sie es um oder entfernen es, bevor Sie LAN-Kontakte aktivieren."
+msgstr ""
+"Bitte benennen Sie es um oder entfernen es, bevor Sie LAN-Kontakte "
+"aktivieren."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2279
 #, python-format
 msgid "Edit %s"
 msgstr "%s ändern"
 
-#: ../src/config.py:2113
+#: ../src/config.py:2281
 #, python-format
 msgid "Register to %s"
 msgstr "Auf %s registrieren"
 
 #. list at the beginning
-#: ../src/config.py:2179
+#: ../src/config.py:2317
 msgid "Ban List"
 msgstr "Sperrliste"
 
-#: ../src/config.py:2180
+#: ../src/config.py:2318
 msgid "Member List"
 msgstr "Mitgliederliste"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2319
 msgid "Owner List"
 msgstr "Besitzerliste"
 
-#: ../src/config.py:2182
+#: ../src/config.py:2320
 msgid "Administrator List"
 msgstr "Administratorliste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2231
-#: ../src/disco.py:747
-#: ../src/history_manager.py:155
+#: ../src/config.py:2369 ../src/disco.py:750 ../src/history_manager.py:160
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2239
+#: ../src/config.py:2377
 msgid "Reason"
 msgstr "Grund"
 
-#: ../src/config.py:2244
+#: ../src/config.py:2382
 msgid "Nick"
 msgstr "Spitzname"
 
-#: ../src/config.py:2248
+#: ../src/config.py:2386
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2273
+#: ../src/config.py:2411
 msgid "Banning..."
 msgstr "Verbanne ..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2275
+#: ../src/config.py:2413
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2790,11 +3158,11 @@ msgstr ""
 "<b>Wen möchten Sie verbannen?</b>\n"
 "\n"
 
-#: ../src/config.py:2277
+#: ../src/config.py:2415
 msgid "Adding Member..."
 msgstr "Füge Mitglied hinzu ..."
 
-#: ../src/config.py:2278
+#: ../src/config.py:2416
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2802,11 +3170,11 @@ msgstr ""
 "<b>Wen möchten Sie zum Mitglied machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2280
+#: ../src/config.py:2418
 msgid "Adding Owner..."
 msgstr "Füge Besitzer hinzu ..."
 
-#: ../src/config.py:2281
+#: ../src/config.py:2419
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -2814,11 +3182,11 @@ msgstr ""
 "<b>Wen möchten Sie zum Besitzer machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2283
+#: ../src/config.py:2421
 msgid "Adding Administrator..."
 msgstr "Füge Administrator hinzu ..."
 
-#: ../src/config.py:2284
+#: ../src/config.py:2422
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2826,7 +3194,7 @@ msgstr ""
 "<b>Wen möchten Sie zum Administrator machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2285
+#: ../src/config.py:2423
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2835,394 +3203,443 @@ msgid ""
 "4. domain (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain."
 msgstr ""
-"Kann eines der folgenden sein:\"1. benutzer@domain/resource (nur die Resource trifft zu).\n"
+"Kann eines der folgenden sein:\"1. benutzer@domain/resource (nur die "
+"Resource trifft zu).\n"
 "2. benutzer@domain (jede Resource trifft zu).\n"
 "3 domain (die Domain selbst trifft zu, als auch jeder benutzer@domain,\n"
 "jede domain/resource oder Adresse, die eine Subdomain enthält."
 
-#: ../src/config.py:2389
+#: ../src/config.py:2527
 #, python-format
 msgid "Removing %s account"
 msgstr "Entferne Konto %s"
 
-#: ../src/config.py:2406
-#: ../src/roster_window.py:2737
+#: ../src/config.py:2542 ../src/gajim.py:1343 ../src/roster_window.py:3451
 msgid "Password Required"
 msgstr "Passwort benötigt"
 
-#: ../src/config.py:2407
-#: ../src/roster_window.py:2733
+#: ../src/config.py:2543 ../src/roster_window.py:3447
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Geben Sie ihr Passwort für %s ein"
 
-#: ../src/config.py:2408
-#: ../src/roster_window.py:2738
+#: ../src/config.py:2544 ../src/roster_window.py:3452
 msgid "Save password"
 msgstr "Passwort speichern"
 
-#: ../src/config.py:2422
+#: ../src/config.py:2557
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" ist mit Server verbunden"
 
-#: ../src/config.py:2423
+#: ../src/config.py:2558
 msgid "If you remove it, the connection will be lost."
 msgstr "Wenn Sie es entfernen, wird die Verbindung beendet."
 
-#: ../src/config.py:2508
+#: ../src/config.py:2651
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2508
+#: ../src/config.py:2651
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:2509
+#: ../src/config.py:2652
 msgid "Enter and leave only"
 msgstr "Nur betreten und verlassen"
 
-#: ../src/config.py:2510
+#: ../src/config.py:2653
 msgid "?print_status:None"
 msgstr "?print_status:Nichts"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2722
 msgid "New Group Chat"
 msgstr "Neuer Gruppenchat"
 
-#: ../src/config.py:2611
+#: ../src/config.py:2755
 msgid "This bookmark has invalid data"
 msgstr "Dieses Lesezeichen hat ungültige Daten"
 
-#: ../src/config.py:2612
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
+#: ../src/config.py:2756
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Bitte Serverfeld und Raumfeld ausfüllen oder Lesezeichen löschen."
 
-#: ../src/config.py:2875
+#: ../src/config.py:3033
 msgid "Invalid username"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/config.py:2876
+#: ../src/config.py:3035
 msgid "You must provide a username to configure this account."
-msgstr "Sie müssen einen Benutzernamen angeben, um diesen Account zu konfigurieren."
-
-#: ../src/config.py:2886
-#: ../src/dialogs.py:1525
-msgid "Invalid password"
-msgstr "Ungültiges Passwort"
-
-#: ../src/config.py:2887
-msgid "You must enter a password for the new account."
-msgstr "Sie müssen ein Passwort für das neue Konto eingeben."
-
-#: ../src/config.py:2891
-#: ../src/dialogs.py:1530
-msgid "Passwords do not match"
-msgstr "Passwörter stimmen nicht überein"
-
-#: ../src/config.py:2892
-#: ../src/dialogs.py:1531
-msgid "The passwords typed in both fields must be identical."
-msgstr "Die Passwörter in beiden Feldern müssen identisch sein."
+msgstr ""
+"Sie müssen einen Benutzernamen angeben, um diesen Account zu konfigurieren."
 
-#: ../src/config.py:2911
+#: ../src/config.py:3061
 msgid "Duplicate Jabber ID"
 msgstr "Doppelte Jabber ID"
 
-#: ../src/config.py:2912
+#: ../src/config.py:3062
 msgid "This account is already configured in Gajim."
-msgstr "Dieser Kontakt bwurde in Gajim bereits konfiguriert."
+msgstr "Dieser Kontakt wurde in Gajim bereits konfiguriert."
 
-#: ../src/config.py:2929
+#: ../src/config.py:3079
 msgid "Account has been added successfully"
 msgstr "Account wurde erfolgreich hinzugefügt"
 
-#: ../src/config.py:2930
-#: ../src/config.py:2965
-msgid "You can set advanced account options by pressing the Advanced button, or later by choosing the Accounts menuitem under the Edit menu from the main window."
-msgstr "Sie können die erweiterten Kontooptionen durch Klicken des Erweitert-Buttons oder durch Klicken des Konto-Menüpunktes im Bearbeiten-Menü des Hauptfensters erreichen."
+#: ../src/config.py:3080 ../src/config.py:3225
+msgid ""
+"You can set advanced account options by pressing the Advanced button, or "
+"later by choosing the Accounts menuitem under the Edit menu from the main "
+"window."
+msgstr ""
+"Sie können die erweiterten Kontooptionen durch Klicken des Erweitert-Buttons "
+"oder durch Klicken des Konto-Menüpunktes im Bearbeiten-Menü des "
+"Hauptfensters erreichen."
 
-#: ../src/config.py:2964
-msgid "Your new account has been created successfully"
-msgstr "Ihr neues Konto wurde erfolgreich erstellt"
+#: ../src/config.py:3097
+msgid "Invalid server"
+msgstr "Ungültiger Server"
+
+#: ../src/config.py:3098
+msgid "Please provide a server on which you want to register."
+msgstr "Bitte geben Sie an, bei dem Sie sich registrieren möchten."
 
-#: ../src/config.py:2982
+#: ../src/config.py:3204 ../src/config.py:3243
 msgid "An error occurred during account creation"
 msgstr "Während der Konto-Erstellung ist ein Fehler aufgetreten"
 
-#: ../src/config.py:3040
+#: ../src/config.py:3224
+msgid "Your new account has been created successfully"
+msgstr "Ihr neues Konto wurde erfolgreich erstellt"
+
+#: ../src/config.py:3327
 msgid "Account name is in use"
 msgstr "Kontoname ist schon vergeben"
 
-#: ../src/config.py:3041
+#: ../src/config.py:3328
 msgid "You already have an account using this name."
 msgstr "Sie haben bereits ein Konto mit diesem Namen."
 
-#: ../src/conversation_textview.py:275
-msgid "Text below this line is what has been said since the last time you paid attention to this group chat"
-msgstr "Text unterhalb dieser Linie stellt dar, was seit ihrem letzten Besuch in diesem Gruppenchat gesagt wurde"
+#: ../src/conversation_textview.py:454
+msgid ""
+"Text below this line is what has been said since the last time you paid "
+"attention to this group chat"
+msgstr ""
+"Text unterhalb dieser Linie stellt dar, was seit ihrem letzten Besuch in "
+"diesem Gruppenchat gesagt wurde"
 
-#: ../src/conversation_textview.py:344
+#: ../src/conversation_textview.py:552
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Aktionen für \"%s\""
 
-#: ../src/conversation_textview.py:356
+#: ../src/conversation_textview.py:564
 msgid "Read _Wikipedia Article"
 msgstr "_Wikipedia-Artikel lesen"
 
-#: ../src/conversation_textview.py:361
+#: ../src/conversation_textview.py:569
 msgid "Look it up in _Dictionary"
 msgstr "Im Wörterbuch _suchen"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:377
+#: ../src/conversation_textview.py:585
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "In Wörterbuch URL fehlt ein \"%s\" und ist nicht Wiktionary"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:390
+#: ../src/conversation_textview.py:598
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "In Websuche URL fehlt ein \"%s\""
 
-#: ../src/conversation_textview.py:393
+#: ../src/conversation_textview.py:601
 msgid "Web _Search for it"
 msgstr "Im _Internet suchen"
 
-#: ../src/conversation_textview.py:399
+#: ../src/conversation_textview.py:607
 msgid "Open as _Link"
 msgstr "Als _Link öffnen"
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:1073
 msgid "Yesterday"
 msgstr "Gestern"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:764
+#: ../src/conversation_textview.py:1077
 #, python-format
 msgid "%i days ago"
 msgstr "Vor %i Tagen"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:1111
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Thema: %s\n"
 
-#: ../src/dialogs.py:59
+#: ../src/dataforms_widget.py:537
+#, fuzzy
+msgid "Jabber ID already in list"
+msgstr "Jabber IM-Client"
+
+#: ../src/dataforms_widget.py:538
+msgid "The Jabber ID you entered is already in the list. Choose another one."
+msgstr ""
+
+#. Default jid
+#: ../src/dataforms_widget.py:549
+msgid "new@jabber.id"
+msgstr ""
+
+#: ../src/dataforms_widget.py:552 ../src/dataforms_widget.py:554
+#, python-format
+msgid "new%d@jabber.id"
+msgstr ""
+
+#: ../src/dialogs.py:71
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Kontaktname: <i>%s</i>"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:73
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i> "
 
-#: ../src/dialogs.py:211
+#: ../src/dialogs.py:223
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:230
 msgid "In the group"
 msgstr "In der Gruppe"
 
-#: ../src/dialogs.py:269
+#: ../src/dialogs.py:330
 msgid "KeyID"
 msgstr "Schlüssel-ID"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:335
 msgid "Contact name"
 msgstr "Name des Kontakts"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:381
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status-Nachricht"
 
-#: ../src/dialogs.py:320
+#: ../src/dialogs.py:383
 msgid "Status Message"
 msgstr "Status-Nachricht"
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:483
 msgid "Save as Preset Status Message"
 msgstr "Als derzeitige Statusnachricht speichern"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:484
 msgid "Please type a name for this status message"
 msgstr "Bitte geben Sie einen Namen für diese Statusnachricht ein:"
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:495
+msgid "Overwrite Status Message?"
+msgstr "Status-Nachricht überschreiben"
+
+#: ../src/dialogs.py:496
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr ""
+"Dieser Name wird bereits verwendet. Möchten Sie die Status-Nachricht "
+"überschreiben?"
+
+#: ../src/dialogs.py:512
 msgid "AIM Address:"
 msgstr "AIM-Adresse"
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:513
 msgid "GG Number:"
 msgstr "GG Nummer"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:514
 msgid "ICQ Number:"
 msgstr "ICQ-Nummer"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:515
 msgid "MSN Address:"
 msgstr "MSN-Adresse"
 
-#: ../src/dialogs.py:421
+#: ../src/dialogs.py:516
 msgid "Yahoo! Address:"
 msgstr "Yahoo!-Adresse"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:553
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
-msgstr "Bitte füllen Sie die Daten für den Kontakt aus, den Sie dem Konto %s hinzufügen wollen"
+msgstr ""
+"Bitte füllen Sie die Daten für den Kontakt aus, den Sie dem Konto %s "
+"hinzufügen wollen"
 
-#: ../src/dialogs.py:459
+#: ../src/dialogs.py:555
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Bitte geben sie die Daten des neuen Kontakts ein"
 
-#: ../src/dialogs.py:609
-#: ../src/dialogs.py:615
+#: ../src/dialogs.py:712 ../src/dialogs.py:718
 msgid "Invalid User ID"
 msgstr "Ungültige Benutzer ID"
 
-#: ../src/dialogs.py:616
+#: ../src/dialogs.py:719
 msgid "The user ID must not contain a resource."
 msgstr "Die Benutzer-ID darf keine resource enthalten."
 
-#: ../src/dialogs.py:630
+#: ../src/dialogs.py:733
 msgid "Contact already in roster"
 msgstr "Kontakt bereits im Roster"
 
-#: ../src/dialogs.py:631
+#: ../src/dialogs.py:734
 msgid "This contact is already listed in your roster."
 msgstr "Der Kontakt befindet sich bereit in Ihrem Roster."
 
-#: ../src/dialogs.py:668
+#: ../src/dialogs.py:770
 msgid "User ID:"
 msgstr "_Benutzer-ID:"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:832
 msgid "A GTK+ jabber client"
 msgstr "Ein GTK+ Jabber-Client"
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:833
 msgid "GTK+ Version:"
 msgstr "GTK+-Version:"
 
-#: ../src/dialogs.py:733
+#: ../src/dialogs.py:834
 msgid "PyGTK Version:"
 msgstr "PyGTK-Version"
 
-#: ../src/dialogs.py:747
+#: ../src/dialogs.py:848
 msgid "Current Developers:"
 msgstr "Derzeitige Entwickler:"
 
-#: ../src/dialogs.py:749
+#: ../src/dialogs.py:850
 msgid "Past Developers:"
 msgstr "Frühere Entwickler:"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:860
 msgid "THANKS:"
 msgstr "DANKE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:765
+#: ../src/dialogs.py:866
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Zuletzt möchten wird gerne allen Paket-Verwaltern danken."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:778
+#: ../src/dialogs.py:879
 msgid "translator-credits"
 msgstr ""
 "Fridtjof Busse\n"
-"Benjamin Drung <benjamin.drung@gmail.com>"
+"Benjamin Drung <benjamin.drung@gmail.com>\n"
+"Fabian Fingerle <fabian@datensalat.eu>\n"
+"Sebastian Schäfer <sarek@uliweb.de>"
 
-#: ../src/dialogs.py:908
+#: ../src/dialogs.py:1011
 #, python-format
 msgid "Unable to bind to port %s."
-msgstr "Konnte nicht mit Port %s verbinden."
+msgstr "Konnte nicht an Port %s binden."
 
-#: ../src/dialogs.py:909
-msgid "Maybe you have another running instance of Gajim. File Transfer will be cancelled."
+#: ../src/dialogs.py:1012
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
 msgstr "Möglicherweise läuft Gajim bereits. Dateitransfer wird abgebrochen."
 
-#: ../src/dialogs.py:1120
+#: ../src/dialogs.py:1019
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option.\n"
+"\n"
+"Highlighting misspelled words feature will not be used"
+msgstr ""
+"Sie müssen das Wörterbuch %s installieren oder eine andere Sprache wählen, "
+"um die Rechtschreibprüfung zu nutzen.\n"
+"\n"
+"Das Hervorheben falsch geschriebener Worte wird nicht genutzt"
+
+#: ../src/dialogs.py:1293
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Abonnement-Anforderung für Konto %s von %s"
 
-#: ../src/dialogs.py:1123
+#: ../src/dialogs.py:1296
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnement-Anforderung von %s"
 
-#: ../src/dialogs.py:1183
-#: ../src/roster_window.py:687
+#: ../src/dialogs.py:1357 ../src/roster_window.py:776
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Sie sind bereits im Gruppenchat %s"
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1365
 msgid "You can not join a group chat unless you are connected."
 msgstr "Sie können einem Gruppenchat erst beitreten, wenn Sie verbunden sind."
 
-#: ../src/dialogs.py:1206
+#: ../src/dialogs.py:1383
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Betrete Gruppenchat mit Account %s"
 
-#: ../src/dialogs.py:1274
-#: ../src/dialogs.py:1280
-#: ../src/groupchat_control.py:1469
+#: ../src/dialogs.py:1453 ../src/dialogs.py:1459
+#: ../src/groupchat_control.py:1683
 msgid "Invalid group chat Jabber ID"
 msgstr "Ungültige Jabber-ID für den Gruppenchat"
 
-#: ../src/dialogs.py:1275
-#: ../src/dialogs.py:1281
-#: ../src/groupchat_control.py:1470
+#: ../src/dialogs.py:1454 ../src/dialogs.py:1460
+#: ../src/groupchat_control.py:1684
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Die Jabber-ID für den Gruppenchat enthält nicht erlaubte Zeichen."
 
-#: ../src/dialogs.py:1287
+#: ../src/dialogs.py:1466
 msgid "This is not a group chat"
 msgstr "Das ist kein Gruppenchat"
 
-#: ../src/dialogs.py:1288
+#: ../src/dialogs.py:1467
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s ist kein Name eines Gruppenchats."
 
-#: ../src/dialogs.py:1327
+#: ../src/dialogs.py:1506
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sie müssen verbunden sein, um Ihre Kontakte zu Synchronisieren."
 
-#: ../src/dialogs.py:1374
+#: ../src/dialogs.py:1520
+msgid "Server"
+msgstr "Server"
+
+#: ../src/dialogs.py:1553
 msgid "This account is not connected to the server"
 msgstr "Konto \"%s\" ist nicht mit dem Server verbunden"
 
-#: ../src/dialogs.py:1375
+#: ../src/dialogs.py:1554
 msgid "You cannot synchronize with an account unless it is connected."
-msgstr "Sie können nicht mit einem Konto Synchronisieren, solange es nicht verbunden ist."
+msgstr ""
+"Sie können nicht mit einem Konto Synchronisieren, solange es nicht verbunden "
+"ist."
 
-#: ../src/dialogs.py:1399
+#: ../src/dialogs.py:1578
 msgid "Synchronise"
 msgstr "Synchronisieren"
 
-#: ../src/dialogs.py:1457
+#: ../src/dialogs.py:1636
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Starte Chat mit Account %s"
 
-#: ../src/dialogs.py:1459
+#: ../src/dialogs.py:1638
 msgid "Start Chat"
 msgstr "Chat starten"
 
-#: ../src/dialogs.py:1460
+#: ../src/dialogs.py:1639
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -3231,523 +3648,761 @@ msgstr ""
 "an den Sie eine Chat-Nachricht schicken wollen:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1485
-#: ../src/dialogs.py:1844
-#: ../src/dialogs.py:1975
+#: ../src/dialogs.py:1664 ../src/dialogs.py:2040 ../src/dialogs.py:2181
 msgid "Connection not available"
 msgstr "Verbindung nicht verfügbar"
 
-#: ../src/dialogs.py:1486
-#: ../src/dialogs.py:1845
-#: ../src/dialogs.py:1976
+#: ../src/dialogs.py:1665 ../src/dialogs.py:2041 ../src/dialogs.py:2182
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vergewissern Sie sich, dass Sie mit \"%s\" verbunden sind."
 
-#: ../src/dialogs.py:1495
-#: ../src/dialogs.py:1498
+#: ../src/dialogs.py:1674 ../src/dialogs.py:1677
 msgid "Invalid JID"
 msgstr "Ungültige JID"
 
-#: ../src/dialogs.py:1498
+#: ../src/dialogs.py:1677
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kann \"%s\" nicht parsen."
 
-#: ../src/dialogs.py:1507
+#: ../src/dialogs.py:1686
 msgid "Without a connection, you can not change your password."
 msgstr "Sie müssen verbunden sein, um Ihr Passwort zu ändern"
 
-#: ../src/dialogs.py:1526
+#: ../src/dialogs.py:1704
+msgid "Invalid password"
+msgstr "Ungültiges Passwort"
+
+#: ../src/dialogs.py:1705
 msgid "You must enter a password."
 msgstr "Sie müssen ein Passwort eingeben."
 
+#: ../src/dialogs.py:1709
+msgid "Passwords do not match"
+msgstr "Passwörter stimmen nicht überein"
+
+#: ../src/dialogs.py:1710
+msgid "The passwords typed in both fields must be identical."
+msgstr "Die Passwörter in beiden Feldern müssen identisch sein."
+
 #. img to display
 #. default value
-#: ../src/dialogs.py:1573
-#: ../src/notify.py:212
-#: ../src/notify.py:416
+#: ../src/dialogs.py:1752 ../src/notify.py:232 ../src/notify.py:447
 msgid "Contact Signed In"
 msgstr "Kontakt hat sich angemeldet"
 
-#: ../src/dialogs.py:1575
-#: ../src/notify.py:220
-#: ../src/notify.py:418
+#: ../src/dialogs.py:1754 ../src/notify.py:240 ../src/notify.py:449
 msgid "Contact Signed Out"
 msgstr "Kontakt hat sich abgemeldet"
 
 #. chat message
-#: ../src/dialogs.py:1577
-#: ../src/notify.py:239
-#: ../src/notify.py:420
+#: ../src/dialogs.py:1756 ../src/notify.py:263 ../src/notify.py:451
 msgid "New Message"
 msgstr "Neue Nachricht"
 
 #. single message
-#: ../src/dialogs.py:1577
-#: ../src/notify.py:224
-#: ../src/notify.py:420
+#: ../src/dialogs.py:1756 ../src/notify.py:244 ../src/notify.py:451
 msgid "New Single Message"
 msgstr "Neue einzelne Nachricht"
 
 #. private message
-#: ../src/dialogs.py:1578
-#: ../src/notify.py:231
-#: ../src/notify.py:421
+#: ../src/dialogs.py:1757 ../src/notify.py:251 ../src/notify.py:452
 msgid "New Private Message"
 msgstr "Neue private Nachricht"
 
-#: ../src/dialogs.py:1578
-#: ../src/gajim.py:1291
-#: ../src/notify.py:429
+#: ../src/dialogs.py:1757 ../src/gajim.py:1532 ../src/notify.py:460
 msgid "New E-mail"
 msgstr "Neue E-Mail"
 
-#: ../src/dialogs.py:1580
-#: ../src/gajim.py:1444
-#: ../src/notify.py:423
+#: ../src/dialogs.py:1759 ../src/gajim.py:1707 ../src/notify.py:454
 msgid "File Transfer Request"
 msgstr "Dateitransfer Anfrage"
 
-#: ../src/dialogs.py:1582
-#: ../src/gajim.py:1263
-#: ../src/gajim.py:1420
-#: ../src/notify.py:425
+#: ../src/dialogs.py:1761 ../src/gajim.py:1504 ../src/gajim.py:1674
+#: ../src/notify.py:456
 msgid "File Transfer Error"
 msgstr "Dateitransfer-Fehler"
 
-#: ../src/dialogs.py:1584
-#: ../src/gajim.py:1483
-#: ../src/gajim.py:1505
-#: ../src/gajim.py:1522
-#: ../src/notify.py:427
+#: ../src/dialogs.py:1763 ../src/gajim.py:1746 ../src/gajim.py:1768
+#: ../src/gajim.py:1785 ../src/notify.py:458
 msgid "File Transfer Completed"
 msgstr "Dateitransfer beendet"
 
-#: ../src/dialogs.py:1585
-#: ../src/gajim.py:1486
-#: ../src/notify.py:427
+#: ../src/dialogs.py:1764 ../src/gajim.py:1749 ../src/notify.py:458
 msgid "File Transfer Stopped"
 msgstr "Dateitransfer gestoppt"
 
-#: ../src/dialogs.py:1587
-#: ../src/gajim.py:1160
-#: ../src/notify.py:431
+#: ../src/dialogs.py:1766 ../src/gajim.py:1364 ../src/notify.py:462
 msgid "Groupchat Invitation"
 msgstr "Gruppenchat-Einladung"
 
-#: ../src/dialogs.py:1589
-#: ../src/notify.py:204
-#: ../src/notify.py:433
+#: ../src/dialogs.py:1768 ../src/notify.py:224 ../src/notify.py:464
 msgid "Contact Changed Status"
 msgstr "Kontakt hat Status verändert"
 
-#: ../src/dialogs.py:1774
+#: ../src/dialogs.py:1959
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Einzelne Nachricht mit Account %s"
 
-#: ../src/dialogs.py:1776
+#: ../src/dialogs.py:1961
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Einzelne Nachricht in Account %s"
 
-#: ../src/dialogs.py:1778
+#: ../src/dialogs.py:1963
 msgid "Single Message"
 msgstr "Einzelne Nachricht"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1781
+#: ../src/dialogs.py:1966
 #, python-format
 msgid "Send %s"
 msgstr "Sende %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1804
+#: ../src/dialogs.py:1989
 #, python-format
 msgid "Received %s"
 msgstr "%s empfangen"
 
+#. prepare UI for Receiving
+#: ../src/dialogs.py:2012
+#, fuzzy, python-format
+msgid "Form %s"
+msgstr "Von %s"
+
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1876
+#: ../src/dialogs.py:2082
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1877
+#: ../src/dialogs.py:2083
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schrieb:\n"
 
-#: ../src/dialogs.py:1921
+#: ../src/dialogs.py:2127
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsole für %s"
 
-#: ../src/dialogs.py:1923
+#: ../src/dialogs.py:2129
 msgid "XML Console"
 msgstr "XML Konsole"
 
-#: ../src/dialogs.py:2046
+#: ../src/dialogs.py:2252
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privatliste <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2050
+#: ../src/dialogs.py:2256
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privatsphären-Liste für %s"
 
-#: ../src/dialogs.py:2098
+#: ../src/dialogs.py:2312
 #, python-format
 msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr "Sortierung: %s, Aktion: %s, Typ: %s, Wert: %s"
 
-#: ../src/dialogs.py:2101
+#: ../src/dialogs.py:2315
 #, python-format
 msgid "Order: %s, action: %s"
 msgstr "Sortierung: %s, Aktion: %s"
 
-#: ../src/dialogs.py:2143
+#: ../src/dialogs.py:2357
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Eine Regel bearbeiten</b>"
 
-#: ../src/dialogs.py:2230
+#: ../src/dialogs.py:2444
 msgid "<b>Add a rule</b>"
 msgstr "<b>Eine Regel hinzufügen</b>"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privatliste für %s"
 
-#: ../src/dialogs.py:2328
+#: ../src/dialogs.py:2542
 msgid "Privacy Lists"
 msgstr "Privatlisten"
 
-#: ../src/dialogs.py:2398
+#: ../src/dialogs.py:2612
 msgid "Invalid List Name"
 msgstr "Ungültiger Listenname"
 
-#: ../src/dialogs.py:2399
+#: ../src/dialogs.py:2613
 msgid "You must enter a name to create a privacy list."
-msgstr "Sie müssen einen Namen eingeben um eine Privatsphären-Liste zu erstellen."
+msgstr ""
+"Sie müssen einen Namen eingeben um eine Privatsphären-Liste zu erstellen."
 
-#. Don't translate $Contact
-#: ../src/dialogs.py:2433
+#: ../src/dialogs.py:2650
+msgid "$Contact has invited you to join a discussion"
+msgstr "$Contact hat Sie in den Gruppenchat %(room_jid)s eingeladen"
+
+#: ../src/dialogs.py:2652
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact hat Sie in den Gruppenchat %(room_jid)s eingeladen"
 
-#. only if not None and not ''
-#: ../src/dialogs.py:2445
+#: ../src/dialogs.py:2665
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2731
 msgid "Choose Sound"
 msgstr "Sound wählen"
 
-#: ../src/dialogs.py:2517
-#: ../src/dialogs.py:2562
+#: ../src/dialogs.py:2741 ../src/dialogs.py:2792
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: ../src/dialogs.py:2522
+#: ../src/dialogs.py:2746
 msgid "Wav Sounds"
 msgstr "Wav Dateien"
 
-#: ../src/dialogs.py:2552
+#: ../src/dialogs.py:2779
 msgid "Choose Image"
 msgstr "Bild auswählen"
 
-#: ../src/dialogs.py:2567
+#: ../src/dialogs.py:2797
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:2624
+#: ../src/dialogs.py:2862
 #, python-format
 msgid "When %s becomes:"
 msgstr "Wenn %s wird:"
 
-#: ../src/dialogs.py:2626
+#: ../src/dialogs.py:2864
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Füge speziellen Hinweis für %s hinzu"
 
 #. # means number
-#: ../src/dialogs.py:2697
+#: ../src/dialogs.py:2935
 msgid "#"
 msgstr "Nr."
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2941
 msgid "Condition"
 msgstr "Bedingung"
 
-#: ../src/dialogs.py:2824
+#: ../src/dialogs.py:3059
 msgid "when I am "
 msgstr "wenn Ich bin "
 
-#: ../src/disco.py:103
+#: ../src/disco.py:111
 msgid "Others"
 msgstr "Andere"
 
-#: ../src/disco.py:104
-#: ../src/disco.py:105
-#: ../src/disco.py:1281
-#: ../src/gajim.py:604
-#: ../src/roster_window.py:272
-#: ../src/roster_window.py:330
-#: ../src/roster_window.py:369
-#: ../src/roster_window.py:451
-#: ../src/roster_window.py:483
-#: ../src/roster_window.py:485
-#: ../src/roster_window.py:3912
-#: ../src/roster_window.py:3914
-#: ../src/common/contacts.py:267
-#: ../src/common/contacts.py:282
-#: ../src/common/helpers.py:43
+#: ../src/disco.py:112 ../src/disco.py:113 ../src/disco.py:1355
+#: ../src/gajim.py:660 ../src/roster_window.py:295 ../src/roster_window.py:355
+#: ../src/roster_window.py:395 ../src/roster_window.py:503
+#: ../src/roster_window.py:535 ../src/roster_window.py:537
+#: ../src/roster_window.py:4751 ../src/roster_window.py:4753
+#: ../src/common/contacts.py:295 ../src/common/contacts.py:310
+#: ../src/common/helpers.py:53
 msgid "Transports"
 msgstr "Transports"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:107
+#: ../src/disco.py:115
 msgid "Conference"
 msgstr "Konferenz"
 
-#: ../src/disco.py:420
+#: ../src/disco.py:428
 msgid "Without a connection, you can not browse available services"
 msgstr "Sie müssen angemeldet sein um Dienste zu durchsuchen"
 
-#: ../src/disco.py:499
+#: ../src/disco.py:502
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Dienste durchsuchen für Konto %s"
 
-#: ../src/disco.py:501
+#: ../src/disco.py:504
 msgid "Service Discovery"
 msgstr "Dienste durchsuchen"
 
-#: ../src/disco.py:641
+#: ../src/disco.py:644
 msgid "The service could not be found"
 msgstr "Der Dienst konnte nicht gefunden werden"
 
-#: ../src/disco.py:642
-msgid "There is no service at the address you entered, or it is not responding. Check the address and try again."
-msgstr "Es existiert kein Dienst an der Adresse, die sie angegeben haben oder er antwortet nicht. Überprüfen Sie die Adresse und versuchen Sie es erneut."
+#: ../src/disco.py:645
+msgid ""
+"There is no service at the address you entered, or it is not responding. "
+"Check the address and try again."
+msgstr ""
+"Es existiert kein Dienst an der Adresse, die sie angegeben haben oder er "
+"antwortet nicht. Überprüfen Sie die Adresse und versuchen Sie es erneut."
 
-#: ../src/disco.py:646
-#: ../src/disco.py:927
+#: ../src/disco.py:649 ../src/disco.py:930
 msgid "The service is not browsable"
 msgstr "Der Dienst ist nicht durchsuchbar"
 
-#: ../src/disco.py:647
+#: ../src/disco.py:650
 msgid "This type of service does not contain any items to browse."
-msgstr "Dieser Art von Dienst enthält keine Objekte, di edurchsucht werden können."
+msgstr ""
+"Dieser Art von Dienst enthält keine Objekte, di edurchsucht werden können."
 
-#: ../src/disco.py:727
+#: ../src/disco.py:730
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Durchsuche %s mit Konto %s"
 
-#: ../src/disco.py:766
+#: ../src/disco.py:769
 msgid "_Browse"
 msgstr "_Durchsuche"
 
-#: ../src/disco.py:928
+#: ../src/disco.py:931
 msgid "This service does not contain any items to browse."
 msgstr "Dieser Dienst enthält keine keine durchsuchbaren Objekte."
 
-#: ../src/disco.py:1155
-#: ../src/disco.py:1286
+#: ../src/disco.py:1152
+msgid "_Execute Command"
+msgstr "_Befehl ausführen..."
+
+#: ../src/disco.py:1162 ../src/disco.py:1360
 msgid "Re_gister"
 msgstr "Re_gistrieren"
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1397
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Durchsuche %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1504
+#: ../src/disco.py:1579
 msgid "Users"
 msgstr "Benutzer"
 
 #. Description column
-#: ../src/disco.py:1511
+#: ../src/disco.py:1587
 msgid "Description"
 msgstr "Beschreibung"
 
 #. Id column
-#: ../src/disco.py:1518
+#: ../src/disco.py:1595
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1741
+#: ../src/disco.py:1824
 msgid "Subscribed"
 msgstr "Abonniert"
 
-#: ../src/disco.py:1767
+#: ../src/disco.py:1832
+msgid "Node"
+msgstr "Node"
+
+#: ../src/disco.py:1889
 msgid "New post"
 msgstr "Neue Nachricht"
 
-#: ../src/disco.py:1773
+#: ../src/disco.py:1895
 msgid "_Subscribe"
 msgstr "_Abonnieren"
 
-#: ../src/disco.py:1779
+#: ../src/disco.py:1901
 msgid "_Unsubscribe"
 msgstr "_Abbestellen"
 
-#: ../src/filetransfers_window.py:72
+#: ../src/features_window.py:47
+msgid "PyOpenSSL"
+msgstr "PyOpenSSL"
+
+#: ../src/features_window.py:48
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+"Eine Bibliothek um Server-Zertifikate zu validieren um eine sichere "
+"Verbindung zu gewährleisten."
+
+#: ../src/features_window.py:49 ../src/features_window.py:50
+msgid "Requires python-pyopenssl."
+msgstr "Erfordert python-pyopenssl."
+
+#: ../src/features_window.py:51
+msgid "Bonjour / Zeroconf"
+msgstr "Bonjour / Zeroconf"
+
+#: ../src/features_window.py:52
+msgid "Serverless chatting with autodetected clients in a local network."
+msgstr ""
+"Serverloses Chatten mit automatisch erkannten Clients in einem lokalen Netz"
+
+#: ../src/features_window.py:53
+msgid "Requires python-avahi."
+msgstr "Erfordert python-avahi."
+
+#: ../src/features_window.py:54
+msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgstr "Erfordert pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+
+#: ../src/features_window.py:55
+msgid "gajim-remote"
+msgstr "gajim-remote"
+
+#: ../src/features_window.py:56
+msgid "A script to controle gajim via commandline."
+msgstr "Ein Skript um Gajim über die Kommandozeile zu steuern."
+
+#: ../src/features_window.py:57
+msgid "Requires python-dbus."
+msgstr "Erfordert python-dbus."
+
+#: ../src/features_window.py:58 ../src/features_window.py:62
+#: ../src/features_window.py:66 ../src/features_window.py:70
+#: ../src/features_window.py:74 ../src/features_window.py:82
+#: ../src/features_window.py:86 ../src/features_window.py:98
+msgid "Feature not available under Windows."
+msgstr "Funktion unter Windows nicht verfügbar."
+
+#: ../src/features_window.py:59
+msgid "OpenGPG"
+msgstr "OpenPGP: "
+
+#: ../src/features_window.py:60
+msgid "Encrypting chatmessages with gpg keys."
+msgstr "Chat Nachrichten werden mit gpg Schlüssel verschlüsselt"
+
+#: ../src/features_window.py:61
+msgid "Requires gpg and python-GnuPGInterface."
+msgstr "Erfordert gpg und python-GnuPGInterface."
+
+#: ../src/features_window.py:63
+msgid "network-manager"
+msgstr "network-manager"
+
+#: ../src/features_window.py:64
+msgid "Autodetection of network status."
+msgstr "Auto-Erkennung des Netzwerk-Status."
+
+#: ../src/features_window.py:65
+msgid "Requires gnome-network-manager and python-dbus."
+msgstr "Erfordert gnome-network-manager und python-dbus."
+
+#: ../src/features_window.py:67
+msgid "Session Management"
+msgstr "Sitzungsverwaltung"
+
+#: ../src/features_window.py:68
+msgid "Gajim session is stored on logout and restored on login."
+msgstr ""
+"Gajim-Sitzung wird beim Logout gespeichert und beim Login wiederhergestellt"
+
+#: ../src/features_window.py:69
+msgid "Requires python-gnome2."
+msgstr "Erfordert python-gnome2."
+
+#: ../src/features_window.py:71
+msgid "gnome-keyring"
+msgstr "gnome-keyring"
+
+#: ../src/features_window.py:72
+msgid "Passwords can be stored securely and not just in plaintext."
+msgstr "Passwörter können sicher und nicht nur im Klartext gespeichert werden"
+
+#: ../src/features_window.py:73
+msgid "Requires gnome-keyring and python-gnome2-desktop."
+msgstr "Erfordert gnome-keyring und python-gnome2-desktop."
+
+#: ../src/features_window.py:75
+msgid "SRV"
+msgstr "SRV"
+
+#: ../src/features_window.py:76
+msgid "Ability to connect to servers which are using SRV records."
+msgstr "Fähigkeit zu Servern die SRV-Einträge verwenden zu verbinden."
+
+#: ../src/features_window.py:77
+msgid "Requires dnsutils."
+msgstr "Erfordert dnsutils."
+
+#: ../src/features_window.py:78
+msgid "Requires nslookup to use SRV records."
+msgstr "Erfordert nslookup zur Nutzung von SRV-Einträgen."
+
+#: ../src/features_window.py:79
+msgid "Spell Checker"
+msgstr "Rechtschreibprüfung"
+
+#: ../src/features_window.py:80
+msgid "Spellchecking of composed messages."
+msgstr "Rechtschreibprüfung erstellter Nachrichten."
+
+#: ../src/features_window.py:81
+msgid ""
+"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
+"sources."
+msgstr ""
+"Erfordert python-gnome2-extras oder die Kompilation des gtkspell-Moduls aus "
+"den Gajim-Quellen."
+
+#: ../src/features_window.py:83
+msgid "Notification-daemon"
+msgstr "Notification-daemon"
+
+#: ../src/features_window.py:84
+msgid "Passive popups notifying for new events."
+msgstr "Popups informieren über neue Ereignisse."
+
+#: ../src/features_window.py:85
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr ""
+"Erforder python-notify oder stattdessen python-dbus in Verbindung mit "
+"notification-daemon."
+
+#: ../src/features_window.py:87
+msgid "Trayicon"
+msgstr "Tray-Symbol"
+
+#: ../src/features_window.py:88
+msgid "A icon in systemtray reflecting the current presence."
+msgstr "Ein Icon im Systemtray, das den Status widerspiegelt."
+
+#: ../src/features_window.py:89
+msgid ""
+"Requires python-gnome2-extras or compiled  trayicon module from Gajim "
+"sources."
+msgstr ""
+"Erfordert python-gnome2-extras oder das kompilierte Trayicon-Modul aus den "
+"Gajim-Quellen"
+
+#: ../src/features_window.py:90
+msgid "Requires PyGTK >= 2.10."
+msgstr "Erforder PyGTK >= 2.10."
+
+#: ../src/features_window.py:91
+msgid "Idle"
+msgstr "Idle"
+
+#: ../src/features_window.py:92
+msgid "Ability to measure idle time, in order to set auto status."
+msgstr "Fähigkeit die Idle-Zeit zu messen um den Status automatisch zu setzen"
+
+#: ../src/features_window.py:93 ../src/features_window.py:94
+msgid "Requires compilation of the idle module from Gajim sources."
+msgstr "Erfordert die Kompilation des Idle-Moduls aus den Gajim-Quellen."
+
+#: ../src/features_window.py:95
+msgid "LaTeX"
+msgstr "LaTeX"
+
+#: ../src/features_window.py:96
+msgid "Transform LaTeX espressions between $$ $$."
+msgstr "LaTeX-Ausdrücke zwischen $$ $$ umwandeln."
+
+#: ../src/features_window.py:97
+msgid ""
+"Requires texlive-latex-base, dvips and imagemagick. You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+"Erfordert texlive-latex-base, dvips und imagemagick. Sie müssen 'use_latex' "
+"im Advanced Configuration Editor auf 'true' setzen."
+
+#: ../src/features_window.py:99
+msgid "End to end encryption"
+msgstr "OpenPGP-Verschlüsselung"
+
+#: ../src/features_window.py:100
+msgid "Encrypting chatmessages."
+msgstr "Chatnachrichten werden verschlüsselt."
+
+#: ../src/features_window.py:101 ../src/features_window.py:102
+msgid "Requires python-crypto."
+msgstr "Erfordert python-crypto"
+
+#: ../src/features_window.py:103
+msgid "RST Generator"
+msgstr "RST Generator"
+
+#: ../src/features_window.py:104
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+"Erzeug aus RST-Code XHTML-Ausgaben (siehe http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+
+#: ../src/features_window.py:105 ../src/features_window.py:106
+msgid "Requires python-docutils."
+msgstr "Erfordert python-docutils."
+
+#: ../src/features_window.py:107
+msgid "libsexy"
+msgstr ""
+
+#: ../src/features_window.py:108
+#, fuzzy
+msgid "Ability to have clickable URLs in chat window."
+msgstr "Versteckt die Knöpfe im Gruppenchat-Fenster."
+
+#: ../src/features_window.py:109 ../src/features_window.py:110
+msgid "Requires python-sexy."
+msgstr "Erfordert python-sexy."
+
+#: ../src/features_window.py:117 ../src/common/helpers.py:248
+msgid "Available"
+msgstr "Angemeldet"
+
+#: ../src/features_window.py:124
+#, fuzzy
+msgid "Feature"
+msgstr "Fähigkeiten des Servers"
+
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Datei"
 
-#: ../src/filetransfers_window.py:87
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Zeit"
 
-#: ../src/filetransfers_window.py:99
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: ../src/filetransfers_window.py:161
-#: ../src/filetransfers_window.py:215
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:218
 #, python-format
 msgid "Filename: %s"
 msgstr "Dateiname: %s"
 
-#: ../src/filetransfers_window.py:162
-#: ../src/filetransfers_window.py:290
+#: ../src/filetransfers_window.py:165 ../src/filetransfers_window.py:305
 #, python-format
 msgid "Size: %s"
 msgstr "Größe: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:171
-#: ../src/filetransfers_window.py:181
-#: ../src/history_manager.py:463
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:184
+#: ../src/history_manager.py:468
 msgid "You"
 msgstr "Sie"
 
-#: ../src/filetransfers_window.py:172
+#: ../src/filetransfers_window.py:175
 #, python-format
 msgid "Sender: %s"
 msgstr "Gespeichert in: %s"
 
-#: ../src/filetransfers_window.py:173
-#: ../src/filetransfers_window.py:564
-#: ../src/tooltips.py:573
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:593
+#: ../src/tooltips.py:593
 msgid "Recipient: "
 msgstr "Empfänger: "
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:187
 #, python-format
 msgid "Saved in: %s"
 msgstr "Absender: %s"
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:189
 msgid "File transfer completed"
 msgstr "Dateitransfer abgeschlossen"
 
-#: ../src/filetransfers_window.py:200
-#: ../src/filetransfers_window.py:206
+#: ../src/filetransfers_window.py:203 ../src/filetransfers_window.py:209
 msgid "File transfer cancelled"
 msgstr "Dateitransfer abgebrochen"
 
-#: ../src/filetransfers_window.py:200
-#: ../src/filetransfers_window.py:207
+#: ../src/filetransfers_window.py:203 ../src/filetransfers_window.py:210
 msgid "Connection with peer cannot be established."
 msgstr "Verbindung zum Teilnehmer kann nicht hergestellt werden"
 
-#: ../src/filetransfers_window.py:216
+#: ../src/filetransfers_window.py:219
 #, python-format
 msgid "Recipient: %s"
 msgstr "Empfänger: %s"
 
-#: ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:221
 #, python-format
 msgid "Error message: %s"
 msgstr "Fehlermeldung: %s"
 
-#: ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:222
 msgid "File transfer stopped by the contact at the other end"
 msgstr "Gegenseite hat Dateitransfer gestoppt"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:243
 msgid "Choose File to Send..."
 msgstr "Datei auswählen ..."
 
-#: ../src/filetransfers_window.py:255
+#: ../src/filetransfers_window.py:259 ../src/tooltips.py:632
+#, fuzzy
+msgid "Description: "
+msgstr "Beschreibung: %s"
+
+#: ../src/filetransfers_window.py:270
 msgid "Gajim cannot access this file"
 msgstr "Gajim kann auf diese Datei nicht zugreifen"
 
-#: ../src/filetransfers_window.py:256
+#: ../src/filetransfers_window.py:271
 msgid "This file is being used by another process."
 msgstr "Diese Datei wird von einem anderen Prozess verwendet."
 
-#: ../src/filetransfers_window.py:288
+#: ../src/filetransfers_window.py:303
 #, python-format
 msgid "File: %s"
 msgstr "Datei: %s"
 
-#: ../src/filetransfers_window.py:293
+#: ../src/filetransfers_window.py:308
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:295
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "Description: %s"
 msgstr "Beschreibung: %s"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s möchte ihnen eine Datei senden:"
 
-#: ../src/filetransfers_window.py:310
-#: ../src/gtkgui_helpers.py:750
+#: ../src/filetransfers_window.py:324 ../src/gtkgui_helpers.py:773
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kann existierende Datei \"%s\" nicht überschreiben"
 
-#: ../src/filetransfers_window.py:311
-#: ../src/gtkgui_helpers.py:752
-msgid "A file with this name already exists and you do not have permission to overwrite it."
-msgstr "Eine Datei mit diesem Namen existiert bereits und Sie haben nicht die Rechte sie zu überschreiben."
+#: ../src/filetransfers_window.py:325 ../src/gtkgui_helpers.py:775
+msgid ""
+"A file with this name already exists and you do not have permission to "
+"overwrite it."
+msgstr ""
+"Eine Datei mit diesem Namen existiert bereits und Sie haben nicht die Rechte "
+"sie zu überschreiben."
 
-#: ../src/filetransfers_window.py:318
-#: ../src/gtkgui_helpers.py:756
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:779
 msgid "This file already exists"
 msgstr "Diese Datei existiert bereits"
 
-#: ../src/filetransfers_window.py:318
-#: ../src/gtkgui_helpers.py:756
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:779
 msgid "What do you want to do?"
 msgstr "Was möchten Sie tun?"
 
-#: ../src/filetransfers_window.py:330
-#: ../src/gtkgui_helpers.py:766
+#: ../src/filetransfers_window.py:344 ../src/gtkgui_helpers.py:789
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Verzeichnis \"%s\" ist nicht schreibbar"
 
-#: ../src/filetransfers_window.py:330
-#: ../src/gtkgui_helpers.py:767
+#: ../src/filetransfers_window.py:344 ../src/gtkgui_helpers.py:790
 msgid "You do not have permission to create files in this directory."
-msgstr "Ihre Benutzerrechte erlauben es Ihnen nicht, in diesem Verzeichnis Dateien anzulegen."
+msgstr ""
+"Ihre Benutzerrechte erlauben es Ihnen nicht, in diesem Verzeichnis Dateien "
+"anzulegen."
 
-#: ../src/filetransfers_window.py:340
+#: ../src/filetransfers_window.py:354
 msgid "Save File as..."
 msgstr "Datei speichern unter ..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:421
+#: ../src/filetransfers_window.py:434
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3755,95 +4410,103 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:497
+#: ../src/filetransfers_window.py:523
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:536
-#: ../src/filetransfers_window.py:539
+#: ../src/filetransfers_window.py:563 ../src/filetransfers_window.py:566
 msgid "Invalid File"
 msgstr "Ungültige Datei"
 
-#: ../src/filetransfers_window.py:536
+#: ../src/filetransfers_window.py:563
 msgid "File: "
 msgstr "Datei: "
 
-#: ../src/filetransfers_window.py:540
+#: ../src/filetransfers_window.py:567
 msgid "It is not possible to send empty files"
 msgstr "Es nicht möglich, leere Dateien zu versenden"
 
-#: ../src/filetransfers_window.py:560
-#: ../src/tooltips.py:563
+#: ../src/filetransfers_window.py:589 ../src/tooltips.py:583
 msgid "Name: "
 msgstr "Name: "
 
-#: ../src/filetransfers_window.py:562
-#: ../src/tooltips.py:567
+#: ../src/filetransfers_window.py:591 ../src/tooltips.py:587
 msgid "Sender: "
 msgstr "Absender: "
 
-#: ../src/filetransfers_window.py:750
+#: ../src/filetransfers_window.py:779
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:47
+#: ../src/gajim.py:56
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s ist kein gültiger Loglevel."
 
-#: ../src/gajim.py:122
+#: ../src/gajim.py:129
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim benötigt einen laufenden X-Server. Breche ab ..."
 
-#: ../src/gajim.py:126
+#: ../src/gajim.py:156
 msgid "Gajim needs PyGTK 2.8 or above"
 msgstr "Gajim benötigt PyGTK 2.6 oder höher"
 
-#: ../src/gajim.py:127
+#: ../src/gajim.py:157
 msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
 msgstr "Gajim benötigt PyGTK 2.6 oder höher. Breche ab ..."
 
-#: ../src/gajim.py:129
+#: ../src/gajim.py:159
 msgid "Gajim needs GTK 2.8 or above"
 msgstr "Gajim benötigt GTK 2.6 oder höher"
 
-#: ../src/gajim.py:130
+#: ../src/gajim.py:160
 msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
 msgstr "Gajim benötigt GTK 2.6+. Breche ab ..."
 
-#: ../src/gajim.py:135
+#: ../src/gajim.py:165
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ runtine fehlt libglade-Unterstützung"
 
-#: ../src/gajim.py:137
+#: ../src/gajim.py:167
 #, python-format
-msgid "Please remove your current GTK+ runtime and install the latest stable version from %s"
-msgstr "Bitte entfernen Sie Ihre derzeitige GTK+ Laufzeitumgebung und installieren Sie die aktuelle Version von %s"
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Bitte entfernen Sie Ihre derzeitige GTK+ Laufzeitumgebung und installieren "
+"Sie die aktuelle Version von %s"
 
-#: ../src/gajim.py:139
-msgid "Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr "Bitte stellen Sie sicher, dass GTK+ und PyGTK auf Ihrem System libglade-Unterstützung besitzen."
+#: ../src/gajim.py:169
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr ""
+"Bitte stellen Sie sicher, dass GTK+ und PyGTK auf Ihrem System libglade-"
+"Unterstützung besitzen."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:174
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim benötigt PySQLite2 zum Starten"
 
-#: ../src/gajim.py:152
+#: ../src/gajim.py:182
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim benötigt pywin32 zum Laufen"
 
-#: ../src/gajim.py:153
+#: ../src/gajim.py:183
 #, python-format
-msgid "Please make sure that Pywin32 is installed on your system. You can get it at %s"
-msgstr "Bitte stellen Sie sicher das Pywin32 auf Ihrem System installiert ist. Sie können es unter folgender URL herunterladen: %s "
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+"Bitte stellen Sie sicher das Pywin32 auf Ihrem System installiert ist. Sie "
+"können es unter folgender URL herunterladen: %s "
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:300
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "Gajim läuft bereits"
 
-#: ../src/gajim.py:301
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -3851,88 +4514,169 @@ msgstr ""
 "Eine andere Instanz von Gajim schein bereits zu laufen\n"
 "Trotzdem starten?"
 
-#: ../src/gajim.py:408
+#: ../src/gajim.py:352 ../src/common/connection_handlers.py:908
+#: ../src/common/connection_handlers.py:1620
+#: ../src/common/connection_handlers.py:1649
+#: ../src/common/connection_handlers.py:1659
+#: ../src/common/connection_handlers.py:1678
+#: ../src/common/connection_handlers.py:1915
+#: ../src/common/connection_handlers.py:2027 ../src/common/connection.py:938
+msgid "Disk Write Error"
+msgstr "Fehler beim Schreiben auf Festplatte"
+
+#: ../src/gajim.py:448
+msgid "Do you accept this request?"
+msgstr "Akzeptieren Sie diese Anfrage?"
+
+#: ../src/gajim.py:450
+#, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Akzeptieren Sie diese Anfrage vom %s Konto?"
+
+#: ../src/gajim.py:453
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Autorisierung für %s (id: %s)"
 
-#: ../src/gajim.py:409
-msgid "Do you accept this request?"
-msgstr "Akzeptieren Sie diese Anfrage?"
-
-#: ../src/gajim.py:455
-#: ../src/notify.py:435
+#: ../src/gajim.py:500 ../src/notify.py:466
 msgid "Connection Failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: ../src/gajim.py:775
+#: ../src/gajim.py:834
 #, python-format
 msgid "Subject: %s"
 msgstr "Thema: %s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
-#: ../src/gajim.py:820
-#: ../src/gajim.py:833
+#: ../src/gajim.py:881 ../src/gajim.py:894
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "Fehler beim Senden von %s ( %s )"
 
-#: ../src/gajim.py:866
+#: ../src/gajim.py:927
 msgid "Authorization accepted"
 msgstr "Autorisierung akzeptiert"
 
-#: ../src/gajim.py:867
+#: ../src/gajim.py:928
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakt \"%s\" hat Sie autorisiert seinen oder ihren Staus zu sehen."
 
-#: ../src/gajim.py:875
+#: ../src/gajim.py:936
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" hat das Abonnement zurückgezogen"
 
-#: ../src/gajim.py:876
+#: ../src/gajim.py:937
 msgid "You will always see him or her as offline."
 msgstr "Sie werden den Kontakt ab sofort als offline sehen."
 
-#: ../src/gajim.py:920
+#: ../src/gajim.py:981
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt mit \"%s\" konnte nicht hergestellt werden"
 
-#: ../src/gajim.py:921
-#: ../src/common/connection.py:434
+#: ../src/gajim.py:982 ../src/common/connection.py:465
 msgid "Check your connection or try again later."
-msgstr "Überprüfen Sie die Verbindung oder versuchen Sie es später noch einmal."
+msgstr ""
+"Überprüfen Sie die Verbindung oder versuchen Sie es später noch einmal."
+
+#: ../src/gajim.py:1151 ../src/groupchat_control.py:991
+#, python-format
+msgid "%s is now known as %s"
+msgstr "%s heißt jetzt %s"
 
-#: ../src/gajim.py:1070
-#: ../src/roster_window.py:1218
+#: ../src/gajim.py:1167 ../src/roster_window.py:1372
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s ist jetzt %s (%s)"
 
 #. No status message
-#: ../src/gajim.py:1073
-#: ../src/groupchat_control.py:962
-#: ../src/roster_window.py:1221
+#: ../src/gajim.py:1170 ../src/groupchat_control.py:1142
+#: ../src/roster_window.py:1375
 #, python-format
 msgid "%s is now %s"
 msgstr "%s ist jetzt %s"
 
-#: ../src/gajim.py:1170
+#. Can be a presence (see chg_contact_status in groupchat_contol.py)
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/gajim.py:1291 ../src/groupchat_control.py:951
+msgid "Any occupant is allowed to see your full JID"
+msgstr "Jeder Teilnehmer darf Ihre volle JID sehen"
+
+#: ../src/gajim.py:1294
+msgid "Room now shows unavailable member"
+msgstr "Raum zeigt jetzt abwesende Teilnehmer"
+
+#: ../src/gajim.py:1296
+msgid "room now does not show unavailable members"
+msgstr "Raum zeigt jetzt abwesende Teilnehmer nicht an"
+
+#: ../src/gajim.py:1299
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+"Eine nicht Privatsphären-bezogene Raum-Konfigurations-Änderung ist "
+"aufgetreten"
+
+#. Can be a presence (see chg_contact_status in groupchat_contol.py)
+#: ../src/gajim.py:1302
+msgid "Room logging is now enabled"
+msgstr "Raum-Mitschnitt ist jetzt aktiviert"
+
+#: ../src/gajim.py:1304
+msgid "Room logging is now disabled"
+msgstr "Raum-Mitschnitt ist jetzt deaktiviert"
+
+#: ../src/gajim.py:1306
+msgid "Room is now non-anonymous"
+msgstr "Raum ist jetzt un-anonym"
+
+#: ../src/gajim.py:1309
+msgid "Room is now semi-anonymous"
+msgstr "Raum ist jetzt semi-anonym"
+
+#: ../src/gajim.py:1312
+msgid "Room is now fully-anonymous"
+msgstr "Raum ist jetzt voll anonym"
+
+#: ../src/gajim.py:1344
+#, python-format
+msgid "A Password is required to join the room %s. Please type it"
+msgstr "Für das Betreten des Gruppenchats-Raumes %s wird ein Passwort benötig."
+
+#: ../src/gajim.py:1379
 msgid "Your passphrase is incorrect"
 msgstr "Ihre Passphrase ist falsch"
 
-#: ../src/gajim.py:1171
+#: ../src/gajim.py:1380
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Sie wurden ohne ihren GPG-Schlüssel verbunden"
 
-#: ../src/gajim.py:1274
+#: ../src/gajim.py:1392
+msgid "Passphrase Required"
+msgstr "Passphrase benötigt"
+
+#: ../src/gajim.py:1393
+#, python-format
+msgid "Enter GPG key passphrase for account %s."
+msgstr "Geben Sie die GPG-Passphrase für das Konto %s ein."
+
+#: ../src/gajim.py:1405
+msgid "Wrong Passphrase"
+msgstr "Falsche Passphrase"
+
+#: ../src/gajim.py:1406
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr ""
+"Bitte geben Sie Ihre GPG-Passphrase erneut ein oder klicken Sie auf "
+"Abbrechen."
+
+#: ../src/gajim.py:1515
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Neue E-Mail auf %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1276
+#: ../src/gajim.py:1517
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3942,7 +4686,7 @@ msgstr[1] "Sie haben %d ungelesene E-Mail-Nachrichten"
 #. FIXME: emulate Gtalk client popups. find out what they parse and how
 #. they decide what to show
 #. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1285
+#: ../src/gajim.py:1526
 #, python-format
 msgid ""
 "\n"
@@ -3951,329 +4695,430 @@ msgstr ""
 "\n"
 "Von: %(from_address)s"
 
-#: ../src/gajim.py:1441
+#: ../src/gajim.py:1704
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s möchte ihnen eine Datei senden."
 
-#: ../src/gajim.py:1506
+#: ../src/gajim.py:1769
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Sie haben %(filename)s erfolgreich von %(name)s erhalten."
 
 #. ft stopped
-#: ../src/gajim.py:1510
+#: ../src/gajim.py:1773
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Dateitransfer %(filename)s von %(name)s wurde gestoppt."
 
-#: ../src/gajim.py:1523
+#: ../src/gajim.py:1786
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Sie haben%(filename)s erfolgreich an %(name)s gesendet."
 
 #. ft stopped
-#: ../src/gajim.py:1527
+#: ../src/gajim.py:1790
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Dateitransfer von %(filename)s an %(name)s wurde gestoppt."
 
-#: ../src/gajim.py:1640
+#: ../src/gajim.py:1885
+msgid "Session negotiation cancelled"
+msgstr "Sitzungs-Aushandlung abgebrochen"
+
+#: ../src/gajim.py:1886
+#, python-format
+msgid "The client at %s cancelled the session negotiation."
+msgstr "Der Client bei %s hat die Sitzungs-Aushandlung abgebrochen."
+
+#: ../src/gajim.py:1927 ../src/gajim.py:1971
+msgid "Confirm these session options"
+msgstr "Bestätigen Sie diese Sitzungs-Optionen"
+
+#: ../src/gajim.py:1928
+#, python-format
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t\t%s\n"
+"\n"
+"\t\tAre these options acceptable?"
+msgstr ""
+"Der entfernte Client will eine Sitzung mit diesen Features aushandeln:\n"
+"\n"
+"\t\t%s\n"
+"\n"
+"\t\tSind diese Einstellungen akzeptabel?"
+
+#: ../src/gajim.py:1972
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
+msgstr ""
+"Der entfernte Client hat diese Optionen ausgewählt:\n"
+"\n"
+"%s\n"
+"\n"
+"Mit der Sitzung fortfahren?"
+
+#: ../src/gajim.py:2097
 msgid "Username Conflict"
 msgstr "Benutzernamenkonflikt"
 
-#: ../src/gajim.py:1641
+#: ../src/gajim.py:2098
 msgid "Please type a new username for your local account"
-msgstr "<b>Bitte geben Sie einen neuen Benutzernamen für Ihr lokales Konto ein</b>"
+msgstr "Bitte geben Sie einen neuen Benutzernamen für Ihr lokales Konto ein"
+
+#: ../src/gajim.py:2115
+msgid "Ping?"
+msgstr "Ping?"
+
+#: ../src/gajim.py:2123
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
+
+#: ../src/gajim.py:2129
+msgid "Error."
+msgstr "Fehler:"
+
+#: ../src/gajim.py:2154
+msgid "Resource Conflict"
+msgstr "Resourcenkonflikt"
+
+#: ../src/gajim.py:2155
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+"Sie sind mit diesem Konto bereits mit derselben Ressource verbunden.Bitte "
+"geben Sie eine neue ein"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1987
+#: ../src/gajim.py:2520
 msgid "Could not save your settings and preferences"
 msgstr "Konnte Einstellungen nicht speichern"
 
-#: ../src/gajim.py:2185
+#. sorted alphanum
+#: ../src/gajim.py:2656 ../src/common/config.py:102
+#: ../src/common/config.py:413 ../src/common/optparser.py:206
+#: ../src/common/optparser.py:424 ../src/common/optparser.py:458
+msgid "default"
+msgstr "Standard"
+
+#: ../src/gajim.py:2742
 msgid "Network Manager support not available"
 msgstr "Unterstützung für Network Manager nicht verfügbar"
 
-#: ../src/gajim.py:2264
+#: ../src/gajim.py:2847
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Sitzungsmanagment-Unterstützung nicht verfügbar (Modul gnome.ui fehlt)"
 
-#: ../src/gajim-remote.py:65
+#: ../src/gajim-remote.py:73
 msgid "Shows a help on specific command"
 msgstr "zeige die Hilfe für einen bestimmten Befehl"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:68
+#: ../src/gajim-remote.py:76
 msgid "command"
 msgstr "Befehl"
 
-#: ../src/gajim-remote.py:69
+#: ../src/gajim-remote.py:77
 msgid "show help on command"
 msgstr "zeige Hilfe für Befehl"
 
-#: ../src/gajim-remote.py:73
+#: ../src/gajim-remote.py:81
 msgid "Shows or hides the roster window"
 msgstr "Ein- oder Ausblenden des Hauptfensters"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:85
 msgid "Pops up a window with the next pending event"
 msgstr "Zeige Popup-Fenster mit dem nächsten ungelesenen Ereignis"
 
-#: ../src/gajim-remote.py:81
-msgid "Prints a list of all contacts in the roster. Each contact appears on a separate line"
+#: ../src/gajim-remote.py:89
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appears on a "
+"separate line"
 msgstr "Gibt eine Liste aller Kontakte im Roster aus. Eine Zeile je Kontakt"
 
-#: ../src/gajim-remote.py:84
-#: ../src/gajim-remote.py:99
-#: ../src/gajim-remote.py:109
-#: ../src/gajim-remote.py:122
-#: ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:157
-#: ../src/gajim-remote.py:187
-#: ../src/gajim-remote.py:196
-#: ../src/gajim-remote.py:203
-#: ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:221
-#: ../src/gajim-remote.py:237
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:92 ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:174 ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:213 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:227 ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:254 ../src/gajim-remote.py:263
 msgid "account"
 msgstr "Konto"
 
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:92
 msgid "show only contacts of the given account"
 msgstr "zeige nur Kontakte für das gegebene Konto"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:98
 msgid "Prints a list of registered accounts"
 msgstr "Gibt eine Liste registrierter Konten aus"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:102
 msgid "Changes the status of account or accounts"
 msgstr "Ändere den Status eines oder mehrerer Konten"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:105
 msgid "status"
 msgstr "Status"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:105
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "Eins von: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:98
-#: ../src/gajim-remote.py:119
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:106 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:141 ../src/gajim-remote.py:152
 msgid "message"
 msgstr "Nachricht"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:106
 msgid "status message"
 msgstr "Statusnachricht"
 
-#: ../src/gajim-remote.py:99
-msgid "change status of account \"account\". If not specified, try to change status of all accounts that have \"sync with global status\" option set"
-msgstr "Ändere Status vom Konto \"account\". Falls nicht angegeben, ändere Status aller Konten für die \"Kontostatus mit globalem Status abgleichen\" aktiviert ist"
+#: ../src/gajim-remote.py:107
+msgid ""
+"change status of account \"account\". If not specified, try to change status "
+"of all accounts that have \"sync with global status\" option set"
+msgstr ""
+"Ändere Status vom Konto \"account\". Falls nicht angegeben, ändere Status "
+"aller Konten für die \"Kontostatus mit globalem Status abgleichen\" "
+"aktiviert ist"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:113
 msgid "Shows the chat dialog so that you can send messages to a contact"
-msgstr "Zeige Chatfenster, so dass eine Nachricht an einen Kontakt gesendet werden kann"
+msgstr ""
+"Zeige Chatfenster, so dass eine Nachricht an einen Kontakt gesendet werden "
+"kann"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:115
 msgid "JID of the contact that you want to chat with"
 msgstr "JID des Kontakts mit Sie chatten möchten"
 
-#: ../src/gajim-remote.py:109
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:204
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "falls angegeben, wird der Kontakt von der Liste dieses Kontos gewählt"
 
-#: ../src/gajim-remote.py:114
-msgid "Sends new chat message to a contact in the roster. Both OpenPGP key and account are optional. If you want to set only 'account', without 'OpenPGP key', just set 'OpenPGP key' to ''."
-msgstr "Sende neue Chat-Nachricht zu einem Kontakt im Roster. OpenPGP-Schlüssel und Konto sind optional. Falls nur 'Konto' gesetzt werden soll, ohne OpenGPG-Schlüssel, setzen Sie 'OpenGPG-Schlüssel' einfach auf ''."
+#: ../src/gajim-remote.py:122
+msgid ""
+"Sends new chat message to a contact in the roster. Both OpenPGP key and "
+"account are optional. If you want to set only 'account', without 'OpenPGP "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Sende neue Chat-Nachricht zu einem Kontakt im Roster. OpenPGP-Schlüssel und "
+"Konto sind optional. Falls nur 'Konto' gesetzt werden soll, ohne OpenGPG-"
+"Schlüssel, setzen Sie 'OpenGPG-Schlüssel' einfach auf ''."
 
-#: ../src/gajim-remote.py:118
-#: ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:126 ../src/gajim-remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "JID des Kontakts, der die Nachricht empfängt"
 
-#: ../src/gajim-remote.py:119
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:152
 msgid "message contents"
 msgstr "Nachrichteninhalt"
 
-#: ../src/gajim-remote.py:120
-#: ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:128 ../src/gajim-remote.py:142
 msgid "pgp key"
 msgstr "PGP-Schlüssel"
 
-#: ../src/gajim-remote.py:120
-#: ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:128 ../src/gajim-remote.py:142
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "falls angegeben, wird die Nachricht damit verschlüsselt"
 
-#: ../src/gajim-remote.py:122
-#: ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:130 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:153
 msgid "if specified, the message will be sent using this account"
 msgstr "falls angegeben, wird die Nachricht über dieses Konto gesendet"
 
-#: ../src/gajim-remote.py:127
-msgid "Sends new single message to a contact in the roster. Both OpenPGP key and account are optional. If you want to set only 'account', without 'OpenPGP key', just set 'OpenPGP key' to ''."
-msgstr "Sende neue einzelne Nachricht an einen Kontakt im Roster. OpenPGP-Schlüssel und Konto sind optional. Falls nur 'Konto' gesetzt werden soll, ohne OpenGPG-Schlüssel, lassen Sie 'OpenGPG-Schlüssel' einfach leer."
+#: ../src/gajim-remote.py:135
+msgid ""
+"Sends new single message to a contact in the roster. Both OpenPGP key and "
+"account are optional. If you want to set only 'account', without 'OpenPGP "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Sende neue einzelne Nachricht an einen Kontakt im Roster. OpenPGP-Schlüssel "
+"und Konto sind optional. Falls nur 'Konto' gesetzt werden soll, ohne OpenGPG-"
+"Schlüssel, lassen Sie 'OpenGPG-Schlüssel' einfach leer."
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:140
 msgid "subject"
 msgstr "Betreff"
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:140
 msgid "message subject"
 msgstr "Nachrichten-Betreff"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:149
+msgid "Sends new message to a groupchat you've joined."
+msgstr ""
+"Sendet eine neue Nachricht an einen Gruppenchat, den Sie betreten haben."
+
+#: ../src/gajim-remote.py:151
+msgid "JID of the room that will receive the message"
+msgstr "JID des Raums, der die Nachricht empfängt"
+
+#: ../src/gajim-remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Zeige detaillierte Informationen über Kontakt"
 
-#: ../src/gajim-remote.py:143
-#: ../src/gajim-remote.py:156
-#: ../src/gajim-remote.py:186
-#: ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:173
+#: ../src/gajim-remote.py:203 ../src/gajim-remote.py:212
 msgid "JID of the contact"
 msgstr "JID des Kontakts"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Zeige detaillierte Informationen über ein Konto"
 
-#: ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:166
 msgid "Name of the account"
 msgstr "Name des Kontos"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:170
 msgid "Sends file to a contact"
 msgstr "Sendet dem Kontakt eine Datei"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:172
 msgid "file"
 msgstr "Datei"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:172
 msgid "File path"
 msgstr "Dateipfad"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:174
 msgid "if specified, file will be sent using this account"
 msgstr "Falls angegeben, wird die Nachricht über dieses Konto gesendet"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Zeige alle Einstellung und ihre Werte"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setze Wert von 'Schlüssel' auf 'Wert'."
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:185
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:185
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'key' ist der Name der Option, 'value' ist der der einzustellende Wert"
 
-#: ../src/gajim-remote.py:173
+#: ../src/gajim-remote.py:190
 msgid "Deletes a preference item"
 msgstr "Lösche eine Einstellung"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:192
 msgid "key"
 msgstr "Schlüssel"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "Name der zu löschenden Einstellung"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:196
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Schreibe die aktuellen Gajim-Einstellung in die Konfigurationsdatei"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:201
 msgid "Removes contact from roster"
 msgstr "Entfernt den Kontakt aus dem Roster"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:210
 msgid "Adds contact to roster"
 msgstr "Fügt Kontakt zum Roster hinzu"
 
-#: ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:212
 msgid "jid"
 msgstr "JID"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:213
 msgid "Adds new contact to this account"
 msgstr "Fügt neuen Kontakt zu diesem Konto hinzu"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:218
 msgid "Returns current status (the global one unless account is specified)"
-msgstr "Gibt derzeitigen Status zurück (der globale Status, außer, es wird ein Account spezifiziert)"
+msgstr ""
+"Gibt derzeitigen Status zurück (der globale Status, außer, es wird ein "
+"Account spezifiziert)"
 
-#: ../src/gajim-remote.py:208
-msgid "Returns current status message(the global one unless account is specified)"
-msgstr "Gibt derzeitige Statusnachricht zurück (der globale, außer, es wird ein Account angegeben)"
+#: ../src/gajim-remote.py:225
+msgid ""
+"Returns current status message(the global one unless account is specified)"
+msgstr ""
+"Gibt derzeitige Statusnachricht zurück (der globale, außer, es wird ein "
+"Account angegeben)"
 
-#: ../src/gajim-remote.py:215
+#: ../src/gajim-remote.py:232
 msgid "Returns number of unread messages"
 msgstr "Gibt die Anzahl der ungelesenen Nachrichten zurück"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:236
 msgid "Opens 'Start Chat' dialog"
 msgstr "Öffnet den 'Chat starten' Dialog"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:238
 msgid "Starts chat, using this account"
 msgstr "Starte Chat mit diesem Account"
 
-#: ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:242
 msgid "Sends custom XML"
 msgstr "Benutzerdefinierten XML-Code senden"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:244
 msgid "XML to send"
 msgstr "Zu sendender XML-Code"
 
-#: ../src/gajim-remote.py:228
-msgid "Account in which the xml will be sent; if not specified, xml will be sent to all accounts"
-msgstr "Konto, an welchen XML gesendet wird; wenn nicht spezifiziert, wird XML an alle Konten gesendet"
+#: ../src/gajim-remote.py:245
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Konto, an welchen XML gesendet wird; wenn nicht spezifiziert, wird XML an "
+"alle Konten gesendet"
 
-#: ../src/gajim-remote.py:234
+#: ../src/gajim-remote.py:251
 msgid "Handle a xmpp:/ uri"
 msgstr "Behandle eine xmpp:/ URI"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:253
 msgid "uri"
 msgstr "URI"
 
-#: ../src/gajim-remote.py:241
+#: ../src/gajim-remote.py:258
 msgid "Join a MUC room"
 msgstr "Neuen Raum betreten"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:260
 msgid "room"
 msgstr "Raum"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:261
 msgid "nick"
 msgstr "Spitzname"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:262
 msgid "password"
 msgstr "Passwort"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:285
 msgid "Missing argument \"contact_jid\""
 msgstr "Fehlendes Argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:287
+#: ../src/gajim-remote.py:304
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4282,11 +5127,11 @@ msgstr ""
 "'%s' ist nicht in ihrer Kontaktliste.\n"
 "Bitte geben Sie ein Konto zum Senden der Nachricht an."
 
-#: ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:307
 msgid "You have no active account"
 msgstr "Kein aktives Konto"
 
-#: ../src/gajim-remote.py:354
+#: ../src/gajim-remote.py:371
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -4295,16 +5140,16 @@ msgstr ""
 "Verwendung: %s %s %s \n"
 "\t %s"
 
-#: ../src/gajim-remote.py:357
+#: ../src/gajim-remote.py:374
 msgid "Arguments:"
 msgstr "Parameter:"
 
-#: ../src/gajim-remote.py:361
+#: ../src/gajim-remote.py:378
 #, python-format
 msgid "%s not found"
 msgstr "%s nicht gefunden"
 
-#: ../src/gajim-remote.py:365
+#: ../src/gajim-remote.py:382
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -4313,7 +5158,7 @@ msgstr ""
 "Verwendung: %s Befehl [Argumente]\n"
 "Befehl ist einer von:\n"
 
-#: ../src/gajim-remote.py:438
+#: ../src/gajim-remote.py:455
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4322,7 +5167,7 @@ msgstr ""
 "Zu viele Argumente. \n"
 "Geben Sie \"%s help %s\" ein für weitere Informationen"
 
-#: ../src/gajim-remote.py:442
+#: ../src/gajim-remote.py:459
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -4331,229 +5176,291 @@ msgstr ""
 "Argument \"%s\" wurde nicht angegeben. \n"
 "Geben Sie \"%s help %s\" ein für Hilfe"
 
-#: ../src/gajim-remote.py:460
+#: ../src/gajim-remote.py:477
 msgid "Wrong uri"
 msgstr "Falscher URI"
 
-#: ../src/gajim_themes_window.py:60
+#: ../src/gajim_themes_window.py:67
 msgid "Theme"
 msgstr "Thema"
 
+#: ../src/gajim_themes_window.py:105
+msgid "You cannot make changes to the default theme"
+msgstr "Sie können ihr derzeitiges Theme nicht ändern"
+
+#: ../src/gajim_themes_window.py:106
+msgid "Please create a clean new theme with your desired name."
+msgstr ""
+"Bitte erstellen Sie ein neues leeres Thema mit Ihrem gewünschten Namen."
+
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:155
+#: ../src/gajim_themes_window.py:180
 msgid "theme name"
 msgstr "Name des Themas"
 
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:197
 msgid "You cannot delete your current theme"
 msgstr "Sie können ihr derzeitiges Theme nicht löschen"
 
-#: ../src/gajim_themes_window.py:173
+#: ../src/gajim_themes_window.py:198
 msgid "Please first choose another for your current theme."
 msgstr "Bitte wählen Sie zuerst einen anderen Namen für ihr derzeitiges Theme."
 
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:139
 msgid "Sending private message failed"
 msgstr "Senden privater Nachricht fehlgeschlagen"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:124
+#: ../src/groupchat_control.py:141
 #, python-format
 msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
-msgstr "Sie sind nicht mehr im Gruppenchat \"%s\" oder \"%s\" hat den Gruppenchat verlassen."
+msgstr ""
+"Sie sind nicht mehr im Gruppenchat \"%s\" oder \"%s\" hat den Gruppenchat "
+"verlassen."
 
-#: ../src/groupchat_control.py:322
+#: ../src/groupchat_control.py:350
 msgid "Insert Nickname"
 msgstr "Spitzname einfügen"
 
+#: ../src/groupchat_control.py:878
+msgid "Really send file?"
+msgstr "Datei wirklich senden?"
+
+#: ../src/groupchat_control.py:879
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+"Wenn Sie eine Datei an %s senden wird er/sie Ihre echte Jabber ID kennen."
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:954
+msgid "Room logging is enabled"
+msgstr "Raum-Mitschnitt ist aktiviert"
+
+#: ../src/groupchat_control.py:956
+msgid "A new room has been created"
+msgstr "Ein neuer Raum wurde erstellt"
+
+#: ../src/groupchat_control.py:959
+msgid "The server has assigned or modified your roomnick"
+msgstr "Der Server hat Ihren Raum-Nick zugewiesen oder verändert"
+
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:844
+#: ../src/groupchat_control.py:965
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s wurde rausgeschmissen: %(reason)s"
 
-#: ../src/groupchat_control.py:848
+#: ../src/groupchat_control.py:969
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s wurde von %(who)s rausgeschmissen: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:855
+#: ../src/groupchat_control.py:976
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s wurde gebannt: %(reason)s"
 
-#: ../src/groupchat_control.py:859
+#: ../src/groupchat_control.py:980
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s wurde von %(who)s gebannt: %(reason)s"
 
-#: ../src/groupchat_control.py:867
+#: ../src/groupchat_control.py:989
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sie heißen nun %s"
 
-#: ../src/groupchat_control.py:869
+#: ../src/groupchat_control.py:1025 ../src/groupchat_control.py:1029
+#: ../src/groupchat_control.py:1034
 #, python-format
-msgid "%s is now known as %s"
-msgstr "%s heißt jetzt %s"
+msgid "%(nick)s has been removed from the room (%(reason)s)"
+msgstr "%(nick)s wurde von %(who)s rausgeschmissen: %(reason)s"
 
-#: ../src/groupchat_control.py:955
+#: ../src/groupchat_control.py:1026
+#, fuzzy
+msgid "affiliation changed"
+msgstr "Zugehörigkeit: "
+
+#: ../src/groupchat_control.py:1031
+msgid "room configuration changed to members-only"
+msgstr "Gruppenchatkonfiguration wurde auf ausschließlich Mitgleider geändert"
+
+#: ../src/groupchat_control.py:1036
+msgid "system shutdown"
+msgstr "System wird heruntergefahren"
+
+#: ../src/groupchat_control.py:1135
 #, python-format
 msgid "%s has left"
 msgstr "%s ist gegangen"
 
-#: ../src/groupchat_control.py:960
+#: ../src/groupchat_control.py:1140
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s hat den Gruppenchat betreten"
 
-#: ../src/groupchat_control.py:1082
-#: ../src/groupchat_control.py:1100
-#: ../src/groupchat_control.py:1193
-#: ../src/groupchat_control.py:1210
+#. Invalid Nickname
+#. invalid char
+#: ../src/groupchat_control.py:1253 ../src/groupchat_control.py:1532
+msgid "Invalid nickname"
+msgstr "Ungültiger Benutzername"
+
+#: ../src/groupchat_control.py:1254 ../src/groupchat_control.py:1533
+msgid "The nickname has not allowed characters."
+msgstr "Die Jabber-ID für den Gruppenchat enthält nicht erlaubte Zeichen."
+
+#: ../src/groupchat_control.py:1277 ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1379 ../src/groupchat_control.py:1396
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Spitzname nicht gefunden: %s"
 
-#: ../src/groupchat_control.py:1116
+#: ../src/groupchat_control.py:1311
 msgid "This group chat has no subject"
 msgstr "Dieser Gruppenchat hat kein Thema"
 
-#: ../src/groupchat_control.py:1129
+#: ../src/groupchat_control.py:1322
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s in %(room_jid)s eingeladen"
 
-#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1136
-#: ../src/groupchat_control.py:1164
-#, python-format
-msgid "%s does not appear to be a valid JID"
-msgstr "%s scheint keine gültige JID zu sein"
-
-#: ../src/groupchat_control.py:1247
-#, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr "Kein Kommando: /%s (wenn Sie dies senden wollen, setzen Sie /say voran)"
-
-#: ../src/groupchat_control.py:1270
+#: ../src/groupchat_control.py:1459
 #, python-format
-msgid "Commands: %s"
-msgstr "Kommandos: %s"
-
-#: ../src/groupchat_control.py:1273
-#, python-format
-msgid "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The nickname of an occupant may be substituted, but not if it contains \"@\". If the JID is currently in the group chat, he/she/it will also be kicked. Does NOT support spaces in nickname."
-msgstr "Bedienung: /%s <Spitzname|JID> [Grund], bannt die JID aus dem Gruppenchat. Der Spitzname eines Teilnehmers kann hinzugefügt werden, aber nicht, wenn es ein \"@\" enthält. Wenn die JID derzeit im Gruppenchat ist, wird er/sie/es ebenfalls gebannt. Unterstützt KEINE Leerzeichen im Spitznamen."
-
-#: ../src/groupchat_control.py:1280
-#, python-format
-msgid "Usage: /%s <nickname>, opens a private chat window with the specified occupant."
-msgstr "Verwendung: /%s <Spitzname>, öffnet ein privates Nachrichtenfenster mit dem Inhaber des angegebenen Spitznamens."
-
-#: ../src/groupchat_control.py:1284
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Bedienung: /%s, leert das Textfenster."
-
-#: ../src/groupchat_control.py:1286
-#, python-format
-msgid "Usage: /%s [reason], closes the current window or tab, displaying reason if specified."
-msgstr "Bedienung: /%s [Grund], schließt das aktuelle Fenster oder Tab, mit Anzeige eines Grundes, falls angegeben."
+msgid ""
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
+msgstr ""
+"Bedienung: /%s <Spitzname|JID> [Grund], bannt die JID aus dem Gruppenchat. "
+"Der Spitzname eines Teilnehmers kann hinzugefügt werden, aber nicht, wenn es "
+"ein \"@\" enthält. Wenn die JID derzeit im Gruppenchat ist, wird er/sie/es "
+"ebenfalls gebannt. Unterstützt KEINE Leerzeichen im Spitznamen."
 
-#: ../src/groupchat_control.py:1289
+#: ../src/groupchat_control.py:1466
 #, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Verwendung: /%s, versteckt die Chatbuttons."
+msgid ""
+"Usage: /%s <nickname>, opens a private chat window with the specified "
+"occupant."
+msgstr ""
+"Verwendung: /%s <Spitzname>, öffnet ein privates Nachrichtenfenster mit dem "
+"Inhaber des angegebenen Spitznamens."
 
-#: ../src/groupchat_control.py:1292
+#: ../src/groupchat_control.py:1472
 #, python-format
-msgid "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally providing a reason."
-msgstr "Bedienung: /%s <JID> [Grund], lädt die JID in den aktuellen Gruppenchat ein, optional mit der Angabe eines Grundes."
+msgid ""
+"Usage: /%s [reason], closes the current window or tab, displaying reason if "
+"specified."
+msgstr ""
+"Bedienung: /%s [Grund], schließt das aktuelle Fenster oder Tab, mit Anzeige "
+"eines Grundes, falls angegeben."
 
-#: ../src/groupchat_control.py:1296
+#: ../src/groupchat_control.py:1478
 #, python-format
-msgid "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally using specified nickname."
-msgstr "Bedienung: /%s <Raum>@<Server> [/Spitzname], bietet den Beitritt zu Raum@Server an, optional mit Spitznamen."
+msgid ""
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
+"providing a reason."
+msgstr ""
+"Bedienung: /%s <JID> [Grund], lädt die JID in den aktuellen Gruppenchat ein, "
+"optional mit der Angabe eines Grundes."
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1482
 #, python-format
-msgid "Usage: /%s <nickname> [reason], removes the occupant specified by nickname from the group chat and optionally displays a reason. Does NOT support spaces in nickname."
-msgstr "Bedienung: /%s <Spitzname> [Grund], verweist den Inhaber des Spitznamen des Gruppenchats und zeigt optional einen Grund. Unterstützt KEINE Leerzeichen im Spitznamen."
+msgid ""
+"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
+"using specified nickname."
+msgstr ""
+"Bedienung: /%s <Raum>@<Server> [/Spitzname], bietet den Beitritt zu "
+"Raum@Server an, optional mit Spitznamen."
 
-#: ../src/groupchat_control.py:1305
+#: ../src/groupchat_control.py:1486
 #, python-format
-msgid "Usage: /%s <action>, sends action to the current group chat. Use third person. (e.g. /%s explodes.)"
-msgstr "Bedienung: /%s <Aktion>, sendet die Aktion im aktuellen Gruppenchat. Verwende dritte Person, z.B. /%s explodiert)."
+msgid ""
+"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
+msgstr ""
+"Bedienung: /%s <Spitzname> [Grund], verweist den Inhaber des Spitznamen des "
+"Gruppenchats und zeigt optional einen Grund. Unterstützt KEINE Leerzeichen "
+"im Spitznamen."
 
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1495
 #, python-format
-msgid "Usage: /%s <nickname> [message], opens a private message window and sends message to the occupant specified by nickname."
-msgstr "Verwendung: /%s <Spitzname> [Nachricht], öffnet ein privates Nachrichtenfenster und sendet die Nachricht zum Inhaber des angegebenen Spitznamens."
+msgid ""
+"Usage: /%s <nickname> [message], opens a private message window and sends "
+"message to the occupant specified by nickname."
+msgstr ""
+"Verwendung: /%s <Spitzname> [Nachricht], öffnet ein privates "
+"Nachrichtenfenster und sendet die Nachricht zum Inhaber des angegebenen "
+"Spitznamens."
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1500
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Bedienung: /%s <Spitzname>, ändert den Spitznamen im aktuellen Gruppenchat."
+msgstr ""
+"Bedienung: /%s <Spitzname>, ändert den Spitznamen im aktuellen Gruppenchat."
 
-#: ../src/groupchat_control.py:1318
+#: ../src/groupchat_control.py:1504
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Benutzung: /%s , zeigt die Namen der Gruppenchatbesucher."
 
-#: ../src/groupchat_control.py:1322
+#: ../src/groupchat_control.py:1508
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr "Benutzung: /%s [topic], zeigt oder aktualisiert das derzeitige Gruppenchat-Thema."
-
-#: ../src/groupchat_control.py:1325
-#, python-format
-msgid "Usage: /%s <message>, sends a message without looking for other commands."
-msgstr "Benutzung: /%s <Nachricht>, sendet eine Nachricht ohne andere Befehle zu beachten."
+msgstr ""
+"Benutzung: /%s [topic], zeigt oder aktualisiert das derzeitige Gruppenchat-"
+"Thema."
 
-#: ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1511
 #, python-format
-msgid "No help info for /%s"
-msgstr "Keine Hilfe vorhanden für /%s"
+msgid ""
+"Usage: /%s <message>, sends a message without looking for other commands."
+msgstr ""
+"Benutzung: /%s <Nachricht>, sendet eine Nachricht ohne andere Befehle zu "
+"beachten."
 
-#: ../src/groupchat_control.py:1391
+#: ../src/groupchat_control.py:1606
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Möchten Sie den Gruppenchat \"%s\" wirklich verlassen?"
 
-#: ../src/groupchat_control.py:1393
-msgid "If you close this window, you will be disconnected from this group chat."
-msgstr "Wenn Sie dieses Fenster schließen, wird die Verbindung zu diesem Gruppenchat geschlossen."
+#: ../src/groupchat_control.py:1608
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
+msgstr ""
+"Wenn Sie dieses Fenster schließen, wird die Verbindung zu diesem Gruppenchat "
+"geschlossen."
 
-#: ../src/groupchat_control.py:1397
-#: ../src/roster_window.py:4058
+#: ../src/groupchat_control.py:1612 ../src/roster_window.py:4898
 msgid "Do _not ask me again"
 msgstr "_Nicht noch einmal fragen"
 
-#: ../src/groupchat_control.py:1431
+#: ../src/groupchat_control.py:1644
 msgid "Changing Subject"
 msgstr "Thema ändern"
 
-#: ../src/groupchat_control.py:1432
+#: ../src/groupchat_control.py:1645
 msgid "Please specify the new subject:"
 msgstr "Bitte bestimmen Sie ein neues Thema"
 
-#: ../src/groupchat_control.py:1441
+#: ../src/groupchat_control.py:1654
 msgid "Changing Nickname"
 msgstr "Spitzname ändern"
 
-#: ../src/groupchat_control.py:1442
+#: ../src/groupchat_control.py:1655
 msgid "Please specify the new nickname you want to use:"
 msgstr "Bitte geben Sie an, welchen Spitznamen Sie verwenden möchten:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1457
+#: ../src/groupchat_control.py:1670
 #, python-format
 msgid "Destroying %s"
 msgstr "Zerstöre %s"
 
-#: ../src/groupchat_control.py:1458
+#: ../src/groupchat_control.py:1671
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -4561,715 +5468,876 @@ msgstr ""
 "Sie werden den Raum endgültig zerstören.\n"
 "Sie können hier einen Grund angeben:"
 
-#: ../src/groupchat_control.py:1460
+#: ../src/groupchat_control.py:1673
 msgid "You may also enter an alternate venue:"
 msgstr "Sie können auch einen alternativen Raum eintragen:"
 
-#: ../src/groupchat_control.py:1490
+#: ../src/groupchat_control.py:1705
 msgid "Bookmark already set"
 msgstr "Lesezeichen existiert schon"
 
-#: ../src/groupchat_control.py:1491
+#: ../src/groupchat_control.py:1706
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Der Gruppenchat \"%s\" ist schon in den Lesezeichen."
 
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1715
 msgid "Bookmark has been added successfully"
 msgstr "Lesezeichen wurde erfolgreich hinzugefügt"
 
-#: ../src/groupchat_control.py:1501
+#: ../src/groupchat_control.py:1716
 msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Sie können ihre Lesezeichen über das Aktionen-Menü in der Kontaktliste bearbeiten"
+msgstr ""
+"Sie können ihre Lesezeichen über das Aktionen-Menü in der Kontaktliste "
+"bearbeiten"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1629
+#: ../src/groupchat_control.py:1868
 #, python-format
 msgid "Kicking %s"
 msgstr "%s rausschmeißen"
 
-#: ../src/groupchat_control.py:1630
-#: ../src/groupchat_control.py:1913
+#: ../src/groupchat_control.py:1869 ../src/groupchat_control.py:2169
 msgid "You may specify a reason below:"
 msgstr "Sie können eine Begründung angeben:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1912
+#: ../src/groupchat_control.py:2168
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
 
-#: ../src/gtkexcepthook.py:41
+#: ../src/gtkexcepthook.py:46
 msgid "A programming error has been detected"
 msgstr "Es wurde ein Programmfehler entdeckt"
 
-#: ../src/gtkexcepthook.py:42
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
-msgstr "Es ist vermutlich nicht fatal, aber der Fehler sollte trotzdem den Entwicklern gemeldet werden"
+#: ../src/gtkexcepthook.py:47
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
+msgstr ""
+"Es ist vermutlich nicht fatal, aber der Fehler sollte trotzdem den "
+"Entwicklern gemeldet werden"
 
-#: ../src/gtkexcepthook.py:48
+#: ../src/gtkexcepthook.py:53
 msgid "_Report Bug"
 msgstr "Bug melden"
 
-#: ../src/gtkexcepthook.py:71
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Details"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:156
-#: ../src/gtkgui_helpers.py:171
+#: ../src/gtkgui_helpers.py:162 ../src/gtkgui_helpers.py:177
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fehler: Kann %s kann nicht zum Lesen öffnen"
 
-#: ../src/gtkgui_helpers.py:336
+#: ../src/gtkgui_helpers.py:347
 msgid "Error reading file:"
 msgstr "Fehler beim Lesen der Datei:"
 
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:350
 msgid "Error parsing file:"
 msgstr "Fehler bei der Dateianalyse:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:376
+#: ../src/gtkgui_helpers.py:387
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
-msgstr "Konnte nicht an %s schreiben. Sitzungmanagment-Unterstützung wird nicht funktionieren"
+msgstr ""
+"Konnte nicht an %s schreiben. Sitzungmanagment-Unterstützung wird nicht "
+"funktionieren"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:694
+#: ../src/gtkgui_helpers.py:719
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim ist nicht Ihr Standard-Jabber-Client"
 
-#: ../src/gtkgui_helpers.py:695
+#: ../src/gtkgui_helpers.py:720
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Möchten Sie Gajim zu Ihrem Standard-Jabber-Client machen?"
 
-#: ../src/gtkgui_helpers.py:696
+#: ../src/gtkgui_helpers.py:721
 msgid "Always check to see if Gajim is the default Jabber client on startup"
-msgstr "Immer beim Programmstart prüfen, ob Gajim der Standard-Jabber-Client ist"
+msgstr ""
+"Immer beim Programmstart prüfen, ob Gajim der Standard-Jabber-Client ist"
 
-#: ../src/gtkgui_helpers.py:795
+#: ../src/gtkgui_helpers.py:818
 msgid "Extension not supported"
 msgstr "Erweiterung wird nicht unterstützt."
 
-#: ../src/gtkgui_helpers.py:796
+#: ../src/gtkgui_helpers.py:819
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
-msgstr "Bild kann nicht im %(type)s-Format gespeichert werden. Als %(new_filename)s speichern?"
+msgstr ""
+"Bild kann nicht im %(type)s-Format gespeichert werden. Als %(new_filename)s "
+"speichern?"
 
-#: ../src/gtkgui_helpers.py:805
+#: ../src/gtkgui_helpers.py:828
 msgid "Save Image as..."
 msgstr "Bild speichern unter ..."
 
-#: ../src/history_manager.py:65
+#: ../src/history_manager.py:73
 msgid "Cannot find history logs database"
 msgstr "Kann Verlaufs-Datenkbank nicht finden"
 
 #. holds jid
-#: ../src/history_manager.py:108
+#: ../src/history_manager.py:113
 msgid "Contacts"
 msgstr "Kontakte"
 
 #. holds time
-#: ../src/history_manager.py:121
-#: ../src/history_manager.py:161
-#: ../src/history_window.py:86
+#: ../src/history_manager.py:126 ../src/history_manager.py:166
+#: ../src/history_window.py:121
 msgid "Date"
 msgstr "Datum"
 
 #. holds nickname
-#: ../src/history_manager.py:127
-#: ../src/history_manager.py:179
+#: ../src/history_manager.py:132 ../src/history_manager.py:184
 msgid "Nickname"
 msgstr "Spitzname"
 
 #. holds message
-#: ../src/history_manager.py:135
-#: ../src/history_manager.py:167
-#: ../src/history_window.py:94
+#: ../src/history_manager.py:140 ../src/history_manager.py:172
+#: ../src/history_window.py:129
 msgid "Message"
 msgstr "Nachricht"
 
-#: ../src/history_manager.py:187
-msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
-msgstr "Möchten Sie die Datenbank aufräumen? (NICHT EMPFOHLEN, WENN GAJIM GERADE LÄUFT)"
+#: ../src/history_manager.py:192
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
+msgstr ""
+"Möchten Sie die Datenbank aufräumen? (NICHT EMPFOHLEN, WENN GAJIM GERADE "
+"LÄUFT)"
 
-#: ../src/history_manager.py:189
+#: ../src/history_manager.py:194
 msgid ""
-"Normally allocated database size will not be freed, it will just become reusable. If you really want to reduce database filesize, click YES, else click NO.\n"
+"Normally allocated database size will not be freed, it will just become "
+"reusable. If you really want to reduce database filesize, click YES, else "
+"click NO.\n"
 "\n"
 "In case you click YES, please wait..."
 msgstr ""
-"Der reservierte Datenbankspeicherplatz wird nicht freigegeben, er wird nur wiederverwendbar. Wenn Sie wirklich den Speicherplatz reduzieren möchten, klicken Sie JA, ansonsten NEIN.\n"
+"Der reservierte Datenbankspeicherplatz wird nicht freigegeben, er wird nur "
+"wiederverwendbar. Wenn Sie wirklich den Speicherplatz reduzieren möchten, "
+"klicken Sie JA, ansonsten NEIN.\n"
 "\n"
 "Falls Sie JA klicken, warten Sie bitte einen Augenblick ..."
 
-#: ../src/history_manager.py:401
+#: ../src/history_manager.py:406
 msgid "Exporting History Logs..."
 msgstr "Exportiere Verlauf ..."
 
-#: ../src/history_manager.py:476
+#: ../src/history_manager.py:481
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s sagte um %(time)s: %(message)s\n"
 
-#: ../src/history_manager.py:514
+#: ../src/history_manager.py:518
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] "Möchten Sie wirklich alle Logs des ausgewählten Kontakts löschen?"
-msgstr[1] "Möchten Sie wirklich alle Logs des ausgewählten Kontakte löschen?"
+msgstr[1] "Möchten Sie wirklich alle Logs der ausgewählten Kontakte löschen?"
 
-#: ../src/history_manager.py:518
-#: ../src/history_manager.py:554
+#: ../src/history_manager.py:522 ../src/history_manager.py:557
 msgid "This is an irreversible operation."
 msgstr "Dies ist ein unwiderruflicher Vorgang."
 
-#: ../src/history_manager.py:551
+#: ../src/history_manager.py:554
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Möchten Sie die ausgewählte Nachricht wirklich löschen?"
 msgstr[1] "Möchten Sie die ausgewählten Nachrichten wirklich löschen?"
 
-#: ../src/history_window.py:103
-#: ../src/history_window.py:105
+#: ../src/history_window.py:209 ../src/history_window.py:211
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Unterhaltungs-Verlauf mit %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:342
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s ist jezt %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:262
-#: ../src/notify.py:199
+#: ../src/history_window.py:346 ../src/notify.py:219
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s ist jetzt %(status)s"
 
-#: ../src/history_window.py:268
+#: ../src/history_window.py:352
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status ist jetzt: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:355
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status ist jetzt: %(status)s"
 
-#: ../src/message_window.py:273
+#: ../src/htmltextview.py:586 ../src/htmltextview.py:597
+msgid "Timeout loading image"
+msgstr "Konnte Bild nicht laden"
+
+#: ../src/htmltextview.py:607
+msgid "Image is too big"
+msgstr "Das Bild ist zu groß"
+
+#: ../src/message_window.py:350
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/message_window.py:275
+#: ../src/message_window.py:352
 msgid "Group Chats"
 msgstr "Gruppenchat"
 
-#: ../src/message_window.py:277
+#: ../src/message_window.py:354
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: ../src/message_window.py:279
+#: ../src/message_window.py:356
 msgid "Messages"
 msgstr "Nachrichten"
 
-#: ../src/message_window.py:280
+#: ../src/message_window.py:357
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
 
-#: ../src/notify.py:197
+#: ../src/negotiation.py:13
+msgid "- messages will be logged"
+msgstr "- Nachrichten werden aufgezeichnet"
+
+#: ../src/negotiation.py:15
+msgid "- messages will not be logged"
+msgstr "- Nachrichten werden nicht aufgezeichnet"
+
+#: ../src/negotiation.py:24
+msgid "OK to continue with negotiation?"
+msgstr "In Ordnung mit der Verhandlung fortzufahren?"
+
+#: ../src/negotiation.py:25
+#, python-format
+msgid ""
+"You've begun an encrypted session with %s, but it can't be guaranteed that "
+"you're talking directly to the person you think you are.\n"
+"\n"
+"You should speak with them directly (in person or on the phone) and confirm "
+"that their Short Authentication String is identical to this one: %s\n"
+"\n"
+"Would you like to continue with the encrypted session?"
+msgstr ""
+"Sie haben eine verschlüsselte Sitzung mit %s begonnen, aber es kann nicht "
+"garantiert werden, dass Sie tatsächlich mit der Person sprechen, die sie "
+"vorgibt zu sein.\n"
+"\n"
+"Sie sollten mit der Person direkt (persönlich oder am Telefon) sprechen und "
+"sich vergewissern, dass ihr kurzer Authentifizierungs-String mit diesem "
+"übereinstimmt: %s\n"
+"\n"
+"Möchten Sie mit der verschlüsselten Sitzung fortfahren?"
+
+#: ../src/negotiation.py:31
+msgid "Yes, I verified the Short Authentication String"
+msgstr "Ja, Ich habe den kurzen Authentifizierungs-String überprüft"
+
+#: ../src/notify.py:217
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s änderte Status"
 
-#: ../src/notify.py:207
+#: ../src/notify.py:227
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s angemeldet"
 
-#: ../src/notify.py:215
+#: ../src/notify.py:235
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s abgemeldet"
 
-#: ../src/notify.py:227
+#: ../src/notify.py:247
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Neue einzelne Nachricht von %(nickname)s"
 
-#: ../src/notify.py:235
+#: ../src/notify.py:255
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Neue private Nachricht von Gruppenchat %s"
 
-#: ../src/notify.py:236
+#: ../src/notify.py:257
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:260
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Neue Nachricht von %(nickname)s"
+
+#: ../src/notify.py:266
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Neue Nachricht von %(nickname)s"
 
-#: ../src/profile_window.py:72
+#: ../src/profile_window.py:54
 msgid "Retrieving profile..."
 msgstr "Empfange Profil ..."
 
+#: ../src/profile_window.py:107 ../src/roster_window.py:1914
+msgid "File is empty"
+msgstr "Datei ist leer"
+
+#: ../src/profile_window.py:110 ../src/roster_window.py:1917
+msgid "File does not exist"
+msgstr "Datei existiert nicht"
+
 #. keep identation
-#: ../src/profile_window.py:143
+#. unknown format
+#: ../src/profile_window.py:124 ../src/profile_window.py:140
+#: ../src/roster_window.py:1919 ../src/roster_window.py:1930
 msgid "Could not load image"
 msgstr "Konnte Bild nicht laden"
 
-#: ../src/profile_window.py:255
+#: ../src/profile_window.py:250
 msgid "Information received"
 msgstr "Informationen empfangen"
 
-#: ../src/profile_window.py:324
+#: ../src/profile_window.py:319
 msgid "Without a connection you can not publish your contact information."
-msgstr "Sie müssen angemeldet sein, um Kontakt-Informationen zu veröffentlichen"
+msgstr ""
+"Sie müssen angemeldet sein, um Kontakt-Informationen zu veröffentlichen"
 
-#: ../src/profile_window.py:336
+#: ../src/profile_window.py:331
 msgid "Sending profile..."
 msgstr "Sende Profil ..."
 
-#: ../src/profile_window.py:351
+#: ../src/profile_window.py:346
 msgid "Information NOT published"
 msgstr "Informationen NICHT veröffentlicht"
 
-#: ../src/profile_window.py:358
+#: ../src/profile_window.py:353
 msgid "vCard publication failed"
 msgstr "vCard Veröffentlichung fehlgeschlagen"
 
-#: ../src/profile_window.py:359
-msgid "There was an error while publishing your personal information, try again later."
-msgstr "Bei der Veröffentlichung Ihrer persönlichen Informationen ist ein Fehler aufgetreten, versuchen Sie es später nochmals."
+#: ../src/profile_window.py:354
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Bei der Veröffentlichung Ihrer persönlichen Informationen ist ein Fehler "
+"aufgetreten, versuchen Sie es später nochmals."
 
-#: ../src/roster_window.py:172
-#: ../src/roster_window.py:227
+#: ../src/roster_window.py:194 ../src/roster_window.py:249
 msgid "Merged accounts"
 msgstr "Alle Konten"
 
-#: ../src/roster_window.py:345
-#: ../src/common/helpers.py:43
+#: ../src/roster_window.py:370 ../src/roster_window.py:635
+#: ../src/roster_window.py:2143 ../src/common/contacts.py:312
+#: ../src/common/helpers.py:53
 msgid "Observers"
 msgstr "Beobachter"
 
-#: ../src/roster_window.py:692
-#: ../src/roster_window.py:3215
+#. Make special context menu if group is Groupchats
+#: ../src/roster_window.py:454 ../src/roster_window.py:459
+#: ../src/roster_window.py:1967 ../src/roster_window.py:1970
+#: ../src/roster_window.py:2636 ../src/roster_window.py:2639
+#: ../src/roster_window.py:2664 ../src/roster_window.py:4759
+#: ../src/roster_window.py:4761 ../src/common/commands.py:199
+#: ../src/common/contacts.py:102 ../src/common/helpers.py:53
+msgid "Groupchats"
+msgstr "Gruppenchat"
+
+#: ../src/roster_window.py:784 ../src/roster_window.py:4008
 msgid "You cannot join a group chat while you are invisible"
-msgstr "Sie können einem Gruppenchat nicht beitreten, wenn Sie unsichtbar sind."
+msgstr ""
+"Sie können einem Gruppenchat nicht beitreten, wenn Sie unsichtbar sind."
 
 #. new chat
+#. single message
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:884
-#: ../src/systray.py:206
-#: ../src/systray.py:211
+#. join gc
+#: ../src/roster_window.py:1005 ../src/roster_window.py:1015
+#: ../src/roster_window.py:1024 ../src/systray.py:212 ../src/systray.py:217
+#: ../src/systray.py:223
 #, python-format
 msgid "using account %s"
 msgstr "mit Konto %s"
 
-#. the 'manage gc bookmarks' item is shown
-#. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:909
+#: ../src/roster_window.py:1031
 #, python-format
 msgid "to %s account"
 msgstr "an Konto %s"
 
 #. disco
-#: ../src/roster_window.py:914
+#: ../src/roster_window.py:1036
 #, python-format
 msgid "using %s account"
 msgstr "mit Konto %s"
 
+#: ../src/roster_window.py:1117
+msgid "_Manage Bookmarks..."
+msgstr "_Verwalte Lesezeichen..."
+
 #. profile, avatar
-#: ../src/roster_window.py:989
+#: ../src/roster_window.py:1136
 #, python-format
 msgid "of account %s"
 msgstr "von Konto %s"
 
-#: ../src/roster_window.py:1009
-msgid "_Manage Bookmarks..."
-msgstr "_Verwalte Lesezeichen..."
-
-#: ../src/roster_window.py:1038
+#: ../src/roster_window.py:1176
 #, python-format
 msgid "for account %s"
 msgstr "für Konto %s"
 
 #. History manager
-#: ../src/roster_window.py:1059
+#: ../src/roster_window.py:1200
 msgid "History Manager"
 msgstr "_Verlaufsmanager"
 
-#: ../src/roster_window.py:1068
+#: ../src/roster_window.py:1209
 msgid "_Join New Group Chat"
 msgstr "_Gruppenchat betreten"
 
-#: ../src/roster_window.py:1397
-#: ../src/roster_window.py:3410
-#: ../src/roster_window.py:3417
+#: ../src/roster_window.py:1576 ../src/roster_window.py:4213
+#: ../src/roster_window.py:4220
 msgid "You have unread messages"
 msgstr "Sie haben ungelesene Nachrichten"
 
-#: ../src/roster_window.py:1398
+#: ../src/roster_window.py:1577
 msgid "You must read them before removing this transport."
 msgstr "Sie müssen sie alle lesen, bevor der Account entfernt wird."
 
-#: ../src/roster_window.py:1401
+#: ../src/roster_window.py:1580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" wird entfernt"
 
-#: ../src/roster_window.py:1402
-msgid "You will no longer be able to send and receive messages from contacts using this transport."
-msgstr "Sie können nun keine Nachrichten mehr mit Kontakten von diesem Transport austauschen."
+#: ../src/roster_window.py:1581
+msgid ""
+"You will no longer be able to send and receive messages from contacts using "
+"this transport."
+msgstr ""
+"Sie können nun keine Nachrichten mehr mit Kontakten von diesem Transport "
+"austauschen."
 
-#: ../src/roster_window.py:1405
+#: ../src/roster_window.py:1584
 msgid "Transports will be removed"
 msgstr "Transporte werden entfernt"
 
-#: ../src/roster_window.py:1410
+#: ../src/roster_window.py:1589
 #, python-format
-msgid "You will no longer be able to send and receive messages to contacts from these transports:%s"
-msgstr "Sie können nun keine Nachrichten mehr mit Kontakten von diesen Transporten austauschen:%s"
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr ""
+"Sie können nun keine Nachrichten mehr mit Kontakten von diesen Transporten "
+"austauschen:%s"
 
 #. it's jid
-#: ../src/roster_window.py:1430
+#: ../src/roster_window.py:1755
 msgid "Rename Contact"
 msgstr "Kontakt umbenennen"
 
-#: ../src/roster_window.py:1431
+#: ../src/roster_window.py:1756
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Geben Sie einen Spitznamen für den Kontakt %s ein"
 
-#: ../src/roster_window.py:1438
+#: ../src/roster_window.py:1763
 msgid "Rename Group"
 msgstr "Gruppe umbenennen"
 
-#: ../src/roster_window.py:1439
+#: ../src/roster_window.py:1764
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Geben Sie einen neuen Namen für die Gruppe %s ein"
 
-#: ../src/roster_window.py:1514
+#: ../src/roster_window.py:1839
 msgid "Remove Group"
 msgstr "Gruppe entfernen"
 
-#: ../src/roster_window.py:1515
+#: ../src/roster_window.py:1840
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Möchten Sie wirklich die Gruppe %s von Ihrer Kontaktliste entfernen?"
 
-#: ../src/roster_window.py:1516
+#: ../src/roster_window.py:1841
 msgid "Remove also all contacts in this group from your roster"
 msgstr "Auch alle Kontakte dieser Gruppe von Ihrer Kontaktliste entfernen"
 
-#: ../src/roster_window.py:1547
+#: ../src/roster_window.py:1872
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP-Schlüssel Zuweisen"
 
-#: ../src/roster_window.py:1548
+#: ../src/roster_window.py:1873
 msgid "Select a key to apply to the contact"
 msgstr "Weisen Sie dem Kontakt einen Schüssel zu"
 
-#: ../src/roster_window.py:1784
-#: ../src/roster_window.py:2045
-msgid "_New group chat"
-msgstr "_Neuer Gruppenchat"
+#: ../src/roster_window.py:2189
+msgid "_New Group Chat"
+msgstr "Neuer Gruppenchat"
 
-#: ../src/roster_window.py:1915
+#: ../src/roster_window.py:2327
 msgid "I would like to add you to my roster"
 msgstr "Ich würde dich gerne in meine Liste aufnehmen"
 
-#: ../src/roster_window.py:2090
-#: ../src/roster_window.py:2137
+#. Send Group Message
+#: ../src/roster_window.py:2461 ../src/roster_window.py:2673
 msgid "Send Group M_essage"
 msgstr "_Sende Nachricht an Gruppe"
 
-#: ../src/roster_window.py:2116
-msgid "Re_name"
-msgstr "_Umbenennen"
+#: ../src/roster_window.py:2480
+msgid "_New group chat"
+msgstr "_Neuer Gruppenchat"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:2518
+msgid "_Manage Contacts"
+msgstr "Kontakte verwalten"
+
+#: ../src/roster_window.py:2579
+msgid "_Maximize"
+msgstr "_Maximieren"
 
-#: ../src/roster_window.py:2143
+#: ../src/roster_window.py:2586
+msgid "_Disconnect"
+msgstr "_Verbindung trennen"
+
+#: ../src/roster_window.py:2665
+msgid "_Maximize All"
+msgstr "Alle _maximieren"
+
+#: ../src/roster_window.py:2681
 msgid "To all users"
 msgstr "An alle Benutzern"
 
-#: ../src/roster_window.py:2146
+#: ../src/roster_window.py:2684
 msgid "To all online users"
 msgstr "An alle angemeldeten Benutzer"
 
-#: ../src/roster_window.py:2182
+#. Log Off
+#: ../src/roster_window.py:2801
+msgid "_Log off"
+msgstr "_Abmelden"
+
+#. Log on
+#: ../src/roster_window.py:2807
 msgid "_Log on"
 msgstr "_Anmelden"
 
-#: ../src/roster_window.py:2192
-msgid "Log _off"
-msgstr "_Abmelden"
+#. Send single message
+#: ../src/roster_window.py:2819
+msgid "Send Single Message"
+msgstr "Sende _einzelne Nachricht"
 
-#: ../src/roster_window.py:2314
-#: ../src/roster_window.py:2385
+#. Manage Transport submenu
+#: ../src/roster_window.py:2866
+msgid "_Manage Transport"
+msgstr "Transports"
+
+#. Modify Transport
+#: ../src/roster_window.py:2874
+msgid "_Modify Transport"
+msgstr "Trans_port ändern"
+
+#: ../src/roster_window.py:2988 ../src/roster_window.py:3062
 msgid "_Change Status Message"
 msgstr "Ändere _Statusnachricht"
 
-#: ../src/roster_window.py:2457
+#: ../src/roster_window.py:3134
 msgid "Authorization has been sent"
 msgstr "Autorisierung wurde erneut gesendet"
 
-#: ../src/roster_window.py:2458
+#: ../src/roster_window.py:3135
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" kennt jetzt ihren Status."
 
-#: ../src/roster_window.py:2478
+#: ../src/roster_window.py:3155
 msgid "Subscription request has been sent"
 msgstr "Abonnement-Anforderung wurde gesendet"
 
-#: ../src/roster_window.py:2479
+#: ../src/roster_window.py:3156
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Wenn \"%s\" diese Anfrage akzeptiert, erfahren Sie dessen Status."
 
-#: ../src/roster_window.py:2491
+#: ../src/roster_window.py:3168
 msgid "Authorization has been removed"
 msgstr "Autorisierung wurde entfernt"
 
-#: ../src/roster_window.py:2492
+#: ../src/roster_window.py:3169
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" wird Sie nun immer als offline sehen."
 
-#: ../src/roster_window.py:2684
+#: ../src/roster_window.py:3403
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" wird von ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:2688
-msgid "By removing this contact you also remove authorization resulting in him or her always seeing you as offline."
-msgstr "Durch das Entfernen dieses Kontaktes entziehen Sie ihm auch die Berechtigung Ihren Status zu sehen, wodurch der Kontakt Sie nur noch als offline sehen wird."
+#: ../src/roster_window.py:3407
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Durch das Entfernen dieses Kontaktes entziehen Sie ihm auch die Berechtigung "
+"Ihren Status zu sehen, wodurch der Kontakt Sie nur noch als offline sehen "
+"wird."
 
-#: ../src/roster_window.py:2693
-msgid "By removing this contact you also by default remove authorization resulting in him or her always seeing you as offline."
-msgstr "Durch das Entfernen dieses Kontaktes entziehen Sie ihm auch standardmäßig die Berechtigung Ihren Status zu sehen, wodurch der Kontakt Sie nur noch als offline sehen wird."
+#: ../src/roster_window.py:3412
+msgid ""
+"By removing this contact you also by default remove authorization resulting "
+"in him or her always seeing you as offline."
+msgstr ""
+"Durch das Entfernen dieses Kontaktes entziehen Sie ihm auch standardmäßig "
+"die Berechtigung Ihren Status zu sehen, wodurch der Kontakt Sie nur noch als "
+"offline sehen wird."
 
-#: ../src/roster_window.py:2696
+#: ../src/roster_window.py:3415
 msgid "I want this contact to know my status after removal"
-msgstr "Ich möchte, dass dieser Kontakt meinen Status auch nach dem Entfernen sieht"
+msgstr ""
+"Ich möchte, dass dieser Kontakt meinen Status auch nach dem Entfernen sieht"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2700
+#: ../src/roster_window.py:3419
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakte werden von Ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:2704
+#: ../src/roster_window.py:3423
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
 "you also remove authorization resulting in them always seeing you as offline."
 msgstr ""
 "Durch das Entfernen dieser Kontakte:%s\n"
-"entziehen Sie ihnen auch die Berechtigung Ihren Status zu sehen, wodurch die Kontakte Sie nur noch als offline sehen werden."
+"entziehen Sie ihnen auch die Berechtigung Ihren Status zu sehen, wodurch die "
+"Kontakte Sie nur noch als offline sehen werden."
+
+#: ../src/roster_window.py:3450
+msgid ""
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
+msgstr ""
+"Gnome Keyring ist installiert, aber nicht korrekt gestartet "
+"(Umgebungsvariablen wahrscheinlich falsch gesetzt)"
 
-#: ../src/roster_window.py:2736
-msgid "Gnome Keyring is installed but not correctly started (environment variable probably not correctly set)"
-msgstr "Gnome Keyring ist installiert, aber nicht korrekt gestartet (Umgebungsvariablen wahrscheinlich falsch gesetzt)"
+#: ../src/roster_window.py:3469
+msgid "GPG is not usable"
+msgstr "GPG ist nicht benutzbar"
 
-#. TODO: make this string translatable
 #. %s is the account name here
-#: ../src/roster_window.py:2764
-#: ../src/common/connection.py:687
-#: ../src/common/zeroconf/connection_zeroconf.py:158
+#: ../src/roster_window.py:3470 ../src/common/connection_handlers.py:2153
+#: ../src/common/zeroconf/connection_zeroconf.py:171
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Sie werden ohne OpenPGP mit %s verbunden."
 
-#: ../src/roster_window.py:2781
-msgid "Passphrase Required"
-msgstr "Passphrase benötigt"
-
-#: ../src/roster_window.py:2782
-#, python-format
-msgid "Enter GPG key passphrase for account %s."
-msgstr "Geben Sie die GPG-Passphrase für das Konto %s ein."
-
-#: ../src/roster_window.py:2787
-msgid "Save passphrase"
-msgstr "Passphrase speichern"
-
-#: ../src/roster_window.py:2795
-msgid "Wrong Passphrase"
-msgstr "Falsche Passphrase"
-
-#: ../src/roster_window.py:2796
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Bitte geben Sie Ihre GPG-Passphrase erneut ein oder klicken Sie auf Abbrechen."
-
-#: ../src/roster_window.py:2853
-#: ../src/roster_window.py:2913
+#: ../src/roster_window.py:3541 ../src/roster_window.py:3619
 msgid "You are participating in one or more group chats"
 msgstr "Sie nehmen an einem oder mehreren Gruppenchats teil"
 
-#: ../src/roster_window.py:2854
-#: ../src/roster_window.py:2914
-msgid "Changing your status to invisible will result in disconnection from those group chats. Are you sure you want to go invisible?"
-msgstr "Wenn Sie Ihren Status auf unsichtbar setzen, werden sie von diesen Gruppenchats getrennt. Sind Sie sicher, dass sie unsichtbar werden möchten?"
+#: ../src/roster_window.py:3542 ../src/roster_window.py:3620
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+msgstr ""
+"Wenn Sie Ihren Status auf unsichtbar setzen, werden sie von diesen "
+"Gruppenchats getrennt. Sind Sie sicher, dass sie unsichtbar werden möchten?"
 
-#: ../src/roster_window.py:2871
+#: ../src/roster_window.py:3576
 msgid "No account available"
 msgstr "Kein Konto vorhanden"
 
-#: ../src/roster_window.py:2872
+#: ../src/roster_window.py:3577
 msgid "You must create an account before you can chat with other contacts."
-msgstr "Sie müssen ein Konto erstellen, bevor Sie sich zum Jabber-Netzwerk verbinden können."
+msgstr ""
+"Sie müssen ein Konto erstellen, bevor Sie sich zum Jabber-Netzwerk verbinden "
+"können."
 
-#: ../src/roster_window.py:2974
+#: ../src/roster_window.py:3726
 #, python-format
 msgid "\"%(title)s\" by %(artist)s"
 msgstr "\"%(title)s\" von %(artist)s"
 
-#: ../src/roster_window.py:3411
-#: ../src/roster_window.py:3418
-msgid "Messages will only be available for reading them later if you have history enabled."
+#: ../src/roster_window.py:4214 ../src/roster_window.py:4221
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled."
 msgstr "Um Nachrichten später lesen zu können, muss der Verlauf aktiv sein."
 
-#: ../src/roster_window.py:4008
+#: ../src/roster_window.py:4845
 msgid "Metacontacts storage not supported by your server"
-msgstr "Das Speichern von Metakontakten wird von Ihrem Server nicht unterstützt"
+msgstr ""
+"Das Speichern von Metakontakten wird von Ihrem Server nicht unterstützt"
 
-#: ../src/roster_window.py:4010
-msgid "Your server does not support storing metacontacts information. So those information will not be save on next reconnection."
-msgstr "Ihr Server unterstützt leider nicht das Speichern von Metakontakt-Informationen. Aus diesem Grund werden diese Informationen bei der nächsten Neuverbindung nicht gespeichert werden."
+#: ../src/roster_window.py:4847
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be saved on next reconnection."
+msgstr ""
+"Ihr Server unterstützt leider nicht das Speichern von Metakontakt-"
+"Informationen. Aus diesem Grund werden diese Informationen bei der nächsten "
+"Neuverbindung nicht gespeichert werden."
 
-#: ../src/roster_window.py:4052
-msgid "You are about to create a metacontact. Are you sure you want to continue?"
-msgstr "Sie sind dabei einen Metakontakt zu erstellen. Wollen Sie wirklich fortfahren?"
+#: ../src/roster_window.py:4892
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr ""
+"Sie sind dabei einen Metakontakt zu erstellen. Wollen Sie wirklich "
+"fortfahren?"
 
-#: ../src/roster_window.py:4054
-msgid "Metacontacts are a way to regroup several contacts in one line. Generally it is used when the same person has several Jabber accounts or transport accounts."
-msgstr "Metakontakte sind eine Möglichkeit, mehrere Kontakte in einer Zeile zu gruppieren. Normalerweise benutzt man Sie, wenn eine Person mehrere Jabber- oder Transport-Konten hat."
+#: ../src/roster_window.py:4894
+msgid ""
+"Metacontacts are a way to regroup several contacts in one line. Generally it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+msgstr ""
+"Metakontakte sind eine Möglichkeit, mehrere Kontakte in einer Zeile zu "
+"gruppieren. Normalerweise benutzt man Sie, wenn eine Person mehrere Jabber- "
+"oder Transport-Konten hat."
 
-#: ../src/roster_window.py:4132
-#, python-format
-msgid "Do you want to send that file to %s:"
+#: ../src/roster_window.py:4989
+#, fuzzy
+msgid "Invalid file URI:"
+msgstr "Ungültige Datei"
+
+#: ../src/roster_window.py:5000
+#, fuzzy, python-format
+msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send those files to %s:"
 msgstr[0] "%s möchte ihnen eine Datei senden:"
-msgstr[1] "%s möchte ihnen diese Datei senden:"
-
-#: ../src/roster_window.py:4237
-#, python-format
-msgid "Drop %s in group %s"
-msgstr "Setze %s in Gruppe %s"
+msgstr[1] "%s möchte ihnen diese Dateien senden:"
 
-#: ../src/roster_window.py:4244
-#, python-format
-msgid "Make %s and %s metacontacts"
-msgstr "Mache %s und %s Metakontakte"
-
-#: ../src/roster_window.py:4431
+#: ../src/roster_window.py:5328
 msgid "Change Status Message..."
 msgstr "Ändere Statusnachricht ..."
 
-#: ../src/systray.py:163
+#: ../src/search_window.py:91
+msgid "Waiting for results"
+msgstr "Warte auf Ergebnisse"
+
+#: ../src/search_window.py:131 ../src/search_window.py:209
+msgid "Error in received dataform"
+msgstr "Fehler den empfangenen Daten"
+
+#. No result
+#: ../src/search_window.py:165 ../src/search_window.py:201
+msgid "No result"
+msgstr "Kein Ergebnis"
+
+#: ../src/systray.py:169
 msgid "_Change Status Message..."
 msgstr "Ändere _Statusnachricht..."
 
-#: ../src/systray.py:251
+#: ../src/systray.py:254
 msgid "Hide this menu"
 msgstr "Versteckt dieses Menü"
 
-#: ../src/tooltips.py:309
-#: ../src/tooltips.py:492
+#: ../src/tooltips.py:317 ../src/tooltips.py:510
 msgid "Jabber ID: "
 msgstr "Jabber-ID:"
 
-#: ../src/tooltips.py:312
-#: ../src/tooltips.py:496
+#: ../src/tooltips.py:320 ../src/tooltips.py:514
 msgid "Resource: "
 msgstr "Ressource: "
 
-#: ../src/tooltips.py:317
+#: ../src/tooltips.py:325
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s dieses Gruppenchats"
 
-#: ../src/tooltips.py:430
-#: ../src/tooltips.py:610
+#: ../src/tooltips.py:423
+msgid " [blocked]"
+msgstr " [blockiert]"
+
+#: ../src/tooltips.py:427
+msgid " [minimized]"
+msgstr " [minimiert]"
+
+#: ../src/tooltips.py:442 ../src/tooltips.py:630
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:461
+#: ../src/tooltips.py:472
 #, python-format
 msgid "Last status: %s"
 msgstr "Letzter Status: %s"
 
-#: ../src/tooltips.py:463
+#: ../src/tooltips.py:474
 #, python-format
 msgid " since %s"
 msgstr " seit %s"
 
+#: ../src/tooltips.py:492
+msgid "Connected"
+msgstr "Verbunden"
+
+#: ../src/tooltips.py:494
+msgid "Disconnected"
+msgstr "Nicht verbunden"
+
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:521
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:512
+#: ../src/tooltips.py:531
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:566
+#: ../src/tooltips.py:586
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:572
+#: ../src/tooltips.py:592
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:599
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:605
 msgid "Transferred: "
 msgstr "Übertragen: "
 
-#: ../src/tooltips.py:588
-#: ../src/tooltips.py:609
+#: ../src/tooltips.py:608 ../src/tooltips.py:629
 msgid "Not started"
 msgstr "Nicht gestartet"
 
-#: ../src/tooltips.py:592
+#: ../src/tooltips.py:612
 msgid "Stopped"
 msgstr "Angehalten"
 
-#: ../src/tooltips.py:594
-#: ../src/tooltips.py:597
+#: ../src/tooltips.py:614 ../src/tooltips.py:617
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: ../src/tooltips.py:601
+#: ../src/tooltips.py:621
 msgid "?transfer status:Paused"
 msgstr "?Transferstatus:Pausiert"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:605
+#: ../src/tooltips.py:625
 msgid "Stalled"
 msgstr "Steht still"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:627
 msgid "Transferring"
 msgstr "Übertrage"
 
-#: ../src/tooltips.py:639
+#: ../src/tooltips.py:661
 msgid "This service has not yet responded with detailed information"
 msgstr "Dieser Dienst hat nicht mit detaillierten Informationen geantwortet"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:664
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5277,177 +6345,193 @@ msgstr ""
 "Dieser Dienst konnte nicht mit detaillierten Informationen antworten\n"
 "Er ist wahrscheinlich verwaltet oder defekt"
 
-#: ../src/vcard.py:217
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "Unbekannt"
 
-#: ../src/vcard.py:219
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "Unbekannt"
 
-#: ../src/vcard.py:247
-#: ../src/vcard.py:449
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:472
 #, python-format
 msgid "since %s"
 msgstr "seit %s"
 
-#: ../src/vcard.py:277
+#: ../src/vcard.py:311
 msgid "Affiliation:"
 msgstr "Zugehörigkeit: "
 
-#: ../src/vcard.py:285
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
-msgstr "Dieser Kontakt ist an Ihren Anwesenheitsinformationen interessiert, aber Sie sind nicht an seiner/ihrer Anwesenheit interessiert"
+#: ../src/vcard.py:319
+msgid ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
+msgstr ""
+"Dieser Kontakt ist an Ihren Anwesenheitsinformationen interessiert, aber Sie "
+"sind nicht an seiner/ihrer Anwesenheit interessiert"
 
-#: ../src/vcard.py:287
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
-msgstr "Sie sind an den Anwesenheitsinformationen des Kontakts interessiert, aber er/sie ist nicht an ihren interessiert"
+#: ../src/vcard.py:321
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
+msgstr ""
+"Sie sind an den Anwesenheitsinformationen des Kontakts interessiert, aber er/"
+"sie ist nicht an ihren interessiert"
 
-#: ../src/vcard.py:289
+#: ../src/vcard.py:323
 msgid "You and the contact are interested in each other's presence information"
-msgstr "Sie und der Kontakt sind an den Anwesenheitsinformationen des Anderen interessiert"
+msgstr ""
+"Sie und der Kontakt sind an den Anwesenheitsinformationen des Anderen "
+"interessiert"
 
 #. None
-#: ../src/vcard.py:291
-msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
-msgstr "Sie sind nicht an der Anwesenheit des Kontakts interessiert, und er/sie ist nicht interessiert an ihrer"
+#: ../src/vcard.py:325
+msgid ""
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
+msgstr ""
+"Sie sind nicht an der Anwesenheit des Kontakts interessiert, und er/sie ist "
+"nicht interessiert an ihrer"
 
-#: ../src/vcard.py:299
+#: ../src/vcard.py:333
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Sie warten auf die Antwort des Kontaktes auf ihre Abonnement-Anfrage"
 
-#: ../src/vcard.py:311
-#: ../src/vcard.py:338
-#: ../src/vcard.py:482
+#: ../src/vcard.py:337 ../src/vcard.py:374 ../src/vcard.py:497
 msgid " resource with priority "
 msgstr " resource mit Priorität "
 
-#: ../src/common/check_paths.py:33
+#: ../src/common/check_paths.py:38
 msgid "creating logs database"
 msgstr "Erstelle Log-Datenbank"
 
-#: ../src/common/check_paths.py:89
-#: ../src/common/check_paths.py:100
-#: ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:112
+#: ../src/common/check_paths.py:119
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s ist eine Datei, aber es sollte ein Verzeichnis sein"
 
-#: ../src/common/check_paths.py:90
-#: ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:108
-#: ../src/common/check_paths.py:116
+#: ../src/common/check_paths.py:102 ../src/common/check_paths.py:113
+#: ../src/common/check_paths.py:120 ../src/common/check_paths.py:128
 msgid "Gajim will now exit"
 msgstr "Gajim wird nun beendet"
 
-#: ../src/common/check_paths.py:115
+#: ../src/common/check_paths.py:127
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s ist ein Verzeichnis, sollte aber eine Datei sein"
 
-#: ../src/common/check_paths.py:131
+#: ../src/common/check_paths.py:143
 #, python-format
 msgid "creating %s directory"
 msgstr "Erstelle Verzeichnis %s"
 
-#: ../src/common/commands.py:69
+#: ../src/common/commands.py:74
 msgid "Change status information"
 msgstr "Ändere Statusinformation"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:87
 msgid "Change status"
 msgstr "Kontakt hat Status verändert"
 
-#: ../src/common/commands.py:83
+#: ../src/common/commands.py:88
 msgid "Set the presence type and description"
 msgstr "Lege den Anwesenheitstyp und die Beschreibung fest"
 
-#: ../src/common/commands.py:89
+#: ../src/common/commands.py:94
 msgid "Free for chat"
 msgstr "Frei zum Chatten"
 
-#: ../src/common/commands.py:90
+#: ../src/common/commands.py:95
 msgid "Online"
 msgstr "Online"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 msgid "Extended away"
 msgstr "Längere Zeit abwesend"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Do not disturb"
 msgstr "Bitte nicht stören"
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:99
 msgid "Offline - disconnect"
 msgstr "Offline - Abgemeldet"
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 msgid "Presence description:"
 msgstr "Anwesenheitsbeschreibung:"
 
-#: ../src/common/commands.py:134
+#: ../src/common/commands.py:139
 msgid "The status has been changed."
 msgstr "Der Status hat sich verändert."
 
-#: ../src/common/commands.py:179
+#: ../src/common/commands.py:184
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s aus Gruppenchat %(room_jid)s"
 
-#: ../src/common/commands.py:183
+#: ../src/common/commands.py:188
 msgid "You have not joined a groupchat."
 msgstr "Sie haben keinen Gruppenchat betreten."
 
-#: ../src/common/commands.py:189
+#: ../src/common/commands.py:194
 msgid "Leave Groupchats"
 msgstr "Verlasse Gruppenchat"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:195
 msgid "Choose the groupchats you want to leave"
 msgstr "Wählen Sie den Gruppenchat, den Sie verlassen möchten"
 
-#: ../src/common/commands.py:194
-msgid "Groupchats"
-msgstr "Gruppenchat"
-
-#: ../src/common/commands.py:230
+#: ../src/common/commands.py:235
 msgid "You left the following groupchats:"
 msgstr "Sie haben folgende Gruppenchats verlassen:"
 
-#: ../src/common/config.py:56
+#: ../src/common/commands.py:247
+msgid "Forward unread messages"
+msgstr "Ungelesene Nachrichten weiterleiten"
+
+#: ../src/common/commands.py:267
+msgid "All unread messages have been forwarded."
+msgstr "Alle ungelesenen Nachrichten wurden weitergeleitet."
+
+#: ../src/common/config.py:74
 msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr "Verwende D-Bus und Notification-Daemon, um Benachrichtigungen zu zeigen"
+msgstr ""
+"Verwende D-Bus und Notification-Daemon, um Benachrichtigungen zu zeigen"
 
-#: ../src/common/config.py:61
+#: ../src/common/config.py:79
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Zeit in Minuten, nach der Ihr Status auf abwesend gesetzt wird"
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:80
 msgid "Away as a result of being idle"
 msgstr "Abwesend, da untätig"
 
-#: ../src/common/config.py:64
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Zeit in Minuten, nach der Ihr Status auf nicht verfügbar gesetzt wird."
 
-#: ../src/common/config.py:65
+#: ../src/common/config.py:83
 msgid "Not available as a result of being idle"
 msgstr "Nicht verfügbar, da untätig"
 
-#: ../src/common/config.py:83
-msgid "List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr "Liste (leerzeichengeteilt) von Reihen (Kontos und Gruppen), die eingeklappt sind."
+#: ../src/common/config.py:101
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"Liste (leerzeichengeteilt) von Reihen (Kontos und Gruppen), die eingeklappt "
+"sind."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:106
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Aktiviere Anzeige von Kontakten im LAN über Zeroconf."
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:109
 msgid "Language used by speller"
 msgstr "Sprache der Rechtschreibprüfung"
 
-#: ../src/common/config.py:92
+#: ../src/common/config.py:110
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -5457,614 +6541,841 @@ msgstr ""
 "'sometimes' - Zeige Zeit alle print_ichat_every_foo_minutes Minuten.\n"
 "'never' - Zeige nie die Zeit."
 
-#: ../src/common/config.py:93
-msgid "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. This is used only if print_time is 'sometimes'."
-msgstr "Zeige die Zeit in Chats mittels ungenauer Uhr an. Werte für die Ungenauigkeit sind 1 bis 4 oder 0, um die ungenaue Uhr zu deaktivieren. 1 ist am Genauesten, 4 ist am Ungenaueste. Dies wird nur verwendet, wenn print_time auf 'sometimes' gesetzt ist."
+#: ../src/common/config.py:111
+msgid ""
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
+"This is used only if print_time is 'sometimes'."
+msgstr ""
+"Zeige die Zeit in Chats mittels ungenauer Uhr an. Werte für die "
+"Ungenauigkeit sind 1 bis 4 oder 0, um die ungenaue Uhr zu deaktivieren. 1 "
+"ist am Genauesten, 4 ist am Ungenaueste. Dies wird nur verwendet, wenn "
+"print_time auf 'sometimes' gesetzt ist."
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:114
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _ Paare als mögliche Formatierungszeichen."
 
-#: ../src/common/config.py:97
-msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-msgstr "Wenn aktiviert, wird */_ nicht entfernt. So wird *abc* fett gedruckt, aber * * wird nicht entfernt."
+#: ../src/common/config.py:115
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Wenn aktiviert, wird */_ nicht entfernt. So wird *abc* fett gedruckt, aber * "
+"* wird nicht entfernt."
 
-#: ../src/common/config.py:100
-msgid "Uses ReStructured text markup to send HTML, plus ascii formatting if selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (If you want to use this, install docutils)"
-msgstr "Wenn aktiviert, wird reStructuredText für die HTML und ASCII-Formatierung verwendet (falls dies erwünscht ist, installieren Sie docutils). Informationen zur Syntax finden Sie unter http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (Englisch)"
+#: ../src/common/config.py:118
+msgid ""
+"Uses ReStructured text markup to send HTML, plus ascii formatting if "
+"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html (If you want to use this, install docutils)"
+msgstr ""
+"Wenn aktiviert, wird reStructuredText für die HTML und ASCII-Formatierung "
+"verwendet (falls dies erwünscht ist, installieren Sie docutils). "
+"Informationen zur Syntax finden Sie unter http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html (Englisch)"
 
-#: ../src/common/config.py:109
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Zeichen, das hinter Spitznamen angezeigt wird, wenn Spitznamenvervollständigung (Tab) im Gruppenchat verwendet wird."
+#: ../src/common/config.py:127
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Zeichen, das hinter Spitznamen angezeigt wird, wenn "
+"Spitznamenvervollständigung (Tab) im Gruppenchat verwendet wird."
 
-#: ../src/common/config.py:110
-msgid "Character to propose to add after desired nickname when desired nickname is used by someone else in group chat."
-msgstr "Zeichen, das hinter den gewünschten Spitznamen gehängt wird, falls der gewünschteName im Gruppenchat bereits vergeben ist."
+#: ../src/common/config.py:128
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Zeichen, das hinter den gewünschten Spitznamen gehängt wird, falls der "
+"gewünschteName im Gruppenchat bereits vergeben ist."
 
-#: ../src/common/config.py:133
-msgid "This option let you customize timestamp that is printed in conversation. For exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on strftime for full documentation: http://docs.python.org/lib/module-time.html"
-msgstr "Hiermit lässt sich der Zeitstempel anpassen, der in den Unterhaltungen verwendet wird. Zum Beispiel wird \"[%H:%M] \" zu \"[Stunde:Minute] \". Weitere Informationen finden Sie in der Python-Dokumentation zu 'strftime' unter http://docs.python.org/lib/module-time.html (Englisch)."
+#: ../src/common/config.py:151
+msgid ""
+"This option let you customize timestamp that is printed in conversation. For "
+"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
+"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+msgstr ""
+"Hiermit lässt sich der Zeitstempel anpassen, der in den Unterhaltungen "
+"verwendet wird. Zum Beispiel wird \"[%H:%M] \" zu \"[Stunde:Minute] \". "
+"Weitere Informationen finden Sie in der Python-Dokumentation zu 'strftime' "
+"unter http://docs.python.org/lib/module-time.html (Englisch)."
 
-#: ../src/common/config.py:134
+#: ../src/common/config.py:152
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Zeichen, die vor dem Spitzname gedruckt werden"
 
-#: ../src/common/config.py:135
+#: ../src/common/config.py:153
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Zeichen, die nach dem Spitznamen gedruckt werden"
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:156
+msgid ""
+"If checked, Gajim can regularly poll a Last.fm account and adjust the status "
+"message to reflect recently played songs. "
+"set_status_msg_from_current_music_track option must be False."
+msgstr ""
+
+#: ../src/common/config.py:157
+msgid "The username used to identify the Last.fm account."
+msgstr ""
+
+#: ../src/common/config.py:162
 msgid "Add * and [n] in roster title?"
 msgstr "Füge * und [n] in die Kontaktleiste?"
 
-#: ../src/common/config.py:143
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
-msgstr "Wie viele Zeilen von der vorherigen Unterhaltung gespeichert werden, wenn ein Chat Tab/Fenster wieder geöffnet wird."
+#: ../src/common/config.py:163
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Wie viele Zeilen von der vorherigen Unterhaltung gespeichert werden, wenn "
+"ein Chat Tab/Fenster wieder geöffnet wird."
 
-#: ../src/common/config.py:144
+#: ../src/common/config.py:164
 msgid "How many minutes should last lines from previous conversation last."
-msgstr "Wie viele Minuten die Zeilen vom vorherigen Chat angezeigt werden sollen."
+msgstr ""
+"Wie viele Minuten die Zeilen vom vorherigen Chat angezeigt werden sollen."
 
-#: ../src/common/config.py:145
-msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
-msgstr "Sende Nachricht mit Strg+Enter und mache bei Enter einen Zeilenumbruch (Mirabilis ICQ-Client Standardeinstellung)."
+#: ../src/common/config.py:165
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Sende Nachricht mit Strg+Enter und mache bei Enter einen Zeilenumbruch "
+"(Mirabilis ICQ-Client Standardeinstellung)."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:167
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Wie viele Zeilen für Strg+BildAuf gespeichert werden."
 
-#: ../src/common/config.py:150
+#: ../src/common/config.py:170
 #, python-format
-msgid "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
-msgstr "Entweder eine spezielle URL mit %s, wobei %s das Word/Phrase ist oder 'WIKTIONARY', was bedeutet, dass das Wörterbuch Wiktionary verwendet wird."
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Entweder eine spezielle URL mit %s, wobei %s das Word/Phrase ist oder "
+"'WIKTIONARY', was bedeutet, dass das Wörterbuch Wiktionary verwendet wird."
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:173
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr "Falls aktiviert, kann Gajim von Außerhalb mittels gajim-remote kontrolliert werden."
+msgstr ""
+"Falls aktiviert, kann Gajim von Außerhalb mittels gajim-remote kontrolliert "
+"werden."
 
-#: ../src/common/config.py:154
-msgid "If True, listen to D-Bus signals from NetworkManager and change the status of accounts (provided they do not have listen_to_network_manager set to False and they sync with global status) based upon the status of the network connection."
-msgstr "Wenn aktiviert, reagiere auf D-Bus-Signale vom NetworkManager und ändere den Status von Konten (vorausgesetzt, sie haben listen_to_network_manager nicht auf False gesetzt und sie synchronisieren sich mit dem globalen Status) basierend auf dem Status der Netzwerkverbindung."
+#: ../src/common/config.py:174
+msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+"Wenn aktiviert, reagiere auf D-Bus-Signale vom NetworkManager und ändere den "
+"Status von Konten (vorausgesetzt, sie haben listen_to_network_manager nicht "
+"auf False gesetzt und sie synchronisieren sich mit dem globalen Status) "
+"basierend auf dem Status der Netzwerkverbindung."
 
-#: ../src/common/config.py:155
-msgid "Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr "Chat-Statusbenachrichtigungen gesendet. Kann eine von allen sein, composing_only deaktiviert."
+#: ../src/common/config.py:175
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+"Chat-Statusbenachrichtigungen gesendet. Kann eine von allen sein, "
+"composing_only deaktiviert."
 
-#: ../src/common/config.py:156
-msgid "Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled."
-msgstr "Angezeigte Chat-Status Benachrichtigungen im Chatfenster. Kann all, composing_only oder disabled sein."
+#: ../src/common/config.py:176
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Angezeigte Chat-Status Benachrichtigungen im Chatfenster. Kann all, "
+"composing_only oder disabled sein."
 
-#: ../src/common/config.py:158
-msgid "When not printing time for every message (print_time==sometimes), print it every x minutes."
-msgstr "Wenn die Uhrzeit nicht für jede Nachricht angezeigt werden soll (print_time==sometimes), zeige sie alle x Minuten."
+#: ../src/common/config.py:178
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Wenn die Uhrzeit nicht für jede Nachricht angezeigt werden soll "
+"(print_time==sometimes), zeige sie alle x Minuten."
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:179
 msgid "Ask before closing a group chat tab/window."
 msgstr "Fragen, bevor ein Gruppenchat Tab/Fenster geschlossen wird."
 
-#: ../src/common/config.py:160
-msgid "Always ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Immer fragen, bevor ein Gruppenchat-Fenster/Tab aus der Leerzeichen-seperierten Liste von Gruppchatnamen geschlossen wird."
+#: ../src/common/config.py:180
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Immer fragen, bevor ein Gruppenchat-Fenster/Tab aus der Leerzeichen-"
+"seperierten Liste von Gruppchatnamen geschlossen wird."
 
-#: ../src/common/config.py:161
-msgid "Never ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Niemals fragen, bevor ein Gruppenchat-Fenster/Tab aus der Leerzeichen-seperierten Liste von Gruppenchatnamen geschlossen wird."
+#: ../src/common/config.py:181
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Niemals fragen, bevor ein Gruppenchat-Fenster/Tab aus der Leerzeichen-"
+"seperierten Liste von Gruppenchatnamen geschlossen wird."
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:184
 #, fuzzy
-msgid "Comma separated list of hosts that we send, in addition of local interfaces, for File Transfer in case of address translation/port forwarding."
-msgstr "Überschreibt den Host für Datenübertragung für den Fall von NAT/Port-Forwarding"
+msgid ""
+"Comma separated list of hosts that we send, in addition of local interfaces, "
+"for File Transfer in case of address translation/port forwarding."
+msgstr ""
+"Überschreibt den Host für Datenübertragung für den Fall von NAT/Port-"
+"Forwarding"
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:186
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC-Standard sagt KiB = 1024 Byte, kB = 1000 Byte."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:188
 msgid "Notify of events in the system trayicon."
 msgstr "Benachrichtige über Ereignisse durch das Trayicon"
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:194
 msgid "Show tab when only one conversation?"
 msgstr "Tab bei einer einzelnen Unterhaltung anzeigen?"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:195
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Tab-Grenze im Chat-Fenster anzeigen?"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:196
 msgid "Show close button in tab?"
 msgstr "Schließen-Button im Tab anzeigen?"
 
-#: ../src/common/config.py:189
-msgid "A semicolon-separated list of words that will be highlighted in group chats."
-msgstr "Eine mit Semilkolon seperierte Liste von Worten, die in einem Gruppenchat hervorgehoben werden."
+#: ../src/common/config.py:197
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+"Soll Gajim beim Aushandeln einer verschlüsselten Sitzung annehmen, dass Sie "
+"Ihre Nachricht mitschneiden wollen?"
 
-#: ../src/common/config.py:190
-msgid "If True, quits Gajim when X button of Window Manager is clicked. This setting is taken into account only if trayicon is used."
-msgstr "Falls aktiviert, wird Gajim beendet, wenn der X-Button des Fenstermanagers geklickt wird. Diese Option wird nur beachtet, wenn die Trayicon-Unterstützung aktiv ist."
+#: ../src/common/config.py:198
+msgid ""
+"When negotiating an encrypted session, should Gajim prefer to use public "
+"keys for identification?"
+msgstr ""
+"Soll Gajim bei Aushandeln einer verschlüsselten Situng öffentliche Schlüssel "
+"zur Identifikation bevorzugen?"
 
-#: ../src/common/config.py:191
-msgid "If True, Gajim will check if it's the default jabber client on each startup."
-msgstr "Wenn aktiviert, wird Gajim beim Starten überprüfen, ob Gajim der Standard-Jabber-Client ist."
+#: ../src/common/config.py:207
+#, fuzzy
+msgid "Preview new messages in notification popup?"
+msgstr "Sende Statusbenachrichtigungen:"
 
-#: ../src/common/config.py:192
-msgid "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated."
-msgstr "Falls aktiviert, wird Gajim ein Icon auf jedem Tab mit ungelesenen Nachrichten anzeigen. Abhängig vom Thema kann dieses Icon animiert sein."
+#: ../src/common/config.py:212
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"Eine mit Semilkolon seperierte Liste von Worten, die in einem Gruppenchat "
+"hervorgehoben werden."
 
-#: ../src/common/config.py:193
-msgid "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window."
-msgstr "Falls aktiviert, wird Gajim für jeden Kontakt die Statusnachricht, falls nicht leer, unter dem jeweiligen Kontaktnamen im Roster anzeigen."
+#: ../src/common/config.py:213
+msgid ""
+"If True, quits Gajim when X button of Window Manager is clicked. This "
+"setting is taken into account only if trayicon is used."
+msgstr ""
+"Falls aktiviert, wird Gajim beendet, wenn der X-Button des Fenstermanagers "
+"geklickt wird. Diese Option wird nur beachtet, wenn die Trayicon-"
+"Unterstützung aktiv ist."
 
-#: ../src/common/config.py:195
-msgid "If True, Gajim will ask for avatar each contact that did not have an avatar last time or has one cached that is too old."
-msgstr "Falls aktiviert fragt Gajim nach einem Avatar für jeden Kontakt, der beim letzten Mal keinen hatte oder einen veralteten hat."
+#: ../src/common/config.py:214
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr ""
+"Wenn aktiviert, wird Gajim beim Starten überprüfen, ob Gajim der Standard-"
+"Jabber-Client ist."
 
-#: ../src/common/config.py:196
-msgid "If False, Gajim will no longer print status line in chats when a contact changes his or her status and/or his or her status message."
-msgstr "Falls deaktiviert, werden Sie keine Statuszeile im Chat sehen, wenn ein Kontakt seinen Status und/oder seine Statusnachricht ändert."
+#: ../src/common/config.py:215
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Falls aktiviert, wird Gajim ein Icon auf jedem Tab mit ungelesenen "
+"Nachrichten anzeigen. Abhängig vom Thema kann dieses Icon animiert sein."
 
-#: ../src/common/config.py:197
-msgid "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no longer print status line in groupchats when a member changes his or her status and/or his or her status message. If \"all\" Gajim will print all status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves group chat."
-msgstr "Kann \"none\", \"all\" oder \"in_and_out\" sein. Falls \"none\", wird Gajim keine Status-Zeilen mehr in Gruppenchats anzeigen, wenn ein Mitglied seinen Status oder seine Statusnachricht ändert. Falls \"all\", wird Gajim alle Statusnachrichten anzeigen. Falls \"in_and_out\", wird Gajim nur einen Status anzeigen, wenn jemand den Gruppenchat betritt oder verlässt."
+#: ../src/common/config.py:216
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"Falls aktiviert, wird Gajim für jeden Kontakt die Statusnachricht, falls "
+"nicht leer, unter dem jeweiligen Kontaktnamen im Roster anzeigen."
+
+#: ../src/common/config.py:218
+msgid ""
+"If True, Gajim will ask for avatar each contact that did not have an avatar "
+"last time or has one cached that is too old."
+msgstr ""
+"Falls aktiviert fragt Gajim nach einem Avatar für jeden Kontakt, der beim "
+"letzten Mal keinen hatte oder einen veralteten hat."
+
+#: ../src/common/config.py:219
+msgid ""
+"If False, Gajim will no longer print status line in chats when a contact "
+"changes his or her status and/or his or her status message."
+msgstr ""
+"Falls deaktiviert, werden Sie keine Statuszeile im Chat sehen, wenn ein "
+"Kontakt seinen Status und/oder seine Statusnachricht ändert."
+
+#: ../src/common/config.py:220
+msgid ""
+"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"longer print status line in groupchats when a member changes his or her "
+"status and/or his or her status message. If \"all\" Gajim will print all "
+"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
+"group chat."
+msgstr ""
+"Kann \"none\", \"all\" oder \"in_and_out\" sein. Falls \"none\", wird Gajim "
+"keine Status-Zeilen mehr in Gruppenchats anzeigen, wenn ein Mitglied seinen "
+"Status oder seine Statusnachricht ändert. Falls \"all\", wird Gajim alle "
+"Statusnachrichten anzeigen. Falls \"in_and_out\", wird Gajim nur einen "
+"Status anzeigen, wenn jemand den Gruppenchat betritt oder verlässt."
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:222
 msgid "Background color of contacts when they just signed in."
 msgstr "Hintergrundfarbe von Kontakten wenn sie sich gerade noch anmeldeten."
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:223
 msgid "Background color of contacts when they just signed out."
 msgstr "Hintergrundfarbe von Kontakten wenn sie sich gerade noch abmeldeten."
 
-#: ../src/common/config.py:202
-msgid "If True, restored messages will use a smaller font than the default one."
-msgstr "Falls aktiv, werden wiederhergestellte Nachrichten mit einer kleineren Schrift als der Standard dargestellt."
+#: ../src/common/config.py:225
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+"Falls aktiv, werden wiederhergestellte Nachrichten mit einer kleineren "
+"Schrift als der Standard dargestellt."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:226
 msgid "Don't show avatar for the transport itself."
 msgstr "Zeige keinen Avatar für den Transport selber."
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:227
 msgid "Don't show roster in the system taskbar."
 msgstr "Kontaktliste nicht in der System-Taskleiste anzeigen."
 
-#: ../src/common/config.py:205
-msgid "If True and installed GTK+ and PyGTK versions are at least 2.8, make the window flash (the default behaviour in most Window Managers) when holding pending events."
-msgstr "Wenn aktiviert und die installierten GTK+ und PyGTK Versionen wenigstens 2.8 sind, lasse das Fenster bei neuen Ereignissen aufblitzen (Standardverhalten in den meisten Window-Managers) "
+#: ../src/common/config.py:228
+msgid ""
+"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
+"window flash (the default behaviour in most Window Managers) when holding "
+"pending events."
+msgstr ""
+"Wenn aktiviert und die installierten GTK+ und PyGTK Versionen wenigstens 2.8 "
+"sind, lasse das Fenster bei neuen Ereignissen aufblitzen (Standardverhalten "
+"in den meisten Window-Managers) "
 
-#: ../src/common/config.py:207
-msgid "Jabberd1.4 does not like sha info when one join a password protected group chat. Turn this option to False to stop sending sha info in group chat presences."
-msgstr "Jabberd1.4 mag keine SHA-Informationen wenn ein passwortgeschützter Gruppenchat betreten wird. Deaktivieren Sie diese Option um keine SHA-Informationen in Gruppenchats zu senden"
+#: ../src/common/config.py:230
+msgid ""
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. Turn this option to False to stop sending sha info in group chat "
+"presences."
+msgstr ""
+"Jabberd1.4 mag keine SHA-Informationen wenn ein passwortgeschützter "
+"Gruppenchat betreten wird. Deaktivieren Sie diese Option um keine SHA-"
+"Informationen in Gruppenchats zu senden"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:210
+#: ../src/common/config.py:233
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a specific window. Note, changing this option requires restarting Gajim before the changes will take effect."
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect."
 msgstr ""
 "Kontrolliert das Fenster in dem neue Nachrichten platziert werden.\n"
 "'always' - Alle Nachrichten landen in einem einzelnen Fenster.\n"
 "'never' - Alle Nachrichten bekommen ihr eigenes Fenster.\n"
-"'peracct' - Nachrichten für jeden Account landen in einem speziellen Fenster.\n"
-"'pertype' - Jede Nachrichtentyp (z.B. Chat vs. Gruppenchat) landet in in einem speziellen Fenster. Falls Sie diese Option ändern, muss Gajim neu gestartet werden, damit die Änderungen übernommen werden"
+"'peracct' - Nachrichten für jeden Account landen in einem speziellen "
+"Fenster.\n"
+"'pertype' - Jede Nachrichtentyp (z.B. Chat vs. Gruppenchat) landet in in "
+"einem speziellen Fenster. Falls Sie diese Option ändern, muss Gajim neu "
+"gestartet werden, damit die Änderungen übernommen werden"
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:234
 msgid "If False, you will no longer see the avatar in the chat window."
-msgstr "Wenn deaktiviert, werden Sie den Avatar nicht mehr im Chatfenster sehen."
+msgstr ""
+"Wenn deaktiviert, werden Sie den Avatar nicht mehr im Chatfenster sehen."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:235
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Wenn aktiviert, schließt die Escape-Taste ein Tab/Fenster."
 
-#: ../src/common/config.py:213
-msgid "Hides the buttons in group chat window."
+#: ../src/common/config.py:236
+msgid "Hides the buttons in chat windows."
 msgstr "Versteckt die Knöpfe im Gruppenchat-Fenster."
 
-#: ../src/common/config.py:214
-msgid "Hides the buttons in two persons chat window."
-msgstr "Versteckt die Knöpfe im Zwei-Personen-Chatfenster"
-
-#: ../src/common/config.py:215
+#: ../src/common/config.py:237
 msgid "Hides the banner in a group chat window"
 msgstr "Versteckt das Banner im Gruppenchat-Fenster"
 
-#: ../src/common/config.py:216
+#: ../src/common/config.py:238
 msgid "Hides the banner in two persons chat window"
 msgstr "Versteckt das Banner im Zwei-Personen-Chatfenster"
 
-#: ../src/common/config.py:217
+#: ../src/common/config.py:239
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Versteckt die Gruppenchat-Benutzerliste im Gruppenchat-Fenster."
 
-#: ../src/common/config.py:218
-msgid "In a chat, show the nickname at the beginning of a line only when it's not the same person talking than in previous message."
-msgstr "Zeige in einem Chat den Spitznamen nur dann am Beginn einer Linie, wenn es nicht die selbe Person ist die schon die letzte Nachricht geschrieben hat."
+#: ../src/common/config.py:240
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
+msgstr ""
+"Zeige in einem Chat den Spitznamen nur dann am Beginn einer Linie, wenn es "
+"nicht die selbe Person ist die schon die letzte Nachricht geschrieben hat."
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:241
 msgid "Indentation when using merge consecutive nickname."
-msgstr "Einrückung, wenn das Zusammenführen nachfolgender Spitznamen verwendet wird."
+msgstr ""
+"Einrückung, wenn das Zusammenführen nachfolgender Spitznamen verwendet wird."
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:242
+#, fuzzy
+msgid "Smooth scroll message in conversation window"
+msgstr "Nachricht senden und Fenster schließen"
+
+#: ../src/common/config.py:243
 msgid "List of colors that will be used to color nicknames in group chats."
-msgstr "Farbliste, die für die Einfärbung von Spitzenamen im Gruppenchat verwendet wird."
+msgstr ""
+"Farbliste, die für die Einfärbung von Spitzenamen im Gruppenchat verwendet "
+"wird."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:244
 msgid "Ctrl-Tab go to next composing tab when none is unread."
-msgstr "Strg-Tab, um zum nächsten Reiter zu gehen, wenn kein Anderer neue Nachrichten enthält."
+msgstr ""
+"Strg-Tab, um zum nächsten Reiter zu gehen, wenn kein Anderer neue "
+"Nachrichten enthält."
 
-#: ../src/common/config.py:222
-msgid "Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog."
-msgstr "Soll der Bestätigungsdialog beim Erstellen von Metakontakten angezeigt werden oder nicht? Bei leerer Zeichenfolge wird der Dialog nie gezeigt."
+#: ../src/common/config.py:245
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Soll der Bestätigungsdialog beim Erstellen von Metakontakten angezeigt "
+"werden oder nicht? Bei leerer Zeichenfolge wird der Dialog nie gezeigt."
 
-#: ../src/common/config.py:223
-msgid "If True, you will be able to set a negative priority to your account in account modification window. BE CAREFUL, when you are logged in with a negative priority, you will NOT receive any message from your server."
-msgstr "Wenn aktiviert, werden Sie in der Lage sein eine negative Priorität für Ihr Konto im Konto-Bearbeiten Fenster zu setzen. SEIEN SIE VORSICHTIG, wenn Sie mit einer negativen Priorität angemeldet sind: Sie werden KEINE Nachrichten mehr von Ihrem Server erhalten."
+#: ../src/common/config.py:246
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFUL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+"Wenn aktiviert, werden Sie in der Lage sein eine negative Priorität für Ihr "
+"Konto im Konto-Bearbeiten Fenster zu setzen. SEIEN SIE VORSICHTIG, wenn Sie "
+"mit einer negativen Priorität angemeldet sind: Sie werden KEINE Nachrichten "
+"mehr von Ihrem Server erhalten."
 
-#: ../src/common/config.py:224
-msgid "If True, Gajim will use Gnome Keyring (if available) to store account passwords."
-msgstr "Wenn aktiviert, wird Gnome Keyring (falls verfügbar) verwendet, um die Passwörter der Konten zu speichern."
+#: ../src/common/config.py:247
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"Wenn aktiviert, wird Gnome Keyring (falls verfügbar) verwendet, um die "
+"Passwörter der Konten zu speichern."
 
-#: ../src/common/config.py:225
-msgid "If True, Gajim will show number of online and total contacts in account and group rows."
-msgstr "Wenn aktiviert, wird Gajim die Anzahl der angemeldeten und gesamten Kontakte in den Konto- und Gruppenreihen anzeigen."
+#: ../src/common/config.py:248
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"Wenn aktiviert, wird Gajim die Anzahl der angemeldeten und gesamten Kontakte "
+"in den Konto- und Gruppenreihen anzeigen."
 
-#: ../src/common/config.py:226
-msgid "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages as if they were of this type"
-msgstr "Kann leer, 'chat' oder 'normal' sein. Wenn nicht leer, dann werden alle eingehenden Nachrichten so behandelt, als wären sie von diesem Typ."
+#: ../src/common/config.py:249
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+"Kann leer, 'chat' oder 'normal' sein. Wenn nicht leer, dann werden alle "
+"eingehenden Nachrichten so behandelt, als wären sie von diesem Typ."
 
-#: ../src/common/config.py:227
-msgid "If True, Gajim will scroll and select the contact who sent you the last message, if chat window is not already opened."
-msgstr "Wenn aktiviert, wird Gajim automatisch zu der Person springen und auswählen, die die letzte Nachricht geschickt hat, falls das Chat Fenster nicht bereits offen ist."
+#: ../src/common/config.py:250
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+"Wenn aktiviert, wird Gajim automatisch zu der Person springen und auswählen, "
+"die die letzte Nachricht geschickt hat, falls das Chat Fenster nicht bereits "
+"offen ist."
 
-#: ../src/common/config.py:238
-msgid "Priority will change automatically according to your status. Priorities are defined in autopriority_* options."
-msgstr "Die Priorität wird automatisch dem Status entsprechend geändert. Prioritäten sind in den autopriority_* Optionen definiert."
+#: ../src/common/config.py:251
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+"Falls 'true', wird Gajim eine Zeichenkette zwischen $$ und $$ mittels dvips "
+"vor dem Einfügen in ein Chat-Fenster in ein Bild umwandeln."
+
+#: ../src/common/config.py:252
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr ""
+"Benötigte Inaktivitäts-Zeit bevor das 'Status ändern'-Fenster geschlossen "
+"wird."
+
+#: ../src/common/config.py:253
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+"Maximale Anzahl Zeilen, die in einem Gespräch angezeigt werden. Die ältesten "
+"Zeilen werden gelöscht."
+
+#: ../src/common/config.py:254
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+
+#: ../src/common/config.py:265
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Die Priorität wird automatisch dem Status entsprechend geändert. Prioritäten "
+"sind in den autopriority_* Optionen definiert."
 
 #. yes, no, ask
-#: ../src/common/config.py:267
+#: ../src/common/config.py:293
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 Workaround"
 
-#: ../src/common/config.py:271
-msgid "If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer."
-msgstr "Wenn aktiviert, wird Gajim Ihre IP und die in der file_transfer_proxies Option definierten Proxies für den Datentransfer verwenden."
+#: ../src/common/config.py:297
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Wenn aktiviert, wird Gajim Ihre IP und die in der file_transfer_proxies "
+"Option definierten Proxies für den Datentransfer verwenden."
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:356
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ist OpenPGP für diesen Kontakt aktiviert?"
 
-#: ../src/common/config.py:331
-#: ../src/common/config.py:334
+#: ../src/common/config.py:357 ../src/common/config.py:360
 msgid "Language for which we want to check misspelled words"
 msgstr "Sprache für, die nach falsch geschriebenen Wörtern gesucht werden soll"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:366
 msgid "all or space separated status"
 msgstr "alle oder Leerzeichen-getrennter Status"
 
-#: ../src/common/config.py:341
+#: ../src/common/config.py:367
 msgid "'yes', 'no', or 'both'"
 msgstr "'ja', 'nein' oder 'beide'"
 
-#: ../src/common/config.py:342
-#: ../src/common/config.py:344
-#: ../src/common/config.py:345
-#: ../src/common/config.py:348
-#: ../src/common/config.py:349
+#: ../src/common/config.py:368 ../src/common/config.py:370
+#: ../src/common/config.py:371 ../src/common/config.py:374
+#: ../src/common/config.py:375
 msgid "'yes', 'no' or ''"
 msgstr "'ja, 'nein' oder ''"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:381
 msgid "Sleeping"
 msgstr "Schlafen"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:382
 msgid "Back soon"
 msgstr "Bin gleich wieder da"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:382
 msgid "Back in some minutes."
 msgstr "Bin in ein paar Minuten zurück."
 
-#: ../src/common/config.py:357
+#: ../src/common/config.py:383
 msgid "Eating"
 msgstr "Essen"
 
-#: ../src/common/config.py:357
+#: ../src/common/config.py:383
 msgid "I'm eating, so leave me a message."
 msgstr "Ich esse gerade, also hinterlasst eine Nachricht."
 
-#: ../src/common/config.py:358
+#: ../src/common/config.py:384
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:358
+#: ../src/common/config.py:384
 msgid "I'm watching a movie."
 msgstr "Ich sehe mir einen Film an."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:385
 msgid "Working"
 msgstr "Arbeiten"
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:385
 msgid "I'm working."
 msgstr "Ich arbeite."
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:386
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:386
 msgid "I'm on the phone."
 msgstr "Ich telefoniere."
 
-#: ../src/common/config.py:361
+#: ../src/common/config.py:387
 msgid "Out"
 msgstr "Draußen"
 
-#: ../src/common/config.py:361
+#: ../src/common/config.py:387
 msgid "I'm out enjoying life."
 msgstr "Ich bin draußen und genieße das Leben."
 
-#: ../src/common/config.py:365
+#: ../src/common/config.py:391
 msgid "I'm available."
 msgstr "Ich bin angemeldet."
 
-#: ../src/common/config.py:366
+#: ../src/common/config.py:392
 msgid "I'm free for chat."
 msgstr "Ich bin frei zum Chatten."
 
-#: ../src/common/config.py:368
+#: ../src/common/config.py:394
 msgid "I'm not available."
 msgstr "Ich bin nicht verfügbar."
 
-#: ../src/common/config.py:369
+#: ../src/common/config.py:395
 msgid "Do not disturb."
 msgstr "Bitte nicht stören."
 
-#: ../src/common/config.py:370
-#: ../src/common/config.py:371
+#: ../src/common/config.py:396 ../src/common/config.py:397
 msgid "Bye!"
 msgstr "Auf Wiedersehen!"
 
-#: ../src/common/config.py:380
-msgid "Sound to play when a group chat message contains one of the words in muc_highlight_words, or when a group chat message contains your nickname."
-msgstr "Abzuspielender Ton, falls eine Gruppenchat-Nachricht eines der Wörter aus der muc_highlights_works-Liste oder Ihren Spitznamen enthält."
+#: ../src/common/config.py:406
+msgid ""
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
+msgstr ""
+"Abzuspielender Ton, falls eine Gruppenchat-Nachricht eines der Wörter aus "
+"der muc_highlights_works-Liste oder Ihren Spitznamen enthält."
 
-#: ../src/common/config.py:381
+#: ../src/common/config.py:407
 msgid "Sound to play when any MUC message arrives."
-msgstr "Ton der beim empfangen einer Gruppenchat-Nachricht abgespielt werden soll"
+msgstr ""
+"Ton der beim empfangen einer Gruppenchat-Nachricht abgespielt werden soll"
 
-#: ../src/common/config.py:390
-#: ../src/common/optparser.py:195
+#: ../src/common/config.py:416 ../src/common/optparser.py:220
 msgid "green"
 msgstr "grün"
 
-#: ../src/common/config.py:394
-#: ../src/common/optparser.py:181
+#: ../src/common/config.py:420 ../src/common/optparser.py:206
 msgid "grocery"
 msgstr "gemüse"
 
-#: ../src/common/config.py:398
+#: ../src/common/config.py:424
 msgid "human"
 msgstr "menschlich"
 
-#: ../src/common/config.py:402
+#: ../src/common/config.py:428
 msgid "marine"
 msgstr "Marine"
 
-#: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
+#: ../src/common/connection_handlers.py:61
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
 msgid "Unable to load idle module"
 msgstr "Konnte Idle-Modus nicht laden"
 
-#: ../src/common/connection_handlers.py:180
-#: ../src/common/connection_handlers.py:215
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:236
+#: ../src/common/connection_handlers.py:219
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:243
 msgid "Wrong host"
 msgstr "Falscher Host"
 
-#: ../src/common/connection_handlers.py:180
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:236
-#, python-format
-msgid "The host %s you configured as the ft_add_hosts_to_send advanced option is not valid, so ignored."
-msgstr "Der Host %s, den Sie für die erweiterte Option ft_override_host_to_send angeben haben ist ungültig und wird ignoriert."
-
-#: ../src/common/connection_handlers.py:216
+#: ../src/common/connection_handlers.py:220
 msgid "Invalid local address? :-O"
 msgstr "Ungültige Lokale Adresse? :-O"
 
-#: ../src/common/connection_handlers.py:607
+#: ../src/common/connection_handlers.py:618
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
-msgstr "Registrierungsinformation für Transport %s sind nicht rechtzeitig angekommen"
+msgstr ""
+"Registrierungsinformation für Transport %s sind nicht rechtzeitig angekommen"
 
-#: ../src/common/connection_handlers.py:1544
+#: ../src/common/connection_handlers.py:1802
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Spitzname nicht erlaubt: %s"
 
-#. password required to join
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1609
-#: ../src/common/connection_handlers.py:1612
-#: ../src/common/connection_handlers.py:1615
-#: ../src/common/connection_handlers.py:1618
-#: ../src/common/connection_handlers.py:1621
-#: ../src/common/connection_handlers.py:1624
-#: ../src/common/connection_handlers.py:1632
+#: ../src/common/connection_handlers.py:1872
+#: ../src/common/connection_handlers.py:1875
+#: ../src/common/connection_handlers.py:1878
+#: ../src/common/connection_handlers.py:1881
+#: ../src/common/connection_handlers.py:1885
+#: ../src/common/connection_handlers.py:1894
 msgid "Unable to join group chat"
 msgstr "Fehler beim Betreten des Gruppenchats"
 
-#: ../src/common/connection_handlers.py:1610
-msgid "A password is required to join this group chat."
-msgstr "Für das Betreten dieses Gruppenchats ist ein Passwort nötig."
-
-#: ../src/common/connection_handlers.py:1613
-msgid "You are banned from this group chat."
-msgstr "Sie sind von diesem Gruppenchat gebannt."
+#: ../src/common/connection_handlers.py:1873
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Sie sind von Gruppenchat %s gebannt."
 
-#: ../src/common/connection_handlers.py:1616
-msgid "Such group chat does not exist."
+#: ../src/common/connection_handlers.py:1876
+#, python-format
+msgid "Group chat %s does not exist."
 msgstr "Dieser Gruppenchat existiert nicht."
 
-#: ../src/common/connection_handlers.py:1619
+#: ../src/common/connection_handlers.py:1879
 msgid "Group chat creation is restricted."
 msgstr "Gruppenchaterstellung ist beschränkt."
 
-#: ../src/common/connection_handlers.py:1622
-msgid "Your registered nickname must be used."
+#: ../src/common/connection_handlers.py:1882
+#, python-format
+msgid "Your registered nickname must be used in group chat %s."
 msgstr "Sie müssen Ihren registrierten Spitznamen verwenden"
 
-#: ../src/common/connection_handlers.py:1625
-msgid "You are not in the members list."
+#: ../src/common/connection_handlers.py:1886
+#, python-format
+msgid "You are not in the members list in groupchat %s."
 msgstr "Sie sind nicht in der Mitgliedliste"
 
-#: ../src/common/connection_handlers.py:1633
+#: ../src/common/connection_handlers.py:1895
+#, python-format
 msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
-"Der gewünschte Benutzername wird bereits verwendet oder ist von einem anderen Benutzer registriert.\n"
+"Der gewünschte Benutzername wird bereits verwendet oder ist von einem "
+"anderen Benutzer registriert.\n"
 "Bitte geben Sie einen anderen Benutzernamen an:"
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:1676
+#: ../src/common/connection_handlers.py:1926
 msgid "Room has been destroyed"
 msgstr "Raum wurde zerstört"
 
-#: ../src/common/connection_handlers.py:1683
+#: ../src/common/connection_handlers.py:1933
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Sie können stattdessen diesem Raum beitreten: %s"
 
-#: ../src/common/connection_handlers.py:1709
+#: ../src/common/connection_handlers.py:1960
 msgid "I would like to add you to my roster."
 msgstr "Ich würde dich gerne zu meiner Liste hinzufügen."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1730
+#: ../src/common/connection_handlers.py:1981
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "wir haben jetzt %s abonniert"
 
-#: ../src/common/connection_handlers.py:1732
+#: ../src/common/connection_handlers.py:1983
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Anfrage zur Kündigung des Abonnements von %s"
 
-#: ../src/common/connection_handlers.py:1734
+#: ../src/common/connection_handlers.py:1985
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s hat das Abonnement beendet"
 
-#: ../src/common/connection_handlers.py:1851
+#: ../src/common/connection_handlers.py:2112
 #, python-format
-msgid "JID %s is not RFC compliant. It will not be added to your roster. Use roster management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr "Jid %s ist nicht RFC-konform. Sie wird nicht zu ihrem Roster hinzugefügt. Verwenden Sie ein Roster-Managment-Tool wie <http://jru.jabberstudio.org/>, um ihn zu entfernen"
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"Jid %s ist nicht RFC-konform. Sie wird nicht zu ihrem Roster hinzugefügt. "
+"Verwenden Sie ein Roster-Managment-Tool wie <http://jru.jabberstudio.org/>, "
+"um ihn zu entfernen"
+
+#. We didn't set a passphrase
+#: ../src/common/connection_handlers.py:2151
+#: ../src/common/zeroconf/connection_zeroconf.py:169
+msgid "OpenPGP passphrase was not given"
+msgstr "Keine OpenPGP-Passphrase gewählt"
 
-#: ../src/common/connection.py:193
-#: ../src/common/zeroconf/connection_zeroconf.py:196
+#: ../src/common/connection.py:243
+#: ../src/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbindung mit Konto \"%s\" abgebrochen"
 
-#: ../src/common/connection.py:194
+#: ../src/common/connection.py:244
 msgid "Reconnect manually."
 msgstr "Manuelle Neuverbindung."
 
-#: ../src/common/connection.py:205
-#: ../src/common/connection.py:232
-#, python-format
-msgid "Transport %s answered wrongly to register request: %s"
-msgstr "Transport %s beantwortete unsere Registrierungsanfrage nicht korrekt: %s"
+#: ../src/common/connection.py:255
+#, fuzzy, python-format
+msgid "Server %s answered wrongly to register request: %s"
+msgstr ""
+"Transport %s beantwortete unsere Registrierungsanfrage nicht korrekt: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:231
+#: ../src/common/connection.py:263
 msgid "Invalid answer"
 msgstr "Ungültige Antwort"
 
-#: ../src/common/connection.py:379
+#: ../src/common/connection.py:264
+#, python-format
+msgid "Transport %s answered wrongly to register request: %s"
+msgstr ""
+"Transport %s beantwortete unsere Registrierungsanfrage nicht korrekt: %s"
+
+#: ../src/common/connection.py:410
 msgid "Connection to proxy failed"
 msgstr "Verbindung mit Proxy fehlgeschlagen"
 
-#: ../src/common/connection.py:433
-#: ../src/common/connection.py:531
-#: ../src/common/connection.py:984
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:464 ../src/common/connection.py:510
+#: ../src/common/connection.py:1080
+#: ../src/common/zeroconf/connection_zeroconf.py:243
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Konnte nicht mit %s verbinden"
 
-#: ../src/common/connection.py:447
+#: ../src/common/connection.py:478
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Verbunden mit Server %s:%s mit %s"
 
-#: ../src/common/connection.py:460
-#, python-format
-msgid "Security error connecting to \"%s\""
-msgstr "Konnte nicht mit %s verbinden"
-
-#: ../src/common/connection.py:461
-msgid "The server's key has changed, or someone is trying to hack your connection."
-msgstr "Der Schlüssel des Servers wurde geändert oder jemand versucht ihre Verbindung zu hacken."
-
-#: ../src/common/connection.py:468
-#, python-format
-msgid "Unable to check fingerprint for %s. Connection could be insecure."
-msgstr "Konnte Fingerabdruck von %s nicht überprüfen. Die Verbindung ist möglicherweise unsicher."
-
-#: ../src/common/connection.py:510
-#, python-format
-msgid "Missing fingerprint in SSL connection to %s"
-msgstr "Fehlender Fingerabdruck in der SSL-Verbindung zu %s"
-
-#: ../src/common/connection.py:516
-#, python-format
-msgid "Fingerprint mismatch for %s: Got %s, expected %s"
-msgstr "Fingerabdruck von %s stimmt nicht überein: Erhalten %s, erwartet %s"
-
-#: ../src/common/connection.py:532
+#: ../src/common/connection.py:511
 msgid "Check your connection or try again later"
 msgstr "Überprüfen Sie die Verbindung oder versuchen Sie es später noch einmal"
 
-#: ../src/common/connection.py:558
+#: ../src/common/connection.py:536
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentifizierung mit \"%s\" fehlgeschlagen"
 
-#: ../src/common/connection.py:559
+#: ../src/common/connection.py:538
 msgid "Please check your login and password for correctness."
 msgstr "Bitte überprüfen Sie ihren Benutzernamen und Passwort."
 
-#: ../src/common/connection.py:586
+#: ../src/common/connection.py:581
 msgid "Error while removing privacy list"
 msgstr "Fehler beim Entfernen der Privatliste"
 
-#: ../src/common/connection.py:587
+#: ../src/common/connection.py:582
 #, python-format
-msgid "Privacy list %s has not been removed. It is maybe active in one of your connected resources. Deactivate it and try again."
-msgstr "Privatliste %s wurde nicht entfernt. Möglicherweise ist die Privatliste noch in einer Ihrer Verbindungen aktiv. Deaktivieren Sie diese und versuchen Sie es erneut."
-
-#. We didn't set a passphrase
-#: ../src/common/connection.py:685
-#: ../src/common/zeroconf/connection_zeroconf.py:156
-msgid "OpenPGP passphrase was not given"
-msgstr "Keine OpenPGP-Passphrase gewählt"
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+msgstr ""
+"Privatliste %s wurde nicht entfernt. Möglicherweise ist die Privatliste noch "
+"in einer Ihrer Verbindungen aktiv. Deaktivieren Sie diese und versuchen Sie "
+"es erneut."
 
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:814
+#: ../src/common/connection.py:855
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Diese Nachricht ist *verschlüsselt* (Siehe: JEP:`27`)]"
 
-#: ../src/common/connection.py:870
-#: ../src/common/zeroconf/connection_zeroconf.py:397
+#: ../src/common/connection.py:929
+#: ../src/common/zeroconf/connection_zeroconf.py:437
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -6073,486 +7384,487 @@ msgstr ""
 "Thema: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1010
+#: ../src/common/connection.py:1112
 msgid "Not fetched because of invisible status"
 msgstr "Nicht abgeholt aufgrund eines Unsichtbar-Status"
 
-#: ../src/common/contacts.py:271
+#: ../src/common/contacts.py:299
 msgid "Not in roster"
 msgstr "Nicht in der Kontaktliste"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:33
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Auf diesem Computer fehlen die Python Bibliotheken für D-Bus"
 
-#: ../src/common/dbus_support.py:34
+#: ../src/common/dbus_support.py:42
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajims D-BUS-Möglichkeiten können nicht genutzt werden"
 
-#: ../src/common/exceptions.py:22
+#: ../src/common/exceptions.py:27
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (auch python-pysqlite2 genannt) Abhängigkeit fehlt. Beende ..."
+msgstr ""
+"pysqlite2 (auch python-pysqlite2 genannt) Abhängigkeit fehlt. Beende ..."
 
-#: ../src/common/exceptions.py:30
+#: ../src/common/exceptions.py:44
 msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr "Dienst nicht verfügbar: Gajim ist nicht aktiv oder remote_control ist deaktiviert"
+msgstr ""
+"Dienst nicht verfügbar: Gajim ist nicht aktiv oder remote_control ist "
+"deaktiviert"
 
-#: ../src/common/exceptions.py:38
+#: ../src/common/exceptions.py:52
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus auf diesem Computer nicht vorhanden oder das Python-Modul fehlt"
 
-#: ../src/common/exceptions.py:46
+#: ../src/common/exceptions.py:60
 msgid ""
 "Session bus is not available.\n"
 "Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr "Sitzungsbus ist nicht verfügbar.\"Bitte lesen Sie http://trac.gajim.org/wiki/GajimDBus (Englisch)"
+msgstr ""
+"Sitzungsbus ist nicht verfügbar.\"Bitte lesen Sie http://trac.gajim.org/wiki/"
+"GajimDBus (Englisch)"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:47
 msgid "one"
 msgstr "Eins"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:47
 msgid "two"
 msgstr "Zwei"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:47
 msgid "three"
 msgstr "Drei"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:47
 msgid "four"
 msgstr "Vier"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:47
 msgid "five"
 msgstr "Fünf"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:47
 msgid "six"
 msgstr "Sechs"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:48
 msgid "seven"
 msgstr "Sieben"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:48
 msgid "eight"
 msgstr "Acht"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:48
 msgid "nine"
 msgstr "Neun"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:48
 msgid "ten"
 msgstr "Zehn"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:48
 msgid "eleven"
 msgstr "Elf"
 
-#: ../src/common/fuzzyclock.py:44
+#: ../src/common/fuzzyclock.py:49
 msgid "twelve"
 msgstr "Zwölf"
 
 #. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
 #. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47
-#: ../src/common/fuzzyclock.py:55
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
 msgid "$0 o'clock"
 msgstr "%0 Uhr"
 
-#: ../src/common/fuzzyclock.py:47
-#: ../src/common/fuzzyclock.py:55
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
 msgid "five past $0"
 msgstr "fünf nach %0"
 
-#: ../src/common/fuzzyclock.py:48
-#: ../src/common/fuzzyclock.py:56
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:61
 msgid "ten past $0"
 msgstr "zehn nach %0"
 
-#: ../src/common/fuzzyclock.py:48
-#: ../src/common/fuzzyclock.py:56
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:61
 msgid "quarter past $0"
 msgstr "viertel nach %0"
 
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:57
+#: ../src/common/fuzzyclock.py:54 ../src/common/fuzzyclock.py:62
 msgid "twenty past $0"
 msgstr "zwanzig nach %0"
 
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:57
+#: ../src/common/fuzzyclock.py:54 ../src/common/fuzzyclock.py:62
 msgid "twenty five past $0"
 msgstr "fünfundzwanzig nach %0"
 
-#: ../src/common/fuzzyclock.py:50
-#: ../src/common/fuzzyclock.py:58
+#: ../src/common/fuzzyclock.py:55 ../src/common/fuzzyclock.py:63
 msgid "half past $0"
 msgstr "dreißig nach %0"
 
-#: ../src/common/fuzzyclock.py:50
-#: ../src/common/fuzzyclock.py:58
+#: ../src/common/fuzzyclock.py:55 ../src/common/fuzzyclock.py:63
 msgid "twenty five to $1"
 msgstr "fünfundzwanzig vor %1"
 
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:56 ../src/common/fuzzyclock.py:64
 msgid "twenty to $1"
 msgstr "zwanzig vor %1"
 
-#: ../src/common/fuzzyclock.py:51
-#: ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:56 ../src/common/fuzzyclock.py:64
 msgid "quarter to $1"
 msgstr "viertel vor %1"
 
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:57 ../src/common/fuzzyclock.py:65
 msgid "ten to $1"
 msgstr "zehn vor %1"
 
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:57 ../src/common/fuzzyclock.py:65
 msgid "five to $1"
 msgstr "fünf vor %1"
 
-#: ../src/common/fuzzyclock.py:52
-#: ../src/common/fuzzyclock.py:61
+#: ../src/common/fuzzyclock.py:57 ../src/common/fuzzyclock.py:66
 msgid "$1 o'clock"
 msgstr "%1 Uhr"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:69
 msgid "Night"
 msgstr "Nacht"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:69
 msgid "Early morning"
 msgstr "Früh Morgens"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:69
 msgid "Morning"
 msgstr "Morgen"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:69
 msgid "Almost noon"
 msgstr "Fast Mittag"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:70
 msgid "Noon"
 msgstr "Mittag"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:70
 msgid "Afternoon"
 msgstr "Nachmittag"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:70
 msgid "Evening"
 msgstr "Abend"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:70
 msgid "Late evening"
 msgstr "Später Abend"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:72
 msgid "Start of week"
 msgstr "Anfang der Woche"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:72
 msgid "Middle of week"
 msgstr "Mitte der Woche"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:72
 msgid "End of week"
 msgstr "Ende der Woche"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:73
 msgid "Weekend!"
 msgstr "Wochenende!"
 
-#: ../src/common/helpers.py:114
+#: ../src/common/helpers.py:124
 msgid "Invalid character in username."
 msgstr "Ungültiges Zeichen im Benutzernamen"
 
-#: ../src/common/helpers.py:119
+#: ../src/common/helpers.py:129
 msgid "Server address required."
 msgstr "Server-Adresse wird benötigt."
 
-#: ../src/common/helpers.py:124
+#: ../src/common/helpers.py:134
 msgid "Invalid character in hostname."
 msgstr "Ungültiges Zeichen in Hostname."
 
-#: ../src/common/helpers.py:130
+#: ../src/common/helpers.py:140
 msgid "Invalid character in resource."
 msgstr "Ungültiges Zeichen in Resource."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:183
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:177
+#: ../src/common/helpers.py:187
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:180
+#: ../src/common/helpers.py:190
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:184
+#: ../src/common/helpers.py:194
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:187
+#: ../src/common/helpers.py:197
 #, python-format
 msgid "%s KB"
 msgstr "%s kB"
 
 #. B means bytes
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:200
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:231
 msgid "_Busy"
 msgstr "_Beschäftigt"
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:233
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:236
 msgid "_Not Available"
 msgstr "_Nicht verfügbar"
 
-#: ../src/common/helpers.py:229
+#: ../src/common/helpers.py:241
 msgid "_Free for Chat"
 msgstr "_Frei zum Chatten"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:243
 msgid "Free for Chat"
 msgstr "Frei zum Chatten"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:246
 msgid "_Available"
 msgstr "_Angemeldet"
 
-#: ../src/common/helpers.py:236
-msgid "Available"
-msgstr "Angemeldet"
-
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:250
 msgid "Connecting"
 msgstr "Verbinde"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:253
 msgid "A_way"
 msgstr "Ab_wesend"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:258
 msgid "_Offline"
 msgstr "A_bgemeldet"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:260
 msgid "Offline"
 msgstr "Abgemeldet"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:263
 msgid "_Invisible"
 msgstr "_Unsichtbar"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:269
 msgid "?contact has status:Unknown"
 msgstr "Unbekannt"
 
-#: ../src/common/helpers.py:259
+#: ../src/common/helpers.py:271
 msgid "?contact has status:Has errors"
 msgstr "Hat Fehler"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:276
 msgid "?Subscription we already have:None"
 msgstr "Keine"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:278
 msgid "To"
 msgstr "An"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:282
 msgid "Both"
 msgstr "Beide"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:290
 msgid "?Ask (for Subscription):None"
 msgstr "Keine"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:292
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:301
 msgid "?Group Chat Contact Role:None"
 msgstr "Keine"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:304
 msgid "Moderators"
 msgstr "Moderatoren"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:306
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:297
+#: ../src/common/helpers.py:309
 msgid "Participants"
 msgstr "Teilnehmer"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:311
 msgid "Participant"
 msgstr "Teilnehmer"
 
-#: ../src/common/helpers.py:302
+#: ../src/common/helpers.py:314
 msgid "Visitors"
 msgstr "Besucher"
 
-#: ../src/common/helpers.py:304
+#: ../src/common/helpers.py:316
 msgid "Visitor"
 msgstr "Besucher"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:322
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Gruppenchat Kontaktverbindung:Keine"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:324
 msgid "Owner"
 msgstr "Besitzer"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:326
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:316
+#: ../src/common/helpers.py:328
 msgid "Member"
 msgstr "Mitglied"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:367
 msgid "is paying attention to the conversation"
 msgstr "beobachtet diese Unterhaltung"
 
-#: ../src/common/helpers.py:357
+#: ../src/common/helpers.py:369
 msgid "is doing something else"
 msgstr "tut etwas anderes"
 
-#: ../src/common/helpers.py:359
+#: ../src/common/helpers.py:371
 msgid "is composing a message..."
 msgstr "schreibt im Moment"
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:362
+#: ../src/common/helpers.py:374
 msgid "paused composing a message"
 msgstr "macht gerade eine Schreibpause"
 
-#: ../src/common/helpers.py:364
+#: ../src/common/helpers.py:376
 msgid "has closed the chat window or tab"
 msgstr "hat das Chatfenster oder den Tab geschlossen"
 
-#: ../src/common/helpers.py:890
+#: ../src/common/helpers.py:947 ../src/common/helpers.py:954
+#, python-format
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "%d Nachricht schwebend"
+msgstr[1] "%d Nachrichten schwebend"
+
+#: ../src/common/helpers.py:960
 #, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] " %d ungelesene Nachricht"
-msgstr[1] " %d ungelesene Nachrichten"
+msgid " from room %s"
+msgstr "Von Gruppenchat %s"
 
-#: ../src/common/helpers.py:896
+#: ../src/common/helpers.py:963 ../src/common/helpers.py:982
 #, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] " %d ungelesene Einzel-Nachricht"
-msgstr[1] " %d ungelesene Einzel-Nachrichten"
+msgid " from user %s"
+msgstr "Von Benutzer %s"
 
-#: ../src/common/helpers.py:902
+#: ../src/common/helpers.py:965
 #, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] " %d ungelesene Gruppenchat-Nachricht"
-msgstr[1] " %d ungelesene Gruppenchat-Nachrichten"
+msgid " from %s"
+msgstr "Von %s"
 
-#: ../src/common/helpers.py:908
+#: ../src/common/helpers.py:972 ../src/common/helpers.py:979
 #, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] " %d ungelesene private Nachricht"
-msgstr[1] " %d ungelesene private Nachrichten"
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] "%d Ereignis anstehend"
+msgstr[1] "%d Ereignisse anstehend"
 
-#: ../src/common/helpers.py:918
-#: ../src/common/helpers.py:920
+#: ../src/common/helpers.py:1012
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:65
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "Fehler: %s kann nicht zum Lesen geöffnet werden"
 
-#: ../src/common/optparser.py:181
-msgid "gtk+"
-msgstr "gtk+"
-
-#: ../src/common/optparser.py:190
-#: ../src/common/optparser.py:191
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:216
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:308
+#: ../src/common/optparser.py:332
 msgid "migrating logs database to indices"
 msgstr "migriere Logdatenbank zu Indices"
 
-#: ../src/common/passwords.py:82
+#: ../src/common/passwords.py:88
 #, python-format
 msgid "Gajim account %s"
 msgstr "Gajim-Konto %s"
 
-#: ../src/common/zeroconf/client_zeroconf.py:189
-msgid "Connection to host could not be established: Incorrect answer from server."
-msgstr "Verbindung zum Host konnte nicht aufgebaut werden: Fehlerhafte Antwort vom Server."
-
-#: ../src/common/zeroconf/client_zeroconf.py:205
+#: ../src/common/zeroconf/client_zeroconf.py:149
+#: ../src/common/zeroconf/client_zeroconf.py:232
 msgid "Connection to host could not be established"
 msgstr "Verbindung zu Host konnte nicht hergestellt werden"
 
-#: ../src/common/zeroconf/client_zeroconf.py:339
-msgid "Connection to host could not be established: Timeout while sending data."
-msgstr "Verbindung zum Host konnte nicht hergestellt werden: Zeitüberschreitung beim Senden von Daten."
+#: ../src/common/zeroconf/client_zeroconf.py:206
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
+msgstr ""
+"Verbindung zum Host konnte nicht aufgebaut werden: Fehlerhafte Antwort vom "
+"Server."
 
-#: ../src/common/zeroconf/client_zeroconf.py:632
+#: ../src/common/zeroconf/client_zeroconf.py:366
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"Verbindung zum Host konnte nicht hergestellt werden: Zeitüberschreitung beim "
+"Senden von Daten."
+
+#: ../src/common/zeroconf/client_zeroconf.py:652
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt ist offline. Ihre Nachricht konnte nicht versendet werden."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:197
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:243
+#, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"Der Host %s, den Sie für die erweiterte Option ft_override_host_to_send "
+"angeben haben ist ungültig und wird ignoriert."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:210
 msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "Um weiterhin Nachrichten Senden und Empfangen zu können, müssen Sie sich erneut verbinden."
+msgstr ""
+"Um weiterhin Nachrichten Senden und Empfangen zu können, müssen Sie sich "
+"erneut verbinden."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:233
 msgid "Avahi error"
 msgstr "Avahi-Fehler"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:233
 #, python-format
 msgid ""
 "%s\n"
@@ -6561,233 +7873,567 @@ msgstr ""
 "%s\n"
 "Lokaler Nachrichtenversand funktioniert eventuell nicht richtig."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#: ../src/common/zeroconf/connection_zeroconf.py:244
 msgid "Please check if Avahi is installed."
 msgstr "Bitte überprüfen Sie, ob Avahi installiert ist."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#: ../src/common/zeroconf/connection_zeroconf.py:231
+#: ../src/common/zeroconf/connection_zeroconf.py:253
+#: ../src/common/zeroconf/connection_zeroconf.py:257
 msgid "Could not start local service"
 msgstr "Lokaler Dienst konnte nicht gestartet werden"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:228
+#: ../src/common/zeroconf/connection_zeroconf.py:254
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Konnte nicht mit Port %d verbinden."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:232
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:258
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "Please check if avahi-daemon is running."
 msgstr "Bitte überprüfen Sie, ob avahi-daemon läuft."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:324
+#: ../src/common/zeroconf/connection_zeroconf.py:352
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Der Status des Kontos \"%s\" konnte nicht geändert werden."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:341
-msgid "You are not connected or not visible to others. Your message could not be sent."
-msgstr "Sie sind nicht verbunden oder für andere nicht sichtbar. Ihre Nachricht konnte nicht versendet werden."
+#: ../src/common/zeroconf/connection_zeroconf.py:369
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+"Sie sind nicht verbunden oder für andere nicht sichtbar. Ihre Nachricht "
+"konnte nicht versendet werden."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:353
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid "[This message is encrypted]"
 msgstr "[Diese Nachricht ist verschlüsselt]"
 
-#: ../src/common/zeroconf/zeroconf.py:180
+#: ../src/common/zeroconf/zeroconf_avahi.py:183
+#: ../src/common/zeroconf/zeroconf_bonjour.py:194
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "Fehler beim Hinzufügen des Dienstes. %s"
 
+#, fuzzy
+#~ msgid "Select the account with which to synchronise"
+#~ msgstr "JID des Kontakts mit dem Sie chatten möchten"
+
+#~ msgid "Save passphrase"
+#~ msgstr "Passphrase speichern"
+
+#~ msgid ""
+#~ "To continue, Gajim needs to access your stored secrets. Enter your "
+#~ "passphrase"
+#~ msgstr ""
+#~ "Um fortzufahren benötigt Gajim Zugriff auf Ihre gespeicherten Passwörter. "
+#~ "Geben Sie Ihre Passphrase ein"
+
+#, fuzzy
+#~ msgid "Confirm Passphrase"
+#~ msgstr "Falsche Passphrase"
+
+#, fuzzy
+#~ msgid "Enter your new passphrase again for confirmation"
+#~ msgstr "Erneut eingeben zur Bestätigung:"
+
+#, fuzzy
+#~ msgid "Create Passphrase"
+#~ msgstr "Passphrase speichern"
+
+#~ msgid "Passphrases did not match.\n"
+#~ msgstr "Passwörter stimmen nicht überein.\n"
+
+#~ msgid "Gajim needs you to create a passphrase to encrypt stored secrets"
+#~ msgstr ""
+#~ "Sie müssen eine Passphrase angeben um Ihre gespeicherten Passwörter zu "
+#~ "verschlüsseln"
+
+#~ msgid "Invite _Friends"
+#~ msgstr "_Freunde einladen"
+
+#~ msgid "Build custom query"
+#~ msgstr "Personalisierte Anfrage bauen"
+
+#~ msgid ""
+#~ "Enter a contact jid or MUC jid here to view its history.\n"
+#~ "If a contact is connected you can even enter his nick name.\n"
+#~ msgstr ""
+#~ "Geben Sie hier eine JID ein, im ihren Verlauf anzusehen.\n"
+#~ "Wenn ein Kontakt eingeloggt ist, können Sie sogar seinen Spitznamen "
+#~ "eingeben.\n"
+
+#~ msgid "Query Builder..."
+#~ msgstr "Anfrage-Baukasten ..."
+
+#~ msgid "%s does not appear to be a valid JID"
+#~ msgstr "%s scheint keine gültige JID zu sein"
+
+#~ msgid "_Discover Services..."
+#~ msgstr "_Durchsuche Dienste..."
+
+#~ msgid "_Retype Password:"
+#~ msgstr "Passwort e_rneut eingeben:"
+
+#~ msgid "_Use proxy"
+#~ msgstr "_Proxy benutzen"
+
+#~ msgid "Accounts"
+#~ msgstr "Konten"
+
+#~ msgid ""
+#~ "If checked, all local contacts that use a Bonjour compatible chat client "
+#~ "(like iChat, Trillian or Gaim) will be shown in roster. You don't need to "
+#~ "be connected to a jabber server for it to work.\n"
+#~ "This is only available if python-avahi is installed and avahi-daemon is "
+#~ "running."
+#~ msgstr ""
+#~ "Wenn aktiviert, werden alle lokalen Kontakte, welche einen zu Bonjour "
+#~ "kompatiblen Chat-Client (Wie z.B. iChat, Trillian oder Gaim) nutzen, in "
+#~ "Ihrer Kontaktliste angezeigt. Dafür müssen Sie nicht mit einem Jabber-"
+#~ "Server verbunden sein.\n"
+#~ "Dies ist nur möglich, wenn python-avahi verfügbar ist und avahi-daemon "
+#~ "läuft (Automatische Diensterkennung)."
+
+#~ msgid ""
+#~ "If you have 2 or more accounts and this is checked, Gajim will list all "
+#~ "contacts as if you had one account"
+#~ msgstr ""
+#~ "Wenn Sie zwei oder mehr Konten haben und diese Option gewählt ist, wird "
+#~ "Gajim alle Kontakte auflisten, als hätten Sie nur ein Konto"
+
+#~ msgid "_Enable link-local messaging"
+#~ msgstr "_Kontakte im LAN anzeigen"
+
+#~ msgid "_Modify"
+#~ msgstr "_Ändern"
+
+#~ msgid "_Compact View    Alt+C"
+#~ msgstr "_Kompakte Ansicht Alt+C"
+
+#~ msgid "<b>Interface Customization</b>"
+#~ msgstr "<b>Benutzerdefiniertes Aussehen</b>"
+
+#~ msgid "Also known as iChat style"
+#~ msgstr "Auch als iChat-Stil bekannt"
+
+#~ msgid "Chat"
+#~ msgstr "Chat"
+
+#~ msgid "E_very 5 minutes"
+#~ msgstr "Alle 5 _Minuten"
+
+#~ msgid ""
+#~ "Gajim will automatically show new events by popping up the relevant window"
+#~ msgstr ""
+#~ "Gajim wird neue Ereignisse automatisch anzeigen, indem das betreffende "
+#~ "Fenster geöffnet wird"
+
+#~ msgid ""
+#~ "Gajim will notify you for new events via a popup in the bottom right of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Gajim wird Sie über neue Ereignisse mit einem Popup in der rechten "
+#~ "unteren Ecke des Bildschirms benachrichtigen"
+
+#~ msgid ""
+#~ "Gajim will notify you via a popup window in the bottom right of the "
+#~ "screen about contacts that just signed in"
+#~ msgstr ""
+#~ "Gajim wird Sie über ein Popup-Fenster in der rechten unteren Ecke des "
+#~ "Bildschirmes über Kontakte informieren, die sich gerade angemeldet haben"
+
+#~ msgid ""
+#~ "Gajim will only change the icon of the contact that triggered the new "
+#~ "event"
+#~ msgstr ""
+#~ "Gajim wird nur das Symbol des Kontaktes ändern, von dem die neue "
+#~ "Nachricht kommt"
+
+#~ msgid ""
+#~ "If checked, Gajim will remember the roster and chat window positions in "
+#~ "the screen and the sizes of them next time you run it"
+#~ msgstr ""
+#~ "Wenn aktiviert, erinnert sich Gajim an die Position und Größe der "
+#~ "Kontaktliste auf dem Bildschirm beim nächsten Start"
+
+#~ msgid "On every _message"
+#~ msgstr "In jeder _Zeile"
+
+#~ msgid "Outgoing Chat state noti_fications:"
+#~ msgstr "_Sende Chatstatus:"
+
+#~ msgid "Print time:"
+#~ msgstr "Zeit anzeigen:"
+
+#~ msgid "Save _position and size for roster and chat windows"
+#~ msgstr "Speichere _Position und Größe der Kontaktliste und Chatfenster"
+
+#~ msgid "Show only in _roster"
+#~ msgstr "Nur in der _Kontaktliste anzeigen"
+
+#~ msgid "Use t_rayicon (aka. notification area icon)"
+#~ msgstr "Verwende _Trayicon (Benachrichtigungs-Icon)"
+
+#~ msgid ""
+#~ "When a new event (message, file transfer request etc..) is received, the "
+#~ "following methods may be used to inform you about it. Please note that "
+#~ "events about new messages only occur if it is a new message from a "
+#~ "contact you are not already chatting with"
+#~ msgstr ""
+#~ "Wenn ein neues Ereignis (Nachricht, Dateitransferanfrage usw.) empfangen "
+#~ "wird, können die folgenden Methoden zur Benachrichtigung verwendet "
+#~ "werden. Bitte beachten Sie, dass Ereignisse über neue Nachrichten nur "
+#~ "auftreten, wenn Sie eine Nachricht von einem Kontakt erhalten, mit dem "
+#~ "Sie nicht bereits chatten"
+
+#~ msgid "_Never"
+#~ msgstr "_Nie"
+
+#~ msgid "_Notify me about it"
+#~ msgstr "Be_nachrichtigen"
+
+#~ msgid "_Pop it up"
+#~ msgstr "_Öffnen"
+
+#~ msgid "_Remove from Roster"
+#~ msgstr "Entfernen von _Kontaktliste"
+
+#~ msgid "_Filter:"
+#~ msgstr "_Filter:"
+
+#~ msgid ""
+#~ "If that is not your language for which you want to highlight misspelled "
+#~ "words, then please set your $LANG as appropriate. Eg. for French do "
+#~ "export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to "
+#~ "make it global in /etc/profile.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Wenn das nicht die Sprache ist, für die Sie falschgeschriebene Wörter "
+#~ "hervorheben möchten, setzen Sie bitte Ihre $LANG entsprechend. Z.B. für "
+#~ "Französisch: export LANG=fr_FR oder export LANG=fr_FR.UTF-8 in ~/."
+#~ "bash_profile or global in /etc/profile.\n"
+#~ "\n"
+#~ "Falschgeschriebene Wörter werden nicht hervorgehoben"
+
+#~ msgid "Every %s _minutes"
+#~ msgstr "Alle %s _Minuten"
+
+#~ msgid "You must enter a password for the new account."
+#~ msgstr "Sie müssen ein Passwort für das neue Konto eingeben."
+
+#~ msgid "Drop %s in group %s"
+#~ msgstr "Setze %s in Gruppe %s"
+
+#~ msgid "Make %s and %s metacontacts"
+#~ msgstr "Mache %s und %s Metakontakte"
+
+#~ msgid "Hides the buttons in two persons chat window."
+#~ msgstr "Versteckt die Knöpfe im Zwei-Personen-Chatfenster"
+
+#~ msgid "Security error connecting to \"%s\""
+#~ msgstr "Konnte nicht mit %s verbinden"
+
+#~ msgid ""
+#~ "The server's key has changed, or someone is trying to hack your "
+#~ "connection."
+#~ msgstr ""
+#~ "Der Schlüssel des Servers wurde geändert oder jemand versucht ihre "
+#~ "Verbindung zu hacken."
+
+#~ msgid "Unable to check fingerprint for %s. Connection could be insecure."
+#~ msgstr ""
+#~ "Konnte Fingerabdruck von %s nicht überprüfen. Die Verbindung ist "
+#~ "möglicherweise unsicher."
+
+#~ msgid "Missing fingerprint in SSL connection to %s"
+#~ msgstr "Fehlender Fingerabdruck in der SSL-Verbindung zu %s"
+
+#~ msgid "Fingerprint mismatch for %s: Got %s, expected %s"
+#~ msgstr "Fingerabdruck von %s stimmt nicht überein: Erhalten %s, erwartet %s"
+
+#~ msgid " %d unread single message"
+#~ msgid_plural " %d unread single messages"
+#~ msgstr[0] " %d ungelesene Einzel-Nachricht"
+#~ msgstr[1] " %d ungelesene Einzel-Nachrichten"
+
+#~ msgid " %d unread group chat message"
+#~ msgid_plural " %d unread group chat messages"
+#~ msgstr[0] " %d ungelesene Gruppenchat-Nachricht"
+#~ msgstr[1] " %d ungelesene Gruppenchat-Nachrichten"
+
+#~ msgid " %d unread private message"
+#~ msgid_plural " %d unread private messages"
+#~ msgstr[0] " %d ungelesene private Nachricht"
+#~ msgstr[1] " %d ungelesene private Nachrichten"
+
+#~ msgid "gtk+"
+#~ msgstr "gtk+"
+
 #~ msgid "Private Chat"
 #~ msgstr "Privater Chat"
+
 #~ msgid "Group Chat"
 #~ msgstr "Gruppenchat"
+
 #~ msgid "invisible"
 #~ msgstr "unsichtbar"
+
 #~ msgid "offline"
 #~ msgstr "abgemeldet"
+
 #~ msgid "I'm %s"
 #~ msgstr "Ich bin %s"
+
 #~ msgid "2003-12-13T18:30:02Z"
 #~ msgstr "2003-12-13T18:30:02Z"
+
 #~ msgid "<small>Romeo and Juliet</small>"
 #~ msgstr "<small>Romeo und Julia</small>"
+
 #~ msgid "Old stories"
 #~ msgstr "Alte Geschichten"
+
 #~ msgid "Soliloquy"
 #~ msgstr "Selbstgespräch"
+
 #~ msgid "A_fter nickname:"
 #~ msgstr "Nach dem Spit_znamen:"
+
 #~ msgid "B_efore nickname:"
 #~ msgstr "Vor d_em Spitznamen:"
+
 #~ msgid "_After time:"
 #~ msgstr "_Nach der Zeit:"
+
 #~ msgid "_Before time:"
 #~ msgstr "_Vor der Zeit:"
+
 #~ msgid "_Publish"
 #~ msgstr "_Veröffentlichen"
+
 #~ msgid "_Retrieve"
 #~ msgstr "Ab_rufen"
+
 #~ msgid "Information published"
 #~ msgstr "Informationen veröffentlicht"
+
 #~ msgid "Without a connection, you can not get your contact information."
 #~ msgstr "Sie müssen angemeldet sein, um Kontakt-Informationen abzurufen"
+
 #~ msgid "This is result of query."
 #~ msgstr "Dies ist das Ergebnis der Anfrage."
+
 #~ msgid "Edit items on the list"
 #~ msgstr "Bearbeite Punkte auf der Liste"
+
 #~ msgid "Receive a Message"
 #~ msgstr "Nachricht empfangen"
+
 #~ msgid "Role: "
 #~ msgstr "Rolle:"
-#~ msgid "Affiliation: "
-#~ msgstr "Zugehörigkeit: "
+
 #~ msgid ""
 #~ "Sound to play when any MUC message arrives. (This setting is taken into "
 #~ "account only if notify_on_all_muc_messages is True)"
 #~ msgstr ""
 #~ "Abzuspielender Ton, falls eine MUC-Nachricht ankommt. (Diese Einstellung "
 #~ "wirdnur beachtet, wenn notify_on_all_muc_messages aktiviert ist)"
+
 #~ msgid "Create your own Privacy Lists"
 #~ msgstr "Erstelle eigene Privatliste"
+
 #~ msgid "Server-based Privacy Lists"
 #~ msgstr "Server-basierte Privatliste"
+
 #~ msgid "Contact _Info"
 #~ msgstr "Kontakt-_Info"
+
 #~ msgid "Jabber ID"
 #~ msgstr "Jabber-ID"
+
 #~ msgid "User ID"
 #~ msgstr "Benutzer-ID"
+
 #~ msgid "Invalid room or server name"
 #~ msgstr "Ungültiger Raum oder Servername"
+
 #~ msgid "Unknown D-Bus version: %s"
 #~ msgstr "Unbekannte D-BUS-Version: %s"
+
 #~ msgid "vCard publication succeeded"
 #~ msgstr "vCard erfolgreich veröffentlicht"
+
 #~ msgid "Your personal information has been published successfully."
 #~ msgstr "Ihre persönlichen Informationen wurden erfolgreich veröffentlicht."
+
 #~ msgid "Gajim - %d unread message"
 #~ msgid_plural "Gajim - %d unread messages"
 #~ msgstr[0] "Gajim - %d ungelesene Nachricht"
 #~ msgstr[1] "Gajim - %d ungelesene Nachrichten"
+
 #~ msgid "Since %s"
 #~ msgstr "Seit %s"
+
 #~ msgid "Personal details"
 #~ msgstr "Persönliche Details"
+
 #~ msgid "Be right back"
 #~ msgstr "Bin gleich zurück"
+
 #~ msgid "Jabber"
 #~ msgstr "Jabber"
+
 #~ msgid "Migrating Logs..."
 #~ msgstr "Migriere Logs ..."
+
 #~ msgid "Automatically authorize contact"
 #~ msgstr "Kontakt automatisch autorisieren"
+
 #~ msgid "Send File"
 #~ msgstr "Datei Senden"
+
 #~ msgid "Underline"
 #~ msgstr "Unterstreichen"
+
 #~ msgid "_Join New Room..."
 #~ msgstr "_Neuen Raum betreten..."
-#~ msgid "Usage: /%s, sets the groupchat window to compact mode."
-#~ msgstr "Bedienung: /%s, stellt das Gruppenchat-Fenster auf Kompaktmodus."
+
 #~ msgid "<b>Please modify your special notification below</b>"
 #~ msgstr "<b>Bitte wählen Sie eine der Optionen:</b>"
+
 #~ msgid "Delete Message of the Day"
 #~ msgstr "Lösche Nachricht des Tages"
-#~ msgid "I want a notification popup:"
-#~ msgstr "Sende Statusbenachrichtigungen:"
+
 #~ msgid "I want to listen to:"
 #~ msgstr "%s möchte ihnen eine Datei senden:"
+
 #~ msgid "Send _New Message..."
 #~ msgstr "Sende _neue Nachricht..."
+
 #~ msgid "Set Message of the Day"
 #~ msgstr "Setze Message of the Day"
+
 #~ msgid "Update Message of the Day"
 #~ msgstr "Aktualisiere Nachricht des Tages (MOTD)"
+
 #~ msgid "_XML Console..."
 #~ msgstr "_XML Konsole..."
-#~ msgid "Choose Avatar"
-#~ msgstr "Avatar auswählen"
+
 #~ msgid "Use compact view when you open a chat window"
 #~ msgstr "Kompaktansicht verwenden, wenn Sie ein Chatfenster öffnen"
+
 #~ msgid "Use compact view when you open a group chat window"
 #~ msgstr "Verwende Kompaktansicht wenn ein Gruppenchat-Fenster geöffnet wird"
+
 #~ msgid "plain"
 #~ msgstr "plain"
+
 #~ msgid "Send"
 #~ msgstr "Senden"
+
 #~ msgid "%(nickname)s in room %(room_name)s has sent you a new message."
 #~ msgstr ""
 #~ "%(nickname)s im Raum %(room_name)s hat Ihnen eine neue Nachricht gesendet."
+
 #~ msgid "%s has sent you a new message."
 #~ msgstr "%s hat Ihnen eine neue Nachricht gesendet."
+
 #~ msgid "GUI Migration failed"
 #~ msgstr "vCard Veröffentlichung fehlgeschlagen"
+
 #~ msgid "Logs have been successfully migrated to the database."
 #~ msgstr "Logs wurden erfolgreich in die Datenbank migriert."
+
 #~ msgid "If checked, Gajim will also have a trayicon"
 #~ msgstr "Wenn aktiviert, wird Gajim ein Tray-Symbol verwenden"
+
 #~ msgid "Start Chat with Contact"
 #~ msgstr "Starte Chat mit Account %s"
+
 #~ msgid "All contacts in this group are offline or have errors"
 #~ msgstr "Alle Kontakte dieser Gruppe sind abgemeldet oder haben Fehler"
+
 #~ msgid "Size: "
 #~ msgstr "Größe: "
+
 #~ msgid "Session bus is not available"
 #~ msgstr "Session-Bus nicht verfügbar"
+
 #~ msgid "Sound"
 #~ msgstr "Sound"
+
 #~ msgid "Image"
 #~ msgstr "Bild"
-#~ msgid "From %s"
-#~ msgstr "Von %s"
+
 #~ msgid "To %s"
 #~ msgstr "An %s"
+
 #~ msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 #~ msgstr "Sie wurden in den Raum %(room_jid)s von %(contact_jid)s eingeladen"
+
 #~ msgid "Manage Emoticons"
 #~ msgstr "Emoticons anpassen"
+
 #~ msgid "Or choose a preset message:"
 #~ msgstr "Oder wählen Sie eine voreingestellte Nachricht:"
+
 #~ msgid "Use _emoticons"
 #~ msgstr "_Emoticons verwenden"
+
 #~ msgid "_Set Image..."
 #~ msgstr "_Bild wählen..."
+
 #~ msgid "Switch to %s"
 #~ msgstr "Wechseln zu %s"
+
 #~ msgid "using account "
 #~ msgstr "mit Konto"
+
 #~ msgid "The filesize of image \"%s\" is too large"
 #~ msgstr "Die Dateigröße des Bildes \"%s\" ist zu groß"
+
 #~ msgid "The file must not be more than 32 kilobytes."
 #~ msgstr "Die Datei darf nicht größer als 32 Kilobytes sein."
+
 #~ msgid "Timeout"
 #~ msgstr "Timeout"
+
 #~ msgid "account: "
 #~ msgstr "Konto: "
+
 #~ msgid "Are you sure you want to leave rooms \"%s\"?"
 #~ msgstr "Möchten Sie die Räume \"%s\" wirklich verlassen?"
+
 #~ msgid "If you close this window, you will be disconnected from these rooms."
 #~ msgstr ""
 #~ "Wenn Sie dieses Fenster schließen, wird die Verbindung mit diesen Räumen "
 #~ "abgebrochen."
+
 #~ msgid "Activate/Disable notification for when a file transfer is complete"
 #~ msgstr "Benachrichtigung für beendete Dateitransfers ein/ausschalten"
+
 #~ msgid "Removing selected file transfer"
 #~ msgstr "Ausgewählten Dateitransfer entfernen"
+
 #~ msgid "Stoping selected file transfer"
 #~ msgstr "Bricht den ausgewählten Dateitransfer ab"
+
 #~ msgid ""
 #~ "If you close this tab and you have history disabled, the message will be "
 #~ "lost."
 #~ msgstr ""
 #~ "Wenn Sie diesen Reiter schließen und die History abgeschaltet haben, ist "
 #~ "die Nachricht verloren."
+
 #~ msgid "Cannot remove last group"
 #~ msgstr "Letzte Gruppe kann nicht entfernt werden"
+
 #~ msgid "At least one contact group must be present."
 #~ msgstr "Mindestens eine Gruppe wird benötigt."
+
 #~ msgid ""
 #~ "pysqlite2 (aka python-pysqlite2) dependency is missing. After you install "
 #~ "pysqlite3, if you want to migrate your logs to the new database, please "
@@ -6797,47 +8443,64 @@ msgstr "Fehler beim Hinzufügen des Dienstes. %s"
 #~ "Sie pysqlite2installiert haben, wenn Sie Ihre Logs in die neue Datenbank "
 #~ "migrieren möchte, lesen Siebitte: http://trac.gajim.org/wiki/"
 #~ "MigrateLogToDot9DB Beende ..."
-#~ msgid "Image is too big"
-#~ msgstr "Das Bild ist zu groß"
+
 #~ msgid ""
 #~ "Image for emoticon has to be less than or equal to 24 pixels in width and "
 #~ "24 in height."
 #~ msgstr ""
 #~ "Das Bild darf eine Höhe und Breite von je 24 Pixeln nicht überschreiten."
+
 #~ msgid "<b>Changes in latest version</b>"
 #~ msgstr "<b>Änderungen in der neuesten Version</b>"
+
 #~ msgid "Check for new _version on Gajim startup"
 #~ msgstr "Beim Start von Gajim auf neue _Versionen prüfen"
+
 #~ msgid "Log history"
 #~ msgstr "Log-Verlauf"
+
 #~ msgid "New version of Gajim available"
 #~ msgstr "Es ist eine neue Version von Gajim verfügbar"
+
 #~ msgid "Open Download Page"
 #~ msgstr "Download-Seite öffnen"
+
 #~ msgid "(%s/s)"
 #~ msgstr "(%s/s)"
+
 #~ msgid "Session bus is not available."
 #~ msgstr "Session-Bus nicht verfügbar."
+
 #~ msgid "with account "
 #~ msgstr "Konto: "
+
 #~ msgid "Chat with"
 #~ msgstr "Unterhalten mit"
+
 #~ msgid "as %s"
 #~ msgstr "als %s"
+
 #~ msgid "as "
 #~ msgstr "als "
+
 #~ msgid "Send _New Message"
 #~ msgstr "Sende _neue Nachricht"
+
 #~ msgid "Re_quest Authorization from"
 #~ msgstr "Autorisierung anfordern"
+
 #~ msgid "Send Authorization to"
 #~ msgstr "Autorisierung senden"
+
 #~ msgid "<b>Log</b>"
 #~ msgstr "<b>Log</b>"
+
 #~ msgid "Log presences in _contact's log file"
 #~ msgstr "Anwesenheit in _Kontakt-Logdateien schreiben"
+
 #~ msgid "Log presences in an _external file"
 #~ msgstr "Anwesenheit in eine _externe Datei speichern"
+
 #~ msgid ""
 #~ "You can set advanced account options by pressing Advanced button,or later "
 #~ "by clicking in Accounts menuitem under Edit menu from the main window."
@@ -6845,12 +8508,14 @@ msgstr "Fehler beim Hinzufügen des Dienstes. %s"
 #~ "Sie können die erweiterten Konten-Optionen durch Klicken des Erweitert-"
 #~ "Buttons erreichen, oder später durch klicken des Konten Menüitems im "
 #~ "Bearbeiten-Menü."
+
 #~ msgid ""
 #~ "Set value of 'key' to 'value'. If there is no such key, new item in the "
 #~ "preferences is inserted."
 #~ msgstr ""
 #~ "Setze den Wert von 'key' auf 'value'. Wenn kein solcher key existiert "
 #~ "wirdeine neuer Wert in den Einstellungen erstellt."
+
 #~ msgid ""
 #~ "When a new message is received which is not from a contact already in a "
 #~ "chat window, the three following actions may happen in order for you to "
@@ -6859,20 +8524,28 @@ msgstr "Fehler beim Hinzufügen des Dienstes. %s"
 #~ "Wenn eine neue Nachricht von einem neuen Kontakt in einem Chatfenster "
 #~ "empfangen wird, können die drei folgenden Aktionen ausgeführt werden, um "
 #~ "Sie darüber zu informieren"
+
 #~ msgid "_Earliest"
 #~ msgstr "_Erste"
+
 #~ msgid "_Latest"
 #~ msgstr "_Letzte"
+
 #~ msgid "_Previous"
 #~ msgstr "_Vorherige"
+
 #~ msgid "Filter query too short"
 #~ msgstr "Filteranfrage zu kurz"
+
 #~ msgid "Query must be at least 3 characters long."
 #~ msgstr "Anfrage muss wenigstens 3 Zeichen lang sein."
+
 #~ msgid "%s is now %s: %s"
 #~ msgstr "%s ist jetzt %s (%s)"
+
 #~ msgid "Allow controlling Gajim via D-Bus service."
 #~ msgstr "Erlaube die Steuerung von Gajim mit dem D-Bus Dienst."
+
 #~ msgid ""
 #~ "\n"
 #~ "\n"
@@ -6885,6 +8558,7 @@ msgstr "Fehler beim Hinzufügen des Dienstes. %s"
 #~ "\n"
 #~ "== Originalnachricht ==\n"
 #~ "%s"
+
 #~ msgid ""
 #~ "Your new account has been created successfully.\n"
 #~ "You can set advanced account options by pressing Advanced button,\n"
@@ -6893,6 +8567,7 @@ msgstr "Fehler beim Hinzufügen des Dienstes. %s"
 #~ msgstr ""
 #~ "Konto wurde erfolgreich hinzugefügt.\n"
 #~ "Erweiterte Optionen sind über \"Ändern->Konten\" zu erreichen."
+
 #~ msgid ""
 #~ "When we remove a contact, remove both his and our subscription, so we do "
 #~ "not receive his presence anymore and he ours."
@@ -6900,18 +8575,17 @@ msgstr "Fehler beim Hinzufügen des Dienstes. %s"
 #~ "Wenn wir einen Kontakt entfernen, lösche sowohl sein als auch unser "
 #~ "Abonnement, damitwir nicht mehr gegenseitig über die Präsenz informiert "
 #~ "werden"
+
 #~ msgid ""
 #~ "Should Gajim send inactive (\"is doing something else\") on just focus "
 #~ "out of window/switch to another tab?"
 #~ msgstr ""
 #~ "Soll Gajim Inaktivitätsbenachrichtungen von Tabs im Fokus an andere "
 #~ "Fenster/Tabs senden?"
-#~ msgid "Error:"
-#~ msgstr "Fehler:"
+
 #~ msgid "Service"
 #~ msgstr "Dienst"
-#~ msgid "Node"
-#~ msgstr "Node"
+
 #~ 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 "
@@ -6919,49 +8593,69 @@ msgstr "Fehler beim Hinzufügen des Dienstes. %s"
 #~ msgstr ""
 #~ "Ihr neues Konto wurde erstellt und der Gajimkonfiguration hinzugefügt.\n"
 #~ "Erweiterte Optionen sind über \"Ändern->Konten\" zu erreichen."
+
 #~ msgid "You need to enter a valid server address to add an account."
 #~ msgstr ""
 #~ "Sie müssen einen gültigen Server angeben, um ein neues Konto zu erstellen."
+
 #~ msgid "Contact names must be of the form \"user@servername\"."
 #~ msgstr "Benutzernamen müssen die Form \"benutzer@servername\" haben."
+
 #~ msgid "Invalid contact ID"
 #~ msgstr "Ungültige Benutzer-ID"
+
 #~ msgid "Contact ID must be of the form \"username@servername\"."
 #~ msgstr "Benutzer-ID muss in der Form \"username@servername\" sein."
+
 #~ msgid "Account registration successful"
 #~ msgstr "Kontoregistrierung erfolgreich"
+
 #~ msgid "The account \"%s\" has been registered with the Jabber server."
 #~ msgstr "Konto \"%s\" wurde auf dem Jabberserver registriert."
+
 #~ msgid "theme_name"
 #~ msgstr "thema_name"
+
 #~ msgid "Edit"
 #~ msgstr "_Ändern"
+
 #~ msgid "<b>Please fill in the data for your existing account</b>"
 #~ msgstr "<b>Bitte tragen Sie die Daten für ihr bestehendes Konto ein</b>"
+
 #~ msgid "Check if you want to register for a new jabber account"
 #~ msgstr "Prüfen Sie, ob Sie ein neues Konto erstellen möchten"
+
 #~ msgid "Click to get contact's extended information"
 #~ msgstr "Klicken, um erweiterte Informationen des Kontaktes einzusehen"
+
 #~ msgid "_Compact View"
 #~ msgstr "_Kompakte Ansicht"
+
 #~ msgid "_Refresh"
 #~ msgstr "_Aktualisieren"
+
 #~ msgid "_Register new account"
 #~ msgstr "Neues Konto e_rstellen"
+
 #~ msgid "You just received a new message in room \"%s\""
 #~ msgstr "Sie haben eine neue Nachricht im Raum \"%s\" erhalten"
+
 #~ msgid ""
 #~ "If you close this window and you have history disabled, this message will "
 #~ "be lost."
 #~ msgstr ""
 #~ "Wenn sie das Fenster schließen und die History abgeschaltet haben, geht "
 #~ "die Nachricht verloren."
+
 #~ msgid "New _Room"
 #~ msgstr "Neuer _Raum"
+
 #~ msgid "Always use compact _view"
 #~ msgstr "Benutze immer die kompakte Ansicht"
+
 #~ msgid "Banner:"
 #~ msgstr "Banner:"
+
 #~ msgid ""
 #~ "If checked, all chat and group chat windows will have the information "
 #~ "area in the top and the buttons area in the bottom hidden. You can quick "
@@ -6972,28 +8666,34 @@ msgstr "Fehler beim Hinzufügen des Dienstes. %s"
 #~ "den Chat- und Chatraumfenstern ausgeblendet.  Mit Alt+C können Sie "
 #~ "schnell zwischen der kompakten und der normalen Ansicht umschalten. "
 #~ "Achtung: die jeweils letzte Ansicht wird nicht beibehalten"
+
 #~ msgid "Inactivate account"
 #~ msgstr "Kein aktives Konto"
-#~ msgid "Join _Group Chat..."
-#~ msgstr "_Chatraum beitreten..."
+
 #~ msgid "Po_sition:"
 #~ msgstr "Position:"
+
 #~ msgid "Show roster window on Gajim startup"
 #~ msgstr "Kontaktliste beim Start von Gajim anzeigen"
+
 #~ msgid "_Service Discovery"
 #~ msgstr "_Dienste durchsuchen"
+
 #~ msgid "_Service Discovery..."
 #~ msgstr "_Dienste durchsuchen..."
+
 #~ msgid "error appeared while processing xmpp:"
 #~ msgstr "Fehler während der Verarbeitung von xmpp:"
+
 #~ msgid ""
 #~ "Cancels the selected file transfer. If there is an incomplete file, kept "
 #~ "in the file system it will be removed. This operation is not reversable"
 #~ msgstr ""
 #~ "Stoppt den ausgewählten Dateitransfer. Unvollständige Dateien werden "
 #~ "gelöscht. Diese Aktion ist nicht rückgangig zu machen."
+
 #~ msgid "Chan_ge"
 #~ msgstr "_Ändern"
+
 #~ msgid "Unknown type %s "
 #~ msgstr "Unbekannter Typ %s "
-
diff --git a/po/fr.po b/po/fr.po
index 7c2f28549..7149ff9ff 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2524,19 +2524,19 @@ msgstr "texte du message d'état :"
 
 #: ../src/config.py:1036
 msgid "First Message Received"
-msgstr "Premier Message Reçu"
+msgstr "Premier message reçu"
 
 #: ../src/config.py:1037
 msgid "Next Message Received"
-msgstr "Message Suivant Reçu"
+msgstr "Message reçu suivant"
 
 #: ../src/config.py:1038
 msgid "Contact Connected"
-msgstr "Contacte Connecté"
+msgstr "Contact connecté"
 
 #: ../src/config.py:1039
 msgid "Contact Disconnected"
-msgstr "Contacte déconnecté"
+msgstr "Contact déconnecté"
 
 #: ../src/config.py:1040
 msgid "Message Sent"
diff --git a/po/gl_ES.po b/po/gl.po
index dd3d202a6..dd3d202a6 100644
--- a/po/gl_ES.po
+++ b/po/gl.po
diff --git a/po/it.po b/po/it.po
index fbaf570e1..1cf26330b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,17 +5,18 @@
 # Mauro Brenna <malloblenne@gmail.com>, 2005,2006.
 # Andrea Ratti <scimiot@yahoo.it>, 2005.
 # Matteo Dell'Amico <della@linux.it>, 2005, 2006.
-#: ../src/gajim-remote.py:203 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:236 ../src/gajim-remote.py:237
-#: ../src/gajim-remote.py:243 ../src/gajim-remote.py:244
+# Daniel Coppi <neoex.dc@gmail.com>, 2007.
+#: ../src/gajim-remote.py:212 ../src/gajim-remote.py:219
 #: ../src/gajim-remote.py:245 ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:252 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254 ../src/gajim-remote.py:255
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-19 11:39+0100\n"
-"PO-Revision-Date: 2007-01-31 14:26+0100\n"
-"Last-Translator: Matteo Dell'Amico <della@linux.it>\n"
+"POT-Creation-Date: 2007-09-14 21:09+0200\n"
+"PO-Revision-Date: 2007-09-14 20:53+0100\n"
+"Last-Translator: neoex <neoex.dc@gmail.com>\n"
 "Language-Team: Italian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,35 +36,35 @@ msgid "Jabber IM Client"
 msgstr "Client IM Jabber"
 
 #: ../data/glade/account_context_menu.glade.h:1
-msgid "Send Single _Message..."
-msgstr "Invia _messaggio singolo..."
+#: ../data/glade/roster_window.glade.h:8
+msgid "Join _Group Chat..."
+msgstr "Entra in chat di _gruppo..."
 
 #: ../data/glade/account_context_menu.glade.h:2
 msgid "_Add Contact..."
 msgstr "_Aggiungi Contatto..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-msgid "_Discover Services..."
-msgstr "_Ricerca servizi..."
+#: ../data/glade/roster_window.glade.h:15
+msgid "_Discover Services"
+msgstr "_Ricerca servizi"
 
-#: ../data/glade/account_context_menu.glade.h:4 ../src/disco.py:1145
+#: ../data/glade/account_context_menu.glade.h:4
 msgid "_Execute Command..."
-msgstr "Esegui _comando..."
+msgstr "_Esegui comando..."
 
 #: ../data/glade/account_context_menu.glade.h:5
-#: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "Chat di _gruppo"
+msgid "_Modify Account"
+msgstr "_Modifica account"
 
 #: ../data/glade/account_context_menu.glade.h:6
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Modifica account..."
+msgid "_Open Gmail Inbox"
+msgstr "_Apri posta ricevuta"
 
 #: ../data/glade/account_context_menu.glade.h:7
-msgid "_Open Gmail Inbox"
-msgstr "_Apri composizione email"
+#: ../data/glade/roster_window.glade.h:22
+msgid "_Start Chat..."
+msgstr "_Inizia chat..."
 
 #: ../data/glade/account_context_menu.glade.h:8
 #: ../data/glade/zeroconf_context_menu.glade.h:2
@@ -72,11 +73,11 @@ msgstr "_Stato"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:1
 msgid ""
-"<b>Account is being created</b>\n"
+"<b>Connecting to server</b>\n"
 "\n"
 "Please wait..."
 msgstr ""
-"<b>Creazione dell'account in corso</b>\n"
+"<b>Connessione al server</b>\n"
 "\n"
 "Attendere prego..."
 
@@ -89,50 +90,68 @@ msgid "<b>Please fill in the data for your new account</b>"
 msgstr "<b>Inserire i dati per il nuovo account</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:6
+msgid "<b>Please select a server</b>"
+msgstr "<b>Selezionare un server</b>"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:7
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
-"Cliccare per vedere i servizi (come i trasporti MSN o ICQ) dei server Jabber"
+"Clicca per vedere i servizi (come i trasporti MSN o ICQ) dei server Jabber"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/glade/account_creation_wizard_window.glade.h:8
 msgid "Connect when I press Finish"
-msgstr "Collegati alla pressione di Fine"
+msgstr "Connettiti alla pressione di Fine"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/glade/account_creation_wizard_window.glade.h:9
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Assistente creazione account"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:9
-msgid "I already have an account I want to use"
+#: ../data/glade/account_creation_wizard_window.glade.h:10
+#, fuzzy
+msgid "I already have an account I want to _use"
 msgstr "Ho già un account da usare"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "I want to _register for a new account"
 msgstr "Voglio _registrare un nuovo account"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
-#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:22
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Se marcato, Gajim ricorderà la password per questo account"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Pass_word:"
-msgstr "Pass_word:"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:38
-msgid "Save pass_word"
-msgstr "_Memorizza password"
+#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:32
+msgid "Manage..."
+msgstr "Gestisci..."
 
 #: ../data/glade/account_creation_wizard_window.glade.h:14
+msgid "Prox_y:"
+msgstr "Prox_y:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:48
+msgid "Save pass_word"
+msgstr "Ricorda la pass_word"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 msgid "Servers Features"
 msgstr "Servizi del server"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 msgid "Set my profile when I connect"
-msgstr "Imposta il profilo durante la connessione"
+msgstr "Configura il mio profilo appena effettuata la connessione"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:53
+msgid "Use custom hostname/port"
+msgstr "Usa hostname/porta personalizzati"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -140,67 +159,63 @@ msgstr ""
 "È necessario avere un account per connettersi\n"
 "alla rete Jabber."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:21
 msgid "Your JID:"
 msgstr "Il tuo JID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Advanced"
 msgstr "_Avanzato"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:23
 msgid "_Finish"
 msgstr "_Fine"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/manage_proxies_window.glade.h:9
-msgid "_Host:"
-msgstr "_Host:"
+#: ../data/glade/account_creation_wizard_window.glade.h:24
+msgid "_Hostname:"
+msgstr "Nome dell'_host: "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_modification_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:23
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "_Retype Password:"
-msgstr "_Ripetere password:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:27
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
-msgid "_Use proxy"
-msgstr "_Usa proxy"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_Username:"
 msgstr "_Nome utente:"
 
 #: ../data/glade/account_modification_window.glade.h:1
+#: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:8
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Varie</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:2
 #: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:3
 #: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Informazioni personali</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:4
 msgid "Account"
 msgstr "Account"
 
@@ -209,68 +224,93 @@ msgid "Account Modification"
 msgstr "Modifica account"
 
 #: ../data/glade/account_modification_window.glade.h:6
-msgid "Auto-reconnect when connection is lost"
-msgstr "Riconnettiti automaticamente quando si perde la connessione"
+#: ../data/glade/accounts_window.glade.h:5
+msgid "Administration operations"
+msgstr "Operazioni amministrative"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:6
+msgid "Auto-reconnect when connection is lost"
+msgstr "Riconnetti automaticamente quando si perde la connessione"
+
+#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:7
 #: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
-msgstr "_Connetti all'avvio di Gajim"
+msgstr "C_onnetti all'avvio di Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:8
 msgid "Chan_ge Password"
 msgstr "_Cambia password"
 
-#: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:9
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
 "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
 "default if broadcasted by the server, and with this option enabled TLS will "
 "be disabled"
 msgstr ""
-"Selezionando questa opzione Gajim si connetterà alla porta 5223, sulla quale "
-"i server più vecchi attivano SSL. Notare che Gajim usa la cifratura TLS di "
-"default se il server la annuncia, e abilitando questa opzione TLS sarà "
-"disabilitata."
+"Se marcato, Gajim si connetterà alla porta 5223, sulla quale i server più "
+"vecchi attivano SSL. Notare che Gajim usa la cifratura TLS di default se il "
+"server la annuncia, e abilitando questa opzione TLS sarà disabilitata"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:10
 #: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Scegli _chiave..."
 
-#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:11
 msgid "Click to change account's password"
-msgstr "Cliccare per cambiare la password dell'account"
+msgstr "Clicca per cambiare la password dell'account"
 
-#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:12
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+"Clicca per richiedere l'autorizzazione a tutti i contatti di un altro account"
+
+#: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:13
 msgid "Connection"
 msgstr "Connessione"
 
-#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/account_modification_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Edit Personal Information..."
 msgstr "Modifica informazioni personali..."
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:458
-#: ../src/notify.py:480 ../src/notify.py:492 ../src/common/helpers.py:914
+#. No configured account
+#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:6 ../src/notify.py:471
+#: ../src/notify.py:493 ../src/notify.py:505 ../src/common/helpers.py:964
+#: ../src/common/helpers.py:976
 msgid "Gajim"
 msgstr "Gajim"
 
-#. Contact is not in a group, so count it in General group
-#: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:51
+#. General group cannot be changed
+#: ../data/glade/account_modification_window.glade.h:17
+#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/preferences_window.glade.h:45
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:346 ../src/roster_window.py:1225
-#: ../src/roster_window.py:1436 ../src/roster_window.py:2112
-#: ../src/roster_window.py:2154 ../src/common/contacts.py:280
+#: ../src/roster_window.py:359 ../src/roster_window.py:624
+#: ../src/roster_window.py:1360 ../src/roster_window.py:1728
+#: ../src/roster_window.py:2112 ../src/roster_window.py:2628
+#: ../src/roster_window.py:2746 ../src/common/contacts.py:309
 msgid "General"
 msgstr "Generale"
 
-#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:20
 msgid "Hostname: "
 msgstr "Nome dell'host: "
 
-#: ../data/glade/account_modification_window.glade.h:17
+#: ../data/glade/account_modification_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:21
 msgid ""
 "If checked, Gajim will also broadcast some more IPs except from just your "
 "IP, so file transfer has higher chances of working."
@@ -279,7 +319,8 @@ msgstr ""
 "su cui viene eseguito, di modo che il trasferimento file abbia maggiori "
 "possibilità di funzionare correttamente."
 
-#: ../data/glade/account_modification_window.glade.h:19
+#: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/accounts_window.glade.h:23
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -287,94 +328,107 @@ msgstr ""
 "Se marcato, Gajim invierà dei pacchetti di keep-alive per prevenire il "
 "timeout che provoca una disconnessione"
 
-#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/accounts_window.glade.h:24
 #: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
 msgstr ""
 "Se marcato, Gajim memorizzerà la password in ~/.gajim/config, con permessi "
-"di lettura solo per l'utente che esegue il programma"
+"di lettura solo per l'utente corrente"
 
-#: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/accounts_window.glade.h:25
 #: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
 msgstr ""
 "Se marcato, Gajim, quando lanciato, si connetterà automaticamente a Jabber "
-"usando questo account."
+"usando questo account"
 
-#: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/account_modification_window.glade.h:24
+#: ../data/glade/accounts_window.glade.h:26
 #: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
 "accordingly"
 msgstr ""
-"Se marcato, ogni cambio allo stato globale (gestito dalla combo box sotto la "
-"lista contatti) cambierà di conseguenza lo stato di questo account"
+"Se marcato, ogni cambio allo stato globale (gestito dal menu a tendina sotto "
+"la lista contatti) cambierà anche lo stato di questo account"
 
-#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/accounts_window.glade.h:29
 msgid "Information about you, as stored in the server"
 msgstr "Informazioni su di te, archiviate sul server"
 
-#: ../data/glade/account_modification_window.glade.h:24
-msgid "Manage..."
-msgstr "Gestisci..."
-
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1617
-#: ../src/config.py:3409
+#: ../data/glade/account_modification_window.glade.h:27
+#: ../data/glade/accounts_window.glade.h:34
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1524
+#: ../src/config.py:2010
 msgid "No key selected"
 msgstr "Nessuna chiave selezionata"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1197
-#: ../src/config.py:1202 ../src/config.py:1386 ../src/config.py:1607
-#: ../src/config.py:1616 ../src/config.py:1675 ../src/config.py:1749
-#: ../src/config.py:3399 ../src/config.py:3408 ../src/dialogs.py:281
-#: ../src/dialogs.py:283
+#. GPG Key
+#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:32 ../src/config.py:1110
+#: ../src/config.py:1181 ../src/config.py:1430 ../src/config.py:1435
+#: ../src/config.py:1906 ../src/config.py:1993 ../src/config.py:2009
+#: ../src/config.py:3109 ../src/config.py:3155 ../src/dialogs.py:286
+#: ../src/dialogs.py:288 ../src/roster_window.py:1832
+#: ../src/roster_window.py:1839 ../src/roster_window.py:1846
 msgid "None"
 msgstr "Nessuno"
 
-#: ../data/glade/account_modification_window.glade.h:28
-#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/accounts_window.glade.h:37
+#: ../data/glade/profile_window.glade.h:26
 #: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Informazioni personali"
 
-#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:38
 msgid "Port: "
 msgstr "Porta: "
 
-#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:39
 msgid "Priori_ty:"
-msgstr "Pr_iorità:"
+msgstr "Priori_tà:"
 
-#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:40
 msgid ""
 "Priority is used in Jabber to determine who gets the events from the jabber "
 "server when two or more clients are connected using the same account; The "
 "client with the highest priority gets the events"
 msgstr ""
 "La priorità si usa in Jabber per determinare chi riceve gli eventi dal "
-"server Jabber, quando due o più client sono connessi usando lo stesso "
-"account; il client con la maggiore priorità riceverà gli eventi."
+"server Jabber quando due o più client sono connessi usando lo stesso "
+"account; il client con la maggiore priorità riceverà gli eventi"
 
-#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr "La priorità cambierà automaticamente in funzione del tuo stato."
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:42
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/accounts_window.glade.h:44
 msgid "Resour_ce:"
 msgstr "_Risorsa: "
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/accounts_window.glade.h:45
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -383,97 +437,132 @@ msgid ""
 "has the highest priority will get the events. (see below)"
 msgstr ""
 "La risorsa viene inviata al server Jabber per distinguere tra due o più "
-"client connessi allo stesso server. In questa maniera, è possibile "
+"client connessi allo stesso account. In questa maniera, è possibile "
 "connettersi allo stesso account con risorse 'Casa' e 'Lavoro' "
-"contemporaneamente. La risorsa con la priorità maggiore riceverà gli eventi "
-"(vedi sotto)."
+"contemporaneamente. La risorsa con la priorità maggiore riceverà gli eventi. "
+"(vedi sotto)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/accounts_window.glade.h:46
 #: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Salva _passphrase (non sicuro)"
 
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:47
 #: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
-msgstr "Memorizza i _log delle conversazioni con tutti i contatti"
+msgstr "_Registra le conversazioni con tutti i contatti"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Invia pacchetti di keep-alive"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
-msgstr "_Sincronizza lo stato dell'account con lo stato globale"
+msgstr "Sinc_ronizza lo stato dell'account con lo stato globale"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Use _SSL (legacy)"
-msgstr "Usa _SSL (legacy)"
+#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:51
+msgid "Synchronise contacts"
+msgstr "Sincronizza contatti"
 
-#: ../data/glade/account_modification_window.glade.h:42
-msgid "Use custom hostname/port"
-msgstr "Usa hostname/port personalizzati"
+#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/accounts_window.glade.h:52
+msgid "Use _SSL (legacy)"
+msgstr "Usa _SSL (vecchio)"
 
-#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:55
 msgid "Use file transfer proxies"
 msgstr "Usa proxy per il trasferimento file"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Modifica lo stato"
 
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Jabber ID:"
 msgstr "ID _Jabber:"
 
-#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/account_modification_window.glade.h:49
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: ../data/glade/accounts_window.glade.h:1
-msgid "Accounts"
-msgstr "Account"
+#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-Mail:"
 
-#: ../data/glade/accounts_window.glade.h:2
-msgid ""
-"If checked, all local contacts that use a Bonjour compatible chat client "
-"(like iChat, Trillian or Gaim) will be shown in roster. You don't need to be "
-"connected to a jabber server for it to work.\n"
-"This is only available if python-avahi is installed and avahi-daemon is "
-"running."
-msgstr ""
-"Se selezionato, tutti i contatti locali che usano un client chat compatibile "
-"con Bonjour (es. IChat, Trillian or Gaim) saranno visibili nella lista "
-"contatti. Non è necessario essere connesso a un server jabber affinché "
-"funzioni.\n"
-"Questo è possibile solo se python-avahi è installato e  avahi-daemon è in "
-"esecuzione."
+#. XML Console enable checkbutton
+#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Abilita"
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:17
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+msgid "First Name:"
+msgstr "Nome:"
+
+#: ../data/glade/accounts_window.glade.h:27
+#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
-"If you have 2 or more accounts and this is checked, Gajim will list all "
-"contacts as if you had one account"
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
 msgstr ""
-"Se marcato e se sono presenti 2 o più account, Gajim mostrerà tutti i "
-"contatti come se ci fosse un unico account"
+"Se la porta predefinita usata per i messaggi in entrata non si adatta alle "
+"tue configurazioni puoi selezionarne un'altra qui.\n"
+"Potresti considerare di cambiare la configurazione del firewall"
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:453
+msgid "Jabber ID:"
+msgstr "ID Jabber: "
+
+#: ../data/glade/accounts_window.glade.h:31
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+msgid "Last Name:"
+msgstr "Cognome:"
+
+#: ../data/glade/accounts_window.glade.h:33
 msgid "Mer_ge accounts"
 msgstr "_Unisci account"
 
-#: ../data/glade/accounts_window.glade.h:6
-msgid "_Enable link-local messaging"
-msgstr "_Abilita la messaggistica sulla rete locale"
+#. Rename
+#: ../data/glade/accounts_window.glade.h:43 ../src/roster_window.py:2698
+msgid "Re_name"
+msgstr "Ri_nomina"
 
-#: ../data/glade/accounts_window.glade.h:7
-msgid "_Modify"
-msgstr "_Modifica"
+#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+msgid "Use custom port:"
+msgstr "Usa porta personalizzata:"
 
-#: ../data/glade/accounts_window.glade.h:8
-#: ../data/glade/remove_account_window.glade.h:4
-msgid "_Remove"
-msgstr "_Elimina"
+#: ../data/glade/accounts_window.glade.h:59
+msgid "gtk-add"
+msgstr "gtk-add"
+
+#: ../data/glade/accounts_window.glade.h:60
+msgid "gtk-close"
+msgstr "gtk-close"
+
+#: ../data/glade/accounts_window.glade.h:61
+msgid "gtk-remove"
+msgstr "gtk-remove"
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
@@ -508,8 +597,8 @@ msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
 msgstr ""
-"È necessario essere connesso all'account per poter aggiungere\n"
-" un contatto da questo protocollo"
+"È necessario essere connesso al trasporto per poter aggiungere\n"
+" un contatto da questo protocollo."
 
 #: ../data/glade/add_new_contact_window.glade.h:11
 msgid "_Group:"
@@ -533,11 +622,11 @@ msgstr "_ID utente:"
 
 #: ../data/glade/adhoc_commands_window.glade.h:1
 msgid "<b>An error has occurred:</b>"
-msgstr "<b>È avvenuto un errore:</b>"
+msgstr "<b>Si è verificato un errore:</b>"
 
 #: ../data/glade/adhoc_commands_window.glade.h:2
 msgid "<b>Choose command to execute:</b>"
-msgstr "<b>Scegliere il comando da eseguire:</b>"
+msgstr "<b>Scegli il comando da eseguire:</b>"
 
 #: ../data/glade/adhoc_commands_window.glade.h:3
 msgid "Ad-hoc Commands - Gajim"
@@ -545,7 +634,7 @@ msgstr "Comandi ad-hoc - Gajim"
 
 #: ../data/glade/adhoc_commands_window.glade.h:4
 msgid "Check once more"
-msgstr "Controlla un'altra volta"
+msgstr "Controlla ancora"
 
 #: ../data/glade/adhoc_commands_window.glade.h:5
 msgid "Error description..."
@@ -557,7 +646,7 @@ msgstr "Attendere durante il recupero della lista comandi..."
 
 #: ../data/glade/adhoc_commands_window.glade.h:7
 msgid "Please wait while the command is sending..."
-msgstr "Attendere durante l'invio del comando.."
+msgstr "Attendere durante l'invio del comando..."
 
 #: ../data/glade/adhoc_commands_window.glade.h:8
 msgid "Please wait..."
@@ -565,7 +654,7 @@ msgstr "Attendere..."
 
 #: ../data/glade/adhoc_commands_window.glade.h:9
 msgid "This jabber entity does not expose any commands."
-msgstr "Questa entità jabber non mostra alcun comando."
+msgstr "Questa entità Jabber non mostra alcun comando."
 
 #: ../data/glade/advanced_configuration_window.glade.h:1
 msgid "<b>Description</b>"
@@ -573,7 +662,9 @@ msgstr "<b>Descrizione</b>"
 
 #: ../data/glade/advanced_configuration_window.glade.h:2
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
-msgstr "<b>NOTA:</b> È necessario riavviare Gajim perché alcune impostazioni abbiano effetto"
+msgstr ""
+"<b>NOTA:</b> È necessario riavviare Gajim perché alcune impostazioni abbiano "
+"effetto"
 
 #: ../data/glade/advanced_configuration_window.glade.h:3
 msgid "Advanced Configuration Editor"
@@ -592,44 +683,40 @@ msgid "Deletes Message of the Day"
 msgstr "Elimina il messaggio del giorno"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:3
-msgid "Sends a message to users currently connected to this server"
-msgstr "Invia un messaggio agli utenti attualmenti connessi a questo server"
+msgid "Edit _Privacy Lists..."
+msgstr "Modifica liste _privacy..."
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:4
-msgid "Set MOTD"
-msgstr "Imposta MOTD"
+msgid "Sends a message to users currently connected to this server"
+msgstr "Invia un messaggio agli utenti attualmenti connessi a questo server"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:5
+msgid "Set MOTD..."
+msgstr "Imposta MOTD..."
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:6
 msgid "Sets Message of the Day"
 msgstr "Imposta messaggio del giorno"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/glade/advanced_menuitem_menu.glade.h:7
 msgid "Show _XML Console"
 msgstr "Mostra console _XML"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
-msgid "Update MOTD"
-msgstr "Aggiorna MOTD"
-
 #: ../data/glade/advanced_menuitem_menu.glade.h:8
+msgid "Update MOTD..."
+msgstr "Aggiorna MOTD..."
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:9
 msgid "Updates Message of the Day"
 msgstr "Aggiorna il messaggio del giorno"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/glade/advanced_menuitem_menu.glade.h:10
 msgid "_Administrator"
 msgstr "_Amministratore"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
-msgid "_Privacy Lists"
-msgstr "_Liste privacy"
-
 #: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message"
-msgstr "_Invia messaggio server"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:12
-msgid "_Send Single Message"
-msgstr "_Invia messaggio singolo"
+msgid "_Send Server Message..."
+msgstr "_Invia messaggio server..."
 
 #: ../data/glade/advanced_notifications_window.glade.h:1
 msgid " a window/tab opened with that contact "
@@ -644,7 +731,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>Condizioni</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>Sounds</b>"
 msgstr "<b>Suoni</b>"
 
@@ -654,14 +741,14 @@ msgstr "Azioni avanzate"
 
 #: ../data/glade/advanced_notifications_window.glade.h:6
 msgid "Advanced Notifications Control"
-msgstr "Controllo notifiche avanzato"
+msgstr "Gestione avanzata delle notifiche"
 
 #: ../data/glade/advanced_notifications_window.glade.h:7
 msgid "All statuses"
 msgstr "Tutti gli stati"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:91 ../src/common/helpers.py:243
+#: ../src/common/commands.py:91 ../src/common/helpers.py:246
 msgid "Away"
 msgstr "Assente"
 
@@ -678,7 +765,7 @@ msgid "Have "
 msgstr "Ho "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:256
 msgid "Invisible"
 msgstr "Invisibile"
 
@@ -687,7 +774,7 @@ msgid "Launch a command"
 msgstr "Lancia un comando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:226
+#: ../src/common/helpers.py:229
 msgid "Not Available"
 msgstr "Non disponibile"
 
@@ -701,7 +788,7 @@ msgstr "Online / Libero per chat"
 
 #: ../data/glade/advanced_notifications_window.glade.h:17
 msgid "Play a sound"
-msgstr "Riproduci suono"
+msgstr "Riproduci un suono"
 
 #: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
@@ -752,7 +839,7 @@ msgstr "_Disabilita l'evento di apparizione nella lista contatti"
 
 #: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in systray"
-msgstr "_Disabilita l'evento di apparizione nell'area di notifica"
+msgstr "_Disabilita la visualizzazione dell'evento nell'area di notifica"
 
 #: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Inform me with a popup window"
@@ -768,11 +855,11 @@ msgstr "Mostra evento nella lista _contatti"
 
 #: ../data/glade/advanced_notifications_window.glade.h:36
 msgid "_Show event in systray"
-msgstr "Mostra evento nella s_ystray"
+msgstr "_Mostra evento nell'area di notifica"
 
 #: ../data/glade/advanced_notifications_window.glade.h:37
 msgid "and I "
-msgstr "ed io"
+msgstr "ed io "
 
 #: ../data/glade/advanced_notifications_window.glade.h:38
 msgid ""
@@ -793,38 +880,22 @@ msgid "when I'm in"
 msgstr "quando sono in"
 
 #: ../data/glade/atom_entry_window.glade.h:1
-msgid "2003-12-13T18:30:02Z"
-msgstr "2003-12-13T18:30:02Z"
-
-#: ../data/glade/atom_entry_window.glade.h:2
-msgid "<small>Romeo and Juliet</small>"
-msgstr "<small>Romeo e Giulietta</small>"
-
-#: ../data/glade/atom_entry_window.glade.h:3
 msgid "Entry:"
 msgstr "Voce:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/glade/atom_entry_window.glade.h:2
 msgid "Feed name:"
 msgstr "Nome feed:"
 
-#: ../data/glade/atom_entry_window.glade.h:5
+#: ../data/glade/atom_entry_window.glade.h:3
 msgid "Last modified:"
 msgstr "Ultima modifica:"
 
-#: ../data/glade/atom_entry_window.glade.h:6
+#: ../data/glade/atom_entry_window.glade.h:4
 msgid "New entry received"
 msgstr "Nuova voce ricevuta"
 
-#: ../data/glade/atom_entry_window.glade.h:7
-msgid "Old stories"
-msgstr "Vecchie storie"
-
-#: ../data/glade/atom_entry_window.glade.h:8
-msgid "Soliloquy"
-msgstr "Soliloquio"
-
-#: ../data/glade/atom_entry_window.glade.h:9
+#: ../data/glade/atom_entry_window.glade.h:5
 msgid "You have received new entry:"
 msgstr "Hai ricevuto un nuovo evento:"
 
@@ -857,15 +928,13 @@ msgid "Join _Group Chat"
 msgstr "Entra in chat di _gruppo"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-#: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "_Add to Roster"
-msgstr "_Aggiungi ai contatti"
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+msgid "_Add to Roster..."
+msgstr "_Aggiungi ai contatti..."
 
 #: ../data/glade/chat_context_menu.glade.h:3
 msgid "_Copy JID/Email Address"
-msgstr "_Copia Indirizzo Email/JID"
+msgstr "_Copia JID/indirizzo email"
 
 #: ../data/glade/chat_context_menu.glade.h:4
 msgid "_Copy Link Location"
@@ -880,7 +949,6 @@ msgid "_Open Link in Browser"
 msgstr "_Apri il collegamento nel browser"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
@@ -888,34 +956,43 @@ msgstr "_Inizia chat"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:1
 msgid "Click to see past conversations with this contact"
-msgstr "Cliccare per vedere le conversazioni precedenti con questo contatto"
+msgstr "Clicca per vedere le conversazioni precedenti con questo contatto"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+msgid "Invite _Friends"
+msgstr "Invita _amici"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Invia _file"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-msgid "Toggle Open_PGP Encryption"
-msgstr "Attiva cifratura Open_PGP"
+#: ../data/glade/chat_control_popup_menu.glade.h:4
+msgid "Toggle End to End Encryption"
+msgstr "Attiva cifratura end-to-end"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-msgid "_Compact View    Alt+C"
-msgstr "_Vista compatta    Alt+C"
+msgid "Toggle Open_PGP Encryption"
+msgstr "Attiva cifratura Open_PGP"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Aggiungi ai contatti"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:7
 #: ../data/glade/gc_control_popup_menu.glade.h:7
-#: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:16
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:2567
 msgid "_History"
 msgstr "_Cronologia"
 
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
-msgstr "Completa nel form"
+msgstr "Completa nel form."
 
 #: ../data/glade/data_form_window.glade.h:2
 msgid "Room Configuration"
@@ -979,7 +1056,7 @@ msgid "When a file transfer is complete show a popup notification"
 msgstr ""
 "Mostra una notifica popup quando un trasferimento file viene completato"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:769
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:774
 msgid "_Continue"
 msgstr "_Continua"
 
@@ -987,7 +1064,7 @@ msgstr "_Continua"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notifica quando un trasferimento file viene completato"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:186
 msgid "_Open Containing Folder"
 msgstr "_Apri cartella"
 
@@ -1048,16 +1125,16 @@ msgid ""
 "MUC\n"
 "Messages"
 msgstr ""
-"Messaggi\n"
-"MUC"
+"Messaggi di una\n"
+"chat di gruppo"
 
 #: ../data/glade/gajim_themes_window.glade.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
 msgstr ""
-"Messaggi diretti\n"
-"a MUC"
+"Messaggi inviati in\n"
+"una chat di gruppo"
 
 #: ../data/glade/gajim_themes_window.glade.h:17
 msgid "Paused"
@@ -1076,58 +1153,70 @@ msgid "_Background:"
 msgstr "_Sfondo:"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname"
-msgstr "Cambia _nickname"
+msgid "Change _Nickname..."
+msgstr "Cambia _nickname..."
 
 #: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject"
-msgstr "Cambia _oggetto"
+msgid "Change _Subject..."
+msgstr "Cambia _oggetto..."
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
 msgid "Click to see past conversation in this room"
-msgstr "Cliccare per vedere le conversazioni precedenti di questa stanza"
+msgstr "Clicca per vedere le conversazioni precedenti di questa stanza"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:4
-msgid "Configure _Room"
-msgstr "Configu_ra la stanza"
+msgid "Configure _Room..."
+msgstr "Configura la _stanza..."
 
 #: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Bookmark This Room"
-msgstr "Inserire un _segnalibro per questa stanza"
+msgid "_Bookmark"
+msgstr "Aggiungi _segnalibro"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+msgid "_Destroy Room"
+msgstr "_Elimina stanza"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:8
+msgid "_Manage Room"
+msgstr "Gestisci stanza"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:9
+msgid "_Minimize on close"
+msgstr "_Minimizza alla chiusura"
 
 #: ../data/glade/gc_occupants_menu.glade.h:1
 msgid "Mo_derator"
 msgstr "Mo_deratore"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:2
+msgid "Occupant Actions"
+msgstr "Azioni partecipante"
+
+#: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
-msgstr "_Admin"
+msgstr "_Amministratore"
 
-#: ../data/glade/gc_occupants_menu.glade.h:4
+#: ../data/glade/gc_occupants_menu.glade.h:6
 msgid "_Ban"
 msgstr "_Bandisci"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
 msgid "_Kick"
 msgstr "_Caccia"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Member"
 msgstr "_Membro"
 
-#: ../data/glade/gc_occupants_menu.glade.h:8
-msgid "_Occupant Actions"
-msgstr "Azioni _partecipanti"
-
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Owner"
 msgstr "_Proprietario"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Send Private Message"
 msgstr "_Invia messaggio privato"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Voice"
 msgstr "_Voce"
 
@@ -1135,7 +1224,7 @@ msgstr "_Voce"
 msgid "Create new post"
 msgstr "Crea nuovo post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:268
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:271
 msgid "From"
 msgstr "Da"
 
@@ -1155,15 +1244,15 @@ msgid ""
 "If you plan to do massive deletions, please make sure Gajim is not running. "
 "Generally avoid deletions with contacts you currently chat with."
 msgstr ""
-"<big><b>Benvenuti al gestore delle cronologie di Gajim</b></big>\n"
+"<big><b>Benvenuto nel gestore della cronologia di Gajim</b></big>\n"
 "\n"
-"Si possono selezionare elementi alla sinistra e/o cercare nella base dati da "
-"sotto.\n"
+"Puoi selezionare le conversazioni da sinistra e/o cercare nel database "
+"tramite il campo in basso.\n"
 "\n"
 "<b>ATTENZIONE:</B>\n"
-"Se si ha intenzione di cancellare molte cose, verificare che Gajim non sia "
-"in esecuzione. Generalmente evitare di eliminare dati sui contatti con cui "
-"si sta conversando."
+"Se hai intenzione di cancellare molte cose, verifica che Gajim non sia in "
+"esecuzione. Generalmente evita di eliminare conversazioni dei contatti con "
+"cui stai chattando."
 
 #: ../data/glade/history_manager.glade.h:7
 msgid "Delete"
@@ -1175,29 +1264,51 @@ msgstr "Esporta"
 
 #: ../data/glade/history_manager.glade.h:9
 msgid "Gajim History Logs Manager"
-msgstr "Gestore delle cronologie di Gajim"
+msgstr "Gestore cronologia di Gajim"
 
 #: ../data/glade/history_manager.glade.h:10
 msgid "_Search Database"
-msgstr "_Cerca base dati"
+msgstr "_Cerca nel database"
 
 #: ../data/glade/history_window.glade.h:1
+msgid "<b>History Viewer</b>"
+msgstr "<b>Gestore cronologia</b>"
+
+#: ../data/glade/history_window.glade.h:2
+msgid "<b>JID Selection</b>"
+msgstr "<b>Selezione JID</b>"
+
+#: ../data/glade/history_window.glade.h:3
 msgid "Build custom query"
 msgstr "Costruisci richiesta personalizzata"
 
-#: ../data/glade/history_window.glade.h:2
+#: ../data/glade/history_window.glade.h:4 ../src/history_window.py:199
 msgid "Conversation History"
 msgstr "Cronologia conversazione"
 
-#: ../data/glade/history_window.glade.h:3
+#: ../data/glade/history_window.glade.h:5
+msgid ""
+"Enter a contact jid or MUC jid here to view its history.\n"
+"If a contact is connected you can even enter his nick name.\n"
+msgstr ""
+"Inserisci il JID di un contatto o di una stanza di gruppo per visualizzarne "
+"la cronologia.\n"
+"Se il contatto è connesso puoi anche inserire il suo nickname.\n"
+
+#: ../data/glade/history_window.glade.h:8
 msgid "Query Builder..."
 msgstr "Costruttore richieste..."
 
-#: ../data/glade/history_window.glade.h:4
+#: ../data/glade/history_window.glade.h:9
 msgid "Search"
 msgstr "Cerca"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/glade/history_window.glade.h:10
+#: ../data/glade/zeroconf_information_window.glade.h:10
+msgid "_Log conversation history"
+msgstr "_Memorizza cronologia conversazione"
+
+#: ../data/glade/history_window.glade.h:11 ../src/disco.py:1172
 msgid "_Search"
 msgstr "_Cerca"
 
@@ -1214,7 +1325,7 @@ msgstr "Nega"
 msgid "Invitation Received"
 msgstr "Invito ricevuto"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1148
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1265
 msgid "Join Group Chat"
 msgstr "Entra in chat di gruppo"
 
@@ -1223,14 +1334,14 @@ msgid "Join this room automatically when I connect"
 msgstr "Entra automaticamente in questa stanza alla connessione"
 
 #: ../data/glade/join_groupchat_window.glade.h:3
-#: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "Nickname:"
 msgstr "Nickname:"
 
 #: ../data/glade/join_groupchat_window.glade.h:4
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Password:"
 
@@ -1239,12 +1350,12 @@ msgid "Recently:"
 msgstr "Recenti:"
 
 #: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Stanza:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1163
-#: ../src/disco.py:1546
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1160
+#: ../src/disco.py:1615
 msgid "_Join"
 msgstr "_Entra"
 
@@ -1258,21 +1369,25 @@ msgstr "Partecipa automaticamente"
 
 #: ../data/glade/manage_bookmarks_window.glade.h:2
 msgid "If checked, Gajim will join this group chat on startup"
-msgstr "Se marcato, all'avvio Gajim entrerà in questa chat di gruppo"
+msgstr "Se marcato, Gajim entrerà in questa chat di gruppo all'avvio"
 
 #: ../data/glade/manage_bookmarks_window.glade.h:3
 msgid "Manage Bookmarks"
 msgstr "Gestisci segnalibri"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:4
+msgid "Minimize on Auto Join"
+msgstr "Minimizza automaticamente"
+
+#: ../data/glade/manage_bookmarks_window.glade.h:7
 msgid "Print status:"
 msgstr "Scrivi stato:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Server:"
 msgstr "Server:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:10
 msgid "Title:"
 msgstr "Titolo:"
 
@@ -1285,46 +1400,59 @@ msgid "<b>Settings</b>"
 msgstr "<b>Impostazioni</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-msgid "HTTP Connect"
-msgstr "Connessione HTTP"
+#, fuzzy
+msgid ""
+"HTTP Connect\n"
+"SOCKS5"
+msgstr ""
+"Connessione HTTP\n"
+"SOCKS5"
 
-#: ../data/glade/manage_proxies_window.glade.h:4
+#: ../data/glade/manage_proxies_window.glade.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Gestisci profili proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/manage_proxies_window.glade.h:6
+#: ../data/glade/profile_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:30
 msgid "Name:"
 msgstr "Nome:"
 
 #: ../data/glade/manage_proxies_window.glade.h:7
+msgid "Pass_word:"
+msgstr "Pass_word:"
+
+#: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/glade/manage_proxies_window.glade.h:9
 msgid "Use authentication"
 msgstr "Usa autenticazione"
 
+#: ../data/glade/manage_proxies_window.glade.h:10
+msgid "_Host:"
+msgstr "_Host:"
+
 #: ../data/glade/message_window.glade.h:1
 msgid "Click to insert an emoticon (Alt+M)"
-msgstr "Cliccare per inserire un emoticon (Alt+M)"
+msgstr "Clicca per inserire un emoticon (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1109
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1213
 msgid "OpenPGP Encryption"
 msgstr "Cifratura OpenPGP"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:4
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:12
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
-msgstr "A_zioni"
+msgstr "_Azioni"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:6
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:253
+#: ../src/filetransfers_window.py:243
 msgid "_Send"
 msgstr "_Invia"
 
@@ -1340,36 +1468,48 @@ msgstr "<b>Editor di configurazione avanzata</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Applicazioni</b>"
 
+#: ../data/glade/preferences_window.glade.h:3
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Aspetto della chat</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/glade/preferences_window.glade.h:5
 msgid "<b>Custom</b>"
 msgstr "<b>Personalizzato</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/glade/preferences_window.glade.h:6
 msgid "<b>Format of a line</b>"
 msgstr "<b>Formato di una linea</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/glade/preferences_window.glade.h:7
 msgid "<b>GMail Options</b>"
 msgstr "<b>Opzioni GMail</b>"
 
-#: ../data/glade/preferences_window.glade.h:7
-msgid "<b>Interface Customization</b>"
-msgstr "<b>Personalizzazione dell'interfaccia</b>"
-
 #: ../data/glade/preferences_window.glade.h:9
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Messaggi di stato predefiniti</b>"
 
+#: ../data/glade/preferences_window.glade.h:10
+msgid "<b>Privacy</b>"
+msgstr "<b>Privacy</b>"
+
 #: ../data/glade/preferences_window.glade.h:11
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Aspetto lista contatti</b>"
+
+#: ../data/glade/preferences_window.glade.h:13
+msgid "<b>Themes</b>"
+msgstr "<b>Temi</b>"
+
+#: ../data/glade/preferences_window.glade.h:14
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Notifiche visuali</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/glade/preferences_window.glade.h:15
 msgid "Advanced"
 msgstr "Avanzato"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/glade/preferences_window.glade.h:16
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1379,45 +1519,41 @@ msgstr ""
 "Solo composizione\n"
 "Disattivato"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/glade/preferences_window.glade.h:19
 msgid "Allow _OS information to be sent"
 msgstr "Consentire invio di informazioni sull'_OS"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/glade/preferences_window.glade.h:20
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr "Consentire notifiche/popup quando _assente/nd/occupato/invisibile."
 
-#: ../data/glade/preferences_window.glade.h:18
-msgid "Also known as iChat style"
-msgstr "Conosciuto anche come stile iChat"
-
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/glade/preferences_window.glade.h:21
 msgid "Always check to see if Gajim is the _default Jabber client on startup"
 msgstr "Verifica sempre se Gajim è il client Jabber _predefinito all'avvio"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/glade/preferences_window.glade.h:22
 msgid ""
 "An example: If you have enabled status message for away, Gajim won't ask you "
 "anymore for a status message when you change your status to away; it will "
 "use the default one set here"
 msgstr ""
 "Un esempio: se si ha abilitato il messaggio di stato per l'assenza, Gajim "
-"non chiederà più il messaggio di stato si diventa assente; verrà usato il "
-"valore predefinito impostato qui"
+"non chiederà più il messaggio di stato quando si diventa assente; verrà "
+"usato il valore predefinito impostato qui"
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Ask status message when I:"
 msgstr "Chiedi messaggio di stato per:"
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/glade/preferences_window.glade.h:24
 msgid "Auto _away after:"
 msgstr "_Assente automaticamente dopo:"
 
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:25
 msgid "Auto _not available after:"
-msgstr "N_on disponibile automaticamente dopo:"
+msgstr "_Non disponibile automaticamente dopo:"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/glade/preferences_window.glade.h:26
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1425,34 +1561,29 @@ msgid ""
 "Always use XFCE4 default applications\n"
 "Custom"
 msgstr ""
-"Ricerca in automatico ad ogni avvio di Gajim\n"
+"Rilevamento automatico ad ogni avvio di Gajim\n"
 "Usa sempre le applicazioni predefinite di GNOME\n"
 "Usa sempre le applicazioni predefinite di KDE\n"
 "Usa sempre le applicazioni predefinite XFCE4\n"
-"Personalizza"
+"Personalizzate"
 
-#: ../data/glade/preferences_window.glade.h:29 ../src/chat_control.py:852
-msgid "Chat"
-msgstr "Chat"
-
-#: ../data/glade/preferences_window.glade.h:30
+#: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, because it blocks all messages from any contact that "
 "is not in the roster"
-msgstr "Selezionare questa opzione solo se qualche utente fuori dalla lista contatti spamma o disturba. Usare con cautela: verranno bloccati tutti i messaggi ricevuti da chi non è membro della lista contatti."
+msgstr ""
+"Selezionare questa opzione solo se qualche utente fuori dalla lista contatti "
+"spamma o disturba. Usare con cautela, poiché verranno bloccati tutti i "
+"messaggi ricevuti da chi non è membro della lista contatti."
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/glade/preferences_window.glade.h:32
 msgid "Configure color and font of the interface"
 msgstr "Configura colore e tipo di carattere per l'interfaccia"
 
-#: ../data/glade/preferences_window.glade.h:32
-msgid "Default Status Messages"
-msgstr "Messaggio di stato"
-
 #: ../data/glade/preferences_window.glade.h:33
-msgid "Default status _iconset:"
-msgstr "_Icone stato predefinite:"
+msgid "Default Status Messages"
+msgstr "Messaggi di stato preimpostati"
 
 #: ../data/glade/preferences_window.glade.h:34
 msgid ""
@@ -1466,33 +1597,25 @@ msgstr ""
 
 #: ../data/glade/preferences_window.glade.h:37
 msgid "Display _extra email details"
-msgstr "Mostra _dettagli email extra"
+msgstr "Mostra dettagli email _extra"
 
 #: ../data/glade/preferences_window.glade.h:38
 msgid "Display a_vatars of contacts in roster"
-msgstr "Mostra gli a_vatar dei contatti nella lista"
+msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
 
 #: ../data/glade/preferences_window.glade.h:39
 msgid "Display status _messages of contacts in roster"
-msgstr "Mostra i _messaggi di stato dei contatti nella lista"
+msgstr "Mostra i _messaggi di stato dei contatti nella lista contatti"
 
 #: ../data/glade/preferences_window.glade.h:40
-msgid "Displayed Chat state noti_fications:"
-msgstr "Noti_fiche dello stato di chat"
-
-#: ../data/glade/preferences_window.glade.h:41
-msgid "E_very 5 minutes"
-msgstr "_Ogni 5 minuti"
-
-#: ../data/glade/preferences_window.glade.h:42
 msgid "Emoticons:"
 msgstr "Emoticon:"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Events"
 msgstr "Eventi"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:42
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1500,9 +1623,9 @@ msgid ""
 msgstr ""
 "Gajim può ricevere ed inviare meta-informazioni relative ad una "
 "conversazione con un contatto. Qui è possibile specificare che stati di chat "
-"si vogliono inviare al corrispondente."
+"si vogliono visualizzare nella finestra di chat."
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:43
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1510,30 +1633,9 @@ msgid ""
 msgstr ""
 "Gajim può ricevere ed inviare meta-informazioni relative ad una "
 "conversazione con un contatto. Qui è possibile specificare che stati di chat "
-"si vogliono inviare al corrispondente."
-
-#: ../data/glade/preferences_window.glade.h:46
-msgid ""
-"Gajim will automatically show new events by popping up the relevant window"
-msgstr "Gajim mostrerà automaticamente i nuovi eventi sollevando la finestra relativa"
-
-#: ../data/glade/preferences_window.glade.h:47
-msgid ""
-"Gajim will notify you for new events via a popup in the bottom right of the "
-"screen"
-msgstr ""
-"Gajim notificherà i nuovi eventi tramite popup nell'angolo in fondo a destra "
-"dello schermo"
-
-#: ../data/glade/preferences_window.glade.h:48
-msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed in"
-msgstr ""
-"Gajim notificherà tramite popup nell'angolo in fondo a destra dello schermo "
-"quando un contatto si connette"
+"si vogliono inviare al contatto."
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:44
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1541,12 +1643,11 @@ msgstr ""
 "Gajim notificherà tramite popup nell'angolo in fondo a destra dello schermo "
 "quando un contatto si disconnette"
 
-#: ../data/glade/preferences_window.glade.h:50
-msgid ""
-"Gajim will only change the icon of the contact that triggered the new event"
-msgstr "Gajim cambierà solamente l'icona del contatto fonte del nuovo evento"
+#: ../data/glade/preferences_window.glade.h:46
+msgid "Hides buttons in chatwindows to "
+msgstr "Nasconde i pulsanti nella finestra di chat"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1554,7 +1655,7 @@ msgstr ""
 "Se selezionato, Gajim includerà informazioni riguardo al mittente delle "
 "nuove email"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1562,7 +1663,7 @@ msgstr ""
 "Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
 "nelle chat di gruppo"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1570,25 +1671,17 @@ msgstr ""
 "Se marcato, Gajim mostrerà il messaggio di stato di ogni membro di lista "
 "contatti e chat di gruppo sotto il suo nome"
 
-#: ../data/glade/preferences_window.glade.h:55
-msgid ""
-"If checked, Gajim will remember the roster and chat window positions in the "
-"screen and the sizes of them next time you run it"
-msgstr ""
-"Se marcato, Gajim manterrà le posizioni delle finestre di chat e della lista "
-"contatti sullo schermo la prossima volta che verrà eseguito"
-
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
 "etc...)"
 msgstr ""
 "Se marcato, Gajim userà icone di stato specifiche per il protocollo usato. "
-"(es., un contatto MSN avrà l'icona MSN equivalente per gli stati online, "
+"(es. un contatto MSN avrà l'icona MSN equivalente per gli stati disponibile, "
 "assente, occupato, ecc...)"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1596,15 +1689,15 @@ msgstr ""
 "Se marcato, Gajim sostituirà gli smiley ASCII come ':)' con gli equivalenti "
 "emoticon grafici animati o statici"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:52
 msgid "Ignore rich content in incoming messages"
-msgstr "Ignora il rich content dei messaggi ricevuti"
+msgstr "Ignora la formattazione dei messaggi ricevuti"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Ma_nage..."
 msgstr "_Gestisci..."
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "Never\n"
 "Always\n"
@@ -1616,211 +1709,197 @@ msgstr ""
 "Per account\n"
 "Per tipo"
 
-#: ../data/glade/preferences_window.glade.h:64
-msgid "Notify me about contacts that: "
-msgstr "Notificare i contatti che eseguono:"
+#: ../data/glade/preferences_window.glade.h:58
+msgid "Notify me about contacts that sign _in"
+msgstr "Mostra notifica per i contatti che si _connettono"
+
+#: ../data/glade/preferences_window.glade.h:59
+msgid "Notify me about contacts that sign _out"
+msgstr "Mostra notifica per i contatti che si _disconnettono"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:60
 msgid "Notify on new _GMail email"
 msgstr "Notifica le nuove e-mail su _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:66
-msgid "On every _message"
-msgstr "In _tutti i messaggi"
-
-#: ../data/glade/preferences_window.glade.h:67
-msgid "One message _window:"
-msgstr "Una _finestra messaggi:"
-
-#: ../data/glade/preferences_window.glade.h:68
-msgid "Outgoing Chat state noti_fications:"
-msgstr "Noti_fiche dello stato di chat"
-
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:61
 msgid "Play _sounds"
 msgstr "Riproduci _suoni"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:62
+msgid ""
+"Pop it up\n"
+"Notify me about it\n"
+"Show only in roster"
+msgstr ""
+"Mostra immediatamente\n"
+"Mostra una notifica\n"
+"Mostra solo nella lista contatti"
+
+#: ../data/glade/preferences_window.glade.h:65
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../data/glade/preferences_window.glade.h:71
-msgid "Print time:"
-msgstr "Scrivi ora:"
-
-#: ../data/glade/preferences_window.glade.h:72
-msgid "Save _position and size for roster and chat windows"
-msgstr "Salva _posizione e dimensione delle finestre di chat e lista contatti"
+#: ../data/glade/preferences_window.glade.h:66
+msgid "Privacy"
+msgstr "Privacy"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Set status message to reflect currently playing _music track"
 msgstr ""
-"Imposta il messaggio di stato in modo che rifletta la traccia _musicale "
-"correntemente ascoltata"
-
-#: ../data/glade/preferences_window.glade.h:74
-msgid "Show only in _roster"
-msgstr "Mostra solo nella lista _contatti"
+"Imposta il messaggio di stato in modo che rifletta la traccia _musicale in "
+"riproduzione"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Sign _in"
 msgstr "C_onnessione"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Sign _out"
 msgstr "_Disconnessione"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:70
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
 msgstr ""
-"Alcuni messaggi potrebbero includere con contenuto ricco (formattazione, "
-"colori, ecc.). Se selezionato, Gajim li mostrerà come messaggi semplici."
+"Alcuni messaggi potrebbero includere contenuto ricco (formattazione, colori, "
+"ecc.). Se selezionato, Gajim li mostrerà come messaggi semplici."
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Status"
 msgstr "Stato"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:72
+msgid "Status _iconset:"
+msgstr "_Icone di stato:"
+
+#: ../data/glade/preferences_window.glade.h:73
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:74
 msgid "The auto away status message"
 msgstr "Il messaggio di stato per l'assenza automatica"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:75
 msgid "The auto not available status message"
 msgstr "Il messaggio di stato per il 'non disponibile' automatico"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Treat all incoming messages as:"
 msgstr "Trattare tutti i messaggi in arrivo come:"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Use _transports iconsets"
 msgstr "Usa le icone dei _trasporti"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:78
+msgid "Use only one message _window:"
+msgstr "Usa solo una _finestra dei messaggi:"
+
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Use system _default"
 msgstr "Usa il sistema _predefinito"
 
-#: ../data/glade/preferences_window.glade.h:85
-msgid "Use t_rayicon (aka. notification area icon)"
-msgstr "Usa _icona nell'area di notifica"
-
-#: ../data/glade/preferences_window.glade.h:86
-msgid ""
-"When a new event (message, file transfer request etc..) is received, the "
-"following methods may be used to inform you about it. Please note that "
-"events about new messages only occur if it is a new message from a contact "
-"you are not already chatting with"
-msgstr ""
-"Quando un nuovo evento (messaggio, richiesta di trasferimento file, ecc...) "
-"viene ricevuto, i seguenti metodi possono venire usati per informarti di "
-"ciò. Notare che gli eventi per i nuovi messaggi avverranno solo se si tratta "
-"di un nuovo messaggio da un contatto con cui non si sta già chattando"
-
-#: ../data/glade/preferences_window.glade.h:87
-msgid "When new event is received"
-msgstr "Quando si riceve un nuovo evento"
+#: ../data/glade/preferences_window.glade.h:80
+msgid "When new event is received:"
+msgstr "Quando si riceve un nuovo evento:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:81
 msgid ""
 "Works for Rhythmbox and Muine players. For more players, please visit http://"
 "trac.gajim.org/wiki/GajimAndMusicPlayer"
 msgstr ""
-"Funziona con Rhythmbox e Muine. Per altri player visita http://trac.gajim."
+"Funziona con Rhythmbox e Muine. Per altri player, visita http://trac.gajim."
 "org/wiki/GajimAndMusicPlayer"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:82
 msgid "_Advanced Notifications Control..."
 msgstr "Controllo notifiche _avanzato..."
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:83
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:84
+msgid "_Display chat state notifications:"
+msgstr "Notifica dello stato di chat in _entrata:"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "_File manager:"
-msgstr "Gestore _file:"
+msgstr "_File manager:"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Font:"
 msgstr "_Carattere:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_Highlight misspelled words"
-msgstr "Evidenzia _parole scorrette"
+msgstr "_Evidenzia parole errate"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignora gli eventi da contatti non appartenenti alla lista"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Incoming message:"
 msgstr "Messaggio in _arrivo:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_Log status changes of contacts"
 msgstr "_Registra i cambiamenti di stato dei contatti"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Mail client:"
-msgstr "_Client mail:"
+msgstr "_Client di posta:"
 
-#: ../data/glade/preferences_window.glade.h:98
-msgid "_Never"
-msgstr "_Mai"
-
-#: ../data/glade/preferences_window.glade.h:99
-msgid "_Notify me about it"
-msgstr "_Notifica"
+#: ../data/glade/preferences_window.glade.h:92
+msgid "_Make message windows compact"
+msgstr "Rendi compatta la finestra dei _messaggi"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Open..."
 msgstr "_Apri..."
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Outgoing message:"
 msgstr "Messaggio in _uscita:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Player:"
 msgstr "_Riproduttore:"
 
-#: ../data/glade/preferences_window.glade.h:103
-msgid "_Pop it up"
-msgstr "_Mostra"
-
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Reset to Default Colors"
 msgstr "_Reimposta ai colori di default"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:97
+msgid "_Send chat state notifications:"
+msgstr "Notifica dello stato di chat in usci_ta:"
+
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Sort contacts by status"
 msgstr "_Ordina i contatti per stato"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Status message:"
 msgstr "Messaggio di _stato:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:100
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:101
 msgid "minutes"
 msgstr "minuti"
 
 #: ../data/glade/privacy_lists_window.glade.h:1
 msgid "Privacy Lists:"
-msgstr "Liste utenti bloccati:"
+msgstr "Liste privacy:"
 
 #: ../data/glade/privacy_list_window.glade.h:1
 msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>Aggiungi/ modifica una regola</b>"
+msgstr "<b>Aggiungi/modifica una regola</b>"
 
 #: ../data/glade/privacy_list_window.glade.h:2
 msgid "<b>List of rules</b>"
@@ -1832,15 +1911,15 @@ msgstr "<i>Lista privacy</i>"
 
 #: ../data/glade/privacy_list_window.glade.h:4
 msgid "Active for this session"
-msgstr "Attivo per la sessione corrente"
+msgstr "Attiva per questa sessione"
 
 #: ../data/glade/privacy_list_window.glade.h:5
 msgid "Active on each startup"
-msgstr "Attivo ad ogni avvio di Gajim"
+msgstr "Attiva ad ogni avvio di Gajim"
 
 #: ../data/glade/privacy_list_window.glade.h:6
 msgid "All"
-msgstr "Tutti"
+msgstr "a tutti"
 
 #: ../data/glade/privacy_list_window.glade.h:7
 msgid "Allow"
@@ -1854,17 +1933,17 @@ msgstr "ID Jabber"
 msgid "Order:"
 msgstr "Ordine:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1862
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2104
 msgid "Privacy List"
-msgstr "Lista utenti bloccati"
+msgstr "Lista privacy"
 
 #: ../data/glade/privacy_list_window.glade.h:12
 msgid "all by subscription"
-msgstr "tutti per abbonamento"
+msgstr "a tutti per abbonamento"
 
 #: ../data/glade/privacy_list_window.glade.h:13
 msgid "all in the group"
-msgstr "tutti nel gruppo"
+msgstr "a tutti nel gruppo"
 
 #: ../data/glade/privacy_list_window.glade.h:14
 msgid ""
@@ -1880,19 +1959,19 @@ msgstr ""
 
 #: ../data/glade/privacy_list_window.glade.h:18
 msgid "to send me messages"
-msgstr "invio di messaggi"
+msgstr "di inviarmi messaggi"
 
 #: ../data/glade/privacy_list_window.glade.h:19
 msgid "to send me queries"
-msgstr "invio di richieste"
+msgstr "di inviarmi richieste"
 
 #: ../data/glade/privacy_list_window.glade.h:20
 msgid "to send me status"
-msgstr "invio di stato"
+msgstr "di inviarmi uno stato"
 
 #: ../data/glade/privacy_list_window.glade.h:21
 msgid "to view my status"
-msgstr "vedere il mio stato"
+msgstr "di vedere il mio stato"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:2
@@ -1920,121 +1999,118 @@ msgid "City:"
 msgstr "Città:"
 
 #: ../data/glade/profile_window.glade.h:7
+msgid "Click to set your avatar"
+msgstr "Clicca per inserire l'avatar"
+
+#: ../data/glade/profile_window.glade.h:8
 #: ../data/glade/vcard_information_window.glade.h:10
 msgid "Company:"
 msgstr "Società:"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Country:"
-msgstr "Paese:"
-
 #: ../data/glade/profile_window.glade.h:9
 #: ../data/glade/vcard_information_window.glade.h:14
-msgid "Department:"
-msgstr "Dipartimento:"
+msgid "Country:"
+msgstr "Paese:"
 
 #: ../data/glade/profile_window.glade.h:10
 #: ../data/glade/vcard_information_window.glade.h:15
-#: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
-msgid "E-Mail:"
-msgstr "E-Mail:"
+msgid "Department:"
+msgstr "Dipartimento:"
 
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/profile_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:17
 msgid "Extra Address:"
 msgstr "Indirizzo extra:"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/profile_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:19
 msgid "Family:"
 msgstr "Cognome:"
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/profile_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "Format: YYYY-MM-DD"
 msgstr "Formato: AAAA-MM-GG"
 
-#. Given Name
 #: ../data/glade/profile_window.glade.h:17
 #: ../data/glade/vcard_information_window.glade.h:22
+msgid "Full Name"
+msgstr "Nome completo"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:19
+#: ../data/glade/vcard_information_window.glade.h:24
 msgid "Given:"
 msgstr "Nome:"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "Homepage:"
 msgstr "Homepage:"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "Middle:"
 msgstr "Secondo nome:"
 
-#: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:27
-msgid "More"
-msgstr "Ancora"
-
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:34
 msgid "Personal Info"
 msgstr "Informazioni personali"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "Phone No.:"
 msgstr "Telefono:"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/glade/profile_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:36
 msgid "Position:"
 msgstr "Titolo:"
 
-#: ../data/glade/profile_window.glade.h:28
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:37
 msgid "Postal Code:"
 msgstr "Codice postale:"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:39
 msgid "Prefix:"
 msgstr "Prefisso:"
 
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:38 ../src/vcard.py:273
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:41 ../src/vcard.py:302
 msgid "Role:"
 msgstr "Ruolo:"
 
-#: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/profile_window.glade.h:33
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "State:"
 msgstr "Regione:"
 
-#: ../data/glade/profile_window.glade.h:33
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Street:"
 msgstr "Via:"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/profile_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "Suffix:"
 msgstr "Suffisso:"
 
-#: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/profile_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Lavoro"
 
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
-msgstr "<b>Cosa fare?</b>"
+msgstr "<b>Cosa vuoi fare?</b>"
 
 #: ../data/glade/remove_account_window.glade.h:2
 msgid "Remove account _only from Gajim"
@@ -2042,135 +2118,165 @@ msgstr "Rimuovi l'account solo da _Gajim"
 
 #: ../data/glade/remove_account_window.glade.h:3
 msgid "Remove account from Gajim and from _server"
-msgstr "Eliminare l'account da Gajim e dal _server"
+msgstr "Rimuovi l'account da Gajim e dal _server"
+
+#. Remove
+#. Remove group
+#. Remove
+#: ../data/glade/remove_account_window.glade.h:4
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+#: ../src/roster_window.py:2524 ../src/roster_window.py:2734
+#: ../src/roster_window.py:2870
+msgid "_Remove"
+msgstr "_Elimina"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:1
 msgid "A_sk to see his/her status"
 msgstr "_Chiedi di poter vedere il suo stato"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Crea _notifica speciale"
+msgid "Add Special _Notification..."
+msgstr "Aggiungi _notifica speciale..."
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Assegna chiave Open_PGP"
+msgid "Assign Open_PGP Key..."
+msgstr "Assegna chiave Open_PGP..."
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:2076
-msgid "Edit _Groups"
-msgstr "Modifica _gruppi"
+msgid "Edit _Groups..."
+msgstr "Modifica _gruppi..."
 
+#. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:2211
+#: ../src/roster_window.py:2827
 msgid "Execute Command..."
-msgstr "Esegui Comando..."
+msgstr "Esegui comando..."
 
+#. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:2034
+#: ../src/roster_window.py:2440
 msgid "In_vite to"
 msgstr "In_vita a "
 
+#. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Invia _messaggio singolo"
+#: ../src/roster_window.py:2664 ../src/roster_window.py:2798
+msgid "Send Cus_tom Status"
+msgstr "Invia s_tato personalizzato"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+msgid "Send Single _Message..."
+msgstr "Invia _messaggio singolo..."
 
 #: ../data/glade/roster_contact_context_menu.glade.h:9
+msgid "Send _File..."
+msgstr "Invia _file..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:10
+msgid "Set Custom _Avatar..."
+msgstr "Imposta _avatar personalizzato..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Inizia _chat"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 msgid "_Allow him/her to see my status"
 msgstr "Permetti di _vedere il mio stato"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-msgid "_Forbid him/her to see my status"
-msgstr "_Proibisci di vedere il mio stato"
-
-#. Remove group
 #: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:2028 ../src/roster_window.py:2125
-#: ../src/roster_window.py:2232
-msgid "_Remove from Roster"
-msgstr "_Elimina dai contatti"
+#: ../src/roster_window.py:2514 ../src/roster_window.py:2725
+msgid "_Block"
+msgstr "_Blocca"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:15
+msgid "_Forbid him/her to see my status"
+msgstr "_Proibisci di vedere il mio stato"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:17
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2220
-msgid "_Rename"
-msgstr "_Rinomina"
+msgid "_Manage Contact"
+msgstr "_Gestisci contatto"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:19
+msgid "_Rename..."
+msgstr "_Rinomina..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:20
 msgid "_Subscription"
 msgstr "_Abbonamento"
 
+#: ../data/glade/roster_contact_context_menu.glade.h:21
+#: ../src/roster_window.py:2508 ../src/roster_window.py:2719
+msgid "_Unblock"
+msgstr "_Sblocca"
+
 #: ../data/glade/roster_window.glade.h:1
 msgid "A_ccounts"
 msgstr "_Account"
 
 #: ../data/glade/roster_window.glade.h:2
-msgid "Add _Contact"
-msgstr "Aggiungi _contatto"
+msgid "Add _Contact..."
+msgstr "Aggiungi _contatto......"
 
 #: ../data/glade/roster_window.glade.h:3
+msgid "Fea_tures"
+msgstr "Fun_zioni"
+
+#: ../data/glade/roster_window.glade.h:4
 msgid "File _Transfers"
 msgstr "_Trasferimenti file"
 
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/glade/roster_window.glade.h:5
 msgid "Frequently Asked Questions (online)"
 msgstr "Domande frequenti (online)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/glade/roster_window.glade.h:7
 msgid "Help online"
 msgstr "Aiuto online"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:9
 msgid "Profile, A_vatar"
 msgstr "Profilo, a_vatar"
 
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
 msgstr "Mostra tras_porti"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "Mostra contatti _offline"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:14
 msgid "_Contents"
 msgstr "_Contenuti"
 
-#: ../data/glade/roster_window.glade.h:13
-msgid "_Discover Services"
-msgstr "_Ricerca servizi"
-
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1284
-#: ../src/roster_window.py:2203
+#: ../data/glade/roster_window.glade.h:16 ../src/disco.py:1348
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:17
 msgid "_FAQ"
 msgstr "_Domande frequenti"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_Preferences"
 msgstr "_Preferenze"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Quit"
 msgstr "_Esci"
 
 #: ../data/glade/roster_window.glade.h:21
+msgid "_Send Single Message..."
+msgstr "Invia _messaggio singolo..."
+
+#: ../data/glade/roster_window.glade.h:23
 msgid "_View"
 msgstr "_Visualizza"
 
@@ -2182,10 +2288,6 @@ msgstr "_Vai"
 msgid "_Address:"
 msgstr "_Indirizzo:"
 
-#: ../data/glade/service_discovery_window.glade.h:3
-msgid "_Filter:"
-msgstr "_Filtro:"
-
 #: ../data/glade/service_registration_window.glade.h:1
 msgid "Register to"
 msgstr "Registra a"
@@ -2250,7 +2352,8 @@ msgstr "Autorizza il contatto affinché sappia quando sei connesso"
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
-msgstr "Nega l'autorizzazione al contatto cosicché non sappia quando sei connesso"
+msgstr ""
+"Nega l'autorizzazione al contatto cosicché non sappia quando sei connesso"
 
 #: ../data/glade/subscription_request_window.glade.h:4
 msgid "Subscription Request"
@@ -2264,6 +2367,10 @@ msgstr "_Nega"
 msgid "Mute Sounds"
 msgstr "Disabilita suoni"
 
+#: ../data/glade/systray_context_menu.glade.h:2
+msgid "Send Single _Message"
+msgstr "Invia _messaggio singolo"
+
 #: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
 msgstr "Mostra tutti gli _eventi in attesa"
@@ -2276,6 +2383,10 @@ msgstr "Mostra lista _contatti"
 msgid "Sta_tus"
 msgstr "Sta_to"
 
+#: ../data/glade/systray_context_menu.glade.h:6
+msgid "_Group Chat"
+msgstr "Chat di _gruppo"
+
 #. Given Name
 #: ../data/glade/vcard_information_window.glade.h:5
 msgid "Ask:"
@@ -2290,43 +2401,44 @@ msgid "Comments"
 msgstr "Commenti"
 
 #: ../data/glade/vcard_information_window.glade.h:11
+msgid "Configured avatar:"
+msgstr "Avatar personalizzato:"
+
+#: ../data/glade/vcard_information_window.glade.h:12
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Contatto"
 
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:13
 msgid "Contact Information"
 msgstr "Informazioni sul contatto"
 
-#: ../data/glade/vcard_information_window.glade.h:24
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
-msgid "Jabber ID:"
-msgstr "ID Jabber: "
+#: ../data/glade/vcard_information_window.glade.h:29
+msgid "More"
+msgstr "Ancora"
 
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "OS:"
 msgstr "OS:"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:40
 #: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Risorsa:"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Stato:"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Subscription:"
 msgstr "Abbonamento:"
 
-#: ../data/glade/vcard_information_window.glade.h:47
-#: ../data/glade/zeroconf_information_window.glade.h:10
-msgid "_Log conversation history"
-msgstr "_Memorizza cronologia conversazione"
+#: ../data/glade/vcard_information_window.glade.h:49
+msgid "User avatar:"
+msgstr "Avatar dell'utente:"
 
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
@@ -2336,11 +2448,6 @@ msgstr "<b>Traffico Jabber</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>Inserimento XML</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Abilita"
-
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2349,7 +2456,7 @@ msgstr "Info/Richiesta (Info/Query)"
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
 #: ../data/glade/xml_console_window.glade.h:8
 msgid "_IQ"
-msgstr "I_Q"
+msgstr "_IQ"
 
 #: ../data/glade/xml_console_window.glade.h:9
 msgid "_Message"
@@ -2359,42 +2466,42 @@ msgstr "_Messaggio"
 msgid "_Presence"
 msgstr "_Presenza"
 
-#: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
-msgid "First Name:"
-msgstr "Nome:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
+msgid "Add Special _Notification"
+msgstr "Crea _notifica speciale"
 
-#: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
-msgid "Last Name:"
-msgstr "Cognome:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
+msgid "Assign Open_PGP Key"
+msgstr "Assegna chiave Open_PGP"
+
+#. Edit Groups
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:2497
+msgid "Edit _Groups"
+msgstr "Modifica _gruppi"
+
+#. Rename
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:2854
+msgid "_Rename"
+msgstr "_Rinomina"
+
+#: ../data/glade/zeroconf_context_menu.glade.h:1
+msgid "_Modify Account..."
+msgstr "_Modifica account..."
 
 #: ../data/glade/zeroconf_information_window.glade.h:6
 msgid "Local jid:"
-msgstr "Jid locale:"
+msgstr "JID locale:"
 
 #: ../data/glade/zeroconf_information_window.glade.h:7
 msgid "Personal"
 msgstr "Informazioni personali"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:11
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Se la porta predefinita usata per i messaggi in ricezione non si adatta alle "
-"tue configurazioni puoi selezionarne un'altra qui.\n"
-"Potresti considerare di cambiare la configurazione del firewall"
-
 #: ../data/glade/zeroconf_properties_window.glade.h:15
 msgid "Modify Account"
 msgstr "Modifica account"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
-msgstr "Usa porta personalizzata:"
-
 #. For i18n
 #: ../src/advanced.py:51
 msgid "Activated"
@@ -2447,205 +2554,241 @@ msgstr "Nascosta"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:55
 msgid "English"
 msgstr "Inglese"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:55
 msgid "Belarusian"
 msgstr "Bielorusso"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:55
 msgid "Bulgarian"
 msgstr "Bulgaro"
 
-#: ../src/chat_control.py:52
-msgid "Briton"
+#: ../src/chat_control.py:55
+msgid "Breton"
 msgstr "Bretone"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:55
 msgid "Czech"
 msgstr "Ceco"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:55
 msgid "German"
 msgstr "Tedesco"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:55
 msgid "Greek"
 msgstr "Greco"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:55
 msgid "British"
 msgstr "Britannico"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:55
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:55
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: ../src/chat_control.py:52
-msgid "Basc"
+#: ../src/chat_control.py:55
+msgid "Basque"
 msgstr "Basco"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:55
 msgid "French"
 msgstr "Francese"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:55
 msgid "Croatian"
 msgstr "Croato"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:55
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:55
 msgid "Norwegian (b)"
 msgstr "Norvegese (b)"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:55
 msgid "Dutch"
 msgstr "Olandese"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:55
 msgid "Norwegian"
 msgstr "Norvegese"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:55
 msgid "Polish"
 msgstr "Polacco"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:55
 msgid "Portuguese"
 msgstr "Portoghese"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:55
 msgid "Brazilian Portuguese"
 msgstr "Brasiliano"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:55
 msgid "Russian"
 msgstr "Russo"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:55
+msgid "Serbian"
+msgstr "Serbo"
+
+#: ../src/chat_control.py:55
 msgid "Slovak"
 msgstr "Slovacco"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:55
 msgid "Swedish"
 msgstr "Svedese"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:55
 msgid "Chinese (Ch)"
 msgstr "Cinese (Ch)"
 
-#: ../src/chat_control.py:208 ../src/dialogs.py:1516
-msgid ""
-"If that is not your language for which you want to highlight misspelled "
-"words, then please set your $LANG as appropriate. Eg. for French do export "
-"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it "
-"global in /etc/profile.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Se questa non è la lingua per cui si vogliono evidenziare le parole "
-"scorrette, impostare $LANG in maniera appropriata. Per esempio, per "
-"l'italiano eseguire \"export LANG=it_IT\" o \"export LANG=it_IT.UTF-8\" in "
-"~/.bash_profile o, per rendere la modifica globale, in /etc/profile.\n"
-"\n"
-"Non verrà usata la caratteristica di evidenziatura parole scorrette"
-
-#: ../src/chat_control.py:247
+#: ../src/chat_control.py:283
 msgid "Spelling language"
 msgstr "Lingua per la correzione ortografica"
 
 #. we are not connected
-#: ../src/chat_control.py:270 ../src/chat_control.py:476
+#: ../src/chat_control.py:306 ../src/chat_control.py:512
 msgid "A connection is not available"
 msgstr "Nessuna connessione disponibile"
 
-#: ../src/chat_control.py:271 ../src/chat_control.py:477
+#: ../src/chat_control.py:307 ../src/chat_control.py:513
 msgid "Your message can not be sent until you are connected."
 msgstr "Il messaggio non può venire inviato finché non si è connessi."
 
-#: ../src/chat_control.py:852
-msgid "Chats"
-msgstr "Chat"
-
-#: ../src/chat_control.py:1034
+#: ../src/chat_control.py:1139
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s della chat di gruppo %(room_name)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1123
+#: ../src/chat_control.py:1227
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "%s non ha annunciato una chiave OpenPGP e non gliene è stata assegnata una"
 
-#: ../src/chat_control.py:1259
+#: ../src/chat_control.py:1266 ../src/groupchat_control.py:1411
+#, python-format
+msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+msgstr "Comando inesistente: /%s (per inviarlo, scrivere /say prima di esso)"
+
+#: ../src/chat_control.py:1273 ../src/groupchat_control.py:1434
+#, python-format
+msgid "Commands: %s"
+msgstr "Comandi: %s"
+
+#: ../src/chat_control.py:1276 ../src/groupchat_control.py:1448
+#, python-format
+msgid "Usage: /%s, clears the text window."
+msgstr "Utilizzo: /%s, pulisce la finestra di testo."
+
+#: ../src/chat_control.py:1279 ../src/groupchat_control.py:1453
+#, python-format
+msgid "Usage: /%s, hide the chat buttons."
+msgstr "Utilizzo: /%s, nasconde i pulsanti di chat."
+
+#: ../src/chat_control.py:1282 ../src/groupchat_control.py:1469
+#, python-format
+msgid ""
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
+msgstr ""
+"Utilizzo: /%s <azione>, invia l'azione alla stanza corrente. Usare la terza "
+"persona (esempio: /%s esplode)."
+
+#: ../src/chat_control.py:1286
+#, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr "Utilizzo: /%s, invia un ping al contatto"
+
+#: ../src/chat_control.py:1289
+#, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "Utilizzo: /%s, invia il messaggio al contatto"
+
+#: ../src/chat_control.py:1292 ../src/groupchat_control.py:1492
+#, python-format
+msgid "No help info for /%s"
+msgstr "Non esiste aiuto per /%s"
+
+#: ../src/chat_control.py:1430 ../src/chat_control.py:1456
 msgid "Encryption enabled"
 msgstr "Cifratura attivata"
 
-#: ../src/chat_control.py:1264
+#: ../src/chat_control.py:1435
+msgid "Session WILL be logged"
+msgstr "La sessione SARÀ registrata"
+
+#: ../src/chat_control.py:1437
+msgid "Session WILL NOT be logged"
+msgstr "La sessione NON SARÀ registrata"
+
+#: ../src/chat_control.py:1444
+msgid "The following message was NOT encrypted"
+msgstr "Il seguente messaggio NON è stato cifrato"
+
+#: ../src/chat_control.py:1448 ../src/chat_control.py:1461
+#: ../src/chat_control.py:2090
 msgid "Encryption disabled"
 msgstr "Cifratura disattivata"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1406 ../src/conversation_textview.py:493
-#: ../src/dialogs.py:629 ../src/gajim.py:842 ../src/gajim.py:843
-#: ../src/gajim.py:1187 ../src/roster_window.py:332
-#: ../src/roster_window.py:410 ../src/roster_window.py:1498
-#: ../src/roster_window.py:1508 ../src/roster_window.py:1684
-#: ../src/roster_window.py:1890 ../src/roster_window.py:2475
-#: ../src/roster_window.py:3900 ../src/roster_window.py:3902
-#: ../src/common/contacts.py:73 ../src/common/helpers.py:43
-#: ../src/common/helpers.py:255
+#: ../src/chat_control.py:1618 ../src/conversation_textview.py:562
+#: ../src/dialogs.py:674 ../src/gajim.py:894 ../src/gajim.py:895
+#: ../src/gajim.py:1369 ../src/gajim.py:1662 ../src/roster_window.py:345
+#: ../src/roster_window.py:429 ../src/roster_window.py:1790
+#: ../src/roster_window.py:1800 ../src/roster_window.py:2039
+#: ../src/roster_window.py:2277 ../src/roster_window.py:3125
+#: ../src/roster_window.py:3351 ../src/roster_window.py:4711
+#: ../src/roster_window.py:4713 ../src/common/contacts.py:84
+#: ../src/common/helpers.py:44 ../src/common/helpers.py:258
 msgid "Not in Roster"
 msgstr "Non nei contatti"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1550
+#: ../src/chat_control.py:1762
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Hai appena ricevuto un nuovo messaggio da \"%s\""
 
-#: ../src/chat_control.py:1551
+#: ../src/chat_control.py:1763
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr ""
-"Se questa scheda viene chiusa e la cronologia è disabilitata, questo "
-"messaggio verrà perso."
+"Se chiudi questa scheda e la cronologia è disabilitata, questo messaggio "
+"verrà perso."
 
-#: ../src/config.py:137 ../src/config.py:588
+#: ../src/config.py:122 ../src/config.py:544
 msgid "Disabled"
 msgstr "Disabilitato"
 
-#: ../src/config.py:231
-#, python-format
-msgid "Every %s _minutes"
-msgstr "Ogni %s _minuti"
-
-#: ../src/config.py:353
+#: ../src/config.py:288
 msgid "Active"
 msgstr "Attivo"
 
-#: ../src/config.py:361
+#: ../src/config.py:296
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:684 ../src/gajim.py:2222
+#: ../src/config.py:617 ../src/dialogs.py:958
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Dizionario per lingua %s non disponibile"
 
-#: ../src/config.py:685 ../src/gajim.py:2223
+#: ../src/config.py:618
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -2654,249 +2797,256 @@ msgstr ""
 "E' necessario installare il dizionario %s per usare il controllo "
 "ortografico, o configurare un'altra lingua nelle opzioni speller_language"
 
-#: ../src/config.py:1009
+#: ../src/config.py:969
 msgid "status message title"
 msgstr "titolo del messaggio di stato"
 
-#: ../src/config.py:1009
+#: ../src/config.py:969
 msgid "status message text"
 msgstr "testo del messaggio di stato"
 
-#: ../src/config.py:1045
+#: ../src/config.py:1005
 msgid "First Message Received"
 msgstr "Primo messaggio ricevuto"
 
-#: ../src/config.py:1046
+#: ../src/config.py:1006
 msgid "Next Message Received"
 msgstr "Prossimo messaggio ricevuto"
 
-#: ../src/config.py:1047
+#: ../src/config.py:1007
 msgid "Contact Connected"
 msgstr "Contatto connesso"
 
-#: ../src/config.py:1048
+#: ../src/config.py:1008
 msgid "Contact Disconnected"
 msgstr "Contatto disconnesso"
 
-#: ../src/config.py:1049
+#: ../src/config.py:1009
 msgid "Message Sent"
 msgstr "Messaggio inviato"
 
-#: ../src/config.py:1050
+#: ../src/config.py:1010
 msgid "Group Chat Message Highlight"
 msgstr "Evidenziatura messaggi in chat di gruppo"
 
-#: ../src/config.py:1051
+#: ../src/config.py:1011
 msgid "Group Chat Message Received"
 msgstr "Messaggio ricevuto in chat di gruppo"
 
-#: ../src/config.py:1058
+#: ../src/config.py:1018
 msgid "GMail Email Received"
 msgstr "Email GMail ricevuta"
 
-#: ../src/config.py:1261
+#. Name column
+#: ../src/config.py:1287 ../src/dialogs.py:1397 ../src/dialogs.py:1461
+#: ../src/disco.py:736 ../src/disco.py:1559 ../src/disco.py:1805
+#: ../src/history_window.py:108
+msgid "Name"
+msgstr "Nome"
+
+#: ../src/config.py:1395 ../src/common/config.py:375
+msgid "Be right back."
+msgstr "Torno subito."
+
+#: ../src/config.py:1399
+msgid "Relogin now?"
+msgstr "Effettuare un nuovo login?"
+
+#: ../src/config.py:1400
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+"Se si vogliono applicare subito i cambiamenti, è necessario effettuare un "
+"nuovo login."
+
+#: ../src/config.py:1495 ../src/config.py:1594
 msgid "OpenPGP is not usable in this computer"
 msgstr "Non è possibile usare OpenPGP su questo computer"
 
-#: ../src/config.py:1307
+#: ../src/config.py:1630 ../src/config.py:1674
+msgid "Unread events"
+msgstr "Eventi non letti"
+
+#: ../src/config.py:1631
+msgid "Read all pending events before removing this account."
+msgstr "Leggere tutti gli eventi in attesa prima di rimuovere questo account."
+
+#: ../src/config.py:1660
+#, python-format
+msgid "You have opened chat in account %s"
+msgstr "Hai aperto una chat nell'account %s"
+
+#: ../src/config.py:1661
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+"Tutte le finestre di chat e le chat di gruppo saranno chiuse. Desideri "
+"continuare?"
+
+#: ../src/config.py:1670
 msgid "You are currently connected to the server"
 msgstr "Si è ora connessi al server"
 
-#: ../src/config.py:1308
+#: ../src/config.py:1671
 msgid "To change the account name, you must be disconnected."
 msgstr "Per cambiare nome account, è necessario disconnettersi."
 
-#: ../src/config.py:1311 ../src/config.py:1905
-msgid "Unread events"
-msgstr "Eventi non letti"
-
-#: ../src/config.py:1312
+#: ../src/config.py:1675
 msgid "To change the account name, you must read all pending events."
-msgstr "Per cambiare nome account, è necessario leggere tutti gli eventi in attesa."
+msgstr ""
+"Per cambiare nome account, è necessario leggere tutti gli eventi in attesa."
 
-#: ../src/config.py:1316
+#: ../src/config.py:1681
 msgid "Account Name Already Used"
 msgstr "Nome account già in uso"
 
-#: ../src/config.py:1317
+#: ../src/config.py:1682
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Questo nome è già usato da un altro account. Scegliere un altro nome."
 
-#: ../src/config.py:1321 ../src/config.py:1325
+#: ../src/config.py:1686 ../src/config.py:1690
 msgid "Invalid account name"
 msgstr "Il nome account non è valido"
 
-#: ../src/config.py:1322
+#: ../src/config.py:1687
 msgid "Account name cannot be empty."
 msgstr "Il nome account non può essere vuoto."
 
-#: ../src/config.py:1326
+#: ../src/config.py:1691
 msgid "Account name cannot contain spaces."
 msgstr "Il nome account non può contenere spazi."
 
-#: ../src/config.py:1334 ../src/config.py:1340 ../src/config.py:1350
-#: ../src/config.py:3008
+#: ../src/config.py:1755
+msgid "Rename Account"
+msgstr "Rinomina account"
+
+#: ../src/config.py:1756
+#, python-format
+msgid "Enter a new name for account %s"
+msgstr "Inserisci un nuovo nome per l'account %s"
+
+#: ../src/config.py:1774 ../src/config.py:1782 ../src/config.py:1822
+#: ../src/config.py:3048
 msgid "Invalid Jabber ID"
 msgstr "ID Jabber non valido"
 
-#: ../src/config.py:1341
+#: ../src/config.py:1783
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Un ID Jabber deve essere nella forma \"utente@nomeserver\"."
 
-#: ../src/config.py:1400
+#: ../src/config.py:1968 ../src/config.py:3119
 msgid "Invalid entry"
 msgstr "Voce non valida"
 
-#: ../src/config.py:1401
+#: ../src/config.py:1969 ../src/config.py:3120
 msgid "Custom port must be a port number."
 msgstr "Si deve scegliere un numero di porta."
 
-#: ../src/config.py:1529 ../src/common/config.py:366
-msgid "Be right back."
-msgstr "Torno subito."
+#: ../src/config.py:1990
+msgid "Failed to get secret keys"
+msgstr "Fallimento nella ricezione delle chiavi segrete"
 
-#: ../src/config.py:1539
-msgid "Relogin now?"
-msgstr "Effettuare un nuovo login?"
+#: ../src/config.py:1991
+msgid "There was a problem retrieving your OpenPGP secret keys."
+msgstr "C'è stato un problema nel recuperare le chiavi segrete OpenPGP."
 
-#: ../src/config.py:1540
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr ""
-"Se si vogliono applicare subito i cambiamenti, è necessario effettuare un "
-"nuovo login."
+#: ../src/config.py:1994
+msgid "OpenPGP Key Selection"
+msgstr "Scelta chiave OpenPGP"
+
+#: ../src/config.py:1995
+msgid "Choose your OpenPGP key"
+msgstr "Scegliere la chiave OpenPGP"
 
-#: ../src/config.py:1566
+#: ../src/config.py:2052
 msgid "No such account available"
 msgstr "Questo account non è disponibile"
 
-#: ../src/config.py:1567
+#: ../src/config.py:2053
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "È necessario creare un nuovo account prima di poter modificare le "
 "informazioni personali."
 
-#: ../src/config.py:1574 ../src/dialogs.py:1130 ../src/dialogs.py:1316
-#: ../src/disco.py:419 ../src/profile_window.py:313
+#: ../src/config.py:2060 ../src/dialogs.py:1244 ../src/dialogs.py:1385
+#: ../src/dialogs.py:1565 ../src/disco.py:420 ../src/profile_window.py:325
 msgid "You are not connected to the server"
 msgstr "Non si è connessi al server"
 
-#: ../src/config.py:1575
+#: ../src/config.py:2061
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Senza una connessione, non è possibile modificare le informazioni personali."
 
-#: ../src/config.py:1579
+#: ../src/config.py:2065
 msgid "Your server doesn't support Vcard"
 msgstr "Il server non supporta Vcard"
 
-#: ../src/config.py:1580
+#: ../src/config.py:2066
 msgid "Your server can't save your personal information."
 msgstr "Il server non può salvare le informazioni personali."
 
-#: ../src/config.py:1604 ../src/config.py:3396
-msgid "Failed to get secret keys"
-msgstr "Fallimento nella ricezione delle chiavi segrete"
-
-#: ../src/config.py:1605 ../src/config.py:3397
-msgid "There was a problem retrieving your OpenPGP secret keys."
-msgstr "C'è stato un problema nel recuperare le chiavi segrete OpenPGP."
-
-#: ../src/config.py:1608 ../src/config.py:3400
-msgid "OpenPGP Key Selection"
-msgstr "Scelta chiave OpenPGP"
-
-#: ../src/config.py:1609 ../src/config.py:3401
-msgid "Choose your OpenPGP key"
-msgstr "Scegliere la chiave OpenPGP"
-
-#. Name column
-#: ../src/config.py:1839 ../src/disco.py:740 ../src/disco.py:1495
-#: ../src/disco.py:1733 ../src/history_window.py:78
-msgid "Name"
-msgstr "Nome"
-
-#: ../src/config.py:1842
-msgid "Server"
-msgstr "Server"
-
-#: ../src/config.py:1906
-msgid "Read all pending events before removing this account."
-msgstr "Leggere tutti gli eventi in attesa prima di rimuovere questo account."
-
-#: ../src/config.py:1943
-#, python-format
-msgid "You have opened chat in account %s"
-msgstr "Hai aperto una chat nell'account %s"
-
-#: ../src/config.py:1944
-msgid "All chat and groupchat windows will be closed. Do you want to continue?"
-msgstr ""
-"Tutte le finestre di chat e le chat di gruppo saranno chiuse. Desideri "
-"continuare?"
-
-#: ../src/config.py:2003
+#: ../src/config.py:2097
 msgid "Account Local already exists."
 msgstr "Nome account già in uso"
 
-#: ../src/config.py:2004
+#: ../src/config.py:2098
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Per favore rinominalo o rimuovilo prima di abilitare la messaggistica sulla "
 "rete locale."
 
-#: ../src/config.py:2238
+#: ../src/config.py:2274
 #, python-format
 msgid "Edit %s"
 msgstr "Modifica %s"
 
-#: ../src/config.py:2240
+#: ../src/config.py:2276
 #, python-format
 msgid "Register to %s"
 msgstr "Registra a %s"
 
 #. list at the beginning
-#: ../src/config.py:2306
+#: ../src/config.py:2312
 msgid "Ban List"
 msgstr "Lista utenti bloccati"
 
-#: ../src/config.py:2307
+#: ../src/config.py:2313
 msgid "Member List"
 msgstr "Lista membri"
 
-#: ../src/config.py:2308
+#: ../src/config.py:2314
 msgid "Owner List"
 msgstr "Lista proprietari"
 
-#: ../src/config.py:2309
+#: ../src/config.py:2315
 msgid "Administrator List"
 msgstr "Lista amministratori"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2342 ../src/disco.py:747 ../src/history_manager.py:155
+#: ../src/config.py:2364 ../src/disco.py:743 ../src/history_manager.py:155
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2350
+#: ../src/config.py:2372
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:2355
+#: ../src/config.py:2377
 msgid "Nick"
 msgstr "Nickname"
 
-#: ../src/config.py:2359
+#: ../src/config.py:2381
 msgid "Role"
 msgstr "Ruolo"
 
-#: ../src/config.py:2380
+#: ../src/config.py:2406
 msgid "Banning..."
 msgstr "Sto bloccando..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2382
+#: ../src/config.py:2408
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2904,11 +3054,11 @@ msgstr ""
 "<b>Chi si vuole bloccare?</b>\n"
 "\n"
 
-#: ../src/config.py:2384
+#: ../src/config.py:2410
 msgid "Adding Member..."
 msgstr "Aggiunta membro..."
 
-#: ../src/config.py:2385
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2916,11 +3066,11 @@ msgstr ""
 "<b>Chi si vuole rendere membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2387
+#: ../src/config.py:2413
 msgid "Adding Owner..."
 msgstr "Aggiunta proprietario..."
 
-#: ../src/config.py:2388
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -2928,11 +3078,11 @@ msgstr ""
 "<b>Chi si vuole rendere proprietario?</b>\n"
 "\n"
 
-#: ../src/config.py:2390
+#: ../src/config.py:2416
 msgid "Adding Administrator..."
 msgstr "Aggiunta amministratore..."
 
-#: ../src/config.py:2391
+#: ../src/config.py:2417
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2940,7 +3090,7 @@ msgstr ""
 "<b>Chi si vuole rendere amministratore?</b>\n"
 "\n"
 
-#: ../src/config.py:2392
+#: ../src/config.py:2418
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2957,124 +3107,119 @@ msgstr ""
 "4. dominio (il dominio corrisponde, così come qualsiasi utente@dominio,\n"
 "dominio/risorsa, o indirizzo contenente un sottodominio)."
 
-#: ../src/config.py:2497
+#: ../src/config.py:2522
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminazione account %s"
 
-#: ../src/config.py:2514 ../src/roster_window.py:2733
+#: ../src/config.py:2539 ../src/gajim.py:1312 ../src/roster_window.py:3410
 msgid "Password Required"
 msgstr "Password richiesta"
 
-#: ../src/config.py:2515 ../src/roster_window.py:2729
+#: ../src/config.py:2540 ../src/roster_window.py:3406
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Inserire la password per l'account %s"
 
-#: ../src/config.py:2516 ../src/roster_window.py:2734
+#: ../src/config.py:2541 ../src/roster_window.py:3411
 msgid "Save password"
 msgstr "Memorizza password"
 
-#: ../src/config.py:2530
+#: ../src/config.py:2555
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "L'account \"%s\" è connesso al server"
 
-#: ../src/config.py:2531
+#: ../src/config.py:2556
 msgid "If you remove it, the connection will be lost."
 msgstr "Se viene rimosso, la connessione verrà persa."
 
-#: ../src/config.py:2616
+#: ../src/config.py:2649
 msgid "Default"
 msgstr "Predefinito"
 
-#: ../src/config.py:2616
+#: ../src/config.py:2649
 msgid "?print_status:All"
 msgstr "?print_status:Tutti"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2650
 msgid "Enter and leave only"
 msgstr "Solo ingresso ed uscita"
 
-#: ../src/config.py:2618
+#: ../src/config.py:2651
 msgid "?print_status:None"
 msgstr "Nessuno"
 
-#: ../src/config.py:2686
+#: ../src/config.py:2720
 msgid "New Group Chat"
 msgstr "Nuova chat di gruppo"
 
-#: ../src/config.py:2719
+#: ../src/config.py:2753
 msgid "This bookmark has invalid data"
 msgstr "Questo segnalibro contiene dati non validi"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2754
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Controllare di avere compilato i campi server e stanza, o eliminare questo "
 "segnalibro."
 
-#: ../src/config.py:2983
+#: ../src/config.py:3031
 msgid "Invalid username"
 msgstr "Nome utente non valido"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3033
 msgid "You must provide a username to configure this account."
 msgstr "È necessario inserire un nome utente per configurare questo account."
 
-#: ../src/config.py:2994 ../src/dialogs.py:1335
-msgid "Invalid password"
-msgstr "Password non valida"
-
-#: ../src/config.py:2995
-msgid "You must enter a password for the new account."
-msgstr "È necessario inserire una password per il nuovo account."
-
-#: ../src/config.py:2999 ../src/dialogs.py:1340
-msgid "Passwords do not match"
-msgstr "Le password non coincidono"
-
-#: ../src/config.py:3000 ../src/dialogs.py:1341
-msgid "The passwords typed in both fields must be identical."
-msgstr "Le password immesse nei due campi devono essere identiche."
-
-#: ../src/config.py:3019
+#: ../src/config.py:3059
 msgid "Duplicate Jabber ID"
 msgstr "ID Jabber duplicato"
 
-#: ../src/config.py:3020
+#: ../src/config.py:3060
 msgid "This account is already configured in Gajim."
 msgstr "Questo account è già configurato in Gajim."
 
-#: ../src/config.py:3037
+#: ../src/config.py:3077
 msgid "Account has been added successfully"
 msgstr "L'account è stato aggiunto con successo"
 
-#: ../src/config.py:3038 ../src/config.py:3073
+#: ../src/config.py:3078 ../src/config.py:3223
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
 "window."
-msgstr "È possibile impostare ora le opzioni avanzate premendo il pulsante \"Avanzate\", o farlo più tardi scegliendo la voce \"Account\" nel menu \"Modifica\" della finestra principale."
+msgstr ""
+"È possibile impostare ora le opzioni avanzate premendo il pulsante \"Avanzate"
+"\", o farlo più tardi scegliendo la voce \"Account\" nel menu \"Modifica\" "
+"della finestra principale."
 
-#: ../src/config.py:3072
-msgid "Your new account has been created successfully"
-msgstr "Il nuovo account è stato creato con successo"
+#: ../src/config.py:3095
+msgid "Invalid server"
+msgstr "Server non valido"
+
+#: ../src/config.py:3096
+msgid "Please provide a server on which you want to register."
+msgstr "Per favore fornire il server su cui vuoi registrarti."
 
-#: ../src/config.py:3090
+#: ../src/config.py:3202 ../src/config.py:3241
 msgid "An error occurred during account creation"
 msgstr "Si è verificato un errore durante la creazione dell'account"
 
-#: ../src/config.py:3148
+#: ../src/config.py:3222
+msgid "Your new account has been created successfully"
+msgstr "Il nuovo account è stato creato con successo"
+
+#: ../src/config.py:3327
 msgid "Account name is in use"
 msgstr "Il nome account è già in uso"
 
-#: ../src/config.py:3149
+#: ../src/config.py:3328
 msgid "You already have an account using this name."
 msgstr "Esiste già un account con lo stesso nome"
 
-#: ../src/conversation_textview.py:271
+#: ../src/conversation_textview.py:337
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3082,518 +3227,583 @@ msgstr ""
 "Il testo sotto a questa riga è quanto è stato detto dall'ultima volta che si "
 "è prestata attenzione a questa chat di gruppo"
 
-#: ../src/conversation_textview.py:340
+#: ../src/conversation_textview.py:409
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Azioni per \"%s\""
 
-#: ../src/conversation_textview.py:352
+#: ../src/conversation_textview.py:421
 msgid "Read _Wikipedia Article"
 msgstr "Leggi l'articolo di _Wikipedia"
 
-#: ../src/conversation_textview.py:357
+#: ../src/conversation_textview.py:426
 msgid "Look it up in _Dictionary"
 msgstr "Controlla nel _Dizionario"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:373
+#: ../src/conversation_textview.py:442
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Manca un \"%s\" nell'URL del Dizionario e questo non è WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:386
+#: ../src/conversation_textview.py:455
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Manca un \"%s\" nell'URL di ricerca su web"
 
-#: ../src/conversation_textview.py:389
+#: ../src/conversation_textview.py:458
 msgid "Web _Search for it"
 msgstr "_Cercalo nel Web"
 
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:464
 msgid "Open as _Link"
 msgstr "Apri come _Link"
 
-#: ../src/conversation_textview.py:752
+#: ../src/conversation_textview.py:929
 msgid "Yesterday"
 msgstr "Ieri"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:933
 #, python-format
 msgid "%i days ago"
 msgstr "%i giorni fa"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:790
+#: ../src/conversation_textview.py:967
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Oggetto: %s\n"
 
-#: ../src/dialogs.py:59
+#: ../src/dialogs.py:64
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome contatto: <i>%s</i>"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:66
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "ID Jabber: <i>%s</i>"
 
-#: ../src/dialogs.py:211
+#: ../src/dialogs.py:216
 msgid "Group"
 msgstr "Gruppo"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:223
 msgid "In the group"
 msgstr "Nel gruppo"
 
-#: ../src/dialogs.py:269
+#: ../src/dialogs.py:274
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:277
 msgid "Contact name"
 msgstr "Nome contatto"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:323
 #, python-format
 msgid "%s Status Message"
 msgstr "Messaggio di stato %s"
 
-#: ../src/dialogs.py:320
+#: ../src/dialogs.py:325
 msgid "Status Message"
 msgstr "Messaggio di stato"
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:425
 msgid "Save as Preset Status Message"
 msgstr "Salva come messaggio di stato predefinito"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:426
 msgid "Please type a name for this status message"
 msgstr "Inserire un nome per questo messaggio di stato"
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:437
+msgid "Overwrite Status Message?"
+msgstr "Sovrascrivere messaggio di stato?"
+
+#: ../src/dialogs.py:438
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr ""
+"Questo nome è già stato utilizzato. Vuoi sovrascrivere questo messaggio di "
+"stato?"
+
+#: ../src/dialogs.py:454
 msgid "AIM Address:"
 msgstr "Indirizzo AIM:"
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:455
 msgid "GG Number:"
 msgstr "Numero GG:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:456
 msgid "ICQ Number:"
 msgstr "Numero ICQ:"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:457
 msgid "MSN Address:"
 msgstr "Indirizzo MSN:"
 
-#: ../src/dialogs.py:421
+#: ../src/dialogs.py:458
 msgid "Yahoo! Address:"
 msgstr "Indirizzo Yahoo!:"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:495
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Inserire i dati del contatto che si vuole aggiungere all'account %s"
 
-#: ../src/dialogs.py:459
+#: ../src/dialogs.py:497
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Inserire i dati del contatto che si vuole aggiungere"
 
-#: ../src/dialogs.py:609 ../src/dialogs.py:615
+#: ../src/dialogs.py:654 ../src/dialogs.py:660
 msgid "Invalid User ID"
 msgstr "ID utente non valido"
 
-#: ../src/dialogs.py:616
+#: ../src/dialogs.py:661
 msgid "The user ID must not contain a resource."
 msgstr "L'identificatore dell'utente deve non contenere una risorsa."
 
-#: ../src/dialogs.py:630
+#: ../src/dialogs.py:675
 msgid "Contact already in roster"
-msgstr "Contatto già presente nella lista"
+msgstr "Contatto già presente nella lista contatti"
 
-#: ../src/dialogs.py:631
+#: ../src/dialogs.py:676
 msgid "This contact is already listed in your roster."
-msgstr "Questo contatto è già presente nella lista."
+msgstr "Questo contatto è già presente nella lista contatti."
 
-#: ../src/dialogs.py:668
+#: ../src/dialogs.py:712
 msgid "User ID:"
 msgstr "ID utente:"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:774
 msgid "A GTK+ jabber client"
 msgstr "Un client jabber GTK+"
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:775
 msgid "GTK+ Version:"
 msgstr "Versione di GTK+:"
 
-#: ../src/dialogs.py:733
+#: ../src/dialogs.py:776
 msgid "PyGTK Version:"
 msgstr "Versione di PyGTK:"
 
-#: ../src/dialogs.py:747
+#: ../src/dialogs.py:790
 msgid "Current Developers:"
 msgstr "Sviluppatori attuali:"
 
-#: ../src/dialogs.py:749
+#: ../src/dialogs.py:792
 msgid "Past Developers:"
 msgstr "Sviluppatori precedenti:"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:802
 msgid "THANKS:"
 msgstr "GRAZIE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:765
+#: ../src/dialogs.py:808
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Dulcis in fundo, ringraziamo tutti i gestori dei pacchetti"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:778
+#: ../src/dialogs.py:821
 msgid "translator-credits"
 msgstr ""
 "Mauro Brenna <malloblenne@gmail.com>\n"
 "Andrea Ratti <scimiot@yahoo.it>\n"
-"Matteo Dell'Amico <della@linux.it>"
+"Matteo Dell'Amico <della@linux.it>\n"
+"Daniel Coppi <neoex.dc@gmail.com>"
 
-#: ../src/dialogs.py:908
+#: ../src/dialogs.py:951
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Non è possibile fare il bind alla porta %s"
 
-#: ../src/dialogs.py:909
+#: ../src/dialogs.py:952
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
-msgstr "Potrebbe essere in esecuzione un altra istanza di Gajim. Il trasferimento file verrà annullato."
+msgstr ""
+"Potrebbe essere in esecuzione un altra istanza di Gajim. Il trasferimento "
+"file verrà annullato."
+
+#: ../src/dialogs.py:959
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option.\n"
+"\n"
+"Highlighting misspelled words feature will not be used"
+msgstr ""
+"E' necessario installare il dizionario %s per usare il controllo "
+"ortografico, o configurare un'altra lingua nelle opzioni speller_language.\n"
+"\n"
+"L'evidenziazione delle parole errate non verrà usata"
 
-#: ../src/dialogs.py:1060
+#: ../src/dialogs.py:1173
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Richiesta di abbonamento per l'account %s da %s"
 
-#: ../src/dialogs.py:1063
+#: ../src/dialogs.py:1176
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Richiesta di abbonamento da %s"
 
-#: ../src/dialogs.py:1123 ../src/roster_window.py:687
+#: ../src/dialogs.py:1237 ../src/roster_window.py:763
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Si è già nella stanza %s"
 
-#: ../src/dialogs.py:1131
+#: ../src/dialogs.py:1245
 msgid "You can not join a group chat unless you are connected."
 msgstr "Non è possibile unirsi a chat di gruppo quando non si è connessi."
 
-#: ../src/dialogs.py:1146
+#: ../src/dialogs.py:1263
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entra in chat di gruppo con l'account %s"
 
-#: ../src/dialogs.py:1214 ../src/dialogs.py:1220
+#: ../src/dialogs.py:1333 ../src/dialogs.py:1339
+#: ../src/groupchat_control.py:1662
 msgid "Invalid group chat Jabber ID"
 msgstr "ID Jabber non valido"
 
-#: ../src/dialogs.py:1215 ../src/dialogs.py:1221
+#: ../src/dialogs.py:1334 ../src/dialogs.py:1340
+#: ../src/groupchat_control.py:1663
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Il nome della stanza o del server contiene caratteri non permessi."
 
-#: ../src/dialogs.py:1227
+#: ../src/dialogs.py:1346
 msgid "This is not a group chat"
 msgstr "Questa non è una chat di gruppo"
 
-#: ../src/dialogs.py:1228
+#: ../src/dialogs.py:1347
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s non è il nome di una chat di gruppo"
 
-#: ../src/dialogs.py:1267
+#: ../src/dialogs.py:1386
+msgid "Without a connection, you can not synchronise your contacts."
+msgstr "Senza una connessione, non puoi sincronizzare i tuoi contatti."
+
+#: ../src/dialogs.py:1400
+msgid "Server"
+msgstr "Server"
+
+#: ../src/dialogs.py:1433
+msgid "This account is not connected to the server"
+msgstr "Questo account non è connesso al server"
+
+#: ../src/dialogs.py:1434
+msgid "You cannot synchronize with an account unless it is connected."
+msgstr "Non puoi sincronizzarti con un account a meno che non sia connesso."
+
+#: ../src/dialogs.py:1458
+msgid "Synchronise"
+msgstr "Sincronizza"
+
+#: ../src/dialogs.py:1516
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Inizia chat con l'account %s"
 
-#: ../src/dialogs.py:1269
+#: ../src/dialogs.py:1518
 msgid "Start Chat"
 msgstr "Inizia chat"
 
-#: ../src/dialogs.py:1270
+#: ../src/dialogs.py:1519
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr "Introdurre il nickname o l'ID del contatto con cui chattare:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1295 ../src/dialogs.py:1654 ../src/dialogs.py:1785
+#: ../src/dialogs.py:1544 ../src/dialogs.py:1891 ../src/dialogs.py:2027
 msgid "Connection not available"
 msgstr "Connessione non disponibile"
 
-#: ../src/dialogs.py:1296 ../src/dialogs.py:1655 ../src/dialogs.py:1786
+#: ../src/dialogs.py:1545 ../src/dialogs.py:1892 ../src/dialogs.py:2028
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Assicurarsi di essere connesso con \"%s\"."
 
-#: ../src/dialogs.py:1305 ../src/dialogs.py:1308
+#: ../src/dialogs.py:1554 ../src/dialogs.py:1557
 msgid "Invalid JID"
 msgstr "ID Jabber non valido"
 
-#: ../src/dialogs.py:1308
+#: ../src/dialogs.py:1557
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossibile processare \"%s\"."
 
-#: ../src/dialogs.py:1317
+#: ../src/dialogs.py:1566
 msgid "Without a connection, you can not change your password."
 msgstr "Senza una connessione, non è possibile cambiare la password."
 
-#: ../src/dialogs.py:1336
+#: ../src/dialogs.py:1584
+msgid "Invalid password"
+msgstr "Password non valida"
+
+#: ../src/dialogs.py:1585
 msgid "You must enter a password."
 msgstr "È necessario inserire una password."
 
+#: ../src/dialogs.py:1589
+msgid "Passwords do not match"
+msgstr "Le password non coincidono"
+
+#: ../src/dialogs.py:1590
+msgid "The passwords typed in both fields must be identical."
+msgstr "Le password immesse nei due campi devono essere identiche."
+
 #. img to display
 #. default value
-#: ../src/dialogs.py:1383 ../src/notify.py:212 ../src/notify.py:416
+#: ../src/dialogs.py:1632 ../src/notify.py:219 ../src/notify.py:429
 msgid "Contact Signed In"
 msgstr "Contatto connesso"
 
-#: ../src/dialogs.py:1385 ../src/notify.py:220 ../src/notify.py:418
+#: ../src/dialogs.py:1634 ../src/notify.py:227 ../src/notify.py:431
 msgid "Contact Signed Out"
 msgstr "Contatto disconnesso"
 
 #. chat message
-#: ../src/dialogs.py:1387 ../src/notify.py:239 ../src/notify.py:420
+#: ../src/dialogs.py:1636 ../src/notify.py:250 ../src/notify.py:433
 msgid "New Message"
 msgstr "Nuovo messaggio"
 
 #. single message
-#: ../src/dialogs.py:1387 ../src/notify.py:224 ../src/notify.py:420
+#: ../src/dialogs.py:1636 ../src/notify.py:231 ../src/notify.py:433
 msgid "New Single Message"
 msgstr "Nuovo messaggio singolo"
 
 #. private message
-#: ../src/dialogs.py:1388 ../src/notify.py:231 ../src/notify.py:421
+#: ../src/dialogs.py:1637 ../src/notify.py:238 ../src/notify.py:434
 msgid "New Private Message"
 msgstr "Nuovo messaggio privato"
 
-#: ../src/dialogs.py:1388 ../src/gajim.py:1282 ../src/notify.py:429
+#: ../src/dialogs.py:1637 ../src/gajim.py:1465 ../src/notify.py:442
 msgid "New E-mail"
 msgstr "Nuova e-mail"
 
-#: ../src/dialogs.py:1390 ../src/gajim.py:1435 ../src/notify.py:423
+#: ../src/dialogs.py:1639 ../src/gajim.py:1682 ../src/notify.py:436
 msgid "File Transfer Request"
 msgstr "Richiesta di trasferimento file"
 
-#: ../src/dialogs.py:1392 ../src/gajim.py:1254 ../src/gajim.py:1411
-#: ../src/notify.py:425
+#: ../src/dialogs.py:1641 ../src/gajim.py:1437 ../src/gajim.py:1649
+#: ../src/notify.py:438
 msgid "File Transfer Error"
 msgstr "Errore nel trasferimento file"
 
-#: ../src/dialogs.py:1394 ../src/gajim.py:1474 ../src/gajim.py:1496
-#: ../src/gajim.py:1513 ../src/notify.py:427
+#: ../src/dialogs.py:1643 ../src/gajim.py:1721 ../src/gajim.py:1743
+#: ../src/gajim.py:1760 ../src/notify.py:440
 msgid "File Transfer Completed"
 msgstr "Trasferimento file completato"
 
-#: ../src/dialogs.py:1395 ../src/gajim.py:1477 ../src/notify.py:427
+#: ../src/dialogs.py:1644 ../src/gajim.py:1724 ../src/notify.py:440
 msgid "File Transfer Stopped"
 msgstr "Trasferimento file fermato"
 
-#: ../src/dialogs.py:1397 ../src/gajim.py:1151 ../src/notify.py:431
+#: ../src/dialogs.py:1646 ../src/gajim.py:1333 ../src/notify.py:444
 msgid "Groupchat Invitation"
 msgstr "Invito a chat di gruppo"
 
-#: ../src/dialogs.py:1399 ../src/notify.py:204 ../src/notify.py:433
+#: ../src/dialogs.py:1648 ../src/notify.py:211 ../src/notify.py:446
 msgid "Contact Changed Status"
 msgstr "Stato Contatto Cambiato"
 
-#: ../src/dialogs.py:1584
+#: ../src/dialogs.py:1821
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Messaggio singolo con l'account %s"
 
-#: ../src/dialogs.py:1586
+#: ../src/dialogs.py:1823
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Messaggio singolo nell'account %s"
 
-#: ../src/dialogs.py:1588
+#: ../src/dialogs.py:1825
 msgid "Single Message"
 msgstr "Messaggio singolo"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1591
+#: ../src/dialogs.py:1828
 #, python-format
 msgid "Send %s"
 msgstr "Invia %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1614
+#: ../src/dialogs.py:1851
 #, python-format
 msgid "Received %s"
 msgstr "Ricevuto %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1686
+#: ../src/dialogs.py:1928
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1687
+#: ../src/dialogs.py:1929
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s ha scritto:\n"
 
-#: ../src/dialogs.py:1731
+#: ../src/dialogs.py:1973
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML per %s"
 
-#: ../src/dialogs.py:1733
+#: ../src/dialogs.py:1975
 msgid "XML Console"
 msgstr "Console XML"
 
-#: ../src/dialogs.py:1856
+#: ../src/dialogs.py:2098
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista privacy <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:1860
+#: ../src/dialogs.py:2102
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista privacy per %s"
 
-#: ../src/dialogs.py:1908
+#: ../src/dialogs.py:2158
 #, python-format
 msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr "Ordine: %s, azione: %s, tipo: %s, valore: %s"
 
-#: ../src/dialogs.py:1911
+#: ../src/dialogs.py:2161
 #, python-format
 msgid "Order: %s, action: %s"
 msgstr "Ordine: %s, azione: %s"
 
-#: ../src/dialogs.py:1953
+#: ../src/dialogs.py:2203
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Modifica una regola</b>"
 
-#: ../src/dialogs.py:2040
+#: ../src/dialogs.py:2290
 msgid "<b>Add a rule</b>"
 msgstr "<b>Aggiungi una regola</b>"
 
-#: ../src/dialogs.py:2136
+#: ../src/dialogs.py:2386
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Lista privacy per %s"
 
-#: ../src/dialogs.py:2138
+#: ../src/dialogs.py:2388
 msgid "Privacy Lists"
 msgstr "Liste privacy"
 
-#: ../src/dialogs.py:2208
+#: ../src/dialogs.py:2458
 msgid "Invalid List Name"
 msgstr "Nome lista non valido"
 
-#: ../src/dialogs.py:2209
+#: ../src/dialogs.py:2459
 msgid "You must enter a name to create a privacy list."
 msgstr "È necessario inserire una nome per creare una lista privacy"
 
-#. Don't translate $Contact
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2496
+msgid "$Contact has invited you to join a discussion"
+msgstr "$Contact ti ha invitato a partecipare a una discussione"
+
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact ti ha invitato alla chat di gruppo %(room_jid)s"
 
 #. only if not None and not ''
-#: ../src/dialogs.py:2255
+#: ../src/dialogs.py:2510
 #, python-format
 msgid "Comment: %s"
 msgstr "Commento: %s"
 
-#: ../src/dialogs.py:2317
+#: ../src/dialogs.py:2576
 msgid "Choose Sound"
 msgstr "Scegliere il suono"
 
-#: ../src/dialogs.py:2327 ../src/dialogs.py:2372
+#: ../src/dialogs.py:2586 ../src/dialogs.py:2634
 msgid "All files"
 msgstr "Tutti i file"
 
-#: ../src/dialogs.py:2332
+#: ../src/dialogs.py:2591
 msgid "Wav Sounds"
 msgstr "Suoni Wav"
 
-#: ../src/dialogs.py:2362
+#: ../src/dialogs.py:2624
 msgid "Choose Image"
 msgstr "Scegli immagine"
 
-#: ../src/dialogs.py:2377
+#: ../src/dialogs.py:2639
 msgid "Images"
 msgstr "Immagini"
 
-#: ../src/dialogs.py:2434
+#: ../src/dialogs.py:2703
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quando %s diventa:"
 
-#: ../src/dialogs.py:2436
+#: ../src/dialogs.py:2705
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Creazione notifica speciale per %s"
 
 #. # means number
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2776
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:2513
+#: ../src/dialogs.py:2782
 msgid "Condition"
 msgstr "Condizione"
 
-#: ../src/dialogs.py:2634
+#: ../src/dialogs.py:2900
 msgid "when I am "
 msgstr "quando io sono "
 
-#: ../src/disco.py:103
+#: ../src/disco.py:104
 msgid "Others"
 msgstr "Altri"
 
-#: ../src/disco.py:104 ../src/disco.py:105 ../src/disco.py:1281
-#: ../src/gajim.py:596 ../src/roster_window.py:271 ../src/roster_window.py:329
-#: ../src/roster_window.py:368 ../src/roster_window.py:451
-#: ../src/roster_window.py:483 ../src/roster_window.py:485
-#: ../src/roster_window.py:3896 ../src/roster_window.py:3898
-#: ../src/common/contacts.py:267 ../src/common/helpers.py:43
+#: ../src/disco.py:105 ../src/disco.py:106 ../src/disco.py:1345
+#: ../src/gajim.py:644 ../src/roster_window.py:282 ../src/roster_window.py:342
+#: ../src/roster_window.py:382 ../src/roster_window.py:490
+#: ../src/roster_window.py:522 ../src/roster_window.py:524
+#: ../src/roster_window.py:4707 ../src/roster_window.py:4709
+#: ../src/common/contacts.py:290 ../src/common/contacts.py:305
+#: ../src/common/helpers.py:44
 msgid "Transports"
 msgstr "Trasporti"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:107
+#: ../src/disco.py:108
 msgid "Conference"
 msgstr "Conferenze"
 
-#: ../src/disco.py:420
+#: ../src/disco.py:421
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Senza una connessione, non è possibile consultare i servizi disponibili"
 
-#: ../src/disco.py:499
+#: ../src/disco.py:495
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Ricerca servizi usando l'account %s"
 
-#: ../src/disco.py:501
+#: ../src/disco.py:497
 msgid "Service Discovery"
 msgstr "Ricerca servizi"
 
-#: ../src/disco.py:641
+#: ../src/disco.py:637
 msgid "The service could not be found"
 msgstr "Il servizio non è stato trovato"
 
-#: ../src/disco.py:642
+#: ../src/disco.py:638
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3601,64 +3811,72 @@ msgstr ""
 "Il servizio all'indirizzo immesso non risponde o è inesistente. Controllare "
 "l'indirizzo e riprovare."
 
-#: ../src/disco.py:646 ../src/disco.py:927
+#: ../src/disco.py:642 ../src/disco.py:923
 msgid "The service is not browsable"
 msgstr "Non è possibile consultare il servizio"
 
-#: ../src/disco.py:647
+#: ../src/disco.py:643
 msgid "This type of service does not contain any items to browse."
 msgstr "Questo tipo di servizio non contiene oggetti da consultare."
 
-#: ../src/disco.py:727
+#: ../src/disco.py:723
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Consulta %s usando l'account %s"
 
-#: ../src/disco.py:766
+#: ../src/disco.py:762
 msgid "_Browse"
 msgstr "C_onsulta"
 
-#: ../src/disco.py:928
+#: ../src/disco.py:924
 msgid "This service does not contain any items to browse."
 msgstr "Questo servizio non contiene oggetti da consultare."
 
-#: ../src/disco.py:1155 ../src/disco.py:1286
+#: ../src/disco.py:1142
+msgid "_Execute Command"
+msgstr "_Esegui comando"
+
+#: ../src/disco.py:1152 ../src/disco.py:1350
 msgid "Re_gister"
 msgstr "_Registra"
 
-#: ../src/disco.py:1323
+#: ../src/disco.py:1387
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Analisi %d / %d..."
 
 #. Users column
-#: ../src/disco.py:1504
+#: ../src/disco.py:1569
 msgid "Users"
 msgstr "Utenti"
 
 #. Description column
-#: ../src/disco.py:1511
+#: ../src/disco.py:1577
 msgid "Description"
 msgstr "Descrizione"
 
 #. Id column
-#: ../src/disco.py:1518
+#: ../src/disco.py:1585
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1741
+#: ../src/disco.py:1814
 msgid "Subscribed"
 msgstr "Abbonati"
 
-#: ../src/disco.py:1767
+#: ../src/disco.py:1822
+msgid "Node"
+msgstr "Nodo"
+
+#: ../src/disco.py:1879
 msgid "New post"
 msgstr "Nuovo post"
 
-#: ../src/disco.py:1773
+#: ../src/disco.py:1885
 msgid "_Subscribe"
 msgstr "A_bbonati"
 
-#: ../src/disco.py:1779
+#: ../src/disco.py:1891
 msgid "_Unsubscribe"
 msgstr "Disa_bbonati"
 
@@ -3674,102 +3892,102 @@ msgstr "Tempo"
 msgid "Progress"
 msgstr "Progresso"
 
-#: ../src/filetransfers_window.py:163 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:159 ../src/filetransfers_window.py:213
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome file: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
+#: ../src/filetransfers_window.py:160 ../src/filetransfers_window.py:288
 #, python-format
 msgid "Size: %s"
 msgstr "Dimensione: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183
+#: ../src/filetransfers_window.py:169 ../src/filetransfers_window.py:179
 #: ../src/history_manager.py:463
 msgid "You"
 msgstr "Tu"
 
-#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:170
 #, python-format
 msgid "Sender: %s"
 msgstr "Mittente: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:572
-#: ../src/tooltips.py:573
+#: ../src/filetransfers_window.py:171 ../src/filetransfers_window.py:577
+#: ../src/tooltips.py:586
 msgid "Recipient: "
 msgstr "Destinatario: "
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:182
 #, python-format
 msgid "Saved in: %s"
 msgstr "Memorizzato in: %s"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:184
 msgid "File transfer completed"
 msgstr "Trasferimento file completato"
 
-#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:212
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:204
 msgid "File transfer cancelled"
 msgstr "Trasferimento file annullato"
 
-#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:213
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:205
 msgid "Connection with peer cannot be established."
 msgstr "La connessione non può essere stabilita."
 
-#: ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:214
 #, python-format
 msgid "Recipient: %s"
 msgstr "Destinatario: %s"
 
-#: ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:216
 #, python-format
 msgid "Error message: %s"
 msgstr "Messaggio di errore: %s"
 
-#: ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:217
 msgid "File transfer stopped by the contact at the other end"
 msgstr "Trasferimento file fermato dal contatto dall'altra parte"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:234
 msgid "Choose File to Send..."
 msgstr "Scegliere il file da inviare..."
 
-#: ../src/filetransfers_window.py:263
+#: ../src/filetransfers_window.py:253
 msgid "Gajim cannot access this file"
 msgstr "Gajim non riesce a leggere questo file"
 
-#: ../src/filetransfers_window.py:264
+#: ../src/filetransfers_window.py:254
 msgid "This file is being used by another process."
 msgstr "Questo file è in uso da un altro processo."
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:286
 #, python-format
 msgid "File: %s"
 msgstr "File: %s"
 
-#: ../src/filetransfers_window.py:301
+#: ../src/filetransfers_window.py:291
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:293
 #, python-format
 msgid "Description: %s"
 msgstr "Descrizione: %s"
 
-#: ../src/filetransfers_window.py:304
+#: ../src/filetransfers_window.py:294
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s vuole inviarti un file:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:747
+#: ../src/filetransfers_window.py:308 ../src/gtkgui_helpers.py:767
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Non è possibile sovrascrivere il file esistente \"%s\""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:749
+#: ../src/filetransfers_window.py:309 ../src/gtkgui_helpers.py:769
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -3777,31 +3995,31 @@ msgstr ""
 "Un file con lo stesso nome è già presente e non si ha il permesso per "
 "sovrascriverlo"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:753
+#: ../src/filetransfers_window.py:316 ../src/gtkgui_helpers.py:773
 msgid "This file already exists"
 msgstr "Questo file esiste già"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:753
+#: ../src/filetransfers_window.py:316 ../src/gtkgui_helpers.py:773
 msgid "What do you want to do?"
 msgstr "Cosa fare?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:763
+#: ../src/filetransfers_window.py:328 ../src/gtkgui_helpers.py:783
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "La cartella \"%s\" non è scrivibile."
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:764
+#: ../src/filetransfers_window.py:328 ../src/gtkgui_helpers.py:784
 msgid "You do not have permission to create files in this directory."
 msgstr "Non si ha il permesso di creare file in questa cartella."
 
-#: ../src/filetransfers_window.py:348
+#: ../src/filetransfers_window.py:338
 msgid "Save File as..."
 msgstr "Salva file come..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:429
+#: ../src/filetransfers_window.py:419
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3809,65 +4027,66 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:505
+#: ../src/filetransfers_window.py:508
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:544 ../src/filetransfers_window.py:547
+#: ../src/filetransfers_window.py:547 ../src/filetransfers_window.py:550
 msgid "Invalid File"
 msgstr "File non valido"
 
-#: ../src/filetransfers_window.py:544
+#: ../src/filetransfers_window.py:547
 msgid "File: "
 msgstr "File: "
 
-#: ../src/filetransfers_window.py:548
+#: ../src/filetransfers_window.py:551
 msgid "It is not possible to send empty files"
 msgstr "Non è possibile inviare file vuoti"
 
-#: ../src/filetransfers_window.py:568 ../src/tooltips.py:563
+#: ../src/filetransfers_window.py:573 ../src/tooltips.py:576
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:567
+#: ../src/filetransfers_window.py:575 ../src/tooltips.py:580
 msgid "Sender: "
 msgstr "Mittente: "
 
-#: ../src/filetransfers_window.py:758
+#: ../src/filetransfers_window.py:763
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:47
+#: ../src/gajim.py:50
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s non è un livello di log valido"
 
-#: ../src/gajim.py:122
+#: ../src/gajim.py:143
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim ha bisogno di un server X per essere eseguito. Uscita..."
 
-#: ../src/gajim.py:126
+#: ../src/gajim.py:147
 msgid "Gajim needs PyGTK 2.8 or above"
 msgstr "Gajim ha bisogno di PyGTK 2.8 o superiore"
 
-#: ../src/gajim.py:127
+#: ../src/gajim.py:148
 msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
-msgstr "Gajim ha bisogno di PyGTK 2.8 o superiore per essere eseguito. Uscita..."
+msgstr ""
+"Gajim ha bisogno di PyGTK 2.8 o superiore per essere eseguito. Uscita..."
 
-#: ../src/gajim.py:129
+#: ../src/gajim.py:150
 msgid "Gajim needs GTK 2.8 or above"
 msgstr "Gajim ha bisogno di GTK2.8 o superiore"
 
-#: ../src/gajim.py:130
+#: ../src/gajim.py:151
 msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
 msgstr "Gajim ha bisogno di GTK2.8 o superiore per essere eseguito. Uscita..."
 
-#: ../src/gajim.py:135
+#: ../src/gajim.py:156
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Supporto libglade mancante nel runtime GTK+"
 
-#: ../src/gajim.py:137
+#: ../src/gajim.py:158
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3876,20 +4095,20 @@ msgstr ""
 "Eliminare il runtime GTK+ corrente ed installare l'ultima versione stabile "
 "da %s"
 
-#: ../src/gajim.py:139
+#: ../src/gajim.py:160
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "Verificare che GTK+ e PyGTK abbiano supporto libglade sul sistema."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:165
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim ha bisogno di PySQLite2 per essere eseguito"
 
-#: ../src/gajim.py:152
+#: ../src/gajim.py:173
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim ha bisogno di pywin32 per essere eseguito"
 
-#: ../src/gajim.py:153
+#: ../src/gajim.py:174
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3899,11 +4118,11 @@ msgstr ""
 "%s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:296
+#: ../src/gajim.py:317
 msgid "Gajim is already running"
 msgstr "Gajim è già in esecuzione"
 
-#: ../src/gajim.py:297
+#: ../src/gajim.py:318
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -3911,83 +4130,140 @@ msgstr ""
 "Un'altra istanza di Gajim sembra essere in esecuzione\n"
 "Continuare comunque?"
 
-#: ../src/gajim.py:403
+#: ../src/gajim.py:341 ../src/common/connection_handlers.py:896
+#: ../src/common/connection_handlers.py:1597
+#: ../src/common/connection_handlers.py:1626
+#: ../src/common/connection_handlers.py:1636
+#: ../src/common/connection_handlers.py:1655
+#: ../src/common/connection_handlers.py:1892
+#: ../src/common/connection_handlers.py:2004 ../src/common/connection.py:925
+msgid "Disk Write Error"
+msgstr "Errore di scrittura su disco"
+
+#: ../src/gajim.py:434
+msgid "Do you accept this request?"
+msgstr "Accettare questa richiesta?"
+
+#: ../src/gajim.py:437
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "Autorizzazione HTTP (%s) per %s (id: %s)"
 
-#: ../src/gajim.py:404
-msgid "Do you accept this request?"
-msgstr "Accettare questa richiesta?"
-
-#: ../src/gajim.py:450 ../src/notify.py:435
+#: ../src/gajim.py:484 ../src/notify.py:448
 msgid "Connection Failed"
 msgstr "Connessione fallita"
 
-#: ../src/gajim.py:767
+#: ../src/gajim.py:817
 #, python-format
 msgid "Subject: %s"
 msgstr "Oggetto: %s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
-#: ../src/gajim.py:812 ../src/gajim.py:825
+#: ../src/gajim.py:864 ../src/gajim.py:877
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "errore durante l'invio di %s ( %s )"
 
-#: ../src/gajim.py:858
+#: ../src/gajim.py:910
 msgid "Authorization accepted"
 msgstr "Autorizzazione accettata"
 
-#: ../src/gajim.py:859
+#: ../src/gajim.py:911
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Il contatto \"%s\" ti ha autorizzato a vedere il suo stato."
 
-#: ../src/gajim.py:867
+#: ../src/gajim.py:919
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Il contatto \"%s\" ha eliminato il tuo abbonamento verso di lui"
 
-#: ../src/gajim.py:868
+#: ../src/gajim.py:920
 msgid "You will always see him or her as offline."
 msgstr "Lo vedrai sempre come offline."
 
-#: ../src/gajim.py:911
+#: ../src/gajim.py:964
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Non si può contattare \"%s\""
 
-#: ../src/gajim.py:912 ../src/common/connection.py:417
+#: ../src/gajim.py:965 ../src/common/connection.py:466
 msgid "Check your connection or try again later."
 msgstr "Controllare la connessione o riprovare più tardi."
 
-#: ../src/gajim.py:1061 ../src/roster_window.py:1218
+#: ../src/gajim.py:1136 ../src/roster_window.py:1348
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s è ora %s (%s)"
 
 #. No status message
-#: ../src/gajim.py:1064 ../src/groupchat_control.py:944
-#: ../src/roster_window.py:1221
+#: ../src/gajim.py:1139 ../src/groupchat_control.py:1120
+#: ../src/roster_window.py:1351
 #, python-format
 msgid "%s is now %s"
 msgstr "%s è ora %s"
 
-#: ../src/gajim.py:1161
+#. Can be a presence (see chg_contact_status in groupchat_contol.py)
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/gajim.py:1260 ../src/groupchat_control.py:932
+msgid "Any occupant is allowed to see your full JID"
+msgstr "Tutti i partecipanti possono vedere il tuo JID"
+
+#: ../src/gajim.py:1263
+msgid "Room now shows unavailable member"
+msgstr "La stanza ora mostra i membri non disponibili"
+
+#: ../src/gajim.py:1265
+msgid "room now does not show unavailable members"
+msgstr "la stanza ora non mostra i membri non disponibili"
+
+#: ../src/gajim.py:1268
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+"E' stata effettuata una modifica alla configurazione della stanza che non "
+"riguarda la privacy"
+
+#. Can be a presence (see chg_contact_status in groupchat_contol.py)
+#: ../src/gajim.py:1271
+msgid "Room logging is now enabled"
+msgstr "La registrazione dei messaggi della stanza è stata attivata"
+
+#: ../src/gajim.py:1273
+msgid "Room logging is now disabled"
+msgstr "La registrazione dei messaggi della stanza è stata disattivata"
+
+#: ../src/gajim.py:1275
+msgid "Room is now non-anonymous"
+msgstr "La stanza è ora completamente non anonima"
+
+#: ../src/gajim.py:1278
+msgid "Room is now semi-anonymous"
+msgstr "La stanza è ora semi-anonima"
+
+#: ../src/gajim.py:1281
+msgid "Room is now fully-anonymous"
+msgstr "La stanza è ora completamente anonima"
+
+#: ../src/gajim.py:1313
+#, python-format
+msgid "A Password is required to join the room %s. Please type it"
+msgstr ""
+"È necessaria una password per entrare nella stanza %s. Inserisci la password"
+
+#: ../src/gajim.py:1343
 msgid "Your passphrase is incorrect"
 msgstr "Passphrase errata"
 
-#: ../src/gajim.py:1162
+#: ../src/gajim.py:1344
 msgid "You are currently connected without your OpenPGP key."
-msgstr "Si è connessi senza la chiave OpenPGP"
+msgstr "Sei connesso senza la chiave OpenPGP."
 
-#: ../src/gajim.py:1265
+#: ../src/gajim.py:1448
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nuova e-mail su %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1267
+#: ../src/gajim.py:1450
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3997,7 +4273,7 @@ msgstr[1] "Ci sono %d nuove conversazioni in e-mail"
 #. FIXME: emulate Gtalk client popups. find out what they parse and how
 #. they decide what to show
 #. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1276
+#: ../src/gajim.py:1459
 #, python-format
 msgid ""
 "\n"
@@ -4006,52 +4282,126 @@ msgstr ""
 "\n"
 "Da: %(from_address)s"
 
-#: ../src/gajim.py:1432
+#: ../src/gajim.py:1679
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vuole inviarti un file."
 
-#: ../src/gajim.py:1497
+#: ../src/gajim.py:1744
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "%(filename)s ricevuto con successo da %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1501
+#: ../src/gajim.py:1748
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Il trasferimento file di %(filename)s da %(name)s è fermo."
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1761
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Invio di %(filename)s a %(name)s effettuato con successo."
 
 #. ft stopped
-#: ../src/gajim.py:1518
+#: ../src/gajim.py:1765
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Trasferimento file di %(filename)s a %(name)s fermato."
 
-#: ../src/gajim.py:1631
+#: ../src/gajim.py:1860
+msgid "Session negotiation cancelled"
+msgstr "Negoziazione della sessione annullata"
+
+#: ../src/gajim.py:1861
+#, python-format
+msgid "The client at %s cancelled the session negotiation."
+msgstr "Il client a %s ha annullato la negoziazione della sessione."
+
+#: ../src/gajim.py:1901 ../src/gajim.py:1942
+msgid "Confirm these session options"
+msgstr "Conferma queste opzioni di sessione"
+
+#: ../src/gajim.py:1902
+#, python-format
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tAre these options acceptable?"
+msgstr ""
+"Il client remoto vuole negoziare una sessione con queste caratteristiche:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tQueste opzioni sono accettabili?"
+
+#: ../src/gajim.py:1943
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
+msgstr ""
+"Il client remoto ha selezionato queste opzioni:\n"
+"\n"
+"%s\n"
+"\n"
+"Continuare la sessione?"
+
+#: ../src/gajim.py:2055
 msgid "Username Conflict"
 msgstr "Conflitto di nomi utenti"
 
-#: ../src/gajim.py:1632
+#: ../src/gajim.py:2056
 msgid "Please type a new username for your local account"
 msgstr "Inserire un nuovo nome utente per l'account locale"
 
+#: ../src/gajim.py:2073
+msgid "Ping?"
+msgstr "Ping?"
+
+#: ../src/gajim.py:2081
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
+
+#: ../src/gajim.py:2087
+msgid "Error."
+msgstr "Errore."
+
+#: ../src/gajim.py:2112
+msgid "Resource Conflict"
+msgstr "Conflitto tra risorse"
+
+#: ../src/gajim.py:2113
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+"Sei già connesso a questo account con la stessa risorsa. Inseriscine un'altra"
+
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1972
+#: ../src/gajim.py:2475
 msgid "Could not save your settings and preferences"
 msgstr "Impossibile salvare impostazioni e preferenze"
 
-#: ../src/gajim.py:2170
+#. sorted alphanum
+#: ../src/gajim.py:2610 ../src/common/config.py:86 ../src/common/config.py:395
+#: ../src/common/optparser.py:194 ../src/common/optparser.py:412
+#: ../src/common/optparser.py:446
+msgid "default"
+msgstr "predefinito"
+
+#: ../src/gajim.py:2697
 msgid "Network Manager support not available"
 msgstr "Supporto Network Manager non disponibile"
 
-#: ../src/gajim.py:2249
+#: ../src/gajim.py:2798
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Supporto gestione sessioni non disponibile (modulo gnome.ui mancante)"
 
@@ -4084,11 +4434,11 @@ msgstr "Scrive la lista contatti. Ogni contatto appare su una linea separata"
 
 #: ../src/gajim-remote.py:84 ../src/gajim-remote.py:99
 #: ../src/gajim-remote.py:109 ../src/gajim-remote.py:122
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:157
-#: ../src/gajim-remote.py:187 ../src/gajim-remote.py:196
-#: ../src/gajim-remote.py:203 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:237
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:205 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:246 ../src/gajim-remote.py:255
 msgid "account"
 msgstr "account"
 
@@ -4115,7 +4465,7 @@ msgstr ""
 "uno fra: offline, online, chat, assente, xa, non disturbare, invisibile"
 
 #: ../src/gajim-remote.py:98 ../src/gajim-remote.py:119
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:144
 msgid "message"
 msgstr "messaggio"
 
@@ -4140,7 +4490,7 @@ msgstr "Mostra la finestra di chat per mandare messaggi ad un contatto"
 msgid "JID of the contact that you want to chat with"
 msgstr "JID del contatto con cui si vuole chattare"
 
-#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:196
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "se specificato, il contatto è preso dalla lista contatti di questo account"
@@ -4160,6 +4510,7 @@ msgid "JID of the contact that will receive the message"
 msgstr "JID del contatto che riceverà il messaggio"
 
 #: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144
 msgid "message contents"
 msgstr "contenuti messaggi"
 
@@ -4173,6 +4524,7 @@ msgstr ""
 "se specificato, il messaggio verrà cifrato usando questa chiave pubblica"
 
 #: ../src/gajim-remote.py:122 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:145
 msgid "if specified, the message will be sent using this account"
 msgstr "se specificato, il messaggio verrà inviato usando questo account"
 
@@ -4195,121 +4547,129 @@ msgid "message subject"
 msgstr "oggetto del messaggio "
 
 #: ../src/gajim-remote.py:141
+msgid "Sends new message to a groupchat you've joined."
+msgstr "Invia nuovi messaggi alla chat di gruppo in cui sei entrato."
+
+#: ../src/gajim-remote.py:143
+msgid "JID of the room that will receive the message"
+msgstr "JID della stanza che riceverà il messaggio"
+
+#: ../src/gajim-remote.py:150
 msgid "Gets detailed info on a contact"
 msgstr "Ottiene informazioni dettagliate su un contatto"
 
-#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
-#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:165
+#: ../src/gajim-remote.py:195 ../src/gajim-remote.py:204
 msgid "JID of the contact"
 msgstr "JID del contatto"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:156
 msgid "Gets detailed info on a account"
 msgstr "Ottiene informazioni dettagliate su un contatto"
 
-#: ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:158
 msgid "Name of the account"
 msgstr "Nome dell'account"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:162
 msgid "Sends file to a contact"
 msgstr "Invia file ad un contatto"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:164
 msgid "file"
 msgstr "file"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:164
 msgid "File path"
 msgstr "Percorso file"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:166
 msgid "if specified, file will be sent using this account"
 msgstr "se specificato, il file verrà inviato usando questo account"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:171
 msgid "Lists all preferences and their values"
 msgstr "Mostra tutte le preferenze ed i relativi valori"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:175
 msgid "Sets value of 'key' to 'value'."
 msgstr "Imposta il valore di 'chiave' a 'valore'."
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:177
 msgid "key=value"
 msgstr "chiave=valore"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:177
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'chiave' è il nome della preferenza, 'valore' è il valore a cui impostarla"
 
-#: ../src/gajim-remote.py:173
+#: ../src/gajim-remote.py:182
 msgid "Deletes a preference item"
 msgstr "Elimina un oggetto dalle preferenze"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:184
 msgid "key"
 msgstr "chiave"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:184
 msgid "name of the preference to be deleted"
 msgstr "nome della preferenza da eliminare"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:188
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Scrive lo stato corrente delle preferenze di Gajim nel file .config"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:193
 msgid "Removes contact from roster"
 msgstr "Elimina il contatto dalla lista"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:202
 msgid "Adds contact to roster"
 msgstr "Aggiunge il contatto alla lista"
 
-#: ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:204
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:205
 msgid "Adds new contact to this account"
 msgstr "Aggiunge un nuovo contatto a questo account"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:210
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Restituisce lo stato corrente (quello globale se non è specificato un "
 "account)"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:217
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr ""
 "Restituisce il messaggio di stato corrente (quello globale se non è "
 "specificato un account)"
 
-#: ../src/gajim-remote.py:215
+#: ../src/gajim-remote.py:224
 msgid "Returns number of unread messages"
 msgstr "Restituisce il numero di messaggi non letti"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:228
 msgid "Opens 'Start Chat' dialog"
 msgstr "Apre la finestra di inizio chat"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:230
 msgid "Starts chat, using this account"
 msgstr "Inizia chat usando questo account"
 
-#: ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:234
 msgid "Sends custom XML"
 msgstr "Invia XML personalizzato"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:236
 msgid "XML to send"
 msgstr "XML da inviare"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:237
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -4317,35 +4677,35 @@ msgstr ""
 "L'account al quale l'xml è inviato; se non specificato, l'xml sarà spedito a "
 "tutti gli account."
 
-#: ../src/gajim-remote.py:234
+#: ../src/gajim-remote.py:243
 msgid "Handle a xmpp:/ uri"
 msgstr "Gestisci un uri xmpp:/"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:245
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:241
+#: ../src/gajim-remote.py:250
 msgid "Join a MUC room"
 msgstr "Entra in una stanza MUC"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:252
 msgid "room"
 msgstr "stanza"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:253
 msgid "nick"
 msgstr "nickname"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:254
 msgid "password"
 msgstr "password"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:277
 msgid "Missing argument \"contact_jid\""
 msgstr "Parametro mancante \"contact_jid\""
 
-#: ../src/gajim-remote.py:287
+#: ../src/gajim-remote.py:296
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4354,38 +4714,38 @@ msgstr ""
 "'%s' non appartiene alla lista contatti.\n"
 "Specificare l'account per l'invio del messaggio."
 
-#: ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:299
 msgid "You have no active account"
 msgstr "Non ci sono account attivi"
 
-#: ../src/gajim-remote.py:354
+#: ../src/gajim-remote.py:363
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
 "\t %s"
 msgstr ""
-"Uso: %s %s %s \n"
+"Utilizzo: %s %s %s \n"
 "\t %s"
 
-#: ../src/gajim-remote.py:357
+#: ../src/gajim-remote.py:366
 msgid "Arguments:"
 msgstr "Parametri:"
 
-#: ../src/gajim-remote.py:361
+#: ../src/gajim-remote.py:370
 #, python-format
 msgid "%s not found"
 msgstr "%s non trovato"
 
-#: ../src/gajim-remote.py:365
+#: ../src/gajim-remote.py:374
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 msgstr ""
-"Uso: %s comando [parametri]\n"
+"Utilizzo: %s comando [parametri]\n"
 "Il comando è uno fra:\n"
 
-#: ../src/gajim-remote.py:438
+#: ../src/gajim-remote.py:447
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4394,7 +4754,7 @@ msgstr ""
 "Troppi parametri. \n"
 "Scrivere \"%s help %s\" per maggiori informazioni"
 
-#: ../src/gajim-remote.py:442
+#: ../src/gajim-remote.py:451
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -4403,131 +4763,160 @@ msgstr ""
 "Il parametro \"%s\" non è specificato. \n"
 "Scrivere\"%s help %s\" per maggiori informazioni"
 
-#: ../src/gajim-remote.py:460
+#: ../src/gajim-remote.py:469
 msgid "Wrong uri"
-msgstr "Uri errato"
+msgstr "URI errato"
 
-#: ../src/gajim_themes_window.py:60
+#: ../src/gajim_themes_window.py:62
 msgid "Theme"
 msgstr "Tema"
 
+#: ../src/gajim_themes_window.py:100
+msgid "You cannot make changes to the default theme"
+msgstr "Non è possibile modificare il tema di default"
+
+#: ../src/gajim_themes_window.py:101
+msgid "Please create a clean new theme with your desired name."
+msgstr "Creare un nuovo tema con il nome desiderato."
+
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:155
+#: ../src/gajim_themes_window.py:175
 msgid "theme name"
 msgstr "nome del tema"
 
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:192
 msgid "You cannot delete your current theme"
 msgstr "Non è possibile eliminare il tema corrente"
 
-#: ../src/gajim_themes_window.py:173
+#: ../src/gajim_themes_window.py:193
 msgid "Please first choose another for your current theme."
 msgstr "Scegliere prima un altro tema."
 
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Chat privata"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Chat private"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:134
 msgid "Sending private message failed"
 msgstr "Invio messaggio privato fallito"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:136
 #, python-format
 msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Non sei più nella stanza \"%s\" o \"%s\" è uscito."
 
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Chat di gruppo"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Chat di gruppo"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:343
 msgid "Insert Nickname"
 msgstr "Inserisci nickname"
 
+#: ../src/groupchat_control.py:859
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/groupchat_control.py:860
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:935
+msgid "Room logging is enabled"
+msgstr "La registrazione dei messaggi della stanza è stata attivata"
+
+#: ../src/groupchat_control.py:937
+msgid "A new room has been created"
+msgstr "E' stata creata una nuova stanza"
+
+#: ../src/groupchat_control.py:940
+msgid "The server has assigned or modified your roomnick"
+msgstr "Il server ha assegnato o modificato il tuo nickname"
+
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:829
+#: ../src/groupchat_control.py:946
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s è stato cacciato: %(reason)s"
 
-#: ../src/groupchat_control.py:833
+#: ../src/groupchat_control.py:950
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s è stato cacciato da %(who)s : %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:840
+#: ../src/groupchat_control.py:957
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s è stato bloccato: %(reason)s"
 
-#: ../src/groupchat_control.py:844
+#: ../src/groupchat_control.py:961
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s è stato bloccato da %(who)s : %(reason)s"
 
-#: ../src/groupchat_control.py:852
+#. Someone changed his or her nick
+#. We changed our nick
+#: ../src/groupchat_control.py:968
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sei ora conosciuto come %s"
 
-#: ../src/groupchat_control.py:854
+#: ../src/groupchat_control.py:970
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s è ora conosciuto come %s"
 
-#: ../src/groupchat_control.py:937
+#: ../src/groupchat_control.py:1003 ../src/groupchat_control.py:1007
+#: ../src/groupchat_control.py:1012
+#, python-format
+msgid "%(nick)s has been removed from the room (%(reason)s)"
+msgstr "%(nick)s è stato cacciato dalla stanza (%(reason)s)"
+
+#: ../src/groupchat_control.py:1004
+msgid "affiliation changed"
+msgstr "l'affiliazione è stata cambiata"
+
+#: ../src/groupchat_control.py:1009
+msgid "room configuration changed to members-only"
+msgstr "la stanza è ora accessibile solo ai membri"
+
+#: ../src/groupchat_control.py:1014
+#, fuzzy
+msgid "system shutdown"
+msgstr "spegnimento del sistema"
+
+#: ../src/groupchat_control.py:1113
 #, python-format
 msgid "%s has left"
 msgstr "%s se ne è andato"
 
-#: ../src/groupchat_control.py:942
+#: ../src/groupchat_control.py:1118
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s è entrato nella chat di gruppo"
 
-#: ../src/groupchat_control.py:1063 ../src/groupchat_control.py:1081
-#: ../src/groupchat_control.py:1174 ../src/groupchat_control.py:1191
+#. Invalid Nickname
+#. invalid char
+#: ../src/groupchat_control.py:1231 ../src/groupchat_control.py:1510
+msgid "Invalid nickname"
+msgstr "Nickname non valido"
+
+#: ../src/groupchat_control.py:1232 ../src/groupchat_control.py:1511
+msgid "The nickname has not allowed characters."
+msgstr "Il nickname contiene caratteri non consentiti."
+
+#: ../src/groupchat_control.py:1255 ../src/groupchat_control.py:1273
+#: ../src/groupchat_control.py:1357 ../src/groupchat_control.py:1374
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Nickname non trovato: %s"
 
-#: ../src/groupchat_control.py:1097
+#: ../src/groupchat_control.py:1289
 msgid "This group chat has no subject"
 msgstr "Questa stanza non ha oggetto"
 
-#: ../src/groupchat_control.py:1110
+#: ../src/groupchat_control.py:1300
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Si è invitato %(contact_jid)s a %(room_jid)s."
 
-#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1117 ../src/groupchat_control.py:1145
-#, python-format
-msgid "%s does not appear to be a valid JID"
-msgstr "%s non sembra essere un JID valido"
-
-#: ../src/groupchat_control.py:1228
-#, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr "Comando inesistente: /%s (per inviarlo, scrivere /say prima di esso)"
-
-#: ../src/groupchat_control.py:1251
-#, python-format
-msgid "Commands: %s"
-msgstr "Comandi: %s"
-
-#: ../src/groupchat_control.py:1253
+#: ../src/groupchat_control.py:1437
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4535,176 +4924,174 @@ msgid ""
 "the JID is currently in the group chat, he/she/it will also be kicked. Does "
 "NOT support spaces in nickname."
 msgstr ""
-"Uso: /%s <nickname|JID> [motivo], bandisce il JID dalla stanza. Il nickname "
-"di un partecipante può venire usato al posto del JID, ma non se contiene \"@"
-"\". Se il JID è correntemente nella stanza, verrà anche cacciato. NON "
-"supporta la presenza di spazi nel nickname."
+"Utilizzo: /%s <nickname|JID> [motivo], bandisce il JID dalla stanza. Il "
+"nickname di un partecipante può venire usato al posto del JID, ma non se "
+"contiene \"@\". Se il JID è correntemente nella stanza, verrà anche "
+"cacciato. NON supporta la presenza di spazi nel nickname."
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1444
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
 "occupant."
 msgstr ""
-"Uso: /%s <nickname>, apre una finestra di chat privata al partecipante "
+"Utilizzo: /%s <nickname>, apre una finestra di chat privata al partecipante "
 "specificato."
 
-#: ../src/groupchat_control.py:1264
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Uso: /%s, pulisce la finestra di testo."
-
-#: ../src/groupchat_control.py:1266
+#: ../src/groupchat_control.py:1450
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
 "specified."
 msgstr ""
-"Uso: /%s [motivo], chiude la finestra oi scheda corrente, mostrando il "
+"Utilizzo: /%s [motivo], chiude la finestra oi scheda corrente, mostrando il "
 "motivo se specificato."
 
-#: ../src/groupchat_control.py:1269
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Uso: /%s, nasconde i pulsanti di chat."
-
-#: ../src/groupchat_control.py:1272
+#: ../src/groupchat_control.py:1456
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
 msgstr ""
-"Uso: /%s <JID> [motivo], invita JID alla stanza corrente, opzionalmente "
+"Utilizzo: /%s <JID> [motivo], invita JID alla stanza corrente, opzionalmente "
 "fornendo un motivo."
 
-#: ../src/groupchat_control.py:1276
+#: ../src/groupchat_control.py:1460
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
 "using specified nickname."
 msgstr ""
-"Uso: /%s <stanza>@<server>[/nickname], offre la possibilità di entrare in "
-"stanza@server, opzionalmente usando il nickname specificato."
+"Utilizzo: /%s <stanza>@<server>[/nickname], offre la possibilità di entrare "
+"in stanza@server, opzionalmente usando il nickname specificato."
 
-#: ../src/groupchat_control.py:1280
+#: ../src/groupchat_control.py:1464
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
 "from the group chat and optionally displays a reason. Does NOT support "
 "spaces in nickname."
 msgstr ""
-"Uso: /%s <nickname> [motivo], rimuove il partecipante specificato per "
+"Utilizzo: /%s <nickname> [motivo], rimuove il partecipante specificato per "
 "nickname dalla stanza e opzionalmente mostra un motivo. NON supporta la "
 "presenza di spazi nel nickname."
 
-#: ../src/groupchat_control.py:1285
-#, python-format
-msgid ""
-"Usage: /%s <action>, sends action to the current group chat. Use third "
-"person. (e.g. /%s explodes.)"
-msgstr ""
-"Uso: /%s <azione>, invia l'azione alla stanza corrente. Usare la terza "
-"persona (esempio: /%s esplode)."
-
-#: ../src/groupchat_control.py:1289
+#: ../src/groupchat_control.py:1473
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
 "message to the occupant specified by nickname."
 msgstr ""
-"Uso: /%s <nickname> [messaggio], apre una finestra di messaggi privati ed "
-"invia il messaggio al partecipante specificato per nickname."
+"Utilizzo: /%s <nickname> [messaggio], apre una finestra di messaggi privati "
+"ed invia il messaggio al partecipante specificato per nickname."
 
-#: ../src/groupchat_control.py:1294
+#: ../src/groupchat_control.py:1478
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
-msgstr "Uso: /%s <nickname>, cambia il tuo nickname nella stanza corrente."
+msgstr ""
+"Utilizzo: /%s <nickname>, cambia il tuo nickname nella stanza corrente."
 
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1482
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr ""
-"Uso: /%s [argomento], mostra o aggiorna l'argomento della stanza corrente."
+"Utilizzo: /%s [argomento], mostra o aggiorna l'argomento della stanza "
+"corrente."
 
-#: ../src/groupchat_control.py:1302
+#: ../src/groupchat_control.py:1486
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
-"Uso: /%s [argomento], mostra o aggiorna l'argomento della stanza corrente."
+"Utilizzo: /%s [argomento], mostra o aggiorna l'argomento della stanza "
+"corrente."
 
-#: ../src/groupchat_control.py:1305
+#: ../src/groupchat_control.py:1489
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
-"Uso: /%s <messaggio>, invia un messaggio senza considerare gli altri comandi."
-
-#: ../src/groupchat_control.py:1308
-#, python-format
-msgid "No help info for /%s"
-msgstr "Non esiste aiuto per /%s"
+"Utilizzo: /%s <messaggio>, invia un messaggio senza considerare gli altri "
+"comandi."
 
-#: ../src/groupchat_control.py:1359
+#: ../src/groupchat_control.py:1584
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Si è sicuri di voler uscire dalla stanza \"%s\"?"
 
-#: ../src/groupchat_control.py:1361
+#: ../src/groupchat_control.py:1586
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Chiudendo questa finestra, si verrà disconnessi da questa stanza."
 
-#: ../src/groupchat_control.py:1365 ../src/roster_window.py:4036
+#: ../src/groupchat_control.py:1590 ../src/roster_window.py:4855
 msgid "Do _not ask me again"
 msgstr "_Non chiederlo più"
 
-#: ../src/groupchat_control.py:1399
+#: ../src/groupchat_control.py:1624
 msgid "Changing Subject"
 msgstr "Cambio oggetto"
 
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1625
 msgid "Please specify the new subject:"
 msgstr "Specificare il nuovo oggetto:"
 
-#: ../src/groupchat_control.py:1409
+#: ../src/groupchat_control.py:1634
 msgid "Changing Nickname"
 msgstr "Cambio nickname"
 
-#: ../src/groupchat_control.py:1410
+#: ../src/groupchat_control.py:1635
 msgid "Please specify the new nickname you want to use:"
 msgstr "Specificare il nuovo nickname da usare:"
 
-#: ../src/groupchat_control.py:1435
+#. Ask for a reason
+#: ../src/groupchat_control.py:1650
+#, python-format
+msgid "Destroying %s"
+msgstr "Eliminazione %s"
+
+#: ../src/groupchat_control.py:1651
+msgid ""
+"You are going to definitively destroy this room.\n"
+"You may specify a reason below:"
+msgstr ""
+"Stai per cancellare definitivamente questa stanza.\n"
+"Puoi specificare il motivo qui sotto:"
+
+#: ../src/groupchat_control.py:1653
+msgid "You may also enter an alternate venue:"
+msgstr "Puoi anche inserire un nome alternativo:"
+
+#: ../src/groupchat_control.py:1684
 msgid "Bookmark already set"
 msgstr "Segnalibro già impostato"
 
-#: ../src/groupchat_control.py:1436
+#: ../src/groupchat_control.py:1685
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "La stanza \"%s\" è già tra i segnalibri."
 
-#: ../src/groupchat_control.py:1445
+#: ../src/groupchat_control.py:1694
 msgid "Bookmark has been added successfully"
 msgstr "Il segnalibro è stato aggiunto con successo"
 
-#: ../src/groupchat_control.py:1446
+#: ../src/groupchat_control.py:1695
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "È possibile gestire i segnalibri attraverso il menu Azioni nella finestra "
 "della lista contatti."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1574
+#: ../src/groupchat_control.py:1847
 #, python-format
 msgid "Kicking %s"
 msgstr "Sto cacciando %s"
 
-#: ../src/groupchat_control.py:1575 ../src/groupchat_control.py:1858
+#: ../src/groupchat_control.py:1848 ../src/groupchat_control.py:2148
 msgid "You may specify a reason below:"
 msgstr "Specifica un motivo qui sotto:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2147
 #, python-format
 msgid "Banning %s"
 msgstr "Sto bandendo %s"
@@ -4730,56 +5117,56 @@ msgid "Details"
 msgstr "Dettagli"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:156 ../src/gtkgui_helpers.py:171
+#: ../src/gtkgui_helpers.py:157 ../src/gtkgui_helpers.py:172
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Errore: impossibile aprire %s in lettura"
 
-#: ../src/gtkgui_helpers.py:336
+#: ../src/gtkgui_helpers.py:337
 msgid "Error reading file:"
 msgstr "Errore leggendo il file:"
 
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:340
 msgid "Error parsing file:"
 msgstr "Errore processando il file:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:376
+#: ../src/gtkgui_helpers.py:377
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Non si è potuto scrivere su %s. Il supporto gestione sessioni non funzionerà"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:691
+#: ../src/gtkgui_helpers.py:711
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim non è il client Jabber predefinito"
 
-#: ../src/gtkgui_helpers.py:692
+#: ../src/gtkgui_helpers.py:712
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Si vuole rendere Gajim il client Jabber predefinito?"
 
-#: ../src/gtkgui_helpers.py:693
+#: ../src/gtkgui_helpers.py:713
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "Verifica sempre se Gajim è il client Jabber predefinito all'avvio"
 
-#: ../src/gtkgui_helpers.py:792
+#: ../src/gtkgui_helpers.py:812
 msgid "Extension not supported"
 msgstr "Dbus non è supportato."
 
-#: ../src/gtkgui_helpers.py:793
+#: ../src/gtkgui_helpers.py:813
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "L'immagine non può essere salvata in formato %(type)s. Salvarla come %"
 "(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:802
+#: ../src/gtkgui_helpers.py:822
 msgid "Save Image as..."
 msgstr "Salva immagine come..."
 
-#: ../src/history_manager.py:65
+#: ../src/history_manager.py:68
 msgid "Cannot find history logs database"
 msgstr "Impossibile trovare la base dati delle cronologie"
 
@@ -4790,7 +5177,7 @@ msgstr "Contatti"
 
 #. holds time
 #: ../src/history_manager.py:121 ../src/history_manager.py:161
-#: ../src/history_window.py:86
+#: ../src/history_window.py:116
 msgid "Date"
 msgstr "Data"
 
@@ -4801,7 +5188,7 @@ msgstr "Nickname"
 
 #. holds message
 #: ../src/history_manager.py:135 ../src/history_manager.py:167
-#: ../src/history_window.py:94
+#: ../src/history_window.py:124
 msgid "Message"
 msgstr "Messaggio"
 
@@ -4853,71 +5240,96 @@ msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Si vuole davvero eliminare il messaggio selezionato?"
 msgstr[1] "Si vogliono davvero eliminare i messaggi selezionati?"
 
-#: ../src/history_window.py:103 ../src/history_window.py:105
+#: ../src/history_window.py:185 ../src/history_window.py:187
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Cronologia conversazione con %s"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:332
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s ora è %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:262 ../src/notify.py:199
+#: ../src/history_window.py:336 ../src/notify.py:206
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s è ora %(status)s"
 
-#: ../src/history_window.py:268
+#: ../src/history_window.py:342
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Lo stato ora è: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:345
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Lo stato ora è: %(status)s"
 
-#: ../src/message_window.py:273
+#: ../src/htmltextview.py:583 ../src/htmltextview.py:594
+msgid "Timeout loading image"
+msgstr "Impossibile caricare l'immagine"
+
+#: ../src/htmltextview.py:604
+msgid "Image is too big"
+msgstr "L'immagine è troppo grande"
+
+#: ../src/message_window.py:288
+msgid "Chats"
+msgstr "Chat"
+
+#: ../src/message_window.py:290
+msgid "Group Chats"
+msgstr "Chat di gruppo"
+
+#: ../src/message_window.py:292
+msgid "Private Chats"
+msgstr "Chat private"
+
+#: ../src/message_window.py:294
 msgid "Messages"
 msgstr "Messaggi"
 
-#: ../src/message_window.py:274
+#: ../src/message_window.py:295
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
 
-#: ../src/notify.py:197
+#: ../src/notify.py:204
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s ha cambiato stato"
 
-#: ../src/notify.py:207
+#: ../src/notify.py:214
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s connesso"
 
-#: ../src/notify.py:215
+#: ../src/notify.py:222
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s disconnesso"
 
-#: ../src/notify.py:227
+#: ../src/notify.py:234
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nuovo messaggio singolo da %(nickname)s"
 
-#: ../src/notify.py:235
+#: ../src/notify.py:242
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nuovo messaggio privato dalla stanza %s"
 
-#: ../src/notify.py:236
+#: ../src/notify.py:244
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:247
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Messaggio inviato da %(nickname)s"
+
+#: ../src/notify.py:253
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nuovo messaggio da %(nickname)s"
@@ -4926,37 +5338,42 @@ msgstr "Nuovo messaggio da %(nickname)s"
 msgid "Retrieving profile..."
 msgstr "Recupero profilo..."
 
-#: ../src/profile_window.py:107 ../src/profile_window.py:210
-#: ../src/profile_window.py:219
-msgid "Click to set your avatar"
-msgstr "Cliccare per inserire l'avatar"
+#: ../src/profile_window.py:123 ../src/roster_window.py:1882
+msgid "File is empty"
+msgstr "Il file è vuoto"
+
+#: ../src/profile_window.py:126 ../src/roster_window.py:1885
+msgid "File does not exist"
+msgstr "Il file non esiste"
 
 #. keep identation
-#: ../src/profile_window.py:137
+#. unknown format
+#: ../src/profile_window.py:140 ../src/profile_window.py:156
+#: ../src/roster_window.py:1887 ../src/roster_window.py:1898
 msgid "Could not load image"
 msgstr "Impossibile caricare l'immagine"
 
-#: ../src/profile_window.py:245
+#: ../src/profile_window.py:257
 msgid "Information received"
-msgstr "Informazione ricevuta"
+msgstr "Informazioni ricevute"
 
-#: ../src/profile_window.py:314
+#: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
 msgstr "Senza una connessione non è possibile pubblicare i dati personali."
 
-#: ../src/profile_window.py:326
+#: ../src/profile_window.py:338
 msgid "Sending profile..."
 msgstr "Invio del profilo..."
 
-#: ../src/profile_window.py:341
+#: ../src/profile_window.py:353
 msgid "Information NOT published"
 msgstr "Informazione NON pubblicata"
 
-#: ../src/profile_window.py:348
+#: ../src/profile_window.py:360
 msgid "vCard publication failed"
 msgstr "Pubblicazione della vCard fallita"
 
-#: ../src/profile_window.py:349
+#: ../src/profile_window.py:361
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -4964,89 +5381,105 @@ msgstr ""
 "C'è stato un errore nella pubblicazione delle informazioni personali, "
 "riprovare più tardi."
 
-#: ../src/roster_window.py:171 ../src/roster_window.py:226
+#: ../src/roster_window.py:182 ../src/roster_window.py:237
 msgid "Merged accounts"
 msgstr "Account uniti"
 
-#: ../src/roster_window.py:344 ../src/common/helpers.py:43
+#: ../src/roster_window.py:357 ../src/roster_window.py:622
+#: ../src/roster_window.py:2110 ../src/common/contacts.py:307
+#: ../src/common/helpers.py:44
 msgid "Observers"
 msgstr "Osservatori"
 
-#: ../src/roster_window.py:692 ../src/roster_window.py:3201
+#. Make special context menu if group is Groupchats
+#: ../src/roster_window.py:441 ../src/roster_window.py:446
+#: ../src/roster_window.py:1935 ../src/roster_window.py:1938
+#: ../src/roster_window.py:2607 ../src/roster_window.py:2610
+#: ../src/roster_window.py:2635 ../src/roster_window.py:4715
+#: ../src/roster_window.py:4717 ../src/common/commands.py:194
+#: ../src/common/contacts.py:97 ../src/common/helpers.py:44
+msgid "Groupchats"
+msgstr "Chat di gruppo"
+
+#: ../src/roster_window.py:771 ../src/roster_window.py:3971
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Non è possibile unirsi ad una stanza quando si è invisibile"
 
 #. new chat
+#. single message
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:884 ../src/systray.py:187 ../src/systray.py:192
+#. join gc
+#: ../src/roster_window.py:984 ../src/roster_window.py:994
+#: ../src/roster_window.py:1003 ../src/systray.py:207 ../src/systray.py:212
+#: ../src/systray.py:218
 #, python-format
 msgid "using account %s"
 msgstr "usando l'account %s"
 
-#. the 'manage gc bookmarks' item is shown
-#. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:909
+#: ../src/roster_window.py:1010
 #, python-format
 msgid "to %s account"
 msgstr "all'account %s"
 
 #. disco
-#: ../src/roster_window.py:914
+#: ../src/roster_window.py:1015
 #, python-format
 msgid "using %s account"
 msgstr "usando l'account %s"
 
+#: ../src/roster_window.py:1096
+msgid "_Manage Bookmarks..."
+msgstr "_Gestione segnalibri..."
+
 #. profile, avatar
-#: ../src/roster_window.py:989
+#: ../src/roster_window.py:1115
 #, python-format
 msgid "of account %s"
 msgstr "dell'account %s"
 
-#: ../src/roster_window.py:1009
-msgid "_Manage Bookmarks..."
-msgstr "_Gestione segnalibri..."
-
-#: ../src/roster_window.py:1038
+#: ../src/roster_window.py:1155
 #, python-format
 msgid "for account %s"
 msgstr "per l'account %s"
 
 #. History manager
-#: ../src/roster_window.py:1059
+#: ../src/roster_window.py:1176
 msgid "History Manager"
 msgstr "Gestore cronologia"
 
-#: ../src/roster_window.py:1068
+#: ../src/roster_window.py:1185
 msgid "_Join New Group Chat"
-msgstr "_Entrare in chat di gruppo"
+msgstr "_Nuova chat di gruppo"
 
-#: ../src/roster_window.py:1398 ../src/roster_window.py:3394
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:1544 ../src/roster_window.py:4169
+#: ../src/roster_window.py:4176
 msgid "You have unread messages"
 msgstr "Ci sono messaggi non letti"
 
-#: ../src/roster_window.py:1399
+#: ../src/roster_window.py:1545
 msgid "You must read them before removing this transport."
 msgstr "Leggere tutti gli eventi pendenti prima di rimuovere questo account."
 
-#: ../src/roster_window.py:1402
+#: ../src/roster_window.py:1548
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Il trasporto \"%s\" verrà rimosso"
 
-#: ../src/roster_window.py:1403
+#: ../src/roster_window.py:1549
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
-msgstr "Non si potranno più inviare e ricevere messaggi verso i contatti di questo trasporto."
+msgstr ""
+"Non si potranno più inviare e ricevere messaggi verso i contatti di questo "
+"trasporto."
 
-#: ../src/roster_window.py:1406
+#: ../src/roster_window.py:1552
 msgid "Transports will be removed"
 msgstr "I trasporti verranno rimossi"
 
-#: ../src/roster_window.py:1411
+#: ../src/roster_window.py:1557
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -5056,114 +5489,154 @@ msgstr ""
 "trasporti:%s"
 
 #. it's jid
-#: ../src/roster_window.py:1431
+#: ../src/roster_window.py:1723
 msgid "Rename Contact"
 msgstr "Rinomina contatto"
 
-#: ../src/roster_window.py:1432
+#: ../src/roster_window.py:1724
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Inserire un nuovo nickname per il contatto %s."
 
-#: ../src/roster_window.py:1439
+#: ../src/roster_window.py:1731
 msgid "Rename Group"
 msgstr "Rinomina Gruppo"
 
-#: ../src/roster_window.py:1440
+#: ../src/roster_window.py:1732
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Inserire un nome per il gruppo %s."
 
-#: ../src/roster_window.py:1515
+#: ../src/roster_window.py:1807
 msgid "Remove Group"
 msgstr "Elimina Gruppo"
 
-#: ../src/roster_window.py:1516
+#: ../src/roster_window.py:1808
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Rimuovere il gruppo %s dalla lista?"
 
-#: ../src/roster_window.py:1517
+#: ../src/roster_window.py:1809
 msgid "Remove also all contacts in this group from your roster"
 msgstr "Elimina anche tutti i contatti di questo gruppo dalla lista"
 
-#: ../src/roster_window.py:1546
+#: ../src/roster_window.py:1840
 msgid "Assign OpenPGP Key"
 msgstr "Assegna chiave OpenPGP"
 
-#: ../src/roster_window.py:1547
+#: ../src/roster_window.py:1841
 msgid "Select a key to apply to the contact"
 msgstr "Seleziona una chiave da applicare al contatto"
 
-#: ../src/roster_window.py:1782 ../src/roster_window.py:2043
-msgid "_New group chat"
+#: ../src/roster_window.py:2156
+msgid "_New Group Chat"
 msgstr "_Nuova chat di gruppo"
 
-#: ../src/roster_window.py:1913
+#: ../src/roster_window.py:2298
 msgid "I would like to add you to my roster"
 msgstr "Vorrei aggiungerti ai miei contatti"
 
-#: ../src/roster_window.py:2088 ../src/roster_window.py:2135
+#. Send Group Message
+#: ../src/roster_window.py:2432 ../src/roster_window.py:2644
 msgid "Send Group M_essage"
 msgstr "Invia _messaggio di gruppo"
 
-#: ../src/roster_window.py:2114
-msgid "Re_name"
-msgstr "Ri_nomina"
+#: ../src/roster_window.py:2451
+msgid "_New group chat"
+msgstr "_Nuova chat di gruppo"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:2489
+msgid "_Manage Contacts"
+msgstr "_Gestisci contatti"
+
+#: ../src/roster_window.py:2550
+msgid "_Maximize"
+msgstr "_Massimizza"
+
+#: ../src/roster_window.py:2557
+msgid "_Disconnect"
+msgstr "_Disconnetti"
 
-#: ../src/roster_window.py:2141
+#: ../src/roster_window.py:2636
+msgid "_Maximize All"
+msgstr "_Massimizza tutti"
+
+#: ../src/roster_window.py:2652
 msgid "To all users"
 msgstr "A tutti gli utenti"
 
-#: ../src/roster_window.py:2144
+#: ../src/roster_window.py:2655
 msgid "To all online users"
 msgstr "Utenti _online"
 
-#: ../src/roster_window.py:2180
+#. Log Off
+#: ../src/roster_window.py:2772
+msgid "_Log off"
+msgstr "_Disconnetti"
+
+#. Log on
+#: ../src/roster_window.py:2778
 msgid "_Log on"
 msgstr "_Connetti"
 
-#: ../src/roster_window.py:2190
-msgid "Log _off"
-msgstr "_Disconnetti"
+#. Send single message
+#: ../src/roster_window.py:2790
+msgid "Send Single Message"
+msgstr "Invia messaggio singolo"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:2837
+msgid "_Manage Transport"
+msgstr "_Gestisci trasporto"
 
-#: ../src/roster_window.py:2312 ../src/roster_window.py:2383
+#. Modify Transport
+#: ../src/roster_window.py:2845
+msgid "_Modify Transport"
+msgstr "_Modifica trasporto"
+
+#. Information
+#: ../src/roster_window.py:2882
+msgid "_Information"
+msgstr "_Informazioni"
+
+#: ../src/roster_window.py:2959 ../src/roster_window.py:3033
 msgid "_Change Status Message"
 msgstr "_Cambia messaggio di stato"
 
-#: ../src/roster_window.py:2455
+#: ../src/roster_window.py:3105
 msgid "Authorization has been sent"
 msgstr "Autorizzazione inviata"
 
-#: ../src/roster_window.py:2456
+#: ../src/roster_window.py:3106
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ora \"%s\" conoscerà il tuo stato."
 
-#: ../src/roster_window.py:2476
+#: ../src/roster_window.py:3126
 msgid "Subscription request has been sent"
 msgstr "La richiesta di abbonamento è stata inviata"
 
-#: ../src/roster_window.py:2477
+#: ../src/roster_window.py:3127
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" accetta questa richiesta conoscerai il suo stato."
 
-#: ../src/roster_window.py:2489
+#: ../src/roster_window.py:3139
 msgid "Authorization has been removed"
 msgstr "L'autorizzazione è stata rimossa"
 
-#: ../src/roster_window.py:2490
+#: ../src/roster_window.py:3140
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ora \"%s\" ti vedrà sempre come offline."
 
-#: ../src/roster_window.py:2680
+#: ../src/roster_window.py:3357
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Il contatto \"%s\" sarà rimosso dalla tua lista"
 
-#: ../src/roster_window.py:2684
+#: ../src/roster_window.py:3361
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -5171,7 +5644,7 @@ msgstr ""
 "Eliminando questo contatto ne verrà rimossa anche l'autorizzazione. Questi "
 "ti vedrà sempre offline."
 
-#: ../src/roster_window.py:2689
+#: ../src/roster_window.py:3366
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -5179,16 +5652,16 @@ msgstr ""
 "Eliminando questo contatto ne rimuoverai anche l'autorizzazione. Questi ti "
 "vedrà sempre offline."
 
-#: ../src/roster_window.py:2692
+#: ../src/roster_window.py:3369
 msgid "I want this contact to know my status after removal"
 msgstr "Voglio che questo contatto conosca il mio stato dopo la rimozione"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2696
+#: ../src/roster_window.py:3373
 msgid "Contacts will be removed from your roster"
 msgstr "Il contatto sarà rimosso dalla tua lista"
 
-#: ../src/roster_window.py:2700
+#: ../src/roster_window.py:3377
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -5197,46 +5670,51 @@ msgstr ""
 "Eliminando questi contatti:%s\n"
 "ne verrà rimossa anche l'autorizzazione. Ti vedranno sempre offline."
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:3409
 msgid ""
-"Gnomekeyring is installed but not correctly started (environment variable "
+"Gnome Keyring is installed but not correctly started (environment variable "
 "probably not correctly set)"
-msgstr "Gnomekeyring è installato ma non avviato correttamente (la variabile d'ambiente è probabilmente impostata in maniera scorretta)"
+msgstr ""
+"Gnome Keyring è installato ma non avviato correttamente (la variabile "
+"d'ambiente è probabilmente impostata in maniera non corretta)"
+
+#: ../src/roster_window.py:3436
+msgid "GPG is not usable"
+msgstr "Non è possibile utilizzare GPG"
 
-#. TODO: make this string translatable
 #. %s is the account name here
-#: ../src/roster_window.py:2760 ../src/common/connection.py:671
-#: ../src/common/zeroconf/connection_zeroconf.py:158
+#: ../src/roster_window.py:3436 ../src/common/connection.py:684
+#: ../src/common/zeroconf/connection_zeroconf.py:165
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
-msgstr "Ci si connetterà a %s senza OpenPGP"
+msgstr "Ti connetterai a %s senza OpenPGP."
 
-#: ../src/roster_window.py:2777
+#: ../src/roster_window.py:3453
 msgid "Passphrase Required"
 msgstr "Passphrase richiesta"
 
-#: ../src/roster_window.py:2778
+#: ../src/roster_window.py:3454
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Inserire la passphrase della chiave GPG per l'account %s."
 
-#: ../src/roster_window.py:2783
+#: ../src/roster_window.py:3459
 msgid "Save passphrase"
 msgstr "Memorizza passphrase"
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:3467
 msgid "Wrong Passphrase"
 msgstr "Passphrase errata"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:3468
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Riscrivere la passphrase GPG o premere Annulla."
 
-#: ../src/roster_window.py:2849 ../src/roster_window.py:2909
+#: ../src/roster_window.py:3551 ../src/roster_window.py:3628
 msgid "You are participating in one or more group chats"
 msgstr "Si sta partecipando ad una o più chat di gruppo"
 
-#: ../src/roster_window.py:2850 ../src/roster_window.py:2910
+#: ../src/roster_window.py:3552 ../src/roster_window.py:3629
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -5244,21 +5722,21 @@ msgstr ""
 "Impostare lo stato invisibile ti farà disconnettere da queste chat di "
 "gruppo. Diventare veramente invisibile?"
 
-#: ../src/roster_window.py:2867
+#: ../src/roster_window.py:3586
 msgid "No account available"
 msgstr "Nessun account disponibile"
 
-#: ../src/roster_window.py:2868
+#: ../src/roster_window.py:3587
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "È necessario creare un account prima di poter chattare con altri contatti."
 
-#: ../src/roster_window.py:2966
+#: ../src/roster_window.py:3715
 #, python-format
 msgid "\"%(title)s\" by %(artist)s"
 msgstr "\"%(title)s\" di %(artist)s"
 
-#: ../src/roster_window.py:3395 ../src/roster_window.py:3402
+#: ../src/roster_window.py:4170 ../src/roster_window.py:4177
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -5266,24 +5744,25 @@ msgstr ""
 "I messaggi saranno disponibili per una lettura successiva solo se la "
 "cronologia è abilitata"
 
-#: ../src/roster_window.py:3986
+#: ../src/roster_window.py:4801
 msgid "Metacontacts storage not supported by your server"
 msgstr "Il supporto metacontatti non è supportato dal tuo server"
 
-#: ../src/roster_window.py:3988
+#: ../src/roster_window.py:4803
+#, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
-"information will not be save on next reconnection."
+"information will not be saved on next reconnection."
 msgstr ""
 "Il tuo server non supporta il salvataggio di informazioni metacontatti. "
 "Perciò queste informazioni non saranno salvate al prossimo riavvio."
 
-#: ../src/roster_window.py:4030
+#: ../src/roster_window.py:4849
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Stai per creare un metacontatto. Continuare?"
 
-#: ../src/roster_window.py:4032
+#: ../src/roster_window.py:4851
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -5293,110 +5772,123 @@ msgstr ""
 "Generalmente si usano quando la stessa persona ha più account jabber o su "
 "vari transport."
 
-#: ../src/roster_window.py:4199
-#, python-format
-msgid "Drop %s in group %s"
-msgstr "Sposta %s nel gruppo %s"
-
-#: ../src/roster_window.py:4206
+#: ../src/roster_window.py:4949
 #, python-format
-msgid "Make %s and %s metacontacts"
-msgstr "Rendi %s e %s metacontatti"
+msgid "Do you want to send that file to %s:"
+msgid_plural "Do you want to send those files to %s:"
+msgstr[0] "Vuoi inviare questo file a %s:"
+msgstr[1] "Vuoi inviare questi file a %s:"
 
-#: ../src/roster_window.py:4393
+#: ../src/roster_window.py:5232
 msgid "Change Status Message..."
 msgstr "Cambia messaggio di stato..."
 
-#: ../src/systray.py:144
+#: ../src/systray.py:164
 msgid "_Change Status Message..."
 msgstr "_Cambia messaggio di stato..."
 
-#: ../src/systray.py:232
+#: ../src/systray.py:249
 msgid "Hide this menu"
 msgstr "Nascondi questo menu"
 
-#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#: ../src/tooltips.py:310 ../src/tooltips.py:503
 msgid "Jabber ID: "
 msgstr "ID Jabber: "
 
-#: ../src/tooltips.py:312 ../src/tooltips.py:496
+#: ../src/tooltips.py:313 ../src/tooltips.py:507
 msgid "Resource: "
 msgstr "Risorsa: "
 
-#: ../src/tooltips.py:317
+#: ../src/tooltips.py:318
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s di questa chat di gruppo"
 
-#: ../src/tooltips.py:430 ../src/tooltips.py:610
+#: ../src/tooltips.py:416
+msgid " [blocked]"
+msgstr " [bloccato]"
+
+#: ../src/tooltips.py:420
+msgid " [minimized]"
+msgstr " [minimizzata]"
+
+#: ../src/tooltips.py:435 ../src/tooltips.py:623
 msgid "Status: "
 msgstr "Stato: "
 
-#: ../src/tooltips.py:461
+#: ../src/tooltips.py:465
 #, python-format
 msgid "Last status: %s"
 msgstr "Ultimo stato: %s"
 
-#: ../src/tooltips.py:463
+#: ../src/tooltips.py:467
 #, python-format
 msgid " since %s"
-msgstr "da %s"
+msgstr " dalle %s"
+
+#: ../src/tooltips.py:485
+msgid "Connected"
+msgstr "Connesso"
+
+#: ../src/tooltips.py:487
+msgid "Disconnected"
+msgstr "Disconnesso"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:514
 msgid "Subscription: "
 msgstr "Abbonamento: "
 
-#: ../src/tooltips.py:512
+#: ../src/tooltips.py:524
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:566
+#: ../src/tooltips.py:579
 msgid "Download"
 msgstr "Scarica"
 
-#: ../src/tooltips.py:572
+#: ../src/tooltips.py:585
 msgid "Upload"
 msgstr "Invia"
 
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:592
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:598
 msgid "Transferred: "
 msgstr "Trasferito: "
 
-#: ../src/tooltips.py:588 ../src/tooltips.py:609
+#: ../src/tooltips.py:601 ../src/tooltips.py:622
 msgid "Not started"
 msgstr "Non iniziato"
 
-#: ../src/tooltips.py:592
+#: ../src/tooltips.py:605
 msgid "Stopped"
 msgstr "Fermato"
 
-#: ../src/tooltips.py:594 ../src/tooltips.py:597
+#: ../src/tooltips.py:607 ../src/tooltips.py:610
 msgid "Completed"
 msgstr "Completato"
 
-#: ../src/tooltips.py:601
+#: ../src/tooltips.py:614
 msgid "?transfer status:Paused"
 msgstr "?transfer status:In pausa"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:605
+#: ../src/tooltips.py:618
 msgid "Stalled"
 msgstr "In stallo"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:620
 msgid "Transferring"
 msgstr "Trasferimento in corso"
 
-#: ../src/tooltips.py:639
+#: ../src/tooltips.py:652
 msgid "This service has not yet responded with detailed information"
 msgstr "Questo servizio non ha ancora inviato informazioni dettagliate"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:655
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5404,24 +5896,24 @@ msgstr ""
 "Questo servizio non ha inviato informazioni dettagliate.\n"
 "È probabilmente vecchio o malfunzionante"
 
-#: ../src/vcard.py:217
+#: ../src/vcard.py:240
 msgid "?Client:Unknown"
 msgstr "?Client:Sconosciuto"
 
-#: ../src/vcard.py:219
+#: ../src/vcard.py:242
 msgid "?OS:Unknown"
 msgstr "Sconosciuto"
 
-#: ../src/vcard.py:247 ../src/vcard.py:449
+#: ../src/vcard.py:267 ../src/vcard.py:277 ../src/vcard.py:467
 #, python-format
 msgid "since %s"
-msgstr "da %s"
+msgstr "dalle %s"
 
-#: ../src/vcard.py:277
+#: ../src/vcard.py:306
 msgid "Affiliation:"
 msgstr "Affiliazione: "
 
-#: ../src/vcard.py:285
+#: ../src/vcard.py:314
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5429,7 +5921,7 @@ msgstr ""
 "Questo contatto è interessato alle informazioni sulla tua presenza, ma tu "
 "non sei interessato alla sua"
 
-#: ../src/vcard.py:287
+#: ../src/vcard.py:316
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5437,14 +5929,14 @@ msgstr ""
 "Sei interessato alle informazioni sulla presenza di questo contatto, ma lui/"
 "lei non è interessato/a alla tua"
 
-#: ../src/vcard.py:289
+#: ../src/vcard.py:318
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Tu ed il contatto siete reciprocamente interessati alle informazioni sulla "
 "presenza dell'altro"
 
 #. None
-#: ../src/vcard.py:291
+#: ../src/vcard.py:320
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -5452,12 +5944,12 @@ msgstr ""
 "Non sei interessato alla presenza del contatto, e lui/lei non è interessato "
 "alla tua"
 
-#: ../src/vcard.py:299
+#: ../src/vcard.py:328
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Sei in attesa della risposta del contatto alla tua richiesta di abbonamento"
 
-#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
+#: ../src/vcard.py:332 ../src/vcard.py:369 ../src/vcard.py:492
 msgid " resource with priority "
 msgstr " risorsa con priorità "
 
@@ -5465,23 +5957,23 @@ msgstr " risorsa con priorità "
 msgid "creating logs database"
 msgstr "creazione database log"
 
-#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
-#: ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:96 ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:114
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s è un file ma dovrebbe essere una cartella"
 
-#: ../src/common/check_paths.py:90 ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
+#: ../src/common/check_paths.py:97 ../src/common/check_paths.py:108
+#: ../src/common/check_paths.py:115 ../src/common/check_paths.py:123
 msgid "Gajim will now exit"
 msgstr "Gajim sta per uscire"
 
-#: ../src/common/check_paths.py:115
+#: ../src/common/check_paths.py:122
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s è una cartella ma dovrebbe essere un file"
 
-#: ../src/common/check_paths.py:131
+#: ../src/common/check_paths.py:138
 #, python-format
 msgid "creating %s directory"
 msgstr "creazione della cartella %s"
@@ -5537,54 +6029,58 @@ msgstr "Non si è entrati in una chat di gruppo."
 
 #: ../src/common/commands.py:189
 msgid "Leave Groupchats"
-msgstr "Lasciare le chat di gruppo"
+msgstr "Esci dalle chat di gruppo"
 
 #: ../src/common/commands.py:190
 msgid "Choose the groupchats you want to leave"
-msgstr "Scegliere le chat di gruppo da lasciare"
-
-#: ../src/common/commands.py:194
-msgid "Groupchats"
-msgstr "Chat di gruppo"
+msgstr "Scegliere le chat di gruppo da cui vuoi uscire"
 
 #: ../src/common/commands.py:230
-msgid "You leaved the following groupchats:"
-msgstr "Sono state lasciate le seguenti chat di gruppo:"
+msgid "You left the following groupchats:"
+msgstr "Sei uscito dalle seguenti chat di gruppo:"
+
+#: ../src/common/commands.py:242
+msgid "Forward unread messages"
+msgstr "Inoltra messaggi non letti"
+
+#: ../src/common/commands.py:262
+msgid "All unread messages have been forwarded."
+msgstr "Tutti i messaggi non letti sono stati inoltrati."
 
-#: ../src/common/config.py:56
+#: ../src/common/config.py:58
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Usa D-Bus e Notification-Daemon per mostrare le notifiche"
 
-#: ../src/common/config.py:61
+#: ../src/common/config.py:63
 msgid "Time in minutes, after which your status changes to away."
-msgstr "Tempo in minuti dopo il quale lo stato diventa \"assente\"."
+msgstr "Tempo in minuti dopo il quale lo stato diventa 'assente'."
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:64
 msgid "Away as a result of being idle"
 msgstr "Assente per inattività"
 
-#: ../src/common/config.py:64
+#: ../src/common/config.py:66
 msgid "Time in minutes, after which your status changes to not available."
-msgstr "Tempo in minuti dopo il quale lo stato diventa \"non disponibile\"."
+msgstr "Tempo in minuti dopo il quale lo stato diventa 'non disponibile'."
 
-#: ../src/common/config.py:65
+#: ../src/common/config.py:67
 msgid "Not available as a result of being idle"
 msgstr "Non disponibile per inattività"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:85
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "Lista (separata da spazi) di linee (account e gruppi) raggruppate."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:90
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Abilità la messaggistica zeroconf sulla rete locale"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:93
 msgid "Language used by speller"
 msgstr "Lingua usata dal controllo ortografico"
 
-#: ../src/common/config.py:92
+#: ../src/common/config.py:94
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -5594,32 +6090,37 @@ msgstr ""
 "'a volte' - scrive l'ora ogni print_ichat_every_foo_minutes minuti.\n"
 "'mai' - non scrive mai l'ora."
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:95
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
-msgstr "Scrive l'ora nelle chat usando l'orologio vago. Valore di vaghezza da 1 a 4, o 0 per disabilitarlo. 1 è l'orologio più preciso, 4 è il meno preciso. Viene usato solo se print_time è 'sometimes'."
+msgstr ""
+"Scrive l'ora nelle chat usando l'orologio vago. Valore di vaghezza da 1 a 4, "
+"o 0 per disabilitarlo. 1 è l'orologio più preciso, 4 è il meno preciso. "
+"Viene usato solo se print_time è 'sometimes'."
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Tratta le coppie di * / _ come possibili caratteri di formattazione."
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
-"Se Vero, non verranno rimossi */_ . *abc* verrà mostrato in grassetto ma "
-"senza rimuovere * *."
+"Se Vero, non verranno rimossi */_ . Perciò *abc* verrà mostrato in grassetto "
+"ma senza rimuovere * *."
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (If you want to use this, install docutils)"
-msgstr "Usa il testo annotato ReStructured per inviare HTML, più la formattazione ascii se selezionata (se si vuole usare questa opzione, installare docutils)"
+msgstr ""
+"Usa il testo annotato ReStructured per inviare HTML, più la formattazione "
+"ascii se selezionata (se si vuole usare questa opzione, installare docutils)"
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:111
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -5627,7 +6128,7 @@ msgstr ""
 "Carattere da aggiungere dopo il nickname quando si usa il completamento nick "
 "(tab) nella chat di gruppo."
 
-#: ../src/common/config.py:110
+#: ../src/common/config.py:112
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -5635,26 +6136,30 @@ msgstr ""
 "Carattere da proporre di aggiungere dopo il nickname desiderato quando il "
 "nickname desiderato è già usato da qualcun'altro nella chat di gruppo"
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:135
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
-msgstr "Questa opzione permette di personalizzare l'orario stampato nelle conversazioni. Per esempio, \"[%H:%M] \" mostrerà \"[ora:minuto] \". Vedere la documentazione della funzione python strftime per ottenere documentazione completa: http://docs.python.org/lib/module-time.html"
+msgstr ""
+"Questa opzione permette di personalizzare l'orario stampato nelle "
+"conversazioni. Per esempio, \"[%H:%M] \" mostrerà \"[ora:minuto] \". Vedere "
+"la documentazione della funzione python strftime per ottenere documentazione "
+"completa: http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:134
+#: ../src/common/config.py:136
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Caratteri scritti prima del nickname nelle conversazioni"
 
-#: ../src/common/config.py:135
+#: ../src/common/config.py:137
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Caratteri scritti dopo il nickname nelle conversazioni"
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:144
 msgid "Add * and [n] in roster title?"
 msgstr "Aggiungere * e [n] al titolo della lista contatti?"
 
-#: ../src/common/config.py:143
+#: ../src/common/config.py:145
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -5662,12 +6167,12 @@ msgstr ""
 "Quante linee ricordare dalla precedente conversazione quando una scheda/"
 "finestra di chat viene riaperta."
 
-#: ../src/common/config.py:144
+#: ../src/common/config.py:146
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Quanti minuti devono durare le ultime linee dalla conversazione precedente."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:147
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -5675,11 +6180,11 @@ msgstr ""
 "Inviare il messaggio con Ctrl-Invio e con Invio creare una nuova linea "
 "(comportamento predefinito del client ICQ Mirabilis)."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:149
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Quante linee memorizzare per Ctrl+Alto."
 
-#: ../src/common/config.py:150
+#: ../src/common/config.py:152
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -5688,12 +6193,12 @@ msgstr ""
 "URL personalizzato contenente %s dove %s è la parola/frase o 'WIKTIONARY', "
 "che significa usare wiktionary."
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:155
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Se marcato, Gajim può essere controllato da remoto usando gajim-remote."
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:156
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -5705,13 +6210,13 @@ msgstr ""
 "che sia sincronizzato con lo stato globale) basandosi sullo stato della "
 "connessione di rete."
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:157
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Notifiche di stato inviate. Può essere una tra all, composing_only, disabled."
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:158
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -5719,7 +6224,7 @@ msgstr ""
 "Le notifiche di stato mostrate nella finestra di chat. Possono essere una "
 "tra all, composing_only, disabled."
 
-#: ../src/common/config.py:158
+#: ../src/common/config.py:160
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -5727,11 +6232,11 @@ msgstr ""
 "Quando non scrivi la data ad ogni messaggio (print_time==sometimes), "
 "scriverla ogni x minuti."
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:161
 msgid "Ask before closing a group chat tab/window."
 msgstr "Chiedere prima di chiudere una finestra/scheda di chat di gruppo."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:162
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -5739,7 +6244,7 @@ msgstr ""
 "Chiedere sempre prima di chiudere una finestra/scheda di chat di gruppo in "
 "questa lista separata da spazi di jid di stanze."
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:163
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -5747,42 +6252,56 @@ msgstr ""
 "Non chiedere mai prima di chiudere una scheda/finestra di chat in questa "
 "lista separata da spazi di jid di stanze."
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:166
+#, fuzzy
 msgid ""
-"Overrides the host we send for File Transfer in case of address translation/"
-"port forwarding."
+"Comma separated list of hosts that we send, in addition of local interfaces, "
+"for File Transfer in case of address translation/port forwarding."
 msgstr ""
-"Imposta l'host inviato per il trasferimento file in caso di traduzione di "
-"indirizzo/port forwarding."
+"Lista di host separati da una virgola che saranno inviati, insieme alle "
+"interfacce locali, per il trasferimento file in caso di traslazione "
+"dell'indirizzo/inoltro porte."
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:168
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Secondo lo standard IEC, KiB = 1024 byte, KB = 1000 byte."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:170
 msgid "Notify of events in the system trayicon."
 msgstr "Notifica gli eventi nell'area di notifica."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:176
 msgid "Show tab when only one conversation?"
 msgstr "Mostrare scheda quando c'è una sola conversazione?"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:177
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Mostrare bordo per le schede quando c'è una sola conversazione?"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:178
 msgid "Show close button in tab?"
 msgstr "Mostrare il pulsante \"chiudi\" nelle schede?"
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:179
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+"Durante la negoziazione di una sessione cifrata, Gajim deve abilitare la "
+"registrazione dei messaggi?"
+
+#: ../src/common/config.py:188
+msgid "Preview new messages in notification popup?"
+msgstr "Includere l'anteprima dei nuovi messaggi nelle notifiche popup?"
+
+#: ../src/common/config.py:193
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Una lista separata da caratteri ';' di parole che verranno evidenziate nelle "
 "chat multi-utente."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:194
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -5791,12 +6310,13 @@ msgstr ""
 "cliccato. Questa impostazione è presa in considerazione solo se viene usata "
 "l'icona nello spazio di notifica."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:195
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
-msgstr "Se Vero, Gajim controllerà se è il client Jabber predefinito ad ogni avvio."
+msgstr ""
+"Se Vero, Gajim controllerà se è il client Jabber predefinito ad ogni avvio."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:196
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -5804,7 +6324,7 @@ msgstr ""
 "Se Vero, Gajim mostrerà un icona su ogni scheda contenente messaggi non "
 "letti. A seconda del tema, questa icona può essere animata."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:197
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -5812,7 +6332,7 @@ msgstr ""
 "Se Vero, Gajim mostrerà il messaggio di stato, se non vuoto, per ogni "
 "contatto sotto il nome del contatto nella finestra dei contatti"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:199
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -5820,7 +6340,7 @@ msgstr ""
 "Se Vero, Gajim chiederà un avatar ad ogni contatto che non aveva un avatar "
 "l'ultima volta o ne ha uno troppo vecchio in cache."
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:200
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -5828,39 +6348,44 @@ msgstr ""
 "Se Falso, non si vedrà più la linea di stato nelle chat quando un contatto "
 "cambia stato o messaggio di stato."
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:201
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
 "status and/or his or her status message. If \"all\" Gajim will print all "
 "status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
 "group chat."
-msgstr "può essere \"none\", \"all\" o \"in_and_out\". Se \"none\", Gajim non scriverà più la riga di stato nelle chat di gruppo quando un membro cambia il suo stato e/o il suo messaggio di stato. Se \"all\" Gajim scriverà tutti i messaggi di stato. Se \"in_and_out\", gajim scriverà solo quando qualcuno entra od esce dalla chat di gruppo."
+msgstr ""
+"può essere \"none\", \"all\" o \"in_and_out\". Se \"none\", Gajim non "
+"scriverà più la riga di stato nelle chat di gruppo quando un membro cambia "
+"il suo stato e/o il suo messaggio di stato. Se \"all\" Gajim scriverà tutti "
+"i messaggi di stato. Se \"in_and_out\", gajim scriverà solo quando qualcuno "
+"entra od esce dalla chat di gruppo."
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:203
 msgid "Background color of contacts when they just signed in."
 msgstr "Colore di sfondo dei contatti appena collegati."
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:204
 msgid "Background color of contacts when they just signed out."
 msgstr "Colore di sfondo dei contatti appena scollegati."
 
-#: ../src/common/config.py:202
+#: ../src/common/config.py:206
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Se Vero, i messaggi recuperati useranno un font più piccolo di quello "
 "predefinito."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:207
 msgid "Don't show avatar for the transport itself."
 msgstr "Non mostrare l'avatar per il trasporto stesso."
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:208
 msgid "Don't show roster in the system taskbar."
 msgstr "Non mostrare l'account nella taskbar del sistema."
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:209
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -5870,7 +6395,7 @@ msgstr ""
 "finestra lampeggia (comportamento predefinito per la maggior parte dei "
 "gestori di finestre) quando contiene nuovi eventi."
 
-#: ../src/common/config.py:207
+#: ../src/common/config.py:211
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -5881,7 +6406,7 @@ msgstr ""
 "SHA nella presenza sulle chat di gruppo"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:210
+#: ../src/common/config.py:214
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -5900,36 +6425,32 @@ msgstr ""
 "ad una specifica finestra. Nota, cambiare questa opzione richiede il riavvio "
 "di Gajim prima che le modifiche abbiano effetto"
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:215
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Se Falso, l'avatar non verrà mostrato nella finestra di chat"
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:216
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Se Vero, premere il tasto Esc chiude una scheda/finestra"
 
-#: ../src/common/config.py:213
-msgid "Hides the buttons in group chat window."
-msgstr "Nasconde i pulsanti nella finestra di chat di gruppo"
-
-#: ../src/common/config.py:214
-msgid "Hides the buttons in two persons chat window."
-msgstr "Nasconde i pulsanti nella finestra di chat a due persone"
+#: ../src/common/config.py:217
+msgid "Hides the buttons in chat windows."
+msgstr "Nascondi i pulsanti nella finestra di chat di gruppo."
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:218
 msgid "Hides the banner in a group chat window"
 msgstr "Nasconde l'intestazione in una finestra di chat di gruppo"
 
-#: ../src/common/config.py:216
+#: ../src/common/config.py:219
 msgid "Hides the banner in two persons chat window"
 msgstr "Nasconde l'intestazione nella finestra di chat a due persone"
 
-#: ../src/common/config.py:217
+#: ../src/common/config.py:220
 msgid "Hides the group chat occupants list in group chat window."
 msgstr ""
 "Nasconde la lista dei presenti nella stanza nella finestra di chat di gruppo"
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:221
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -5937,22 +6458,26 @@ msgstr ""
 "In una chat, mostra il nickname all'inizio della riga solo quando non è "
 "quello della persona che parlava nel messaggio precedente."
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:222
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentazione quando si raggruppano nickname consecutivi."
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:223
+msgid "Smooth scroll message in conversation window"
+msgstr "Scorrimento fluido dei messaggi nella finestra di continuazione"
+
+#: ../src/common/config.py:224
 msgid "List of colors that will be used to color nicknames in group chats."
 msgstr ""
 "Lista di colori che saranno usati per colorare i nickname nelle chat di "
 "gruppo."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:225
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab va alla prossima scheda di composizione se nessuna è non letta."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:226
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -5960,7 +6485,7 @@ msgstr ""
 "Mostrare la richiesta di conferma creazione metacontatti o meno? Una stringa "
 "vuota significa che non verrà mai mostrata."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:227
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -5970,25 +6495,61 @@ msgstr ""
 "di modifica account. ATTENZIONE, quando si è collegati con priorità "
 "negativa, NON si riceveranno messaggi dal server."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:228
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
-msgstr "Se Vero, Gajim userà il Keyring Gnome (se disponibile) per memorizzare le password degli account."
+msgstr ""
+"Se Vero, Gajim userà il Keyring Gnome (se disponibile) per memorizzare le "
+"password degli account."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:229
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
-msgstr "Se Vero, Gajim mostrerà il numero di account online e totali nelle linee degli account e dei gruppi."
+msgstr ""
+"Se Vero, Gajim mostrerà il numero di account online e totali nelle linee "
+"degli account e dei gruppi."
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:230
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
-msgstr "Può essere vuoto, 'chat' o 'normal'. Se non vuoto, tratta tutti i messaggi in iarrivo come se fossero di questo tipo"
+msgstr ""
+"Può essere vuoto, 'chat' o 'normal'. Se non vuoto, tratta tutti i messaggi "
+"in iarrivo come se fossero di questo tipo"
+
+#: ../src/common/config.py:231
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+"Se Vero, Gajim scorrerà e selezionerà il contatto che ti ha mandato l'ultimo "
+"messaggio, se la finestra di chat non è già aperta."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:232
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+"Se Vero, Gajim converterà le stringhe comprese tra $$ e $$ in un'immagine "
+"usando dvips e convertendola prima di inserirla in una finestra di chat."
+
+#: ../src/common/config.py:233
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr ""
+"Tempo di inattività richiesto prima che la finestra di cambiamento del "
+"messaggio di stato si chiuda."
+
+#: ../src/common/config.py:234
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+"Massimo numero di linee che sono visualizzate nelle conversazioni. Le linee "
+"più vecchie verranno cancellate."
+
+#: ../src/common/config.py:245
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -5997,11 +6558,11 @@ msgstr ""
 "definite nelle opzioni autopriority_*."
 
 #. yes, no, ask
-#: ../src/common/config.py:266
+#: ../src/common/config.py:275
 msgid "Jabberd2 workaround"
 msgstr "Workaround Jabberd2"
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:279
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -6009,101 +6570,101 @@ msgstr ""
 "Se marcato, Gajim userà l'IP della macchina ed i proxy definiti nell'opzione "
 "file_transfer_proxies per il trasferimento file."
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:338
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "OpenPGP è abilitato per questo contatto?"
 
-#: ../src/common/config.py:330 ../src/common/config.py:333
+#: ../src/common/config.py:339 ../src/common/config.py:342
 msgid "Language for which we want to check misspelled words"
 msgstr "Linguaggio per il quale controllare le parole sbagliate"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:348
 msgid "all or space separated status"
 msgstr "tutto o stati separati da uno spazio"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:349
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', o 'both'"
 
-#: ../src/common/config.py:341 ../src/common/config.py:343
-#: ../src/common/config.py:344 ../src/common/config.py:347
-#: ../src/common/config.py:348
+#: ../src/common/config.py:350 ../src/common/config.py:352
+#: ../src/common/config.py:353 ../src/common/config.py:356
+#: ../src/common/config.py:357
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' o 'both'"
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:363
 msgid "Sleeping"
 msgstr "Dormo"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:364
 msgid "Back soon"
 msgstr "Torno presto"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:364
 msgid "Back in some minutes."
-msgstr "Di ritorno tra qualche minuto."
+msgstr "Torno tra qualche minuto."
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:365
 msgid "Eating"
 msgstr "Mangio"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:365
 msgid "I'm eating, so leave me a message."
-msgstr "Sto mangiando, lascia pure un messaggio"
+msgstr "Sto mangiando, lascia pure un messaggio."
 
-#: ../src/common/config.py:357
+#: ../src/common/config.py:366
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:357
+#: ../src/common/config.py:366
 msgid "I'm watching a movie."
 msgstr "Sto guardando un film."
 
-#: ../src/common/config.py:358
+#: ../src/common/config.py:367
 msgid "Working"
 msgstr "Lavoro"
 
-#: ../src/common/config.py:358
+#: ../src/common/config.py:367
 msgid "I'm working."
 msgstr "Sto lavorando."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:368
 msgid "Phone"
 msgstr "Telefono"
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:368
 msgid "I'm on the phone."
-msgstr "Sono al telefono"
+msgstr "Sono al telefono."
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:369
 msgid "Out"
 msgstr "Fuori"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:369
 msgid "I'm out enjoying life."
-msgstr "Sono fuori a divertirmi"
+msgstr "Sono fuori a divertirmi."
 
-#: ../src/common/config.py:364
+#: ../src/common/config.py:373
 msgid "I'm available."
-msgstr "Disponibile"
+msgstr "Sono disponibile."
 
-#: ../src/common/config.py:365
+#: ../src/common/config.py:374
 msgid "I'm free for chat."
-msgstr "Libero per chat"
+msgstr "Solo libero per chat."
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:376
 msgid "I'm not available."
-msgstr "Servizio non disponibile"
+msgstr "Non sono disponibile."
 
-#: ../src/common/config.py:368
+#: ../src/common/config.py:377
 msgid "Do not disturb."
 msgstr "Non disturbare."
 
-#: ../src/common/config.py:369 ../src/common/config.py:370
+#: ../src/common/config.py:378 ../src/common/config.py:379
 msgid "Bye!"
 msgstr "Ciao ciao!"
 
-#: ../src/common/config.py:379
+#: ../src/common/config.py:388
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -6111,123 +6672,130 @@ msgstr ""
 "Suono da riprodurre quando un messaggio MUC contiene una delle parole in "
 "muc_highlight_words, o quando un messaggio MUC contiene il tuo nickname."
 
-#: ../src/common/config.py:380
+#: ../src/common/config.py:389
 msgid "Sound to play when any MUC message arrives."
 msgstr "Suono da riprodurre quando un messaggio MUC arriva."
 
-#: ../src/common/config.py:389 ../src/common/optparser.py:193
+#: ../src/common/config.py:398 ../src/common/optparser.py:208
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:393 ../src/common/optparser.py:179
+#: ../src/common/config.py:402 ../src/common/optparser.py:194
 msgid "grocery"
 msgstr "drogheria"
 
-#: ../src/common/config.py:397
+#: ../src/common/config.py:406
 msgid "human"
 msgstr "umano"
 
-#: ../src/common/config.py:401
+#: ../src/common/config.py:410
 msgid "marine"
 msgstr "marino"
 
-#: ../src/common/connection_handlers.py:52
+#: ../src/common/connection_handlers.py:56
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
 msgid "Unable to load idle module"
 msgstr "Impossibile caricare il modulo idle"
 
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
+#: ../src/common/connection_handlers.py:215
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:236
 msgid "Wrong host"
 msgstr "Host errato"
 
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-msgid ""
-"The host you configured as the ft_override_host_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"L'host configurato come ft_override_host_to_send nelle opzioni avanzate non "
-"è valido, sarà ignorato."
+#: ../src/common/connection_handlers.py:216
+msgid "Invalid local address? :-O"
+msgstr "Indirizzo locale non valido? :-O"
 
-#: ../src/common/connection_handlers.py:590
+#: ../src/common/connection_handlers.py:608
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "Le informazioni di registrazione per il transport %s non sono arrivate in "
 "tempo"
 
-#: ../src/common/connection_handlers.py:1543
+#: ../src/common/connection_handlers.py:1779
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Nickname non permesso: %s"
 
-#. password required to join
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1605
-#: ../src/common/connection_handlers.py:1608
-#: ../src/common/connection_handlers.py:1611
-#: ../src/common/connection_handlers.py:1614
-#: ../src/common/connection_handlers.py:1617
-#: ../src/common/connection_handlers.py:1620
-#: ../src/common/connection_handlers.py:1628
+#: ../src/common/connection_handlers.py:1849
+#: ../src/common/connection_handlers.py:1852
+#: ../src/common/connection_handlers.py:1855
+#: ../src/common/connection_handlers.py:1858
+#: ../src/common/connection_handlers.py:1862
+#: ../src/common/connection_handlers.py:1871
 msgid "Unable to join group chat"
 msgstr "Non è possibile entrare nella stanza"
 
-#: ../src/common/connection_handlers.py:1606
-msgid "A password is required to join this group chat."
-msgstr "È necessaria una password per entrare in questa stanza."
-
-#: ../src/common/connection_handlers.py:1609
-msgid "You are banned from this group chat."
-msgstr "Sei bandito da questa stanza."
+#: ../src/common/connection_handlers.py:1850
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Sei stato bandito dalla stanza %s."
 
-#: ../src/common/connection_handlers.py:1612
-msgid "Such group chat does not exist."
-msgstr "Questa stanza non esiste."
+#: ../src/common/connection_handlers.py:1853
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "La stanza %s non esiste."
 
-#: ../src/common/connection_handlers.py:1615
+#: ../src/common/connection_handlers.py:1856
 msgid "Group chat creation is restricted."
 msgstr "Non è permessa la creazione di stanze."
 
-#: ../src/common/connection_handlers.py:1618
-msgid "Your registered nickname must be used."
-msgstr "È necessario usare il nickname registrato."
+#: ../src/common/connection_handlers.py:1859
+#, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Il tuo nickname è già in uso nella stanza di gruppo %s:"
 
-#: ../src/common/connection_handlers.py:1621
-msgid "You are not in the members list."
-msgstr "Non si appartiene alla lista dei membri."
+#: ../src/common/connection_handlers.py:1863
+#, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Non sei nella lista dei membri nella chat di gruppo %s."
 
-#: ../src/common/connection_handlers.py:1629
+#: ../src/common/connection_handlers.py:1872
+#, python-format
 msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
-"Il nickname desiderato è in uso o registrato da un altro partecipante.\n"
+"Il nickname desiderato è in uso o registrato da un altro partecipante alla "
+"chat di gruppo %s.\n"
 "Specificare un altro nickname sotto:"
 
-#: ../src/common/connection_handlers.py:1679
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers.py:1903
+msgid "Room has been destroyed"
+msgstr "La stanza è stata cancellata"
+
+#: ../src/common/connection_handlers.py:1910
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr "Puoi invece entrare in questa stanza: %s"
+
+#: ../src/common/connection_handlers.py:1937
 msgid "I would like to add you to my roster."
 msgstr "Vorrei aggiungerti ai miei contatti."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1700
+#: ../src/common/connection_handlers.py:1958
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "si è ora abbonati a %s"
 
-#: ../src/common/connection_handlers.py:1702
+#: ../src/common/connection_handlers.py:1960
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "richiesta di cancellazione abbonamento da %s"
 
-#: ../src/common/connection_handlers.py:1704
+#: ../src/common/connection_handlers.py:1962
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "è stato ora cancellato l'abbonamento a %s"
 
-#: ../src/common/connection_handlers.py:1874
+#: ../src/common/connection_handlers.py:2084
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -6237,117 +6805,91 @@ msgstr ""
 "strumenti di gestione dei contatti come http://jru.jabberstudio.org/ per "
 "rimuoverlo"
 
-#: ../src/common/connection.py:182
-#: ../src/common/zeroconf/connection_zeroconf.py:196
+#: ../src/common/connection.py:244
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connessione con l'account \"%s\" persa"
 
-#: ../src/common/connection.py:183
+#: ../src/common/connection.py:245
 msgid "Reconnect manually."
 msgstr "Riconnetti manualmente."
 
-#: ../src/common/connection.py:194 ../src/common/connection.py:221
+#: ../src/common/connection.py:256
 #, python-format
-msgid "Transport %s answered wrongly to register request: %s"
+msgid "Server %s answered wrongly to register request: %s"
 msgstr ""
-"Il trasporto %s ha risposto in maniera errata alla richiesta di "
-"registrazione: %s"
+"Il server %s ha risposto in maniera errata alla richiesta di registrazione: %"
+"s"
 
 #. wrong answer
-#: ../src/common/connection.py:220
+#: ../src/common/connection.py:264
 msgid "Invalid answer"
 msgstr "Risposta non valida"
 
-#: ../src/common/connection.py:416 ../src/common/connection.py:515
-#: ../src/common/connection.py:973
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:265
 #, python-format
-msgid "Could not connect to \"%s\""
-msgstr "Non ci si è potuti collegare a \"%s\""
-
-#: ../src/common/connection.py:430
-#, python-format
-msgid "Connected to server %s:%s with %s"
-msgstr "Connesso al server %s:%s con %s"
-
-#: ../src/common/connection.py:444
-#, python-format
-msgid "Security error connecting to \"%s\""
-msgstr "Errore di sicurezza nella connessione a \"%s\""
-
-#: ../src/common/connection.py:445
-msgid ""
-"The server's key has changed, or someone is trying to hack your connection."
-msgstr "La chiave del server è cambiata, o qualcuno sta cercando di intromettersi nella connessione."
+msgid "Transport %s answered wrongly to register request: %s"
+msgstr ""
+"Il trasporto %s ha risposto in maniera errata alla richiesta di "
+"registrazione: %s"
 
-#: ../src/common/connection.py:452
-#, python-format
-msgid "Unable to check fingerprint for %s. Connection could be insecure."
-msgstr "Non è possibile verificare l'impronta digitale di %s. La connessione potrebbe non essere sicura."
+#: ../src/common/connection.py:411
+msgid "Connection to proxy failed"
+msgstr "Connessione al proxy fallita"
 
-#: ../src/common/connection.py:494
+#: ../src/common/connection.py:465 ../src/common/connection.py:511
+#: ../src/common/connection.py:1067
+#: ../src/common/zeroconf/connection_zeroconf.py:237
 #, python-format
-msgid "Missing fingerprint in SSL connection to %s"
-msgstr "Impronta digitale mancante nella connessione SSL a %s"
+msgid "Could not connect to \"%s\""
+msgstr "Non è possibile connettersi a \"%s\""
 
-#: ../src/common/connection.py:500
+#: ../src/common/connection.py:479
 #, python-format
-msgid "Fingerprint mismatch for %s: Got %s, expected %s"
-msgstr "Impronta digitale non corrispondente per %s: ottenuto %s, atteso %s"
+msgid "Connected to server %s:%s with %s"
+msgstr "Connesso al server %s:%s con %s"
 
-#: ../src/common/connection.py:516
+#: ../src/common/connection.py:512
 msgid "Check your connection or try again later"
 msgstr "Controllare la connessione o riprovare più tardi"
 
-#: ../src/common/connection.py:542
+#: ../src/common/connection.py:537
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autenticazione con \"%s\" fallita"
 
-#: ../src/common/connection.py:543
+#: ../src/common/connection.py:538
 msgid "Please check your login and password for correctness."
 msgstr "Verificare la correttezza di login e password."
 
-#: ../src/common/connection.py:570
+#: ../src/common/connection.py:581
 msgid "Error while removing privacy list"
 msgstr "Errore durante la rimozione della lista privacy"
 
-#: ../src/common/connection.py:571
+#: ../src/common/connection.py:582
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Desactivate it and try again."
-msgstr "La lista privacy %s non è stata rimossa. Potrebbe essere attiva in una delle risorse connesse. Disattivarla e riprovare."
+"connected resources. Deactivate it and try again."
+msgstr ""
+"La lista privacy %s non è stata rimossa. Potrebbe essere attiva in una delle "
+"risorse connesse. Disattivarla e riprovare."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:669
-#: ../src/common/zeroconf/connection_zeroconf.py:156
+#: ../src/common/connection.py:682
+#: ../src/common/zeroconf/connection_zeroconf.py:163
 msgid "OpenPGP passphrase was not given"
 msgstr "Non è stata impostata la passphrase OpenPGP"
 
-#. do not show I'm invisible!
-#: ../src/common/connection.py:711
-msgid "invisible"
-msgstr "invisibile"
-
-#: ../src/common/connection.py:712
-msgid "offline"
-msgstr "offline"
-
-#: ../src/common/connection.py:713
-#, python-format
-msgid "I'm %s"
-msgstr "Sono %s"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:804
+#: ../src/common/connection.py:845
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Questo messaggio è *cifrato* (vedi :JEP:`27`)]"
 
-#: ../src/common/connection.py:860
-#: ../src/common/zeroconf/connection_zeroconf.py:397
+#: ../src/common/connection.py:916
+#: ../src/common/zeroconf/connection_zeroconf.py:423
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -6356,11 +6898,11 @@ msgstr ""
 "Oggetto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:999
+#: ../src/common/connection.py:1099
 msgid "Not fetched because of invisible status"
 msgstr "Non ottenuto a causa di stato invisibile"
 
-#: ../src/common/contacts.py:271
+#: ../src/common/contacts.py:294
 msgid "Not in roster"
 msgstr "Non nei contatti"
 
@@ -6377,19 +6919,19 @@ msgstr "Le potenzialità D-Bus di Gajim non possono essere usate"
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr "La dipendenza pysqlite2 (o python-pysqlite2) è mancante. Uscita..."
 
-#: ../src/common/exceptions.py:30
+#: ../src/common/exceptions.py:39
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Servizio non disponibile: Gajim non è in esecuzione, o remote_control è "
 "Falso."
 
-#: ../src/common/exceptions.py:38
+#: ../src/common/exceptions.py:47
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
 "D-Bus non è presente su questa macchina o il relativo modulo python è "
 "mancante"
 
-#: ../src/common/exceptions.py:46
+#: ../src/common/exceptions.py:55
 msgid ""
 "Session bus is not available.\n"
 "Try reading http://trac.gajim.org/wiki/GajimDBus"
@@ -6547,293 +7089,300 @@ msgstr "Fine settimana"
 msgid "Weekend!"
 msgstr "Fine settimana!"
 
-#: ../src/common/helpers.py:114
+#: ../src/common/helpers.py:115
 msgid "Invalid character in username."
 msgstr "Carattere non valido nel nome utente."
 
-#: ../src/common/helpers.py:119
+#: ../src/common/helpers.py:120
 msgid "Server address required."
 msgstr "Indirizzo del server richiesto."
 
-#: ../src/common/helpers.py:124
+#: ../src/common/helpers.py:125
 msgid "Invalid character in hostname."
 msgstr "Carattere non valido nell'hostname."
 
-#: ../src/common/helpers.py:130
+#: ../src/common/helpers.py:131
 msgid "Invalid character in resource."
 msgstr "Carattere non valido nella risorsa."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:171
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:174
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:177
+#: ../src/common/helpers.py:178
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:180
+#: ../src/common/helpers.py:181
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:184
+#: ../src/common/helpers.py:185
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:187
+#: ../src/common/helpers.py:188
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:191
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:222
 msgid "_Busy"
 msgstr "O_ccupato"
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:224
 msgid "Busy"
 msgstr "Occupato"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:227
 msgid "_Not Available"
 msgstr "_Non disponibile"
 
-#: ../src/common/helpers.py:229
+#: ../src/common/helpers.py:232
 msgid "_Free for Chat"
 msgstr "_Libero per chat"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:234
 msgid "Free for Chat"
 msgstr "Libero per chat"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
 msgid "_Available"
 msgstr "_Disponibile"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:239
 msgid "Available"
 msgstr "Disponibile"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:241
 msgid "Connecting"
 msgstr "Connessione in corso"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:244
 msgid "A_way"
 msgstr "_Assente"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:249
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:251
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:254
 msgid "_Invisible"
 msgstr "_Invisibile"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:260
 msgid "?contact has status:Unknown"
 msgstr "Sconosciuto"
 
-#: ../src/common/helpers.py:259
+#: ../src/common/helpers.py:262
 msgid "?contact has status:Has errors"
 msgstr "Ci sono errori"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:267
 msgid "?Subscription we already have:None"
 msgstr "Nessuno"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:273
 msgid "Both"
 msgstr "Entrambi"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:281
 msgid "?Ask (for Subscription):None"
 msgstr "Nulla"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:283
 msgid "Subscribe"
 msgstr "Abbonati"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:292
 msgid "?Group Chat Contact Role:None"
 msgstr "Nessuno"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:295
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:297
 msgid "Moderator"
 msgstr "Moderatore"
 
-#: ../src/common/helpers.py:297
+#: ../src/common/helpers.py:300
 msgid "Participants"
 msgstr "Partecipanti"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:302
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:302
+#: ../src/common/helpers.py:305
 msgid "Visitors"
 msgstr "Visitatori"
 
-#: ../src/common/helpers.py:304
+#: ../src/common/helpers.py:307
 msgid "Visitor"
 msgstr "Visitatore"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:313
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Nessuna"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:315
 msgid "Owner"
 msgstr "Proprietario"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:317
 msgid "Administrator"
 msgstr "Amministratore"
 
-#: ../src/common/helpers.py:316
+#: ../src/common/helpers.py:319
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:358
 msgid "is paying attention to the conversation"
 msgstr "sta seguendo la conversazione"
 
-#: ../src/common/helpers.py:357
+#: ../src/common/helpers.py:360
 msgid "is doing something else"
 msgstr "sta facendo altro"
 
-#: ../src/common/helpers.py:359
+#: ../src/common/helpers.py:362
 msgid "is composing a message..."
 msgstr "sta scrivendo..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:362
+#: ../src/common/helpers.py:365
 msgid "paused composing a message"
 msgstr "ha smesso di scrivere"
 
-#: ../src/common/helpers.py:364
+#: ../src/common/helpers.py:367
 msgid "has closed the chat window or tab"
 msgstr "ha chiuso la finestra o scheda di chat"
 
-#: ../src/common/helpers.py:890
+#: ../src/common/helpers.py:913 ../src/common/helpers.py:920
 #, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "Gajim - %d messaggio non letto"
-msgstr[1] "Gajim - %d messaggi non letti"
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "%d messaggio in attesa"
+msgstr[1] "%d messaggi in attesa"
 
-#: ../src/common/helpers.py:896
+#: ../src/common/helpers.py:926
 #, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "Gajim - %d messaggio singolo non letto"
-msgstr[1] "Gajim - %d messaggi singoli non letti"
+msgid " from room %s"
+msgstr " dalla stanza %s"
 
-#: ../src/common/helpers.py:902
+#: ../src/common/helpers.py:929 ../src/common/helpers.py:948
 #, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "Gajim - %d messaggio in chat di gruppo non letto"
-msgstr[1] "Gajim - %d messaggi in chat di gruppo non letti"
+msgid " from user %s"
+msgstr " dall'utente %s"
 
-#: ../src/common/helpers.py:908
+#: ../src/common/helpers.py:931
 #, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "Gajim - %d messaggio privato non letto"
-msgstr[1] "Gajim - %d messaggi privati non letti"
+msgid " from %s"
+msgstr " da %s"
 
-#: ../src/common/helpers.py:918 ../src/common/helpers.py:920
+#: ../src/common/helpers.py:938 ../src/common/helpers.py:945
+#, python-format
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] "%d evento in attesa"
+msgstr[1] "%d eventi in attesa"
+
+#: ../src/common/helpers.py:978
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:60
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "errore: impossibile aprire %s per lettura"
 
-#: ../src/common/optparser.py:179
-msgid "gtk+"
-msgstr "gtk+"
-
-#: ../src/common/optparser.py:188 ../src/common/optparser.py:189
+#: ../src/common/optparser.py:203 ../src/common/optparser.py:204
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:306
+#: ../src/common/optparser.py:320
 msgid "migrating logs database to indices"
 msgstr "Migrazione database delle cronologie agli indici"
 
-#: ../src/common/passwords.py:92
+#: ../src/common/passwords.py:82
 #, python-format
 msgid "Gajim account %s"
 msgstr "Account Gajim %s"
 
-#: ../src/common/zeroconf/client_zeroconf.py:189
+#: ../src/common/zeroconf/client_zeroconf.py:135
+#: ../src/common/zeroconf/client_zeroconf.py:218
+msgid "Connection to host could not be established"
+msgstr "La connessione non può essere stabilita."
+
+#: ../src/common/zeroconf/client_zeroconf.py:192
 msgid ""
 "Connection to host could not be established: Incorrect answer from server."
 msgstr ""
 "La connessione all'host non può esser stabilita: risposta incorretta dal "
 "server."
 
-#: ../src/common/zeroconf/client_zeroconf.py:205
-msgid "Connection to host could not be established"
-msgstr "La connessione non può essere stabilita."
-
-#: ../src/common/zeroconf/client_zeroconf.py:334
+#: ../src/common/zeroconf/client_zeroconf.py:352
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
 "La connessione all'host non può esser stabilita: Tempo scaduto durante "
 "l'invio di dati."
 
-#: ../src/common/zeroconf/client_zeroconf.py:627
+#: ../src/common/zeroconf/client_zeroconf.py:638
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Il contatto è offline. Il tuo messaggio non può esser inviato."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:197
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:236
+#, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"L'host %s che hai configurato come il ft_add_hosts_to_send opzione non è "
+"valida, perciò sarà ignorato."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:204
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Per continuare a mandare e ricevere messaggi, è necessario riconnettersi."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:227
 msgid "Avahi error"
 msgstr "Errore avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:227
 #, python-format
 msgid ""
 "%s\n"
@@ -6842,31 +7391,31 @@ msgstr ""
 "%s\n"
 "La messaggistica sulla rete locale potrebbe non funzionare correttamente."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#: ../src/common/zeroconf/connection_zeroconf.py:238
 msgid "Please check if Avahi is installed."
 msgstr "Controllare se Avahi è installato."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#: ../src/common/zeroconf/connection_zeroconf.py:231
+#: ../src/common/zeroconf/connection_zeroconf.py:247
+#: ../src/common/zeroconf/connection_zeroconf.py:251
 msgid "Could not start local service"
 msgstr "Impossibile avviare il servizio locale"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:228
+#: ../src/common/zeroconf/connection_zeroconf.py:248
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossibile collegarsi alla porta %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:232
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:347
 msgid "Please check if avahi-daemon is running."
 msgstr "Controllare se avahi-daemon è in esecuzione."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:324
+#: ../src/common/zeroconf/connection_zeroconf.py:346
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossibile cambiare lo stato dell'account  \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:341
+#: ../src/common/zeroconf/connection_zeroconf.py:363
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -6875,14 +7424,509 @@ msgstr ""
 "essere inviato."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:353
+#: ../src/common/zeroconf/connection_zeroconf.py:375
 msgid "[This message is encrypted]"
 msgstr "[Questo messaggio è cifrato]"
 
-#: ../src/common/zeroconf/zeroconf.py:180
-#, python-format
-msgid "Error while adding service. %s"
-msgstr "Errore durante la creazione del servizio. %s"
+#~ msgid "%s does not appear to be a valid JID"
+#~ msgstr "%s non sembra essere un JID valido"
+
+#~ msgid "Blocked Contacts"
+#~ msgstr "Contatti bloccati"
+
+#~ msgid "In_vite"
+#~ msgstr "In_vita"
+
+#~ msgid "Invite Friends !"
+#~ msgstr "Invita amici!"
+
+#~ msgid "MUC server"
+#~ msgstr "Server MUC"
+
+#~ msgid "Please select a MUC server."
+#~ msgstr "Selezionare un server MUC."
+
+#~ msgid ""
+#~ "You are going to begin a Multi-User Chat.\n"
+#~ "Select the contacts you want to invite"
+#~ msgstr ""
+#~ "Stai per iniziare una chat di gruppo.\n"
+#~ "Scegli i contatti che vuoi invitare"
+
+#~ msgid "<b>List of possible features in Gajim:</b>"
+#~ msgstr "<b>Lista delle possibili funzioni extra di Gajim:</b>"
+
+#, fuzzy
+#~ msgid "Features"
+#~ msgstr "Servizi del server"
+
+#~ msgid "Please wait while retrieving search form..."
+#~ msgstr "Attendere durante il recupero dei campi di ricerca..."
+
+#~ msgid "_Add contact"
+#~ msgstr "_Aggiungi contatto"
+
+#~ msgid "Select the account with which you want to synchronise"
+#~ msgstr "Seleziona l'account con cui vuoi effettuare la sincronizzazione"
+
+#~ msgid "Select the contacts you want to synchronise"
+#~ msgstr "Seleziona i contatti che vuoi sincronizzare"
+
+#~ msgid "Synchronise : select contacts"
+#~ msgstr "Sincronizzazione: scegli i contatti"
+
+#~ msgid "PyOpenSSL"
+#~ msgstr "PyOpenSSL"
+
+#~ msgid ""
+#~ "A library used to validate server certificates to ensure a secure "
+#~ "connection."
+#~ msgstr ""
+#~ "Una libreria usata per validare i certificati del server per assicurare "
+#~ "una connessione sicura."
+
+#~ msgid "Requires python-pyopenssl."
+#~ msgstr "Richiede python-pyopenssl."
+
+#~ msgid "Bonjour / Zeroconf"
+#~ msgstr "Bonjour/Zeroconf"
+
+#~ msgid "Serverless chatting with autodetected clients in a local network."
+#~ msgstr ""
+#~ "Sistema di chat senza server con i client rilevati automaticamente nella "
+#~ "rete locale."
+
+#~ msgid "Requires python-avahi."
+#~ msgstr "Richiede python-avahi."
+
+#~ msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#~ msgstr "Richiede pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+
+#~ msgid "gajim-remote"
+#~ msgstr "gajim-remote"
+
+#~ msgid "A script to controle gajim via commandline."
+#~ msgstr "Uno script per controllare gajim dalla riga di comando."
+
+#~ msgid "Requires python-dbus."
+#~ msgstr "Richiede python-dbus."
+
+#~ msgid "Feature not available under Windows."
+#~ msgstr "Caratteristica non disponibile sotto Windows."
+
+#~ msgid "OpenGPG"
+#~ msgstr "OpenGPG"
+
+#~ msgid "Encrypting chatmessages with gpg keys."
+#~ msgstr "Cifratura dei messaggi di chat con le chiavi gpg."
+
+#~ msgid "Requires gpg and python-GnuPGInterface."
+#~ msgstr "Richiede gpg e python-GnuPGInterface"
+
+#~ msgid "network-manager"
+#~ msgstr "Gestore connessione"
+
+#~ msgid "Autodetection of network status."
+#~ msgstr "Riconoscimento automatico dello stato della connessione."
+
+#~ msgid "Requires gnome-network-manager and python-dbus."
+#~ msgstr "Richiede gnome-network-manager e python-dbus."
+
+#~ msgid "Session Management"
+#~ msgstr "Gestore sessioni"
+
+#~ msgid "Gajim session is stored on logout and restored on login."
+#~ msgstr ""
+#~ "La sessione di Gajim viene salvata alla chiusura e ripristinata all'avvio."
+
+#~ msgid "Requires python-gnome2."
+#~ msgstr "Richiede python-gnome2."
+
+#~ msgid "gnome-keyring"
+#~ msgstr "Gestore portachiavi"
+
+#~ msgid "Passwords can be stored securely and not just in plaintext."
+#~ msgstr ""
+#~ "Le password possono essere salvate in modo sicuro e non in un semplice "
+#~ "file di testo."
+
+#~ msgid "Requires gnome-keyring and python-gnome2-desktop."
+#~ msgstr "Richiede gnome-keyring e python-gnome2-desktop."
+
+#~ msgid "SRV"
+#~ msgstr "SRV"
+
+#~ msgid "Ability to connect to servers which is using SRV records."
+#~ msgstr "Possibilità di connettersi ai server che usano record SRV."
+
+#~ msgid "Requires dnsutils."
+#~ msgstr "Richiede dnsutils."
+
+#~ msgid "Requires nslookup to use SRV records."
+#~ msgstr "Richiede nslookup per usare i record SRV."
+
+#~ msgid "Spell Checker"
+#~ msgstr "Correttore ortografico"
+
+#~ msgid "Spellchecking of composed messages."
+#~ msgstr "Correzione ortografica dei messaggi."
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compilation of gtkspell module from "
+#~ "Gajim sources."
+#~ msgstr ""
+#~ "Richiede python-gnome2-extras o la compilazione del modulo gtkspell dai "
+#~ "sorgenti di Gajim."
+
+#~ msgid "Notification-daemon"
+#~ msgstr "Demone delle notifiche"
+
+#~ msgid "Passive popups notifying for new events."
+#~ msgstr "Popup passivi che notificano nuovi eventi."
+
+#~ msgid ""
+#~ "Requires python-notify or instead python-dbus in conjunction with "
+#~ "notification-daemon."
+#~ msgstr "Richiede python-notify, oppure python-dbus e notification-daemon."
+
+#~ msgid "Trayicon"
+#~ msgstr "Icona nell'area di notifica"
+
+#~ msgid "A icon in systemtray reflecting the current presence."
+#~ msgstr "Un'icona nell'area di notifica che riflette lo stato attuale."
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compiled  trayicon module from Gajim "
+#~ "sources."
+#~ msgstr ""
+#~ "Richiede python-gnome2-extras oppure la compilazione del modulo trayicon "
+#~ "dai sorgenti di Gajim."
+
+#~ msgid "Requires PyGTK >= 2.10."
+#~ msgstr "Richiede PyGTK >= 2.10."
+
+#~ msgid "Idle"
+#~ msgstr "Inattivatore"
+
+#~ msgid "Ability to measure idle time, in order to set auto status."
+#~ msgstr ""
+#~ "Possibilità di misurare il tempo di inattività, per poter cambiare lo "
+#~ "stato automaticamente."
+
+#~ msgid "Requires compilation of the idle module from Gajim sources."
+#~ msgstr "Richiede la compilazione del modulo idle dai sorgenti di Gajim."
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#~ msgid "Transform LaTeX espressions between $$ $$."
+#~ msgstr "Trasforma le espressioni LaTeX comprese in $$ $$."
+
+#~ msgid ""
+#~ "Requires texlive-latex-base, dvips and imagemagick. You have to set "
+#~ "'use_latex' to True in the Advanced Configuration Editor."
+#~ msgstr ""
+#~ "Richiede texlive-latex-base, dvips e imagemagick. Devi impostare "
+#~ "'use_latex' su Attivato nell'Editor di configurazione avanzata."
+
+#~ msgid "End to end encryption"
+#~ msgstr "Attiva cifratura end-to-end"
+
+#~ msgid "Encrypting chatmessages."
+#~ msgstr "Cifratura dei messaggi di chat."
+
+#~ msgid "Requires python-crypto."
+#~ msgstr "Richiede python-crypto."
+
+#, fuzzy
+#~ msgid "RST Generator"
+#~ msgstr "Generatore RST"
+
+#~ msgid ""
+#~ "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+#~ "docs/ref/rst/restructuredtext.html)."
+#~ msgstr ""
+#~ "Genera output XHTML a partire da codice RST (vedi http://docutils."
+#~ "sourceforge.net/docs/ref/rst/restructuredtext.html)."
+
+#~ msgid "Requires python-docutils."
+#~ msgstr "Richiede python-docutils."
+
+#~ msgid "Feature"
+#~ msgstr "Funzione"
+
+#~ msgid "- messages will be logged"
+#~ msgstr "- i messaggi saranno registrati"
+
+#~ msgid "- messages will not be logged"
+#~ msgstr "- i messaggi non saranno registrati"
+
+#~ msgid "Verify the remote client's identity"
+#~ msgstr "Verifica l'identità del client remoto"
+
+#~ msgid ""
+#~ "You've begun an encrypted session with %s, but it can't be guaranteed "
+#~ "that you're talking directly to the person you think you are.\n"
+#~ "\n"
+#~ "You should speak with them directly (in person or on the phone) and "
+#~ "confirm that their Short Authentication String is identical to this one: %"
+#~ "s"
+#~ msgstr ""
+#~ "Hai iniziato una sessione cifrata con %s, ma non è possibile garantire "
+#~ "che stai parlando direttamente con la persona che pensi sia in realtà.\n"
+#~ "\n"
+#~ "Dovresti parlarci direttamente (di persona o al telefono) e confermare "
+#~ "che la sua stringa di autenticazione sia identica a questa: %s"
+
+#~ msgid "Waiting for results"
+#~ msgstr "Ricerca in corso"
+
+#~ msgid "Error in received dataform"
+#~ msgstr "Errore nella ricezione dei dati"
+
+#~ msgid "No result"
+#~ msgstr "Nessun risultato"
+
+#~ msgid "Error while adding service. %s"
+#~ msgstr "Errore durante la creazione del servizio. %s"
+
+#~ msgid "_Add Contact"
+#~ msgstr "_Aggiungi contatto"
+
+#~ msgid "<b>Interface Customization</b>"
+#~ msgstr "<b>Personalizzazione dell'interfaccia</b>"
+
+#~ msgid "Also known as iChat style"
+#~ msgstr "Conosciuto anche come stile iChat"
+
+#~ msgid "Chat"
+#~ msgstr "Chat"
+
+#~ msgid "E_very 5 minutes"
+#~ msgstr "_Ogni 5 minuti"
+
+#~ msgid ""
+#~ "Gajim will automatically show new events by popping up the relevant window"
+#~ msgstr ""
+#~ "Gajim mostrerà automaticamente i nuovi eventi sollevando la finestra "
+#~ "relativa"
+
+#~ msgid ""
+#~ "Gajim will notify you for new events via a popup in the bottom right of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Gajim notificherà i nuovi eventi tramite popup nell'angolo in fondo a "
+#~ "destra dello schermo"
+
+#~ msgid ""
+#~ "Gajim will notify you via a popup window in the bottom right of the "
+#~ "screen about contacts that just signed in"
+#~ msgstr ""
+#~ "Gajim notificherà tramite popup nell'angolo in fondo a destra dello "
+#~ "schermo quando un contatto si connette"
+
+#~ msgid ""
+#~ "Gajim will only change the icon of the contact that triggered the new "
+#~ "event"
+#~ msgstr ""
+#~ "Gajim cambierà solamente l'icona del contatto fonte del nuovo evento"
+
+#~ msgid ""
+#~ "If checked, Gajim will remember the roster and chat window positions in "
+#~ "the screen and the sizes of them next time you run it"
+#~ msgstr ""
+#~ "Se marcato, Gajim manterrà le posizioni delle finestre di chat e della "
+#~ "lista contatti sullo schermo la prossima volta che verrà eseguito"
+
+#~ msgid "On every _message"
+#~ msgstr "In tutti i _messaggi"
+
+#~ msgid "Outgoing Chat state noti_fications:"
+#~ msgstr "Noti_fiche dello stato di chat in uscita"
+
+#~ msgid "Print time:"
+#~ msgstr "Scrivi ora:"
+
+#~ msgid "Save _position and size for roster and chat windows"
+#~ msgstr ""
+#~ "Salva _posizione e dimensione delle finestre di chat e lista contatti"
+
+#~ msgid "Show only in _roster"
+#~ msgstr "Mostra solo nella lista _contatti"
+
+#~ msgid "Use t_rayicon (aka. notification area icon)"
+#~ msgstr "Usa _icona nell'area di notifica (vassoio di sistema)"
+
+#~ msgid ""
+#~ "When a new event (message, file transfer request etc..) is received, the "
+#~ "following methods may be used to inform you about it. Please note that "
+#~ "events about new messages only occur if it is a new message from a "
+#~ "contact you are not already chatting with"
+#~ msgstr ""
+#~ "Quando un nuovo evento (messaggio, richiesta di trasferimento file, "
+#~ "ecc...) viene ricevuto, i seguenti metodi possono venire usati per "
+#~ "informarti di ciò. Notare che gli eventi per i nuovi messaggi avverranno "
+#~ "solo se si tratta di un nuovo messaggio da un contatto con cui non si sta "
+#~ "già chattando"
+
+#~ msgid "_Never"
+#~ msgstr "_Mai"
+
+#~ msgid "_Notify me about it"
+#~ msgstr "_Notifica"
+
+#~ msgid "_Pop it up"
+#~ msgstr "_Mostra"
+
+#~ msgid "Add _Contact"
+#~ msgstr "Aggiungi _contatto"
+
+#~ msgid "_Send Single Message"
+#~ msgstr "_Invia messaggio singolo"
+
+#~ msgid "_Filter:"
+#~ msgstr "_Filtro:"
+
+#~ msgid "Every %s _minutes"
+#~ msgstr "Ogni %s _minuti"
+
+#~ msgid "_Discover Services..."
+#~ msgstr "_Ricerca servizi..."
+
+#~ msgid "_Retype Password:"
+#~ msgstr "_Ripetere password:"
+
+#~ msgid "_Use proxy"
+#~ msgstr "_Usa proxy"
+
+#~ msgid "Accounts"
+#~ msgstr "Account"
+
+#~ msgid ""
+#~ "If checked, all local contacts that use a Bonjour compatible chat client "
+#~ "(like iChat, Trillian or Gaim) will be shown in roster. You don't need to "
+#~ "be connected to a jabber server for it to work.\n"
+#~ "This is only available if python-avahi is installed and avahi-daemon is "
+#~ "running."
+#~ msgstr ""
+#~ "Se selezionato, tutti i contatti locali che usano un client chat "
+#~ "compatibile con Bonjour (es. IChat, Trillian or Gaim) saranno visibili "
+#~ "nella lista contatti. Non è necessario essere connesso a un server jabber "
+#~ "affinché funzioni.\n"
+#~ "Questo è possibile solo se python-avahi è installato e  avahi-daemon è in "
+#~ "esecuzione."
+
+#~ msgid ""
+#~ "If you have 2 or more accounts and this is checked, Gajim will list all "
+#~ "contacts as if you had one account"
+#~ msgstr ""
+#~ "Se marcato e se sono presenti 2 o più account, Gajim mostrerà tutti i "
+#~ "contatti come se ci fosse un unico account"
+
+#~ msgid "_Enable link-local messaging"
+#~ msgstr "_Abilita la messaggistica sulla rete locale"
+
+#~ msgid "_Modify"
+#~ msgstr "_Modifica"
+
+#~ msgid "2003-12-13T18:30:02Z"
+#~ msgstr "2003-12-13T18:30:02Z"
+
+#~ msgid "<small>Romeo and Juliet</small>"
+#~ msgstr "<small>Romeo e Giulietta</small>"
+
+#~ msgid "Old stories"
+#~ msgstr "Vecchie storie"
+
+#~ msgid "Soliloquy"
+#~ msgstr "Soliloquio"
+
+#~ msgid "_Compact View    Alt+C"
+#~ msgstr "_Vista compatta    Alt+C"
+
+#~ msgid "_Remove from Roster"
+#~ msgstr "_Elimina dai contatti"
+
+#~ msgid ""
+#~ "If that is not your language for which you want to highlight misspelled "
+#~ "words, then please set your $LANG as appropriate. Eg. for French do "
+#~ "export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to "
+#~ "make it global in /etc/profile.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Se questa non è la lingua per cui si vogliono evidenziare le parole "
+#~ "scorrette, impostare $LANG in maniera appropriata. Per esempio, per "
+#~ "l'italiano eseguire \"export LANG=it_IT\" o \"export LANG=it_IT.UTF-8\" "
+#~ "in ~/.bash_profile o, per rendere la modifica globale, in /etc/profile.\n"
+#~ "\n"
+#~ "Non verrà usata la caratteristica di evidenziatura parole scorrette"
+
+#~ msgid "You must enter a password for the new account."
+#~ msgstr "È necessario inserire una password per il nuovo account."
+
+#~ msgid "Private Chat"
+#~ msgstr "Chat privata"
+
+#~ msgid "Group Chat"
+#~ msgstr "Chat di gruppo"
+
+#~ msgid "Drop %s in group %s"
+#~ msgstr "Sposta %s nel gruppo %s"
+
+#~ msgid "Make %s and %s metacontacts"
+#~ msgstr "Rendi %s e %s metacontatti"
+
+#~ msgid "Hides the buttons in two persons chat window."
+#~ msgstr "Nasconde i pulsanti nella finestra di chat a due persone"
+
+#~ msgid "Security error connecting to \"%s\""
+#~ msgstr "Errore di sicurezza nella connessione a \"%s\""
+
+#~ msgid ""
+#~ "The server's key has changed, or someone is trying to hack your "
+#~ "connection."
+#~ msgstr ""
+#~ "La chiave del server è cambiata, o qualcuno sta cercando di intromettersi "
+#~ "nella connessione."
+
+#~ msgid "Unable to check fingerprint for %s. Connection could be insecure."
+#~ msgstr ""
+#~ "Non è possibile verificare l'impronta digitale di %s. La connessione "
+#~ "potrebbe non essere sicura."
+
+#~ msgid "Missing fingerprint in SSL connection to %s"
+#~ msgstr "Impronta digitale mancante nella connessione SSL a %s"
+
+#~ msgid "Fingerprint mismatch for %s: Got %s, expected %s"
+#~ msgstr "Impronta digitale non corrispondente per %s: ottenuto %s, atteso %s"
+
+#~ msgid "invisible"
+#~ msgstr "invisibile"
+
+#~ msgid "offline"
+#~ msgstr "offline"
+
+#~ msgid "I'm %s"
+#~ msgstr "Sono %s"
+
+#~ msgid " %d unread single message"
+#~ msgid_plural " %d unread single messages"
+#~ msgstr[0] "Gajim - %d messaggio singolo non letto"
+#~ msgstr[1] "Gajim - %d messaggi singoli non letti"
+
+#~ msgid " %d unread group chat message"
+#~ msgid_plural " %d unread group chat messages"
+#~ msgstr[0] "Gajim - %d messaggio in chat di gruppo non letto"
+#~ msgstr[1] "Gajim - %d messaggi in chat di gruppo non letti"
+
+#~ msgid " %d unread private message"
+#~ msgid_plural " %d unread private messages"
+#~ msgstr[0] "Gajim - %d messaggio privato non letto"
+#~ msgstr[1] "Gajim - %d messaggi privati non letti"
+
+#~ msgid "gtk+"
+#~ msgstr "gtk+"
 
 #~ msgid "A_fter nickname:"
 #~ msgstr "_Dopo il nickname:"
@@ -6917,9 +7961,6 @@ msgstr "Errore durante la creazione del servizio. %s"
 #~ msgid "Role: "
 #~ msgstr "Ruolo: "
 
-#~ msgid "Affiliation: "
-#~ msgstr "Affiliazione: "
-
 #~ msgid ""
 #~ "Sound to play when any MUC message arrives. (This setting is taken into "
 #~ "account only if notify_on_all_muc_messages is True)"
@@ -6976,10 +8017,6 @@ msgstr "Errore durante la creazione del servizio. %s"
 #~ msgid "_Join New Room..."
 #~ msgstr "_Entra in nuova stanza..."
 
-#~ msgid "Usage: /%s, sets the groupchat window to compact mode."
-#~ msgstr ""
-#~ "Uso: /%s, imposta la modalità compatta nella finestra chat di gruppo"
-
 #~ msgid "Delete Message of the Day"
 #~ msgstr "Elimina messaggio del giorno"
 
@@ -6995,9 +8032,6 @@ msgstr "Errore durante la creazione del servizio. %s"
 #~ msgid "_XML Console..."
 #~ msgstr "Console _XML..."
 
-#~ msgid "Choose Avatar"
-#~ msgstr "Scegli avatar"
-
 #~ msgid "Use compact view when you open a chat window"
 #~ msgstr "Usa vista compatta quando si apre una finestra di chat"
 
@@ -7061,18 +8095,12 @@ msgstr "Errore durante la creazione del servizio. %s"
 #~ "Leggere il file AUTHORS per la lista completa, comprendente anche gli "
 #~ "sviluppatori non più attivi"
 
-#~ msgid "From %s"
-#~ msgstr "Da %s"
-
 #~ msgid "To %s"
 #~ msgstr "A %s"
 
 #~ msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 #~ msgstr "Sei stato invitato nella stanza %(room_jid)s da %(contact_jid)s"
 
-#~ msgid "Browsing %s"
-#~ msgstr "Consultazione %s"
-
 #~ msgid ""
 #~ "Animated\n"
 #~ "Static"
@@ -7145,9 +8173,6 @@ msgstr "Errore durante la creazione del servizio. %s"
 #~ "installato pysqlite3, per migrare i log al nuovo database, leggere: "
 #~ "http://trac.gajim.org/wiki/MigrateLogToDot9DB Uscita..."
 
-#~ msgid "Image is too big"
-#~ msgstr "L'immagine è troppo grande"
-
 #~ msgid ""
 #~ "Image for emoticon has to be less than or equal to 24 pixels in width and "
 #~ "24 in height."
@@ -7269,15 +8294,9 @@ msgstr "Errore durante la creazione del servizio. %s"
 #~ msgid "Allow controlling Gajim via D-Bus service."
 #~ msgstr "Permettere il controllo di Gajim attraverso il servizio D-Bus."
 
-#~ msgid "Error:"
-#~ msgstr "Errore:"
-
 #~ msgid "Service"
 #~ msgstr "Servizio"
 
-#~ msgid "Node"
-#~ msgstr "Nodo"
-
 #~ 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 "
@@ -7358,9 +8377,6 @@ msgstr "Errore durante la creazione del servizio. %s"
 #~ "possibile cambiare modalità premendo Alt-C. NOTA: L'ultimo stato in cui "
 #~ "viene lasciata una finestra/scheda non è permanente"
 
-#~ msgid "Join _Group Chat..."
-#~ msgstr "Entra in chat di _gruppo..."
-
 #~ msgid "Show roster window on Gajim startup"
 #~ msgstr "Mostra la finestra dei contatti all'avvio di Gajim"
 
diff --git a/po/lt.po b/po/lt.po
new file mode 100644
index 000000000..860a96392
--- /dev/null
+++ b/po/lt.po
@@ -0,0 +1,7655 @@
+# Lithuanian translations for Gajim - A Jabber Instant Messager package.
+# Copyright (C) 2006 THE Gajim - A Jabber Instant Messager'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the Gajim - A Jabber Instant Messager package.
+# Mantas Zimnickas <sirexas@yahoo.com>, 2007.
+#
+#: ../src/gajim-remote.py:212 ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:245 ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:252 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254 ../src/gajim-remote.py:255
+msgid ""
+msgstr ""
+"Project-Id-Version: Gajim - A Jabber Instant Messager 0.11.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-09-12 09:53+0200\n"
+"PO-Revision-Date: 2007-01-21 15:27+1100\n"
+"Last-Translator: Mantas Zimnickas <sirexas@yahoo.com>\n"
+"Language-Team: Lithuanian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "GTK+ Jabber klientas"
+
+#: ../data/gajim.desktop.in.in.h:2
+msgid "Gajim Instant Messenger"
+msgstr "Gajim Greitųjų žinučių programa"
+
+#: ../data/gajim.desktop.in.in.h:3
+msgid "Jabber IM Client"
+msgstr "Jabber IM Klientas"
+
+#: ../data/glade/account_context_menu.glade.h:1
+#: ../data/glade/roster_window.glade.h:8
+#, fuzzy
+msgid "Join _Group Chat..."
+msgstr "Prisijungti prie pokalbio grupėje"
+
+#: ../data/glade/account_context_menu.glade.h:2
+msgid "_Add Contact..."
+msgstr "_Įtraukti asmenį..."
+
+#: ../data/glade/account_context_menu.glade.h:3
+#: ../data/glade/roster_window.glade.h:15
+msgid "_Discover Services"
+msgstr "_Ieškoti Paslaugų"
+
+#: ../data/glade/account_context_menu.glade.h:4
+msgid "_Execute Command..."
+msgstr "_Vykdyti komandą..."
+
+#: ../data/glade/account_context_menu.glade.h:5
+#, fuzzy
+msgid "_Modify Account"
+msgstr "Keisti Prieigą"
+
+#: ../data/glade/account_context_menu.glade.h:6
+msgid "_Open Gmail Inbox"
+msgstr "_Atidaryti Gmail paštą"
+
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/roster_window.glade.h:22
+#, fuzzy
+msgid "_Start Chat..."
+msgstr "_Pradėti pokalbį"
+
+#: ../data/glade/account_context_menu.glade.h:8
+#: ../data/glade/zeroconf_context_menu.glade.h:2
+msgid "_Status"
+msgstr "_Būklė"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:1
+#, fuzzy
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Prieiga kuriama</b>\n"
+"\n"
+"Prašome palaukti..."
+
+#: ../data/glade/account_creation_wizard_window.glade.h:4
+msgid "<b>Please choose one of the options below:</b>"
+msgstr "<b>Prašome pasirinkti vieną iš variantų žemiau:</b>"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:5
+msgid "<b>Please fill in the data for your new account</b>"
+msgstr "<b>Prašome užpildyti naujos Jūsų prieigos duomenis</b>"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:6
+msgid "<b>Please select a server</b>"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+msgstr "Jabber serverių paslaugų sąrašas (tokių, kaip: MSN, ICQ pernašos)"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:8
+msgid "Connect when I press Finish"
+msgstr "Prisijungti, kai paspausiu Baigti"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:9
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Prieigos kūrimo vedlys"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:10
+#, fuzzy
+msgid "I already have an account I want to _use"
+msgstr "Jau turiu prieigą, kurią noriu naudoti"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:11
+msgid "I want to _register for a new account"
+msgstr "Noriu už_registruoti naują prieigą"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:22
+msgid "If checked, Gajim will remember the password for this account"
+msgstr "Jei pažymėta, Gajim prisimins šios prieigos slaptažodį"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:32
+msgid "Manage..."
+msgstr "Valdyti..."
+
+#: ../data/glade/account_creation_wizard_window.glade.h:14
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Proksis:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:48
+msgid "Save pass_word"
+msgstr "Išsaugoti _slaptažodį"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:16
+msgid "Servers Features"
+msgstr "Serverio teikiamos paslaugos"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:17
+msgid "Set my profile when I connect"
+msgstr "Nustatyti mano profilį, kai prisijungsiu"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:53
+msgid "Use custom hostname/port"
+msgstr "Naudoti parinktą serverio adresą/prievadą"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:19
+msgid ""
+"You need to have an account in order to connect\n"
+"to the Jabber network."
+msgstr ""
+"Kad prisijungtumėte privalote turėti prieigą\n"
+"Jabber tinkle."
+
+#: ../data/glade/account_creation_wizard_window.glade.h:21
+msgid "Your JID:"
+msgstr "Jūsų JID:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:13
+msgid "_Advanced"
+msgstr "_Papildomas"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:23
+msgid "_Finish"
+msgstr "_Baigti"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:24
+#, fuzzy
+msgid "_Hostname:"
+msgstr "Serverio adresas: "
+
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_modification_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:58
+msgid "_Password:"
+msgstr "_Slaptažodis:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/manage_proxies_window.glade.h:11
+msgid "_Port:"
+msgstr "_Portas:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:27
+msgid "_Server:"
+msgstr "_Serveris:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/manage_proxies_window.glade.h:12
+msgid "_Username:"
+msgstr "_Naudotojo vardas:"
+
+#: ../data/glade/account_modification_window.glade.h:1
+#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/preferences_window.glade.h:8
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Įvairūs</b>"
+
+#: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:1
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
+
+#: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:2
+msgid "<b>Personal Information</b>"
+msgstr "<b>Asmeninė informacija</b>"
+
+#: ../data/glade/account_modification_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:4
+msgid "Account"
+msgstr "Prieiga"
+
+#: ../data/glade/account_modification_window.glade.h:5
+msgid "Account Modification"
+msgstr "Prieigos keitimas"
+
+#: ../data/glade/account_modification_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "Administration operations"
+msgstr "Administrator List"
+
+#: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:6
+msgid "Auto-reconnect when connection is lost"
+msgstr "Automatiškai bandyti prisijungti, kai prarandamas ryšys"
+
+#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/zeroconf_properties_window.glade.h:3
+msgid "C_onnect on Gajim startup"
+msgstr "_Prisijungti, kai Gajim pasileis"
+
+#: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:8
+msgid "Chan_ge Password"
+msgstr "_Keisti slaptažodį"
+
+#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:9
+msgid ""
+"Check this so Gajim will connect in port 5223 where legacy servers are "
+"expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
+"default if broadcasted by the server, and with this option enabled TLS will "
+"be disabled"
+msgstr ""
+"Jei pažymėsite, Gajim jungsis prie 5223 porto, kur tikimasi, kad serveriai "
+"turi SSL galimybes. Gajim, pagal nutylėjimą naudoja TLS šifravimą jei  "
+"serveris užklausia ir jei ši parinktis yra aktyvi, TLS bus deaktyvuotas"
+
+#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/zeroconf_properties_window.glade.h:4
+msgid "Choose _Key..."
+msgstr "Pasirinkite _Raktą..."
+
+#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:11
+msgid "Click to change account's password"
+msgstr "Spauskite, kad pakeisti prieigos slaptažodį"
+
+#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:12
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:13
+msgid "Connection"
+msgstr "Prisijungimas"
+
+#: ../data/glade/account_modification_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:15
+msgid "Edit Personal Information..."
+msgstr "Keisti asmeninę informaciją..."
+
+#. No configured account
+#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:6 ../src/notify.py:471
+#: ../src/notify.py:493 ../src/notify.py:505 ../src/common/helpers.py:964
+#: ../src/common/helpers.py:976
+msgid "Gajim"
+msgstr "Gajim"
+
+#. General group cannot be changed
+#: ../data/glade/account_modification_window.glade.h:17
+#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/zeroconf_properties_window.glade.h:7
+#: ../src/roster_window.py:359 ../src/roster_window.py:624
+#: ../src/roster_window.py:1360 ../src/roster_window.py:1728
+#: ../src/roster_window.py:2112 ../src/roster_window.py:2628
+#: ../src/roster_window.py:2746 ../src/common/contacts.py:309
+msgid "General"
+msgstr "Bendros parinktys"
+
+#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:20
+msgid "Hostname: "
+msgstr "Serverio adresas: "
+
+#: ../data/glade/account_modification_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:21
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Jei pažymėta, Gajim siųs užklausimą į kelis IP išskyrus Jūsų IP, tokiu būdu "
+"pagerės bylos siuntimas."
+
+#: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/accounts_window.glade.h:23
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Jei pažymėta, Gajim siuntinės „aš-gyvas“ paketus, kad nebūtų prarastas "
+"ryšys, dėl ko gali įvyksta savaiminiai atsijungimai"
+
+#: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/accounts_window.glade.h:24
+#: ../data/glade/zeroconf_properties_window.glade.h:8
+msgid ""
+"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+"permission only for you"
+msgstr ""
+"Jei pažymėta, Gajim saugos slaptažodį faile ~/.gajim/config su 'tik-"
+"skaitymui' teisėmis, tik Jums"
+
+#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/accounts_window.glade.h:25
+#: ../data/glade/zeroconf_properties_window.glade.h:9
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Jei pažymėta, po pasileidimo Gajim automatiškai jungsis prie jabber "
+"naudodamas šią prieigą"
+
+#: ../data/glade/account_modification_window.glade.h:24
+#: ../data/glade/accounts_window.glade.h:26
+#: ../data/glade/zeroconf_properties_window.glade.h:10
+msgid ""
+"If checked, any change to the global status (handled by the combobox at the "
+"bottom of the roster window) will change the status of this account "
+"accordingly"
+msgstr ""
+"Jei pažymėta, bet koks globalus būklės pakeitimas (įvykdytas iš sąrašo, "
+"pagrindinio lango apačioje) įtakos ir šios prieigos būklę accordingly"
+
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/accounts_window.glade.h:29
+msgid "Information about you, as stored in the server"
+msgstr "Informacija apie jus, kur yra išsaugota serveryje"
+
+#: ../data/glade/account_modification_window.glade.h:27
+#: ../data/glade/accounts_window.glade.h:34
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1524
+#: ../src/config.py:2010
+msgid "No key selected"
+msgstr "Raktas nepasirinktas"
+
+#. None means no proxy profile selected
+#. GPG Key
+#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:32 ../src/config.py:1110
+#: ../src/config.py:1181 ../src/config.py:1430 ../src/config.py:1435
+#: ../src/config.py:1906 ../src/config.py:1993 ../src/config.py:2009
+#: ../src/config.py:3109 ../src/config.py:3155 ../src/dialogs.py:286
+#: ../src/dialogs.py:288 ../src/roster_window.py:1832
+#: ../src/roster_window.py:1839 ../src/roster_window.py:1846
+msgid "None"
+msgstr "Joks"
+
+#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/accounts_window.glade.h:37
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/zeroconf_properties_window.glade.h:17
+msgid "Personal Information"
+msgstr "Asmeninė informacija"
+
+#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:38
+msgid "Port: "
+msgstr "Prievadas: "
+
+#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:39
+msgid "Priori_ty:"
+msgstr "_Prioritetas:"
+
+#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:40
+msgid ""
+"Priority is used in Jabber to determine who gets the events from the jabber "
+"server when two or more clients are connected using the same account; The "
+"client with the highest priority gets the events"
+msgstr ""
+"Prioritetas, Jabber'yje naudojamas, kad nustatyti, kas turi gauti pranešimus "
+"iš jabber serverio, kai du ar daugiau klientų yra prisijungę prie tos pačios "
+"prieigos; Klientas, turintis aukščiausią prioritetą gaus pranešimus"
+
+#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/accounts_window.glade.h:41
+msgid "Priority will change automatically according to your status."
+msgstr "Prioritetas keisis automatiškai, priklausomai nuo jūsų būklės."
+
+#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:42
+msgid "Proxy:"
+msgstr "Proksis:"
+
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/accounts_window.glade.h:44
+msgid "Resour_ce:"
+msgstr "Šal_tinis:"
+
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/accounts_window.glade.h:45
+msgid ""
+"Resource is sent to the Jabber server in order to separate the same JID in "
+"two or more parts depending on the number of the clients connected in the "
+"same server with the same account. So you might be connected in the same "
+"account with resource 'Home' and 'Work' at the same time. The resource which "
+"has the highest priority will get the events. (see below)"
+msgstr ""
+"Šaltinis siunčiamas į Jabber serverį, tam, kad būtų atskirti JID, kai yra "
+"prisijungę du ar daugiau klientų tuo pačiu metu, tame pačiame serveryje ir "
+"prie tos pačios prieigos. Jūs galite būti prisijungę prie tos pačios  "
+"prieigos su šaltiniu 'Namai' ir 'Darbas', tuo pačiu metu. Šaltinis, kuris "
+"turi didžiausią prioritetą gaus visus pranešimus. (žiūrėkite žemiau)"
+
+#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/accounts_window.glade.h:46
+#: ../data/glade/zeroconf_properties_window.glade.h:18
+msgid "Save _passphrase (insecure)"
+msgstr "Išsaugoti _slaptafrazę (nesaugu)"
+
+#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:47
+#: ../data/glade/zeroconf_properties_window.glade.h:19
+msgid "Save conversation _logs for all contacts"
+msgstr "Saugoti visų asmenų pokalbių žurnalus"
+
+#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:49
+msgid "Send keep-alive packets"
+msgstr "Siųsti „aš-gyvas“ paketus"
+
+#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:50
+#: ../data/glade/zeroconf_properties_window.glade.h:20
+msgid "Synch_ronize account status with global status"
+msgstr "Sinchronizuoti prieigos būklę su globalia būkle"
+
+#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:51
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "Rodyti _Atsijungusius Asmenis"
+
+#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/accounts_window.glade.h:52
+msgid "Use _SSL (legacy)"
+msgstr "Naudoti _SSL (legacy)"
+
+#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:55
+msgid "Use file transfer proxies"
+msgstr "Naudoti failų siuntimo proksius"
+
+#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:56
+msgid "_Adjust to status"
+msgstr "_Nustatyti būklei"
+
+#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
+
+#: ../data/glade/account_modification_window.glade.h:49
+msgid "_Name:"
+msgstr "_Pavadinimas:"
+
+#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "El. paštas:"
+
+#. XML Console enable checkbutton
+#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Įjungti"
+
+#: ../data/glade/accounts_window.glade.h:17
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+msgid "First Name:"
+msgstr "Vardas:"
+
+#: ../data/glade/accounts_window.glade.h:27
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+"Jei prievadas, pagal nutylėjimą, kuris naudojamas įeinančioms žinutėms "
+"neatitinka jūsų nustatymų, čia galite pasirinkti kitą.\n"
+"Turėtumėte pakeisti leistinus ugniasienės nustatymus."
+
+#: ../data/glade/accounts_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:453
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/glade/accounts_window.glade.h:31
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+msgid "Last Name:"
+msgstr "Pavardė:"
+
+#: ../data/glade/accounts_window.glade.h:33
+msgid "Mer_ge accounts"
+msgstr "Apjun_gti prieigas"
+
+#. Rename
+#: ../data/glade/accounts_window.glade.h:43 ../src/roster_window.py:2698
+msgid "Re_name"
+msgstr "Pe_rvadinti"
+
+#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+msgid "Use custom port:"
+msgstr "Use custom port:"
+
+#: ../data/glade/accounts_window.glade.h:59
+msgid "gtk-add"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:60
+msgid "gtk-close"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:61
+msgid "gtk-remove"
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:1
+msgid "A_ccount:"
+msgstr "_Prieiga:"
+
+#: ../data/glade/add_new_contact_window.glade.h:2
+msgid "A_llow this contact to view my status"
+msgstr "Leisti šiam asmeniui matyti mano būklę"
+
+#: ../data/glade/add_new_contact_window.glade.h:3
+msgid "Add New Contact"
+msgstr "Prijungti naują asmenį"
+
+#: ../data/glade/add_new_contact_window.glade.h:4
+msgid "I would like to add you to my contact list."
+msgstr "Norėšiau jus įtraukti į savo kontaktų sąrašą."
+
+#: ../data/glade/add_new_contact_window.glade.h:5
+msgid ""
+"You have to register with this transport\n"
+"to be able to add a contact from this\n"
+"protocol. Click on register button to\n"
+"proceed."
+msgstr ""
+"Turite užsiregistruoti naudojant šią pernašą,\n"
+"tam, kad galėtumėtte prijungti asmenis iš šio\n"
+"protokolo. Jei norite tęsti, spustelkite ant mygtuko\n"
+"registruoti."
+
+#: ../data/glade/add_new_contact_window.glade.h:9
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+msgstr ""
+"Kad galėtumėte pridėti asmenį iš šio protokolo, turite\n"
+"būti prisijungęs prie perlaidos."
+
+#: ../data/glade/add_new_contact_window.glade.h:11
+msgid "_Group:"
+msgstr "_Grupė:"
+
+#: ../data/glade/add_new_contact_window.glade.h:12
+msgid "_Nickname:"
+msgstr "_Slapyvardis:"
+
+#: ../data/glade/add_new_contact_window.glade.h:13
+msgid "_Protocol:"
+msgstr "_Protokolas:"
+
+#: ../data/glade/add_new_contact_window.glade.h:14
+msgid "_Register"
+msgstr "_Registracija"
+
+#: ../data/glade/add_new_contact_window.glade.h:15
+msgid "_User ID:"
+msgstr "_Naudotojo ID:"
+
+#: ../data/glade/adhoc_commands_window.glade.h:1
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Įvyko klaida:</b>"
+
+#: ../data/glade/adhoc_commands_window.glade.h:2
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Pasirinktie komandą vykdymui:</b>"
+
+#: ../data/glade/adhoc_commands_window.glade.h:3
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc Komandos - Gajim"
+
+#: ../data/glade/adhoc_commands_window.glade.h:4
+msgid "Check once more"
+msgstr "Patikrinti dar kartą"
+
+#: ../data/glade/adhoc_commands_window.glade.h:5
+msgid "Error description..."
+msgstr "Klaidos aprašymas..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:6
+msgid "Please wait while retrieving command list..."
+msgstr "Prašome luktelti, kol atsisiųs komandų sąrašas..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:7
+msgid "Please wait while the command is sending..."
+msgstr "Prašome luktelti, kol siunčiama komanda..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:8
+msgid "Please wait..."
+msgstr "Prašome palaukti..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:9
+msgid "This jabber entity does not expose any commands."
+msgstr "Ši jabber esybė nepateikė jokių komando."
+
+#: ../data/glade/advanced_configuration_window.glade.h:1
+msgid "<b>Description</b>"
+msgstr "<b>Aprašymas</b>"
+
+#: ../data/glade/advanced_configuration_window.glade.h:2
+msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+msgstr ""
+"<b>PASTABA:</b> Kad įsigaliotų tam tikri nustatymai turite perkrauti Gajim"
+
+#: ../data/glade/advanced_configuration_window.glade.h:3
+msgid "Advanced Configuration Editor"
+msgstr "Išplėstinis konfigūracijos redaktorius"
+
+#: ../data/glade/advanced_configuration_window.glade.h:4
+msgid "Filter:"
+msgstr "Filtras:"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:1
+msgid "Delete MOTD"
+msgstr "Trinti MOTD"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:2
+msgid "Deletes Message of the Day"
+msgstr "Ištrins dienos žinutę"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#, fuzzy
+msgid "Edit _Privacy Lists..."
+msgstr "_Privatūs sąrašai"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:4
+msgid "Sends a message to users currently connected to this server"
+msgstr "Bus išsiųstos žinutės naudotojams, prisijungusiems prie šio serverio"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#, fuzzy
+msgid "Set MOTD..."
+msgstr "Nustatyti MOTD"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:6
+msgid "Sets Message of the Day"
+msgstr "Nustatyti dienos žinutę"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:7
+msgid "Show _XML Console"
+msgstr "Rodyti _XML konsolę"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#, fuzzy
+msgid "Update MOTD..."
+msgstr "Atnaujinti MOTD"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:9
+msgid "Updates Message of the Day"
+msgstr "Atnaujinti dienos žinutę"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:10
+msgid "_Administrator"
+msgstr "_Administratorius"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:11
+#, fuzzy
+msgid "_Send Server Message..."
+msgstr "_Siųsti žinutę serveriui"
+
+#: ../data/glade/advanced_notifications_window.glade.h:1
+msgid " a window/tab opened with that contact "
+msgstr " atidarytas langas/žymė su šiuo asmeniu "
+
+#: ../data/glade/advanced_notifications_window.glade.h:2
+msgid "<b>Actions</b>"
+msgstr "<b>Veiksmai</b>"
+
+#: ../data/glade/advanced_notifications_window.glade.h:3
+msgid "<b>Conditions</b>"
+msgstr "<b>Sąlygos</b>"
+
+#: ../data/glade/advanced_notifications_window.glade.h:4
+#: ../data/glade/preferences_window.glade.h:12
+msgid "<b>Sounds</b>"
+msgstr "<b>Garsai</b>"
+
+#: ../data/glade/advanced_notifications_window.glade.h:5
+msgid "Advanced Actions"
+msgstr "Išplėstiniai veiksmai"
+
+#: ../data/glade/advanced_notifications_window.glade.h:6
+msgid "Advanced Notifications Control"
+msgstr "Išplėstinis pranešimų valdymas"
+
+#: ../data/glade/advanced_notifications_window.glade.h:7
+msgid "All statuses"
+msgstr "Visos būklės"
+
+#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../src/common/commands.py:91 ../src/common/helpers.py:246
+msgid "Away"
+msgstr "Manęs nėra"
+
+#: ../data/glade/advanced_notifications_window.glade.h:9
+msgid "Busy "
+msgstr "Užsiėmęs "
+
+#: ../data/glade/advanced_notifications_window.glade.h:10
+msgid "Don't have "
+msgstr "Neturiu "
+
+#: ../data/glade/advanced_notifications_window.glade.h:11
+msgid "Have "
+msgstr "Turiu "
+
+#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../src/common/helpers.py:256
+msgid "Invisible"
+msgstr "Nematomas"
+
+#: ../data/glade/advanced_notifications_window.glade.h:13
+msgid "Launch a command"
+msgstr "Paleisti komandą"
+
+#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../src/common/helpers.py:229
+msgid "Not Available"
+msgstr "Esu išėjęs"
+
+#: ../data/glade/advanced_notifications_window.glade.h:15
+msgid "One or more special statuses..."
+msgstr "Viena ar daugiau specialių būklių..."
+
+#: ../data/glade/advanced_notifications_window.glade.h:16
+msgid "Online / Free For Chat"
+msgstr "Prisijungęs / Laisvas susirašinėti"
+
+#: ../data/glade/advanced_notifications_window.glade.h:17
+msgid "Play a sound"
+msgstr "Groti garsą"
+
+#: ../data/glade/advanced_notifications_window.glade.h:18
+msgid ""
+"Receive a Message\n"
+"Contact Disconnected \n"
+"Contact Change Status \n"
+"Group Chat Message Highlight \n"
+"Group Chat Message Received \n"
+"File Transfer Request \n"
+"File Transfer Started \n"
+"File Transfer Finished"
+msgstr ""
+"Atsiųsti žinutę\n"
+"Asmuo atsijungė \n"
+"Asmuo pakeitė būklę \n"
+"Paryškinta žinutė grupės pokalbyje \n"
+"Gauta žinutė grupės pokalbyje \n"
+"Failo atsisiuntimo užklausimas \n"
+"Failo siuntimas pradėtas \n"
+"Failo siuntimas baigtas"
+
+#: ../data/glade/advanced_notifications_window.glade.h:26
+msgid "When "
+msgstr "Kai "
+
+#: ../data/glade/advanced_notifications_window.glade.h:27
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+msgstr ""
+"_Aktyvuoti langų tvarkyklės UrgencyHint, kad pokalbio langas mirksėtų "
+"užduočių juostoje"
+
+#: ../data/glade/advanced_notifications_window.glade.h:28
+msgid "_Disable auto opening chat window"
+msgstr "_Padaryti, kad pokalbių langas automatiškai neiššoktu"
+
+#: ../data/glade/advanced_notifications_window.glade.h:29
+msgid "_Disable existing popup window"
+msgstr "_Uždrausti esančius iššokstančius (pop-up) langus"
+
+#: ../data/glade/advanced_notifications_window.glade.h:30
+msgid "_Disable existing sound for this event"
+msgstr "_Uždrausti esmą garsą šiam įvykiui"
+
+#: ../data/glade/advanced_notifications_window.glade.h:31
+msgid "_Disable showing event in roster"
+msgstr "_Uždrausti įvykių rodyma kantaktų sąraše"
+
+#: ../data/glade/advanced_notifications_window.glade.h:32
+msgid "_Disable showing event in systray"
+msgstr "_Uždrausti įvykių rodyma sistemos dėkle"
+
+#: ../data/glade/advanced_notifications_window.glade.h:33
+msgid "_Inform me with a popup window"
+msgstr "_Informuok mane su iššokstančiu langu"
+
+#: ../data/glade/advanced_notifications_window.glade.h:34
+msgid "_Open chat window with user"
+msgstr "_Atidaryti pokalbio langą su šiuo naudotoju"
+
+#: ../data/glade/advanced_notifications_window.glade.h:35
+msgid "_Show event in roster"
+msgstr "_Rodyti įvykį kontaktų sąraše"
+
+#: ../data/glade/advanced_notifications_window.glade.h:36
+msgid "_Show event in systray"
+msgstr "_Rodyti įvykį sistemos dėkle"
+
+#: ../data/glade/advanced_notifications_window.glade.h:37
+msgid "and I "
+msgstr "ir aš "
+
+#: ../data/glade/advanced_notifications_window.glade.h:38
+msgid ""
+"contact(s)\n"
+"group(s)\n"
+"everybody"
+msgstr ""
+"asmuo(nys)\n"
+"grupė(s)\n"
+"visi"
+
+#: ../data/glade/advanced_notifications_window.glade.h:41
+msgid "for "
+msgstr "dėl "
+
+#: ../data/glade/advanced_notifications_window.glade.h:42
+msgid "when I'm in"
+msgstr "kai būsiu"
+
+#: ../data/glade/atom_entry_window.glade.h:1
+msgid "Entry:"
+msgstr "Įrašas:"
+
+#: ../data/glade/atom_entry_window.glade.h:2
+msgid "Feed name:"
+msgstr "Kanalo pavadinimas:"
+
+#: ../data/glade/atom_entry_window.glade.h:3
+msgid "Last modified:"
+msgstr "Paskutinį kartą keista:"
+
+#: ../data/glade/atom_entry_window.glade.h:4
+msgid "New entry received"
+msgstr "Gautas naujas įrašas"
+
+#: ../data/glade/atom_entry_window.glade.h:5
+msgid "You have received new entry:"
+msgstr "Jūs gavote naują įrašą:"
+
+#: ../data/glade/change_password_dialog.glade.h:1
+msgid "Change Password"
+msgstr "Keisti slaptažodį"
+
+#: ../data/glade/change_password_dialog.glade.h:2
+msgid "Enter it again for confirmation:"
+msgstr "Įveskite jį dar kartą, dėl patvirtinimo:"
+
+#: ../data/glade/change_password_dialog.glade.h:3
+msgid "Enter new password:"
+msgstr "Įveskite naują slaptažodį:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:1
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Įveskite naują būklės žinutę</b>"
+
+#: ../data/glade/change_status_message_dialog.glade.h:2
+msgid "Preset messages:"
+msgstr "Nustatytos žinutės:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:3
+msgid "Save as Preset..."
+msgstr "Išsaugoti kaip nustatytą..."
+
+#: ../data/glade/chat_context_menu.glade.h:1
+msgid "Join _Group Chat"
+msgstr "Prisijungti prie pokalbio grupėje"
+
+#: ../data/glade/chat_context_menu.glade.h:2
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+#, fuzzy
+msgid "_Add to Roster..."
+msgstr "Įtr_aukti į kontaktų sąrašą"
+
+#: ../data/glade/chat_context_menu.glade.h:3
+msgid "_Copy JID/Email Address"
+msgstr "_Kopijuoti JID/El. pašto adresą"
+
+#: ../data/glade/chat_context_menu.glade.h:4
+msgid "_Copy Link Location"
+msgstr "_Kopijuoti nuorodos adresą"
+
+#: ../data/glade/chat_context_menu.glade.h:5
+msgid "_Open Email Composer"
+msgstr "_Atidaryti el. pašto programą"
+
+#: ../data/glade/chat_context_menu.glade.h:6
+msgid "_Open Link in Browser"
+msgstr "_Atverti nuorodą naršyklėje"
+
+#: ../data/glade/chat_context_menu.glade.h:7
+#: ../data/glade/subscription_request_popup_menu.glade.h:1
+#: ../data/glade/systray_context_menu.glade.h:7
+msgid "_Start Chat"
+msgstr "_Pradėti pokalbį"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:1
+msgid "Click to see past conversations with this contact"
+msgstr "Spauskite, kad pamatytumėte buvusius pokalbius su šiuo asmeniu"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:2
+msgid "Invite _Friends"
+msgstr ""
+
+#: ../data/glade/chat_control_popup_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:3
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
+msgid "Send _File"
+msgstr "Siųsti _Failą"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:4
+#, fuzzy
+msgid "Toggle End to End Encryption"
+msgstr "Įjungti Open_PGP kodavimą"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:5
+msgid "Toggle Open_PGP Encryption"
+msgstr "Įjungti Open_PGP kodavimą"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "Įtr_aukti į kontaktų sąrašą"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:7
+#: ../data/glade/gc_control_popup_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:2567
+msgid "_History"
+msgstr "_Istorija"
+
+#: ../data/glade/data_form_window.glade.h:1
+msgid "Fill in the form."
+msgstr "Užpildykite formą."
+
+#: ../data/glade/data_form_window.glade.h:2
+msgid "Room Configuration"
+msgstr "Kambario nustatymai"
+
+#: ../data/glade/edit_groups_dialog.glade.h:1
+msgid "Edit Groups"
+msgstr "Keisti grupę"
+
+#: ../data/glade/filetransfers.glade.h:1
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Sąrašas aktyvių, baigtų ar sustabdytų failų siuntimų"
+
+#: ../data/glade/filetransfers.glade.h:2
+msgid "Cancel file transfer"
+msgstr "Atšaukti failo siuntimą"
+
+#: ../data/glade/filetransfers.glade.h:3
+msgid "Cancels the selected file transfer"
+msgstr "Atšaukti pažymėtų failų siuntimą"
+
+#: ../data/glade/filetransfers.glade.h:4
+msgid "Cancels the selected file transfer and removes incomplete file"
+msgstr "Atšaukti pažymėtų failų siuntimą ir ištrinti nepilnus failus"
+
+#: ../data/glade/filetransfers.glade.h:5
+msgid "Clean _up"
+msgstr "_Išvalyti"
+
+#: ../data/glade/filetransfers.glade.h:6
+msgid "File Transfers"
+msgstr "Failų siuntimai"
+
+#: ../data/glade/filetransfers.glade.h:7
+msgid "Hides the window"
+msgstr "Slėpti langą"
+
+#: ../data/glade/filetransfers.glade.h:8
+msgid "Remove file transfer from the list."
+msgstr "Pašalinti failo siuntimą iš sąrašo."
+
+#: ../data/glade/filetransfers.glade.h:9
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr "Pašalinti užbaigtus, atšauktus ir lūžusius failų siuntimus iš sąrašo"
+
+#: ../data/glade/filetransfers.glade.h:10
+msgid "Shows a list of file transfers between you and others"
+msgstr "Rodyti failų siuntimų sąrašą tarp jūsų ir kitų"
+
+#: ../data/glade/filetransfers.glade.h:11
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
+msgstr ""
+"Šis veiksmas pašalins vieną failo siuntimą iš sąrašo. Jei failo siuntimas "
+"yra aktyvus, jis iš pradžių bus sustabdytas ir tada ištrintas"
+
+#: ../data/glade/filetransfers.glade.h:12
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Rodyti pranešimą iššokstančiame lange, kai failo siuntimas baigsis  "
+
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:774
+msgid "_Continue"
+msgstr "_Tęsti"
+
+#: ../data/glade/filetransfers.glade.h:14
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Pranešti, kai failo siuntimas bus baigtas"
+
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:186
+msgid "_Open Containing Folder"
+msgstr "_Atidaryti katalogą, kuriame yra failas"
+
+#: ../data/glade/filetransfers.glade.h:16
+msgid "_Pause"
+msgstr "_Pauzė"
+
+#: ../data/glade/filetransfers.glade.h:17
+msgid "file transfers list"
+msgstr "failų siuntimų sąrašas"
+
+#: ../data/glade/gajim_themes_window.glade.h:1
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Pokalbių būklės žymių spalvos</b>"
+
+#: ../data/glade/gajim_themes_window.glade.h:2
+msgid ""
+"Account row\n"
+"Group row\n"
+"Contact row\n"
+"Chat Banner"
+msgstr ""
+"Prieigos eilutė\n"
+"Grupės eilutė\n"
+"Asmens eilutė\n"
+"Pokalbio paveiksliukas"
+
+#: ../data/glade/gajim_themes_window.glade.h:6
+msgid "Bold"
+msgstr "Paryškintas"
+
+#: ../data/glade/gajim_themes_window.glade.h:7
+msgid "Composing"
+msgstr "Kuriama"
+
+#: ../data/glade/gajim_themes_window.glade.h:8
+msgid "Font style:"
+msgstr "Šrifto stilius:"
+
+#: ../data/glade/gajim_themes_window.glade.h:9
+msgid "Gajim Themes Customization"
+msgstr "Gajim temų keitimas"
+
+#: ../data/glade/gajim_themes_window.glade.h:10
+msgid "Gone"
+msgstr "Dingo"
+
+#: ../data/glade/gajim_themes_window.glade.h:11
+msgid "Inactive"
+msgstr "Neaktyvus"
+
+#: ../data/glade/gajim_themes_window.glade.h:12
+msgid "Italic"
+msgstr "Pasviręs"
+
+#: ../data/glade/gajim_themes_window.glade.h:13
+msgid ""
+"MUC\n"
+"Messages"
+msgstr ""
+"MUC\n"
+"Žinutės"
+
+#: ../data/glade/gajim_themes_window.glade.h:15
+msgid ""
+"MUC Directed\n"
+"Messages"
+msgstr ""
+"MUC skirtos\n"
+"Žinutės"
+
+#: ../data/glade/gajim_themes_window.glade.h:17
+msgid "Paused"
+msgstr "sustabdytas"
+
+#: ../data/glade/gajim_themes_window.glade.h:18
+msgid "Text _color:"
+msgstr "Teksto _spalva:"
+
+#: ../data/glade/gajim_themes_window.glade.h:19
+msgid "Text _font:"
+msgstr "Teksto šri_ftas:"
+
+#: ../data/glade/gajim_themes_window.glade.h:20
+msgid "_Background:"
+msgstr "_Fonas:"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:1
+#, fuzzy
+msgid "Change _Nickname..."
+msgstr "Keisti _slapyvardį"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:2
+#, fuzzy
+msgid "Change _Subject..."
+msgstr "Keisti _temą"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:3
+msgid "Click to see past conversation in this room"
+msgstr "Spauskite, kad pamatytumėte buvusius pokalbius šiame kambaryje"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:4
+#, fuzzy
+msgid "Configure _Room..."
+msgstr "Keisti kambario nustatymus"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:5
+#, fuzzy
+msgid "_Bookmark"
+msgstr "Žy_mėti šį kambarį"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+msgid "_Destroy Room"
+msgstr ""
+
+#: ../data/glade/gc_control_popup_menu.glade.h:8
+#, fuzzy
+msgid "_Manage Room"
+msgstr "Žymių valdymas"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:9
+msgid "_Minimize on close"
+msgstr ""
+
+#: ../data/glade/gc_occupants_menu.glade.h:1
+msgid "Mo_derator"
+msgstr "Mo_deratorius"
+
+#: ../data/glade/gc_occupants_menu.glade.h:2
+#, fuzzy
+msgid "Occupant Actions"
+msgstr "_Valdytojo Veiksmai"
+
+#: ../data/glade/gc_occupants_menu.glade.h:5
+msgid "_Admin"
+msgstr "_Adminas"
+
+#: ../data/glade/gc_occupants_menu.glade.h:6
+msgid "_Ban"
+msgstr "_Banas"
+
+#: ../data/glade/gc_occupants_menu.glade.h:8
+msgid "_Kick"
+msgstr "_Išspirti"
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
+msgid "_Member"
+msgstr "_Dalyvis"
+
+#: ../data/glade/gc_occupants_menu.glade.h:10
+msgid "_Owner"
+msgstr "_Savininkas"
+
+#: ../data/glade/gc_occupants_menu.glade.h:11
+msgid "_Send Private Message"
+msgstr "_Siųsti privačią žinutę"
+
+#: ../data/glade/gc_occupants_menu.glade.h:12
+msgid "_Voice"
+msgstr "_Balsas"
+
+#: ../data/glade/groups_post_window.glade.h:1
+msgid "Create new post"
+msgstr "Kurti naują pranešimą"
+
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:271
+msgid "From"
+msgstr "Nuo"
+
+#. holds subject
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:142
+#: ../src/history_manager.py:173
+msgid "Subject"
+msgstr "Tema"
+
+#: ../data/glade/history_manager.glade.h:1
+msgid ""
+"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
+"\n"
+"You can select logs from the left and/or search database from below.\n"
+"\n"
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
+msgstr ""
+"<big><b>Gajim istorijos žurnalų valdymas</b></big>\n"
+"\n"
+"Galite pasirinkti žurnalą kairėje ir/arba žemiau ieškoti duomenų bazę.\n"
+"\n"
+"<b>ĮSPĖJIMAS:</b>\n"
+"Jei planuojate daryti daug trynimų, įsitikinkite, kad Gajim yra išjungtas. "
+"Stengitės netrinti iš asmenų su kuriais dabar bendraujate."
+
+#: ../data/glade/history_manager.glade.h:7
+msgid "Delete"
+msgstr "Trinti"
+
+#: ../data/glade/history_manager.glade.h:8
+msgid "Export"
+msgstr "Eksportuoti"
+
+#: ../data/glade/history_manager.glade.h:9
+msgid "Gajim History Logs Manager"
+msgstr "Gajim Istorijos Žurnalų Valdymas"
+
+#: ../data/glade/history_manager.glade.h:10
+msgid "_Search Database"
+msgstr "_Paieška duomenų bazėje"
+
+#: ../data/glade/history_window.glade.h:1
+#, fuzzy
+msgid "<b>History Viewer</b>"
+msgstr "<b>Taisyklių sąrašas</b>"
+
+#: ../data/glade/history_window.glade.h:2
+#, fuzzy
+msgid "<b>JID Selection</b>"
+msgstr "<b>Aprašymas</b>"
+
+#: ../data/glade/history_window.glade.h:3
+msgid "Build custom query"
+msgstr "Kurti kitokią užklausą"
+
+#: ../data/glade/history_window.glade.h:4 ../src/history_window.py:199
+msgid "Conversation History"
+msgstr "Pokalbio istorija"
+
+#: ../data/glade/history_window.glade.h:5
+msgid ""
+"Enter a contact jid or MUC jid here to view its history.\n"
+"If a contact is connected you can even enter his nick name.\n"
+msgstr ""
+
+#: ../data/glade/history_window.glade.h:8
+msgid "Query Builder..."
+msgstr "Užklasų kūrimas..."
+
+#: ../data/glade/history_window.glade.h:9
+msgid "Search"
+msgstr "Ieškoti"
+
+#: ../data/glade/history_window.glade.h:10
+#: ../data/glade/zeroconf_information_window.glade.h:10
+msgid "_Log conversation history"
+msgstr "_Registruoti pokalbio istoriją"
+
+#: ../data/glade/history_window.glade.h:11 ../src/disco.py:1172
+msgid "_Search"
+msgstr "_Ieškoti"
+
+#: ../data/glade/invitation_received_dialog.glade.h:1
+msgid "Accept"
+msgstr "Priimti"
+
+#: ../data/glade/invitation_received_dialog.glade.h:2
+#: ../data/glade/privacy_list_window.glade.h:8
+msgid "Deny"
+msgstr "Atmesti"
+
+#: ../data/glade/invitation_received_dialog.glade.h:3
+msgid "Invitation Received"
+msgstr "Gautas pakvietimas"
+
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1265
+msgid "Join Group Chat"
+msgstr "Prisijungti prie pokalbio grupėje"
+
+#: ../data/glade/join_groupchat_window.glade.h:2
+msgid "Join this room automatically when I connect"
+msgstr "Prisijungti prie šio kambario automatiškai."
+
+#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:31
+msgid "Nickname:"
+msgstr "Slapyvardis:"
+
+#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/manage_bookmarks_window.glade.h:6
+msgid "Password:"
+msgstr "Slaptažodis:"
+
+#: ../data/glade/join_groupchat_window.glade.h:5
+msgid "Recently:"
+msgstr "Nesenai:"
+
+#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:8
+msgid "Room:"
+msgstr "Kambarys:"
+
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1160
+#: ../src/disco.py:1615
+msgid "_Join"
+msgstr "_Jungtis"
+
+#: ../data/glade/manage_accounts_window.glade.h:1
+msgid "Manage Accounts"
+msgstr "Prieigų valdymas"
+
+#: ../data/glade/manage_bookmarks_window.glade.h:1
+msgid "Auto join"
+msgstr "Automatinis prsijungimas"
+
+#: ../data/glade/manage_bookmarks_window.glade.h:2
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "Jei pažymėta, Gajim, startuodamas jungsis prie šio pokalbio grupėje"
+
+#: ../data/glade/manage_bookmarks_window.glade.h:3
+msgid "Manage Bookmarks"
+msgstr "Žymių valdymas"
+
+#: ../data/glade/manage_bookmarks_window.glade.h:4
+msgid "Minimize on Auto Join"
+msgstr ""
+
+#: ../data/glade/manage_bookmarks_window.glade.h:7
+msgid "Print status:"
+msgstr "Rodyti būklę:"
+
+#: ../data/glade/manage_bookmarks_window.glade.h:9
+msgid "Server:"
+msgstr "Serveris:"
+
+#: ../data/glade/manage_bookmarks_window.glade.h:10
+msgid "Title:"
+msgstr "Antraštė:"
+
+#: ../data/glade/manage_proxies_window.glade.h:1
+msgid "<b>Properties</b>"
+msgstr "<b>Savybės</b>"
+
+#: ../data/glade/manage_proxies_window.glade.h:2
+msgid "<b>Settings</b>"
+msgstr "<b>Nustatymai</b>"
+
+#: ../data/glade/manage_proxies_window.glade.h:3
+#, fuzzy
+msgid ""
+"HTTP Connect\n"
+"SOCKS5"
+msgstr "HTTP jungimąsis"
+
+#: ../data/glade/manage_proxies_window.glade.h:5
+msgid "Manage Proxy Profiles"
+msgstr "Proxi profilių valdymas"
+
+#: ../data/glade/manage_proxies_window.glade.h:6
+#: ../data/glade/profile_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:30
+msgid "Name:"
+msgstr "Pavadinimas:"
+
+#: ../data/glade/manage_proxies_window.glade.h:7
+msgid "Pass_word:"
+msgstr "_Slaptažodis:"
+
+#: ../data/glade/manage_proxies_window.glade.h:8
+msgid "Type:"
+msgstr "Tipas:"
+
+#: ../data/glade/manage_proxies_window.glade.h:9
+msgid "Use authentication"
+msgstr "Naudoti autentifikaciją"
+
+#: ../data/glade/manage_proxies_window.glade.h:10
+msgid "_Host:"
+msgstr "_Hostas:"
+
+#: ../data/glade/message_window.glade.h:1
+msgid "Click to insert an emoticon (Alt+M)"
+msgstr "Įterpti emocijų paveiksliuką (Alt+M)"
+
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1213
+msgid "OpenPGP Encryption"
+msgstr "OpenPGP Šifravimas"
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:4
+#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/subscription_request_window.glade.h:6
+msgid "_Actions"
+msgstr "_Veiksmai"
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:6
+#: ../data/glade/xml_console_window.glade.h:11
+#: ../src/filetransfers_window.py:243
+msgid "_Send"
+msgstr "_Siųsti"
+
+#: ../data/glade/passphrase_dialog.glade.h:1
+msgid "Passphrase"
+msgstr "Slapta frazė"
+
+#: ../data/glade/preferences_window.glade.h:1
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Išplėstinis konfigūracijos redaktorius</b>"
+
+#: ../data/glade/preferences_window.glade.h:2
+msgid "<b>Applications</b>"
+msgstr "<b>Programos</b>"
+
+#: ../data/glade/preferences_window.glade.h:3
+#, fuzzy
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Edit a rule</b>"
+
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:5
+msgid "<b>Custom</b>"
+msgstr "<b>Kitaip</b>"
+
+#: ../data/glade/preferences_window.glade.h:6
+msgid "<b>Format of a line</b>"
+msgstr "<b>Eilutės formatas</b>"
+
+#: ../data/glade/preferences_window.glade.h:7
+msgid "<b>GMail Options</b>"
+msgstr "<b>GMail nustatymai</b>"
+
+#: ../data/glade/preferences_window.glade.h:9
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Nustatytosios būklės žinutės</b>"
+
+#: ../data/glade/preferences_window.glade.h:10
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<i>Privatus Sąrašas</i>"
+
+#: ../data/glade/preferences_window.glade.h:11
+msgid "<b>Roster Appearance</b>"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:13
+#, fuzzy
+msgid "<b>Themes</b>"
+msgstr "<b>Savybės</b>"
+
+#: ../data/glade/preferences_window.glade.h:14
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Vizualinis informavimas</b>"
+
+#: ../data/glade/preferences_window.glade.h:15
+msgid "Advanced"
+msgstr "Išplėstinis"
+
+#: ../data/glade/preferences_window.glade.h:16
+msgid ""
+"All chat states\n"
+"Composing only\n"
+"Disabled"
+msgstr ""
+"Visos pokalbių būklės\n"
+"Tik rąšant\n"
+"Uždrausta"
+
+#: ../data/glade/preferences_window.glade.h:19
+msgid "Allow _OS information to be sent"
+msgstr "Leisti siųsti informaciją apie _OS"
+
+#: ../data/glade/preferences_window.glade.h:20
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr ""
+"Leisti pop-up/informavimą, kai esu _nuėjęs/nepasiekamas/užimtas/namatomas"
+
+#: ../data/glade/preferences_window.glade.h:21
+msgid "Always check to see if Gajim is the _default Jabber client on startup"
+msgstr "Startuojant visada tikrinti ar Gajim yra pagrindinis Jabber klientas"
+
+#: ../data/glade/preferences_window.glade.h:22
+msgid ""
+"An example: If you have enabled status message for away, Gajim won't ask you "
+"anymore for a status message when you change your status to away; it will "
+"use the default one set here"
+msgstr ""
+"Pavyzdys: Jei esate nustatęs žinutę būklei - nuėjęs, Gajim daugiau neklaus "
+"kokią žinutę naudoti, kai nustatoma būklė - nuėjęs; bus naudojama "
+"standartinė arba čia nustatyta žinutė"
+
+#: ../data/glade/preferences_window.glade.h:23
+msgid "Ask status message when I:"
+msgstr "Prašyti įvesti būklės žinutę, kai aš:"
+
+#: ../data/glade/preferences_window.glade.h:24
+msgid "Auto _away after:"
+msgstr "Automatiškai keisti būklė į nuėjęs, po:"
+
+#: ../data/glade/preferences_window.glade.h:25
+msgid "Auto _not available after:"
+msgstr "Automatiškai keisti būklę į nepasiekamas, po:"
+
+#: ../data/glade/preferences_window.glade.h:26
+msgid ""
+"Autodetect on every Gajim startup\n"
+"Always use GNOME default applications\n"
+"Always use KDE default applications\n"
+"Always use XFCE4 default applications\n"
+"Custom"
+msgstr ""
+"Automatiškai aptikti, startuojant Gajim\n"
+"Visada naudoti GNOME programas pagal nutylėjimą\n"
+"Visada naudoti KDĘ programas pagal nutylėjimą\n"
+"Visada naudoti XFCE4 programas pagal nutylėjimą\n"
+"Kita"
+
+#: ../data/glade/preferences_window.glade.h:31
+msgid ""
+"Check this option, only if someone you don't have in the roster spams/annoys "
+"you. Use with caution, because it blocks all messages from any contact that "
+"is not in the roster"
+msgstr ""
+"Pažymėkite šį laukelį, tik jei kas nors, kas nėra jūsų kantaktų sąraše rašo "
+"jums nepageidaujamas žinutes. Naudokite atsargiai, nes šis dalykas blokuos "
+"vias žinutes, siunčiamas iš žmonių, kurie nėra Jūsų kontaktų sąraše."
+
+#: ../data/glade/preferences_window.glade.h:32
+msgid "Configure color and font of the interface"
+msgstr "Nustatyti sąsajos spalvą ir šriftą"
+
+#: ../data/glade/preferences_window.glade.h:33
+msgid "Default Status Messages"
+msgstr "Būklės žinutė, pagal nutylėjimą"
+
+#: ../data/glade/preferences_window.glade.h:34
+msgid ""
+"Determined by sender\n"
+"Chat message\n"
+"Single message"
+msgstr ""
+"Aptinkamas pagal siuntėją\n"
+"Pokalbio žinutė\n"
+"Atskira žinutė"
+
+#: ../data/glade/preferences_window.glade.h:37
+msgid "Display _extra email details"
+msgstr "Rodyti papildomus _el. pašto duomenis"
+
+#: ../data/glade/preferences_window.glade.h:38
+msgid "Display a_vatars of contacts in roster"
+msgstr "Rodyti asmenų _paveiksliukus kontaktų sąraše"
+
+#: ../data/glade/preferences_window.glade.h:39
+msgid "Display status _messages of contacts in roster"
+msgstr "Rodyti asmenų _būklės žinutes kontaktų sąraše"
+
+#: ../data/glade/preferences_window.glade.h:40
+msgid "Emoticons:"
+msgstr "Rožiukai:"
+
+#: ../data/glade/preferences_window.glade.h:41
+msgid "Events"
+msgstr "Įvykiai"
+
+#: ../data/glade/preferences_window.glade.h:42
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"display in chat windows."
+msgstr ""
+"Gajim gali išsiųsti ir parsisiųsti meta-informaciją, susijusią su pokalbiu, "
+"kurį galite turėti su kokiu nors asmeniu. Čia jūs galite nurodyti kokią "
+"koduotę rodyti pokalbių languose."
+
+#: ../data/glade/preferences_window.glade.h:43
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"send to the other party."
+msgstr ""
+"Gajim gali išsiųsti ir parsisiųsti meta-informaciją, susijusią su pokalbiu, "
+"kurį galite turėti su kokiu nors asmeniu. Čia jūs galite nurodyti kokią "
+"koduotę išsiųsti kitai šaliai."
+
+#: ../data/glade/preferences_window.glade.h:44
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr ""
+"Gajim rodys pranešimus apie ką tik atsijungusius asmenis iššokančiame "
+"langelyje, dešiniajame apatiniame ekrano kampe"
+
+#: ../data/glade/preferences_window.glade.h:46
+#, fuzzy
+msgid "Hides buttons in chatwindows to "
+msgstr "Hides the buttons in group chat window."
+
+#: ../data/glade/preferences_window.glade.h:47
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+"Jei pažymėsite, Gajim taip pat įtrauks informaciją apie naujo laiško siuntėją"
+
+#: ../data/glade/preferences_window.glade.h:48
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Jei pažymėta, Gajim rodys asmens paveiksliuką kontaktų sąraše ir pokalbio "
+"lange"
+
+#: ../data/glade/preferences_window.glade.h:49
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+msgstr ""
+"Jei pažymėta, Gajim rodys žiničių būkles žemiau kontaktinio asmens vardo, "
+"kontaktų sąraše ir pokalbių grupėse"
+
+#: ../data/glade/preferences_window.glade.h:50
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Jei pažymėta, Gajim naudos specifinius protokolo būklės paveiksliukus. "
+"(pvz.: asmuo iš MSN protokolo turės atitinkamą MSN paveiksliuką būklei "
+"„prisijungęs“, „nuėjęs“, „užimtas“ atvaizduoti... )"
+
+#: ../data/glade/preferences_window.glade.h:51
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Jei neišjungtas, Gajim automatiškai pakeis tekstines šypsenėles tokias kaip "
+"':)', į atitinkamus animuotus arba statinius paveiksliukus „rožiukus“"
+
+#: ../data/glade/preferences_window.glade.h:52
+msgid "Ignore rich content in incoming messages"
+msgstr "Ignoruoti formatuotą turinį ateinančioms žinutėms"
+
+#: ../data/glade/preferences_window.glade.h:53
+msgid "Ma_nage..."
+msgstr "Val_dyti..."
+
+#: ../data/glade/preferences_window.glade.h:54
+msgid ""
+"Never\n"
+"Always\n"
+"Per account\n"
+"Per type"
+msgstr ""
+"Niekada\n"
+"Visada\n"
+"Kiekvienam asmeniui\n"
+"Kiekvienam tipui"
+
+#: ../data/glade/preferences_window.glade.h:58
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Pranešk man apie asmenius, kurie: "
+
+#: ../data/glade/preferences_window.glade.h:59
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Pranešk man apie asmenius, kurie: "
+
+#: ../data/glade/preferences_window.glade.h:60
+msgid "Notify on new _GMail email"
+msgstr "Pranešk apie naujus _GMail laiškus"
+
+#: ../data/glade/preferences_window.glade.h:61
+msgid "Play _sounds"
+msgstr "Groti _garsus"
+
+#: ../data/glade/preferences_window.glade.h:62
+msgid ""
+"Pop it up\n"
+"Notify me about it\n"
+"Show only in roster"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:65
+msgid "Preferences"
+msgstr "Parinktys"
+
+#: ../data/glade/preferences_window.glade.h:66
+#, fuzzy
+msgid "Privacy"
+msgstr "Privatus sąrašas"
+
+#: ../data/glade/preferences_window.glade.h:67
+msgid "Set status message to reflect currently playing _music track"
+msgstr "Nustatyti būklės žinutę, atspindinčią grojamą _muzikinį takelį"
+
+#: ../data/glade/preferences_window.glade.h:68
+msgid "Sign _in"
+msgstr "Pr_isijungti"
+
+#: ../data/glade/preferences_window.glade.h:69
+msgid "Sign _out"
+msgstr "_Atsijungti"
+
+#: ../data/glade/preferences_window.glade.h:70
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Kai kurios žinutės gali turėti formatuotą turinį (pastorinimai, spalvos ir "
+"pan.). Jei pažymėsite, Gajim rodys tiesiog tekstą, be jokių formatavimų."
+
+#: ../data/glade/preferences_window.glade.h:71
+msgid "Status"
+msgstr "Būklė"
+
+#: ../data/glade/preferences_window.glade.h:72
+#, fuzzy
+msgid "Status _iconset:"
+msgstr "Būklės p_iktogramų rinkinys, pagal nutylėjimą:"
+
+#: ../data/glade/preferences_window.glade.h:73
+msgid "T_heme:"
+msgstr "_Tema:"
+
+#: ../data/glade/preferences_window.glade.h:74
+msgid "The auto away status message"
+msgstr "Automatinio nuėjimo būklės pranešimas"
+
+#: ../data/glade/preferences_window.glade.h:75
+msgid "The auto not available status message"
+msgstr "Automatinio nebuvimo būklės žinutė"
+
+#: ../data/glade/preferences_window.glade.h:76
+msgid "Treat all incoming messages as:"
+msgstr "Laikyti visas įeinančias žinutes kaip:"
+
+#: ../data/glade/preferences_window.glade.h:77
+msgid "Use _transports iconsets"
+msgstr "Naudoti _pernašos paveiksliukus"
+
+#: ../data/glade/preferences_window.glade.h:78
+#, fuzzy
+msgid "Use only one message _window:"
+msgstr "Vienas žinučių langas:"
+
+#: ../data/glade/preferences_window.glade.h:79
+msgid "Use system _default"
+msgstr "Naudoti sisteminius nustatymus"
+
+#: ../data/glade/preferences_window.glade.h:80
+#, fuzzy
+msgid "When new event is received:"
+msgstr "Naujam įvykiui ivykus"
+
+#: ../data/glade/preferences_window.glade.h:81
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+"Veikia su Thythmbox ir Muine grotuvais. Dėl informacijos apie kitus grotuvus "
+"apsilankykite svetainėje: http://trac.gajim.org/wiki/GajimAndMusicPlayer"
+
+#: ../data/glade/preferences_window.glade.h:82
+msgid "_Advanced Notifications Control..."
+msgstr "_Išplėstinis Pranešimų Valdymas..."
+
+#: ../data/glade/preferences_window.glade.h:83
+msgid "_Browser:"
+msgstr "_Naršyklė:"
+
+#: ../data/glade/preferences_window.glade.h:84
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "Rodyti _pokalbio būklės pranešimus:"
+
+#: ../data/glade/preferences_window.glade.h:85
+msgid "_File manager:"
+msgstr "_Failų menedžeris:"
+
+#: ../data/glade/preferences_window.glade.h:86
+msgid "_Font:"
+msgstr "Šri_ftas:"
+
+#: ../data/glade/preferences_window.glade.h:87
+msgid "_Highlight misspelled words"
+msgstr "Žymėti žodžius su _gramatine klaida"
+
+#: ../data/glade/preferences_window.glade.h:88
+msgid "_Ignore events from contacts not in the roster"
+msgstr "_Ignoruoti įvykius nuo asmenų nesančių kontaktų sąraše"
+
+#: ../data/glade/preferences_window.glade.h:89
+msgid "_Incoming message:"
+msgstr "Į_einanti žinutė:"
+
+#: ../data/glade/preferences_window.glade.h:90
+msgid "_Log status changes of contacts"
+msgstr "_Registruoti asmenų būklės pakitimus"
+
+#: ../data/glade/preferences_window.glade.h:91
+msgid "_Mail client:"
+msgstr "_El. pašto programa:"
+
+#: ../data/glade/preferences_window.glade.h:92
+#, fuzzy
+msgid "_Make message windows compact"
+msgstr "Vienas žinučių langas:"
+
+#: ../data/glade/preferences_window.glade.h:93
+msgid "_Open..."
+msgstr "_Atidaryti..."
+
+#: ../data/glade/preferences_window.glade.h:94
+msgid "_Outgoing message:"
+msgstr "_Išeinanti žinutė:"
+
+#: ../data/glade/preferences_window.glade.h:95
+msgid "_Player:"
+msgstr "_Grotuvas:"
+
+#: ../data/glade/preferences_window.glade.h:96
+msgid "_Reset to Default Colors"
+msgstr "_Grąžinti buvusias spalvas pagal nutylėjimą"
+
+#: ../data/glade/preferences_window.glade.h:97
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "Rodyti _pokalbio būklės pranešimus:"
+
+#: ../data/glade/preferences_window.glade.h:98
+msgid "_Sort contacts by status"
+msgstr "_Rūšiuoti kontaktus pagal būklę"
+
+#: ../data/glade/preferences_window.glade.h:99
+msgid "_Status message:"
+msgstr "_Būklės pranešimas:"
+
+#: ../data/glade/preferences_window.glade.h:100
+msgid "_URL:"
+msgstr "_URL:"
+
+#: ../data/glade/preferences_window.glade.h:101
+msgid "minutes"
+msgstr "minutės"
+
+#: ../data/glade/privacy_lists_window.glade.h:1
+msgid "Privacy Lists:"
+msgstr "Privatūs Sąrašai:"
+
+#: ../data/glade/privacy_list_window.glade.h:1
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Pridėti / Keisti taisyklę</b>"
+
+#: ../data/glade/privacy_list_window.glade.h:2
+msgid "<b>List of rules</b>"
+msgstr "<b>Taisyklių sąrašas</b>"
+
+#: ../data/glade/privacy_list_window.glade.h:3
+msgid "<i>Privacy List</i>"
+msgstr "<i>Privatus Sąrašas</i>"
+
+#: ../data/glade/privacy_list_window.glade.h:4
+msgid "Active for this session"
+msgstr "Aktyvus šiai sesijai"
+
+#: ../data/glade/privacy_list_window.glade.h:5
+msgid "Active on each startup"
+msgstr "Aktyvus kiekvieno paleidimo metu"
+
+#: ../data/glade/privacy_list_window.glade.h:6
+msgid "All"
+msgstr "Visi"
+
+#: ../data/glade/privacy_list_window.glade.h:7
+msgid "Allow"
+msgstr "Leisti"
+
+#: ../data/glade/privacy_list_window.glade.h:9
+msgid "JabberID"
+msgstr "JabberID"
+
+#: ../data/glade/privacy_list_window.glade.h:10
+msgid "Order:"
+msgstr "Tvarka:"
+
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2104
+msgid "Privacy List"
+msgstr "Privatus sąrašas"
+
+#: ../data/glade/privacy_list_window.glade.h:12
+msgid "all by subscription"
+msgstr "visus pagal užsisakymą"
+
+#: ../data/glade/privacy_list_window.glade.h:13
+msgid "all in the group"
+msgstr "visus grupėje"
+
+#: ../data/glade/privacy_list_window.glade.h:14
+msgid ""
+"none\n"
+"both\n"
+"from\n"
+"to"
+msgstr ""
+"joks\n"
+"abu\n"
+"nuo\n"
+"kam"
+
+#: ../data/glade/privacy_list_window.glade.h:18
+msgid "to send me messages"
+msgstr "žinučių siuntimui"
+
+#: ../data/glade/privacy_list_window.glade.h:19
+msgid "to send me queries"
+msgstr "užklausimų siuntimui"
+
+#: ../data/glade/privacy_list_window.glade.h:20
+msgid "to send me status"
+msgstr "informavimui mane, apie būklę"
+
+#: ../data/glade/privacy_list_window.glade.h:21
+msgid "to view my status"
+msgstr "mano būklės peržiūrai"
+
+#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:2
+#: ../data/glade/vcard_information_window.glade.h:2
+msgid "About"
+msgstr "Apie"
+
+#: ../data/glade/profile_window.glade.h:3
+#: ../data/glade/vcard_information_window.glade.h:3
+msgid "Address"
+msgstr "Adresas"
+
+#: ../data/glade/profile_window.glade.h:4
+msgid "Avatar:"
+msgstr "Atvaizdas:"
+
+#: ../data/glade/profile_window.glade.h:5
+#: ../data/glade/vcard_information_window.glade.h:6
+msgid "Birthday:"
+msgstr "Gimtadienis:"
+
+#: ../data/glade/profile_window.glade.h:6
+#: ../data/glade/vcard_information_window.glade.h:7
+msgid "City:"
+msgstr "Miestas:"
+
+#: ../data/glade/profile_window.glade.h:7
+msgid "Click to set your avatar"
+msgstr "Spauskia čia, kad įkeltum savo atvaizdą"
+
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:10
+msgid "Company:"
+msgstr "Kompanija:"
+
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:14
+msgid "Country:"
+msgstr "Šalis:"
+
+#: ../data/glade/profile_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:15
+msgid "Department:"
+msgstr "Skyrius:"
+
+#: ../data/glade/profile_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:17
+msgid "Extra Address:"
+msgstr "Papildomas adresas:"
+
+#. Family Name
+#: ../data/glade/profile_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:19
+msgid "Family:"
+msgstr "Pavardė:"
+
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:21
+msgid "Format: YYYY-MM-DD"
+msgstr "Formatas: YYYY-MM-DD"
+
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:22
+#, fuzzy
+msgid "Full Name"
+msgstr "Name"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:19
+#: ../data/glade/vcard_information_window.glade.h:24
+msgid "Given:"
+msgstr "Vardas:"
+
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:25
+msgid "Homepage:"
+msgstr "Asmeninė svetainė:"
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:28
+msgid "Middle:"
+msgstr "Antras vardas:"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:34
+msgid "Personal Info"
+msgstr "Asmeninė Informacija"
+
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:35
+msgid "Phone No.:"
+msgstr "Tel. Nr.:"
+
+#: ../data/glade/profile_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:36
+msgid "Position:"
+msgstr "Padėtis:"
+
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:37
+msgid "Postal Code:"
+msgstr "Pašto kodas:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "Prefix:"
+msgstr "Kreipinys:"
+
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:41 ../src/vcard.py:302
+msgid "Role:"
+msgstr "Funkcija:"
+
+#: ../data/glade/profile_window.glade.h:33
+#: ../data/glade/vcard_information_window.glade.h:42
+msgid "State:"
+msgstr "Valstija:"
+
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:44
+msgid "Street:"
+msgstr "Gatvė:"
+
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:48
+msgid "Suffix:"
+msgstr "Vardo sufiksas:"
+
+#: ../data/glade/profile_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:50
+msgid "Work"
+msgstr "Darbas"
+
+#: ../data/glade/remove_account_window.glade.h:1
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Ką norėtumėte veikti?</b>"
+
+#: ../data/glade/remove_account_window.glade.h:2
+msgid "Remove account _only from Gajim"
+msgstr "Pašalinti prieigą, _tik iš Gajim"
+
+#: ../data/glade/remove_account_window.glade.h:3
+msgid "Remove account from Gajim and from _server"
+msgstr "Pašalinti prieigą ir iš Gajim ir iš _serverio"
+
+#. Remove
+#. Remove group
+#. Remove
+#: ../data/glade/remove_account_window.glade.h:4
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+#: ../src/roster_window.py:2524 ../src/roster_window.py:2734
+#: ../src/roster_window.py:2870
+msgid "_Remove"
+msgstr "_Trinti"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "Siųsti užklausimą, kad galėtumėte matyti jo/jos būklę"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:2
+#, fuzzy
+msgid "Add Special _Notification..."
+msgstr "Add Special _Notification"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:3
+#, fuzzy
+msgid "Assign Open_PGP Key..."
+msgstr "Priskirti Open_PGP Raktą"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:4
+#, fuzzy
+msgid "Edit _Groups..."
+msgstr "Redaguoti _Grupes"
+
+#. Execute Command
+#: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:2827
+msgid "Execute Command..."
+msgstr "Vykdyti Komandą..."
+
+#. Invite to Groupchat
+#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:2440
+msgid "In_vite to"
+msgstr "Pak_viesti į"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../src/roster_window.py:2664 ../src/roster_window.py:2798
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Sends custom XML"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+msgid "Send Single _Message..."
+msgstr "Siųsti ži_nutę..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:9
+#, fuzzy
+msgid "Send _File..."
+msgstr "Siųsti _Failą"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:10
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
+msgid "Start _Chat"
+msgstr "Pradėti _Pokalbį"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+msgid "_Allow him/her to see my status"
+msgstr "_Leisti jam/jai matyti mano būklę"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../src/roster_window.py:2514 ../src/roster_window.py:2725
+msgid "_Block"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+msgid "_Forbid him/her to see my status"
+msgstr "_Drausti jam/jai matyti mano būklę"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
+#, fuzzy
+msgid "_Manage Contact"
+msgstr "Rename Contact"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:19
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Pervadinti"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:20
+msgid "_Subscription"
+msgstr "_Sutikimas"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:21
+#: ../src/roster_window.py:2508 ../src/roster_window.py:2719
+msgid "_Unblock"
+msgstr ""
+
+#: ../data/glade/roster_window.glade.h:1
+msgid "A_ccounts"
+msgstr "P_rieigos"
+
+#: ../data/glade/roster_window.glade.h:2
+#, fuzzy
+msgid "Add _Contact..."
+msgstr "_Įtraukti asmenį..."
+
+#: ../data/glade/roster_window.glade.h:3
+#, fuzzy
+msgid "Fea_tures"
+msgstr "Serverio teikiamos paslaugos"
+
+#: ../data/glade/roster_window.glade.h:4
+msgid "File _Transfers"
+msgstr "Failų _Siuntimai"
+
+#: ../data/glade/roster_window.glade.h:5
+msgid "Frequently Asked Questions (online)"
+msgstr "Dažniausiai Užduodami Klausimai (prisijungus)"
+
+#: ../data/glade/roster_window.glade.h:7
+msgid "Help online"
+msgstr "Pagalba tinkle"
+
+#: ../data/glade/roster_window.glade.h:9
+msgid "Profile, A_vatar"
+msgstr "Profilis, At_vaizdas"
+
+#: ../data/glade/roster_window.glade.h:10
+msgid "Show Trans_ports"
+msgstr "Rodyti _Pernašas"
+
+#: ../data/glade/roster_window.glade.h:11
+msgid "Show _Offline Contacts"
+msgstr "Rodyti _Atsijungusius Asmenis"
+
+#: ../data/glade/roster_window.glade.h:14
+msgid "_Contents"
+msgstr "_Turinys"
+
+#: ../data/glade/roster_window.glade.h:16 ../src/disco.py:1348
+msgid "_Edit"
+msgstr "_Redaguoti"
+
+#: ../data/glade/roster_window.glade.h:17
+msgid "_FAQ"
+msgstr "_DUK"
+
+#: ../data/glade/roster_window.glade.h:18
+msgid "_Help"
+msgstr "_Pagalba"
+
+#: ../data/glade/roster_window.glade.h:19
+msgid "_Preferences"
+msgstr "_Nustatymai"
+
+#: ../data/glade/roster_window.glade.h:20
+msgid "_Quit"
+msgstr "_Išjungti"
+
+#: ../data/glade/roster_window.glade.h:21
+#, fuzzy
+msgid "_Send Single Message..."
+msgstr "Siųsti ži_nutę..."
+
+#: ../data/glade/roster_window.glade.h:23
+msgid "_View"
+msgstr "_Rodinys"
+
+#: ../data/glade/service_discovery_window.glade.h:1
+msgid "G_o"
+msgstr "_Eik"
+
+#: ../data/glade/service_discovery_window.glade.h:2
+msgid "_Address:"
+msgstr "_Adresas:"
+
+#: ../data/glade/service_registration_window.glade.h:1
+msgid "Register to"
+msgstr "Registruotis prie"
+
+#: ../data/glade/service_registration_window.glade.h:2
+msgid "_Cancel"
+msgstr "_Atšaukti"
+
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_OK"
+
+#: ../data/glade/single_message_window.glade.h:1
+msgid "0"
+msgstr "0"
+
+#: ../data/glade/single_message_window.glade.h:2
+msgid "From:"
+msgstr "Nuo:"
+
+#: ../data/glade/single_message_window.glade.h:3
+msgid "Reply to this message"
+msgstr "Atsakyti šiai žinutei"
+
+#: ../data/glade/single_message_window.glade.h:4
+msgid "Sen_d"
+msgstr "_Siųsti"
+
+#: ../data/glade/single_message_window.glade.h:5
+msgid "Send message"
+msgstr "Siųsti žinutę"
+
+#: ../data/glade/single_message_window.glade.h:6
+msgid "Send message and close window"
+msgstr "Išsiųsti žinutę ir uždaryti langą"
+
+#: ../data/glade/single_message_window.glade.h:7
+msgid "Subject:"
+msgstr "Tema:"
+
+#: ../data/glade/single_message_window.glade.h:8
+msgid "To:"
+msgstr "Kam:"
+
+#: ../data/glade/single_message_window.glade.h:9
+msgid "_Reply"
+msgstr "_Atsakyti"
+
+#: ../data/glade/single_message_window.glade.h:10
+msgid "_Send & Close"
+msgstr "_Išsiųsti "
+
+#: ../data/glade/subscription_request_window.glade.h:1
+msgid "Au_thorize"
+msgstr "Au_torizuoti"
+
+#: ../data/glade/subscription_request_window.glade.h:2
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Autorizuoti asmenį, kad jis arba ji žinotu kada esate prisijungęs"
+
+#: ../data/glade/subscription_request_window.glade.h:3
+msgid ""
+"Deny authorization from contact so he or she cannot know when you're "
+"connected"
+msgstr ""
+"Drausti autorizacija šiam asmeniui, jis arba ji negalės matyti ar esate "
+"prisijungęs"
+
+#: ../data/glade/subscription_request_window.glade.h:4
+msgid "Subscription Request"
+msgstr "Sutikimo užklausimas"
+
+#: ../data/glade/subscription_request_window.glade.h:7
+msgid "_Deny"
+msgstr "_Drausti"
+
+#: ../data/glade/systray_context_menu.glade.h:1
+msgid "Mute Sounds"
+msgstr "Išjungti Garsus"
+
+#: ../data/glade/systray_context_menu.glade.h:2
+msgid "Send Single _Message"
+msgstr "Siųsti Vieną Ži_nutę"
+
+#: ../data/glade/systray_context_menu.glade.h:3
+msgid "Show All Pending _Events"
+msgstr "Rodyti Visus Laukiančius Į_vykius"
+
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
+msgstr "Rodyk _Kontaktų Sąrašą"
+
+#: ../data/glade/systray_context_menu.glade.h:5
+msgid "Sta_tus"
+msgstr "_Būklė"
+
+#: ../data/glade/systray_context_menu.glade.h:6
+msgid "_Group Chat"
+msgstr "Pokalbiai _Grupėje"
+
+#. Given Name
+#: ../data/glade/vcard_information_window.glade.h:5
+msgid "Ask:"
+msgstr "Klausti:"
+
+#: ../data/glade/vcard_information_window.glade.h:8
+msgid "Client:"
+msgstr "Klientas:"
+
+#: ../data/glade/vcard_information_window.glade.h:9
+msgid "Comments"
+msgstr "Komentarai"
+
+#: ../data/glade/vcard_information_window.glade.h:11
+#, fuzzy
+msgid "Configured avatar:"
+msgstr "Keisti kambario nustatymus"
+
+#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/zeroconf_information_window.glade.h:1
+msgid "Contact"
+msgstr "Asmuo"
+
+#: ../data/glade/vcard_information_window.glade.h:13
+msgid "Contact Information"
+msgstr "Asmens Informacija"
+
+#: ../data/glade/vcard_information_window.glade.h:29
+msgid "More"
+msgstr "Daugiau"
+
+#: ../data/glade/vcard_information_window.glade.h:33
+msgid "OS:"
+msgstr "OS:"
+
+#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/zeroconf_information_window.glade.h:8
+msgid "Resource:"
+msgstr "Šaltinis:"
+
+#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/zeroconf_information_window.glade.h:9
+msgid "Status:"
+msgstr "Būklė:"
+
+#. Family Name
+#: ../data/glade/vcard_information_window.glade.h:46
+msgid "Subscription:"
+msgstr "Sutikimas:"
+
+#: ../data/glade/vcard_information_window.glade.h:49
+#, fuzzy
+msgid "User avatar:"
+msgstr "Atvaizdas:"
+
+#: ../data/glade/xml_console_window.glade.h:1
+msgid "<b>Jabber Traffic</b>"
+msgstr "<b>Jabber Srautas</b>"
+
+#: ../data/glade/xml_console_window.glade.h:2
+msgid "<b>XML Input</b>"
+msgstr "<b>XML Įvestis</b>"
+
+#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
+#: ../data/glade/xml_console_window.glade.h:6
+msgid "Info/Query"
+msgstr "Informacija/Užklausa"
+
+#. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
+#: ../data/glade/xml_console_window.glade.h:8
+msgid "_IQ"
+msgstr "_IQ"
+
+#: ../data/glade/xml_console_window.glade.h:9
+msgid "_Message"
+msgstr "Ži_nutė"
+
+#: ../data/glade/xml_console_window.glade.h:10
+msgid "_Presence"
+msgstr "_Buvimas"
+
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
+msgid "Add Special _Notification"
+msgstr "Add Special _Notification"
+
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
+msgid "Assign Open_PGP Key"
+msgstr "Priskirti Open_PGP Raktą"
+
+#. Edit Groups
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:2497
+msgid "Edit _Groups"
+msgstr "Redaguoti _Grupes"
+
+#. Rename
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:2854
+msgid "_Rename"
+msgstr "_Pervadinti"
+
+#: ../data/glade/zeroconf_context_menu.glade.h:1
+msgid "_Modify Account..."
+msgstr "_Keisti Prieigą..."
+
+#: ../data/glade/zeroconf_information_window.glade.h:6
+msgid "Local jid:"
+msgstr "Vietinis jid:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:7
+msgid "Personal"
+msgstr "Asmeninis"
+
+#: ../data/glade/zeroconf_properties_window.glade.h:15
+msgid "Modify Account"
+msgstr "Keisti Prieigą"
+
+#. For i18n
+#: ../src/advanced.py:51
+msgid "Activated"
+msgstr "Activated"
+
+#: ../src/advanced.py:51
+msgid "Deactivated"
+msgstr "Deactivated"
+
+#: ../src/advanced.py:53
+msgid "Boolean"
+msgstr "Boolean"
+
+#: ../src/advanced.py:54
+msgid "Integer"
+msgstr "Integer"
+
+#: ../src/advanced.py:55
+msgid "Text"
+msgstr "Text"
+
+#: ../src/advanced.py:56
+msgid "Color"
+msgstr "Colour"
+
+#: ../src/advanced.py:65
+msgid "Preference Name"
+msgstr "Preference Name"
+
+#: ../src/advanced.py:71
+msgid "Value"
+msgstr "Value"
+
+#: ../src/advanced.py:79
+msgid "Type"
+msgstr "Type"
+
+#. we talk about option description in advanced configuration editor
+#: ../src/advanced.py:136
+msgid "(None)"
+msgstr "(None)"
+
+#. we talk about password
+#: ../src/advanced.py:239
+msgid "Hidden"
+msgstr "Hidden"
+
+#. the next script, executed in the "po" directory,
+#. generates the following list.
+#. #!/bin/sh
+#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. echo "{_('en'):'en'",$LANG"}"
+#: ../src/chat_control.py:55
+msgid "English"
+msgstr "English"
+
+#: ../src/chat_control.py:55
+msgid "Belarusian"
+msgstr "Belarusian"
+
+#: ../src/chat_control.py:55
+msgid "Bulgarian"
+msgstr "Bulgarian"
+
+#: ../src/chat_control.py:55
+#, fuzzy
+msgid "Breton"
+msgstr "Briton"
+
+#: ../src/chat_control.py:55
+msgid "Czech"
+msgstr "Czech"
+
+#: ../src/chat_control.py:55
+msgid "German"
+msgstr "German"
+
+#: ../src/chat_control.py:55
+msgid "Greek"
+msgstr "Greek"
+
+#: ../src/chat_control.py:55
+msgid "British"
+msgstr "British"
+
+#: ../src/chat_control.py:55
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../src/chat_control.py:55
+msgid "Spanish"
+msgstr "Spanish"
+
+#: ../src/chat_control.py:55
+#, fuzzy
+msgid "Basque"
+msgstr "Basc"
+
+#: ../src/chat_control.py:55
+msgid "French"
+msgstr "French"
+
+#: ../src/chat_control.py:55
+msgid "Croatian"
+msgstr "Croatian"
+
+#: ../src/chat_control.py:55
+msgid "Italian"
+msgstr "Italian"
+
+#: ../src/chat_control.py:55
+msgid "Norwegian (b)"
+msgstr "Norwegian (b)"
+
+#: ../src/chat_control.py:55
+msgid "Dutch"
+msgstr "Dutch"
+
+#: ../src/chat_control.py:55
+msgid "Norwegian"
+msgstr "Norwegian"
+
+#: ../src/chat_control.py:55
+msgid "Polish"
+msgstr "Polish"
+
+#: ../src/chat_control.py:55
+msgid "Portuguese"
+msgstr "Portuguese"
+
+#: ../src/chat_control.py:55
+msgid "Brazilian Portuguese"
+msgstr "Brazilian Portuguese"
+
+#: ../src/chat_control.py:55
+msgid "Russian"
+msgstr "Russian"
+
+#: ../src/chat_control.py:55
+#, fuzzy
+msgid "Serbian"
+msgstr "German"
+
+#: ../src/chat_control.py:55
+msgid "Slovak"
+msgstr "Slovak"
+
+#: ../src/chat_control.py:55
+msgid "Swedish"
+msgstr "Swedish"
+
+#: ../src/chat_control.py:55
+msgid "Chinese (Ch)"
+msgstr "Chinese (Ch)"
+
+#: ../src/chat_control.py:283
+msgid "Spelling language"
+msgstr "Spelling language"
+
+#. we are not connected
+#: ../src/chat_control.py:306 ../src/chat_control.py:512
+msgid "A connection is not available"
+msgstr "A connection is not available"
+
+#: ../src/chat_control.py:307 ../src/chat_control.py:513
+msgid "Your message can not be sent until you are connected."
+msgstr "Your message can not be sent until you are connected."
+
+#: ../src/chat_control.py:1139
+#, python-format
+msgid "%(nickname)s from group chat %(room_name)s"
+msgstr "%(nickname)s from group chat %(room_name)s"
+
+#. we talk about a contact here
+#: ../src/chat_control.py:1227
+#, python-format
+msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+msgstr "%s has not broadcast an OpenPGP key, nor has one been assigned"
+
+#: ../src/chat_control.py:1266 ../src/groupchat_control.py:1392
+#, python-format
+msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+msgstr "No such command: /%s (if you want to send this, prefix it with /say)"
+
+#: ../src/chat_control.py:1273 ../src/groupchat_control.py:1415
+#, python-format
+msgid "Commands: %s"
+msgstr "Commands: %s"
+
+#: ../src/chat_control.py:1276 ../src/groupchat_control.py:1429
+#, python-format
+msgid "Usage: /%s, clears the text window."
+msgstr "Usage: /%s, clears the text window."
+
+#: ../src/chat_control.py:1279 ../src/groupchat_control.py:1434
+#, python-format
+msgid "Usage: /%s, hide the chat buttons."
+msgstr "Usage: /%s, hide the chat buttons."
+
+#: ../src/chat_control.py:1282 ../src/groupchat_control.py:1450
+#, python-format
+msgid ""
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
+msgstr ""
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
+
+#: ../src/chat_control.py:1286
+#, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr ""
+
+#: ../src/chat_control.py:1289
+#, fuzzy, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "Usage: /%s, hide the chat buttons."
+
+#: ../src/chat_control.py:1292 ../src/groupchat_control.py:1473
+#, python-format
+msgid "No help info for /%s"
+msgstr "No help info for /%s"
+
+#: ../src/chat_control.py:1430 ../src/chat_control.py:1456
+msgid "Encryption enabled"
+msgstr "Encryption enabled"
+
+#: ../src/chat_control.py:1435
+msgid "Session WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1437
+msgid "Session WILL NOT be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1444
+#, fuzzy
+msgid "The following message was NOT encrypted"
+msgstr "[This message is encrypted]"
+
+#: ../src/chat_control.py:1448 ../src/chat_control.py:1461
+#: ../src/chat_control.py:2090
+msgid "Encryption disabled"
+msgstr "Encryption disabled"
+
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1618 ../src/conversation_textview.py:562
+#: ../src/dialogs.py:674 ../src/gajim.py:894 ../src/gajim.py:895
+#: ../src/gajim.py:1364 ../src/roster_window.py:345
+#: ../src/roster_window.py:429 ../src/roster_window.py:1790
+#: ../src/roster_window.py:1800 ../src/roster_window.py:2039
+#: ../src/roster_window.py:2277 ../src/roster_window.py:3125
+#: ../src/roster_window.py:3332 ../src/roster_window.py:4692
+#: ../src/roster_window.py:4694 ../src/common/contacts.py:84
+#: ../src/common/helpers.py:44 ../src/common/helpers.py:258
+msgid "Not in Roster"
+msgstr "Not in Roster"
+
+#. %s is being replaced in the code with JID
+#: ../src/chat_control.py:1762
+#, python-format
+msgid "You just received a new message from \"%s\""
+msgstr "You just received a new message from \"%s\""
+
+#: ../src/chat_control.py:1763
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+
+#: ../src/config.py:122 ../src/config.py:544
+msgid "Disabled"
+msgstr "Disabled"
+
+#: ../src/config.py:288
+msgid "Active"
+msgstr "Active"
+
+#: ../src/config.py:296
+msgid "Event"
+msgstr "Event"
+
+#: ../src/config.py:617 ../src/dialogs.py:958
+#, python-format
+msgid "Dictionary for lang %s not available"
+msgstr "Dictionary for lang %s not available"
+
+#: ../src/config.py:618
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+
+#: ../src/config.py:969
+msgid "status message title"
+msgstr "status message title"
+
+#: ../src/config.py:969
+msgid "status message text"
+msgstr "status message text"
+
+#: ../src/config.py:1005
+msgid "First Message Received"
+msgstr "First Message Received"
+
+#: ../src/config.py:1006
+msgid "Next Message Received"
+msgstr "Next Message Received"
+
+#: ../src/config.py:1007
+msgid "Contact Connected"
+msgstr "Contact Connected"
+
+#: ../src/config.py:1008
+msgid "Contact Disconnected"
+msgstr "Contact Disconnected"
+
+#: ../src/config.py:1009
+msgid "Message Sent"
+msgstr "Message Sent"
+
+#: ../src/config.py:1010
+msgid "Group Chat Message Highlight"
+msgstr "Group Chat Message Highlight"
+
+#: ../src/config.py:1011
+msgid "Group Chat Message Received"
+msgstr "Group Chat Message Received"
+
+#: ../src/config.py:1018
+msgid "GMail Email Received"
+msgstr "GMail E-mail Received"
+
+#. Name column
+#: ../src/config.py:1287 ../src/dialogs.py:1397 ../src/dialogs.py:1461
+#: ../src/disco.py:736 ../src/disco.py:1559 ../src/disco.py:1805
+#: ../src/history_window.py:108
+msgid "Name"
+msgstr "Name"
+
+#: ../src/config.py:1395 ../src/common/config.py:375
+msgid "Be right back."
+msgstr "Be right back."
+
+#: ../src/config.py:1399
+msgid "Relogin now?"
+msgstr "Relogin now?"
+
+#: ../src/config.py:1400
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr "If you want all the changes to apply instantly, you must relogin."
+
+#: ../src/config.py:1495 ../src/config.py:1594
+msgid "OpenPGP is not usable in this computer"
+msgstr "OpenPGP is not usable in this computer"
+
+#: ../src/config.py:1630 ../src/config.py:1674
+msgid "Unread events"
+msgstr "Unread events"
+
+#: ../src/config.py:1631
+msgid "Read all pending events before removing this account."
+msgstr "Read all pending events before removing this account."
+
+#: ../src/config.py:1660
+#, python-format
+msgid "You have opened chat in account %s"
+msgstr "You have opened chat in account %s"
+
+#: ../src/config.py:1661
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+"All chat and groupchat windows will be closed. Do you want to continue?"
+
+#: ../src/config.py:1670
+msgid "You are currently connected to the server"
+msgstr "You are currently connected to the server"
+
+#: ../src/config.py:1671
+msgid "To change the account name, you must be disconnected."
+msgstr "To change the account name, you must be disconnected."
+
+#: ../src/config.py:1675
+msgid "To change the account name, you must read all pending events."
+msgstr "To change the account name, you must read all pending events."
+
+#: ../src/config.py:1681
+msgid "Account Name Already Used"
+msgstr "Account Name Already Used"
+
+#: ../src/config.py:1682
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
+msgstr ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
+
+#: ../src/config.py:1686 ../src/config.py:1690
+msgid "Invalid account name"
+msgstr "Invalid account name"
+
+#: ../src/config.py:1687
+msgid "Account name cannot be empty."
+msgstr "Account name cannot be empty."
+
+#: ../src/config.py:1691
+msgid "Account name cannot contain spaces."
+msgstr "Account name cannot contain spaces."
+
+#: ../src/config.py:1755
+#, fuzzy
+msgid "Rename Account"
+msgstr "Prieigų valdymas"
+
+#: ../src/config.py:1756
+#, fuzzy, python-format
+msgid "Enter a new name for account %s"
+msgstr "Enter a new name for group %s"
+
+#: ../src/config.py:1774 ../src/config.py:1782 ../src/config.py:1822
+#: ../src/config.py:3048
+msgid "Invalid Jabber ID"
+msgstr "Invalid Jabber ID"
+
+#: ../src/config.py:1783
+msgid "A Jabber ID must be in the form \"user@servername\"."
+msgstr "A Jabber ID must be in the form \"user@servername\"."
+
+#: ../src/config.py:1968 ../src/config.py:3119
+msgid "Invalid entry"
+msgstr "Invalid entry"
+
+#: ../src/config.py:1969 ../src/config.py:3120
+msgid "Custom port must be a port number."
+msgstr "Custom port must be a port number."
+
+#: ../src/config.py:1990
+msgid "Failed to get secret keys"
+msgstr "Failed to get secret keys"
+
+#: ../src/config.py:1991
+msgid "There was a problem retrieving your OpenPGP secret keys."
+msgstr "There was a problem retrieving your OpenPGP secret keys."
+
+#: ../src/config.py:1994
+msgid "OpenPGP Key Selection"
+msgstr "OpenPGP Key Selection"
+
+#: ../src/config.py:1995
+msgid "Choose your OpenPGP key"
+msgstr "Choose your OpenPGP key"
+
+#: ../src/config.py:2052
+msgid "No such account available"
+msgstr "No such account available"
+
+#: ../src/config.py:2053
+msgid "You must create your account before editing your personal information."
+msgstr "You must create your account before editing your personal information."
+
+#: ../src/config.py:2060 ../src/dialogs.py:1244 ../src/dialogs.py:1385
+#: ../src/dialogs.py:1565 ../src/disco.py:420 ../src/profile_window.py:325
+msgid "You are not connected to the server"
+msgstr "You are not connected to the server"
+
+#: ../src/config.py:2061
+msgid "Without a connection, you can not edit your personal information."
+msgstr "Without a connection, you can not edit your personal information."
+
+#: ../src/config.py:2065
+msgid "Your server doesn't support Vcard"
+msgstr "Your server doesn't support Vcard"
+
+#: ../src/config.py:2066
+msgid "Your server can't save your personal information."
+msgstr "Your server can't save your personal information."
+
+#: ../src/config.py:2097
+msgid "Account Local already exists."
+msgstr "Account Local already exists."
+
+#: ../src/config.py:2098
+msgid "Please rename or remove it before enabling link-local messaging."
+msgstr "Please rename or remove it before enabling link-local messaging."
+
+#: ../src/config.py:2274
+#, python-format
+msgid "Edit %s"
+msgstr "Edit %s"
+
+#: ../src/config.py:2276
+#, python-format
+msgid "Register to %s"
+msgstr "Register to %s"
+
+#. list at the beginning
+#: ../src/config.py:2312
+msgid "Ban List"
+msgstr "Ban List"
+
+#: ../src/config.py:2313
+msgid "Member List"
+msgstr "Member List"
+
+#: ../src/config.py:2314
+msgid "Owner List"
+msgstr "Owner List"
+
+#: ../src/config.py:2315
+msgid "Administrator List"
+msgstr "Administrator List"
+
+#. Address column
+#. holds JID (who said this)
+#: ../src/config.py:2364 ../src/disco.py:743 ../src/history_manager.py:155
+msgid "JID"
+msgstr "JID"
+
+#: ../src/config.py:2372
+msgid "Reason"
+msgstr "Reason"
+
+#: ../src/config.py:2377
+msgid "Nick"
+msgstr "Nick"
+
+#: ../src/config.py:2381
+msgid "Role"
+msgstr "Role"
+
+#: ../src/config.py:2406
+msgid "Banning..."
+msgstr "Banning..."
+
+#. You can move '\n' before user@domain if that line is TOO BIG
+#: ../src/config.py:2408
+msgid ""
+"<b>Whom do you want to ban?</b>\n"
+"\n"
+msgstr ""
+"<b>Whom do you want to ban?</b>\n"
+"\n"
+
+#: ../src/config.py:2410
+msgid "Adding Member..."
+msgstr "Adding Member..."
+
+#: ../src/config.py:2411
+msgid ""
+"<b>Whom do you want to make a member?</b>\n"
+"\n"
+msgstr ""
+"<b>Whom do you want to make a member?</b>\n"
+"\n"
+
+#: ../src/config.py:2413
+msgid "Adding Owner..."
+msgstr "Adding Owner..."
+
+#: ../src/config.py:2414
+msgid ""
+"<b>Whom do you want to make an owner?</b>\n"
+"\n"
+msgstr ""
+"<b>Whom do you want to make an owner?</b>\n"
+"\n"
+
+#: ../src/config.py:2416
+msgid "Adding Administrator..."
+msgstr "Adding Administrator..."
+
+#: ../src/config.py:2417
+msgid ""
+"<b>Whom do you want to make an administrator?</b>\n"
+"\n"
+msgstr ""
+"<b>Whom do you want to make an administrator?</b>\n"
+"\n"
+
+#: ../src/config.py:2418
+msgid ""
+"Can be one of the following:\n"
+"1. user@domain/resource (only that resource matches).\n"
+"2. user@domain (any resource matches).\n"
+"3. domain/resource (only that resource matches).\n"
+"4. domain (the domain itself matches, as does any user@domain,\n"
+"domain/resource, or address containing a subdomain."
+msgstr ""
+"Can be one of the following:\n"
+"1. user@domain/resource (only that resource matches).\n"
+"2. user@domain (any resource matches).\n"
+"3. domain/resource (only that resource matches).\n"
+"4. domain (the domain itself matches, as does any user@domain,\n"
+"domain/resource, or address containing a subdomain."
+
+#: ../src/config.py:2522
+#, python-format
+msgid "Removing %s account"
+msgstr "Removing %s account"
+
+#: ../src/config.py:2539 ../src/gajim.py:1307 ../src/roster_window.py:3391
+msgid "Password Required"
+msgstr "Password Required"
+
+#: ../src/config.py:2540 ../src/roster_window.py:3387
+#, python-format
+msgid "Enter your password for account %s"
+msgstr "Enter your password for account %s"
+
+#: ../src/config.py:2541 ../src/roster_window.py:3392
+msgid "Save password"
+msgstr "Save password"
+
+#: ../src/config.py:2555
+#, python-format
+msgid "Account \"%s\" is connected to the server"
+msgstr "Account \"%s\" is connected to the server"
+
+#: ../src/config.py:2556
+msgid "If you remove it, the connection will be lost."
+msgstr "If you remove it, the connection will be lost."
+
+#: ../src/config.py:2649
+msgid "Default"
+msgstr "Default"
+
+#: ../src/config.py:2649
+msgid "?print_status:All"
+msgstr "All"
+
+#: ../src/config.py:2650
+msgid "Enter and leave only"
+msgstr "Enter and leave only"
+
+#: ../src/config.py:2651
+msgid "?print_status:None"
+msgstr "None"
+
+#: ../src/config.py:2720
+msgid "New Group Chat"
+msgstr "New Group Chat"
+
+#: ../src/config.py:2753
+msgid "This bookmark has invalid data"
+msgstr "This bookmark has invalid data"
+
+#: ../src/config.py:2754
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
+msgstr ""
+"Please be sure to fill out server and room fields or remove this bookmark."
+
+#: ../src/config.py:3031
+msgid "Invalid username"
+msgstr "Invalid username"
+
+#: ../src/config.py:3033
+msgid "You must provide a username to configure this account."
+msgstr "You must provide a username to configure this account."
+
+#: ../src/config.py:3059
+msgid "Duplicate Jabber ID"
+msgstr "Duplicate Jabber ID"
+
+#: ../src/config.py:3060
+msgid "This account is already configured in Gajim."
+msgstr "This account is already configured in Gajim."
+
+#: ../src/config.py:3077
+msgid "Account has been added successfully"
+msgstr "Account has been added successfully"
+
+#: ../src/config.py:3078 ../src/config.py:3223
+msgid ""
+"You can set advanced account options by pressing the Advanced button, or "
+"later by choosing the Accounts menuitem under the Edit menu from the main "
+"window."
+msgstr ""
+"You can set advanced account options by pressing the Advanced button, or "
+"later by choosing the Accounts menuitem under the Edit menu from the main "
+"window."
+
+#: ../src/config.py:3095
+#, fuzzy
+msgid "Invalid server"
+msgstr "Invalid username"
+
+#: ../src/config.py:3096
+#, fuzzy
+msgid "Please provide a server on which you want to register."
+msgstr "Please specify the new nickname you want to use:"
+
+#: ../src/config.py:3202 ../src/config.py:3241
+msgid "An error occurred during account creation"
+msgstr "An error occurred during account creation"
+
+#: ../src/config.py:3222
+msgid "Your new account has been created successfully"
+msgstr "Your new account has been successfully created"
+
+#: ../src/config.py:3327
+msgid "Account name is in use"
+msgstr "Account name is in use"
+
+#: ../src/config.py:3328
+msgid "You already have an account using this name."
+msgstr "You already have an account using this name."
+
+#: ../src/conversation_textview.py:337
+msgid ""
+"Text below this line is what has been said since the last time you paid "
+"attention to this group chat"
+msgstr ""
+"Text below this line is what has been said since the last time you paid "
+"attention to this group chat"
+
+#: ../src/conversation_textview.py:409
+#, python-format
+msgid "_Actions for \"%s\""
+msgstr "_Actions for \"%s\""
+
+#: ../src/conversation_textview.py:421
+msgid "Read _Wikipedia Article"
+msgstr "Read _Wikipedia Article"
+
+#: ../src/conversation_textview.py:426
+msgid "Look it up in _Dictionary"
+msgstr "Look it up in _Dictionary"
+
+#. we must have %s in the url if not WIKTIONARY
+#: ../src/conversation_textview.py:442
+#, python-format
+msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
+msgstr "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
+
+#. we must have %s in the url
+#: ../src/conversation_textview.py:455
+#, python-format
+msgid "Web Search URL is missing an \"%s\""
+msgstr "Web Search URL is missing an \"%s\""
+
+#: ../src/conversation_textview.py:458
+msgid "Web _Search for it"
+msgstr "Web _Search for it"
+
+#: ../src/conversation_textview.py:464
+msgid "Open as _Link"
+msgstr "Open as _Link"
+
+#: ../src/conversation_textview.py:929
+msgid "Yesterday"
+msgstr "Yesterday"
+
+#. the number is >= 2
+#. %i is day in year (1-365), %d (1-31) we want %i
+#: ../src/conversation_textview.py:933
+#, python-format
+msgid "%i days ago"
+msgstr "%i days ago"
+
+#. if we have subject, show it too!
+#: ../src/conversation_textview.py:967
+#, python-format
+msgid "Subject: %s\n"
+msgstr "Subject: %s\n"
+
+#: ../src/dialogs.py:64
+#, python-format
+msgid "Contact name: <i>%s</i>"
+msgstr "Contact name: <i>%s</i>"
+
+#: ../src/dialogs.py:66
+#, python-format
+msgid "Jabber ID: <i>%s</i>"
+msgstr "Jabber ID: <i>%s</i>"
+
+#: ../src/dialogs.py:216
+msgid "Group"
+msgstr "Group"
+
+#: ../src/dialogs.py:223
+msgid "In the group"
+msgstr "In the group"
+
+#: ../src/dialogs.py:274
+msgid "KeyID"
+msgstr "KeyID"
+
+#: ../src/dialogs.py:277
+msgid "Contact name"
+msgstr "Contact name"
+
+#: ../src/dialogs.py:323
+#, python-format
+msgid "%s Status Message"
+msgstr "%s Status Message"
+
+#: ../src/dialogs.py:325
+msgid "Status Message"
+msgstr "Status Message"
+
+#: ../src/dialogs.py:425
+msgid "Save as Preset Status Message"
+msgstr "Save as Preset Status Message"
+
+#: ../src/dialogs.py:426
+msgid "Please type a name for this status message"
+msgstr "Please type a name for this status message"
+
+#: ../src/dialogs.py:437
+#, fuzzy
+msgid "Overwrite Status Message?"
+msgstr "Status Message"
+
+#: ../src/dialogs.py:438
+#, fuzzy
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
+
+#: ../src/dialogs.py:454
+msgid "AIM Address:"
+msgstr "AIM Address:"
+
+#: ../src/dialogs.py:455
+msgid "GG Number:"
+msgstr "GG Number:"
+
+#: ../src/dialogs.py:456
+msgid "ICQ Number:"
+msgstr "ICQ Number:"
+
+#: ../src/dialogs.py:457
+msgid "MSN Address:"
+msgstr "MSN Address:"
+
+#: ../src/dialogs.py:458
+msgid "Yahoo! Address:"
+msgstr "Yahoo! Address:"
+
+#: ../src/dialogs.py:495
+#, python-format
+msgid "Please fill in the data of the contact you want to add in account %s"
+msgstr "Please fill in the data of the contact you want to add in account %s"
+
+#: ../src/dialogs.py:497
+msgid "Please fill in the data of the contact you want to add"
+msgstr "Please fill in the data of the contact you want to add"
+
+#: ../src/dialogs.py:654 ../src/dialogs.py:660
+msgid "Invalid User ID"
+msgstr "Invalid User ID"
+
+#: ../src/dialogs.py:661
+msgid "The user ID must not contain a resource."
+msgstr "The user ID must not contain a resource."
+
+#: ../src/dialogs.py:675
+msgid "Contact already in roster"
+msgstr "Contact already in roster"
+
+#: ../src/dialogs.py:676
+msgid "This contact is already listed in your roster."
+msgstr "This contact is already listed in your roster."
+
+#: ../src/dialogs.py:712
+msgid "User ID:"
+msgstr "User ID:"
+
+#: ../src/dialogs.py:774
+msgid "A GTK+ jabber client"
+msgstr "A GTK+ jabber client"
+
+#: ../src/dialogs.py:775
+msgid "GTK+ Version:"
+msgstr "GTK+ Version:"
+
+#: ../src/dialogs.py:776
+msgid "PyGTK Version:"
+msgstr "PyGTK Version:"
+
+#: ../src/dialogs.py:790
+msgid "Current Developers:"
+msgstr "Current Developers:"
+
+#: ../src/dialogs.py:792
+msgid "Past Developers:"
+msgstr "Past Developers:"
+
+#: ../src/dialogs.py:802
+msgid "THANKS:"
+msgstr "THANKS:"
+
+#. remove one english sentence
+#. and add it manually as translatable
+#: ../src/dialogs.py:808
+msgid "Last but not least, we would like to thank all the package maintainers."
+msgstr ""
+"Last but not least, we would like to thank all the package maintainers."
+
+#. here you write your name in the form Name FamilyName <someone@somewhere>
+#: ../src/dialogs.py:821
+msgid "translator-credits"
+msgstr "Jeff Bailes <thepizzaking@gmail.com>"
+
+#: ../src/dialogs.py:951
+#, python-format
+msgid "Unable to bind to port %s."
+msgstr "Unable to bind to port %s."
+
+#: ../src/dialogs.py:952
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+
+#: ../src/dialogs.py:959
+#, fuzzy, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option.\n"
+"\n"
+"Highlighting misspelled words feature will not be used"
+msgstr ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+
+#: ../src/dialogs.py:1173
+#, python-format
+msgid "Subscription request for account %s from %s"
+msgstr "Subscription request for account %s from %s"
+
+#: ../src/dialogs.py:1176
+#, python-format
+msgid "Subscription request from %s"
+msgstr "Subscription request from %s"
+
+#: ../src/dialogs.py:1237 ../src/roster_window.py:763
+#, python-format
+msgid "You are already in group chat %s"
+msgstr "You are already in group chat %s"
+
+#: ../src/dialogs.py:1245
+msgid "You can not join a group chat unless you are connected."
+msgstr "You can not join a group chat unless you are connected."
+
+#: ../src/dialogs.py:1263
+#, python-format
+msgid "Join Group Chat with account %s"
+msgstr "Join Group Chat with account %s"
+
+#: ../src/dialogs.py:1333 ../src/dialogs.py:1339
+#: ../src/groupchat_control.py:1643
+msgid "Invalid group chat Jabber ID"
+msgstr "Invalid group chat Jabber ID"
+
+#: ../src/dialogs.py:1334 ../src/dialogs.py:1340
+#: ../src/groupchat_control.py:1644
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "The group chat Jabber ID has invalid characters."
+
+#: ../src/dialogs.py:1346
+msgid "This is not a group chat"
+msgstr "This is not a group chat"
+
+#: ../src/dialogs.py:1347
+#, python-format
+msgid "%s is not the name of a group chat."
+msgstr "%s is not the name of a group chat."
+
+#: ../src/dialogs.py:1386
+#, fuzzy
+msgid "Without a connection, you can not synchronise your contacts."
+msgstr "Without a connection, you can not change your password."
+
+#: ../src/dialogs.py:1400
+msgid "Server"
+msgstr "Server"
+
+#: ../src/dialogs.py:1433
+#, fuzzy
+msgid "This account is not connected to the server"
+msgstr "Account \"%s\" is connected to the server"
+
+#: ../src/dialogs.py:1434
+#, fuzzy
+msgid "You cannot synchronize with an account unless it is connected."
+msgstr "You can not join a group chat unless you are connected."
+
+#: ../src/dialogs.py:1458
+msgid "Synchronise"
+msgstr ""
+
+#: ../src/dialogs.py:1516
+#, python-format
+msgid "Start Chat with account %s"
+msgstr "Start Chat with account %s"
+
+#: ../src/dialogs.py:1518
+msgid "Start Chat"
+msgstr "Start Chat"
+
+#: ../src/dialogs.py:1519
+msgid ""
+"Fill in the nickname or the Jabber ID of the contact you would like\n"
+"to send a chat message to:"
+msgstr ""
+"Fill in the nickname or the Jabber ID of the contact you would like\n"
+"to send a chat message to:"
+
+#. if offline or connecting
+#: ../src/dialogs.py:1544 ../src/dialogs.py:1891 ../src/dialogs.py:2027
+msgid "Connection not available"
+msgstr "Connection not available"
+
+#: ../src/dialogs.py:1545 ../src/dialogs.py:1892 ../src/dialogs.py:2028
+#, python-format
+msgid "Please make sure you are connected with \"%s\"."
+msgstr "Please make sure you are connected with \"%s\"."
+
+#: ../src/dialogs.py:1554 ../src/dialogs.py:1557
+msgid "Invalid JID"
+msgstr "Invalid JID"
+
+#: ../src/dialogs.py:1557
+#, python-format
+msgid "Unable to parse \"%s\"."
+msgstr "Unable to parse \"%s\"."
+
+#: ../src/dialogs.py:1566
+msgid "Without a connection, you can not change your password."
+msgstr "Without a connection, you can not change your password."
+
+#: ../src/dialogs.py:1584
+msgid "Invalid password"
+msgstr "Invalid password"
+
+#: ../src/dialogs.py:1585
+msgid "You must enter a password."
+msgstr "You must enter a password."
+
+#: ../src/dialogs.py:1589
+msgid "Passwords do not match"
+msgstr "Passwords do not match"
+
+#: ../src/dialogs.py:1590
+msgid "The passwords typed in both fields must be identical."
+msgstr "The passwords typed in both fields must be identical."
+
+#. img to display
+#. default value
+#: ../src/dialogs.py:1632 ../src/notify.py:219 ../src/notify.py:429
+msgid "Contact Signed In"
+msgstr "Contact Signed In"
+
+#: ../src/dialogs.py:1634 ../src/notify.py:227 ../src/notify.py:431
+msgid "Contact Signed Out"
+msgstr "Contact Signed Out"
+
+#. chat message
+#: ../src/dialogs.py:1636 ../src/notify.py:250 ../src/notify.py:433
+msgid "New Message"
+msgstr "New Message"
+
+#. single message
+#: ../src/dialogs.py:1636 ../src/notify.py:231 ../src/notify.py:433
+msgid "New Single Message"
+msgstr "New Single Message"
+
+#. private message
+#: ../src/dialogs.py:1637 ../src/notify.py:238 ../src/notify.py:434
+msgid "New Private Message"
+msgstr "New Private Message"
+
+#: ../src/dialogs.py:1637 ../src/gajim.py:1460 ../src/notify.py:442
+msgid "New E-mail"
+msgstr "New E-mail"
+
+#: ../src/dialogs.py:1639 ../src/gajim.py:1668 ../src/notify.py:436
+msgid "File Transfer Request"
+msgstr "File Transfer Request"
+
+#: ../src/dialogs.py:1641 ../src/gajim.py:1432 ../src/gajim.py:1644
+#: ../src/notify.py:438
+msgid "File Transfer Error"
+msgstr "File Transfer Error"
+
+#: ../src/dialogs.py:1643 ../src/gajim.py:1707 ../src/gajim.py:1729
+#: ../src/gajim.py:1746 ../src/notify.py:440
+msgid "File Transfer Completed"
+msgstr "File Transfer Completed"
+
+#: ../src/dialogs.py:1644 ../src/gajim.py:1710 ../src/notify.py:440
+msgid "File Transfer Stopped"
+msgstr "File Transfer Stopped"
+
+#: ../src/dialogs.py:1646 ../src/gajim.py:1328 ../src/notify.py:444
+msgid "Groupchat Invitation"
+msgstr "Groupchat Invitation"
+
+#: ../src/dialogs.py:1648 ../src/notify.py:211 ../src/notify.py:446
+msgid "Contact Changed Status"
+msgstr "Contact Changed Status"
+
+#: ../src/dialogs.py:1821
+#, python-format
+msgid "Single Message using account %s"
+msgstr "Single Message using account %s"
+
+#: ../src/dialogs.py:1823
+#, python-format
+msgid "Single Message in account %s"
+msgstr "Single Message in account %s"
+
+#: ../src/dialogs.py:1825
+msgid "Single Message"
+msgstr "Single Message"
+
+#. prepare UI for Sending
+#: ../src/dialogs.py:1828
+#, python-format
+msgid "Send %s"
+msgstr "Send %s"
+
+#. prepare UI for Receiving
+#: ../src/dialogs.py:1851
+#, python-format
+msgid "Received %s"
+msgstr "Received %s"
+
+#. we create a new blank window to send and we preset RE: and to jid
+#: ../src/dialogs.py:1928
+#, python-format
+msgid "RE: %s"
+msgstr "RE: %s"
+
+#: ../src/dialogs.py:1929
+#, python-format
+msgid "%s wrote:\n"
+msgstr "%s wrote:\n"
+
+#: ../src/dialogs.py:1973
+#, python-format
+msgid "XML Console for %s"
+msgstr "XML Console for %s"
+
+#: ../src/dialogs.py:1975
+msgid "XML Console"
+msgstr "XML Console"
+
+#: ../src/dialogs.py:2098
+#, python-format
+msgid "Privacy List <b><i>%s</i></b>"
+msgstr "Privacy List <b><i>%s</i></b>"
+
+#: ../src/dialogs.py:2102
+#, python-format
+msgid "Privacy List for %s"
+msgstr "Privacy List for %s"
+
+#: ../src/dialogs.py:2158
+#, python-format
+msgid "Order: %s, action: %s, type: %s, value: %s"
+msgstr "Order: %s, action: %s, type: %s, value: %s"
+
+#: ../src/dialogs.py:2161
+#, python-format
+msgid "Order: %s, action: %s"
+msgstr "Order: %s, action: %s"
+
+#: ../src/dialogs.py:2203
+msgid "<b>Edit a rule</b>"
+msgstr "<b>Edit a rule</b>"
+
+#: ../src/dialogs.py:2290
+msgid "<b>Add a rule</b>"
+msgstr "<b>Add a rule</b>"
+
+#: ../src/dialogs.py:2386
+#, python-format
+msgid "Privacy Lists for %s"
+msgstr "Privacy Lists for %s"
+
+#: ../src/dialogs.py:2388
+msgid "Privacy Lists"
+msgstr "Privacy Lists"
+
+#: ../src/dialogs.py:2458
+msgid "Invalid List Name"
+msgstr "Invalid List Name"
+
+#: ../src/dialogs.py:2459
+msgid "You must enter a name to create a privacy list."
+msgstr "You must enter a name to create a privacy list."
+
+#: ../src/dialogs.py:2496
+#, fuzzy
+msgid "$Contact has invited you to join a discussion"
+msgstr "$Contact has invited you to group chat %(room_jid)s"
+
+#: ../src/dialogs.py:2498
+#, python-format
+msgid "$Contact has invited you to group chat %(room_jid)s"
+msgstr "$Contact has invited you to group chat %(room_jid)s"
+
+#. only if not None and not ''
+#: ../src/dialogs.py:2510
+#, python-format
+msgid "Comment: %s"
+msgstr "Comment: %s"
+
+#: ../src/dialogs.py:2576
+msgid "Choose Sound"
+msgstr "Choose Sound"
+
+#: ../src/dialogs.py:2586 ../src/dialogs.py:2634
+msgid "All files"
+msgstr "All files"
+
+#: ../src/dialogs.py:2591
+msgid "Wav Sounds"
+msgstr "Wav Sounds"
+
+#: ../src/dialogs.py:2624
+msgid "Choose Image"
+msgstr "Choose Image"
+
+#: ../src/dialogs.py:2639
+msgid "Images"
+msgstr "Images"
+
+#: ../src/dialogs.py:2703
+#, python-format
+msgid "When %s becomes:"
+msgstr "When %s becomes:"
+
+#: ../src/dialogs.py:2705
+#, python-format
+msgid "Adding Special Notification for %s"
+msgstr "Adding Special Notification for %s"
+
+#. # means number
+#: ../src/dialogs.py:2776
+msgid "#"
+msgstr "#"
+
+#: ../src/dialogs.py:2782
+msgid "Condition"
+msgstr "Condition"
+
+#: ../src/dialogs.py:2900
+msgid "when I am "
+msgstr "when I am "
+
+#: ../src/disco.py:104
+msgid "Others"
+msgstr "Others"
+
+#: ../src/disco.py:105 ../src/disco.py:106 ../src/disco.py:1345
+#: ../src/gajim.py:644 ../src/roster_window.py:282 ../src/roster_window.py:342
+#: ../src/roster_window.py:382 ../src/roster_window.py:490
+#: ../src/roster_window.py:522 ../src/roster_window.py:524
+#: ../src/roster_window.py:4688 ../src/roster_window.py:4690
+#: ../src/common/contacts.py:290 ../src/common/contacts.py:305
+#: ../src/common/helpers.py:44
+msgid "Transports"
+msgstr "Transports"
+
+#. conference is a category for listing mostly groupchats in service discovery
+#: ../src/disco.py:108
+msgid "Conference"
+msgstr "Conference"
+
+#: ../src/disco.py:421
+msgid "Without a connection, you can not browse available services"
+msgstr "Without a connection, you can not browse available services"
+
+#: ../src/disco.py:495
+#, python-format
+msgid "Service Discovery using account %s"
+msgstr "Service Discovery using account %s"
+
+#: ../src/disco.py:497
+msgid "Service Discovery"
+msgstr "Service Discovery"
+
+#: ../src/disco.py:637
+msgid "The service could not be found"
+msgstr "The service could not be found"
+
+#: ../src/disco.py:638
+msgid ""
+"There is no service at the address you entered, or it is not responding. "
+"Check the address and try again."
+msgstr ""
+"There is no service at the address you entered, or it is not responding. "
+"Check the address and try again."
+
+#: ../src/disco.py:642 ../src/disco.py:923
+msgid "The service is not browsable"
+msgstr "The service is not browsable"
+
+#: ../src/disco.py:643
+msgid "This type of service does not contain any items to browse."
+msgstr "This type of service does not contain any items to browse."
+
+#: ../src/disco.py:723
+#, python-format
+msgid "Browsing %s using account %s"
+msgstr "Browsing %s using account %s"
+
+#: ../src/disco.py:762
+msgid "_Browse"
+msgstr "_Browse"
+
+#: ../src/disco.py:924
+msgid "This service does not contain any items to browse."
+msgstr "This service does not contain any items to browse."
+
+#: ../src/disco.py:1142
+#, fuzzy
+msgid "_Execute Command"
+msgstr "_Vykdyti komandą..."
+
+#: ../src/disco.py:1152 ../src/disco.py:1350
+msgid "Re_gister"
+msgstr "Re_gister"
+
+#: ../src/disco.py:1387
+#, python-format
+msgid "Scanning %d / %d.."
+msgstr "Scanning %d / %d.."
+
+#. Users column
+#: ../src/disco.py:1569
+msgid "Users"
+msgstr "Users"
+
+#. Description column
+#: ../src/disco.py:1577
+msgid "Description"
+msgstr "Description"
+
+#. Id column
+#: ../src/disco.py:1585
+msgid "Id"
+msgstr "Id"
+
+#: ../src/disco.py:1814
+msgid "Subscribed"
+msgstr "Subscribed"
+
+#: ../src/disco.py:1822
+#, fuzzy
+msgid "Node"
+msgstr "Joks"
+
+#: ../src/disco.py:1879
+msgid "New post"
+msgstr "New post"
+
+#: ../src/disco.py:1885
+msgid "_Subscribe"
+msgstr "_Subscribe"
+
+#: ../src/disco.py:1891
+msgid "_Unsubscribe"
+msgstr "_Unsubscribe"
+
+#: ../src/filetransfers_window.py:72
+msgid "File"
+msgstr "File"
+
+#: ../src/filetransfers_window.py:87
+msgid "Time"
+msgstr "Time"
+
+#: ../src/filetransfers_window.py:99
+msgid "Progress"
+msgstr "Progress"
+
+#: ../src/filetransfers_window.py:159 ../src/filetransfers_window.py:213
+#, python-format
+msgid "Filename: %s"
+msgstr "Filename: %s"
+
+#: ../src/filetransfers_window.py:160 ../src/filetransfers_window.py:288
+#, python-format
+msgid "Size: %s"
+msgstr "Size: %s"
+
+#. You is a reply of who sent a file
+#. You is a reply of who received a file
+#: ../src/filetransfers_window.py:169 ../src/filetransfers_window.py:179
+#: ../src/history_manager.py:463
+msgid "You"
+msgstr "You"
+
+#: ../src/filetransfers_window.py:170
+#, python-format
+msgid "Sender: %s"
+msgstr "Sender: %s"
+
+#: ../src/filetransfers_window.py:171 ../src/filetransfers_window.py:577
+#: ../src/tooltips.py:586
+msgid "Recipient: "
+msgstr "Recipient: "
+
+#: ../src/filetransfers_window.py:182
+#, python-format
+msgid "Saved in: %s"
+msgstr "Saved in: %s"
+
+#: ../src/filetransfers_window.py:184
+msgid "File transfer completed"
+msgstr "File transfer completed"
+
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:204
+msgid "File transfer cancelled"
+msgstr "File transfer cancelled"
+
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:205
+msgid "Connection with peer cannot be established."
+msgstr "Connection with peer cannot be established."
+
+#: ../src/filetransfers_window.py:214
+#, python-format
+msgid "Recipient: %s"
+msgstr "Recipient: %s"
+
+#: ../src/filetransfers_window.py:216
+#, python-format
+msgid "Error message: %s"
+msgstr "Error message: %s"
+
+#: ../src/filetransfers_window.py:217
+msgid "File transfer stopped by the contact at the other end"
+msgstr "File transfer stopped by the contact at the other end"
+
+#: ../src/filetransfers_window.py:234
+msgid "Choose File to Send..."
+msgstr "Choose File to Send..."
+
+#: ../src/filetransfers_window.py:253
+msgid "Gajim cannot access this file"
+msgstr "Gajim cannot access this file"
+
+#: ../src/filetransfers_window.py:254
+msgid "This file is being used by another process."
+msgstr "This file is being used by another process."
+
+#: ../src/filetransfers_window.py:286
+#, python-format
+msgid "File: %s"
+msgstr "File: %s"
+
+#: ../src/filetransfers_window.py:291
+#, python-format
+msgid "Type: %s"
+msgstr "Type: %s"
+
+#: ../src/filetransfers_window.py:293
+#, python-format
+msgid "Description: %s"
+msgstr "Description: %s"
+
+#: ../src/filetransfers_window.py:294
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s wants to send you a file:"
+
+#: ../src/filetransfers_window.py:308 ../src/gtkgui_helpers.py:767
+#, python-format
+msgid "Cannot overwrite existing file \"%s\""
+msgstr "Cannot overwrite existing file \"%s\""
+
+#: ../src/filetransfers_window.py:309 ../src/gtkgui_helpers.py:769
+msgid ""
+"A file with this name already exists and you do not have permission to "
+"overwrite it."
+msgstr ""
+"A file with this name already exists and you do not have permission to "
+"overwrite it."
+
+#: ../src/filetransfers_window.py:316 ../src/gtkgui_helpers.py:773
+msgid "This file already exists"
+msgstr "This file already exists"
+
+#: ../src/filetransfers_window.py:316 ../src/gtkgui_helpers.py:773
+msgid "What do you want to do?"
+msgstr "What do you want to do?"
+
+#: ../src/filetransfers_window.py:328 ../src/gtkgui_helpers.py:783
+#, python-format
+msgid "Directory \"%s\" is not writable"
+msgstr "Directory \"%s\" is not writable"
+
+#: ../src/filetransfers_window.py:328 ../src/gtkgui_helpers.py:784
+msgid "You do not have permission to create files in this directory."
+msgstr "You do not have permission to create files in this directory."
+
+#: ../src/filetransfers_window.py:338
+msgid "Save File as..."
+msgstr "Save File as..."
+
+#. Print remaining time in format 00:00:00
+#. You can change the places of (hours), (minutes), (seconds) -
+#. they are not translatable.
+#: ../src/filetransfers_window.py:419
+#, python-format
+msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
+msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
+
+#. This should make the string Kb/s,
+#. where 'Kb' part is taken from %s.
+#. Only the 's' after / (which means second) should be translated.
+#: ../src/filetransfers_window.py:508
+#, python-format
+msgid "(%(filesize_unit)s/s)"
+msgstr "(%(filesize_unit)s/s)"
+
+#: ../src/filetransfers_window.py:547 ../src/filetransfers_window.py:550
+msgid "Invalid File"
+msgstr "Invalid File"
+
+#: ../src/filetransfers_window.py:547
+msgid "File: "
+msgstr "File: "
+
+#: ../src/filetransfers_window.py:551
+msgid "It is not possible to send empty files"
+msgstr "It is not possible to send empty files"
+
+#: ../src/filetransfers_window.py:573 ../src/tooltips.py:576
+msgid "Name: "
+msgstr "Name: "
+
+#: ../src/filetransfers_window.py:575 ../src/tooltips.py:580
+msgid "Sender: "
+msgstr "Sender: "
+
+#: ../src/filetransfers_window.py:763
+msgid "Pause"
+msgstr "Pause"
+
+#: ../src/gajim.py:50
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr ""
+
+#: ../src/gajim.py:143
+msgid "Gajim needs X server to run. Quiting..."
+msgstr "Gajim needs X server to run. Quiting..."
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above"
+msgstr "Gajim needs PyGTK 2.6 or above"
+
+#: ../src/gajim.py:148
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
+msgstr "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+
+#: ../src/gajim.py:150
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above"
+msgstr "Gajim needs GTK 2.6 or above"
+
+#: ../src/gajim.py:151
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
+msgstr "Gajim needs GTK 2.6 or above to run. Quiting..."
+
+#: ../src/gajim.py:156
+msgid "GTK+ runtime is missing libglade support"
+msgstr "GTK+ runtime is missing libglade support"
+
+#: ../src/gajim.py:158
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+
+#: ../src/gajim.py:160
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+
+#: ../src/gajim.py:165
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Gajim needs PySQLite2 to run"
+
+#: ../src/gajim.py:173
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim needs pywin32 to run"
+
+#: ../src/gajim.py:174
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:317
+msgid "Gajim is already running"
+msgstr "Gajim is already running"
+
+#: ../src/gajim.py:318
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+
+#: ../src/gajim.py:341 ../src/common/connection_handlers.py:900
+#: ../src/common/connection_handlers.py:1601
+#: ../src/common/connection_handlers.py:1629
+#: ../src/common/connection_handlers.py:1639
+#: ../src/common/connection_handlers.py:1658
+#: ../src/common/connection_handlers.py:1889
+#: ../src/common/connection_handlers.py:2001 ../src/common/connection.py:925
+msgid "Disk Write Error"
+msgstr ""
+
+#: ../src/gajim.py:434
+msgid "Do you accept this request?"
+msgstr "Do you accept this request?"
+
+#: ../src/gajim.py:437
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "HTTP (%s) Authorisation for %s (id: %s)"
+
+#: ../src/gajim.py:484 ../src/notify.py:448
+msgid "Connection Failed"
+msgstr "Connection Failed"
+
+#: ../src/gajim.py:817
+#, python-format
+msgid "Subject: %s"
+msgstr "Subject: %s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:864 ../src/gajim.py:877
+#, python-format
+msgid "error while sending %s ( %s )"
+msgstr "error while sending %s ( %s )"
+
+#: ../src/gajim.py:910
+msgid "Authorization accepted"
+msgstr "Authorisation accepted"
+
+#: ../src/gajim.py:911
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "The contact \"%s\" has authorised you to see his or her status."
+
+#: ../src/gajim.py:919
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Contact \"%s\" removed subscription from you"
+
+#: ../src/gajim.py:920
+msgid "You will always see him or her as offline."
+msgstr "You will always see him or her as offline."
+
+#: ../src/gajim.py:964
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Contact with \"%s\" cannot be established"
+
+#: ../src/gajim.py:965 ../src/common/connection.py:466
+msgid "Check your connection or try again later."
+msgstr "Check your connection or try again later."
+
+#: ../src/gajim.py:1136 ../src/roster_window.py:1348
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s is now %s (%s)"
+
+#. No status message
+#: ../src/gajim.py:1139 ../src/groupchat_control.py:1101
+#: ../src/roster_window.py:1351
+#, python-format
+msgid "%s is now %s"
+msgstr "%s is now %s"
+
+#. Can be a presence (see chg_contact_status in groupchat_contol.py)
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/gajim.py:1259 ../src/groupchat_control.py:913
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#: ../src/gajim.py:1261
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gajim.py:1263
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gajim.py:1266
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_contol.py)
+#: ../src/gajim.py:1269
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gajim.py:1271
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gajim.py:1273
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1275
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1277
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1308
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it"
+msgstr "A password is required to join this group chat."
+
+#: ../src/gajim.py:1338
+msgid "Your passphrase is incorrect"
+msgstr "Your passphrase is incorrect"
+
+#: ../src/gajim.py:1339
+msgid "You are currently connected without your OpenPGP key."
+msgstr "You are currently connected without your OpenPGP key."
+
+#: ../src/gajim.py:1443
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "New mail on %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1445
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "You have %d new mail conversation"
+msgstr[1] "You have %d new mail conversations"
+
+#. FIXME: emulate Gtalk client popups. find out what they parse and how
+#. they decide what to show
+#. each message has a 'From', 'Subject' and 'Snippet' field
+#: ../src/gajim.py:1454
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+"\n"
+"From: %(from_address)s"
+
+#: ../src/gajim.py:1665
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s wants to send you a file."
+
+#: ../src/gajim.py:1730
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "You successfully received %(filename)s from %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1734
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "File transfer of %(filename)s from %(name)s stopped."
+
+#: ../src/gajim.py:1747
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "You successfully sent %(filename)s to %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1751
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "File transfer of %(filename)s to %(name)s stopped."
+
+#: ../src/gajim.py:1846
+msgid "Session negotiation cancelled"
+msgstr ""
+
+#: ../src/gajim.py:1847
+#, python-format
+msgid "The client at %s cancelled the session negotiation."
+msgstr ""
+
+#: ../src/gajim.py:1887 ../src/gajim.py:1928
+msgid "Confirm these session options"
+msgstr ""
+
+#: ../src/gajim.py:1888
+#, python-format
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tAre these options acceptable?"
+msgstr ""
+
+#: ../src/gajim.py:1929
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
+msgstr ""
+
+#: ../src/gajim.py:2041
+msgid "Username Conflict"
+msgstr "Username Conflict"
+
+#: ../src/gajim.py:2042
+msgid "Please type a new username for your local account"
+msgstr "Please type a new username for your local account"
+
+#: ../src/gajim.py:2059
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gajim.py:2067
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gajim.py:2073
+msgid "Error."
+msgstr ""
+
+#: ../src/gajim.py:2098
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "Username Conflict"
+
+#: ../src/gajim.py:2099
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:2461
+msgid "Could not save your settings and preferences"
+msgstr "Could not save your settings and preferences"
+
+#. sorted alphanum
+#: ../src/gajim.py:2596 ../src/common/config.py:86 ../src/common/config.py:395
+#: ../src/common/optparser.py:194 ../src/common/optparser.py:412
+#: ../src/common/optparser.py:446
+#, fuzzy
+msgid "default"
+msgstr "Default"
+
+#: ../src/gajim.py:2683
+msgid "Network Manager support not available"
+msgstr "Network Manager support not available"
+
+#: ../src/gajim.py:2784
+msgid "Session Management support not available (missing gnome.ui module)"
+msgstr "Session Management support not available (missing gnome.ui module)"
+
+#: ../src/gajim-remote.py:65
+msgid "Shows a help on specific command"
+msgstr "Shows a help on specific command"
+
+#. User gets help for the command, specified by this parameter
+#: ../src/gajim-remote.py:68
+msgid "command"
+msgstr "command"
+
+#: ../src/gajim-remote.py:69
+msgid "show help on command"
+msgstr "show help on command"
+
+#: ../src/gajim-remote.py:73
+msgid "Shows or hides the roster window"
+msgstr "Shows or hides the roster window"
+
+#: ../src/gajim-remote.py:77
+msgid "Pops up a window with the next pending event"
+msgstr "Pops up a window with the next pending event"
+
+#: ../src/gajim-remote.py:81
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appears on a "
+"separate line"
+msgstr ""
+"Prints a list of all contacts in the roster. Each contact appears on a "
+"separate line"
+
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:205 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:246 ../src/gajim-remote.py:255
+msgid "account"
+msgstr "account"
+
+#: ../src/gajim-remote.py:84
+msgid "show only contacts of the given account"
+msgstr "show only contacts of the given account"
+
+#: ../src/gajim-remote.py:90
+msgid "Prints a list of registered accounts"
+msgstr "Prints a list of registered accounts"
+
+#: ../src/gajim-remote.py:94
+msgid "Changes the status of account or accounts"
+msgstr "Changes the status of account or accounts"
+
+#. offline, online, chat, away, xa, dnd, invisible should not be translated
+#: ../src/gajim-remote.py:97
+msgid "status"
+msgstr "status"
+
+#: ../src/gajim-remote.py:97
+msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+msgstr "one of: offline, online, chat, away, xa, dnd, invisible "
+
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:144
+msgid "message"
+msgstr "message"
+
+#: ../src/gajim-remote.py:98
+msgid "status message"
+msgstr "status message"
+
+#: ../src/gajim-remote.py:99
+msgid ""
+"change status of account \"account\". If not specified, try to change status "
+"of all accounts that have \"sync with global status\" option set"
+msgstr ""
+"change status of account \"account\". If not specified, try to change status "
+"of all accounts that have \"sync with global status\" option set"
+
+#: ../src/gajim-remote.py:105
+msgid "Shows the chat dialog so that you can send messages to a contact"
+msgstr "Shows the chat dialogue so that you can send messages to a contact"
+
+#: ../src/gajim-remote.py:107
+msgid "JID of the contact that you want to chat with"
+msgstr "JID of the contact that you want to chat with"
+
+#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:196
+msgid "if specified, contact is taken from the contact list of this account"
+msgstr "if specified, contact is taken from the contact list of this account"
+
+#: ../src/gajim-remote.py:114
+msgid ""
+"Sends new chat message to a contact in the roster. Both OpenPGP key and "
+"account are optional. If you want to set only 'account', without 'OpenPGP "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Sends new chat message to a contact in the roster. Both OpenPGP key and "
+"account are optional. If you want to set only 'account', without 'OpenPGP "
+"key', just set 'OpenPGP key' to ''."
+
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:131
+msgid "JID of the contact that will receive the message"
+msgstr "JID of the contact that will receive the message"
+
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144
+msgid "message contents"
+msgstr "message contents"
+
+#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134
+msgid "pgp key"
+msgstr "pgp key"
+
+#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134
+msgid "if specified, the message will be encrypted using this public key"
+msgstr "if specified, the message will be encrypted using this public key"
+
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:145
+msgid "if specified, the message will be sent using this account"
+msgstr "if specified, the message will be sent using this account"
+
+#: ../src/gajim-remote.py:127
+msgid ""
+"Sends new single message to a contact in the roster. Both OpenPGP key and "
+"account are optional. If you want to set only 'account', without 'OpenPGP "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Sends new single message to a contact in the roster. Both OpenPGP key and "
+"account are optional. If you want to set only 'account', without 'OpenPGP "
+"key', just set 'OpenPGP key' to ''."
+
+#: ../src/gajim-remote.py:132
+msgid "subject"
+msgstr "subject"
+
+#: ../src/gajim-remote.py:132
+msgid "message subject"
+msgstr "message subject"
+
+#: ../src/gajim-remote.py:141
+msgid "Sends new message to a groupchat you've joined."
+msgstr ""
+
+#: ../src/gajim-remote.py:143
+#, fuzzy
+msgid "JID of the room that will receive the message"
+msgstr "JID of the contact that will receive the message"
+
+#: ../src/gajim-remote.py:150
+msgid "Gets detailed info on a contact"
+msgstr "Gets detailed info on a contact"
+
+#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:165
+#: ../src/gajim-remote.py:195 ../src/gajim-remote.py:204
+msgid "JID of the contact"
+msgstr "JID of the contact"
+
+#: ../src/gajim-remote.py:156
+msgid "Gets detailed info on a account"
+msgstr "Gets detailed info on a account"
+
+#: ../src/gajim-remote.py:158
+msgid "Name of the account"
+msgstr "Name of the account"
+
+#: ../src/gajim-remote.py:162
+msgid "Sends file to a contact"
+msgstr "Sends file to a contact"
+
+#: ../src/gajim-remote.py:164
+msgid "file"
+msgstr "file"
+
+#: ../src/gajim-remote.py:164
+msgid "File path"
+msgstr "File path"
+
+#: ../src/gajim-remote.py:166
+msgid "if specified, file will be sent using this account"
+msgstr "if specified, file will be sent using this account"
+
+#: ../src/gajim-remote.py:171
+msgid "Lists all preferences and their values"
+msgstr "Lists all preferences and their values"
+
+#: ../src/gajim-remote.py:175
+msgid "Sets value of 'key' to 'value'."
+msgstr "Sets value of 'key' to 'value'."
+
+#: ../src/gajim-remote.py:177
+msgid "key=value"
+msgstr "key=value"
+
+#: ../src/gajim-remote.py:177
+msgid "'key' is the name of the preference, 'value' is the value to set it to"
+msgstr "'key' is the name of the preference, 'value' is the value to set it to"
+
+#: ../src/gajim-remote.py:182
+msgid "Deletes a preference item"
+msgstr "Deletes a preference item"
+
+#: ../src/gajim-remote.py:184
+msgid "key"
+msgstr "key"
+
+#: ../src/gajim-remote.py:184
+msgid "name of the preference to be deleted"
+msgstr "name of the preference to be deleted"
+
+#: ../src/gajim-remote.py:188
+msgid "Writes the current state of Gajim preferences to the .config file"
+msgstr "Writes the current state of Gajim preferences to the .config file"
+
+#: ../src/gajim-remote.py:193
+msgid "Removes contact from roster"
+msgstr "Removes contact from roster"
+
+#: ../src/gajim-remote.py:202
+msgid "Adds contact to roster"
+msgstr "Adds contact to roster"
+
+#: ../src/gajim-remote.py:204
+msgid "jid"
+msgstr "jid"
+
+#: ../src/gajim-remote.py:205
+msgid "Adds new contact to this account"
+msgstr "Adds new contact to this account"
+
+#: ../src/gajim-remote.py:210
+msgid "Returns current status (the global one unless account is specified)"
+msgstr "Returns current status (the global one unless account is specified)"
+
+#: ../src/gajim-remote.py:217
+msgid ""
+"Returns current status message(the global one unless account is specified)"
+msgstr ""
+"Returns current status message(the global one unless account is specified)"
+
+#: ../src/gajim-remote.py:224
+msgid "Returns number of unread messages"
+msgstr "Returns number of unread messages"
+
+#: ../src/gajim-remote.py:228
+msgid "Opens 'Start Chat' dialog"
+msgstr "Opens 'Start Chat' dialogue"
+
+#: ../src/gajim-remote.py:230
+msgid "Starts chat, using this account"
+msgstr "Starts chat, using this account"
+
+#: ../src/gajim-remote.py:234
+msgid "Sends custom XML"
+msgstr "Sends custom XML"
+
+#: ../src/gajim-remote.py:236
+msgid "XML to send"
+msgstr "XML to send"
+
+#: ../src/gajim-remote.py:237
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+
+#: ../src/gajim-remote.py:243
+msgid "Handle a xmpp:/ uri"
+msgstr "Handle a xmpp:/ uri"
+
+#: ../src/gajim-remote.py:245
+msgid "uri"
+msgstr "uri"
+
+#: ../src/gajim-remote.py:250
+msgid "Join a MUC room"
+msgstr "Join a MUC room"
+
+#: ../src/gajim-remote.py:252
+msgid "room"
+msgstr "room"
+
+#: ../src/gajim-remote.py:253
+msgid "nick"
+msgstr "nick"
+
+#: ../src/gajim-remote.py:254
+msgid "password"
+msgstr "password"
+
+#: ../src/gajim-remote.py:277
+msgid "Missing argument \"contact_jid\""
+msgstr "Missing argument \"contact_jid\""
+
+#: ../src/gajim-remote.py:296
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+
+#: ../src/gajim-remote.py:299
+msgid "You have no active account"
+msgstr "You have no active account"
+
+#: ../src/gajim-remote.py:363
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
+"Usage: %s %s %s \n"
+"\t %s"
+
+#: ../src/gajim-remote.py:366
+msgid "Arguments:"
+msgstr "Arguments:"
+
+#: ../src/gajim-remote.py:370
+#, python-format
+msgid "%s not found"
+msgstr "%s not found"
+
+#: ../src/gajim-remote.py:374
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
+msgstr ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
+
+#: ../src/gajim-remote.py:447
+#, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+
+#: ../src/gajim-remote.py:451
+#, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+
+#: ../src/gajim-remote.py:469
+msgid "Wrong uri"
+msgstr "Wrong uri"
+
+#: ../src/gajim_themes_window.py:62
+msgid "Theme"
+msgstr "Theme"
+
+#: ../src/gajim_themes_window.py:100
+#, fuzzy
+msgid "You cannot make changes to the default theme"
+msgstr "You cannot delete your current theme"
+
+#: ../src/gajim_themes_window.py:101
+msgid "Please create a clean new theme with your desired name."
+msgstr ""
+
+#. don't confuse translators
+#: ../src/gajim_themes_window.py:175
+msgid "theme name"
+msgstr "theme name"
+
+#: ../src/gajim_themes_window.py:192
+msgid "You cannot delete your current theme"
+msgstr "You cannot delete your current theme"
+
+#: ../src/gajim_themes_window.py:193
+msgid "Please first choose another for your current theme."
+msgstr "Please first choose another for your current theme."
+
+#: ../src/groupchat_control.py:134
+msgid "Sending private message failed"
+msgstr "Sending private message failed"
+
+#. in second %s code replaces with nickname
+#: ../src/groupchat_control.py:136
+#, python-format
+msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
+msgstr "You are no longer in group chat \"%s\" or \"%s\" has left."
+
+#: ../src/groupchat_control.py:342
+msgid "Insert Nickname"
+msgstr "Insert Nickname"
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:916
+msgid "Room logging is enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:918
+#, fuzzy
+msgid "A new room has been created"
+msgstr "Your new account has been successfully created"
+
+#: ../src/groupchat_control.py:921
+msgid "The server has assigned or modified your roomnick"
+msgstr ""
+
+#. do not print 'kicked by None'
+#: ../src/groupchat_control.py:927
+#, python-format
+msgid "%(nick)s has been kicked: %(reason)s"
+msgstr "%(nick)s has been kicked: %(reason)s"
+
+#: ../src/groupchat_control.py:931
+#, python-format
+msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
+msgstr "%(nick)s has been kicked by %(who)s: %(reason)s"
+
+#. do not print 'banned by None'
+#: ../src/groupchat_control.py:938
+#, python-format
+msgid "%(nick)s has been banned: %(reason)s"
+msgstr "%(nick)s has been banned: %(reason)s"
+
+#: ../src/groupchat_control.py:942
+#, python-format
+msgid "%(nick)s has been banned by %(who)s: %(reason)s"
+msgstr "%(nick)s has been banned by %(who)s: %(reason)s"
+
+#. Someone changed his or her nick
+#. We changed our nick
+#: ../src/groupchat_control.py:949
+#, python-format
+msgid "You are now known as %s"
+msgstr "You are now known as %s"
+
+#: ../src/groupchat_control.py:951
+#, python-format
+msgid "%s is now known as %s"
+msgstr "%s is now known as %s"
+
+#: ../src/groupchat_control.py:984 ../src/groupchat_control.py:988
+#: ../src/groupchat_control.py:993
+#, fuzzy, python-format
+msgid "%(nick)s has been removed from the room (%(reason)s)"
+msgstr "%(nick)s has been kicked by %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:985
+#, fuzzy
+msgid "affiliation changed"
+msgstr "Affiliation:"
+
+#: ../src/groupchat_control.py:990
+msgid "room configuration changed to members-only"
+msgstr ""
+
+#: ../src/groupchat_control.py:995
+msgid "system shutdown"
+msgstr ""
+
+#: ../src/groupchat_control.py:1094
+#, python-format
+msgid "%s has left"
+msgstr "%s has left"
+
+#: ../src/groupchat_control.py:1099
+#, python-format
+msgid "%s has joined the group chat"
+msgstr "%s has joined the group chat"
+
+#. Invalid Nickname
+#. invalid char
+#: ../src/groupchat_control.py:1212 ../src/groupchat_control.py:1491
+#, fuzzy
+msgid "Invalid nickname"
+msgstr "Invalid username"
+
+#: ../src/groupchat_control.py:1213 ../src/groupchat_control.py:1492
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr "The group chat Jabber ID has invalid characters."
+
+#: ../src/groupchat_control.py:1236 ../src/groupchat_control.py:1254
+#: ../src/groupchat_control.py:1338 ../src/groupchat_control.py:1355
+#, python-format
+msgid "Nickname not found: %s"
+msgstr "Nickname not found: %s"
+
+#: ../src/groupchat_control.py:1270
+msgid "This group chat has no subject"
+msgstr "This group chat has no subject"
+
+#: ../src/groupchat_control.py:1281
+#, python-format
+msgid "Invited %(contact_jid)s to %(room_jid)s."
+msgstr "Invited %(contact_jid)s to %(room_jid)s."
+
+#: ../src/groupchat_control.py:1418
+#, python-format
+msgid ""
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
+msgstr ""
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
+
+#: ../src/groupchat_control.py:1425
+#, python-format
+msgid ""
+"Usage: /%s <nickname>, opens a private chat window with the specified "
+"occupant."
+msgstr ""
+"Usage: /%s <nickname>, opens a private chat window with the specified "
+"occupant."
+
+#: ../src/groupchat_control.py:1431
+#, python-format
+msgid ""
+"Usage: /%s [reason], closes the current window or tab, displaying reason if "
+"specified."
+msgstr ""
+"Usage: /%s [reason], closes the current window or tab, displaying reason if "
+"specified."
+
+#: ../src/groupchat_control.py:1437
+#, python-format
+msgid ""
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
+"providing a reason."
+msgstr ""
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
+"providing a reason."
+
+#: ../src/groupchat_control.py:1441
+#, python-format
+msgid ""
+"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
+"using specified nickname."
+msgstr ""
+"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
+"using specified nickname."
+
+#: ../src/groupchat_control.py:1445
+#, python-format
+msgid ""
+"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
+msgstr ""
+"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
+
+#: ../src/groupchat_control.py:1454
+#, python-format
+msgid ""
+"Usage: /%s <nickname> [message], opens a private message window and sends "
+"message to the occupant specified by nickname."
+msgstr ""
+"Usage: /%s <nickname> [message], opens a private message window and sends "
+"message to the occupant specified by nickname."
+
+#: ../src/groupchat_control.py:1459
+#, python-format
+msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+msgstr "Usage: /%s <nickname>, changes your nickname in current group chat."
+
+#: ../src/groupchat_control.py:1463
+#, python-format
+msgid "Usage: /%s , display the names of group chat occupants."
+msgstr "Usage: /%s , display the names of group chat occupants."
+
+#: ../src/groupchat_control.py:1467
+#, python-format
+msgid "Usage: /%s [topic], displays or updates the current group chat topic."
+msgstr "Usage: /%s [topic], displays or updates the current group chat topic."
+
+#: ../src/groupchat_control.py:1470
+#, python-format
+msgid ""
+"Usage: /%s <message>, sends a message without looking for other commands."
+msgstr ""
+"Usage: /%s <message>, sends a message without looking for other commands."
+
+#: ../src/groupchat_control.py:1565
+#, python-format
+msgid "Are you sure you want to leave group chat \"%s\"?"
+msgstr "Are you sure you want to leave group chat \"%s\"?"
+
+#: ../src/groupchat_control.py:1567
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
+msgstr ""
+"If you close this window, you will be disconnected from this group chat."
+
+#: ../src/groupchat_control.py:1571 ../src/roster_window.py:4836
+msgid "Do _not ask me again"
+msgstr "Do _not ask me again"
+
+#: ../src/groupchat_control.py:1605
+msgid "Changing Subject"
+msgstr "Changing Subject"
+
+#: ../src/groupchat_control.py:1606
+msgid "Please specify the new subject:"
+msgstr "Please specify the new subject:"
+
+#: ../src/groupchat_control.py:1615
+msgid "Changing Nickname"
+msgstr "Changing Nickname"
+
+#: ../src/groupchat_control.py:1616
+msgid "Please specify the new nickname you want to use:"
+msgstr "Please specify the new nickname you want to use:"
+
+#. Ask for a reason
+#: ../src/groupchat_control.py:1631
+#, fuzzy, python-format
+msgid "Destroying %s"
+msgstr "Description: %s"
+
+#: ../src/groupchat_control.py:1632
+msgid ""
+"You are going to definitively destroy this room.\n"
+"You may specify a reason below:"
+msgstr ""
+
+#: ../src/groupchat_control.py:1634
+msgid "You may also enter an alternate venue:"
+msgstr ""
+
+#: ../src/groupchat_control.py:1665
+msgid "Bookmark already set"
+msgstr "Bookmark already set"
+
+#: ../src/groupchat_control.py:1666
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Group Chat \"%s\" is already in your bookmarks."
+
+#: ../src/groupchat_control.py:1675
+msgid "Bookmark has been added successfully"
+msgstr "Bookmark has been added successfully"
+
+#: ../src/groupchat_control.py:1676
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "You can manage your bookmarks via Actions menu in your roster."
+
+#. ask for reason
+#: ../src/groupchat_control.py:1828
+#, python-format
+msgid "Kicking %s"
+msgstr "Kicking %s"
+
+#: ../src/groupchat_control.py:1829 ../src/groupchat_control.py:2129
+msgid "You may specify a reason below:"
+msgstr "You may specify a reason below:"
+
+#. ask for reason
+#: ../src/groupchat_control.py:2128
+#, python-format
+msgid "Banning %s"
+msgstr "Banning %s"
+
+#: ../src/gtkexcepthook.py:41
+msgid "A programming error has been detected"
+msgstr "A programming error has been detected"
+
+#: ../src/gtkexcepthook.py:42
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
+msgstr ""
+"It is probably not fatal, but should be reported to the developers "
+"nonetheless."
+
+#: ../src/gtkexcepthook.py:48
+msgid "_Report Bug"
+msgstr "_Report Bug"
+
+#: ../src/gtkexcepthook.py:71
+msgid "Details"
+msgstr "Details"
+
+#. we talk about file
+#: ../src/gtkgui_helpers.py:157 ../src/gtkgui_helpers.py:172
+#, python-format
+msgid "Error: cannot open %s for reading"
+msgstr "Error: cannot open %s for reading"
+
+#: ../src/gtkgui_helpers.py:337
+msgid "Error reading file:"
+msgstr "Error reading file:"
+
+#: ../src/gtkgui_helpers.py:340
+msgid "Error parsing file:"
+msgstr "Error parsing file:"
+
+#. do not traceback (could be a permission problem)
+#. we talk about a file here
+#: ../src/gtkgui_helpers.py:377
+#, python-format
+msgid "Could not write to %s. Session Management support will not work"
+msgstr "Could not write to %s. Session Management support will not work"
+
+#. xmpp: is currently handled by another program, so ask the user
+#: ../src/gtkgui_helpers.py:711
+msgid "Gajim is not the default Jabber client"
+msgstr "Gajim is not the default Jabber client"
+
+#: ../src/gtkgui_helpers.py:712
+msgid "Would you like to make Gajim the default Jabber client?"
+msgstr "Would you like to make Gajim the default Jabber client?"
+
+#: ../src/gtkgui_helpers.py:713
+msgid "Always check to see if Gajim is the default Jabber client on startup"
+msgstr "Always check to see if Gajim is the default Jabber client on startup"
+
+#: ../src/gtkgui_helpers.py:812
+msgid "Extension not supported"
+msgstr "Extension not supported"
+
+#: ../src/gtkgui_helpers.py:813
+#, python-format
+msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
+msgstr "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
+
+#: ../src/gtkgui_helpers.py:822
+msgid "Save Image as..."
+msgstr "Save Image as..."
+
+#: ../src/history_manager.py:68
+msgid "Cannot find history logs database"
+msgstr "Cannot find history logs database"
+
+#. holds jid
+#: ../src/history_manager.py:108
+msgid "Contacts"
+msgstr "Contacts"
+
+#. holds time
+#: ../src/history_manager.py:121 ../src/history_manager.py:161
+#: ../src/history_window.py:116
+msgid "Date"
+msgstr "Date"
+
+#. holds nickname
+#: ../src/history_manager.py:127 ../src/history_manager.py:179
+msgid "Nickname"
+msgstr "Nickname"
+
+#. holds message
+#: ../src/history_manager.py:135 ../src/history_manager.py:167
+#: ../src/history_window.py:124
+msgid "Message"
+msgstr "Message"
+
+#: ../src/history_manager.py:187
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
+msgstr ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
+
+#: ../src/history_manager.py:189
+msgid ""
+"Normally allocated database size will not be freed, it will just become "
+"reusable. If you really want to reduce database filesize, click YES, else "
+"click NO.\n"
+"\n"
+"In case you click YES, please wait..."
+msgstr ""
+"Normally allocated database size will not be freed, it will just become "
+"reusable. If you really want to reduce database filesize, click YES, "
+"otherwise click NO.\n"
+"\n"
+"In case you click YES, please wait..."
+
+#: ../src/history_manager.py:401
+msgid "Exporting History Logs..."
+msgstr "Exporting History Logs..."
+
+#: ../src/history_manager.py:476
+#, python-format
+msgid "%(who)s on %(time)s said: %(message)s\n"
+msgstr "%(who)s on %(time)s said: %(message)s\n"
+
+#: ../src/history_manager.py:514
+msgid "Do you really want to delete logs of the selected contact?"
+msgid_plural "Do you really want to delete logs of the selected contacts?"
+msgstr[0] "Do you really want to delete the logs of the selected contact?"
+msgstr[1] "Do you really want to delete the logs of the selected contacts?"
+
+#: ../src/history_manager.py:518 ../src/history_manager.py:554
+msgid "This is an irreversible operation."
+msgstr "This is an irreversible operation."
+
+#: ../src/history_manager.py:551
+msgid "Do you really want to delete the selected message?"
+msgid_plural "Do you really want to delete the selected messages?"
+msgstr[0] "Do you really want to delete the selected message?"
+msgstr[1] "Do you really want to delete the selected messages?"
+
+#: ../src/history_window.py:185 ../src/history_window.py:187
+#, python-format
+msgid "Conversation History with %s"
+msgstr "Conversation History with %s"
+
+#: ../src/history_window.py:332
+#, python-format
+msgid "%(nick)s is now %(status)s: %(status_msg)s"
+msgstr "%(nick)s is now %(status)s: %(status_msg)s"
+
+#: ../src/history_window.py:336 ../src/notify.py:206
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s is now %(status)s"
+
+#: ../src/history_window.py:342
+#, python-format
+msgid "Status is now: %(status)s: %(status_msg)s"
+msgstr "Status is now: %(status)s: %(status_msg)s"
+
+#: ../src/history_window.py:345
+#, python-format
+msgid "Status is now: %(status)s"
+msgstr "Status is now: %(status)s"
+
+#: ../src/htmltextview.py:583 ../src/htmltextview.py:594
+#, fuzzy
+msgid "Timeout loading image"
+msgstr "Could not load image"
+
+#: ../src/htmltextview.py:604
+msgid "Image is too big"
+msgstr ""
+
+#: ../src/message_window.py:288
+msgid "Chats"
+msgstr "Chats"
+
+#: ../src/message_window.py:290
+msgid "Group Chats"
+msgstr "Group Chats"
+
+#: ../src/message_window.py:292
+msgid "Private Chats"
+msgstr "Private Chats"
+
+#: ../src/message_window.py:294
+msgid "Messages"
+msgstr "Messages"
+
+#: ../src/message_window.py:295
+#, python-format
+msgid "%s - Gajim"
+msgstr "%s - Gajim"
+
+#: ../src/notify.py:204
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s Changed Status"
+
+#: ../src/notify.py:214
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s Signed In"
+
+#: ../src/notify.py:222
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s Signed Out"
+
+#: ../src/notify.py:234
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "New Single Message from %(nickname)s"
+
+#: ../src/notify.py:242
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "New Private Message from group chat %s"
+
+#: ../src/notify.py:244
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/notify.py:247
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "New Message from %(nickname)s"
+
+#: ../src/notify.py:253
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "New Message from %(nickname)s"
+
+#: ../src/profile_window.py:72
+msgid "Retrieving profile..."
+msgstr "Retrieving profile..."
+
+#: ../src/profile_window.py:123 ../src/roster_window.py:1882
+#, fuzzy
+msgid "File is empty"
+msgstr "File path"
+
+#: ../src/profile_window.py:126 ../src/roster_window.py:1885
+#, fuzzy
+msgid "File does not exist"
+msgstr "Such group chat does not exist."
+
+#. keep identation
+#. unknown format
+#: ../src/profile_window.py:140 ../src/profile_window.py:156
+#: ../src/roster_window.py:1887 ../src/roster_window.py:1898
+msgid "Could not load image"
+msgstr "Could not load image"
+
+#: ../src/profile_window.py:257
+msgid "Information received"
+msgstr "Information received"
+
+#: ../src/profile_window.py:326
+msgid "Without a connection you can not publish your contact information."
+msgstr "Without a connection you can not publish your contact information."
+
+#: ../src/profile_window.py:338
+msgid "Sending profile..."
+msgstr "Sending profile..."
+
+#: ../src/profile_window.py:353
+msgid "Information NOT published"
+msgstr "Information NOT published"
+
+#: ../src/profile_window.py:360
+msgid "vCard publication failed"
+msgstr "vCard publication failed"
+
+#: ../src/profile_window.py:361
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"There was an error while publishing your personal information, try again "
+"later."
+
+#: ../src/roster_window.py:182 ../src/roster_window.py:237
+msgid "Merged accounts"
+msgstr "Apjungtos prieigos"
+
+#: ../src/roster_window.py:357 ../src/roster_window.py:622
+#: ../src/roster_window.py:2110 ../src/common/contacts.py:307
+#: ../src/common/helpers.py:44
+msgid "Observers"
+msgstr "Observers"
+
+#. Make special context menu if group is Groupchats
+#: ../src/roster_window.py:441 ../src/roster_window.py:446
+#: ../src/roster_window.py:1935 ../src/roster_window.py:1938
+#: ../src/roster_window.py:2607 ../src/roster_window.py:2610
+#: ../src/roster_window.py:2635 ../src/roster_window.py:4696
+#: ../src/roster_window.py:4698 ../src/common/commands.py:194
+#: ../src/common/contacts.py:97 ../src/common/helpers.py:44
+msgid "Groupchats"
+msgstr "Groupchats"
+
+#: ../src/roster_window.py:771 ../src/roster_window.py:3952
+msgid "You cannot join a group chat while you are invisible"
+msgstr "You cannot join a group chat while you are invisible"
+
+#. new chat
+#. single message
+#. for chat_with
+#. for single message
+#. join gc
+#: ../src/roster_window.py:984 ../src/roster_window.py:994
+#: ../src/roster_window.py:1003 ../src/systray.py:207 ../src/systray.py:212
+#: ../src/systray.py:218
+#, python-format
+msgid "using account %s"
+msgstr "using account %s"
+
+#. add
+#: ../src/roster_window.py:1010
+#, python-format
+msgid "to %s account"
+msgstr "to %s account"
+
+#. disco
+#: ../src/roster_window.py:1015
+#, python-format
+msgid "using %s account"
+msgstr "using %s account"
+
+#: ../src/roster_window.py:1096
+msgid "_Manage Bookmarks..."
+msgstr "_Manage Bookmarks..."
+
+#. profile, avatar
+#: ../src/roster_window.py:1115
+#, python-format
+msgid "of account %s"
+msgstr "of account %s"
+
+#: ../src/roster_window.py:1155
+#, python-format
+msgid "for account %s"
+msgstr "for account %s"
+
+#. History manager
+#: ../src/roster_window.py:1176
+msgid "History Manager"
+msgstr "History Manager"
+
+#: ../src/roster_window.py:1185
+msgid "_Join New Group Chat"
+msgstr "_Join New Group Chat"
+
+#: ../src/roster_window.py:1544 ../src/roster_window.py:4150
+#: ../src/roster_window.py:4157
+msgid "You have unread messages"
+msgstr "You have unread messages"
+
+#: ../src/roster_window.py:1545
+msgid "You must read them before removing this transport."
+msgstr "You must read them before removing this transport."
+
+#: ../src/roster_window.py:1548
+#, python-format
+msgid "Transport \"%s\" will be removed"
+msgstr "Transport \"%s\" will be removed"
+
+#: ../src/roster_window.py:1549
+msgid ""
+"You will no longer be able to send and receive messages from contacts using "
+"this transport."
+msgstr ""
+"You will no longer be able to send and receive messages from contacts using "
+"this transport."
+
+#: ../src/roster_window.py:1552
+msgid "Transports will be removed"
+msgstr "Transports will be removed"
+
+#: ../src/roster_window.py:1557
+#, python-format
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+
+#. it's jid
+#: ../src/roster_window.py:1723
+msgid "Rename Contact"
+msgstr "Rename Contact"
+
+#: ../src/roster_window.py:1724
+#, python-format
+msgid "Enter a new nickname for contact %s"
+msgstr "Enter a new nickname for contact %s"
+
+#: ../src/roster_window.py:1731
+msgid "Rename Group"
+msgstr "Rename Group"
+
+#: ../src/roster_window.py:1732
+#, python-format
+msgid "Enter a new name for group %s"
+msgstr "Enter a new name for group %s"
+
+#: ../src/roster_window.py:1807
+msgid "Remove Group"
+msgstr "Remove Group"
+
+#: ../src/roster_window.py:1808
+#, python-format
+msgid "Do you want to remove group %s from the roster?"
+msgstr "Do you want to remove group %s from the roster?"
+
+#: ../src/roster_window.py:1809
+msgid "Remove also all contacts in this group from your roster"
+msgstr "Remove also all contacts in this group from your roster"
+
+#: ../src/roster_window.py:1840
+msgid "Assign OpenPGP Key"
+msgstr "Assign OpenPGP Key"
+
+#: ../src/roster_window.py:1841
+msgid "Select a key to apply to the contact"
+msgstr "Select a key to apply to the contact"
+
+#: ../src/roster_window.py:2156
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "New Group Chat"
+
+#: ../src/roster_window.py:2298
+msgid "I would like to add you to my roster"
+msgstr "I would like to add you to my roster"
+
+#. Send Group Message
+#: ../src/roster_window.py:2432 ../src/roster_window.py:2644
+msgid "Send Group M_essage"
+msgstr "Send Group M_essage"
+
+#: ../src/roster_window.py:2451
+msgid "_New group chat"
+msgstr "_New group chat"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:2489
+#, fuzzy
+msgid "_Manage Contacts"
+msgstr "Rename Contact"
+
+#: ../src/roster_window.py:2550
+msgid "_Maximize"
+msgstr ""
+
+#: ../src/roster_window.py:2557
+#, fuzzy
+msgid "_Disconnect"
+msgstr "Contact Disconnected"
+
+#: ../src/roster_window.py:2636
+msgid "_Maximize All"
+msgstr ""
+
+#: ../src/roster_window.py:2652
+msgid "To all users"
+msgstr "Visiems"
+
+#: ../src/roster_window.py:2655
+msgid "To all online users"
+msgstr "Visiems prisijungusiems"
+
+#. Log Off
+#: ../src/roster_window.py:2772
+#, fuzzy
+msgid "_Log off"
+msgstr "_Atsijungti"
+
+#. Log on
+#: ../src/roster_window.py:2778
+msgid "_Log on"
+msgstr "_Prisijungti"
+
+#. Send single message
+#: ../src/roster_window.py:2790
+#, fuzzy
+msgid "Send Single Message"
+msgstr "_Siųsti vieną žinutę"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:2837
+#, fuzzy
+msgid "_Manage Transport"
+msgstr "Transports"
+
+#. Modify Transport
+#: ../src/roster_window.py:2845
+#, fuzzy
+msgid "_Modify Transport"
+msgstr "Rodyti _Pernašas"
+
+#. Information
+#: ../src/roster_window.py:2882
+#, fuzzy
+msgid "_Information"
+msgstr "Asmens Informacija"
+
+#: ../src/roster_window.py:2959 ../src/roster_window.py:3033
+msgid "_Change Status Message"
+msgstr "_Keisti Būklės Žinutę"
+
+#: ../src/roster_window.py:3105
+msgid "Authorization has been sent"
+msgstr "Authorisation has been sent"
+
+#: ../src/roster_window.py:3106
+#, python-format
+msgid "Now \"%s\" will know your status."
+msgstr "Dabar \"%s\" žinos apie jūsų būklę."
+
+#: ../src/roster_window.py:3126
+msgid "Subscription request has been sent"
+msgstr "Subscription request has been sent"
+
+#: ../src/roster_window.py:3127
+#, python-format
+msgid "If \"%s\" accepts this request you will know his or her status."
+msgstr "If \"%s\" accepts this request you will know his or her status."
+
+#: ../src/roster_window.py:3139
+msgid "Authorization has been removed"
+msgstr "Authorisation has been removed"
+
+#: ../src/roster_window.py:3140
+#, python-format
+msgid "Now \"%s\" will always see you as offline."
+msgstr "Now \"%s\" will always see you as offline."
+
+#: ../src/roster_window.py:3338
+#, python-format
+msgid "Contact \"%s\" will be removed from your roster"
+msgstr "Contact \"%s\" will be removed from your roster"
+
+#: ../src/roster_window.py:3342
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"By removing this contact you also remove authorisation resulting in him or "
+"her always seeing you as offline."
+
+#: ../src/roster_window.py:3347
+msgid ""
+"By removing this contact you also by default remove authorization resulting "
+"in him or her always seeing you as offline."
+msgstr ""
+"By removing this contact you also by default remove authorisation resulting "
+"in him or her always seeing you as offline."
+
+#: ../src/roster_window.py:3350
+msgid "I want this contact to know my status after removal"
+msgstr "I want this contact to know my status after removal"
+
+#. several contact to remove at the same time
+#: ../src/roster_window.py:3354
+msgid "Contacts will be removed from your roster"
+msgstr "Contacts will be removed from your roster"
+
+#: ../src/roster_window.py:3358
+#, python-format
+msgid ""
+"By removing these contacts:%s\n"
+"you also remove authorization resulting in them always seeing you as offline."
+msgstr ""
+"By removing these contacts:%s\n"
+"you also remove authorisation resulting in them always seeing you as offline."
+
+#: ../src/roster_window.py:3390
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
+msgstr ""
+"Gnomekeyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
+
+#: ../src/roster_window.py:3417
+msgid "GPG is not usable"
+msgstr ""
+
+#. %s is the account name here
+#: ../src/roster_window.py:3417 ../src/common/connection.py:684
+#: ../src/common/zeroconf/connection_zeroconf.py:165
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "You will be connected to %s without OpenPGP."
+
+#: ../src/roster_window.py:3434
+msgid "Passphrase Required"
+msgstr "Passphrase Required"
+
+#: ../src/roster_window.py:3435
+#, python-format
+msgid "Enter GPG key passphrase for account %s."
+msgstr "Enter GPG key passphrase for account %s."
+
+#: ../src/roster_window.py:3440
+msgid "Save passphrase"
+msgstr "Save passphrase"
+
+#: ../src/roster_window.py:3448
+msgid "Wrong Passphrase"
+msgstr "Wrong Passphrase"
+
+#: ../src/roster_window.py:3449
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Please retype your GPG passphrase or press Cancel."
+
+#: ../src/roster_window.py:3532 ../src/roster_window.py:3609
+msgid "You are participating in one or more group chats"
+msgstr "You are participating in one or more group chats"
+
+#: ../src/roster_window.py:3533 ../src/roster_window.py:3610
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+msgstr ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+
+#: ../src/roster_window.py:3567
+msgid "No account available"
+msgstr "No account available"
+
+#: ../src/roster_window.py:3568
+msgid "You must create an account before you can chat with other contacts."
+msgstr "You must create an account before you can chat with other contacts."
+
+#: ../src/roster_window.py:3696
+#, python-format
+msgid "\"%(title)s\" by %(artist)s"
+msgstr "\"%(title)s\" by %(artist)s"
+
+#: ../src/roster_window.py:4151 ../src/roster_window.py:4158
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled."
+msgstr ""
+"Messages will only be available for reading them later if you have history "
+"enabled."
+
+#: ../src/roster_window.py:4782
+msgid "Metacontacts storage not supported by your server"
+msgstr "Metacontacts storage not supported by your server"
+
+#: ../src/roster_window.py:4784
+#, fuzzy
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be saved on next reconnection."
+msgstr ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be save on next reconnection."
+
+#: ../src/roster_window.py:4830
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+
+#: ../src/roster_window.py:4832
+msgid ""
+"Metacontacts are a way to regroup several contacts in one line. Generally it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+msgstr ""
+"Metacontacts are a way to regroup several contacts in one line. Generally it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+
+#: ../src/roster_window.py:4930
+#, fuzzy, python-format
+msgid "Do you want to send that file to %s:"
+msgid_plural "Do you want to send those files to %s:"
+msgstr[0] "%s wants to send you a file:"
+msgstr[1] "%s wants to send you a file:"
+
+#: ../src/roster_window.py:5212
+msgid "Change Status Message..."
+msgstr "Change Status Message..."
+
+#: ../src/systray.py:164
+msgid "_Change Status Message..."
+msgstr "_Change Status Message..."
+
+#: ../src/systray.py:249
+msgid "Hide this menu"
+msgstr "Hide this menu"
+
+#: ../src/tooltips.py:310 ../src/tooltips.py:503
+msgid "Jabber ID: "
+msgstr "Jabber ID: "
+
+#: ../src/tooltips.py:313 ../src/tooltips.py:507
+msgid "Resource: "
+msgstr "Resource: "
+
+#: ../src/tooltips.py:318
+#, python-format
+msgid "%(owner_or_admin_or_member)s of this group chat"
+msgstr "%(owner_or_admin_or_member)s of this group chat"
+
+#: ../src/tooltips.py:416
+msgid " [blocked]"
+msgstr ""
+
+#: ../src/tooltips.py:420
+msgid " [minimized]"
+msgstr ""
+
+#: ../src/tooltips.py:435 ../src/tooltips.py:623
+msgid "Status: "
+msgstr "Status: "
+
+#: ../src/tooltips.py:465
+#, python-format
+msgid "Last status: %s"
+msgstr "Last status: %s"
+
+#: ../src/tooltips.py:467
+#, python-format
+msgid " since %s"
+msgstr " since %s"
+
+#: ../src/tooltips.py:485
+#, fuzzy
+msgid "Connected"
+msgstr "Prisijungimas"
+
+#: ../src/tooltips.py:487
+#, fuzzy
+msgid "Disconnected"
+msgstr "Contact Disconnected"
+
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:514
+msgid "Subscription: "
+msgstr "Subscription: "
+
+#: ../src/tooltips.py:524
+msgid "OpenPGP: "
+msgstr "OpenPGP: "
+
+#: ../src/tooltips.py:579
+msgid "Download"
+msgstr "Download"
+
+#: ../src/tooltips.py:585
+msgid "Upload"
+msgstr "Upload"
+
+#: ../src/tooltips.py:592
+msgid "Type: "
+msgstr "Type: "
+
+#: ../src/tooltips.py:598
+msgid "Transferred: "
+msgstr "Transferred: "
+
+#: ../src/tooltips.py:601 ../src/tooltips.py:622
+msgid "Not started"
+msgstr "Not started"
+
+#: ../src/tooltips.py:605
+msgid "Stopped"
+msgstr "Stopped"
+
+#: ../src/tooltips.py:607 ../src/tooltips.py:610
+msgid "Completed"
+msgstr "Completed"
+
+#: ../src/tooltips.py:614
+msgid "?transfer status:Paused"
+msgstr "Paused"
+
+#. stalled is not paused. it is like 'frozen' it stopped alone
+#: ../src/tooltips.py:618
+msgid "Stalled"
+msgstr "Stalled"
+
+#: ../src/tooltips.py:620
+msgid "Transferring"
+msgstr "Transferring"
+
+#: ../src/tooltips.py:652
+msgid "This service has not yet responded with detailed information"
+msgstr "This service has not yet responded with detailed information"
+
+#: ../src/tooltips.py:655
+msgid ""
+"This service could not respond with detailed information.\n"
+"It is most likely legacy or broken"
+msgstr ""
+"This service could not respond with detailed information.\n"
+"It is most likely legacy or broken"
+
+#: ../src/vcard.py:240
+msgid "?Client:Unknown"
+msgstr "Unknown"
+
+#: ../src/vcard.py:242
+msgid "?OS:Unknown"
+msgstr "Unknown"
+
+#: ../src/vcard.py:267 ../src/vcard.py:277 ../src/vcard.py:467
+#, python-format
+msgid "since %s"
+msgstr "since %s"
+
+#: ../src/vcard.py:306
+msgid "Affiliation:"
+msgstr "Affiliation:"
+
+#: ../src/vcard.py:314
+msgid ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
+msgstr ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
+
+#: ../src/vcard.py:316
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
+msgstr ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
+
+#: ../src/vcard.py:318
+msgid "You and the contact are interested in each other's presence information"
+msgstr ""
+"You and the contact are interested in each other's presence information"
+
+#. None
+#: ../src/vcard.py:320
+msgid ""
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
+msgstr ""
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
+
+#: ../src/vcard.py:328
+msgid "You are waiting contact's answer about your subscription request"
+msgstr "You are waiting contact's answer about your subscription request"
+
+#: ../src/vcard.py:332 ../src/vcard.py:369 ../src/vcard.py:492
+msgid " resource with priority "
+msgstr " resource with priority "
+
+#: ../src/common/check_paths.py:33
+msgid "creating logs database"
+msgstr "creating logs database"
+
+#: ../src/common/check_paths.py:96 ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:114
+#, python-format
+msgid "%s is a file but it should be a directory"
+msgstr "%s is a file but it should be a directory"
+
+#: ../src/common/check_paths.py:97 ../src/common/check_paths.py:108
+#: ../src/common/check_paths.py:115 ../src/common/check_paths.py:123
+msgid "Gajim will now exit"
+msgstr "Gajim will now exit"
+
+#: ../src/common/check_paths.py:122
+#, python-format
+msgid "%s is a directory but should be a file"
+msgstr "%s is a directory but should be a file"
+
+#: ../src/common/check_paths.py:138
+#, python-format
+msgid "creating %s directory"
+msgstr "creating %s directory"
+
+#: ../src/common/commands.py:69
+msgid "Change status information"
+msgstr "Change status information"
+
+#: ../src/common/commands.py:82
+msgid "Change status"
+msgstr "Change status"
+
+#: ../src/common/commands.py:83
+msgid "Set the presence type and description"
+msgstr "Set the presence type and description"
+
+#: ../src/common/commands.py:89
+msgid "Free for chat"
+msgstr "Free for chat"
+
+#: ../src/common/commands.py:90
+msgid "Online"
+msgstr "Online"
+
+#: ../src/common/commands.py:92
+msgid "Extended away"
+msgstr "Extended away"
+
+#: ../src/common/commands.py:93
+msgid "Do not disturb"
+msgstr "Do not disturb"
+
+#: ../src/common/commands.py:94
+msgid "Offline - disconnect"
+msgstr "Offline - disconnect"
+
+#: ../src/common/commands.py:99
+msgid "Presence description:"
+msgstr "Presence description:"
+
+#: ../src/common/commands.py:134
+msgid "The status has been changed."
+msgstr "The status has been changed."
+
+#: ../src/common/commands.py:179
+#, python-format
+msgid "%(nickname)s on %(room_jid)s"
+msgstr "%(nickname)s on %(room_jid)s"
+
+#: ../src/common/commands.py:183
+msgid "You have not joined a groupchat."
+msgstr "You have not joined a groupchat."
+
+#: ../src/common/commands.py:189
+msgid "Leave Groupchats"
+msgstr "Leave Groupchats"
+
+#: ../src/common/commands.py:190
+msgid "Choose the groupchats you want to leave"
+msgstr "Choose the groupchats you want to leave"
+
+#: ../src/common/commands.py:230
+#, fuzzy
+msgid "You left the following groupchats:"
+msgstr "You left the following groupchats:"
+
+#: ../src/common/commands.py:242
+#, fuzzy
+msgid "Forward unread messages"
+msgstr " %d unread message"
+
+#: ../src/common/commands.py:262
+msgid "All unread messages have been forwarded."
+msgstr ""
+
+#: ../src/common/config.py:58
+msgid "Use D-Bus and Notification-Daemon to show notifications"
+msgstr "Use D-Bus and Notification-Daemon to show notifications"
+
+#: ../src/common/config.py:63
+msgid "Time in minutes, after which your status changes to away."
+msgstr "Time in minutes, after which your status changes to away."
+
+#: ../src/common/config.py:64
+msgid "Away as a result of being idle"
+msgstr "Away as a result of being idle"
+
+#: ../src/common/config.py:66
+msgid "Time in minutes, after which your status changes to not available."
+msgstr "Time in minutes, after which your status changes to not available."
+
+#: ../src/common/config.py:67
+msgid "Not available as a result of being idle"
+msgstr "Not available as a result of being idle"
+
+#: ../src/common/config.py:85
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+
+#: ../src/common/config.py:90
+msgid "Enable link-local/zeroconf messaging"
+msgstr "Enable link-local/zeroconf messaging"
+
+#: ../src/common/config.py:93
+msgid "Language used by speller"
+msgstr "Language used by speller"
+
+#: ../src/common/config.py:94
+msgid ""
+"'always' - print time for every message.\n"
+"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
+"'never' - never print time."
+msgstr ""
+"'always' - print time for every message.\n"
+"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
+"'never' - never print time."
+
+#: ../src/common/config.py:95
+msgid ""
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
+"This is used only if print_time is 'sometimes'."
+msgstr ""
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
+"This is used only if print_time is 'sometimes'."
+
+#: ../src/common/config.py:98
+msgid "Treat * / _ pairs as possible formatting characters."
+msgstr "Treat * / _ pairs as possible formatting characters."
+
+#: ../src/common/config.py:99
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+
+#: ../src/common/config.py:102
+msgid ""
+"Uses ReStructured text markup to send HTML, plus ascii formatting if "
+"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html (If you want to use this, install docutils)"
+msgstr ""
+"Uses ReStructured text markup to send HTML, plus ascii formatting if "
+"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html (If you want to use this, install docutils)"
+
+#: ../src/common/config.py:111
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+
+#: ../src/common/config.py:112
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+
+#: ../src/common/config.py:135
+msgid ""
+"This option let you customize timestamp that is printed in conversation. For "
+"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
+"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+msgstr ""
+"This option let you customize timestamp that is printed in conversation. For "
+"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
+"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+
+#: ../src/common/config.py:136
+msgid "Characters that are printed before the nickname in conversations"
+msgstr "Characters that are printed before the nickname in conversations"
+
+#: ../src/common/config.py:137
+msgid "Characters that are printed after the nickname in conversations"
+msgstr "Characters that are printed after the nickname in conversations"
+
+#: ../src/common/config.py:144
+msgid "Add * and [n] in roster title?"
+msgstr "Add * and [n] in roster title?"
+
+#: ../src/common/config.py:145
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+
+#: ../src/common/config.py:146
+msgid "How many minutes should last lines from previous conversation last."
+msgstr "How many minutes should last lines from previous conversation last."
+
+#: ../src/common/config.py:147
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+
+#: ../src/common/config.py:149
+msgid "How many lines to store for Ctrl+KeyUP."
+msgstr "How many lines to store for Ctrl+KeyUP."
+
+#: ../src/common/config.py:152
+#, python-format
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Either custom URL with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+
+#: ../src/common/config.py:155
+msgid "If checked, Gajim can be controlled remotely using gajim-remote."
+msgstr "If ticked, Gajim can be controlled remotely using gajim-remote."
+
+#: ../src/common/config.py:156
+msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+
+#: ../src/common/config.py:157
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+
+#: ../src/common/config.py:158
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+
+#: ../src/common/config.py:160
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+
+#: ../src/common/config.py:161
+msgid "Ask before closing a group chat tab/window."
+msgstr "Ask before closing a group chat tab/window."
+
+#: ../src/common/config.py:162
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+
+#: ../src/common/config.py:163
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+
+#: ../src/common/config.py:166
+#, fuzzy
+msgid ""
+"Comma separated list of hosts that we send, in addition of local interfaces, "
+"for File Transfer in case of address translation/port forwarding."
+msgstr ""
+"Overrides the host we send for File Transfer in case of address translation/"
+"port forwarding."
+
+#: ../src/common/config.py:168
+msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
+msgstr "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
+
+#: ../src/common/config.py:170
+msgid "Notify of events in the system trayicon."
+msgstr "Notify of events in the system trayicon."
+
+#: ../src/common/config.py:176
+msgid "Show tab when only one conversation?"
+msgstr "Show tab when only one conversation?"
+
+#: ../src/common/config.py:177
+msgid "Show tabbed notebook border in chat windows?"
+msgstr "Show tabbed notebook border in chat windows?"
+
+#: ../src/common/config.py:178
+msgid "Show close button in tab?"
+msgstr "Show close button in tab?"
+
+#: ../src/common/config.py:179
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+
+#: ../src/common/config.py:188
+msgid "Preview new messages in notification popup?"
+msgstr ""
+
+#: ../src/common/config.py:193
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+
+#: ../src/common/config.py:194
+msgid ""
+"If True, quits Gajim when X button of Window Manager is clicked. This "
+"setting is taken into account only if trayicon is used."
+msgstr ""
+"If True, quits Gajim when X button of Window Manager is clicked. This "
+"setting is taken into account only if trayicon is used."
+
+#: ../src/common/config.py:195
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+
+#: ../src/common/config.py:196
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+
+#: ../src/common/config.py:197
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+
+#: ../src/common/config.py:199
+msgid ""
+"If True, Gajim will ask for avatar each contact that did not have an avatar "
+"last time or has one cached that is too old."
+msgstr ""
+"If True, Gajim will ask for avatar each contact that did not have an avatar "
+"last time or has one cached that is too old."
+
+#: ../src/common/config.py:200
+msgid ""
+"If False, Gajim will no longer print status line in chats when a contact "
+"changes his or her status and/or his or her status message."
+msgstr ""
+"If False, Gajim will no longer print status line in chats when a contact "
+"changes his or her status and/or status message."
+
+#: ../src/common/config.py:201
+msgid ""
+"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"longer print status line in groupchats when a member changes his or her "
+"status and/or his or her status message. If \"all\" Gajim will print all "
+"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
+"group chat."
+msgstr ""
+"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"longer print status line in groupchats when a member changes his or her "
+"status and/or his or her status message. If \"all\" Gajim will print all "
+"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
+"group chat."
+
+#: ../src/common/config.py:203
+msgid "Background color of contacts when they just signed in."
+msgstr "Background colour of contacts when they just signed in."
+
+#: ../src/common/config.py:204
+msgid "Background color of contacts when they just signed out."
+msgstr "Background colour of contacts when they just signed out."
+
+#: ../src/common/config.py:206
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+"If True, restored messages will use a smaller font than the default one."
+
+#: ../src/common/config.py:207
+msgid "Don't show avatar for the transport itself."
+msgstr "Don't show avatar for the transport itself."
+
+#: ../src/common/config.py:208
+msgid "Don't show roster in the system taskbar."
+msgstr "Don't show roster in the system taskbar."
+
+#: ../src/common/config.py:209
+msgid ""
+"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
+"window flash (the default behaviour in most Window Managers) when holding "
+"pending events."
+msgstr ""
+"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
+"window flash (the default behaviour in most Window Managers) when holding "
+"pending events."
+
+#: ../src/common/config.py:211
+msgid ""
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. Turn this option to False to stop sending sha info in group chat "
+"presences."
+msgstr ""
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. Turn this option to False to stop sending sha info in group chat "
+"presences."
+
+#. always, never, peracct, pertype should not be translated
+#: ../src/common/config.py:214
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'never' - All messages get their own window.\n"
+"'peracct' - Messages for each account are sent to a specific window.\n"
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect."
+msgstr ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'never' - All messages get their own window.\n"
+"'peracct' - Messages for each account are sent to a specific window.\n"
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect."
+
+#: ../src/common/config.py:215
+msgid "If False, you will no longer see the avatar in the chat window."
+msgstr "If False, you will no longer see the avatar in the chat window."
+
+#: ../src/common/config.py:216
+msgid "If True, pressing the escape key closes a tab/window."
+msgstr "If True, pressing the escape key closes a tab/window."
+
+#: ../src/common/config.py:217
+#, fuzzy
+msgid "Hides the buttons in chat windows."
+msgstr "Hides the buttons in group chat window."
+
+#: ../src/common/config.py:218
+msgid "Hides the banner in a group chat window"
+msgstr "Hides the banner in a group chat window"
+
+#: ../src/common/config.py:219
+msgid "Hides the banner in two persons chat window"
+msgstr "Hides the banner in two persons chat window"
+
+#: ../src/common/config.py:220
+msgid "Hides the group chat occupants list in group chat window."
+msgstr "Hides the group chat occupants list in group chat window."
+
+#: ../src/common/config.py:221
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
+msgstr ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
+
+#: ../src/common/config.py:222
+msgid "Indentation when using merge consecutive nickname."
+msgstr "Indentation when using merge consecutive nickname."
+
+#: ../src/common/config.py:223
+#, fuzzy
+msgid "Smooth scroll message in conversation window"
+msgstr "Išsiųsti žinutę ir uždaryti langą"
+
+#: ../src/common/config.py:224
+msgid "List of colors that will be used to color nicknames in group chats."
+msgstr "List of colours that will be used to colour nicknames in group chats."
+
+#: ../src/common/config.py:225
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr "Ctrl-Tab go to next composing tab when none is unread."
+
+#: ../src/common/config.py:226
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Should we show the confirm metacontacts creation dialogue or not? Empty "
+"string means we never show the dialogue."
+
+#: ../src/common/config.py:227
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFUL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFUL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+
+#: ../src/common/config.py:228
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+
+#: ../src/common/config.py:229
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+
+#: ../src/common/config.py:230
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+
+#: ../src/common/config.py:231
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+
+#: ../src/common/config.py:232
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+
+#: ../src/common/config.py:233
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr ""
+
+#: ../src/common/config.py:234
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+
+#: ../src/common/config.py:245
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+
+#. yes, no, ask
+#: ../src/common/config.py:275
+msgid "Jabberd2 workaround"
+msgstr "Jabberd2 workaround"
+
+#: ../src/common/config.py:279
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"If ticked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+
+#: ../src/common/config.py:338
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "Is OpenPGP enabled for this contact?"
+
+#: ../src/common/config.py:339 ../src/common/config.py:342
+msgid "Language for which we want to check misspelled words"
+msgstr "Language for which we want to check misspelt words"
+
+#: ../src/common/config.py:348
+msgid "all or space separated status"
+msgstr "all or space separated status"
+
+#: ../src/common/config.py:349
+msgid "'yes', 'no', or 'both'"
+msgstr "'yes', 'no', or 'both'"
+
+#: ../src/common/config.py:350 ../src/common/config.py:352
+#: ../src/common/config.py:353 ../src/common/config.py:356
+#: ../src/common/config.py:357
+msgid "'yes', 'no' or ''"
+msgstr "'yes', 'no' or ''"
+
+#: ../src/common/config.py:363
+msgid "Sleeping"
+msgstr "Sleeping"
+
+#: ../src/common/config.py:364
+msgid "Back soon"
+msgstr "Back soon"
+
+#: ../src/common/config.py:364
+msgid "Back in some minutes."
+msgstr "Back in some minutes."
+
+#: ../src/common/config.py:365
+msgid "Eating"
+msgstr "Eating"
+
+#: ../src/common/config.py:365
+msgid "I'm eating, so leave me a message."
+msgstr "I'm eating, so leave me a message."
+
+#: ../src/common/config.py:366
+msgid "Movie"
+msgstr "Movie"
+
+#: ../src/common/config.py:366
+msgid "I'm watching a movie."
+msgstr "I'm watching a movie."
+
+#: ../src/common/config.py:367
+msgid "Working"
+msgstr "Working"
+
+#: ../src/common/config.py:367
+msgid "I'm working."
+msgstr "I'm working."
+
+#: ../src/common/config.py:368
+msgid "Phone"
+msgstr "Phone"
+
+#: ../src/common/config.py:368
+msgid "I'm on the phone."
+msgstr "I'm on the phone."
+
+#: ../src/common/config.py:369
+msgid "Out"
+msgstr "Out"
+
+#: ../src/common/config.py:369
+msgid "I'm out enjoying life."
+msgstr "I'm out enjoying life."
+
+#: ../src/common/config.py:373
+msgid "I'm available."
+msgstr "I'm available."
+
+#: ../src/common/config.py:374
+msgid "I'm free for chat."
+msgstr "I'm free for chat."
+
+#: ../src/common/config.py:376
+msgid "I'm not available."
+msgstr "I'm not available."
+
+#: ../src/common/config.py:377
+msgid "Do not disturb."
+msgstr "Do not disturb."
+
+#: ../src/common/config.py:378 ../src/common/config.py:379
+msgid "Bye!"
+msgstr "Bye!"
+
+#: ../src/common/config.py:388
+msgid ""
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
+msgstr ""
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
+
+#: ../src/common/config.py:389
+msgid "Sound to play when any MUC message arrives."
+msgstr "Sound to play when any MUC message arrives."
+
+#: ../src/common/config.py:398 ../src/common/optparser.py:208
+msgid "green"
+msgstr "green"
+
+#: ../src/common/config.py:402 ../src/common/optparser.py:194
+msgid "grocery"
+msgstr "grocery"
+
+#: ../src/common/config.py:406
+msgid "human"
+msgstr "human"
+
+#: ../src/common/config.py:410
+msgid "marine"
+msgstr "marine"
+
+#: ../src/common/connection_handlers.py:56
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
+msgid "Unable to load idle module"
+msgstr "Unable to load idle module"
+
+#: ../src/common/connection_handlers.py:184
+#: ../src/common/connection_handlers.py:219
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:236
+msgid "Wrong host"
+msgstr "Wrong host"
+
+#: ../src/common/connection_handlers.py:184
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:236
+#, fuzzy, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"The host you configured as the ft_override_host_to_send advanced option is "
+"not valid, so ignored."
+
+#: ../src/common/connection_handlers.py:220
+msgid "Invalid local address? :-O"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:612
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "Registration information for transport %s has not arrived in time"
+
+#: ../src/common/connection_handlers.py:1776
+#, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Nickname not allowed: %s"
+
+#. we are banned
+#. group chat does not exist
+#: ../src/common/connection_handlers.py:1846
+#: ../src/common/connection_handlers.py:1849
+#: ../src/common/connection_handlers.py:1852
+#: ../src/common/connection_handlers.py:1855
+#: ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1868
+msgid "Unable to join group chat"
+msgstr "Unable to join group chat"
+
+#: ../src/common/connection_handlers.py:1847
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "You are banned from this group chat."
+
+#: ../src/common/connection_handlers.py:1850
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "Such group chat does not exist."
+
+#: ../src/common/connection_handlers.py:1853
+msgid "Group chat creation is restricted."
+msgstr "Group chat creation is restricted."
+
+#: ../src/common/connection_handlers.py:1856
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Your registered nickname must be used."
+
+#: ../src/common/connection_handlers.py:1860
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "You are not in the members list."
+
+#: ../src/common/connection_handlers.py:1869
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Your desired nickname is in use or registered by another occupant.\n"
+"Please specify another nickname below:"
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers.py:1900
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Authorisation has been removed"
+
+#: ../src/common/connection_handlers.py:1907
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1934
+msgid "I would like to add you to my roster."
+msgstr "I would like to add you to my roster."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:1955
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "we are now subscribed to %s"
+
+#: ../src/common/connection_handlers.py:1957
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "unsubscribe request from %s"
+
+#: ../src/common/connection_handlers.py:1959
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "we are now unsubscribed from %s"
+
+#: ../src/common/connection_handlers.py:2081
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+
+#: ../src/common/connection.py:244
+#: ../src/common/zeroconf/connection_zeroconf.py:203
+#, python-format
+msgid "Connection with account \"%s\" has been lost"
+msgstr "Connection with account \"%s\" has been lost"
+
+#: ../src/common/connection.py:245
+msgid "Reconnect manually."
+msgstr "Reconnect manually."
+
+#: ../src/common/connection.py:256
+#, fuzzy, python-format
+msgid "Server %s answered wrongly to register request: %s"
+msgstr "Transport %s answered wrongly to register request: %s"
+
+#. wrong answer
+#: ../src/common/connection.py:264
+msgid "Invalid answer"
+msgstr "Invalid answer"
+
+#: ../src/common/connection.py:265
+#, python-format
+msgid "Transport %s answered wrongly to register request: %s"
+msgstr "Transport %s answered wrongly to register request: %s"
+
+#: ../src/common/connection.py:411
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Connection Failed"
+
+#: ../src/common/connection.py:465 ../src/common/connection.py:511
+#: ../src/common/connection.py:1067
+#: ../src/common/zeroconf/connection_zeroconf.py:237
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Could not connect to \"%s\""
+
+#: ../src/common/connection.py:479
+#, python-format
+msgid "Connected to server %s:%s with %s"
+msgstr "Connected to server %s:%s with %s"
+
+#: ../src/common/connection.py:512
+msgid "Check your connection or try again later"
+msgstr "Check your connection or try again later"
+
+#: ../src/common/connection.py:537
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "Authentication failed with \"%s\""
+
+#: ../src/common/connection.py:538
+msgid "Please check your login and password for correctness."
+msgstr "Please check your login and password for correctness."
+
+#: ../src/common/connection.py:581
+msgid "Error while removing privacy list"
+msgstr "Error while removing privacy list"
+
+#: ../src/common/connection.py:582
+#, fuzzy, python-format
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+msgstr ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+
+#. We didn't set a passphrase
+#: ../src/common/connection.py:682
+#: ../src/common/zeroconf/connection_zeroconf.py:163
+msgid "OpenPGP passphrase was not given"
+msgstr "OpenPGP passphrase was not given"
+
+#. we're not english
+#. one  in locale and one en
+#: ../src/common/connection.py:845
+msgid "[This message is *encrypted* (See :JEP:`27`]"
+msgstr "[This message is *encrypted* (See :JEP:`27`]"
+
+#: ../src/common/connection.py:916
+#: ../src/common/zeroconf/connection_zeroconf.py:423
+#, python-format
+msgid ""
+"Subject: %s\n"
+"%s"
+msgstr ""
+"Subject: %s\n"
+"%s"
+
+#: ../src/common/connection.py:1099
+msgid "Not fetched because of invisible status"
+msgstr "Not fetched because of invisible status"
+
+#: ../src/common/contacts.py:294
+msgid "Not in roster"
+msgstr "Not in roster"
+
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:33
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "D-Bus python bindings are missing in this computer"
+
+#: ../src/common/dbus_support.py:34
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "D-Bus capabilities of Gajim cannot be used"
+
+#: ../src/common/exceptions.py:22
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+
+#: ../src/common/exceptions.py:39
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr ""
+"Service not available: Gajim is not running, or remote_control is False"
+
+#: ../src/common/exceptions.py:47
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr "D-Bus is not present on this machine or python module is missing"
+
+#: ../src/common/exceptions.py:55
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "one"
+msgstr "one"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "two"
+msgstr "two"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "three"
+msgstr "three"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "four"
+msgstr "four"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "five"
+msgstr "five"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr "six"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "seven"
+msgstr "seven"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr "eight"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "nine"
+msgstr "nine"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr "ten"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eleven"
+msgstr "eleven"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr "twelve"
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "$0 o'clock"
+msgstr "$0 o'clock"
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past $0"
+msgstr "five past $0"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "ten past $0"
+msgstr "ten past $0"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past $0"
+msgstr "quarter past $0"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty past $0"
+msgstr "twenty past $0"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past $0"
+msgstr "twenty five past $0"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "half past $0"
+msgstr "half past $0"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to $1"
+msgstr "twenty five to $1"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "twenty to $1"
+msgstr "twenty to $1"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to $1"
+msgstr "quarter to $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "ten to $1"
+msgstr "ten to $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "five to $1"
+msgstr "five to $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
+msgid "$1 o'clock"
+msgstr "$1 o'clock"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Night"
+msgstr "Night"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Early morning"
+msgstr "Early morning"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Morning"
+msgstr "Morning"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Almost noon"
+msgstr "Almost noon"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Noon"
+msgstr "Noon"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Afternoon"
+msgstr "Afternoon"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Evening"
+msgstr "Evening"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Late evening"
+msgstr "Late evening"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Start of week"
+msgstr "Start of week"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Middle of week"
+msgstr "Middle of week"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "End of week"
+msgstr "End of week"
+
+#: ../src/common/fuzzyclock.py:68
+msgid "Weekend!"
+msgstr "Weekend!"
+
+#: ../src/common/helpers.py:115
+msgid "Invalid character in username."
+msgstr "Invalid character in username."
+
+#: ../src/common/helpers.py:120
+msgid "Server address required."
+msgstr "Server address required."
+
+#: ../src/common/helpers.py:125
+msgid "Invalid character in hostname."
+msgstr "Invalid character in hostname."
+
+#: ../src/common/helpers.py:131
+msgid "Invalid character in resource."
+msgstr "Invalid character in resource."
+
+#. GiB means gibibyte
+#: ../src/common/helpers.py:171
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:174
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:178
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:181
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:185
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:188
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:191
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:222
+msgid "_Busy"
+msgstr "_Užimtas"
+
+#: ../src/common/helpers.py:224
+msgid "Busy"
+msgstr "Užimtas"
+
+#: ../src/common/helpers.py:227
+msgid "_Not Available"
+msgstr "_Nepasiekiamas"
+
+#: ../src/common/helpers.py:232
+msgid "_Free for Chat"
+msgstr "_Laisvas Pokalbiams"
+
+#: ../src/common/helpers.py:234
+msgid "Free for Chat"
+msgstr "Laisvas Pokalbiams"
+
+#: ../src/common/helpers.py:237
+msgid "_Available"
+msgstr "_Prisijungęs"
+
+#: ../src/common/helpers.py:239
+msgid "Available"
+msgstr "Prisijungęs"
+
+#: ../src/common/helpers.py:241
+msgid "Connecting"
+msgstr "Jungiamasi"
+
+#: ../src/common/helpers.py:244
+msgid "A_way"
+msgstr "_Nuėjęs"
+
+#: ../src/common/helpers.py:249
+msgid "_Offline"
+msgstr "A_tsijungęs"
+
+#: ../src/common/helpers.py:251
+msgid "Offline"
+msgstr "Atsijungęs"
+
+#: ../src/common/helpers.py:254
+msgid "_Invisible"
+msgstr "N_ematomas"
+
+#: ../src/common/helpers.py:260
+msgid "?contact has status:Unknown"
+msgstr "Būklė nežinoma"
+
+#: ../src/common/helpers.py:262
+msgid "?contact has status:Has errors"
+msgstr "Būklė klaidinga"
+
+#: ../src/common/helpers.py:267
+msgid "?Subscription we already have:None"
+msgstr "Joks"
+
+#: ../src/common/helpers.py:269
+msgid "To"
+msgstr "Kam"
+
+#: ../src/common/helpers.py:273
+msgid "Both"
+msgstr "Abu"
+
+#: ../src/common/helpers.py:281
+msgid "?Ask (for Subscription):None"
+msgstr "Joks"
+
+#: ../src/common/helpers.py:283
+msgid "Subscribe"
+msgstr "Subscribe"
+
+#: ../src/common/helpers.py:292
+msgid "?Group Chat Contact Role:None"
+msgstr "None"
+
+#: ../src/common/helpers.py:295
+msgid "Moderators"
+msgstr "Moderators"
+
+#: ../src/common/helpers.py:297
+msgid "Moderator"
+msgstr "Moderator"
+
+#: ../src/common/helpers.py:300
+msgid "Participants"
+msgstr "Participants"
+
+#: ../src/common/helpers.py:302
+msgid "Participant"
+msgstr "Participant"
+
+#: ../src/common/helpers.py:305
+msgid "Visitors"
+msgstr "Visitors"
+
+#: ../src/common/helpers.py:307
+msgid "Visitor"
+msgstr "Visitor"
+
+#: ../src/common/helpers.py:313
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "None"
+
+#: ../src/common/helpers.py:315
+msgid "Owner"
+msgstr "Owner"
+
+#: ../src/common/helpers.py:317
+msgid "Administrator"
+msgstr "Administrator"
+
+#: ../src/common/helpers.py:319
+msgid "Member"
+msgstr "Member"
+
+#: ../src/common/helpers.py:358
+msgid "is paying attention to the conversation"
+msgstr "is paying attention to the conversation"
+
+#: ../src/common/helpers.py:360
+msgid "is doing something else"
+msgstr "is doing something else"
+
+#: ../src/common/helpers.py:362
+msgid "is composing a message..."
+msgstr "is composing a message..."
+
+#. paused means he or she was composing but has stopped for a while
+#: ../src/common/helpers.py:365
+msgid "paused composing a message"
+msgstr "paused composing a message"
+
+#: ../src/common/helpers.py:367
+msgid "has closed the chat window or tab"
+msgstr "has closed the chat window or tab"
+
+#: ../src/common/helpers.py:913 ../src/common/helpers.py:920
+#, fuzzy, python-format
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "Siųsti žinutę"
+msgstr[1] "Siųsti žinutę"
+
+#: ../src/common/helpers.py:926
+#, python-format
+msgid " from room %s"
+msgstr ""
+
+#: ../src/common/helpers.py:929 ../src/common/helpers.py:948
+#, python-format
+msgid " from user %s"
+msgstr ""
+
+#: ../src/common/helpers.py:931
+#, python-format
+msgid " from %s"
+msgstr ""
+
+#: ../src/common/helpers.py:938 ../src/common/helpers.py:945
+#, python-format
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/common/helpers.py:978
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
+#. we talk about a file
+#: ../src/common/optparser.py:60
+#, python-format
+msgid "error: cannot open %s for reading"
+msgstr "error: cannot open %s for reading"
+
+#: ../src/common/optparser.py:203 ../src/common/optparser.py:204
+msgid "cyan"
+msgstr "cyan"
+
+#: ../src/common/optparser.py:320
+msgid "migrating logs database to indices"
+msgstr "migrating logs database to indices"
+
+#: ../src/common/passwords.py:82
+#, python-format
+msgid "Gajim account %s"
+msgstr "Gajim account %s"
+
+#: ../src/common/zeroconf/client_zeroconf.py:135
+#: ../src/common/zeroconf/client_zeroconf.py:218
+msgid "Connection to host could not be established"
+msgstr "Connection to host could not be established"
+
+#: ../src/common/zeroconf/client_zeroconf.py:192
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
+msgstr ""
+"Connection to host could not be established: Incorrect answer from server."
+
+#: ../src/common/zeroconf/client_zeroconf.py:352
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"Connection to host could not be established: Timeout while sending data."
+
+#: ../src/common/zeroconf/client_zeroconf.py:638
+msgid "Contact is offline. Your message could not be sent."
+msgstr "Contact is offline. Your message could not be sent."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:204
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr ""
+"To continue sending and receiving messages, you will need to reconnect."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+msgid "Avahi error"
+msgstr "Avahi error"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+"%s\n"
+"Link-local messaging might not work properly."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+msgid "Please check if Avahi is installed."
+msgstr "Please check if Avahi is installed."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:247
+#: ../src/common/zeroconf/connection_zeroconf.py:251
+msgid "Could not start local service"
+msgstr "Could not start local service"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:248
+#, python-format
+msgid "Unable to bind to port %d."
+msgstr "Unable to bind to port %d."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:347
+msgid "Please check if avahi-daemon is running."
+msgstr "Please check if avahi-daemon is running."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:346
+#, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Could not change status of account \"%s\""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:363
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:375
+msgid "[This message is encrypted]"
+msgstr "[This message is encrypted]"
+
+#~ msgid "_Discover Services..."
+#~ msgstr "_Ieškoti paslaugų..."
+
+#~ msgid "_Retype Password:"
+#~ msgstr "_Pakartokite slaptažodį:"
+
+#~ msgid "_Use proxy"
+#~ msgstr "_Naudoti proksi"
+
+#~ msgid "Accounts"
+#~ msgstr "Prieiga"
+
+#~ msgid ""
+#~ "If checked, all local contacts that use a Bonjour compatible chat client "
+#~ "(like iChat, Trillian or Gaim) will be shown in roster. You don't need to "
+#~ "be connected to a jabber server for it to work.\n"
+#~ "This is only available if python-avahi is installed and avahi-daemon is "
+#~ "running."
+#~ msgstr ""
+#~ "Jei pažymėta, visi lokalūs asmenys, kurie naudoja pokalbių programas, "
+#~ "palaikančias Bonjour (tokias kaip: iChat, Trillian ar Gaim) bus rodomi "
+#~ "asmenų sąraše. Jums nereikia būti prisijungusiam prie jabber serverio, "
+#~ "kad tai veiktų.\n"
+#~ "Tai veikia, tik tuo atveju, jei python-avahi yra įdiegtas ir avahi-deamon "
+#~ "yra  paleistas."
+
+#~ msgid ""
+#~ "If you have 2 or more accounts and this is checked, Gajim will list all "
+#~ "contacts as if you had one account"
+#~ msgstr ""
+#~ "Jei jūs turite kelias prieigas ir ši žymė yra pažymėta, Gajim pateiks "
+#~ "visų asmenų sąrašą taip, lyg jie visi priklausytų vienai prieigai"
+
+#~ msgid "_Enable link-local messaging"
+#~ msgstr "Įjungti lokalūjį pokalbių r_ežimą"
+
+#~ msgid "_Modify"
+#~ msgstr "_Keisti"
+
+#~ msgid "_Compact View    Alt+C"
+#~ msgstr "_Kompaktiška išvaizda    Alt+C"
+
+#~ msgid "<b>Interface Customization</b>"
+#~ msgstr "<b>Išvaizdos keitimas</b>"
+
+#~ msgid "Also known as iChat style"
+#~ msgstr "Taip pat žinomas, kaip iChat stilius"
+
+#~ msgid "Chat"
+#~ msgstr "Pokalbis"
+
+#~ msgid "E_very 5 minutes"
+#~ msgstr "_Kas 5 minutes"
+
+#~ msgid ""
+#~ "Gajim will automatically show new events by popping up the relative window"
+#~ msgstr "Gajim automatiškai rodys naujus įvykius iššokančiame langelyje."
+
+#~ msgid ""
+#~ "Gajim will notify you for new events via a popup in the bottom right of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Gajim praneš apie naujus įvykius iššokančiame langelyje, kuris pasirodys "
+#~ "dešiniajame apatiniame ekrano kampe"
+
+#~ msgid ""
+#~ "Gajim will notify you via a popup window in the bottom right of the "
+#~ "screen about contacts that just signed in"
+#~ msgstr ""
+#~ "Gajim rodys pranešimus apie ką tik prisijungusius asmenis iššokančiame "
+#~ "langelyje, dešiniajame apatiniame ekrano kampe"
+
+#~ msgid ""
+#~ "Gajim will only change the icon of the contact that triggered the new "
+#~ "event"
+#~ msgstr "Gajim keis tik tų asmenų piktogramas, kurie atliko naują įvykį"
+
+#~ msgid ""
+#~ "If checked, Gajim will remember the roster and chat window positions in "
+#~ "the screen and the sizes of them next time you run it"
+#~ msgstr ""
+#~ "Jei pažymėta, Gajim atsimins kontaktų sąrašo ir pokalbių lango pozicijas "
+#~ "ir dydžius ekrane sekančio paleidimo metu"
+
+#~ msgid "On every _message"
+#~ msgstr "_Kiekvienai žinutei"
+
+#~ msgid "Outgoing Chat state noti_fications:"
+#~ msgstr "Išeinančių pokalbių būklės pranešimai:"
+
+#~ msgid "Print time:"
+#~ msgstr "Spausdinimo laikas:"
+
+#~ msgid "Save _position and size for roster and chat windows"
+#~ msgstr "Įsiminti kontakų sąrašo ir pokalbių langų pozicijas ir dydžius"
+
+#~ msgid "Show only in _roster"
+#~ msgstr "Rodyti tik kontaktų _sąrašą"
+
+#~ msgid "Use t_rayicon (aka. notification area icon)"
+#~ msgstr "Naudoti piktogramą trėjuje (pranešimų panelės piktograma)"
+
+#~ msgid ""
+#~ "When a new event (message, file transfer request etc..) is received, the "
+#~ "following methods may be used to inform you about it. Please note that "
+#~ "events about new messages only occur if it is a new message from a "
+#~ "contact you are not already chatting with"
+#~ msgstr ""
+#~ "Naujam įvykiui ivykus (atėjus žinutei, failui ir pan.), sekantys būdai "
+#~ "gali būti naudojami jums informuoti apie tai. Pastaba: naujų žinučių "
+#~ "įvykiai pasirodys tik jei tai bus nauja žinutė nuo kurio nors asmens, su "
+#~ "kuriuo jūs dar nebuvote pradėjęs pokalbio"
+
+#~ msgid "_Never"
+#~ msgstr "_Niekada"
+
+#~ msgid "_Notify me about it"
+#~ msgstr "_Pranešti man apie tai"
+
+#~ msgid "_Pop it up"
+#~ msgstr "_Rodyk"
+
+#~ msgid "_Remove from Roster"
+#~ msgstr "Ša_linti iš Kontaktų Sąrašo"
+
+#~ msgid "Add _Contact"
+#~ msgstr "Įtraukti _Asmenį"
+
+#~ msgid "_Filter:"
+#~ msgstr "_Filtras:"
+
+#~ msgid ""
+#~ "If that is not your language for which you want to highlight misspelled "
+#~ "words, then please set your $LANG as appropriate. Eg. for French do "
+#~ "export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to "
+#~ "make it global in /etc/profile.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "If that is not your language for which you want to highlight misspelt "
+#~ "words, then please set your $LANG as appropriate. Eg. for French do "
+#~ "export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to "
+#~ "make it global in /etc/profile.\n"
+#~ "\n"
+#~ "Highlighting misspelt words feature will not be used"
+
+#~ msgid "Every %s _minutes"
+#~ msgstr "Every %s _minutes"
+
+#~ msgid "You must enter a password for the new account."
+#~ msgstr "You must enter a password for the new account."
+
+#~ msgid "%s does not appear to be a valid JID"
+#~ msgstr "%s does not appear to be a valid JID"
+
+#~ msgid "Drop %s in group %s"
+#~ msgstr "Drop %s in group %s"
+
+#~ msgid "Make %s and %s metacontacts"
+#~ msgstr "Make %s and %s metacontacts"
+
+#~ msgid "Hides the buttons in two persons chat window."
+#~ msgstr "Hides the buttons in two persons chat window."
+
+#~ msgid " %d unread single message"
+#~ msgid_plural " %d unread single messages"
+#~ msgstr[0] " %d unread single message"
+#~ msgstr[1] " %d unread single messages"
+
+#~ msgid " %d unread group chat message"
+#~ msgid_plural " %d unread group chat messages"
+#~ msgstr[0] " %d unread group chat message"
+#~ msgstr[1] " %d unread group chat messages"
+
+#~ msgid " %d unread private message"
+#~ msgid_plural " %d unread private messages"
+#~ msgstr[0] " %d unread private message"
+#~ msgstr[1] " %d unread private messages"
+
+#~ msgid "Error while adding service. %s"
+#~ msgstr "Error while adding service. %s"
+
+#~ msgid "gtk+"
+#~ msgstr "gtk+"
+
+#~ msgid "Private Chat"
+#~ msgstr "Private Chat"
+
+#~ msgid "Group Chat"
+#~ msgstr "Group Chat"
+
+#~ msgid "invisible"
+#~ msgstr "invisible"
+
+#~ msgid "offline"
+#~ msgstr "offline"
+
+#~ msgid "I'm %s"
+#~ msgstr "I'm %s"
+
+#~ msgid "2003-12-13T18:30:02Z"
+#~ msgstr "2003-12-13T18:30:02Z"
+
+#~ msgid "<small>Romeo and Juliet</small>"
+#~ msgstr "<small>Romeo and Juliet</small>"
+
+#~ msgid "Old stories"
+#~ msgstr "Old stories"
+
+#~ msgid "Soliloquy"
+#~ msgstr "Soliloquy"
+
+#~ msgid "A_fter nickname:"
+#~ msgstr "A_fter nickname:"
+
+#~ msgid "B_efore nickname:"
+#~ msgstr "B_efore nickname:"
+
+#~ msgid "_After time:"
+#~ msgstr "_After time:"
+
+#~ msgid "_Before time:"
+#~ msgstr "_Before time:"
+
+#~ msgid "_Publish"
+#~ msgstr "_Publish"
+
+#~ msgid "_Retrieve"
+#~ msgstr "_Retrieve"
+
+#~ msgid "Information published"
+#~ msgstr "Information published"
+
+#~ msgid "Without a connection, you can not get your contact information."
+#~ msgstr "Without a connection, you can not get your contact information."
+
+#~ msgid "This is result of query."
+#~ msgstr "This is result of query."
+
+#~ msgid "Edit items on the list"
+#~ msgstr "Edit items on the list"
diff --git a/po/pl.po b/po/pl.po
index 39fab72d4..930265fa1 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,18 +5,17 @@
 # Automatically generated, 2005.
 #
 #
-#: ../src/chat_control.py:1182 ../src/gajim-remote.py:203
-#: ../src/gajim-remote.py:210 ../src/gajim-remote.py:236
-#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:243
-#: ../src/gajim-remote.py:244 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:217 ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:250 ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:257 ../src/gajim-remote.py:258
+#: ../src/gajim-remote.py:259 ../src/gajim-remote.py:260
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-02 20:42+0200\n"
+"POT-Creation-Date: 2007-11-07 14:56+0100\n"
 "PO-Revision-Date: 2006-11-08 09:01+0100\n"
-"Last-Translator: Maciej Chojnacki <byte@byte.livenet.pl>\n"
+"Last-Translator: Maciej Chojnacki <maciej.chojnacki@gmail.com>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,36 +36,36 @@ msgid "Jabber IM Client"
 msgstr "Klient komunikatora Jabber"
 
 #: ../data/glade/account_context_menu.glade.h:1
-msgid "Send Single _Message..."
-msgstr "Wyślij _wiadomość..."
+#: ../data/glade/roster_window.glade.h:8
+msgid "Join _Group Chat..."
+msgstr "Dołącz do _pokoju"
 
 #: ../data/glade/account_context_menu.glade.h:2
 msgid "_Add Contact..."
 msgstr "Dod_aj kontakt..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-msgid "_Discover Services..."
-msgstr "_Wyszukuj usługi..."
+#: ../data/glade/roster_window.glade.h:15
+msgid "_Discover Services"
+msgstr "_Wyszukuj usługi"
 
 #: ../data/glade/account_context_menu.glade.h:4
 msgid "_Execute Command..."
 msgstr "_Wykonaj komendę"
 
 #: ../data/glade/account_context_menu.glade.h:5
-#: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Pokój"
+msgid "_Modify Account"
+msgstr "_Modyfikuj konto"
 
 #: ../data/glade/account_context_menu.glade.h:6
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Modyfikuj konto..."
-
-#: ../data/glade/account_context_menu.glade.h:7
 msgid "_Open Gmail Inbox"
 msgstr "_Otwórz skrzynkę Gmail"
 
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/roster_window.glade.h:23
+msgid "_Start Chat..."
+msgstr "_Rozpocznij rozmowę"
+
 #: ../data/glade/account_context_menu.glade.h:8
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
@@ -74,11 +73,11 @@ msgstr "_Status"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:1
 msgid ""
-"<b>Account is being created</b>\n"
+"<b>Connecting to server</b>\n"
 "\n"
 "Please wait..."
 msgstr ""
-"<b>Konto jest tworzone</b>\n"
+"<b>Łączenie z serwerem</b>\n"
 "\n"
 "proszę czekać..."
 
@@ -91,50 +90,67 @@ msgid "<b>Please fill in the data for your new account</b>"
 msgstr "<b>Wpisz dane do swojego nowego konta</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:6
+msgid "<b>Please select a server</b>"
+msgstr "<b>Wybierz serwer</b>"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:7
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Kliknij by zobaczyć możliwości serwerów jabbera (np. transporty MSN czy ICQ)"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/glade/account_creation_wizard_window.glade.h:8
 msgid "Connect when I press Finish"
 msgstr "Połącz po wciśnięciu przycisku Zakończ"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/glade/account_creation_wizard_window.glade.h:9
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kreator Konta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:9
-msgid "I already have an account I want to use"
-msgstr "Mam już konto i chcę z niego korzystać"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:10
+msgid "I already have an account I want to _use"
+msgstr "_Mam już konto i chcę z niego korzystać"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "I want to _register for a new account"
 msgstr "Chcę za_rejestrować nowe konto Jabbera"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 #: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:23
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Włączenie tej opcji spowoduje zapamiętanie hasła dla tego konta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
-#: ../data/glade/manage_proxies_window.glade.h:7
-msgid "Pass_word:"
-msgstr "_Hasło:"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:32
+msgid "Manage..."
+msgstr "Zarządzaj..."
+
+#: ../data/glade/account_creation_wizard_window.glade.h:14
+msgid "Prox_y:"
+msgstr "_Pośrednik:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 #: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:47
 msgid "Save pass_word"
 msgstr "Zapisz _hasło"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 msgid "Servers Features"
 msgstr "Możliwości serwerów"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 msgid "Set my profile when I connect"
 msgstr "Ustaw profil po połączeniu"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:53
+msgid "Use custom hostname/port"
+msgstr "Użyj własnej nazwy hosta/portu"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -142,67 +158,63 @@ msgstr ""
 "Musisz posiadać konto aby połączyć się\n"
 " z siecią Jabber."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:21
 msgid "Your JID:"
 msgstr "Twój JID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Advanced"
 msgstr "Z_aawansowane"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:23
 msgid "_Finish"
 msgstr "_Zakończ"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "_Host:"
+#: ../data/glade/account_creation_wizard_window.glade.h:24
+msgid "_Hostname:"
+msgstr "_Nazwa hosta: "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 #: ../data/glade/account_modification_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Password:"
 msgstr "_Hasło:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:23
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 #: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "_Retype Password:"
-msgstr "_Powtórz hasło:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:27
 msgid "_Server:"
 msgstr "_Serwer:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
-msgid "_Use proxy"
-msgstr "_Korzystaj z pośrednika"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:28
 #: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_Username:"
 msgstr "_Nazwa użytkownika:"
 
 #: ../data/glade/account_modification_window.glade.h:1
+#: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:8
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Różne</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:2
 #: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:3
 #: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Informacje o sobie</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:4
 msgid "Account"
 msgstr "Konto"
 
@@ -211,23 +223,28 @@ msgid "Account Modification"
 msgstr "Modyfikacja konta"
 
 #: ../data/glade/account_modification_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
 msgid "Administration operations"
 msgstr "Operacje administracyjne"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Auto-reconnect when connection is lost"
 msgstr "Automatyczne połącz po zerwaniu połączenia"
 
 #: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:7
 #: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "P_ołącz przy starcie programu"
 
 #: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:8
 msgid "Chan_ge Password"
 msgstr "Z_mień hasło"
 
 #: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:9
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
 "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
@@ -239,47 +256,60 @@ msgstr ""
 "tylko serwer daje taką możliwość. Ta opcja wyłącza TLS"
 
 #: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:10
 #: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Wybierz _klucz..."
 
 #: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:11
 msgid "Click to change account's password"
 msgstr "Kliknij, aby zmienić hasło dla konta"
 
 #: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:12
 msgid "Click to request authorization to all contacts of another account"
-msgstr "Kliknij aby poprosić o autoryzację od wszystkich kontaktów z innego konta"
+msgstr ""
+"Kliknij aby poprosić o autoryzację od wszystkich kontaktów z innego konta"
 
 #: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:13
 msgid "Connection"
 msgstr "Połączenie"
 
 #: ../data/glade/account_modification_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Edit Personal Information..."
 msgstr "Zmień informacje o sobie..."
 
+#. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:458
-#: ../src/notify.py:480 ../src/notify.py:492 ../src/common/helpers.py:914
+#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:6 ../src/notify.py:476
+#: ../src/notify.py:498 ../src/notify.py:510 ../src/common/helpers.py:982
+#: ../src/common/helpers.py:994
 msgid "Gajim"
 msgstr "Gajim"
 
+#. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/preferences_window.glade.h:45
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:348 ../src/roster_window.py:573
-#: ../src/roster_window.py:1254 ../src/roster_window.py:1613
-#: ../src/roster_window.py:2341 ../src/roster_window.py:2383
-#: ../src/roster_window.py:2420 ../src/common/contacts.py:284
+#: ../src/roster_window.py:365 ../src/roster_window.py:630
+#: ../src/roster_window.py:1366 ../src/roster_window.py:1733
+#: ../src/roster_window.py:2117 ../src/roster_window.py:2627
+#: ../src/roster_window.py:2745 ../src/common/contacts.py:314
 msgid "General"
 msgstr "Ogólne"
 
 #: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:20
 msgid "Hostname: "
 msgstr "Nazwa hosta: "
 
 #: ../data/glade/account_modification_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:21
 msgid ""
 "If checked, Gajim will also broadcast some more IPs except from just your "
 "IP, so file transfer has higher chances of working."
@@ -288,6 +318,7 @@ msgstr ""
 "Twoim, tak aby przesyłanie plików przebiegało sprawniej."
 
 #: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/accounts_window.glade.h:24
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -305,6 +336,7 @@ msgstr ""
 "z prawem do odczytu tylko dla ciebie"
 
 #: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/accounts_window.glade.h:25
 #: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
@@ -314,6 +346,7 @@ msgstr ""
 "wykorzystaniem tego konta"
 
 #: ../data/glade/account_modification_window.glade.h:24
+#: ../data/glade/accounts_window.glade.h:26
 #: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
@@ -324,46 +357,49 @@ msgstr ""
 "menu na dole okna listy kontaktów) wpłynie odpowiednio na status tego konta"
 
 #: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/accounts_window.glade.h:29
 msgid "Information about you, as stored in the server"
 msgstr "Informacje o Tobie, takie jakie są przechowywane na serwerze"
 
-#: ../data/glade/account_modification_window.glade.h:26
-msgid "Manage..."
-msgstr "Zarządzaj..."
-
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1623
-#: ../src/config.py:3301
+#: ../data/glade/accounts_window.glade.h:34
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1526
+#: ../src/config.py:2002
 msgid "No key selected"
 msgstr "Nie wybrano żadnego klucza"
 
 #. None means no proxy profile selected
 #. GPG Key
 #: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:32 ../src/config.py:1196
-#: ../src/config.py:1201 ../src/config.py:1385 ../src/config.py:1613
-#: ../src/config.py:1622 ../src/config.py:1682 ../src/config.py:1756
-#: ../src/config.py:3291 ../src/config.py:3300 ../src/dialogs.py:281
-#: ../src/dialogs.py:283 ../src/roster_window.py:1717
-#: ../src/roster_window.py:1724 ../src/roster_window.py:1731
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:32 ../src/config.py:1115
+#: ../src/config.py:1186 ../src/config.py:1435 ../src/config.py:1440
+#: ../src/config.py:1900 ../src/config.py:1987 ../src/config.py:2001
+#: ../src/config.py:3083 ../src/config.py:3129 ../src/dialogs.py:342
+#: ../src/dialogs.py:344 ../src/roster_window.py:1837
+#: ../src/roster_window.py:1844 ../src/roster_window.py:1851
 msgid "None"
 msgstr "Żaden"
 
 #: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/accounts_window.glade.h:37
 #: ../data/glade/profile_window.glade.h:26
 #: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Informacje osobiste"
 
 #: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:38
 msgid "Port: "
 msgstr "Port: "
 
 #: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:39
 msgid "Priori_ty:"
 msgstr "Priory_tet:"
 
 #: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:40
 msgid ""
 "Priority is used in Jabber to determine who gets the events from the jabber "
 "server when two or more clients are connected using the same account; The "
@@ -374,18 +410,22 @@ msgstr ""
 "który ma wyższy priorytet, będzie odbierał wiadomości"
 
 #: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr "Priorytet ulegnie zmianie automatycznie, stosownie do twojego statusu."
 
 #: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:42
 msgid "Proxy:"
 msgstr "Pośrednik:"
 
 #: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/accounts_window.glade.h:44
 msgid "Resour_ce:"
 msgstr "Za_sób: "
 
 #: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/accounts_window.glade.h:45
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -405,41 +445,46 @@ msgid "Save _passphrase (insecure)"
 msgstr "Zapisz _hasło (nie jest to bezpieczne)"
 
 #: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:46
 #: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Zapisz _logi rozmów dla wszystkich kontaktów"
 
 #: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Send keep-alive packets"
 msgstr "Wysyłaj pakiety podtrzymujące"
 
 #: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Synch_ronizuj status konta z globalnym statusem"
 
 #: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:50
+#: ../data/glade/synchronise_contacts_dialog.glade.h:2
 #: ../data/glade/synchronise_select_account_dialog.glade.h:2
 msgid "Synchronise contacts"
 msgstr "Synchronizuj kontakty"
 
 #: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/accounts_window.glade.h:52
 msgid "Use _SSL (legacy)"
 msgstr "Korzystaj z _SSL"
 
-#: ../data/glade/account_modification_window.glade.h:45
-msgid "Use custom hostname/port"
-msgstr "Użyj własnej nazwy hosta/portu"
-
 #: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:55
 msgid "Use file transfer proxies"
 msgstr "Używaj serwerów proxy do przesyłania plików"
 
 #: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Dostosuj do statusu"
 
 #: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
@@ -447,47 +492,85 @@ msgstr "_Jabber ID:"
 msgid "_Name:"
 msgstr "_Nazwa: "
 
-#: ../data/glade/accounts_window.glade.h:1
-msgid "Accounts"
-msgstr "Konta"
+#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "Adres e-mail:"
 
-#: ../data/glade/accounts_window.glade.h:2
-msgid ""
-"If checked, all local contacts that use a Bonjour compatible chat client "
-"(like iChat, Trillian or Gaim) will be shown in roster. You don't need to be "
-"connected to a jabber server for it to work.\n"
-"This is only available if python-avahi is installed and avahi-daemon is "
-"running."
+#. XML Console enable checkbutton
+#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Włącz"
+
+#: ../data/glade/accounts_window.glade.h:17
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+msgid "First Name:"
+msgstr "Imię:"
+
+#: ../data/glade/accounts_window.glade.h:22
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr ""
-"Jeżeli opcja ta zostanie uaktywniona, znajdujące się w twojej sieci lokalnej "
-"kontakty używające klienta wykorzystującego technologię Bonjour (jak iChat, "
-"Trillian czy Gaim) pojawią się na rosterze. Nie musisz łączyć się z serwerem "
-"Jabbera, by z nimi rozmawiać."
+"Zaznaczenie tej opcji spowoduje pobieranie hasła z agenta GPG, np. Seahorse"
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:27
+#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
-"If you have 2 or more accounts and this is checked, Gajim will list all "
-"contacts as if you had one account"
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
 msgstr ""
-"Jeśli masz dwa konta lub więcej, to dzięki tej opcji Gajim pokaże wszystkie "
-"kontakty w taki sposób, jakby było to jedno konto"
+"Jeżeli domyślny port, na którym przyjmowane są nadchodzące wiadomości nie "
+"odpowiada ci, możesz wskazać numer portu, jakiego chcesz używać.\n"
+"Konieczna stać się może ponowna konfiguracja firewalla."
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:509
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/glade/accounts_window.glade.h:31
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+msgid "Last Name:"
+msgstr "Nazwisko:"
+
+#: ../data/glade/accounts_window.glade.h:33
 msgid "Mer_ge accounts"
 msgstr "_Połącz konta"
 
-#: ../data/glade/accounts_window.glade.h:6
-msgid "_Enable link-local messaging"
-msgstr "_Uaktywnij przesyłanie wiadomości do adresów link-local"
+#. Rename
+#: ../data/glade/accounts_window.glade.h:43 ../src/roster_window.py:2697
+msgid "Re_name"
+msgstr "_Zmień nazwę"
 
-#: ../data/glade/accounts_window.glade.h:7
-msgid "_Modify"
-msgstr "_Edytuj"
+#: ../data/glade/accounts_window.glade.h:51
+msgid "Use GPG _Agent"
+msgstr "Użyj _Agenta GPG"
 
-#: ../data/glade/accounts_window.glade.h:8
-#: ../data/glade/remove_account_window.glade.h:4
-msgid "_Remove"
-msgstr "_Usuń"
+#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+msgid "Use custom port:"
+msgstr "Użyj innego portu:"
+
+#: ../data/glade/accounts_window.glade.h:59
+msgid "gtk-add"
+msgstr "gtk-add"
+
+#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/features_window.glade.h:4
+msgid "gtk-close"
+msgstr "gtk-close"
+
+#: ../data/glade/accounts_window.glade.h:61
+msgid "gtk-remove"
+msgstr "gtk-remove"
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
@@ -582,6 +665,7 @@ msgid "This jabber entity does not expose any commands."
 msgstr "Ten obiekt Jabbera nie udostępnia żadnych komend."
 
 #: ../data/glade/advanced_configuration_window.glade.h:1
+#: ../data/glade/features_window.glade.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Opis</b>"
 
@@ -608,48 +692,40 @@ msgid "Deletes Message of the Day"
 msgstr "Usuwa Wiadomość Dnia"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:3
+msgid "Edit _Privacy Lists..."
+msgstr "_Edytuj listy prywatności"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:4
 msgid "Sends a message to users currently connected to this server"
 msgstr "Wysyła wiadomość do użytkowników aktualnie połączonych z tym serwerem"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
-msgid "Set MOTD"
+#: ../data/glade/advanced_menuitem_menu.glade.h:5
+msgid "Set MOTD..."
 msgstr "Ustaw MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/glade/advanced_menuitem_menu.glade.h:6
 msgid "Sets Message of the Day"
 msgstr "Ustawia Wiadomość Dnia"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/glade/advanced_menuitem_menu.glade.h:7
 msgid "Show _XML Console"
 msgstr "Konsola _XML"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
-msgid "Update MOTD"
-msgstr "Uaktualnij MOTD"
-
 #: ../data/glade/advanced_menuitem_menu.glade.h:8
+msgid "Update MOTD..."
+msgstr "Uaktualnij MOTD..."
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:9
 msgid "Updates Message of the Day"
 msgstr "Uaktualnia Wiadomość Dnia"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/glade/advanced_menuitem_menu.glade.h:10
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
-msgid "_Blocked Contacts"
-msgstr "_Kontakty zablokowane"
-
 #: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Privacy Lists"
-msgstr "_Listy prywatności"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:12
-msgid "_Send Server Message"
-msgstr "_Wyślij wiadomość do serwera"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:13
-msgid "_Send Single Message"
-msgstr "_Wyślij wiadomość"
+msgid "_Send Server Message..."
+msgstr "_Wyślij wiadomość do serwera..."
 
 #: ../data/glade/advanced_notifications_window.glade.h:1
 msgid " a window/tab opened with that contact "
@@ -664,7 +740,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>Warunki</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>Sounds</b>"
 msgstr "<b>Dźwięki</b>"
 
@@ -681,7 +757,7 @@ msgid "All statuses"
 msgstr "Dowolny status"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:91 ../src/common/helpers.py:243
+#: ../src/common/commands.py:96 ../src/common/helpers.py:251
 msgid "Away"
 msgstr "Zaraz wracam"
 
@@ -698,7 +774,7 @@ msgid "Have "
 msgstr "rozmawiam "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:261
 msgid "Invisible"
 msgstr "Niewidoczny"
 
@@ -707,7 +783,7 @@ msgid "Launch a command"
 msgstr "Wykonaj komendę"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:226
+#: ../src/common/helpers.py:234
 msgid "Not Available"
 msgstr "Nieobecny"
 
@@ -830,6 +906,10 @@ msgstr "Odebrano nowy wpis"
 msgid "You have received new entry:"
 msgstr "Otrzymałeś nowy artykuł:"
 
+#: ../data/glade/blocked_contacts_window.glade.h:1
+msgid "Blocked Contacts"
+msgstr "Kontakty zablokowane"
+
 #: ../data/glade/change_password_dialog.glade.h:1
 msgid "Change Password"
 msgstr "Zmień hasło"
@@ -859,11 +939,9 @@ msgid "Join _Group Chat"
 msgstr "Dołącz do _pokoju"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-#: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:11
-msgid "_Add to Roster"
-msgstr "Dod_aj do listy kontaktów"
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+msgid "_Add to Roster..."
+msgstr "Dod_aj do listy kontaktów..."
 
 #: ../data/glade/chat_context_menu.glade.h:3
 msgid "_Copy JID/Email Address"
@@ -882,7 +960,6 @@ msgid "_Open Link in Browser"
 msgstr "_Otwórz Link w przeglądarce"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
@@ -893,28 +970,62 @@ msgid "Click to see past conversations with this contact"
 msgstr "Kliknij by zobaczyć poprzednie rozmowy z tym kontaktem"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+msgid "Invite _Contacts"
+msgstr "Zaproś kontakty"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Wyślij _plik"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-msgid "Toggle Open_PGP Encryption"
-msgstr "Włącz/wyłącz szyfrowanie Open_PGP"
+#: ../data/glade/chat_control_popup_menu.glade.h:4
+msgid "Toggle End to End Encryption"
+msgstr "Włącz/wyłącz _szyfrowanie połączenia"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-msgid "_Compact View    Alt+C"
-msgstr "Widok _zwarty    Alt+C"
+msgid "Toggle Open_PGP Encryption"
+msgstr "Włącz/wyłącz szyfrowanie Open_PGP"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:8
-#: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "Dod_aj do listy kontaktów"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:7
+#: ../data/glade/gc_control_popup_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_window.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:2566
 msgid "_History"
 msgstr "_Historia"
 
+#: ../data/glade/chat_to_muc_window.glade.h:1
+msgid "In_vite"
+msgstr "_Zaproś"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends !"
+msgstr "Zaproś przyjaciół!"
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+msgid "MUC server"
+msgstr "Serwer MUC"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr "Proszę wybrać serwer MUC."
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+"Zamierzasz rozpocząć czat.\n"
+"Wybierz kontakty, które chcesz do niego zaprosić"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Wypełnij formularz."
@@ -927,6 +1038,14 @@ msgstr "Konfiguracja pokoju"
 msgid "Edit Groups"
 msgstr "Edytuj Grupy"
 
+#: ../data/glade/features_window.glade.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr "<b>Lista możliwych funkcjonalności Gajima:</b>"
+
+#: ../data/glade/features_window.glade.h:3
+msgid "Features"
+msgstr "Możliwości programu"
+
 #: ../data/glade/filetransfers.glade.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Lista aktywnych, ukończonych i zatrzymanych transferów plików"
@@ -979,7 +1098,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Gdy plik w całości zostanie przesłany, wyświetl okno powiadomienia"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:777
 msgid "_Continue"
 msgstr "_Kontynuuj"
 
@@ -987,7 +1106,7 @@ msgstr "_Kontynuuj"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Powiadom mnie gdy przesyłanie pliku dobiegnie końca"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:188
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:191
 msgid "_Open Containing Folder"
 msgstr "_Otwórz katalog zawierający ten plik"
 
@@ -1076,62 +1195,70 @@ msgid "_Background:"
 msgstr "_Tło:"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname"
-msgstr "Zmień pseudo_nim"
+msgid "Change _Nickname..."
+msgstr "Zmień pseudo_nim..."
 
 #: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject"
-msgstr "Zmień _temat"
+msgid "Change _Subject..."
+msgstr "Zmień _temat..."
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
 msgid "Click to see past conversation in this room"
 msgstr "Kliknij by zobaczyć poprzednie rozmowy w tym pokoju"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:4
-msgid "Configure _Room"
-msgstr "Konfiguruj _pokój"
+msgid "Configure _Room..."
+msgstr "Konfiguruj _pokój..."
 
 #: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Bookmark This Room"
+msgid "_Bookmark"
 msgstr "Dodaj _zakładkę dla tego pokoju"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-msgid "_Destroy room"
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+msgid "_Destroy Room"
 msgstr "_Zlikwiduj pokój"
 
+#: ../data/glade/gc_control_popup_menu.glade.h:8
+msgid "_Manage Room"
+msgstr "Zarządzaj pokojem"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:9
+msgid "_Minimize on close"
+msgstr "_Minimalizuj przy zamknięciu"
+
 #: ../data/glade/gc_occupants_menu.glade.h:1
 msgid "Mo_derator"
 msgstr "Mo_derator"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:2
+msgid "Occupant Actions"
+msgstr "Działania użytk_ownika"
+
+#: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Administrator"
 
-#: ../data/glade/gc_occupants_menu.glade.h:4
+#: ../data/glade/gc_occupants_menu.glade.h:6
 msgid "_Ban"
 msgstr "Za_banuj"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
 msgid "_Kick"
 msgstr "Wy_rzuć"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Member"
 msgstr "_Uczestnik"
 
-#: ../data/glade/gc_occupants_menu.glade.h:8
-msgid "_Occupant Actions"
-msgstr "Działania użytk_ownika"
-
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Owner"
 msgstr "_Właściciel"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Send Private Message"
 msgstr "_Wyślij prywatną wiadomość"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Voice"
 msgstr "_Głos"
 
@@ -1139,13 +1266,13 @@ msgstr "_Głos"
 msgid "Create new post"
 msgstr "Utwórz nowy wpis"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:268
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:276
 msgid "From"
 msgstr "Od"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:142
-#: ../src/history_manager.py:173
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:147
+#: ../src/history_manager.py:178
 msgid "Subject"
 msgstr "Temat"
 
@@ -1186,32 +1313,54 @@ msgid "_Search Database"
 msgstr "_Szukaj w bazie"
 
 #: ../data/glade/history_window.glade.h:1
-msgid "Build custom query"
-msgstr "Stwórz własne zapytanie"
+msgid "<b>History Viewer</b>"
+msgstr "<b>Przeglądanie historii</b>"
 
 #: ../data/glade/history_window.glade.h:2
+msgid "<b>JID Selection</b>"
+msgstr "<b>Wybór JID-a</b>"
+
+#: ../data/glade/history_window.glade.h:3
+msgid ""
+"Choose the chatlog you want to view. \n"
+"Enter the jid of a groupchat or a contact here. For online accounts you can "
+"even enter a a contact's nickname."
+msgstr ""
+"Wybierz katalog, który chcesz przejrzeć. \n"
+"Tu wpisz JID czatu lub kontaktu. Jeżeli kontakt jest online, możesz podać "
+"sam nick."
+
+#: ../data/glade/history_window.glade.h:5 ../src/history_window.py:224
 msgid "Conversation History"
 msgstr "Historia rozmowy"
 
-#: ../data/glade/history_window.glade.h:3
-msgid "Query Builder..."
-msgstr "Kreator zapytań..."
+#: ../data/glade/history_window.glade.h:6
+msgid ""
+"Current History\n"
+"All Chat Histories"
+msgstr ""
+"Bieżąca historia\n"
+"Wszystkie historie rozmów"
 
-#: ../data/glade/history_window.glade.h:4
+#: ../data/glade/history_window.glade.h:8
 #: ../data/glade/search_window.glade.h:2
 msgid "Search"
 msgstr "Szukaj"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/glade/history_window.glade.h:9
 #: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Zapisuj historię rozmowy"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/search_window.glade.h:3 ../src/disco.py:1177
+#: ../data/glade/history_window.glade.h:10
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1181
 msgid "_Search"
 msgstr "_Szukaj"
 
+#: ../data/glade/history_window.glade.h:11
+msgid "in"
+msgstr "w"
+
 #: ../data/glade/invitation_received_dialog.glade.h:1
 msgid "Accept"
 msgstr "Akceptuj"
@@ -1225,7 +1374,7 @@ msgstr "Odmów"
 msgid "Invitation Received"
 msgstr "Zaproszenie Odebrane"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1208
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1381
 msgid "Join Group Chat"
 msgstr "Dołącz do pokoju"
 
@@ -1234,14 +1383,14 @@ msgid "Join this room automatically when I connect"
 msgstr "Automatycznie dołącz do tego pokoju po uzyskaniu połączenia"
 
 #: ../data/glade/join_groupchat_window.glade.h:3
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/glade/manage_bookmarks_window.glade.h:5
 #: ../data/glade/profile_window.glade.h:24
 #: ../data/glade/vcard_information_window.glade.h:31
 msgid "Nickname:"
 msgstr "Pseudonim:"
 
 #: ../data/glade/join_groupchat_window.glade.h:4
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Hasło:"
 
@@ -1250,12 +1399,12 @@ msgid "Recently:"
 msgstr "Ostatnio:"
 
 #: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Pokój:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1165
-#: ../src/disco.py:1615
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1169
+#: ../src/disco.py:1624
 msgid "_Join"
 msgstr "_Dołącz"
 
@@ -1275,15 +1424,19 @@ msgstr "Zaznaczenie spowoduje łączenie z tym pokojem przy starcie programu"
 msgid "Manage Bookmarks"
 msgstr "Zarządzaj zakładkami"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:4
+msgid "Minimize on Auto Join"
+msgstr "Minimalizuj po automatycznym wejściu"
+
+#: ../data/glade/manage_bookmarks_window.glade.h:7
 msgid "Print status:"
 msgstr "Wyświetlaj status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Server:"
 msgstr "Serwer:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:10
 msgid "Title:"
 msgstr "Tytuł:"
 
@@ -1299,7 +1452,8 @@ msgstr "<b>Ustawienia</b>"
 msgid ""
 "HTTP Connect\n"
 "SOCKS5"
-msgstr "Połączenie HTTP\n"
+msgstr ""
+"Połączenie HTTP\n"
 "SOCKS5"
 
 #: ../data/glade/manage_proxies_window.glade.h:5
@@ -1312,6 +1466,10 @@ msgstr "Zarządzaj profilami pośrednika"
 msgid "Name:"
 msgstr "Nazwa:"
 
+#: ../data/glade/manage_proxies_window.glade.h:7
+msgid "Pass_word:"
+msgstr "_Hasło:"
+
 #: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Type:"
 msgstr "Typ:"
@@ -1320,17 +1478,21 @@ msgstr "Typ:"
 msgid "Use authentication"
 msgstr "Używaj autoryzacji"
 
+#: ../data/glade/manage_proxies_window.glade.h:10
+msgid "_Host:"
+msgstr "_Host:"
+
 #: ../data/glade/message_window.glade.h:1
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Kliknij by wstawić emotikon (Alt+E)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1125
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1268
 msgid "OpenPGP Encryption"
 msgstr "Szyfrowanie OpenPGP"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:4
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:12
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Działania"
@@ -1338,7 +1500,7 @@ msgstr "_Działania"
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:6
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:245
+#: ../src/filetransfers_window.py:248
 msgid "_Send"
 msgstr "_Wyślij"
 
@@ -1354,36 +1516,48 @@ msgstr "<b>Edytor zaawansowanych konfiguracji</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Aplikacje</b>"
 
+#: ../data/glade/preferences_window.glade.h:3
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Tożsamość na czacie</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/glade/preferences_window.glade.h:5
 msgid "<b>Custom</b>"
 msgstr "<b>Własne</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/glade/preferences_window.glade.h:6
 msgid "<b>Format of a line</b>"
 msgstr "<b>Format linii</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/glade/preferences_window.glade.h:7
 msgid "<b>GMail Options</b>"
 msgstr "<b>Opcje konta Gmail</b>"
 
-#: ../data/glade/preferences_window.glade.h:7
-msgid "<b>Interface Customization</b>"
-msgstr "<b>Własne ustawienia interfejsu</b>"
-
 #: ../data/glade/preferences_window.glade.h:9
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Zapisane opisy</b>"
 
+#: ../data/glade/preferences_window.glade.h:10
+msgid "<b>Privacy</b>"
+msgstr "<p>Prywatność</i>"
+
 #: ../data/glade/preferences_window.glade.h:11
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Tożsamość na rosterze</b>"
+
+#: ../data/glade/preferences_window.glade.h:13
+msgid "<b>Themes</b>"
+msgstr "<b>Tematy</b>"
+
+#: ../data/glade/preferences_window.glade.h:14
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Powiadomienia wizualne</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/glade/preferences_window.glade.h:15
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/glade/preferences_window.glade.h:16
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1393,26 +1567,22 @@ msgstr ""
 "Tylko dotyczące pisania\n"
 "Wyłączone"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/glade/preferences_window.glade.h:19
 msgid "Allow _OS information to be sent"
 msgstr "Zezwól na wysyłanie informacji o systemie _operacyjnym"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/glade/preferences_window.glade.h:20
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Pokazuj powiadomienia gdy mam status _zaraz wracam/nieobecny/zajęty/"
 "niewidoczny"
 
-#: ../data/glade/preferences_window.glade.h:18
-msgid "Also known as iChat style"
-msgstr "Znany także jako styl iChat"
-
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/glade/preferences_window.glade.h:21
 msgid "Always check to see if Gajim is the _default Jabber client on startup"
 msgstr ""
 "Przy starcie zawsze sprawdzaj czy Gajim jest _domyślnym_ klientem Jabbera"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/glade/preferences_window.glade.h:22
 msgid ""
 "An example: If you have enabled status message for away, Gajim won't ask you "
 "anymore for a status message when you change your status to away; it will "
@@ -1422,19 +1592,19 @@ msgstr ""
 "zapamięta go i nie będzie prosił o jego zmianę po ponownym ustawieniu "
 "takiego stanu"
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Ask status message when I:"
 msgstr "Pytaj o opis przy zmianie statusu na:"
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/glade/preferences_window.glade.h:24
 msgid "Auto _away after:"
 msgstr "Automatyczny status '_Zaraz wracam' po:"
 
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:25
 msgid "Auto _not available after:"
 msgstr "Automatyczny status '_Nieobecny' po:"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/glade/preferences_window.glade.h:26
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1448,11 +1618,7 @@ msgstr ""
 "Zawsze używaj domyślnych aplikacji XFCE4\n"
 "Własne"
 
-#: ../data/glade/preferences_window.glade.h:29
-msgid "Chat"
-msgstr "Rozmowa"
-
-#: ../data/glade/preferences_window.glade.h:30
+#: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, because it blocks all messages from any contact that "
@@ -1462,18 +1628,14 @@ msgstr ""
 "wiadomościami. Stosuj ją ostrożnie, ponieważ powoduje ona blokowanie "
 "wszystkich wiadomości od osób, których nie masz na liście kontaktów"
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/glade/preferences_window.glade.h:32
 msgid "Configure color and font of the interface"
 msgstr "Konfiguruj kolor i czcionkę interfejsu"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Default Status Messages"
 msgstr "Domyślne stany opisowe"
 
-#: ../data/glade/preferences_window.glade.h:33
-msgid "Default status _iconset:"
-msgstr "Domyślny zestaw ikon _statusu:"
-
 #: ../data/glade/preferences_window.glade.h:34
 msgid ""
 "Determined by sender\n"
@@ -1497,22 +1659,14 @@ msgid "Display status _messages of contacts in roster"
 msgstr "Wyświetlaj _opisy statusu kontaktu na liście kontaktów"
 
 #: ../data/glade/preferences_window.glade.h:40
-msgid "Displayed Chat state noti_fications:"
-msgstr "Rodzaj wyświetlanych _powiadomień podczas rozmowy:"
-
-#: ../data/glade/preferences_window.glade.h:41
-msgid "E_very 5 minutes"
-msgstr "Co 5 _minut"
-
-#: ../data/glade/preferences_window.glade.h:42
 msgid "Emoticons:"
 msgstr "Emotikony:"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Events"
 msgstr "Zdarzenia"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:42
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1522,7 +1676,7 @@ msgstr ""
 "W tym miejscu możesz zdecydować, które z tych danych chcesz wyświetlać w "
 "oknie rozmowy."
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:43
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1531,30 +1685,7 @@ msgstr ""
 "Gajim może wysyłać i odbierać meta-infomacje związane z prowadzoną rozmową. "
 "W tym miejscu możesz zdecydować, jakie dane chcesz wysyłać do rozmówcy."
 
-#: ../data/glade/preferences_window.glade.h:46
-msgid ""
-"Gajim will automatically show new events by popping up the relevant window"
-msgstr ""
-"Gajim automatycznie wyświetli nową wiadomość w nowym oknie lub w nowej "
-"karcie otwartego okna rozmowy"
-
-#: ../data/glade/preferences_window.glade.h:47
-msgid ""
-"Gajim will notify you for new events via a popup in the bottom right of the "
-"screen"
-msgstr ""
-"Gajim powiadomi Cię o nadejściu nowej wiadomości wyświetlając okienko w "
-"prawym dolnym rogu ekranu"
-
-#: ../data/glade/preferences_window.glade.h:48
-msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed in"
-msgstr ""
-"Gajim powiadomi automatycznie przy pomocy okna w prawym dolnym rogu o "
-"kontaktach, które zmieniają status na Dostępny"
-
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:44
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1562,12 +1693,11 @@ msgstr ""
 "Gajim powiadomi automatycznie przy pomocy okna w prawym dolnym rogu o "
 "kontaktach które zmieniają status na Rozłączony"
 
-#: ../data/glade/preferences_window.glade.h:50
-msgid ""
-"Gajim will only change the icon of the contact that triggered the new event"
-msgstr "Gajim zmieni jedynie ikonę kontaktu, który przysłał nową wiadomość"
+#: ../data/glade/preferences_window.glade.h:46
+msgid "Hides buttons in chatwindows to "
+msgstr "Ukrywa przyciski w oknie czatu "
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1575,7 +1705,7 @@ msgstr ""
 "Jeżeli opcja ta zostanie uaktywniona, Gajim będzie również wyświetlał "
 "informacje o nadawcach nowej poczty w twojej skrzynce"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1583,7 +1713,7 @@ msgstr ""
 "Zaznaczenie tej opcji spowoduje wyświetlanie awatarów w oknie listy "
 "kontaktów (roster oraz okno czatu)"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1591,15 +1721,7 @@ msgstr ""
 "Jeśli jest zaznaczone, Gajim będzie wyświetlał opis statusu kontaktu pod "
 "jego nazwą na liście kontaktów"
 
-#: ../data/glade/preferences_window.glade.h:55
-msgid ""
-"If checked, Gajim will remember the roster and chat window positions in the "
-"screen and the sizes of them next time you run it"
-msgstr ""
-"Zaznaczenie tej opcji spowoduje zapamiętanie położenia głównego okna "
-"programu na ekranie oraz jego rozmiaru"
-
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1609,7 +1731,7 @@ msgstr ""
 "transportu, np. kontakt z MSN będzie miał odpowiednie ikony statusu "
 "dostępny, zaraz wracam, zajęty, itd"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1617,15 +1739,15 @@ msgstr ""
 "Zaznaczenie tej opcji spowoduje zastąpienie emotikon tekstowych jak ':)' "
 "emotikonami graficznymi"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:52
 msgid "Ignore rich content in incoming messages"
 msgstr "Ignoruj wzbogaconą treść w wiadomościach"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Ma_nage..."
 msgstr "Za_rządzaj..."
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "Never\n"
 "Always\n"
@@ -1637,59 +1759,53 @@ msgstr ""
 "Według konta\n"
 "Według typu"
 
-#: ../data/glade/preferences_window.glade.h:64
-msgid "Notify me about contacts that: "
-msgstr "Powiadom mnie o kontaktach zmieniających status na: "
+#: ../data/glade/preferences_window.glade.h:58
+msgid "Notify me about contacts that sign _in"
+msgstr "Powiadom mnie o kontaktach, które się _logują"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:59
+msgid "Notify me about contacts that sign _out"
+msgstr "Powiadom mnie o kontaktach, które się _wylogowują "
+
+#: ../data/glade/preferences_window.glade.h:60
 msgid "Notify on new _GMail email"
 msgstr "Powiadamiaj o nowej poczcie na koncie _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:66
-msgid "On every _message"
-msgstr "W każdej _wiadomości"
-
-#: ../data/glade/preferences_window.glade.h:67
-msgid "One message _window:"
-msgstr "Grupuj okna:"
-
-#: ../data/glade/preferences_window.glade.h:68
-msgid "Outgoing Chat state noti_fications:"
-msgstr "Wysyłanie powiadomienia o stanie _rozmowy:"
-
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:61
 msgid "Play _sounds"
 msgstr "Odtwórz _dźwięk"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:62
+msgid ""
+"Pop it up\n"
+"Notify me about it\n"
+"Show only in roster"
+msgstr ""
+"Otwórz okno\n"
+"Powiadom mnie o tym\n"
+"Pokaż tylko w rosterze"
+
+#: ../data/glade/preferences_window.glade.h:65
 msgid "Preferences"
 msgstr "Ustawienia"
 
-#: ../data/glade/preferences_window.glade.h:71
-msgid "Print time:"
-msgstr "Wyświetlaj czas:"
-
-#: ../data/glade/preferences_window.glade.h:72
-msgid "Save _position and size for roster and chat windows"
-msgstr "Zapisz _pozycję i rozmiar okna kontaktów i okna rozmowy"
+#: ../data/glade/preferences_window.glade.h:66
+msgid "Privacy"
+msgstr "Prywatność"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Set status message to reflect currently playing _music track"
 msgstr "Wyświetlaj informacje o odtwarzanej _muzyce w statusie opisowym"
 
-#: ../data/glade/preferences_window.glade.h:74
-msgid "Show only in _roster"
-msgstr "Pokaż tylko _listę kontaktów"
-
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Sign _in"
 msgstr "_Połączony"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Sign _out"
 msgstr "R_ozłączony"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:70
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1698,54 +1814,47 @@ msgstr ""
 "formatowanie. Jeżeli ta opcja jest aktywna, Gajim będzie ignorował te "
 "dodatki i wyświetlał czysty tekst."
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:72
+msgid "Status _iconset:"
+msgstr "Zestaw ikon _statusu:"
+
+#: ../data/glade/preferences_window.glade.h:73
 msgid "T_heme:"
 msgstr "_Motyw:"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:74
 msgid "The auto away status message"
 msgstr "Automatyczny status \"Zaraz wracam\""
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:75
 msgid "The auto not available status message"
 msgstr "Automatyczny status \"Nieobecny\""
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Treat all incoming messages as:"
 msgstr "Traktuj wszystkie otrzymane wiadomości jako:"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Use _transports iconsets"
 msgstr "Używaj zestawów ikon _transportów"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:78
+msgid "Use only one message _window:"
+msgstr "_Grupuj okna:"
+
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Use system _default"
 msgstr "Użyj _domyślnej dla systemu"
 
-#: ../data/glade/preferences_window.glade.h:85
-msgid "Use t_rayicon (aka. notification area icon)"
-msgstr "_Ikona w obszarze powiadamiania"
-
-#: ../data/glade/preferences_window.glade.h:86
-msgid ""
-"When a new event (message, file transfer request etc..) is received, the "
-"following methods may be used to inform you about it. Please note that "
-"events about new messages only occur if it is a new message from a contact "
-"you are not already chatting with"
-msgstr ""
-"Kiedy pojawi się nowe zdarzenie (wiadomość, prośba o przesłanie pliku itp.), "
-"możesz zostać o tym powiadomiony na takie sposoby. UWAGA: Nowa wiadomość "
-"pojawia się jeśli nie pochodzi od osoby, z którą aktualnie rozmawiasz"
-
-#: ../data/glade/preferences_window.glade.h:87
-msgid "When new event is received"
+#: ../data/glade/preferences_window.glade.h:80
+msgid "When new event is received:"
 msgstr "Gdy odebrane zostanie nowe zdarzenie"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:81
 msgid ""
 "Works for Rhythmbox and Muine players. For more players, please visit http://"
 "trac.gajim.org/wiki/GajimAndMusicPlayer"
@@ -1754,86 +1863,90 @@ msgstr ""
 "obsłudze innego oprogramowania, odwiedź stronę http://trac.gajim.org/wiki/"
 "GajimAndMusicPlayer"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:82
 msgid "_Advanced Notifications Control..."
 msgstr "_Edytor zaawansowanych ustawień"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:83
 msgid "_Browser:"
 msgstr "Prze_glądarka:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:84
+msgid "_Display chat state notifications:"
+msgstr "Wyświetlaj informacje stanie kontaktu:"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "_File manager:"
 msgstr "Menadżer _plików:"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Font:"
 msgstr "_Czcionka:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_Highlight misspelled words"
 msgstr "Podś_wietlaj błędy w pisowni"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignoruj wiadomości od osób spoza listy kontaktów"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Incoming message:"
 msgstr "Wiadomość _otrzymana:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_Log status changes of contacts"
 msgstr "_Zapisuj w logach zmiany statusów kontaktów"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Mail client:"
 msgstr "Klient _poczty:"
 
-#: ../data/glade/preferences_window.glade.h:98
-msgid "_Never"
-msgstr "_Nigdy"
-
-#: ../data/glade/preferences_window.glade.h:99
-msgid "_Notify me about it"
-msgstr "Powia_dom mnie o tym"
+#: ../data/glade/preferences_window.glade.h:92
+msgid "_Make message windows compact"
+msgstr "_Ukrywaj przyciski w oknach rozmowy"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Open..."
 msgstr "_Otwórz..."
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Outgoing message:"
 msgstr "Wysłana wiadomość :"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Player:"
 msgstr "_Program odtwarzający dźwięk:"
 
-#: ../data/glade/preferences_window.glade.h:103
-msgid "_Pop it up"
-msgstr "_Wyświetl"
-
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Reset to Default Colors"
 msgstr "Wróć do kolorów _domyślnych"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:97
+msgid "_Send chat state notifications:"
+msgstr "Rodzaje powiadomień wysyłanych podczas rozmowy:"
+
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Sort contacts by status"
 msgstr "Sortuj kontakty według statusu"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Status message:"
 msgstr "_Informacja o statusie:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:100
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:101
 msgid "minutes"
 msgstr "minutach"
 
+#: ../data/glade/privacy_lists_window.glade.h:1
+msgid "Privacy Lists:"
+msgstr "Listy prywatności"
+
 #: ../data/glade/privacy_list_window.glade.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Dodaj / Edytuj regułę</b>"
@@ -1870,7 +1983,7 @@ msgstr "JID"
 msgid "Order:"
 msgstr "Kolejność:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2052
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2248
 msgid "Privacy List"
 msgstr "Lista prywatności"
 
@@ -1910,10 +2023,6 @@ msgstr "wysyłać mi status"
 msgid "to view my status"
 msgstr "widzieć mój status"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
-msgid "Privacy Lists:"
-msgstr "Listy prywatności"
-
 #. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:2
 #: ../data/glade/vcard_information_window.glade.h:2
@@ -1944,66 +2053,59 @@ msgid "Click to set your avatar"
 msgstr "Kliknij aby ustawić avatar"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "Company:"
 msgstr "Firma:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/glade/vcard_information_window.glade.h:14
 msgid "Country:"
 msgstr "Kraj:"
 
 #: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "Department:"
 msgstr "Dział:"
 
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:17
-#: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
-msgid "E-Mail:"
-msgstr "Adres e-mail:"
-
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:17
 msgid "Extra Address:"
 msgstr "Dodatkowy adres:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:19
 msgid "Family:"
 msgstr "Nazwisko:"
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:16
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "Format: YYYY-MM-DD"
 msgstr "Format: RRRR-MM-DD"
 
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:22
+msgid "Full Name"
+msgstr "Imię i nazwisko"
+
 #. Given Name
-#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/profile_window.glade.h:19
 #: ../data/glade/vcard_information_window.glade.h:24
 msgid "Given:"
 msgstr "Imię:"
 
-#: ../data/glade/profile_window.glade.h:19
+#: ../data/glade/profile_window.glade.h:20
 #: ../data/glade/vcard_information_window.glade.h:25
 msgid "Homepage:"
 msgstr "Strona domowa:"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:21
+#: ../data/glade/profile_window.glade.h:22
 #: ../data/glade/vcard_information_window.glade.h:28
 msgid "Middle:"
 msgstr "Drugie imię:"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:29
-msgid "More"
-msgstr "Więcej"
-
 #: ../data/glade/profile_window.glade.h:25
 #: ../data/glade/vcard_information_window.glade.h:34
 msgid "Personal Info"
@@ -2031,7 +2133,7 @@ msgid "Prefix:"
 msgstr "Prefiks:"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:41 ../src/vcard.py:381
+#: ../data/glade/vcard_information_window.glade.h:41 ../src/vcard.py:307
 msgid "Role:"
 msgstr "Funkcja:"
 
@@ -2068,82 +2170,95 @@ msgstr "Usuń konto _tylko z Gajima"
 msgid "Remove account from Gajim and from _server"
 msgstr "Usuń konto z Gajima i z _serwera"
 
+#. Remove
+#. Remove group
+#. Remove
+#: ../data/glade/remove_account_window.glade.h:4
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+#: ../src/roster_window.py:2523 ../src/roster_window.py:2733
+#: ../src/roster_window.py:2869
+msgid "_Remove"
+msgstr "_Usuń"
+
 #: ../data/glade/roster_contact_context_menu.glade.h:1
 msgid "A_sk to see his/her status"
 msgstr "Poproś o to, żeby móc widzieć jego/jej _status"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Dodaj powiadomienia _specjalne"
+msgid "Add Special _Notification..."
+msgstr "Dodaj powiadomienia _specjalne..."
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Przypisz klucz Open_PGP"
+msgid "Assign Open_PGP Key..."
+msgstr "Przypisz klucz Open_PGP..."
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:2293
-msgid "Edit _Groups"
-msgstr "Modyfikuj _grupy"
+msgid "Edit _Groups..."
+msgstr "Modyfikuj _grupy..."
 
+#. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:2481
+#: ../src/roster_window.py:2826
 msgid "Execute Command..."
 msgstr "Wykonaj komendę..."
 
+#. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:2251
+#: ../src/roster_window.py:2439
 msgid "In_vite to"
 msgstr "_Zaproś do"
 
+#. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Wyślij _wiadomość"
+#: ../src/roster_window.py:2663 ../src/roster_window.py:2797
+msgid "Send Cus_tom Status"
+msgstr "Wyślij odrębny status"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+msgid "Send Single _Message..."
+msgstr "Wyślij _wiadomość..."
 
 #: ../data/glade/roster_contact_context_menu.glade.h:9
-msgid "Send cus_tom status"
-msgstr "Wyślij _odrębny status"
+msgid "Send _File..."
+msgstr "Wyślij _plik..."
 
 #: ../data/glade/roster_contact_context_menu.glade.h:10
+msgid "Set Custom _Avatar..."
+msgstr "Ustaw własny _avatar..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Rozpocznij _rozmowę"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 msgid "_Allow him/her to see my status"
 msgstr "_Pozwól mu/jej widzieć swój status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:13
-#: ../src/roster_window.py:2317 ../src/roster_window.py:2428
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../src/roster_window.py:2513 ../src/roster_window.py:2724
 msgid "_Block"
 msgstr "_Zablokuj"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../data/glade/roster_contact_context_menu.glade.h:15
 msgid "_Forbid him/her to see my status"
 msgstr "_Zabroń mu/jej widzieć twój status"
 
-#. Remove group
-#: ../data/glade/roster_contact_context_menu.glade.h:16
-#: ../src/roster_window.py:2245 ../src/roster_window.py:2354
-#: ../src/roster_window.py:2502
-msgid "_Remove from Roster"
-msgstr "_Usuń z listy kontaktów"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:17
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2490
-msgid "_Rename"
-msgstr "_Zmień nazwę"
+msgid "_Manage Contact"
+msgstr "_Modyfikuj dane kontaktu"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:18
+#: ../data/glade/roster_contact_context_menu.glade.h:19
+msgid "_Rename..."
+msgstr "_Zmień nazwę..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:20
 msgid "_Subscription"
 msgstr "_Autoryzacja"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../src/roster_window.py:2311 ../src/roster_window.py:2422
+#: ../data/glade/roster_contact_context_menu.glade.h:21
+#: ../src/roster_window.py:2507 ../src/roster_window.py:2718
 msgid "_Unblock"
 msgstr "_Cofnij blokadę"
 
@@ -2152,63 +2267,66 @@ msgid "A_ccounts"
 msgstr "_Konta"
 
 #: ../data/glade/roster_window.glade.h:2
-msgid "Add _Contact"
-msgstr "Dodaj _kontakt"
+msgid "Add _Contact..."
+msgstr "Dod_aj kontakt..."
 
 #: ../data/glade/roster_window.glade.h:3
+msgid "Fea_tures"
+msgstr "_Możliwości serwerów"
+
+#: ../data/glade/roster_window.glade.h:4
 msgid "File _Transfers"
 msgstr "_Przesyłanie plików"
 
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/glade/roster_window.glade.h:5
 msgid "Frequently Asked Questions (online)"
 msgstr "Najczęściej Zadawane Pytania (w sieci)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/glade/roster_window.glade.h:7
 msgid "Help online"
 msgstr "Pomoc w sieci"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:9
 msgid "Profile, A_vatar"
 msgstr "Profil, _Awatar"
 
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
 msgstr "Pokaż _transporty"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "Pokaż kontakty niep_ołączone"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:14
 msgid "_Contents"
 msgstr "_Zawartość"
 
-#: ../data/glade/roster_window.glade.h:13
-msgid "_Discover Services"
-msgstr "_Wyszukuj usługi"
-
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1353
-#: ../src/roster_window.py:2473
+#: ../data/glade/roster_window.glade.h:16 ../src/disco.py:1357
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:17
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Help"
 msgstr "_Pomoc"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Preferences"
 msgstr "_Ustawienia"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:21
 msgid "_Quit"
 msgstr "_Zakończ"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
+msgid "_Send Single Message..."
+msgstr "Wyślij _wiadomość..."
+
+#: ../data/glade/roster_window.glade.h:24
 msgid "_View"
 msgstr "_Widok"
 
@@ -2216,6 +2334,15 @@ msgstr "_Widok"
 msgid "Please wait while retrieving search form..."
 msgstr "Proszę czekać, trwa pobieranie formularza wyszukiwania..."
 
+#: ../data/glade/search_window.glade.h:3
+msgid "_Add contact"
+msgstr "Dodaj _kontakt"
+
+#. Information
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:2881
+msgid "_Information"
+msgstr "Informacje o kontakcie"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "I_dź"
@@ -2224,10 +2351,6 @@ msgstr "I_dź"
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: ../data/glade/service_discovery_window.glade.h:3
-msgid "_Filter:"
-msgstr "_Filtr:"
-
 #: ../data/glade/service_registration_window.glade.h:1
 msgid "Register to"
 msgstr "Zarejestruj w"
@@ -2304,6 +2427,11 @@ msgstr "Prośba o autoryzację"
 msgid "_Deny"
 msgstr "O_dmów"
 
+#: ../data/glade/synchronise_contacts_dialog.glade.h:1
+#, fuzzy
+msgid "Select the account with which to synchronise"
+msgstr "Wskaż konto, z którym chcesz zsynchronizować kontakty"
+
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Wskaż konto, z którym chcesz zsynchronizować kontakty"
@@ -2320,6 +2448,10 @@ msgstr "Synchronizacja: wybierz kontakty"
 msgid "Mute Sounds"
 msgstr "Wyłącz dźwięki"
 
+#: ../data/glade/systray_context_menu.glade.h:2
+msgid "Send Single _Message"
+msgstr "Wyślij _wiadomość"
+
 #: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
 msgstr "Pokaż wszystkie oczekujące _zdarzenia"
@@ -2332,41 +2464,39 @@ msgstr "Pokaż _listę kontaktów"
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
+#: ../data/glade/systray_context_menu.glade.h:6
+msgid "_Group Chat"
+msgstr "_Pokój"
+
 #. Given Name
 #: ../data/glade/vcard_information_window.glade.h:5
 msgid "Ask:"
 msgstr "Pytaj:"
 
 #: ../data/glade/vcard_information_window.glade.h:8
-msgid "Click to force avatar"
-msgstr "Kliknij aby ustawić avatar"
-
-#: ../data/glade/vcard_information_window.glade.h:9
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:9
 msgid "Comments"
 msgstr "Komentarze"
 
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:11
 msgid "Configured avatar:"
 msgstr "Ustawiony avatar:"
 
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:12
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:13
 msgid "Contact Information"
 msgstr "Informacje o kontakcie"
 
-#: ../data/glade/vcard_information_window.glade.h:26
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+#: ../data/glade/vcard_information_window.glade.h:29
+msgid "More"
+msgstr "Więcej"
 
 #: ../data/glade/vcard_information_window.glade.h:33
 msgid "OS:"
@@ -2399,11 +2529,6 @@ msgstr "<b>Jabber Traffic</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>Wejście XML</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Włącz"
-
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2422,15 +2547,29 @@ msgstr "Wiado_mość"
 msgid "_Presence"
 msgstr "_Obecność"
 
-#: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
-msgid "First Name:"
-msgstr "Imię:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
+msgid "Add Special _Notification"
+msgstr "Dodaj powiadomienia _specjalne"
 
-#: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
-msgid "Last Name:"
-msgstr "Nazwisko:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
+msgid "Assign Open_PGP Key"
+msgstr "Przypisz klucz Open_PGP"
+
+#. Edit Groups
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:2496
+msgid "Edit _Groups"
+msgstr "Modyfikuj _grupy"
+
+#. Rename
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:2853
+msgid "_Rename"
+msgstr "_Zmień nazwę"
+
+#: ../data/glade/zeroconf_context_menu.glade.h:1
+msgid "_Modify Account..."
+msgstr "_Modyfikuj konto..."
 
 #: ../data/glade/zeroconf_information_window.glade.h:6
 msgid "Local jid:"
@@ -2440,266 +2579,275 @@ msgstr "Lokalny JID:"
 msgid "Personal"
 msgstr "Informacje osobiste"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:11
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Jeżeli domyślny port, na którym przyjmowane są nadchodzące wiadomości nie "
-"odpowiada ci, możesz wskazać numer portu, jakiego chcesz używać.\n"
-"Konieczna stać się może ponowna konfiguracja firewalla."
-
 #: ../data/glade/zeroconf_properties_window.glade.h:15
 msgid "Modify Account"
 msgstr "Modyfikuj konto"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
-msgstr "Użyj innego portu:"
-
 #. For i18n
-#: ../src/advanced.py:51
+#: ../src/advanced.py:56
 msgid "Activated"
 msgstr "Aktywny"
 
-#: ../src/advanced.py:51
+#: ../src/advanced.py:56
 msgid "Deactivated"
 msgstr "Nieaktywny"
 
-#: ../src/advanced.py:53
+#: ../src/advanced.py:58
 msgid "Boolean"
 msgstr "Zmienna logiczna"
 
-#: ../src/advanced.py:54
+#: ../src/advanced.py:59
 msgid "Integer"
 msgstr "Liczba całkowita"
 
-#: ../src/advanced.py:55
+#: ../src/advanced.py:60
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced.py:56
+#: ../src/advanced.py:61
 msgid "Color"
 msgstr "Kolor"
 
-#: ../src/advanced.py:65
+#: ../src/advanced.py:70
 msgid "Preference Name"
 msgstr "Nazwa opcji"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:76
 msgid "Value"
 msgstr "Wartość"
 
-#: ../src/advanced.py:79
+#: ../src/advanced.py:84
 msgid "Type"
 msgstr "Typ"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:140
 msgid "(None)"
 msgstr "(Brak)"
 
 #. we talk about password
-#: ../src/advanced.py:239
+#: ../src/advanced.py:243
 msgid "Hidden"
 msgstr "Ukryte"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
-#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "English"
 msgstr "angielski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Belarusian"
 msgstr "bułgarski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Bulgarian"
 msgstr "bułgarski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Breton"
 msgstr "bretoński"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Czech"
 msgstr "czeski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "German"
 msgstr "niemiecki"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Greek"
 msgstr "grecki"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "British"
 msgstr "brytyjski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Esperanto"
 msgstr "esperanto"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Spanish"
 msgstr "hiszpański"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Basque"
 msgstr "baskijski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "French"
 msgstr "francuski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Croatian"
 msgstr "chorwacki"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Italian"
 msgstr "włoski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Norwegian (b)"
 msgstr "norweski (b)"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Dutch"
 msgstr "holenderski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Norwegian"
 msgstr "norweski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Polish"
 msgstr "polski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Portuguese"
 msgstr "portugalski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Brazilian Portuguese"
 msgstr "portugalski (Brazylia)"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Russian"
 msgstr "rosyjski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Serbian"
 msgstr "serbski"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Slovak"
 msgstr "słowacki"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Swedish"
 msgstr "szwedzki"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control.py:60
 msgid "Chinese (Ch)"
 msgstr "chiński (Ch)"
 
-#: ../src/chat_control.py:212 ../src/dialogs.py:1706
-msgid ""
-"If that is not your language for which you want to highlight misspelled "
-"words, then please set your $LANG as appropriate. Eg. for French do export "
-"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it "
-"global in /etc/profile.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Jeśli podświetlanie błędów w pisowni działa dla niewłaściwego języka, to "
-"ustaw odpowiednio zmienną środowiskową $LANG. Np. dla języka polskiego wpisz "
-"export LANG=pl_PL do pliku ~/.bash_profile lub globalnie do pliku in /etc/"
-"profile.\n"
-"\n"
-"Podświedlanie błędów w pisowni nie będzie używane"
-
-#: ../src/chat_control.py:251
+#: ../src/chat_control.py:314
 msgid "Spelling language"
 msgstr "Wybierz słownik"
 
 #. we are not connected
-#: ../src/chat_control.py:274 ../src/chat_control.py:480
+#: ../src/chat_control.py:337 ../src/chat_control.py:560
 msgid "A connection is not available"
 msgstr "Połączenie jest niemożliwe"
 
-#: ../src/chat_control.py:275 ../src/chat_control.py:481
+#: ../src/chat_control.py:338 ../src/chat_control.py:561
 msgid "Your message can not be sent until you are connected."
 msgstr "Nie możesz wysłać wiadomości dopóki nie będziesz połączony."
 
-#: ../src/chat_control.py:1050
+#: ../src/chat_control.py:1187
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z pokoju %(room_name)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1139
+#: ../src/chat_control.py:1282
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 "Ani %s nie przesyła swojego klucza OpenPGP, ani Ty nie przypisałeś mu "
 "żadnego klucza"
 
-#: ../src/chat_control.py:1173 ../src/groupchat_control.py:1276
+#: ../src/chat_control.py:1325 ../src/groupchat_control.py:1433
+#, python-format
+msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+msgstr ""
+"Nie ma takiego polecenia: /%s (jeśli chcesz je wysłać, poprzedź je znakami: /"
+"say)"
+
+#: ../src/chat_control.py:1332 ../src/groupchat_control.py:1456
 #, python-format
 msgid "Commands: %s"
 msgstr "Polecenia: %s"
 
-#: ../src/chat_control.py:1176 ../src/groupchat_control.py:1290
+#: ../src/chat_control.py:1335 ../src/groupchat_control.py:1470
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Użycie: /%s czyście okno tekstowe."
 
-#: ../src/chat_control.py:1179 ../src/groupchat_control.py:1295
+#: ../src/chat_control.py:1338 ../src/groupchat_control.py:1475
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Użycie: /%s ukrywa przyciski czatu."
 
-#: ../src/chat_control.py:1184 ../src/groupchat_control.py:1334
+#: ../src/chat_control.py:1341 ../src/groupchat_control.py:1491
+#, python-format
+msgid ""
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
+msgstr ""
+"Użycie: /%s <działanie> wysyła działanie do aktualnego pokoju. Używaj w "
+"trzeciej osobie (np. /%s eksploduje.)"
+
+#: ../src/chat_control.py:1345
+#, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr "Uzycie: /%s, wysyła sygnał ping do kontaktu"
+
+#: ../src/chat_control.py:1348
+#, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "Użycie: /%s wysyła wiadomość do kontaktu"
+
+#: ../src/chat_control.py:1351 ../src/groupchat_control.py:1514
 #, python-format
 msgid "No help info for /%s"
 msgstr "Brak informacji o pomocy dla /%s"
 
-#: ../src/chat_control.py:1314
+#: ../src/chat_control.py:1489 ../src/chat_control.py:1515
 msgid "Encryption enabled"
 msgstr "Szyfrowanie włączone"
 
-#: ../src/chat_control.py:1319
+#: ../src/chat_control.py:1494
+msgid "Session WILL be logged"
+msgstr "Sesja BĘDZIE logowana"
+
+#: ../src/chat_control.py:1496
+msgid "Session WILL NOT be logged"
+msgstr "Sesja NIE BĘDZIE logowana"
+
+#: ../src/chat_control.py:1503
+msgid "The following message was NOT encrypted"
+msgstr "Ta wiadomość NIE została jest zaszyfrowana"
+
+#: ../src/chat_control.py:1507 ../src/chat_control.py:1520
+#: ../src/chat_control.py:2166
 msgid "Encryption disabled"
 msgstr "Szyfrowanie wyłączone"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1463 ../src/conversation_textview.py:501
-#: ../src/dialogs.py:629 ../src/gajim.py:853 ../src/gajim.py:854
-#: ../src/gajim.py:1199 ../src/roster_window.py:334
-#: ../src/roster_window.py:414 ../src/roster_window.py:1675
-#: ../src/roster_window.py:1685 ../src/roster_window.py:1864
-#: ../src/roster_window.py:2088 ../src/roster_window.py:2745
-#: ../src/roster_window.py:2949 ../src/roster_window.py:4234
-#: ../src/roster_window.py:4236 ../src/common/contacts.py:73
-#: ../src/common/helpers.py:43 ../src/common/helpers.py:255
+#: ../src/chat_control.py:1683 ../src/conversation_textview.py:701
+#: ../src/dialogs.py:730 ../src/gajim.py:904 ../src/gajim.py:905
+#: ../src/gajim.py:1393 ../src/gajim.py:1644 ../src/roster_window.py:351
+#: ../src/roster_window.py:435 ../src/roster_window.py:1795
+#: ../src/roster_window.py:1805 ../src/roster_window.py:2044
+#: ../src/roster_window.py:2276 ../src/roster_window.py:3124
+#: ../src/roster_window.py:3363 ../src/roster_window.py:4734
+#: ../src/roster_window.py:4736 ../src/common/contacts.py:89
+#: ../src/common/helpers.py:49 ../src/common/helpers.py:263
 msgid "Not in Roster"
 msgstr "spoza listy kontaktów"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1607
+#: ../src/chat_control.py:1836
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Właśnie otrzymałeś nową wiadomość od \"%s\""
 
-#: ../src/chat_control.py:1608
+#: ../src/chat_control.py:1837
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2707,29 +2855,24 @@ msgstr ""
 "Jeśli zamkniesz tę kartę, a nie masz uaktywnionej opcji historii, to "
 "utracisz tę wiadomość."
 
-#: ../src/config.py:139 ../src/config.py:588
+#: ../src/config.py:127 ../src/config.py:549
 msgid "Disabled"
 msgstr "Wyłączone"
 
-#: ../src/config.py:233
-#, python-format
-msgid "Every %s _minutes"
-msgstr "Co %s _minut"
-
-#: ../src/config.py:353
+#: ../src/config.py:293
 msgid "Active"
 msgstr "Aktywny"
 
-#: ../src/config.py:361
+#: ../src/config.py:301
 msgid "Event"
 msgstr "Zdarzenie"
 
-#: ../src/config.py:684 ../src/gajim.py:2309
+#: ../src/config.py:622 ../src/dialogs.py:1014
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Brak słownika dla tego języka (%s)"
 
-#: ../src/config.py:685 ../src/gajim.py:2310
+#: ../src/config.py:623
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -2738,248 +2881,253 @@ msgstr ""
 "Musisz zainstalować słownik %s aby aktywować sprawdzanie pisowni lub wybrać "
 "inny język korzystać z opcji speller_langugage."
 
-#: ../src/config.py:1008
+#: ../src/config.py:974
 msgid "status message title"
 msgstr "nagłówek informacji o statusie"
 
-#: ../src/config.py:1008
+#: ../src/config.py:974
 msgid "status message text"
 msgstr "treść informacji o statusie"
 
-#: ../src/config.py:1044
+#: ../src/config.py:1010
 msgid "First Message Received"
 msgstr "Otrzymano pierwszą wiadomość"
 
-#: ../src/config.py:1045
+#: ../src/config.py:1011
 msgid "Next Message Received"
 msgstr "Otrzymałeś nową wiadomość"
 
-#: ../src/config.py:1046
+#: ../src/config.py:1012
 msgid "Contact Connected"
 msgstr "Kontakt połączył się"
 
-#: ../src/config.py:1047
+#: ../src/config.py:1013
 msgid "Contact Disconnected"
 msgstr "Kontakt rozłączył się"
 
-#: ../src/config.py:1048
+#: ../src/config.py:1014
 msgid "Message Sent"
 msgstr "Wiadomość została wysłana"
 
-#: ../src/config.py:1049
+#: ../src/config.py:1015
 msgid "Group Chat Message Highlight"
 msgstr "Podświetlenie wiadomości z czatu"
 
-#: ../src/config.py:1050
+#: ../src/config.py:1016
 msgid "Group Chat Message Received"
 msgstr "Otrzymano wiadomość na czacie"
 
-#: ../src/config.py:1057
+#: ../src/config.py:1023
 msgid "GMail Email Received"
 msgstr "Nowa poczta na koncie Gmail"
 
-#: ../src/config.py:1260
+#. Name column
+#: ../src/config.py:1292 ../src/dialogs.py:1513 ../src/dialogs.py:1577
+#: ../src/disco.py:742 ../src/disco.py:1568 ../src/disco.py:1814
+#: ../src/history_window.py:113
+msgid "Name"
+msgstr "Nazwa"
+
+#: ../src/config.py:1400 ../src/common/config.py:379
+msgid "Be right back."
+msgstr "Zaraz wracam."
+
+#: ../src/config.py:1404
+msgid "Relogin now?"
+msgstr "Czy zalogować się ponownie?"
+
+#: ../src/config.py:1405
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+"Jeżeli chcesz by wszelkie zmiany odniosły natychmiastowy skutek, musisz "
+"zalogować się ponownie."
+
+#: ../src/config.py:1500 ../src/config.py:1591
 msgid "OpenPGP is not usable in this computer"
 msgstr "Nie można używać OpenPGP na tym komputerze"
 
-#: ../src/config.py:1306
+#: ../src/config.py:1627 ../src/config.py:1668
+msgid "Unread events"
+msgstr "Nieprzeczytane wiadomości"
+
+#: ../src/config.py:1628
+msgid "Read all pending events before removing this account."
+msgstr ""
+"Przejrzyj wszystkie niepotwierdzone zdarzenia przed usunięciem tego konta."
+
+#: ../src/config.py:1654
+#, python-format
+msgid "You have opened chat in account %s"
+msgstr "Masz otwarte okno rozmowy na koncie %s"
+
+#: ../src/config.py:1655
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+"Wszystkie otwarte zakładki rozmów i czatów zostaną zamknięte. Kontynuować?"
+
+#: ../src/config.py:1664
 msgid "You are currently connected to the server"
 msgstr "Jesteś połączony z serwerem"
 
-#: ../src/config.py:1307
+#: ../src/config.py:1665
 msgid "To change the account name, you must be disconnected."
 msgstr "Aby zmienić nazwę konta, musisz być rozłączony."
 
-#: ../src/config.py:1310 ../src/config.py:1916
-msgid "Unread events"
-msgstr "Nieprzeczytane wiadomości"
-
-#: ../src/config.py:1311
+#: ../src/config.py:1669
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Aby zmienić nazwę konta, musisz przeczytać wszystkie zaległe wiadomości."
 
-#: ../src/config.py:1315
+#: ../src/config.py:1675
 msgid "Account Name Already Used"
 msgstr "Konto o takiej nazwie już istnieje"
 
-#: ../src/config.py:1316
+#: ../src/config.py:1676
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Posiadasz już konto o tej nazwie. Zmień nazwę konta na unikalną."
 
-#: ../src/config.py:1320 ../src/config.py:1324
+#: ../src/config.py:1680 ../src/config.py:1684
 msgid "Invalid account name"
 msgstr "Niepoprawna nazwa konta"
 
-#: ../src/config.py:1321
+#: ../src/config.py:1681
 msgid "Account name cannot be empty."
 msgstr "Nazwa konta nie może być pusta."
 
-#: ../src/config.py:1325
+#: ../src/config.py:1685
 msgid "Account name cannot contain spaces."
 msgstr "Nazwa konta nie może zawierać spacji."
 
-#: ../src/config.py:1333 ../src/config.py:1339 ../src/config.py:1349
-#: ../src/config.py:2900
+#: ../src/config.py:1749
+msgid "Rename Account"
+msgstr "Zmień nazwę konta"
+
+#: ../src/config.py:1750
+#, python-format
+msgid "Enter a new name for account %s"
+msgstr "Wpisz nową nazwę dla kontaktu %s."
+
+#: ../src/config.py:1768 ../src/config.py:1776 ../src/config.py:1816
+#: ../src/config.py:3022
 msgid "Invalid Jabber ID"
 msgstr "Niepoprawny Jabber ID"
 
-#: ../src/config.py:1340
+#: ../src/config.py:1777
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musi być postaci \"użytkownik@nazwaserwera\"."
 
-#: ../src/config.py:1399
+#: ../src/config.py:1962 ../src/config.py:3093
 msgid "Invalid entry"
 msgstr "Niepoprawny wpis"
 
-#: ../src/config.py:1400
+#: ../src/config.py:1963 ../src/config.py:3094
 msgid "Custom port must be a port number."
 msgstr "Wybrany port musi być numerem portu."
 
-#: ../src/config.py:1528 ../src/common/config.py:368
-msgid "Be right back."
-msgstr "Zaraz wracam."
-
-#: ../src/config.py:1538
-msgid "Relogin now?"
-msgstr "Czy zalogować się ponownie?"
+#: ../src/config.py:1984
+msgid "Failed to get secret keys"
+msgstr "Pobieranie kluczy prywatnych nie powiodło się"
 
-#: ../src/config.py:1539
-msgid "If you want all the changes to apply instantly, you must relogin."
+#: ../src/config.py:1985
+msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr ""
-"Jeżeli chcesz by wszelkie zmiany odniosły natychmiastowy skutek, musisz "
-"zalogować się ponownie."
+"Wystąpił problem w trakcie odzyskiwania Twoich kluczy prywatnych OpenPGP."
 
-#: ../src/config.py:1565
+#: ../src/config.py:1988
+msgid "OpenPGP Key Selection"
+msgstr "Wybór klucza OpenPGP"
+
+#: ../src/config.py:1989
+msgid "Choose your OpenPGP key"
+msgstr "Wybierz klucz OpenPGP"
+
+#: ../src/config.py:2029
 msgid "No such account available"
 msgstr "Takie konto nie jest dostępne"
 
-#: ../src/config.py:1566
+#: ../src/config.py:2030
 msgid "You must create your account before editing your personal information."
 msgstr "Musisz najpierw stworzyć konto by móc edytować informacje o sobie."
 
-#: ../src/config.py:1573 ../src/dialogs.py:1190 ../src/dialogs.py:1326
-#: ../src/dialogs.py:1506 ../src/disco.py:420 ../src/profile_window.py:325
+#: ../src/config.py:2037 ../src/dialogs.py:1360 ../src/dialogs.py:1501
+#: ../src/dialogs.py:1681 ../src/disco.py:426 ../src/profile_window.py:306
 msgid "You are not connected to the server"
 msgstr "Nie jesteś połączony z serwerem"
 
-#: ../src/config.py:1574
+#: ../src/config.py:2038
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Musisz być połączony, aby móc zmieniać informacje o sobie."
 
-#: ../src/config.py:1578
+#: ../src/config.py:2042
 msgid "Your server doesn't support Vcard"
 msgstr "Twój serwer nie akceptuje Vcard"
 
-#: ../src/config.py:1579
+#: ../src/config.py:2043
 msgid "Your server can't save your personal information."
 msgstr "Twój serwer nie potrafi zapisać informacji osobistych."
 
-#: ../src/config.py:1610 ../src/config.py:3288
-msgid "Failed to get secret keys"
-msgstr "Pobieranie kluczy prywatnych nie powiodło się"
-
-#: ../src/config.py:1611 ../src/config.py:3289
-msgid "There was a problem retrieving your OpenPGP secret keys."
-msgstr ""
-"Wystąpił problem w trakcie odzyskiwania Twoich kluczy prywatnych OpenPGP."
-
-#: ../src/config.py:1614 ../src/config.py:3292
-msgid "OpenPGP Key Selection"
-msgstr "Wybór klucza OpenPGP"
-
-#: ../src/config.py:1615 ../src/config.py:3293
-msgid "Choose your OpenPGP key"
-msgstr "Wybierz klucz OpenPGP"
-
-#. Name column
-#: ../src/config.py:1850 ../src/dialogs.py:1338 ../src/dialogs.py:1402
-#: ../src/disco.py:741 ../src/disco.py:1564 ../src/disco.py:1802
-#: ../src/history_window.py:78
-msgid "Name"
-msgstr "Nazwa"
-
-#: ../src/config.py:1853 ../src/dialogs.py:1341
-msgid "Server"
-msgstr "Serwer"
-
-#: ../src/config.py:1917
-msgid "Read all pending events before removing this account."
-msgstr ""
-"Przejrzyj wszystkie niepotwierdzone zdarzenia przed usunięciem tego konta."
-
-#: ../src/config.py:1954
-#, python-format
-msgid "You have opened chat in account %s"
-msgstr "Masz otwarte okno rozmowy na koncie %s"
-
-#: ../src/config.py:1955
-msgid "All chat and groupchat windows will be closed. Do you want to continue?"
-msgstr ""
-"Wszystkie otwarte zakładki rozmów i czatów zostaną zamknięte. Kontynuować?"
-
-#: ../src/config.py:2014
+#: ../src/config.py:2074
 msgid "Account Local already exists."
 msgstr "Konto o takiej nazwie już istnieje."
 
-#: ../src/config.py:2015
+#: ../src/config.py:2075
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Proszę go zmienić lub usunąć przed uaktywnieniem komunikacji link-local."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2251
 #, python-format
 msgid "Edit %s"
 msgstr "Modyfikuj %s"
 
-#: ../src/config.py:2113
+#: ../src/config.py:2253
 #, python-format
 msgid "Register to %s"
 msgstr "Zarejestruj na %s"
 
 #. list at the beginning
-#: ../src/config.py:2179
+#: ../src/config.py:2289
 msgid "Ban List"
 msgstr "Lista kontaktów zablokowanych"
 
-#: ../src/config.py:2180
+#: ../src/config.py:2290
 msgid "Member List"
 msgstr "_Lista uczestników"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2291
 msgid "Owner List"
 msgstr "_Lista właścicieli"
 
-#: ../src/config.py:2182
+#: ../src/config.py:2292
 msgid "Administrator List"
 msgstr "_Administratorzy"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2231 ../src/disco.py:748 ../src/history_manager.py:155
+#: ../src/config.py:2341 ../src/disco.py:749 ../src/history_manager.py:160
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2239
+#: ../src/config.py:2349
 msgid "Reason"
 msgstr "Powód"
 
-#: ../src/config.py:2244
+#: ../src/config.py:2354
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2248
+#: ../src/config.py:2358
 msgid "Role"
 msgstr "Funkcja:"
 
-#: ../src/config.py:2273
+#: ../src/config.py:2383
 msgid "Banning..."
 msgstr "Blokuję użytkownika..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2275
+#: ../src/config.py:2385
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2987,11 +3135,11 @@ msgstr ""
 "<b>Którego użytkownika chcesz zablokować?</b>\n"
 "\n"
 
-#: ../src/config.py:2277
+#: ../src/config.py:2387
 msgid "Adding Member..."
 msgstr "Dodaję członka..."
 
-#: ../src/config.py:2278
+#: ../src/config.py:2388
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2999,11 +3147,11 @@ msgstr ""
 "<b>Status którego użytkownika chcesz zmienić?</b>\n"
 "\n"
 
-#: ../src/config.py:2280
+#: ../src/config.py:2390
 msgid "Adding Owner..."
 msgstr "Dodaję właściciela..."
 
-#: ../src/config.py:2281
+#: ../src/config.py:2391
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -3011,11 +3159,11 @@ msgstr ""
 "<b>Którego użytkownika chcesz uczynić właścicielem pokoju?</b>\n"
 "\n"
 
-#: ../src/config.py:2283
+#: ../src/config.py:2393
 msgid "Adding Administrator..."
 msgstr "Dodaję administratora..."
 
-#: ../src/config.py:2284
+#: ../src/config.py:2394
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -3023,7 +3171,7 @@ msgstr ""
 "<b>Którego użytkownika chcesz uczynić administratorem?</b>\n"
 "\n"
 
-#: ../src/config.py:2285
+#: ../src/config.py:2395
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -3039,99 +3187,83 @@ msgstr ""
 "4. domena (dotyczy domeny a także dowolnego adresu typu użytkownik@domena,\n"
 "domena/zasób lub adresu zawierającego subdomenę)."
 
-#: ../src/config.py:2389
+#: ../src/config.py:2499
 #, python-format
 msgid "Removing %s account"
 msgstr "Usuwanie konta %s"
 
-#: ../src/config.py:2406 ../src/roster_window.py:3008
+#: ../src/config.py:2514 ../src/gajim.py:1336 ../src/roster_window.py:3426
 msgid "Password Required"
 msgstr "Wymagane hasło"
 
-#: ../src/config.py:2407 ../src/roster_window.py:3004
+#: ../src/config.py:2515 ../src/roster_window.py:3422
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Wpisz hasło dla konta %s"
 
-#: ../src/config.py:2408 ../src/roster_window.py:3009
+#: ../src/config.py:2516 ../src/roster_window.py:3427
 msgid "Save password"
 msgstr "Zapisz hasło"
 
-#: ../src/config.py:2422
+#: ../src/config.py:2529
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" jest połączone z serwerem."
 
-#: ../src/config.py:2423
+#: ../src/config.py:2530
 msgid "If you remove it, the connection will be lost."
 msgstr "Jeśli to usuniesz, połączenie zostanie zerwane."
 
-#: ../src/config.py:2508
+#: ../src/config.py:2623
 msgid "Default"
 msgstr "Domyślny"
 
-#: ../src/config.py:2508
+#: ../src/config.py:2623
 msgid "?print_status:All"
 msgstr "?print_status:Wszystkie"
 
-#: ../src/config.py:2509
+#: ../src/config.py:2624
 msgid "Enter and leave only"
 msgstr "Jedynie wejdź i wyjdź"
 
-#: ../src/config.py:2510
+#: ../src/config.py:2625
 msgid "?print_status:None"
 msgstr "?print_status:Żaden"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2694
 msgid "New Group Chat"
 msgstr "Nowa rozmowa grupowa"
 
-#: ../src/config.py:2611
+#: ../src/config.py:2727
 msgid "This bookmark has invalid data"
 msgstr "Ta zakładka zawiera niepoprawne dane"
 
-#: ../src/config.py:2612
+#: ../src/config.py:2728
 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:2875
+#: ../src/config.py:3005
 msgid "Invalid username"
 msgstr "Niepoprawna nazwa użytkownika"
 
-#: ../src/config.py:2876
+#: ../src/config.py:3007
 msgid "You must provide a username to configure this account."
 msgstr "Musisz wpisać nazwę użytkownika aby skonfigurować to konto."
 
-#: ../src/config.py:2886 ../src/dialogs.py:1525
-msgid "Invalid password"
-msgstr "Niepoprawne hasło"
-
-#: ../src/config.py:2887
-msgid "You must enter a password for the new account."
-msgstr "Musisz wpisać hasło dla nowego konta."
-
-#: ../src/config.py:2891 ../src/dialogs.py:1530
-msgid "Passwords do not match"
-msgstr "Hasła nie zgadzają się"
-
-#: ../src/config.py:2892 ../src/dialogs.py:1531
-msgid "The passwords typed in both fields must be identical."
-msgstr "Hasła wpisane w obydwu polach muszą być identyczne."
-
-#: ../src/config.py:2911
+#: ../src/config.py:3033
 msgid "Duplicate Jabber ID"
 msgstr "Taki Jabber ID już istnieje!"
 
-#: ../src/config.py:2912
+#: ../src/config.py:3034
 msgid "This account is already configured in Gajim."
 msgstr "Konto o takiej nazwie jest już skonfigurowane."
 
-#: ../src/config.py:2929
+#: ../src/config.py:3051
 msgid "Account has been added successfully"
 msgstr "Konto zostało pomyślnie dodane"
 
-#: ../src/config.py:2930 ../src/config.py:2965
+#: ../src/config.py:3052 ../src/config.py:3197
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -3140,23 +3272,31 @@ msgstr ""
 "Możesz ustawić opcje zaawansowane wciskając przycisk Zaawansowane lub "
 "później wybierając pozycję Konta z menu Edycja w głównym oknie programu."
 
-#: ../src/config.py:2964
-msgid "Your new account has been created successfully"
-msgstr "Twoje konto zostało założone"
+#: ../src/config.py:3069
+msgid "Invalid server"
+msgstr "Niepoprawna nazwa serwera"
 
-#: ../src/config.py:2982
+#: ../src/config.py:3070
+msgid "Please provide a server on which you want to register."
+msgstr "Wpisz adres serwera, na którym chcesz się zarejestrować."
+
+#: ../src/config.py:3176 ../src/config.py:3215
 msgid "An error occurred during account creation"
 msgstr "Wystąpił błąd w trakcie tworzenia konta"
 
-#: ../src/config.py:3040
+#: ../src/config.py:3196
+msgid "Your new account has been created successfully"
+msgstr "Twoje konto zostało założone"
+
+#: ../src/config.py:3299
 msgid "Account name is in use"
 msgstr "Nazwa konta jest już zajęta"
 
-#: ../src/config.py:3041
+#: ../src/config.py:3300
 msgid "You already have an account using this name."
 msgstr "Masz już konto o takiej nazwie."
 
-#: ../src/conversation_textview.py:279
+#: ../src/conversation_textview.py:450
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3164,191 +3304,200 @@ msgstr ""
 "Tekst poniżej tej linii zawiera to, co zostało napisane w tym pokoju od "
 "momentu gdy ostatni raz zwracałeś/zwracałaś na niego uwagę"
 
-#: ../src/conversation_textview.py:348
+#: ../src/conversation_textview.py:548
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Działania dla wyrażenia \"%s\""
 
-#: ../src/conversation_textview.py:360
+#: ../src/conversation_textview.py:560
 msgid "Read _Wikipedia Article"
 msgstr "Przeczytaj artykuł w _Wikipedii"
 
-#: ../src/conversation_textview.py:365
+#: ../src/conversation_textview.py:565
 msgid "Look it up in _Dictionary"
 msgstr "Szukaj w _słowniku"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:381
+#: ../src/conversation_textview.py:581
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "W URL-u słownika brakuje \"%s\" i nie jest to WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:394
+#: ../src/conversation_textview.py:594
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "W URL-u Przeszukiwania Sieci brakuje \"%s\""
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:597
 msgid "Web _Search for it"
 msgstr "Szukaj w _Internecie"
 
-#: ../src/conversation_textview.py:403
+#: ../src/conversation_textview.py:603
 msgid "Open as _Link"
 msgstr "Otwórz jako _odnośnik"
 
-#: ../src/conversation_textview.py:848
+#: ../src/conversation_textview.py:1069
 msgid "Yesterday"
 msgstr "Wczoraj"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:852
+#: ../src/conversation_textview.py:1073
 #, python-format
 msgid "%i days ago"
 msgstr "%i dni temu"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:886
+#: ../src/conversation_textview.py:1107
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temat: %s\n"
 
-#: ../src/dialogs.py:59
+#: ../src/dialogs.py:71
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nazwa kontaktu: <i>%s</i>"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:73
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "JID : <i>%s</i>"
 
-#: ../src/dialogs.py:211
+#: ../src/dialogs.py:223
 msgid "Group"
 msgstr "Grupa"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:230
 msgid "In the group"
 msgstr "W grupie"
 
-#: ../src/dialogs.py:269
+#: ../src/dialogs.py:330
 msgid "KeyID"
 msgstr "Identyfikator klucza"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:333
 msgid "Contact name"
 msgstr "Nazwa kontaktu"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:379
 #, python-format
 msgid "%s Status Message"
 msgstr "Informacja o statusie %s"
 
-#: ../src/dialogs.py:320
+#: ../src/dialogs.py:381
 msgid "Status Message"
 msgstr "Opis statusu"
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:481
 msgid "Save as Preset Status Message"
 msgstr "Szablony opisów"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:482
 msgid "Please type a name for this status message"
 msgstr "Podaj nazwę dla tego szablonu"
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:493
+msgid "Overwrite Status Message?"
+msgstr "Zmienić opis statusu?"
+
+#: ../src/dialogs.py:494
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr "Status o tej nazwie jest w użyciu. Czy chcesz go zmienić?"
+
+#: ../src/dialogs.py:510
 msgid "AIM Address:"
 msgstr "_Adres AIM:"
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:511
 msgid "GG Number:"
 msgstr "Numer GG:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:512
 msgid "ICQ Number:"
 msgstr "Numer ICQ:"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:513
 msgid "MSN Address:"
 msgstr "_Adres MSN:"
 
-#: ../src/dialogs.py:421
+#: ../src/dialogs.py:514
 msgid "Yahoo! Address:"
 msgstr "Adres _Yahoo:"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:551
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Wypełnij informacje o kontakcie, który chcesz dodać do konta %s"
 
-#: ../src/dialogs.py:459
+#: ../src/dialogs.py:553
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Wypełnij informacje o kontakcie, który chcesz dodać"
 
-#: ../src/dialogs.py:609 ../src/dialogs.py:615
+#: ../src/dialogs.py:710 ../src/dialogs.py:716
 msgid "Invalid User ID"
 msgstr "Niepoprawny identyfikator użytkownika"
 
-#: ../src/dialogs.py:616
+#: ../src/dialogs.py:717
 msgid "The user ID must not contain a resource."
 msgstr "ID użytkownika nie może zawierać zasobu."
 
-#: ../src/dialogs.py:630
+#: ../src/dialogs.py:731
 msgid "Contact already in roster"
 msgstr "Kontakt jest już na liście kontaktów"
 
-#: ../src/dialogs.py:631
+#: ../src/dialogs.py:732
 msgid "This contact is already listed in your roster."
 msgstr "Ten kontakt znajduje się już na twojej liście kontaktów."
 
-#: ../src/dialogs.py:668
+#: ../src/dialogs.py:768
 msgid "User ID:"
 msgstr "ID uzytkownika:"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:830
 msgid "A GTK+ jabber client"
 msgstr "Klient jabbera w GTK+."
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:831
 msgid "GTK+ Version:"
 msgstr "Wersja GTK+:"
 
-#: ../src/dialogs.py:733
+#: ../src/dialogs.py:832
 msgid "PyGTK Version:"
 msgstr "Wersja PyGTK:"
 
-#: ../src/dialogs.py:747
+#: ../src/dialogs.py:846
 msgid "Current Developers:"
 msgstr "Bieżący deweloperzy:"
 
-#: ../src/dialogs.py:749
+#: ../src/dialogs.py:848
 msgid "Past Developers:"
 msgstr "Poprzedni deweloperzy:"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:858
 msgid "THANKS:"
 msgstr "Podziękowania:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:765
+#: ../src/dialogs.py:864
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "I wreszcie, chcielibyśmy podziękować wszystkim opiekunom pakietów."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:778
+#: ../src/dialogs.py:877
 msgid "translator-credits"
 msgstr ""
-"Tłumaczenie na język polski: Witold Kieraś <pambuk@gmail.com>\n"
-"Maciej Chojnacki <byte@byte.livenet.pl>"
+"Tłumaczenie na język polski: Witold Kieraś\n"
+"Maciej Chojnacki <maciej@chojnacki.name>"
 
-#: ../src/dialogs.py:908
+#: ../src/dialogs.py:1007
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Nie można podłączyć się do portu %s."
 
-#: ../src/dialogs.py:909
+#: ../src/dialogs.py:1008
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -3356,75 +3505,92 @@ msgstr ""
 "Być może masz już uruchomioną inną kopię Gajima. Przesyłanie plików zostanie "
 "anulowane."
 
-#: ../src/dialogs.py:1120
+#: ../src/dialogs.py:1015
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option.\n"
+"\n"
+"Highlighting misspelled words feature will not be used"
+msgstr ""
+"Musisz zainstalować słownik %s aby aktywować sprawdzanie pisowni lub wybrać "
+"inny język korzystać z opcji speller_langugage.\n"
+"Do tego czasu podświetlanie błędnie wpisanych słów nie będzie działało"
+
+#: ../src/dialogs.py:1289
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Prośba o autoryzację dla konta %s od %s"
 
-#: ../src/dialogs.py:1123
+#: ../src/dialogs.py:1292
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prośba o autoryzację od %s"
 
-#: ../src/dialogs.py:1183 ../src/roster_window.py:705
+#: ../src/dialogs.py:1353 ../src/roster_window.py:769
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Już jesteś w pokoju %s"
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1361
 msgid "You can not join a group chat unless you are connected."
 msgstr "Nie możesz dołączyć do pokoju gdy nie jesteś połączony."
 
-#: ../src/dialogs.py:1206
+#: ../src/dialogs.py:1379
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Dołącz do pokoju z konta %s"
 
-#: ../src/dialogs.py:1274 ../src/dialogs.py:1280
-#: ../src/groupchat_control.py:1475
+#: ../src/dialogs.py:1449 ../src/dialogs.py:1455
+#: ../src/groupchat_control.py:1683
 msgid "Invalid group chat Jabber ID"
 msgstr "Niepoprawny Jabber ID"
 
-#: ../src/dialogs.py:1275 ../src/dialogs.py:1281
-#: ../src/groupchat_control.py:1476
+#: ../src/dialogs.py:1450 ../src/dialogs.py:1456
+#: ../src/groupchat_control.py:1684
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Używane przez ciebie Jabber ID zawiera niedozwolone znaki."
 
-#: ../src/dialogs.py:1287
+#: ../src/dialogs.py:1462
 msgid "This is not a group chat"
 msgstr "To nie jest czat"
 
-#: ../src/dialogs.py:1288
+#: ../src/dialogs.py:1463
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nie jest nazwą czatu."
 
-#: ../src/dialogs.py:1327
+#: ../src/dialogs.py:1502
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Nie możesz zsynchronizować kontaktów przy niektywnym połączeniu."
 
-#: ../src/dialogs.py:1374
+#: ../src/dialogs.py:1516
+msgid "Server"
+msgstr "Serwer"
+
+#: ../src/dialogs.py:1549
 msgid "This account is not connected to the server"
 msgstr "To konto nie jest połączone z serwerem"
 
-#: ../src/dialogs.py:1375
+#: ../src/dialogs.py:1550
 msgid "You cannot synchronize with an account unless it is connected."
-msgstr "Nie możesz synchronizować kontaktów z kontem, które nie jest połączone."
+msgstr ""
+"Nie możesz synchronizować kontaktów z kontem, które nie jest połączone."
 
-#: ../src/dialogs.py:1399
+#: ../src/dialogs.py:1574
 msgid "Synchronise"
 msgstr "Synchronizuj"
 
-#: ../src/dialogs.py:1457
+#: ../src/dialogs.py:1632
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Rozpocznij rozmowę z konta %s"
 
-#: ../src/dialogs.py:1459
+#: ../src/dialogs.py:1634
 msgid "Start Chat"
 msgstr "Rozpocznij rozmowę"
 
-#: ../src/dialogs.py:1460
+#: ../src/dialogs.py:1635
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -3433,283 +3599,290 @@ msgstr ""
 "wysłać wiadomość:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1485 ../src/dialogs.py:1844 ../src/dialogs.py:1975
+#: ../src/dialogs.py:1660 ../src/dialogs.py:2030 ../src/dialogs.py:2171
 msgid "Connection not available"
 msgstr "Połączenie jest niedostępne"
 
-#: ../src/dialogs.py:1486 ../src/dialogs.py:1845 ../src/dialogs.py:1976
+#: ../src/dialogs.py:1661 ../src/dialogs.py:2031 ../src/dialogs.py:2172
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Sprawdź, czy jesteś połączony z \"%s\"."
 
-#: ../src/dialogs.py:1495 ../src/dialogs.py:1498
+#: ../src/dialogs.py:1670 ../src/dialogs.py:1673
 msgid "Invalid JID"
 msgstr "Niepoprawny JID"
 
-#: ../src/dialogs.py:1498
+#: ../src/dialogs.py:1673
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nie można sparsować \"%s\"."
 
-#: ../src/dialogs.py:1507
+#: ../src/dialogs.py:1682
 msgid "Without a connection, you can not change your password."
 msgstr "Nie możesz zmienić hasła, jeśli nie jesteś połączony."
 
-#: ../src/dialogs.py:1526
+#: ../src/dialogs.py:1700
+msgid "Invalid password"
+msgstr "Niepoprawne hasło"
+
+#: ../src/dialogs.py:1701
 msgid "You must enter a password."
 msgstr "Musisz wpisać hasło."
 
+#: ../src/dialogs.py:1705
+msgid "Passwords do not match"
+msgstr "Hasła nie zgadzają się"
+
+#: ../src/dialogs.py:1706
+msgid "The passwords typed in both fields must be identical."
+msgstr "Hasła wpisane w obydwu polach muszą być identyczne."
+
 #. img to display
 #. default value
-#: ../src/dialogs.py:1573 ../src/notify.py:212 ../src/notify.py:416
+#: ../src/dialogs.py:1748 ../src/notify.py:224 ../src/notify.py:434
 msgid "Contact Signed In"
 msgstr "Kontakt połączył się"
 
-#: ../src/dialogs.py:1575 ../src/notify.py:220 ../src/notify.py:418
+#: ../src/dialogs.py:1750 ../src/notify.py:232 ../src/notify.py:436
 msgid "Contact Signed Out"
 msgstr "Kontakt rozłączył się"
 
 #. chat message
-#: ../src/dialogs.py:1577 ../src/notify.py:239 ../src/notify.py:420
+#: ../src/dialogs.py:1752 ../src/notify.py:255 ../src/notify.py:438
 msgid "New Message"
 msgstr "Nowa wiadomość"
 
 #. single message
-#: ../src/dialogs.py:1577 ../src/notify.py:224 ../src/notify.py:420
+#: ../src/dialogs.py:1752 ../src/notify.py:236 ../src/notify.py:438
 msgid "New Single Message"
 msgstr "Nowa wiadomość"
 
 #. private message
-#: ../src/dialogs.py:1578 ../src/notify.py:231 ../src/notify.py:421
+#: ../src/dialogs.py:1753 ../src/notify.py:243 ../src/notify.py:439
 msgid "New Private Message"
 msgstr "Wyślij prywatną wiadomość"
 
-#: ../src/dialogs.py:1578 ../src/gajim.py:1294 ../src/notify.py:429
+#: ../src/dialogs.py:1753 ../src/gajim.py:1489 ../src/notify.py:447
 msgid "New E-mail"
 msgstr "Nowy adres e-mail"
 
-#: ../src/dialogs.py:1580 ../src/gajim.py:1447 ../src/notify.py:423
+#: ../src/dialogs.py:1755 ../src/gajim.py:1664 ../src/notify.py:441
 msgid "File Transfer Request"
 msgstr "Pytanie o przysłanie pliku"
 
-#: ../src/dialogs.py:1582 ../src/gajim.py:1266 ../src/gajim.py:1423
-#: ../src/notify.py:425
+#: ../src/dialogs.py:1757 ../src/gajim.py:1461 ../src/gajim.py:1631
+#: ../src/notify.py:443
 msgid "File Transfer Error"
 msgstr "Błąd przesyłania pliku"
 
-#: ../src/dialogs.py:1584 ../src/gajim.py:1486 ../src/gajim.py:1508
-#: ../src/gajim.py:1525 ../src/notify.py:427
+#: ../src/dialogs.py:1759 ../src/gajim.py:1703 ../src/gajim.py:1725
+#: ../src/gajim.py:1742 ../src/notify.py:445
 msgid "File Transfer Completed"
 msgstr "Zakończono przesyłanie pliku"
 
-#: ../src/dialogs.py:1585 ../src/gajim.py:1489 ../src/notify.py:427
+#: ../src/dialogs.py:1760 ../src/gajim.py:1706 ../src/notify.py:445
 msgid "File Transfer Stopped"
 msgstr "Przesyłanie pliku zatrzymane"
 
-#: ../src/dialogs.py:1587 ../src/gajim.py:1163 ../src/notify.py:431
+#: ../src/dialogs.py:1762 ../src/gajim.py:1357 ../src/notify.py:449
 msgid "Groupchat Invitation"
 msgstr "Zaproszenie na czat"
 
-#: ../src/dialogs.py:1589 ../src/notify.py:204 ../src/notify.py:433
+#: ../src/dialogs.py:1764 ../src/notify.py:216 ../src/notify.py:451
 msgid "Contact Changed Status"
 msgstr "Kontakt zmienił status"
 
-#: ../src/dialogs.py:1774
+#: ../src/dialogs.py:1949
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Wiadomość z konta %s"
 
-#: ../src/dialogs.py:1776
+#: ../src/dialogs.py:1951
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Wiadomość z konta %s"
 
-#: ../src/dialogs.py:1778
+#: ../src/dialogs.py:1953
 msgid "Single Message"
 msgstr "Pojedyncza wiadomość"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1781
+#: ../src/dialogs.py:1956
 #, python-format
 msgid "Send %s"
 msgstr "Wyślij %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1804
+#: ../src/dialogs.py:1979
 #, python-format
 msgid "Received %s"
 msgstr "Odebrane %s"
 
+#. prepare UI for Receiving
+#: ../src/dialogs.py:2002
+#, python-format
+msgid "Form %s"
+msgstr "Od %s"
+
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1876
+#: ../src/dialogs.py:2072
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1877
+#: ../src/dialogs.py:2073
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napisał:\n"
 
-#: ../src/dialogs.py:1921
+#: ../src/dialogs.py:2117
 #, python-format
 msgid "XML Console for %s"
 msgstr "Kosola XML dla %s"
 
-#: ../src/dialogs.py:1923
+#: ../src/dialogs.py:2119
 msgid "XML Console"
 msgstr "Konsola XML"
 
-#: ../src/dialogs.py:2046
+#: ../src/dialogs.py:2242
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista prywatności <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2050
+#: ../src/dialogs.py:2246
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista prywatności dla %s"
 
-#: ../src/dialogs.py:2098
+#: ../src/dialogs.py:2302
 #, python-format
 msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr "Kolejność: %s, akcja: %s, typ: %s, wartość: %s"
 
-#: ../src/dialogs.py:2101
+#: ../src/dialogs.py:2305
 #, python-format
 msgid "Order: %s, action: %s"
 msgstr "Kolejność: %s, akcja: %s"
 
-#: ../src/dialogs.py:2143
+#: ../src/dialogs.py:2347
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Edytuj regułę</b>"
 
-#: ../src/dialogs.py:2230
+#: ../src/dialogs.py:2434
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj regułę</b>"
 
-#: ../src/dialogs.py:2319
-#, python-format
-msgid "Blocked Contacts for %s"
-msgstr "Kontakty zablokowane (dla %s)"
-
-#: ../src/dialogs.py:2321
-msgid "Blocked Contacts"
-msgstr "Kontakty zablokowane"
-
-#: ../src/dialogs.py:2390
-msgid "Group %s"
-msgstr "Grupa %"
-
-#: ../src/dialogs.py:2421
+#: ../src/dialogs.py:2530
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listy prywatności dla %s"
 
-#: ../src/dialogs.py:2423
+#: ../src/dialogs.py:2532
 msgid "Privacy Lists"
 msgstr "Listy prywatności"
 
-#: ../src/dialogs.py:2493
+#: ../src/dialogs.py:2602
 msgid "Invalid List Name"
 msgstr "Niepoprawna nazwa listy"
 
-#: ../src/dialogs.py:2494
+#: ../src/dialogs.py:2603
 msgid "You must enter a name to create a privacy list."
 msgstr "Musisz podać nazwę nowej listy prywatności."
 
-#. Don't translate $Contact
-#: ../src/dialogs.py:2528
+#: ../src/dialogs.py:2640
+msgid "$Contact has invited you to join a discussion"
+msgstr "$Contact zaprasza cię do rozmowy"
+
+#: ../src/dialogs.py:2642
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact zaprasza cię do pokoju %(room_jid)s"
 
-#. only if not None and not ''
-#: ../src/dialogs.py:2540
+#: ../src/dialogs.py:2655
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentarz: %s"
 
-#: ../src/dialogs.py:2602
+#: ../src/dialogs.py:2721
 msgid "Choose Sound"
 msgstr "Wybierz dźwięk"
 
-#: ../src/dialogs.py:2612 ../src/dialogs.py:2657
+#: ../src/dialogs.py:2731 ../src/dialogs.py:2779
 msgid "All files"
 msgstr "Wszystkie pliki"
 
-#: ../src/dialogs.py:2617
+#: ../src/dialogs.py:2736
 msgid "Wav Sounds"
 msgstr "Dźwięki w Wav"
 
-#: ../src/dialogs.py:2647
+#: ../src/dialogs.py:2769
 msgid "Choose Image"
 msgstr "Wybierz obrazek"
 
-#: ../src/dialogs.py:2662
+#: ../src/dialogs.py:2784
 msgid "Images"
 msgstr "Obrazki"
 
-#: ../src/dialogs.py:2719
+#: ../src/dialogs.py:2849
 #, python-format
 msgid "When %s becomes:"
 msgstr "Gdy %s ma status:"
 
-#: ../src/dialogs.py:2721
+#: ../src/dialogs.py:2851
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodaję specjalne powiadomienia dla %s"
 
 #. # means number
-#: ../src/dialogs.py:2792
+#: ../src/dialogs.py:2922
 msgid "#"
 msgstr "Nr"
 
-#: ../src/dialogs.py:2798
+#: ../src/dialogs.py:2928
 msgid "Condition"
 msgstr "Warunek"
 
-#: ../src/dialogs.py:2919
+#: ../src/dialogs.py:3046
 msgid "when I am "
 msgstr "kiedy mam "
 
-#: ../src/disco.py:104
+#: ../src/disco.py:110
 msgid "Others"
 msgstr "Inni"
 
-#: ../src/disco.py:105 ../src/disco.py:106 ../src/disco.py:1350
-#: ../src/gajim.py:607 ../src/roster_window.py:273 ../src/roster_window.py:331
-#: ../src/roster_window.py:370 ../src/roster_window.py:454
-#: ../src/roster_window.py:486 ../src/roster_window.py:488
-#: ../src/roster_window.py:4230 ../src/roster_window.py:4232
-#: ../src/common/contacts.py:267 ../src/common/contacts.py:282
-#: ../src/common/helpers.py:43
+#: ../src/disco.py:111 ../src/disco.py:112 ../src/disco.py:1354
+#: ../src/gajim.py:653 ../src/roster_window.py:288 ../src/roster_window.py:348
+#: ../src/roster_window.py:388 ../src/roster_window.py:496
+#: ../src/roster_window.py:528 ../src/roster_window.py:530
+#: ../src/roster_window.py:4730 ../src/roster_window.py:4732
+#: ../src/common/contacts.py:295 ../src/common/contacts.py:310
+#: ../src/common/helpers.py:49
 msgid "Transports"
 msgstr "Transporty"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:108
+#: ../src/disco.py:114
 msgid "Conference"
 msgstr "Konferencja"
 
-#: ../src/disco.py:421
+#: ../src/disco.py:427
 msgid "Without a connection, you can not browse available services"
 msgstr "Nie możesz przeglądać usług, jeśli nie jesteś połączony"
 
-#: ../src/disco.py:500
+#: ../src/disco.py:501
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Przeglądanie usług przy użyciu konta %s"
 
-#: ../src/disco.py:502
+#: ../src/disco.py:503
 msgid "Service Discovery"
 msgstr "Przeglądanie usług"
 
-#: ../src/disco.py:642
+#: ../src/disco.py:643
 msgid "The service could not be found"
 msgstr "Nie można odnaleźć usługi"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:644
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3717,210 +3890,458 @@ msgstr ""
 "Pod wpisanym adresem nie ma żadnych usług lub one nie odpowiadają. Sprawdź "
 "adres i spróbuj ponownie."
 
-#: ../src/disco.py:647 ../src/disco.py:928
+#: ../src/disco.py:648 ../src/disco.py:929
 msgid "The service is not browsable"
 msgstr "Tej usługi nie można przeglądać"
 
-#: ../src/disco.py:648
+#: ../src/disco.py:649
 msgid "This type of service does not contain any items to browse."
 msgstr "Tego typu usługa nie zawiera elementów, które można przeglądać."
 
-#: ../src/disco.py:728
+#: ../src/disco.py:729
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Przeglądanie %s przy użyciu konta %s"
 
-#: ../src/disco.py:767
+#: ../src/disco.py:768
 msgid "_Browse"
 msgstr "Prze_glądaj"
 
-#: ../src/disco.py:929
+#: ../src/disco.py:930
 msgid "This service does not contain any items to browse."
 msgstr "Usługa nie zawiera elementów, które można przeglądać."
 
-#: ../src/disco.py:1147
+#: ../src/disco.py:1151
 msgid "_Execute Command"
 msgstr "_Wykonaj komendę"
 
-#: ../src/disco.py:1157 ../src/disco.py:1355
+#: ../src/disco.py:1161 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "Za_rejestruj"
 
-#: ../src/disco.py:1392
+#: ../src/disco.py:1396
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Skanowanie %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1573
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Użytkownicy"
 
 #. Description column
-#: ../src/disco.py:1580
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Opis"
 
 #. Id column
-#: ../src/disco.py:1587
+#: ../src/disco.py:1594
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1810
+#: ../src/disco.py:1823
 msgid "Subscribed"
 msgstr "Zasubskrybowano"
 
-#: ../src/disco.py:1836
+#: ../src/disco.py:1831
+msgid "Node"
+msgstr "Węzeł"
+
+#: ../src/disco.py:1888
 msgid "New post"
 msgstr "Nowy wpis"
 
-#: ../src/disco.py:1842
+#: ../src/disco.py:1894
 msgid "_Subscribe"
 msgstr "_Autoryzuj"
 
-#: ../src/disco.py:1848
+#: ../src/disco.py:1900
 msgid "_Unsubscribe"
 msgstr "_Cofnij autoryzację"
 
-#: ../src/filetransfers_window.py:72
+#: ../src/features_window.py:46
+msgid "PyOpenSSL"
+msgstr "PyOpenSSL"
+
+#: ../src/features_window.py:47
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+"Biblioteka używana do weryfikacji certyfikatów w celu zapewnienia "
+"bezpiecznego połączenia."
+
+#: ../src/features_window.py:48 ../src/features_window.py:49
+msgid "Requires python-pyopenssl."
+msgstr "Wymaga python-pyopenssl"
+
+#: ../src/features_window.py:50
+msgid "Bonjour / Zeroconf"
+msgstr "Bonjour / Zeroconf"
+
+#: ../src/features_window.py:51
+msgid "Serverless chatting with autodetected clients in a local network."
+msgstr ""
+"Rozmowy w sieci lokalnej, bez pośrednictwa serwera i z automatycznym "
+"wykrywaniem klientów."
+
+#: ../src/features_window.py:52
+msgid "Requires python-avahi."
+msgstr "Wymaga python-avahi."
+
+#: ../src/features_window.py:53
+msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgstr "Wymaga pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)"
+
+#: ../src/features_window.py:54
+msgid "gajim-remote"
+msgstr "gajim-remote"
+
+#: ../src/features_window.py:55
+msgid "A script to controle gajim via commandline."
+msgstr "Skrypt pozwalający na sterowanie Gajimem z linii komend."
+
+#: ../src/features_window.py:56
+msgid "Requires python-dbus."
+msgstr "Wymaga python-dbus"
+
+#: ../src/features_window.py:57 ../src/features_window.py:61
+#: ../src/features_window.py:65 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:81
+#: ../src/features_window.py:85 ../src/features_window.py:97
+msgid "Feature not available under Windows."
+msgstr "Funkcjonalność niedostępna dla systemu Windows."
+
+#: ../src/features_window.py:58
+msgid "OpenGPG"
+msgstr "OpenGPG"
+
+#: ../src/features_window.py:59
+msgid "Encrypting chatmessages with gpg keys."
+msgstr "Szyfrowanie wiadomości kluczami GPG."
+
+#: ../src/features_window.py:60
+msgid "Requires gpg and python-GnuPGInterface."
+msgstr "Wymaga GPG oraz python-GnuPGInterface."
+
+#: ../src/features_window.py:62
+msgid "network-manager"
+msgstr "Menedżer sieci"
+
+#: ../src/features_window.py:63
+msgid "Autodetection of network status."
+msgstr "Automatyczne wykrywanie stanu sieci."
+
+#: ../src/features_window.py:64
+msgid "Requires gnome-network-manager and python-dbus."
+msgstr "Wymaga gnome-network-manager oraz python-dbus."
+
+#: ../src/features_window.py:66
+msgid "Session Management"
+msgstr "Zarządzanie sesją"
+
+#: ../src/features_window.py:67
+msgid "Gajim session is stored on logout and restored on login."
+msgstr ""
+"Sesja jest zapisywana przy wylogowaniu z serwera i przywracana przy "
+"logowaniu."
+
+#: ../src/features_window.py:68
+msgid "Requires python-gnome2."
+msgstr "Wymaga python-gnome2."
+
+#: ../src/features_window.py:70
+msgid "gnome-keyring"
+msgstr "Baza kluczy GNOME"
+
+#: ../src/features_window.py:71
+msgid "Passwords can be stored securely and not just in plaintext."
+msgstr "Bezpieczne przechowywanie haseł."
+
+#: ../src/features_window.py:72
+msgid "Requires gnome-keyring and python-gnome2-desktop."
+msgstr "Wymaga gnome-keyring oraz python-gnome-desktop."
+
+#: ../src/features_window.py:74
+msgid "SRV"
+msgstr "SRV"
+
+#: ../src/features_window.py:75
+msgid "Ability to connect to servers which are using SRV records."
+msgstr "Możliwość połączenia z serwerami, które używają rekordów SRV."
+
+#: ../src/features_window.py:76
+msgid "Requires dnsutils."
+msgstr "Wymaga dnsutils."
+
+#: ../src/features_window.py:77
+msgid "Requires nslookup to use SRV records."
+msgstr "Wymaga nslookup."
+
+#: ../src/features_window.py:78
+msgid "Spell Checker"
+msgstr "Słownik"
+
+#: ../src/features_window.py:79
+msgid "Spellchecking of composed messages."
+msgstr "Zwraca uwagę na błędy w wysyłanych wiadomościach."
+
+#: ../src/features_window.py:80
+msgid ""
+"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
+"sources."
+msgstr "Wymaga python-gnome2-extras lub kompilacji gtkspell ze źródeł Gajima."
+
+#: ../src/features_window.py:82
+msgid "Notification-daemon"
+msgstr "Powiadamianie o zdarzeniach"
+
+#: ../src/features_window.py:83
+msgid "Passive popups notifying for new events."
+msgstr "Wyświetla okna informujące o nowych zdarzeniach."
+
+#: ../src/features_window.py:84
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr ""
+"Wymaga python-notify lub python-dbus w połączeniu z notification-daemon."
+
+#: ../src/features_window.py:86
+msgid "Trayicon"
+msgstr "Ikona w obszarze powiadamiania"
+
+#: ../src/features_window.py:87
+msgid "A icon in systemtray reflecting the current presence."
+msgstr "Ikona w obszarze powiadamiania odzwierciedla aktualny status."
+
+#: ../src/features_window.py:88
+msgid ""
+"Requires python-gnome2-extras or compiled  trayicon module from Gajim "
+"sources."
+msgstr ""
+"Wymaga python-gnome2-extras lub skompilowanego modułu trayicon ze źródeł "
+"Gajima."
+
+#: ../src/features_window.py:89
+msgid "Requires PyGTK >= 2.10."
+msgstr "Wymaga PyGTK >= 2.10."
+
+#: ../src/features_window.py:90
+msgid "Idle"
+msgstr "Stan bezczynności"
+
+#: ../src/features_window.py:91
+msgid "Ability to measure idle time, in order to set auto status."
+msgstr ""
+"Umożliwia mierzenie czasu bezczynności i odpowiednie ustawienie statusu."
+
+#: ../src/features_window.py:92 ../src/features_window.py:93
+msgid "Requires compilation of the idle module from Gajim sources."
+msgstr "Wymaga kompilacji modułu idle ze źródeł Gajima."
+
+#: ../src/features_window.py:94
+msgid "LaTeX"
+msgstr "LaTeX"
+
+#: ../src/features_window.py:95
+msgid "Transform LaTeX espressions between $$ $$."
+msgstr "Przekształcanie wyrażeń jezyka LaTeX pomiędzy $$ $$."
+
+#: ../src/features_window.py:96
+msgid ""
+"Requires texlive-latex-base, dvips and imagemagick. You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+"Wymaga texlive-latex-ase, dvips oraz imagemagick. Musisz ustawić zmienną "
+"'use_latex' na 'True'."
+
+#: ../src/features_window.py:98
+msgid "End to end encryption"
+msgstr "Szyfrowanie transmisji"
+
+#: ../src/features_window.py:99
+msgid "Encrypting chatmessages."
+msgstr "Szyfrowanie wysyłanych wiadomości."
+
+#: ../src/features_window.py:100 ../src/features_window.py:101
+msgid "Requires python-crypto."
+msgstr "Wymaga python-crypto."
+
+#: ../src/features_window.py:102
+msgid "RST Generator"
+msgstr "Generator RST"
+
+#: ../src/features_window.py:103
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+"Tworzy XHTML z kodu RST (patrz http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html)."
+
+#: ../src/features_window.py:104 ../src/features_window.py:105
+msgid "Requires python-docutils."
+msgstr "Wymaga python-docutils."
+
+#: ../src/features_window.py:106
+msgid "libsexy"
+msgstr "libsexy"
+
+#: ../src/features_window.py:107
+msgid "Ability to have clickable URLs in chat window."
+msgstr "Dodaje możliwość wyświetlania aktywnych ('klikalnych') adresów URL."
+
+#: ../src/features_window.py:108 ../src/features_window.py:109
+msgid "Requires python-sexy."
+msgstr "Wymaga python-sexy"
+
+#: ../src/features_window.py:116 ../src/common/helpers.py:244
+msgid "Available"
+msgstr "Dostępny"
+
+#: ../src/features_window.py:123
+msgid "Feature"
+msgstr "Możliwości"
+
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Plik"
 
-#: ../src/filetransfers_window.py:87
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Czas"
 
-#: ../src/filetransfers_window.py:99
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Postęp"
 
-#: ../src/filetransfers_window.py:161 ../src/filetransfers_window.py:215
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:218
 #, python-format
 msgid "Filename: %s"
 msgstr "Nazwa pliku: %s"
 
-#: ../src/filetransfers_window.py:162 ../src/filetransfers_window.py:290
+#: ../src/filetransfers_window.py:165 ../src/filetransfers_window.py:293
 #, python-format
 msgid "Size: %s"
 msgstr "Rozmiar: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:171 ../src/filetransfers_window.py:181
-#: ../src/history_manager.py:463
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:184
+#: ../src/history_manager.py:468
 msgid "You"
 msgstr "Ty"
 
-#: ../src/filetransfers_window.py:172
+#: ../src/filetransfers_window.py:175
 #, python-format
 msgid "Sender: %s"
 msgstr "Nadawca: %s"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:564
-#: ../src/tooltips.py:574
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:580
+#: ../src/tooltips.py:593
 msgid "Recipient: "
 msgstr "Odbiorca: "
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:187
 #, python-format
 msgid "Saved in: %s"
 msgstr "Zapisane w: %s"
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:189
 msgid "File transfer completed"
 msgstr "Zakończono przesyłanie pliku"
 
-#: ../src/filetransfers_window.py:200 ../src/filetransfers_window.py:206
+#: ../src/filetransfers_window.py:203 ../src/filetransfers_window.py:209
 msgid "File transfer cancelled"
 msgstr "Przesyłanie pliku anulowane"
 
-#: ../src/filetransfers_window.py:200 ../src/filetransfers_window.py:207
+#: ../src/filetransfers_window.py:203 ../src/filetransfers_window.py:210
 msgid "Connection with peer cannot be established."
 msgstr "Nie można ustanowić połączenia z drugą stroną."
 
-#: ../src/filetransfers_window.py:216
+#: ../src/filetransfers_window.py:219
 #, python-format
 msgid "Recipient: %s"
 msgstr "Odbiorca: %s"
 
-#: ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:221
 #, python-format
 msgid "Error message: %s"
 msgstr "Komunikat błędu: %s"
 
-#: ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:222
 msgid "File transfer stopped by the contact at the other end"
 msgstr "Przesyłanie pliku zostało zatrzymane przez drugą osobę"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:239
 msgid "Choose File to Send..."
 msgstr "Wybierz plik do wysłania..."
 
-#: ../src/filetransfers_window.py:255
+#: ../src/filetransfers_window.py:258
 msgid "Gajim cannot access this file"
 msgstr "Gajim nie może uzyskać dostępu do tego pliku"
 
-#: ../src/filetransfers_window.py:256
+#: ../src/filetransfers_window.py:259
 msgid "This file is being used by another process."
 msgstr "Ten plik jest używany przez inny proces."
 
-#: ../src/filetransfers_window.py:288
+#: ../src/filetransfers_window.py:291
 #, python-format
 msgid "File: %s"
 msgstr "Plik: %s"
 
-#: ../src/filetransfers_window.py:293
+#: ../src/filetransfers_window.py:296
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:295
+#: ../src/filetransfers_window.py:298
 #, python-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:299
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s chce przesłać Ci plik:"
 
-#: ../src/filetransfers_window.py:310 ../src/gtkgui_helpers.py:767
+#: ../src/filetransfers_window.py:312 ../src/gtkgui_helpers.py:768
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nie można nadpisać pliku \"%s\""
 
-#: ../src/filetransfers_window.py:311 ../src/gtkgui_helpers.py:769
+#: ../src/filetransfers_window.py:313 ../src/gtkgui_helpers.py:770
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 "Istnieje już plik o tej nazwie a Ty nie masz uprawnień do jego nadpisania."
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:773
+#: ../src/filetransfers_window.py:320 ../src/gtkgui_helpers.py:774
 msgid "This file already exists"
 msgstr "Ten plik już istnieje"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:773
+#: ../src/filetransfers_window.py:320 ../src/gtkgui_helpers.py:774
 msgid "What do you want to do?"
 msgstr "<b>Co chcesz zrobić?</b>"
 
-#: ../src/filetransfers_window.py:330 ../src/gtkgui_helpers.py:783
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:784
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Nie masz uprawnień do zapisu w folderze \"%s\""
 
-#: ../src/filetransfers_window.py:330 ../src/gtkgui_helpers.py:784
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:785
 msgid "You do not have permission to create files in this directory."
 msgstr "Nie masz uprawnień do tworzenia plików w tym folderze."
 
-#: ../src/filetransfers_window.py:340
+#: ../src/filetransfers_window.py:342
 msgid "Save File as..."
 msgstr "Zapisz obraz jako..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:421
+#: ../src/filetransfers_window.py:422
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3928,57 +4349,419 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:497
+#: ../src/filetransfers_window.py:511
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/ów)"
 
-#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
+#: ../src/filetransfers_window.py:550 ../src/filetransfers_window.py:553
 msgid "Invalid File"
 msgstr "Niepoprawny plik"
 
-#: ../src/filetransfers_window.py:536
+#: ../src/filetransfers_window.py:550
 msgid "File: "
 msgstr "Plik: "
 
-#: ../src/filetransfers_window.py:540
+#: ../src/filetransfers_window.py:554
 msgid "It is not possible to send empty files"
 msgstr "Nie można wysłać pustego pliku"
 
-#: ../src/filetransfers_window.py:560 ../src/tooltips.py:564
+#: ../src/filetransfers_window.py:576 ../src/tooltips.py:583
 msgid "Name: "
 msgstr "Nazwa: "
 
-#: ../src/filetransfers_window.py:562 ../src/tooltips.py:568
+#: ../src/filetransfers_window.py:578 ../src/tooltips.py:587
 msgid "Sender: "
 msgstr "Nadawca: "
 
-#: ../src/filetransfers_window.py:750
+#: ../src/filetransfers_window.py:766
 msgid "Pause"
 msgstr "Zatrzymaj"
 
-#: ../src/gajim-remote.py:65
+#: ../src/gajim.py:55
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr "%s nie jest prawidłowym poziomem logowania"
+
+#: ../src/gajim.py:128
+msgid "Gajim needs X server to run. Quiting..."
+msgstr "Gajim wymaga do działania serwera X. Zamykanie programu..."
+
+#: ../src/gajim.py:155
+msgid "Gajim needs PyGTK 2.8 or above"
+msgstr "Gajim wymaga PyGTK w wersji 2.8 lub wyższej"
+
+#: ../src/gajim.py:156
+msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
+msgstr ""
+"Gajim wymaga do działania PyGTK w wersji 2.8 lub wyższej. Zamykanie "
+"programu..."
+
+#: ../src/gajim.py:158
+msgid "Gajim needs GTK 2.8 or above"
+msgstr "Gajim wymaga GTK w wersji 2.8 lub wyższej"
+
+#: ../src/gajim.py:159
+msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
+msgstr ""
+"Gajim wymaga do działania GTK w wersji 2.8 lub wyższej. Zamykanie programu..."
+
+#: ../src/gajim.py:164
+msgid "GTK+ runtime is missing libglade support"
+msgstr "W GTK+ brakuje wsparcia dla libglade"
+
+#: ../src/gajim.py:166
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Proszę usunąć obecną wersje GTK+ i zainstalować najnowszą stabilną wesję z %s"
+
+#: ../src/gajim.py:168
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr ""
+"Sprawdź, czy GTK+ oraz PyGTK posiadają w twoim systemie wsparcie dla "
+"libglade."
+
+#: ../src/gajim.py:173
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Gajim wymaga do działania PySQLite2"
+
+#: ../src/gajim.py:181
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajim wymaga do działania pakietu pywin32"
+
+#: ../src/gajim.py:182
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+"Proszę upewnić się, że zainstalowany jest pakiet Pywin32. Możesz go pobrać "
+"spod adresu %s"
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:324
+msgid "Gajim is already running"
+msgstr "Gajim jest już uruchomiony"
+
+#: ../src/gajim.py:325
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+"Wydaje się, że w tle działa już inna kopia Gajima.\n"
+"Czy mimo to chcesz uruchomić program?"
+
+#: ../src/gajim.py:348 ../src/common/connection_handlers.py:908
+#: ../src/common/connection_handlers.py:1619
+#: ../src/common/connection_handlers.py:1648
+#: ../src/common/connection_handlers.py:1658
+#: ../src/common/connection_handlers.py:1677
+#: ../src/common/connection_handlers.py:1914
+#: ../src/common/connection_handlers.py:2026 ../src/common/connection.py:933
+msgid "Disk Write Error"
+msgstr "Błąd zapisu na dysk"
+
+#: ../src/gajim.py:441
+msgid "Do you accept this request?"
+msgstr "Czy akceptujesz tę prośbę?"
+
+#: ../src/gajim.py:443
+#, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Czy akceptujesz tę prośbę na koncie %s?"
+
+#: ../src/gajim.py:446
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "Autoryzacja HTTP (%s) dla %s (id: %s)"
+
+#: ../src/gajim.py:493 ../src/notify.py:453
+msgid "Connection Failed"
+msgstr "Połączenie nie powiodło się"
+
+#: ../src/gajim.py:827
+#, python-format
+msgid "Subject: %s"
+msgstr "Temat: %s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:874 ../src/gajim.py:887
+#, python-format
+msgid "error while sending %s ( %s )"
+msgstr "błąd przy wysyłaniu %s ( %s )"
+
+#: ../src/gajim.py:920
+msgid "Authorization accepted"
+msgstr "Autoryzacja przyjęta"
+
+#: ../src/gajim.py:921
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Kontakt \"%s\" udzielił Ci autoryzacji byś mógł widzieć jego status."
+
+#: ../src/gajim.py:929
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Kontakt \"%s\" cofnął Ci autoryzację"
+
+#: ../src/gajim.py:930
+msgid "You will always see him or her as offline."
+msgstr "Zawsze będziesz widział ten kontakt jako niepołączony."
+
+#: ../src/gajim.py:974
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Nie można ustanowić połączenia z \"%s\""
+
+#: ../src/gajim.py:975 ../src/common/connection.py:471
+msgid "Check your connection or try again later."
+msgstr "Sprawdź swoje połączenie lub spróbuj później."
+
+#: ../src/gajim.py:1144 ../src/groupchat_control.py:991
+#, python-format
+msgid "%s is now known as %s"
+msgstr "%s występuje teraz jako %s"
+
+#: ../src/gajim.py:1160 ../src/roster_window.py:1354
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s ma teraz status %s (%s)"
+
+#. No status message
+#: ../src/gajim.py:1163 ../src/groupchat_control.py:1142
+#: ../src/roster_window.py:1357
+#, python-format
+msgid "%s is now %s"
+msgstr "%s ma teraz status %s"
+
+#. Can be a presence (see chg_contact_status in groupchat_contol.py)
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/gajim.py:1284 ../src/groupchat_control.py:951
+msgid "Any occupant is allowed to see your full JID"
+msgstr "Każdy uczestnik może zobaczyć twój pełny JID"
+
+#: ../src/gajim.py:1287
+msgid "Room now shows unavailable member"
+msgstr "Lista zawiera teraz niedostępnych uczestników"
+
+#: ../src/gajim.py:1289
+msgid "room now does not show unavailable members"
+msgstr "lista nie zawiera teraz niedostępnych użytkowników"
+
+#: ../src/gajim.py:1292
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr "Nastąpiła zmiana konfiguracji pokoju (nie powiązana z prywatnością)"
+
+#. Can be a presence (see chg_contact_status in groupchat_contol.py)
+#: ../src/gajim.py:1295
+msgid "Room logging is now enabled"
+msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz włączone"
+
+#: ../src/gajim.py:1297
+msgid "Room logging is now disabled"
+msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz wyłączone"
+
+#: ../src/gajim.py:1299
+msgid "Room is now non-anonymous"
+msgstr "Pokój nie jest już anonimowy"
+
+#: ../src/gajim.py:1302
+msgid "Room is now semi-anonymous"
+msgstr "Pokój jest teraz quasi-anonimowy"
+
+#: ../src/gajim.py:1305
+msgid "Room is now fully-anonymous"
+msgstr "Pokój jest teraz w pełni anonimowy"
+
+#: ../src/gajim.py:1337
+#, python-format
+msgid "A Password is required to join the room %s. Please type it"
+msgstr "Aby dołączyć do pokoju %s wymagane jest hasło. Proszę je wpisać"
+
+#: ../src/gajim.py:1367
+msgid "Your passphrase is incorrect"
+msgstr "Twoje hasło jest niepoprawne"
+
+#: ../src/gajim.py:1368
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Jesteś aktualnie połączony bez obsługi OpenPGP."
+
+#: ../src/gajim.py:1472
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Nowa poczta w skrzynce %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1474
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Masz %d nieprzeczytaną wiadomość pocztową"
+msgstr[1] "Masz %d nieprzeczytane wiadomości pocztowe"
+msgstr[2] "Masz %d nieprzeczytane wiadomości pocztowe"
+
+#. FIXME: emulate Gtalk client popups. find out what they parse and how
+#. they decide what to show
+#. each message has a 'From', 'Subject' and 'Snippet' field
+#: ../src/gajim.py:1483
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+"\n"
+"Od: %(from_address)s"
+
+#: ../src/gajim.py:1661
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s chce przesłać ci plik."
+
+#: ../src/gajim.py:1726
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Otrzymałeś plik %(filename)s od %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1730
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Przesyłanie pliku %(filename)s od %(name)s zostało zatrzymane."
+
+#: ../src/gajim.py:1743
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Przesłałeś plik %(filename)s do %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1747
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Przesyłanie pliku %(filename)s do %(name)s zostało zatrzymane."
+
+#: ../src/gajim.py:1842
+msgid "Session negotiation cancelled"
+msgstr "Negocjowanie sesji zostało przerwane"
+
+#: ../src/gajim.py:1843
+#, python-format
+msgid "The client at %s cancelled the session negotiation."
+msgstr "Klient na %s anulował negocjację sesji"
+
+#: ../src/gajim.py:1884 ../src/gajim.py:1928
+msgid "Confirm these session options"
+msgstr "Potwierdź opcje sesji"
+
+#: ../src/gajim.py:1885
+#, python-format
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t\t%s\n"
+"\n"
+"\t\tAre these options acceptable?"
+msgstr ""
+"Zdalny klient chce przeprowadzić negocjację sesji z poniższymi "
+"ustawieniami:\n"
+"\n"
+"\t\t%s\n"
+"\n"
+"\t\tCzy akceptujesz te ustawienia?"
+
+#: ../src/gajim.py:1929
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
+msgstr ""
+"Zdalny kilent wybrał następujące opcje:\n"
+"\n"
+"%s\n"
+"\n"
+"Kontynuować?"
+
+#: ../src/gajim.py:2054
+msgid "Username Conflict"
+msgstr "Konflikt nazw użytkownika"
+
+#: ../src/gajim.py:2055
+msgid "Please type a new username for your local account"
+msgstr "Podaj nazwę użytkownika dla nowego konta lokalnego"
+
+#: ../src/gajim.py:2072
+msgid "Ping?"
+msgstr "Ping?"
+
+#: ../src/gajim.py:2080
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
+
+#: ../src/gajim.py:2086
+msgid "Error."
+msgstr "Błąd."
+
+#: ../src/gajim.py:2111
+msgid "Resource Conflict"
+msgstr "Konflikt zasobów"
+
+#: ../src/gajim.py:2112
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+"Jesteś już połączony z tym kontem przy użyciu tego samego zasobu.Proszę "
+"podać nowy zasób"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:2474
+msgid "Could not save your settings and preferences"
+msgstr "Nie można zapisać twoich ustawień i opcji"
+
+#. sorted alphanum
+#: ../src/gajim.py:2609 ../src/common/config.py:91 ../src/common/config.py:399
+#: ../src/common/optparser.py:205 ../src/common/optparser.py:423
+#: ../src/common/optparser.py:457
+msgid "default"
+msgstr "domyślny"
+
+#: ../src/gajim.py:2696
+msgid "Network Manager support not available"
+msgstr "Brak wsparcia dla Network Managera"
+
+#: ../src/gajim.py:2800
+msgid "Session Management support not available (missing gnome.ui module)"
+msgstr "Wsparcie dla Menadżera Sesji jest niedostępne (brak modułu gnome.ui"
+
+#: ../src/gajim-remote.py:70
 msgid "Shows a help on specific command"
 msgstr "Wyświetla pomoc dla wybranego polecenia"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:68
+#: ../src/gajim-remote.py:73
 msgid "command"
 msgstr "polecenie"
 
-#: ../src/gajim-remote.py:69
+#: ../src/gajim-remote.py:74
 msgid "show help on command"
 msgstr "pokaż pomoc polecenia"
 
-#: ../src/gajim-remote.py:73
+#: ../src/gajim-remote.py:78
 msgid "Shows or hides the roster window"
 msgstr "Pokazuje lub ukrywa okno listy kontaktów"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:82
 msgid "Pops up a window with the next pending event"
 msgstr "Pokazuje okno z następną nieprzeczytaną wiadomością"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:86
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -3986,49 +4769,49 @@ msgstr ""
 "Wyświetla listę wszystkich kontaktów. Każdy kontakt zostanie wyświetlony w "
 "osobnej linii"
 
-#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:99
-#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:122
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:157
-#: ../src/gajim-remote.py:187 ../src/gajim-remote.py:196
-#: ../src/gajim-remote.py:203 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:237
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:89 ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:141 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:210 ../src/gajim-remote.py:217
+#: ../src/gajim-remote.py:224 ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:251 ../src/gajim-remote.py:260
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:89
 msgid "show only contacts of the given account"
 msgstr "pokaż tylko kontakty z danego konta"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:95
 msgid "Prints a list of registered accounts"
 msgstr "Wypisuje listę zarejestrowanych kont"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:99
 msgid "Changes the status of account or accounts"
 msgstr "Zmienia status kont lub kont"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:102
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:102
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "jeden z: rozłączony, dostępny, chętny do rozmowy, zaraz wracam, nieobecny, "
 "zajęty, niewidoczny "
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:119
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:103 ../src/gajim-remote.py:124
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:149
 msgid "message"
 msgstr "wiadomość"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:103
 msgid "status message"
 msgstr "informacja o statusie"
 
-#: ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:104
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4037,20 +4820,20 @@ msgstr ""
 "zmienić status wszystkich kont, które mają ustawioną opcję synchronizacji ze "
 "statusem globalnym"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:110
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Pokazuje okno dialogowe umożliwiające wysłanie wiadomości do kontaktu"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:112
 msgid "JID of the contact that you want to chat with"
 msgstr "JID osoby, z którą chcesz porozmawiać"
 
-#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:201
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "jeśli jest podany, to kontakt jest pobierany z listy kontaktów tego konta"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:119
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4060,28 +4843,30 @@ msgstr ""
 "nie są wymagane. Jeśli chcesz ustawić jedynie 'konto' bez 'klucza OpenPGP', "
 "to ustaw 'klucz OpenPGP' na ''."
 
-#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
 msgid "JID of the contact that will receive the message"
 msgstr "JID osoby, która otrzyma wiadomość"
 
-#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:149
 msgid "message contents"
 msgstr "zawartość wiadomości"
 
-#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:139
 msgid "pgp key"
 msgstr "klucz pgp"
 
-#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:139
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "jeśli jest podany, to wiadomość zostanie zaszyfrowana tym kluczem publicznym"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:150
 msgid "if specified, the message will be sent using this account"
 msgstr "jeśli jest podane, to wiadomość zostanie wysłana z tego konta"
 
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:132
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4091,125 +4876,133 @@ msgstr ""
 "nie są wymagane. Jeśli chcesz ustawić jedynie 'konto' bez 'klucza OpenPGP', "
 "to ustaw 'klucz OpenPGP' na ''."
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:137
 msgid "subject"
 msgstr "temat"
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:137
 msgid "message subject"
 msgstr "temat wiadomości"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:146
+msgid "Sends new message to a groupchat you've joined."
+msgstr "Wysyła nową wiadomość na czat, w którym uczestniczysz."
+
+#: ../src/gajim-remote.py:148
+msgid "JID of the room that will receive the message"
+msgstr "JID pokoju, do którego zostanie wysłana wiadomość"
+
+#: ../src/gajim-remote.py:155
 msgid "Gets detailed info on a contact"
 msgstr "Pobiera szczegółowe informacje o kontakcie"
 
-#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
-#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:157 ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:200 ../src/gajim-remote.py:209
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:161
 msgid "Gets detailed info on a account"
 msgstr "Pobiera szczegółowe informacje o koncie"
 
-#: ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:163
 msgid "Name of the account"
 msgstr "Nazwa konta"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:167
 msgid "Sends file to a contact"
 msgstr "Wysyła plik kontaktowi"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:169
 msgid "file"
 msgstr "plik"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:169
 msgid "File path"
 msgstr "Ścieżka do pliku"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:171
 msgid "if specified, file will be sent using this account"
 msgstr "plik zostanie wysłany z tego konta, jeśli jest ono podane"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:176
 msgid "Lists all preferences and their values"
 msgstr "Wypisuje wszystkie opcje i ich wartości"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:180
 msgid "Sets value of 'key' to 'value'."
 msgstr "Ustawia wartość 'klucza' na 'wartość'."
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:182
 msgid "key=value"
 msgstr "klucz=wartość"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:182
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'klucz' jest nazwą opcji, 'wartość' zaś jest jej ustawianą wartością"
 
-#: ../src/gajim-remote.py:173
+#: ../src/gajim-remote.py:187
 msgid "Deletes a preference item"
 msgstr "Usuwa opcję"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:189
 msgid "key"
 msgstr "klucz"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:189
 msgid "name of the preference to be deleted"
 msgstr "nazwa opcji do usunięcia"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:193
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisuje obecny stan opcji Gajima do pliku .config"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:198
 msgid "Removes contact from roster"
 msgstr "Usuwa kontakt z listy kontaktów"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:207
 msgid "Adds contact to roster"
 msgstr "Dodaje kontakt do listy kontaktów"
 
-#: ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:209
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:210
 msgid "Adds new contact to this account"
 msgstr "Dodaje nowy kontakt do tego konta"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:215
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Zwraca obecny status (globalny, chyba, że zostało wskazane konto)."
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:222
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr "Zwraca obecny status (globalny, chyba że zostało wskazane konto)."
 
-#: ../src/gajim-remote.py:215
+#: ../src/gajim-remote.py:229
 msgid "Returns number of unread messages"
 msgstr "Zwraca liczbę nieprzeczytanych wiadomości"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:233
 msgid "Opens 'Start Chat' dialog"
 msgstr "Otwiera okno dialogowe 'Rozpocznij rozmowę'"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:235
 msgid "Starts chat, using this account"
 msgstr "Rozpocznij rozmowę z tego konta"
 
-#: ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:239
 msgid "Sends custom XML"
 msgstr "Wysyła własny XML"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:241
 msgid "XML to send"
 msgstr "XML do wysłania"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:242
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -4217,35 +5010,35 @@ msgstr ""
 "Konto, na jaki zostanie wysłany XML. Jeżeli nie jest określone, Gajim wyśle "
 "dane do wszystkich kont"
 
-#: ../src/gajim-remote.py:234
+#: ../src/gajim-remote.py:248
 msgid "Handle a xmpp:/ uri"
 msgstr "Obsługuj URI xmpp:/"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:250
 msgid "uri"
 msgstr "URI"
 
-#: ../src/gajim-remote.py:241
+#: ../src/gajim-remote.py:255
 msgid "Join a MUC room"
 msgstr "Dołącz do nowego pokoju"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:257
 msgid "room"
 msgstr "pokój"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:258
 msgid "nick"
 msgstr "nick"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:259
 msgid "password"
 msgstr "hasło"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:282
 msgid "Missing argument \"contact_jid\""
 msgstr "Brak argumentu \"contact_jid\""
 
-#: ../src/gajim-remote.py:287
+#: ../src/gajim-remote.py:301
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4254,11 +5047,11 @@ msgstr ""
 "'%s' nie znajduje się na twojej liście kontaktów.\n"
 "Podaj konto, na które ma zostać wysłana ta wiadomość."
 
-#: ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:304
 msgid "You have no active account"
 msgstr "Żadne z twoich kont nie jest aktywne"
 
-#: ../src/gajim-remote.py:354
+#: ../src/gajim-remote.py:368
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -4267,16 +5060,16 @@ msgstr ""
 "Użycie: %s %s %s \n"
 "\t %s"
 
-#: ../src/gajim-remote.py:357
+#: ../src/gajim-remote.py:371
 msgid "Arguments:"
 msgstr "Argumenty:"
 
-#: ../src/gajim-remote.py:361
+#: ../src/gajim-remote.py:375
 #, python-format
 msgid "%s not found"
 msgstr "Nie znaleziono %s"
 
-#: ../src/gajim-remote.py:365
+#: ../src/gajim-remote.py:379
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -4285,16 +5078,16 @@ msgstr ""
 "Użycie: polecenie %s [argument]\n"
 "Gdzie polecenie to jedna z następujący fraz:\n"
 
-#: ../src/gajim-remote.py:438
+#: ../src/gajim-remote.py:452
 #, python-format
 msgid ""
 "Too many arguments. \n"
 "Type \"%s help %s\" for more info"
 msgstr ""
 "Za dużo argumentów. \n"
-"Wpisz \"%s·help·%s\" aby uzyskać więcej informacji"
+"Wpisz \"%s help %s\" aby uzyskać więcej informacji"
 
-#: ../src/gajim-remote.py:442
+#: ../src/gajim-remote.py:456
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -4303,347 +5096,153 @@ msgstr ""
 "Argument \"%s\" nie jest określony. \n"
 "Wpisz \"%s help %s\" aby uzyskać więcej informacji"
 
-#: ../src/gajim-remote.py:460
+#: ../src/gajim-remote.py:474
 msgid "Wrong uri"
 msgstr "Błędny adres URI"
 
-#: ../src/gajim.py:47
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr "%s nie jest prawidłowym poziomem logowania"
-
-#: ../src/gajim.py:122
-msgid "Gajim needs X server to run. Quiting..."
-msgstr "Gajim wymaga do działania serwera X. Zamykanie programu..."
-
-#: ../src/gajim.py:126
-msgid "Gajim needs PyGTK 2.8 or above"
-msgstr "Gajim wymaga PyGTK w wersji 2.8 lub wyższej"
-
-#: ../src/gajim.py:127
-msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
-msgstr ""
-"Gajim wymaga do działania PyGTK w wersji 2.8 lub wyższej. Zamykanie "
-"programu..."
-
-#: ../src/gajim.py:129
-msgid "Gajim needs GTK 2.8 or above"
-msgstr "Gajim wymaga GTK w wersji 2.8 lub wyższej"
-
-#: ../src/gajim.py:130
-msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
-msgstr ""
-"Gajim wymaga do działania GTK w wersji 2.8 lub wyższej. Zamykanie programu..."
-
-#: ../src/gajim.py:135
-msgid "GTK+ runtime is missing libglade support"
-msgstr "W GTK+ brakuje wsparcia dla libglade"
-
-#: ../src/gajim.py:137
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Proszę usunąć obecną wersje GTK+ i zainstalować najnowszą stabilną wesję z %s"
-
-#: ../src/gajim.py:139
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Sprawdź, czy GTK+ oraz PyGTK posiadają w twoim systemie wsparcie dla "
-"libglade."
-
-#: ../src/gajim.py:144
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim wymaga do działania PySQLite2"
-
-#: ../src/gajim.py:152
-msgid "Gajim needs pywin32 to run"
-msgstr "Gajim wymaga do działania pakietu pywin32"
-
-#: ../src/gajim.py:153
-#, python-format
-msgid ""
-"Please make sure that Pywin32 is installed on your system. You can get it at "
-"%s"
-msgstr ""
-"Proszę upewnić się, że zainstalowany jest pakiet Pywin32. Możesz go pobrać "
-"spod adresu %s"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:300
-msgid "Gajim is already running"
-msgstr "Gajim jest już uruchomiony"
-
-#: ../src/gajim.py:301
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-"Wydaje się, że w tle działa już inna kopia Gajima.\n"
-"Czy mimo to chcesz uruchomić program?"
-
-#: ../src/gajim.py:408
-msgid "Do you accept this request?"
-msgstr "Czy akceptujesz tę prośbę?"
-
-#: ../src/gajim.py:411
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "Autoryzacja HTTP (%s) dla %s (id: %s)"
-
-#: ../src/gajim.py:458 ../src/notify.py:435
-msgid "Connection Failed"
-msgstr "Połączenie nie powiodło się"
-
-#: ../src/gajim.py:778
-#, python-format
-msgid "Subject: %s"
-msgstr "Temat: %s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
-#: ../src/gajim.py:823 ../src/gajim.py:836
-#, python-format
-msgid "error while sending %s ( %s )"
-msgstr "błąd przy wysyłaniu %s ( %s )"
-
-#: ../src/gajim.py:869
-msgid "Authorization accepted"
-msgstr "Autoryzacja przyjęta"
-
-#: ../src/gajim.py:870
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "Kontakt \"%s\" udzielił Ci autoryzacji byś mógł widzieć jego status."
-
-#: ../src/gajim.py:878
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "Kontakt \"%s\" cofnął Ci autoryzację"
-
-#: ../src/gajim.py:879
-msgid "You will always see him or her as offline."
-msgstr "Zawsze będziesz widział ten kontakt jako niepołączony."
-
-#: ../src/gajim.py:923
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Nie można ustanowić połączenia z \"%s\""
-
-#: ../src/gajim.py:924 ../src/common/connection.py:438
-msgid "Check your connection or try again later."
-msgstr "Sprawdź swoje połączenie lub spróbuj później."
-
-#: ../src/gajim.py:1073 ../src/roster_window.py:1247
-#, python-format
-msgid "%s is now %s (%s)"
-msgstr "%s ma teraz status %s (%s)"
-
-#. No status message
-#: ../src/gajim.py:1076 ../src/groupchat_control.py:968
-#: ../src/roster_window.py:1250
-#, python-format
-msgid "%s is now %s"
-msgstr "%s ma teraz status %s"
-
-#: ../src/gajim.py:1173
-msgid "Your passphrase is incorrect"
-msgstr "Twoje hasło jest niepoprawne"
-
-#: ../src/gajim.py:1174
-msgid "You are currently connected without your OpenPGP key."
-msgstr "Jesteś aktualnie połączony bez obsługi OpenPGP."
-
-#: ../src/gajim.py:1277
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr "Nowa poczta w skrzynce %(gmail_mail_address)s"
-
-#: ../src/gajim.py:1279
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "Masz %d nieprzeczytaną wiadomość pocztową"
-msgstr[1] "Masz %d nieprzeczytane wiadomości pocztowe"
-msgstr[2] "Masz %d nieprzeczytane wiadomości pocztowe"
-
-#. FIXME: emulate Gtalk client popups. find out what they parse and how
-#. they decide what to show
-#. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1288
-#, python-format
-msgid ""
-"\n"
-"From: %(from_address)s"
-msgstr ""
-"\n"
-"Od: %(from_address)s"
-
-#: ../src/gajim.py:1444
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s chce przesłać ci plik."
-
-#: ../src/gajim.py:1509
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "Otrzymałeś plik %(filename)s od %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1513
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "Przesyłanie pliku %(filename)s·od·%(name)s·zostało zatrzymane."
-
-#: ../src/gajim.py:1526
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "Przesłałeś plik %(filename)s do %(name)s."
-
-#. ft stopped
-#: ../src/gajim.py:1530
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "Przesyłanie pliku·%(filename)s·do·%(name)s·zostało zatrzymane."
-
-#: ../src/gajim.py:1662
-msgid "Username Conflict"
-msgstr "Konflikt nazw użytkownika"
-
-#: ../src/gajim.py:1663
-msgid "Please type a new username for your local account"
-msgstr "Podaj nazwę użytkownika dla nowego konta lokalnego"
-
-#: ../src/gajim.py:1680
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gajim.py:1688
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gajim.py:1694
-msgid "Error."
-msgstr "Błąd."
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2048
-msgid "Could not save your settings and preferences"
-msgstr "Nie można zapisać twoich ustawień i opcji"
-
-#: ../src/gajim.py:2257
-msgid "Network Manager support not available"
-msgstr "Brak wsparcia dla Network Managera"
-
-#: ../src/gajim.py:2336
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Wsparcie dla Menadżera Sesji jest niedostępne (brak modułu gnome.ui"
-
-#: ../src/gajim_themes_window.py:60
+#: ../src/gajim_themes_window.py:67
 msgid "Theme"
 msgstr "Motyw"
 
+#: ../src/gajim_themes_window.py:105
+msgid "You cannot make changes to the default theme"
+msgstr "Nie możesz dokonywać zmian w obecnie używanym motywie"
+
+#: ../src/gajim_themes_window.py:106
+msgid "Please create a clean new theme with your desired name."
+msgstr "Proszę utworzyć nowy temat i nadać mu nazwę."
+
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:155
+#: ../src/gajim_themes_window.py:180
 msgid "theme name"
 msgstr "nazwa motywu"
 
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:197
 msgid "You cannot delete your current theme"
 msgstr "Nie możesz skasować obecnie używanego motywu"
 
-#: ../src/gajim_themes_window.py:173
+#: ../src/gajim_themes_window.py:198
 msgid "Please first choose another for your current theme."
 msgstr "Ustaw najpierw inny motyw."
 
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:139
 msgid "Sending private message failed"
 msgstr "Wysyłanie prywatnej wiadomości nie powiodło się"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:124
+#: ../src/groupchat_control.py:141
 #, python-format
 msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Nie jesteś już w pokoju \"%s\" lub \"%s\" opuścił go."
 
-#: ../src/groupchat_control.py:322
+#: ../src/groupchat_control.py:350
 msgid "Insert Nickname"
 msgstr "Wstaw pseudonim"
 
+#: ../src/groupchat_control.py:878
+msgid "Really send file?"
+msgstr "Na pewno wysłać ten plik?"
+
+#: ../src/groupchat_control.py:879
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr "Jeżeli wyślesz plik do %s, pozna on/ona twój pełny JID."
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:954
+msgid "Room logging is enabled"
+msgstr "Zapisywanie rozmów prowadzonych w pokoju jest włączone"
+
+#: ../src/groupchat_control.py:956
+msgid "A new room has been created"
+msgstr "Został utworzony nowy pokój"
+
+#: ../src/groupchat_control.py:959
+msgid "The server has assigned or modified your roomnick"
+msgstr ""
+"Serwer przypisał ci lub zmodyfikował twój pseudonim używany w tym pokoju"
+
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:850
+#: ../src/groupchat_control.py:965
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s został wyrzucony: %(reason)s"
 
-#: ../src/groupchat_control.py:854
+#: ../src/groupchat_control.py:969
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s został wyrzucony przez %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:861
+#: ../src/groupchat_control.py:976
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s został zabanowany: %(reason)s"
 
-#: ../src/groupchat_control.py:865
+#: ../src/groupchat_control.py:980
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s został zabanowany przez %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:873
+#: ../src/groupchat_control.py:989
 #, python-format
 msgid "You are now known as %s"
 msgstr "Występujesz teraz jako %s"
 
-#: ../src/groupchat_control.py:875
+#: ../src/groupchat_control.py:1025 ../src/groupchat_control.py:1029
+#: ../src/groupchat_control.py:1034
 #, python-format
-msgid "%s is now known as %s"
-msgstr "%s występuje teraz jako %s"
+msgid "%(nick)s has been removed from the room (%(reason)s)"
+msgstr "%(nick)s został wyrzucony z pokoju: %(reason)s"
+
+#: ../src/groupchat_control.py:1026
+msgid "affiliation changed"
+msgstr "afiliacja została zmieniona "
+
+#: ../src/groupchat_control.py:1031
+msgid "room configuration changed to members-only"
+msgstr "konfiguracja pokoju zmieniona na 'tylko dla członków'"
 
-#: ../src/groupchat_control.py:961
+#: ../src/groupchat_control.py:1036
+msgid "system shutdown"
+msgstr "zamknięcie systemu"
+
+#: ../src/groupchat_control.py:1135
 #, python-format
 msgid "%s has left"
 msgstr "%s wychodzi"
 
-#: ../src/groupchat_control.py:966
+#: ../src/groupchat_control.py:1140
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s dołączył do pokoju"
 
-#: ../src/groupchat_control.py:1088 ../src/groupchat_control.py:1106
-#: ../src/groupchat_control.py:1199 ../src/groupchat_control.py:1216
+#. Invalid Nickname
+#. invalid char
+#: ../src/groupchat_control.py:1253 ../src/groupchat_control.py:1532
+msgid "Invalid nickname"
+msgstr "Niepoprawny pseudonim"
+
+#: ../src/groupchat_control.py:1254 ../src/groupchat_control.py:1533
+msgid "The nickname has not allowed characters."
+msgstr "Używany przez ciebie pseudonim zawiera niedozwolone znaki."
+
+#: ../src/groupchat_control.py:1277 ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1379 ../src/groupchat_control.py:1396
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Pseudonim nie został odnaleziony: %s"
 
-#: ../src/groupchat_control.py:1122
+#: ../src/groupchat_control.py:1311
 msgid "This group chat has no subject"
 msgstr "Ten pokój nie ma tematu"
 
-#: ../src/groupchat_control.py:1135
+#: ../src/groupchat_control.py:1322
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s zaproszony do %(room_jid)s."
 
-#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1142 ../src/groupchat_control.py:1170
-#, python-format
-msgid "%s does not appear to be a valid JID"
-msgstr "%s nie wygląda na poprawny JID"
-
-#: ../src/groupchat_control.py:1253
-#, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr ""
-"Nie ma takiego polecenia: /%s (jeśli chcesz je wysłać, poprzedź je znakami: /"
-"say)"
-
-#: ../src/groupchat_control.py:1279
+#: ../src/groupchat_control.py:1459
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4655,14 +5254,14 @@ msgstr ""
 "może zostać zmieniony o ile nie zawiera \"@\". Jeśli JID jest obecnie w "
 "pokoju, to zostanie z niego wyrzucony. NIE toleruje spacji w pseudonimie."
 
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
 "occupant."
 msgstr "Użycie: /%s <pseudonim>, otwiera okno prywatnej rozmowy z tą osobą."
 
-#: ../src/groupchat_control.py:1292
+#: ../src/groupchat_control.py:1472
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4671,7 +5270,7 @@ msgstr ""
 "Użycie: /%s [powód] zamyka aktualne okno lub kartę i wyświetla powóc, jeśli "
 "został podany."
 
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1478
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4680,7 +5279,7 @@ msgstr ""
 "Użycie: /%s <JID> [powód] zaprasza JID do aktualnego pokoju, opcjonalnie "
 "wyświetlając powód."
 
-#: ../src/groupchat_control.py:1302
+#: ../src/groupchat_control.py:1482
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4689,7 +5288,7 @@ msgstr ""
 "Użycie: /%s <pokój>@<serwer>[/pseudonim] oferuje przyłączenie się do "
 "pokój@serwer opcjonalnie z wykorzystaniem podanego psedonimu."
 
-#: ../src/groupchat_control.py:1306
+#: ../src/groupchat_control.py:1486
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4699,16 +5298,7 @@ msgstr ""
 "Użycie: /%s <pseudonim> [powód] usuwa podaną poprzez pseudonim osobę z "
 "pokoju i opcjonalnie wyświetla powód. NIE wspiera spacji w pseudonimie."
 
-#: ../src/groupchat_control.py:1311
-#, python-format
-msgid ""
-"Usage: /%s <action>, sends action to the current group chat. Use third "
-"person. (e.g. /%s explodes.)"
-msgstr ""
-"Użycie: /%s <działanie> wysyła działanie do aktualnego pokoju. Używaj w "
-"trzeciej osobie (np. /%s eksploduje.)"
-
-#: ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1495
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -4717,112 +5307,114 @@ msgstr ""
 "Użycie: /%s <pseudonim> [wiadomość] otwiera okno prywatnej wiadomości i "
 "wysyła ją do osoby o takim pseudonimie."
 
-#: ../src/groupchat_control.py:1320
+#: ../src/groupchat_control.py:1500
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Użycie: /%s <pseudonim> zmienia twój pseudonim w aktualnym pokoju."
 
-#: ../src/groupchat_control.py:1324
+#: ../src/groupchat_control.py:1504
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Użycie: /%s , wyświetla osoby obecne w danym pokoju."
 
-#: ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1508
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Użycie: /%s [temat] wyświetla lub aktualizuje temat aktualnego pokoju."
 
-#: ../src/groupchat_control.py:1331
+#: ../src/groupchat_control.py:1511
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Użycie: /%s <wiadomość> wysyła wiadomość bez sprawdzania innych poleceń."
 
-#: ../src/groupchat_control.py:1397
+#: ../src/groupchat_control.py:1606
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Czy jesteś pewien, że chcesz opuścić pokój \"%s\"?"
 
-#: ../src/groupchat_control.py:1399
+#: ../src/groupchat_control.py:1608
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Jeśli zamkniesz to okno, połączenie z tym pokojem zostanie zerwane."
 
-#: ../src/groupchat_control.py:1403 ../src/roster_window.py:4376
+#: ../src/groupchat_control.py:1612 ../src/roster_window.py:4877
 msgid "Do _not ask me again"
 msgstr "_Nie pytaj mnie o to ponownie"
 
-#: ../src/groupchat_control.py:1437
+#: ../src/groupchat_control.py:1644
 msgid "Changing Subject"
 msgstr "Zmiana tematu"
 
-#: ../src/groupchat_control.py:1438
+#: ../src/groupchat_control.py:1645
 msgid "Please specify the new subject:"
 msgstr "Wpisz nowy temat:"
 
-#: ../src/groupchat_control.py:1447
+#: ../src/groupchat_control.py:1654
 msgid "Changing Nickname"
 msgstr "Zmiana pseudonimu"
 
-#: ../src/groupchat_control.py:1448
+#: ../src/groupchat_control.py:1655
 msgid "Please specify the new nickname you want to use:"
 msgstr "Wpisz nowy pseudonim, którego chcesz używać:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1463
+#: ../src/groupchat_control.py:1670
+#, python-format
 msgid "Destroying %s"
 msgstr "Usuwam pokój %s"
 
-#: ../src/groupchat_control.py:1464
+#: ../src/groupchat_control.py:1671
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
-msgstr "Zamierzasz całkowicie usunąć ten pokój. \n"
+msgstr ""
+"Zamierzasz całkowicie usunąć ten pokój. \n"
 "Poniżej możesz podać powód swojej decyzji:"
 
-#: ../src/groupchat_control.py:1466
+#: ../src/groupchat_control.py:1673
 msgid "You may also enter an alternate venue:"
 msgstr "Możesz również podać alternatywne miejsce spotkań:"
 
-#: ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1705
 msgid "Bookmark already set"
 msgstr "Zakładka została już dodana"
 
-#: ../src/groupchat_control.py:1497
+#: ../src/groupchat_control.py:1706
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Pokój \"%s\" jest już w Twoich zakładkach."
 
-#: ../src/groupchat_control.py:1506
+#: ../src/groupchat_control.py:1715
 msgid "Bookmark has been added successfully"
 msgstr "Zakładka została dodana"
 
-#: ../src/groupchat_control.py:1507
+#: ../src/groupchat_control.py:1716
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Możesz zarządzać zakładkami poprzez menu Działania w oknie kontaktów."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1635
+#: ../src/groupchat_control.py:1868
 #, python-format
 msgid "Kicking %s"
 msgstr "Wyrzuć %s"
 
-#: ../src/groupchat_control.py:1636 ../src/groupchat_control.py:1929
+#: ../src/groupchat_control.py:1869 ../src/groupchat_control.py:2169
 msgid "You may specify a reason below:"
 msgstr "Podaj przyczynę:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1928
+#: ../src/groupchat_control.py:2168
 #, python-format
 msgid "Banning %s"
 msgstr "Zabanuj %s"
 
-#: ../src/gtkexcepthook.py:41
+#: ../src/gtkexcepthook.py:46
 msgid "A programming error has been detected"
 msgstr "Wykryto błąd programistyczny"
 
-#: ../src/gtkexcepthook.py:42
+#: ../src/gtkexcepthook.py:47
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
@@ -4830,91 +5422,91 @@ msgstr ""
 "Nie jest prawdopodnie krytyczny, ale powinien zostać mimo to zgłoszony "
 "deweloperom."
 
-#: ../src/gtkexcepthook.py:48
+#: ../src/gtkexcepthook.py:53
 msgid "_Report Bug"
 msgstr "_Zgłoś Błąd"
 
-#: ../src/gtkexcepthook.py:71
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Szczegóły"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:156 ../src/gtkgui_helpers.py:171
+#: ../src/gtkgui_helpers.py:162 ../src/gtkgui_helpers.py:177
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "błąd: nie można otworzyć %s do odczytu"
 
-#: ../src/gtkgui_helpers.py:336
+#: ../src/gtkgui_helpers.py:342
 msgid "Error reading file:"
 msgstr "Błąd odczytu pliku:"
 
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:345
 msgid "Error parsing file:"
 msgstr "Błąd przetwarzania pliku:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:376
+#: ../src/gtkgui_helpers.py:382
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Nie można zapisywać do %s. Wsparcie dla Menadżera Sesji nie będzie działać"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:711
+#: ../src/gtkgui_helpers.py:714
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim nie jest domyślnym klinetem Jabbera"
 
-#: ../src/gtkgui_helpers.py:712
+#: ../src/gtkgui_helpers.py:715
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Czy chciałbyś by Gajim stał się klientem domyślnym?"
 
-#: ../src/gtkgui_helpers.py:713
+#: ../src/gtkgui_helpers.py:716
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "Przy starcie sprawdzaj czy Gajim jest domyślnym klinetem Jabbera"
 
-#: ../src/gtkgui_helpers.py:812
+#: ../src/gtkgui_helpers.py:813
 msgid "Extension not supported"
 msgstr "Rozszerzenie nie jest obsługiwane"
 
-#: ../src/gtkgui_helpers.py:813
+#: ../src/gtkgui_helpers.py:814
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Obraz nie może zostać zapisany w formacie %(type)s. Zapisać jako %"
 "(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:822
+#: ../src/gtkgui_helpers.py:823
 msgid "Save Image as..."
 msgstr "Zapisz plik jako..."
 
-#: ../src/history_manager.py:65
+#: ../src/history_manager.py:73
 msgid "Cannot find history logs database"
 msgstr "Nie można odnaleźć bazy danych z historią rozmów"
 
 #. holds jid
-#: ../src/history_manager.py:108
+#: ../src/history_manager.py:113
 msgid "Contacts"
 msgstr "Kontakty"
 
 #. holds time
-#: ../src/history_manager.py:121 ../src/history_manager.py:161
-#: ../src/history_window.py:86
+#: ../src/history_manager.py:126 ../src/history_manager.py:166
+#: ../src/history_window.py:121
 msgid "Date"
 msgstr "Data"
 
 #. holds nickname
-#: ../src/history_manager.py:127 ../src/history_manager.py:179
+#: ../src/history_manager.py:132 ../src/history_manager.py:184
 msgid "Nickname"
 msgstr "Pseudonim"
 
 #. holds message
-#: ../src/history_manager.py:135 ../src/history_manager.py:167
-#: ../src/history_window.py:94
+#: ../src/history_manager.py:140 ../src/history_manager.py:172
+#: ../src/history_window.py:129
 msgid "Message"
 msgstr "Wiadomość"
 
-#: ../src/history_manager.py:187
+#: ../src/history_manager.py:192
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -4922,7 +5514,7 @@ msgstr ""
 "Czy chcesz wyczyścić bazę danych? (STANOWCZO ODRADZA SIĘ KORZYSTANIE Z TEJ "
 "OPCJI GDY GAJIM JEST URUCHOMIONY)"
 
-#: ../src/history_manager.py:189
+#: ../src/history_manager.py:194
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -4937,160 +5529,202 @@ msgstr ""
 "\n"
 "Jeżeli kliknąłeś TAK, musisz teraz poczekać..."
 
-#: ../src/history_manager.py:401
+#: ../src/history_manager.py:406
 msgid "Exporting History Logs..."
 msgstr "Przenoszenie logów rozmów..."
 
-#: ../src/history_manager.py:476
+#: ../src/history_manager.py:481
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s o godzinie %(time)s napisał: %(message)s\n"
 
-#: ../src/history_manager.py:514
+#: ../src/history_manager.py:518
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] "Czy na pewno chcesz usunąć historię rozmów wybranego kontaktu?"
 msgstr[1] "Czy na pewno chcesz usunąć historię rozmów wybranych kontaktów?"
 msgstr[2] "Czy na pewno chcesz usunąć historię rozmów wybranych kontaktów?"
 
-#: ../src/history_manager.py:518 ../src/history_manager.py:554
+#: ../src/history_manager.py:522 ../src/history_manager.py:557
 msgid "This is an irreversible operation."
 msgstr "Skutków tej operacji nie można będzie wycofać."
 
-#: ../src/history_manager.py:551
+#: ../src/history_manager.py:554
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Czy na pewno chcesz usunąć wybraną wiadomość?"
 msgstr[1] "Czy na pewno chcesz usunąć wybrane wiadomości?"
 msgstr[2] "Czy na pewno chcesz usunąć wybrane wiadomości?"
 
-#: ../src/history_window.py:103 ../src/history_window.py:105
+#: ../src/history_window.py:209 ../src/history_window.py:211
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historia rozmowy z %s"
 
-#: ../src/history_window.py:266
+#: ../src/history_window.py:342
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s jes teraz %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:270 ../src/notify.py:199
+#: ../src/history_window.py:346 ../src/notify.py:211
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s ma teraz status %(status)s"
 
-#: ../src/history_window.py:276
+#: ../src/history_window.py:352
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Obecny status: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:279
+#: ../src/history_window.py:355
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Obecny status: %(status)s"
 
-#: ../src/htmltextview.py:710 ../src/htmltextview.py:721
+#: ../src/htmltextview.py:586 ../src/htmltextview.py:597
 msgid "Timeout loading image"
 msgstr "Przekroczono czas ładowania obrazu"
 
-#: ../src/htmltextview.py:731
+#: ../src/htmltextview.py:607
 msgid "Image is too big"
 msgstr "Obraz jest za duży"
 
-#: ../src/message_window.py:273
+#: ../src/message_window.py:350
 msgid "Chats"
 msgstr "Rozmowy"
 
-#: ../src/message_window.py:275
+#: ../src/message_window.py:352
 msgid "Group Chats"
 msgstr "Czaty"
 
-#: ../src/message_window.py:277
+#: ../src/message_window.py:354
 msgid "Private Chats"
 msgstr "Rozmowy prywatne"
 
-#: ../src/message_window.py:279
+#: ../src/message_window.py:356
 msgid "Messages"
 msgstr "Wiadomości"
 
-#: ../src/message_window.py:280
+#: ../src/message_window.py:357
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
 
-#: ../src/notify.py:197
+#: ../src/negotiation.py:13
+msgid "- messages will be logged"
+msgstr "- wiadomości będzie logowanych"
+
+#: ../src/negotiation.py:15
+msgid "- messages will not be logged"
+msgstr "- wiadomości nie będzie logowanych"
+
+#: ../src/negotiation.py:24
+msgid "OK to continue with negotiation?"
+msgstr "Czy kontynuować negocjację?"
+
+#: ../src/negotiation.py:25
+#, python-format
+msgid ""
+"You've begun an encrypted session with %s, but it can't be guaranteed that "
+"you're talking directly to the person you think you are.\n"
+"\n"
+"You should speak with them directly (in person or on the phone) and confirm "
+"that their Short Authentication String is identical to this one: %s\n"
+"\n"
+"Would you like to continue with the encrypted session?"
+msgstr ""
+"Rozpocząłeś szyfrowaną sesję z %s, ale nie można zagwarantować, że "
+"rozmawiasz bezpośrednio z odpowiednią osobą.\n"
+"\n"
+"Powienieneś(-winnaś) porozmawiać z nią w cztery osobiście lub za "
+"pośrednictwem telefonu i potwierdzić, że jej SAS (Short Authentication "
+"String) jest identyczny z poniższym: %s\n"
+"Czy chcesz kontynuować tą sesję?"
+
+#: ../src/negotiation.py:31
+msgid "Yes, I verified the Short Authentication String"
+msgstr "Tak, SAS został zweryfikowany."
+
+#: ../src/notify.py:209
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s zmienił status"
 
-#: ../src/notify.py:207
+#: ../src/notify.py:219
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s połączył(a) się"
 
-#: ../src/notify.py:215
+#: ../src/notify.py:227
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s rozłączył(a) się"
 
-#: ../src/notify.py:227
+#: ../src/notify.py:239
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nowa wiadomość od %(nickname)s"
 
-#: ../src/notify.py:235
+#: ../src/notify.py:247
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nowa wiadomość prywatna z pokoju %s"
 
-#: ../src/notify.py:236
+#: ../src/notify.py:249
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:252
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Nowa wiadomość od %(nickname)s"
+
+#: ../src/notify.py:258
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nowa wiadomość od %(nickname)s"
 
-#: ../src/profile_window.py:72
+#: ../src/profile_window.py:53
 msgid "Retrieving profile..."
 msgstr "Pobieranie profilu..."
 
-#: ../src/profile_window.py:127 ../src/vcard.py:135
-msgid "File is emty"
+#: ../src/profile_window.py:104 ../src/roster_window.py:1887
+msgid "File is empty"
 msgstr "Plik jest pusty"
 
-#: ../src/profile_window.py:130 ../src/vcard.py:138
+#: ../src/profile_window.py:107 ../src/roster_window.py:1890
 msgid "File does not exist"
 msgstr "Plik nie istnieje."
 
 #. keep identation
-#: ../src/profile_window.py:144 ../src/vcard.py:140
+#. unknown format
+#: ../src/profile_window.py:121 ../src/profile_window.py:137
+#: ../src/roster_window.py:1892 ../src/roster_window.py:1903
 msgid "Could not load image"
 msgstr "Nie można załadować obrazka."
 
-#: ../src/profile_window.py:257
+#: ../src/profile_window.py:238
 msgid "Information received"
 msgstr "Informacja została odebrana"
 
-#: ../src/profile_window.py:326
+#: ../src/profile_window.py:307
 msgid "Without a connection you can not publish your contact information."
 msgstr "Nie możesz wysłać informacji o sobie jeśli nie jesteś połączony."
 
-#: ../src/profile_window.py:338
+#: ../src/profile_window.py:319
 msgid "Sending profile..."
 msgstr "Wysyłanie profilu..."
 
-#: ../src/profile_window.py:353
+#: ../src/profile_window.py:334
 msgid "Information NOT published"
 msgstr "Informacja NIE ZOSTAŁA opublikowana"
 
-#: ../src/profile_window.py:360
+#: ../src/profile_window.py:341
 msgid "vCard publication failed"
 msgstr "Publikacja vCard nie powiodła się"
 
-#: ../src/profile_window.py:361
+#: ../src/profile_window.py:342
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -5098,80 +5732,93 @@ msgstr ""
 "W czasie publikowanie informacji o tobie wystąpił błąd, spróbuj ponownie "
 "później."
 
-#: ../src/roster_window.py:173 ../src/roster_window.py:228
+#: ../src/roster_window.py:188 ../src/roster_window.py:243
 msgid "Merged accounts"
 msgstr "Połączone konta"
 
-#: ../src/roster_window.py:346 ../src/roster_window.py:571
-#: ../src/common/helpers.py:43
+#: ../src/roster_window.py:363 ../src/roster_window.py:628
+#: ../src/roster_window.py:2115 ../src/common/contacts.py:312
+#: ../src/common/helpers.py:49
 msgid "Observers"
 msgstr "Obserwatorzy"
 
-#: ../src/roster_window.py:710 ../src/roster_window.py:3526
+#. Make special context menu if group is Groupchats
+#: ../src/roster_window.py:447 ../src/roster_window.py:452
+#: ../src/roster_window.py:1940 ../src/roster_window.py:1943
+#: ../src/roster_window.py:2606 ../src/roster_window.py:2609
+#: ../src/roster_window.py:2634 ../src/roster_window.py:4738
+#: ../src/roster_window.py:4740 ../src/common/commands.py:199
+#: ../src/common/contacts.py:102 ../src/common/helpers.py:49
+msgid "Groupchats"
+msgstr "Pokoje"
+
+#: ../src/roster_window.py:777 ../src/roster_window.py:3987
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nie możesz dołączyć do pokoju gdy jesteś niewidoczny"
 
 #. new chat
+#. single message
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:913 ../src/systray.py:206 ../src/systray.py:211
+#. join gc
+#: ../src/roster_window.py:990 ../src/roster_window.py:1000
+#: ../src/roster_window.py:1009 ../src/systray.py:212 ../src/systray.py:217
+#: ../src/systray.py:223
 #, python-format
 msgid "using account %s"
 msgstr "używając konta %s"
 
-#. the 'manage gc bookmarks' item is shown
-#. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:938
+#: ../src/roster_window.py:1016
 #, python-format
 msgid "to %s account"
 msgstr "do konta %s"
 
 #. disco
-#: ../src/roster_window.py:943
+#: ../src/roster_window.py:1021
 #, python-format
 msgid "using %s account"
 msgstr "używając konta %s"
 
+#: ../src/roster_window.py:1102
+msgid "_Manage Bookmarks..."
+msgstr "_Zarządzaj zakładkami..."
+
 #. profile, avatar
-#: ../src/roster_window.py:1018
+#: ../src/roster_window.py:1121
 #, python-format
 msgid "of account %s"
 msgstr "dla konta %s"
 
-#: ../src/roster_window.py:1038
-msgid "_Manage Bookmarks..."
-msgstr "_Zarządzaj zakładkami..."
-
-#: ../src/roster_window.py:1067
+#: ../src/roster_window.py:1161
 #, python-format
 msgid "for account %s"
 msgstr "dla konta %s"
 
 #. History manager
-#: ../src/roster_window.py:1088
+#: ../src/roster_window.py:1182
 msgid "History Manager"
 msgstr "Historia rozmów"
 
-#: ../src/roster_window.py:1097
+#: ../src/roster_window.py:1191
 msgid "_Join New Group Chat"
 msgstr "_Dołącz do pokoju"
 
-#: ../src/roster_window.py:1429 ../src/roster_window.py:3722
-#: ../src/roster_window.py:3729
+#: ../src/roster_window.py:1549 ../src/roster_window.py:4192
+#: ../src/roster_window.py:4199
 msgid "You have unread messages"
 msgstr "Masz nieprzeczytane wiadomości"
 
-#: ../src/roster_window.py:1430
+#: ../src/roster_window.py:1550
 msgid "You must read them before removing this transport."
 msgstr "Przejrzyj je wszystkie przed usunięciem tego transportu."
 
-#: ../src/roster_window.py:1433
+#: ../src/roster_window.py:1553
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zostanie usunięty"
 
-#: ../src/roster_window.py:1434
+#: ../src/roster_window.py:1554
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -5179,11 +5826,11 @@ msgstr ""
 "Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów za pomocą "
 "tego transportu."
 
-#: ../src/roster_window.py:1437
+#: ../src/roster_window.py:1557
 msgid "Transports will be removed"
 msgstr "Transporty zostaną usunięte"
 
-#: ../src/roster_window.py:1442
+#: ../src/roster_window.py:1562
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -5193,120 +5840,151 @@ msgstr ""
 "następujących transportów: %s"
 
 #. it's jid
-#: ../src/roster_window.py:1608
+#: ../src/roster_window.py:1728
 msgid "Rename Contact"
 msgstr "Zmień nazwę dla kontaktu"
 
-#: ../src/roster_window.py:1609
+#: ../src/roster_window.py:1729
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Wpisz nazwę dla kontaktu %s."
 
-#: ../src/roster_window.py:1616
+#: ../src/roster_window.py:1736
 msgid "Rename Group"
 msgstr "Zmień nazwę grupy"
 
-#: ../src/roster_window.py:1617
+#: ../src/roster_window.py:1737
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Wpisz nową nazwę dla grupy %s."
 
-#: ../src/roster_window.py:1692
+#: ../src/roster_window.py:1812
 msgid "Remove Group"
 msgstr "Usuń grupę"
 
-#: ../src/roster_window.py:1693
+#: ../src/roster_window.py:1813
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Czy chcesz usunąć z rostera grupę %s?"
 
-#: ../src/roster_window.py:1694
+#: ../src/roster_window.py:1814
 msgid "Remove also all contacts in this group from your roster"
 msgstr "Usuń z rostera wszystkie kontakty należące do tej grupy"
 
-#: ../src/roster_window.py:1725
+#: ../src/roster_window.py:1845
 msgid "Assign OpenPGP Key"
 msgstr "Przypisz klucz OpenPGP"
 
-#: ../src/roster_window.py:1726
+#: ../src/roster_window.py:1846
 msgid "Select a key to apply to the contact"
 msgstr "Wybierz klucz, który chcesz przypisać kontaktowi"
 
-#: ../src/roster_window.py:1966 ../src/roster_window.py:2260
-msgid "_New group chat"
+#: ../src/roster_window.py:2161
+msgid "_New Group Chat"
 msgstr "_Nowa rozmowa grupowa"
 
-#: ../src/roster_window.py:2111
+#: ../src/roster_window.py:2297
 msgid "I would like to add you to my roster"
 msgstr "Chciałbym dodać Cię do listy kontaktów"
 
-#: ../src/roster_window.py:2305 ../src/roster_window.py:2364
+#. Send Group Message
+#: ../src/roster_window.py:2431 ../src/roster_window.py:2643
 msgid "Send Group M_essage"
 msgstr "_Wyślij wiadomość grupową"
 
-#: ../src/roster_window.py:2343
-msgid "Re_name"
-msgstr "_Zmień nazwę"
+#: ../src/roster_window.py:2450
+msgid "_New group chat"
+msgstr "_Nowa rozmowa grupowa"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:2488
+msgid "_Manage Contacts"
+msgstr "_Zarządzaj kontaktami"
+
+#: ../src/roster_window.py:2549
+msgid "_Maximize"
+msgstr "_Maksymalizuj"
+
+#: ../src/roster_window.py:2556
+msgid "_Disconnect"
+msgstr "_Rozłącz"
 
-#: ../src/roster_window.py:2370
+#: ../src/roster_window.py:2635
+msgid "_Maximize All"
+msgstr "_Maksymalizuj wszystkie"
+
+#: ../src/roster_window.py:2651
 msgid "To all users"
 msgstr "Do wszystkich użytkowników"
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:2654
 msgid "To all online users"
 msgstr "Do wszystkich połączonych użytkowników"
 
-#: ../src/roster_window.py:2393
-msgid "Send Cus_tom Status"
-msgstr "Wyślij odrębny status"
+#. Log Off
+#: ../src/roster_window.py:2771
+msgid "_Log off"
+msgstr "R_ozłącz"
 
-#: ../src/roster_window.py:2450
+#. Log on
+#: ../src/roster_window.py:2777
 msgid "_Log on"
 msgstr "_Połącz"
 
-#: ../src/roster_window.py:2460
-msgid "Log _off"
-msgstr "R_ozłącz"
+#. Send single message
+#: ../src/roster_window.py:2789
+msgid "Send Single Message"
+msgstr "Wyślij wiadomość"
 
-#: ../src/roster_window.py:2582 ../src/roster_window.py:2653
+#. Manage Transport submenu
+#: ../src/roster_window.py:2836
+msgid "_Manage Transport"
+msgstr "_Zarządzaj transportami"
+
+#. Modify Transport
+#: ../src/roster_window.py:2844
+msgid "_Modify Transport"
+msgstr "_Modyfikuj transport"
+
+#: ../src/roster_window.py:2958 ../src/roster_window.py:3032
 msgid "_Change Status Message"
 msgstr "_Zmień opis statusu"
 
-#: ../src/roster_window.py:2725
+#: ../src/roster_window.py:3104
 msgid "Authorization has been sent"
 msgstr "Autoryzacja została wysłana"
 
-#: ../src/roster_window.py:2726
+#: ../src/roster_window.py:3105
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Teraz \"%s\" będzie znał Twój status."
 
-#: ../src/roster_window.py:2746
+#: ../src/roster_window.py:3125
 msgid "Subscription request has been sent"
 msgstr "Prośba o autoryzację została wysłana"
 
-#: ../src/roster_window.py:2747
+#: ../src/roster_window.py:3126
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Jeśli \"%s\" zaakceptuje tę prośbę, to będziesz mógł widzieć jego lub jej "
 "status."
 
-#: ../src/roster_window.py:2759
+#: ../src/roster_window.py:3138
 msgid "Authorization has been removed"
 msgstr "Autoryzacja została cofnięta"
 
-#: ../src/roster_window.py:2760
+#: ../src/roster_window.py:3139
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Teraz \"%s\" zawsze będzie cię widział jako rozłączonego."
 
-#: ../src/roster_window.py:2955
+#: ../src/roster_window.py:3373
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" zostanie usunięty z Twojej listy kontaktów"
 
-#: ../src/roster_window.py:2959
+#: ../src/roster_window.py:3377
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -5314,7 +5992,7 @@ msgstr ""
 "Usuwając kontakt cofniesz mu również autoryzację, co spowoduje, że kontakt "
 "będzie zawsze widział Cię jako rozłączonego."
 
-#: ../src/roster_window.py:2964
+#: ../src/roster_window.py:3382
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -5322,16 +6000,16 @@ msgstr ""
 "Usuwając kontakt usuniesz również autoryzację, co spowoduje, że kontakt "
 "będzie zawsze widział Cię jako rozłączonego."
 
-#: ../src/roster_window.py:2967
+#: ../src/roster_window.py:3385
 msgid "I want this contact to know my status after removal"
 msgstr "Chcę żeby po usunięciu ten kontakt znał mój status"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2971
+#: ../src/roster_window.py:3389
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakty zostaną usunięte z twojej listy kontaktów"
 
-#: ../src/roster_window.py:2975
+#: ../src/roster_window.py:3393
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -5341,7 +6019,7 @@ msgstr ""
 "cofniesz im również autoryzację, co spowoduje, że będziesz dla nich widoczny "
 "jako rozłączony."
 
-#: ../src/roster_window.py:3007
+#: ../src/roster_window.py:3425
 msgid ""
 "Gnome Keyring is installed but not correctly started (environment variable "
 "probably not correctly set)"
@@ -5349,41 +6027,44 @@ msgstr ""
 "Menedżer bazy kluczy GNOME jest zainstalowany, ale ma błędną konfigurację"
 "(prawodpodobnie niepoprawna zmienna środowiskowa"
 
-#. TODO: make this string translatable
+#: ../src/roster_window.py:3447
+msgid "GPG is not usable"
+msgstr "GPG nie nadaje się do użycia"
+
 #. %s is the account name here
-#: ../src/roster_window.py:3035 ../src/common/connection.py:707
-#: ../src/common/zeroconf/connection_zeroconf.py:164
+#: ../src/roster_window.py:3447 ../src/common/connection.py:689
+#: ../src/common/zeroconf/connection_zeroconf.py:170
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Zostanie połączony z %s bez obsługi OpenPGP."
 
-#: ../src/roster_window.py:3052
+#: ../src/roster_window.py:3460
 msgid "Passphrase Required"
 msgstr "Wymagane hasło"
 
-#: ../src/roster_window.py:3053
+#: ../src/roster_window.py:3461
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Wpisz hasło GPG dla konta %s."
 
-#: ../src/roster_window.py:3058
+#: ../src/roster_window.py:3466
 msgid "Save passphrase"
 msgstr "Zapisz hasło"
 
-#: ../src/roster_window.py:3066
+#: ../src/roster_window.py:3474
 msgid "Wrong Passphrase"
 msgstr "Błędne hasło"
 
-#: ../src/roster_window.py:3067
+#: ../src/roster_window.py:3475
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 "Proszę ponownie wprowadzić swoje hasło GPG lub kliknąć przycisk Anuluj."
 
-#: ../src/roster_window.py:3134 ../src/roster_window.py:3202
+#: ../src/roster_window.py:3550 ../src/roster_window.py:3628
 msgid "You are participating in one or more group chats"
 msgstr "Znajdujesz się w jednym lub kilku pokojach"
 
-#: ../src/roster_window.py:3135 ../src/roster_window.py:3203
+#: ../src/roster_window.py:3551 ../src/roster_window.py:3629
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -5391,20 +6072,20 @@ msgstr ""
 "Zmiana statusu na Niewidoczny spowoduje rozłaczeniem z tym pokojami. Czy na "
 "pewno chcesz stać się niewidoczny?"
 
-#: ../src/roster_window.py:3160
+#: ../src/roster_window.py:3585
 msgid "No account available"
 msgstr "Żadne konto nie jest dostępne"
 
-#: ../src/roster_window.py:3161
+#: ../src/roster_window.py:3586
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Aby rozmawiać z innymi osobami musisz założyć konto Jabbera."
 
-#: ../src/roster_window.py:3284
+#: ../src/roster_window.py:3715
 #, python-format
 msgid "\"%(title)s\" by %(artist)s"
 msgstr "\"%(title)s\" w wykonaniu %(artist)s"
 
-#: ../src/roster_window.py:3723 ../src/roster_window.py:3730
+#: ../src/roster_window.py:4193 ../src/roster_window.py:4200
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -5412,24 +6093,24 @@ msgstr ""
 "Wiadomości będą dostępne tylko do czytania, o ile masz włączoną obsługę "
 "historii."
 
-#: ../src/roster_window.py:4326
+#: ../src/roster_window.py:4824
 msgid "Metacontacts storage not supported by your server"
 msgstr "Twój serwer uniemożliwia przechowywanie metakontaktów"
 
-#: ../src/roster_window.py:4328
+#: ../src/roster_window.py:4826
 msgid ""
 "Your server does not support storing metacontacts information. So those "
-"information will not be save on next reconnection."
+"information will not be saved on next reconnection."
 msgstr ""
 "Twój serwer uniemożliwia przechowywanie metakontaktów. Informacja ta nie "
 "zostanie przywrócona podczas następnego połączenia."
 
-#: ../src/roster_window.py:4370
+#: ../src/roster_window.py:4871
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Chcesz utworzyć metakontakt. Kontynuować?"
 
-#: ../src/roster_window.py:4372
+#: ../src/roster_window.py:4873
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -5439,129 +6120,137 @@ msgstr ""
 "rostera. Używa się ich przede wszystkim wtedy, gdy jedna osoba ma kilka kont "
 "Jabbera lub zarejestrowana jest w kilku transportach."
 
-#: ../src/roster_window.py:4450
+#: ../src/roster_window.py:4970
+#, python-format
 msgid "Do you want to send that file to %s:"
 msgid_plural "Do you want to send those files to %s:"
 msgstr[0] "Czy chcesz wysłać ten plik do %s:"
 msgstr[1] "Czy chcesz wysłać te pliki do %s:"
 msgstr[2] "Czy chcesz wysłać te pliki do %s:"
 
-#: ../src/roster_window.py:4555
-#, python-format
-msgid "Drop %s in group %s"
-msgstr "Usuń %s z grupy %s"
-
-#: ../src/roster_window.py:4562
-#, python-format
-msgid "Make %s and %s metacontacts"
-msgstr "Przekształć %s oraz %s w metakontakty"
-
-#: ../src/roster_window.py:4749
+#: ../src/roster_window.py:5253
 msgid "Change Status Message..."
 msgstr "Zmień opis statusu..."
 
-#: ../src/search_window.py:88
+#: ../src/search_window.py:91
 msgid "Waiting for results"
 msgstr "Oczekiwanie na wyniki"
 
-#: ../src/search_window.py:135 ../src/search_window.py:186
+#: ../src/search_window.py:131 ../src/search_window.py:209
 msgid "Error in received dataform"
 msgstr "Błąd w odebranych danych"
 
-#: ../src/search_window.py:154
+#. No result
+#: ../src/search_window.py:165 ../src/search_window.py:201
 msgid "No result"
 msgstr "Brak wyników"
 
-#: ../src/systray.py:163
+#: ../src/systray.py:169
 msgid "_Change Status Message..."
 msgstr "_Zmień opis statusu..."
 
-#: ../src/systray.py:251
+#: ../src/systray.py:254
 msgid "Hide this menu"
 msgstr "Ukryj to menu"
 
-#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#: ../src/tooltips.py:317 ../src/tooltips.py:510
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:312 ../src/tooltips.py:496
+#: ../src/tooltips.py:320 ../src/tooltips.py:514
 msgid "Resource: "
 msgstr "Zasoby: "
 
-#: ../src/tooltips.py:317
+#: ../src/tooltips.py:325
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s tego pokoju"
 
-#: ../src/tooltips.py:429 ../src/tooltips.py:611
+#: ../src/tooltips.py:423
+msgid " [blocked]"
+msgstr " [zablokowany]"
+
+#: ../src/tooltips.py:427
+msgid " [minimized]"
+msgstr " [zminimalizowany]"
+
+#: ../src/tooltips.py:442 ../src/tooltips.py:630
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:460
+#: ../src/tooltips.py:472
 #, python-format
 msgid "Last status: %s"
 msgstr "Ostatni status %s"
 
-#: ../src/tooltips.py:462
+#: ../src/tooltips.py:474
 #, python-format
 msgid " since %s"
 msgstr " od %s"
 
+#: ../src/tooltips.py:492
+msgid "Connected"
+msgstr "Połączony"
+
+#: ../src/tooltips.py:494
+msgid "Disconnected"
+msgstr "Rozłączony"
+
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:521
 msgid "Subscription: "
 msgstr "Autoryzacja: "
 
-#: ../src/tooltips.py:512
+#: ../src/tooltips.py:531
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:586
 msgid "Download"
 msgstr "Pobieranie"
 
-#: ../src/tooltips.py:573
+#: ../src/tooltips.py:592
 msgid "Upload"
 msgstr "Prześlij"
 
-#: ../src/tooltips.py:580
+#: ../src/tooltips.py:599
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:586
+#: ../src/tooltips.py:605
 msgid "Transferred: "
 msgstr "Przesłane: "
 
-#: ../src/tooltips.py:589 ../src/tooltips.py:610
+#: ../src/tooltips.py:608 ../src/tooltips.py:629
 msgid "Not started"
 msgstr "Nie włączony"
 
-#: ../src/tooltips.py:593
+#: ../src/tooltips.py:612
 msgid "Stopped"
 msgstr "Zatrzymany"
 
-#: ../src/tooltips.py:595 ../src/tooltips.py:598
+#: ../src/tooltips.py:614 ../src/tooltips.py:617
 msgid "Completed"
 msgstr "Ukończony"
 
-#: ../src/tooltips.py:602
+#: ../src/tooltips.py:621
 msgid "?transfer status:Paused"
 msgstr "?status transferu:wstrzymany"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:606
+#: ../src/tooltips.py:625
 msgid "Stalled"
 msgstr "Wygaszony"
 
-#: ../src/tooltips.py:608
+#: ../src/tooltips.py:627
 msgid "Transferring"
 msgstr "Przesyłanie"
 
-#: ../src/tooltips.py:640
+#: ../src/tooltips.py:659
 msgid "This service has not yet responded with detailed information"
 msgstr "Ta usługa nie odesłała jeszcze szczegółowych informacji"
 
-#: ../src/tooltips.py:643
+#: ../src/tooltips.py:662
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5569,24 +6258,24 @@ msgstr ""
 "Ta usługa nie była w stanie odesłać szczegółowych informacji.\n"
 "Prawdopodobnie została zamknięta lub jest zepsuta"
 
-#: ../src/vcard.py:325
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "?Klient: Nieznany"
 
-#: ../src/vcard.py:327
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "?System operacyjny: Nieznany"
 
-#: ../src/vcard.py:355 ../src/vcard.py:533
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:472
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:385
+#: ../src/vcard.py:311
 msgid "Affiliation:"
 msgstr "Afiliacja: "
 
-#: ../src/vcard.py:393
+#: ../src/vcard.py:319
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5594,7 +6283,7 @@ msgstr ""
 "Ten kontakt jest zaintersowany informacjami o twoim statusie, ale ty nie "
 "interesujesz się jego/jej statusem."
 
-#: ../src/vcard.py:395
+#: ../src/vcard.py:321
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5602,12 +6291,12 @@ msgstr ""
 "Jesteś zainteresowany informacjami o statusie tego kontaktu, ale on/ona nie "
 "jest zainteresowana twoim."
 
-#: ../src/vcard.py:397
+#: ../src/vcard.py:323
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Oboje jesteście zaintersowani nawzajem swoimi informacjami o statusie"
 
 #. None
-#: ../src/vcard.py:399
+#: ../src/vcard.py:325
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -5615,140 +6304,144 @@ msgstr ""
 "Nie jesteś zainteresowany informacjami o statusie kontaktu i on również nie "
 "jest zainteresowany twoim"
 
-#: ../src/vcard.py:407
+#: ../src/vcard.py:333
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Oczekujesz na odpowiedź kontaktu dotyczącą prośby o autoryzację"
 
-#: ../src/vcard.py:411 ../src/vcard.py:438 ../src/vcard.py:558
+#: ../src/vcard.py:337 ../src/vcard.py:374 ../src/vcard.py:497
 msgid " resource with priority "
 msgstr " zasób o wysokim priorytecie "
 
-#: ../src/common/check_paths.py:33
+#: ../src/common/check_paths.py:38
 msgid "creating logs database"
 msgstr "tworzenie bazy danych z logami"
 
-#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
-#: ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:112
+#: ../src/common/check_paths.py:119
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s jest plikiem choć powinien być katalogiem"
 
-#: ../src/common/check_paths.py:90 ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
+#: ../src/common/check_paths.py:102 ../src/common/check_paths.py:113
+#: ../src/common/check_paths.py:120 ../src/common/check_paths.py:128
 msgid "Gajim will now exit"
 msgstr "Gajim zakończy teraz działanie"
 
-#: ../src/common/check_paths.py:115
+#: ../src/common/check_paths.py:127
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s jest katalogiem choć powinien być plikiem"
 
-#: ../src/common/check_paths.py:131
+#: ../src/common/check_paths.py:143
 #, python-format
 msgid "creating %s directory"
 msgstr "tworzenie katalogu %s"
 
-#: ../src/common/commands.py:69
+#: ../src/common/commands.py:74
 msgid "Change status information"
 msgstr "Zmień informację o statusie"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:87
 msgid "Change status"
 msgstr "Zmień status"
 
-#: ../src/common/commands.py:83
+#: ../src/common/commands.py:88
 msgid "Set the presence type and description"
 msgstr "Ustaw typ widoczności i status opisowy"
 
-#: ../src/common/commands.py:89
+#: ../src/common/commands.py:94
 msgid "Free for chat"
 msgstr "Chętny do rozmowy"
 
-#: ../src/common/commands.py:90
+#: ../src/common/commands.py:95
 msgid "Online"
 msgstr "Dostępny"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 msgid "Extended away"
 msgstr "Nieobecny"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Do not disturb"
 msgstr "Nie przeszkadzać."
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:99
 msgid "Offline - disconnect"
 msgstr "Nieobecny - rozłączony"
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 msgid "Presence description:"
 msgstr "Status opisowy"
 
-#: ../src/common/commands.py:134
+#: ../src/common/commands.py:139
 msgid "The status has been changed."
 msgstr "Status został zmieniony."
 
-#: ../src/common/commands.py:179
+#: ../src/common/commands.py:184
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s z pokoju %(room_jid)s"
 
-#: ../src/common/commands.py:183
+#: ../src/common/commands.py:188
 msgid "You have not joined a groupchat."
 msgstr "Nie dołączyłeś do pokoju."
 
-#: ../src/common/commands.py:189
+#: ../src/common/commands.py:194
 msgid "Leave Groupchats"
 msgstr "Opuść pokoje"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:195
 msgid "Choose the groupchats you want to leave"
 msgstr "Wybierz pokoje, które chcesz opuścić"
 
-#: ../src/common/commands.py:194
-msgid "Groupchats"
-msgstr "Pokoje"
-
-#: ../src/common/commands.py:230
+#: ../src/common/commands.py:235
 msgid "You left the following groupchats:"
 msgstr "Opuściłeś pokoje:"
 
-#: ../src/common/config.py:56
+#: ../src/common/commands.py:247
+msgid "Forward unread messages"
+msgstr "Prześlij dalej nieprzeczytane wiadomości"
+
+#: ../src/common/commands.py:267
+msgid "All unread messages have been forwarded."
+msgstr "Wszystkie nieprzeczytane wiadomości zostały przesłane dalej."
+
+#: ../src/common/config.py:63
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Korzystaj z DBus i Demona Powiadomień aby wyświetlać powiadomienia"
 
-#: ../src/common/config.py:61
+#: ../src/common/config.py:68
 msgid "Time in minutes, after which your status changes to away."
 msgstr ""
 "Czas w minutach, po którym twój status zostanie zmieniona na Zaraz wracam."
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:69
 msgid "Away as a result of being idle"
 msgstr "Status Zaraz wracam z powodu bezczynności programu"
 
-#: ../src/common/config.py:64
+#: ../src/common/config.py:71
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Czas w minutach, po którym twój status zostanie zmieniony na Niedostępny."
 
-#: ../src/common/config.py:65
+#: ../src/common/config.py:72
 msgid "Not available as a result of being idle"
 msgstr "Status Nieobecny z powodu bezczynności programu"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:90
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "Lista (oddzielona spacjami) kolumn (kont lub grup), które są zwinięte."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:95
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Uaktywnij komunikację link-local/zeroconf"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:98
 msgid "Language used by speller"
 msgstr "Język używany przez słownik"
 
-#: ../src/common/config.py:92
+#: ../src/common/config.py:99
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -5759,7 +6452,7 @@ msgstr ""
 "print_ichat_every_foo_minutes.\n"
 "'never' - nigdy nie wyświetlaj czasu."
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:100
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -5770,18 +6463,18 @@ msgstr ""
 "najmniej dokładne. Ustawienie to brane jest pod uwagę jedynie wtedy, gdy "
 "opcja print_time ustawiona jest na 'sometimes'."
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:103
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Traktuj pary znaków * / _ jako znaki formatujące."
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:104
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Jeśli ma wartość True, to */_ nie będą usuwane. Zatem napis *abc* będzie "
 "pogrubiony ale bez usuniętych znaków * *."
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:107
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -5791,7 +6484,7 @@ msgstr ""
 "zainstalowany pakiet docutils. Wyjaśnienie składni dostępne na stronie "
 "http://docutils.sourceforge.net/docs/ref/rst/"
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:116
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -5799,7 +6492,7 @@ msgstr ""
 "Znak dodawany do nicka przy użyciu autouzupełniania klawiszem TAB (tylko "
 "czat)"
 
-#: ../src/common/config.py:110
+#: ../src/common/config.py:117
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -5807,7 +6500,7 @@ msgstr ""
 "Znak proponowany do dodania do nicka w sytuacji, gdy dany nick jest już "
 "używany przez innego uzytkownika czatu"
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:140
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -5818,19 +6511,19 @@ msgstr ""
 "minuta] \". Więcej informacji w dokumentacjy Pythona dotyczącą strftime: "
 "http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:134
+#: ../src/common/config.py:141
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Znaki, które wyświetlane są podczas rozmowy przed nazwą użytkownika"
 
-#: ../src/common/config.py:135
+#: ../src/common/config.py:142
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Znaki, które wyświetlane są podczas rozmowy za nazwą użytkownika"
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:149
 msgid "Add * and [n] in roster title?"
 msgstr "Dodać * i [n] do tytułu listy kontaktów?"
 
-#: ../src/common/config.py:143
+#: ../src/common/config.py:150
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -5838,11 +6531,11 @@ msgstr ""
 "Ile linii z poprzedniej rozmowy powinno zostać zapamiętanych gdy okno/karta "
 "rozmowy zostanie ponownie otwarta."
 
-#: ../src/common/config.py:144
+#: ../src/common/config.py:151
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Ile minut powinny być widoczne linie z poprzedniej rozmowy."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:152
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -5850,11 +6543,11 @@ msgstr ""
 "Kombinacja Ctrl+Enter wysyła wiadomość a Enter tworzy nową linię (domyślne "
 "zachowanie klienta Mirabilis ICQ)."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:154
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Ile przechwywać linii dla kombinacji Ctrl+KeyUP."
 
-#: ../src/common/config.py:150
+#: ../src/common/config.py:157
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -5863,13 +6556,13 @@ msgstr ""
 "Albo własny url zawierający %s, gdzie %s jest słowem/frazą, albo WIKTIONARY, "
 "co oznacza użycie wiktionary."
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:160
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Jeśli ta opcja jest zaznaczona, to Gajim będzie mógł być sterowany zdalnie z "
 "wykorzystaniem gajim-remote."
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:161
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -5882,14 +6575,14 @@ msgstr ""
 "synchronizują się ze statusem globalnym) w oparciu o status wykorzystywanego "
 "połączenia sieciowego."
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:162
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Wysyłaj informacje o twoim statusie podczas prowadzenia rozmowy. Może "
 "przyjmować wartości all, composing_only, disabled."
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:163
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -5897,7 +6590,7 @@ msgstr ""
 "Informacje o statusie rozmówcy wyświetlane w oknie rozmowy. Przyjmuje "
 "wartości all, composing_only, disabled."
 
-#: ../src/common/config.py:158
+#: ../src/common/config.py:165
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -5906,11 +6599,11 @@ msgstr ""
 "(print_time==sometimes), zmienna określa co ile minut Gajim ma wyświetlać "
 "czas nadejścia nowej wiadomości."
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:166
 msgid "Ask before closing a group chat tab/window."
 msgstr "Zapytaj przed zamknięciem karty/okna rozmowy grupowej."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:167
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -5919,7 +6612,7 @@ msgstr ""
 "na każdym z pokojów wymienionych na liście (nazwy pokojów rozdzielone "
 "spacją)."
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:168
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -5928,42 +6621,61 @@ msgstr ""
 "prowadzona jest na dowolnym pokoju obecnym na tej liście (nazwy pokojów "
 "rozdzielone spacją)."
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:171
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
 msgstr ""
-"Oddzielona przecinkami lista hostów, którą wysyłamy w celu przesyłania plików, w przypadku "
-"tłumaczenia adresu/przekierowania portu."
+"Oddzielona przecinkami lista hostów, którą wysyłamy w celu przesyłania "
+"plików, w przypadku tłumaczenia adresu/przekierowania portu."
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:173
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Standard IEC mówi, że KiB = 1024 bajty, KB = 100 bajtów."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:175
 msgid "Notify of events in the system trayicon."
 msgstr "Powiadamiaj o zdarzeniach za pomocą ikony w obszarze powiadamiania."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:181
 msgid "Show tab when only one conversation?"
 msgstr "Czy pokazywać kartę gdy otwarta jest tylko jedna rozmowa?"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:182
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Czy pokazywać rozgraniczenie kart w oknie czatu?"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:183
 msgid "Show close button in tab?"
 msgstr "Czy pokazywać przycisk zamknięcia na karcie?"
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:184
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+"Czy podczas negocjowania szyfrowanej sesji Gajim ma przyjąć, że chcesz ją "
+"logować?"
+
+#: ../src/common/config.py:185
+msgid ""
+"When negotiating an encrypted session, should Gajim prefer to use public "
+"keys for identification?"
+msgstr ""
+"Czy podczas negocjowania szyfrowanej sesji Gajim ma kluczy publicznych?"
+
+#: ../src/common/config.py:194
+msgid "Preview new messages in notification popup?"
+msgstr "Podgląd nowych wiadomości w oknie powiadomienia?"
+
+#: ../src/common/config.py:199
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Lista słów oddzielonych średnikami, które będą podświetlane w trakcie "
 "rozmowy w pokoju."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:200
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -5972,14 +6684,14 @@ msgstr ""
 "Menadżera Okien. Ta opcja jest brana pod uwagę tylko gdy używana jest tacka "
 "systemowa."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:201
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Jeśli ma wartość True, Gajim sprawdzi przy każdym uruchomieniu czy jest "
 "domyślnym klientem Jabbera."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:202
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -5988,7 +6700,7 @@ msgstr ""
 "nieprzeczytaną wiadomość. Ikona ta może być animowana, w zależności od "
 "motywu."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:203
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -5996,7 +6708,7 @@ msgstr ""
 "Jeśli ma wartość True, Gajim wyświetli opis statusu, jeśli nie jest on "
 "pusty, dla każdego kontaktu pod jego nazwą w oknie listy kontaktów."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:205
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -6004,7 +6716,7 @@ msgstr ""
 "Jeśli ma wartość True, Gajim wyśle zapytanie o awatar każdego kontaktu, "
 "który ostatnio nie miał awatara lub ma zapisany jedynie stary."
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:206
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -6012,7 +6724,7 @@ msgstr ""
 "Jeśli ma wartość False, to nie będziesz informowany o zmianie statusu lub "
 "opisu statusu przez kontakt, z którym rozmawiasz."
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:207
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -6027,30 +6739,30 @@ msgstr ""
 "\"in_and_out\" nakazuje programowi wyświetlanie jedynie informacji o wejściu "
 "użytkownika do pokoju lub jego opuszczeniu."
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:209
 msgid "Background color of contacts when they just signed in."
 msgstr "Kolor tła dla logujących się kontaktów."
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:210
 msgid "Background color of contacts when they just signed out."
 msgstr "Kolor tła dla kontaktów w trakcie wylogowywania."
 
-#: ../src/common/config.py:202
+#: ../src/common/config.py:212
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Jeżeli opcja ustawiona jest na True, przywrócone wiadomości będą wyświetlane "
 "mniejszą czcionką."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:213
 msgid "Don't show avatar for the transport itself."
 msgstr "Nie pokazuj awatarów transportów."
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:214
 msgid "Don't show roster in the system taskbar."
 msgstr "Nie pokazuj okna rostera na pasku zadań."
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:215
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -6060,7 +6772,7 @@ msgstr ""
 "niższej niż 2.8, odebrane a nie przeczytane wiadomości spowodują miganie "
 "okna programu."
 
-#: ../src/common/config.py:207
+#: ../src/common/config.py:217
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -6071,7 +6783,7 @@ msgstr ""
 "wysyłania takiej informacji."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:210
+#: ../src/common/config.py:220
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -6089,39 +6801,35 @@ msgstr ""
 "wspólne okno. Aby uaktywnić dokonane w tej opcji zmiany, trzeba ponownie "
 "uruchomić program."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:221
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Jeżeli ustawisz tą opcję na False, Gajim nie będzie wyświetlał avatara w "
 "oknie rozmowy."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:222
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Ustawienie 'True' spowoduje zamykanie okna/karty rozmowy po naciśnięciu "
 "klawisza ESC."
 
-#: ../src/common/config.py:213
-msgid "Hides the buttons in group chat window."
+#: ../src/common/config.py:223
+msgid "Hides the buttons in chat windows."
 msgstr "Ukrywa przyciski w oknie czatu."
 
-#: ../src/common/config.py:214
-msgid "Hides the buttons in two persons chat window."
-msgstr "Ukrywa przyciski podczas rozmowy dwóch osób."
-
-#: ../src/common/config.py:215
+#: ../src/common/config.py:224
 msgid "Hides the banner in a group chat window"
 msgstr "Ukrywa banner w oknie czatu"
 
-#: ../src/common/config.py:216
+#: ../src/common/config.py:225
 msgid "Hides the banner in two persons chat window"
 msgstr "Usuwa banner podczas rozmowy dwóch osób"
 
-#: ../src/common/config.py:217
+#: ../src/common/config.py:226
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Usuwa z okna rozmowy grupowej listę osób obecnych w pokoju."
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:227
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -6129,22 +6837,26 @@ msgstr ""
 "Podczas rozmowy grupowej, pokaż nazwę rozmówcy na początku linii tylko "
 "wówczas, gdy poprzednią wiadomość wysłała inna osoba."
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:228
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Wcięcie stosowane przy łaczeniu tych samych nicków."
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:229
+msgid "Smooth scroll message in conversation window"
+msgstr "Płynne przewijanie w oknie rozmowy"
+
+#: ../src/common/config.py:230
 msgid "List of colors that will be used to color nicknames in group chats."
 msgstr ""
 "Lista kolorów, które używane będą do kolorowania nicków w oknach czatu."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:231
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Kombinacja klawiszy Ctrl-Tab przechodzi do następnej karty, o ile w żadnej z "
 "nich nie ma nieprzeczytanych wiadomości."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:232
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -6152,7 +6864,7 @@ msgstr ""
 "Czy program powinien potwierdzać za każdym razem utworzenie metakontaktu? "
 "Pusty ciąg spowoduje, że okno dialogowe nie będzie wyświetlane."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:233
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -6163,7 +6875,7 @@ msgstr ""
 "ujemnym priorytetem nie będziesz otrzymywał żadnych wiadomości z twojego "
 "serwera."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:234
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -6171,7 +6883,7 @@ msgstr ""
 "Jeśli opcja ta ustawiona jest na True, do przechowywania haseł Gajim będzie "
 "używał Menedżera bazy kluczy GNOME."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:235
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -6180,7 +6892,7 @@ msgstr ""
 "połączonych kontaktów oraz ogólną liczbę kontaktów dla każdego konta oraz "
 "grupy"
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:236
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -6189,22 +6901,39 @@ msgstr ""
 "Gajim będzie traktował każdą przychodzącą wiadomość jako czat lub pojedynczą "
 "wiadomość"
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:237
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
-msgstr "Jeżeli ustawiono na 'True', Gajim przewinie listę kontaktów i wybierze ten "
-"kontakt, który wysłał ci ostatnią wiadomość, ale tylko wtedy gdy okno czatu nie jest "
-"już otwarte."
+msgstr ""
+"Jeżeli ustawiono na 'True', Gajim przewinie listę kontaktów i wybierze ten "
+"kontakt, który wysłał ci ostatnią wiadomość, ale tylko wtedy gdy okno czatu "
+"nie jest już otwarte."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:238
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
-msgstr "Jeżeli ustawiono na 'True', Gajim dokona konwersji ciągów zawartych pomiędzy "
-"$$ i $$ do postaci obrazu (z wykorzystaniem dvips) przed wstawieniem ich do okna rozmowy."
+msgstr ""
+"Jeżeli ustawiono na 'True', Gajim dokona konwersji ciągów zawartych pomiędzy "
+"$$ i $$ do postaci obrazu (z wykorzystaniem dvips) przed wstawieniem ich do "
+"okna rozmowy."
 
 #: ../src/common/config.py:239
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr ""
+"Wymagany jest okres nieaktywności zanim zamknięte zostanie okno zmiany "
+"statusu."
+
+#: ../src/common/config.py:240
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+"Maksymalna ilość linii, jaka jest wyświetlana podczas rozmów. Najstarsze są "
+"usuwane."
+
+#: ../src/common/config.py:251
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -6213,11 +6942,11 @@ msgstr ""
 "zdefiniowane są opcjach rozpoczynających się od autopriority_*."
 
 #. yes, no, ask
-#: ../src/common/config.py:268
+#: ../src/common/config.py:279
 msgid "Jabberd2 workaround"
 msgstr "Obejście dla Jabberd2"
 
-#: ../src/common/config.py:272
+#: ../src/common/config.py:283
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -6225,101 +6954,101 @@ msgstr ""
 "Jeżeli ta opcja jest aktywna, Gajim pobierze adresy serwerów proxy z klucza "
 "file_transfers_proxies i użyje ich podczas przesyłania plików."
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:342
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Czy OpenPGP jest włączone dla tego kontaktu?"
 
-#: ../src/common/config.py:332 ../src/common/config.py:335
+#: ../src/common/config.py:343 ../src/common/config.py:346
 msgid "Language for which we want to check misspelled words"
 msgstr "Język, którego używa słownik przy sprawdzaniu pisowni"
 
-#: ../src/common/config.py:341
+#: ../src/common/config.py:352
 msgid "all or space separated status"
 msgstr "all lub komunikaty stanu rozdzielone spacjami"
 
-#: ../src/common/config.py:342
+#: ../src/common/config.py:353
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' lub 'both'"
 
-#: ../src/common/config.py:343 ../src/common/config.py:345
-#: ../src/common/config.py:346 ../src/common/config.py:349
-#: ../src/common/config.py:350
+#: ../src/common/config.py:354 ../src/common/config.py:356
+#: ../src/common/config.py:357 ../src/common/config.py:360
+#: ../src/common/config.py:361
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' lub \""
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:367
 msgid "Sleeping"
 msgstr "Śpię"
 
-#: ../src/common/config.py:357
+#: ../src/common/config.py:368
 msgid "Back soon"
 msgstr "Niedługo wrócę"
 
-#: ../src/common/config.py:357
+#: ../src/common/config.py:368
 msgid "Back in some minutes."
 msgstr "Wrócę za jakiś czas."
 
-#: ../src/common/config.py:358
+#: ../src/common/config.py:369
 msgid "Eating"
 msgstr "Jem"
 
-#: ../src/common/config.py:358
+#: ../src/common/config.py:369
 msgid "I'm eating, so leave me a message."
 msgstr "Jem. Zostaw wiadomość."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:370
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:370
 msgid "I'm watching a movie."
 msgstr "Oglądam film."
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:371
 msgid "Working"
 msgstr "Praca"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:371
 msgid "I'm working."
 msgstr "Pracuję."
 
-#: ../src/common/config.py:361
+#: ../src/common/config.py:372
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:361
+#: ../src/common/config.py:372
 msgid "I'm on the phone."
 msgstr "Rozmawiam przez telefon."
 
-#: ../src/common/config.py:362
+#: ../src/common/config.py:373
 msgid "Out"
 msgstr "Wyszedłem"
 
-#: ../src/common/config.py:362
+#: ../src/common/config.py:373
 msgid "I'm out enjoying life."
 msgstr "Wyszedłem cieszyć się życiem."
 
-#: ../src/common/config.py:366
+#: ../src/common/config.py:377
 msgid "I'm available."
 msgstr "Dostępny."
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:378
 msgid "I'm free for chat."
 msgstr "Chętny do rozmowy."
 
-#: ../src/common/config.py:369
+#: ../src/common/config.py:380
 msgid "I'm not available."
 msgstr "Nieobecny."
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:381
 msgid "Do not disturb."
 msgstr "Nie przeszkadzać."
 
-#: ../src/common/config.py:371 ../src/common/config.py:372
+#: ../src/common/config.py:382 ../src/common/config.py:383
 msgid "Bye!"
 msgstr "Żegnaj!"
 
-#: ../src/common/config.py:381
+#: ../src/common/config.py:392
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -6328,253 +7057,128 @@ msgstr ""
 "wyrazów ze zmiennej muc_highlight_words lub gdy wiadomość MUC zawierać "
 "będzie twój pseudonim."
 
-#: ../src/common/config.py:382
+#: ../src/common/config.py:393
 msgid "Sound to play when any MUC message arrives."
 msgstr "Dźwięk, jaki będzie odtwarzany, gdy nadejdzie wiadomość MUC."
 
-#: ../src/common/config.py:391 ../src/common/optparser.py:195
+#: ../src/common/config.py:402 ../src/common/optparser.py:219
 msgid "green"
 msgstr "zielony"
 
-#: ../src/common/config.py:395 ../src/common/optparser.py:181
+#: ../src/common/config.py:406 ../src/common/optparser.py:205
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:399
+#: ../src/common/config.py:410
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:414
 msgid "marine"
 msgstr "morski"
 
-#: ../src/common/connection.py:197
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#, python-format
-msgid "Connection with account \"%s\" has been lost"
-msgstr "Połączenie z kontem \"%s\"zostało zerwane."
-
-#: ../src/common/connection.py:198
-msgid "Reconnect manually."
-msgstr "Połącz ponownie ręcznie."
-
-#: ../src/common/connection.py:209 ../src/common/connection.py:236
-#, python-format
-msgid "Transport %s answered wrongly to register request: %s"
-msgstr ""
-"Transport %s udzielił nieprawidłowej odpowiedzi na żądnie rejestracji: %s"
-
-#. wrong answer
-#: ../src/common/connection.py:235
-msgid "Invalid answer"
-msgstr "Niepoprawna odpowiedź"
-
-#: ../src/common/connection.py:383
-msgid "Connection to proxy failed"
-msgstr "Połączenie z proxy nie powiodło się"
-
-#: ../src/common/connection.py:437 ../src/common/connection.py:535
-#: ../src/common/connection.py:1032
-#: ../src/common/zeroconf/connection_zeroconf.py:236
-#, python-format
-msgid "Could not connect to \"%s\""
-msgstr "Nie można połączyć się z \"%s\""
-
-#: ../src/common/connection.py:451
-#, python-format
-msgid "Connected to server %s:%s with %s"
-msgstr "Połączony z serwerem %s: %s z %s"
-
-#: ../src/common/connection.py:464
-#, python-format
-msgid "Security error connecting to \"%s\""
-msgstr "Błąd zabezpieczeń przy połączeniu z \"%s\""
-
-#: ../src/common/connection.py:465
-msgid ""
-"The server's key has changed, or someone is trying to hack your connection."
-msgstr ""
-"Zmienił się klucz twojego serwera lub ktoś próbuje podsłuchać połączenie."
-
-#: ../src/common/connection.py:472
-#, python-format
-msgid "Unable to check fingerprint for %s. Connection could be insecure."
-msgstr ""
-"Nie można sprawdzić odcisku klucza %s. Połączenie może nie być bezpieczne"
-
-#: ../src/common/connection.py:514
-#, python-format
-msgid "Missing fingerprint in SSL connection to %s"
-msgstr "Brak odcisku klucza w połączeniu SSL z %s"
-
-#: ../src/common/connection.py:520
-#, python-format
-msgid "Fingerprint mismatch for %s: Got %s, expected %s"
-msgstr "Niezgodność odcisku klucza %s. Oczekiwano %s, otrzymano %s"
-
-#: ../src/common/connection.py:536
-msgid "Check your connection or try again later"
-msgstr "Sprawdź swoje połączenie lub spróbuj później"
-
-#: ../src/common/connection.py:562
-#, python-format
-msgid "Authentication failed with \"%s\""
-msgstr "Autoryzacja z \"%s\" nie powiodła się"
-
-#: ../src/common/connection.py:563
-msgid "Please check your login and password for correctness."
-msgstr "Spawdź czy twój login i hasło są poprawne."
-
-#: ../src/common/connection.py:606
-msgid "Error while removing privacy list"
-msgstr "Błąd usuwaniu listy prywatności"
-
-#: ../src/common/connection.py:607
-msgid ""
-"Privacy list %s has not been removed. It is maybe active in one of your "
-"connected resources. Deactivate it and try again."
-msgstr ""
-"Lista prywatności %s nie została usunięta. Prawdopodobnie jest aktywna w "
-"jednym z połączonych zasobów. Wyłącz ją i spróbuj ponownie."
-
-#. We didn't set a passphrase
-#: ../src/common/connection.py:705
-#: ../src/common/zeroconf/connection_zeroconf.py:162
-msgid "OpenPGP passphrase was not given"
-msgstr "Nie podano klucza OpenPGP"
-
-#. we're not english
-#. one  in locale and one en
-#: ../src/common/connection.py:862
-msgid "[This message is *encrypted* (See :JEP:`27`]"
-msgstr "[Ta wiadomość jest zaszyfrowana (zobacz JEP '27']"
-
-#: ../src/common/connection.py:918
-#: ../src/common/zeroconf/connection_zeroconf.py:421
-#, python-format
-msgid ""
-"Subject: %s\n"
-"%s"
-msgstr ""
-"Temat: %s\n"
-"%s"
-
-#: ../src/common/connection.py:1058
-msgid "Not fetched because of invisible status"
-msgstr "Nie wysłano z powodu statusu 'niewidoczny'"
-
-#: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
+#: ../src/common/connection_handlers.py:61
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
 msgid "Unable to load idle module"
 msgstr "Nie można załadować modułu idle"
 
-#: ../src/common/connection_handlers.py:180
-#: ../src/common/connection_handlers.py:215
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:236
+#: ../src/common/connection_handlers.py:219
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:243
 msgid "Wrong host"
 msgstr "Błędna nazwa hosta"
 
-#: ../src/common/connection_handlers.py:180
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:236
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"Nazwa hosta, którą określiłeś w opcji ft_add_hosts_to_send jest "
-"niepoprawna, będzie więc ignorowana."
-
-#: ../src/common/connection_handlers.py:216
+#: ../src/common/connection_handlers.py:220
 msgid "Invalid local address? :-O"
 msgstr "Niepoprawny adres lokalny? :-O"
 
-#: ../src/common/connection_handlers.py:607
+#: ../src/common/connection_handlers.py:618
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Informacje rejestracyjne transportu %s nie dotarły na czas"
 
-#: ../src/common/connection_handlers.py:1557
+#: ../src/common/connection_handlers.py:1801
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Pseudonim jest niedozwolony: %s"
 
-#. password required to join
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1622
-#: ../src/common/connection_handlers.py:1625
-#: ../src/common/connection_handlers.py:1628
-#: ../src/common/connection_handlers.py:1631
-#: ../src/common/connection_handlers.py:1634
-#: ../src/common/connection_handlers.py:1637
-#: ../src/common/connection_handlers.py:1645
+#: ../src/common/connection_handlers.py:1871
+#: ../src/common/connection_handlers.py:1874
+#: ../src/common/connection_handlers.py:1877
+#: ../src/common/connection_handlers.py:1880
+#: ../src/common/connection_handlers.py:1884
+#: ../src/common/connection_handlers.py:1893
 msgid "Unable to join group chat"
 msgstr "Nie można dołączyć do pokoju"
 
-#: ../src/common/connection_handlers.py:1623
-msgid "A password is required to join this group chat."
-msgstr "Aby dołączyć do tego pokoju, wymagane jest hasło."
-
-#: ../src/common/connection_handlers.py:1626
-msgid "You are banned from this group chat."
-msgstr "Zostałeś zabanowany w tym pokoju."
+#: ../src/common/connection_handlers.py:1872
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Zostałeś zabanowany w pokoju %s."
 
-#: ../src/common/connection_handlers.py:1629
-msgid "Such group chat does not exist."
-msgstr "Taki pokój nie istnieje."
+#: ../src/common/connection_handlers.py:1875
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "Pokój %s nie istnieje."
 
-#: ../src/common/connection_handlers.py:1632
+#: ../src/common/connection_handlers.py:1878
 msgid "Group chat creation is restricted."
 msgstr "Tworzenie pokoi jest ograniczone."
 
-#: ../src/common/connection_handlers.py:1635
-msgid "Your registered nickname must be used."
-msgstr "Twój zarejestrowany pseudonim musi być w użyciu."
+#: ../src/common/connection_handlers.py:1881
+#, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Twój pseudonim musi być używany w pokoju %s."
 
-#: ../src/common/connection_handlers.py:1638
-msgid "You are not in the members list."
-msgstr "Nie jesteś na liście członków."
+#: ../src/common/connection_handlers.py:1885
+#, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Nie jesteś na liście uczestników rozmów w pokoju %s."
 
-#: ../src/common/connection_handlers.py:1646
+#: ../src/common/connection_handlers.py:1894
+#, python-format
 msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
 "Pożądany przez ciebie pseudonim jest używany lub zarejestrowany przez kogoś "
-"innego.\n"
+"innego w pokoju %s.\n"
 "Podaj inny pseudonim:"
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:1689
+#: ../src/common/connection_handlers.py:1925
 msgid "Room has been destroyed"
 msgstr "Pokój został usunięty"
 
-#: ../src/common/connection_handlers.py:1696
+#: ../src/common/connection_handlers.py:1932
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "W zamian możesz dołączyć do pokoju %s"
 
-#: ../src/common/connection_handlers.py:1722
+#: ../src/common/connection_handlers.py:1959
 msgid "I would like to add you to my roster."
 msgstr "Chciałbym dodać Cię do listy kontaktów."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1743
+#: ../src/common/connection_handlers.py:1980
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "Zapisaliśmy się do %s"
 
-#: ../src/common/connection_handlers.py:1745
+#: ../src/common/connection_handlers.py:1982
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Prośba o cofnięcie autoryzacji od %s"
 
-#: ../src/common/connection_handlers.py:1747
+#: ../src/common/connection_handlers.py:1984
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "Wypisaliśmy się z %s"
 
-#: ../src/common/connection_handlers.py:1866
+#: ../src/common/connection_handlers.py:2106
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -6584,36 +7188,130 @@ msgstr ""
 "Skorzystaj z narzędzi do zarządzania listą kontaktów, takich jak http://jru."
 "jabberstudio.org/ aby go usunąć"
 
-#: ../src/common/contacts.py:271
+#: ../src/common/connection.py:249
+#: ../src/common/zeroconf/connection_zeroconf.py:208
+#, python-format
+msgid "Connection with account \"%s\" has been lost"
+msgstr "Połączenie z kontem \"%s\"zostało zerwane."
+
+#: ../src/common/connection.py:250
+msgid "Reconnect manually."
+msgstr "Połącz ponownie ręcznie."
+
+#: ../src/common/connection.py:261
+#, python-format
+msgid "Server %s answered wrongly to register request: %s"
+msgstr "Serwer %s udzielił nieprawidłowej odpowiedzi na żądnie rejestracji: %s"
+
+#. wrong answer
+#: ../src/common/connection.py:269
+msgid "Invalid answer"
+msgstr "Niepoprawna odpowiedź"
+
+#: ../src/common/connection.py:270
+#, python-format
+msgid "Transport %s answered wrongly to register request: %s"
+msgstr ""
+"Transport %s udzielił nieprawidłowej odpowiedzi na żądnie rejestracji: %s"
+
+#: ../src/common/connection.py:416
+msgid "Connection to proxy failed"
+msgstr "Połączenie z proxy nie powiodło się"
+
+#: ../src/common/connection.py:470 ../src/common/connection.py:516
+#: ../src/common/connection.py:1075
+#: ../src/common/zeroconf/connection_zeroconf.py:242
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Nie można połączyć się z \"%s\""
+
+#: ../src/common/connection.py:484
+#, python-format
+msgid "Connected to server %s:%s with %s"
+msgstr "Połączony z serwerem %s: %s z %s"
+
+#: ../src/common/connection.py:517
+msgid "Check your connection or try again later"
+msgstr "Sprawdź swoje połączenie lub spróbuj później"
+
+#: ../src/common/connection.py:542
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "Autoryzacja z \"%s\" nie powiodła się"
+
+#: ../src/common/connection.py:543
+msgid "Please check your login and password for correctness."
+msgstr "Spawdź czy twój login i hasło są poprawne."
+
+#: ../src/common/connection.py:586
+msgid "Error while removing privacy list"
+msgstr "Błąd usuwaniu listy prywatności"
+
+#: ../src/common/connection.py:587
+#, python-format
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+msgstr ""
+"Lista prywatności %s nie została usunięta. Prawdopodobnie jest aktywna w "
+"jednym z połączonych zasobów. Wyłącz ją i spróbuj ponownie."
+
+#. We didn't set a passphrase
+#: ../src/common/connection.py:687
+#: ../src/common/zeroconf/connection_zeroconf.py:168
+msgid "OpenPGP passphrase was not given"
+msgstr "Nie podano klucza OpenPGP"
+
+#. we're not english
+#. one  in locale and one en
+#: ../src/common/connection.py:850
+msgid "[This message is *encrypted* (See :JEP:`27`]"
+msgstr "[Ta wiadomość jest zaszyfrowana (zobacz JEP '27']"
+
+#: ../src/common/connection.py:924
+#: ../src/common/zeroconf/connection_zeroconf.py:436
+#, python-format
+msgid ""
+"Subject: %s\n"
+"%s"
+msgstr ""
+"Temat: %s\n"
+"%s"
+
+#: ../src/common/connection.py:1107
+msgid "Not fetched because of invisible status"
+msgstr "Nie wysłano z powodu statusu 'niewidoczny'"
+
+#: ../src/common/contacts.py:299
 msgid "Not in roster"
 msgstr "Spoza listy kontaktów"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:33
+#: ../src/common/dbus_support.py:38
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Na tym komputerze brakuje pythonowych dowiązań do D-Bus."
 
-#: ../src/common/dbus_support.py:34
+#: ../src/common/dbus_support.py:39
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Nie można użyć D-Bus."
 
-#: ../src/common/exceptions.py:22
+#: ../src/common/exceptions.py:27
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr ""
 "Nie znaleziono biblioteki pysqlite2 (lub python-pysqlite2). Kończenie pracy "
 "programu..."
 
-#: ../src/common/exceptions.py:30
+#: ../src/common/exceptions.py:44
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Usługa nie jest dostępna. Gajim nie działa lub remote_control ma wartość "
 "False"
 
-#: ../src/common/exceptions.py:38
+#: ../src/common/exceptions.py:52
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus nie jest obecny na tej maszynie lub brak modułu dla pythona"
 
-#: ../src/common/exceptions.py:46
+#: ../src/common/exceptions.py:60
 msgid ""
 "Session bus is not available.\n"
 "Try reading http://trac.gajim.org/wiki/GajimDBus"
@@ -6621,443 +7319,444 @@ msgstr ""
 "Nie znaleziono interfejsu DBus.\n"
 "Zapoznaj się z uwagami na stronie http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:47
 msgid "one"
 msgstr "pierwsza"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:47
 msgid "two"
 msgstr "druga"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:47
 msgid "three"
 msgstr "trzecia"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:47
 msgid "four"
 msgstr "czwarta"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:47
 msgid "five"
 msgstr "piąta"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:47
 msgid "six"
 msgstr "szóstej"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:48
 msgid "seven"
 msgstr "siódma"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:48
 msgid "eight"
 msgstr "ósmej"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:48
 msgid "nine"
 msgstr "dziewiąta"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:48
 msgid "ten"
 msgstr "dziesiątej"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:48
 msgid "eleven"
 msgstr "jedenasta"
 
-#: ../src/common/fuzzyclock.py:44
+#: ../src/common/fuzzyclock.py:49
 msgid "twelve"
 msgstr "dwunastej"
 
 #. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
 #. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
 msgid "$0 o'clock"
 msgstr "Godzina $0"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
 msgid "five past $0"
 msgstr "pięć po $0"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:61
 msgid "ten past $0"
 msgstr "dziesięć po $0"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:61
 msgid "quarter past $0"
 msgstr "kwadrans po $0"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+#: ../src/common/fuzzyclock.py:54 ../src/common/fuzzyclock.py:62
 msgid "twenty past $0"
 msgstr "dwadzieścia po $0"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+#: ../src/common/fuzzyclock.py:54 ../src/common/fuzzyclock.py:62
 msgid "twenty five past $0"
 msgstr "za pięć wpół do $0"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+#: ../src/common/fuzzyclock.py:55 ../src/common/fuzzyclock.py:63
 msgid "half past $0"
 msgstr "w pół do $1"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+#: ../src/common/fuzzyclock.py:55 ../src/common/fuzzyclock.py:63
 msgid "twenty five to $1"
 msgstr "pięć po wpół do $1"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:56 ../src/common/fuzzyclock.py:64
 msgid "twenty to $1"
 msgstr "za dwadzieścia $1"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:56 ../src/common/fuzzyclock.py:64
 msgid "quarter to $1"
 msgstr "za kwadrans $1"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:57 ../src/common/fuzzyclock.py:65
 msgid "ten to $1"
 msgstr "za dziesięć $1"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:57 ../src/common/fuzzyclock.py:65
 msgid "five to $1"
 msgstr "za pięć $1"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
+#: ../src/common/fuzzyclock.py:57 ../src/common/fuzzyclock.py:66
 msgid "$1 o'clock"
 msgstr "godzina $1"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:69
 msgid "Night"
 msgstr "Noc"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:69
 msgid "Early morning"
 msgstr "Wczesny poranek"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:69
 msgid "Morning"
 msgstr "rano"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:69
 msgid "Almost noon"
 msgstr "Prawie południe"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:70
 msgid "Noon"
 msgstr "w południe"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:70
 msgid "Afternoon"
 msgstr "Popołudnie"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:70
 msgid "Evening"
 msgstr "wieczorem"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:70
 msgid "Late evening"
 msgstr "Późny wieczór"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:72
 msgid "Start of week"
 msgstr "Początek tygodnia"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:72
 msgid "Middle of week"
 msgstr "Środek tygodnia"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:72
 msgid "End of week"
 msgstr "Koniec tygodnia"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:73
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: ../src/common/helpers.py:114
+#: ../src/common/helpers.py:120
 msgid "Invalid character in username."
 msgstr "Niepoprawna litera w nazwie użytkownika."
 
-#: ../src/common/helpers.py:119
+#: ../src/common/helpers.py:125
 msgid "Server address required."
 msgstr "Wymagany adres serwera."
 
-#: ../src/common/helpers.py:124
+#: ../src/common/helpers.py:130
 msgid "Invalid character in hostname."
 msgstr "Niepoprawna litera w nazwie hosta."
 
-#: ../src/common/helpers.py:130
+#: ../src/common/helpers.py:136
 msgid "Invalid character in resource."
 msgstr "Niepoprawna litera w zasobach."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:176
 #, python-format
 msgid "%s GiB"
-msgstr "%s·GiB"
+msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:179
 #, python-format
 msgid "%s GB"
-msgstr "%s·GB"
+msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:177
+#: ../src/common/helpers.py:183
 #, python-format
 msgid "%s MiB"
-msgstr "%s·MiB"
+msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:180
+#: ../src/common/helpers.py:186
 #, python-format
 msgid "%s MB"
-msgstr "%s·MB"
+msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:184
+#: ../src/common/helpers.py:190
 #, python-format
 msgid "%s KiB"
-msgstr "%s·KiB"
+msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:187
+#: ../src/common/helpers.py:193
 #, python-format
 msgid "%s KB"
-msgstr "%s·KB"
+msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:196
 #, python-format
 msgid "%s B"
-msgstr "%s·B"
+msgstr "%s B"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:227
 msgid "_Busy"
 msgstr "_Zajęty"
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:229
 msgid "Busy"
 msgstr "Zajęty"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:232
 msgid "_Not Available"
 msgstr "Nie_obecny"
 
-#: ../src/common/helpers.py:229
+#: ../src/common/helpers.py:237
 msgid "_Free for Chat"
 msgstr "_Chętny do rozmowy"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:239
 msgid "Free for Chat"
 msgstr "Chętny do rozmowy"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:242
 msgid "_Available"
 msgstr "_Dostępny"
 
-#: ../src/common/helpers.py:236
-msgid "Available"
-msgstr "Dostępny"
-
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:246
 msgid "Connecting"
 msgstr "Łączę się"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:249
 msgid "A_way"
 msgstr "Zaraz _wracam"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:254
 msgid "_Offline"
 msgstr "R_ozłączony"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:256
 msgid "Offline"
 msgstr "Rozłączony"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:259
 msgid "_Invisible"
 msgstr "N_iewidoczny"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:265
 msgid "?contact has status:Unknown"
 msgstr "?contact ma status: Nieznany"
 
-#: ../src/common/helpers.py:259
+#: ../src/common/helpers.py:267
 msgid "?contact has status:Has errors"
 msgstr "?contact ma status: Wystąpiły błędy"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:272
 msgid "?Subscription we already have:None"
 msgstr "?Posiadane autoryzacje: Brak"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:274
 msgid "To"
 msgstr "Do"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:278
 msgid "Both"
 msgstr "Obustronna"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:286
 msgid "?Ask (for Subscription):None"
 msgstr "?Poproś (o autoryzację): Brak"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:288
 msgid "Subscribe"
 msgstr "Autoryzuj"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:297
 msgid "?Group Chat Contact Role:None"
 msgstr "?Funkcja kontaktu w pokoju: Brak"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:300
 msgid "Moderators"
 msgstr "Moderatorzy"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:302
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:297
+#: ../src/common/helpers.py:305
 msgid "Participants"
 msgstr "Uczestnicy"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:307
 msgid "Participant"
 msgstr "Uczestnik"
 
-#: ../src/common/helpers.py:302
+#: ../src/common/helpers.py:310
 msgid "Visitors"
 msgstr "Goście"
 
-#: ../src/common/helpers.py:304
+#: ../src/common/helpers.py:312
 msgid "Visitor"
 msgstr "Gość"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:318
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Powiązanie kontaktu z czata: brak"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:320
 msgid "Owner"
 msgstr "Właściciel"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:322
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:316
+#: ../src/common/helpers.py:324
 msgid "Member"
 msgstr "Uczestnik"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:363
 msgid "is paying attention to the conversation"
 msgstr "jest skupiony na rozmowie"
 
-#: ../src/common/helpers.py:357
+#: ../src/common/helpers.py:365
 msgid "is doing something else"
 msgstr "robi coś innego"
 
-#: ../src/common/helpers.py:359
+#: ../src/common/helpers.py:367
 msgid "is composing a message..."
 msgstr "pisze wiadomość..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:362
+#: ../src/common/helpers.py:370
 msgid "paused composing a message"
 msgstr "przerwał pisanie wiadomości"
 
-#: ../src/common/helpers.py:364
+#: ../src/common/helpers.py:372
 msgid "has closed the chat window or tab"
 msgstr "zamknął okno lub kartę rozmowy"
 
-#: ../src/common/helpers.py:890
+#: ../src/common/helpers.py:931 ../src/common/helpers.py:938
+#, python-format
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "%d oczekująca wiadomość"
+msgstr[1] "%d oczekujące wiadomości"
+msgstr[2] "%d oczekujących wiadomości"
+
+#: ../src/common/helpers.py:944
 #, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "%d nieprzeczytana wiadomość"
-msgstr[1] "%d nieprzeczytane wiadomości"
-msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
+msgid " from room %s"
+msgstr " z pokoju %s"
 
-#: ../src/common/helpers.py:896
+#: ../src/common/helpers.py:947 ../src/common/helpers.py:966
 #, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "%d nieprzeczytana wiadomość"
-msgstr[1] "%d nieprzeczytane wiadomości"
-msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
+msgid " from user %s"
+msgstr " od użytkownika %s"
 
-#: ../src/common/helpers.py:902
+#: ../src/common/helpers.py:949
 #, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "%d nieprzeczytana wiadomość z czatu"
-msgstr[1] "%d nieprzeczytane wiadomości z czatu"
-msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
+msgid " from %s"
+msgstr " od %s"
 
-#: ../src/common/helpers.py:908
+#: ../src/common/helpers.py:956 ../src/common/helpers.py:963
 #, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "%d nieprzeczytana wiadomość prywatna"
-msgstr[1] "%d nieprzeczytane wiadomości prywatne"
-msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] "%d oczekująca wiadomość"
+msgstr[1] "%d oczekujące wiadomości"
+msgstr[2] "%d oczekujących wiadomości"
 
-#: ../src/common/helpers.py:918 ../src/common/helpers.py:920
+#: ../src/common/helpers.py:996
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:65
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "błąd: nie można otworzyć %s do odczytu"
 
-#: ../src/common/optparser.py:181
-msgid "gtk+"
-msgstr "gtk+"
-
-#: ../src/common/optparser.py:190 ../src/common/optparser.py:191
+#: ../src/common/optparser.py:214 ../src/common/optparser.py:215
 msgid "cyan"
 msgstr "cyjan"
 
-#: ../src/common/optparser.py:308
+#: ../src/common/optparser.py:331
 msgid "migrating logs database to indices"
 msgstr "indeksowanie archiwum rozmów"
 
-#: ../src/common/passwords.py:82
+#: ../src/common/passwords.py:88
 #, python-format
 msgid "Gajim account %s"
 msgstr "Konto Gajim'a %s"
 
-#: ../src/common/zeroconf/client_zeroconf.py:187
+#: ../src/common/zeroconf/client_zeroconf.py:140
+#: ../src/common/zeroconf/client_zeroconf.py:223
+msgid "Connection to host could not be established"
+msgstr "Nie można ustanowić połączenia z hostem"
+
+#: ../src/common/zeroconf/client_zeroconf.py:197
 msgid ""
 "Connection to host could not be established: Incorrect answer from server."
 msgstr "Nie można ustanowić połączenia z hostem. Nieprawidłowa odpowiedź."
 
-#: ../src/common/zeroconf/client_zeroconf.py:215
-msgid "Connection to host could not be established"
-msgstr "Nie można ustanowić połączenia z hostem"
-
-#: ../src/common/zeroconf/client_zeroconf.py:349
+#: ../src/common/zeroconf/client_zeroconf.py:357
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
 "Nie można ustanowić połączenia z hostem. Timeout podczas wysyłania danych."
 
-#: ../src/common/zeroconf/client_zeroconf.py:642
+#: ../src/common/zeroconf/client_zeroconf.py:643
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt jest rozłączony. Twoja wiadomość nie mogła zostać wysłana."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:243
+#, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"Nazwa hosta %s, którą określiłeś w opcji ft_add_hosts_to_send jest "
+"niepoprawna, będzie więc ignorowana."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:209
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "Aby dalej wysyłać i odbierać wiadomości musisz się ponownie połączyć."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:226
+#: ../src/common/zeroconf/connection_zeroconf.py:232
 msgid "Avahi error"
 msgstr "Błąd Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:226
+#: ../src/common/zeroconf/connection_zeroconf.py:232
 #, python-format
 msgid ""
 "%s\n"
@@ -7066,31 +7765,31 @@ msgstr ""
 "%s\n"
 "Przesyłanie wiadomości między adresami link-local może nie działać poprawnie."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:237
+#: ../src/common/zeroconf/connection_zeroconf.py:243
 msgid "Please check if Avahi is installed."
 msgstr "Proszę sprawdzić czy zainstalowano Avahi."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:246
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:256
 msgid "Could not start local service"
 msgstr "Nie można uruchomić usługi lokalnej"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:247
+#: ../src/common/zeroconf/connection_zeroconf.py:253
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nie można podłączyć się do portu %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:251
-#: ../src/common/zeroconf/connection_zeroconf.py:345
+#: ../src/common/zeroconf/connection_zeroconf.py:257
+#: ../src/common/zeroconf/connection_zeroconf.py:352
 msgid "Please check if avahi-daemon is running."
 msgstr "Proszę sprawdzić czy uruchomiony jest demon Avahi."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:344
+#: ../src/common/zeroconf/connection_zeroconf.py:351
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nie można zmienić statusu konta \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:368
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -7099,15 +7798,265 @@ msgstr ""
 "mogła zostać wysłana."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:373
+#: ../src/common/zeroconf/connection_zeroconf.py:380
 msgid "[This message is encrypted]"
 msgstr "[Ta wiadomość jest zaszyfrowana]"
 
-#: ../src/common/zeroconf/zeroconf.py:180
+#: ../src/common/zeroconf/zeroconf_avahi.py:183
+#: ../src/common/zeroconf/zeroconf_bonjour.py:192
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "Błąd przy dodawaniu usługi %s"
 
+#~ msgid ""
+#~ "To continue, Gajim needs to access your stored secrets. Enter your "
+#~ "passphrase"
+#~ msgstr ""
+#~ "Aby kontynuować, Gajim musi uzyskać dostęp do Twoich haseł. Proszę podać "
+#~ "hasło główne"
+
+#~ msgid "Confirm Passphrase"
+#~ msgstr "Potwierdź hasło"
+
+#~ msgid "Enter your new passphrase again for confirmation"
+#~ msgstr "Wpisz ponownie nowe hasło"
+
+#~ msgid "Create Passphrase"
+#~ msgstr "Utwórz hasło"
+
+#~ msgid "Passphrases did not match.\n"
+#~ msgstr "Hasła nie zgadzają się.\n"
+
+#~ msgid "Gajim needs you to create a passphrase to encrypt stored secrets"
+#~ msgstr "Proszę podać hasło główne służące do zaszyfrowania danych poufnych"
+
+#~ msgid "Build custom query"
+#~ msgstr "Stwórz własne zapytanie"
+
+#~ msgid ""
+#~ "Enter a contact jid or MUC jid here to view its history.\n"
+#~ "If a contact is connected you can even enter his nick name.\n"
+#~ msgstr ""
+#~ "Wprowadź nazwę użytkownika z rostera lub czatu aby przejrzeć historię "
+#~ "rozmów.\n"
+#~ "Jeżeli jest połączony, możesz podać jego nazwę.\n"
+
+#~ msgid "Query Builder..."
+#~ msgstr "Kreator zapytań..."
+
+#~ msgid "_Discover Services..."
+#~ msgstr "_Wyszukuj usługi..."
+
+#~ msgid "_Retype Password:"
+#~ msgstr "_Powtórz hasło:"
+
+#~ msgid "_Use proxy"
+#~ msgstr "_Korzystaj z pośrednika"
+
+#~ msgid "Accounts"
+#~ msgstr "Konta"
+
+#~ msgid ""
+#~ "If checked, all local contacts that use a Bonjour compatible chat client "
+#~ "(like iChat, Trillian or Gaim) will be shown in roster. You don't need to "
+#~ "be connected to a jabber server for it to work.\n"
+#~ "This is only available if python-avahi is installed and avahi-daemon is "
+#~ "running."
+#~ msgstr ""
+#~ "Jeżeli opcja ta zostanie uaktywniona, znajdujące się w twojej sieci "
+#~ "lokalnej kontakty używające klienta wykorzystującego technologię Bonjour "
+#~ "(jak iChat, Trillian czy Gaim) pojawią się na rosterze. Nie musisz łączyć "
+#~ "się z serwerem Jabbera, by z nimi rozmawiać."
+
+#~ msgid ""
+#~ "If you have 2 or more accounts and this is checked, Gajim will list all "
+#~ "contacts as if you had one account"
+#~ msgstr ""
+#~ "Jeśli masz dwa konta lub więcej, to dzięki tej opcji Gajim pokaże "
+#~ "wszystkie kontakty w taki sposób, jakby było to jedno konto"
+
+#~ msgid "_Enable link-local messaging"
+#~ msgstr "_Uaktywnij przesyłanie wiadomości do adresów link-local"
+
+#~ msgid "_Modify"
+#~ msgstr "_Edytuj"
+
+#~ msgid "_Blocked Contacts"
+#~ msgstr "_Kontakty zablokowane"
+
+#~ msgid "_Compact View    Alt+C"
+#~ msgstr "Widok _zwarty    Alt+C"
+
+#~ msgid "<b>Interface Customization</b>"
+#~ msgstr "<b>Własne ustawienia interfejsu</b>"
+
+#~ msgid "Also known as iChat style"
+#~ msgstr "Znany także jako styl iChat"
+
+#~ msgid "Chat"
+#~ msgstr "Rozmowa"
+
+#~ msgid "E_very 5 minutes"
+#~ msgstr "Co 5 _minut"
+
+#~ msgid ""
+#~ "Gajim will automatically show new events by popping up the relevant window"
+#~ msgstr ""
+#~ "Gajim automatycznie wyświetli nową wiadomość w nowym oknie lub w nowej "
+#~ "karcie otwartego okna rozmowy"
+
+#~ msgid ""
+#~ "Gajim will notify you for new events via a popup in the bottom right of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Gajim powiadomi Cię o nadejściu nowej wiadomości wyświetlając okienko w "
+#~ "prawym dolnym rogu ekranu"
+
+#~ msgid ""
+#~ "Gajim will notify you via a popup window in the bottom right of the "
+#~ "screen about contacts that just signed in"
+#~ msgstr ""
+#~ "Gajim powiadomi automatycznie przy pomocy okna w prawym dolnym rogu o "
+#~ "kontaktach, które zmieniają status na Dostępny"
+
+#~ msgid ""
+#~ "Gajim will only change the icon of the contact that triggered the new "
+#~ "event"
+#~ msgstr "Gajim zmieni jedynie ikonę kontaktu, który przysłał nową wiadomość"
+
+#~ msgid ""
+#~ "If checked, Gajim will remember the roster and chat window positions in "
+#~ "the screen and the sizes of them next time you run it"
+#~ msgstr ""
+#~ "Zaznaczenie tej opcji spowoduje zapamiętanie położenia głównego okna "
+#~ "programu na ekranie oraz jego rozmiaru"
+
+#~ msgid "On every _message"
+#~ msgstr "W każdej _wiadomości"
+
+#~ msgid "Outgoing Chat state noti_fications:"
+#~ msgstr "Wysyłanie powiadomienia o stanie _rozmowy:"
+
+#~ msgid "Print time:"
+#~ msgstr "Wyświetlaj czas:"
+
+#~ msgid "Save _position and size for roster and chat windows"
+#~ msgstr "Zapisz _pozycję i rozmiar okna kontaktów i okna rozmowy"
+
+#~ msgid "Show only in _roster"
+#~ msgstr "Pokaż tylko _listę kontaktów"
+
+#~ msgid "Use t_rayicon (aka. notification area icon)"
+#~ msgstr "_Ikona w obszarze powiadamiania"
+
+#~ msgid ""
+#~ "When a new event (message, file transfer request etc..) is received, the "
+#~ "following methods may be used to inform you about it. Please note that "
+#~ "events about new messages only occur if it is a new message from a "
+#~ "contact you are not already chatting with"
+#~ msgstr ""
+#~ "Kiedy pojawi się nowe zdarzenie (wiadomość, prośba o przesłanie pliku "
+#~ "itp.), możesz zostać o tym powiadomiony na takie sposoby. UWAGA: Nowa "
+#~ "wiadomość pojawia się jeśli nie pochodzi od osoby, z którą aktualnie "
+#~ "rozmawiasz"
+
+#~ msgid "_Never"
+#~ msgstr "_Nigdy"
+
+#~ msgid "_Notify me about it"
+#~ msgstr "Powia_dom mnie o tym"
+
+#~ msgid "_Pop it up"
+#~ msgstr "_Wyświetl"
+
+#~ msgid "Send cus_tom status"
+#~ msgstr "Wyślij _odrębny status"
+
+#~ msgid "_Remove from Roster"
+#~ msgstr "_Usuń z listy kontaktów"
+
+#~ msgid "_Filter:"
+#~ msgstr "_Filtr:"
+
+#~ msgid "Click to force avatar"
+#~ msgstr "Kliknij aby ustawić avatar"
+
+#~ msgid ""
+#~ "If that is not your language for which you want to highlight misspelled "
+#~ "words, then please set your $LANG as appropriate. Eg. for French do "
+#~ "export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to "
+#~ "make it global in /etc/profile.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Jeśli podświetlanie błędów w pisowni działa dla niewłaściwego języka, to "
+#~ "ustaw odpowiednio zmienną środowiskową $LANG. Np. dla języka polskiego "
+#~ "wpisz export LANG=pl_PL do pliku ~/.bash_profile lub globalnie do pliku "
+#~ "in /etc/profile.\n"
+#~ "\n"
+#~ "Podświedlanie błędów w pisowni nie będzie używane"
+
+#~ msgid "Every %s _minutes"
+#~ msgstr "Co %s _minut"
+
+#~ msgid "You must enter a password for the new account."
+#~ msgstr "Musisz wpisać hasło dla nowego konta."
+
+#~ msgid "Blocked Contacts for %s"
+#~ msgstr "Kontakty zablokowane (dla %s)"
+
+#~ msgid "%s does not appear to be a valid JID"
+#~ msgstr "%s nie wygląda na poprawny JID"
+
+#~ msgid "Drop %s in group %s"
+#~ msgstr "Usuń %s z grupy %s"
+
+#~ msgid "Make %s and %s metacontacts"
+#~ msgstr "Przekształć %s oraz %s w metakontakty"
+
+#~ msgid "Hides the buttons in two persons chat window."
+#~ msgstr "Ukrywa przyciski podczas rozmowy dwóch osób."
+
+#~ msgid "Security error connecting to \"%s\""
+#~ msgstr "Błąd zabezpieczeń przy połączeniu z \"%s\""
+
+#~ msgid ""
+#~ "The server's key has changed, or someone is trying to hack your "
+#~ "connection."
+#~ msgstr ""
+#~ "Zmienił się klucz twojego serwera lub ktoś próbuje podsłuchać połączenie."
+
+#~ msgid "Unable to check fingerprint for %s. Connection could be insecure."
+#~ msgstr ""
+#~ "Nie można sprawdzić odcisku klucza %s. Połączenie może nie być bezpieczne"
+
+#~ msgid "Missing fingerprint in SSL connection to %s"
+#~ msgstr "Brak odcisku klucza w połączeniu SSL z %s"
+
+#~ msgid "Fingerprint mismatch for %s: Got %s, expected %s"
+#~ msgstr "Niezgodność odcisku klucza %s. Oczekiwano %s, otrzymano %s"
+
+#~ msgid " %d unread single message"
+#~ msgid_plural " %d unread single messages"
+#~ msgstr[0] "%d nieprzeczytana wiadomość"
+#~ msgstr[1] "%d nieprzeczytane wiadomości"
+#~ msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
+
+#~ msgid " %d unread group chat message"
+#~ msgid_plural " %d unread group chat messages"
+#~ msgstr[0] "%d nieprzeczytana wiadomość z czatu"
+#~ msgstr[1] "%d nieprzeczytane wiadomości z czatu"
+#~ msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
+
+#~ msgid " %d unread private message"
+#~ msgid_plural " %d unread private messages"
+#~ msgstr[0] "%d nieprzeczytana wiadomość prywatna"
+#~ msgstr[1] "%d nieprzeczytane wiadomości prywatne"
+#~ msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
+
+#~ msgid "gtk+"
+#~ msgstr "gtk+"
+
 #~ msgid "2003-12-13T18:30:02Z"
 #~ msgstr "2003-12-13T18:30:02Z"
 
@@ -7177,9 +8126,6 @@ msgstr "Błąd przy dodawaniu usługi %s"
 #~ msgid "Role: "
 #~ msgstr "Funkcja: "
 
-#~ msgid "Affiliation: "
-#~ msgstr "Afiliacja: "
-
 #~ msgid ""
 #~ "Sound to play when any MUC message arrives. (This setting is taken into "
 #~ "account only if notify_on_all_muc_messages is True)"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6be0cf0d5..7a0015489 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,17 +5,17 @@
 #
 # junix <junix@targetlinux.org>, 2005.
 # Gajim <gajim-devel@gajim.org>, 2007.
-#: ../src/gajim-remote.py:203 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:236 ../src/gajim-remote.py:237
-#: ../src/gajim-remote.py:243 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:245 ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:253 ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:263
 msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-19 18:15+0200\n"
-"PO-Revision-Date: 2007-04-19 12:44-0300\n"
-"Last-Translator: Gajim <gajim-devel@gajim.org>\n"
+"POT-Creation-Date: 2007-11-28 20:33+0100\n"
+"PO-Revision-Date: 2007-11-28 11:55-0300\n"
+"Last-Translator: Davidson Paulo <dpaulo@fedoraproject.org>\n"
 "Language-Team: Português Brasileiro <gajim-devel@gajim.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,36 +38,36 @@ msgid "Jabber IM Client"
 msgstr "Cliente de IM Jabber"
 
 #: ../data/glade/account_context_menu.glade.h:1
-msgid "Send Single _Message..."
-msgstr "Enviar _Mensagem Simples..."
+#: ../data/glade/roster_window.glade.h:8
+msgid "Join _Group Chat..."
+msgstr "_Entrar em uma Conferência..."
 
 #: ../data/glade/account_context_menu.glade.h:2
 msgid "_Add Contact..."
 msgstr "_Adicionar Contato..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-msgid "_Discover Services..."
-msgstr "_Procurar Serviços..."
+#: ../data/glade/roster_window.glade.h:15
+msgid "_Discover Services"
+msgstr "_Descubra Serviços"
 
 #: ../data/glade/account_context_menu.glade.h:4
 msgid "_Execute Command..."
 msgstr "_Executar Comando"
 
 #: ../data/glade/account_context_menu.glade.h:5
-#: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Conferência"
+msgid "_Modify Account"
+msgstr "_Alterar Conta"
 
 #: ../data/glade/account_context_menu.glade.h:6
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Alterar Conta..."
-
-#: ../data/glade/account_context_menu.glade.h:7
 msgid "_Open Gmail Inbox"
 msgstr "_Abrir Caixa de Entrada do Gmail"
 
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/roster_window.glade.h:23
+msgid "_Start Chat..."
+msgstr "_Iniciar Conversa..."
+
 #: ../data/glade/account_context_menu.glade.h:8
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
@@ -75,11 +75,11 @@ msgstr "_Status"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:1
 msgid ""
-"<b>Account is being created</b>\n"
+"<b>Connecting to server</b>\n"
 "\n"
 "Please wait..."
 msgstr ""
-"<b>Sua conta está sendo criada</b>\n"
+"<b>Conectando ao servidor</b>\n"
 "\n"
 "Por favor aguarde..."
 
@@ -92,51 +92,68 @@ msgid "<b>Please fill in the data for your new account</b>"
 msgstr "<b>Por favor preencha os dados da sua nova conta</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:6
+msgid "<b>Please select a server</b>"
+msgstr "<b>Por favor, selecione um servidor</b>"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:7
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Clique para ver os recursos do servidor jabber (como transportes MSN, ICQ, "
 "etc)"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/glade/account_creation_wizard_window.glade.h:8
 msgid "Connect when I press Finish"
 msgstr "Conectar quando eu clicar em Fim"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/glade/account_creation_wizard_window.glade.h:9
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Assistente de Configuração de Conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:9
-msgid "I already have an account I want to use"
-msgstr "Eu já tenho uma conta e quero usá-la"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:10
+msgid "I already have an account I want to _use"
+msgstr "Eu já tenho uma conta e quero _usá-la"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "I want to _register for a new account"
 msgstr "Eu quero _registrar uma nova conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
-#: ../data/glade/account_modification_window.glade.h:19
+#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:23
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Se marcado, o Gajim lembrará a senha para esta conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
-#: ../data/glade/manage_proxies_window.glade.h:7
-msgid "Pass_word:"
-msgstr "_Senha:"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:32
+msgid "Manage..."
+msgstr "Gerenciar..."
+
+#: ../data/glade/account_creation_wizard_window.glade.h:14
+msgid "Prox_y:"
+msgstr "Prox_y:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:47
 msgid "Save pass_word"
 msgstr "Salvar senha"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 msgid "Servers Features"
 msgstr "Recursos dos Servidores"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 msgid "Set my profile when I connect"
 msgstr "Configurar perfil quando eu conectar"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:53
+msgid "Use custom hostname/port"
+msgstr "Usa nome de máquina/porta customizados"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -144,67 +161,63 @@ msgstr ""
 "Você precisa ter uma conta para conectar na\n"
 "rede Jabber."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:21
 msgid "Your JID:"
 msgstr "Seu JID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Advanced"
 msgstr "_Avançado"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:23
 msgid "_Finish"
 msgstr "_Concluir"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "_Computador:"
+#: ../data/glade/account_creation_wizard_window.glade.h:24
+msgid "_Hostname:"
+msgstr "_Nome do Computador:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:49
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_modification_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:23
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 #: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "_Retype Password:"
-msgstr "_Reescreva a Senha:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:27
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
-msgid "_Use proxy"
-msgstr "_Usar proxy"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:28
 #: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_Username:"
 msgstr "Nome de _usuário"
 
 #: ../data/glade/account_modification_window.glade.h:1
+#: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:8
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Diversos</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:2
 #: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:3
 #: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Informações Pessoais</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:4
 msgid "Account"
 msgstr "Conta"
 
@@ -213,23 +226,28 @@ msgid "Account Modification"
 msgstr "Alteração da Conta"
 
 #: ../data/glade/account_modification_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
 msgid "Administration operations"
 msgstr "Operações de administração"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Auto-reconnect when connection is lost"
 msgstr "Reconectar automaticamente quando a conexão cair"
 
 #: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:7
 #: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "C_onectar na inicialização do Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:8
 msgid "Chan_ge Password"
 msgstr "Alterar Senha"
 
 #: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:9
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
 "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
@@ -242,42 +260,60 @@ msgstr ""
 "TLS será desabilitado"
 
 #: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:10
 #: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "_Escolha a chave..."
 
 #: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:11
 msgid "Click to change account's password"
 msgstr "Clique para mudar a senha da conta"
 
 #: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:12
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+"Clique para requisitar autorização para todos os contatos de outra conta"
+
+#: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:13
 msgid "Connection"
 msgstr "Conexão"
 
-#: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/account_modification_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Edit Personal Information..."
 msgstr "Editar detalhes pessoais..."
 
-#: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:458
-#: ../src/notify.py:480 ../src/notify.py:492 ../src/common/helpers.py:914
+#. No configured account
+#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:6 ../src/notify.py:489
+#: ../src/notify.py:520 ../src/notify.py:532 ../src/common/helpers.py:998
+#: ../src/common/helpers.py:1010
 msgid "Gajim"
 msgstr "Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/preferences_window.glade.h:51
+#. General group cannot be changed
+#: ../data/glade/account_modification_window.glade.h:17
+#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/preferences_window.glade.h:45
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:347 ../src/roster_window.py:1225
-#: ../src/roster_window.py:1435 ../src/roster_window.py:2114
-#: ../src/roster_window.py:2156 ../src/common/contacts.py:284
+#: ../src/roster_window.py:372 ../src/roster_window.py:637
+#: ../src/roster_window.py:1384 ../src/roster_window.py:1760
+#: ../src/roster_window.py:2147 ../src/roster_window.py:2661
+#: ../src/roster_window.py:2779 ../src/common/contacts.py:314
 msgid "General"
 msgstr "Geral"
 
-#: ../data/glade/account_modification_window.glade.h:17
+#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:20
 msgid "Hostname: "
 msgstr "Nome do Computador:"
 
-#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/account_modification_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:21
 msgid ""
 "If checked, Gajim will also broadcast some more IPs except from just your "
 "IP, so file transfer has higher chances of working."
@@ -286,7 +322,8 @@ msgstr ""
 "então a transferência de arquivo tem grandes possibilidades de executar "
 "corretamente."
 
-#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/accounts_window.glade.h:24
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -294,7 +331,7 @@ msgstr ""
 "Se marcado, o Gajim enviará pacotes keep-alive para prevenir timeout na "
 "conexão, fazendo-a cair"
 
-#: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/account_modification_window.glade.h:22
 #: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
@@ -303,7 +340,8 @@ msgstr ""
 "Se checado, o Gajim gravará sua senha em ~/.gajim/config com permissão de "
 "'leitura' somente para você"
 
-#: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/accounts_window.glade.h:25
 #: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
@@ -312,7 +350,8 @@ msgstr ""
 "Se marcado, o Gajim, quando carregado, conectará automaticamente ao jabber "
 "usando esta conta"
 
-#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/account_modification_window.glade.h:24
+#: ../data/glade/accounts_window.glade.h:26
 #: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
@@ -322,46 +361,50 @@ msgstr ""
 "Se marcada, o status deste cliente será alterado de acordo com qualquer "
 "mudança no status global (definido pela caixa no fundo da janela da lista)"
 
-#: ../data/glade/account_modification_window.glade.h:24
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/accounts_window.glade.h:29
 msgid "Information about you, as stored in the server"
 msgstr "Informações sobre você são gravadas no servidor"
 
-#: ../data/glade/account_modification_window.glade.h:25
-msgid "Manage..."
-msgstr "Gerenciar..."
-
-#: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1623
-#: ../src/config.py:3301
+#: ../data/glade/account_modification_window.glade.h:27
+#: ../data/glade/accounts_window.glade.h:34
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1551
+#: ../src/config.py:2028
 msgid "No key selected"
 msgstr "Nenhuma chave selecionada"
 
 #. None means no proxy profile selected
 #. GPG Key
-#: ../data/glade/account_modification_window.glade.h:28 ../src/config.py:1196
-#: ../src/config.py:1201 ../src/config.py:1385 ../src/config.py:1613
-#: ../src/config.py:1622 ../src/config.py:1682 ../src/config.py:1756
-#: ../src/config.py:3291 ../src/config.py:3300 ../src/dialogs.py:281
-#: ../src/dialogs.py:283 ../src/roster_window.py:1539
-#: ../src/roster_window.py:1546 ../src/roster_window.py:1553
+#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:32 ../src/config.py:1142
+#: ../src/config.py:1213 ../src/config.py:1460 ../src/config.py:1465
+#: ../src/config.py:1926 ../src/config.py:2013 ../src/config.py:2027
+#: ../src/config.py:3109 ../src/config.py:3155 ../src/dialogs.py:344
+#: ../src/dialogs.py:346 ../src/roster_window.py:1864
+#: ../src/roster_window.py:1871 ../src/roster_window.py:1878
 msgid "None"
 msgstr "Nenhum"
 
-#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/accounts_window.glade.h:37
 #: ../data/glade/profile_window.glade.h:26
 #: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Informações Pessoais"
 
-#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:38
 msgid "Port: "
 msgstr "Porta:"
 
-#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:39
 msgid "Priori_ty:"
 msgstr "_Prioridade"
 
-#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:40
 msgid ""
 "Priority is used in Jabber to determine who gets the events from the jabber "
 "server when two or more clients are connected using the same account; The "
@@ -371,19 +414,23 @@ msgstr ""
 "servidor jabber quando dois ou mais clientes estão conectados usando a mesma "
 "conta; O cliente com a maior prioridade receberá os eventos"
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr "A prioridade será alterada automaticamente de acordo com o seu status"
 
-#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:42
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/accounts_window.glade.h:44
 msgid "Resour_ce:"
 msgstr "Recur_so:"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/accounts_window.glade.h:45
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -397,95 +444,137 @@ msgstr ""
 "conta com o recurso 'Casa' e 'Trabalho' ao mesmo tempo. O recurso que "
 "possuir a maior prioridade receberá os eventos. (veja abaixo)"
 
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:38
 #: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Salvar _frase de acesso (inseguro)"
 
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:46
 #: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "Salvar histórico para todos os contatos desta conta"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Send keep-alive packets"
 msgstr "Enviar pacotes para manter a conexão (keep-alive)"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "_Sincronizar status da conta com status global"
 
-#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:50
+#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/synchronise_select_account_dialog.glade.h:2
 msgid "Synchronise contacts"
 msgstr "Sincronizar contatos"
 
-#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/accounts_window.glade.h:52
 msgid "Use _SSL (legacy)"
 msgstr "Usar _SSL (obsoleto, apenas para servidores antigos)"
 
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use custom hostname/port"
-msgstr "Usa nome de máquina/porta customizados"
-
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:55
 msgid "Use file transfer proxies"
 msgstr "Usa proxies de transferência de arquivos"
 
-#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "Ajustar para status"
 
-#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/account_modification_window.glade.h:49
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: ../data/glade/accounts_window.glade.h:1
-msgid "Accounts"
-msgstr "Contas"
+#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-Mail:"
 
-#: ../data/glade/accounts_window.glade.h:2
-msgid ""
-"If checked, all local contacts that use a Bonjour compatible chat client "
-"(like iChat, Trillian or Gaim) will be shown in roster. You don't need to be "
-"connected to a jabber server for it to work.\n"
-"This is only available if python-avahi is installed and avahi-daemon is "
-"running."
-msgstr ""
-"Se marcado, todos os contatos locais que usam um cliente de chat compatível "
-"com o Bonjour (como iChat, Trillian ou Gaim) serão mostrados na lista. Você "
-"não precisa estar conectado a um servidor jabber para que ele funcione.\n"
-" Isto só está disponível se o python-avahi estiver instalado e o serviço "
-"avahi-daemon estiver rodando."
+#. XML Console enable checkbutton
+#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Habilitar"
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:17
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+msgid "First Name:"
+msgstr "Primeiro nome:"
+
+#: ../data/glade/accounts_window.glade.h:22
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Se marcado, o Gajim obterá a senha de um agente GPG como o Seahorse"
+
+#: ../data/glade/accounts_window.glade.h:27
+#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
-"If you have 2 or more accounts and this is checked, Gajim will list all "
-"contacts as if you had one account"
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
 msgstr ""
-"Se você tiver duas ou mais contas e isto estiver marcado, o Gajim listará "
-"todos os contatos como se você tivesse somente uma única conta"
+"Se a porta padrão usada para recebimento de mensagens não for adequada você "
+"pode selecionar outra aqui.\n"
+"Considere a possível modificação das regras do seu firewall. "
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:511
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/glade/accounts_window.glade.h:31
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+msgid "Last Name:"
+msgstr "Último nome:"
+
+#: ../data/glade/accounts_window.glade.h:33
 msgid "Mer_ge accounts"
 msgstr "Mes_clar contas"
 
-#: ../data/glade/accounts_window.glade.h:6
-msgid "_Enable link-local messaging"
-msgstr "_Ativar mensagens \"link-local\""
+#. Rename
+#: ../data/glade/accounts_window.glade.h:43 ../src/roster_window.py:2731
+msgid "Re_name"
+msgstr "Re_nomear"
 
-#: ../data/glade/accounts_window.glade.h:7
-msgid "_Modify"
-msgstr "_Modificar"
+#: ../data/glade/accounts_window.glade.h:51
+msgid "Use GPG _Agent"
+msgstr "Usar o _Agente GPG"
 
-#: ../data/glade/accounts_window.glade.h:8
-#: ../data/glade/remove_account_window.glade.h:4
-msgid "_Remove"
-msgstr "_Remover"
+#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+msgid "Use custom port:"
+msgstr "Usar servidor/porta personalizado"
+
+#: ../data/glade/accounts_window.glade.h:59
+msgid "gtk-add"
+msgstr "gtk-add"
+
+#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/features_window.glade.h:4
+msgid "gtk-close"
+msgstr "gtk-close"
+
+#: ../data/glade/accounts_window.glade.h:61
+msgid "gtk-remove"
+msgstr "gtk-remove"
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
@@ -580,6 +669,7 @@ msgid "This jabber entity does not expose any commands."
 msgstr "Esta entidade jabber não expõe quaisquer comandos."
 
 #: ../data/glade/advanced_configuration_window.glade.h:1
+#: ../data/glade/features_window.glade.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Descrição</b>"
 
@@ -606,45 +696,41 @@ msgid "Deletes Message of the Day"
 msgstr "Excluir Mensagem do Dia"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:3
+msgid "Edit _Privacy Lists..."
+msgstr "Editar Listas de _Privacidade..."
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:4
 msgid "Sends a message to users currently connected to this server"
 msgstr ""
 "Envia uma mensagem para os usuários atualmente conectados a este servidor"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
-msgid "Set MOTD"
-msgstr "Configurar MOTD"
-
 #: ../data/glade/advanced_menuitem_menu.glade.h:5
+msgid "Set MOTD..."
+msgstr "Definir MOTD..."
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:6
 msgid "Sets Message of the Day"
 msgstr "Configurar Mensagem do Dia"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/glade/advanced_menuitem_menu.glade.h:7
 msgid "Show _XML Console"
 msgstr "Mostrar console _XML"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
-msgid "Update MOTD"
-msgstr "Atualizar MOTD"
-
 #: ../data/glade/advanced_menuitem_menu.glade.h:8
+msgid "Update MOTD..."
+msgstr "Atualizar MOTD..."
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:9
 msgid "Updates Message of the Day"
 msgstr "Atualizar Mensagem do Dia"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/glade/advanced_menuitem_menu.glade.h:10
 msgid "_Administrator"
 msgstr "_Administrador"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
-msgid "_Privacy Lists"
-msgstr "_Listas de Privacidade"
-
 #: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message"
-msgstr "_Enviar Mensagem pelo Servidor"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:12
-msgid "_Send Single Message"
-msgstr "_Enviar uma Mensagem Simples"
+msgid "_Send Server Message..."
+msgstr "_Enviar Mensagem de Servidor..."
 
 #: ../data/glade/advanced_notifications_window.glade.h:1
 msgid " a window/tab opened with that contact "
@@ -659,7 +745,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>Condições</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>Sounds</b>"
 msgstr "<b>Sons</b>"
 
@@ -676,7 +762,7 @@ msgid "All statuses"
 msgstr "Totos os status"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:91 ../src/common/helpers.py:243
+#: ../src/common/commands.py:96 ../src/common/helpers.py:255
 msgid "Away"
 msgstr "Afastado"
 
@@ -693,7 +779,7 @@ msgid "Have "
 msgstr "Possui"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:265
 msgid "Invisible"
 msgstr "Invisível"
 
@@ -702,7 +788,7 @@ msgid "Launch a command"
 msgstr "Executar um comando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:226
+#: ../src/common/helpers.py:238
 msgid "Not Available"
 msgstr "Não Disponível"
 
@@ -828,6 +914,10 @@ msgstr "Novo evento recebido"
 msgid "You have received new entry:"
 msgstr "Você recebeu uma nova entrada:"
 
+#: ../data/glade/blocked_contacts_window.glade.h:1
+msgid "Blocked Contacts"
+msgstr "Contatos Bloqueados"
+
 #: ../data/glade/change_password_dialog.glade.h:1
 msgid "Change Password"
 msgstr "Alterar Senha"
@@ -857,11 +947,9 @@ msgid "Join _Group Chat"
 msgstr "_Entrar em uma Conferência"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "_Add to Roster"
-msgstr "_Adicionar à  Lista"
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+msgid "_Add to Roster..."
+msgstr "_Adicionar à Lista..."
 
 #: ../data/glade/chat_context_menu.glade.h:3
 msgid "_Copy JID/Email Address"
@@ -880,7 +968,6 @@ msgid "_Open Link in Browser"
 msgstr "_Visualizar no Navegador"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
@@ -891,33 +978,62 @@ msgid "Click to see past conversations with this contact"
 msgstr "Clique para ver o histórico de conversas com este contato"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#, fuzzy
-msgid "Ping"
-msgstr "Comendo"
+msgid "Invite _Contacts"
+msgstr "Convidar _Contatos"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:3
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Enviar _Arquivo"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:4
+msgid "Toggle End to End Encryption"
+msgstr "Alternar para Criptografia End to End"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:5
 msgid "Toggle Open_PGP Encryption"
 msgstr "Ativar criptografia Open_PGP"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:6
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-msgid "_Compact View    Alt+C"
-msgstr "Visão _Compacta    Alt+C"
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Adicionar à  Lista"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:7
-#: ../data/glade/gc_control_popup_menu.glade.h:8
-#: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/gc_control_popup_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_window.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:2600
 msgid "_History"
 msgstr "_Histórico"
 
+#: ../data/glade/chat_to_muc_window.glade.h:1
+msgid "In_vite"
+msgstr "Con_vidar"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends !"
+msgstr "Convidar Amigos!"
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+msgid "MUC server"
+msgstr "Servidor MUC"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr "Por favor, selecione um servidor MUC."
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+"Você está prestes a iniciar uma Conversa Multi-Usuário (MUC).\n"
+"Selecione os contatos que você quer convidar"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Preencha o formulário."
@@ -930,6 +1046,14 @@ msgstr "Configuração da Sala"
 msgid "Edit Groups"
 msgstr "Editar Grupos"
 
+#: ../data/glade/features_window.glade.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr "<b>Listas dos possíveis recursos do Gajim:</b>"
+
+#: ../data/glade/features_window.glade.h:3
+msgid "Features"
+msgstr "Recursos"
+
 #: ../data/glade/filetransfers.glade.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Uma lista de transferências de arquivo ativas, completadas e paradas"
@@ -985,7 +1109,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Mostrar um alerta visual quanto uma transferência de arquivo terminar"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:790
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -993,7 +1117,7 @@ msgstr "_Continuar"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notificar-me quando a transmissão do arquivo terminar"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:188
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:191
 msgid "_Open Containing Folder"
 msgstr "_Abrir pasta do arquivo"
 
@@ -1082,62 +1206,70 @@ msgid "_Background:"
 msgstr "Cor _de fundo"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname"
-msgstr "Mudar _Apelido"
+msgid "Change _Nickname..."
+msgstr "Alterar _Apelido..."
 
 #: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject"
-msgstr "Mudar _Assunto"
+msgid "Change _Subject..."
+msgstr "Alterar _Assunto..."
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
 msgid "Click to see past conversation in this room"
 msgstr "Clique para ver o histórico de conversas nesta sala"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:4
-msgid "Configure _Room"
-msgstr "Configurar _Sala"
+msgid "Configure _Room..."
+msgstr "Configurar _Sala..."
 
 #: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Bookmark This Room"
-msgstr "Adicionar esta Sala ao _Bookmark"
+msgid "_Bookmark"
+msgstr "_Favoritos"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-msgid "_Destroy room"
-msgstr "_Excluir sala"
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+msgid "_Destroy Room"
+msgstr "_Excluir Sala"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:8
+msgid "_Manage Room"
+msgstr "_Gerenciar Sala"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:9
+msgid "_Minimize on close"
+msgstr "_Minimizar ao fechar"
 
 #: ../data/glade/gc_occupants_menu.glade.h:1
 msgid "Mo_derator"
 msgstr "Mo_derador"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:2
+msgid "Occupant Actions"
+msgstr "Ações de Ocupante"
+
+#: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Administração"
 
-#: ../data/glade/gc_occupants_menu.glade.h:4
+#: ../data/glade/gc_occupants_menu.glade.h:6
 msgid "_Ban"
 msgstr "_Banir"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
 msgid "_Kick"
 msgstr "_Chutar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Member"
 msgstr "_Membro"
 
-#: ../data/glade/gc_occupants_menu.glade.h:8
-msgid "_Occupant Actions"
-msgstr "Ações de _Ocupantes"
-
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Owner"
 msgstr "D_ono"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Send Private Message"
 msgstr "_Enviar Mensagem Privada"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Voice"
 msgstr "_Voz"
 
@@ -1145,13 +1277,13 @@ msgstr "_Voz"
 msgid "Create new post"
 msgstr "Criar nova postagem"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:268
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:280
 msgid "From"
 msgstr "De"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:142
-#: ../src/history_manager.py:173
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:147
+#: ../src/history_manager.py:178
 msgid "Subject"
 msgstr "Assunto"
 
@@ -1191,30 +1323,54 @@ msgid "_Search Database"
 msgstr "_Buscar no Bando de Dados"
 
 #: ../data/glade/history_window.glade.h:1
-msgid "Build custom query"
-msgstr "Gerar consulta customizada"
+msgid "<b>History Viewer</b>"
+msgstr "<b>Visualizador de Histórico</b>"
 
 #: ../data/glade/history_window.glade.h:2
+msgid "<b>JID Selection</b>"
+msgstr "<b>Seleção de JID</b>"
+
+#: ../data/glade/history_window.glade.h:3
+msgid ""
+"Choose the chatlog you want to view. \n"
+"Enter the jid of a groupchat or a contact here. For online accounts you can "
+"even enter a a contact's nickname."
+msgstr ""
+"Selecione o registro de conversa que você quer ver. \n"
+"Entre com o JID de uma sala ou contato aqui. Para contas online você sempre "
+"entra com o apelido do contato."
+
+#: ../data/glade/history_window.glade.h:5 ../src/history_window.py:224
 msgid "Conversation History"
 msgstr "Histórico de Conversação"
 
-#: ../data/glade/history_window.glade.h:3
-msgid "Query Builder..."
-msgstr "Gerador de consultas..."
+#: ../data/glade/history_window.glade.h:6
+msgid ""
+"Current History\n"
+"All Chat Histories"
+msgstr ""
+"Histórico Atual\n"
+"Históricos de Todas as Conversas"
 
-#: ../data/glade/history_window.glade.h:4
+#: ../data/glade/history_window.glade.h:8
+#: ../data/glade/search_window.glade.h:2
 msgid "Search"
 msgstr "Buscar"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/glade/history_window.glade.h:9
 #: ../data/glade/zeroconf_information_window.glade.h:10
 msgid "_Log conversation history"
 msgstr "_Histórico de Conversação"
 
-#: ../data/glade/history_window.glade.h:6 ../src/disco.py:1177
+#: ../data/glade/history_window.glade.h:10
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1182
 msgid "_Search"
 msgstr "_Buscar"
 
+#: ../data/glade/history_window.glade.h:11
+msgid "in"
+msgstr "em"
+
 #: ../data/glade/invitation_received_dialog.glade.h:1
 msgid "Accept"
 msgstr "Aceitar"
@@ -1228,7 +1384,7 @@ msgstr "Negar"
 msgid "Invitation Received"
 msgstr "Convite Recebido"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1208
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1385
 msgid "Join Group Chat"
 msgstr "Ingressar numa conferência"
 
@@ -1237,14 +1393,14 @@ msgid "Join this room automatically when I connect"
 msgstr "Entra nesta sala automaticamente quando eu conectar"
 
 #: ../data/glade/join_groupchat_window.glade.h:3
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/glade/manage_bookmarks_window.glade.h:5
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "Nickname:"
 msgstr "Apelido:"
 
 #: ../data/glade/join_groupchat_window.glade.h:4
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Senha:"
 
@@ -1253,12 +1409,12 @@ msgid "Recently:"
 msgstr "Recentemente:"
 
 #: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1165
-#: ../src/disco.py:1615
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1170
+#: ../src/disco.py:1625
 msgid "_Join"
 msgstr "_Ingressar"
 
@@ -1279,15 +1435,19 @@ msgstr ""
 msgid "Manage Bookmarks"
 msgstr "Gerenciar Bookmarks"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:4
+msgid "Minimize on Auto Join"
+msgstr "Minimizar ao Entrar Automaticamente"
+
+#: ../data/glade/manage_bookmarks_window.glade.h:7
 msgid "Print status:"
 msgstr "Imprimir status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:10
 msgid "Title:"
 msgstr "Título:"
 
@@ -1313,10 +1473,14 @@ msgstr "Gerenciar Perfis de Proxy"
 
 #: ../data/glade/manage_proxies_window.glade.h:6
 #: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:30
 msgid "Name:"
 msgstr "Nome:"
 
+#: ../data/glade/manage_proxies_window.glade.h:7
+msgid "Pass_word:"
+msgstr "_Senha:"
+
 #: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Type:"
 msgstr "Tipo:"
@@ -1325,17 +1489,22 @@ msgstr "Tipo:"
 msgid "Use authentication"
 msgstr "Usar autenticação"
 
+#: ../data/glade/manage_proxies_window.glade.h:10
+msgid "_Host:"
+msgstr "_Computador:"
+
 #: ../data/glade/message_window.glade.h:1
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Clique para inserir um emoticon (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1129
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control2.py:1257
+#: ../src/chat_control.py:1268
 msgid "OpenPGP Encryption"
 msgstr "Criptografia OpenPGP"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:4
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:12
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Ações"
@@ -1343,7 +1512,7 @@ msgstr "_Ações"
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:6
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:245
+#: ../src/filetransfers_window.py:252
 msgid "_Send"
 msgstr "_Enviar"
 
@@ -1359,36 +1528,48 @@ msgstr "<b>Editor de Configurações Avançadas</b>"
 msgid "<b>Applications</b>"
 msgstr "<b>Aplicações</b>"
 
+#: ../data/glade/preferences_window.glade.h:3
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Aparência da Conversa</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/glade/preferences_window.glade.h:5
 msgid "<b>Custom</b>"
 msgstr "<b>Customizar</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/glade/preferences_window.glade.h:6
 msgid "<b>Format of a line</b>"
 msgstr "<b>Formato da linha</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/glade/preferences_window.glade.h:7
 msgid "<b>GMail Options</b>"
 msgstr "<b>Opções do Gmail</b>"
 
-#: ../data/glade/preferences_window.glade.h:7
-msgid "<b>Interface Customization</b>"
-msgstr "<b>Customização de interface</b>"
-
 #: ../data/glade/preferences_window.glade.h:9
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Mensagens de Status Disponíveis</b>"
 
+#: ../data/glade/preferences_window.glade.h:10
+msgid "<b>Privacy</b>"
+msgstr "<i>Privacidade</i>"
+
 #: ../data/glade/preferences_window.glade.h:11
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Aparência da Lista</b>"
+
+#: ../data/glade/preferences_window.glade.h:13
+msgid "<b>Themes</b>"
+msgstr "<b>Tema</b>"
+
+#: ../data/glade/preferences_window.glade.h:14
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Notificações Visuais</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/glade/preferences_window.glade.h:15
 msgid "Advanced"
 msgstr "Avançado"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/glade/preferences_window.glade.h:16
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1398,24 +1579,20 @@ msgstr ""
 "Escrevendo somente\n"
 "Desabilitado"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/glade/preferences_window.glade.h:19
 msgid "Allow _OS information to be sent"
 msgstr "Permitir o envio de informações do _SO "
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/glade/preferences_window.glade.h:20
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Permite janela/notificação quando eu estou _afastado/NA/ocupado/invisível"
 
-#: ../data/glade/preferences_window.glade.h:18
-msgid "Also known as iChat style"
-msgstr "Conhecido também como estilo iChat"
-
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/glade/preferences_window.glade.h:21
 msgid "Always check to see if Gajim is the _default Jabber client on startup"
 msgstr "Sempre verificar ao iniciar se o Gajim é o cliente Jabber padrão"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/glade/preferences_window.glade.h:22
 msgid ""
 "An example: If you have enabled status message for away, Gajim won't ask you "
 "anymore for a status message when you change your status to away; it will "
@@ -1425,24 +1602,25 @@ msgstr ""
 "Gajim não perguntará mais por uma mensagem de status quando você mudá-lo "
 "para afastado, ele usará o padrão definido aqui"
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Ask status message when I:"
 msgstr "Solicite uma mensagem de status quanto eu:"
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/glade/preferences_window.glade.h:24
 msgid "Auto _away after:"
 msgstr "Marcar como _afastado depois:"
 
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:25
 msgid "Auto _not available after:"
 msgstr "Marcar como _afastado depois:"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/glade/preferences_window.glade.h:26
+#, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
-"Always use XFCE4 default applications\n"
+"Always use Xfce default applications\n"
 "Custom"
 msgstr ""
 "Auto-detectar ao abrir o Gajim\n"
@@ -1450,11 +1628,7 @@ msgstr ""
 "Sempre usar aplicações no padrão KDE\n"
 "Personalizar"
 
-#: ../data/glade/preferences_window.glade.h:29
-msgid "Chat"
-msgstr "Conversa"
-
-#: ../data/glade/preferences_window.glade.h:30
+#: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, because it blocks all messages from any contact that "
@@ -1465,18 +1639,14 @@ msgstr ""
 "mensagens de qualquer contato que você não possuir na sua lista e queria lhe "
 "enviar uma mensagem"
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/glade/preferences_window.glade.h:32
 msgid "Configure color and font of the interface"
 msgstr "Configurar cores e fontes da interface"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Default Status Messages"
 msgstr "Mensagens de Status Padrão"
 
-#: ../data/glade/preferences_window.glade.h:33
-msgid "Default status _iconset:"
-msgstr "_Conjunto de Ícones de status padrão:"
-
 #: ../data/glade/preferences_window.glade.h:34
 msgid ""
 "Determined by sender\n"
@@ -1500,22 +1670,14 @@ msgid "Display status _messages of contacts in roster"
 msgstr "Mostrar _mensagem de status da lista de contato"
 
 #: ../data/glade/preferences_window.glade.h:40
-msgid "Displayed Chat state noti_fications:"
-msgstr "Noti_ficações do status da conversa exibidas:"
-
-#: ../data/glade/preferences_window.glade.h:41
-msgid "E_very 5 minutes"
-msgstr "De 5 _em 5 minutos"
-
-#: ../data/glade/preferences_window.glade.h:42
 msgid "Emoticons:"
 msgstr "Emoticons:"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Events"
 msgstr "Eventos"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:42
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1525,7 +1687,7 @@ msgstr ""
 "que você pode ter com um contato. Aqui você pode especificar quais "
 "caracteres você quer para enviar a outra parte."
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:43
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1535,30 +1697,7 @@ msgstr ""
 "você pode ter com um contato. Aqui você pode especificar quais caracteres "
 "você quer para enviar a outra parte."
 
-#: ../data/glade/preferences_window.glade.h:46
-msgid ""
-"Gajim will automatically show new events by popping up the relevant window"
-msgstr ""
-"O Gajim automaticamente mostrará novos eventos em uma janela saltando sobre "
-"a janela relevante"
-
-#: ../data/glade/preferences_window.glade.h:47
-msgid ""
-"Gajim will notify you for new events via a popup in the bottom right of the "
-"screen"
-msgstr ""
-"Gajim notificará você de uma novo evento via uma alerta visual na lateral "
-"inferior direita da tela"
-
-#: ../data/glade/preferences_window.glade.h:48
-msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed in"
-msgstr ""
-"Gajim notificará você através de um alerta visual na parte inferior direita "
-"da tela sobre os contatos que se conectaram"
-
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:44
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1566,12 +1705,11 @@ msgstr ""
 "Gajim notificará você através de um alerta visual na parte inferior direita "
 "da tela sobre os contatos que se desconectaram"
 
-#: ../data/glade/preferences_window.glade.h:50
-msgid ""
-"Gajim will only change the icon of the contact that triggered the new event"
-msgstr "Gajim mudará somente o ícone do contato que provocou o evento novo"
+#: ../data/glade/preferences_window.glade.h:46
+msgid "Hides buttons in chatwindows to "
+msgstr "Esconder os botões nas janelas de conversa em"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1579,7 +1717,7 @@ msgstr ""
 "Se marcado, o Gajim também incluirá informação sobre o remetente de novos "
 "emails"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1587,7 +1725,7 @@ msgstr ""
 "Se marcado, Gajim mostrará avatars dos contatos na janela da lista e na "
 "conferência"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1595,15 +1733,7 @@ msgstr ""
 "Se marcado, Gajim indicará mensagens de status dos contatos sob o nome do "
 "contato na janela da lista e na conferência"
 
-#: ../data/glade/preferences_window.glade.h:55
-msgid ""
-"If checked, Gajim will remember the roster and chat window positions in the "
-"screen and the sizes of them next time you run it"
-msgstr ""
-"Se marcado, o Gajim lembrará a posição e tamanho da janela principal na "
-"próxima vez que você executa-lo"
-
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1613,7 +1743,7 @@ msgstr ""
 "exemplo, um contato do MSN terá o ícone equivalente do MSN para o status "
 "conectado, ausente, ocupado, etc....)"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1621,15 +1751,15 @@ msgstr ""
 "Se habilitado, Gajim substituirá o ascii para smilies, como ':)' com a "
 "animação equivalente ou estático emoticons gráfico"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:52
 msgid "Ignore rich content in incoming messages"
 msgstr "Ignorar conteúdo formatado nas mensagens recebidas."
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Ma_nage..."
 msgstr "Gere_nciar..."
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "Never\n"
 "Always\n"
@@ -1641,60 +1771,54 @@ msgstr ""
 "Por conta\n"
 "Por tipo"
 
-#: ../data/glade/preferences_window.glade.h:64
-msgid "Notify me about contacts that: "
-msgstr "Notifique-me sobre contatos ao: "
+#: ../data/glade/preferences_window.glade.h:58
+msgid "Notify me about contacts that sign _in"
+msgstr "Notifique-me sobre contatos ao _conectar"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:59
+msgid "Notify me about contacts that sign _out"
+msgstr "Notifique-me sobre contatos ao _desconectar"
+
+#: ../data/glade/preferences_window.glade.h:60
 msgid "Notify on new _GMail email"
 msgstr "Notificar cada nova mensagem do _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:66
-msgid "On every _message"
-msgstr "Em todas as _mensagens"
-
-#: ../data/glade/preferences_window.glade.h:67
-msgid "One message _window:"
-msgstr "Uma _janela de mensagem"
-
-#: ../data/glade/preferences_window.glade.h:68
-msgid "Outgoing Chat state noti_fications:"
-msgstr "Enviar noti_ficações do status da conversa:"
-
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:61
 msgid "Play _sounds"
 msgstr "Tocar _Sons"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:62
+msgid ""
+"Pop it up\n"
+"Notify me about it\n"
+"Show only in roster"
+msgstr ""
+"Mostrar em um pop-up\n"
+"Notificar-me sobre\n"
+"Mostra apenas na lista"
+
+#: ../data/glade/preferences_window.glade.h:65
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../data/glade/preferences_window.glade.h:71
-msgid "Print time:"
-msgstr "Imprimir tempo:"
-
-#: ../data/glade/preferences_window.glade.h:72
-msgid "Save _position and size for roster and chat windows"
-msgstr "Salvar _posição e tamanho das janelas de conversa e lista de contatos"
+#: ../data/glade/preferences_window.glade.h:66
+msgid "Privacy"
+msgstr "Privacidade"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Set status message to reflect currently playing _music track"
 msgstr ""
 "Definir a mensagem de status de acordo com a música que estiver sendo tocada."
 
-#: ../data/glade/preferences_window.glade.h:74
-msgid "Show only in _roster"
-msgstr "Mostre somente na _lista"
-
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Sign _in"
 msgstr "_Conectar"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:70
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1702,55 +1826,47 @@ msgstr ""
 "Algumas mensagens podem incluir conteúdo rico (formatação, cores etc). Se "
 "marcado, o Gajim apenas mostrará as mensagens em texto puro."
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:72
+msgid "Status _iconset:"
+msgstr "_Conjunto de ícones de status:"
+
+#: ../data/glade/preferences_window.glade.h:73
 msgid "T_heme:"
 msgstr "_Tema:"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:74
 msgid "The auto away status message"
 msgstr "A mensagem de status para o ausente automático"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:75
 msgid "The auto not available status message"
 msgstr "A mensagem de status para o afastado automático"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Treat all incoming messages as:"
 msgstr "Tratar todas as mensagens recebidas como:"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Use _transports iconsets"
 msgstr "Usar conjunto de ícones de _transportes"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:78
+msgid "Use only one message _window:"
+msgstr "Usar apenas uma _janela de mensagem:"
+
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Use system _default"
 msgstr "Usar o _padrão do sistema"
 
-#: ../data/glade/preferences_window.glade.h:85
-msgid "Use t_rayicon (aka. notification area icon)"
-msgstr "Usar ícone na bandeja (também conhecido por área de notificação)"
-
-#: ../data/glade/preferences_window.glade.h:86
-msgid ""
-"When a new event (message, file transfer request etc..) is received, the "
-"following methods may be used to inform you about it. Please note that "
-"events about new messages only occur if it is a new message from a contact "
-"you are not already chatting with"
-msgstr ""
-"Quando um evento novo (mensagem, pedido etc. de transferência de arquivo, "
-"etc.) é recebido, os seguintes métodos podem ser usados para informá-lo "
-"sobre ele. Por favor, note que os eventos sobre mensagens novas ocorrem "
-"somente se for uma mensagem nova de um contato que você não está conversando"
-
-#: ../data/glade/preferences_window.glade.h:87
-msgid "When new event is received"
-msgstr "Quando novo evento é recebido"
+#: ../data/glade/preferences_window.glade.h:80
+msgid "When new event is received:"
+msgstr "Quando novo evento é recebido:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:81
 msgid ""
 "Works for Rhythmbox and Muine players. For more players, please visit http://"
 "trac.gajim.org/wiki/GajimAndMusicPlayer"
@@ -1758,83 +1874,83 @@ msgstr ""
 "Funciona para os reprodutores Rhythmbox e Muine. Para mais reprodutores, por "
 "favor visite a página http://trac.gajim.org/wiki/GajimAndMusicPlayer"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:82
 msgid "_Advanced Notifications Control..."
 msgstr "Controle _Avançado de Notificações..."
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:83
 msgid "_Browser:"
 msgstr "_Navegar:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:84
+msgid "_Display chat state notifications:"
+msgstr "_Mostrar notificações de status de conversa:"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "_File manager:"
 msgstr "_Gerenciamento de arquivos:"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Font:"
 msgstr "_Fonte:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_Highlight misspelled words"
 msgstr "_Destacar palavras mal escritas"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignore eventos de contatos que não estejam na minha lista"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Incoming message:"
 msgstr "Mensagem _recebida:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_Log status changes of contacts"
 msgstr "_Log mudanças de status dos contatos"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Mail client:"
 msgstr "_Cliente de email:"
 
-#: ../data/glade/preferences_window.glade.h:98
-msgid "_Never"
-msgstr "_Nunca"
-
-#: ../data/glade/preferences_window.glade.h:99
-msgid "_Notify me about it"
-msgstr "_Notifique-me sobre isto"
+#: ../data/glade/preferences_window.glade.h:92
+msgid "_Make message windows compact"
+msgstr "_Tornar a janela de mensagem compacta"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Outgoing message:"
 msgstr "Mensagem _enviada:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Player:"
 msgstr "_Tocador de som:"
 
-#: ../data/glade/preferences_window.glade.h:103
-msgid "_Pop it up"
-msgstr "_Alerta visual"
-
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Reset to Default Colors"
 msgstr "Voltar para as Cores _Padrões"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:97
+msgid "_Send chat state notifications:"
+msgstr "_Enviar notificações de status de conversa:"
+
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Sort contacts by status"
 msgstr "_Ordena contatos pelo status"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Status message:"
 msgstr "_Mensagem de status:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:100
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:101
 msgid "minutes"
 msgstr "minutos"
 
@@ -1878,7 +1994,7 @@ msgstr "Jabber ID"
 msgid "Order:"
 msgstr "Ordem:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2052
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2258
 msgid "Privacy List"
 msgstr "Lista de Privacidade"
 
@@ -1953,110 +2069,103 @@ msgid "Company:"
 msgstr "Empresa:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 msgid "Country:"
 msgstr "País:"
 
 #: ../data/glade/profile_window.glade.h:10
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "Department:"
 msgstr "Departamento:"
 
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:15
-#: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 msgid "Extra Address:"
 msgstr "Complemento:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:19
 msgid "Family:"
 msgstr "Família:"
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:16
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "Format: YYYY-MM-DD"
 msgstr "Formato: YYYY-MM-DD"
 
-#. Given Name
-#: ../data/glade/profile_window.glade.h:18
+#: ../data/glade/profile_window.glade.h:17
 #: ../data/glade/vcard_information_window.glade.h:22
+msgid "Full Name"
+msgstr "Nome Completo"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:19
+#: ../data/glade/vcard_information_window.glade.h:24
 msgid "Given:"
 msgstr "Nome:"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "Homepage:"
 msgstr "Homepage:"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "Middle:"
 msgstr "Nome do meio:"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:27
-msgid "More"
-msgstr "Mais"
-
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:34
 msgid "Personal Info"
 msgstr "Informações Pessoais"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "Phone No.:"
 msgstr "Telefone:"
 
 #: ../data/glade/profile_window.glade.h:28
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/glade/vcard_information_window.glade.h:36
 msgid "Position:"
 msgstr "Cargo:"
 
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:37
 msgid "Postal Code:"
 msgstr "Código Postal:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:39
 msgid "Prefix:"
 msgstr "Prefixo:"
 
 #: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:38 ../src/vcard.py:257
+#: ../data/glade/vcard_information_window.glade.h:41 ../src/vcard.py:307
 msgid "Role:"
 msgstr "Função:"
 
 #: ../data/glade/profile_window.glade.h:33
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "State:"
 msgstr "Estado:"
 
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Street:"
 msgstr "Rua:"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "Suffix:"
 msgstr "Sobrenome:"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Trabalho"
 
@@ -2072,136 +2181,180 @@ msgstr "Remover conta _somente do Gajim"
 msgid "Remove account from Gajim and from _server"
 msgstr "Remover conta do Gajim e do _servidor"
 
+#. Remove
+#. Remove group
+#. Remove
+#: ../data/glade/remove_account_window.glade.h:4
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+#: ../src/roster_window.py:2557 ../src/roster_window.py:2767
+#: ../src/roster_window.py:2903
+msgid "_Remove"
+msgstr "_Remover"
+
 #: ../data/glade/roster_contact_context_menu.glade.h:1
 msgid "A_sk to see his/her status"
 msgstr "Pe_ça para ver o status dele/dela"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
-msgstr "Adicionar Notificações Visuais"
+msgid "Add Special _Notification..."
+msgstr "Adicionar _Notificação Especial..."
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
-msgstr "Atribuir chave OpenPGP"
+msgid "Assign Open_PGP Key..."
+msgstr "Atribuir Chave Open_PGP..."
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:2078
-msgid "Edit _Groups"
-msgstr "Editar _Grupos"
+msgid "Edit _Groups..."
+msgstr "Editar _Grupos..."
 
+#. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:2213
+#: ../src/roster_window.py:2860
 msgid "Execute Command..."
 msgstr "Executar Comando..."
 
+#. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:2036
+#: ../src/roster_window.py:2473
 msgid "In_vite to"
 msgstr "Con_vidar para"
 
+#. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Enviar _Mensagem Simples"
+#: ../src/roster_window.py:2697 ../src/roster_window.py:2831
+msgid "Send Cus_tom Status"
+msgstr "Enviar Status Perso_nalizado"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+msgid "Send Single _Message..."
+msgstr "Enviar _Mensagem Simples..."
 
 #: ../data/glade/roster_contact_context_menu.glade.h:9
+msgid "Send _File..."
+msgstr "Enviar _Arquivo..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:10
+msgid "Set Custom _Avatar..."
+msgstr "Definir _Avatar Personalizado..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
 msgstr "Iniciar conversa"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 msgid "_Allow him/her to see my status"
 msgstr "_Permitir que ele/ela veja meu status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-msgid "_Forbid him/her to see my status"
-msgstr "_Proibir ele/ela de ver meu status"
-
-#. Remove group
 #: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:2030 ../src/roster_window.py:2127
-#: ../src/roster_window.py:2234
-msgid "_Remove from Roster"
-msgstr "_Remover da Lista"
+#: ../src/roster_window.py:2547 ../src/roster_window.py:2758
+msgid "_Block"
+msgstr "_Bloquear"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:15
+msgid "_Forbid him/her to see my status"
+msgstr "_Proibir ele/ela de ver meu status"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:17
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2222
-msgid "_Rename"
-msgstr "_Renomear"
+msgid "_Manage Contact"
+msgstr "_Gerenciar Contato"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:19
+msgid "_Rename..."
+msgstr "_Renomear..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:20
 msgid "_Subscription"
 msgstr "_Inscrição"
 
+#: ../data/glade/roster_contact_context_menu.glade.h:21
+#: ../src/roster_window.py:2541 ../src/roster_window.py:2752
+msgid "_Unblock"
+msgstr "_Desbloquear"
+
 #: ../data/glade/roster_window.glade.h:1
 msgid "A_ccounts"
 msgstr "_Contas"
 
 #: ../data/glade/roster_window.glade.h:2
-msgid "Add _Contact"
-msgstr "Adicionar _Contato"
+msgid "Add _Contact..."
+msgstr "Adicionar _Contato..."
 
 #: ../data/glade/roster_window.glade.h:3
+msgid "Fea_tures"
+msgstr "Re_cursos"
+
+#: ../data/glade/roster_window.glade.h:4
 msgid "File _Transfers"
 msgstr "Transferência de _Arquivos"
 
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/glade/roster_window.glade.h:5
 msgid "Frequently Asked Questions (online)"
 msgstr "Perguntas freqüentes (online)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/glade/roster_window.glade.h:7
 msgid "Help online"
 msgstr "Ajuda online"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:9
 msgid "Profile, A_vatar"
 msgstr "Perfil, A_vatar"
 
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
 msgstr "Mostrar Trans_portes"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "Mostrar Contatos desc_onectados"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:14
 msgid "_Contents"
 msgstr "_Índices"
 
-#: ../data/glade/roster_window.glade.h:13
-msgid "_Discover Services"
-msgstr "_Descubra Serviços"
-
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1353
-#: ../src/roster_window.py:2205
+#: ../data/glade/roster_window.glade.h:16 ../src/disco.py:1358
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:17
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Preferences"
 msgstr "_Preferências"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:21
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
+msgid "_Send Single Message..."
+msgstr "_Enviar Mensagem Simples..."
+
+#: ../data/glade/roster_window.glade.h:24
 msgid "_View"
 msgstr "_Ver"
 
+#: ../data/glade/search_window.glade.h:1
+msgid "Please wait while retrieving search form..."
+msgstr ""
+"Por favor aguarde enquanto o formulário de pesquisa está sendo obtido..."
+
+#: ../data/glade/search_window.glade.h:3
+msgid "_Add contact"
+msgstr "_Adicionar contato"
+
+#. Information
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:2915
+msgid "_Information"
+msgstr "_Informações"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "_Ir"
@@ -2210,10 +2363,6 @@ msgstr "_Ir"
 msgid "_Address:"
 msgstr "_Endereço:"
 
-#: ../data/glade/service_discovery_window.glade.h:3
-msgid "_Filter:"
-msgstr "_Filtro:"
-
 #: ../data/glade/service_registration_window.glade.h:1
 msgid "Register to"
 msgstr "Registrar para"
@@ -2291,10 +2440,31 @@ msgstr "Solicitação de Inscrição"
 msgid "_Deny"
 msgstr "_Negar"
 
+#: ../data/glade/synchronise_contacts_dialog.glade.h:1
+#, fuzzy
+msgid "Select the account with which to synchronise"
+msgstr "Selecione a conta que você quer sincronizar"
+
+#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+msgid "Select the account with which you want to synchronise"
+msgstr "Selecione a conta que você quer sincronizar"
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+msgid "Select the contacts you want to synchronise"
+msgstr "Selecione os contatos que você quer sincronizar"
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+msgid "Synchronise : select contacts"
+msgstr "Sincronizar: selecionar contatos"
+
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Mute Sounds"
 msgstr "Sons Mudos"
 
+#: ../data/glade/systray_context_menu.glade.h:2
+msgid "Send Single _Message"
+msgstr "Enviar _Mensagem Simples"
+
 #: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
 msgstr "Mostrar todos _Eventos Pendentes"
@@ -2307,6 +2477,10 @@ msgstr "Mostre _Lista"
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
+#: ../data/glade/systray_context_menu.glade.h:6
+msgid "_Group Chat"
+msgstr "_Conferência"
+
 #. Given Name
 #: ../data/glade/vcard_information_window.glade.h:5
 msgid "Ask:"
@@ -2321,39 +2495,45 @@ msgid "Comments"
 msgstr "Comentários"
 
 #: ../data/glade/vcard_information_window.glade.h:11
+msgid "Configured avatar:"
+msgstr "Configurar _avatar:"
+
+#: ../data/glade/vcard_information_window.glade.h:12
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Contato"
 
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:13
 msgid "Contact Information"
 msgstr "Informações do Contato"
 
-#: ../data/glade/vcard_information_window.glade.h:24
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+#: ../data/glade/vcard_information_window.glade.h:29
+msgid "More"
+msgstr "Mais"
 
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "OS:"
 msgstr "SO:"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:40
 #: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Recurso:"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Status:"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Subscription:"
 msgstr "Inscrição:"
 
+#: ../data/glade/vcard_information_window.glade.h:49
+msgid "User avatar:"
+msgstr "Avatar do usuário:"
+
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Trafégo do Jabber</b>"
@@ -2362,11 +2542,6 @@ msgstr "<b>Trafégo do Jabber</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>Entrada XML</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Habilitar"
-
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2385,15 +2560,29 @@ msgstr "_Mensagem"
 msgid "_Presence"
 msgstr "_Presença"
 
-#: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
-msgid "First Name:"
-msgstr "Primeiro nome:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
+msgid "Add Special _Notification"
+msgstr "Adicionar Notificações Visuais"
 
-#: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
-msgid "Last Name:"
-msgstr "Último nome:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
+msgid "Assign Open_PGP Key"
+msgstr "Atribuir chave OpenPGP"
+
+#. Edit Groups
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:2530
+msgid "Edit _Groups"
+msgstr "Editar _Grupos"
+
+#. Rename
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:2887
+msgid "_Rename"
+msgstr "_Renomear"
+
+#: ../data/glade/zeroconf_context_menu.glade.h:1
+msgid "_Modify Account..."
+msgstr "_Alterar Conta..."
 
 #: ../data/glade/zeroconf_information_window.glade.h:6
 msgid "Local jid:"
@@ -2403,244 +2592,283 @@ msgstr "JID local:"
 msgid "Personal"
 msgstr "Pessoal"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:11
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Se a porta padrão usada para recebimento de mensagens não for adequada você "
-"pode selecionar outra aqui.\n"
-"Considere a possível modificação das regras do seu firewall. "
-
 #: ../data/glade/zeroconf_properties_window.glade.h:15
 msgid "Modify Account"
 msgstr "Alterar Conta"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
-msgstr "Usar servidor/porta personalizado"
-
 #. For i18n
-#: ../src/advanced.py:51
+#: ../src/advanced.py:56
 msgid "Activated"
 msgstr "Ativado"
 
-#: ../src/advanced.py:51
+#: ../src/advanced.py:56
 msgid "Deactivated"
 msgstr "Desativado"
 
-#: ../src/advanced.py:53
+#: ../src/advanced.py:58
 msgid "Boolean"
 msgstr "Booleano"
 
-#: ../src/advanced.py:54
+#: ../src/advanced.py:59
 msgid "Integer"
 msgstr "Inteiro"
 
-#: ../src/advanced.py:55
+#: ../src/advanced.py:60
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/advanced.py:56
+#: ../src/advanced.py:61
 msgid "Color"
 msgstr "Cor"
 
-#: ../src/advanced.py:65
+#: ../src/advanced.py:70
 msgid "Preference Name"
 msgstr "Nome da preferência"
 
-#: ../src/advanced.py:71
+#: ../src/advanced.py:76
 msgid "Value"
 msgstr "Valor"
 
-#: ../src/advanced.py:79
+#: ../src/advanced.py:84
 msgid "Type"
 msgstr "Tipo"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:136
+#: ../src/advanced.py:140
 msgid "(None)"
 msgstr "(Nada)"
 
 #. we talk about password
-#: ../src/advanced.py:239
+#: ../src/advanced.py:243
 msgid "Hidden"
 msgstr "Escondido"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
-#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "English"
 msgstr "Inglês"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Belarusian"
 msgstr "Bielorusso"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Breton"
 msgstr "Bretão"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Czech"
 msgstr "Tcheco"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "German"
 msgstr "Alemão"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Greek"
 msgstr "Grego"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "British"
 msgstr "Inglês Britânico"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Basque"
 msgstr "Basco"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "French"
 msgstr "Francês"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Croatian"
 msgstr "Croata"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Norwegian (b)"
 msgstr "Norueguês (b)"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Dutch"
 msgstr "Holandês"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Norwegian"
 msgstr "Norueguês"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Polish"
 msgstr "Polonês"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Portuguese"
 msgstr "Português"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Brazilian Portuguese"
 msgstr "Português Brasileiro"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Russian"
 msgstr "Russo"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Serbian"
 msgstr "Sérvio"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Chinese (Ch)"
 msgstr "Chinês (Ch)"
 
-#: ../src/chat_control.py:212 ../src/dialogs.py:1706
-msgid ""
-"If that is not your language for which you want to highlight misspelled "
-"words, then please set your $LANG as appropriate. Eg. for French do export "
-"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it "
-"global in /etc/profile.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Se este não for o idioma para o qual você quer destacar palavras incorretas, "
-"por favor, configure a sua variável de ambiente $LANG com o valor "
-"apropriado. Por exemplo, para o francês exporte LANG=fr_FR ou exporte "
-"LANG=fr_FR.UTF-8 em ~/.bash_profile ou coloca-lo \n"
-" globalmente em/etc/profile.\n"
-"Caracteristica de destacar palavras erradas não será usada"
-
-#: ../src/chat_control.py:251
+#: ../src/chat_control2.py:310 ../src/chat_control.py:313
 msgid "Spelling language"
 msgstr "Idioma do corretor ortográfico"
 
 #. we are not connected
-#: ../src/chat_control.py:274 ../src/chat_control.py:480
+#: ../src/chat_control2.py:333 ../src/chat_control2.py:549
+#: ../src/chat_control.py:336 ../src/chat_control.py:559
 msgid "A connection is not available"
 msgstr "Uma conexão não está disponível"
 
-#: ../src/chat_control.py:275 ../src/chat_control.py:481
+#: ../src/chat_control2.py:334 ../src/chat_control2.py:550
+#: ../src/chat_control.py:337 ../src/chat_control.py:560
 msgid "Your message can not be sent until you are connected."
 msgstr "Sua mensagem não pode ser enviada até que esteja conectado."
 
-#: ../src/chat_control.py:1054
+#: ../src/chat_control2.py:1176 ../src/chat_control.py:1186
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s da conferência %(room_name)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1143
+#: ../src/chat_control2.py:1271 ../src/chat_control.py:1282
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s não tem a transmissão uma chave de OpenPGP, nem uma foi atribuída"
 
-#: ../src/chat_control.py:1275
+#: ../src/chat_control2.py:1314 ../src/chat_control.py:1325
+#: ../src/groupchat_control.py:1433
+#, python-format
+msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+msgstr ""
+"Comando não encontrado: /%s (se você quer enviar isto, use este prefixo /say)"
+
+#: ../src/chat_control2.py:1321 ../src/chat_control.py:1332
+#: ../src/groupchat_control.py:1456
+#, python-format
+msgid "Commands: %s"
+msgstr "Comandos: %s"
+
+#: ../src/chat_control2.py:1324 ../src/chat_control.py:1335
+#: ../src/groupchat_control.py:1470
+#, python-format
+msgid "Usage: /%s, clears the text window."
+msgstr "Uso: /%s, apaga o texto da janela."
+
+#: ../src/chat_control2.py:1327 ../src/chat_control.py:1338
+#: ../src/groupchat_control.py:1475
+#, python-format
+msgid "Usage: /%s, hide the chat buttons."
+msgstr "Uso: /%s, esconde os botões do bate-papo."
+
+#: ../src/chat_control2.py:1330 ../src/chat_control.py:1341
+#: ../src/groupchat_control.py:1491
+#, python-format
+msgid ""
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
+msgstr ""
+"Uso: /%s <ação>, emite a ação à  sala atual. Use a terceira pessoa (por "
+"exemplo: /%s explodes.)"
+
+#: ../src/chat_control2.py:1334 ../src/chat_control.py:1345
+#, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr "Uso: /%s, envia um ping para o contato"
+
+#: ../src/chat_control2.py:1337 ../src/chat_control.py:1348
+#, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "Uso: /%s, envia a mensagem para o contato"
+
+#: ../src/chat_control2.py:1340 ../src/chat_control.py:1351
+#: ../src/groupchat_control.py:1514
+#, python-format
+msgid "No help info for /%s"
+msgstr "Sem ajuda para /%s"
+
+#: ../src/chat_control2.py:1478 ../src/chat_control2.py:1504
+#: ../src/chat_control.py:1489 ../src/chat_control.py:1515
 msgid "Encryption enabled"
 msgstr "Criptografia habilitada"
 
-#: ../src/chat_control.py:1280
+#: ../src/chat_control2.py:1483 ../src/chat_control.py:1494
+msgid "Session WILL be logged"
+msgstr "A sessão SERÁ gravada"
+
+#: ../src/chat_control2.py:1485 ../src/chat_control.py:1496
+msgid "Session WILL NOT be logged"
+msgstr "A sessão NÃO SERÁ gravada"
+
+#: ../src/chat_control2.py:1492 ../src/chat_control.py:1503
+msgid "The following message was NOT encrypted"
+msgstr "A seguinte mensagem NÃO estava criptografada"
+
+#: ../src/chat_control2.py:1496 ../src/chat_control2.py:1509
+#: ../src/chat_control2.py:2155 ../src/chat_control.py:1507
+#: ../src/chat_control.py:1520 ../src/chat_control.py:2166
 msgid "Encryption disabled"
 msgstr "Criptografia desabilitada"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1425 ../src/conversation_textview.py:502
-#: ../src/dialogs.py:629 ../src/gajim.py:850 ../src/gajim.py:851
-#: ../src/gajim.py:1196 ../src/roster_window.py:333
-#: ../src/roster_window.py:411 ../src/roster_window.py:1497
-#: ../src/roster_window.py:1507 ../src/roster_window.py:1686
-#: ../src/roster_window.py:1892 ../src/roster_window.py:2477
-#: ../src/roster_window.py:2678 ../src/roster_window.py:3924
-#: ../src/roster_window.py:3926 ../src/common/contacts.py:73
-#: ../src/common/helpers.py:43 ../src/common/helpers.py:255
+#: ../src/chat_control2.py:1672 ../src/chat_control.py:1683
+#: ../src/conversation_textview.py:705 ../src/dialogs.py:732
+#: ../src/gajim.py:911 ../src/gajim.py:912 ../src/gajim.py:1436
+#: ../src/gajim.py:1687 ../src/roster_window.py:358
+#: ../src/roster_window.py:442 ../src/roster_window.py:1822
+#: ../src/roster_window.py:1832 ../src/roster_window.py:2072
+#: ../src/roster_window.py:2308 ../src/roster_window.py:3158
+#: ../src/roster_window.py:3397 ../src/roster_window.py:4759
+#: ../src/roster_window.py:4761 ../src/common/contacts.py:89
+#: ../src/common/helpers.py:53 ../src/common/helpers.py:267
 msgid "Not in Roster"
 msgstr "Fora da lista"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1571
+#: ../src/chat_control2.py:1825 ../src/chat_control.py:1836
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Você acabou de receber uma nova mensagem de \"%s\""
 
-#: ../src/chat_control.py:1572
+#: ../src/chat_control2.py:1826 ../src/chat_control.py:1837
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2648,29 +2876,32 @@ msgstr ""
 "Se você fechar esta aba e o histórico estiver desabilitado, esta mensagem "
 "será perdida."
 
-#: ../src/config.py:139 ../src/config.py:588
+#: ../src/config.py:127 ../src/config.py:565
 msgid "Disabled"
 msgstr "Desabilitado"
 
-#: ../src/config.py:233
-#, python-format
-msgid "Every %s _minutes"
-msgstr "A cada %s _minutos"
-
-#: ../src/config.py:353
+#: ../src/config.py:293
 msgid "Active"
 msgstr "Ativo"
 
-#: ../src/config.py:361
+#: ../src/config.py:301
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:684 ../src/gajim.py:2263
+#: ../src/config.py:407
+msgid "Always use OS/X default applications"
+msgstr "Sempre usar as aplicações padrões do OS/X"
+
+#: ../src/config.py:408
+msgid "Custom"
+msgstr "Personalizar"
+
+#: ../src/config.py:638 ../src/dialogs.py:1018
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "O dicionário para o idioma %s não está disponível"
 
-#: ../src/config.py:685 ../src/gajim.py:2264
+#: ../src/config.py:639
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -2679,71 +2910,103 @@ msgstr ""
 "Você precisa instalar o dicionário %s para usar a correção ortográfica ou "
 "selecionar outro idioma ajustando a opção 'speller_language'."
 
-#: ../src/config.py:1008
+#: ../src/config.py:1001
 msgid "status message title"
 msgstr "título da mensagem de status"
 
-#: ../src/config.py:1008
+#: ../src/config.py:1001
 msgid "status message text"
 msgstr "texto da mensagem de status"
 
-#: ../src/config.py:1044
+#: ../src/config.py:1037
 msgid "First Message Received"
 msgstr "Primeira Mensagem Recebida"
 
-#: ../src/config.py:1045
+#: ../src/config.py:1038
 msgid "Next Message Received"
 msgstr "Nova Mensagem Recebida"
 
-#: ../src/config.py:1046
+#: ../src/config.py:1039
 msgid "Contact Connected"
 msgstr "Contato Conectado"
 
-#: ../src/config.py:1047
+#: ../src/config.py:1040
 msgid "Contact Disconnected"
 msgstr "Contato Desconectou"
 
-#: ../src/config.py:1048
+#: ../src/config.py:1041
 msgid "Message Sent"
 msgstr "Mensagem Enviada"
 
-#: ../src/config.py:1049
+#: ../src/config.py:1042
 msgid "Group Chat Message Highlight"
 msgstr "Mensagem Destacada de Conferência"
 
-#: ../src/config.py:1050
+#: ../src/config.py:1043
 msgid "Group Chat Message Received"
 msgstr "Mensagem de Conferência Recebida"
 
-#: ../src/config.py:1057
+#: ../src/config.py:1050
 msgid "GMail Email Received"
 msgstr "Email do Gmail Recebido"
 
-#: ../src/config.py:1260
+#. Name column
+#: ../src/config.py:1319 ../src/dialogs.py:1517 ../src/dialogs.py:1581
+#: ../src/disco.py:743 ../src/disco.py:1569 ../src/disco.py:1815
+#: ../src/history_window.py:113
+msgid "Name"
+msgstr "Nome"
+
+#: ../src/config.py:1425 ../src/common/config.py:393
+msgid "Be right back."
+msgstr "Estou de volta."
+
+#: ../src/config.py:1429
+msgid "Relogin now?"
+msgstr "Re-autenticar agora?"
+
+#: ../src/config.py:1430
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr "Se você quer aplicar todas as mudanças, deve se re-autenticar."
+
+#: ../src/config.py:1525 ../src/config.py:1616
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP não disponível neste computador"
 
-#: ../src/config.py:1306
+#: ../src/config.py:1652 ../src/config.py:1693
+msgid "Unread events"
+msgstr "Eventos não lidos"
+
+#: ../src/config.py:1653
+msgid "Read all pending events before removing this account."
+msgstr "Ler todos os eventos pendentes antes de remover esta conta."
+
+#: ../src/config.py:1679
+#, python-format
+msgid "You have opened chat in account %s"
+msgstr "Você iniciou uma conversa usando a conta %s"
+
+#: ../src/config.py:1680
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr "Todas as janelas de conversa e conferência serão fechadas. Confirma?"
+
+#: ../src/config.py:1689
 msgid "You are currently connected to the server"
 msgstr "Você está atualmente conectado ao servidor"
 
-#: ../src/config.py:1307
+#: ../src/config.py:1690
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, você deve estar disconectado."
 
-#: ../src/config.py:1310 ../src/config.py:1916
-msgid "Unread events"
-msgstr "Eventos não lidos"
-
-#: ../src/config.py:1311
+#: ../src/config.py:1694
 msgid "To change the account name, you must read all pending events."
 msgstr "Para mudar o nome da conta, você deve ler todas os eventos pendentes."
 
-#: ../src/config.py:1315
+#: ../src/config.py:1700
 msgid "Account Name Already Used"
 msgstr "Nome de conta já está em uso"
 
-#: ../src/config.py:1316
+#: ../src/config.py:1701
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2751,174 +3014,147 @@ msgstr ""
 "Este nome já está sendo usado por outra de suas contas. Por favor, escolha "
 "outro nome."
 
-#: ../src/config.py:1320 ../src/config.py:1324
+#: ../src/config.py:1705 ../src/config.py:1709
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
 
-#: ../src/config.py:1321
+#: ../src/config.py:1706
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio."
 
-#: ../src/config.py:1325
+#: ../src/config.py:1710
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços."
 
-#: ../src/config.py:1333 ../src/config.py:1339 ../src/config.py:1349
-#: ../src/config.py:2900
+#: ../src/config.py:1774
+msgid "Rename Account"
+msgstr "Renomear Conta"
+
+#: ../src/config.py:1775
+#, python-format
+msgid "Enter a new name for account %s"
+msgstr "Entre com um novo nome para a conta %s"
+
+#: ../src/config.py:1793 ../src/config.py:1801 ../src/config.py:1841
+#: ../src/config.py:3048 ../src/dataforms_widget.py:533
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID Inválido:"
 
-#: ../src/config.py:1340
+#: ../src/config.py:1802
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Um Jabber ID deve ter o seguinte formato \"usuário@nomedoservidor\"."
 
-#: ../src/config.py:1399
+#: ../src/config.py:1988 ../src/config.py:3119
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:1400
+#: ../src/config.py:1989 ../src/config.py:3120
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta."
 
-#: ../src/config.py:1528 ../src/common/config.py:367
-msgid "Be right back."
-msgstr "Estou de volta."
+#: ../src/config.py:2010
+msgid "Failed to get secret keys"
+msgstr "Falha enquanto recebia as chaves secretas"
 
-#: ../src/config.py:1538
-msgid "Relogin now?"
-msgstr "Re-autenticar agora?"
+#: ../src/config.py:2011
+msgid "There was a problem retrieving your OpenPGP secret keys."
+msgstr "Houve um problema no recebimento de suas chaves secretas OpenPGP."
 
-#: ../src/config.py:1539
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr "Se você quer aplicar todas as mudanças, deve se re-autenticar."
+#: ../src/config.py:2014
+msgid "OpenPGP Key Selection"
+msgstr "Seleção de Chave OpenPGP"
 
-#: ../src/config.py:1565
+#: ../src/config.py:2015
+msgid "Choose your OpenPGP key"
+msgstr "Escolha sua chave OpenPGP"
+
+#: ../src/config.py:2055
 msgid "No such account available"
 msgstr "Conta não disponível"
 
-#: ../src/config.py:1566
+#: ../src/config.py:2056
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Você deve primeiro criar sua conta antes de editar suas informações pessoais."
 
-#: ../src/config.py:1573 ../src/dialogs.py:1190 ../src/dialogs.py:1326
-#: ../src/dialogs.py:1506 ../src/disco.py:420 ../src/profile_window.py:323
+#: ../src/config.py:2063 ../src/dialogs.py:1364 ../src/dialogs.py:1505
+#: ../src/dialogs.py:1685 ../src/disco.py:427 ../src/profile_window.py:318
 msgid "You are not connected to the server"
 msgstr "Você não está conectado ao servidor"
 
-#: ../src/config.py:1574
+#: ../src/config.py:2064
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Você deve estar conectado para editar suas informações pessoais."
 
-#: ../src/config.py:1578
+#: ../src/config.py:2068
 msgid "Your server doesn't support Vcard"
 msgstr "Seu servidor não suporta Vcard"
 
-#: ../src/config.py:1579
+#: ../src/config.py:2069
 msgid "Your server can't save your personal information."
 msgstr "Seu servidor não pode salvar suas informações pessoais."
 
-#: ../src/config.py:1610 ../src/config.py:3288
-msgid "Failed to get secret keys"
-msgstr "Falha enquanto recebia as chaves secretas"
-
-#: ../src/config.py:1611 ../src/config.py:3289
-msgid "There was a problem retrieving your OpenPGP secret keys."
-msgstr "Houve um problema no recebimento de suas chaves secretas OpenPGP."
-
-#: ../src/config.py:1614 ../src/config.py:3292
-msgid "OpenPGP Key Selection"
-msgstr "Seleção de Chave OpenPGP"
-
-#: ../src/config.py:1615 ../src/config.py:3293
-msgid "Choose your OpenPGP key"
-msgstr "Escolha sua chave OpenPGP"
-
-#. Name column
-#: ../src/config.py:1850 ../src/dialogs.py:1338 ../src/dialogs.py:1402
-#: ../src/disco.py:741 ../src/disco.py:1564 ../src/disco.py:1802
-#: ../src/history_window.py:78
-msgid "Name"
-msgstr "Nome"
-
-#: ../src/config.py:1853 ../src/dialogs.py:1341
-msgid "Server"
-msgstr "Servidor"
-
-#: ../src/config.py:1917
-msgid "Read all pending events before removing this account."
-msgstr "Ler todos os eventos pendentes antes de remover esta conta."
-
-#: ../src/config.py:1954
-#, python-format
-msgid "You have opened chat in account %s"
-msgstr "Você iniciou uma conversa usando a conta %s"
-
-#: ../src/config.py:1955
-msgid "All chat and groupchat windows will be closed. Do you want to continue?"
-msgstr "Todas as janelas de conversa e conferência serão fechadas. Confirma?"
-
-#: ../src/config.py:2014
+#: ../src/config.py:2100
 msgid "Account Local already exists."
 msgstr "Conta local já existe."
 
-#: ../src/config.py:2015
+#: ../src/config.py:2101
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Por favor renomeie ou remova-o antes de ativar troca de mensagens \"link-"
 "local\"."
 
-#: ../src/config.py:2111
+#: ../src/config.py:2277
 #, python-format
 msgid "Edit %s"
 msgstr "_Editar %s"
 
-#: ../src/config.py:2113
+#: ../src/config.py:2279
 #, python-format
 msgid "Register to %s"
 msgstr "Registro para %s"
 
 #. list at the beginning
-#: ../src/config.py:2179
+#: ../src/config.py:2315
 msgid "Ban List"
 msgstr "Lista de Banidos"
 
-#: ../src/config.py:2180
+#: ../src/config.py:2316
 msgid "Member List"
 msgstr "Lista de Membros"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2317
 msgid "Owner List"
 msgstr "Lista de Donos"
 
-#: ../src/config.py:2182
+#: ../src/config.py:2318
 msgid "Administrator List"
 msgstr "Lista de Administradores"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2231 ../src/disco.py:748 ../src/history_manager.py:155
+#: ../src/config.py:2367 ../src/disco.py:750 ../src/history_manager.py:160
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2239
+#: ../src/config.py:2375
 msgid "Reason"
 msgstr "Razão"
 
-#: ../src/config.py:2244
+#: ../src/config.py:2380
 msgid "Nick"
 msgstr "Apelido"
 
-#: ../src/config.py:2248
+#: ../src/config.py:2384
 msgid "Role"
 msgstr "Lista"
 
-#: ../src/config.py:2273
+#: ../src/config.py:2409
 msgid "Banning..."
 msgstr "Banindo..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2275
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2926,11 +3162,11 @@ msgstr ""
 "<b>Quem você quer banir?</b>\n"
 "\n"
 
-#: ../src/config.py:2277
+#: ../src/config.py:2413
 msgid "Adding Member..."
 msgstr "Adicionando Membro..."
 
-#: ../src/config.py:2278
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2938,11 +3174,11 @@ msgstr ""
 "<b>Quem você quer fazer como membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2280
+#: ../src/config.py:2416
 msgid "Adding Owner..."
 msgstr "Adicionando Proprietário..."
 
-#: ../src/config.py:2281
+#: ../src/config.py:2417
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -2950,11 +3186,11 @@ msgstr ""
 "<b>Quem você quer tornar um dono?</b>\n"
 "\n"
 
-#: ../src/config.py:2283
+#: ../src/config.py:2419
 msgid "Adding Administrator..."
 msgstr "Adicionando Administrador..."
 
-#: ../src/config.py:2284
+#: ../src/config.py:2420
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2962,7 +3198,7 @@ msgstr ""
 "<b>Quem você quer tornar um administrador?</b>\n"
 "\n"
 
-#: ../src/config.py:2285
+#: ../src/config.py:2421
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2978,101 +3214,85 @@ msgstr ""
 "4. domínio (o domínio combina por si com qualquer usuario@domínio,\n"
 "domínio/recurso, ou endereço contendo um subdomínio."
 
-#: ../src/config.py:2389
+#: ../src/config.py:2525
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2406 ../src/roster_window.py:2737
+#: ../src/config.py:2540 ../src/gajim.py:1343 ../src/roster_window.py:3455
 msgid "Password Required"
 msgstr "Senha é obrigatória"
 
-#: ../src/config.py:2407 ../src/roster_window.py:2733
+#: ../src/config.py:2541 ../src/roster_window.py:3451
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entre com a senha para conta %s"
 
-#: ../src/config.py:2408 ../src/roster_window.py:2738
+#: ../src/config.py:2542 ../src/roster_window.py:3456
 msgid "Save password"
 msgstr "Salvar senha"
 
-#: ../src/config.py:2422
+#: ../src/config.py:2555
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Conta \"%s\" está conectada ao servidor"
 
-#: ../src/config.py:2423
+#: ../src/config.py:2556
 msgid "If you remove it, the connection will be lost."
 msgstr "Se você remover-lo, a conexão será perdida."
 
-#: ../src/config.py:2508
+#: ../src/config.py:2649
 msgid "Default"
 msgstr "Padrão"
 
-#: ../src/config.py:2508
+#: ../src/config.py:2649
 msgid "?print_status:All"
 msgstr "?exibir_status:Todos"
 
-#: ../src/config.py:2509
+#: ../src/config.py:2650
 msgid "Enter and leave only"
 msgstr "Apenas entre e saia"
 
-#: ../src/config.py:2510
+#: ../src/config.py:2651
 msgid "?print_status:None"
 msgstr "?exibir_status:Nenhum"
 
-#: ../src/config.py:2578
+#: ../src/config.py:2720
 msgid "New Group Chat"
 msgstr "Nova Conferência"
 
-#: ../src/config.py:2611
+#: ../src/config.py:2753
 msgid "This bookmark has invalid data"
 msgstr "Bookmark tem dados inválidos"
 
-#: ../src/config.py:2612
+#: ../src/config.py:2754
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Por favor, tenha certeza que preencheu os campos servidor e sala ou remova "
 "este bookmark"
 
-#: ../src/config.py:2875
+#: ../src/config.py:3031
 msgid "Invalid username"
 msgstr "Nome de usuário inválido"
 
-#: ../src/config.py:2876
+#: ../src/config.py:3033
 msgid "You must provide a username to configure this account."
 msgstr "Você deve entrar com um nome para configurar esta conta."
 
-#: ../src/config.py:2886 ../src/dialogs.py:1525
-msgid "Invalid password"
-msgstr "Senha Inválida"
-
-#: ../src/config.py:2887
-msgid "You must enter a password for the new account."
-msgstr "Você deve entrar com uma senha para registrar uma nova conta."
-
-#: ../src/config.py:2891 ../src/dialogs.py:1530
-msgid "Passwords do not match"
-msgstr "Senhas não conferem"
-
-#: ../src/config.py:2892 ../src/dialogs.py:1531
-msgid "The passwords typed in both fields must be identical."
-msgstr "As senhas digitadas em ambos os campos devem ser idênticas."
-
-#: ../src/config.py:2911
+#: ../src/config.py:3059
 msgid "Duplicate Jabber ID"
 msgstr "Jabber ID Duplicado"
 
-#: ../src/config.py:2912
+#: ../src/config.py:3060
 msgid "This account is already configured in Gajim."
 msgstr "Esta conta já está configurada no Gajim."
 
-#: ../src/config.py:2929
+#: ../src/config.py:3077
 msgid "Account has been added successfully"
 msgstr "Conta foi adicionada com sucesso"
 
-#: ../src/config.py:2930 ../src/config.py:2965
+#: ../src/config.py:3078 ../src/config.py:3223
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -3082,23 +3302,31 @@ msgstr ""
 "Avançado, ou mais tarde clicando em Contas no menu Editar da janela "
 "principal."
 
-#: ../src/config.py:2964
-msgid "Your new account has been created successfully"
-msgstr "Sua nova conta foi criada com sucesso"
+#: ../src/config.py:3095
+msgid "Invalid server"
+msgstr "Servidor inválido"
 
-#: ../src/config.py:2982
+#: ../src/config.py:3096
+msgid "Please provide a server on which you want to register."
+msgstr "Por favor, forneça um servidor no qual você queira se registrar."
+
+#: ../src/config.py:3202 ../src/config.py:3241
 msgid "An error occurred during account creation"
 msgstr "Um erro ocorreu durante a criação da conta"
 
-#: ../src/config.py:3040
+#: ../src/config.py:3222
+msgid "Your new account has been created successfully"
+msgstr "Sua nova conta foi criada com sucesso"
+
+#: ../src/config.py:3325
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:3041
+#: ../src/config.py:3326
 msgid "You already have an account using this name."
 msgstr "Você já tem uma conta usando este nome."
 
-#: ../src/conversation_textview.py:280
+#: ../src/conversation_textview.py:454
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3106,191 +3334,220 @@ msgstr ""
 "O texto abaixo desta linha é o que foi dito desde a última vez onde você "
 "prestou a atenção a conferência"
 
-#: ../src/conversation_textview.py:349
+#: ../src/conversation_textview.py:552
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Ações para \"%s\""
 
-#: ../src/conversation_textview.py:361
+#: ../src/conversation_textview.py:564
 msgid "Read _Wikipedia Article"
 msgstr "Ler Artigo da _Wikipedia"
 
-#: ../src/conversation_textview.py:366
+#: ../src/conversation_textview.py:569
 msgid "Look it up in _Dictionary"
 msgstr "Procurar no _Dicionário"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:382
+#: ../src/conversation_textview.py:585
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL do Dicionário não existe \"%s\" e isto não é WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:395
+#: ../src/conversation_textview.py:598
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL de Procura na Web não existe \"%s\""
 
-#: ../src/conversation_textview.py:398
+#: ../src/conversation_textview.py:601
 msgid "Web _Search for it"
 msgstr "_Procura na Web por isto"
 
-#: ../src/conversation_textview.py:404
+#: ../src/conversation_textview.py:607
 msgid "Open as _Link"
 msgstr "Abrir como _Link"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:1073
 msgid "Yesterday"
 msgstr "Ontem"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:769
+#: ../src/conversation_textview.py:1077
 #, python-format
 msgid "%i days ago"
 msgstr "%i dias atrás"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:803
+#: ../src/conversation_textview.py:1111
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
 
-#: ../src/dialogs.py:59
+#: ../src/dataforms_widget.py:537
+msgid "Jabber ID already in list"
+msgstr "Jabber ID já existente na lista"
+
+#: ../src/dataforms_widget.py:538
+msgid "The Jabber ID you entered is already in the list. Choose another one."
+msgstr "O Jabber ID que você forneceu já está na lista. Escolha outro."
+
+#. Default jid
+#: ../src/dataforms_widget.py:549
+msgid "new@jabber.id"
+msgstr "novo@jabber.id"
+
+#: ../src/dataforms_widget.py:552 ../src/dataforms_widget.py:554
+#, python-format
+msgid "new%d@jabber.id"
+msgstr "novo%d@jabber.id"
+
+#: ../src/dialogs.py:71
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome do Contato: <i>%s</i>"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:73
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:211
+#: ../src/dialogs.py:223
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:230
 msgid "In the group"
 msgstr "Neste grupo"
 
-#: ../src/dialogs.py:269
+#: ../src/dialogs.py:330
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:335
 msgid "Contact name"
 msgstr "Nome do Contato"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:381
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Mensagem de status"
 
-#: ../src/dialogs.py:320
+#: ../src/dialogs.py:383
 msgid "Status Message"
 msgstr "Mensagem de status"
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:483
 msgid "Save as Preset Status Message"
 msgstr "Salvar como a mensagem de status pré-configurada"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:484
 msgid "Please type a name for this status message"
 msgstr "Por favor, escreva um nome para esta mensagem de status"
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:495
+msgid "Overwrite Status Message?"
+msgstr "Sobrescrever Mensagem de Status?"
+
+#: ../src/dialogs.py:496
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr ""
+"Este nome já está sendo usado. Você quer sobrescrever essa mensagem de "
+"status?"
+
+#: ../src/dialogs.py:512
 msgid "AIM Address:"
 msgstr "Endereço AIM:"
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:513
 msgid "GG Number:"
 msgstr "Número de GG:"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:514
 msgid "ICQ Number:"
 msgstr "Número de ICQ:"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:515
 msgid "MSN Address:"
 msgstr "Endereço MSN:"
 
-#: ../src/dialogs.py:421
+#: ../src/dialogs.py:516
 msgid "Yahoo! Address:"
 msgstr "Endereço Yahoo!:"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:553
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Por favor, preencha os dados do contato se você quer adicionar na conta %s"
 
-#: ../src/dialogs.py:459
+#: ../src/dialogs.py:555
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor preencha os dados do contato que você quer adicionar"
 
-#: ../src/dialogs.py:609 ../src/dialogs.py:615
+#: ../src/dialogs.py:712 ../src/dialogs.py:718
 msgid "Invalid User ID"
 msgstr "Inválido ID do usuário"
 
-#: ../src/dialogs.py:616
+#: ../src/dialogs.py:719
 msgid "The user ID must not contain a resource."
 msgstr "O ID do usuário não contém um recurso."
 
-#: ../src/dialogs.py:630
+#: ../src/dialogs.py:733
 msgid "Contact already in roster"
 msgstr "Contato já foi adicionado à  lista"
 
-#: ../src/dialogs.py:631
+#: ../src/dialogs.py:734
 msgid "This contact is already listed in your roster."
 msgstr "Este contato já encontra-se em sua lista."
 
-#: ../src/dialogs.py:668
+#: ../src/dialogs.py:770
 msgid "User ID:"
 msgstr "ID do Usuário:"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:832
 msgid "A GTK+ jabber client"
 msgstr "Um cliente jabber GTK+"
 
-#: ../src/dialogs.py:732
+#: ../src/dialogs.py:833
 msgid "GTK+ Version:"
 msgstr "Versão do GTK+:"
 
-#: ../src/dialogs.py:733
+#: ../src/dialogs.py:834
 msgid "PyGTK Version:"
 msgstr "Versão do PyGTK:"
 
-#: ../src/dialogs.py:747
+#: ../src/dialogs.py:848
 msgid "Current Developers:"
 msgstr "Desenvolvedores Atuais:"
 
-#: ../src/dialogs.py:749
+#: ../src/dialogs.py:850
 msgid "Past Developers:"
 msgstr "Desenvolvedores Passados:"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:860
 msgid "THANKS:"
 msgstr "AGRADECIMENTOS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:765
+#: ../src/dialogs.py:866
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Nós gostaríamos de agradecer todos os mantedores do pacote."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:778
+#: ../src/dialogs.py:879
 msgid "translator-credits"
 msgstr ""
 "Alfredo Jr. - Junix <junix@infolink.com.br> e Juracy Filho <juracy@gmail.com>"
 
-#: ../src/dialogs.py:908
+#: ../src/dialogs.py:1011
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Impossível conectar à porta %s."
 
-#: ../src/dialogs.py:909
+#: ../src/dialogs.py:1012
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -3298,76 +3555,93 @@ msgstr ""
 "Talvez haja uma outra instância do Gajim em execução. A Transferência de "
 "Arquivos será cancelada."
 
-#: ../src/dialogs.py:1120
+#: ../src/dialogs.py:1019
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option.\n"
+"\n"
+"Highlighting misspelled words feature will not be used"
+msgstr ""
+"Você precisa instalar o dicionário %s para usar a correção ortográfica ou "
+"selecionar outro idioma definindo a opção speller_language.\n"
+"\n"
+"O recurso de destacar palavras grafadas incorretamente não será usado"
+
+#: ../src/dialogs.py:1293
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Solicitação de inscrição para conta %s de %s"
 
-#: ../src/dialogs.py:1123
+#: ../src/dialogs.py:1296
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Solicitação de inscrição de %s"
 
-#: ../src/dialogs.py:1183 ../src/roster_window.py:687
+#: ../src/dialogs.py:1357 ../src/roster_window.py:776
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Você já está na conferência %s"
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1365
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Você não pode ingressar em uma sala de conferência até que esteja conectado."
 
-#: ../src/dialogs.py:1206
+#: ../src/dialogs.py:1383
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Ingressar numa conferência com a conta %s"
 
-#: ../src/dialogs.py:1274 ../src/dialogs.py:1280
-#: ../src/groupchat_control.py:1475
+#: ../src/dialogs.py:1453 ../src/dialogs.py:1459
+#: ../src/groupchat_control.py:1683
 msgid "Invalid group chat Jabber ID"
 msgstr "Jabber ID da conferência inválido:"
 
-#: ../src/dialogs.py:1275 ../src/dialogs.py:1281
-#: ../src/groupchat_control.py:1476
+#: ../src/dialogs.py:1454 ../src/dialogs.py:1460
+#: ../src/groupchat_control.py:1684
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "O Jabber ID da conferência possui caracteres não permitidos."
 
-#: ../src/dialogs.py:1287
+#: ../src/dialogs.py:1466
 msgid "This is not a group chat"
 msgstr "Isto não é uma conferência"
 
-#: ../src/dialogs.py:1288
+#: ../src/dialogs.py:1467
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s não é o nome da conferência."
 
-#: ../src/dialogs.py:1327
+#: ../src/dialogs.py:1506
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sem uma conexão, você pode não sincronizar seus contatos."
 
-#: ../src/dialogs.py:1374
+#: ../src/dialogs.py:1520
+msgid "Server"
+msgstr "Servidor"
+
+#: ../src/dialogs.py:1553
 msgid "This account is not connected to the server"
 msgstr "Esta conta não está conectada ao servidor"
 
-#: ../src/dialogs.py:1375
+#: ../src/dialogs.py:1554
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Você não pode sincronizar com uma conta a menos que esteja conectado."
 
-#: ../src/dialogs.py:1399
+#: ../src/dialogs.py:1578
 msgid "Synchronise"
 msgstr "Sincronizar"
 
-#: ../src/dialogs.py:1457
+#: ../src/dialogs.py:1636
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar uma conferência com a conta %s"
 
-#: ../src/dialogs.py:1459
+#: ../src/dialogs.py:1638
 msgid "Start Chat"
 msgstr "Iniciar conversa"
 
-#: ../src/dialogs.py:1460
+#: ../src/dialogs.py:1639
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -3376,270 +3650,290 @@ msgstr ""
 "você quer enviar uma messagem:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1485 ../src/dialogs.py:1844 ../src/dialogs.py:1975
+#: ../src/dialogs.py:1664 ../src/dialogs.py:2040 ../src/dialogs.py:2181
 msgid "Connection not available"
 msgstr "Conexão não disponível"
 
-#: ../src/dialogs.py:1486 ../src/dialogs.py:1845 ../src/dialogs.py:1976
+#: ../src/dialogs.py:1665 ../src/dialogs.py:2041 ../src/dialogs.py:2182
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, tenha certeza que você está conectado com \"%s\"."
 
-#: ../src/dialogs.py:1495 ../src/dialogs.py:1498
+#: ../src/dialogs.py:1674 ../src/dialogs.py:1677
 msgid "Invalid JID"
 msgstr "JID inválido:"
 
-#: ../src/dialogs.py:1498
+#: ../src/dialogs.py:1677
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossível gravar o arquivo em \"%s\"."
 
-#: ../src/dialogs.py:1507
+#: ../src/dialogs.py:1686
 msgid "Without a connection, you can not change your password."
 msgstr "Você deve estar contectado para mudar sua senha"
 
-#: ../src/dialogs.py:1526
+#: ../src/dialogs.py:1704
+msgid "Invalid password"
+msgstr "Senha Inválida"
+
+#: ../src/dialogs.py:1705
 msgid "You must enter a password."
 msgstr "Você deve entrar com uma senha."
 
+#: ../src/dialogs.py:1709
+msgid "Passwords do not match"
+msgstr "Senhas não conferem"
+
+#: ../src/dialogs.py:1710
+msgid "The passwords typed in both fields must be identical."
+msgstr "As senhas digitadas em ambos os campos devem ser idênticas."
+
 #. img to display
 #. default value
-#: ../src/dialogs.py:1573 ../src/notify.py:212 ../src/notify.py:416
+#: ../src/dialogs.py:1752 ../src/notify.py:232 ../src/notify.py:447
 msgid "Contact Signed In"
 msgstr "Contato conectou"
 
-#: ../src/dialogs.py:1575 ../src/notify.py:220 ../src/notify.py:418
+#: ../src/dialogs.py:1754 ../src/notify.py:240 ../src/notify.py:449
 msgid "Contact Signed Out"
 msgstr "Contato desconectou"
 
 #. chat message
-#: ../src/dialogs.py:1577 ../src/notify.py:239 ../src/notify.py:420
+#: ../src/dialogs.py:1756 ../src/notify.py:263 ../src/notify.py:451
 msgid "New Message"
 msgstr "Nova Mensagem"
 
 #. single message
-#: ../src/dialogs.py:1577 ../src/notify.py:224 ../src/notify.py:420
+#: ../src/dialogs.py:1756 ../src/notify.py:244 ../src/notify.py:451
 msgid "New Single Message"
 msgstr "Nova Mensagem"
 
 #. private message
-#: ../src/dialogs.py:1578 ../src/notify.py:231 ../src/notify.py:421
+#: ../src/dialogs.py:1757 ../src/notify.py:251 ../src/notify.py:452
 msgid "New Private Message"
 msgstr "Enviar Mensagem Privada"
 
-#: ../src/dialogs.py:1578 ../src/gajim.py:1291 ../src/notify.py:429
+#: ../src/dialogs.py:1757 ../src/gajim.py:1532 ../src/notify.py:460
 msgid "New E-mail"
 msgstr "Novo E-Mail"
 
-#: ../src/dialogs.py:1580 ../src/gajim.py:1444 ../src/notify.py:423
+#: ../src/dialogs.py:1759 ../src/gajim.py:1707 ../src/notify.py:454
 msgid "File Transfer Request"
 msgstr "Solicitação de Transferência de Arquivos"
 
-#: ../src/dialogs.py:1582 ../src/gajim.py:1263 ../src/gajim.py:1420
-#: ../src/notify.py:425
+#: ../src/dialogs.py:1761 ../src/gajim.py:1504 ../src/gajim.py:1674
+#: ../src/notify.py:456
 msgid "File Transfer Error"
 msgstr "Erro na Transferência de Arquivos"
 
-#: ../src/dialogs.py:1584 ../src/gajim.py:1483 ../src/gajim.py:1505
-#: ../src/gajim.py:1522 ../src/notify.py:427
+#: ../src/dialogs.py:1763 ../src/gajim.py:1746 ../src/gajim.py:1768
+#: ../src/gajim.py:1785 ../src/notify.py:458
 msgid "File Transfer Completed"
 msgstr "Transferência do Arquivo Completa"
 
-#: ../src/dialogs.py:1585 ../src/gajim.py:1486 ../src/notify.py:427
+#: ../src/dialogs.py:1764 ../src/gajim.py:1749 ../src/notify.py:458
 msgid "File Transfer Stopped"
 msgstr "Transferência do Arquivo Parada"
 
-#: ../src/dialogs.py:1587 ../src/gajim.py:1160 ../src/notify.py:431
+#: ../src/dialogs.py:1766 ../src/gajim.py:1364 ../src/notify.py:462
 msgid "Groupchat Invitation"
 msgstr "Convite para Conferência"
 
-#: ../src/dialogs.py:1589 ../src/notify.py:204 ../src/notify.py:433
+#: ../src/dialogs.py:1768 ../src/notify.py:224 ../src/notify.py:464
 msgid "Contact Changed Status"
 msgstr "O Contato Alterou seu Status"
 
-#: ../src/dialogs.py:1774
+#: ../src/dialogs.py:1959
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mensagem Simples usando conta %s"
 
-#: ../src/dialogs.py:1776
+#: ../src/dialogs.py:1961
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Mensagem Simples na conta %s"
 
-#: ../src/dialogs.py:1778
+#: ../src/dialogs.py:1963
 msgid "Single Message"
 msgstr "Mensagem simples"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1781
+#: ../src/dialogs.py:1966
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1804
+#: ../src/dialogs.py:1989
 #, python-format
 msgid "Received %s"
 msgstr "Recebido %s"
 
+#. prepare UI for Receiving
+#: ../src/dialogs.py:2012
+#, python-format
+msgid "Form %s"
+msgstr "Formulário %s"
+
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1876
+#: ../src/dialogs.py:2082
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1877
+#: ../src/dialogs.py:2083
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: ../src/dialogs.py:1921
+#: ../src/dialogs.py:2127
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML para %s"
 
-#: ../src/dialogs.py:1923
+#: ../src/dialogs.py:2129
 msgid "XML Console"
 msgstr "Console XML"
 
-#: ../src/dialogs.py:2046
+#: ../src/dialogs.py:2252
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista de Privacidade <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2050
+#: ../src/dialogs.py:2256
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista de Privacidade para %s"
 
-#: ../src/dialogs.py:2098
+#: ../src/dialogs.py:2312
 #, python-format
 msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr "Ordem: %s, ação: %s tipo: %s, valor: %s"
 
-#: ../src/dialogs.py:2101
+#: ../src/dialogs.py:2315
 #, python-format
 msgid "Order: %s, action: %s"
 msgstr "Ordem: %s, ação: %s"
 
-#: ../src/dialogs.py:2143
+#: ../src/dialogs.py:2357
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Editar uma regra</b>"
 
-#: ../src/dialogs.py:2230
+#: ../src/dialogs.py:2444
 msgid "<b>Add a rule</b>"
 msgstr "<b>Adicionar uma regra</b>"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Lista de Privacidade para %s"
 
-#: ../src/dialogs.py:2328
+#: ../src/dialogs.py:2542
 msgid "Privacy Lists"
 msgstr "Listas de Privacidade"
 
-#: ../src/dialogs.py:2398
+#: ../src/dialogs.py:2612
 msgid "Invalid List Name"
 msgstr "Nome de Lista Inválido"
 
-#: ../src/dialogs.py:2399
+#: ../src/dialogs.py:2613
 msgid "You must enter a name to create a privacy list."
 msgstr "Você deve digitar um nome para criar uma lista de privacidade."
 
-#. Don't translate $Contact
-#: ../src/dialogs.py:2433
+#: ../src/dialogs.py:2650
+msgid "$Contact has invited you to join a discussion"
+msgstr "$Contact convidou você para ingressar em uma discussão"
+
+#: ../src/dialogs.py:2652
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact convidou você para entrar na conferência %(room_jid)s"
 
-#. only if not None and not ''
-#: ../src/dialogs.py:2445
+#: ../src/dialogs.py:2665
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: ../src/dialogs.py:2507
+#: ../src/dialogs.py:2731
 msgid "Choose Sound"
 msgstr "Escolher Som"
 
-#: ../src/dialogs.py:2517 ../src/dialogs.py:2562
+#: ../src/dialogs.py:2741 ../src/dialogs.py:2792
 msgid "All files"
 msgstr "Todos os arquivos"
 
-#: ../src/dialogs.py:2522
+#: ../src/dialogs.py:2746
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/dialogs.py:2552
+#: ../src/dialogs.py:2779
 msgid "Choose Image"
 msgstr "Escolha imagem"
 
-#: ../src/dialogs.py:2567
+#: ../src/dialogs.py:2797
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/dialogs.py:2624
+#: ../src/dialogs.py:2862
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quando %s chega:"
 
-#: ../src/dialogs.py:2626
+#: ../src/dialogs.py:2864
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adicionando Notificação Especial para %s"
 
 #. # means number
-#: ../src/dialogs.py:2697
+#: ../src/dialogs.py:2935
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2941
 msgid "Condition"
 msgstr "Condição"
 
-#: ../src/dialogs.py:2824
+#: ../src/dialogs.py:3059
 msgid "when I am "
 msgstr "quando eu estiver"
 
-#: ../src/disco.py:104
+#: ../src/disco.py:111
 msgid "Others"
 msgstr "Outros"
 
-#: ../src/disco.py:105 ../src/disco.py:106 ../src/disco.py:1350
-#: ../src/gajim.py:604 ../src/roster_window.py:272 ../src/roster_window.py:330
-#: ../src/roster_window.py:369 ../src/roster_window.py:451
-#: ../src/roster_window.py:483 ../src/roster_window.py:485
-#: ../src/roster_window.py:3920 ../src/roster_window.py:3922
-#: ../src/common/contacts.py:267 ../src/common/contacts.py:282
-#: ../src/common/helpers.py:43
+#: ../src/disco.py:112 ../src/disco.py:113 ../src/disco.py:1355
+#: ../src/gajim.py:660 ../src/roster_window.py:295 ../src/roster_window.py:355
+#: ../src/roster_window.py:395 ../src/roster_window.py:503
+#: ../src/roster_window.py:535 ../src/roster_window.py:537
+#: ../src/roster_window.py:4755 ../src/roster_window.py:4757
+#: ../src/common/contacts.py:295 ../src/common/contacts.py:310
+#: ../src/common/helpers.py:53
 msgid "Transports"
 msgstr "Transportes"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:108
+#: ../src/disco.py:115
 msgid "Conference"
 msgstr "Conferência"
 
-#: ../src/disco.py:421
+#: ../src/disco.py:428
 msgid "Without a connection, you can not browse available services"
 msgstr "Você deve estar conectado para visualizar os serviços disponíveis"
 
-#: ../src/disco.py:500
+#: ../src/disco.py:502
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Buscar Serviços usando conta %s"
 
-#: ../src/disco.py:502
+#: ../src/disco.py:504
 msgid "Service Discovery"
 msgstr "Buscar Serviços"
 
-#: ../src/disco.py:642
+#: ../src/disco.py:644
 msgid "The service could not be found"
 msgstr "O serviço não pode ser encontrado"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:645
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3647,180 +3941,435 @@ msgstr ""
 "Não existe serviço para o endereço que você entrou, ou não está respondendo. "
 "Verifique o endereço e tente novamente."
 
-#: ../src/disco.py:647 ../src/disco.py:928
+#: ../src/disco.py:649 ../src/disco.py:930
 msgid "The service is not browsable"
 msgstr "Serviço não navegável"
 
-#: ../src/disco.py:648
+#: ../src/disco.py:650
 msgid "This type of service does not contain any items to browse."
 msgstr "Este tipo de serviço não contém nenhum item para navegar."
 
-#: ../src/disco.py:728
+#: ../src/disco.py:730
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Visualizando %s usando conta %s"
 
-#: ../src/disco.py:767
+#: ../src/disco.py:769
 msgid "_Browse"
 msgstr "_Navegar"
 
-#: ../src/disco.py:929
+#: ../src/disco.py:931
 msgid "This service does not contain any items to browse."
 msgstr "Este serviço não contém nenhum item para navegar."
 
-#: ../src/disco.py:1147
-#, fuzzy
+#: ../src/disco.py:1152
 msgid "_Execute Command"
 msgstr "_Executar Comando"
 
-#: ../src/disco.py:1157 ../src/disco.py:1355
+#: ../src/disco.py:1162 ../src/disco.py:1360
 msgid "Re_gister"
 msgstr "Re_gistrar"
 
-#: ../src/disco.py:1392
+#: ../src/disco.py:1397
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Buscando %d / %d"
 
 #. Users column
-#: ../src/disco.py:1573
+#: ../src/disco.py:1579
 msgid "Users"
 msgstr "Usuários"
 
 #. Description column
-#: ../src/disco.py:1580
+#: ../src/disco.py:1587
 msgid "Description"
 msgstr "Descrição"
 
 #. Id column
-#: ../src/disco.py:1587
+#: ../src/disco.py:1595
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1810
+#: ../src/disco.py:1824
 msgid "Subscribed"
 msgstr "Inscrito"
 
-#: ../src/disco.py:1836
+#: ../src/disco.py:1832
+msgid "Node"
+msgstr "Nó"
+
+#: ../src/disco.py:1889
 msgid "New post"
 msgstr "Nova postagem"
 
-#: ../src/disco.py:1842
+#: ../src/disco.py:1895
 msgid "_Subscribe"
 msgstr "_Inscrever"
 
-#: ../src/disco.py:1848
+#: ../src/disco.py:1901
 msgid "_Unsubscribe"
 msgstr "_Desinscrever"
 
-#: ../src/filetransfers_window.py:72
+#: ../src/features_window.py:47
+msgid "PyOpenSSL"
+msgstr "PyOpenSSL"
+
+#: ../src/features_window.py:48
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+"Uma biblioteca usada para validar os certificados do servidor para garantir "
+"uma conexão segura."
+
+#: ../src/features_window.py:49 ../src/features_window.py:50
+msgid "Requires python-pyopenssl."
+msgstr "Requer o python-pyopenssl."
+
+#: ../src/features_window.py:51
+msgid "Bonjour / Zeroconf"
+msgstr "Bonjour / Zeroconf"
+
+#: ../src/features_window.py:52
+msgid "Serverless chatting with autodetected clients in a local network."
+msgstr ""
+"Conversa sem servidor com clientes detectados automaticamente em uma rede "
+"local."
+
+#: ../src/features_window.py:53
+msgid "Requires python-avahi."
+msgstr "Requer o python-avahi."
+
+#: ../src/features_window.py:54
+msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgstr "Requer pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+
+#: ../src/features_window.py:55
+msgid "gajim-remote"
+msgstr "gajim-remote"
+
+#: ../src/features_window.py:56
+msgid "A script to controle gajim via commandline."
+msgstr "Um script para controlar o Gajim via linha de comando."
+
+#: ../src/features_window.py:57
+msgid "Requires python-dbus."
+msgstr "Requer o python-dbus."
+
+#: ../src/features_window.py:58 ../src/features_window.py:62
+#: ../src/features_window.py:66 ../src/features_window.py:70
+#: ../src/features_window.py:74 ../src/features_window.py:82
+#: ../src/features_window.py:86 ../src/features_window.py:98
+msgid "Feature not available under Windows."
+msgstr "Recurso não disponível no Windows."
+
+#: ../src/features_window.py:59
+msgid "OpenGPG"
+msgstr "OpenGPG"
+
+#: ../src/features_window.py:60
+msgid "Encrypting chatmessages with gpg keys."
+msgstr "Criptografando as mensagens das conversas com chaves PGP."
+
+#: ../src/features_window.py:61
+msgid "Requires gpg and python-GnuPGInterface."
+msgstr "Requer gpg e python-GnuPGInterface."
+
+#: ../src/features_window.py:63
+msgid "network-manager"
+msgstr "network-manager"
+
+#: ../src/features_window.py:64
+msgid "Autodetection of network status."
+msgstr "Detecção automática do status da rede."
+
+#: ../src/features_window.py:65
+msgid "Requires gnome-network-manager and python-dbus."
+msgstr "Requer gnome-network-manager e python-dbus."
+
+#: ../src/features_window.py:67
+msgid "Session Management"
+msgstr "Gerenciamento de Sessão"
+
+#: ../src/features_window.py:68
+msgid "Gajim session is stored on logout and restored on login."
+msgstr "A sessão do Gajim é armazenada no logout and restaurada no login."
+
+#: ../src/features_window.py:69
+msgid "Requires python-gnome2."
+msgstr "Requer python-gnome2."
+
+#: ../src/features_window.py:71
+msgid "gnome-keyring"
+msgstr "gnome-keyring"
+
+#: ../src/features_window.py:72
+msgid "Passwords can be stored securely and not just in plaintext."
+msgstr ""
+"As senhas podem ser armazenadas de maneira segura e não apenas em texto "
+"plano."
+
+#: ../src/features_window.py:73
+msgid "Requires gnome-keyring and python-gnome2-desktop."
+msgstr "Requer gnome-keyring e python-gnome2-desktop."
+
+#: ../src/features_window.py:75
+msgid "SRV"
+msgstr "SRV"
+
+#: ../src/features_window.py:76
+msgid "Ability to connect to servers which are using SRV records."
+msgstr "Habilidade de conectar a servidores que estão usando registros SRV."
+
+#: ../src/features_window.py:77
+msgid "Requires dnsutils."
+msgstr "Requer dnsutils."
+
+#: ../src/features_window.py:78
+msgid "Requires nslookup to use SRV records."
+msgstr "Requer nslookup para usar registros SRV."
+
+#: ../src/features_window.py:79
+msgid "Spell Checker"
+msgstr "Verificador Ortográfico"
+
+#: ../src/features_window.py:80
+msgid "Spellchecking of composed messages."
+msgstr "Verificação ortográfica das mensagens escritas."
+
+#: ../src/features_window.py:81
+msgid ""
+"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
+"sources."
+msgstr ""
+"Requer python-gnome2-extras ou a compilação do módulo gtkspell a partir dos "
+"fontes do Gajim."
+
+#: ../src/features_window.py:83
+msgid "Notification-daemon"
+msgstr "Notification-daemon"
+
+#: ../src/features_window.py:84
+msgid "Passive popups notifying for new events."
+msgstr "Popups passivos notificando novos eventos."
+
+#: ../src/features_window.py:85
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr ""
+"Requer python-notify ou então python-dbus em conjunto com notification-"
+"daemon."
+
+#: ../src/features_window.py:87
+msgid "Trayicon"
+msgstr "Ícone da Bandeja"
+
+#: ../src/features_window.py:88
+msgid "A icon in systemtray reflecting the current presence."
+msgstr "Um ícone na bandeja do sistema refletindo a presença atual."
+
+#: ../src/features_window.py:89
+msgid ""
+"Requires python-gnome2-extras or compiled  trayicon module from Gajim "
+"sources."
+msgstr ""
+"Requer python-gnome2-extras ou módulo trayicon compilado a partir dos fontes "
+"do Gajim."
+
+#: ../src/features_window.py:90
+msgid "Requires PyGTK >= 2.10."
+msgstr "Requer PyGTK >= 2.10."
+
+#: ../src/features_window.py:91
+msgid "Idle"
+msgstr "Ocioso"
+
+#: ../src/features_window.py:92
+msgid "Ability to measure idle time, in order to set auto status."
+msgstr ""
+"Habilidade de medir o tempo de inatividade para definir o status automático."
+
+#: ../src/features_window.py:93 ../src/features_window.py:94
+msgid "Requires compilation of the idle module from Gajim sources."
+msgstr "Requer a compilação do módulo idle a partir dos fontes do Gajim."
+
+#: ../src/features_window.py:95
+msgid "LaTeX"
+msgstr "LaTeX"
+
+#: ../src/features_window.py:96
+msgid "Transform LaTeX espressions between $$ $$."
+msgstr "Tranforma expressões LaTeX entre $$ $$."
+
+#: ../src/features_window.py:97
+msgid ""
+"Requires texlive-latex-base, dvips and imagemagick. You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+"Requer textlive-latex-base, dvips e imagemagick. Você tem que definir a "
+"opção 'use_latex' para Verdadeiro no Editor de Configurações Avançadas."
+
+#: ../src/features_window.py:99
+msgid "End to end encryption"
+msgstr "Criptografia end to end"
+
+#: ../src/features_window.py:100
+msgid "Encrypting chatmessages."
+msgstr "Criptografando mensagens."
+
+#: ../src/features_window.py:101 ../src/features_window.py:102
+msgid "Requires python-crypto."
+msgstr "Requer python-crypto."
+
+#: ../src/features_window.py:103
+msgid "RST Generator"
+msgstr "Gerador RST"
+
+#: ../src/features_window.py:104
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+"Gera saída XHTML a partir de código RST (veja http://docutils.sourceforge."
+"net/docs/ref/rst/restructuredtext.html)."
+
+#: ../src/features_window.py:105 ../src/features_window.py:106
+msgid "Requires python-docutils."
+msgstr "Requer python-docutils."
+
+#: ../src/features_window.py:107
+msgid "libsexy"
+msgstr "libsexy"
+
+#: ../src/features_window.py:108
+msgid "Ability to have clickable URLs in chat window."
+msgstr "Habilidade de ter URL's clicáveis na janela de conversa."
+
+#: ../src/features_window.py:109 ../src/features_window.py:110
+msgid "Requires python-sexy."
+msgstr "Requer python-sexy."
+
+#: ../src/features_window.py:117 ../src/common/helpers.py:248
+msgid "Available"
+msgstr "Disponível"
+
+#: ../src/features_window.py:124
+msgid "Feature"
+msgstr "Recurso"
+
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Arquivo"
 
-#: ../src/filetransfers_window.py:87
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Tempo"
 
-#: ../src/filetransfers_window.py:99
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Progresso"
 
-#: ../src/filetransfers_window.py:161 ../src/filetransfers_window.py:215
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:218
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome do arquivo: %s"
 
-#: ../src/filetransfers_window.py:162 ../src/filetransfers_window.py:290
+#: ../src/filetransfers_window.py:165 ../src/filetransfers_window.py:305
 #, python-format
 msgid "Size: %s"
 msgstr "Tamanho: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:171 ../src/filetransfers_window.py:181
-#: ../src/history_manager.py:463
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:184
+#: ../src/history_manager.py:468
 msgid "You"
 msgstr "Você"
 
-#: ../src/filetransfers_window.py:172
+#: ../src/filetransfers_window.py:175
 #, python-format
 msgid "Sender: %s"
 msgstr "Remetente: %s"
 
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:564
-#: ../src/tooltips.py:575
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:593
+#: ../src/tooltips.py:592
 msgid "Recipient: "
 msgstr "Destinatário: "
 
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:187
 #, python-format
 msgid "Saved in: %s"
 msgstr "Salvo em: %s"
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:189
 msgid "File transfer completed"
 msgstr "Transferência de arquivos completa"
 
-#: ../src/filetransfers_window.py:200 ../src/filetransfers_window.py:206
+#: ../src/filetransfers_window.py:203 ../src/filetransfers_window.py:209
 msgid "File transfer cancelled"
 msgstr "Transferência de arquivos cancelada"
 
-#: ../src/filetransfers_window.py:200 ../src/filetransfers_window.py:207
+#: ../src/filetransfers_window.py:203 ../src/filetransfers_window.py:210
 msgid "Connection with peer cannot be established."
 msgstr "Conexão ponto a ponto não pode ser estabelecida."
 
-#: ../src/filetransfers_window.py:216
+#: ../src/filetransfers_window.py:219
 #, python-format
 msgid "Recipient: %s"
 msgstr "Conteúdo: %s"
 
-#: ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:221
 #, python-format
 msgid "Error message: %s"
 msgstr "Mensagem de erro: %s"
 
-#: ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:222
 msgid "File transfer stopped by the contact at the other end"
 msgstr "Transferência de arquivo parada pelo contato do outro lado"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:243
 msgid "Choose File to Send..."
 msgstr "Escolha o Arquivo para Enviar..."
 
-#: ../src/filetransfers_window.py:255
+#: ../src/filetransfers_window.py:259 ../src/tooltips.py:631
+#, fuzzy
+msgid "Description: "
+msgstr "Descrição: %s"
+
+#: ../src/filetransfers_window.py:270
 msgid "Gajim cannot access this file"
 msgstr "Gajim não pode acessar este arquivo"
 
-#: ../src/filetransfers_window.py:256
+#: ../src/filetransfers_window.py:271
 msgid "This file is being used by another process."
 msgstr "Este arquivo está sendo usado por outro processo."
 
-#: ../src/filetransfers_window.py:288
+#: ../src/filetransfers_window.py:303
 #, python-format
 msgid "File: %s"
 msgstr "Arquivo: %s"
 
-#: ../src/filetransfers_window.py:293
+#: ../src/filetransfers_window.py:308
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:295
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s quer te enviar um arquivo:"
 
-#: ../src/filetransfers_window.py:310 ../src/gtkgui_helpers.py:750
+#: ../src/filetransfers_window.py:324 ../src/gtkgui_helpers.py:773
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Não é possível sobrescrever o arquivo \"%s\""
 
-#: ../src/filetransfers_window.py:311 ../src/gtkgui_helpers.py:752
+#: ../src/filetransfers_window.py:325 ../src/gtkgui_helpers.py:775
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -3828,31 +4377,31 @@ msgstr ""
 "Um arquivo com este nome já existe e você não tem permissão para sobrescrevê-"
 "lo."
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:756
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:779
 msgid "This file already exists"
 msgstr "Este arquivo já existe"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:756
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:779
 msgid "What do you want to do?"
 msgstr "O que você quer fazer?"
 
-#: ../src/filetransfers_window.py:330 ../src/gtkgui_helpers.py:766
+#: ../src/filetransfers_window.py:344 ../src/gtkgui_helpers.py:789
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "O diretório \"%s\" não é gravável"
 
-#: ../src/filetransfers_window.py:330 ../src/gtkgui_helpers.py:767
+#: ../src/filetransfers_window.py:344 ../src/gtkgui_helpers.py:790
 msgid "You do not have permission to create files in this directory."
 msgstr "Você não tem permissão para criar este diretório"
 
-#: ../src/filetransfers_window.py:340
+#: ../src/filetransfers_window.py:354
 msgid "Save File as..."
 msgstr "Salvar Arquivo como..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:421
+#: ../src/filetransfers_window.py:434
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3860,65 +4409,65 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:497
+#: ../src/filetransfers_window.py:523
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
+#: ../src/filetransfers_window.py:563 ../src/filetransfers_window.py:566
 msgid "Invalid File"
 msgstr "Arquivo inválido"
 
-#: ../src/filetransfers_window.py:536
+#: ../src/filetransfers_window.py:563
 msgid "File: "
 msgstr "Arquivo:"
 
-#: ../src/filetransfers_window.py:540
+#: ../src/filetransfers_window.py:567
 msgid "It is not possible to send empty files"
 msgstr "não é possível enviar arquivos vazios"
 
-#: ../src/filetransfers_window.py:560 ../src/tooltips.py:565
+#: ../src/filetransfers_window.py:589 ../src/tooltips.py:582
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:562 ../src/tooltips.py:569
+#: ../src/filetransfers_window.py:591 ../src/tooltips.py:586
 msgid "Sender: "
 msgstr "Remetente: "
 
-#: ../src/filetransfers_window.py:750
+#: ../src/filetransfers_window.py:779
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:47
+#: ../src/gajim.py:56
 #, python-format
 msgid "%s is not a valid loglevel"
-msgstr "%s não é um nível de registro (loglevel) válido"
+msgstr "%s não é um nível de gravação (loglevel) válido"
 
-#: ../src/gajim.py:122
+#: ../src/gajim.py:129
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "O Gajim necessita do servidor X para rodar. Encerrando..."
 
-#: ../src/gajim.py:126
+#: ../src/gajim.py:156
 msgid "Gajim needs PyGTK 2.8 or above"
 msgstr "O Gajim necessita do PyGTK 2.8 ou superior"
 
-#: ../src/gajim.py:127
+#: ../src/gajim.py:157
 msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
 msgstr "O Gajim necessita do PyGTK 2.8 ou superior para rodar. Encerrando..."
 
-#: ../src/gajim.py:129
+#: ../src/gajim.py:159
 msgid "Gajim needs GTK 2.8 or above"
 msgstr "O Gajim necessita do GTK 2.8 ou superior"
 
-#: ../src/gajim.py:130
+#: ../src/gajim.py:160
 msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
 msgstr "O Gajim necessita do GTK 2.8 ou superior para rodar. Encerrando..."
 
-#: ../src/gajim.py:135
+#: ../src/gajim.py:165
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Não existe suporte para libglade no GTK+ runtime"
 
-#: ../src/gajim.py:137
+#: ../src/gajim.py:167
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3927,22 +4476,22 @@ msgstr ""
 "Por favor remova seu GTK+ runtime atual e instale a última versão estável de "
 "%s"
 
-#: ../src/gajim.py:139
+#: ../src/gajim.py:169
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Por favor certifique-se de que o GTK e o PyGTK tem suporte ao libglade em "
 "seu sistema."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:174
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim necessita de PySQLite2 para rodar"
 
-#: ../src/gajim.py:152
+#: ../src/gajim.py:182
 msgid "Gajim needs pywin32 to run"
 msgstr "O Gajim precisa do pywin32 para rodar"
 
-#: ../src/gajim.py:153
+#: ../src/gajim.py:183
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -3952,11 +4501,11 @@ msgstr ""
 "pode obtê-lo em %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:300
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "O Gajim já está em execução"
 
-#: ../src/gajim.py:301
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -3964,83 +4513,166 @@ msgstr ""
 "Outra instância do Gajim parece estar rodando\n"
 "Executar de qualquer forma?"
 
-#: ../src/gajim.py:408
+#: ../src/gajim.py:352 ../src/common/connection_handlers.py:908
+#: ../src/common/connection_handlers.py:1620
+#: ../src/common/connection_handlers.py:1649
+#: ../src/common/connection_handlers.py:1659
+#: ../src/common/connection_handlers.py:1678
+#: ../src/common/connection_handlers.py:1915
+#: ../src/common/connection_handlers.py:2027 ../src/common/connection.py:939
+msgid "Disk Write Error"
+msgstr "Erro de Escrita em Disco"
+
+#: ../src/gajim.py:448
+msgid "Do you accept this request?"
+msgstr "Você aceita a solicitação?"
+
+#: ../src/gajim.py:450
+#, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Você aceita essa requisição na conta %s?"
+
+#: ../src/gajim.py:453
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "Autorização HTTP (%s) para %s (id: %s)"
 
-#: ../src/gajim.py:409
-msgid "Do you accept this request?"
-msgstr "Você aceita a solicitação?"
-
-#: ../src/gajim.py:455 ../src/notify.py:435
+#: ../src/gajim.py:500 ../src/notify.py:466
 msgid "Connection Failed"
 msgstr "Falha na Conexão"
 
-#: ../src/gajim.py:775
+#: ../src/gajim.py:834
 #, python-format
 msgid "Subject: %s"
 msgstr "Assunto: %s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
-#: ../src/gajim.py:820 ../src/gajim.py:833
+#: ../src/gajim.py:881 ../src/gajim.py:894
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "erro no envio %s ( %s )"
 
-#: ../src/gajim.py:866
+#: ../src/gajim.py:927
 msgid "Authorization accepted"
 msgstr "Autorização aceita"
 
-#: ../src/gajim.py:867
+#: ../src/gajim.py:928
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "O contato \"%s\" autorizou você para ver seu status."
 
-#: ../src/gajim.py:875
+#: ../src/gajim.py:936
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contato \"%s\" removeu sua inscrição"
 
-#: ../src/gajim.py:876
+#: ../src/gajim.py:937
 msgid "You will always see him or her as offline."
 msgstr "Você sempre o verá como offline."
 
-#: ../src/gajim.py:920
+#: ../src/gajim.py:981
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contato com \"%s\" não pode ser estabelecido"
 
-#: ../src/gajim.py:921 ../src/common/connection.py:435
+#: ../src/gajim.py:982 ../src/common/connection.py:465
 msgid "Check your connection or try again later."
 msgstr "Verifique sua conexão ou tente novamente mais tarde."
 
-#: ../src/gajim.py:1070 ../src/roster_window.py:1218
+#: ../src/gajim.py:1151 ../src/groupchat_control.py:991
+#, python-format
+msgid "%s is now known as %s"
+msgstr "%s agora é conhecido como %s"
+
+#: ../src/gajim.py:1167 ../src/roster_window.py:1372
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s agora está %s (%s)"
 
 #. No status message
-#: ../src/gajim.py:1073 ../src/groupchat_control.py:968
-#: ../src/roster_window.py:1221
+#: ../src/gajim.py:1170 ../src/groupchat_control.py:1142
+#: ../src/roster_window.py:1375
 #, python-format
 msgid "%s is now %s"
 msgstr "%s agora está %s"
 
-#: ../src/gajim.py:1170
+#. Can be a presence (see chg_contact_status in groupchat_contol.py)
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/gajim.py:1291 ../src/groupchat_control.py:951
+msgid "Any occupant is allowed to see your full JID"
+msgstr "Algum ocupante tem permissão de ver o seu JID inteiro"
+
+#: ../src/gajim.py:1294
+msgid "Room now shows unavailable member"
+msgstr "A sala agora mostra membros indisponíveis"
+
+#: ../src/gajim.py:1296
+msgid "room now does not show unavailable members"
+msgstr "a sala agora não mostra membros indisponíveis"
+
+#: ../src/gajim.py:1299
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+"Uma modificação na configuração da sala que não tem relação com privacidade "
+"ocorreu"
+
+#. Can be a presence (see chg_contact_status in groupchat_contol.py)
+#: ../src/gajim.py:1302
+msgid "Room logging is now enabled"
+msgstr "A gravação das conversas da sala está ativo agora"
+
+#: ../src/gajim.py:1304
+msgid "Room logging is now disabled"
+msgstr "A gravação das conversas da sala está desligado agora"
+
+#: ../src/gajim.py:1306
+msgid "Room is now non-anonymous"
+msgstr "Agora a sala é não-anônima"
+
+#: ../src/gajim.py:1309
+msgid "Room is now semi-anonymous"
+msgstr "Agora a sala é semi-anônima"
+
+#: ../src/gajim.py:1312
+msgid "Room is now fully-anonymous"
+msgstr "Agora a sala é totalmente anônima"
+
+#: ../src/gajim.py:1344
+#, python-format
+msgid "A Password is required to join the room %s. Please type it"
+msgstr "Uma Senha é requerida para ingressar na sala %s. Por favor, digite-a"
+
+#: ../src/gajim.py:1379
 msgid "Your passphrase is incorrect"
 msgstr "Sua frase de acesso está incorreta"
 
-#: ../src/gajim.py:1171
+#: ../src/gajim.py:1380
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Você está atualmente conectado sem sua chave OpenPGP."
 
-#: ../src/gajim.py:1274
+#: ../src/gajim.py:1392 ../src/secrets.py:44
+msgid "Passphrase Required"
+msgstr "Frase de acesso é obrigatória"
+
+#: ../src/gajim.py:1393
+#, python-format
+msgid "Enter GPG key passphrase for account %s."
+msgstr "Entre com a frase de acesso da chave GPG para conta %s"
+
+#: ../src/gajim.py:1405
+msgid "Wrong Passphrase"
+msgstr "Frase de acesso Errada"
+
+#: ../src/gajim.py:1406
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Por favor, reescreva sua frase de segurança GPG ou pressione Cancelar."
+
+#: ../src/gajim.py:1515
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novo email em %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1276
+#: ../src/gajim.py:1517
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -4050,7 +4682,7 @@ msgstr[1] "Você tem %d novas mensagens de email"
 #. FIXME: emulate Gtalk client popups. find out what they parse and how
 #. they decide what to show
 #. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1285
+#: ../src/gajim.py:1526
 #, python-format
 msgid ""
 "\n"
@@ -4059,92 +4691,154 @@ msgstr ""
 "\n"
 "De: %(from_address)s"
 
-#: ../src/gajim.py:1441
+#: ../src/gajim.py:1704
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer te enviar um arquivo:"
 
-#: ../src/gajim.py:1506
+#: ../src/gajim.py:1769
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Você recebeu com sucesso %(filename)s de %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1510
+#: ../src/gajim.py:1773
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transferência de arquivo de %(filename)s de %(name)s parou."
 
-#: ../src/gajim.py:1523
+#: ../src/gajim.py:1786
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Você enviou com sucesso o %(filename)s a %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1527
+#: ../src/gajim.py:1790
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transferência de arquivo de %(filename)s to %(name)s parado."
 
-#: ../src/gajim.py:1640
+#: ../src/gajim.py:1885
+msgid "Session negotiation cancelled"
+msgstr "Negociação da sessão cancelada"
+
+#: ../src/gajim.py:1886
+#, python-format
+msgid "The client at %s cancelled the session negotiation."
+msgstr "O cliente em %s cancelou a negociação da sessão."
+
+#: ../src/gajim.py:1927 ../src/gajim.py:1971
+msgid "Confirm these session options"
+msgstr "Confirme essas opções de sessão"
+
+#: ../src/gajim.py:1928
+#, python-format
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t\t%s\n"
+"\n"
+"\t\tAre these options acceptable?"
+msgstr ""
+"O cliente remoto quer negociar uma sessão com esses recursos:\n"
+"\n"
+"\t\t%s\n"
+"\n"
+"\t\tEssas opções são aceitáveis?"
+
+#: ../src/gajim.py:1972
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
+msgstr ""
+"O cliente remoto selecionou essas opções:\n"
+"\n"
+"%s\n"
+"\n"
+"Continuar com a sessão?"
+
+#: ../src/gajim.py:2097
 msgid "Username Conflict"
 msgstr "Conflito de nome de usuário"
 
-#: ../src/gajim.py:1641
+#: ../src/gajim.py:2098
 msgid "Please type a new username for your local account"
 msgstr "Por favor digite um novo nome de usuário para sua conta local"
 
-#: ../src/gajim.py:1658
+#: ../src/gajim.py:2115
 msgid "Ping?"
-msgstr ""
+msgstr "Ping?"
 
-#: ../src/gajim.py:1666
+#: ../src/gajim.py:2123
 #, python-format
 msgid "Pong! (%s s.)"
-msgstr ""
+msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:1672
+#: ../src/gajim.py:2129
 msgid "Error."
+msgstr "Erro."
+
+#: ../src/gajim.py:2154
+msgid "Resource Conflict"
+msgstr "Conflito de Recurso"
+
+#: ../src/gajim.py:2155
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
 msgstr ""
+"Você já está conectado a essa conta com o mesmo recurso. Por favor digite um "
+"novo"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2012
+#: ../src/gajim.py:2521
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar suas preferências"
 
-#: ../src/gajim.py:2211
+#. sorted alphanum
+#: ../src/gajim.py:2657 ../src/common/config.py:102
+#: ../src/common/config.py:413 ../src/common/optparser.py:206
+#: ../src/common/optparser.py:424 ../src/common/optparser.py:458
+msgid "default"
+msgstr "padrão"
+
+#: ../src/gajim.py:2743
 msgid "Network Manager support not available"
 msgstr "Não há suporte disponível para o Network Manager"
 
-#: ../src/gajim.py:2290
+#: ../src/gajim.py:2848
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Suporte de gerenciamento da sessão não disponível (faltando o módulo gnome."
 "ui)"
 
-#: ../src/gajim-remote.py:65
+#: ../src/gajim-remote.py:73
 msgid "Shows a help on specific command"
 msgstr "Mostra uma ajuda para um comando específico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:68
+#: ../src/gajim-remote.py:76
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:69
+#: ../src/gajim-remote.py:77
 msgid "show help on command"
 msgstr "mostrar ajuda no comando"
 
-#: ../src/gajim-remote.py:73
+#: ../src/gajim-remote.py:81
 msgid "Shows or hides the roster window"
 msgstr "Mostrar ou esconder a janela principal"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:85
 msgid "Pops up a window with the next pending event"
 msgstr "Exibir uma janela popup com o próximo evento pendente"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:89
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -4152,48 +4846,48 @@ msgstr ""
 "Exibir uma lista de todos os contatos na lista. Cada contato aparecerá em "
 "uma linha separada"
 
-#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:99
-#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:122
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:157
-#: ../src/gajim-remote.py:187 ../src/gajim-remote.py:196
-#: ../src/gajim-remote.py:203 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:237
-#: ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:92 ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:174 ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:213 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:227 ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:254 ../src/gajim-remote.py:263
 msgid "account"
 msgstr "conta"
 
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:92
 msgid "show only contacts of the given account"
 msgstr "mostrar somente os contatos desta conta"
 
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:98
 msgid "Prints a list of registered accounts"
 msgstr "Imprimir uma lista das contas registradas"
 
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:102
 msgid "Changes the status of account or accounts"
 msgstr "Mudar o status da conta ou contas"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:105
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:105
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "um desses: desconectado, conectado, bate-papo, inativo, fora, np, invisível"
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:119
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:106 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:141 ../src/gajim-remote.py:152
 msgid "message"
 msgstr "mensagem"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:106
 msgid "status message"
 msgstr "mensagem de status"
 
-#: ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:107
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4202,21 +4896,21 @@ msgstr ""
 "status de todas as contas existentes com a opção \"sincronizar com status "
 "global\" marcada"
 
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:113
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Mostrar o diálogo do bate-papo onde você pode enviar mensagens para um "
 "contato"
 
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:115
 msgid "JID of the contact that you want to chat with"
 msgstr "JID do contato que você quer conversar"
 
-#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:204
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "se especificado, o contato é feito da lista de contatos desta conta"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:122
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4226,28 +4920,30 @@ msgstr ""
 "são opcionais. Se você quer configurar somente a 'conta', sem a 'chave "
 "OpenPGP', apenas configure a 'chave para ''."
 
-#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:126 ../src/gajim-remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "JID do contato que irá receber a mensagem"
 
-#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:152
 msgid "message contents"
 msgstr "conteúdos da mensagem"
 
-#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:128 ../src/gajim-remote.py:142
 msgid "pgp key"
 msgstr "chave pgp"
 
-#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:128 ../src/gajim-remote.py:142
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "se especificada, a mensagem será criptografada usando esta chave pública"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:130 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:153
 msgid "if specified, the message will be sent using this account"
 msgstr "se especificada, a mensagem será enviada usando esta conta"
 
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:135
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4257,127 +4953,136 @@ msgstr ""
 "conta são opcionais. Se você quer configurar somente a 'conta', sem a 'chave "
 "OpenPGP, apenas configure a 'chave OpenPGP' para ''."
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:140
 msgid "subject"
 msgstr "assunto"
 
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:140
 msgid "message subject"
 msgstr "assunto da mensagem"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:149
+msgid "Sends new message to a groupchat you've joined."
+msgstr ""
+"Envia uma nova messagem para uma conferência em que você tiver ingressado."
+
+#: ../src/gajim-remote.py:151
+msgid "JID of the room that will receive the message"
+msgstr "O JID do contato que receberá a mensagem"
+
+#: ../src/gajim-remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Informações detalhadas do contato"
 
-#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
-#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:173
+#: ../src/gajim-remote.py:203 ../src/gajim-remote.py:212
 msgid "JID of the contact"
 msgstr "JID do contato"
 
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Informações detalhadas do contato"
 
-#: ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:166
 msgid "Name of the account"
 msgstr "Nome da conta"
 
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:170
 msgid "Sends file to a contact"
 msgstr "Enviar arquivo para um contato"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:172
 msgid "file"
 msgstr "arquivo"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:172
 msgid "File path"
 msgstr "Caminho do arquivo"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:174
 msgid "if specified, file will be sent using this account"
 msgstr "se especificada, arquivo irá ser enviado usando esta conta"
 
-#: ../src/gajim-remote.py:162
+#: ../src/gajim-remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Lista todas as preferências e seus valores"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Ajusta o valor da 'chave' ao 'valor '."
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:185
 msgid "key=value"
 msgstr "chave=valor"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:185
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'chave' é o nome de preferência, 'valor' é o valor para ajustá-la"
 
-#: ../src/gajim-remote.py:173
+#: ../src/gajim-remote.py:190
 msgid "Deletes a preference item"
 msgstr "Deleta um item de preferência"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:192
 msgid "key"
 msgstr "chave"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "nome da preferência a ser deletado"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:196
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Escreve o estado atual das preferências do Gajim em um arquivo .config"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:201
 msgid "Removes contact from roster"
 msgstr "Remover contato da lista"
 
-#: ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:210
 msgid "Adds contact to roster"
 msgstr "Adicionar contato para a lista"
 
-#: ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:212
 msgid "jid"
 msgstr "JID"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:213
 msgid "Adds new contact to this account"
 msgstr "Adicionar novo contato para esta conta"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:218
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Retorna o status atual (global a menos que o cliente for especificado)"
 
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:225
 msgid ""
 "Returns current status message(the global one unless account is specified)"
 msgstr ""
 "Retorna a mensagem de status atual (global a menos que a conta for "
 "especificada)"
 
-#: ../src/gajim-remote.py:215
+#: ../src/gajim-remote.py:232
 msgid "Returns number of unread messages"
 msgstr "Retorna o número das mensagens não lidas"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:236
 msgid "Opens 'Start Chat' dialog"
 msgstr "Abrir o diálogo 'Iniciar Conversa'"
 
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:238
 msgid "Starts chat, using this account"
 msgstr "Iniciar conversa, usando esta conta"
 
-#: ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:242
 msgid "Sends custom XML"
 msgstr "Envia XML personalizado"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:244
 msgid "XML to send"
 msgstr "XML a enviar"
 
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:245
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -4385,35 +5090,35 @@ msgstr ""
 "A conta em que o XML será enviado; se não estiver especificado, será enviado "
 "para todas as contas"
 
-#: ../src/gajim-remote.py:234
+#: ../src/gajim-remote.py:251
 msgid "Handle a xmpp:/ uri"
 msgstr "Manipular uma URI xmpp:/"
 
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:253
 msgid "uri"
 msgstr "URI"
 
-#: ../src/gajim-remote.py:241
+#: ../src/gajim-remote.py:258
 msgid "Join a MUC room"
 msgstr "Entrar em uma sala MUC"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:260
 msgid "room"
 msgstr "sala"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:261
 msgid "nick"
 msgstr "apelido"
 
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:262
 msgid "password"
 msgstr "senha"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:285
 msgid "Missing argument \"contact_jid\""
 msgstr "Argumento não informado \"contact_jid\""
 
-#: ../src/gajim-remote.py:287
+#: ../src/gajim-remote.py:304
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4422,11 +5127,11 @@ msgstr ""
 "'%s' não está em sua lista.\n"
 "Por favor, especifique a conta para enviar a mensagem."
 
-#: ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:307
 msgid "You have no active account"
 msgstr "Você não tem uma conta ativa"
 
-#: ../src/gajim-remote.py:354
+#: ../src/gajim-remote.py:371
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -4435,16 +5140,16 @@ msgstr ""
 "Uso: %s %s %s \n"
 "\t %s"
 
-#: ../src/gajim-remote.py:357
+#: ../src/gajim-remote.py:374
 msgid "Arguments:"
 msgstr "Argumentos:"
 
-#: ../src/gajim-remote.py:361
+#: ../src/gajim-remote.py:378
 #, python-format
 msgid "%s not found"
 msgstr "%s não encontrado"
 
-#: ../src/gajim-remote.py:365
+#: ../src/gajim-remote.py:382
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -4453,7 +5158,7 @@ msgstr ""
 "Uso: %s comando [argumentos]\n"
 "Comando é um desses:\n"
 
-#: ../src/gajim-remote.py:438
+#: ../src/gajim-remote.py:455
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -4462,7 +5167,7 @@ msgstr ""
 "Muitos argumentos.\n"
 "Digite \"%s help %s\" para mais informações"
 
-#: ../src/gajim-remote.py:442
+#: ../src/gajim-remote.py:459
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -4471,116 +5176,152 @@ msgstr ""
 "Argumento \"%s\" não está especificado. \n"
 "Tipo \"%s ajuda %s\" para maiores informações"
 
-#: ../src/gajim-remote.py:460
+#: ../src/gajim-remote.py:477
 msgid "Wrong uri"
 msgstr "URI incorreta"
 
-#: ../src/gajim_themes_window.py:60
+#: ../src/gajim_themes_window.py:67
 msgid "Theme"
 msgstr "Tema"
 
+#: ../src/gajim_themes_window.py:105
+msgid "You cannot make changes to the default theme"
+msgstr "Você não pode fazer alterações no tema padrão"
+
+#: ../src/gajim_themes_window.py:106
+msgid "Please create a clean new theme with your desired name."
+msgstr "Crie um novo tema com o nome que você desejar."
+
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:155
+#: ../src/gajim_themes_window.py:180
 msgid "theme name"
 msgstr "nome do tema"
 
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:197
 msgid "You cannot delete your current theme"
 msgstr "Você não pode apagar o seu tema corrente"
 
-#: ../src/gajim_themes_window.py:173
+#: ../src/gajim_themes_window.py:198
 msgid "Please first choose another for your current theme."
 msgstr "Por favor escolha outro para seu tema corrente."
 
-#: ../src/groupchat_control.py:122
+#: ../src/groupchat_control.py:139
 msgid "Sending private message failed"
 msgstr "Falha ao Enviar uma mensagem privada"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:124
+#: ../src/groupchat_control.py:141
 #, python-format
 msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Você não está mais na sala \"%s\" ou \"%s\" saiu."
 
-#: ../src/groupchat_control.py:322
+#: ../src/groupchat_control.py:350
 msgid "Insert Nickname"
 msgstr "Inserir Apelido"
 
+#: ../src/groupchat_control.py:878
+msgid "Really send file?"
+msgstr "Enviar o arquivo mesmo?"
+
+#: ../src/groupchat_control.py:879
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr "Se você enviar um arquivo para %s, ele(a) saberá o seu Jabber ID real."
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:954
+msgid "Room logging is enabled"
+msgstr "A gravação das conversas da sala está ligado"
+
+#: ../src/groupchat_control.py:956
+msgid "A new room has been created"
+msgstr "Uma nova sala foi criada"
+
+#: ../src/groupchat_control.py:959
+msgid "The server has assigned or modified your roomnick"
+msgstr "O servidor atribuiu ou modificou o apelido da sua sala"
+
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:850
+#: ../src/groupchat_control.py:965
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi chutado: %(reason)s"
 
-#: ../src/groupchat_control.py:854
+#: ../src/groupchat_control.py:969
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s foi chutado por %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:861
+#: ../src/groupchat_control.py:976
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s  foi banido: %(reason)s"
 
-#: ../src/groupchat_control.py:865
+#: ../src/groupchat_control.py:980
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s  foi banido por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:873
+#: ../src/groupchat_control.py:989
 #, python-format
 msgid "You are now known as %s"
 msgstr "Você agora é conhecido como %s"
 
-#: ../src/groupchat_control.py:875
+#: ../src/groupchat_control.py:1025 ../src/groupchat_control.py:1029
+#: ../src/groupchat_control.py:1034
 #, python-format
-msgid "%s is now known as %s"
-msgstr "%s agora é conhecido como %s"
+msgid "%(nick)s has been removed from the room (%(reason)s)"
+msgstr "%(nick)s foi removido da sala (%(reason)s)"
+
+#: ../src/groupchat_control.py:1026
+msgid "affiliation changed"
+msgstr "filiação alterada"
+
+#: ../src/groupchat_control.py:1031
+msgid "room configuration changed to members-only"
+msgstr "a configuração da sala mudou para aceitar apenas membros"
+
+#: ../src/groupchat_control.py:1036
+msgid "system shutdown"
+msgstr "desligamento do sistema"
 
-#: ../src/groupchat_control.py:961
+#: ../src/groupchat_control.py:1135
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
-#: ../src/groupchat_control.py:966
+#: ../src/groupchat_control.py:1140
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s entrou na conferência"
 
-#: ../src/groupchat_control.py:1088 ../src/groupchat_control.py:1106
-#: ../src/groupchat_control.py:1199 ../src/groupchat_control.py:1216
+#. Invalid Nickname
+#. invalid char
+#: ../src/groupchat_control.py:1253 ../src/groupchat_control.py:1532
+msgid "Invalid nickname"
+msgstr "Apelido inválido"
+
+#: ../src/groupchat_control.py:1254 ../src/groupchat_control.py:1533
+msgid "The nickname has not allowed characters."
+msgstr "O apelido possui caracteres não permitidos."
+
+#: ../src/groupchat_control.py:1277 ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1379 ../src/groupchat_control.py:1396
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Apelido não encontrado: %s"
 
-#: ../src/groupchat_control.py:1122
+#: ../src/groupchat_control.py:1311
 msgid "This group chat has no subject"
 msgstr "Esta conferência não tem assunto"
 
-#: ../src/groupchat_control.py:1135
+#: ../src/groupchat_control.py:1322
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Convidado %(contact_jid)s para %(room_jid)s."
 
-#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1142 ../src/groupchat_control.py:1170
-#, python-format
-msgid "%s does not appear to be a valid JID"
-msgstr "%s não parece ser um JID válido"
-
-#: ../src/groupchat_control.py:1253
-#, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr ""
-"Comando não encontrado: /%s (se você quer enviar isto, use este prefixo /say)"
-
-#: ../src/groupchat_control.py:1276
-#, python-format
-msgid "Commands: %s"
-msgstr "Comandos: %s"
-
-#: ../src/groupchat_control.py:1279
+#: ../src/groupchat_control.py:1459
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4593,7 +5334,7 @@ msgstr ""
 "estiver atualmente na sala, ele/ela será chutado também.  NÃO suporta "
 "espaços no apelido."
 
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1466
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -4602,12 +5343,7 @@ msgstr ""
 "Uso: /%s <apelido>, abre uma janela de conferência privada com um ocupante "
 "específico."
 
-#: ../src/groupchat_control.py:1290
-#, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Uso: /%s, apaga o texto da janela."
-
-#: ../src/groupchat_control.py:1292
+#: ../src/groupchat_control.py:1472
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -4616,12 +5352,7 @@ msgstr ""
 "Uso: /%s [rasão], fecha a janela corrente ou a aba, mostrando a razão se "
 "especificada."
 
-#: ../src/groupchat_control.py:1295
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Uso: /%s, esconde os botões do bate-papo."
-
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1478
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4630,7 +5361,7 @@ msgstr ""
 "Uso: /%s <JID> [ razão ], convida JID à  sala atual, fornecendo "
 "opcionalmente uma razão."
 
-#: ../src/groupchat_control.py:1302
+#: ../src/groupchat_control.py:1482
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4639,7 +5370,7 @@ msgstr ""
 "Uso: /%s <sala>@<servidor>[/apelido], oferece para entrar na sala@servidor "
 "opcionalmente usando um apelido específico."
 
-#: ../src/groupchat_control.py:1306
+#: ../src/groupchat_control.py:1486
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4649,16 +5380,7 @@ msgstr ""
 "Uso: /%s <apelido> [razão], remove da sala o ocupante especificado pelo "
 "apelido e indica opcionalmente uma razão.  Não suporta espaços no apelido."
 
-#: ../src/groupchat_control.py:1311
-#, python-format
-msgid ""
-"Usage: /%s <action>, sends action to the current group chat. Use third "
-"person. (e.g. /%s explodes.)"
-msgstr ""
-"Uso: /%s <ação>, emite a ação à  sala atual. Use a terceira pessoa (por "
-"exemplo: /%s explodes.)"
-
-#: ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1495
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -4667,70 +5389,65 @@ msgstr ""
 "Uso: /%s <apelido> [mensagem], abre uma janela de mensagem privada e envia "
 "uma mensagem ao ocupante especificado pelo apelido."
 
-#: ../src/groupchat_control.py:1320
+#: ../src/groupchat_control.py:1500
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Uso: /%s <apelido>, muda seu apelido na sala corrente."
 
-#: ../src/groupchat_control.py:1324
+#: ../src/groupchat_control.py:1504
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Uso: /%s [tópico], mostra ou atualiza o tópico da sala atual."
 
-#: ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1508
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Uso: /%s [tópico], mostra ou atualiza o tópico da sala atual."
 
-#: ../src/groupchat_control.py:1331
+#: ../src/groupchat_control.py:1511
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Uso: /%s <mensagem>, envia uma mensagem sem procurar por outros comandos."
 
-#: ../src/groupchat_control.py:1334
-#, python-format
-msgid "No help info for /%s"
-msgstr "Sem ajuda para /%s"
-
-#: ../src/groupchat_control.py:1397
+#: ../src/groupchat_control.py:1606
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Você tem certeza que quer deixar a conferência \"%s\"?"
 
-#: ../src/groupchat_control.py:1399
+#: ../src/groupchat_control.py:1608
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Se você fechar esta janela, será desconectado desta conferência."
 
-#: ../src/groupchat_control.py:1403 ../src/roster_window.py:4066
+#: ../src/groupchat_control.py:1612 ../src/roster_window.py:4902
 msgid "Do _not ask me again"
 msgstr "_Não me pergunte novamente"
 
-#: ../src/groupchat_control.py:1437
+#: ../src/groupchat_control.py:1644
 msgid "Changing Subject"
 msgstr "Mudando Assunto"
 
-#: ../src/groupchat_control.py:1438
+#: ../src/groupchat_control.py:1645
 msgid "Please specify the new subject:"
 msgstr "Por favor, especifique o novo assunto:"
 
-#: ../src/groupchat_control.py:1447
+#: ../src/groupchat_control.py:1654
 msgid "Changing Nickname"
 msgstr "Mudando Apelido"
 
-#: ../src/groupchat_control.py:1448
+#: ../src/groupchat_control.py:1655
 msgid "Please specify the new nickname you want to use:"
 msgstr "Por favor, especifique o novo apelido que você quer usar:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1463
+#: ../src/groupchat_control.py:1670
 #, python-format
 msgid "Destroying %s"
 msgstr "Excluindo %s"
 
-#: ../src/groupchat_control.py:1464
+#: ../src/groupchat_control.py:1671
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -4738,139 +5455,139 @@ msgstr ""
 "Você está prestes a excluir definitivamente esta sala.\n"
 "Você deve especificar uma justificativa abaixo:"
 
-#: ../src/groupchat_control.py:1466
+#: ../src/groupchat_control.py:1673
 msgid "You may also enter an alternate venue:"
 msgstr "Você também pode entrar um ponto de encontro alternativo:"
 
-#: ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1705
 msgid "Bookmark already set"
 msgstr "Bookmark já configurado"
 
-#: ../src/groupchat_control.py:1497
+#: ../src/groupchat_control.py:1706
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "A sala \"%s\" já existe nos favoritos."
 
-#: ../src/groupchat_control.py:1506
+#: ../src/groupchat_control.py:1715
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark foi adicionado com sucesso"
 
-#: ../src/groupchat_control.py:1507
+#: ../src/groupchat_control.py:1716
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Você pode gerenciar seus bookmarks pelo menu de Ações na janela principal."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1635
+#: ../src/groupchat_control.py:1868
 #, python-format
 msgid "Kicking %s"
 msgstr "Chutando %s"
 
-#: ../src/groupchat_control.py:1636 ../src/groupchat_control.py:1919
+#: ../src/groupchat_control.py:1869 ../src/groupchat_control.py:2169
 msgid "You may specify a reason below:"
 msgstr "Você deve especificar uma razão abaixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1918
+#: ../src/groupchat_control.py:2168
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
 
-#: ../src/gtkexcepthook.py:41
+#: ../src/gtkexcepthook.py:46
 msgid "A programming error has been detected"
 msgstr "Um erro de programação foi detectado"
 
-#: ../src/gtkexcepthook.py:42
+#: ../src/gtkexcepthook.py:47
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
 msgstr "Não é provavelmente fatal, mas deve ser reportado aos programadores."
 
-#: ../src/gtkexcepthook.py:48
+#: ../src/gtkexcepthook.py:53
 msgid "_Report Bug"
 msgstr "_Reportar Erro"
 
-#: ../src/gtkexcepthook.py:71
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Detalhes"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:156 ../src/gtkgui_helpers.py:171
+#: ../src/gtkgui_helpers.py:162 ../src/gtkgui_helpers.py:177
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: impossível abrir %s para leitura"
 
-#: ../src/gtkgui_helpers.py:336
+#: ../src/gtkgui_helpers.py:347
 msgid "Error reading file:"
 msgstr "Erro lendo arquivo:"
 
-#: ../src/gtkgui_helpers.py:339
+#: ../src/gtkgui_helpers.py:350
 msgid "Error parsing file:"
 msgstr "Erro ao analisar gramaticalmente o arquivo:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:376
+#: ../src/gtkgui_helpers.py:387
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Não foi possível escrever à  %s. O suporte de gerência da sessão não funciona"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:694
+#: ../src/gtkgui_helpers.py:719
 msgid "Gajim is not the default Jabber client"
 msgstr "O Gajim não é o cliente Jabber padrão"
 
-#: ../src/gtkgui_helpers.py:695
+#: ../src/gtkgui_helpers.py:720
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Você gostaria de tornar o Gajim o cliente Jabber padrão?"
 
-#: ../src/gtkgui_helpers.py:696
+#: ../src/gtkgui_helpers.py:721
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "Sempre verificar ao iniciar se o Gajim é o cliente Jabber padrão"
 
-#: ../src/gtkgui_helpers.py:795
+#: ../src/gtkgui_helpers.py:818
 msgid "Extension not supported"
 msgstr "Extensão não suportada"
 
-#: ../src/gtkgui_helpers.py:796
+#: ../src/gtkgui_helpers.py:819
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "A imagem não pode ser salva no formato %(type)s. Salvar como %(new_filename)"
 "s?"
 
-#: ../src/gtkgui_helpers.py:805
+#: ../src/gtkgui_helpers.py:828
 msgid "Save Image as..."
 msgstr "Salvar Imagem como..."
 
-#: ../src/history_manager.py:65
+#: ../src/history_manager.py:73
 msgid "Cannot find history logs database"
 msgstr "Não foi encontrado banco de dados do histórico de logs"
 
 #. holds jid
-#: ../src/history_manager.py:108
+#: ../src/history_manager.py:113
 msgid "Contacts"
 msgstr "Contatos"
 
 #. holds time
-#: ../src/history_manager.py:121 ../src/history_manager.py:161
-#: ../src/history_window.py:86
+#: ../src/history_manager.py:126 ../src/history_manager.py:166
+#: ../src/history_window.py:121
 msgid "Date"
 msgstr "Data:"
 
 #. holds nickname
-#: ../src/history_manager.py:127 ../src/history_manager.py:179
+#: ../src/history_manager.py:132 ../src/history_manager.py:184
 msgid "Nickname"
 msgstr "Apelido"
 
 #. holds message
-#: ../src/history_manager.py:135 ../src/history_manager.py:167
-#: ../src/history_window.py:94
+#: ../src/history_manager.py:140 ../src/history_manager.py:172
+#: ../src/history_window.py:129
 msgid "Message"
 msgstr "Mensagem"
 
-#: ../src/history_manager.py:187
+#: ../src/history_manager.py:192
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -4878,7 +5595,7 @@ msgstr ""
 "Você quer limpar o banco de dados? (ALTAMENTE NÃO RECOMENDADO COM O GAJIM EM "
 "EXECUÇÃO)"
 
-#: ../src/history_manager.py:189
+#: ../src/history_manager.py:194
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -4892,221 +5609,293 @@ msgstr ""
 "\n"
 "Se caso você clicou SIM, por favor espere... "
 
-#: ../src/history_manager.py:401
+#: ../src/history_manager.py:406
 msgid "Exporting History Logs..."
 msgstr "Exportando Histórico de Logs..."
 
-#: ../src/history_manager.py:476
+#: ../src/history_manager.py:481
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s em %(time)s disse: %(message)s\n"
 
-#: ../src/history_manager.py:514
+#: ../src/history_manager.py:518
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] "Você realmente quer deletar os logs do contato selecionado?"
 msgstr[1] "Você realmente quer deletar os logs dos contatos selecionados?"
 
-#: ../src/history_manager.py:518 ../src/history_manager.py:554
+#: ../src/history_manager.py:522 ../src/history_manager.py:557
 msgid "This is an irreversible operation."
 msgstr "Esta é uma operação irreversível."
 
-#: ../src/history_manager.py:551
+#: ../src/history_manager.py:554
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Você realmente quer deletar a mensagem selecionada?"
 msgstr[1] "Você realmente quer deletar as mensagens selecionadas?"
 
-#: ../src/history_window.py:103 ../src/history_window.py:105
+#: ../src/history_window.py:209 ../src/history_window.py:211
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Histórico de Conversação com %s"
 
-#: ../src/history_window.py:266
+#: ../src/history_window.py:342
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s é agora %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:270 ../src/notify.py:199
+#: ../src/history_window.py:346 ../src/notify.py:219
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s agora está %(status)s"
 
-#: ../src/history_window.py:276
+#: ../src/history_window.py:352
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status agora é: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:279
+#: ../src/history_window.py:355
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status agora é: %(status)s"
 
-#: ../src/message_window.py:278
+#: ../src/htmltextview.py:586 ../src/htmltextview.py:597
+msgid "Timeout loading image"
+msgstr "Tempo esgotado ao carregar a imagem"
+
+#: ../src/htmltextview.py:607
+msgid "Image is too big"
+msgstr "A imagem é grande demais"
+
+#: ../src/message_window.py:350
 msgid "Chats"
 msgstr "Conversas"
 
-#: ../src/message_window.py:280
+#: ../src/message_window.py:352
 msgid "Group Chats"
 msgstr "Conferências"
 
-#: ../src/message_window.py:282
+#: ../src/message_window.py:354
 msgid "Private Chats"
 msgstr "ConversasPrivada"
 
-#: ../src/message_window.py:284
+#: ../src/message_window.py:356
 msgid "Messages"
 msgstr "Mensagens"
 
-#: ../src/message_window.py:285
+#: ../src/message_window.py:357
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
 
-#: ../src/notify.py:197
+#: ../src/negotiation.py:13
+msgid "- messages will be logged"
+msgstr "- as mensagens serão gravadas"
+
+#: ../src/negotiation.py:15
+msgid "- messages will not be logged"
+msgstr "- as mensagens não serão gravadas"
+
+#: ../src/negotiation.py:24
+msgid "OK to continue with negotiation?"
+msgstr "Tudo certo para continuar com a negociação?"
+
+#: ../src/negotiation.py:25
+#, python-format
+msgid ""
+"You've begun an encrypted session with %s, but it can't be guaranteed that "
+"you're talking directly to the person you think you are.\n"
+"\n"
+"You should speak with them directly (in person or on the phone) and confirm "
+"that their Short Authentication String is identical to this one: %s\n"
+"\n"
+"Would you like to continue with the encrypted session?"
+msgstr ""
+"Você começou uma sessão criptografada com %s, mas não há garantias de que "
+"você esteja falando diretamente com a pessoa que você imagina.\n"
+"\n"
+"Você deve falar com eles diretamente (pessoalmente ou por telefone) e "
+"confirmar que a String de Autenticação Curta deles é idêntica a esta: %s\n"
+"\n"
+"Você quer continuar com a sessão criptografada?"
+
+#: ../src/negotiation.py:31
+msgid "Yes, I verified the Short Authentication String"
+msgstr "Sim, eu verifiquei a String de Verificação Curta"
+
+#: ../src/notify.py:217
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Alterou seu Status"
 
-#: ../src/notify.py:207
+#: ../src/notify.py:227
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Conectou"
 
-#: ../src/notify.py:215
+#: ../src/notify.py:235
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Desconectou"
 
-#: ../src/notify.py:227
+#: ../src/notify.py:247
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova Mensagem Simples de %(nickname)s"
 
-#: ../src/notify.py:235
+#: ../src/notify.py:255
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova Mensagem Privada da conferência %s"
 
-#: ../src/notify.py:236
+#: ../src/notify.py:257
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:242
+#: ../src/notify.py:260
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Mensagem enviada por %(nickname)s"
+
+#: ../src/notify.py:266
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova Mensagem de %(nickname)s"
 
-#: ../src/profile_window.py:72
+#: ../src/profile_window.py:54
 msgid "Retrieving profile..."
 msgstr "Recuperando perfil..."
 
+#: ../src/profile_window.py:107 ../src/roster_window.py:1914
+msgid "File is empty"
+msgstr "O arquivo está vazio"
+
+#: ../src/profile_window.py:110 ../src/roster_window.py:1917
+msgid "File does not exist"
+msgstr "O arquivo não existe"
+
 #. keep identation
-#: ../src/profile_window.py:143
+#. unknown format
+#: ../src/profile_window.py:124 ../src/profile_window.py:140
+#: ../src/roster_window.py:1919 ../src/roster_window.py:1930
 msgid "Could not load image"
 msgstr "A imagem não pode ser carregada"
 
-#: ../src/profile_window.py:255
+#: ../src/profile_window.py:250
 msgid "Information received"
 msgstr "Informação recebida"
 
-#: ../src/profile_window.py:324
+#: ../src/profile_window.py:319
 msgid "Without a connection you can not publish your contact information."
 msgstr "Você deve estar conectado para publicar suas informações de contato."
 
-#: ../src/profile_window.py:336
+#: ../src/profile_window.py:331
 msgid "Sending profile..."
 msgstr "Enviando perfil..."
 
-#: ../src/profile_window.py:351
+#: ../src/profile_window.py:346
 msgid "Information NOT published"
 msgstr "Informação NÃO publicada"
 
-#: ../src/profile_window.py:358
+#: ../src/profile_window.py:353
 msgid "vCard publication failed"
 msgstr "Publicação do vCard falhou"
 
-#: ../src/profile_window.py:359
+#: ../src/profile_window.py:354
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr ""
 "Houve um erro ao publicar sua informação pessoal, tente outra vez mais tarde."
 
-#: ../src/roster_window.py:172 ../src/roster_window.py:227
+#: ../src/roster_window.py:194 ../src/roster_window.py:249
 msgid "Merged accounts"
 msgstr "Juntar contas"
 
-#: ../src/roster_window.py:345 ../src/common/helpers.py:43
+#: ../src/roster_window.py:370 ../src/roster_window.py:635
+#: ../src/roster_window.py:2145 ../src/common/contacts.py:312
+#: ../src/common/helpers.py:53
 msgid "Observers"
 msgstr "Observadores"
 
-#: ../src/roster_window.py:692 ../src/roster_window.py:3222
+#. Make special context menu if group is Groupchats
+#: ../src/roster_window.py:454 ../src/roster_window.py:459
+#: ../src/roster_window.py:1967 ../src/roster_window.py:1970
+#: ../src/roster_window.py:2640 ../src/roster_window.py:2643
+#: ../src/roster_window.py:2668 ../src/roster_window.py:4763
+#: ../src/roster_window.py:4765 ../src/common/commands.py:199
+#: ../src/common/contacts.py:102 ../src/common/helpers.py:53
+msgid "Groupchats"
+msgstr "Salas"
+
+#: ../src/roster_window.py:784 ../src/roster_window.py:4012
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Você não pode ingressar em uma sala enquanto estiver invisível"
 
 #. new chat
+#. single message
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:884 ../src/systray.py:206 ../src/systray.py:211
+#. join gc
+#: ../src/roster_window.py:1005 ../src/roster_window.py:1015
+#: ../src/roster_window.py:1024 ../src/systray.py:212 ../src/systray.py:217
+#: ../src/systray.py:223
 #, python-format
 msgid "using account %s"
 msgstr "usando conta %s"
 
-#. the 'manage gc bookmarks' item is shown
-#. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:909
+#: ../src/roster_window.py:1031
 #, python-format
 msgid "to %s account"
 msgstr "para %s conta"
 
 #. disco
-#: ../src/roster_window.py:914
+#: ../src/roster_window.py:1036
 #, python-format
 msgid "using %s account"
 msgstr "usando %s conta"
 
+#: ../src/roster_window.py:1117
+msgid "_Manage Bookmarks..."
+msgstr "_Gerenciar Favoritos..."
+
 #. profile, avatar
-#: ../src/roster_window.py:989
+#: ../src/roster_window.py:1136
 #, python-format
 msgid "of account %s"
 msgstr "da conta %s"
 
-#: ../src/roster_window.py:1009
-msgid "_Manage Bookmarks..."
-msgstr "_Gerenciar Favoritos..."
-
-#: ../src/roster_window.py:1038
+#: ../src/roster_window.py:1176
 #, python-format
 msgid "for account %s"
 msgstr "para conta %s"
 
 #. History manager
-#: ../src/roster_window.py:1059
+#: ../src/roster_window.py:1200
 msgid "History Manager"
 msgstr "Gerenciador de Histórico"
 
-#: ../src/roster_window.py:1068
+#: ../src/roster_window.py:1209
 msgid "_Join New Group Chat"
 msgstr "_Ingressar em uma nova Conferência"
 
-#: ../src/roster_window.py:1397 ../src/roster_window.py:3418
-#: ../src/roster_window.py:3425
+#: ../src/roster_window.py:1576 ../src/roster_window.py:4217
+#: ../src/roster_window.py:4224
 msgid "You have unread messages"
 msgstr "Você tem mensagens não lidas"
 
-#: ../src/roster_window.py:1398
+#: ../src/roster_window.py:1577
 msgid "You must read them before removing this transport."
 msgstr "Você precisa lê-los antes de remover este transporte."
 
-#: ../src/roster_window.py:1401
+#: ../src/roster_window.py:1580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:1402
+#: ../src/roster_window.py:1581
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -5114,11 +5903,11 @@ msgstr ""
 "Você não poderá mais enviar e receber mensagens dos contatos usando este "
 "transporte."
 
-#: ../src/roster_window.py:1405
+#: ../src/roster_window.py:1584
 msgid "Transports will be removed"
 msgstr "Os transportes serão removidos"
 
-#: ../src/roster_window.py:1410
+#: ../src/roster_window.py:1589
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -5128,114 +5917,149 @@ msgstr ""
 "%s"
 
 #. it's jid
-#: ../src/roster_window.py:1430
+#: ../src/roster_window.py:1755
 msgid "Rename Contact"
 msgstr "Renomear Contato"
 
-#: ../src/roster_window.py:1431
+#: ../src/roster_window.py:1756
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Entre com um novo apelido para o contato %s"
 
-#: ../src/roster_window.py:1438
+#: ../src/roster_window.py:1763
 msgid "Rename Group"
 msgstr "Renomear Grupo"
 
-#: ../src/roster_window.py:1439
+#: ../src/roster_window.py:1764
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Entre com um novo nome para o grupo %s"
 
-#: ../src/roster_window.py:1514
+#: ../src/roster_window.py:1839
 msgid "Remove Group"
 msgstr "Remover Grupo"
 
-#: ../src/roster_window.py:1515
+#: ../src/roster_window.py:1840
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Você quer remover o grupo %s da lista?"
 
-#: ../src/roster_window.py:1516
+#: ../src/roster_window.py:1841
 msgid "Remove also all contacts in this group from your roster"
 msgstr "Remover também todos os contatos neste grupo da sua lista"
 
-#: ../src/roster_window.py:1547
+#: ../src/roster_window.py:1872
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/roster_window.py:1548
+#: ../src/roster_window.py:1873
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para atribuir ao contato"
 
-#: ../src/roster_window.py:1784 ../src/roster_window.py:2045
-msgid "_New group chat"
-msgstr "_Nova conferência"
+#: ../src/roster_window.py:2191
+msgid "_New Group Chat"
+msgstr "_Nova Conferência"
 
-#: ../src/roster_window.py:1915
+#: ../src/roster_window.py:2331
 msgid "I would like to add you to my roster"
 msgstr "Eu gostaria de adiciona-lo à  minha lista"
 
-#: ../src/roster_window.py:2090 ../src/roster_window.py:2137
+#. Send Group Message
+#: ../src/roster_window.py:2465 ../src/roster_window.py:2677
 msgid "Send Group M_essage"
 msgstr "Enviar M_ensagem de Grupo"
 
-#: ../src/roster_window.py:2116
-msgid "Re_name"
-msgstr "Re_nomear"
+#: ../src/roster_window.py:2484
+msgid "_New group chat"
+msgstr "_Nova conferência"
 
-#: ../src/roster_window.py:2143
+#. Manage Transport submenu
+#: ../src/roster_window.py:2522
+msgid "_Manage Contacts"
+msgstr "_Gerenciar Contatos"
+
+#: ../src/roster_window.py:2583
+msgid "_Maximize"
+msgstr "_Maximizar"
+
+#: ../src/roster_window.py:2590
+msgid "_Disconnect"
+msgstr "_Desconectar"
+
+#: ../src/roster_window.py:2669
+msgid "_Maximize All"
+msgstr "_Maximizar Tudo"
+
+#: ../src/roster_window.py:2685
 msgid "To all users"
 msgstr "Para todos os usuários"
 
-#: ../src/roster_window.py:2146
+#: ../src/roster_window.py:2688
 msgid "To all online users"
 msgstr "Para todos os usuários conectados"
 
-#: ../src/roster_window.py:2182
+#. Log Off
+#: ../src/roster_window.py:2805
+msgid "_Log off"
+msgstr "_Efetuar logoff"
+
+#. Log on
+#: ../src/roster_window.py:2811
 msgid "_Log on"
 msgstr "_Conectar"
 
-#: ../src/roster_window.py:2192
-msgid "Log _off"
-msgstr "_Desconectar"
+#. Send single message
+#: ../src/roster_window.py:2823
+msgid "Send Single Message"
+msgstr "Enviar Mensagem Simples"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:2870
+msgid "_Manage Transport"
+msgstr "_Gerenciar Transporte"
+
+#. Modify Transport
+#: ../src/roster_window.py:2878
+msgid "_Modify Transport"
+msgstr "_Modificar Transporte"
 
-#: ../src/roster_window.py:2314 ../src/roster_window.py:2385
+#: ../src/roster_window.py:2992 ../src/roster_window.py:3066
 msgid "_Change Status Message"
 msgstr "_Mudar Mensagem de Status"
 
-#: ../src/roster_window.py:2457
+#: ../src/roster_window.py:3138
 msgid "Authorization has been sent"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:2458
+#: ../src/roster_window.py:3139
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" saberá seu status."
 
-#: ../src/roster_window.py:2478
+#: ../src/roster_window.py:3159
 msgid "Subscription request has been sent"
 msgstr "Solicitação de inscrição foi enviada"
 
-#: ../src/roster_window.py:2479
+#: ../src/roster_window.py:3160
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" aceitar esta solicitação, você saberá o status dele ou dela."
 
-#: ../src/roster_window.py:2491
+#: ../src/roster_window.py:3172
 msgid "Authorization has been removed"
 msgstr "Autorização foi removida"
 
-#: ../src/roster_window.py:2492
+#: ../src/roster_window.py:3173
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Agora \"%s\" você sempre o verá como offline."
 
-#: ../src/roster_window.py:2684
+#: ../src/roster_window.py:3407
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contato \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:2688
+#: ../src/roster_window.py:3411
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -5243,7 +6067,7 @@ msgstr ""
 "Removendo este contato, você também removerá a autorização, resultando em "
 "ele ou ela sempre o verá offiline."
 
-#: ../src/roster_window.py:2693
+#: ../src/roster_window.py:3416
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -5251,16 +6075,16 @@ msgstr ""
 "Removendo este contato, você também, por padrão, removerá a autorização, "
 "resultando em ele ou ela sempre o verá offiline."
 
-#: ../src/roster_window.py:2696
+#: ../src/roster_window.py:3419
 msgid "I want this contact to know my status after removal"
 msgstr "Eu quero que este contato saiba meu status após a remoção"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2700
+#: ../src/roster_window.py:3423
 msgid "Contacts will be removed from your roster"
 msgstr "Os contatos serão removidos da sua lista"
 
-#: ../src/roster_window.py:2704
+#: ../src/roster_window.py:3427
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -5270,7 +6094,7 @@ msgstr ""
 "você também remove a autorização fazendo com que eles sempre vejam você "
 "offline."
 
-#: ../src/roster_window.py:2736
+#: ../src/roster_window.py:3454
 msgid ""
 "Gnome Keyring is installed but not correctly started (environment variable "
 "probably not correctly set)"
@@ -5278,40 +6102,22 @@ msgstr ""
 "O Gnome Keyring está instalado mas não corretamente iniciado (provavelmente "
 "a variável de ambiente não está definida corretamente)"
 
-#. TODO: make this string translatable
+#: ../src/roster_window.py:3473
+msgid "GPG is not usable"
+msgstr "GPG não é usável"
+
 #. %s is the account name here
-#: ../src/roster_window.py:2764 ../src/common/connection.py:704
-#: ../src/common/zeroconf/connection_zeroconf.py:160
+#: ../src/roster_window.py:3474 ../src/common/connection_handlers.py:2153
+#: ../src/common/zeroconf/connection_zeroconf.py:171
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Você será conectado ao %s sem OpenPGP."
 
-#: ../src/roster_window.py:2781
-msgid "Passphrase Required"
-msgstr "Frase de acesso é obrigatória"
-
-#: ../src/roster_window.py:2782
-#, python-format
-msgid "Enter GPG key passphrase for account %s."
-msgstr "Entre com a frase de acesso da chave GPG para conta %s"
-
-#: ../src/roster_window.py:2787
-msgid "Save passphrase"
-msgstr "Salvar Frase de acesso"
-
-#: ../src/roster_window.py:2795
-msgid "Wrong Passphrase"
-msgstr "Frase de acesso Errada"
-
-#: ../src/roster_window.py:2796
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Por favor, reescreva sua frase de segurança GPG ou pressione Cancelar."
-
-#: ../src/roster_window.py:2860 ../src/roster_window.py:2920
+#: ../src/roster_window.py:3545 ../src/roster_window.py:3623
 msgid "You are participating in one or more group chats"
 msgstr "Você está participando em uma ou mais conferências"
 
-#: ../src/roster_window.py:2861 ../src/roster_window.py:2921
+#: ../src/roster_window.py:3546 ../src/roster_window.py:3624
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -5319,21 +6125,21 @@ msgstr ""
 "Mudando seu status para invisível resulta na desconexão daquelas "
 "conferências.  Você tem certeza que quer ir invisível?"
 
-#: ../src/roster_window.py:2878
+#: ../src/roster_window.py:3580
 msgid "No account available"
 msgstr "Conta não disponível"
 
-#: ../src/roster_window.py:2879
+#: ../src/roster_window.py:3581
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Você deve configurar uma conta antes de poder conversar com outros contatos."
 
-#: ../src/roster_window.py:2981
+#: ../src/roster_window.py:3730
 #, python-format
 msgid "\"%(title)s\" by %(artist)s"
 msgstr "\"%(title)s\" by %(artist)s"
 
-#: ../src/roster_window.py:3419 ../src/roster_window.py:3426
+#: ../src/roster_window.py:4218 ../src/roster_window.py:4225
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -5341,26 +6147,25 @@ msgstr ""
 "Mensagem somente estará disponível para leitura mais tarde se você tiver o "
 "histórico habilitado."
 
-#: ../src/roster_window.py:4016
+#: ../src/roster_window.py:4849
 msgid "Metacontacts storage not supported by your server"
 msgstr "O armazenamento de metacontatos não é suportado pelo seu servidor."
 
-#: ../src/roster_window.py:4018
+#: ../src/roster_window.py:4851
 msgid ""
 "Your server does not support storing metacontacts information. So those "
-"information will not be save on next reconnection."
+"information will not be saved on next reconnection."
 msgstr ""
-"O seu servidor não suporta a gravação de informação de metacontatos, "
-"portanto essas informações não serão estarão disponíveis na próxima vez que "
-"você se conectar."
+"O seu servidor não suporta a gravação de informação de metacontatos, então "
+"essas informações não estarão salvas na próxima vez que você conectar."
 
-#: ../src/roster_window.py:4060
+#: ../src/roster_window.py:4896
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Você está prestes a criar um metacontato. Tem certeza que quer continuar?"
 
-#: ../src/roster_window.py:4062
+#: ../src/roster_window.py:4898
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -5370,117 +6175,170 @@ msgstr ""
 "Geralmente isso é usado quando a mesma pessoa possui muitas contas de Jabber "
 "ou transportes."
 
-#: ../src/roster_window.py:4140
-#, python-format
-msgid "Do you want to send that file to %s:"
+#: ../src/roster_window.py:4993
+#, fuzzy
+msgid "Invalid file URI:"
+msgstr "Arquivo inválido"
+
+#: ../src/roster_window.py:5004
+#, fuzzy, python-format
+msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send those files to %s:"
 msgstr[0] "Você quer enviar esse arquivo para %s:"
 msgstr[1] "%s quer te enviar um arquivo:"
 
-#: ../src/roster_window.py:4245
-#, python-format
-msgid "Drop %s in group %s"
-msgstr "Derrubar %s no grupo %s"
-
-#: ../src/roster_window.py:4252
-#, python-format
-msgid "Make %s and %s metacontacts"
-msgstr "Fazer %s e %s metacontatos"
-
-#: ../src/roster_window.py:4439
+#: ../src/roster_window.py:5332
 msgid "Change Status Message..."
 msgstr "Mudar Mensagem de Status..."
 
-#: ../src/systray.py:163
+#: ../src/search_window.py:91
+msgid "Waiting for results"
+msgstr "Esperando resultados"
+
+#: ../src/search_window.py:131 ../src/search_window.py:209
+msgid "Error in received dataform"
+msgstr "Erro no formulário de dados recebido"
+
+#. No result
+#: ../src/search_window.py:165 ../src/search_window.py:201
+msgid "No result"
+msgstr "Sem resultados"
+
+#: ../src/secrets.py:45
+msgid ""
+"To continue, Gajim needs to access your stored secrets. Enter your passphrase"
+msgstr ""
+"Para continuar, o Gajim precisa acessar suas senhas armazenadas. Entre com "
+"sua senha"
+
+#: ../src/secrets.py:89
+msgid "Confirm Passphrase"
+msgstr "Confirmar Frase de Acesso"
+
+#: ../src/secrets.py:90
+msgid "Enter your new passphrase again for confirmation"
+msgstr "Digite novamente sua nova frase de acessar para confirmação"
+
+#: ../src/secrets.py:95 ../src/secrets.py:107
+msgid "Create Passphrase"
+msgstr "Criar Frase de Acesso"
+
+#: ../src/secrets.py:96
+msgid "Passphrases did not match.\n"
+msgstr "Frases de acesso não conferem.\n"
+
+#: ../src/secrets.py:97 ../src/secrets.py:108
+msgid "Gajim needs you to create a passphrase to encrypt stored secrets"
+msgstr ""
+"O Gajim precisa que você crie uma frase de acesso para criptografar as "
+"senhas armazenadas"
+
+#: ../src/systray.py:169
 msgid "_Change Status Message..."
 msgstr "_Mudar Mensagem de Status..."
 
-#: ../src/systray.py:251
+#: ../src/systray.py:254
 msgid "Hide this menu"
 msgstr "Esconder este menu"
 
-#: ../src/tooltips.py:309 ../src/tooltips.py:493
+#: ../src/tooltips.py:316 ../src/tooltips.py:509
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:312 ../src/tooltips.py:497
+#: ../src/tooltips.py:319 ../src/tooltips.py:513
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:317
+#: ../src/tooltips.py:324
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s dessa sala"
 
-#: ../src/tooltips.py:430 ../src/tooltips.py:612
+#: ../src/tooltips.py:422
+msgid " [blocked]"
+msgstr "[bloqueado]"
+
+#: ../src/tooltips.py:426
+msgid " [minimized]"
+msgstr "[minimizado]"
+
+#: ../src/tooltips.py:441 ../src/tooltips.py:629
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:461
+#: ../src/tooltips.py:471
 #, python-format
 msgid "Last status: %s"
 msgstr "Último status: %s"
 
-#: ../src/tooltips.py:463
+#: ../src/tooltips.py:473
 #, python-format
 msgid " since %s"
 msgstr "desde %s"
 
+#: ../src/tooltips.py:491
+msgid "Connected"
+msgstr "Conectado"
+
+#: ../src/tooltips.py:493
+msgid "Disconnected"
+msgstr "Desconectado"
+
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:520
 msgid "Subscription: "
 msgstr "Inscrição: "
 
-#: ../src/tooltips.py:513
+#: ../src/tooltips.py:530
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:568
+#: ../src/tooltips.py:585
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:574
+#: ../src/tooltips.py:591
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:581
+#: ../src/tooltips.py:598
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:604
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:590 ../src/tooltips.py:611
+#: ../src/tooltips.py:607 ../src/tooltips.py:628
 msgid "Not started"
 msgstr "Não iniciado"
 
-#: ../src/tooltips.py:594
+#: ../src/tooltips.py:611
 msgid "Stopped"
 msgstr "Parado"
 
-#: ../src/tooltips.py:596 ../src/tooltips.py:599
+#: ../src/tooltips.py:613 ../src/tooltips.py:616
 msgid "Completed"
 msgstr "Completo"
 
-#: ../src/tooltips.py:603
+#: ../src/tooltips.py:620
 msgid "?transfer status:Paused"
 msgstr "?status da transferência: Parado"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:624
 msgid "Stalled"
 msgstr "Parado"
 
-#: ../src/tooltips.py:609
+#: ../src/tooltips.py:626
 msgid "Transferring"
 msgstr "Transferindo"
 
-#: ../src/tooltips.py:641
+#: ../src/tooltips.py:660
 msgid "This service has not yet responded with detailed information"
 msgstr "Este serviço não respondeu ainda com informação detalhada"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:663
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5488,24 +6346,24 @@ msgstr ""
 "Este serviço não poderia responder com informações detalhadas.\n"
 "É mais provável quebrado"
 
-#: ../src/vcard.py:201
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: ../src/vcard.py:203
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "?SO:Desconhecido"
 
-#: ../src/vcard.py:231 ../src/vcard.py:409
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:472
 #, python-format
 msgid "since %s"
 msgstr "desde %s"
 
-#: ../src/vcard.py:261
+#: ../src/vcard.py:311
 msgid "Affiliation:"
 msgstr "Filiação:"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:319
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5513,7 +6371,7 @@ msgstr ""
 "Este contato está interessado em sua informação de presença, mas você não "
 "está interessado napresença dele/dela"
 
-#: ../src/vcard.py:271
+#: ../src/vcard.py:321
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5521,13 +6379,13 @@ msgstr ""
 "Você está interessado na informação da presença do contato, mas ele/ela não "
 "está interessado em seu"
 
-#: ../src/vcard.py:273
+#: ../src/vcard.py:323
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Você e o contato estão interessados em cada outra informação da presença"
 
 #. None
-#: ../src/vcard.py:275
+#: ../src/vcard.py:325
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -5535,140 +6393,144 @@ msgstr ""
 "Você não está interessado na presença do contato, e nenhum está interessado "
 "no seu"
 
-#: ../src/vcard.py:283
+#: ../src/vcard.py:333
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Você está esperando a resposta do contato sobre seu pedido da subscrição"
 
-#: ../src/vcard.py:287 ../src/vcard.py:314 ../src/vcard.py:434
+#: ../src/vcard.py:337 ../src/vcard.py:374 ../src/vcard.py:497
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
-#: ../src/common/check_paths.py:33
+#: ../src/common/check_paths.py:38
 msgid "creating logs database"
 msgstr "criando banco de dados de logs"
 
-#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
-#: ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:112
+#: ../src/common/check_paths.py:119
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s é um arquivo, mas deveria ser um diretório"
 
-#: ../src/common/check_paths.py:90 ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
+#: ../src/common/check_paths.py:102 ../src/common/check_paths.py:113
+#: ../src/common/check_paths.py:120 ../src/common/check_paths.py:128
 msgid "Gajim will now exit"
 msgstr "Gajim sairá agora"
 
-#: ../src/common/check_paths.py:115
+#: ../src/common/check_paths.py:127
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s é um diretório, mas deveria ser um arquivo"
 
-#: ../src/common/check_paths.py:131
+#: ../src/common/check_paths.py:143
 #, python-format
 msgid "creating %s directory"
 msgstr "criando diretório %s"
 
-#: ../src/common/commands.py:69
+#: ../src/common/commands.py:74
 msgid "Change status information"
 msgstr "Alterar informação de status"
 
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:87
 msgid "Change status"
 msgstr "Alterar status"
 
-#: ../src/common/commands.py:83
+#: ../src/common/commands.py:88
 msgid "Set the presence type and description"
 msgstr "Definir o tipo e a descrição da presença"
 
-#: ../src/common/commands.py:89
+#: ../src/common/commands.py:94
 msgid "Free for chat"
 msgstr "Livre para conversa"
 
-#: ../src/common/commands.py:90
+#: ../src/common/commands.py:95
 msgid "Online"
 msgstr "Conectado"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 msgid "Extended away"
 msgstr "Muito afastado"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Do not disturb"
 msgstr "Não perturbe"
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:99
 msgid "Offline - disconnect"
 msgstr "Desconectado"
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 msgid "Presence description:"
 msgstr "Descrição da presença:"
 
-#: ../src/common/commands.py:134
+#: ../src/common/commands.py:139
 msgid "The status has been changed."
 msgstr "O status foi alterado."
 
-#: ../src/common/commands.py:179
+#: ../src/common/commands.py:184
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s da sala %(room_jid)s"
 
-#: ../src/common/commands.py:183
+#: ../src/common/commands.py:188
 msgid "You have not joined a groupchat."
 msgstr "Você não entrou em uma sala."
 
-#: ../src/common/commands.py:189
+#: ../src/common/commands.py:194
 msgid "Leave Groupchats"
 msgstr "Sair das salas"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:195
 msgid "Choose the groupchats you want to leave"
 msgstr "Selecione as salas das quais você quer sair"
 
-#: ../src/common/commands.py:194
-msgid "Groupchats"
-msgstr "Salas"
-
-#: ../src/common/commands.py:230
+#: ../src/common/commands.py:235
 msgid "You left the following groupchats:"
 msgstr "Você saiu das seguintes salas:"
 
-#: ../src/common/config.py:56
+#: ../src/common/commands.py:247
+msgid "Forward unread messages"
+msgstr "Encaminhar mensagens não lidas"
+
+#: ../src/common/commands.py:267
+msgid "All unread messages have been forwarded."
+msgstr "Todas as mensagens não lidas foram encaminhadas."
+
+#: ../src/common/config.py:74
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Usar DBus e Notification-Daemon para mostrar notificações"
 
-#: ../src/common/config.py:61
+#: ../src/common/config.py:79
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Minutos, depois do qual seu status mudam a afastado."
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:80
 msgid "Away as a result of being idle"
 msgstr "Afastado em conseqüência de estar inativo"
 
-#: ../src/common/config.py:64
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Minutos, depois do qual seu status mudam a nao disponível."
 
-#: ../src/common/config.py:65
+#: ../src/common/config.py:83
 msgid "Not available as a result of being idle"
 msgstr "Não disponível em conseqüência de estar inativo"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:101
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Lista (separada por espaços) de linhas (contas e grupos) que estão agrupados."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:106
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Ativar mensagens \"link-local\"/\"zeroconf\""
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:109
 msgid "Language used by speller"
 msgstr "Idioma usado pelo corretor ortográfico"
 
-#: ../src/common/config.py:92
+#: ../src/common/config.py:110
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -5678,7 +6540,7 @@ msgstr ""
 "'às vezes' - mostrar hora a cada print_ichat_every_foo_minutes minutos.\n"
 "'nunca' - nunca mostrar a hora."
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:111
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -5688,18 +6550,18 @@ msgstr ""
 "varia de 1 a 4, 0 desabilita a função. 1 é relógio mais preciso, 4 é o "
 "menos. Isto é usado apenas se o valor de print_time for 'às vezes'."
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:114
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Aproveite os pare * /_ como caracteres de formatação. "
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:115
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Se verdadeiro, não remova */_. Assim * ABC * seja negrito(realce) mas com * "
 "* não removido."
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:118
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -5710,7 +6572,7 @@ msgstr ""
 "sourceforge.net/docs/ref/rst/restructuredtext.html (Se você quiser usar "
 "isso, instale o docutils)"
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:127
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -5718,7 +6580,7 @@ msgstr ""
 "Caracter a adicionar ao apelido quando se estiver usando o recurso de "
 "completar apelido (tecla Tab) na conferência."
 
-#: ../src/common/config.py:110
+#: ../src/common/config.py:128
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -5726,7 +6588,7 @@ msgstr ""
 "O caracter a ser proposto para adicionar ao final do apelido desejado quando "
 "ele já estiver sendo usado por outra pessoa na conferência."
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:151
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -5737,19 +6599,34 @@ msgstr ""
 "por strftime na documentação do Python: http://docs.python.org/lib/module-"
 "time.html"
 
-#: ../src/common/config.py:134
+#: ../src/common/config.py:152
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Os caracteres que são exibidos antes do apelido nas conversas"
 
-#: ../src/common/config.py:135
+#: ../src/common/config.py:153
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Os caracteres que são exibidos após o apelidos nas conversas"
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:156
+msgid ""
+"If checked, Gajim can regularly poll a Last.fm account and adjust the status "
+"message to reflect recently played songs. "
+"set_status_msg_from_current_music_track option must be False."
+msgstr ""
+"Se marcado, o Gajim pode pesquisar regularmente em uma conta do Last.fm para "
+"ajustar a mensagem de status de modo a refletir as músicas tocadas "
+"recentemente. A opção set_status_msg_from_current_music_track precisa ser "
+"Falso."
+
+#: ../src/common/config.py:157
+msgid "The username used to identify the Last.fm account."
+msgstr "O nome de usuário usado para identificar a conta Last.fm."
+
+#: ../src/common/config.py:162
 msgid "Add * and [n] in roster title?"
 msgstr "Adicionar * e [n] no título da lista?"
 
-#: ../src/common/config.py:143
+#: ../src/common/config.py:163
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -5757,12 +6634,12 @@ msgstr ""
 "Quantas linhas lembrar da conversação anterior quando uma aba/janela de bate-"
 "papo for reaberta."
 
-#: ../src/common/config.py:144
+#: ../src/common/config.py:164
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Quantos minutos mostrar ao exibir as últimas linhas da conversação anterior."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:165
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -5770,11 +6647,11 @@ msgstr ""
 "Enviar a mensagem com Ctrl+Enter e criar uma nova linha com Enter "
 "(comportamento padrão do cliente ICQ da Mirabilis)."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:167
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Quantas linhas armazenar com Ctrl+Acima."
 
-#: ../src/common/config.py:150
+#: ../src/common/config.py:170
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -5783,12 +6660,12 @@ msgstr ""
 "Uma ou outra URL costuma vir com %s onde %s é a palvra/frase ou ' em "
 "WIKTIONARY ' que significam o uso wiktionary."
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:173
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Se verificado, Gajim pode ser remotamente controlado usando gajim-remoto."
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:174
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -5800,14 +6677,14 @@ msgstr ""
 "configurado para Falso e se estiverem sincronizadas com o status global) "
 "baseado no status da conexão de rede."
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:175
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Notificações de estado de conversa enviados. Pode ser one of all, "
 "composing_only, disabled."
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:176
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -5815,7 +6692,7 @@ msgstr ""
 "Notificações de estado de conversa exibidos nas janelas de conversa. Pode "
 "ser one of all, composing_only, disabled."
 
-#: ../src/common/config.py:158
+#: ../src/common/config.py:178
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -5823,11 +6700,11 @@ msgstr ""
 "Quando não estiver exibindo a hora para cada mensagem (print_time == "
 "simetimes), exibi-lo a cada x minutos."
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:179
 msgid "Ask before closing a group chat tab/window."
 msgstr "Perguntar antes de fechar um aba ou janela de conferência."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:180
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -5835,7 +6712,7 @@ msgstr ""
 "Sempre perguntar antes de fechar um aba/janela nesta lista separada por "
 "espaço de JID's de conferências."
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:181
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -5843,7 +6720,7 @@ msgstr ""
 "Nunca perguntar antes de fechar uma aba/janela de conferência nesta lista "
 "separada por espaço de salas separadas por jids."
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:184
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -5852,34 +6729,54 @@ msgstr ""
 "interfaces locais, para Transferência de Arquivo no caso de tradução de "
 "endereço/encaminhamento de porta."
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:186
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Padrão da IEC diz que KiB = 1024 bytes e KB = 1000 bytes."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:188
 msgid "Notify of events in the system trayicon."
 msgstr "Notificar os eventos no ícone da bandeja do sistema."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:194
 msgid "Show tab when only one conversation?"
 msgstr "Mostrar aba quando tiver apenas uma bate papo?"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:195
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Mostrar borda de caderno tabulada nas janelas de conversa?"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:196
 msgid "Show close button in tab?"
 msgstr "Mostrar botão de fechar na aba?"
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:197
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+"Ao negociar uma sessão criptografada, o Gajim deve assumir que você quer que "
+"suas mensagens sejam gravadas?"
+
+#: ../src/common/config.py:198
+msgid ""
+"When negotiating an encrypted session, should Gajim prefer to use public "
+"keys for identification?"
+msgstr ""
+"Ao negociar uma sessão criptografada o Gajim deve preferir usar chaves "
+"públicas para identificação?"
+
+#: ../src/common/config.py:207
+msgid "Preview new messages in notification popup?"
+msgstr "Pré-visualizar novas mensagens em uma janela popup?"
+
+#: ../src/common/config.py:212
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Uma lista separada por ponto-e-vírgula das palavras que serão destacadas nas "
 "conferências."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:213
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -5887,13 +6784,13 @@ msgstr ""
 "Se verdadeiro, o Gajim sairá quando o botão sair da janela for clicado. Esta "
 "opção só faz sentido quando a opção trayicon está sendo usada."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:214
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Se Verdadeiro, o Gajim verifica ao iniciar se é o cliente Jabber padrão."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:215
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -5901,7 +6798,7 @@ msgstr ""
 "Se verdadeiro, Gajim mostrará um ícone para cada aba contendo mensagens não "
 "lidas. Dependendo do tema, este ícone pode ser animado."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:216
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -5909,7 +6806,7 @@ msgstr ""
 "Se Verdadeiro, o Gajim indicará a mensagem de status, se não estiver vazia, "
 "para cada contato sob o nome do contato na janela da lista."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:218
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -5917,7 +6814,7 @@ msgstr ""
 "Se verdadeiro, Gajim pedirá por avatar cada contato que não teve um avatar "
 "ou tem um cache que é velho demais."
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:219
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -5925,7 +6822,7 @@ msgstr ""
 "Se Falso, você não verá por mais muito tempo a linha de status nas conversas "
 "quando um contato alterar seu status e/ou sua mensagem de status."
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:220
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -5939,29 +6836,29 @@ msgstr ""
 "\" o Gajim exibirá todas as mensagens de status. Se for \"in_and_out\" o "
 "Gajim só mostrará FOO entradas/saídas em conferências."
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:222
 msgid "Background color of contacts when they just signed in."
 msgstr "Cor de fundo dos contatos quando eles simplesmente conectarem."
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:223
 msgid "Background color of contacts when they just signed out."
 msgstr "Cor de fundo dos contatos quando eles simplesmente desconectarem."
 
-#: ../src/common/config.py:202
+#: ../src/common/config.py:225
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Se Verdadeiro, as mensagens restauradas usarão uma fonte menor que o padrão."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:226
 msgid "Don't show avatar for the transport itself."
 msgstr "Não mostrar o avatar para o próprio transporte."
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:227
 msgid "Don't show roster in the system taskbar."
 msgstr "Não mostrar a lista na bandeja do sistema."
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:228
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -5971,7 +6868,7 @@ msgstr ""
 "faz a janela piscar (o comportamento padrão na maioria dos Gerenciadores de "
 "Janela) quando esperam eventos pendentes."
 
-#: ../src/common/config.py:207
+#: ../src/common/config.py:230
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -5982,7 +6879,7 @@ msgstr ""
 "informações sha na presenças de conferências."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:210
+#: ../src/common/config.py:233
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -6000,36 +6897,32 @@ msgstr ""
 "conferência) são enviadas para uma janela específica. Nota, esta mudança "
 "requer o reinício do Gajim antes que tenham efeito."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:234
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Se Falso, você não verá por muito tempo o avatar na janela do bate-papo."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:235
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Se Verdadeiro, pressionando a tecla Esc fecha a aba/janela"
 
-#: ../src/common/config.py:213
-msgid "Hides the buttons in group chat window."
-msgstr "Esconder os botões na janela de conferência."
+#: ../src/common/config.py:236
+msgid "Hides the buttons in chat windows."
+msgstr "Esconder os botões nas janelas de conversa."
 
-#: ../src/common/config.py:214
-msgid "Hides the buttons in two persons chat window."
-msgstr "Esconder os botões na janela de conversa para duas pessoas."
-
-#: ../src/common/config.py:215
+#: ../src/common/config.py:237
 msgid "Hides the banner in a group chat window"
 msgstr "Esconder o banner na janela de conferência"
 
-#: ../src/common/config.py:216
+#: ../src/common/config.py:238
 msgid "Hides the banner in two persons chat window"
 msgstr "Esconder o banner na janela de conversa para duas pessoas "
 
-#: ../src/common/config.py:217
+#: ../src/common/config.py:239
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Esconder a lista dos ocupantes da sala na janela da conferência."
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:240
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -6037,22 +6930,26 @@ msgstr ""
 "Em uma conferência, mostrar o apelido no começo da linha apenas quando a "
 "mensagem atual não for da mesma pessoa que mandou a última."
 
-#: ../src/common/config.py:219
+#: ../src/common/config.py:241
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Usar identação ao mesclar apelidos consecutivos."
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:242
+msgid "Smooth scroll message in conversation window"
+msgstr "Suavizar a rolagem de mensagens na janela de conversação"
+
+#: ../src/common/config.py:243
 msgid "List of colors that will be used to color nicknames in group chats."
 msgstr ""
 "A lista de cores que serão usadas para os apelidos nas salas de conferência."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:244
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Quando nenhum aba tiver uma mensagem não lida, Ctrl + Tab vai para a próxima "
 "aba."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:245
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -6060,7 +6957,7 @@ msgstr ""
 "Devemos mostrar o diálogo de confirmação de metacontatos ou não? Uma string "
 "vazia significa que nós nunca devemos mostrar o diálogo."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:246
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -6071,7 +6968,7 @@ msgstr ""
 "autenticado com uma prioridade negativa, você NÃO poderá receber nenhuma "
 "mensagem do seu servidor."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:247
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -6079,7 +6976,7 @@ msgstr ""
 "Se Verdadeiro, o Gajim usará o Gnome Keyring (se disponível) para armazenar "
 "as senhas das contas."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -6087,7 +6984,7 @@ msgstr ""
 "Se Verdadeiro, o Gajim mostrará o número de contatos online e do total de "
 "contatos nas linha de conta e grupo."
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:249
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -6095,7 +6992,7 @@ msgstr ""
 "Pode ser vazio, 'chat' ou 'normal'. Se for vazio, trata todas as mensagens "
 "recebidas como se elas fossem do tipo especificado"
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:250
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -6103,7 +7000,37 @@ msgstr ""
 "Se Verdadeiro, o Gajim irá rolar e selecionar o contato que lhe enviou a "
 "última mensagem, se a janela de conversa ainda não estiver aberta."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:251
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+"Se definido como Verdadeiro o Gajim converterá strings entre $$ e $$ em uma "
+"imagem usando o dvips antes de inseri-la em uma janela de conversa."
+
+#: ../src/common/config.py:252
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr ""
+"O tempo de inatividade necessário antes de fechar a janela de alteração de "
+"status."
+
+#: ../src/common/config.py:253
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+"Número máximo de linhas que são exibidas em conversações. As linhas mais "
+"antigas são apagadas."
+
+#: ../src/common/config.py:254
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+"Se marcado como Verdadeiro as janelas de notificação do notification-daemon "
+"serão anexadas ao ícone da bandeja do sistema."
+
+#: ../src/common/config.py:265
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -6112,11 +7039,11 @@ msgstr ""
 "prioridades são definidas nas opções autopriority_."
 
 #. yes, no, ask
-#: ../src/common/config.py:267
+#: ../src/common/config.py:293
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 rodando"
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:297
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -6124,101 +7051,101 @@ msgstr ""
 "Se checado, o Gaijm usará seu IP e proxies definidos no "
 "file_transfer_proxies, em opções para transferência de arquivos."
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:356
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "O OpenPGP está ativado para este contato?"
 
-#: ../src/common/config.py:331 ../src/common/config.py:334
+#: ../src/common/config.py:357 ../src/common/config.py:360
 msgid "Language for which we want to check misspelled words"
 msgstr "Idioma a usar na verificação ortográficas das palavras"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:366
 msgid "all or space separated status"
 msgstr "todos ou lista de status separados por espaço"
 
-#: ../src/common/config.py:341
+#: ../src/common/config.py:367
 msgid "'yes', 'no', or 'both'"
 msgstr "'sim', 'não' ou 'ambos'"
 
-#: ../src/common/config.py:342 ../src/common/config.py:344
-#: ../src/common/config.py:345 ../src/common/config.py:348
-#: ../src/common/config.py:349
+#: ../src/common/config.py:368 ../src/common/config.py:370
+#: ../src/common/config.py:371 ../src/common/config.py:374
+#: ../src/common/config.py:375
 msgid "'yes', 'no' or ''"
 msgstr "'sim', 'não', ou ''"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:381
 msgid "Sleeping"
 msgstr "Dormindo"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:382
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:382
 msgid "Back in some minutes."
 msgstr "Volto em alguns minutos."
 
-#: ../src/common/config.py:357
+#: ../src/common/config.py:383
 msgid "Eating"
 msgstr "Comendo"
 
-#: ../src/common/config.py:357
+#: ../src/common/config.py:383
 msgid "I'm eating, so leave me a message."
 msgstr "Eu estou comendo, então deixe-me uma mensagem."
 
-#: ../src/common/config.py:358
+#: ../src/common/config.py:384
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:358
+#: ../src/common/config.py:384
 msgid "I'm watching a movie."
 msgstr "Estou assistindo um filme."
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:385
 msgid "Working"
 msgstr "Trabalhando"
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:385
 msgid "I'm working."
 msgstr "Estou trabalhando."
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:386
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:386
 msgid "I'm on the phone."
 msgstr "Estou no telefone."
 
-#: ../src/common/config.py:361
+#: ../src/common/config.py:387
 msgid "Out"
 msgstr "Estou fora"
 
-#: ../src/common/config.py:361
+#: ../src/common/config.py:387
 msgid "I'm out enjoying life."
 msgstr "Estou fora curtindo a vida."
 
-#: ../src/common/config.py:365
+#: ../src/common/config.py:391
 msgid "I'm available."
 msgstr "Estou disponível."
 
-#: ../src/common/config.py:366
+#: ../src/common/config.py:392
 msgid "I'm free for chat."
 msgstr "Estou livre para conversar."
 
-#: ../src/common/config.py:368
+#: ../src/common/config.py:394
 msgid "I'm not available."
 msgstr "Não estou disponível."
 
-#: ../src/common/config.py:369
+#: ../src/common/config.py:395
 msgid "Do not disturb."
 msgstr "Não perturbe."
 
-#: ../src/common/config.py:370 ../src/common/config.py:371
+#: ../src/common/config.py:396 ../src/common/config.py:397
 msgid "Bye!"
 msgstr "Tchau!"
 
-#: ../src/common/config.py:380
+#: ../src/common/config.py:406
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -6226,138 +7153,128 @@ msgstr ""
 "Som para tocar quando uma mensagem MUC conter uma das palavras no "
 "muc_hightlight_words, ou quando uma mensagem MUC contiver seu apelido."
 
-#: ../src/common/config.py:381
+#: ../src/common/config.py:407
 msgid "Sound to play when any MUC message arrives."
 msgstr "Som a ser tocado quando qualquer mensagem MUC chegar."
 
-#: ../src/common/config.py:390 ../src/common/optparser.py:195
+#: ../src/common/config.py:416 ../src/common/optparser.py:220
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:394 ../src/common/optparser.py:181
+#: ../src/common/config.py:420 ../src/common/optparser.py:206
 msgid "grocery"
 msgstr "mantimento"
 
-#: ../src/common/config.py:398
+#: ../src/common/config.py:424
 msgid "human"
 msgstr "humano"
 
-#: ../src/common/config.py:402
+#: ../src/common/config.py:428
 msgid "marine"
 msgstr "marinho"
 
-#: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
+#: ../src/common/connection_handlers.py:61
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
 msgid "Unable to load idle module"
 msgstr "Incapaz de carregar o módulo inativo"
 
-#: ../src/common/connection_handlers.py:180
-#: ../src/common/connection_handlers.py:215
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:236
+#: ../src/common/connection_handlers.py:219
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:243
 msgid "Wrong host"
 msgstr "Servidor errado"
 
-#: ../src/common/connection_handlers.py:180
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:236
-#, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
-"O computador %s que você especificou na configuração avançada "
-"ft_override_host_to_send não é válido e será ignorado."
-
-#: ../src/common/connection_handlers.py:216
+#: ../src/common/connection_handlers.py:220
 msgid "Invalid local address? :-O"
 msgstr "Endereço local inválido? :-O"
 
-#: ../src/common/connection_handlers.py:607
+#: ../src/common/connection_handlers.py:618
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "A informação do registo para o transporte %s não chegou a tempo"
 
-#: ../src/common/connection_handlers.py:1550
+#: ../src/common/connection_handlers.py:1802
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Apelido não permitido: %s"
 
-#. password required to join
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1615
-#: ../src/common/connection_handlers.py:1618
-#: ../src/common/connection_handlers.py:1621
-#: ../src/common/connection_handlers.py:1624
-#: ../src/common/connection_handlers.py:1627
-#: ../src/common/connection_handlers.py:1630
-#: ../src/common/connection_handlers.py:1638
+#: ../src/common/connection_handlers.py:1872
+#: ../src/common/connection_handlers.py:1875
+#: ../src/common/connection_handlers.py:1878
+#: ../src/common/connection_handlers.py:1881
+#: ../src/common/connection_handlers.py:1885
+#: ../src/common/connection_handlers.py:1894
 msgid "Unable to join group chat"
 msgstr "Impossível ingressar na sala"
 
-#: ../src/common/connection_handlers.py:1616
-msgid "A password is required to join this group chat."
-msgstr "Uma senha é requerida para entrar nesta sala."
-
-#: ../src/common/connection_handlers.py:1619
-msgid "You are banned from this group chat."
-msgstr "Você está banido desta sala."
+#: ../src/common/connection_handlers.py:1873
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Você está banido da sala %s."
 
-#: ../src/common/connection_handlers.py:1622
-msgid "Such group chat does not exist."
-msgstr "Tal sala não existe."
+#: ../src/common/connection_handlers.py:1876
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "A sala %s não existe."
 
-#: ../src/common/connection_handlers.py:1625
+#: ../src/common/connection_handlers.py:1879
 msgid "Group chat creation is restricted."
 msgstr "A criação de sala é restrita."
 
-#: ../src/common/connection_handlers.py:1628
-msgid "Your registered nickname must be used."
-msgstr "Seu nickname registado deve ser usado."
+#: ../src/common/connection_handlers.py:1882
+#, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Seu nickname registado deve ser usado na sala %s."
 
-#: ../src/common/connection_handlers.py:1631
-msgid "You are not in the members list."
-msgstr "Você não está na lista de membros."
+#: ../src/common/connection_handlers.py:1886
+#, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Você não está na lista de membros da sala %s."
 
-#: ../src/common/connection_handlers.py:1639
+#: ../src/common/connection_handlers.py:1895
+#, python-format
 msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
-"Seu nickname desejado está em uso ou registado por um outro usuário.\n"
-" Por favor, especifique um outro nickname abaixo:"
+"O apelido que você deseja usar está em uso ou registado por um outro "
+"ocupante.\n"
+"Por favor, especifique um outro apelido abaixo:"
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:1682
+#: ../src/common/connection_handlers.py:1926
 msgid "Room has been destroyed"
 msgstr "A sala foi excluída"
 
-#: ../src/common/connection_handlers.py:1689
+#: ../src/common/connection_handlers.py:1933
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Você pode entrar nessa sala ao invés: %s"
 
-#: ../src/common/connection_handlers.py:1715
+#: ../src/common/connection_handlers.py:1960
 msgid "I would like to add you to my roster."
 msgstr "Eu gostaria de adiciona-lo à  minha lista."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1736
+#: ../src/common/connection_handlers.py:1981
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nós estamos agora inscritos para %s"
 
-#: ../src/common/connection_handlers.py:1738
+#: ../src/common/connection_handlers.py:1983
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Remoção de Inscrição solicitada por %s"
 
-#: ../src/common/connection_handlers.py:1740
+#: ../src/common/connection_handlers.py:1985
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nós estamos agora sem inscrição para %s"
 
-#: ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:2112
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -6367,88 +7284,71 @@ msgstr ""
 "ferramentas de gerência da lista como http://jru.jabberstudio.org/ para "
 "removê-lo"
 
-#: ../src/common/connection.py:194
-#: ../src/common/zeroconf/connection_zeroconf.py:198
+#. We didn't set a passphrase
+#: ../src/common/connection_handlers.py:2151
+#: ../src/common/zeroconf/connection_zeroconf.py:169
+msgid "OpenPGP passphrase was not given"
+msgstr "Palavra-chave do OpenPGP não foi recebida"
+
+#: ../src/common/connection.py:243
+#: ../src/common/zeroconf/connection_zeroconf.py:209
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Conexão com a conta \"%s\" foi perdida"
 
-#: ../src/common/connection.py:195
+#: ../src/common/connection.py:244
 msgid "Reconnect manually."
 msgstr "Reconecte manualmente."
 
-#: ../src/common/connection.py:206 ../src/common/connection.py:233
+#: ../src/common/connection.py:255
 #, python-format
-msgid "Transport %s answered wrongly to register request: %s"
-msgstr "Transporte %s respondeu errado para registar o pedido: %s"
+msgid "Server %s answered wrongly to register request: %s"
+msgstr "O servidor %s respondeu erroneamente à requisição de registro: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:232
+#: ../src/common/connection.py:263
 msgid "Invalid answer"
 msgstr "Resposta inválida"
 
-#: ../src/common/connection.py:380
+#: ../src/common/connection.py:264
+#, python-format
+msgid "Transport %s answered wrongly to register request: %s"
+msgstr "Transporte %s respondeu errado para registar o pedido: %s"
+
+#: ../src/common/connection.py:410
 msgid "Connection to proxy failed"
 msgstr "Falha na conexão com o proxy"
 
-#: ../src/common/connection.py:434 ../src/common/connection.py:532
-#: ../src/common/connection.py:1003
-#: ../src/common/zeroconf/connection_zeroconf.py:219
+#: ../src/common/connection.py:464 ../src/common/connection.py:510
+#: ../src/common/connection.py:1081
+#: ../src/common/zeroconf/connection_zeroconf.py:243
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossível conectar a \"%s\""
 
-#: ../src/common/connection.py:448
+#: ../src/common/connection.py:478
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Conectado ao servidor %s:%s com %s"
 
-#: ../src/common/connection.py:461
-#, python-format
-msgid "Security error connecting to \"%s\""
-msgstr "Erro de segurança ao conectar a \"%s\""
-
-#: ../src/common/connection.py:462
-msgid ""
-"The server's key has changed, or someone is trying to hack your connection."
-msgstr ""
-"A chave do servidor foi alterada ou alguém está tentando hackear a sua "
-"conexão."
-
-#: ../src/common/connection.py:469
-#, python-format
-msgid "Unable to check fingerprint for %s. Connection could be insecure."
-msgstr ""
-"Incapaz de verifica a impressão digital de %s. A conexão pode ser insegura."
-
 #: ../src/common/connection.py:511
-#, python-format
-msgid "Missing fingerprint in SSL connection to %s"
-msgstr "Faltando impressão digital na conexão SSL para %s"
-
-#: ../src/common/connection.py:517
-#, python-format
-msgid "Fingerprint mismatch for %s: Got %s, expected %s"
-msgstr "Conflito de impressões digitais para %s: obtido %s, esperado %s"
-
-#: ../src/common/connection.py:533
 msgid "Check your connection or try again later"
 msgstr "Verifique sua conexão ou tente novamente mais tarde"
 
-#: ../src/common/connection.py:559
+#: ../src/common/connection.py:536
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falha na autenticação com \"%s\""
 
-#: ../src/common/connection.py:560
+#: ../src/common/connection.py:538
 msgid "Please check your login and password for correctness."
 msgstr "Por favor, verifique seu login e senha para exatidão."
 
-#: ../src/common/connection.py:603
+#: ../src/common/connection.py:581
 msgid "Error while removing privacy list"
 msgstr "Erro ao remover lista de privacidade"
 
-#: ../src/common/connection.py:604
+#: ../src/common/connection.py:582
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -6457,20 +7357,14 @@ msgstr ""
 "A lista de privacidade %s não foi removida. Ela pode estar ativa em um ou "
 "mais recursos conectados. Desative-os e tente novamente."
 
-#. We didn't set a passphrase
-#: ../src/common/connection.py:702
-#: ../src/common/zeroconf/connection_zeroconf.py:158
-msgid "OpenPGP passphrase was not given"
-msgstr "Palavra-chave do OpenPGP não foi recebida"
-
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:833
+#: ../src/common/connection.py:856
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Esta mensagem está *criptografada* (Veja:JEP:'27')]"
 
-#: ../src/common/connection.py:889
-#: ../src/common/zeroconf/connection_zeroconf.py:399
+#: ../src/common/connection.py:930
+#: ../src/common/zeroconf/connection_zeroconf.py:437
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -6479,39 +7373,39 @@ msgstr ""
 "Assunto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1029
+#: ../src/common/connection.py:1113
 msgid "Not fetched because of invisible status"
 msgstr "Não baixado por causa do status invisível"
 
-#: ../src/common/contacts.py:271
+#: ../src/common/contacts.py:299
 msgid "Not in roster"
 msgstr "Fora da lista"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:33
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Acesso ao python D-Bus foi perdido neste computador"
 
-#: ../src/common/dbus_support.py:34
+#: ../src/common/dbus_support.py:42
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "As potencialidades do D-Bus no Gajim não podem ser usadas"
 
-#: ../src/common/exceptions.py:22
+#: ../src/common/exceptions.py:27
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr "O pysqlite2 (ou python-pysqlite2) está faltando. Encerrando..."
 
-#: ../src/common/exceptions.py:30
+#: ../src/common/exceptions.py:44
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Serviço não disponível: o Gajim não está funcionando ou o controle remoto é "
 "falso"
 
-#: ../src/common/exceptions.py:38
+#: ../src/common/exceptions.py:52
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
 "O D-Bus não está presente nesta máquina ou o módulo do Python está faltando"
 
-#: ../src/common/exceptions.py:46
+#: ../src/common/exceptions.py:60
 msgid ""
 "Session bus is not available.\n"
 "Try reading http://trac.gajim.org/wiki/GajimDBus"
@@ -6519,443 +7413,446 @@ msgstr ""
 "O bus de sessão não está disponível.\n"
 "Veja http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:47
 msgid "one"
 msgstr "um"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:47
 msgid "two"
 msgstr "dois"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:47
 msgid "three"
 msgstr "três"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:47
 msgid "four"
 msgstr "quatro"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:47
 msgid "five"
 msgstr "cinco"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:47
 msgid "six"
 msgstr "seis"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:48
 msgid "seven"
 msgstr "sete"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:48
 msgid "eight"
 msgstr "oito"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:48
 msgid "nine"
 msgstr "nove"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:48
 msgid "ten"
 msgstr "dez"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:48
 msgid "eleven"
 msgstr "onze"
 
-#: ../src/common/fuzzyclock.py:44
+#: ../src/common/fuzzyclock.py:49
 msgid "twelve"
 msgstr "doze"
 
 #. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
 #. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
 msgid "$0 o'clock"
 msgstr "$0 horas"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
 msgid "five past $0"
 msgstr "$0 e cinco"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:61
 msgid "ten past $0"
 msgstr "$0 e dez"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:61
 msgid "quarter past $0"
 msgstr "$0 e quinze"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+#: ../src/common/fuzzyclock.py:54 ../src/common/fuzzyclock.py:62
 msgid "twenty past $0"
 msgstr "$0 e vinte"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+#: ../src/common/fuzzyclock.py:54 ../src/common/fuzzyclock.py:62
 msgid "twenty five past $0"
 msgstr "$0 e vinte e cinco"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+#: ../src/common/fuzzyclock.py:55 ../src/common/fuzzyclock.py:63
 msgid "half past $0"
 msgstr "$0 e meia"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+#: ../src/common/fuzzyclock.py:55 ../src/common/fuzzyclock.py:63
 msgid "twenty five to $1"
 msgstr "vinte e cinco para as $1"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:56 ../src/common/fuzzyclock.py:64
 msgid "twenty to $1"
 msgstr "vinte para as $1"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:56 ../src/common/fuzzyclock.py:64
 msgid "quarter to $1"
 msgstr "quinze para as $1"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:57 ../src/common/fuzzyclock.py:65
 msgid "ten to $1"
 msgstr "dez para as $1"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:57 ../src/common/fuzzyclock.py:65
 msgid "five to $1"
 msgstr "cinco para as $1"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
+#: ../src/common/fuzzyclock.py:57 ../src/common/fuzzyclock.py:66
 msgid "$1 o'clock"
 msgstr "$1 horas"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:69
 msgid "Night"
 msgstr "Noite"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:69
 msgid "Early morning"
 msgstr "Madrugada"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:69
 msgid "Morning"
 msgstr "Manhã"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:69
 msgid "Almost noon"
 msgstr "Quase meio-dia"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:70
 msgid "Noon"
 msgstr "Meio-dia"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:70
 msgid "Afternoon"
 msgstr "Tarde"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:70
 msgid "Evening"
 msgstr "Noite"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:70
 msgid "Late evening"
 msgstr "Tarde da noite"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:72
 msgid "Start of week"
 msgstr "Começo da semana"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:72
 msgid "Middle of week"
 msgstr "Meio da semana"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:72
 msgid "End of week"
 msgstr "Fim da semana"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:73
 msgid "Weekend!"
 msgstr "Final de semana!"
 
-#: ../src/common/helpers.py:114
+#: ../src/common/helpers.py:124
 msgid "Invalid character in username."
 msgstr "Caracter inválido no nome do usuário"
 
-#: ../src/common/helpers.py:119
+#: ../src/common/helpers.py:129
 msgid "Server address required."
 msgstr "Endereço do servidor é requerido."
 
-#: ../src/common/helpers.py:124
+#: ../src/common/helpers.py:134
 msgid "Invalid character in hostname."
 msgstr "Caracter inválido no nome do host"
 
-#: ../src/common/helpers.py:130
+#: ../src/common/helpers.py:140
 msgid "Invalid character in resource."
 msgstr "Caracter inválido no recurso."
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:180
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:183
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:177
+#: ../src/common/helpers.py:187
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:180
+#: ../src/common/helpers.py:190
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:184
+#: ../src/common/helpers.py:194
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:187
+#: ../src/common/helpers.py:197
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:190
+#: ../src/common/helpers.py:200
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:231
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:233
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:236
 msgid "_Not Available"
 msgstr "_Não Disponível"
 
-#: ../src/common/helpers.py:229
+#: ../src/common/helpers.py:241
 msgid "_Free for Chat"
 msgstr "Livre para _Conversa"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:243
 msgid "Free for Chat"
 msgstr "Livre para Conversa"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:246
 msgid "_Available"
 msgstr "Dis_ponível"
 
-#: ../src/common/helpers.py:236
-msgid "Available"
-msgstr "Disponível"
-
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:250
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:241
+#: ../src/common/helpers.py:253
 msgid "A_way"
 msgstr "_Afastado"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:258
 msgid "_Offline"
 msgstr "_Desconectado"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:260
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:251
+#: ../src/common/helpers.py:263
 msgid "_Invisible"
 msgstr "_Invisível"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:269
 msgid "?contact has status:Unknown"
 msgstr "?contato tem status:Desconhecido"
 
-#: ../src/common/helpers.py:259
+#: ../src/common/helpers.py:271
 msgid "?contact has status:Has errors"
 msgstr "?contato tem status:Com erros"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:276
 msgid "?Subscription we already have:None"
 msgstr "?Inscrição existente:Nenhuma"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:278
 msgid "To"
 msgstr "Para"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:282
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:290
 msgid "?Ask (for Subscription):None"
 msgstr "?Pergunta (para Inscrição):Nenhuma"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:292
 msgid "Subscribe"
 msgstr "Inscrever"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:301
 msgid "?Group Chat Contact Role:None"
 msgstr "?Regra do Contato para Conversa em Grupo:Nenhuma"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:304
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:306
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:297
+#: ../src/common/helpers.py:309
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:311
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:302
+#: ../src/common/helpers.py:314
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:304
+#: ../src/common/helpers.py:316
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:322
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Filiação do Contato de Conferência:Nenhuma"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:324
 msgid "Owner"
 msgstr "Dono"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:326
 msgid "Administrator"
 msgstr "Administrador"
 
-#: ../src/common/helpers.py:316
+#: ../src/common/helpers.py:328
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:367
 msgid "is paying attention to the conversation"
 msgstr "está prestando a atenção na conversa"
 
-#: ../src/common/helpers.py:357
+#: ../src/common/helpers.py:369
 msgid "is doing something else"
 msgstr "está fazendo outra coisa"
 
-#: ../src/common/helpers.py:359
+#: ../src/common/helpers.py:371
 msgid "is composing a message..."
 msgstr "está digitando..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:362
+#: ../src/common/helpers.py:374
 msgid "paused composing a message"
 msgstr "parou de digitar"
 
-#: ../src/common/helpers.py:364
+#: ../src/common/helpers.py:376
 msgid "has closed the chat window or tab"
 msgstr "fechou a janela de conversa ou aba"
 
-#: ../src/common/helpers.py:890
+#: ../src/common/helpers.py:947 ../src/common/helpers.py:954
 #, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] "%d mensagem não lida"
-msgstr[1] "%d mensagens não lidas"
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "%d mensagem pendente"
+msgstr[1] "%s mensagens pendentes"
 
-#: ../src/common/helpers.py:896
+#: ../src/common/helpers.py:960
 #, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] "%d mensagem individual não lida"
-msgstr[1] "%d mensagens individuais não lidas"
+msgid " from room %s"
+msgstr " da sala %s"
 
-#: ../src/common/helpers.py:902
+#: ../src/common/helpers.py:963 ../src/common/helpers.py:982
 #, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] "%d mensagem de conferência não lida"
-msgstr[1] "%d mensagens de conferência não lidas"
+msgid " from user %s"
+msgstr " do usuário %s"
 
-#: ../src/common/helpers.py:908
+#: ../src/common/helpers.py:965
 #, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] "%d mensagem privada não lida"
-msgstr[1] "%d mensagens privadas não lidas"
+msgid " from %s"
+msgstr " de %s"
 
-#: ../src/common/helpers.py:918 ../src/common/helpers.py:920
+#: ../src/common/helpers.py:972 ../src/common/helpers.py:979
+#, python-format
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] "%d evento pendente"
+msgstr[1] "%d eventos pendentes"
+
+#: ../src/common/helpers.py:1012
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:65
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "erro: impossível abrir %s para leitura"
 
-#: ../src/common/optparser.py:181
-msgid "gtk+"
-msgstr "gtk+"
-
-#: ../src/common/optparser.py:190 ../src/common/optparser.py:191
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:216
 msgid "cyan"
 msgstr "azul celeste"
 
-#: ../src/common/optparser.py:308
+#: ../src/common/optparser.py:332
 msgid "migrating logs database to indices"
 msgstr "migrando base de dados de registros para índices"
 
-#: ../src/common/passwords.py:82
+#: ../src/common/passwords.py:88
 #, python-format
 msgid "Gajim account %s"
 msgstr "Conta %s do Gajim"
 
-#: ../src/common/zeroconf/client_zeroconf.py:191
+#: ../src/common/zeroconf/client_zeroconf.py:149
+#: ../src/common/zeroconf/client_zeroconf.py:232
+msgid "Connection to host could not be established"
+msgstr "A conexão ao computador não pôde ser estabelecida."
+
+#: ../src/common/zeroconf/client_zeroconf.py:206
 msgid ""
 "Connection to host could not be established: Incorrect answer from server."
 msgstr ""
 "A conexão ao computador não pôde ser estabelecida: resposta incorreta do "
 "servidor."
 
-#: ../src/common/zeroconf/client_zeroconf.py:207
-msgid "Connection to host could not be established"
-msgstr "A conexão ao computador não pôde ser estabelecida."
-
-#: ../src/common/zeroconf/client_zeroconf.py:341
+#: ../src/common/zeroconf/client_zeroconf.py:366
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
 "A conexão ao computador não pode ser estabelecida: tempo excedido ao "
 "transmitir os dados."
 
-#: ../src/common/zeroconf/client_zeroconf.py:634
+#: ../src/common/zeroconf/client_zeroconf.py:652
 msgid "Contact is offline. Your message could not be sent."
 msgstr "O contato está offline. Sua mensagem não pode ser enviada."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:243
+#, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"O computador %s que você especificou na configuração avançada "
+"ft_override_host_to_send não é válido e será ignorado."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:210
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Para continuar enviando e recebendo mensagens, você precisará reconectar."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:209
+#: ../src/common/zeroconf/connection_zeroconf.py:233
 msgid "Avahi error"
 msgstr "Erro do Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:209
+#: ../src/common/zeroconf/connection_zeroconf.py:233
 #, python-format
 msgid ""
 "%s\n"
@@ -6964,31 +7861,31 @@ msgstr ""
 "%s\n"
 "Mensagens link-local podem não funcionar adequadamente."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:220
+#: ../src/common/zeroconf/connection_zeroconf.py:244
 msgid "Please check if Avahi is installed."
 msgstr "Por favor verifique se o Avahi está instalado."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:229
-#: ../src/common/zeroconf/connection_zeroconf.py:233
+#: ../src/common/zeroconf/connection_zeroconf.py:253
+#: ../src/common/zeroconf/connection_zeroconf.py:257
 msgid "Could not start local service"
 msgstr "Impossível iniciar o serviço local"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:230
+#: ../src/common/zeroconf/connection_zeroconf.py:254
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossível conectar-se à porta %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:234
-#: ../src/common/zeroconf/connection_zeroconf.py:327
+#: ../src/common/zeroconf/connection_zeroconf.py:258
+#: ../src/common/zeroconf/connection_zeroconf.py:353
 msgid "Please check if avahi-daemon is running."
 msgstr "Por favor verifique se o serviço avahi-daemon está rodando."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:326
+#: ../src/common/zeroconf/connection_zeroconf.py:352
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossível alterar status da conta \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:343
+#: ../src/common/zeroconf/connection_zeroconf.py:369
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -6997,20 +7894,225 @@ msgstr ""
 "pode ser enviada."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:355
+#: ../src/common/zeroconf/connection_zeroconf.py:381
 msgid "[This message is encrypted]"
 msgstr "[Esta mensagem está criptografada]"
 
-#: ../src/common/zeroconf/zeroconf.py:180
+#: ../src/common/zeroconf/zeroconf_avahi.py:183
+#: ../src/common/zeroconf/zeroconf_bonjour.py:194
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "Erro ao adicionar serviço. %s"
 
-#~ msgid "Select the account with which you want to synchronise"
-#~ msgstr "Selecione a conta que você quer sincronizar"
-
-#~ msgid "Select the contacts you want to synchronise"
-#~ msgstr "Selecione os contatos que você quer sincronizar"
-
-#~ msgid "Synchronise : select contacts"
-#~ msgstr "Sincronizar: selecionar contatos"
+#~ msgid "Save passphrase"
+#~ msgstr "Salvar Frase de acesso"
+
+#~ msgid "_Discover Services..."
+#~ msgstr "_Procurar Serviços..."
+
+#~ msgid "_Retype Password:"
+#~ msgstr "_Reescreva a Senha:"
+
+#~ msgid "_Use proxy"
+#~ msgstr "_Usar proxy"
+
+#~ msgid "Accounts"
+#~ msgstr "Contas"
+
+#~ msgid ""
+#~ "If checked, all local contacts that use a Bonjour compatible chat client "
+#~ "(like iChat, Trillian or Gaim) will be shown in roster. You don't need to "
+#~ "be connected to a jabber server for it to work.\n"
+#~ "This is only available if python-avahi is installed and avahi-daemon is "
+#~ "running."
+#~ msgstr ""
+#~ "Se marcado, todos os contatos locais que usam um cliente de chat "
+#~ "compatível com o Bonjour (como iChat, Trillian ou Gaim) serão mostrados "
+#~ "na lista. Você não precisa estar conectado a um servidor jabber para que "
+#~ "ele funcione.\n"
+#~ " Isto só está disponível se o python-avahi estiver instalado e o serviço "
+#~ "avahi-daemon estiver rodando."
+
+#~ msgid ""
+#~ "If you have 2 or more accounts and this is checked, Gajim will list all "
+#~ "contacts as if you had one account"
+#~ msgstr ""
+#~ "Se você tiver duas ou mais contas e isto estiver marcado, o Gajim listará "
+#~ "todos os contatos como se você tivesse somente uma única conta"
+
+#~ msgid "_Enable link-local messaging"
+#~ msgstr "_Ativar mensagens \"link-local\""
+
+#~ msgid "_Modify"
+#~ msgstr "_Modificar"
+
+#~ msgid "_Compact View    Alt+C"
+#~ msgstr "Visão _Compacta    Alt+C"
+
+#~ msgid "Build custom query"
+#~ msgstr "Gerar consulta customizada"
+
+#~ msgid "Query Builder..."
+#~ msgstr "Gerador de consultas..."
+
+#~ msgid "<b>Interface Customization</b>"
+#~ msgstr "<b>Customização de interface</b>"
+
+#~ msgid "Also known as iChat style"
+#~ msgstr "Conhecido também como estilo iChat"
+
+#~ msgid "Chat"
+#~ msgstr "Conversa"
+
+#~ msgid "E_very 5 minutes"
+#~ msgstr "De 5 _em 5 minutos"
+
+#~ msgid ""
+#~ "Gajim will automatically show new events by popping up the relevant window"
+#~ msgstr ""
+#~ "O Gajim automaticamente mostrará novos eventos em uma janela saltando "
+#~ "sobre a janela relevante"
+
+#~ msgid ""
+#~ "Gajim will notify you for new events via a popup in the bottom right of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Gajim notificará você de uma novo evento via uma alerta visual na lateral "
+#~ "inferior direita da tela"
+
+#~ msgid ""
+#~ "Gajim will notify you via a popup window in the bottom right of the "
+#~ "screen about contacts that just signed in"
+#~ msgstr ""
+#~ "Gajim notificará você através de um alerta visual na parte inferior "
+#~ "direita da tela sobre os contatos que se conectaram"
+
+#~ msgid ""
+#~ "Gajim will only change the icon of the contact that triggered the new "
+#~ "event"
+#~ msgstr "Gajim mudará somente o ícone do contato que provocou o evento novo"
+
+#~ msgid ""
+#~ "If checked, Gajim will remember the roster and chat window positions in "
+#~ "the screen and the sizes of them next time you run it"
+#~ msgstr ""
+#~ "Se marcado, o Gajim lembrará a posição e tamanho da janela principal na "
+#~ "próxima vez que você executa-lo"
+
+#~ msgid "On every _message"
+#~ msgstr "Em todas as _mensagens"
+
+#~ msgid "Outgoing Chat state noti_fications:"
+#~ msgstr "Enviar noti_ficações do status da conversa:"
+
+#~ msgid "Print time:"
+#~ msgstr "Imprimir tempo:"
+
+#~ msgid "Save _position and size for roster and chat windows"
+#~ msgstr ""
+#~ "Salvar _posição e tamanho das janelas de conversa e lista de contatos"
+
+#~ msgid "Show only in _roster"
+#~ msgstr "Mostre somente na _lista"
+
+#~ msgid "Use t_rayicon (aka. notification area icon)"
+#~ msgstr "Usar ícone na bandeja (também conhecido por área de notificação)"
+
+#~ msgid ""
+#~ "When a new event (message, file transfer request etc..) is received, the "
+#~ "following methods may be used to inform you about it. Please note that "
+#~ "events about new messages only occur if it is a new message from a "
+#~ "contact you are not already chatting with"
+#~ msgstr ""
+#~ "Quando um evento novo (mensagem, pedido etc. de transferência de arquivo, "
+#~ "etc.) é recebido, os seguintes métodos podem ser usados para informá-lo "
+#~ "sobre ele. Por favor, note que os eventos sobre mensagens novas ocorrem "
+#~ "somente se for uma mensagem nova de um contato que você não está "
+#~ "conversando"
+
+#~ msgid "_Never"
+#~ msgstr "_Nunca"
+
+#~ msgid "_Notify me about it"
+#~ msgstr "_Notifique-me sobre isto"
+
+#~ msgid "_Pop it up"
+#~ msgstr "_Alerta visual"
+
+#~ msgid "_Remove from Roster"
+#~ msgstr "_Remover da Lista"
+
+#~ msgid "_Filter:"
+#~ msgstr "_Filtro:"
+
+#~ msgid ""
+#~ "If that is not your language for which you want to highlight misspelled "
+#~ "words, then please set your $LANG as appropriate. Eg. for French do "
+#~ "export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to "
+#~ "make it global in /etc/profile.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Se este não for o idioma para o qual você quer destacar palavras "
+#~ "incorretas, por favor, configure a sua variável de ambiente $LANG com o "
+#~ "valor apropriado. Por exemplo, para o francês exporte LANG=fr_FR ou "
+#~ "exporte LANG=fr_FR.UTF-8 em ~/.bash_profile ou coloca-lo \n"
+#~ " globalmente em/etc/profile.\n"
+#~ "Caracteristica de destacar palavras erradas não será usada"
+
+#~ msgid "Every %s _minutes"
+#~ msgstr "A cada %s _minutos"
+
+#~ msgid "You must enter a password for the new account."
+#~ msgstr "Você deve entrar com uma senha para registrar uma nova conta."
+
+#~ msgid "%s does not appear to be a valid JID"
+#~ msgstr "%s não parece ser um JID válido"
+
+#~ msgid "Drop %s in group %s"
+#~ msgstr "Derrubar %s no grupo %s"
+
+#~ msgid "Make %s and %s metacontacts"
+#~ msgstr "Fazer %s e %s metacontatos"
+
+#~ msgid "Hides the buttons in two persons chat window."
+#~ msgstr "Esconder os botões na janela de conversa para duas pessoas."
+
+#~ msgid "Security error connecting to \"%s\""
+#~ msgstr "Erro de segurança ao conectar a \"%s\""
+
+#~ msgid ""
+#~ "The server's key has changed, or someone is trying to hack your "
+#~ "connection."
+#~ msgstr ""
+#~ "A chave do servidor foi alterada ou alguém está tentando hackear a sua "
+#~ "conexão."
+
+#~ msgid "Unable to check fingerprint for %s. Connection could be insecure."
+#~ msgstr ""
+#~ "Incapaz de verifica a impressão digital de %s. A conexão pode ser "
+#~ "insegura."
+
+#~ msgid "Missing fingerprint in SSL connection to %s"
+#~ msgstr "Faltando impressão digital na conexão SSL para %s"
+
+#~ msgid "Fingerprint mismatch for %s: Got %s, expected %s"
+#~ msgstr "Conflito de impressões digitais para %s: obtido %s, esperado %s"
+
+#~ msgid " %d unread single message"
+#~ msgid_plural " %d unread single messages"
+#~ msgstr[0] "%d mensagem individual não lida"
+#~ msgstr[1] "%d mensagens individuais não lidas"
+
+#~ msgid " %d unread group chat message"
+#~ msgid_plural " %d unread group chat messages"
+#~ msgstr[0] "%d mensagem de conferência não lida"
+#~ msgstr[1] "%d mensagens de conferência não lidas"
+
+#~ msgid " %d unread private message"
+#~ msgid_plural " %d unread private messages"
+#~ msgstr[0] "%d mensagem privada não lida"
+#~ msgstr[1] "%d mensagens privadas não lidas"
+
+#~ msgid "gtk+"
+#~ msgstr "gtk+"
diff --git a/po/ru.po b/po/ru.po
index 3fc70b80d..bbd428766 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,23 +6,27 @@
 # This file is distributed under the same license as the gajim package.
 #
 #
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
 # <nebulam51@gmail.com>, 2005.
 #  <nebulam51@gmail.com>, 2005.
 # Yakov Bezrukov <nebulam51@gmail.com>, 2005, 2006, 2007.
 # Yakov Bezrukov <bezrukov@isp.nsc.ru>, 2005.
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:253 ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:263
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-18 09:32+0100\n"
-"PO-Revision-Date: 2007-07-08 21:53+0700\n"
-"Last-Translator: Yakov Bezrukov <nebulam51@gmail.com>\n"
+"POT-Creation-Date: 2007-12-05 23:47+0100\n"
+"PO-Revision-Date: 2007-12-05 18:32+0300\n"
+"Last-Translator: Fomin Denis,  Oleg N. Stadnik. <fominde@mail.ru>\n"
 "Language-Team: Русский <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../data/gajim.desktop.in.in.h:1
@@ -35,39 +39,39 @@ msgstr "Клиент для мгновенных сообщений Gajim"
 
 #: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
-msgstr "Jabber-клиент на GTK+"
+msgstr "Jabber клиент для мгновенных сообщений"
 
 #: ../data/glade/account_context_menu.glade.h:1
-msgid "Send Single _Message..."
-msgstr "Отправить одиночное _сообщение..."
+#: ../data/glade/roster_window.glade.h:8
+msgid "Join _Group Chat..."
+msgstr "Войти в _комнату"
 
 #: ../data/glade/account_context_menu.glade.h:2
 msgid "_Add Contact..."
 msgstr "_Добавить контакт..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-msgid "_Discover Services..."
-msgstr "_Просмотреть сервисы..."
+#: ../data/glade/roster_window.glade.h:15
+msgid "_Discover Services"
+msgstr "_Просмотреть сервисы"
 
 #: ../data/glade/account_context_menu.glade.h:4
 msgid "_Execute Command..."
 msgstr "В_ыполнить команду..."
 
 #: ../data/glade/account_context_menu.glade.h:5
-#: ../data/glade/roster_window.glade.h:16
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Комната"
+msgid "_Modify Account"
+msgstr "Редактировать учетную запись"
 
 #: ../data/glade/account_context_menu.glade.h:6
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Изменить учетную запись..."
-
-#: ../data/glade/account_context_menu.glade.h:7
 msgid "_Open Gmail Inbox"
 msgstr "_Открыть Gmail"
 
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/roster_window.glade.h:23
+msgid "_Start Chat..."
+msgstr "Начать беседу"
+
 #: ../data/glade/account_context_menu.glade.h:8
 #: ../data/glade/zeroconf_context_menu.glade.h:2
 msgid "_Status"
@@ -75,11 +79,11 @@ msgstr "_Статус"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:1
 msgid ""
-"<b>Account is being created</b>\n"
+"<b>Connecting to server</b>\n"
 "\n"
 "Please wait..."
 msgstr ""
-"<b>Была создана учетная запись </b>\n"
+"<b>Соединение с сервером </b>\n"
 "\n"
 "Пожалуйста подождите..."
 
@@ -92,51 +96,74 @@ msgid "<b>Please fill in the data for your new account</b>"
 msgstr "<b>Пожалуйста, заполните данные для вашей новой учетной записи</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:6
+msgid "<b>Please select a server</b>"
+msgstr "<b>Пожалуйста выберите сервер</b>"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:10
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Щелкните, чтобы просмотреть сервисы предоставляемые jabber сервером "
 "(например, MSN, ICQ транспорты)"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/glade/account_creation_wizard_window.glade.h:11
 msgid "Connect when I press Finish"
-msgstr "Подключиться, когда я нажму \"Завершить\""
+msgstr "Подключиться, когда я нажму \"Закончить\""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: мастер создания учетной записи"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:9
-msgid "I already have an account I want to use"
+#: ../data/glade/account_creation_wizard_window.glade.h:13
+msgid "I already have an account I want to _use"
 msgstr "У меня уже есть учетная запись, которую я хочу использовать"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I want to _register for a new account"
 msgstr "Я хочу _зарегистрировать новую учетную запись"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
-#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:23
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Если отмечено, то Gajim запомнит пароль учетной записи"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Pass_word:"
-msgstr "П_ароль"
+#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:32
+msgid "Manage..."
+msgstr "Управление..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
-#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/account_creation_wizard_window.glade.h:17
+msgid "Prox_y:"
+msgstr "Прокси:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:47
 msgid "Save pass_word"
 msgstr "Сохранить _пароль"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 msgid "Servers Features"
 msgstr "Параметры сервера"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Настроить мой профиль после соединения"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:53
+msgid "Use custom hostname/port"
+msgstr "Использовать пользовательские хост/порт"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -144,67 +171,63 @@ msgstr ""
 "Необходимо создать учетную запись для присоединения \n"
 "к сети Jabber."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:24
 msgid "Your JID:"
 msgstr "Ваш JID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Advanced"
 msgstr "_Дополнительно"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Finish"
 msgstr "_Закончить"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/manage_proxies_window.glade.h:9
-msgid "_Host:"
-msgstr "_Хост:"
+#: ../data/glade/account_creation_wizard_window.glade.h:27
+msgid "_Hostname:"
+msgstr "Хост: "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_modification_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Password:"
 msgstr "_Пароль:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:23
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Порт:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "_Retype Password:"
-msgstr "_Пароль для проверки:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "_Сервер:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
-msgid "_Use proxy"
-msgstr "_Использовать прокси"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:31
+#: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_Username:"
 msgstr "_Имя пользователя:"
 
 #: ../data/glade/account_modification_window.glade.h:1
+#: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:8
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Прочее</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:2
 #: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:3
 #: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Личная информация</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:4
 msgid "Account"
 msgstr "Учетные записи"
 
@@ -213,19 +236,28 @@ msgid "Account Modification"
 msgstr "Изменение учетной записи"
 
 #: ../data/glade/account_modification_window.glade.h:6
-msgid "Autoreconnect when connection is lost"
-msgstr "Автоподключение при разрыве связи"
+#: ../data/glade/accounts_window.glade.h:5
+msgid "Administration operations"
+msgstr "Административные операции"
 
 #: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:6
+msgid "Auto-reconnect when connection is lost"
+msgstr "Автоподключение при разрыве связи"
+
+#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:7
 #: ../data/glade/zeroconf_properties_window.glade.h:3
 msgid "C_onnect on Gajim startup"
 msgstr "_Соединяться при запуске Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:8
 msgid "Chan_ge Password"
 msgstr "И_зменить пароль"
 
-#: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:9
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
 "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
@@ -237,44 +269,60 @@ msgstr ""
 "TLS шифрование по умолчанию, если сервер предоставляет такую возможность, с "
 "этой же опцией TLS отключается"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:10
 #: ../data/glade/zeroconf_properties_window.glade.h:4
 msgid "Choose _Key..."
 msgstr "Выбрать _ключ..."
 
-#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:11
 msgid "Click to change account's password"
 msgstr "Щелкните для изменения пароля"
 
-#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:12
+msgid "Click to request authorization to all contacts of another account"
+msgstr "Щелкните чтобы запросить авторизацию у всех контактов другого аккаунта"
+
+#: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:13
 msgid "Connection"
 msgstr "Соединение"
 
-#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/account_modification_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Edit Personal Information..."
 msgstr "Редактировать личную информацию..."
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453
-#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:905
+#. No configured account
+#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:6 ../src/notify.py:489
+#: ../src/notify.py:520 ../src/notify.py:532 ../src/common/helpers.py:998
+#: ../src/common/helpers.py:1010
 msgid "Gajim"
 msgstr "Gajim"
 
-#. Contact is not in a group, so count it in General group
-#: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/preferences_window.glade.h:49
+#. General group cannot be changed
+#: ../data/glade/account_modification_window.glade.h:17
+#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/preferences_window.glade.h:45
 #: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/roster_window.py:342 ../src/roster_window.py:1207
-#: ../src/roster_window.py:1418 ../src/roster_window.py:2029
-#: ../src/roster_window.py:2071 ../src/common/contacts.py:278
+#: ../src/roster_window.py:372 ../src/roster_window.py:637
+#: ../src/roster_window.py:1384 ../src/roster_window.py:1760
+#: ../src/roster_window.py:2147 ../src/roster_window.py:2661
+#: ../src/roster_window.py:2779 ../src/common/contacts.py:314
 msgid "General"
 msgstr "Общие"
 
-#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:20
 msgid "Hostname: "
 msgstr "Хост: "
 
-#: ../data/glade/account_modification_window.glade.h:17
+#: ../data/glade/account_modification_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:21
 msgid ""
 "If checked, Gajim will also broadcast some more IPs except from just your "
 "IP, so file transfer has higher chances of working."
@@ -282,15 +330,16 @@ msgstr ""
 "Если отмечено, Gajim будет передавать еще несколько IP адресов в дополнение "
 "к вашему, так что передача файла имеет больше шансов на успех."
 
-#: ../data/glade/account_modification_window.glade.h:19
+#: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/accounts_window.glade.h:24
 msgid ""
-"If checked, Gajim will send keep-alive packets so it prevents connection "
-"timeout which results in disconnection"
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
 msgstr ""
 "Если отмечено, то Gajim будет пинговать сервер, чтобы избежать разрыва "
 "соединения по таймауту"
 
-#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/account_modification_window.glade.h:22
 #: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
@@ -299,7 +348,8 @@ msgstr ""
 "Если отмечено, то Gajim сохранит пароль в ~/.gajim/config с доступом на "
 "чтение только для вас"
 
-#: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/accounts_window.glade.h:25
 #: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
@@ -308,7 +358,8 @@ msgstr ""
 "Если отмечено, Gajim, после запуска, будет автоматически подсоединяться к "
 "jabber серверу с использованием этой учетной записи"
 
-#: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/account_modification_window.glade.h:24
+#: ../data/glade/accounts_window.glade.h:26
 #: ../data/glade/zeroconf_properties_window.glade.h:10
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
@@ -319,44 +370,50 @@ msgstr ""
 "выпадающего списка внизу окна ростера) повлекут за собой изменение статуса "
 "этой учетной записи"
 
-#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/accounts_window.glade.h:29
 msgid "Information about you, as stored in the server"
 msgstr "Информация о вас, сохраненная на сервере"
 
-#: ../data/glade/account_modification_window.glade.h:24
-msgid "Manage..."
-msgstr "Управление..."
-
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1643
-#: ../src/config.py:3436
+#: ../data/glade/account_modification_window.glade.h:27
+#: ../data/glade/accounts_window.glade.h:34
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1548
+#: ../src/config.py:2025
 msgid "No key selected"
 msgstr "Не выбран ключ"
 
 #. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1225
-#: ../src/config.py:1230 ../src/config.py:1414 ../src/config.py:1633
-#: ../src/config.py:1642 ../src/config.py:1701 ../src/config.py:1775
-#: ../src/config.py:2646 ../src/config.py:3426 ../src/config.py:3435
-#: ../src/dialogs.py:281 ../src/dialogs.py:283
+#. GPG Key
+#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:32 ../src/config.py:1142
+#: ../src/config.py:1213 ../src/config.py:1456 ../src/config.py:1461
+#: ../src/config.py:1923 ../src/config.py:2010 ../src/config.py:2024
+#: ../src/config.py:3114 ../src/config.py:3172 ../src/dialogs.py:344
+#: ../src/dialogs.py:346 ../src/roster_window.py:1864
+#: ../src/roster_window.py:1871 ../src/roster_window.py:1878
 msgid "None"
 msgstr "Нет"
 
-#: ../data/glade/account_modification_window.glade.h:28
-#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/accounts_window.glade.h:37
+#: ../data/glade/profile_window.glade.h:26
 #: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Личная информация"
 
-#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:38
 msgid "Port: "
 msgstr "Порт: "
 
-#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:39
 msgid "Priori_ty:"
 msgstr "Приори_тет:"
 
-#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:40
 msgid ""
 "Priority is used in Jabber to determine who gets the events from the jabber "
 "server when two or more clients are connected using the same account; The "
@@ -367,19 +424,23 @@ msgstr ""
 "той же учетной записью. Клиент с наибольшим приоритетом будет получать "
 "события"
 
-#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr "Изменять приоритет автоматически в соответствии со статусом."
 
-#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:42
 msgid "Proxy:"
 msgstr "Прокси:"
 
-#: ../data/glade/account_modification_window.glade.h:34
-msgid "Resour_ce: "
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/accounts_window.glade.h:44
+msgid "Resour_ce:"
 msgstr "Ресу_рс: "
 
-#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/accounts_window.glade.h:45
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -394,88 +455,137 @@ msgstr ""
 "одновременно. Ресурс, который имеет больший приоритет будет получать все "
 "события. (См. ниже)"
 
-#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/account_modification_window.glade.h:38
 #: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Сохранить _парольную фразу (небезопасно)"
 
-#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:46
 #: ../data/glade/zeroconf_properties_window.glade.h:19
 msgid "Save conversation _logs for all contacts"
 msgstr "_Сохранять историю для всех контактов"
 
-#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Send keep-alive packets"
 msgstr "Отправить пинг"
 
-#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:49
 #: ../data/glade/zeroconf_properties_window.glade.h:20
 msgid "Synch_ronize account status with global status"
 msgstr "Син_хронизировать статус учетной записи с глобальным статусом"
 
-#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:50
+#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/synchronise_select_account_dialog.glade.h:2
+msgid "Synchronise contacts"
+msgstr "Объединить контакты"
+
+#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/accounts_window.glade.h:52
 msgid "Use _SSL (legacy)"
 msgstr "Использовать _SSL (устарело)"
 
-#: ../data/glade/account_modification_window.glade.h:42
-msgid "Use custom hostname/port"
-msgstr "Использовать пользовательские хост/порт"
-
-#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:55
 msgid "Use file transfer proxies"
 msgstr "Использовать прокси для передачи файла"
 
-#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "В зависимости от статуса"
 
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_modification_window.glade.h:46
-msgid "_Name: "
+#: ../data/glade/account_modification_window.glade.h:49
+msgid "_Name:"
 msgstr "_Имя: "
 
-#: ../data/glade/accounts_window.glade.h:1
-msgid "Accounts"
-msgstr "Учетные записи"
+#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "Почта:"
 
-#: ../data/glade/accounts_window.glade.h:2
-msgid ""
-"If checked, all local contacts that use a Bonjour compatible chat client "
-"(like iChat, Trillian or Gaim) will be shown in roster. You don't need to be "
-"connected to a jabber server for it to work.\n"
-"This is only available if python-avahi is installed and avahi-daemon is "
-"running."
-msgstr ""
-"Если отмечено, то все локальные контакты, которые используют Bonjour-совместимый клиент (напр. iChat, Trillian или Gaim) будут показаны в ростере. Для этого не нужно подключаться к jabber-серверу.\n"
-"Доступно только в том случае, когда установлен python-avahi и запущен avahi-daemon."
+#. XML Console enable checkbutton
+#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Включить"
 
-#: ../data/glade/accounts_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:17
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+msgid "First Name:"
+msgstr "Имя:"
+
+#: ../data/glade/accounts_window.glade.h:22
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Если отмечено, то Gajim запомнит пароль учетной записи"
+
+#: ../data/glade/accounts_window.glade.h:27
+#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
-"If you have 2 or more accounts and it is checked, Gajim will list all "
-"contacts as if you had one account"
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
 msgstr ""
-"Если у вас 2 и более учетных записей, то, отметив здесь, вы заставите Gajim "
-"показывать вместе контакты из всех учетных записей"
+"Если порт по умолчанию, который используется для входящих сообщения вас не "
+"устраивает, вы можете выбрать другой.\n"
+"Так же возможно придется изменить некоторые настройки брандмауэра."
 
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:511
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/glade/accounts_window.glade.h:31
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+msgid "Last Name:"
+msgstr "Фамилия:"
+
+#: ../data/glade/accounts_window.glade.h:33
 msgid "Mer_ge accounts"
 msgstr "_Объединить учетные записи"
 
-#: ../data/glade/accounts_window.glade.h:6
-msgid "_Enable link-local messaging"
-msgstr "_Включить локальный обмен сообщениями"
+#. Rename
+#: ../data/glade/accounts_window.glade.h:43 ../src/roster_window.py:2731
+msgid "Re_name"
+msgstr "П_ереименовать"
 
-#: ../data/glade/accounts_window.glade.h:7
-msgid "_Modify"
-msgstr "_Изменить"
+#: ../data/glade/accounts_window.glade.h:51
+msgid "Use GPG _Agent"
+msgstr "Использовать GPG _Agent"
 
-#: ../data/glade/accounts_window.glade.h:8
-#: ../data/glade/remove_account_window.glade.h:4
-msgid "_Remove"
-msgstr "_Удалить"
+#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+msgid "Use custom port:"
+msgstr "Другой порт"
+
+#: ../data/glade/accounts_window.glade.h:59
+msgid "gtk-add"
+msgstr "gtk-add"
+
+#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/features_window.glade.h:4
+msgid "gtk-close"
+msgstr "gtk-close"
+
+#: ../data/glade/accounts_window.glade.h:61
+msgid "gtk-remove"
+msgstr "gtk-remove"
 
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
@@ -495,7 +605,7 @@ msgstr "Вы не возражаете, если я добавлю Вас в к�
 
 #: ../data/glade/add_new_contact_window.glade.h:5
 msgid ""
-"You have to register to this transport\n"
+"You have to register with this transport\n"
 "to be able to add a contact from this\n"
 "protocol. Click on register button to\n"
 "proceed."
@@ -534,7 +644,7 @@ msgid "_User ID:"
 msgstr "ID пользователя:"
 
 #: ../data/glade/adhoc_commands_window.glade.h:1
-msgid "<b>An error has occured:</b>"
+msgid "<b>An error has occurred:</b>"
 msgstr "<b>Произошла ошибка:</b>"
 
 #: ../data/glade/adhoc_commands_window.glade.h:2
@@ -570,12 +680,15 @@ msgid "This jabber entity does not expose any commands."
 msgstr ""
 
 #: ../data/glade/advanced_configuration_window.glade.h:1
+#: ../data/glade/features_window.glade.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Описание</b>"
 
 #: ../data/glade/advanced_configuration_window.glade.h:2
-msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
-msgstr "<b>ПРИМЕЧАНИЕ:</b> Вы должны перезапустить gajim, чтобы некоторые настройки вступили в силу"
+msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+msgstr ""
+"<b>ПРИМЕЧАНИЕ:</b> Вы должны перезапустить Gajim, чтобы некоторые настройки "
+"вступили в силу"
 
 #: ../data/glade/advanced_configuration_window.glade.h:3
 msgid "Advanced Configuration Editor"
@@ -594,48 +707,45 @@ msgid "Deletes Message of the Day"
 msgstr "Удаляет сообщение дня."
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:3
-msgid "Sends a message to currently connected users to this server"
-msgstr "Отправляет сообщение пользователям подсоединенным к серверу в данный момент"
+msgid "Edit _Privacy Lists..."
+msgstr "Редактировать _списки доступа..."
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:4
-msgid "Set MOTD"
-msgstr "Установить собщение дня"
+msgid "Sends a message to users currently connected to this server"
+msgstr ""
+"Отправляет сообщение пользователям подсоединенным к серверу в данный момент"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:5
+msgid "Set MOTD..."
+msgstr "Установить собщение дня"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:6
 msgid "Sets Message of the Day"
 msgstr "Устанавливает сообщение дня"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/glade/advanced_menuitem_menu.glade.h:7
 msgid "Show _XML Console"
 msgstr "Показать консоль _XML"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
-msgid "Update MOTD"
-msgstr "Обновить MOTD"
-
 #: ../data/glade/advanced_menuitem_menu.glade.h:8
-msgid "Updates Message of the Day"
-msgstr "Обновляет фортунку"
+msgid "Update MOTD..."
+msgstr "Обновить собщение дня"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:9
-msgid "_Administrator"
-msgstr "_Администрирование"
+msgid "Updates Message of the Day"
+msgstr "Обновляет сообщение дня"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:10
-msgid "_Privacy Lists"
-msgstr "_Списки доступа"
+msgid "_Administrator"
+msgstr "_Администрирование"
 
 #: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message"
+msgid "_Send Server Message..."
 msgstr "_Отправить сообщение сервера"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:12
-msgid "_Send Single Message"
-msgstr "О_тправить одиночное сообщение"
-
 #: ../data/glade/advanced_notifications_window.glade.h:1
 msgid " a window/tab opened with that contact "
-msgstr " с этим контактом уже открыты окно или вкладка"
+msgstr " с этим контактом открытых окон/вкладок"
 
 #: ../data/glade/advanced_notifications_window.glade.h:2
 msgid "<b>Actions</b>"
@@ -646,7 +756,7 @@ msgid "<b>Conditions</b>"
 msgstr "<b>Условия</b>"
 
 #: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/glade/preferences_window.glade.h:12
 msgid "<b>Sounds</b>"
 msgstr "<b>Звуки</b>"
 
@@ -663,7 +773,7 @@ msgid "All statuses"
 msgstr "Все статусы"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/helpers.py:234
+#: ../src/common/commands.py:96 ../src/common/helpers.py:255
 msgid "Away"
 msgstr "Ушел"
 
@@ -673,14 +783,14 @@ msgstr "Занят "
 
 #: ../data/glade/advanced_notifications_window.glade.h:10
 msgid "Don't have "
-msgstr "Не имеет "
+msgstr "Нет "
 
 #: ../data/glade/advanced_notifications_window.glade.h:11
 msgid "Have "
-msgstr "Имеет "
+msgstr "Есть "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:244
+#: ../src/common/helpers.py:265
 msgid "Invisible"
 msgstr "Невидимка"
 
@@ -689,7 +799,7 @@ msgid "Launch a command"
 msgstr "Выполнить команду"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:238
 msgid "Not Available"
 msgstr "Недоступен"
 
@@ -708,17 +818,15 @@ msgstr "Проигрывать звук"
 #: ../data/glade/advanced_notifications_window.glade.h:18
 msgid ""
 "Receive a Message\n"
-"Contact Connected \n"
 "Contact Disconnected \n"
 "Contact Change Status \n"
 "Group Chat Message Highlight \n"
 "Group Chat Message Received \n"
-"File Transfert Resquest \n"
-"File Transfert Started \n"
-"File Transfert Finished"
+"File Transfer Request \n"
+"File Transfer Started \n"
+"File Transfer Finished"
 msgstr ""
 "Получено сообщение\n"
-"Контакт подключился\n"
 "Контакт отключился\n"
 "Контакт сменил статус\n"
 "Упоминание в комнате\n"
@@ -727,55 +835,58 @@ msgstr ""
 "Начата передача файла\n"
 "Завершена передача файла"
 
-#: ../data/glade/advanced_notifications_window.glade.h:27
+#: ../data/glade/advanced_notifications_window.glade.h:26
 msgid "When "
 msgstr "Когда "
 
-#: ../data/glade/advanced_notifications_window.glade.h:28
-msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr "_Активировать функцию оконного менеджера \"UrgencyHint\", чтобы окно беседы мигало на панели"
+#: ../data/glade/advanced_notifications_window.glade.h:27
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+msgstr ""
+"_Активировать функцию оконного менеджера \"UrgencyHint\", чтобы окно чата "
+"мигало на панели"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/glade/advanced_notifications_window.glade.h:28
 msgid "_Disable auto opening chat window"
-msgstr "_Отключить автоматическое открытие окна беседы"
+msgstr "_Отключить автоматическое открытие окна чата"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/glade/advanced_notifications_window.glade.h:29
 msgid "_Disable existing popup window"
-msgstr "_Отключиться все всплывающие окна"
+msgstr "_Отключить все всплывающие окна"
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/glade/advanced_notifications_window.glade.h:30
 msgid "_Disable existing sound for this event"
 msgstr "_Отключить звуки для этого события"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/glade/advanced_notifications_window.glade.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Отключить показ события в ростере"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/glade/advanced_notifications_window.glade.h:32
 msgid "_Disable showing event in systray"
 msgstr "_Отключить показ события в системном лотке"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/glade/advanced_notifications_window.glade.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Сообщить с помощью всплывающего окна"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/glade/advanced_notifications_window.glade.h:34
 msgid "_Open chat window with user"
-msgstr "_Открыть окно беседы с контактом"
+msgstr "_Открыть окно чата с контактом"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/glade/advanced_notifications_window.glade.h:35
 msgid "_Show event in roster"
 msgstr "_Показывать событие в ростере"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/glade/advanced_notifications_window.glade.h:36
 msgid "_Show event in systray"
-msgstr "_Показывать событие в лотке"
+msgstr "_Показывать событие в системном лотке"
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
+#: ../data/glade/advanced_notifications_window.glade.h:37
 msgid "and I "
-msgstr "и я"
+msgstr "и у меня"
 
-#: ../data/glade/advanced_notifications_window.glade.h:39
+#: ../data/glade/advanced_notifications_window.glade.h:38
 msgid ""
 "contact(s)\n"
 "group(s)\n"
@@ -785,50 +896,38 @@ msgstr ""
 "группа(ы)\n"
 "все"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/glade/advanced_notifications_window.glade.h:41
 msgid "for "
 msgstr "для "
 
-#: ../data/glade/advanced_notifications_window.glade.h:43
+#: ../data/glade/advanced_notifications_window.glade.h:42
 msgid "when I'm in"
 msgstr "Когда я в "
 
 #: ../data/glade/atom_entry_window.glade.h:1
-msgid "2003-12-13T18:30:02Z"
-msgstr "2003-12-13T18:30:02Z"
-
-#: ../data/glade/atom_entry_window.glade.h:2
-msgid "<small>Romeo and Juliet</small>"
-msgstr "<small>Иван и Марья</small>"
-
-#: ../data/glade/atom_entry_window.glade.h:3
 msgid "Entry:"
 msgstr "Запись:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/glade/atom_entry_window.glade.h:2
 msgid "Feed name:"
 msgstr "Название ленты:"
 
-#: ../data/glade/atom_entry_window.glade.h:5
+#: ../data/glade/atom_entry_window.glade.h:3
 msgid "Last modified:"
 msgstr "Последнее изменение:"
 
-#: ../data/glade/atom_entry_window.glade.h:6
+#: ../data/glade/atom_entry_window.glade.h:4
 msgid "New entry received"
 msgstr "Получена новая запись"
 
-#: ../data/glade/atom_entry_window.glade.h:7
-msgid "Old stories"
-msgstr "Старые записи"
-
-#: ../data/glade/atom_entry_window.glade.h:8
-msgid "Soliloquy"
-msgstr "Монолог"
-
-#: ../data/glade/atom_entry_window.glade.h:9
+#: ../data/glade/atom_entry_window.glade.h:5
 msgid "You have received new entry:"
 msgstr "Получена новая запись:"
 
+#: ../data/glade/blocked_contacts_window.glade.h:1
+msgid "Blocked Contacts"
+msgstr "Заблокированне контакты"
+
 #: ../data/glade/change_password_dialog.glade.h:1
 msgid "Change Password"
 msgstr "Изменить пароль"
@@ -858,10 +957,8 @@ msgid "Join _Group Chat"
 msgstr "Войти в _комнату"
 
 #: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/chat_control_popup_menu.glade.h:4
-#: ../data/glade/gc_occupants_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:10
-msgid "_Add to Roster"
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+msgid "_Add to Roster..."
 msgstr "Добавить в ростер"
 
 #: ../data/glade/chat_context_menu.glade.h:3
@@ -881,7 +978,6 @@ msgid "_Open Link in Browser"
 msgstr "_Просмотреть ссылку в браузере"
 
 #: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/roster_window.glade.h:20
 #: ../data/glade/subscription_request_popup_menu.glade.h:1
 #: ../data/glade/systray_context_menu.glade.h:7
 msgid "_Start Chat"
@@ -892,28 +988,63 @@ msgid "Click to see past conversations with this contact"
 msgstr "Щелкните для просмотра последних бесед с этим человеком"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+msgid "Invite _Contacts"
+msgstr "Пригласить _участников"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Отправить _файл"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-msgid "Toggle Open_PGP Encryption"
+#: ../data/glade/chat_control_popup_menu.glade.h:4
+#, fuzzy
+msgid "Toggle End to End Encryption"
 msgstr "Включить Open_PGP шифрование"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:5
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-msgid "_Compact View    Alt+C"
-msgstr "_Компактный вид    Alt-C"
+msgid "Toggle Open_PGP Encryption"
+msgstr "Включить Open_PGP шифрование"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "Добавить в ростер"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:7
 #: ../data/glade/gc_control_popup_menu.glade.h:7
-#: ../data/glade/gc_occupants_menu.glade.h:5
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_window.glade.h:19
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:2600
 msgid "_History"
 msgstr "_История"
 
+#: ../data/glade/chat_to_muc_window.glade.h:1
+msgid "In_vite"
+msgstr "_Пригласить"
+
+#: ../data/glade/chat_to_muc_window.glade.h:2
+msgid "Invite Friends !"
+msgstr "Пригласить Друзей !"
+
+#: ../data/glade/chat_to_muc_window.glade.h:3
+msgid "MUC server"
+msgstr "MUC сервер"
+
+#: ../data/glade/chat_to_muc_window.glade.h:4
+msgid "Please select a MUC server."
+msgstr "Пожалуйста выберите сервер"
+
+#: ../data/glade/chat_to_muc_window.glade.h:5
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+"Вы хотите начать чат(Multi-User Chat).\n"
+"Выберите контакты которых вы хотите пригласить"
+
 #: ../data/glade/data_form_window.glade.h:1
 msgid "Fill in the form."
 msgstr "Заполните форму."
@@ -926,6 +1057,14 @@ msgstr "Настройки комнаты"
 msgid "Edit Groups"
 msgstr "Редактировать группы"
 
+#: ../data/glade/features_window.glade.h:2
+msgid "<b>List of possible features in Gajim:</b>"
+msgstr "<b>Список возможных функций Gajim:</b>"
+
+#: ../data/glade/features_window.glade.h:3
+msgid "Features"
+msgstr "Возможности"
+
 #: ../data/glade/filetransfers.glade.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Список активных, завершенных и остановленных передач файлов"
@@ -959,11 +1098,11 @@ msgid "Remove file transfer from the list."
 msgstr "Удалить передачу из списка."
 
 #: ../data/glade/filetransfers.glade.h:9
-msgid "Removes completed, canceled and failed file transfers from the list"
+msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "Удаляет завершеные, отмененные и неудачные передачи из списка"
 
 #: ../data/glade/filetransfers.glade.h:10
-msgid "Shows a list of file transfers between you and other"
+msgid "Shows a list of file transfers between you and others"
 msgstr "Показывает список передач между вами и остальными"
 
 #: ../data/glade/filetransfers.glade.h:11
@@ -978,7 +1117,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Показать уведомление по окончании загрузки"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:769
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
 msgid "_Continue"
 msgstr "_Продолжить"
 
@@ -986,7 +1125,7 @@ msgstr "_Продолжить"
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Уведомить меня, когда передача файлов закончится"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:191
 msgid "_Open Containing Folder"
 msgstr "_Открыть папку с принятым файлом"
 
@@ -1012,7 +1151,7 @@ msgstr ""
 "Учетная запись\n"
 "Группа\n"
 "Контакт\n"
-"Заголовок окна беседы"
+"Баннер в окне чата"
 
 #: ../data/glade/gajim_themes_window.glade.h:6
 msgid "Bold"
@@ -1073,11 +1212,11 @@ msgid "_Background:"
 msgstr "Цвет _фона"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname"
+msgid "Change _Nickname..."
 msgstr "Изменить _ник"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject"
+msgid "Change _Subject..."
 msgstr "Изменить _тему"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:3
@@ -1085,46 +1224,58 @@ msgid "Click to see past conversation in this room"
 msgstr "Щелкните для просмотра бесед в этой комнате"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:4
-msgid "Configure _Room"
+msgid "Configure _Room..."
 msgstr "Настроить _комнату"
 
 #: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Bookmark This Room"
+msgid "_Bookmark"
 msgstr "Добавить эту комнату в _закладки"
 
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+msgid "_Destroy Room"
+msgstr "Уничтожить комнату"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:8
+msgid "_Manage Room"
+msgstr "_Управление комнатой"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:9
+msgid "_Minimize on close"
+msgstr "Сворачивать при закрытии"
+
 #: ../data/glade/gc_occupants_menu.glade.h:1
 msgid "Mo_derator"
 msgstr "_Модератор"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:2
+msgid "Occupant Actions"
+msgstr "_Действия над посетителем"
+
+#: ../data/glade/gc_occupants_menu.glade.h:5
 msgid "_Admin"
 msgstr "_Админ"
 
-#: ../data/glade/gc_occupants_menu.glade.h:4
+#: ../data/glade/gc_occupants_menu.glade.h:6
 msgid "_Ban"
 msgstr "_Забанить"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:8
 msgid "_Kick"
 msgstr "_Выгнать"
 
-#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Member"
 msgstr "_Участник"
 
-#: ../data/glade/gc_occupants_menu.glade.h:8
-msgid "_Occupant Actions"
-msgstr "_Действия над посетителем"
-
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Owner"
 msgstr "_Владелец"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Send Private Message"
 msgstr "_Отправить личное сообщение"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Voice"
 msgstr "_Право говорить"
 
@@ -1132,72 +1283,110 @@ msgstr "_Право говорить"
 msgid "Create new post"
 msgstr "Создать новое сообщение"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:259
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:280
 msgid "From"
 msgstr "От"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141
-#: ../src/history_manager.py:172
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:147
+#: ../src/history_manager.py:178
 msgid "Subject"
 msgstr "Тема"
 
 #: ../data/glade/history_manager.glade.h:1
 msgid ""
-"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
-"\n"
-"You can select logs from the left and/or search database from below.\n"
-"\n"
 "<b>WARNING:</b>\n"
 "If you plan to do massive deletions, please make sure Gajim is not running. "
 "Generally avoid deletions with contacts you currently chat with."
 msgstr ""
-"<big><b>Добро пожаловать в менеджер истории Gajim'а</b></big>\n"
-"\n"
-"Вы можете выбрать логи в левом поле и/или искать в базе данных в форме "
-"внизу. \n"
-"\n"
 "<b>ВНИМАНИЕ:</b>\n"
 "Если вы собираетесь устроить массовую чистку, пожалуйста удостоверьтесь что "
 "Gajim не запущен. Избегайте удалений из логов контактов с которыми вы "
 "разговариваете в этот момент."
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../data/glade/history_manager.glade.h:3
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "<big><b>Добро пожаловать в менеджер истории Gajim'а</b></big>"
+
+#: ../data/glade/history_manager.glade.h:4
 msgid "Delete"
 msgstr "Удалить"
 
-#: ../data/glade/history_manager.glade.h:8
+#: ../data/glade/history_manager.glade.h:5
 msgid "Export"
 msgstr "Экспорт"
 
-#: ../data/glade/history_manager.glade.h:9
+#: ../data/glade/history_manager.glade.h:6
 msgid "Gajim History Logs Manager"
 msgstr "Менеджер истории Gajim'а"
 
+#: ../data/glade/history_manager.glade.h:7
+msgid ""
+"This log manager is not intended for log viewing. If you are looking for "
+"such functionality, use the history window instead.\n"
+"\n"
+"Use this program to delete or export logs. You can select logs from the left "
+"and/or search database from below."
+msgstr ""
+"Этот менеджер истории не предназначен для просмотра. Если вы хотите "
+"просмативать историю с большим количеством функций, используйте окно "
+"истории.\n"
+"\n"
+"Используйте эту программу для удаления или экспорта истории. Вы можете "
+"выбрать лог слева или воспользоваться поиском в базе."
+
 #: ../data/glade/history_manager.glade.h:10
 msgid "_Search Database"
 msgstr "_Поиск в базе данных"
 
 #: ../data/glade/history_window.glade.h:1
-msgid "Build custom query"
-msgstr "Составить свой запрос"
+msgid "<b>History Viewer</b>"
+msgstr "<b>Менеджер истории</b>"
 
 #: ../data/glade/history_window.glade.h:2
+msgid "<b>JID Selection</b>"
+msgstr "<b>Выбор JID</b>"
+
+#: ../data/glade/history_window.glade.h:3
+msgid ""
+"Choose the chatlog you want to view. \n"
+"Enter the jid of a groupchat or a contact here. For online accounts you can "
+"even enter a a contact's nickname."
+msgstr ""
+"Выберите лог чата который хотите посмотреть. \n"
+"Введите jid чата или контакта. Для онлайн контактов можете ввести ники."
+
+#: ../data/glade/history_window.glade.h:5 ../src/history_window.py:224
 msgid "Conversation History"
 msgstr "История"
 
-#: ../data/glade/history_window.glade.h:3
-msgid "Query Builder..."
-msgstr "Редактор запросов..."
+#: ../data/glade/history_window.glade.h:6
+msgid ""
+"Current History\n"
+"All Chat Histories"
+msgstr ""
+"Текущая история\n"
+"История всех чатов"
 
-#: ../data/glade/history_window.glade.h:4
+#: ../data/glade/history_window.glade.h:8
+#: ../data/glade/search_window.glade.h:2
 msgid "Search"
 msgstr "Поиск"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/glade/history_window.glade.h:9
+#: ../data/glade/zeroconf_information_window.glade.h:10
+msgid "_Log conversation history"
+msgstr "_История сообщения"
+
+#: ../data/glade/history_window.glade.h:10
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1182
 msgid "_Search"
 msgstr "_Поиск"
 
+#: ../data/glade/history_window.glade.h:11
+msgid "in"
+msgstr "в"
+
 #: ../data/glade/invitation_received_dialog.glade.h:1
 msgid "Accept"
 msgstr "Принять"
@@ -1211,33 +1400,37 @@ msgstr "Отклонить"
 msgid "Invitation Received"
 msgstr "Получено приглашение"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1385
 msgid "Join Group Chat"
 msgstr "Войти в комнату"
 
 #: ../data/glade/join_groupchat_window.glade.h:2
-#: ../data/glade/manage_bookmarks_window.glade.h:4
-#: ../data/glade/profile_window.glade.h:23
-#: ../data/glade/vcard_information_window.glade.h:29
-msgid "Nickname:"
-msgstr "Ник:"
+msgid "Join this room automatically when I connect"
+msgstr "Автовход в комнату при подключении"
 
 #: ../data/glade/join_groupchat_window.glade.h:3
 #: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:31
+msgid "Nickname:"
+msgstr "Ник:"
+
+#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/manage_bookmarks_window.glade.h:6
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/join_groupchat_window.glade.h:5
 msgid "Recently:"
 msgstr "Недавно:"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:8
 msgid "Room:"
 msgstr "Комната:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1151
-#: ../src/disco.py:1518
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1170
+#: ../src/disco.py:1591
 msgid "_Join"
 msgstr "_Присоединиться"
 
@@ -1257,15 +1450,19 @@ msgstr "Если отмечено, то Gajim будет входить в ко�
 msgid "Manage Bookmarks"
 msgstr "Управление закладками"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:4
+msgid "Minimize on Auto Join"
+msgstr "Сворачивать при авто входе"
+
+#: ../data/glade/manage_bookmarks_window.glade.h:7
 msgid "Print status:"
 msgstr "Показывать статус:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/glade/manage_bookmarks_window.glade.h:9
 msgid "Server:"
 msgstr "Сервер:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:10
 msgid "Title:"
 msgstr "Заголовок:"
 
@@ -1278,38 +1475,51 @@ msgid "<b>Settings</b>"
 msgstr "<b>Натройки</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-msgid "HTTP Connect"
-msgstr "HTTP Соединение"
+msgid ""
+"HTTP Connect\n"
+"SOCKS5"
+msgstr ""
+"HTTP Соединение\n"
+"SOCKS5"
 
-#: ../data/glade/manage_proxies_window.glade.h:4
+#: ../data/glade/manage_proxies_window.glade.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Управление профилями прокси"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/manage_proxies_window.glade.h:6
+#: ../data/glade/profile_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:30
 msgid "Name:"
 msgstr "Имя:"
 
 #: ../data/glade/manage_proxies_window.glade.h:7
+msgid "Pass_word:"
+msgstr "П_ароль"
+
+#: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Type:"
 msgstr "Тип:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/glade/manage_proxies_window.glade.h:9
 msgid "Use authentication"
 msgstr "Использовать аутентификацию"
 
+#: ../data/glade/manage_proxies_window.glade.h:10
+msgid "_Host:"
+msgstr "_Хост:"
+
 #: ../data/glade/message_window.glade.h:1
 msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Щелкните, чтобы вставить смайлик (Alt+M)"
 
-#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control2.py:1257
+#: ../src/chat_control.py:1271
 msgid "OpenPGP Encryption"
 msgstr "Шифрование OpenPGP"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:4
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:12
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Действия"
@@ -1317,7 +1527,7 @@ msgstr "_Действия"
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:6
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:253
+#: ../src/filetransfers_window.py:252
 msgid "_Send"
 msgstr "_Отправить"
 
@@ -1327,46 +1537,54 @@ msgstr "Парольная фраза"
 
 #: ../data/glade/preferences_window.glade.h:1
 msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>Редактор настроек</b>"
+msgstr "<b>Расширенный редактор настроек</b>"
 
 #: ../data/glade/preferences_window.glade.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Приложения</b>"
 
+#: ../data/glade/preferences_window.glade.h:3
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Настройки окна чата</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/glade/preferences_window.glade.h:5
 msgid "<b>Custom</b>"
 msgstr "<b>Пользовательские настройки</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/glade/preferences_window.glade.h:6
 msgid "<b>Format of a line</b>"
 msgstr "<b>Формат строки</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/glade/preferences_window.glade.h:7
 msgid "<b>GMail Options</b>"
 msgstr "<b>Настройки GMail</b>"
 
-#: ../data/glade/preferences_window.glade.h:7
-msgid "<b>Interface Customization</b>"
-msgstr "<b>Настройка интерфейса</b>"
-
 #: ../data/glade/preferences_window.glade.h:9
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Предустановленные сообщения о статусе</b>"
 
-#: ../data/glade/preferences_window.glade.h:11
-msgid "<b>Visual Notifications</b>"
+#: ../data/glade/preferences_window.glade.h:10
+msgid "<b>Privacy</b>"
 msgstr "<b>Уведомления</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
-msgid "A_fter nickname:"
-msgstr "П_осле ника:"
+#: ../data/glade/preferences_window.glade.h:11
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Настройки ростера</b>"
 
 #: ../data/glade/preferences_window.glade.h:13
-msgid "Advanced"
-msgstr "Расширенный"
+msgid "<b>Themes</b>"
+msgstr "<b>Настройки интерфейса</b>"
 
 #: ../data/glade/preferences_window.glade.h:14
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Уведомления</b>"
+
+#: ../data/glade/preferences_window.glade.h:15
+msgid "Advanced"
+msgstr "Расширенные"
+
+#: ../data/glade/preferences_window.glade.h:16
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1376,43 +1594,48 @@ msgstr ""
 "Только печать\n"
 "Отключено "
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/glade/preferences_window.glade.h:19
 msgid "Allow _OS information to be sent"
 msgstr "Отсылать информацию об _ОС"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/glade/preferences_window.glade.h:20
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr "Позволять уведомления в режиме _ушел/недоступен/занят/невидимка"
 
-#: ../data/glade/preferences_window.glade.h:19
-msgid "Also known as iChat style"
-msgstr "В стиле iChat"
+#: ../data/glade/preferences_window.glade.h:21
+msgid "Always check to see if Gajim is the _default Jabber client on startup"
+msgstr ""
+"Всегда проверять при запуске, является ли Gajim jabber-клиентом по-умолчанию"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/glade/preferences_window.glade.h:22
 msgid ""
 "An example: If you have enabled status message for away, Gajim won't ask you "
 "anymore for a status message when you change your status to away; it will "
 "use the default one set here"
-msgstr "Пример: если вы включили статусные сообщения для режима \"Отошел\", Gajim вас больше не будет спрашивать о статусом сообщении, когда вы смените статус на \"Отошел\", поскольку будет использовать значение по-умолчанию, которое установлено здесь"
+msgstr ""
+"Пример: если вы включили статусные сообщения для режима \"Отошел\", Gajim "
+"вас больше не будет спрашивать о статусом сообщении, когда вы смените статус "
+"на \"Отошел\", поскольку будет использовать значение по-умолчанию, которое "
+"установлено здесь"
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/glade/preferences_window.glade.h:23
 msgid "Ask status message when I:"
 msgstr "Запрашивать сообщение о статусе, когда я: "
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/glade/preferences_window.glade.h:24
 msgid "Auto _away after:"
 msgstr "Авто-_отошел после:"
 
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/glade/preferences_window.glade.h:25
 msgid "Auto _not available after:"
 msgstr "Авто-_недоступен после:"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/glade/preferences_window.glade.h:26
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
 "Always use KDE default applications\n"
-"Always use XFCE4 default applications\n"
+"Always use Xfce default applications\n"
 "Custom"
 msgstr ""
 "Определять автоматически при каждом запуске Gajim\n"
@@ -1421,23 +1644,15 @@ msgstr ""
 "Всегда использовать приложения XFCE4 по умолчанию\n"
 "Другое"
 
-#: ../data/glade/preferences_window.glade.h:29
-msgid "B_efore nickname:"
-msgstr "_До ника:"
-
-#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844
-msgid "Chat"
-msgstr "Чат"
-
 #: ../data/glade/preferences_window.glade.h:31
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
-"you. Use with caution, cause it blocks all messages from any contact that is "
-"not in the roster"
+"you. Use with caution, because it blocks all messages from any contact that "
+"is not in the roster"
 msgstr ""
 "Отметьте эту опцию, только если кто-то не из вашего ростера спамит/достает "
 "вас. Используйте с осторожностью, потому что это заблокирует все сообщения "
-"от контактов не из вашего ротера."
+"от контактов не из вашего роcтера."
 
 #: ../data/glade/preferences_window.glade.h:32
 msgid "Configure color and font of the interface"
@@ -1448,28 +1663,26 @@ msgid "Default Status Messages"
 msgstr "Автоматические статусные сообщения"
 
 #: ../data/glade/preferences_window.glade.h:34
-msgid "Default status _iconset:"
-msgstr "Тема статусных _иконок:"
+msgid ""
+"Determined by sender\n"
+"Chat message\n"
+"Single message"
+msgstr ""
+"Определяется отправителем\n"
+"Сообщение чата\n"
+"Одиночное сообщение"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:37
 msgid "Display _extra email details"
 msgstr "Отображать _дополнительные данные о почте"
 
-#: ../data/glade/preferences_window.glade.h:36
-msgid "Display a_vatars of contacts in roster"
-msgstr "Показавать а_ватары для контактов в ростере"
-
-#: ../data/glade/preferences_window.glade.h:37
-msgid "Display status _messages of contacts in roster"
-msgstr "Показать _сообщения о статусе контакта в ростере"
-
 #: ../data/glade/preferences_window.glade.h:38
-msgid "Displayed Chat state noti_fications:"
-msgstr "Отображать уведомления со_стоянии беседы:"
+msgid "Display a_vatars of contacts in roster"
+msgstr "Показывать а_ватары для контактов в ростере"
 
 #: ../data/glade/preferences_window.glade.h:39
-msgid "E_very 5 minutes"
-msgstr "Каждые 5 _минут"
+msgid "Display status _messages of contacts in roster"
+msgstr "Показывать _сообщения о статусе контакта в ростере"
 
 #: ../data/glade/preferences_window.glade.h:40
 msgid "Emoticons:"
@@ -1486,7 +1699,8 @@ msgid ""
 "display in chat windows."
 msgstr ""
 "Gajim может отсылать и получать метаданные относящиеся к беседе с контактом. "
-"Здесь вы можете указать какие состояние беседы вы хотели бы видеть в окне беседы."
+"Здесь вы можете указать, какие состояние чата вы хотели бы видеть в окне "
+"чата."
 
 #: ../data/glade/preferences_window.glade.h:43
 msgid ""
@@ -1495,32 +1709,10 @@ msgid ""
 "send to the other party."
 msgstr ""
 "Gajim может отсылать и получать метаданные, относящиеся к беседе с "
-"контактом. Здесь вы можете указать, какие состояния беседы клиент будет "
+"контактом. Здесь вы можете указать, какие состояния чата Gajim будет "
 "отсылать вашему респонденту."
 
 #: ../data/glade/preferences_window.glade.h:44
-msgid "Gajim will automatically show new events by poping up the relative window"
-msgstr ""
-"Gajim будет автоматически показывать новые события, поднимая соответствующее "
-"окно."
-
-#: ../data/glade/preferences_window.glade.h:45
-msgid ""
-"Gajim will notify you for new events via a popup in the bottom right of the "
-"screen"
-msgstr ""
-"Gajim будет уведомлять вас о новых событиях с помощью сообщения в правом "
-"нижнем углу экрана"
-
-#: ../data/glade/preferences_window.glade.h:46
-msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed in"
-msgstr ""
-"Gajim будет уведомлять вас о присоединившемся контакте с помощью сообщения в "
-"правом нижнем углу экрана"
-
-#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1528,17 +1720,18 @@ msgstr ""
 "Gajim будет уведомлять вас об отсоединившемся контакте с помощью сообщения в "
 "правом нижнем углу экрана"
 
-#: ../data/glade/preferences_window.glade.h:48
-msgid "Gajim will only change the icon of the contact that triggered the new event"
-msgstr "Gajim будет лишь менять иконку у контакта, от которого пришло новое сообщение"
+#: ../data/glade/preferences_window.glade.h:46
+msgid "Hides buttons in chatwindows to "
+msgstr "Скрывает кнопки окна комнаты."
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
-msgstr "Если отмечено, то Gajim будет включать информацию об отправителе новых писем."
+msgstr ""
+"Если отмечено, то Gajim будет включать информацию об отправителе новых писем."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1546,7 +1739,7 @@ msgstr ""
 "Если отмечено, то Gajim будет показывать аватары контактов в окне ростера и "
 "в окнах комнат"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1554,13 +1747,7 @@ msgstr ""
 "Если отмечено, то Gajim будет отображать сообщение о статусе контакта под "
 "его именем в окне ростера и в окнах комнат"
 
-#: ../data/glade/preferences_window.glade.h:53
-msgid ""
-"If checked, Gajim will remember the roster and chat window positions in the "
-"screen and the sizes of them next time you run it"
-msgstr "Если отмечено, то Gajim запомнит позицию и размер окна ростера"
-
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:50
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1570,7 +1757,7 @@ msgstr ""
 "(например, контакты из MSN будут иметь соответствующие иконки msn для "
 "статусов \"в сети\", \"ушёл\", \"занят\" и т.д.)"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:51
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1579,15 +1766,15 @@ msgstr ""
 "анимированным эквивалентом. Выберите \"Отключены\", чтобы этого не "
 "происходило."
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:52
 msgid "Ignore rich content in incoming messages"
 msgstr "Игнорировать форматирование во входящих сообщениях"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:53
 msgid "Ma_nage..."
 msgstr "_Управление..."
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "Never\n"
 "Always\n"
@@ -1599,59 +1786,53 @@ msgstr ""
 "По учетной записи\n"
 "По типу"
 
-#: ../data/glade/preferences_window.glade.h:62
-msgid "Notify me about contacts that: "
-msgstr "Уведомлять о контактах, которые: "
+#: ../data/glade/preferences_window.glade.h:58
+msgid "Notify me about contacts that sign _in"
+msgstr "Уведомлять о контактах, которые вошли: "
+
+#: ../data/glade/preferences_window.glade.h:59
+msgid "Notify me about contacts that sign _out"
+msgstr "Уведомлять о контактах, которые вышли: "
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:60
 msgid "Notify on new _GMail email"
 msgstr "Сообщать о новых письмах в _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:64
-msgid "On every _message"
-msgstr "В _каждой строке"
-
-#: ../data/glade/preferences_window.glade.h:65
-msgid "One message _window:"
-msgstr "Одно _окно сообщения:"
-
-#: ../data/glade/preferences_window.glade.h:66
-msgid "Outgoing Chat state noti_fications:"
-msgstr "Исходящие у_ведомления о состоянии беседы:"
-
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:61
 msgid "Play _sounds"
 msgstr "Проигрывать _звук"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:62
+msgid ""
+"Pop it up\n"
+"Notify me about it\n"
+"Show only in roster"
+msgstr ""
+"Показать всплывающее окно\n"
+"Сообщить мне об этом\n"
+"Показать в ростере"
+
+#: ../data/glade/preferences_window.glade.h:65
 msgid "Preferences"
 msgstr "Настройки"
 
-#: ../data/glade/preferences_window.glade.h:69
-msgid "Print time:"
-msgstr "Выводить время:"
-
-#: ../data/glade/preferences_window.glade.h:70
-msgid "Save _position and size for roster and chat windows"
-msgstr "Сохранить _положение и размер ростера и окон бесед"
+#: ../data/glade/preferences_window.glade.h:66
+msgid "Privacy"
+msgstr "Личные"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:67
 msgid "Set status message to reflect currently playing _music track"
 msgstr "Отображать в статусном сообщении название проигрываемого трека"
 
-#: ../data/glade/preferences_window.glade.h:72
-msgid "Show only in _roster"
-msgstr "Показывать только в _ростере"
-
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Sign _in"
-msgstr "В_ошли"
+msgstr "В_ошел"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Sign _out"
-msgstr "В_ышли"
+msgstr "В_ышел"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:70
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1659,51 +1840,47 @@ msgstr ""
 "Некоторые сообщения могут содержать форматирование (цвет, шрифт и т.д.). "
 "Если отмечено, Gajim будет отображать только их текст, без форматирования."
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:71
 msgid "Status"
 msgstr "Статус"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:72
+msgid "Status _iconset:"
+msgstr "Тема статусных _иконок:"
+
+#: ../data/glade/preferences_window.glade.h:73
 msgid "T_heme:"
 msgstr "_Тема:"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:74
 msgid "The auto away status message"
 msgstr "Сообщение о статусе для авто-отошел"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:75
 msgid "The auto not available status message"
 msgstr "Сообщение о статусе для авто-недоступен"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:76
+msgid "Treat all incoming messages as:"
+msgstr "Входящее сообщение:"
+
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Use _transports iconsets"
 msgstr "Использовать иконки _транспортов"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:78
+msgid "Use only one message _window:"
+msgstr "Только одно окно:"
+
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Use system _default"
 msgstr "Использовать системный шрифт"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid "Use t_rayicon (aka. notification area icon)"
-msgstr "Иконка в _трее (или в области уведомления)"
-
-#: ../data/glade/preferences_window.glade.h:83
-msgid ""
-"When a new event (message, file transfer request etc..) is received, the "
-"following methods may be used to inform you about it. Please note that "
-"events about new messages only occur if it is a new message from a contact "
-"you are not already chatting with"
-msgstr ""
-"Когда происходит новое событие (приходит сообщение, запрос на передачу файла "
-"и т.д.) могут быть использованы следующие способы сообщения об этом. Учтите "
-"что событие соответствующее новому сообщению, не происходит если вы уже "
-"беседуете с контактом"
-
-#: ../data/glade/preferences_window.glade.h:84
-msgid "When new event is received"
-msgstr "Когда получено новое сообытие"
+#: ../data/glade/preferences_window.glade.h:80
+msgid "When new event is received:"
+msgstr "Когда получено новое сообытие:"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:81
 msgid ""
 "Works for Rhythmbox and Muine players. For more players, please visit http://"
 "trac.gajim.org/wiki/GajimAndMusicPlayer"
@@ -1711,91 +1888,83 @@ msgstr ""
 "Работает с проигрывателями Rhythmbox и Muine. О других проигрывателях см. "
 "http://trac.gajim.org/wiki/GajimAndMusicPlayer"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:82
 msgid "_Advanced Notifications Control..."
 msgstr "_Дополнительные настройки уведомлений..."
 
-#: ../data/glade/preferences_window.glade.h:87
-msgid "_After time:"
-msgstr "_После времени:"
-
-#: ../data/glade/preferences_window.glade.h:88
-msgid "_Before time:"
-msgstr "_До времени:"
-
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:83
 msgid "_Browser:"
 msgstr "_Браузер:"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:84
+msgid "_Display chat state notifications:"
+msgstr "Отображать уведомления о состоянии чата:"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "_File manager:"
 msgstr "_Менеджер файлов:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:86
 msgid "_Font:"
 msgstr "Шри_фт:"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:87
 msgid "_Highlight misspelled words"
 msgstr "Выделять _слова с опечатками"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:88
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Игнорировать события от контактов не из ростера"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:89
 msgid "_Incoming message:"
 msgstr "_Входящее сообщение:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:90
 msgid "_Log status changes of contacts"
-msgstr "_Записывать изменения статуса контактов"
+msgstr "_Записывать в лог изменения статусов контактов"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:91
 msgid "_Mail client:"
 msgstr "_Почтовый клиент:"
 
-#: ../data/glade/preferences_window.glade.h:97
-msgid "_Never"
-msgstr "_Никогда"
-
-#: ../data/glade/preferences_window.glade.h:98
-msgid "_Notify me about it"
-msgstr "_Сообщать об этом"
+#: ../data/glade/preferences_window.glade.h:92
+msgid "_Make message windows compact"
+msgstr "Компактное окно сообщений"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:93
 msgid "_Open..."
 msgstr "_Открыть..."
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:94
 msgid "_Outgoing message:"
 msgstr "_Исходящее сообщение:"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:95
 msgid "_Player:"
 msgstr "_Проигрыватель:"
 
-#: ../data/glade/preferences_window.glade.h:102
-msgid "_Pop it up"
-msgstr "_Вывести окно"
-
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:96
 msgid "_Reset to Default Colors"
 msgstr "_Вернуться к цветам по умолчанию"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:97
+msgid "_Send chat state notifications:"
+msgstr "Отправлять уведомления о состоянии чата:"
+
+#: ../data/glade/preferences_window.glade.h:98
 msgid "_Sort contacts by status"
 msgstr "_Сортировать контакты по статусу"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:99
 msgid "_Status message:"
 msgstr "_Сообщение о статусе:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:100
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:101
 msgid "minutes"
 msgstr "минут"
 
@@ -1839,7 +2008,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Номер:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2258
 msgid "Privacy List"
 msgstr "Список доступа"
 
@@ -1892,7 +2061,7 @@ msgstr "Адрес"
 
 #: ../data/glade/profile_window.glade.h:4
 msgid "Avatar:"
-msgstr "Аватара:"
+msgstr "Аватар:"
 
 #: ../data/glade/profile_window.glade.h:5
 #: ../data/glade/vcard_information_window.glade.h:6
@@ -1905,126 +2074,115 @@ msgid "City:"
 msgstr "Город:"
 
 #: ../data/glade/profile_window.glade.h:7
+msgid "Click to set your avatar"
+msgstr "Установить свою аватару"
+
+#: ../data/glade/profile_window.glade.h:8
 #: ../data/glade/vcard_information_window.glade.h:10
 msgid "Company:"
 msgstr "Компания:"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:13
-msgid "Country:"
-msgstr "Страна:"
-
 #: ../data/glade/profile_window.glade.h:9
 #: ../data/glade/vcard_information_window.glade.h:14
-msgid "Department:"
-msgstr "Отделение:"
+msgid "Country:"
+msgstr "Страна:"
 
 #: ../data/glade/profile_window.glade.h:10
 #: ../data/glade/vcard_information_window.glade.h:15
-#: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
-msgid "E-Mail:"
-msgstr "Почта:"
+msgid "Department:"
+msgstr "Отделение:"
 
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/profile_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:17
 msgid "Extra Address:"
 msgstr "Дополнительный адрес:"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:13
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/profile_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:19
 msgid "Family:"
 msgstr "Фамилия:"
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/profile_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "Format: YYYY-MM-DD"
 msgstr "Формат: YYYY-MM-DD"
 
-#. Given Name
 #: ../data/glade/profile_window.glade.h:17
 #: ../data/glade/vcard_information_window.glade.h:22
+msgid "Full Name"
+msgstr "Имя"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:19
+#: ../data/glade/vcard_information_window.glade.h:24
 msgid "Given:"
 msgstr "Имя:"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "Homepage:"
 msgstr "Веб-страница:"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "Middle:"
 msgstr "Отчество:"
 
-#: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:27
-msgid "More"
-msgstr "Еще"
-
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:34
 msgid "Personal Info"
 msgstr "Личная информация"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "Phone No.:"
 msgstr "Телефон:"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/glade/profile_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:36
 msgid "Position:"
 msgstr "Должность:"
 
-#: ../data/glade/profile_window.glade.h:28
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:37
 msgid "Postal Code:"
 msgstr "Индекс:"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:30
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:39
 msgid "Prefix:"
 msgstr "Префикс:"
 
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:38 ../src/vcard.py:273
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:41 ../src/vcard.py:307
 msgid "Role:"
 msgstr "Обязанности:"
 
-#: ../data/glade/profile_window.glade.h:32
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/profile_window.glade.h:33
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "State:"
 msgstr "Штат:"
 
-#: ../data/glade/profile_window.glade.h:33
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Street:"
 msgstr "Улица:"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/profile_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "Suffix:"
 msgstr "Суффикс:"
 
-#: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/profile_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Работа"
 
-#: ../data/glade/profile_window.glade.h:37
-msgid "_Publish"
-msgstr "_Опубликовать"
-
-#: ../data/glade/profile_window.glade.h:38
-msgid "_Retrieve"
-msgstr "_Получить"
-
 #: ../data/glade/remove_account_window.glade.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Что вы хотите сделать?</b>"
@@ -2037,136 +2195,179 @@ msgstr "Удалит учетную запись _только из Gajim"
 msgid "Remove account from Gajim and from _server"
 msgstr "Удалить учетную запись из Gajim и с _сервера"
 
+#. Remove
+#. Remove group
+#. Remove
+#: ../data/glade/remove_account_window.glade.h:4
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+#: ../src/roster_window.py:2557 ../src/roster_window.py:2767
+#: ../src/roster_window.py:2903
+msgid "_Remove"
+msgstr "_Удалить"
+
 #: ../data/glade/roster_contact_context_menu.glade.h:1
 msgid "A_sk to see his/her status"
 msgstr "Попросить возможность видеть его или её статус"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:2
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
-msgid "Add Special _Notification"
+msgid "Add Special _Notification..."
 msgstr "Добавить специальное _уведомление"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:3
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
-msgid "Assign Open_PGP Key"
+msgid "Assign Open_PGP Key..."
 msgstr "Назначить OpenPGP ключ"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:4
-#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:1993
-msgid "Edit _Groups"
+msgid "Edit _Groups..."
 msgstr "Редактировать группы"
 
+#. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:2128
+#: ../src/roster_window.py:2860
 msgid "Execute Command..."
 msgstr "Выполнить команду..."
 
+#. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:1951
+#: ../src/roster_window.py:2473
 msgid "In_vite to"
 msgstr "_Пригласить в"
 
+#. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Отправить _сообщение"
+#: ../src/roster_window.py:2697 ../src/roster_window.py:2831
+msgid "Send Cus_tom Status"
+msgstr "Установить статус"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+msgid "Send Single _Message..."
+msgstr "Отправить одиночное _сообщение..."
 
 #: ../data/glade/roster_contact_context_menu.glade.h:9
+msgid "Send _File..."
+msgstr "Отправить _файл..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:10
+msgid "Set Custom _Avatar..."
+msgstr "Установить _аватар..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:11
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5
 msgid "Start _Chat"
-msgstr "Начать _чат"
+msgstr "Начать _беседу"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:13
 msgid "_Allow him/her to see my status"
 msgstr "Позволить ему или ей видеть мой статус"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:12
-msgid "_Forbid him/her to see my status"
-msgstr "Запретить ему или ей видеть мой статус"
-
-#. Remove group
 #: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:1945 ../src/roster_window.py:2042
-#: ../src/roster_window.py:2149
-msgid "_Remove from Roster"
-msgstr "_Удалить из ростера"
+#: ../src/roster_window.py:2547 ../src/roster_window.py:2758
+msgid "_Block"
+msgstr "_Блокировать"
 
 #: ../data/glade/roster_contact_context_menu.glade.h:15
+msgid "_Forbid him/her to see my status"
+msgstr "Запретить ему или ей видеть мой статус"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:17
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:2137
-msgid "_Rename"
+msgid "_Manage Contact"
+msgstr "Управление контактом"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:19
+msgid "_Rename..."
 msgstr "П_ереименовать"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:20
 msgid "_Subscription"
 msgstr "_Подписка"
 
+#: ../data/glade/roster_contact_context_menu.glade.h:21
+#: ../src/roster_window.py:2541 ../src/roster_window.py:2752
+msgid "_Unblock"
+msgstr "_Разблокировать"
+
 #: ../data/glade/roster_window.glade.h:1
 msgid "A_ccounts"
 msgstr "Учётные записи"
 
 #: ../data/glade/roster_window.glade.h:2
-msgid "Add _Contact"
-msgstr "Добавить _контакт"
+msgid "Add _Contact..."
+msgstr "_Добавить контакт..."
 
 #: ../data/glade/roster_window.glade.h:3
+msgid "Fea_tures"
+msgstr "Возможности"
+
+#: ../data/glade/roster_window.glade.h:4
 msgid "File _Transfers"
 msgstr "_Передачи"
 
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/glade/roster_window.glade.h:5
 msgid "Frequently Asked Questions (online)"
-msgstr "Часто задаваемые вопросы (в сети)"
+msgstr "Часто задаваемые вопросы (онлайн)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/glade/roster_window.glade.h:7
 msgid "Help online"
 msgstr "Помощь онлайн"
 
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:9
 msgid "Profile, A_vatar"
-msgstr "Профиль и аватара"
+msgstr "Профиль и аватар"
 
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
 msgstr "Показать транспорты"
 
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "Показать _отключенных"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:14
 msgid "_Contents"
 msgstr "_Содержание"
 
-#: ../data/glade/roster_window.glade.h:13
-msgid "_Discover Services"
-msgstr "_Просмотреть сервисы"
-
-#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1256
-#: ../src/roster_window.py:2120
+#: ../data/glade/roster_window.glade.h:16 ../src/disco.py:1324
 msgid "_Edit"
 msgstr "_Правка"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:17
 msgid "_FAQ"
 msgstr "_ЧаВО"
 
-#: ../data/glade/roster_window.glade.h:17
+#: ../data/glade/roster_window.glade.h:18
 msgid "_Help"
 msgstr "_Помощь"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Preferences"
 msgstr "_Настройки"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:21
 msgid "_Quit"
 msgstr "_Выйти"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
+msgid "_Send Single Message..."
+msgstr "Отправить одиночное _сообщение..."
+
+#: ../data/glade/roster_window.glade.h:24
 msgid "_View"
 msgstr "_Вид"
 
+#: ../data/glade/search_window.glade.h:1
+msgid "Please wait while retrieving search form..."
+msgstr "Получаю форму поиска. Подождите..."
+
+#: ../data/glade/search_window.glade.h:3
+msgid "_Add contact"
+msgstr "Добавить _контакт"
+
+#. Information
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:2915
+msgid "_Information"
+msgstr "Информация о контакте"
+
 #: ../data/glade/service_discovery_window.glade.h:1
 msgid "G_o"
 msgstr "_Вперед"
@@ -2175,10 +2376,6 @@ msgstr "_Вперед"
 msgid "_Address:"
 msgstr "_Адрес:"
 
-#: ../data/glade/service_discovery_window.glade.h:3
-msgid "_Filter:"
-msgstr "_Фильтр:"
-
 #: ../data/glade/service_registration_window.glade.h:1
 msgid "Register to"
 msgstr "Зарегистрировать в"
@@ -2236,11 +2433,13 @@ msgid "Au_thorize"
 msgstr "А_вторизовать"
 
 #: ../data/glade/subscription_request_window.glade.h:2
-msgid "Authorize contact so he can know when you're connected"
+msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Авторизовать контакт (он будет видеть ваш статус)"
 
 #: ../data/glade/subscription_request_window.glade.h:3
-msgid "Deny authorization from contact so he cannot know when you're connected"
+msgid ""
+"Deny authorization from contact so he or she cannot know when you're "
+"connected"
 msgstr "Отклонить авторизацию от контакта (Он не сможет видеть ваш статус)"
 
 #: ../data/glade/subscription_request_window.glade.h:4
@@ -2251,10 +2450,32 @@ msgstr "Запрос подписки"
 msgid "_Deny"
 msgstr "_Отклонить"
 
+#: ../data/glade/synchronise_contacts_dialog.glade.h:1
+#, fuzzy
+msgid "Select the account with which to synchronise"
+msgstr "Выберите аккаунт для объединения"
+
+#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+msgid "Select the account with which you want to synchronise"
+msgstr "Выберите аккаунт для объединения"
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#, fuzzy
+msgid "Select the contacts you want to synchronise"
+msgstr "JID контакта, с которым вы хотели бы побеседовать"
+
+#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+msgid "Synchronise : select contacts"
+msgstr "Синхронизация : выберите контакт"
+
 #: ../data/glade/systray_context_menu.glade.h:1
 msgid "Mute Sounds"
 msgstr "Выключить звук"
 
+#: ../data/glade/systray_context_menu.glade.h:2
+msgid "Send Single _Message"
+msgstr "Отправить _сообщение"
+
 #: ../data/glade/systray_context_menu.glade.h:3
 msgid "Show All Pending _Events"
 msgstr "Показать непросмотренные _события"
@@ -2267,6 +2488,10 @@ msgstr "Показать _ростер"
 msgid "Sta_tus"
 msgstr "Ста_тус"
 
+#: ../data/glade/systray_context_menu.glade.h:6
+msgid "_Group Chat"
+msgstr "_Комната"
+
 #. Given Name
 #: ../data/glade/vcard_information_window.glade.h:5
 msgid "Ask:"
@@ -2281,43 +2506,44 @@ msgid "Comments"
 msgstr "Комментарии"
 
 #: ../data/glade/vcard_information_window.glade.h:11
+msgid "Configured avatar:"
+msgstr "Настроить _аватар:"
+
+#: ../data/glade/vcard_information_window.glade.h:12
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Контакт"
 
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:13
 msgid "Contact Information"
 msgstr "Информация о контакте"
 
-#: ../data/glade/vcard_information_window.glade.h:24
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
+#: ../data/glade/vcard_information_window.glade.h:29
+msgid "More"
+msgstr "Еще"
 
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "OS:"
 msgstr "ОС:"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:40
 #: ../data/glade/zeroconf_information_window.glade.h:8
 msgid "Resource:"
 msgstr "Ресурс:"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:9
 msgid "Status:"
 msgstr "Статус:"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Subscription:"
 msgstr "Подписка:"
 
-#: ../data/glade/vcard_information_window.glade.h:47
-#: ../data/glade/zeroconf_information_window.glade.h:10
-msgid "_Log conversation history"
-msgstr "_История сообщения"
+#: ../data/glade/vcard_information_window.glade.h:49
+msgid "User avatar:"
+msgstr "Аватар:"
 
 #: ../data/glade/xml_console_window.glade.h:1
 msgid "<b>Jabber Traffic</b>"
@@ -2327,11 +2553,6 @@ msgstr "<b>Jabber Траффик</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Ввод</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Включить"
-
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2350,15 +2571,29 @@ msgstr "_Сообщение"
 msgid "_Presence"
 msgstr "_Присутствие"
 
-#: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
-msgid "First Name:"
-msgstr "Имя:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
+msgid "Add Special _Notification"
+msgstr "Добавить специальное _уведомление"
 
-#: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
-msgid "Last Name:"
-msgstr "Фамилия:"
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
+msgid "Assign Open_PGP Key"
+msgstr "Назначить OpenPGP ключ"
+
+#. Edit Groups
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:2530
+msgid "Edit _Groups"
+msgstr "Редактировать группы"
+
+#. Rename
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:2887
+msgid "_Rename"
+msgstr "П_ереименовать"
+
+#: ../data/glade/zeroconf_context_menu.glade.h:1
+msgid "_Modify Account..."
+msgstr "_Изменить учетную запись..."
 
 #: ../data/glade/zeroconf_information_window.glade.h:6
 msgid "Local jid:"
@@ -2368,211 +2603,288 @@ msgstr "Локальный JID:"
 msgid "Personal"
 msgstr "Личная информация"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:11
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Если порт по умолчанию, который используется для входящих сообщения вас не устраивает, вы можете выбрать другой.\n"
-"Так же возможно придется изменить некоторые настройки брандмауэра."
-
 #: ../data/glade/zeroconf_properties_window.glade.h:15
 msgid "Modify Account"
 msgstr "Редактировать учетную запись"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
-msgstr "Другой порт"
+#. For i18n
+#: ../src/advanced.py:56
+#, fuzzy
+msgid "Activated"
+msgstr "Активен"
 
-#: ../src/advanced.py:57
+#: ../src/advanced.py:56
+#, fuzzy
+msgid "Deactivated"
+msgstr "Неактивен"
+
+#: ../src/advanced.py:58
+msgid "Boolean"
+msgstr ""
+
+#: ../src/advanced.py:59
+msgid "Integer"
+msgstr ""
+
+#: ../src/advanced.py:60
+msgid "Text"
+msgstr ""
+
+#: ../src/advanced.py:61
+msgid "Color"
+msgstr ""
+
+#: ../src/advanced.py:70
 msgid "Preference Name"
 msgstr "Название опции"
 
-#: ../src/advanced.py:63
+#: ../src/advanced.py:76
 msgid "Value"
 msgstr "Значение"
 
-#: ../src/advanced.py:72
+#: ../src/advanced.py:84
 msgid "Type"
 msgstr "Тип"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:128
+#: ../src/advanced.py:140
 msgid "(None)"
 msgstr "(Нет)"
 
 #. we talk about password
-#: ../src/advanced.py:227
+#: ../src/advanced.py:243
 msgid "Hidden"
 msgstr "Скрытый"
 
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
-#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "English"
 msgstr "Английский"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+msgid "Belarusian"
+msgstr "Беларусский"
+
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Bulgarian"
 msgstr "Болгарский"
 
-#: ../src/chat_control.py:52
-msgid "Briton"
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#, fuzzy
+msgid "Breton"
 msgstr "Бриттский"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Czech"
 msgstr "Чешский"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "German"
 msgstr "Немецкий"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Greek"
 msgstr "Греческий"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+msgid "British"
+msgstr "Британский"
+
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Esperanto"
 msgstr "Эсперанто"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Spanish"
 msgstr "Испанский"
 
-#: ../src/chat_control.py:52
-msgid "Basc"
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+#, fuzzy
+msgid "Basque"
 msgstr "Баскский"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "French"
 msgstr "Французский"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Croatian"
 msgstr "Хорватский"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Italian"
 msgstr "Итальянский"
 
-#: ../src/chat_control.py:52
-msgid "Norvegian b"
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+msgid "Norwegian (b)"
 msgstr "Норвежский b"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Dutch"
 msgstr "Голландский"
 
-#: ../src/chat_control.py:52
-msgid "Norvegian"
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+msgid "Norwegian"
 msgstr "Норвежский"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Polish"
 msgstr "Польский"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Portuguese"
 msgstr "Португальский"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Brazilian Portuguese"
 msgstr "Португальский (Бразилия)"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Russian"
 msgstr "Русский"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
+msgid "Serbian"
+msgstr "Сербский"
+
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Slovak"
 msgstr "Словацкий"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Swedish"
 msgstr "Шведский"
 
-#: ../src/chat_control.py:52
+#: ../src/chat_control2.py:60 ../src/chat_control.py:60
 msgid "Chinese (Ch)"
 msgstr "Китайский"
 
-#: ../src/chat_control.py:201 ../src/dialogs.py:1497
-msgid ""
-"If that is not your language for which you want to highlight misspelled "
-"words, then please set your $LANG as appropriate. Eg. for French do export "
-"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it "
-"global in /etc/profile.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"Если этот язык не является тем языком, для которого вы хотели бы видеть "
-"проверку орфографии, то установите нужное значение в переменную окружения "
-"$LANG. Например, для русского: export LANG=ru_RU или export LANG=ru_RU.UTF-8 "
-"в ~/.bash_profile, либо же, если вы хотите сделать эту установку системной, "
-"то добавьте то же самое в /etc/profile \n"
-"\n"
-"Выделение слов с опечатками выключено"
-
-#: ../src/chat_control.py:239
+#: ../src/chat_control2.py:310 ../src/chat_control.py:313
 msgid "Spelling language"
 msgstr "Язык проверки орфографии"
 
 #. we are not connected
-#: ../src/chat_control.py:262 ../src/chat_control.py:468
+#: ../src/chat_control2.py:333 ../src/chat_control2.py:549
+#: ../src/chat_control.py:336 ../src/chat_control.py:559
 msgid "A connection is not available"
 msgstr "Подключение недоступно"
 
-#: ../src/chat_control.py:263 ../src/chat_control.py:469
+#: ../src/chat_control2.py:334 ../src/chat_control2.py:550
+#: ../src/chat_control.py:337 ../src/chat_control.py:560
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваше сообщение не может быть отправлено, пока вы не подключитесь."
 
-#: ../src/chat_control.py:844
-msgid "Chats"
-msgstr "Чаты"
-
-#: ../src/chat_control.py:1030
+#: ../src/chat_control2.py:1176 ../src/chat_control.py:1186
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s из комнаты %(room_name)s"
 
 #. we talk about a contact here
-#: ../src/chat_control.py:1118
+#: ../src/chat_control2.py:1271 ../src/chat_control.py:1285
 #, python-format
 msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr "%s не выдал OpenPGP ключ или вы не присвоили ему такового"
 
-#: ../src/chat_control.py:1254
+#: ../src/chat_control2.py:1314 ../src/chat_control.py:1328
+#: ../src/groupchat_control.py:1437
+#, python-format
+msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+msgstr ""
+"Нет такой команды: /%s (если вы хотите её просто передать, то добавьте к ней "
+"префикс /say)"
+
+#: ../src/chat_control2.py:1321 ../src/chat_control.py:1335
+#: ../src/groupchat_control.py:1460
+#, python-format
+msgid "Commands: %s"
+msgstr "Команды: %s"
+
+#: ../src/chat_control2.py:1324 ../src/chat_control.py:1338
+#: ../src/groupchat_control.py:1474
+#, python-format
+msgid "Usage: /%s, clears the text window."
+msgstr "Использование: /%s, очищает текстовое окно."
+
+#: ../src/chat_control2.py:1327 ../src/chat_control.py:1341
+#: ../src/groupchat_control.py:1479
+#, python-format
+msgid "Usage: /%s, hide the chat buttons."
+msgstr "Использование: /%s, скрывает кнопки беседы."
+
+#: ../src/chat_control2.py:1330 ../src/chat_control.py:1344
+#: ../src/groupchat_control.py:1495
+#, python-format
+msgid ""
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
+msgstr ""
+"Использование: /%s <действие>, совершает действие в текущей комнате. "
+"Используйте третье лицо (например, «/%s взрывается».)"
+
+#: ../src/chat_control2.py:1334 ../src/chat_control.py:1348
+#, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr "Использование: /%s, посылает пинг контакту"
+
+#: ../src/chat_control2.py:1337 ../src/chat_control.py:1351
+#, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "Использование: /%s, посылает сообщение контакту"
+
+#: ../src/chat_control2.py:1340 ../src/chat_control.py:1354
+#: ../src/groupchat_control.py:1518
+#, python-format
+msgid "No help info for /%s"
+msgstr "Нет подсказки для /%s"
+
+#: ../src/chat_control2.py:1478 ../src/chat_control2.py:1504
+#: ../src/chat_control.py:1492 ../src/chat_control.py:1518
 msgid "Encryption enabled"
 msgstr "Шифрование включено"
 
-#: ../src/chat_control.py:1259
+#: ../src/chat_control2.py:1483 ../src/chat_control.py:1497
+msgid "Session WILL be logged"
+msgstr "Сессия БУДЕТ сохранена в истории"
+
+#: ../src/chat_control2.py:1485 ../src/chat_control.py:1499
+msgid "Session WILL NOT be logged"
+msgstr "Сессия НЕ БУДЕТ сохранена в истории"
+
+#: ../src/chat_control2.py:1492 ../src/chat_control.py:1506
+msgid "The following message was NOT encrypted"
+msgstr "Последующее сообщение НЕБЫЛО зашифровано"
+
+#: ../src/chat_control2.py:1496 ../src/chat_control2.py:1509
+#: ../src/chat_control2.py:2155 ../src/chat_control.py:1510
+#: ../src/chat_control.py:1523 ../src/chat_control.py:2169
 msgid "Encryption disabled"
 msgstr "Шифрование отключено"
 
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495
-#: ../src/dialogs.py:629 ../src/gajim.py:781 ../src/gajim.py:782
-#: ../src/gajim.py:1121 ../src/roster_window.py:328
-#: ../src/roster_window.py:404 ../src/roster_window.py:1638
-#: ../src/roster_window.py:1819 ../src/roster_window.py:2392
-#: ../src/roster_window.py:2596 ../src/roster_window.py:2607
-#: ../src/roster_window.py:3832 ../src/roster_window.py:3834
-#: ../src/common/contacts.py:73 ../src/common/helpers.py:42
-#: ../src/common/helpers.py:246
+#: ../src/chat_control2.py:1672 ../src/chat_control.py:1686
+#: ../src/conversation_textview.py:705 ../src/dialogs.py:732
+#: ../src/gajim.py:911 ../src/gajim.py:912 ../src/gajim.py:1440
+#: ../src/gajim.py:1691 ../src/roster_window.py:358
+#: ../src/roster_window.py:442 ../src/roster_window.py:1822
+#: ../src/roster_window.py:1832 ../src/roster_window.py:2072
+#: ../src/roster_window.py:2308 ../src/roster_window.py:3158
+#: ../src/roster_window.py:3397 ../src/roster_window.py:4759
+#: ../src/roster_window.py:4761 ../src/common/contacts.py:89
+#: ../src/common/helpers.py:53 ../src/common/helpers.py:267
 msgid "Not in Roster"
 msgstr "Не в ростере"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1545
+#: ../src/chat_control2.py:1825 ../src/chat_control.py:1839
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Вы получили новое сообщение от \"%s\""
 
-#: ../src/chat_control.py:1546
+#: ../src/chat_control2.py:1826 ../src/chat_control.py:1840
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -2580,29 +2892,33 @@ msgstr ""
 "Если вы закроете эту вкладку и у вас отключена функция ведения истории "
 "сообщений, то это сообщение будет утеряно."
 
-#: ../src/config.py:135 ../src/config.py:594
+#: ../src/config.py:127 ../src/config.py:565
 msgid "Disabled"
 msgstr "Отключены"
 
-#: ../src/config.py:221
-#, python-format
-msgid "Every %s _minutes"
-msgstr "Каждые %s _минут"
-
-#: ../src/config.py:363
+#: ../src/config.py:293
 msgid "Active"
 msgstr "Активен"
 
-#: ../src/config.py:371
+#: ../src/config.py:301
 msgid "Event"
 msgstr "Событие"
 
-#: ../src/config.py:685 ../src/gajim.py:2142
+#: ../src/config.py:407
+msgid "Always use OS/X default applications"
+msgstr "Всегда использовать приложения OS/X по умолчанию"
+
+#: ../src/config.py:408
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Пользовательские настройки</b>"
+
+#: ../src/config.py:638 ../src/dialogs.py:1018
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Нет словаря для языка %s"
 
-#: ../src/config.py:686 ../src/gajim.py:2143
+#: ../src/config.py:639
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -2611,71 +2927,106 @@ msgstr ""
 "Чтобы воспользоваться проверкой правописания, установите словарь для языка %"
 "s или выберите другой язык, исправив настройку speller_language."
 
-#: ../src/config.py:1038
+#: ../src/config.py:1001
 msgid "status message title"
 msgstr "заголовок сообщения сервера"
 
-#: ../src/config.py:1038
+#: ../src/config.py:1001
 msgid "status message text"
 msgstr "текст сообщения сервера"
 
-#: ../src/config.py:1073
+#: ../src/config.py:1037
 msgid "First Message Received"
 msgstr "Получено первое сообщение"
 
-#: ../src/config.py:1074
+#: ../src/config.py:1038
 msgid "Next Message Received"
 msgstr "Получено следующее сообщение"
 
-#: ../src/config.py:1075
+#: ../src/config.py:1039
 msgid "Contact Connected"
 msgstr "Контакт подключился"
 
-#: ../src/config.py:1076
+#: ../src/config.py:1040
 msgid "Contact Disconnected"
 msgstr "Контакт отключился"
 
-#: ../src/config.py:1077
+#: ../src/config.py:1041
 msgid "Message Sent"
 msgstr "Сообщение отправлено"
 
-#: ../src/config.py:1078
+#: ../src/config.py:1042
 msgid "Group Chat Message Highlight"
 msgstr "Вас упомянули в комнате"
 
-#: ../src/config.py:1079
+#: ../src/config.py:1043
 msgid "Group Chat Message Received"
 msgstr "Получено сообщение в комнате"
 
-#: ../src/config.py:1086
+#: ../src/config.py:1050
 msgid "GMail Email Received"
 msgstr "Получено письмо на Gmail"
 
-#: ../src/config.py:1289
+#. Name column
+#: ../src/config.py:1315 ../src/dialogs.py:1517 ../src/dialogs.py:1581
+#: ../src/disco.py:743 ../src/disco.py:1535 ../src/disco.py:1781
+#: ../src/history_window.py:113
+msgid "Name"
+msgstr "Имя"
+
+#: ../src/config.py:1421 ../src/common/config.py:394
+msgid "Be right back."
+msgstr "Скоро буду."
+
+#: ../src/config.py:1425
+msgid "Relogin now?"
+msgstr "Переподключиться сейчас?"
+
+#: ../src/config.py:1426
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+"Если вы хотите чтобы изменения были применены немедленно, вы должны "
+"переподключиться."
+
+#: ../src/config.py:1522 ../src/config.py:1613
 msgid "OpenPGP is not usable in this computer"
 msgstr "Невозможно использовать OpenPGP"
 
-#: ../src/config.py:1335
+#: ../src/config.py:1649 ../src/config.py:1690
+msgid "Unread events"
+msgstr "Непросмотренные события"
+
+#: ../src/config.py:1650
+msgid "Read all pending events before removing this account."
+msgstr "Просмотрите все ожидающие события перед удалением учетной записи."
+
+#: ../src/config.py:1676
+#, python-format
+msgid "You have opened chat in account %s"
+msgstr "У вас есть окна чата под учётной записью %s"
+
+#: ../src/config.py:1677
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr "Все окна чатов и комнат будут закрыты. Продолжить?"
+
+#: ../src/config.py:1686
 msgid "You are currently connected to the server"
 msgstr "Вы сейчас подсоединены к серверу"
 
-#: ../src/config.py:1336
+#: ../src/config.py:1687
 msgid "To change the account name, you must be disconnected."
 msgstr "Для смены имени учетной записи необходимо отключиться."
 
-#: ../src/config.py:1339 ../src/config.py:1931
-msgid "Unread events"
-msgstr "Непросмотренные события"
-
-#: ../src/config.py:1340
+#: ../src/config.py:1691
 msgid "To change the account name, you must read all pending events."
-msgstr "Для смены имени учетной записи необходимо просмотреть ожидающие события."
+msgstr ""
+"Для смены имени учетной записи необходимо просмотреть ожидающие события."
 
-#: ../src/config.py:1344
+#: ../src/config.py:1697
 msgid "Account Name Already Used"
 msgstr "Такое имя учетной записи уже используется"
 
-#: ../src/config.py:1345
+#: ../src/config.py:1698
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -2683,175 +3034,147 @@ msgstr ""
 "Это имя уже используется в другой вашей учетной записи. Пожалуйста, выберите "
 "другое."
 
-#: ../src/config.py:1349 ../src/config.py:1353
+#: ../src/config.py:1702 ../src/config.py:1706
 msgid "Invalid account name"
 msgstr "Неверное имя учетной записи"
 
-#: ../src/config.py:1350
+#: ../src/config.py:1703
 msgid "Account name cannot be empty."
 msgstr "Имя учетной записи не может быть пустым."
 
-#: ../src/config.py:1354
+#: ../src/config.py:1707
 msgid "Account name cannot contain spaces."
 msgstr "Имя учетной записи не может содержать пробелы."
 
-#: ../src/config.py:1362 ../src/config.py:1368 ../src/config.py:1378
-#: ../src/config.py:3036
+#: ../src/config.py:1771
+msgid "Rename Account"
+msgstr "Переименовать учетную запись"
+
+#: ../src/config.py:1772
+#, python-format
+msgid "Enter a new name for account %s"
+msgstr "Введите новое название для учетной записи %s"
+
+#: ../src/config.py:1790 ../src/config.py:1798 ../src/config.py:1838
+#: ../src/config.py:3052 ../src/dataforms_widget.py:533
 msgid "Invalid Jabber ID"
 msgstr "Неверный Jabber ID"
 
-#: ../src/config.py:1369
+#: ../src/config.py:1799
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID должен иметь формат \"имя_пользователя@сервер\"."
 
-#: ../src/config.py:1428
+#: ../src/config.py:1985 ../src/config.py:3124
 msgid "Invalid entry"
 msgstr "Неверная запись"
 
-#: ../src/config.py:1429
+#: ../src/config.py:1986 ../src/config.py:3125
 msgid "Custom port must be a port number."
 msgstr "В качестве номера порта должно выступать число"
 
-#: ../src/config.py:1555 ../src/common/config.py:363
-msgid "Be right back."
-msgstr "Скоро буду."
+#: ../src/config.py:2007
+msgid "Failed to get secret keys"
+msgstr "Не удалось получить секретный ключ"
 
-#: ../src/config.py:1565
-msgid "Relogin now?"
-msgstr "Переподключиться сейчас?"
+#: ../src/config.py:2008
+msgid "There was a problem retrieving your OpenPGP secret keys."
+msgstr "Возникла проблема с получением вашего секретного ключа OpenPGP."
 
-#: ../src/config.py:1566
-msgid "If you want all the changes to apply instantly, you must relogin."
-msgstr ""
-"Если вы хотите чтобы изменения были применены немедленно, вы должны "
-"переподключиться."
+#: ../src/config.py:2011
+msgid "OpenPGP Key Selection"
+msgstr "Выбор ключа OpenPGP"
 
-#: ../src/config.py:1592
+#: ../src/config.py:2012
+msgid "Choose your OpenPGP key"
+msgstr "Выберите свой ключ OpenPGP"
+
+#: ../src/config.py:2052
 msgid "No such account available"
 msgstr "Такая учетная запись недоступна"
 
-#: ../src/config.py:1593
+#: ../src/config.py:2053
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Перед редактированием личных данных необходимо сначала создать учетную "
 "запись."
 
-#: ../src/config.py:1600 ../src/dialogs.py:1128 ../src/dialogs.py:1297
-#: ../src/disco.py:417 ../src/profile_window.py:307
-#: ../src/profile_window.py:373
+#: ../src/config.py:2060 ../src/dialogs.py:1364 ../src/dialogs.py:1505
+#: ../src/dialogs.py:1685 ../src/disco.py:427 ../src/profile_window.py:318
 msgid "You are not connected to the server"
 msgstr "Вы не подключены к серверу"
 
-#: ../src/config.py:1601
+#: ../src/config.py:2061
 msgid "Without a connection, you can not edit your personal information."
-msgstr "Чтобы отредактировать личную информацию, нужно подсоединиться к серверу."
+msgstr ""
+"Чтобы отредактировать личную информацию, нужно подсоединиться к серверу."
 
-#: ../src/config.py:1605
+#: ../src/config.py:2065
 msgid "Your server doesn't support Vcard"
 msgstr "Сервер не поддерживает Vcard"
 
-#: ../src/config.py:1606
+#: ../src/config.py:2066
 msgid "Your server can't save your personal information."
 msgstr "Ваш сервер не может хранить личную информацию."
 
-#: ../src/config.py:1630 ../src/config.py:3423
-msgid "Failed to get secret keys"
-msgstr "Не удалось получить секретный ключ"
-
-#: ../src/config.py:1631 ../src/config.py:3424
-msgid "There was a problem retrieving your OpenPGP secret keys."
-msgstr "Возникла проблема с получением вашего секретного ключа OpenPGP."
-
-#: ../src/config.py:1634 ../src/config.py:3427
-msgid "OpenPGP Key Selection"
-msgstr "Выбор ключа OpenPGP"
-
-#: ../src/config.py:1635 ../src/config.py:3428
-msgid "Choose your OpenPGP key"
-msgstr "Выберите свой ключ OpenPGP"
-
-#. Name column
-#: ../src/config.py:1865 ../src/disco.py:741 ../src/disco.py:1467
-#: ../src/disco.py:1705 ../src/history_window.py:78
-msgid "Name"
-msgstr "Имя"
-
-#: ../src/config.py:1868
-msgid "Server"
-msgstr "Сервер"
-
-#: ../src/config.py:1932
-msgid "Read all pending events before removing this account."
-msgstr "Просмотрите все ожидающие события перед удалением учетной записи."
-
-#: ../src/config.py:1969
-#, python-format
-msgid "You have opened chat in account %s"
-msgstr "У вас есть окна чата под учётной записью %s"
-
-#: ../src/config.py:1970
-msgid "All chat and groupchat windows will be closed. Do you want to continue?"
-msgstr "Все окна чатов и комнат будут закрыты. Продолжить?"
-
-#: ../src/config.py:2029
+#: ../src/config.py:2097
 msgid "Account Local already exists."
 msgstr "Учётная запись Local уже существует."
 
-#: ../src/config.py:2030
+#: ../src/config.py:2098
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Переименуйте или удалите её, прежде чем включать локальные сообщения."
 
-#: ../src/config.py:2262
+#: ../src/config.py:2277
 #, python-format
 msgid "Edit %s"
 msgstr "Править %s"
 
-#: ../src/config.py:2264
+#: ../src/config.py:2279
 #, python-format
 msgid "Register to %s"
 msgstr "Зарегистрировать %s"
 
-#. list at the begining
-#: ../src/config.py:2336
+#. list at the beginning
+#: ../src/config.py:2315
 msgid "Ban List"
 msgstr "Черный список"
 
-#: ../src/config.py:2337
+#: ../src/config.py:2316
 msgid "Member List"
 msgstr "Список участников"
 
-#: ../src/config.py:2338
+#: ../src/config.py:2317
 msgid "Owner List"
 msgstr "Список владельцев"
 
-#: ../src/config.py:2339
+#: ../src/config.py:2318
 msgid "Administrator List"
 msgstr "Список администрираторов"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2372 ../src/disco.py:748 ../src/history_manager.py:154
+#: ../src/config.py:2367 ../src/disco.py:750 ../src/history_manager.py:160
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2380
+#: ../src/config.py:2375
 msgid "Reason"
 msgstr "Причина"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2380
 msgid "Nick"
 msgstr "Ник"
 
-#: ../src/config.py:2389
+#: ../src/config.py:2384
 msgid "Role"
 msgstr "Обязанность"
 
-#: ../src/config.py:2410
+#: ../src/config.py:2409
 msgid "Banning..."
 msgstr "Баню..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2412
+#: ../src/config.py:2411
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -2859,11 +3182,11 @@ msgstr ""
 "<b>Кого вы хотите забанить?</b>\n"
 "\n"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2413
 msgid "Adding Member..."
 msgstr "Добавляю участника..."
 
-#: ../src/config.py:2415
+#: ../src/config.py:2414
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -2871,23 +3194,23 @@ msgstr ""
 "<b>Кого вы хотите сделать участником?</b>\n"
 "\n"
 
-#: ../src/config.py:2417
+#: ../src/config.py:2416
 msgid "Adding Owner..."
 msgstr "Добавляю владельца..."
 
-#: ../src/config.py:2418
+#: ../src/config.py:2417
 msgid ""
-"<b>Whom do you want to make a owner?</b>\n"
+"<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr ""
 "<b>Кого вы хотите сделать владельцем?</b>\n"
 "\n"
 
-#: ../src/config.py:2420
+#: ../src/config.py:2419
 msgid "Adding Administrator..."
 msgstr "Добавляю администратора..."
 
-#: ../src/config.py:2421
+#: ../src/config.py:2420
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -2895,7 +3218,7 @@ msgstr ""
 "<b>Кого вы хотите сделать администратором?</b>\n"
 "\n"
 
-#: ../src/config.py:2422
+#: ../src/config.py:2421
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -2911,121 +3234,137 @@ msgstr ""
 "4. domain (сам домен, т.е. как любое сочетание user@domain,\n"
 "domain/resource, так и адрес, содержащий этот поддомен)"
 
-#: ../src/config.py:2527
+#: ../src/config.py:2525
 #, python-format
 msgid "Removing %s account"
 msgstr "Удаление учетной записи %s"
 
-#: ../src/config.py:2544 ../src/roster_window.py:2665
+#: ../src/config.py:2540 ../src/gajim.py:1344 ../src/roster_window.py:3455
 msgid "Password Required"
 msgstr "Требуется пароль"
 
-#: ../src/config.py:2545 ../src/roster_window.py:2666
+#: ../src/config.py:2541 ../src/roster_window.py:3451
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введите пароль для учетной записи %s"
 
-#: ../src/config.py:2546 ../src/roster_window.py:2667
+#: ../src/config.py:2542 ../src/roster_window.py:3456
 msgid "Save password"
 msgstr "Сохранить пароль"
 
-#: ../src/config.py:2560
+#: ../src/config.py:2555
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Учетная запись \"%s\" подключена к серверу"
 
-#: ../src/config.py:2561
+#: ../src/config.py:2556
 msgid "If you remove it, the connection will be lost."
 msgstr "Если вы удалите его, произойдет отключение."
 
-#: ../src/config.py:2645
+#: ../src/config.py:2649
 msgid "Default"
 msgstr "По умолчанию"
 
-#: ../src/config.py:2645
+#: ../src/config.py:2649
 msgid "?print_status:All"
 msgstr "Все"
 
-#: ../src/config.py:2646
+#: ../src/config.py:2650
 msgid "Enter and leave only"
 msgstr "Только приход и уход"
 
-#: ../src/config.py:2716
+#: ../src/config.py:2651
+msgid "?print_status:None"
+msgstr ""
+
+#: ../src/config.py:2720
 msgid "New Group Chat"
 msgstr "Новая комната"
 
-#: ../src/config.py:2748
+#: ../src/config.py:2753
 msgid "This bookmark has invalid data"
 msgstr "Эта закладка содержит неверные данные"
 
-#: ../src/config.py:2749
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
+#: ../src/config.py:2754
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Пожалуйста, удостоверьтесь, что заполнены поля с именем сервера и комнаты, "
 "либо удалите эту закладку."
 
-#: ../src/config.py:3011
+#: ../src/config.py:3035
 msgid "Invalid username"
 msgstr "Неверное имя пользователя"
 
-#: ../src/config.py:3012
+#: ../src/config.py:3037
 msgid "You must provide a username to configure this account."
 msgstr "Для настройки учетной записи необходимо ввести имя пользователя."
 
-#: ../src/config.py:3022 ../src/dialogs.py:1316
-msgid "Invalid password"
-msgstr "Неверный пароль"
-
-#: ../src/config.py:3023
-msgid "You must enter a password for the new account."
-msgstr "Необходимо ввести пароль для новой учетной записи."
-
-#: ../src/config.py:3027 ../src/dialogs.py:1321
-msgid "Passwords do not match"
-msgstr "Пароли не совпадают"
-
-#: ../src/config.py:3028 ../src/dialogs.py:1322
-msgid "The passwords typed in both fields must be identical."
-msgstr "Пароли, введенные в оба поля, должны быть одинаковы."
-
-#: ../src/config.py:3047
+#: ../src/config.py:3063
 msgid "Duplicate Jabber ID"
 msgstr "Дублирующийся Jabber ID"
 
-#: ../src/config.py:3048
+#: ../src/config.py:3064
 msgid "This account is already configured in Gajim."
 msgstr "Этот контакт уже настроен в Gajim."
 
-#: ../src/config.py:3065
+#: ../src/config.py:3081
 msgid "Account has been added successfully"
 msgstr "Учетная запись успешно добавлена"
 
-#: ../src/config.py:3066 ../src/config.py:3101
+#: ../src/config.py:3082 ../src/config.py:3255
 msgid ""
-"You can set advanced account options by pressing Advanced button, or later "
-"by clicking in Accounts menuitem under Edit menu from the main window."
+"You can set advanced account options by pressing the Advanced button, or "
+"later by choosing the Accounts menuitem under the Edit menu from the main "
+"window."
 msgstr ""
 "Учетная запись была успешно добавлена. \n"
-"Вы можете настроить ее используя \n"
-"\"Настройка->Учетные записи\" из главного окна."
+" Вы можете дополнительно ее настроить используя \n"
+"\"Настройка - >Учетные записи\" из главного окна."
 
 #: ../src/config.py:3100
-msgid "Your new account has been created successfully"
-msgstr "Ваша новая учетная запись успешно создана"
+msgid "Invalid server"
+msgstr "Неверный сервер"
+
+#: ../src/config.py:3101
+msgid "Please provide a server on which you want to register."
+msgstr "Пожалуйста, укажите сервер на котором Вы хотите зарегистрироваться."
+
+#: ../src/config.py:3211
+#, python-format
+msgid ""
+"<b>Security Warning</b>\n"
+"\n"
+"The authenticity of the %s SSL certificate could be invalid.\n"
+"SSL Error: %s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/config.py:3216 ../src/gajim.py:2181
+#, python-format
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+"%s"
+msgstr ""
 
-#: ../src/config.py:3118
-msgid "An error occured during account creation"
+#: ../src/config.py:3234 ../src/config.py:3273
+msgid "An error occurred during account creation"
 msgstr "Произошла ошибка при создании учетной записи"
 
-#: ../src/config.py:3176
+#: ../src/config.py:3254
+msgid "Your new account has been created successfully"
+msgstr "Ваша новая учетная запись успешно создана"
+
+#: ../src/config.py:3357
 msgid "Account name is in use"
 msgstr "Такое имя учетной записи уже используется"
 
-#: ../src/config.py:3177
+#: ../src/config.py:3358
 msgid "You already have an account using this name."
 msgstr "У вас уже есть учетная запись с таким именем."
 
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:454
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -3033,518 +3372,604 @@ msgstr ""
 "Текст под этой линией был сказан после того, как вы последний раз "
 "заглядывали в эту комнату"
 
-#: ../src/conversation_textview.py:342
+#: ../src/conversation_textview.py:552
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Действия для \"%s\""
 
-#: ../src/conversation_textview.py:354
+#: ../src/conversation_textview.py:564
 msgid "Read _Wikipedia Article"
 msgstr "Смотреть статью в _Wikipedia"
 
-#: ../src/conversation_textview.py:359
+#: ../src/conversation_textview.py:569
 msgid "Look it up in _Dictionary"
 msgstr "Искать в _словаре"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:375
+#: ../src/conversation_textview.py:585
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL словаря пропущен в \"%s\" и это не WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:388
+#: ../src/conversation_textview.py:598
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL Web-поиска отсутствует в \"%s\""
 
-#: ../src/conversation_textview.py:391
+#: ../src/conversation_textview.py:601
 msgid "Web _Search for it"
 msgstr "_Поиск по Web"
 
-#: ../src/conversation_textview.py:397
+#: ../src/conversation_textview.py:607
 msgid "Open as _Link"
 msgstr "Открыть как ссылку"
 
-#: ../src/conversation_textview.py:757
+#: ../src/conversation_textview.py:1073
 msgid "Yesterday"
 msgstr "Вчера"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:1077
 #, python-format
 msgid "%i days ago"
 msgstr "%i дней назад"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:793
+#: ../src/conversation_textview.py:1111
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#: ../src/dialogs.py:59
+#: ../src/dataforms_widget.py:537
+msgid "Jabber ID already in list"
+msgstr "Jabber ID уже в списке"
+
+#: ../src/dataforms_widget.py:538
+msgid "The Jabber ID you entered is already in the list. Choose another one."
+msgstr "Jabber ID который вы ввели существует.Пожалуйста выберите другой."
+
+#. Default jid
+#: ../src/dataforms_widget.py:549
+msgid "new@jabber.id"
+msgstr ""
+
+#: ../src/dataforms_widget.py:552 ../src/dataforms_widget.py:554
+#, python-format
+msgid "new%d@jabber.id"
+msgstr ""
+
+#: ../src/dialogs.py:71
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Имя контакта: <i>%s</i>"
 
-#: ../src/dialogs.py:61
+#: ../src/dialogs.py:73
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:211
+#: ../src/dialogs.py:223
 msgid "Group"
 msgstr "Группа"
 
-#: ../src/dialogs.py:218
+#: ../src/dialogs.py:230
 msgid "In the group"
 msgstr "В группе"
 
-#: ../src/dialogs.py:269
+#: ../src/dialogs.py:330
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:335
 msgid "Contact name"
 msgstr "Имя контакта"
 
-#: ../src/dialogs.py:318
+#: ../src/dialogs.py:381
 #, python-format
 msgid "%s Status Message"
 msgstr "Сообщение о статусе %s"
 
-#: ../src/dialogs.py:320
+#: ../src/dialogs.py:383
 msgid "Status Message"
 msgstr "Сообщение о статусе"
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:483
 msgid "Save as Preset Status Message"
 msgstr "Сохранить установленное сообщение о статусе"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:484
 msgid "Please type a name for this status message"
 msgstr "Введите имя для этого сообщения о статусе"
 
-#: ../src/dialogs.py:417
+#: ../src/dialogs.py:495
+msgid "Overwrite Status Message?"
+msgstr "Изменить сообщение о статусе?"
+
+#: ../src/dialogs.py:496
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr "Это имя уже используется. Перезаписать это статусное сообщение?"
+
+#: ../src/dialogs.py:512
 msgid "AIM Address:"
 msgstr "Адрес AIM:"
 
-#: ../src/dialogs.py:418
+#: ../src/dialogs.py:513
 msgid "GG Number:"
 msgstr "Номер GaduGadu"
 
-#: ../src/dialogs.py:419
+#: ../src/dialogs.py:514
 msgid "ICQ Number:"
 msgstr "Номер ICQ:"
 
-#: ../src/dialogs.py:420
+#: ../src/dialogs.py:515
 msgid "MSN Address:"
 msgstr "Адрес в MSN:"
 
-#: ../src/dialogs.py:421
+#: ../src/dialogs.py:516
 msgid "Yahoo! Address:"
 msgstr "Адрес Yahoo:"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:553
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Пожалуйста, заполните данные о контакте,\n"
 "который хотите добавить в ростер учетной записи %s"
 
-#: ../src/dialogs.py:459
+#: ../src/dialogs.py:555
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Пожалуйста, заполните данные о контакте, который вы хотите добавить"
 
-#: ../src/dialogs.py:609 ../src/dialogs.py:615
+#: ../src/dialogs.py:712 ../src/dialogs.py:718
 msgid "Invalid User ID"
 msgstr "Неверный ID пользователя"
 
-#: ../src/dialogs.py:616
+#: ../src/dialogs.py:719
 msgid "The user ID must not contain a resource."
 msgstr "ID пользователя не должен содержать ресурс."
 
-#: ../src/dialogs.py:630
+#: ../src/dialogs.py:733
 msgid "Contact already in roster"
 msgstr "Контакт уже в ростере"
 
-#: ../src/dialogs.py:631
+#: ../src/dialogs.py:734
 msgid "This contact is already listed in your roster."
 msgstr "Этот контакт уже содержится в вашем ростере."
 
-#: ../src/dialogs.py:665
+#: ../src/dialogs.py:770
 msgid "User ID:"
 msgstr "ID пользователя:"
 
-#: ../src/dialogs.py:728
+#: ../src/dialogs.py:832
 msgid "A GTK+ jabber client"
 msgstr "Jabber-клиент на GTK+"
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:833
 msgid "GTK+ Version:"
 msgstr "Версия GTK+:"
 
-#: ../src/dialogs.py:730
+#: ../src/dialogs.py:834
 msgid "PyGTK Version:"
 msgstr "Версия PyGTK:"
 
-#: ../src/dialogs.py:744
+#: ../src/dialogs.py:848
 msgid "Current Developers:"
 msgstr "Разработчики:"
 
-#: ../src/dialogs.py:746
+#: ../src/dialogs.py:850
 msgid "Past Developers:"
 msgstr "Разработчики прошлых версий:"
 
-#: ../src/dialogs.py:756
+#: ../src/dialogs.py:860
 msgid "THANKS:"
 msgstr "БЛАГОДАРНОСТИ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:762
+#: ../src/dialogs.py:866
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "И наконец, мы хотели бы поблагодарить всех мейнтейнеров пакетов."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:776
+#: ../src/dialogs.py:879
 msgid "translator-credits"
 msgstr ""
 "Яков Безруков <nebulam51@gmail.com>\n"
-"Александр Мыльцев <avm@altlinux.org>"
+"Александр Мыльцев <avm@altlinux.org>\n"
+"Олег Стадник <mail@lokee.rv.ua>\n"
+"Денис Фомин <fominde@mail.ru>"
 
-#: ../src/dialogs.py:906
+#: ../src/dialogs.py:1011
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Не могу привязаться к порту %s."
 
-#: ../src/dialogs.py:907
+#: ../src/dialogs.py:1012
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
-"canceled."
-msgstr "Возможно, запущен ещё один экземпляр Gajim. Передача файлов будет отменена."
+"cancelled."
+msgstr ""
+"Возможно, запущен ещё один экземпляр Gajim. Передача файлов будет отменена."
 
-#: ../src/dialogs.py:1058
+#: ../src/dialogs.py:1019
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option.\n"
+"\n"
+"Highlighting misspelled words feature will not be used"
+msgstr ""
+"Чтобы воспользоваться проверкой правописания, установите словарь для языка %"
+"s или выберите другой язык, исправив настройку speller_language."
+
+#: ../src/dialogs.py:1293
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Запрос на подписку для учетной записи %s от %s"
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1296
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запрос на подписку от %s"
 
-#: ../src/dialogs.py:1121 ../src/roster_window.py:681
+#: ../src/dialogs.py:1357 ../src/roster_window.py:776
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Вы уже в комнате %s"
 
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1365
 msgid "You can not join a group chat unless you are connected."
 msgstr "Вы не можете зайти в комнату без подключения."
 
-#: ../src/dialogs.py:1144
+#: ../src/dialogs.py:1383
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Войти в комнату с учетной записи %s"
 
-#: ../src/dialogs.py:1212 ../src/dialogs.py:1218
+#: ../src/dialogs.py:1453 ../src/dialogs.py:1459
+#: ../src/groupchat_control.py:1698
 msgid "Invalid group chat Jabber ID"
 msgstr "Неверное имя комнаты"
 
-#: ../src/dialogs.py:1213 ../src/dialogs.py:1219
+#: ../src/dialogs.py:1454 ../src/dialogs.py:1460
+#: ../src/groupchat_control.py:1699
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
 
-#: ../src/dialogs.py:1225
+#: ../src/dialogs.py:1466
 msgid "This is not a group chat"
 msgstr "Это не комната"
 
-#: ../src/dialogs.py:1226
+#: ../src/dialogs.py:1467
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не является именем комнаты."
 
-#: ../src/dialogs.py:1248
+#: ../src/dialogs.py:1506
+msgid "Without a connection, you can not synchronise your contacts."
+msgstr "Чтобы объединить контакты, необходимо подсоединиться к серверу."
+
+#: ../src/dialogs.py:1520
+msgid "Server"
+msgstr "Сервер"
+
+#: ../src/dialogs.py:1553
+msgid "This account is not connected to the server"
+msgstr "Аккаунт не подключен к серверу"
+
+#: ../src/dialogs.py:1554
+#, fuzzy
+msgid "You cannot synchronize with an account unless it is connected."
+msgstr "Вы не можете зайти в комнату без подключения."
+
+#: ../src/dialogs.py:1578
+msgid "Synchronise"
+msgstr ""
+
+#: ../src/dialogs.py:1636
 #, python-format
 msgid "Start Chat with account %s"
-msgstr "Начать беседу с учетной записью %s"
+msgstr "Начать чат с учетной записью %s"
 
-#: ../src/dialogs.py:1250
+#: ../src/dialogs.py:1638
 msgid "Start Chat"
-msgstr "Начать беседу"
+msgstr "Начать чат"
 
-#: ../src/dialogs.py:1251
+#: ../src/dialogs.py:1639
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
-msgstr "Введите ник или ID пользователя, которому вы хотите отправить сообщение:"
+msgstr ""
+"Введите ник или ID пользователя, которому вы хотите отправить сообщение:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764
+#: ../src/dialogs.py:1664 ../src/dialogs.py:2040 ../src/dialogs.py:2181
 msgid "Connection not available"
 msgstr "Соединение невозможно"
 
-#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765
+#: ../src/dialogs.py:1665 ../src/dialogs.py:2041 ../src/dialogs.py:2182
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Пожалуйста, удостоверьтесь, что вы подключены к \"%s\"."
 
-#: ../src/dialogs.py:1286 ../src/dialogs.py:1289
+#: ../src/dialogs.py:1674 ../src/dialogs.py:1677
 msgid "Invalid JID"
 msgstr "Неверный JID"
 
-#: ../src/dialogs.py:1289
+#: ../src/dialogs.py:1677
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Не понимаю адреса \"%s\"."
 
-#: ../src/dialogs.py:1298
+#: ../src/dialogs.py:1686
 msgid "Without a connection, you can not change your password."
 msgstr "Чтобы изменить пароль, необходимо подсоединиться к серверу."
 
-#: ../src/dialogs.py:1317
+#: ../src/dialogs.py:1704
+msgid "Invalid password"
+msgstr "Неверный пароль"
+
+#: ../src/dialogs.py:1705
 msgid "You must enter a password."
 msgstr "Вы должны ввести пароль."
 
+#: ../src/dialogs.py:1709
+msgid "Passwords do not match"
+msgstr "Пароли не совпадают"
+
+#: ../src/dialogs.py:1710
+msgid "The passwords typed in both fields must be identical."
+msgstr "Пароли, введенные в оба поля, должны быть одинаковы."
+
 #. img to display
 #. default value
-#: ../src/dialogs.py:1364 ../src/notify.py:211 ../src/notify.py:411
+#: ../src/dialogs.py:1752 ../src/notify.py:232 ../src/notify.py:447
 msgid "Contact Signed In"
-msgstr "Контакт в сети"
+msgstr "Контакт подключился"
 
-#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413
+#: ../src/dialogs.py:1754 ../src/notify.py:240 ../src/notify.py:449
 msgid "Contact Signed Out"
 msgstr "Контакт отключился"
 
 #. chat message
-#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415
+#: ../src/dialogs.py:1756 ../src/notify.py:263 ../src/notify.py:451
 msgid "New Message"
 msgstr "Новое сообщение"
 
 #. single message
-#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415
+#: ../src/dialogs.py:1756 ../src/notify.py:244 ../src/notify.py:451
 msgid "New Single Message"
 msgstr "Новое одиночное сообщение"
 
 #. private message
-#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416
+#: ../src/dialogs.py:1757 ../src/notify.py:251 ../src/notify.py:452
 msgid "New Private Message"
 msgstr "Новое личное сообщение"
 
-#: ../src/dialogs.py:1369 ../src/gajim.py:1216 ../src/notify.py:424
+#: ../src/dialogs.py:1757 ../src/gajim.py:1536 ../src/notify.py:460
 msgid "New E-mail"
 msgstr "Новое письмо"
 
-#: ../src/dialogs.py:1371 ../src/gajim.py:1369 ../src/notify.py:418
+#: ../src/dialogs.py:1759 ../src/gajim.py:1711 ../src/notify.py:454
 msgid "File Transfer Request"
 msgstr "Запрос передачи"
 
-#: ../src/dialogs.py:1373 ../src/gajim.py:1188 ../src/gajim.py:1345
-#: ../src/notify.py:420
+#: ../src/dialogs.py:1761 ../src/gajim.py:1508 ../src/gajim.py:1678
+#: ../src/notify.py:456
 msgid "File Transfer Error"
 msgstr "Ошибка передачи"
 
-#: ../src/dialogs.py:1375 ../src/gajim.py:1408 ../src/gajim.py:1430
-#: ../src/gajim.py:1447 ../src/notify.py:422
+#: ../src/dialogs.py:1763 ../src/gajim.py:1750 ../src/gajim.py:1772
+#: ../src/gajim.py:1789 ../src/notify.py:458
 msgid "File Transfer Completed"
 msgstr "Передача файла завершена"
 
-#: ../src/dialogs.py:1376 ../src/gajim.py:1411 ../src/notify.py:422
+#: ../src/dialogs.py:1764 ../src/gajim.py:1753 ../src/notify.py:458
 msgid "File Transfer Stopped"
 msgstr "Передача остановлена"
 
-#: ../src/dialogs.py:1378 ../src/gajim.py:1086 ../src/notify.py:426
+#: ../src/dialogs.py:1766 ../src/gajim.py:1365 ../src/notify.py:462
 msgid "Groupchat Invitation"
 msgstr "Приглашение в комнату"
 
-#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428
+#: ../src/dialogs.py:1768 ../src/notify.py:224 ../src/notify.py:464
 msgid "Contact Changed Status"
-msgstr "Контакт изменил статус"
+msgstr "Контакт изменит статус"
 
-#: ../src/dialogs.py:1565
+#: ../src/dialogs.py:1959
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Новое сообщение с учетной записи %s"
 
-#: ../src/dialogs.py:1567
+#: ../src/dialogs.py:1961
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Новое сообщение для учетной записи %s"
 
-#: ../src/dialogs.py:1569
+#: ../src/dialogs.py:1963
 msgid "Single Message"
 msgstr "Сообщение"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1572
+#: ../src/dialogs.py:1966
 #, python-format
 msgid "Send %s"
 msgstr "Отправить %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:1989
 #, python-format
 msgid "Received %s"
 msgstr "Получено %s"
 
+#. prepare UI for Receiving
+#: ../src/dialogs.py:2012
+#, python-format
+msgid "Form %s"
+msgstr "От %s"
+
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1667
+#: ../src/dialogs.py:2082
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1668
+#: ../src/dialogs.py:2083
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написал:\n"
 
-#: ../src/dialogs.py:1712
+#: ../src/dialogs.py:2127
 #, python-format
 msgid "XML Console for %s"
 msgstr "Консоль XML для %s"
 
-#: ../src/dialogs.py:1714
+#: ../src/dialogs.py:2129
 msgid "XML Console"
 msgstr "Консоль XML"
 
-#: ../src/dialogs.py:1835
+#: ../src/dialogs.py:2252
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Список доступа <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:1839
+#: ../src/dialogs.py:2256
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Список доступа для %s"
 
-#: ../src/dialogs.py:1887
+#: ../src/dialogs.py:2312
 #, python-format
 msgid "Order: %s, action: %s, type: %s, value: %s"
 msgstr "Номер: %s, действие: %s, тип: %s, значение: %s"
 
-#: ../src/dialogs.py:1890
+#: ../src/dialogs.py:2315
 #, python-format
 msgid "Order: %s, action: %s"
 msgstr "Номер: %s, действие: %s"
 
-#: ../src/dialogs.py:1932
+#: ../src/dialogs.py:2357
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Изменить правило</b>"
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2444
 msgid "<b>Add a rule</b>"
 msgstr "<b>Добавить правило</b>"
 
-#: ../src/dialogs.py:2115
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Списки доступа для %s"
 
-#: ../src/dialogs.py:2117
+#: ../src/dialogs.py:2542
 msgid "Privacy Lists"
 msgstr "Списки доступа"
 
-#: ../src/dialogs.py:2185
+#: ../src/dialogs.py:2612
 msgid "Invalid List Name"
 msgstr "Недопустимое имя списка"
 
-#: ../src/dialogs.py:2186
+#: ../src/dialogs.py:2613
 msgid "You must enter a name to create a privacy list."
 msgstr "Необходимо ввести имя для новой учетной записи."
 
-#. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:2220
-#, python-format
-msgid "%(contact_jid)s has invited you to group chat %(room_jid)s"
+#: ../src/dialogs.py:2650
+msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s приглашает вас в комнату %(room_jid)s."
 
-#. only if not None and not ''
-#: ../src/dialogs.py:2226
+#: ../src/dialogs.py:2652
+#, python-format
+msgid "$Contact has invited you to group chat %(room_jid)s"
+msgstr "$Contact приглашает вас в комнату %(room_jid)s."
+
+#: ../src/dialogs.py:2665
 #, python-format
 msgid "Comment: %s"
 msgstr "Комментарий: %s"
 
-#: ../src/dialogs.py:2288
+#: ../src/dialogs.py:2731
 msgid "Choose Sound"
 msgstr "Выберите звуковой файл"
 
-#: ../src/dialogs.py:2298 ../src/dialogs.py:2343
+#: ../src/dialogs.py:2741 ../src/dialogs.py:2792
 msgid "All files"
 msgstr "Все файлы"
 
-#: ../src/dialogs.py:2303
+#: ../src/dialogs.py:2746
 msgid "Wav Sounds"
 msgstr "В формате Wav"
 
-#: ../src/dialogs.py:2333
+#: ../src/dialogs.py:2779
 msgid "Choose Image"
 msgstr "Выбрать картинку"
 
-#: ../src/dialogs.py:2348
+#: ../src/dialogs.py:2797
 msgid "Images"
 msgstr "Картинки"
 
-#: ../src/dialogs.py:2405
+#: ../src/dialogs.py:2862
 #, python-format
 msgid "When %s becomes:"
 msgstr "Когда %s происходит:"
 
-#: ../src/dialogs.py:2407
+#: ../src/dialogs.py:2864
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Добавление специального уведомления для %s"
 
 #. # means number
-#: ../src/dialogs.py:2478
+#: ../src/dialogs.py:2935
 msgid "#"
 msgstr "№"
 
-#: ../src/dialogs.py:2484
+#: ../src/dialogs.py:2941
 msgid "Condition"
 msgstr "Условие"
 
-#: ../src/dialogs.py:2605
+#: ../src/dialogs.py:3059
 msgid "when I am "
 msgstr "когда я "
 
-#: ../src/disco.py:101
+#: ../src/disco.py:111
 msgid "Others"
 msgstr "Другие"
 
-#: ../src/disco.py:102 ../src/disco.py:103 ../src/disco.py:1253
-#: ../src/gajim.py:539 ../src/roster_window.py:267 ../src/roster_window.py:325
-#: ../src/roster_window.py:364 ../src/roster_window.py:445
-#: ../src/roster_window.py:477 ../src/roster_window.py:479
-#: ../src/roster_window.py:3828 ../src/roster_window.py:3830
-#: ../src/common/helpers.py:42
+#: ../src/disco.py:112 ../src/disco.py:113 ../src/disco.py:1321
+#: ../src/gajim.py:660 ../src/roster_window.py:295 ../src/roster_window.py:355
+#: ../src/roster_window.py:395 ../src/roster_window.py:503
+#: ../src/roster_window.py:535 ../src/roster_window.py:537
+#: ../src/roster_window.py:4755 ../src/roster_window.py:4757
+#: ../src/common/contacts.py:295 ../src/common/contacts.py:310
+#: ../src/common/helpers.py:53
 msgid "Transports"
 msgstr "Транспорты"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:105
+#: ../src/disco.py:115
 msgid "Conference"
 msgstr "Комнаты"
 
-#: ../src/disco.py:418
+#: ../src/disco.py:428
 msgid "Without a connection, you can not browse available services"
 msgstr "Для просмотра сервисов необходимо сначала подсоединиться к серверу"
 
-#: ../src/disco.py:497
+#: ../src/disco.py:502
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Обзор сервисов с учётной записи %s"
 
-#: ../src/disco.py:499
+#: ../src/disco.py:504
 msgid "Service Discovery"
 msgstr "Обзор сервисов (discovery)"
 
-#: ../src/disco.py:642
+#: ../src/disco.py:644
 msgid "The service could not be found"
 msgstr "Сервис не обнаружен"
 
-#: ../src/disco.py:643
+#: ../src/disco.py:645
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -3552,205 +3977,462 @@ msgstr ""
 "По этому адресу сервисы отсутствуют или не отвечают. Проверьте адрес и "
 "попробуйте еще раз."
 
-#: ../src/disco.py:647 ../src/disco.py:928
+#: ../src/disco.py:649 ../src/disco.py:930
 msgid "The service is not browsable"
 msgstr "Сервис недоступен для просмотра"
 
-#: ../src/disco.py:648
+#: ../src/disco.py:650
 msgid "This type of service does not contain any items to browse."
 msgstr "Этот сервис не содержит ничего, что можно было бы просмотреть."
 
-#: ../src/disco.py:728
+#: ../src/disco.py:730
 #, python-format
 msgid "Browsing %s using account %s"
 msgstr "Просмотр %s с учетной записью %s"
 
-#: ../src/disco.py:767
+#: ../src/disco.py:769
 msgid "_Browse"
 msgstr "_Браузер"
 
-#: ../src/disco.py:929
+#: ../src/disco.py:931
 msgid "This service does not contain any items to browse."
 msgstr "Этот сервис не содержит ничего, что можно было бы просмотреть."
 
-#: ../src/disco.py:1143 ../src/disco.py:1258
+#: ../src/disco.py:1152
+msgid "_Execute Command"
+msgstr "В_ыполнить команду..."
+
+#: ../src/disco.py:1162 ../src/disco.py:1326
 msgid "Re_gister"
 msgstr "За_регистрироваться"
 
-#: ../src/disco.py:1295
+#: ../src/disco.py:1363
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Сканирую %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1476
+#: ../src/disco.py:1545
 msgid "Users"
 msgstr "Пользователи"
 
 #. Description column
-#: ../src/disco.py:1483
+#: ../src/disco.py:1553
 msgid "Description"
 msgstr "Описание"
 
 #. Id column
-#: ../src/disco.py:1490
+#: ../src/disco.py:1561
 msgid "Id"
 msgstr "ID"
 
-#: ../src/disco.py:1713
+#: ../src/disco.py:1790
 msgid "Subscribed"
 msgstr "Подписка"
 
-#: ../src/disco.py:1739
+#: ../src/disco.py:1798
+msgid "Node"
+msgstr ""
+
+#: ../src/disco.py:1855
 msgid "New post"
 msgstr "Новое сообщение"
 
-#: ../src/disco.py:1745
+#: ../src/disco.py:1861
 msgid "_Subscribe"
 msgstr "_Подписаться"
 
-#: ../src/disco.py:1751
+#: ../src/disco.py:1867
 msgid "_Unsubscribe"
 msgstr "_Отписаться"
 
-#: ../src/filetransfers_window.py:72
+#: ../src/features_window.py:47
+msgid "PyOpenSSL"
+msgstr "PyOpenSSL"
+
+#: ../src/features_window.py:48
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+"Библиотека используется для подтверждения действительности сертификатов "
+"сервера для того, чтобы удостовериться в защищенности соединения."
+
+#: ../src/features_window.py:49 ../src/features_window.py:50
+msgid "Requires python-pyopenssl."
+msgstr "Требует python-pyopenssl."
+
+#: ../src/features_window.py:51
+msgid "Bonjour / Zeroconf"
+msgstr "Bonjour / Zeroconf"
+
+#: ../src/features_window.py:52
+msgid "Serverless chatting with autodetected clients in a local network."
+msgstr "Чат в локальной сети."
+
+#: ../src/features_window.py:53
+msgid "Requires python-avahi."
+msgstr "Требует python-avahi."
+
+#: ../src/features_window.py:54
+msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+msgstr "Требует pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+
+#: ../src/features_window.py:55
+msgid "gajim-remote"
+msgstr "gajim-remote"
+
+#: ../src/features_window.py:56
+msgid "A script to controle gajim via commandline."
+msgstr "Скрипт для управления Gajim'ом через коммандную строку."
+
+#: ../src/features_window.py:57
+msgid "Requires python-dbus."
+msgstr "Требует python-dbus."
+
+#: ../src/features_window.py:58 ../src/features_window.py:62
+#: ../src/features_window.py:66 ../src/features_window.py:70
+#: ../src/features_window.py:74 ../src/features_window.py:82
+#: ../src/features_window.py:86 ../src/features_window.py:98
+msgid "Feature not available under Windows."
+msgstr "Эта возможность отсутствует в Windows."
+
+#: ../src/features_window.py:59
+msgid "OpenGPG"
+msgstr "OpenGPG"
+
+#: ../src/features_window.py:60
+msgid "Encrypting chatmessages with gpg keys."
+msgstr "Шифрование сообщений при помощи gpg ключей."
+
+#: ../src/features_window.py:61
+msgid "Requires gpg and python-GnuPGInterface."
+msgstr "Требует gpg и python-GnuPGInterface."
+
+#: ../src/features_window.py:63
+msgid "network-manager"
+msgstr "network-manager"
+
+#: ../src/features_window.py:64
+msgid "Autodetection of network status."
+msgstr "Автоопределение состояния соединения с сетью."
+
+#: ../src/features_window.py:65
+msgid "Requires gnome-network-manager and python-dbus."
+msgstr "Требует gnome-network-manager и python-dbus."
+
+#: ../src/features_window.py:67
+msgid "Session Management"
+msgstr "Управление сеансом"
+
+#: ../src/features_window.py:68
+msgid "Gajim session is stored on logout and restored on login."
+msgstr ""
+"Сеанс Gajim сохраняется при выходе (logout) и восстанавливается при входе "
+"(login)."
+
+#: ../src/features_window.py:69
+msgid "Requires python-gnome2."
+msgstr "Требует python-gnome2."
+
+#: ../src/features_window.py:71
+msgid "gnome-keyring"
+msgstr "gnome-keyring"
+
+#: ../src/features_window.py:72
+msgid "Passwords can be stored securely and not just in plaintext."
+msgstr "Пароли могут храниться безопастно, а не просто открытым текстом."
+
+#: ../src/features_window.py:73
+msgid "Requires gnome-keyring and python-gnome2-desktop."
+msgstr "Требует gnome-keyring и python-gnome2-desktop."
+
+#: ../src/features_window.py:75
+msgid "SRV"
+msgstr "SRV"
+
+#: ../src/features_window.py:76
+msgid "Ability to connect to servers which are using SRV records."
+msgstr ""
+
+#: ../src/features_window.py:77
+msgid "Requires dnsutils."
+msgstr "Требует dnsutils."
+
+#: ../src/features_window.py:78
+msgid "Requires nslookup to use SRV records."
+msgstr ""
+
+#: ../src/features_window.py:79
+msgid "Spell Checker"
+msgstr "Проверка орфографии"
+
+#: ../src/features_window.py:80
+msgid "Spellchecking of composed messages."
+msgstr "Проверка орфографии набираемых сообщений"
+
+#: ../src/features_window.py:81
+msgid ""
+"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
+"sources."
+msgstr ""
+"Требует python-gnome2-extras или скомпилированного модуля gtkspell из "
+"исходных кодов Gajim."
+
+#: ../src/features_window.py:83
+msgid "Notification-daemon"
+msgstr ""
+
+#: ../src/features_window.py:84
+msgid "Passive popups notifying for new events."
+msgstr "Пассивные всплывающие окна для уведомления о новых событиях."
+
+#: ../src/features_window.py:85
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr ""
+
+#: ../src/features_window.py:87
+msgid "Trayicon"
+msgstr "Иконка в системном трее"
+
+#: ../src/features_window.py:88
+msgid "A icon in systemtray reflecting the current presence."
+msgstr "Иконка в системном лотке отображающая текущий статус."
+
+#: ../src/features_window.py:89
+msgid ""
+"Requires python-gnome2-extras or compiled  trayicon module from Gajim "
+"sources."
+msgstr ""
+"Требует python-gnome2-extras или скомпилированного модуля  trayicon из "
+"исходных кодов Gajim."
+
+#: ../src/features_window.py:90
+msgid "Requires PyGTK >= 2.10."
+msgstr "Требует PyGTK >= 2.10."
+
+#: ../src/features_window.py:91
+msgid "Idle"
+msgstr "Время бездействия"
+
+#: ../src/features_window.py:92
+msgid "Ability to measure idle time, in order to set auto status."
+msgstr ""
+
+#: ../src/features_window.py:93 ../src/features_window.py:94
+msgid "Requires compilation of the idle module from Gajim sources."
+msgstr ""
+
+#: ../src/features_window.py:95
+msgid "LaTeX"
+msgstr "LaTeX"
+
+#: ../src/features_window.py:96
+msgid "Transform LaTeX espressions between $$ $$."
+msgstr ""
+
+#: ../src/features_window.py:97
+msgid ""
+"Requires texlive-latex-base, dvips and imagemagick. You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
+msgstr ""
+
+#: ../src/features_window.py:99
+#, fuzzy
+msgid "End to end encryption"
+msgstr "Шифрование OpenPGP"
+
+#: ../src/features_window.py:100
+#, fuzzy
+msgid "Encrypting chatmessages."
+msgstr "_Входящее сообщение:"
+
+#: ../src/features_window.py:101 ../src/features_window.py:102
+msgid "Requires python-crypto."
+msgstr ""
+
+#: ../src/features_window.py:103
+#, fuzzy
+msgid "RST Generator"
+msgstr "Общие"
+
+#: ../src/features_window.py:104
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+
+#: ../src/features_window.py:105 ../src/features_window.py:106
+msgid "Requires python-docutils."
+msgstr "Требует python-docutils."
+
+#: ../src/features_window.py:107
+msgid "libsexy"
+msgstr "libsexy"
+
+#: ../src/features_window.py:108
+#, fuzzy
+msgid "Ability to have clickable URLs in chat and groupchat window banners."
+msgstr "Кликабельные ссылки в окне чата"
+
+#: ../src/features_window.py:109 ../src/features_window.py:110
+msgid "Requires python-sexy."
+msgstr "Требует python-sexy."
+
+#: ../src/features_window.py:117 ../src/common/helpers.py:248
+msgid "Available"
+msgstr "Доступен"
+
+#: ../src/features_window.py:124
+#, fuzzy
+msgid "Feature"
+msgstr "Параметры сервера"
+
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Файл"
 
-#: ../src/filetransfers_window.py:87
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Время"
 
-#: ../src/filetransfers_window.py:99
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Прогресс"
 
-#: ../src/filetransfers_window.py:163 ../src/filetransfers_window.py:223
+#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:218
 #, python-format
 msgid "Filename: %s"
 msgstr "Имя файла: %s"
 
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298
+#: ../src/filetransfers_window.py:165 ../src/filetransfers_window.py:305
 #, python-format
 msgid "Size: %s"
 msgstr "Размер: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183
-#: ../src/history_manager.py:463
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:184
+#: ../src/history_manager.py:468
 msgid "You"
 msgstr "Вы"
 
-#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:175
 #, python-format
 msgid "Sender: %s"
 msgstr "Отправитель: %s"
 
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:572
-#: ../src/tooltips.py:573
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:595
+#: ../src/tooltips.py:592
 msgid "Recipient: "
 msgstr "Получатель:"
 
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:187
 #, python-format
 msgid "Saved in: %s"
 msgstr "Сохранено в: %s"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 msgid "File transfer completed"
 msgstr "Передача завершена"
 
-#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:212
-msgid "File transfer canceled"
+#: ../src/filetransfers_window.py:203 ../src/filetransfers_window.py:209
+msgid "File transfer cancelled"
 msgstr "Передача отменена"
 
-#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:213
+#: ../src/filetransfers_window.py:203 ../src/filetransfers_window.py:210
 msgid "Connection with peer cannot be established."
 msgstr "Соединение не может быть установлено."
 
-#: ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:219
 #, python-format
 msgid "Recipient: %s"
 msgstr "Получатель: %s"
 
-#: ../src/filetransfers_window.py:226
+#: ../src/filetransfers_window.py:221
 #, python-format
 msgid "Error message: %s"
 msgstr "Сообщение об ошибке: %s"
 
-#: ../src/filetransfers_window.py:227
-msgid "File transfer stopped by the contact of the other side"
+#: ../src/filetransfers_window.py:222
+msgid "File transfer stopped by the contact at the other end"
 msgstr "Передача файла остановлена контактом на той стороне"
 
-#: ../src/filetransfers_window.py:244
+#: ../src/filetransfers_window.py:243
 msgid "Choose File to Send..."
 msgstr "Выбрать файл для отправки..."
 
-#: ../src/filetransfers_window.py:263
+#: ../src/filetransfers_window.py:259 ../src/tooltips.py:632
+msgid "Description: "
+msgstr "Описание: "
+
+#: ../src/filetransfers_window.py:270
 msgid "Gajim cannot access this file"
 msgstr "Нет доступа к файлу"
 
-#: ../src/filetransfers_window.py:264
+#: ../src/filetransfers_window.py:271
 msgid "This file is being used by another process."
 msgstr "Файл занят другим процессом."
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:303
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: ../src/filetransfers_window.py:301
+#: ../src/filetransfers_window.py:308
 #, python-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "Description: %s"
 msgstr "Описание: %s"
 
-#: ../src/filetransfers_window.py:304
+#: ../src/filetransfers_window.py:311
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s хочет отправить вам файл:"
 
-#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683
+#: ../src/filetransfers_window.py:324 ../src/gtkgui_helpers.py:773
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Не могу заместить существующий файл \"%s\""
 
-#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685
+#: ../src/filetransfers_window.py:325 ../src/gtkgui_helpers.py:775
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "Этот файл уже существует, и у вас нет права его перезаписать."
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:779
 msgid "This file already exists"
 msgstr "Файл уже существует"
 
-#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:779
 msgid "What do you want to do?"
 msgstr "Что вы хотите сделать?"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699
+#. read-only bit is used to mark special folder under windows,
+#. not to mark that a folder is read-only. See ticket #3587
+#: ../src/filetransfers_window.py:346 ../src/gtkgui_helpers.py:789
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Директория \"%s\" не доступна для записи"
 
-#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700
+#: ../src/filetransfers_window.py:346 ../src/gtkgui_helpers.py:790
 msgid "You do not have permission to create files in this directory."
 msgstr "У вас нет права создавать файлы в этой директории."
 
-#: ../src/filetransfers_window.py:348
+#: ../src/filetransfers_window.py:356
 msgid "Save File as..."
 msgstr "Сохранить файл как..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:429
+#: ../src/filetransfers_window.py:436
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -3758,60 +4440,65 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:505
+#: ../src/filetransfers_window.py:525
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:544 ../src/filetransfers_window.py:547
+#: ../src/filetransfers_window.py:565 ../src/filetransfers_window.py:568
 msgid "Invalid File"
 msgstr "Неверный файл"
 
-#: ../src/filetransfers_window.py:544
+#: ../src/filetransfers_window.py:565
 msgid "File: "
 msgstr "Файл: "
 
-#: ../src/filetransfers_window.py:548
+#: ../src/filetransfers_window.py:569
 msgid "It is not possible to send empty files"
 msgstr "Нельзя отсылать пустые файлы"
 
-#: ../src/filetransfers_window.py:568 ../src/tooltips.py:563
+#: ../src/filetransfers_window.py:591 ../src/tooltips.py:582
 msgid "Name: "
 msgstr "Имя:  "
 
-#: ../src/filetransfers_window.py:570 ../src/tooltips.py:567
+#: ../src/filetransfers_window.py:593 ../src/tooltips.py:586
 msgid "Sender: "
 msgstr "Отправитель:"
 
-#: ../src/filetransfers_window.py:758
+#: ../src/filetransfers_window.py:781
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/gajim.py:47
-msgid "Gajim needs Xserver to run. Quiting..."
-msgstr "Gajim'у для запуска требуется X-сервер. Выход..."
+#: ../src/gajim.py:56
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr ""
+
+#: ../src/gajim.py:129
+msgid "Gajim needs X server to run. Quiting..."
+msgstr "Gajim для запуска требуется X-сервер. Выход..."
 
-#: ../src/gajim.py:51
-msgid "Gajim needs PyGTK 2.6 or above"
-msgstr "Gajim требуется PyGTK 2.6 или выше"
+#: ../src/gajim.py:156
+msgid "Gajim needs PyGTK 2.8 or above"
+msgstr "Gajim требуется PyGTK 2.8 или выше"
 
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
-msgstr "Gajim для запуска требуется PyGTK 2.6 или выше. Выход..."
+#: ../src/gajim.py:157
+msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
+msgstr "Gajim для запуска требуется PyGTK 2.8 или выше. Выход..."
 
-#: ../src/gajim.py:54
-msgid "Gajim needs GTK 2.6 or above"
-msgstr "Gajim требуется GTK 2.6 или выше"
+#: ../src/gajim.py:159
+msgid "Gajim needs GTK 2.8 or above"
+msgstr "Gajim требуется GTK 2.8 или выше"
 
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
-msgstr "Gajim для запуска требуется GTK 2.6 или выше. Выход..."
+#: ../src/gajim.py:160
+msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
+msgstr "Gajim для запуска требуется GTK 2.8 или выше. Выход..."
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:165
 msgid "GTK+ runtime is missing libglade support"
 msgstr "У GTK отсутствует поддержка libglade."
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:167
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -3820,31 +4507,34 @@ msgstr ""
 "Пожалуйста, удалите вашу текущую версию GTK и установите последнюю "
 "стабильную версию с %s"
 
-#: ../src/gajim.py:64
-msgid "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#: ../src/gajim.py:169
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "Пожалуйста, удостоверьтесь что GTK+ и PyGTK поддерживают libglade."
 
-#: ../src/gajim.py:69
+#: ../src/gajim.py:174
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim для запуска требуется PySQLite2"
 
-#: ../src/gajim.py:77
+#: ../src/gajim.py:182
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim для запуска требуется pywin32"
 
-#: ../src/gajim.py:78
+#: ../src/gajim.py:183
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
 "%s"
-msgstr "Пожалуйста, удостоверьтесь что в вашей системе установлен Pywin32. Вы можете получить его на сайте: %s"
+msgstr ""
+"Пожалуйста, удостоверьтесь что в вашей системе установлен Pywin32. Вы можете "
+"получить его на сайте: %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:238
+#: ../src/gajim.py:328
 msgid "Gajim is already running"
 msgstr "Gajim уже запущен"
 
-#: ../src/gajim.py:239
+#: ../src/gajim.py:329
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -3852,76 +4542,173 @@ msgstr ""
 "По-видимому, уже запущен другой экземпляр Gajim\n"
 "Запустить ещё один?"
 
-#: ../src/gajim.py:346
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
-msgstr "HTTP (%s) Авторизация для %s (id: %s)"
+#: ../src/gajim.py:352 ../src/common/connection_handlers.py:910
+#: ../src/common/connection_handlers.py:1624
+#: ../src/common/connection_handlers.py:1653
+#: ../src/common/connection_handlers.py:1663
+#: ../src/common/connection_handlers.py:1682
+#: ../src/common/connection_handlers.py:1919
+#: ../src/common/connection_handlers.py:2031 ../src/common/connection.py:1016
+msgid "Disk Write Error"
+msgstr "Ошибка записи на диск"
 
-#: ../src/gajim.py:347
+#: ../src/gajim.py:448
 msgid "Do you accept this request?"
 msgstr "Вы принимаете этот запрос?"
 
-#: ../src/gajim.py:393 ../src/notify.py:430
+#: ../src/gajim.py:450
+#, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "Вы принимаете запрос %s?"
+
+#: ../src/gajim.py:453
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "HTTP (%s) Авторизация для %s (id: %s)"
+
+#: ../src/gajim.py:500 ../src/notify.py:466
 msgid "Connection Failed"
 msgstr "Соединение разорвалось"
 
-#: ../src/gajim.py:706
+#: ../src/gajim.py:834
 #, python-format
 msgid "Subject: %s"
 msgstr "Тема: %s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
-#: ../src/gajim.py:751 ../src/gajim.py:764
+#: ../src/gajim.py:881 ../src/gajim.py:894
 #, python-format
 msgid "error while sending %s ( %s )"
 msgstr "ошибка при отправке %s ( %s )"
 
-#: ../src/gajim.py:797
+#: ../src/gajim.py:927
 msgid "Authorization accepted"
 msgstr "Авторизация принята"
 
-#: ../src/gajim.py:798
+#: ../src/gajim.py:928
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контакт \"%s\" авторизовал вас, теперь вы можете видеть его статус."
 
-#: ../src/gajim.py:806
+#: ../src/gajim.py:936
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контакт \"%s\" отозвал подписку с вами"
 
-#: ../src/gajim.py:807
+#: ../src/gajim.py:937
 msgid "You will always see him or her as offline."
 msgstr "Вы всегда будете видеть его или её в оффлайне."
 
-#: ../src/gajim.py:850
+#: ../src/gajim.py:981
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Связь с \"%s\" не может быть установлена"
 
-#: ../src/gajim.py:851 ../src/common/connection.py:406
+#: ../src/gajim.py:982 ../src/common/connection.py:524
 msgid "Check your connection or try again later."
 msgstr "Проверьте настройки сети или попробуйте еще раз позже."
 
-#: ../src/gajim.py:999 ../src/roster_window.py:1197
+#: ../src/gajim.py:1152 ../src/groupchat_control.py:995
+#, python-format
+msgid "%s is now known as %s"
+msgstr "%s теперь известен как %s"
+
+#: ../src/gajim.py:1168 ../src/roster_window.py:1372
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s %s (%s)"
 
-#: ../src/gajim.py:1096
-msgid "Your passphrase is incorrect"
-msgstr "Ваша парольная фраза неверна"
+#. No status message
+#: ../src/gajim.py:1171 ../src/groupchat_control.py:1146
+#: ../src/roster_window.py:1375
+#, python-format
+msgid "%s is now %s"
+msgstr "%s %s"
+
+#. Can be a presence (see chg_contact_status in groupchat_contol.py)
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/gajim.py:1292 ../src/groupchat_control.py:955
+msgid "Any occupant is allowed to see your full JID"
+msgstr "Любой участник может увидеть ваш настоящий JID"
+
+#: ../src/gajim.py:1295
+msgid "Room now shows unavailable member"
+msgstr ""
 
-#: ../src/gajim.py:1097
+#: ../src/gajim.py:1297
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gajim.py:1300
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_contol.py)
+#: ../src/gajim.py:1303
+msgid "Room logging is now enabled"
+msgstr "Запись логов конференции включена"
+
+#: ../src/gajim.py:1305
+msgid "Room logging is now disabled"
+msgstr "Запись логов конференции выключена"
+
+#: ../src/gajim.py:1307
+msgid "Room is now non-anonymous"
+msgstr "Конференция не анонимна"
+
+#: ../src/gajim.py:1310
+msgid "Room is now semi-anonymous"
+msgstr "Конференция частично анонимна"
+
+#: ../src/gajim.py:1313
+msgid "Room is now fully-anonymous"
+msgstr "Конференция полностью анонимна"
+
+#: ../src/gajim.py:1345
+#, python-format
+msgid "A Password is required to join the room %s. Please type it"
+msgstr "Чтобы войти в комнату %s, нужен пароль."
+
+#: ../src/gajim.py:1379
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+"Gajim настроен на использование GPG агента,но GPG агент не запущен или он "
+"возвратил неверный пароль.\n"
+
+#: ../src/gajim.py:1381
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Вы сейчас соединены без OpenPGP ключа."
 
-#: ../src/gajim.py:1199
+#: ../src/gajim.py:1384
+msgid "Your passphrase is incorrect"
+msgstr "Ваша парольная фраза неверна"
+
+#: ../src/gajim.py:1396 ../src/secrets.py:44
+msgid "Passphrase Required"
+msgstr "Требуется парольная фраза"
+
+#: ../src/gajim.py:1397
+#, python-format
+msgid "Enter GPG key passphrase for account %s."
+msgstr "Введите парольную фразу GPG для учетной записи %s"
+
+#: ../src/gajim.py:1409
+msgid "Wrong Passphrase"
+msgstr "Неверная парольная фраза"
+
+#: ../src/gajim.py:1410
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr ""
+"Пожалуйста, введите парольную фразу для GPG еще раз или нажмите Отмена."
+
+#: ../src/gajim.py:1519
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Новое письмо на %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1201
+#: ../src/gajim.py:1521
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -3932,7 +4719,7 @@ msgstr[2] "У вас есть %d непрочитанных письма"
 #. FIXME: emulate Gtalk client popups. find out what they parse and how
 #. they decide what to show
 #. each message has a 'From', 'Subject' and 'Snippet' field
-#: ../src/gajim.py:1210
+#: ../src/gajim.py:1530
 #, python-format
 msgid ""
 "\n"
@@ -3941,124 +4728,215 @@ msgstr ""
 "\n"
 "От: %(from_address)s"
 
-#: ../src/gajim.py:1366
+#: ../src/gajim.py:1708
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s хочет отправить вам файл."
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1773
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Успешно получен файл %(filename)s от %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1435
+#: ../src/gajim.py:1777
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Передача файла %(filename)s от %(name)s приостановлена."
 
-#: ../src/gajim.py:1448
+#: ../src/gajim.py:1790
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "%(name)s успешно получил отправленный вами файл %(filename)s."
 
 #. ft stopped
-#: ../src/gajim.py:1452
+#: ../src/gajim.py:1794
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Передача файла %(filename)s к %(name)s приостановлена."
 
-#: ../src/gajim.py:1558
+#: ../src/gajim.py:1889
+msgid "Session negotiation cancelled"
+msgstr ""
+
+#: ../src/gajim.py:1890
+#, python-format
+msgid "The client at %s cancelled the session negotiation."
+msgstr ""
+
+#: ../src/gajim.py:1922 ../src/gajim.py:1966
+msgid "Confirm these session options"
+msgstr ""
+
+#: ../src/gajim.py:1923
+#, python-format
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t\t%s\n"
+"\n"
+"\t\tAre these options acceptable?"
+msgstr ""
+
+#: ../src/gajim.py:1967
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
+msgstr ""
+
+#: ../src/gajim.py:2092
 msgid "Username Conflict"
 msgstr "Такое имя уже есть"
 
-#: ../src/gajim.py:1559
+#: ../src/gajim.py:2093
 msgid "Please type a new username for your local account"
-msgstr "Пожалуйста, введите новое имя пользователя для локальной учетной записи"
+msgstr ""
+"Пожалуйста, введите новое имя пользователя для локальной учетной записи"
+
+#: ../src/gajim.py:2110
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gajim.py:2118
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gajim.py:2124
+msgid "Error."
+msgstr ""
+
+#: ../src/gajim.py:2149
+msgid "Resource Conflict"
+msgstr "Такое имя уже есть"
+
+#: ../src/gajim.py:2150
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+"Вы уже подсоединены к этой учетной записи с таким же ресурсом. Введите "
+"другой ресурс"
+
+#: ../src/gajim.py:2179
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gajim.py:2180
+#, python-format
+msgid ""
+"There was an error verifying the SSL certificate of your jabber server: %"
+"(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/gajim.py:2196
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gajim.py:2197
+msgid ""
+"It seems SSL certificate has changed or your connection is being hacked. Do "
+"you still want to connect and update the fingerprintof the certificate?"
+msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1898
+#: ../src/gajim.py:2557
 msgid "Could not save your settings and preferences"
 msgstr "Не могу сохранить ваши установки и настройки"
 
-#: ../src/gajim.py:2090
+#. sorted alphanum
+#: ../src/gajim.py:2693 ../src/common/config.py:102
+#: ../src/common/config.py:414 ../src/common/optparser.py:206
+#: ../src/common/optparser.py:424 ../src/common/optparser.py:458
+msgid "default"
+msgstr "По_умолчанию"
+
+#: ../src/gajim.py:2779
 msgid "Network Manager support not available"
 msgstr "Network Manager не используется"
 
-#: ../src/gajim.py:2165
+#: ../src/gajim.py:2884
 msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Отсутствует поддержка управления сессиями (отсутствует модуль gnome.ui)"
+msgstr ""
+"Отсутствует поддержка управления сессиями (отсутствует модуль gnome.ui)"
 
-#: ../src/gajim-remote.py:66
+#: ../src/gajim-remote.py:73
 msgid "Shows a help on specific command"
 msgstr "Показывает помощь для конкретной команды"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:69
+#: ../src/gajim-remote.py:76
 msgid "command"
 msgstr "команда"
 
-#: ../src/gajim-remote.py:70
+#: ../src/gajim-remote.py:77
 msgid "show help on command"
 msgstr "показать помощь по команде"
 
-#: ../src/gajim-remote.py:74
+#: ../src/gajim-remote.py:81
 msgid "Shows or hides the roster window"
 msgstr "Скрывает или показывает окно ростера"
 
-#: ../src/gajim-remote.py:78
-msgid "Popups a window with the next pending event"
+#: ../src/gajim-remote.py:85
+msgid "Pops up a window with the next pending event"
 msgstr "Показывать окно со следующим непрочитанным сообщением"
 
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:89
 msgid ""
-"Prints a list of all contacts in the roster. Each contact appear on a "
+"Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 msgstr ""
 "Выводит список всех контактов в ростере. Каждый контакт будет в отдельной "
 "строке"
 
-#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98
-#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156
-#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195
-#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:92 ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:174 ../src/gajim-remote.py:204
+#: ../src/gajim-remote.py:213 ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:227 ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:254 ../src/gajim-remote.py:263
 msgid "account"
 msgstr "Учетные записи"
 
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:92
 msgid "show only contacts of the given account"
 msgstr "показывать контакты только для данной учетной записи"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:98
 msgid "Prints a list of registered accounts"
 msgstr "Показывает список зарегистрированных учетных записей"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:102
 msgid "Changes the status of account or accounts"
 msgstr "Изменяет статус учетной записи или записей"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:105
 msgid "status"
 msgstr "статус"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:105
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
-msgstr "один из: отключен, в сети, чат, отошел, недоступен, не беспокоить, невидимка"
+msgstr ""
+"один из: отключен, в сети, чат, отошел, недоступен, не беспокоить, невидимка"
 
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118
-#: ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:106 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:141 ../src/gajim-remote.py:152
 msgid "message"
 msgstr "сообщение"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:106
 msgid "status message"
 msgstr "сообщение сервера"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:107
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -4067,19 +4945,19 @@ msgstr ""
 "изменить статус всех учетных записей, у которых установлена опция "
 "\"синхронизировать с глобальным статусом\""
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:113
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Показывает окно беседы, чтобы вы могли отправлять сообщения контакту"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:115
 msgid "JID of the contact that you want to chat with"
 msgstr "JID контакта, с которым вы хотели бы побеседовать"
 
-#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186
+#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:204
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "если указано, контакт будет взят из контакт-листа этой учетной записи"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:122
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4089,27 +4967,31 @@ msgstr ""
 "учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', "
 "без 'OpenPGP ключа', просто установите 'OpenPGP ключ' в ''."
 
-#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:126 ../src/gajim-remote.py:139
 msgid "JID of the contact that will receive the message"
 msgstr "JID контакта, который получит сообщение"
 
-#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132
+#: ../src/gajim-remote.py:127 ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:152
 msgid "message contents"
 msgstr "содержимое сообщения"
 
-#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:128 ../src/gajim-remote.py:142
 msgid "pgp key"
 msgstr "PGP ключ"
 
-#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:128 ../src/gajim-remote.py:142
 msgid "if specified, the message will be encrypted using this public key"
-msgstr "если указано, сообщение будет зашифровано с использованием открытого ключа"
+msgstr ""
+"если указано, сообщение будет зашифровано с использованием открытого ключа"
 
-#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:130 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:153
 msgid "if specified, the message will be sent using this account"
-msgstr "если указано, сообщение будет отправлено с использованием этой учетной записи"
+msgstr ""
+"если указано, сообщение будет отправлено с использованием этой учетной записи"
 
-#: ../src/gajim-remote.py:126
+#: ../src/gajim-remote.py:135
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -4119,138 +5001,173 @@ msgstr ""
 "учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', "
 "без 'OpenPGP ключа', просто установите 'OpenPGP ключ' в ''."
 
-#: ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:140
 msgid "subject"
 msgstr "тема"
 
-#: ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:140
 msgid "message subject"
 msgstr "тема сообщения"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:149
+msgid "Sends new message to a groupchat you've joined."
+msgstr ""
+
+#: ../src/gajim-remote.py:151
+msgid "JID of the room that will receive the message"
+msgstr "JID контакта, который получит сообщение"
+
+#: ../src/gajim-remote.py:158
 msgid "Gets detailed info on a contact"
 msgstr "Получает детальную информацию о контакте"
 
-#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155
-#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:173
+#: ../src/gajim-remote.py:203 ../src/gajim-remote.py:212
 msgid "JID of the contact"
 msgstr "JID контакта"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:164
 msgid "Gets detailed info on a account"
 msgstr "Получает детальную информацию о учетной записи"
 
-#: ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:166
 msgid "Name of the account"
 msgstr "Имя учетной записи"
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:170
 msgid "Sends file to a contact"
 msgstr "Отправляет контакту файл"
 
-#: ../src/gajim-remote.py:154
+#: ../src/gajim-remote.py:172
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote.py:154
+#: ../src/gajim-remote.py:172
 msgid "File path"
 msgstr "Путь до файла"
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:174
 msgid "if specified, file will be sent using this account"
-msgstr "если указано, файл будет отправлен с использованием этой учетной записи"
+msgstr ""
+"если указано, файл будет отправлен с использованием этой учетной записи"
 
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:179
 msgid "Lists all preferences and their values"
 msgstr "Показывает все параметры с их значениями"
 
-#: ../src/gajim-remote.py:165
+#: ../src/gajim-remote.py:183
 msgid "Sets value of 'key' to 'value'."
 msgstr "Присваивает 'ключу' в 'значение'"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:185
 msgid "key=value"
 msgstr "ключ=значение"
 
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:185
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
-msgstr "'ключ' это название параметра, а 'значение' это то, что ему присваивают"
+msgstr ""
+"'ключ' это название параметра, а 'значение' это то, что ему присваивают"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:190
 msgid "Deletes a preference item"
 msgstr "Удаляет параметр"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:192
 msgid "key"
 msgstr "ключ"
 
-#: ../src/gajim-remote.py:174
+#: ../src/gajim-remote.py:192
 msgid "name of the preference to be deleted"
 msgstr "имя параметра, который нужно удалить"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:196
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Сохраняет текущее состояние настроек Gajim в файл .config"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:201
 msgid "Removes contact from roster"
 msgstr "Удаляет контакт из ростера"
 
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:210
 msgid "Adds contact to roster"
 msgstr "Добавляет контакт в ростер"
 
-#: ../src/gajim-remote.py:194
+#: ../src/gajim-remote.py:212
 msgid "jid"
 msgstr "JID"
 
-#: ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:213
 msgid "Adds new contact to this account"
 msgstr "Добавляет новый контакт для данной учетной записи"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:218
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Возвращает текущий статус (по умолчанию глобальный, если не указана учетная "
 "запись)"
 
-#: ../src/gajim-remote.py:207
-msgid "Returns current status message(the global one unless account is specified)"
+#: ../src/gajim-remote.py:225
+msgid ""
+"Returns current status message(the global one unless account is specified)"
 msgstr ""
 "Возвращает текущий статус (по умолчанию глобальный, если не указана учетная "
 "запись)"
 
-#: ../src/gajim-remote.py:214
-msgid "Returns number of unreaded messages"
+#: ../src/gajim-remote.py:232
+msgid "Returns number of unread messages"
 msgstr "Возвращает количество непрочитанных сообщений"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:236
 msgid "Opens 'Start Chat' dialog"
 msgstr "Открыть диалог «Начать беседу»"
 
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:238
 msgid "Starts chat, using this account"
 msgstr "Начать беседу с этой учетной записи"
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:242
 msgid "Sends custom XML"
 msgstr "Отправляет произвольный XML"
 
-#: ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:244
 msgid "XML to send"
 msgstr "Отправляемый XML"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:245
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr "Учётная запись, из которой будет отправлен XML."
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:251
+msgid "Handle a xmpp:/ uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:253
+msgid "uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:258
+msgid "Join a MUC room"
+msgstr ""
+
+#: ../src/gajim-remote.py:260
+msgid "room"
+msgstr "комната"
+
+#: ../src/gajim-remote.py:261
+msgid "nick"
+msgstr "Ник"
+
+#: ../src/gajim-remote.py:262
+msgid "password"
+msgstr "Пароль:"
+
+#: ../src/gajim-remote.py:285
 msgid "Missing argument \"contact_jid\""
 msgstr "Пропущен аргумент \"JID контакта\""
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:304
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -4259,11 +5176,11 @@ msgstr ""
 "'%s' не в вашем ростере\n"
 "Пожалуйста, укажите учетную запись для отправки сообщения."
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:307
 msgid "You have no active account"
 msgstr "У вас нет активной учетной записи"
 
-#: ../src/gajim-remote.py:335
+#: ../src/gajim-remote.py:371
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -4272,16 +5189,16 @@ msgstr ""
 "Использование: %s %s %s \n"
 "\t %s"
 
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:374
 msgid "Arguments:"
 msgstr "Аргументы:"
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:378
 #, python-format
 msgid "%s not found"
 msgstr "%s не найден"
 
-#: ../src/gajim-remote.py:346
+#: ../src/gajim-remote.py:382
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -4290,7 +5207,16 @@ msgstr ""
 "Использование: %s команда [аргумента]\n"
 "Команда одна из:\n"
 
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:455
+#, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Много аргументов. \n"
+"Наберите \"%s  help %s\" для справки"
+
+#: ../src/gajim-remote.py:459
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -4299,135 +5225,152 @@ msgstr ""
 "Аргумент \"%s\" не задан. \n"
 "Наберите \"%s\" help \"%s\" для справки"
 
-#: ../src/gajim_themes_window.py:60
+#: ../src/gajim-remote.py:477
+msgid "Wrong uri"
+msgstr "Неверный хост"
+
+#: ../src/gajim_themes_window.py:67
 msgid "Theme"
 msgstr "Тема"
 
+#: ../src/gajim_themes_window.py:105
+msgid "You cannot make changes to the default theme"
+msgstr "Вы не можете удалить вашу текущую тему"
+
+#: ../src/gajim_themes_window.py:106
+msgid "Please create a clean new theme with your desired name."
+msgstr ""
+
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:155
+#: ../src/gajim_themes_window.py:180
 msgid "theme name"
 msgstr "имя тeмы"
 
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:197
 msgid "You cannot delete your current theme"
 msgstr "Вы не можете удалить вашу текущую тему"
 
-#: ../src/gajim_themes_window.py:173
+#: ../src/gajim_themes_window.py:198
 msgid "Please first choose another for your current theme."
 msgstr "Пожалуйста, выберите сначала другую тему."
 
-#: ../src/groupchat_control.py:106
-msgid "Private Chat"
-msgstr "Личная беседа"
-
-#: ../src/groupchat_control.py:106
-msgid "Private Chats"
-msgstr "Личные беседы"
-
-#: ../src/groupchat_control.py:123
+#: ../src/groupchat_control.py:139
 msgid "Sending private message failed"
 msgstr "Не удалось отправить личное сообщение"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:125
+#: ../src/groupchat_control.py:141
 #, python-format
 msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
 msgstr "Вы больше не находитесь в комнате \"%s\" или \"%s\" вышел."
 
-#: ../src/groupchat_control.py:144
-msgid "Group Chat"
-msgstr "Комната"
-
-#: ../src/groupchat_control.py:144
-msgid "Group Chats"
-msgstr "Комнаты"
-
-#: ../src/groupchat_control.py:318
+#: ../src/groupchat_control.py:350
 msgid "Insert Nickname"
 msgstr "Вставить ник"
 
+#: ../src/groupchat_control.py:882
+msgid "Really send file?"
+msgstr "Отправить файл?"
+
+#: ../src/groupchat_control.py:883
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:958
+msgid "Room logging is enabled"
+msgstr "Запись логов конференции включена"
+
+#: ../src/groupchat_control.py:960
+msgid "A new room has been created"
+msgstr "Новая комната была создана"
+
+#: ../src/groupchat_control.py:963
+msgid "The server has assigned or modified your roomnick"
+msgstr ""
+
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:831
+#: ../src/groupchat_control.py:969
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s выгнали из комнаты: %(reason)s"
 
-#: ../src/groupchat_control.py:835
+#: ../src/groupchat_control.py:973
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(who)s выгнал %(nick)s из комнаты: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:842
+#: ../src/groupchat_control.py:980
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s запретили заходить в комнату: %(reason)s"
 
-#: ../src/groupchat_control.py:846
+#: ../src/groupchat_control.py:984
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s запретил %(nick)s заходить в комнату: %(reason)s"
 
-#: ../src/groupchat_control.py:854
+#: ../src/groupchat_control.py:993
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вы теперь известны как %s"
 
-#: ../src/groupchat_control.py:856
+#: ../src/groupchat_control.py:1029 ../src/groupchat_control.py:1033
+#: ../src/groupchat_control.py:1038
 #, python-format
-msgid "%s is now known as %s"
-msgstr "%s теперь известен как %s"
+msgid "%(nick)s has been removed from the room (%(reason)s)"
+msgstr "%(nick)s выгнали из комнаты (%(reason)s)"
 
-#: ../src/groupchat_control.py:936
+#: ../src/groupchat_control.py:1030
+msgid "affiliation changed"
+msgstr ""
+
+#: ../src/groupchat_control.py:1035
+msgid "room configuration changed to members-only"
+msgstr ""
+
+#: ../src/groupchat_control.py:1040
+msgid "system shutdown"
+msgstr ""
+
+#: ../src/groupchat_control.py:1139
 #, python-format
 msgid "%s has left"
 msgstr "%s ушел"
 
-#: ../src/groupchat_control.py:941
+#: ../src/groupchat_control.py:1144
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s зашёл в комнату"
 
-#. No status message
-#: ../src/groupchat_control.py:943 ../src/roster_window.py:1200
-#, python-format
-msgid "%s is now %s"
-msgstr "%s %s"
+#. Invalid Nickname
+#. invalid char
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1536
+msgid "Invalid nickname"
+msgstr "Неверное имя пользователя"
 
-#: ../src/groupchat_control.py:1062 ../src/groupchat_control.py:1080
-#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1190
+#: ../src/groupchat_control.py:1258 ../src/groupchat_control.py:1537
+msgid "The nickname has not allowed characters."
+msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
+
+#: ../src/groupchat_control.py:1281 ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1383 ../src/groupchat_control.py:1400
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Ник не обнаружен: %s"
 
-#: ../src/groupchat_control.py:1096
+#: ../src/groupchat_control.py:1315
 msgid "This group chat has no subject"
 msgstr "У этой комнаты нет темы"
 
-#: ../src/groupchat_control.py:1109
+#: ../src/groupchat_control.py:1326
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Пригласил %(contact_jid)s в %(room_jid)s."
 
-#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:1116 ../src/groupchat_control.py:1144
-#, python-format
-msgid "%s does not appear to be a valid JID"
-msgstr "%s не является нормальным JID"
-
-#: ../src/groupchat_control.py:1227
-#, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-msgstr ""
-"Нет такой команды: /%s (если вы хотите её просто передать, то добавьте к ней "
-"префикс /say)"
-
-#: ../src/groupchat_control.py:1250
-#, python-format
-msgid "Commands: %s"
-msgstr "Команды: %s"
-
-#: ../src/groupchat_control.py:1252
+#: ../src/groupchat_control.py:1463
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -4440,29 +5383,24 @@ msgstr ""
 "данный момент находится в комнате, то он/она/оно также будет выгнан. НЕ "
 "поддерживает пробелы в никах."
 
-#: ../src/groupchat_control.py:1259
-#, python-format
-msgid "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
-msgstr "Использование: /%s <ник>, открывает окно привата с указанным посетителем."
-
-#: ../src/groupchat_control.py:1263
+#: ../src/groupchat_control.py:1470
 #, python-format
-msgid "Usage: /%s, clears the text window."
-msgstr "Использование: /%s, очищает текстовое окно."
+msgid ""
+"Usage: /%s <nickname>, opens a private chat window with the specified "
+"occupant."
+msgstr ""
+"Использование: /%s <ник>, открывает окно привата с указанным посетителем."
 
-#: ../src/groupchat_control.py:1265
+#: ../src/groupchat_control.py:1476
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
 "specified."
-msgstr "Использование: /%s [причина], закрывает текущее окно или вкладку, приводя причину, если она указана."
-
-#: ../src/groupchat_control.py:1268
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
-msgstr "Использование: /%s, скрывает кнопки беседы."
+msgstr ""
+"Использование: /%s [причина], закрывает текущее окно или вкладку, приводя "
+"причину, если она указана."
 
-#: ../src/groupchat_control.py:1271
+#: ../src/groupchat_control.py:1482
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -4471,7 +5409,7 @@ msgstr ""
 "Использование: /%s <JID> [причина], приглашает JID в текущую комнату, с "
 "возможным указанием причины."
 
-#: ../src/groupchat_control.py:1275
+#: ../src/groupchat_control.py:1486
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -4480,7 +5418,7 @@ msgstr ""
 "Использование: /%s <комната>@<сервер>[/ник], предлагает присоединиться к "
 "комната@сервер, с возможным указанием ника."
 
-#: ../src/groupchat_control.py:1279
+#: ../src/groupchat_control.py:1490
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -4490,118 +5428,126 @@ msgstr ""
 "Использование: /%s <ник> [причина], удаляет посетителя с указанным ником из "
 "комнаты с возможным указанием причины. НЕ поддерживает пробелы в нике."
 
-#: ../src/groupchat_control.py:1284
-#, python-format
-msgid ""
-"Usage: /%s <action>, sends action to the current group chat. Use third "
-"person. (e.g. /%s explodes.)"
-msgstr ""
-"Использование: /%s <действие>, совершает действие в текущей комнате. "
-"Используйте третье лицо (например, «/%s взрывается».)"
-
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1499
 #, python-format
 msgid ""
-"Usage: /%s <nickname> [message], opens a private message windowand sends "
+"Usage: /%s <nickname> [message], opens a private message window and sends "
 "message to the occupant specified by nickname."
 msgstr ""
 "Использование: /%s <ник> [сообщение], открывает окно личной беседы и "
 "отсылает сообщение посетителю с указанным ником."
 
-#: ../src/groupchat_control.py:1293
+#: ../src/groupchat_control.py:1504
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Использование: /%s <ник>, меняет ваш ник в текущей комнате."
 
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1508
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Использование: /%s, показывает список присутствующих в комнате."
 
-#: ../src/groupchat_control.py:1301
+#: ../src/groupchat_control.py:1512
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
-msgstr "Использование: /%s [тема], показывает или изменяет текущую тему комнаты."
+msgstr ""
+"Использование: /%s [тема], показывает или изменяет текущую тему комнаты."
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1515
 #, python-format
-msgid "Usage: /%s <message>, sends a message without looking for other commands."
+msgid ""
+"Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Использование: /%s <сообщение>, отсылает сообщение без поиска других команд "
 "в нем."
 
-#: ../src/groupchat_control.py:1307
-#, python-format
-msgid "No help info for /%s"
-msgstr "Нет подсказки для /%s"
-
-#: ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1621
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Вы точно хотите выйти из комнаты \"%s\"?"
 
-#: ../src/groupchat_control.py:1358
-msgid "If you close this window, you will be disconnected from this group chat."
+#: ../src/groupchat_control.py:1623
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
 msgstr "Если вы закроете это окно, то вы выйдете из этой комнаты."
 
-#: ../src/groupchat_control.py:1362 ../src/roster_window.py:3962
+#: ../src/groupchat_control.py:1627 ../src/roster_window.py:4902
 msgid "Do _not ask me again"
 msgstr "Не _переспрашивать"
 
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1659
 msgid "Changing Subject"
 msgstr "Изменяет тему"
 
-#: ../src/groupchat_control.py:1397
+#: ../src/groupchat_control.py:1660
 msgid "Please specify the new subject:"
 msgstr "Пожалуйста, введите новую тему:"
 
-#: ../src/groupchat_control.py:1406
+#: ../src/groupchat_control.py:1669
 msgid "Changing Nickname"
 msgstr "Изменяет ник"
 
-#: ../src/groupchat_control.py:1407
+#: ../src/groupchat_control.py:1670
 msgid "Please specify the new nickname you want to use:"
 msgstr "Пожалуйста, введите новый ник, который вы хотите использовать:"
 
-#: ../src/groupchat_control.py:1432
+# смотря где вылазит меседж - нужно присмотреться
+#. Ask for a reason
+#: ../src/groupchat_control.py:1685
+#, fuzzy, python-format
+msgid "Destroying %s"
+msgstr "Удаление: %s"
+
+#: ../src/groupchat_control.py:1686
+msgid ""
+"You are going to definitively destroy this room.\n"
+"You may specify a reason below:"
+msgstr ""
+"Вы хотите уничтожить комнату.\n"
+"Вы можете указать причину:"
+
+#: ../src/groupchat_control.py:1688
+msgid "You may also enter an alternate venue:"
+msgstr "Альтернативная причина:"
+
+#: ../src/groupchat_control.py:1720
 msgid "Bookmark already set"
 msgstr "Закладка уже установлена"
 
-#: ../src/groupchat_control.py:1433
+#: ../src/groupchat_control.py:1721
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Комната \"%s\" уже есть в ваших закладках."
 
-#: ../src/groupchat_control.py:1442
+#: ../src/groupchat_control.py:1730
 msgid "Bookmark has been added successfully"
 msgstr "Закладка успешно добавлена"
 
-#: ../src/groupchat_control.py:1443
+#: ../src/groupchat_control.py:1731
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Вы можете управлять закладками через меню \"Действия\" в ростере."
 
 #. ask for reason
-#: ../src/groupchat_control.py:1569
+#: ../src/groupchat_control.py:1883
 #, python-format
 msgid "Kicking %s"
 msgstr "Кикнуть %s"
 
-#: ../src/groupchat_control.py:1570 ../src/groupchat_control.py:1852
+#: ../src/groupchat_control.py:1884 ../src/groupchat_control.py:2184
 msgid "You may specify a reason below:"
 msgstr "Вы можете указать причину ниже:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1851
+#: ../src/groupchat_control.py:2183
 #, python-format
 msgid "Banning %s"
 msgstr "Забанить %s"
 
-#: ../src/gtkexcepthook.py:41
+#: ../src/gtkexcepthook.py:46
 msgid "A programming error has been detected"
 msgstr "Обнаружена ошибка в программе"
 
-#: ../src/gtkexcepthook.py:42
+#: ../src/gtkexcepthook.py:47
 msgid ""
 "It probably is not fatal, but should be reported to the developers "
 "nonetheless."
@@ -4609,83 +5555,98 @@ msgstr ""
 "Возможно это не так страшно, но все равно стоит сообщить об этом "
 "разработчикам."
 
-#: ../src/gtkexcepthook.py:48
+#: ../src/gtkexcepthook.py:53
 msgid "_Report Bug"
 msgstr "_Сообщить об ошибке"
 
-#: ../src/gtkexcepthook.py:71
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Детали"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168
+#: ../src/gtkgui_helpers.py:162 ../src/gtkgui_helpers.py:177
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Ошибка: не могу открыть %s для чтения"
 
-#: ../src/gtkgui_helpers.py:293
+#: ../src/gtkgui_helpers.py:347
 msgid "Error reading file:"
 msgstr "Ошибка чтения файла:"
 
-#: ../src/gtkgui_helpers.py:296
+#: ../src/gtkgui_helpers.py:350
 msgid "Error parsing file:"
 msgstr "Ошибка обработки файла:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:334
+#: ../src/gtkgui_helpers.py:387
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Не могу писать в %s. Управление сессиями будет недоступно"
 
-#: ../src/gtkgui_helpers.py:728
+#. xmpp: is currently handled by another program, so ask the user
+#: ../src/gtkgui_helpers.py:719
+msgid "Gajim is not the default Jabber client"
+msgstr "Gajim не является основным jabber-клиентом"
+
+#: ../src/gtkgui_helpers.py:720
+msgid "Would you like to make Gajim the default Jabber client?"
+msgstr "Вы хотите сделать Gajim основным jabber-клиентом?"
+
+#: ../src/gtkgui_helpers.py:721
+msgid "Always check to see if Gajim is the default Jabber client on startup"
+msgstr ""
+"Всегда проверять при запуске является ли Gajim основным jabber-клиентом"
+
+#: ../src/gtkgui_helpers.py:818
 msgid "Extension not supported"
 msgstr "Расширение не поддерживается"
 
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:819
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 "Изображение нельзя сохранить в формате %(type)s. Сохранить как %"
 "(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:738
+#: ../src/gtkgui_helpers.py:828
 msgid "Save Image as..."
 msgstr "Сохранить изображение как..."
 
-#: ../src/history_manager.py:64
+#: ../src/history_manager.py:73
 msgid "Cannot find history logs database"
 msgstr "Не могу найти базу данных истории"
 
 #. holds jid
-#: ../src/history_manager.py:107
+#: ../src/history_manager.py:113
 msgid "Contacts"
 msgstr "Контакты"
 
 #. holds time
-#: ../src/history_manager.py:120 ../src/history_manager.py:160
-#: ../src/history_window.py:86
+#: ../src/history_manager.py:126 ../src/history_manager.py:166
+#: ../src/history_window.py:121
 msgid "Date"
 msgstr "Дата"
 
 #. holds nickname
-#: ../src/history_manager.py:126 ../src/history_manager.py:178
+#: ../src/history_manager.py:132 ../src/history_manager.py:184
 msgid "Nickname"
 msgstr "Ник"
 
 #. holds message
-#: ../src/history_manager.py:134 ../src/history_manager.py:166
-#: ../src/history_window.py:94
+#: ../src/history_manager.py:140 ../src/history_manager.py:172
+#: ../src/history_window.py:129
 msgid "Message"
 msgstr "Сообщение"
 
-#: ../src/history_manager.py:186
+#: ../src/history_manager.py:192
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
-msgstr "Вы хотите очистить базу данных? (КРАЙНЕ НЕ РЕКОМЕНДУЕТСЯ ЕСЛИ GAJIM ЗАПУЩЕН)"
+msgstr ""
+"Вы хотите очистить базу данных? (КРАЙНЕ НЕ РЕКОМЕНДУЕТСЯ ЕСЛИ GAJIM ЗАПУЩЕН)"
 
-#: ../src/history_manager.py:188
+#: ../src/history_manager.py:194
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -4699,235 +5660,300 @@ msgstr ""
 "\n"
 "Если вы нажали ДА, пожалуйста подождите..."
 
-#: ../src/history_manager.py:400
+#: ../src/history_manager.py:406
 msgid "Exporting History Logs..."
 msgstr "Экспортирую историю..."
 
-#: ../src/history_manager.py:476
+#: ../src/history_manager.py:481
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s в %(time)s сказал: %(message)s\n"
 
-#: ../src/history_manager.py:514
+#: ../src/history_manager.py:518
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] "Вы точно хотите удалить логи выделенного контакта?"
 msgstr[1] "Вы точно хотите удалить логи выделенных контактов?"
 msgstr[2] "Вы точно хотите удалить логи выделенных контактов?"
 
-#: ../src/history_manager.py:518 ../src/history_manager.py:554
+#: ../src/history_manager.py:522 ../src/history_manager.py:557
 msgid "This is an irreversible operation."
 msgstr "Это необратимая операция"
 
-#: ../src/history_manager.py:551
+#: ../src/history_manager.py:554
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Вы точно хотите удалить выделенное сообщение?"
 msgstr[1] "Вы точно хотите удалить выделенные сообщения?"
 msgstr[2] "Вы точно хотите удалить выделенные сообщения?"
 
-#: ../src/history_window.py:103 ../src/history_window.py:105
+#: ../src/history_window.py:209 ../src/history_window.py:211
 #, python-format
 msgid "Conversation History with %s"
 msgstr "История %s"
 
-#: ../src/history_window.py:261
+#: ../src/history_window.py:342
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s теперь %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:265 ../src/notify.py:198
+#: ../src/history_window.py:346 ../src/notify.py:219
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s теперь %(status)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:352
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Статус установлен в:  %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:274
+#: ../src/history_window.py:355
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Статус установлен в: %(status)s"
 
-#: ../src/message_window.py:273
+#: ../src/htmltextview.py:586 ../src/htmltextview.py:597
+msgid "Timeout loading image"
+msgstr "Не могу загрузить изображение"
+
+#: ../src/htmltextview.py:607
+msgid "Image is too big"
+msgstr "Изображение слишком большое"
+
+#: ../src/message_window.py:350
+msgid "Chats"
+msgstr "Чаты"
+
+#: ../src/message_window.py:352
+msgid "Group Chats"
+msgstr "Комнаты"
+
+#: ../src/message_window.py:354
+msgid "Private Chats"
+msgstr "Личные беседы"
+
+#: ../src/message_window.py:356
 msgid "Messages"
 msgstr "Сообщения"
 
-#: ../src/message_window.py:274
+#: ../src/message_window.py:357
 #, python-format
 msgid "%s - Gajim"
 msgstr "%s - Gajim"
 
-#: ../src/notify.py:196
+#: ../src/negotiation.py:13
+msgid "- messages will be logged"
+msgstr "- сообщения будут записаны в лог"
+
+#: ../src/negotiation.py:15
+msgid "- messages will not be logged"
+msgstr "- сообщения не будут записаны в лог"
+
+#: ../src/negotiation.py:24
+msgid "OK to continue with negotiation?"
+msgstr ""
+
+#: ../src/negotiation.py:25
+#, python-format
+msgid ""
+"You've begun an encrypted session with %s, but it can't be guaranteed that "
+"you're talking directly to the person you think you are.\n"
+"\n"
+"You should speak with them directly (in person or on the phone) and confirm "
+"that their Short Authentication String is identical to this one: %s\n"
+"\n"
+"Would you like to continue with the encrypted session?"
+msgstr ""
+
+#: ../src/negotiation.py:31
+msgid "Yes, I verified the Short Authentication String"
+msgstr ""
+
+#: ../src/notify.py:217
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s меняет статус"
 
-#: ../src/notify.py:206
+#: ../src/notify.py:227
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s подключается"
 
-#: ../src/notify.py:214
+#: ../src/notify.py:235
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s отключается"
 
-#: ../src/notify.py:226
+#: ../src/notify.py:247
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Новое сообщение от %(nickname)s"
 
-#: ../src/notify.py:234
+#: ../src/notify.py:255
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Новое личное сообщение из комнаты %s"
 
-#: ../src/notify.py:235
+#: ../src/notify.py:257
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:241
+#: ../src/notify.py:260
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Новое сообщение от %(nickname)s"
+
+#: ../src/notify.py:266
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Новое сообщение от %(nickname)s"
 
-#: ../src/profile_window.py:72 ../src/profile_window.py:376
+#: ../src/profile_window.py:54
 msgid "Retrieving profile..."
 msgstr "Получаю данные..."
 
-#: ../src/profile_window.py:107 ../src/profile_window.py:203
-#: ../src/profile_window.py:212 ../src/profile_window.py:370
-msgid "Click to set your avatar"
-msgstr "Установить свою аватару"
+#: ../src/profile_window.py:107 ../src/roster_window.py:1914
+msgid "File is empty"
+msgstr "Пустой файл"
+
+#: ../src/profile_window.py:110 ../src/roster_window.py:1917
+msgid "File does not exist"
+msgstr "Файл не существует"
 
 #. keep identation
-#: ../src/profile_window.py:136
+#. unknown format
+#: ../src/profile_window.py:124 ../src/profile_window.py:140
+#: ../src/roster_window.py:1919 ../src/roster_window.py:1930
 msgid "Could not load image"
 msgstr "Не могу загрузить изображение"
 
-#: ../src/profile_window.py:238
+#: ../src/profile_window.py:250
 msgid "Information received"
 msgstr "Информация получена"
 
-#: ../src/profile_window.py:308
+#: ../src/profile_window.py:319
 msgid "Without a connection you can not publish your contact information."
 msgstr "Необходимо присоединиться к серверу для обновления личной информации"
 
-#: ../src/profile_window.py:320
+#: ../src/profile_window.py:331
 msgid "Sending profile..."
 msgstr "Отправляю данные..."
 
-#: ../src/profile_window.py:328
-msgid "Information published"
-msgstr "Информация опубликована"
-
-#: ../src/profile_window.py:340
+#: ../src/profile_window.py:346
 msgid "Information NOT published"
 msgstr "Информация НЕ опубликована"
 
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:353
 msgid "vCard publication failed"
 msgstr "Публикация vCard не удалась"
 
-#: ../src/profile_window.py:348
+#: ../src/profile_window.py:354
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
-msgstr "При публикации вашей личной информации произошла ошибка, попробуйте позже."
-
-#: ../src/profile_window.py:374
-msgid "Without a connection, you can not get your contact information."
-msgstr "Необходимо присоединиться к серверу для получения информации о контакте"
+msgstr ""
+"При публикации вашей личной информации произошла ошибка, попробуйте позже."
 
-#: ../src/roster_window.py:168 ../src/roster_window.py:223
+#: ../src/roster_window.py:194 ../src/roster_window.py:249
 msgid "Merged accounts"
 msgstr "Объединенные учетные записи"
 
-#: ../src/roster_window.py:340 ../src/common/helpers.py:42
+#: ../src/roster_window.py:370 ../src/roster_window.py:635
+#: ../src/roster_window.py:2145 ../src/common/contacts.py:312
+#: ../src/common/helpers.py:53
 msgid "Observers"
 msgstr "Наблюдатели"
 
-#: ../src/roster_window.py:686 ../src/roster_window.py:3133
+#. Make special context menu if group is Groupchats
+#: ../src/roster_window.py:454 ../src/roster_window.py:459
+#: ../src/roster_window.py:1967 ../src/roster_window.py:1970
+#: ../src/roster_window.py:2640 ../src/roster_window.py:2643
+#: ../src/roster_window.py:2668 ../src/roster_window.py:4763
+#: ../src/roster_window.py:4765 ../src/common/commands.py:199
+#: ../src/common/contacts.py:102 ../src/common/helpers.py:53
+msgid "Groupchats"
+msgstr "Комнаты"
+
+#: ../src/roster_window.py:784 ../src/roster_window.py:4012
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Вы не можете зайти в комнату, так как вы в режиме невидимости."
 
 #. new chat
+#. single message
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192
+#. join gc
+#: ../src/roster_window.py:1005 ../src/roster_window.py:1015
+#: ../src/roster_window.py:1024 ../src/systray.py:212 ../src/systray.py:217
+#: ../src/systray.py:223
 #, python-format
 msgid "using account %s"
 msgstr "используя учетную запись %s"
 
-#. the 'manage gc bookmarks' item is shown
-#. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:903
+#: ../src/roster_window.py:1031
 #, python-format
 msgid "to %s account"
 msgstr "для учетной записи %s"
 
 #. disco
-#: ../src/roster_window.py:908
+#: ../src/roster_window.py:1036
 #, python-format
 msgid "using %s account"
 msgstr "учетной записи %s"
 
+#: ../src/roster_window.py:1117
+msgid "_Manage Bookmarks..."
+msgstr "Управление _закладками..."
+
 #. profile, avatar
-#: ../src/roster_window.py:983
+#: ../src/roster_window.py:1136
 #, python-format
 msgid "of account %s"
 msgstr "для учетной записи %s"
 
-#: ../src/roster_window.py:1003
-msgid "_Manage Bookmarks..."
-msgstr "Управление _закладками..."
-
-#: ../src/roster_window.py:1032
+#: ../src/roster_window.py:1176
 #, python-format
 msgid "for account %s"
 msgstr "для учетной записи %s"
 
 #. History manager
-#: ../src/roster_window.py:1053
+#: ../src/roster_window.py:1200
 msgid "History Manager"
 msgstr "Менеджер истории"
 
-#: ../src/roster_window.py:1062
+#: ../src/roster_window.py:1209
 msgid "_Join New Group Chat"
 msgstr "Войти в новую комнату"
 
-#: ../src/roster_window.py:1380 ../src/roster_window.py:3326
-#: ../src/roster_window.py:3333
+#: ../src/roster_window.py:1576 ../src/roster_window.py:4217
+#: ../src/roster_window.py:4224
 msgid "You have unread messages"
 msgstr "У вас есть непрочитанные сообщения"
 
-#: ../src/roster_window.py:1381
+#: ../src/roster_window.py:1577
 msgid "You must read them before removing this transport."
 msgstr "Просмотрите все ожидающие события перед удалением транспорта."
 
-#: ../src/roster_window.py:1384
+#: ../src/roster_window.py:1580
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт \"%s\" будет удален"
 
-#: ../src/roster_window.py:1385
+#: ../src/roster_window.py:1581
 msgid ""
-"You will no longer be able to send and receive messages to contacts from "
+"You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr ""
 "У вас теперь не будет возможности приема и отправки сообщения контактам "
 "через этот транспорт."
 
-#: ../src/roster_window.py:1388
+#: ../src/roster_window.py:1584
 msgid "Transports will be removed"
 msgstr "Транспорты будут удалены"
 
-#: ../src/roster_window.py:1393
+#: ../src/roster_window.py:1589
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -4937,114 +5963,150 @@ msgstr ""
 "транспорты:%s."
 
 #. it's jid
-#: ../src/roster_window.py:1413
+#: ../src/roster_window.py:1755
 msgid "Rename Contact"
 msgstr "Переименовать контакт"
 
-#: ../src/roster_window.py:1414
+#: ../src/roster_window.py:1756
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Введите новый ник для контакта %s"
 
-#: ../src/roster_window.py:1421
+#: ../src/roster_window.py:1763
 msgid "Rename Group"
 msgstr "Переименовать группу"
 
-#: ../src/roster_window.py:1422
+#: ../src/roster_window.py:1764
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Введите новое название для группы %s"
 
-#: ../src/roster_window.py:1476
+#: ../src/roster_window.py:1839
 msgid "Remove Group"
 msgstr "Удалить группу"
 
-#: ../src/roster_window.py:1477
+#: ../src/roster_window.py:1840
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Вы точно хотите удалить группу %s из ростера?"
 
-#: ../src/roster_window.py:1478
+#: ../src/roster_window.py:1841
 msgid "Remove also all contacts in this group from your roster"
 msgstr "Удалить из ростера все контакты в этой группе"
 
-#: ../src/roster_window.py:1502
+#: ../src/roster_window.py:1872
 msgid "Assign OpenPGP Key"
 msgstr "Назначить OpenPGP ключ"
 
-#: ../src/roster_window.py:1503
+#: ../src/roster_window.py:1873
 msgid "Select a key to apply to the contact"
 msgstr "Выберите ключ, который будет применен к контакту"
 
-#: ../src/roster_window.py:1784 ../src/roster_window.py:1960
-msgid "_New group chat"
-msgstr "_Новая комната"
+#: ../src/roster_window.py:2191
+msgid "_New Group Chat"
+msgstr "В новую комнату"
 
-#: ../src/roster_window.py:1842
+#: ../src/roster_window.py:2331
 msgid "I would like to add you to my roster"
 msgstr "Вы не против, если я добавлю Вас к себе в ростер?"
 
-#: ../src/roster_window.py:2005 ../src/roster_window.py:2052
+#. Send Group Message
+#: ../src/roster_window.py:2465 ../src/roster_window.py:2677
 msgid "Send Group M_essage"
 msgstr "_Отправить сообщение группе"
 
-#: ../src/roster_window.py:2031
-msgid "Re_name"
-msgstr "П_ереименовать"
+#: ../src/roster_window.py:2484
+msgid "_New group chat"
+msgstr "_Новая комната"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:2522
+msgid "_Manage Contacts"
+msgstr "_Управление контактами"
+
+#: ../src/roster_window.py:2583
+msgid "_Maximize"
+msgstr ""
+
+#: ../src/roster_window.py:2590
+#, fuzzy
+msgid "_Disconnect"
+msgstr "Контакт отключился"
 
-#: ../src/roster_window.py:2058
+#: ../src/roster_window.py:2669
+msgid "_Maximize All"
+msgstr ""
+
+#: ../src/roster_window.py:2685
 msgid "To all users"
 msgstr "Всем пользователям"
 
-#: ../src/roster_window.py:2061
+#: ../src/roster_window.py:2688
 msgid "To all online users"
 msgstr "Всем, кто подключён"
 
-#: ../src/roster_window.py:2097
+#. Log Off
+#: ../src/roster_window.py:2805
+msgid "_Log off"
+msgstr "_Отключиться"
+
+#. Log on
+#: ../src/roster_window.py:2811
 msgid "_Log on"
 msgstr "_Соединиться"
 
-#: ../src/roster_window.py:2107
-msgid "Log _off"
-msgstr "_Отключиться"
+#. Send single message
+#: ../src/roster_window.py:2823
+msgid "Send Single Message"
+msgstr "О_тправить одиночное сообщение"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:2870
+msgid "_Manage Transport"
+msgstr "_Управление транспортом"
 
-#: ../src/roster_window.py:2229 ../src/roster_window.py:2300
+#. Modify Transport
+#: ../src/roster_window.py:2878
+msgid "_Modify Transport"
+msgstr "_Изменить транспорт"
+
+#: ../src/roster_window.py:2992 ../src/roster_window.py:3066
 msgid "_Change Status Message"
 msgstr "_Изменить сообщение о статусе"
 
-#: ../src/roster_window.py:2372
+#: ../src/roster_window.py:3138
 msgid "Authorization has been sent"
 msgstr "Была отправлена авторизация"
 
-#: ../src/roster_window.py:2373
+#: ../src/roster_window.py:3139
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Теперь \"%s\" будет знать о вашем статусе."
 
-#: ../src/roster_window.py:2393
+#: ../src/roster_window.py:3159
 msgid "Subscription request has been sent"
 msgstr "Был отправлен запрос на подписку "
 
-#: ../src/roster_window.py:2394
+#: ../src/roster_window.py:3160
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Если \"%s\" примет ваш запрос, вы будете знать его или её статус"
 
-#: ../src/roster_window.py:2406
+#: ../src/roster_window.py:3172
 msgid "Authorization has been removed"
 msgstr "Авторизация была удалена"
 
-#: ../src/roster_window.py:2407
+#: ../src/roster_window.py:3173
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Теперь \"%s\" всегда будет видеть вас в оффлайне."
 
-#: ../src/roster_window.py:2615
+#: ../src/roster_window.py:3407
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт \"%s\" будет удален из вашего ростера"
 
-#: ../src/roster_window.py:2619
+#: ../src/roster_window.py:3411
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -5052,7 +6114,7 @@ msgstr ""
 "Удаляя контакт, вы одновременно удалите авторизацию, и этот человек больше "
 "не сможет видеть ваш статус."
 
-#: ../src/roster_window.py:2624
+#: ../src/roster_window.py:3416
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -5060,16 +6122,16 @@ msgstr ""
 "Если вы удалите контакт, вы так же удалите и авторизацию. Вы будете видеть "
 "его или её всегда в оффлайне."
 
-#: ../src/roster_window.py:2627
+#: ../src/roster_window.py:3419
 msgid "I want this contact to know my status after removal"
 msgstr "Я хочу, чтобы этот контакт видел мой статус после удаления"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:2631
+#: ../src/roster_window.py:3423
 msgid "Contacts will be removed from your roster"
 msgstr "Контакты будут удалены из вашего ростера"
 
-#: ../src/roster_window.py:2635
+#: ../src/roster_window.py:3427
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -5079,40 +6141,28 @@ msgstr ""
 "Одновременно вы удалите и авторизацию, то есть они всегда будут видеть вас в "
 "оффлайне."
 
-#. TODO: make this string translatable
+#: ../src/roster_window.py:3454
+msgid ""
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
+msgstr ""
+
+#: ../src/roster_window.py:3473
+msgid "GPG is not usable"
+msgstr ""
+
 #. %s is the account name here
-#: ../src/roster_window.py:2693 ../src/common/connection.py:587
-#: ../src/common/zeroconf/connection_zeroconf.py:158
+#: ../src/roster_window.py:3474 ../src/common/connection_handlers.py:2157
+#: ../src/common/zeroconf/connection_zeroconf.py:170
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Вы будете подключены к %s без использования OpenPGP."
 
-#: ../src/roster_window.py:2710
-msgid "Passphrase Required"
-msgstr "Требуется парольная фраза"
-
-#: ../src/roster_window.py:2711
-#, python-format
-msgid "Enter GPG key passphrase for account %s."
-msgstr "Введите парольную фразу GPG для учетной записи %s"
-
-#: ../src/roster_window.py:2716
-msgid "Save passphrase"
-msgstr "Сохранить парольную фразу (небезопасно)"
-
-#: ../src/roster_window.py:2724
-msgid "Wrong Passphrase"
-msgstr "Неверная парольная фраза"
-
-#: ../src/roster_window.py:2725
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Пожалуйста, введите парольную фразу для GPG еще раз или нажмите Отмена."
-
-#: ../src/roster_window.py:2782 ../src/roster_window.py:2842
+#: ../src/roster_window.py:3545 ../src/roster_window.py:3623
 msgid "You are participating in one or more group chats"
 msgstr "Вы находитесь в одной или более комнатах"
 
-#: ../src/roster_window.py:2783 ../src/roster_window.py:2843
+#: ../src/roster_window.py:3546 ../src/roster_window.py:3624
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -5120,20 +6170,21 @@ msgstr ""
 "Переход в состояние невидимости приведет к выходу из этих комнат. Вы точно "
 "хотите стать невидимым?"
 
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:3580
 msgid "No account available"
 msgstr "Нет доступной учетной записи"
 
-#: ../src/roster_window.py:2801
+#: ../src/roster_window.py:3581
 msgid "You must create an account before you can chat with other contacts."
-msgstr "Для начала беседы с другими людьми прежде необходимо создать учетную запись."
+msgstr ""
+"Для начала беседы с другими людьми прежде необходимо создать учетную запись."
 
-#: ../src/roster_window.py:2899
+#: ../src/roster_window.py:3730
 #, python-format
 msgid "\"%(title)s\" by %(artist)s"
 msgstr "%(artist)s \"%(title)s\""
 
-#: ../src/roster_window.py:3327 ../src/roster_window.py:3334
+#: ../src/roster_window.py:4218 ../src/roster_window.py:4225
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -5141,133 +6192,193 @@ msgstr ""
 "Сообщения будут доступны для чтения позже если у вас активирована опция "
 "истории."
 
-#: ../src/roster_window.py:3912
+#: ../src/roster_window.py:4849
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сервер не умеет хранить метаконтакты"
 
-#: ../src/roster_window.py:3914
+#: ../src/roster_window.py:4851
 msgid ""
 "Your server does not support storing metacontacts information. So those "
-"information will not be save on next reconnection."
+"information will not be saved on next reconnection."
 msgstr ""
 "Ваш сервер не умеет хранить данные о метаконтактах. Они будут утеряны при "
 "следующем подключении."
 
-#: ../src/roster_window.py:3956
-msgid "You are about to create a metacontact. Are you sure you want to continue?"
+#: ../src/roster_window.py:4896
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Вы хотите создать метаконтакт?"
 
-#: ../src/roster_window.py:3958
+#: ../src/roster_window.py:4898
 msgid ""
-"Metacontacts are a way to regroup several contacts in one line. Generaly it "
+"Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
-msgstr "Метаконтакты это метод группировки нескольких контактов в одну запись. Обычно это используется когда один и тот же человек имеет несколько аккаунтов в Jabber или на транспортах."
+msgstr ""
+"Метаконтакты это метод группировки нескольких контактов в одну запись. "
+"Обычно это используется когда один и тот же человек имеет несколько "
+"аккаунтов в Jabber или на транспортах."
+
+#: ../src/roster_window.py:4993
+msgid "Invalid file URI:"
+msgstr "Неверный файл:"
+
+#: ../src/roster_window.py:5004
+#, fuzzy, python-format
+msgid "Do you want to send this file to %s:"
+msgid_plural "Do you want to send those files to %s:"
+msgstr[0] "%s хочет отправить вам файл:"
+msgstr[1] "%s хочет отправить вам файл:"
+msgstr[2] "%s хочет отправить вам файл:"
+
+#: ../src/roster_window.py:5332
+msgid "Change Status Message..."
+msgstr "Изменить сообщение о статусе..."
 
-#: ../src/roster_window.py:4125
-#, python-format
-msgid "Drop %s in group %s"
-msgstr "Сбросить %s в группе %s"
+#: ../src/search_window.py:91
+msgid "Waiting for results"
+msgstr ""
 
-#: ../src/roster_window.py:4132
-#, python-format
-msgid "Make %s and %s metacontacts"
-msgstr "Сделать %s и %s метаконтактами"
+#: ../src/search_window.py:131 ../src/search_window.py:209
+msgid "Error in received dataform"
+msgstr ""
 
-#: ../src/roster_window.py:4319
-msgid "Change Status Message..."
-msgstr "Изменить сообщение о статусе..."
+#. No result
+#: ../src/search_window.py:165 ../src/search_window.py:201
+msgid "No result"
+msgstr ""
+
+#: ../src/secrets.py:45
+msgid ""
+"To continue, Gajim needs to access your stored secrets. Enter your passphrase"
+msgstr ""
 
-#: ../src/systray.py:144
+#: ../src/secrets.py:89
+msgid "Confirm Passphrase"
+msgstr "Подтверждение парольной фразы"
+
+#: ../src/secrets.py:90
+msgid "Enter your new passphrase again for confirmation"
+msgstr "Введите снова для подтверждения"
+
+#: ../src/secrets.py:95 ../src/secrets.py:107
+msgid "Create Passphrase"
+msgstr "Создать парольную фразу"
+
+#: ../src/secrets.py:96
+msgid "Passphrases did not match.\n"
+msgstr "Пароли не совпадают.\n"
+
+#: ../src/secrets.py:97 ../src/secrets.py:108
+msgid "Gajim needs you to create a passphrase to encrypt stored secrets"
+msgstr ""
+
+#: ../src/systray.py:169
 msgid "_Change Status Message..."
 msgstr "_Изменить сообщение о статусе..."
 
-#: ../src/systray.py:234
+#: ../src/systray.py:254
 msgid "Hide this menu"
 msgstr "Скрыть это меню"
 
-#: ../src/tooltips.py:309 ../src/tooltips.py:492
+#: ../src/tooltips.py:316 ../src/tooltips.py:509
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:312 ../src/tooltips.py:496
+#: ../src/tooltips.py:319 ../src/tooltips.py:513
 msgid "Resource: "
 msgstr "Ресурс: "
 
-#: ../src/tooltips.py:317
+#: ../src/tooltips.py:324
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s этой комнаты"
 
-#: ../src/tooltips.py:430 ../src/tooltips.py:610
+#: ../src/tooltips.py:422
+msgid " [blocked]"
+msgstr ""
+
+#: ../src/tooltips.py:426
+msgid " [minimized]"
+msgstr ""
+
+#: ../src/tooltips.py:441 ../src/tooltips.py:629
 msgid "Status: "
 msgstr "Статус: "
 
-#: ../src/tooltips.py:461
+#: ../src/tooltips.py:471
 #, python-format
 msgid "Last status: %s"
 msgstr "Последний статус: %s"
 
-#: ../src/tooltips.py:463
+#: ../src/tooltips.py:473
 #, python-format
 msgid " since %s"
 msgstr " с %s"
 
+#: ../src/tooltips.py:491
+msgid "Connected"
+msgstr "Соединение"
+
+#: ../src/tooltips.py:493
+msgid "Disconnected"
+msgstr "Контакт отключился"
+
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:520
 msgid "Subscription: "
 msgstr "Подписка: "
 
-#: ../src/tooltips.py:512
+#: ../src/tooltips.py:530
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:566
+#: ../src/tooltips.py:585
 msgid "Download"
 msgstr "Загрузить"
 
-#: ../src/tooltips.py:572
+#: ../src/tooltips.py:591
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:579
+#: ../src/tooltips.py:598
 msgid "Type: "
 msgstr "Тип: "
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:604
 msgid "Transferred: "
 msgstr "Передано: "
 
-#: ../src/tooltips.py:588 ../src/tooltips.py:609
+#: ../src/tooltips.py:607 ../src/tooltips.py:628
 msgid "Not started"
 msgstr "Не начато"
 
-#: ../src/tooltips.py:592
+#: ../src/tooltips.py:611
 msgid "Stopped"
 msgstr "Остановлено"
 
-#: ../src/tooltips.py:594 ../src/tooltips.py:597
+#: ../src/tooltips.py:613 ../src/tooltips.py:616
 msgid "Completed"
 msgstr "Завершено"
 
-#: ../src/tooltips.py:601
+#: ../src/tooltips.py:620
 msgid "?transfer status:Paused"
 msgstr "Приостановлено"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:605
+#: ../src/tooltips.py:624
 msgid "Stalled"
 msgstr "Ожидание"
 
-#: ../src/tooltips.py:607
+#: ../src/tooltips.py:626
 msgid "Transferring"
 msgstr "Передается"
 
-#: ../src/tooltips.py:639
+#: ../src/tooltips.py:662
 msgid "This service has not yet responded with detailed information"
 msgstr "Этот сервис еще не сообщил информацию о себе"
 
-#: ../src/tooltips.py:642
+#: ../src/tooltips.py:665
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -5275,24 +6386,24 @@ msgstr ""
 "Этот сервис не может предоставить информацию о себе . \n"
 "Похоже что он или неверно настроен или сломан"
 
-#: ../src/vcard.py:217
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/vcard.py:219
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "Неизвестна"
 
-#: ../src/vcard.py:247 ../src/vcard.py:449
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:472
 #, python-format
 msgid "since %s"
 msgstr "с %s"
 
-#: ../src/vcard.py:277
+#: ../src/vcard.py:311
 msgid "Affiliation:"
 msgstr "Ранг:"
 
-#: ../src/vcard.py:285
+#: ../src/vcard.py:319
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -5300,7 +6411,7 @@ msgstr ""
 "Этот контакт хочет знать о вашем присутствии, но вам информация о его или её "
 "присутствии не интересна"
 
-#: ../src/vcard.py:287
+#: ../src/vcard.py:321
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -5308,83 +6419,155 @@ msgstr ""
 "Вам хочется получать информацию о присутствии контакта, но он или она не "
 "заинтересована в вашей."
 
-#: ../src/vcard.py:289
+#: ../src/vcard.py:323
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Вы и контакт оба желаете знать о присутствии друг друга"
 
 #. None
-#: ../src/vcard.py:291
+#: ../src/vcard.py:325
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Ни вы, ни ваш контакт не желаете знать о присутствии друг друга"
 
-#: ../src/vcard.py:299
+#: ../src/vcard.py:333
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Вы ожидаете ответа контакта на запрос на подписку"
 
-#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482
+#: ../src/vcard.py:337 ../src/vcard.py:374 ../src/vcard.py:497
 msgid " resource with priority "
 msgstr " ресурс с приоритетом "
 
-#: ../src/common/check_paths.py:33
+#: ../src/common/check_paths.py:38
 msgid "creating logs database"
 msgstr "создается БД истории"
 
-#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100
-#: ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:112
+#: ../src/common/check_paths.py:119
 #, python-format
-msgid "%s is file but it should be a directory"
+msgid "%s is a file but it should be a directory"
 msgstr "%s должен быть директорией, а не файлом"
 
-#: ../src/common/check_paths.py:90 ../src/common/check_paths.py:101
-#: ../src/common/check_paths.py:108 ../src/common/check_paths.py:116
+#: ../src/common/check_paths.py:102 ../src/common/check_paths.py:113
+#: ../src/common/check_paths.py:120 ../src/common/check_paths.py:128
 msgid "Gajim will now exit"
 msgstr "Закончить работу"
 
-#: ../src/common/check_paths.py:115
+#: ../src/common/check_paths.py:127
 #, python-format
-msgid "%s is directory but should be file"
+msgid "%s is a directory but should be a file"
 msgstr "%s должен быть файлом, а не директорией"
 
-#: ../src/common/check_paths.py:131
+#: ../src/common/check_paths.py:143
 #, python-format
 msgid "creating %s directory"
 msgstr "создается директория %s"
 
-#: ../src/common/config.py:55
+#: ../src/common/commands.py:74
+msgid "Change status information"
+msgstr "Изменить информацию о статусе"
+
+#: ../src/common/commands.py:87
+msgid "Change status"
+msgstr "Контакт изменит статус"
+
+#: ../src/common/commands.py:88
+msgid "Set the presence type and description"
+msgstr "Установка статуса и статусного сообщения"
+
+#: ../src/common/commands.py:94
+msgid "Free for chat"
+msgstr "Готов поболтать"
+
+#: ../src/common/commands.py:95
+msgid "Online"
+msgstr "В сети"
+
+#: ../src/common/commands.py:97
+msgid "Extended away"
+msgstr ""
+
+#: ../src/common/commands.py:98
+msgid "Do not disturb"
+msgstr "Не беспокоить."
+
+#: ../src/common/commands.py:99
+msgid "Offline - disconnect"
+msgstr ""
+
+#: ../src/common/commands.py:104
+#, fuzzy
+msgid "Presence description:"
+msgstr "Описание ошибки..."
+
+#: ../src/common/commands.py:139
+msgid "The status has been changed."
+msgstr "Статус изменён."
+
+#: ../src/common/commands.py:170 ../src/common/commands.py:194
+msgid "Leave Groupchats"
+msgstr "Покинуть конференции"
+
+#: ../src/common/commands.py:184
+#, python-format
+msgid "%(nickname)s on %(room_jid)s"
+msgstr "%(nickname)s из комнаты %(room_jid)s"
+
+#: ../src/common/commands.py:188
+msgid "You have not joined a groupchat."
+msgstr "Вы не вошли в комнату."
+
+#: ../src/common/commands.py:195
+msgid "Choose the groupchats you want to leave"
+msgstr "Выберите конференции которые вы хотите покинуть"
+
+#: ../src/common/commands.py:235
+msgid "You left the following groupchats:"
+msgstr "Вы покинули следующие комнаты:"
+
+#: ../src/common/commands.py:247
+msgid "Forward unread messages"
+msgstr "Переслать непрочитанные сообщения"
+
+#: ../src/common/commands.py:267
+msgid "All unread messages have been forwarded."
+msgstr "Все непрочитанные сообщения отправлены."
+
+#: ../src/common/config.py:74
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Использовать DBus и Notification Daemon для показа уведомлений"
 
-#: ../src/common/config.py:60
+#: ../src/common/config.py:79
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Время в минутах, после которого ваш статус изменится на Отошел."
 
-#: ../src/common/config.py:61
+#: ../src/common/config.py:80
 msgid "Away as a result of being idle"
 msgstr "Автостатус 'Отошел' из-за бездействия пользователя."
 
-#: ../src/common/config.py:63
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Время в минутах, после которого ваш статус изменится на Недоступен."
 
-#: ../src/common/config.py:64
+#: ../src/common/config.py:83
 msgid "Not available as a result of being idle"
 msgstr "Автостатус 'Недоступен' из-за бездействия пользователя."
 
-#: ../src/common/config.py:82
-msgid "List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr "Список (через пробел) строк (учётных записей и групп), которые свёрнуты."
+#: ../src/common/config.py:101
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"Список (через пробел) строк (учётных записей и групп), которые свёрнуты."
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:106
 msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:90
+#: ../src/common/config.py:109
 msgid "Language used by speller"
 msgstr "Язык, используемый при проверке правописания"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:110
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -5394,46 +6577,87 @@ msgstr ""
 "\"иногда\" - печатать время каждые несколько минут.\n"
 "\"никогда\" - не печатать время."
 
-#: ../src/common/config.py:92
+#: ../src/common/config.py:111
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
-"to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
-msgstr "Печатать время в беседе как в неточных часах. Степень неточности может быть от 1 до 4, 0 отключает эту функцию. 1 самые точные часы, 4 самые неточные. Используется только если режим печати времени установлен на \"иногда\"."
+msgstr ""
+"Печатать время в беседе как в неточных часах. Степень неточности может быть "
+"от 1 до 4, 0 отключает эту функцию. 1 самые точные часы, 4 самые неточные. "
+"Используется только если режим печати времени установлен на \"иногда\"."
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:114
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Обрабатывать пары * / _ как возможные форматирующие символы."
 
-#: ../src/common/config.py:96
-msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+#: ../src/common/config.py:115
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Если True, то не будут удаляться */_. Так что *фыва* будет написано "
 "полужирным шрифтом, но * * удалены не будут"
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:118
 msgid ""
-"Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
-"(If you want to use this, install docutils)"
+"Uses ReStructured text markup to send HTML, plus ascii formatting if "
+"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html (If you want to use this, install docutils)"
 msgstr ""
 
-#: ../src/common/config.py:108
+#: ../src/common/config.py:127
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
-msgstr "Символ, который нужно добавлять к нику, когда используется дополнение (tab) в комнате."
+msgstr ""
+"Символ, который нужно добавлять к нику, когда используется дополнение (tab) "
+"в комнате."
 
-#: ../src/common/config.py:109
+#: ../src/common/config.py:128
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
-msgstr "Символ, который будет добавляться после ника, когда желаемый ник уже занят кем-нибудь в комнате."
+msgstr ""
+"Символ, который будет добавляться после ника, когда желаемый ник уже занят "
+"кем-нибудь в комнате."
+
+#: ../src/common/config.py:151
+msgid ""
+"This option let you customize timestamp that is printed in conversation. For "
+"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
+"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+msgstr ""
+"Эта опция позволяет настроить отпечаток времени, который печатается в чатах. "
+"К примеру \"[%H:%M]\" будет показано как \"[чч:мм]\". Смотрите дополнительно "
+"документацию python к strftime (http://docs.python.org/lib/module-time.html)"
+
+#: ../src/common/config.py:152
+msgid "Characters that are printed before the nickname in conversations"
+msgstr "Символы, которые будут отображаться перед никами в чате"
+
+#: ../src/common/config.py:153
+msgid "Characters that are printed after the nickname in conversations"
+msgstr "Символы, которые будут отображаться после ников в чате"
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:156
+msgid ""
+"If checked, Gajim can regularly poll a Last.fm account and adjust the status "
+"message to reflect recently played songs. "
+"set_status_msg_from_current_music_track option must be False."
+msgstr ""
+"Если включено, Gajim будет проверять аккаунт на Last.fm и менять ваш статус "
+"на имя проигрываемого трека. set_status_msg_from_current_music_track опция "
+"должна быть  False."
+
+#: ../src/common/config.py:157
+msgid "The username used to identify the Last.fm account."
+msgstr "Имя пользователя на Last.fm."
+
+#: ../src/common/config.py:161
 msgid "Add * and [n] in roster title?"
 msgstr "Добавлять * и [n] в окно ростера?"
 
-#: ../src/common/config.py:143
+#: ../src/common/config.py:162
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -5441,11 +6665,11 @@ msgstr ""
 "Сколько строк из предыдущей беседы выводить, когда вкладка/окно открываются "
 "вновь."
 
-#: ../src/common/config.py:144
+#: ../src/common/config.py:163
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Сколько минут должны оставаться последние строки из предыдущей беседы."
 
-#: ../src/common/config.py:145
+#: ../src/common/config.py:164
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -5453,11 +6677,11 @@ msgstr ""
 "Оправлять сообщения по Ctrl+Enter и Enter создает новую строку (как в "
 "Mirabilis ICQ)"
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:166
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Сколько строк хранить для Ctrl+Стрелка вверх"
 
-#: ../src/common/config.py:150
+#: ../src/common/config.py:169
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -5466,49 +6690,61 @@ msgstr ""
 "Введите свою ссылку с %s, в которой %s подменяет слово/фразу или "
 "'WIKTIONARY', что значит: \"использовать wiktionary\"."
 
-#: ../src/common/config.py:153
+#: ../src/common/config.py:172
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Если отмечено, то Gajim'ом можно будет управлять удаленно с использованием "
 "gajim-remote."
 
-#: ../src/common/config.py:154
+#: ../src/common/config.py:173
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
 "False and they sync with global status) based upon the status of the network "
 "connection."
 msgstr ""
+"Если True, тогда \"слушать\" сообщения от NetworkManager по D-Bus и изменять "
+"статус аккаунтов в зависимости от состояния сетевого соединения (необходимо "
+"чтобы аккаунты не имели установленной в False опции "
+"listen_to_network_manager и они должны синхронизировать свой статус с "
+"глобальным)"
 
-#: ../src/common/config.py:155
-msgid "Sent chat state notifications. Can be one of all, composing_only, disabled."
-msgstr "Отсылать уведомления о состоянии беседы. Может быть одним из \"все\", \"только написание\", \"отключено\"."
+#: ../src/common/config.py:174
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+"Отсылать уведомления о состоянии беседы. Может быть одним из \"все\", "
+"\"только печать\", \"отключено\"."
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:175
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
-msgstr "Отображать состояния беседы в окне беседы. Может быть одним из \"все\", \"только написание\", \"отключено\"."
+msgstr ""
+"Отображать состояния беседы в окне беседы. Может быть одним из \"все\", "
+"\"только написание\", \"отключено\"."
 
-#: ../src/common/config.py:158
+#: ../src/common/config.py:177
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
-msgstr "Есди отключена печать времени для каждого сообщения, то печатать его каждые X минут."
+msgstr ""
+"Есди отключена печать времени для каждого сообщения, то печатать его каждые "
+"X минут."
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:178
 msgid "Ask before closing a group chat tab/window."
 msgstr "Спрашивать перед закрытием окна/вкладки комнаты."
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:179
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 msgstr ""
-"Всегда спрашивать перед закрытием окна/вкладки комнаты из этом списка. "
+"Всегда спрашивать перед закрытием окна/вкладки комнаты из этого списка. "
 "Комнаты в списке разделяются пробелом."
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:180
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -5516,39 +6752,61 @@ msgstr ""
 "Никогда не спрашивать перед закрытием окна/вкладки комнаты из этого списка. "
 "Комнаты в списке разделяются пробелом."
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:183
 msgid ""
-"Overrides the host we send for File Transfer in case of address translation/"
-"port forwarding."
+"Comma separated list of hosts that we send, in addition of local interfaces, "
+"for File Transfer in case of address translation/port forwarding."
 msgstr ""
 "Указвает имя хоста, которое мы отсылаем при передаче файлов, в случае если "
 "мы за NAT или используется проброс портов."
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
-msgstr "IEC утверждает что KiB = 1024 байт, KB = 1000 байт"
+msgstr "IEC стандарт утверждает, что KiB = 1024 байт, KB = 1000 байт"
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr "Уведомлять о событиях в системном лотке."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
-msgstr "Показывать вкладку при одной беседе?"
+msgstr "Показывать вкладку при одном чат-окне?"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:194
 msgid "Show tabbed notebook border in chat windows?"
-msgstr "Показывать границу вкладки в окне беседы?"
+msgstr "Показывать границу вкладки в окне чата?"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Показывать кнопку закрытия на вкладке?"
 
-#: ../src/common/config.py:189
-msgid "A semicolon-separated list of words that will be highlighted in group chats."
-msgstr "Список слов (через точку с запятой), которые будут подсвечиваться в комнатах."
+#: ../src/common/config.py:196
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+"Когда устанавливается зашифрованная сессия, дожен ли Gajim предположить,  "
+"что Вы хотите сохранить историю сообщений?"
+
+#: ../src/common/config.py:197
+msgid ""
+"When negotiating an encrypted session, should Gajim prefer to use public "
+"keys for identification?"
+msgstr ""
+"Когда устанавливается зашифрованная сессия, дожен ли Gajim предпочитать "
+"использовать открытый ключ для идентификации?"
+
+#: ../src/common/config.py:206
+msgid "Preview new messages in notification popup?"
+msgstr "Предпросмотр новых сообщений во всплывающем окне?"
+
+#: ../src/common/config.py:211
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"Список слов (через точку с запятой), которые будут подсвечиваться в комнатах."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:212
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -5556,11 +6814,14 @@ msgstr ""
 "Если True, то Gajim будет завершаться при нажатии на кнопку закрытия окна. "
 "Эта опция учитывается только если используется иконка для трея."
 
-#: ../src/common/config.py:191
-msgid "If True, Gajim registers for xmpp:// on each startup."
-msgstr "Если True, то Gajim будет регистрировать xmpp:// при каждом запуске"
+#: ../src/common/config.py:213
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr ""
+"Если True, то Gajim будет проверять при запуске,является ли он jabber-"
+"клиентом по умолчанию."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:214
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -5568,7 +6829,7 @@ msgstr ""
 "Если True, то Gajim иконку на каждой вкладке, которая содержит непрочитанные "
 "сообщения. В зависимости от темы, она может быть анимированной."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:215
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -5576,7 +6837,7 @@ msgstr ""
 "Если True, то Gajim будет отображать сообщение о статусе, если оно не "
 "пустое, для каждого контакта под именем контакта в окне ростера"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:217
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -5584,44 +6845,52 @@ msgstr ""
 "Если True, то Gajim будет запрашивать аватару для каждого контакта, у "
 "которого её не было в последний раз или она уже слишком старая."
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:218
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
 msgstr ""
-"Если отключено, то Gajim больше не будет показывать статусную строку в окне беседы, "
-"когда контакт меняет его или её статус и/или сообщение о статусе."
+"Если отключено, то Gajim больше не будет показывать статусную строку в окне "
+"беседы, когда контакт меняет его или её статус и/или сообщение о статусе."
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:219
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
 "status and/or his or her status message. If \"all\" Gajim will print all "
-"status messages. If \"in_and_out\", gajim will only print FOO enters/leaves "
+"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
 "group chat."
-msgstr "может быть \"нет\", \"все\" или \"вход и выход\". Если установлено \"нет\", то Gajim больше не будет выводить сообщения о статусе в комнатах когда участник или участница меняет свой статус или сообщение о статусе. Если установлено в \"все\", то Gajim будет выводить все сообщения о статусе. Если установлено в \"вход и выход\", то Gajim будет выводить сообщение только когда кто-то входит или выходит из комнаты."
+msgstr ""
+"может быть \"none\", \"all\" или \"in_and_out\". Если установлено \"none\", "
+"то Gajim больше не будет выводить сообщения о статусе в комнатах когда "
+"участник меняет свой статус или сообщение о статусе. Если установлено в \"all"
+"\", то Gajim будет выводить все сообщения о статусе. Если установлено в "
+"\"in_and_out\", то Gajim будет выводить сообщение только когда кто-то входит "
+"или выходит из комнаты."
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:221
 msgid "Background color of contacts when they just signed in."
 msgstr "Фоновый цвет контакта, который только что вошел."
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:222
 msgid "Background color of contacts when they just signed out."
 msgstr "Фоновый цвет контакта, который только что вышел."
 
-#: ../src/common/config.py:202
-msgid "If True, restored messages will use a smaller font than the default one."
-msgstr "Если установлено, то восстановленные сообщения будут иметь меньший шрифт."
+#: ../src/common/config.py:224
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+"Если установлено, то восстановленные сообщения будут иметь меньший шрифт."
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:225
 msgid "Don't show avatar for the transport itself."
 msgstr "Не показывать аватар для транспорта."
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:226
 msgid "Don't show roster in the system taskbar."
 msgstr "Не показывать ростер в панели задач."
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:227
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -5631,7 +6900,7 @@ msgstr ""
 "(поведение по умолчанию для большинства менеджеров окон) когда присутствуют "
 "не просмотренные события."
 
-#: ../src/common/config.py:207
+#: ../src/common/config.py:229
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -5642,7 +6911,7 @@ msgstr ""
 "информации для комнат"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:210
+#: ../src/common/config.py:232
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -5660,77 +6929,153 @@ msgstr ""
 "свое окно. Заметьте, что при изменении этого параметра требуется перезапуск "
 "Gajim, чтобы изменения вступили в силу."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:233
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Если False, вы больше не будете видеть аватары в окне беседы."
 
-#: ../src/common/config.py:212
+#: ../src/common/config.py:234
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Если True, то нажатие клавиши Escape будет закрывать вкладку/окно."
 
-#: ../src/common/config.py:213
-msgid "Hides the buttons in group chat window."
-msgstr "Скрывает кнопки окна комнаты."
+#: ../src/common/config.py:235
+msgid "Hides the buttons in chat windows."
+msgstr "Скрывает кнопки в окнах чата."
 
-#: ../src/common/config.py:214
-msgid "Hides the buttons in two persons chat window."
-msgstr "Скрывает кнопки в окне беседы."
-
-#: ../src/common/config.py:215
+#: ../src/common/config.py:236
 msgid "Hides the banner in a group chat window"
 msgstr "Скрывает баннер в окне комнаты"
 
-#: ../src/common/config.py:216
+#: ../src/common/config.py:237
 msgid "Hides the banner in two persons chat window"
-msgstr "Скрывает баннер в окне беседы"
+msgstr "Скрывает баннер в окне чата"
 
-#: ../src/common/config.py:217
+#: ../src/common/config.py:238
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Скрывает список посетителей в окне комнаты."
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:239
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
-msgstr "При беседе, показывать ник в начале строки только тогда, когда его произносит участник отличный от того, кто сказал предыдущее."
+msgstr ""
+"Показывать ник в начале строки в чате только если предыдущее сообщение было "
+"написано другим участником."
 
-#: ../src/common/config.py:219
-msgid "Indentation when using merge consecutive nickame."
+#: ../src/common/config.py:240
+msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:241
+msgid "Smooth scroll message in conversation window"
+msgstr "Плавно прокручивать сообщения в окне чата"
+
+#: ../src/common/config.py:242
 msgid "List of colors that will be used to color nicknames in group chats."
-msgstr "Список цветов, которые будут использоваться для раскраски ников в комнатах."
+msgstr ""
+"Список цветов, которые будут использоваться для раскраски ников в комнатах."
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:243
 msgid "Ctrl-Tab go to next composing tab when none is unread."
-msgstr "Использовать Ctrl-Tab чтобы перейти к следующей вкладке с составляемым сообщением, когда нет непрочитанных сообщений."
+msgstr ""
+"Использовать Ctrl-Tab чтобы перейти к следующей вкладке с составляемым "
+"сообщением, когда нет непрочитанных сообщений."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:244
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
-msgstr "А нам надо показывать диалог подтверждения о создании метаконтакта? Если тут пустая строка, то сообщение не будет показываться вообще."
+msgstr ""
+"А нам надо показывать диалог подтверждения о создании метаконтакта? Если тут "
+"пустая строка, то сообщение не будет показываться вообще."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:245
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
-"account modification window. BE CAREFULL, when you are logged in with a "
+"account modification window. BE CAREFUL, when you are logged in with a "
 "negative priority, you will NOT receive any message from your server."
-msgstr "Если установлено, то у вас появится возможность назначить для аккаунта приоритет меньше нуля в окне настройки аккаунта. БУДЬТЕ ОСТОРОЖНЫ, если вы подключитесь еще раз с отрицательным приоритетом, то вы НЕ получите никаких сообщений от сервера."
+msgstr ""
+"Если установлено, то у вас появится возможность назначить для аккаунта "
+"приоритет меньше нуля в окне настройки аккаунта. БУДЬТЕ ОСТОРОЖНЫ, если вы "
+"подключитесь еще раз с отрицательным приоритетом, то вы НЕ получите никаких "
+"сообщений от сервера."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:246
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"Если активно, Gajim будет использовать (если возможно) Gnome Keyring для "
+"хранения паролей учетных записей."
+
+#: ../src/common/config.py:247
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"Если активно, Gajim будет показывать количество контактов онлайн/всего в "
+"строках с названием аккаунта и групп."
+
+#: ../src/common/config.py:248
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+"Может быть пусто, 'chat' или 'normal'. Если не пусто - обрабатывать все "
+"входящие сообщения так, как будто бы они были этого типа."
+
+#: ../src/common/config.py:249
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+"Если активно, Gajim прокрутит ростер и выделит контакт, который написал Вам "
+"сообщение последним, если окно чата еще небыло открыто."
+
+#: ../src/common/config.py:250
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+"Если активно, Gajim будет конвертировать строку между $$ и $$ в изображение, "
+"используя dvips и конвертировать до вставки его в чат-окно."
+
+#: ../src/common/config.py:251
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr "Время не активности прежде чем окно изменения статуса закроется."
+
+#: ../src/common/config.py:252
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr "Максимальное количество строк в окне.Старые строки будут удалены."
+
+#: ../src/common/config.py:253
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+"Если активно, окно уведомления от notification-daemon будет присоединено к "
+"системному трею."
+
+#: ../src/common/config.py:264
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
+"Приоритет будет изменятся автоматически согласно вашему статусу.Приоритеты "
+"для статусов задаются в пункте autopriority_* ."
+
+#: ../src/common/config.py:276
+msgid ""
+"If disabled, don't sign presences with GPG key, even if GPG is configured."
+msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:263
+#: ../src/common/config.py:294
 msgid "Jabberd2 workaround"
 msgstr "Костыль для jabberd2"
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:298
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -5738,101 +7083,101 @@ msgstr ""
 "Если отмечено, Gajim будет использовать ваш IP и прокси, определенные в "
 "параметре file_transfer_proxies для передачи файлов"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:357
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Используется ли для этого контакта OpenPGP"
 
-#: ../src/common/config.py:327 ../src/common/config.py:330
+#: ../src/common/config.py:358 ../src/common/config.py:361
 msgid "Language for which we want to check misspelled words"
 msgstr "Язык, который используется при проверке правописания"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:367
 msgid "all or space separated status"
 msgstr "все или статусы, разделенные пробелом"
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:368
 msgid "'yes', 'no', or 'both'"
 msgstr "\"да\", \"нет\" или \"оба\""
 
-#: ../src/common/config.py:338 ../src/common/config.py:340
-#: ../src/common/config.py:341 ../src/common/config.py:344
-#: ../src/common/config.py:345
+#: ../src/common/config.py:369 ../src/common/config.py:371
+#: ../src/common/config.py:372 ../src/common/config.py:375
+#: ../src/common/config.py:376
 msgid "'yes', 'no' or ''"
 msgstr "\"да\", \"нет\" или \"\""
 
-#: ../src/common/config.py:351
+#: ../src/common/config.py:382
 msgid "Sleeping"
 msgstr "Сплю"
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:383
 msgid "Back soon"
 msgstr "Скоро буду"
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:383
 msgid "Back in some minutes."
 msgstr "Вернусь через несколько минут"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:384
 msgid "Eating"
 msgstr "Ем"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:384
 msgid "I'm eating, so leave me a message."
 msgstr "Кушаю, так что оставьте сообщение секретарю."
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:385
 msgid "Movie"
 msgstr "В кино"
 
-#: ../src/common/config.py:354
+#: ../src/common/config.py:385
 msgid "I'm watching a movie."
 msgstr "Смотрю кино"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:386
 msgid "Working"
 msgstr "Работаю"
 
-#: ../src/common/config.py:355
+#: ../src/common/config.py:386
 msgid "I'm working."
 msgstr "Работаю"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:387
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:356
+#: ../src/common/config.py:387
 msgid "I'm on the phone."
 msgstr "Говорю по телефону"
 
-#: ../src/common/config.py:357
+#: ../src/common/config.py:388
 msgid "Out"
 msgstr "Вышел"
 
-#: ../src/common/config.py:357
+#: ../src/common/config.py:388
 msgid "I'm out enjoying life."
 msgstr "Наслаждаюсь жизнью, чего и вам желаю."
 
-#: ../src/common/config.py:361
+#: ../src/common/config.py:392
 msgid "I'm available."
 msgstr "Я здесь."
 
-#: ../src/common/config.py:362
+#: ../src/common/config.py:393
 msgid "I'm free for chat."
 msgstr "Я готов поболтать."
 
-#: ../src/common/config.py:364
+#: ../src/common/config.py:395
 msgid "I'm not available."
 msgstr "Меня нет."
 
-#: ../src/common/config.py:365
+#: ../src/common/config.py:396
 msgid "Do not disturb."
 msgstr "Не беспокоить."
 
-#: ../src/common/config.py:366 ../src/common/config.py:367
+#: ../src/common/config.py:397 ../src/common/config.py:398
 msgid "Bye!"
 msgstr "Пока!"
 
-#: ../src/common/config.py:376
+#: ../src/common/config.py:407
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -5841,198 +7186,373 @@ msgstr ""
 "содержит слово из списка muc_highlight_words, или когда сообщение содержит "
 "ваш ник."
 
-#: ../src/common/config.py:377
+#: ../src/common/config.py:408
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук, который нужно проигрывать, когда приходит любое сообщение MUC."
 
-#: ../src/common/config.py:386 ../src/common/optparser.py:197
+#: ../src/common/config.py:417 ../src/common/optparser.py:220
 msgid "green"
 msgstr "зеленый"
 
-#: ../src/common/config.py:390 ../src/common/optparser.py:183
+#: ../src/common/config.py:421 ../src/common/optparser.py:206
 msgid "grocery"
 msgstr "овощной"
 
-#: ../src/common/config.py:394
+#: ../src/common/config.py:425
 msgid "human"
 msgstr "телесный"
 
-#: ../src/common/config.py:398
+#: ../src/common/config.py:429
 msgid "marine"
 msgstr "морской"
 
-#: ../src/common/connection_handlers.py:52
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
+#: ../src/common/connection_handlers.py:61
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
 msgid "Unable to load idle module"
 msgstr "Не могу загрузить модуль \"idle\""
 
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
+#: ../src/common/connection_handlers.py:219
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:243
 msgid "Wrong host"
 msgstr "Неверный хост"
 
-#: ../src/common/connection_handlers.py:177
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233
-msgid ""
-"The host you configured as the ft_override_host_to_send advanced option is "
-"not valid, so ignored."
-msgstr ""
+#: ../src/common/connection_handlers.py:220
+msgid "Invalid local address? :-O"
+msgstr "Неправильный локальный адрес? :-O"
 
-#: ../src/common/connection_handlers.py:590
+#: ../src/common/connection_handlers.py:618
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Данные о регистрации для транспорта %s не пришли вовремя."
 
-#: ../src/common/connection_handlers.py:1523
+#: ../src/common/connection_handlers.py:1806
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Ник недопустим: %s"
 
-#. password required to join
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1585
-#: ../src/common/connection_handlers.py:1588
-#: ../src/common/connection_handlers.py:1591
-#: ../src/common/connection_handlers.py:1594
-#: ../src/common/connection_handlers.py:1597
-#: ../src/common/connection_handlers.py:1600
-#: ../src/common/connection_handlers.py:1608
+#: ../src/common/connection_handlers.py:1876
+#: ../src/common/connection_handlers.py:1879
+#: ../src/common/connection_handlers.py:1882
+#: ../src/common/connection_handlers.py:1885
+#: ../src/common/connection_handlers.py:1889
+#: ../src/common/connection_handlers.py:1898
 msgid "Unable to join group chat"
 msgstr "Не получается войти в комнату"
 
-#: ../src/common/connection_handlers.py:1586
-msgid "A password is required to join this group chat."
-msgstr "Чтобы войти в эту комнату, нужен пароль."
-
-#: ../src/common/connection_handlers.py:1589
-msgid "You are banned from this group chat."
-msgstr "Вам запрещено входить в эту комнату."
+#: ../src/common/connection_handlers.py:1877
+#, python-format
+msgid "You are banned from group chat %s."
+msgstr "Вам запрещено входить в комнату %s."
 
-#: ../src/common/connection_handlers.py:1592
-msgid "Such group chat does not exist."
-msgstr "Такой комнаты нет."
+#: ../src/common/connection_handlers.py:1880
+#, python-format
+msgid "Group chat %s does not exist."
+msgstr "Комнаты %s не существует."
 
-#: ../src/common/connection_handlers.py:1595
+#: ../src/common/connection_handlers.py:1883
 msgid "Group chat creation is restricted."
 msgstr "Создание комнат запрещено."
 
-#: ../src/common/connection_handlers.py:1598
-msgid "Your registered nickname must be used."
-msgstr "Требуется использовать ваш зарегистрированный ник."
+#: ../src/common/connection_handlers.py:1886
+#, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Необходимо использовать Ваш зарегистрированный ник в комнате %s."
 
-#: ../src/common/connection_handlers.py:1601
-msgid "You are not in the members list."
-msgstr "Вас нет в списке членов комнаты."
+#: ../src/common/connection_handlers.py:1890
+#, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Вас нет в списке членов комнаты %s."
 
-#: ../src/common/connection_handlers.py:1609
+#: ../src/common/connection_handlers.py:1899
+#, python-format
 msgid ""
-"Your desired nickname is in use or registered by another occupant.\n"
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
-"Тот ник что вы ввели уже используется или зарегистрирован другим пользователем.\n"
+"Тот ник что вы ввели в комнате %s уже используется или зарегистрирован "
+"другим пользователем.\n"
 "Пожалуйста укажите другой ник ниже:"
 
-#: ../src/common/connection_handlers.py:1659
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers.py:1930
+msgid "Room has been destroyed"
+msgstr "Комната была удалена"
+
+#: ../src/common/connection_handlers.py:1937
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1964
 msgid "I would like to add you to my roster."
 msgstr "Вы не возражаете, если я добавлю Вас в свой ростер?"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1680
+#: ../src/common/connection_handlers.py:1985
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "теперь мы подписались на %s"
 
-#: ../src/common/connection_handlers.py:1682
+#: ../src/common/connection_handlers.py:1987
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "%s хочет отменить подписку"
 
-#: ../src/common/connection_handlers.py:1684
+#: ../src/common/connection_handlers.py:1989
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "теперь мы отписались от %s"
 
-#: ../src/common/connection_handlers.py:1854
+#: ../src/common/connection_handlers.py:2116
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
 "management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr "JID %s не соответствует RFC. Он не будет добавлен в ваш ростер. Используйте средство управления ростера, например http://jru.jabberstudio.org/ чтобы удалить его"
+msgstr ""
+"JID %s не соответствует RFC. Он не будет добавлен в ваш ростер. Используйте "
+"средство управления ростера, например http://jru.jabberstudio.org/ чтобы "
+"удалить его"
+
+#. We didn't set a passphrase
+#: ../src/common/connection_handlers.py:2155
+#: ../src/common/zeroconf/connection_zeroconf.py:168
+msgid "OpenPGP passphrase was not given"
+msgstr "Не задана парольная фраза OpenPGP"
+
+#: ../src/common/connection.py:62
+msgid "Unable to get issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:63
+msgid "Unable to get certificate CRL"
+msgstr ""
+
+#: ../src/common/connection.py:64
+msgid "Unable to decrypt certificate's signature"
+msgstr ""
+
+#: ../src/common/connection.py:65
+msgid "Unable to decrypt CRL's signature"
+msgstr ""
+
+#: ../src/common/connection.py:66
+#, fuzzy
+msgid "Unable to decode issuer public key"
+msgstr "Не могу загрузить модуль \"idle\""
+
+#: ../src/common/connection.py:67
+msgid "Certificate signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:68
+msgid "CRL signature failure"
+msgstr ""
+
+#: ../src/common/connection.py:69
+msgid "Certificate is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:70
+msgid "Certificate has expired"
+msgstr ""
+
+#: ../src/common/connection.py:71
+msgid "CRL is not yet valid"
+msgstr ""
+
+#: ../src/common/connection.py:72
+msgid "CRL has expired"
+msgstr ""
 
-#: ../src/common/connection.py:175
-#: ../src/common/zeroconf/connection_zeroconf.py:196
+#: ../src/common/connection.py:73
+msgid "Format error in certificate's notBefore field"
+msgstr ""
+
+#: ../src/common/connection.py:74
+msgid "Format error in certificate's notAfter field"
+msgstr ""
+
+#: ../src/common/connection.py:75
+msgid "Format error in CRL's lastUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:76
+msgid "Format error in CRL's nextUpdate field"
+msgstr ""
+
+#: ../src/common/connection.py:77
+msgid "Out of memory"
+msgstr ""
+
+#: ../src/common/connection.py:78
+msgid "Self signed certificate in certificate chain"
+msgstr ""
+
+#: ../src/common/connection.py:79
+msgid "Unable to get local issuer certificate"
+msgstr ""
+
+#: ../src/common/connection.py:80 ../src/common/connection.py:81
+msgid "Unable to verify the first certificate"
+msgstr ""
+
+#: ../src/common/connection.py:82
+msgid "Certificate chain too long"
+msgstr ""
+
+#: ../src/common/connection.py:83
+msgid "Certificate revoked"
+msgstr ""
+
+#: ../src/common/connection.py:84
+#, fuzzy
+msgid "Invalid CA certificate"
+msgstr "Неверное имя пользователя"
+
+#: ../src/common/connection.py:85
+msgid "Path length constraint exceeded"
+msgstr ""
+
+#: ../src/common/connection.py:86
+msgid "Unsupported certificate purpose"
+msgstr ""
+
+#: ../src/common/connection.py:87
+msgid "Certificate not trusted"
+msgstr ""
+
+#: ../src/common/connection.py:88
+msgid "Certificate rejected"
+msgstr ""
+
+#: ../src/common/connection.py:89
+msgid "Subject issuer mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:90
+msgid "Authority and subject key identifier mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:91
+msgid "Authority and issuer serial number mismatch"
+msgstr ""
+
+#: ../src/common/connection.py:92
+msgid "Key usage does not include certificate signing"
+msgstr ""
+
+#: ../src/common/connection.py:93
+msgid "Application verification failure"
+msgstr ""
+
+#: ../src/common/connection.py:246
+#: ../src/common/zeroconf/connection_zeroconf.py:208
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Связь с учетной записью \"%s\" была потеряна"
 
-#: ../src/common/connection.py:176
+#: ../src/common/connection.py:247
 msgid "Reconnect manually."
 msgstr "Переподключаться вручную."
 
-#: ../src/common/connection.py:187 ../src/common/connection.py:214
+#: ../src/common/connection.py:258
 #, python-format
-msgid "Transport %s answered wrongly to register request: %s"
-msgstr "Транспорт %s неверно ответил на запрос о регистрации: %s"
+msgid "Server %s answered wrongly to register request: %s"
+msgstr "Сервер %s неверно ответил на запрос о регистрации: %s"
+
+#: ../src/common/connection.py:291
+#, python-format
+msgid "Server %s provided a different registration form"
+msgstr ""
+
+#: ../src/common/connection.py:307
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:213
+#: ../src/common/connection.py:322
 msgid "Invalid answer"
 msgstr "Неверный ответ"
 
-#: ../src/common/connection.py:405 ../src/common/connection.py:440
-#: ../src/common/connection.py:889
-#: ../src/common/zeroconf/connection_zeroconf.py:217
+#: ../src/common/connection.py:323
+#, python-format
+msgid "Transport %s answered wrongly to register request: %s"
+msgstr "Транспорт %s неверно ответил на запрос о регистрации: %s"
+
+#: ../src/common/connection.py:469
+msgid "Connection to proxy failed"
+msgstr "Соединение с прокси разорвалось"
+
+#: ../src/common/connection.py:523 ../src/common/connection.py:585
+#: ../src/common/connection.py:1140
+#: ../src/common/zeroconf/connection_zeroconf.py:242
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Не могу соединиться с \"%s\""
 
-#: ../src/common/connection.py:419
+#: ../src/common/connection.py:537
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Подключен к серверу %s: %s с %s"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:548
+#, python-format
+msgid "The authenticity of the %s certificate could be invalid."
+msgstr ""
+
+#: ../src/common/connection.py:551
+#, python-format
+msgid ""
+"\n"
+"SSL Error: %s"
+msgstr ""
+
+#: ../src/common/connection.py:553
+#, python-format
+msgid ""
+"\n"
+"Unknown SSL error: %d"
+msgstr ""
+
+#: ../src/common/connection.py:586
 msgid "Check your connection or try again later"
 msgstr "Проверьте настройки сети или попробуйте еще раз позже"
 
-#: ../src/common/connection.py:467
+#: ../src/common/connection.py:611
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Ошибка аутентификации с \"%s\""
 
-#: ../src/common/connection.py:468
+#: ../src/common/connection.py:613
 msgid "Please check your login and password for correctness."
 msgstr "Пожалуйста, проверьте правильность логина и пароля."
 
-#. We didn't set a passphrase
-#: ../src/common/connection.py:585
-#: ../src/common/zeroconf/connection_zeroconf.py:156
-msgid "OpenPGP passphrase was not given"
-msgstr "Не задана парольная фраза OpenPGP"
-
-#. do not show I'm invisible!
-#: ../src/common/connection.py:627
-msgid "invisible"
-msgstr "невидимка"
-
-#: ../src/common/connection.py:628
-msgid "offline"
-msgstr "отключен"
+#: ../src/common/connection.py:656
+msgid "Error while removing privacy list"
+msgstr "Ошибка при удалении списка приватности"
 
-#: ../src/common/connection.py:629
+#: ../src/common/connection.py:657
 #, python-format
-msgid "I'm %s"
-msgstr "%s"
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+msgstr ""
+"Список приватности %s не может быть удален.Возможно он используется одним из "
+"ваших активных ресурсов.Отключите ресурс и попробуйте снова."
 
 #. we're not english
 #. one  in locale and one en
-#: ../src/common/connection.py:720
+#: ../src/common/connection.py:933
 msgid "[This message is *encrypted* (See :JEP:`27`]"
 msgstr "[Это сообщение *зашифровано*, см. :JEP:`27`]"
 
-#: ../src/common/connection.py:776
-#: ../src/common/zeroconf/connection_zeroconf.py:397
+#: ../src/common/connection.py:1007
+#: ../src/common/zeroconf/connection_zeroconf.py:436
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -6041,34 +7561,38 @@ msgstr ""
 "Тема: %s\n"
 "%s"
 
-#: ../src/common/connection.py:915
+#: ../src/common/connection.py:1172
 msgid "Not fetched because of invisible status"
 msgstr "Нельзя получить из-за невидимости"
 
+#: ../src/common/contacts.py:299
+msgid "Not in roster"
+msgstr "Не в ростере"
+
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:33
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "На компьютере не установлена библиотека D-Bus для Python"
 
-#: ../src/common/dbus_support.py:34
+#: ../src/common/dbus_support.py:42
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Возможности работы Gajim с D-Bus не могут быть использованы"
 
-#: ../src/common/exceptions.py:22
+#: ../src/common/exceptions.py:27
 msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 msgstr "отсутствует библиотека pysqlite2 (или python-pysqlite2). Выход..."
 
-#: ../src/common/exceptions.py:30
+#: ../src/common/exceptions.py:44
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Сервис недоступен: Gajim не запущен или отключена функция удаленного "
 "управления"
 
-#: ../src/common/exceptions.py:38
+#: ../src/common/exceptions.py:52
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "На машине отсутствует D-Bus или модуль питона для нее"
 
-#: ../src/common/exceptions.py:46
+#: ../src/common/exceptions.py:60
 msgid ""
 "Session bus is not available.\n"
 "Try reading http://trac.gajim.org/wiki/GajimDBus"
@@ -6076,483 +7600,490 @@ msgstr ""
 "Шина D-Bus не доступна.\n"
 "Попробуйте прочитать http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:47
 msgid "one"
 msgstr "один"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:47
 msgid "two"
 msgstr "два"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:47
 msgid "three"
 msgstr "три"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:47
 msgid "four"
 msgstr "четыре"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:47
 msgid "five"
 msgstr "пять"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:47
 msgid "six"
 msgstr "шесть"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:48
 msgid "seven"
 msgstr "семь"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:48
 msgid "eight"
 msgstr "восемь"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:48
 msgid "nine"
 msgstr "девять"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:48
 msgid "ten"
 msgstr "десять"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:48
 msgid "eleven"
 msgstr "одиннадцать"
 
-#: ../src/common/fuzzyclock.py:44
+#: ../src/common/fuzzyclock.py:49
 msgid "twelve"
 msgstr "двенадцать"
 
 #. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
 #. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "%0 o'clock"
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "$0 o'clock"
 msgstr "%0"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past %0"
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "five past $0"
 msgstr "пять минут %1"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56
-msgid "ten past %0"
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:61
+msgid "ten past $0"
 msgstr "десять минут %1"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past %0"
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:61
+msgid "quarter past $0"
 msgstr "четверть %1"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57
-msgid "twenty past %0"
+#: ../src/common/fuzzyclock.py:54 ../src/common/fuzzyclock.py:62
+msgid "twenty past $0"
 msgstr "двадцать минут %1"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past %0"
+#: ../src/common/fuzzyclock.py:54 ../src/common/fuzzyclock.py:62
+msgid "twenty five past $0"
 msgstr "двадцать пять минут %1"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58
-msgid "half past %0"
+#: ../src/common/fuzzyclock.py:55 ../src/common/fuzzyclock.py:63
+msgid "half past $0"
 msgstr "половина %1"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to %1"
+#: ../src/common/fuzzyclock.py:55 ../src/common/fuzzyclock.py:63
+msgid "twenty five to $1"
 msgstr "без двадцати пяти %1"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59
-msgid "twenty to %1"
+#: ../src/common/fuzzyclock.py:56 ../src/common/fuzzyclock.py:64
+msgid "twenty to $1"
 msgstr "без двадцати %1"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to %1"
+#: ../src/common/fuzzyclock.py:56 ../src/common/fuzzyclock.py:64
+msgid "quarter to $1"
 msgstr "без четверти %1"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
-msgid "ten to %1"
+#: ../src/common/fuzzyclock.py:57 ../src/common/fuzzyclock.py:65
+msgid "ten to $1"
 msgstr "без десяти %1"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60
-msgid "five to %1"
+#: ../src/common/fuzzyclock.py:57 ../src/common/fuzzyclock.py:65
+msgid "five to $1"
 msgstr "без пяти %1"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "%1 o'clock"
+#: ../src/common/fuzzyclock.py:57 ../src/common/fuzzyclock.py:66
+msgid "$1 o'clock"
 msgstr "%1"
 
-#: ../src/common/fuzzyclock.py:62
+#: ../src/common/fuzzyclock.py:69
 msgid "Night"
 msgstr "Ночь"
 
-#: ../src/common/fuzzyclock.py:62
+#: ../src/common/fuzzyclock.py:69
 msgid "Early morning"
 msgstr "Раннее утро"
 
-#: ../src/common/fuzzyclock.py:62
+#: ../src/common/fuzzyclock.py:69
 msgid "Morning"
 msgstr "Утро"
 
-#: ../src/common/fuzzyclock.py:62
+#: ../src/common/fuzzyclock.py:69
 msgid "Almost noon"
 msgstr "День"
 
-#: ../src/common/fuzzyclock.py:63
+#: ../src/common/fuzzyclock.py:70
 msgid "Noon"
 msgstr "Полдень"
 
-#: ../src/common/fuzzyclock.py:63
+#: ../src/common/fuzzyclock.py:70
 msgid "Afternoon"
 msgstr "День"
 
-#: ../src/common/fuzzyclock.py:63
+#: ../src/common/fuzzyclock.py:70
 msgid "Evening"
 msgstr "Вечер"
 
-#: ../src/common/fuzzyclock.py:63
+#: ../src/common/fuzzyclock.py:70
 msgid "Late evening"
 msgstr "Поздний вечер"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:72
 msgid "Start of week"
 msgstr "Начало недели"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:72
 msgid "Middle of week"
 msgstr "Середина недели"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:72
 msgid "End of week"
 msgstr "Конец недели"
 
-#: ../src/common/fuzzyclock.py:66
+#: ../src/common/fuzzyclock.py:73
 msgid "Weekend!"
 msgstr "Выходные!"
 
-#: ../src/common/helpers.py:105
+#: ../src/common/helpers.py:124
 msgid "Invalid character in username."
 msgstr "Неверный символ в имени пользователя."
 
-#: ../src/common/helpers.py:110
+#: ../src/common/helpers.py:129
 msgid "Server address required."
 msgstr "Требуется адрес сервера."
 
-#: ../src/common/helpers.py:115
+#: ../src/common/helpers.py:134
 msgid "Invalid character in hostname."
 msgstr "Неверный символ в имени сервера"
 
-#: ../src/common/helpers.py:121
+#: ../src/common/helpers.py:140
 msgid "Invalid character in resource."
 msgstr "Неверный символ в ресурсе"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:161
+#: ../src/common/helpers.py:180
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:183
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:168
+#: ../src/common/helpers.py:187
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:171
+#: ../src/common/helpers.py:190
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:194
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:178
+#: ../src/common/helpers.py:197
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:181
+#: ../src/common/helpers.py:200
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:231
 msgid "_Busy"
 msgstr "_Занят"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:233
 msgid "Busy"
 msgstr "Занят"
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:236
 msgid "_Not Available"
 msgstr "_Недоступен"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:241
 msgid "_Free for Chat"
 msgstr "_Готов поболтать"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:243
 msgid "Free for Chat"
 msgstr "Готов поболтать"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:246
 msgid "_Available"
 msgstr "_Доступен"
 
-#: ../src/common/helpers.py:227
-msgid "Available"
-msgstr "Доступен"
-
-#: ../src/common/helpers.py:229
+#: ../src/common/helpers.py:250
 msgid "Connecting"
 msgstr "Соединяюсь"
 
-#: ../src/common/helpers.py:232
+#: ../src/common/helpers.py:253
 msgid "A_way"
 msgstr "_Ушел"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:258
 msgid "_Offline"
 msgstr "_Отключен"
 
-#: ../src/common/helpers.py:239
+#: ../src/common/helpers.py:260
 msgid "Offline"
 msgstr "Отключен"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:263
 msgid "_Invisible"
 msgstr "_Невидимка"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:269
 msgid "?contact has status:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:271
 msgid "?contact has status:Has errors"
 msgstr "Ошибка"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:276
 msgid "?Subscription we already have:None"
 msgstr "Нет"
 
-#: ../src/common/helpers.py:257
+#: ../src/common/helpers.py:278
 msgid "To"
 msgstr "К"
 
-#: ../src/common/helpers.py:261
+#: ../src/common/helpers.py:282
 msgid "Both"
 msgstr "Оба"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:290
 msgid "?Ask (for Subscription):None"
 msgstr "Нет"
 
-#: ../src/common/helpers.py:271
+#: ../src/common/helpers.py:292
 msgid "Subscribe"
 msgstr "Подписаться"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:301
 msgid "?Group Chat Contact Role:None"
 msgstr "Отсутствует"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:304
 msgid "Moderators"
 msgstr "Модераторы"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:306
 msgid "Moderator"
 msgstr "Модератор"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:309
 msgid "Participants"
 msgstr "Участники"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:311
 msgid "Participant"
 msgstr "Участник"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:314
 msgid "Visitors"
 msgstr "Посетители"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:316
 msgid "Visitor"
 msgstr "Посетитель"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:322
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Отсутствует"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:324
 msgid "Owner"
 msgstr "Владелец"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:326
 msgid "Administrator"
 msgstr "Администратор"
 
-#: ../src/common/helpers.py:307
+#: ../src/common/helpers.py:328
 msgid "Member"
 msgstr "Участник"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:367
 msgid "is paying attention to the conversation"
 msgstr "читает сообщение"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:369
 msgid "is doing something else"
 msgstr "занят чем-то еще"
 
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:371
 msgid "is composing a message..."
 msgstr "печатает сообщение..."
 
-#. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:353
+#. paused means he or she was composing but has stopped for a while
+#: ../src/common/helpers.py:374
 msgid "paused composing a message"
 msgstr "перестал печатать сообщение"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:376
 msgid "has closed the chat window or tab"
 msgstr "закрыл окно чата или вкладку"
 
-#: ../src/common/helpers.py:881
+#: ../src/common/helpers.py:947 ../src/common/helpers.py:954
 #, python-format
-msgid " %d unread message"
-msgid_plural " %d unread messages"
-msgstr[0] " %d непрочитанное сообщение"
-msgstr[1] " %d непрочитанных сообщения"
-msgstr[2] " %d непрочитанных сообщений"
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "%d пропущенное сообщение"
+msgstr[1] "%d пропущенных сообщения"
+msgstr[2] "%d пропущенных сообщений"
 
-#: ../src/common/helpers.py:887
+#: ../src/common/helpers.py:960
 #, python-format
-msgid " %d unread single message"
-msgid_plural " %d unread single messages"
-msgstr[0] " %d непрочитанное одиночное сообщение"
-msgstr[1] " %d непрочитанных одиночных сообщения"
-msgstr[2] " %d непрочитанных одиночных сообщений"
+msgid " from room %s"
+msgstr " в комнате %s"
 
-#: ../src/common/helpers.py:893
+#: ../src/common/helpers.py:963 ../src/common/helpers.py:982
 #, python-format
-msgid " %d unread group chat message"
-msgid_plural " %d unread group chat messages"
-msgstr[0] " %d непрочитанное сообщение в комнате"
-msgstr[1] " %d непрочитанных сообщения в комнате"
-msgstr[2] " %d непрочитанных сообщений в комнате"
+msgid " from user %s"
+msgstr ""
 
-#: ../src/common/helpers.py:899
+#: ../src/common/helpers.py:965
 #, python-format
-msgid " %d unread private message"
-msgid_plural " %d unread private messages"
-msgstr[0] " %d непрочитанное личное сообщение"
-msgstr[1] " %d непрочитанных личных сообщения"
-msgstr[2] " %d непрочитанных личных сообщения"
+msgid " from %s"
+msgstr " от %s"
 
-#: ../src/common/helpers.py:909 ../src/common/helpers.py:911
+#: ../src/common/helpers.py:972 ../src/common/helpers.py:979
+#, python-format
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] "%d событие пропущено"
+msgstr[1] "%d события пропущено"
+msgstr[2] "%d событий пропущено"
+
+#: ../src/common/helpers.py:1012
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
 #. we talk about a file
-#: ../src/common/optparser.py:60
+#: ../src/common/optparser.py:65
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "ошибка: не могу открыть %s для чтения"
 
-#: ../src/common/optparser.py:183
-msgid "gtk+"
-msgstr "gtk+"
-
-#: ../src/common/optparser.py:192 ../src/common/optparser.py:193
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:216
 msgid "cyan"
 msgstr "синий"
 
-#: ../src/common/optparser.py:302
-msgid "migrating logs database to indeces"
+#: ../src/common/optparser.py:332
+msgid "migrating logs database to indices"
 msgstr "переносим журнал на индексы"
 
-#: ../src/common/passwords.py:86
+#: ../src/common/passwords.py:88
 #, python-format
 msgid "Gajim account %s"
 msgstr "Учётная запись Gajim %s"
 
-#: ../src/common/zeroconf/client_zeroconf.py:189
-msgid "Connection to host could not be established: Incorrect answer from server."
-msgstr "Нельзя подключиться к хосту: Неверный ответ от сервера."
-
-#: ../src/common/zeroconf/client_zeroconf.py:205
+#: ../src/common/zeroconf/client_zeroconf.py:149
+#: ../src/common/zeroconf/client_zeroconf.py:232
 msgid "Connection to host could not be established"
 msgstr "Не удалось соединиться с хостом"
 
-#: ../src/common/zeroconf/client_zeroconf.py:334
-msgid "Connection to host could not be established: Timeout while sending data."
+#: ../src/common/zeroconf/client_zeroconf.py:206
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
+msgstr "Нельзя подключиться к хосту: Неверный ответ от сервера."
+
+#: ../src/common/zeroconf/client_zeroconf.py:366
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
 msgstr "Не удалось соединиться с хостом: истекло время ожидания."
 
-#: ../src/common/zeroconf/client_zeroconf.py:629
+#: ../src/common/zeroconf/client_zeroconf.py:652
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Контакт не в сети. Отправить сообщение не удалось."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:197
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:243
+#, fuzzy, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"Хост %s, который настроен как расширеная настройка ft_add_hosts_to_send не "
+"действителен (не правилен?), поэтому игнорируется."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:209
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "Требуется переподключение для продолжения приема и отправки сообщений."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:232
 msgid "Avahi error"
 msgstr "Ошибка Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:232
 #, python-format
 msgid ""
 "%s\n"
 "Link-local messaging might not work properly."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:218
+#: ../src/common/zeroconf/connection_zeroconf.py:243
 msgid "Please check if Avahi is installed."
 msgstr "Пожалуйста, удостоверьтесь что Avahi установлен."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:227
-#: ../src/common/zeroconf/connection_zeroconf.py:231
+#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:256
 msgid "Could not start local service"
 msgstr "Не могу запустить локальный сервис"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:228
+#: ../src/common/zeroconf/connection_zeroconf.py:253
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Не могу использовать порт %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:232
-#: ../src/common/zeroconf/connection_zeroconf.py:325
+#: ../src/common/zeroconf/connection_zeroconf.py:257
+#: ../src/common/zeroconf/connection_zeroconf.py:352
 msgid "Please check if avahi-daemon is running."
 msgstr "Пожалуйста, удостоверьтесь что демон avahi запущен."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:324
+#: ../src/common/zeroconf/connection_zeroconf.py:351
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Не могу изменить статус учётной записи \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:341
+#: ../src/common/zeroconf/connection_zeroconf.py:368
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
-msgstr "Вы не подключены или невидимы для других. Ваше сообщение нельзы отправить."
+msgstr ""
+"Вы не подключены или невидимы для других. Ваше сообщение нельзы отправить."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:353
+#: ../src/common/zeroconf/connection_zeroconf.py:380
 msgid "[This message is encrypted]"
 msgstr "[Это сообщение зашифровано]"
 
-#: ../src/common/zeroconf/zeroconf.py:180
+#: ../src/common/zeroconf/zeroconf_avahi.py:183
+#: ../src/common/zeroconf/zeroconf_bonjour.py:194
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "Ошибка при добавлении службы. %s"
 
+#~ msgid "Save passphrase"
+#~ msgstr "Сохранить парольную фразу (небезопасно)"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
new file mode 100644
index 000000000..45007246e
--- /dev/null
+++ b/po/sr@Latn.po
@@ -0,0 +1,7637 @@
+# translation of sr.po to
+# Serbian translations for gajim.
+# Copyright (C) 2006 RiLinux
+# This file is distributed under the same license as the gajim package.
+# B. Kokanovic <branko.kokanovic@gmail.com>, 2007.
+# Branko Kokanovic <baki@sr22.no-ip.info>, 2007.
+#
+#: ../src/gajim-remote.py:212 ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:245 ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:252 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:254 ../src/gajim-remote.py:255
+msgid ""
+msgstr ""
+"Project-Id-Version: sr\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-09-12 09:53+0200\n"
+"PO-Revision-Date: 2007-09-09 21:30+0200\n"
+"Last-Translator: Branko Kokanovic\n"
+"Language-Team:  <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "GTK+ Džaber klijent"
+
+#: ../data/gajim.desktop.in.in.h:2
+msgid "Gajim Instant Messenger"
+msgstr "Gajim Brze Poruke"
+
+#: ../data/gajim.desktop.in.in.h:3
+msgid "Jabber IM Client"
+msgstr "Džaber IM Klijent"
+
+#: ../data/glade/account_context_menu.glade.h:1
+#: ../data/glade/roster_window.glade.h:8
+#, fuzzy
+msgid "Join _Group Chat..."
+msgstr "Priključi se _grupnom razgovoru"
+
+#: ../data/glade/account_context_menu.glade.h:2
+msgid "_Add Contact..."
+msgstr "_Dodaj kontakt..."
+
+#: ../data/glade/account_context_menu.glade.h:3
+#: ../data/glade/roster_window.glade.h:15
+msgid "_Discover Services"
+msgstr "_Otkrivanje servisa"
+
+#: ../data/glade/account_context_menu.glade.h:4
+msgid "_Execute Command..."
+msgstr "_Izvrši naredbu..."
+
+#: ../data/glade/account_context_menu.glade.h:5
+#, fuzzy
+msgid "_Modify Account"
+msgstr "Izmeni nalog"
+
+#: ../data/glade/account_context_menu.glade.h:6
+msgid "_Open Gmail Inbox"
+msgstr "_Otvori Gmail dolaznu poštu"
+
+#: ../data/glade/account_context_menu.glade.h:7
+#: ../data/glade/roster_window.glade.h:22
+#, fuzzy
+msgid "_Start Chat..."
+msgstr "_Započni razgovor"
+
+#: ../data/glade/account_context_menu.glade.h:8
+#: ../data/glade/zeroconf_context_menu.glade.h:2
+msgid "_Status"
+msgstr "_Status"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:1
+#, fuzzy
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>Korisnički nalog je u procesu stvaranja</b>\n"
+"\n"
+"Molimo pričekajte..."
+
+#: ../data/glade/account_creation_wizard_window.glade.h:4
+msgid "<b>Please choose one of the options below:</b>"
+msgstr "<b>Molimo odaberite jednu od opcija ispod:</b>"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:5
+msgid "<b>Please fill in the data for your new account</b>"
+msgstr "<b>Molimo popunimo podatke za Vaš novi korisnički nalog</b>"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:6
+msgid "<b>Please select a server</b>"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+msgstr ""
+"Kliknite da vidite mogućnosti (kao što su MSN, ICQ transporti) džaber "
+"servera "
+
+#: ../data/glade/account_creation_wizard_window.glade.h:8
+msgid "Connect when I press Finish"
+msgstr "Poveži se kada pritisnem Završi"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:9
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: čarobnjak za kreiranje naloga"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:10
+#, fuzzy
+msgid "I already have an account I want to _use"
+msgstr "Već imam nalog koji želim da koristim"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:11
+msgid "I want to _register for a new account"
+msgstr "Želim da registrujem novi nalog"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_modification_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:22
+msgid "If checked, Gajim will remember the password for this account"
+msgstr "Ako je označeno, Gajim će pamtiti lozinku za ovaj nalog"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:32
+msgid "Manage..."
+msgstr "Podesi..."
+
+#: ../data/glade/account_creation_wizard_window.glade.h:14
+#, fuzzy
+msgid "Prox_y:"
+msgstr "Proksi:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_modification_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:48
+msgid "Save pass_word"
+msgstr "Snimi lozinku"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:16
+msgid "Servers Features"
+msgstr "Mogućnosti servera"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:17
+msgid "Set my profile when I connect"
+msgstr "Postavi moj profil pri povezivanju"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:53
+msgid "Use custom hostname/port"
+msgstr "Koristi Vaše određeno ime hosta/port "
+
+#: ../data/glade/account_creation_wizard_window.glade.h:19
+msgid ""
+"You need to have an account in order to connect\n"
+"to the Jabber network."
+msgstr ""
+"Morate posedovati račun da biste se mogli povezati\n"
+"na džaber mrežu."
+
+#: ../data/glade/account_creation_wizard_window.glade.h:21
+msgid "Your JID:"
+msgstr "Vaš džaber ID:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:13
+msgid "_Advanced"
+msgstr "_Napredno"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:23
+msgid "_Finish"
+msgstr "_Završi"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:24
+#, fuzzy
+msgid "_Hostname:"
+msgstr "Ime hosta"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_modification_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:58
+msgid "_Password:"
+msgstr "_Lozinka:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/manage_proxies_window.glade.h:11
+msgid "_Port:"
+msgstr "_Port:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:27
+msgid "_Server:"
+msgstr "_Server:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/manage_proxies_window.glade.h:12
+msgid "_Username:"
+msgstr "_Korisničko ime:"
+
+#: ../data/glade/account_modification_window.glade.h:1
+#: ../data/glade/accounts_window.glade.h:1
+#: ../data/glade/preferences_window.glade.h:8
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>Ostalo</b>"
+
+#: ../data/glade/account_modification_window.glade.h:2
+#: ../data/glade/accounts_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:1
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
+
+#: ../data/glade/account_modification_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:2
+msgid "<b>Personal Information</b>"
+msgstr "<b>Lične informacije</b>"
+
+#: ../data/glade/account_modification_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:4
+msgid "Account"
+msgstr "Nalog"
+
+#: ../data/glade/account_modification_window.glade.h:5
+msgid "Account Modification"
+msgstr "Izmena naloga"
+
+#: ../data/glade/account_modification_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "Administration operations"
+msgstr "Lista administratora"
+
+#: ../data/glade/account_modification_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:6
+msgid "Auto-reconnect when connection is lost"
+msgstr "Automatsko povezivanje kada se veza izgubi"
+
+#: ../data/glade/account_modification_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/zeroconf_properties_window.glade.h:3
+msgid "C_onnect on Gajim startup"
+msgstr "Po_veži se prilikom pokretanja Gajima"
+
+#: ../data/glade/account_modification_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:8
+msgid "Chan_ge Password"
+msgstr "I_zmeni lozinku"
+
+#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:9
+msgid ""
+"Check this so Gajim will connect in port 5223 where legacy servers are "
+"expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
+"default if broadcasted by the server, and with this option enabled TLS will "
+"be disabled"
+msgstr ""
+"Označite ovo da biste se povezali na port 5223 gde se predpostavlja da "
+"stariji serveri imaju SSL  mogućnosti. Primetite da Gajim koristi "
+"podrazumevano TLS enkripciju akoje server traži, a sa ovo opcijom "
+"omogućenom, TLS će biti isključen"
+
+#: ../data/glade/account_modification_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/zeroconf_properties_window.glade.h:4
+msgid "Choose _Key..."
+msgstr "Odaberite _Ključ"
+
+#: ../data/glade/account_modification_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:11
+msgid "Click to change account's password"
+msgstr "Kliknite za izmenu lozinke Vašeg naloga"
+
+#: ../data/glade/account_modification_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:12
+msgid "Click to request authorization to all contacts of another account"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:13
+msgid "Connection"
+msgstr "Veza"
+
+#: ../data/glade/account_modification_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:15
+msgid "Edit Personal Information..."
+msgstr "Izmeni lične informacije"
+
+#. No configured account
+#: ../data/glade/account_modification_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:6 ../src/notify.py:471
+#: ../src/notify.py:493 ../src/notify.py:505 ../src/common/helpers.py:964
+#: ../src/common/helpers.py:976
+msgid "Gajim"
+msgstr "Gajim"
+
+#. General group cannot be changed
+#: ../data/glade/account_modification_window.glade.h:17
+#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/zeroconf_properties_window.glade.h:7
+#: ../src/roster_window.py:359 ../src/roster_window.py:624
+#: ../src/roster_window.py:1360 ../src/roster_window.py:1728
+#: ../src/roster_window.py:2112 ../src/roster_window.py:2628
+#: ../src/roster_window.py:2746 ../src/common/contacts.py:309
+msgid "General"
+msgstr "Opšte"
+
+#: ../data/glade/account_modification_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:20
+msgid "Hostname: "
+msgstr "Ime hosta"
+
+#: ../data/glade/account_modification_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:21
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"Ako je ovo označeno, Gajim će odašiljati još neke IP adrese pored Vaše,tako "
+"da prenos datoteka ima veće šanse da će raditi."
+
+#: ../data/glade/account_modification_window.glade.h:21
+#: ../data/glade/accounts_window.glade.h:23
+msgid ""
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr ""
+"Ako je ovo označeno, Gajim će slati poruke da je prisutan kako bi sprečio "
+"prekid veze zbog duge neaktivnosti"
+
+#: ../data/glade/account_modification_window.glade.h:22
+#: ../data/glade/accounts_window.glade.h:24
+#: ../data/glade/zeroconf_properties_window.glade.h:8
+msgid ""
+"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+"permission only for you"
+msgstr ""
+"Ako je ovo označeno, Gajim će čuvati lozinke u ~/.gajim/config sa 'čitaj' "
+"privilegijom samo za Vas"
+
+#: ../data/glade/account_modification_window.glade.h:23
+#: ../data/glade/accounts_window.glade.h:25
+#: ../data/glade/zeroconf_properties_window.glade.h:9
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Ako je ovo označeno, Gajim će se pri svakom pokretanju automatski povezati "
+"na džaber koristeći ovaj nalog"
+
+#: ../data/glade/account_modification_window.glade.h:24
+#: ../data/glade/accounts_window.glade.h:26
+#: ../data/glade/zeroconf_properties_window.glade.h:10
+msgid ""
+"If checked, any change to the global status (handled by the combobox at the "
+"bottom of the roster window) will change the status of this account "
+"accordingly"
+msgstr ""
+"Ako je ovo označeno, svaka promena globalnog statusa (koji se menja iz "
+"padajućeg menija na dnu prozora kontakt liste) će promeniti i status ovog "
+"naloga "
+
+#: ../data/glade/account_modification_window.glade.h:25
+#: ../data/glade/accounts_window.glade.h:29
+msgid "Information about you, as stored in the server"
+msgstr "Informacije o Vama, kako su uskladištene na serveru"
+
+#: ../data/glade/account_modification_window.glade.h:27
+#: ../data/glade/accounts_window.glade.h:34
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1524
+#: ../src/config.py:2010
+msgid "No key selected"
+msgstr "Nije odabran nijedan ključ"
+
+#. None means no proxy profile selected
+#. GPG Key
+#: ../data/glade/account_modification_window.glade.h:29
+#: ../data/glade/accounts_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:32 ../src/config.py:1110
+#: ../src/config.py:1181 ../src/config.py:1430 ../src/config.py:1435
+#: ../src/config.py:1906 ../src/config.py:1993 ../src/config.py:2009
+#: ../src/config.py:3109 ../src/config.py:3155 ../src/dialogs.py:286
+#: ../src/dialogs.py:288 ../src/roster_window.py:1832
+#: ../src/roster_window.py:1839 ../src/roster_window.py:1846
+msgid "None"
+msgstr "Ništa"
+
+#: ../data/glade/account_modification_window.glade.h:30
+#: ../data/glade/accounts_window.glade.h:37
+#: ../data/glade/profile_window.glade.h:26
+#: ../data/glade/zeroconf_properties_window.glade.h:17
+msgid "Personal Information"
+msgstr "Lične Informacije"
+
+#: ../data/glade/account_modification_window.glade.h:31
+#: ../data/glade/accounts_window.glade.h:38
+msgid "Port: "
+msgstr "Port:"
+
+#: ../data/glade/account_modification_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:39
+msgid "Priori_ty:"
+msgstr "Priori_tet"
+
+#: ../data/glade/account_modification_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:40
+msgid ""
+"Priority is used in Jabber to determine who gets the events from the jabber "
+"server when two or more clients are connected using the same account; The "
+"client with the highest priority gets the events"
+msgstr ""
+"Prioritet se u džaberu koristi da odredi ko dobija događaje sa servera u "
+"slučaju da su dva ili više klijenata povezana na njega; klijent sa najvećim "
+"prioritetomdobija događaje"
+
+#: ../data/glade/account_modification_window.glade.h:34
+#: ../data/glade/accounts_window.glade.h:41
+msgid "Priority will change automatically according to your status."
+msgstr "Prioritet će biti automatski promenjen prema Vašem statusu."
+
+#: ../data/glade/account_modification_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:42
+msgid "Proxy:"
+msgstr "Proksi:"
+
+#: ../data/glade/account_modification_window.glade.h:36
+#: ../data/glade/accounts_window.glade.h:44
+msgid "Resour_ce:"
+msgstr "Resur_s"
+
+#: ../data/glade/account_modification_window.glade.h:37
+#: ../data/glade/accounts_window.glade.h:45
+msgid ""
+"Resource is sent to the Jabber server in order to separate the same JID in "
+"two or more parts depending on the number of the clients connected in the "
+"same server with the same account. So you might be connected in the same "
+"account with resource 'Home' and 'Work' at the same time. The resource which "
+"has the highest priority will get the events. (see below)"
+msgstr ""
+"Resurs se šalje Džaber serveru kako bi se razlikovao isti džaber ID kod 2 "
+"ili više klijenata spojena u isto vreme na isti server sa istim računom. "
+"Dakle, možete biti spojeni sa resursom 'Posao' ili 'Kuća', klijent sa "
+"najvišim prioritetom će dobijati obaveštenja o događajima"
+
+#: ../data/glade/account_modification_window.glade.h:38
+#: ../data/glade/accounts_window.glade.h:46
+#: ../data/glade/zeroconf_properties_window.glade.h:18
+msgid "Save _passphrase (insecure)"
+msgstr "Snimi _lozinku (nesigurno)"
+
+#: ../data/glade/account_modification_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:47
+#: ../data/glade/zeroconf_properties_window.glade.h:19
+msgid "Save conversation _logs for all contacts"
+msgstr "Sni_mi dnevnik razgovora za sve kontakte"
+
+#: ../data/glade/account_modification_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:49
+msgid "Send keep-alive packets"
+msgstr "Šalji podatke o živosti"
+
+#: ../data/glade/account_modification_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:50
+#: ../data/glade/zeroconf_properties_window.glade.h:20
+msgid "Synch_ronize account status with global status"
+msgstr "Sinhroniziraj status naloga sa globalnim statusom"
+
+#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:51
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "Prikaži kontakte koji nisu na vezi"
+
+#: ../data/glade/account_modification_window.glade.h:44
+#: ../data/glade/accounts_window.glade.h:52
+msgid "Use _SSL (legacy)"
+msgstr "Koristi _SSL (zastarelo)"
+
+#: ../data/glade/account_modification_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:55
+msgid "Use file transfer proxies"
+msgstr "Koristi proksi za prenos datoteka"
+
+#: ../data/glade/account_modification_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:56
+msgid "_Adjust to status"
+msgstr "_Podesi prema statusu"
+
+#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:57
+msgid "_Jabber ID:"
+msgstr "_Džaber ID:"
+
+#: ../data/glade/account_modification_window.glade.h:49
+msgid "_Name:"
+msgstr "_Ime:"
+
+#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/profile_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/zeroconf_information_window.glade.h:2
+#: ../data/glade/zeroconf_properties_window.glade.h:5
+msgid "E-Mail:"
+msgstr "E-mejl:"
+
+#. XML Console enable checkbutton
+#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Omogući"
+
+#: ../data/glade/accounts_window.glade.h:17
+#: ../data/glade/zeroconf_information_window.glade.h:3
+#: ../data/glade/zeroconf_properties_window.glade.h:6
+msgid "First Name:"
+msgstr "Ime:"
+
+#: ../data/glade/accounts_window.glade.h:27
+#: ../data/glade/zeroconf_properties_window.glade.h:11
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+"Ako je podrazumevani port koji se koristi za dolazne poruke neodgovarajući "
+"za Vaša podešavanja, ovde možete odabrati neki drugi.\n"
+"Mogli biste uzeti u obzir i mogućnost izmene podešavanja firewall-a."
+
+#: ../data/glade/accounts_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/glade/zeroconf_information_window.glade.h:4
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:453
+msgid "Jabber ID:"
+msgstr "Džaber ID:"
+
+#: ../data/glade/accounts_window.glade.h:31
+#: ../data/glade/zeroconf_information_window.glade.h:5
+#: ../data/glade/zeroconf_properties_window.glade.h:14
+msgid "Last Name:"
+msgstr "Prezime:"
+
+#: ../data/glade/accounts_window.glade.h:33
+msgid "Mer_ge accounts"
+msgstr "_Spoji naloge"
+
+#. Rename
+#: ../data/glade/accounts_window.glade.h:43 ../src/roster_window.py:2698
+msgid "Re_name"
+msgstr "Prei_menuj"
+
+#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/zeroconf_properties_window.glade.h:21
+msgid "Use custom port:"
+msgstr "Koristi svoj port:"
+
+#: ../data/glade/accounts_window.glade.h:59
+msgid "gtk-add"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:60
+msgid "gtk-close"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:61
+msgid "gtk-remove"
+msgstr ""
+
+#: ../data/glade/add_new_contact_window.glade.h:1
+msgid "A_ccount:"
+msgstr "_Nalog:"
+
+#: ../data/glade/add_new_contact_window.glade.h:2
+msgid "A_llow this contact to view my status"
+msgstr "Dozvo_li ovom kontaktu da vidi moj status"
+
+#: ../data/glade/add_new_contact_window.glade.h:3
+msgid "Add New Contact"
+msgstr "Dodaj novi kontakt"
+
+#: ../data/glade/add_new_contact_window.glade.h:4
+msgid "I would like to add you to my contact list."
+msgstr "Želio bih da Vas dodam na listu mojih kontakata."
+
+#: ../data/glade/add_new_contact_window.glade.h:5
+msgid ""
+"You have to register with this transport\n"
+"to be able to add a contact from this\n"
+"protocol. Click on register button to\n"
+"proceed."
+msgstr ""
+"Morate se registrovati na ovaj transport\n"
+"kako biste mogli dodati kontakte sa ovog\n"
+"protokola. Kliknite na dugme za registraciju\n"
+"za nastavak"
+
+#: ../data/glade/add_new_contact_window.glade.h:9
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+msgstr ""
+"Morate biti povezani na transport da biste mogli\n"
+"dodavati kontakte sa ovog protokola."
+
+#: ../data/glade/add_new_contact_window.glade.h:11
+msgid "_Group:"
+msgstr "_Grupa:"
+
+#: ../data/glade/add_new_contact_window.glade.h:12
+msgid "_Nickname:"
+msgstr "_Nadimak:"
+
+#: ../data/glade/add_new_contact_window.glade.h:13
+msgid "_Protocol:"
+msgstr "_Protokol:"
+
+#: ../data/glade/add_new_contact_window.glade.h:14
+msgid "_Register"
+msgstr "_Registracija"
+
+#: ../data/glade/add_new_contact_window.glade.h:15
+msgid "_User ID:"
+msgstr "_ID korisnika:"
+
+#: ../data/glade/adhoc_commands_window.glade.h:1
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Dogodila se greška:</b>"
+
+#: ../data/glade/adhoc_commands_window.glade.h:2
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Odaberite komandu za izvršenje:</b>"
+
+#: ../data/glade/adhoc_commands_window.glade.h:3
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-hok komande - Gajim"
+
+#: ../data/glade/adhoc_commands_window.glade.h:4
+msgid "Check once more"
+msgstr "Označite još jednom"
+
+#: ../data/glade/adhoc_commands_window.glade.h:5
+msgid "Error description..."
+msgstr "Opis greške"
+
+#: ../data/glade/adhoc_commands_window.glade.h:6
+msgid "Please wait while retrieving command list..."
+msgstr "Molimo sačekajte dok se dobavlja lista komandi..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:7
+msgid "Please wait while the command is sending..."
+msgstr "Molimo sačekajte dok se komanda šalje..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:8
+msgid "Please wait..."
+msgstr "Molimo sačekajte..."
+
+#: ../data/glade/adhoc_commands_window.glade.h:9
+msgid "This jabber entity does not expose any commands."
+msgstr "Ovaj džaber izvor ne izlaže nijednu komandu."
+
+#: ../data/glade/advanced_configuration_window.glade.h:1
+msgid "<b>Description</b>"
+msgstr "<b>Opis</b>"
+
+#: ../data/glade/advanced_configuration_window.glade.h:2
+msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+msgstr ""
+"<b>NAPOMENA:</b> Trebalo bi da ponovo pokrenete Gajim da bi neke izmene "
+"podešavanja postale primenjene"
+
+#: ../data/glade/advanced_configuration_window.glade.h:3
+msgid "Advanced Configuration Editor"
+msgstr "Napredna izmena konfiguracije"
+
+#: ../data/glade/advanced_configuration_window.glade.h:4
+msgid "Filter:"
+msgstr "Filter:"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:1
+msgid "Delete MOTD"
+msgstr "Izbriši poruku dana"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:2
+msgid "Deletes Message of the Day"
+msgstr "Briše poruku dana"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#, fuzzy
+msgid "Edit _Privacy Lists..."
+msgstr "Liste _privatnosti"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:4
+msgid "Sends a message to users currently connected to this server"
+msgstr "Šalje poruku trenutno povezanim korisnicima ovog servera"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#, fuzzy
+msgid "Set MOTD..."
+msgstr "Postavi poruku dana"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:6
+msgid "Sets Message of the Day"
+msgstr "Postavlja poruku dana"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:7
+msgid "Show _XML Console"
+msgstr "Prikaži _XML Konzolu"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#, fuzzy
+msgid "Update MOTD..."
+msgstr "Osveži poruku dana"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:9
+msgid "Updates Message of the Day"
+msgstr "Osvežava poruku dana"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:10
+msgid "_Administrator"
+msgstr "_Administrator"
+
+#: ../data/glade/advanced_menuitem_menu.glade.h:11
+#, fuzzy
+msgid "_Send Server Message..."
+msgstr "_Pošalji serversku poruku"
+
+#: ../data/glade/advanced_notifications_window.glade.h:1
+msgid " a window/tab opened with that contact "
+msgstr " otvaranje prozora/jezička sa tim kontaktom "
+
+#: ../data/glade/advanced_notifications_window.glade.h:2
+msgid "<b>Actions</b>"
+msgstr "<b>Akcije</b>"
+
+#: ../data/glade/advanced_notifications_window.glade.h:3
+msgid "<b>Conditions</b>"
+msgstr "<b>Uslovi</b>"
+
+#: ../data/glade/advanced_notifications_window.glade.h:4
+#: ../data/glade/preferences_window.glade.h:12
+msgid "<b>Sounds</b>"
+msgstr "<b>Zvukovi</b>"
+
+#: ../data/glade/advanced_notifications_window.glade.h:5
+msgid "Advanced Actions"
+msgstr "Napredne Akcije"
+
+#: ../data/glade/advanced_notifications_window.glade.h:6
+msgid "Advanced Notifications Control"
+msgstr "Napredna kontrola obaveštavanja"
+
+#: ../data/glade/advanced_notifications_window.glade.h:7
+msgid "All statuses"
+msgstr "Svi statusi"
+
+#: ../data/glade/advanced_notifications_window.glade.h:8
+#: ../src/common/commands.py:91 ../src/common/helpers.py:246
+msgid "Away"
+msgstr "Odsutan"
+
+#: ../data/glade/advanced_notifications_window.glade.h:9
+msgid "Busy "
+msgstr "Zaposlen"
+
+#: ../data/glade/advanced_notifications_window.glade.h:10
+msgid "Don't have "
+msgstr "Nemam "
+
+#: ../data/glade/advanced_notifications_window.glade.h:11
+msgid "Have "
+msgstr "Imam "
+
+#: ../data/glade/advanced_notifications_window.glade.h:12
+#: ../src/common/helpers.py:256
+msgid "Invisible"
+msgstr "Nevidljiv"
+
+#: ../data/glade/advanced_notifications_window.glade.h:13
+msgid "Launch a command"
+msgstr "Pokrenite komandu"
+
+#: ../data/glade/advanced_notifications_window.glade.h:14
+#: ../src/common/helpers.py:229
+msgid "Not Available"
+msgstr "Nedostupan"
+
+#: ../data/glade/advanced_notifications_window.glade.h:15
+msgid "One or more special statuses..."
+msgstr "Jedan ili više posebnih statusa..."
+
+#: ../data/glade/advanced_notifications_window.glade.h:16
+msgid "Online / Free For Chat"
+msgstr "Na vezi / Slobodan za razgovor"
+
+#: ../data/glade/advanced_notifications_window.glade.h:17
+msgid "Play a sound"
+msgstr "Puštanje zvukove"
+
+#: ../data/glade/advanced_notifications_window.glade.h:18
+msgid ""
+"Receive a Message\n"
+"Contact Disconnected \n"
+"Contact Change Status \n"
+"Group Chat Message Highlight \n"
+"Group Chat Message Received \n"
+"File Transfer Request \n"
+"File Transfer Started \n"
+"File Transfer Finished"
+msgstr ""
+"Primljena poruka\n"
+"Kontakt na vezi\n"
+"Kontakt otišao sa veze\n"
+"Kontakt promenio status\n"
+"Obojena poruka na grupnom razgovoru\n"
+"Primljena poruka sa grupnog razgovora\n"
+"Zahtev za prenos datoteke\n"
+"Počeo prenos datoteke\n"
+"Završen prenos datoteke"
+
+#: ../data/glade/advanced_notifications_window.glade.h:26
+msgid "When "
+msgstr "Kada "
+
+#: ../data/glade/advanced_notifications_window.glade.h:27
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+msgstr ""
+"_Aktiviranje upravnika prozora za bljeskanje prozora razgovora u panelu"
+
+#: ../data/glade/advanced_notifications_window.glade.h:28
+msgid "_Disable auto opening chat window"
+msgstr "_Onemogući automatsko otvaranje prozora za razgovor"
+
+#: ../data/glade/advanced_notifications_window.glade.h:29
+msgid "_Disable existing popup window"
+msgstr "_Onemogući postojeći iskačući prozor"
+
+#: ../data/glade/advanced_notifications_window.glade.h:30
+msgid "_Disable existing sound for this event"
+msgstr "_Onemogući postojeći zvuk za ovaj događaj"
+
+#: ../data/glade/advanced_notifications_window.glade.h:31
+msgid "_Disable showing event in roster"
+msgstr "_Onemogući prikazivanje događaja u listi kontakata"
+
+#: ../data/glade/advanced_notifications_window.glade.h:32
+msgid "_Disable showing event in systray"
+msgstr "_Onemogući prikazivanje događaja u sistemskoj kaseti"
+
+#: ../data/glade/advanced_notifications_window.glade.h:33
+msgid "_Inform me with a popup window"
+msgstr "_Obavesti me iskačućim prozorom"
+
+#: ../data/glade/advanced_notifications_window.glade.h:34
+msgid "_Open chat window with user"
+msgstr "_Otvori prozor za razgovor sa korisnikom"
+
+#: ../data/glade/advanced_notifications_window.glade.h:35
+msgid "_Show event in roster"
+msgstr "Prikaži događaj u listi kontakata"
+
+#: ../data/glade/advanced_notifications_window.glade.h:36
+msgid "_Show event in systray"
+msgstr "Prikaži događaj u sistemskoj kaseti"
+
+#: ../data/glade/advanced_notifications_window.glade.h:37
+msgid "and I "
+msgstr "i ja "
+
+#: ../data/glade/advanced_notifications_window.glade.h:38
+msgid ""
+"contact(s)\n"
+"group(s)\n"
+"everybody"
+msgstr ""
+"kontakt(i)\n"
+"grupa/e\n"
+"svi"
+
+#: ../data/glade/advanced_notifications_window.glade.h:41
+msgid "for "
+msgstr "za"
+
+#: ../data/glade/advanced_notifications_window.glade.h:42
+msgid "when I'm in"
+msgstr "kada sam u"
+
+#: ../data/glade/atom_entry_window.glade.h:1
+msgid "Entry:"
+msgstr "Unos:"
+
+#: ../data/glade/atom_entry_window.glade.h:2
+msgid "Feed name:"
+msgstr "Ime teme:"
+
+#: ../data/glade/atom_entry_window.glade.h:3
+msgid "Last modified:"
+msgstr "Zadnji put izmenjeno:"
+
+#: ../data/glade/atom_entry_window.glade.h:4
+msgid "New entry received"
+msgstr "Nov događaj primljen"
+
+#: ../data/glade/atom_entry_window.glade.h:5
+msgid "You have received new entry:"
+msgstr "Primili ste novi unos:"
+
+#: ../data/glade/change_password_dialog.glade.h:1
+msgid "Change Password"
+msgstr "Izmeni lozinku"
+
+#: ../data/glade/change_password_dialog.glade.h:2
+msgid "Enter it again for confirmation:"
+msgstr "Unesite ponovo kao potvrdu:"
+
+#: ../data/glade/change_password_dialog.glade.h:3
+msgid "Enter new password:"
+msgstr "Unesite novu lozinku:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:1
+msgid "<b>Type your new status message</b>"
+msgstr "<b>Upišite Vašu novu statusnu poruku</b>"
+
+#: ../data/glade/change_status_message_dialog.glade.h:2
+msgid "Preset messages:"
+msgstr "Već postavljene poruke:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:3
+msgid "Save as Preset..."
+msgstr "Snimi kao već postavljenu..."
+
+#: ../data/glade/chat_context_menu.glade.h:1
+msgid "Join _Group Chat"
+msgstr "Priključi se _grupnom razgovoru"
+
+#: ../data/glade/chat_context_menu.glade.h:2
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+#, fuzzy
+msgid "_Add to Roster..."
+msgstr "_Dodaj na listu kontakata"
+
+#: ../data/glade/chat_context_menu.glade.h:3
+msgid "_Copy JID/Email Address"
+msgstr "_Kopiraj džaber ID/e-mejl adresu"
+
+#: ../data/glade/chat_context_menu.glade.h:4
+msgid "_Copy Link Location"
+msgstr "_Kopiraj lokaciju veze"
+
+#: ../data/glade/chat_context_menu.glade.h:5
+msgid "_Open Email Composer"
+msgstr "_Otvori sastavljač e-mejla"
+
+#: ../data/glade/chat_context_menu.glade.h:6
+msgid "_Open Link in Browser"
+msgstr "_Otvori vezu u internet pregledaču"
+
+#: ../data/glade/chat_context_menu.glade.h:7
+#: ../data/glade/subscription_request_popup_menu.glade.h:1
+#: ../data/glade/systray_context_menu.glade.h:7
+msgid "_Start Chat"
+msgstr "_Započni razgovor"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:1
+msgid "Click to see past conversations with this contact"
+msgstr "Kliknite za pregled prošlih razgovora sa ovim kontaktom"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:2
+msgid "Invite _Friends"
+msgstr ""
+
+#: ../data/glade/chat_control_popup_menu.glade.h:3
+#: ../data/glade/gc_occupants_menu.glade.h:3
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:4
+msgid "Send _File"
+msgstr "Pošalji _datoteku"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:4
+#, fuzzy
+msgid "Toggle End to End Encryption"
+msgstr "Uključi/isključi Open_PGP enkripciju"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:5
+msgid "Toggle Open_PGP Encryption"
+msgstr "Uključi/isključi Open_PGP enkripciju"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Add to Roster"
+msgstr "_Dodaj na listu kontakata"
+
+#: ../data/glade/chat_control_popup_menu.glade.h:7
+#: ../data/glade/gc_control_popup_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:2567
+msgid "_History"
+msgstr "_Istorijat"
+
+#: ../data/glade/data_form_window.glade.h:1
+msgid "Fill in the form."
+msgstr "Popunite formular."
+
+#: ../data/glade/data_form_window.glade.h:2
+msgid "Room Configuration"
+msgstr "Konfiguracija sobe"
+
+#: ../data/glade/edit_groups_dialog.glade.h:1
+msgid "Edit Groups"
+msgstr "Izmeni grupe"
+
+#: ../data/glade/filetransfers.glade.h:1
+msgid "A list of active, completed and stopped file transfers"
+msgstr "Lista prenosa aktivnih, završenih i zaustavljenih datoteka"
+
+#: ../data/glade/filetransfers.glade.h:2
+msgid "Cancel file transfer"
+msgstr "Prekini prenos datoteke"
+
+#: ../data/glade/filetransfers.glade.h:3
+msgid "Cancels the selected file transfer"
+msgstr "Prekini prenos označene datoteke"
+
+#: ../data/glade/filetransfers.glade.h:4
+msgid "Cancels the selected file transfer and removes incomplete file"
+msgstr "Prekini prenos označene datoteke i izbriši nedovršenu datoteku"
+
+#: ../data/glade/filetransfers.glade.h:5
+msgid "Clean _up"
+msgstr "_Počisti"
+
+#: ../data/glade/filetransfers.glade.h:6
+msgid "File Transfers"
+msgstr "Prenosi datoteka"
+
+#: ../data/glade/filetransfers.glade.h:7
+msgid "Hides the window"
+msgstr "Sakriva prozor"
+
+#: ../data/glade/filetransfers.glade.h:8
+msgid "Remove file transfer from the list."
+msgstr "Ukloni prenos datoteka sa liste"
+
+#: ../data/glade/filetransfers.glade.h:9
+msgid "Removes completed, cancelled and failed file transfers from the list"
+msgstr "Ukloni završene, prekinute i neuspele prenose datoteka iz liste"
+
+#: ../data/glade/filetransfers.glade.h:10
+msgid "Shows a list of file transfers between you and others"
+msgstr "Prikazuje listu prenosa datoteka između Vas i ostalih"
+
+#: ../data/glade/filetransfers.glade.h:11
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
+msgstr ""
+"Ova akcija uklanja prenos datoteke sa liste. Ako je prenos aktivan, prvo se "
+"zaustavlja, pa onda uklanja"
+
+#: ../data/glade/filetransfers.glade.h:12
+msgid "When a file transfer is complete show a popup notification"
+msgstr "Prikaži iskačuće obaveštenje kada se završi prenos datoteke"
+
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:774
+msgid "_Continue"
+msgstr "_Nastavi"
+
+#: ../data/glade/filetransfers.glade.h:14
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Obavesti me kada se završi prenos datoteke"
+
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:186
+msgid "_Open Containing Folder"
+msgstr "_Otvori sadržavajuću fasciklu"
+
+#: ../data/glade/filetransfers.glade.h:16
+msgid "_Pause"
+msgstr "_Pauziraj"
+
+#: ../data/glade/filetransfers.glade.h:17
+msgid "file transfers list"
+msgstr "lista prenosa datoteka"
+
+#: ../data/glade/gajim_themes_window.glade.h:1
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>Boje jezičaka statusa razgovora</b>"
+
+#: ../data/glade/gajim_themes_window.glade.h:2
+msgid ""
+"Account row\n"
+"Group row\n"
+"Contact row\n"
+"Chat Banner"
+msgstr ""
+"Red naloga\n"
+"Red grupa\n"
+"Red kontakata\n"
+"Baner razgovora"
+
+#: ../data/glade/gajim_themes_window.glade.h:6
+msgid "Bold"
+msgstr "Podebljano"
+
+#: ../data/glade/gajim_themes_window.glade.h:7
+msgid "Composing"
+msgstr "Sastavljanje"
+
+#: ../data/glade/gajim_themes_window.glade.h:8
+msgid "Font style:"
+msgstr "Izgled fonta:"
+
+#: ../data/glade/gajim_themes_window.glade.h:9
+msgid "Gajim Themes Customization"
+msgstr "Personalizacija Gajim tema"
+
+#: ../data/glade/gajim_themes_window.glade.h:10
+msgid "Gone"
+msgstr "Otišao"
+
+#: ../data/glade/gajim_themes_window.glade.h:11
+msgid "Inactive"
+msgstr "Neaktivno"
+
+#: ../data/glade/gajim_themes_window.glade.h:12
+msgid "Italic"
+msgstr "Kurziv"
+
+#: ../data/glade/gajim_themes_window.glade.h:13
+msgid ""
+"MUC\n"
+"Messages"
+msgstr ""
+"Poruke\n"
+"višekorisničkog razgovora"
+
+#: ../data/glade/gajim_themes_window.glade.h:15
+msgid ""
+"MUC Directed\n"
+"Messages"
+msgstr ""
+"Usmerene poruke\n"
+"višekorisničkog razgovora"
+
+#: ../data/glade/gajim_themes_window.glade.h:17
+msgid "Paused"
+msgstr "Pauzirano"
+
+#: ../data/glade/gajim_themes_window.glade.h:18
+msgid "Text _color:"
+msgstr "Boja tekst_a:"
+
+#: ../data/glade/gajim_themes_window.glade.h:19
+msgid "Text _font:"
+msgstr "_Font teksta:"
+
+#: ../data/glade/gajim_themes_window.glade.h:20
+msgid "_Background:"
+msgstr "_Pozadina:"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:1
+#, fuzzy
+msgid "Change _Nickname..."
+msgstr "Promeni _nadimak"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:2
+#, fuzzy
+msgid "Change _Subject..."
+msgstr "Promeni _temu"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:3
+msgid "Click to see past conversation in this room"
+msgstr "Kliknite da pogledate prethodni razgovor u ovoj sobi"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:4
+#, fuzzy
+msgid "Configure _Room..."
+msgstr "Podešavanja _sobe"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:5
+#, fuzzy
+msgid "_Bookmark"
+msgstr "_Markiraj ovu so_bu"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+msgid "_Destroy Room"
+msgstr ""
+
+#: ../data/glade/gc_control_popup_menu.glade.h:8
+#, fuzzy
+msgid "_Manage Room"
+msgstr "Podešavanje markera"
+
+#: ../data/glade/gc_control_popup_menu.glade.h:9
+msgid "_Minimize on close"
+msgstr ""
+
+#: ../data/glade/gc_occupants_menu.glade.h:1
+msgid "Mo_derator"
+msgstr "Mo_derator"
+
+#: ../data/glade/gc_occupants_menu.glade.h:2
+#, fuzzy
+msgid "Occupant Actions"
+msgstr "_Akcije prisutnih"
+
+#: ../data/glade/gc_occupants_menu.glade.h:5
+msgid "_Admin"
+msgstr "_Admin"
+
+#: ../data/glade/gc_occupants_menu.glade.h:6
+msgid "_Ban"
+msgstr "_Zabrani"
+
+#: ../data/glade/gc_occupants_menu.glade.h:8
+msgid "_Kick"
+msgstr "_Izbaci"
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
+msgid "_Member"
+msgstr "_Član"
+
+#: ../data/glade/gc_occupants_menu.glade.h:10
+msgid "_Owner"
+msgstr "_Vlasnik"
+
+#: ../data/glade/gc_occupants_menu.glade.h:11
+msgid "_Send Private Message"
+msgstr "_Pošalji privatnu poruku"
+
+#: ../data/glade/gc_occupants_menu.glade.h:12
+msgid "_Voice"
+msgstr "_Glas"
+
+#: ../data/glade/groups_post_window.glade.h:1
+msgid "Create new post"
+msgstr "Napravi novu objavu"
+
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:271
+msgid "From"
+msgstr "Od"
+
+#. holds subject
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:142
+#: ../src/history_manager.py:173
+msgid "Subject"
+msgstr "Tema"
+
+#: ../data/glade/history_manager.glade.h:1
+msgid ""
+"<big><b>Welcome to Gajim History Logs Manager</b></big>\n"
+"\n"
+"You can select logs from the left and/or search database from below.\n"
+"\n"
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
+msgstr ""
+"<big><b>Dobrodošli u Gajimov menadžer dnevnika istorijata</b></big>\n"
+"\n"
+"Sa leve strane možete odabrati dnevnike i/ili niže pretražiti bazu "
+"podataka.\n"
+"\n"
+"<b>UPOZORENJE:</b>\n"
+"Ako planirate da radite veća uklanjanja, potrudite se da Gajim nije "
+"pokrenut. Uopšte, izbegavakte uklanjanja vezana za kontakte sa kojima "
+"trenutno razgovorate."
+
+#: ../data/glade/history_manager.glade.h:7
+msgid "Delete"
+msgstr "Obriši"
+
+#: ../data/glade/history_manager.glade.h:8
+msgid "Export"
+msgstr "Izvezi"
+
+#: ../data/glade/history_manager.glade.h:9
+msgid "Gajim History Logs Manager"
+msgstr "Gajim menadžer dnevnika istorijata"
+
+#: ../data/glade/history_manager.glade.h:10
+msgid "_Search Database"
+msgstr "_Pretraži bazu podataka"
+
+#: ../data/glade/history_window.glade.h:1
+#, fuzzy
+msgid "<b>History Viewer</b>"
+msgstr "<b>Lista pravila</b>"
+
+#: ../data/glade/history_window.glade.h:2
+#, fuzzy
+msgid "<b>JID Selection</b>"
+msgstr "<b>Opis</b>"
+
+#: ../data/glade/history_window.glade.h:3
+msgid "Build custom query"
+msgstr "Izgradi prilagođen upit"
+
+#: ../data/glade/history_window.glade.h:4 ../src/history_window.py:199
+msgid "Conversation History"
+msgstr "Istorijat razgovora"
+
+#: ../data/glade/history_window.glade.h:5
+msgid ""
+"Enter a contact jid or MUC jid here to view its history.\n"
+"If a contact is connected you can even enter his nick name.\n"
+msgstr ""
+
+#: ../data/glade/history_window.glade.h:8
+msgid "Query Builder..."
+msgstr "Graditelj upita..."
+
+#: ../data/glade/history_window.glade.h:9
+msgid "Search"
+msgstr "Pretraga"
+
+#: ../data/glade/history_window.glade.h:10
+#: ../data/glade/zeroconf_information_window.glade.h:10
+msgid "_Log conversation history"
+msgstr "_Pamti u dnevniku istorijat razgovora"
+
+#: ../data/glade/history_window.glade.h:11 ../src/disco.py:1172
+msgid "_Search"
+msgstr "_Pretraga"
+
+#: ../data/glade/invitation_received_dialog.glade.h:1
+msgid "Accept"
+msgstr "Prihvati"
+
+#: ../data/glade/invitation_received_dialog.glade.h:2
+#: ../data/glade/privacy_list_window.glade.h:8
+msgid "Deny"
+msgstr "Odbij"
+
+#: ../data/glade/invitation_received_dialog.glade.h:3
+msgid "Invitation Received"
+msgstr "Primljena pozivnica"
+
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1265
+msgid "Join Group Chat"
+msgstr "Pridruži se grupnom razgovoru"
+
+#: ../data/glade/join_groupchat_window.glade.h:2
+msgid "Join this room automatically when I connect"
+msgstr "Pristupi ovoj sobi automatski kada se povežem"
+
+#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/glade/profile_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:31
+msgid "Nickname:"
+msgstr "Nadimak:"
+
+#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/glade/manage_bookmarks_window.glade.h:6
+msgid "Password:"
+msgstr "Lozinka:"
+
+#: ../data/glade/join_groupchat_window.glade.h:5
+msgid "Recently:"
+msgstr "Nedavno:"
+
+#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:8
+msgid "Room:"
+msgstr "Soba:"
+
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1160
+#: ../src/disco.py:1615
+msgid "_Join"
+msgstr "_Pridruži se"
+
+#: ../data/glade/manage_accounts_window.glade.h:1
+msgid "Manage Accounts"
+msgstr "Podešavanje naloga"
+
+#: ../data/glade/manage_bookmarks_window.glade.h:1
+msgid "Auto join"
+msgstr "Automatsko povezivanje"
+
+#: ../data/glade/manage_bookmarks_window.glade.h:2
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr ""
+"Ako je označeno, Gajim će se pridružiti ovom grupnom razgovoru pri pokretanju"
+
+#: ../data/glade/manage_bookmarks_window.glade.h:3
+msgid "Manage Bookmarks"
+msgstr "Podešavanje markera"
+
+#: ../data/glade/manage_bookmarks_window.glade.h:4
+msgid "Minimize on Auto Join"
+msgstr ""
+
+#: ../data/glade/manage_bookmarks_window.glade.h:7
+msgid "Print status:"
+msgstr "Ispis statusa:"
+
+#: ../data/glade/manage_bookmarks_window.glade.h:9
+msgid "Server:"
+msgstr "Server:"
+
+#: ../data/glade/manage_bookmarks_window.glade.h:10
+msgid "Title:"
+msgstr "Naslov:"
+
+#: ../data/glade/manage_proxies_window.glade.h:1
+msgid "<b>Properties</b>"
+msgstr "<b>Karakteristike</b>"
+
+#: ../data/glade/manage_proxies_window.glade.h:2
+msgid "<b>Settings</b>"
+msgstr "<b>Podešavanja</b>"
+
+#: ../data/glade/manage_proxies_window.glade.h:3
+#, fuzzy
+msgid ""
+"HTTP Connect\n"
+"SOCKS5"
+msgstr "HTTP spoj"
+
+#: ../data/glade/manage_proxies_window.glade.h:5
+msgid "Manage Proxy Profiles"
+msgstr "Podešavanje proksi profila"
+
+#: ../data/glade/manage_proxies_window.glade.h:6
+#: ../data/glade/profile_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:30
+msgid "Name:"
+msgstr "Ime:"
+
+#: ../data/glade/manage_proxies_window.glade.h:7
+msgid "Pass_word:"
+msgstr "Lozinka:"
+
+#: ../data/glade/manage_proxies_window.glade.h:8
+msgid "Type:"
+msgstr "Vrsta:"
+
+#: ../data/glade/manage_proxies_window.glade.h:9
+msgid "Use authentication"
+msgstr "Koristi autentikaciju"
+
+#: ../data/glade/manage_proxies_window.glade.h:10
+msgid "_Host:"
+msgstr "_Host:"
+
+#: ../data/glade/message_window.glade.h:1
+msgid "Click to insert an emoticon (Alt+M)"
+msgstr "Kliknite da ubacite smajli (Alt+M)"
+
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1213
+msgid "OpenPGP Encryption"
+msgstr "OpenPGP enkripcija"
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:4
+#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/subscription_request_window.glade.h:6
+msgid "_Actions"
+msgstr "_Akcije"
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:6
+#: ../data/glade/xml_console_window.glade.h:11
+#: ../src/filetransfers_window.py:243
+msgid "_Send"
+msgstr "_Pošalji"
+
+#: ../data/glade/passphrase_dialog.glade.h:1
+msgid "Passphrase"
+msgstr "Lozinka"
+
+#: ../data/glade/preferences_window.glade.h:1
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Napredna izmena konfiguracije</b>"
+
+#: ../data/glade/preferences_window.glade.h:2
+msgid "<b>Applications</b>"
+msgstr "<b>Aplikacije</b>"
+
+#: ../data/glade/preferences_window.glade.h:3
+#, fuzzy
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Izmeni pravilo</b>"
+
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:5
+msgid "<b>Custom</b>"
+msgstr "<b>Personalni</b>"
+
+#: ../data/glade/preferences_window.glade.h:6
+msgid "<b>Format of a line</b>"
+msgstr "<b>Format linije</b>"
+
+#: ../data/glade/preferences_window.glade.h:7
+msgid "<b>GMail Options</b>"
+msgstr "<b>Gmail Opcije</b>"
+
+#: ../data/glade/preferences_window.glade.h:9
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Već postavljene statusne poruke</b>"
+
+#: ../data/glade/preferences_window.glade.h:10
+#, fuzzy
+msgid "<b>Privacy</b>"
+msgstr "<i>Lista privatnosti</i>"
+
+#: ../data/glade/preferences_window.glade.h:11
+msgid "<b>Roster Appearance</b>"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:13
+#, fuzzy
+msgid "<b>Themes</b>"
+msgstr "<b>Karakteristike</b>"
+
+#: ../data/glade/preferences_window.glade.h:14
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Vizualna obaveštenja</b>"
+
+#: ../data/glade/preferences_window.glade.h:15
+msgid "Advanced"
+msgstr "Napredno"
+
+#: ../data/glade/preferences_window.glade.h:16
+msgid ""
+"All chat states\n"
+"Composing only\n"
+"Disabled"
+msgstr ""
+"Stanja svih razgovora\n"
+"Samo sastavljanje\n"
+"Onemogućeno"
+
+#: ../data/glade/preferences_window.glade.h:19
+msgid "Allow _OS information to be sent"
+msgstr "Dozvoli slanje podataka o OS-u"
+
+#: ../data/glade/preferences_window.glade.h:20
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr ""
+"Omogući iskačuće prozore/obaveštenja kada sam _odsutan/nedostupan/zaposlen/"
+"nevidljiv"
+
+#: ../data/glade/preferences_window.glade.h:21
+msgid "Always check to see if Gajim is the _default Jabber client on startup"
+msgstr "Proveri pri startu _da li je Gajim podrazumevani Džaber klijent"
+
+#: ../data/glade/preferences_window.glade.h:22
+msgid ""
+"An example: If you have enabled status message for away, Gajim won't ask you "
+"anymore for a status message when you change your status to away; it will "
+"use the default one set here"
+msgstr ""
+"Primer: Ako ste omogućili statusnu poruku za odsutnost, Gajim Vas neće više "
+"pitati za statusnu poruku kada promenite Vaš status u odsutnost, već će "
+"korisiti onu postavljenu ovde"
+
+#: ../data/glade/preferences_window.glade.h:23
+msgid "Ask status message when I:"
+msgstr "Pitaj za statusnu poruku pri:"
+
+#: ../data/glade/preferences_window.glade.h:24
+msgid "Auto _away after:"
+msgstr "Autom_atski odsutan nakon:"
+
+#: ../data/glade/preferences_window.glade.h:25
+msgid "Auto _not available after:"
+msgstr "Automatski _nedostupan nakon:"
+
+#: ../data/glade/preferences_window.glade.h:26
+msgid ""
+"Autodetect on every Gajim startup\n"
+"Always use GNOME default applications\n"
+"Always use KDE default applications\n"
+"Always use XFCE4 default applications\n"
+"Custom"
+msgstr ""
+"Automatski prepoznaj pri svakom pokretanju Gajima\n"
+"Uvek koristi predefinisane GNOM aplikacije\n"
+"Uvek koristi predefinisane KDE aplikacije\n"
+"Uvek koristi predefinisane HFCE4 aplikacije\n"
+"Prilagođeno"
+
+#: ../data/glade/preferences_window.glade.h:31
+msgid ""
+"Check this option, only if someone you don't have in the roster spams/annoys "
+"you. Use with caution, because it blocks all messages from any contact that "
+"is not in the roster"
+msgstr ""
+"Označite ovu opciju samo ako Vas neko van Vaše liste spamuje/uznemirava. "
+"Koristite sa oprezom, blokiraće sve poruke koje dolaze od ljudi van Vaše "
+"liste kontakata"
+
+#: ../data/glade/preferences_window.glade.h:32
+msgid "Configure color and font of the interface"
+msgstr "Konfigurisanje boje i fonta interfejsa"
+
+#: ../data/glade/preferences_window.glade.h:33
+msgid "Default Status Messages"
+msgstr "Podrazumevane statusne poruke"
+
+#: ../data/glade/preferences_window.glade.h:34
+msgid ""
+"Determined by sender\n"
+"Chat message\n"
+"Single message"
+msgstr ""
+"Određuje pošaljilac\n"
+"Poruka iz razgovora\n"
+"Samostalna poruka"
+
+#: ../data/glade/preferences_window.glade.h:37
+msgid "Display _extra email details"
+msgstr "Prikaži dodatne e-mejl detalje"
+
+#: ../data/glade/preferences_window.glade.h:38
+msgid "Display a_vatars of contacts in roster"
+msgstr "Prikaži avatare kontakata na listi"
+
+#: ../data/glade/preferences_window.glade.h:39
+msgid "Display status _messages of contacts in roster"
+msgstr "Prikaži statusne poruke kontakata na listi"
+
+#: ../data/glade/preferences_window.glade.h:40
+msgid "Emoticons:"
+msgstr "Smajliji:"
+
+#: ../data/glade/preferences_window.glade.h:41
+msgid "Events"
+msgstr "Događaji"
+
+#: ../data/glade/preferences_window.glade.h:42
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"display in chat windows."
+msgstr ""
+"Gajim može primati i slati meta-informacije vezane za razgovor koji vodite "
+"sa kontaktom. Ovde možete odrediti koja stanja razgovora će se prikazivati u "
+"prozorima razgovora."
+
+#: ../data/glade/preferences_window.glade.h:43
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"send to the other party."
+msgstr ""
+"Gajim može primati i slati meta-informacije vezane za razgovor koji vodite "
+"sa kontaktom. Ovde možete odrediti koja stanja razgovora će se slati drugoj "
+"osobi."
+
+#: ../data/glade/preferences_window.glade.h:44
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr ""
+"Gajim će Vas obavestiti o kontaktima koji su se upravo odjavili sa iskačućim "
+"prozorom u donjem desnom uglu ekrana"
+
+#: ../data/glade/preferences_window.glade.h:46
+#, fuzzy
+msgid "Hides buttons in chatwindows to "
+msgstr "Sakriva dugmad u prozoru grupnog razgovora."
+
+#: ../data/glade/preferences_window.glade.h:47
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+"Ako je označeno, Gajim će ujedno uključiti i informacije o pošiljaocu novih "
+"e-mejlova"
+
+#: ../data/glade/preferences_window.glade.h:48
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"Ako je označeno, Gajim će prikazivati avatare kontakata u listi kontakata i "
+"u grupnim razgovorima"
+
+#: ../data/glade/preferences_window.glade.h:49
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+msgstr ""
+"Ako je označeno, Gajim će prikazivati statusne poruke kontakata ispod imena "
+"kontakta u listi kontakata i u grupnim razgovorima"
+
+#: ../data/glade/preferences_window.glade.h:50
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Ako je označeno, Gajim će koristiti statusne ikone specifične za protokol. "
+"(npr. kontakt sa MSN-a će imati msn ikone za svoje statuse)"
+
+#: ../data/glade/preferences_window.glade.h:51
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"Ako nije onemogućeno, Gajim će zameniti ascii smajlije kao npr. ':)' sa "
+"ekvivalentnim animiranim ili statičnim grafičkim smajlijima"
+
+#: ../data/glade/preferences_window.glade.h:52
+msgid "Ignore rich content in incoming messages"
+msgstr "Ignoriši bogato formatirani sadržaj u pristiglim porukama"
+
+#: ../data/glade/preferences_window.glade.h:53
+msgid "Ma_nage..."
+msgstr "Pode_si..."
+
+#: ../data/glade/preferences_window.glade.h:54
+msgid ""
+"Never\n"
+"Always\n"
+"Per account\n"
+"Per type"
+msgstr ""
+"Nikad\n"
+"Uvek\n"
+"U zavisnosti od naloga\n"
+"U zavisnosti od tipa"
+
+#: ../data/glade/preferences_window.glade.h:58
+#, fuzzy
+msgid "Notify me about contacts that sign _in"
+msgstr "Obavesti me o kontaktima koji:"
+
+#: ../data/glade/preferences_window.glade.h:59
+#, fuzzy
+msgid "Notify me about contacts that sign _out"
+msgstr "Obavesti me o kontaktima koji:"
+
+#: ../data/glade/preferences_window.glade.h:60
+msgid "Notify on new _GMail email"
+msgstr "Obavesti me o novopristigloj Gmail e-mejl pošti"
+
+#: ../data/glade/preferences_window.glade.h:61
+msgid "Play _sounds"
+msgstr "Puštaj zvukove"
+
+#: ../data/glade/preferences_window.glade.h:62
+msgid ""
+"Pop it up\n"
+"Notify me about it\n"
+"Show only in roster"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:65
+msgid "Preferences"
+msgstr "Podešavanja"
+
+#: ../data/glade/preferences_window.glade.h:66
+#, fuzzy
+msgid "Privacy"
+msgstr "Lista privatnosti"
+
+#: ../data/glade/preferences_window.glade.h:67
+msgid "Set status message to reflect currently playing _music track"
+msgstr ""
+"Postavi statusnu poruku da odražava ime trenutno puštene muzičke numere"
+
+#: ../data/glade/preferences_window.glade.h:68
+msgid "Sign _in"
+msgstr "Prijavljivanju"
+
+#: ../data/glade/preferences_window.glade.h:69
+msgid "Sign _out"
+msgstr "Odjavljivanju"
+
+#: ../data/glade/preferences_window.glade.h:70
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Neke poruke mogu uključivati bogati sadržaj (formatiranje, boje itd.). Ako "
+"je označeno, Gajim će samo prikazivati sirovi tekst poruke."
+
+#: ../data/glade/preferences_window.glade.h:71
+msgid "Status"
+msgstr "Status"
+
+#: ../data/glade/preferences_window.glade.h:72
+#, fuzzy
+msgid "Status _iconset:"
+msgstr "Podrazumevani skup statusnih ikona"
+
+#: ../data/glade/preferences_window.glade.h:73
+msgid "T_heme:"
+msgstr "T_ema:"
+
+#: ../data/glade/preferences_window.glade.h:74
+msgid "The auto away status message"
+msgstr "Automatska statusna poruka odsutnosti"
+
+#: ../data/glade/preferences_window.glade.h:75
+msgid "The auto not available status message"
+msgstr "Automatska statusna poruka nedostupnosti"
+
+#: ../data/glade/preferences_window.glade.h:76
+msgid "Treat all incoming messages as:"
+msgstr "Tretiraj sve dolazne poruke kao:"
+
+#: ../data/glade/preferences_window.glade.h:77
+msgid "Use _transports iconsets"
+msgstr "Koristi skup ikona za transportne kontakte"
+
+#: ../data/glade/preferences_window.glade.h:78
+#, fuzzy
+msgid "Use only one message _window:"
+msgstr "Prozor jedne _poruke:"
+
+#: ../data/glade/preferences_window.glade.h:79
+msgid "Use system _default"
+msgstr "Koristi sistemski podrazumevano"
+
+#: ../data/glade/preferences_window.glade.h:80
+#, fuzzy
+msgid "When new event is received:"
+msgstr "Kada se primi novi događaj"
+
+#: ../data/glade/preferences_window.glade.h:81
+msgid ""
+"Works for Rhythmbox and Muine players. For more players, please visit http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+msgstr ""
+"Radi sa Rhytmbox i Muine puštačima muzike. Za ostale, molimo posetite http://"
+"trac.gajim.org/wiki/GajimAndMusicPlayer"
+
+#: ../data/glade/preferences_window.glade.h:82
+msgid "_Advanced Notifications Control..."
+msgstr "_Napredno upravljanje obaveštenjima..."
+
+#: ../data/glade/preferences_window.glade.h:83
+msgid "_Browser:"
+msgstr "_Internet pregledač:"
+
+#: ../data/glade/preferences_window.glade.h:84
+#, fuzzy
+msgid "_Display chat state notifications:"
+msgstr "Prikazana obaveštenja o stanju razgovora"
+
+#: ../data/glade/preferences_window.glade.h:85
+msgid "_File manager:"
+msgstr "_Pregledač datoteka:"
+
+#: ../data/glade/preferences_window.glade.h:86
+msgid "_Font:"
+msgstr "_Font:"
+
+#: ../data/glade/preferences_window.glade.h:87
+msgid "_Highlight misspelled words"
+msgstr "_Oboji pogrešno napisane reči"
+
+#: ../data/glade/preferences_window.glade.h:88
+msgid "_Ignore events from contacts not in the roster"
+msgstr "_Ignoriši događaje od kontakata koji nisu na listi"
+
+#: ../data/glade/preferences_window.glade.h:89
+msgid "_Incoming message:"
+msgstr "_Dolazna poruka:"
+
+#: ../data/glade/preferences_window.glade.h:90
+msgid "_Log status changes of contacts"
+msgstr "_Zapisuj u dnevnik statusne promene kontakata"
+
+#: ../data/glade/preferences_window.glade.h:91
+msgid "_Mail client:"
+msgstr "_E-mejl klijent:"
+
+#: ../data/glade/preferences_window.glade.h:92
+#, fuzzy
+msgid "_Make message windows compact"
+msgstr "Prozor jedne _poruke:"
+
+#: ../data/glade/preferences_window.glade.h:93
+msgid "_Open..."
+msgstr "_Otvori..."
+
+#: ../data/glade/preferences_window.glade.h:94
+msgid "_Outgoing message:"
+msgstr "_Odlazna poruka:"
+
+#: ../data/glade/preferences_window.glade.h:95
+msgid "_Player:"
+msgstr "_Puštač muzike:"
+
+#: ../data/glade/preferences_window.glade.h:96
+msgid "_Reset to Default Colors"
+msgstr "_Ponovo učitaj podrazumevane boje"
+
+#: ../data/glade/preferences_window.glade.h:97
+#, fuzzy
+msgid "_Send chat state notifications:"
+msgstr "Prikazana obaveštenja o stanju razgovora"
+
+#: ../data/glade/preferences_window.glade.h:98
+msgid "_Sort contacts by status"
+msgstr "_Sortiraj kontakte po statusu"
+
+#: ../data/glade/preferences_window.glade.h:99
+msgid "_Status message:"
+msgstr "_Statusna poruka:"
+
+#: ../data/glade/preferences_window.glade.h:100
+msgid "_URL:"
+msgstr "_URL:"
+
+#: ../data/glade/preferences_window.glade.h:101
+msgid "minutes"
+msgstr "minuta"
+
+#: ../data/glade/privacy_lists_window.glade.h:1
+msgid "Privacy Lists:"
+msgstr "Liste privatnosti:"
+
+#: ../data/glade/privacy_list_window.glade.h:1
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>Dodaj / Izmeni pravilo</b>"
+
+#: ../data/glade/privacy_list_window.glade.h:2
+msgid "<b>List of rules</b>"
+msgstr "<b>Lista pravila</b>"
+
+#: ../data/glade/privacy_list_window.glade.h:3
+msgid "<i>Privacy List</i>"
+msgstr "<i>Lista privatnosti</i>"
+
+#: ../data/glade/privacy_list_window.glade.h:4
+msgid "Active for this session"
+msgstr "Aktivno za ovu sesiju"
+
+#: ../data/glade/privacy_list_window.glade.h:5
+msgid "Active on each startup"
+msgstr "Aktovno po svakom pokretanju"
+
+#: ../data/glade/privacy_list_window.glade.h:6
+msgid "All"
+msgstr "Svi"
+
+#: ../data/glade/privacy_list_window.glade.h:7
+msgid "Allow"
+msgstr "Dozvoli"
+
+#: ../data/glade/privacy_list_window.glade.h:9
+msgid "JabberID"
+msgstr "Džaber ID"
+
+#: ../data/glade/privacy_list_window.glade.h:10
+msgid "Order:"
+msgstr "Poredak:"
+
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2104
+msgid "Privacy List"
+msgstr "Lista privatnosti"
+
+#: ../data/glade/privacy_list_window.glade.h:12
+msgid "all by subscription"
+msgstr "sve prema pretplati"
+
+#: ../data/glade/privacy_list_window.glade.h:13
+msgid "all in the group"
+msgstr "sve u grupi"
+
+#: ../data/glade/privacy_list_window.glade.h:14
+msgid ""
+"none\n"
+"both\n"
+"from\n"
+"to"
+msgstr ""
+"nijedna\n"
+"oboje\n"
+"od\n"
+"za"
+
+#: ../data/glade/privacy_list_window.glade.h:18
+msgid "to send me messages"
+msgstr "da mi šalje poruke"
+
+#: ../data/glade/privacy_list_window.glade.h:19
+msgid "to send me queries"
+msgstr "da mi šalje upite"
+
+#: ../data/glade/privacy_list_window.glade.h:20
+msgid "to send me status"
+msgstr "da mi pošalje status"
+
+#: ../data/glade/privacy_list_window.glade.h:21
+msgid "to view my status"
+msgstr "da vidi moj status"
+
+#. "About" is the text of a tab of vcard window
+#: ../data/glade/profile_window.glade.h:2
+#: ../data/glade/vcard_information_window.glade.h:2
+msgid "About"
+msgstr "O"
+
+#: ../data/glade/profile_window.glade.h:3
+#: ../data/glade/vcard_information_window.glade.h:3
+msgid "Address"
+msgstr "Adresa:"
+
+#: ../data/glade/profile_window.glade.h:4
+msgid "Avatar:"
+msgstr "Avatar:"
+
+#: ../data/glade/profile_window.glade.h:5
+#: ../data/glade/vcard_information_window.glade.h:6
+msgid "Birthday:"
+msgstr "Rođendan:"
+
+#: ../data/glade/profile_window.glade.h:6
+#: ../data/glade/vcard_information_window.glade.h:7
+msgid "City:"
+msgstr "Mesto:"
+
+#: ../data/glade/profile_window.glade.h:7
+msgid "Click to set your avatar"
+msgstr "Kliknite da biste postavili Vaš avatar"
+
+#: ../data/glade/profile_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:10
+msgid "Company:"
+msgstr "Preduzeće:"
+
+#: ../data/glade/profile_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:14
+msgid "Country:"
+msgstr "Država:"
+
+#: ../data/glade/profile_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:15
+msgid "Department:"
+msgstr "Odsek:"
+
+#: ../data/glade/profile_window.glade.h:12
+#: ../data/glade/vcard_information_window.glade.h:17
+msgid "Extra Address:"
+msgstr "Dodatna adresa:"
+
+#. Family Name
+#: ../data/glade/profile_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:19
+msgid "Family:"
+msgstr "Familija:"
+
+#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
+#: ../data/glade/profile_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:21
+msgid "Format: YYYY-MM-DD"
+msgstr "Format: GGGG-MM-DD"
+
+#: ../data/glade/profile_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:22
+#, fuzzy
+msgid "Full Name"
+msgstr "Ime"
+
+#. Given Name
+#: ../data/glade/profile_window.glade.h:19
+#: ../data/glade/vcard_information_window.glade.h:24
+msgid "Given:"
+msgstr "Dato:"
+
+#: ../data/glade/profile_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:25
+msgid "Homepage:"
+msgstr "Lična strana:"
+
+#. Middle Name
+#: ../data/glade/profile_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:28
+msgid "Middle:"
+msgstr "Srednje:"
+
+#: ../data/glade/profile_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:34
+msgid "Personal Info"
+msgstr "Lične informacije"
+
+#: ../data/glade/profile_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:35
+msgid "Phone No.:"
+msgstr "Broj telefona:"
+
+#: ../data/glade/profile_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:36
+msgid "Position:"
+msgstr "Pozicija:"
+
+#: ../data/glade/profile_window.glade.h:29
+#: ../data/glade/vcard_information_window.glade.h:37
+msgid "Postal Code:"
+msgstr "Poštanski broj:"
+
+#. Prefix in Name
+#: ../data/glade/profile_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "Prefix:"
+msgstr "Prefiks:"
+
+#: ../data/glade/profile_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:41 ../src/vcard.py:302
+msgid "Role:"
+msgstr "Uloga:"
+
+#: ../data/glade/profile_window.glade.h:33
+#: ../data/glade/vcard_information_window.glade.h:42
+msgid "State:"
+msgstr "Država:"
+
+#: ../data/glade/profile_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:44
+msgid "Street:"
+msgstr "Ulica:"
+
+#. Suffix in Name
+#: ../data/glade/profile_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:48
+msgid "Suffix:"
+msgstr "Sufiks:"
+
+#: ../data/glade/profile_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:50
+msgid "Work"
+msgstr "Posao"
+
+#: ../data/glade/remove_account_window.glade.h:1
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>Šta želite da uradite?</b>"
+
+#: ../data/glade/remove_account_window.glade.h:2
+msgid "Remove account _only from Gajim"
+msgstr "Ukloni nalog samo iz Gajima"
+
+#: ../data/glade/remove_account_window.glade.h:3
+msgid "Remove account from Gajim and from _server"
+msgstr "Ukloni nalog i iz Gajima i sa servera"
+
+#. Remove
+#. Remove group
+#. Remove
+#: ../data/glade/remove_account_window.glade.h:4
+#: ../data/glade/roster_contact_context_menu.glade.h:18
+#: ../src/roster_window.py:2524 ../src/roster_window.py:2734
+#: ../src/roster_window.py:2870
+msgid "_Remove"
+msgstr "_Ukloni"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:1
+msgid "A_sk to see his/her status"
+msgstr "Traži njegov/njen status"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:2
+#, fuzzy
+msgid "Add Special _Notification..."
+msgstr "Dodaj poseb_no obaveštenje"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:3
+#, fuzzy
+msgid "Assign Open_PGP Key..."
+msgstr "Pridruži Open_PGP Ključ"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:4
+#, fuzzy
+msgid "Edit _Groups..."
+msgstr "Izmeni _grupe"
+
+#. Execute Command
+#: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:2827
+msgid "Execute Command..."
+msgstr "Izvrši naredbu..."
+
+#. Invite to Groupchat
+#: ../data/glade/roster_contact_context_menu.glade.h:6
+#: ../src/roster_window.py:2440
+msgid "In_vite to"
+msgstr "Pozo_vi u"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+#: ../src/roster_window.py:2664 ../src/roster_window.py:2798
+#, fuzzy
+msgid "Send Cus_tom Status"
+msgstr "Šalje korisnički definisan XML"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+msgid "Send Single _Message..."
+msgstr "Pošalji jednu _poruku..."
+
+#: ../data/glade/roster_contact_context_menu.glade.h:9
+#, fuzzy
+msgid "Send _File..."
+msgstr "Pošalji _datoteku"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:10
+msgid "Set Custom _Avatar..."
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
+msgid "Start _Chat"
+msgstr "Započni ra_zgovor"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+msgid "_Allow him/her to see my status"
+msgstr "_Dozvoli mu/joj da vidi moj status"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+#: ../src/roster_window.py:2514 ../src/roster_window.py:2725
+msgid "_Block"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+msgid "_Forbid him/her to see my status"
+msgstr "_Zabrani mu/joj da vidi moj status"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
+#, fuzzy
+msgid "_Manage Contact"
+msgstr "Preimenuj kontakt"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:19
+#, fuzzy
+msgid "_Rename..."
+msgstr "_Preimenuj"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:20
+msgid "_Subscription"
+msgstr "_Pretplata"
+
+#: ../data/glade/roster_contact_context_menu.glade.h:21
+#: ../src/roster_window.py:2508 ../src/roster_window.py:2719
+msgid "_Unblock"
+msgstr ""
+
+#: ../data/glade/roster_window.glade.h:1
+msgid "A_ccounts"
+msgstr "Nalo_zi"
+
+#: ../data/glade/roster_window.glade.h:2
+#, fuzzy
+msgid "Add _Contact..."
+msgstr "_Dodaj kontakt..."
+
+#: ../data/glade/roster_window.glade.h:3
+#, fuzzy
+msgid "Fea_tures"
+msgstr "Mogućnosti servera"
+
+#: ../data/glade/roster_window.glade.h:4
+msgid "File _Transfers"
+msgstr "Prenosi da_toteka"
+
+#: ../data/glade/roster_window.glade.h:5
+msgid "Frequently Asked Questions (online)"
+msgstr "Često postavljana pitanja (internet)"
+
+#: ../data/glade/roster_window.glade.h:7
+msgid "Help online"
+msgstr "Pomoć sa interneta"
+
+#: ../data/glade/roster_window.glade.h:9
+msgid "Profile, A_vatar"
+msgstr "Profil, A_vatar"
+
+#: ../data/glade/roster_window.glade.h:10
+msgid "Show Trans_ports"
+msgstr "Prikaži trans_porte"
+
+#: ../data/glade/roster_window.glade.h:11
+msgid "Show _Offline Contacts"
+msgstr "Prikaži kontakte koji nisu na vezi"
+
+#: ../data/glade/roster_window.glade.h:14
+msgid "_Contents"
+msgstr "_Sadržaj"
+
+#: ../data/glade/roster_window.glade.h:16 ../src/disco.py:1348
+msgid "_Edit"
+msgstr "_Izmeni"
+
+#: ../data/glade/roster_window.glade.h:17
+msgid "_FAQ"
+msgstr "_ČPP"
+
+#: ../data/glade/roster_window.glade.h:18
+msgid "_Help"
+msgstr "_Pomoć"
+
+#: ../data/glade/roster_window.glade.h:19
+msgid "_Preferences"
+msgstr "_Podešavanja"
+
+#: ../data/glade/roster_window.glade.h:20
+msgid "_Quit"
+msgstr "_Izlaz"
+
+#: ../data/glade/roster_window.glade.h:21
+#, fuzzy
+msgid "_Send Single Message..."
+msgstr "Pošalji jednu _poruku..."
+
+#: ../data/glade/roster_window.glade.h:23
+msgid "_View"
+msgstr "_Prikaz"
+
+#: ../data/glade/service_discovery_window.glade.h:1
+msgid "G_o"
+msgstr "Kre_ni"
+
+#: ../data/glade/service_discovery_window.glade.h:2
+msgid "_Address:"
+msgstr "_Adresa:"
+
+#: ../data/glade/service_registration_window.glade.h:1
+msgid "Register to"
+msgstr "Registruj se na"
+
+#: ../data/glade/service_registration_window.glade.h:2
+msgid "_Cancel"
+msgstr "_Odustani"
+
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "_U redu"
+
+#: ../data/glade/single_message_window.glade.h:1
+msgid "0"
+msgstr "O"
+
+#: ../data/glade/single_message_window.glade.h:2
+msgid "From:"
+msgstr "Od:"
+
+#: ../data/glade/single_message_window.glade.h:3
+msgid "Reply to this message"
+msgstr "Odgovori na ovu poruku"
+
+#: ../data/glade/single_message_window.glade.h:4
+msgid "Sen_d"
+msgstr "P_ošalji"
+
+#: ../data/glade/single_message_window.glade.h:5
+msgid "Send message"
+msgstr "Pošalji poruku"
+
+#: ../data/glade/single_message_window.glade.h:6
+msgid "Send message and close window"
+msgstr "Pošalji poruku i zatvori prozor"
+
+#: ../data/glade/single_message_window.glade.h:7
+msgid "Subject:"
+msgstr "Tema:"
+
+#: ../data/glade/single_message_window.glade.h:8
+msgid "To:"
+msgstr "Za:"
+
+#: ../data/glade/single_message_window.glade.h:9
+msgid "_Reply"
+msgstr "_Odgovor"
+
+#: ../data/glade/single_message_window.glade.h:10
+msgid "_Send & Close"
+msgstr "_Pošalji i zatvori"
+
+#: ../data/glade/subscription_request_window.glade.h:1
+msgid "Au_thorize"
+msgstr "_Odobri autorizaciju"
+
+#: ../data/glade/subscription_request_window.glade.h:2
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "Autorizuj kontakt tako da on/ona može da vidi kada ste na vezi"
+
+#: ../data/glade/subscription_request_window.glade.h:3
+msgid ""
+"Deny authorization from contact so he or she cannot know when you're "
+"connected"
+msgstr ""
+"Odbij autorizaciju od kontakta tako da on/ona ne može da vidi kada ste na "
+"vezi"
+
+#: ../data/glade/subscription_request_window.glade.h:4
+msgid "Subscription Request"
+msgstr "Zahtev za pretplatom"
+
+#: ../data/glade/subscription_request_window.glade.h:7
+msgid "_Deny"
+msgstr "_Odbij"
+
+#: ../data/glade/systray_context_menu.glade.h:1
+msgid "Mute Sounds"
+msgstr "Ugasi zvukove"
+
+#: ../data/glade/systray_context_menu.glade.h:2
+msgid "Send Single _Message"
+msgstr "Pošalji _jednu poruku"
+
+#: ../data/glade/systray_context_menu.glade.h:3
+msgid "Show All Pending _Events"
+msgstr "Prikaži sv_e događaje na čekanju"
+
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
+msgstr "_Prikaži listu kontakata"
+
+#: ../data/glade/systray_context_menu.glade.h:5
+msgid "Sta_tus"
+msgstr "Sta_tus"
+
+#: ../data/glade/systray_context_menu.glade.h:6
+msgid "_Group Chat"
+msgstr "_Grupni razgovor"
+
+#. Given Name
+#: ../data/glade/vcard_information_window.glade.h:5
+msgid "Ask:"
+msgstr "Pitaj:"
+
+#: ../data/glade/vcard_information_window.glade.h:8
+msgid "Client:"
+msgstr "Klijent:"
+
+#: ../data/glade/vcard_information_window.glade.h:9
+msgid "Comments"
+msgstr "Komentari"
+
+#: ../data/glade/vcard_information_window.glade.h:11
+#, fuzzy
+msgid "Configured avatar:"
+msgstr "Podešavanja _sobe"
+
+#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/glade/zeroconf_information_window.glade.h:1
+msgid "Contact"
+msgstr "Kontakt"
+
+#: ../data/glade/vcard_information_window.glade.h:13
+msgid "Contact Information"
+msgstr "Informacije kontakta"
+
+#: ../data/glade/vcard_information_window.glade.h:29
+msgid "More"
+msgstr "Još"
+
+#: ../data/glade/vcard_information_window.glade.h:33
+msgid "OS:"
+msgstr "OS:"
+
+#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/zeroconf_information_window.glade.h:8
+msgid "Resource:"
+msgstr "Resurs:"
+
+#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/zeroconf_information_window.glade.h:9
+msgid "Status:"
+msgstr "Status:"
+
+#. Family Name
+#: ../data/glade/vcard_information_window.glade.h:46
+msgid "Subscription:"
+msgstr "Pretplata:"
+
+#: ../data/glade/vcard_information_window.glade.h:49
+#, fuzzy
+msgid "User avatar:"
+msgstr "Avatar:"
+
+#: ../data/glade/xml_console_window.glade.h:1
+msgid "<b>Jabber Traffic</b>"
+msgstr "<b>Džaber saobraćaj</b>"
+
+#: ../data/glade/xml_console_window.glade.h:2
+msgid "<b>XML Input</b>"
+msgstr "<b>XML Unos</b>"
+
+#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
+#: ../data/glade/xml_console_window.glade.h:6
+msgid "Info/Query"
+msgstr "Info/Upit"
+
+#. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
+#: ../data/glade/xml_console_window.glade.h:8
+msgid "_IQ"
+msgstr "_IU"
+
+#: ../data/glade/xml_console_window.glade.h:9
+msgid "_Message"
+msgstr "_Poruka"
+
+#: ../data/glade/xml_console_window.glade.h:10
+msgid "_Presence"
+msgstr "_Prisutnost"
+
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:1
+msgid "Add Special _Notification"
+msgstr "Dodaj poseb_no obaveštenje"
+
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:2
+msgid "Assign Open_PGP Key"
+msgstr "Pridruži Open_PGP Ključ"
+
+#. Edit Groups
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
+#: ../src/roster_window.py:2497
+msgid "Edit _Groups"
+msgstr "Izmeni _grupe"
+
+#. Rename
+#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:2854
+msgid "_Rename"
+msgstr "_Preimenuj"
+
+#: ../data/glade/zeroconf_context_menu.glade.h:1
+msgid "_Modify Account..."
+msgstr "_Izmeni nalog..."
+
+#: ../data/glade/zeroconf_information_window.glade.h:6
+msgid "Local jid:"
+msgstr "Lokalni džaber ID:"
+
+#: ../data/glade/zeroconf_information_window.glade.h:7
+msgid "Personal"
+msgstr "Lično"
+
+#: ../data/glade/zeroconf_properties_window.glade.h:15
+msgid "Modify Account"
+msgstr "Izmeni nalog"
+
+#. For i18n
+#: ../src/advanced.py:51
+msgid "Activated"
+msgstr "Aktivirano"
+
+#: ../src/advanced.py:51
+msgid "Deactivated"
+msgstr "Deaktivirano"
+
+#: ../src/advanced.py:53
+msgid "Boolean"
+msgstr "Bulova vrednost"
+
+#: ../src/advanced.py:54
+msgid "Integer"
+msgstr "Ceo broj"
+
+#: ../src/advanced.py:55
+msgid "Text"
+msgstr "Tekst"
+
+#: ../src/advanced.py:56
+msgid "Color"
+msgstr "Boja"
+
+#: ../src/advanced.py:65
+msgid "Preference Name"
+msgstr "Ime postavke"
+
+#: ../src/advanced.py:71
+msgid "Value"
+msgstr "Vrednost"
+
+#: ../src/advanced.py:79
+msgid "Type"
+msgstr "Tip"
+
+#. we talk about option description in advanced configuration editor
+#: ../src/advanced.py:136
+msgid "(None)"
+msgstr "(ništa)"
+
+#. we talk about password
+#: ../src/advanced.py:239
+msgid "Hidden"
+msgstr "Skriven"
+
+#. the next script, executed in the "po" directory,
+#. generates the following list.
+#. #!/bin/sh
+#. LANG=$(for i in *.po; do  j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
+#. echo "{_('en'):'en'",$LANG"}"
+#: ../src/chat_control.py:55
+msgid "English"
+msgstr "Engleski"
+
+#: ../src/chat_control.py:55
+msgid "Belarusian"
+msgstr "Beloruski"
+
+#: ../src/chat_control.py:55
+msgid "Bulgarian"
+msgstr "Bugarski"
+
+#: ../src/chat_control.py:55
+#, fuzzy
+msgid "Breton"
+msgstr "Britanski"
+
+#: ../src/chat_control.py:55
+msgid "Czech"
+msgstr "Češki"
+
+#: ../src/chat_control.py:55
+msgid "German"
+msgstr "Nemački"
+
+#: ../src/chat_control.py:55
+msgid "Greek"
+msgstr "Grčki"
+
+#: ../src/chat_control.py:55
+msgid "British"
+msgstr "Britanski"
+
+#: ../src/chat_control.py:55
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../src/chat_control.py:55
+msgid "Spanish"
+msgstr "Španski"
+
+#: ../src/chat_control.py:55
+#, fuzzy
+msgid "Basque"
+msgstr "Baskijski"
+
+#: ../src/chat_control.py:55
+msgid "French"
+msgstr "Francuski"
+
+#: ../src/chat_control.py:55
+msgid "Croatian"
+msgstr "Hrvatski"
+
+#: ../src/chat_control.py:55
+msgid "Italian"
+msgstr "Italijanski"
+
+#: ../src/chat_control.py:55
+msgid "Norwegian (b)"
+msgstr "Norveški (b)"
+
+#: ../src/chat_control.py:55
+msgid "Dutch"
+msgstr "Holandski"
+
+#: ../src/chat_control.py:55
+msgid "Norwegian"
+msgstr "Norveški"
+
+#: ../src/chat_control.py:55
+msgid "Polish"
+msgstr "Poljski"
+
+#: ../src/chat_control.py:55
+msgid "Portuguese"
+msgstr "Portugalski"
+
+#: ../src/chat_control.py:55
+msgid "Brazilian Portuguese"
+msgstr "Brazilski portugalski"
+
+#: ../src/chat_control.py:55
+msgid "Russian"
+msgstr "Ruski"
+
+#: ../src/chat_control.py:55
+msgid "Serbian"
+msgstr "Srpski"
+
+#: ../src/chat_control.py:55
+msgid "Slovak"
+msgstr "Slovački"
+
+#: ../src/chat_control.py:55
+msgid "Swedish"
+msgstr "Švedski"
+
+#: ../src/chat_control.py:55
+msgid "Chinese (Ch)"
+msgstr "Kineski (Ch)"
+
+#: ../src/chat_control.py:283
+msgid "Spelling language"
+msgstr "Jezik za pravopis"
+
+#. we are not connected
+#: ../src/chat_control.py:306 ../src/chat_control.py:512
+msgid "A connection is not available"
+msgstr "Veza nije dostupna"
+
+#: ../src/chat_control.py:307 ../src/chat_control.py:513
+msgid "Your message can not be sent until you are connected."
+msgstr "Vaša poruka ne može biti poslata ako niste povezani."
+
+#: ../src/chat_control.py:1139
+#, python-format
+msgid "%(nickname)s from group chat %(room_name)s"
+msgstr "%(nickname)s sa grupnog razgovora u sobi %(room_name)s"
+
+#. we talk about a contact here
+#: ../src/chat_control.py:1227
+#, python-format
+msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+msgstr "%s nije emitovao OpenPGP ključ, niti mu je ijedan dodeljen"
+
+#: ../src/chat_control.py:1266 ../src/groupchat_control.py:1392
+#, python-format
+msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+msgstr ""
+"Ne postoji komanda: /%s (ako želite da pošaljete to kao poruku, "
+"prefiksirajte je sa /say)"
+
+#: ../src/chat_control.py:1273 ../src/groupchat_control.py:1415
+#, python-format
+msgid "Commands: %s"
+msgstr "Komanda: %s"
+
+#: ../src/chat_control.py:1276 ../src/groupchat_control.py:1429
+#, python-format
+msgid "Usage: /%s, clears the text window."
+msgstr "Način korišćenja: /%s, prazni tekstualni prozor"
+
+#: ../src/chat_control.py:1279 ../src/groupchat_control.py:1434
+#, python-format
+msgid "Usage: /%s, hide the chat buttons."
+msgstr "Način korišćenja: /%s, sakriva dugmad."
+
+#: ../src/chat_control.py:1282 ../src/groupchat_control.py:1450
+#, python-format
+msgid ""
+"Usage: /%s <action>, sends action to the current group chat. Use third "
+"person. (e.g. /%s explodes.)"
+msgstr ""
+"Način korišćenja: /%s <akcija>, šalje akciju trenutnom grupnom razgovoru. "
+"Koristite treću osobu (npr. /%s eksplodira)."
+
+#: ../src/chat_control.py:1286
+#, python-format
+msgid "Usage: /%s, sends a ping to the contact"
+msgstr ""
+
+#: ../src/chat_control.py:1289
+#, fuzzy, python-format
+msgid "Usage: /%s, send the message to the contact"
+msgstr "Način korišćenja: /%s, sakriva dugmad."
+
+#: ../src/chat_control.py:1292 ../src/groupchat_control.py:1473
+#, python-format
+msgid "No help info for /%s"
+msgstr "Nema informacija ni pomoći za /%s"
+
+#: ../src/chat_control.py:1430 ../src/chat_control.py:1456
+msgid "Encryption enabled"
+msgstr "Enkripcija omogućena"
+
+#: ../src/chat_control.py:1435
+msgid "Session WILL be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1437
+msgid "Session WILL NOT be logged"
+msgstr ""
+
+#: ../src/chat_control.py:1444
+#, fuzzy
+msgid "The following message was NOT encrypted"
+msgstr "[Ova poruka je šifrovana]"
+
+#: ../src/chat_control.py:1448 ../src/chat_control.py:1461
+#: ../src/chat_control.py:2090
+msgid "Encryption disabled"
+msgstr "Enkripcija onemogućena"
+
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1618 ../src/conversation_textview.py:562
+#: ../src/dialogs.py:674 ../src/gajim.py:894 ../src/gajim.py:895
+#: ../src/gajim.py:1364 ../src/roster_window.py:345
+#: ../src/roster_window.py:429 ../src/roster_window.py:1790
+#: ../src/roster_window.py:1800 ../src/roster_window.py:2039
+#: ../src/roster_window.py:2277 ../src/roster_window.py:3125
+#: ../src/roster_window.py:3332 ../src/roster_window.py:4692
+#: ../src/roster_window.py:4694 ../src/common/contacts.py:84
+#: ../src/common/helpers.py:44 ../src/common/helpers.py:258
+msgid "Not in Roster"
+msgstr "Nije na listi kontakata"
+
+#. %s is being replaced in the code with JID
+#: ../src/chat_control.py:1762
+#, python-format
+msgid "You just received a new message from \"%s\""
+msgstr "\"%s\" Vam je upravo poslao poruku"
+
+#: ../src/chat_control.py:1763
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Ako zatvorite ovaj jezičak, a istorijat razgovora nije omogućen, ova poruka "
+"će biti izgubljena."
+
+#: ../src/config.py:122 ../src/config.py:544
+msgid "Disabled"
+msgstr "Onemogućeno"
+
+#: ../src/config.py:288
+msgid "Active"
+msgstr "Aktivno"
+
+#: ../src/config.py:296
+msgid "Event"
+msgstr "događaj"
+
+#: ../src/config.py:617 ../src/dialogs.py:958
+#, python-format
+msgid "Dictionary for lang %s not available"
+msgstr "Rečnik za jezik %s nije dostupan"
+
+#: ../src/config.py:618
+#, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+"Morate instalirati %s rečnik kako biste mogli koristiti proveru pravopisa, "
+"ili odaberite drugi jezik postavkom speller_language opcije."
+
+#: ../src/config.py:969
+msgid "status message title"
+msgstr "naslov statusne poruke"
+
+#: ../src/config.py:969
+msgid "status message text"
+msgstr "tekst statusne poruke"
+
+#: ../src/config.py:1005
+msgid "First Message Received"
+msgstr "Primljena Prva Poruka"
+
+#: ../src/config.py:1006
+msgid "Next Message Received"
+msgstr "Sledeća Primljena Poruka"
+
+#: ../src/config.py:1007
+msgid "Contact Connected"
+msgstr "Kontakt Na Vezi"
+
+#: ../src/config.py:1008
+msgid "Contact Disconnected"
+msgstr "Kontakt Otišao Sa Veze"
+
+#: ../src/config.py:1009
+msgid "Message Sent"
+msgstr "Poruka Poslata"
+
+#: ../src/config.py:1010
+msgid "Group Chat Message Highlight"
+msgstr "Bojenje Poruka Sa Grupnog Razgovora"
+
+#: ../src/config.py:1011
+msgid "Group Chat Message Received"
+msgstr "Primljena Poruka Sa Grupnog Razgovora"
+
+#: ../src/config.py:1018
+msgid "GMail Email Received"
+msgstr "Primljen Gmail e-mejl"
+
+#. Name column
+#: ../src/config.py:1287 ../src/dialogs.py:1397 ../src/dialogs.py:1461
+#: ../src/disco.py:736 ../src/disco.py:1559 ../src/disco.py:1805
+#: ../src/history_window.py:108
+msgid "Name"
+msgstr "Ime"
+
+#: ../src/config.py:1395 ../src/common/config.py:375
+msgid "Be right back."
+msgstr "Odmah se vraćam."
+
+#: ../src/config.py:1399
+msgid "Relogin now?"
+msgstr "Otići sa veze i povezati se odmah?"
+
+#: ../src/config.py:1400
+msgid "If you want all the changes to apply instantly, you must relogin."
+msgstr ""
+"Ako želite da se sve promene trenutno primene, morate da se ponovo povežete."
+
+#: ../src/config.py:1495 ../src/config.py:1594
+msgid "OpenPGP is not usable in this computer"
+msgstr "OpenPGP nije moguće koristiti na ovom računaru"
+
+#: ../src/config.py:1630 ../src/config.py:1674
+msgid "Unread events"
+msgstr "Nepročitani događaji"
+
+#: ../src/config.py:1631
+msgid "Read all pending events before removing this account."
+msgstr "Pročitajte sve događaje na čekanju pre uklanjanja naloga."
+
+#: ../src/config.py:1660
+#, python-format
+msgid "You have opened chat in account %s"
+msgstr "Otvorili ste razgovor u računu %s"
+
+#: ../src/config.py:1661
+msgid "All chat and groupchat windows will be closed. Do you want to continue?"
+msgstr ""
+"Prozori svih razgovora i grupnih razgovora će biti zatvoreni. Želite li da "
+"nastavite?"
+
+#: ../src/config.py:1670
+msgid "You are currently connected to the server"
+msgstr "Trenutno ste spojeni na server"
+
+#: ../src/config.py:1671
+msgid "To change the account name, you must be disconnected."
+msgstr "Za promenu imena naloga, morate otići sa veze."
+
+#: ../src/config.py:1675
+msgid "To change the account name, you must read all pending events."
+msgstr ""
+"Da biste promenili ime naloga, morate prvo pročitati sve događaje na čekanju."
+
+#: ../src/config.py:1681
+msgid "Account Name Already Used"
+msgstr "Ime Naloga Već U Upotrebi"
+
+#: ../src/config.py:1682
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
+msgstr ""
+"Ovo ime već koristi jedan od Vaših naloga. Molimo Vas, odaberite drugo ime."
+
+#: ../src/config.py:1686 ../src/config.py:1690
+msgid "Invalid account name"
+msgstr "Neispravno ime naloga"
+
+#: ../src/config.py:1687
+msgid "Account name cannot be empty."
+msgstr "Ime naloga ne može biti prazno."
+
+#: ../src/config.py:1691
+msgid "Account name cannot contain spaces."
+msgstr "Ime naloga ne može da sadrži beline."
+
+#: ../src/config.py:1755
+#, fuzzy
+msgid "Rename Account"
+msgstr "Podešavanje naloga"
+
+#: ../src/config.py:1756
+#, fuzzy, python-format
+msgid "Enter a new name for account %s"
+msgstr "Unesite novo ime za grupu %s"
+
+#: ../src/config.py:1774 ../src/config.py:1782 ../src/config.py:1822
+#: ../src/config.py:3048
+msgid "Invalid Jabber ID"
+msgstr "Neispravan džaber ID"
+
+#: ../src/config.py:1783
+msgid "A Jabber ID must be in the form \"user@servername\"."
+msgstr "Džaber ID mora biti oblika \"korisnik@server\"."
+
+#: ../src/config.py:1968 ../src/config.py:3119
+msgid "Invalid entry"
+msgstr "Neispravan unos"
+
+#: ../src/config.py:1969 ../src/config.py:3120
+msgid "Custom port must be a port number."
+msgstr "Vaš port mora biti broj porta."
+
+#: ../src/config.py:1990
+msgid "Failed to get secret keys"
+msgstr "Neuspelo uzimanje tajnih ključeva"
+
+#: ../src/config.py:1991
+msgid "There was a problem retrieving your OpenPGP secret keys."
+msgstr "Došlo je do problema u uzimanju Vaših OpenPGP tajnih ključeva."
+
+#: ../src/config.py:1994
+msgid "OpenPGP Key Selection"
+msgstr "Odabir OpenPGP Ključeva"
+
+#: ../src/config.py:1995
+msgid "Choose your OpenPGP key"
+msgstr "Odaberite Vaš OpenPGP ključ"
+
+#: ../src/config.py:2052
+msgid "No such account available"
+msgstr "Nije dostupan takav nalog"
+
+#: ../src/config.py:2053
+msgid "You must create your account before editing your personal information."
+msgstr "Morate napraviti Vaš nalog pre izmena ličnih informacija."
+
+#: ../src/config.py:2060 ../src/dialogs.py:1244 ../src/dialogs.py:1385
+#: ../src/dialogs.py:1565 ../src/disco.py:420 ../src/profile_window.py:325
+msgid "You are not connected to the server"
+msgstr "Niste povezani na server"
+
+#: ../src/config.py:2061
+msgid "Without a connection, you can not edit your personal information."
+msgstr "Bez veze sa serverom, nije moguća izmena ličnih informacija."
+
+#: ../src/config.py:2065
+msgid "Your server doesn't support Vcard"
+msgstr "Vaš server ne podržava Vcard"
+
+#: ../src/config.py:2066
+msgid "Your server can't save your personal information."
+msgstr "Vaš server ne može da sačuva Vaše lične informacije."
+
+#: ../src/config.py:2097
+msgid "Account Local already exists."
+msgstr "Račun lokal već postoji."
+
+#: ../src/config.py:2098
+msgid "Please rename or remove it before enabling link-local messaging."
+msgstr "Molimo Vas, preimenujte ili uklonite pre omogućavanja lokalnih poruka."
+
+#: ../src/config.py:2274
+#, python-format
+msgid "Edit %s"
+msgstr "Izmeni %s"
+
+#: ../src/config.py:2276
+#, python-format
+msgid "Register to %s"
+msgstr "Registruj se na %s"
+
+#. list at the beginning
+#: ../src/config.py:2312
+msgid "Ban List"
+msgstr "Lista zabrana"
+
+#: ../src/config.py:2313
+msgid "Member List"
+msgstr "Lista članova"
+
+#: ../src/config.py:2314
+msgid "Owner List"
+msgstr "Lista vlasnika"
+
+#: ../src/config.py:2315
+msgid "Administrator List"
+msgstr "Lista administratora"
+
+#. Address column
+#. holds JID (who said this)
+#: ../src/config.py:2364 ../src/disco.py:743 ../src/history_manager.py:155
+msgid "JID"
+msgstr "DŽID"
+
+#: ../src/config.py:2372
+msgid "Reason"
+msgstr "Razlog"
+
+#: ../src/config.py:2377
+msgid "Nick"
+msgstr "Nadimak"
+
+#: ../src/config.py:2381
+msgid "Role"
+msgstr "Uloga"
+
+#: ../src/config.py:2406
+msgid "Banning..."
+msgstr "Zabrana..."
+
+#. You can move '\n' before user@domain if that line is TOO BIG
+#: ../src/config.py:2408
+msgid ""
+"<b>Whom do you want to ban?</b>\n"
+"\n"
+msgstr ""
+"<b>Koga želite zabraniti?</b>\n"
+"\n"
+
+#: ../src/config.py:2410
+msgid "Adding Member..."
+msgstr "Dodavanje člana..."
+
+#: ../src/config.py:2411
+msgid ""
+"<b>Whom do you want to make a member?</b>\n"
+"\n"
+msgstr ""
+"<b>Koga želite da postavite članom?</b>\n"
+"\n"
+
+#: ../src/config.py:2413
+msgid "Adding Owner..."
+msgstr "Dodavanje vlasnika..."
+
+#: ../src/config.py:2414
+msgid ""
+"<b>Whom do you want to make an owner?</b>\n"
+"\n"
+msgstr ""
+"<b>Koga želite da postavite za vlasnika?</b>\n"
+"\n"
+
+#: ../src/config.py:2416
+msgid "Adding Administrator..."
+msgstr "Dodavanje administratora..."
+
+#: ../src/config.py:2417
+msgid ""
+"<b>Whom do you want to make an administrator?</b>\n"
+"\n"
+msgstr ""
+"<b>Koga želite da postavite za administratora?</b>\n"
+"\n"
+
+#: ../src/config.py:2418
+msgid ""
+"Can be one of the following:\n"
+"1. user@domain/resource (only that resource matches).\n"
+"2. user@domain (any resource matches).\n"
+"3. domain/resource (only that resource matches).\n"
+"4. domain (the domain itself matches, as does any user@domain,\n"
+"domain/resource, or address containing a subdomain."
+msgstr ""
+"Može biti jedno od sledećeg:\n"
+"1. korisnik@domen/resurs (poklapa se samo sa tim resursom).\n"
+"2. korisnik@domen (poklapa se sa bilo kojim resursom).\n"
+"3. domen/resurs (poklapa se samo sa tim resursom).\n"
+"4. domen (samo se domen poklapa, kao i bilo koji korisnik@domen,\n"
+"domen/resurs, ili adresa koja sadrži poddomen."
+
+#: ../src/config.py:2522
+#, python-format
+msgid "Removing %s account"
+msgstr "Uklanjanje računa %s"
+
+#: ../src/config.py:2539 ../src/gajim.py:1307 ../src/roster_window.py:3391
+msgid "Password Required"
+msgstr "Lozinka zahtevana"
+
+#: ../src/config.py:2540 ../src/roster_window.py:3387
+#, python-format
+msgid "Enter your password for account %s"
+msgstr "Unesite Vašu lozinku za račun %s"
+
+#: ../src/config.py:2541 ../src/roster_window.py:3392
+msgid "Save password"
+msgstr "Sačuvaj lozinku"
+
+#: ../src/config.py:2555
+#, python-format
+msgid "Account \"%s\" is connected to the server"
+msgstr "Račun \"%s\" je povezan na server"
+
+#: ../src/config.py:2556
+msgid "If you remove it, the connection will be lost."
+msgstr "Ukoliko ga uklonite, veza će biti izgubljena."
+
+#: ../src/config.py:2649
+msgid "Default"
+msgstr "Podrazumevano"
+
+#: ../src/config.py:2649
+msgid "?print_status:All"
+msgstr "?ispis statusa:Sve"
+
+#: ../src/config.py:2650
+msgid "Enter and leave only"
+msgstr "Samo ući i napustiti"
+
+#: ../src/config.py:2651
+msgid "?print_status:None"
+msgstr "?ispis statusa:Ništa"
+
+#: ../src/config.py:2720
+msgid "New Group Chat"
+msgstr "Novi grupni razgovor"
+
+#: ../src/config.py:2753
+msgid "This bookmark has invalid data"
+msgstr "Ovaj marker ima neispravne podatke"
+
+#: ../src/config.py:2754
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
+msgstr ""
+"Molimo obavezno ispunite polja servera i sobe ili uklonite ovaj marker."
+
+#: ../src/config.py:3031
+msgid "Invalid username"
+msgstr "Neispravno korisničko ime"
+
+#: ../src/config.py:3033
+msgid "You must provide a username to configure this account."
+msgstr "Morate upisati korisničko ime da biste konfigurisali ovaj nalog."
+
+#: ../src/config.py:3059
+msgid "Duplicate Jabber ID"
+msgstr "Dupliraj Džaber ID"
+
+#: ../src/config.py:3060
+msgid "This account is already configured in Gajim."
+msgstr "Ovaj nalog je već konfigurisan u Gajimu."
+
+#: ../src/config.py:3077
+msgid "Account has been added successfully"
+msgstr "Nalog je uspešno dodat"
+
+#: ../src/config.py:3078 ../src/config.py:3223
+msgid ""
+"You can set advanced account options by pressing the Advanced button, or "
+"later by choosing the Accounts menuitem under the Edit menu from the main "
+"window."
+msgstr ""
+"Napredna podešavanja naloga možete podesiti pritiskom na dugme Napredno, ili "
+"kasnije klikom na stavku menija Nalozi pod menijem Uredi iz glavnog prozora."
+
+#: ../src/config.py:3095
+#, fuzzy
+msgid "Invalid server"
+msgstr "Neispravno korisničko ime"
+
+#: ../src/config.py:3096
+#, fuzzy
+msgid "Please provide a server on which you want to register."
+msgstr "Molimo odredite novi nadimak koji želite da koristite:"
+
+#: ../src/config.py:3202 ../src/config.py:3241
+msgid "An error occurred during account creation"
+msgstr "Pojavila se greška pri kreiranju naloga"
+
+#: ../src/config.py:3222
+msgid "Your new account has been created successfully"
+msgstr "Vaš novi nalog je uspešno napravljen"
+
+#: ../src/config.py:3327
+msgid "Account name is in use"
+msgstr "Ime naloga je već upotrebljeno"
+
+#: ../src/config.py:3328
+msgid "You already have an account using this name."
+msgstr "Već imate nalog sa tim imenom."
+
+#: ../src/conversation_textview.py:337
+msgid ""
+"Text below this line is what has been said since the last time you paid "
+"attention to this group chat"
+msgstr ""
+"Tekst ispod ove linije je ono što je rečeno od kada ste poslednji put "
+"obratili pažnju na ovaj grupni razgovor"
+
+#: ../src/conversation_textview.py:409
+#, python-format
+msgid "_Actions for \"%s\""
+msgstr "_Akcije za nalog \"%s\""
+
+#: ../src/conversation_textview.py:421
+msgid "Read _Wikipedia Article"
+msgstr "Pročitajte članak na _Vikipediji"
+
+#: ../src/conversation_textview.py:426
+msgid "Look it up in _Dictionary"
+msgstr "Potraži u Rečniku"
+
+#. we must have %s in the url if not WIKTIONARY
+#: ../src/conversation_textview.py:442
+#, python-format
+msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
+msgstr "URL-u Rečnika nedostaje \"%s\" i nije Viki rečnik"
+
+#. we must have %s in the url
+#: ../src/conversation_textview.py:455
+#, python-format
+msgid "Web Search URL is missing an \"%s\""
+msgstr "URL-u Veb pretrage nedostaje \"%s\""
+
+#: ../src/conversation_textview.py:458
+msgid "Web _Search for it"
+msgstr "_Pretraži Veb"
+
+#: ../src/conversation_textview.py:464
+msgid "Open as _Link"
+msgstr "Otvori kao _Vezu"
+
+#: ../src/conversation_textview.py:929
+msgid "Yesterday"
+msgstr "Juče"
+
+#. the number is >= 2
+#. %i is day in year (1-365), %d (1-31) we want %i
+#: ../src/conversation_textview.py:933
+#, python-format
+msgid "%i days ago"
+msgstr "Pre %i dana"
+
+#. if we have subject, show it too!
+#: ../src/conversation_textview.py:967
+#, python-format
+msgid "Subject: %s\n"
+msgstr "Tema: %s\n"
+
+#: ../src/dialogs.py:64
+#, python-format
+msgid "Contact name: <i>%s</i>"
+msgstr "Ime kontakta: <i>%s</i>"
+
+#: ../src/dialogs.py:66
+#, python-format
+msgid "Jabber ID: <i>%s</i>"
+msgstr "Džaber ID: <i>%s</i>"
+
+#: ../src/dialogs.py:216
+msgid "Group"
+msgstr "Grupa"
+
+#: ../src/dialogs.py:223
+msgid "In the group"
+msgstr "U grupi"
+
+#: ../src/dialogs.py:274
+msgid "KeyID"
+msgstr "ID Ključa"
+
+#: ../src/dialogs.py:277
+msgid "Contact name"
+msgstr "Ime kontakta"
+
+#: ../src/dialogs.py:323
+#, python-format
+msgid "%s Status Message"
+msgstr "%s Statusna poruka"
+
+#: ../src/dialogs.py:325
+msgid "Status Message"
+msgstr "Statusna poruka"
+
+#: ../src/dialogs.py:425
+msgid "Save as Preset Status Message"
+msgstr "Snimi kao već postavljenu statusnu poruku"
+
+#: ../src/dialogs.py:426
+msgid "Please type a name for this status message"
+msgstr "Molimo unesite ime za ovu statusnu poruku"
+
+#: ../src/dialogs.py:437
+msgid "Overwrite Status Message?"
+msgstr "Prebriši statusnu poruku?"
+
+#: ../src/dialogs.py:438
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr ""
+"Ovo ime se već koristi. Da li želite da prebrišete ovu statusnu poruku?"
+
+#: ../src/dialogs.py:454
+msgid "AIM Address:"
+msgstr "AIM adresa:"
+
+#: ../src/dialogs.py:455
+msgid "GG Number:"
+msgstr "GG Broj:"
+
+#: ../src/dialogs.py:456
+msgid "ICQ Number:"
+msgstr "ICQ Broj:"
+
+#: ../src/dialogs.py:457
+msgid "MSN Address:"
+msgstr "MSN adresa:"
+
+#: ../src/dialogs.py:458
+msgid "Yahoo! Address:"
+msgstr "Yahoo! adresa:"
+
+#: ../src/dialogs.py:495
+#, python-format
+msgid "Please fill in the data of the contact you want to add in account %s"
+msgstr "Molimo Vas ispunite podatke za kontakt koga želite dodati na nalog %s"
+
+#: ../src/dialogs.py:497
+msgid "Please fill in the data of the contact you want to add"
+msgstr "Molimo Vas ispunite podatke za kontakt koga želite dodati"
+
+#: ../src/dialogs.py:654 ../src/dialogs.py:660
+msgid "Invalid User ID"
+msgstr "Neispravan korisnički ID"
+
+#: ../src/dialogs.py:661
+msgid "The user ID must not contain a resource."
+msgstr "ID korisnika ne sme sadržavati resurs."
+
+#: ../src/dialogs.py:675
+msgid "Contact already in roster"
+msgstr "Kontakt je već u listi"
+
+#: ../src/dialogs.py:676
+msgid "This contact is already listed in your roster."
+msgstr "Kontakt je već u listi kontakata."
+
+#: ../src/dialogs.py:712
+msgid "User ID:"
+msgstr "ID korisnika:"
+
+#: ../src/dialogs.py:774
+msgid "A GTK+ jabber client"
+msgstr "GTK+ džaber klijent"
+
+#: ../src/dialogs.py:775
+msgid "GTK+ Version:"
+msgstr "GTK+ verzija:"
+
+#: ../src/dialogs.py:776
+msgid "PyGTK Version:"
+msgstr "PyGTK verzija:"
+
+#: ../src/dialogs.py:790
+msgid "Current Developers:"
+msgstr "Trenutni programeri:"
+
+#: ../src/dialogs.py:792
+msgid "Past Developers:"
+msgstr "Prošli programeri:"
+
+#: ../src/dialogs.py:802
+msgid "THANKS:"
+msgstr "ZAHVALNICE:"
+
+#. remove one english sentence
+#. and add it manually as translatable
+#: ../src/dialogs.py:808
+msgid "Last but not least, we would like to thank all the package maintainers."
+msgstr ""
+"Poslednje, ali ne i najmanje važno, želeli bismo zahvaliti svim "
+"održavateljima paketa"
+
+#. here you write your name in the form Name FamilyName <someone@somewhere>
+#: ../src/dialogs.py:821
+msgid "translator-credits"
+msgstr "B. Kokanović. <branko.kokanovic@gmail.com>"
+
+#: ../src/dialogs.py:951
+#, python-format
+msgid "Unable to bind to port %s."
+msgstr "Ne mogu da se povežem na port %s."
+
+#: ../src/dialogs.py:952
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+"Možda već imate pokrenutu instancu Gajima. Prenos datoteka će biti prekinut."
+
+#: ../src/dialogs.py:959
+#, fuzzy, python-format
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option.\n"
+"\n"
+"Highlighting misspelled words feature will not be used"
+msgstr ""
+"Morate instalirati %s rečnik kako biste mogli koristiti proveru pravopisa, "
+"ili odaberite drugi jezik postavkom speller_language opcije."
+
+#: ../src/dialogs.py:1173
+#, python-format
+msgid "Subscription request for account %s from %s"
+msgstr "Zahtev pretplate na račun %s od %s"
+
+#: ../src/dialogs.py:1176
+#, python-format
+msgid "Subscription request from %s"
+msgstr "Zahtev pretplate od %s"
+
+#: ../src/dialogs.py:1237 ../src/roster_window.py:763
+#, python-format
+msgid "You are already in group chat %s"
+msgstr "Već ste u grupnom razgovoru %s"
+
+#: ../src/dialogs.py:1245
+msgid "You can not join a group chat unless you are connected."
+msgstr "Ne možete se priključiti grupnom razgovoru ako niste povezani."
+
+#: ../src/dialogs.py:1263
+#, python-format
+msgid "Join Group Chat with account %s"
+msgstr "Pridružite se grupnom razgovoru preko naloga %s"
+
+#: ../src/dialogs.py:1333 ../src/dialogs.py:1339
+#: ../src/groupchat_control.py:1643
+msgid "Invalid group chat Jabber ID"
+msgstr "Neispravan Džaber ID grupnog razgovora"
+
+#: ../src/dialogs.py:1334 ../src/dialogs.py:1340
+#: ../src/groupchat_control.py:1644
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "Džaber ID grupnog razgovora ima nedozvoljene znake."
+
+#: ../src/dialogs.py:1346
+msgid "This is not a group chat"
+msgstr "Ovo nije grupni razgovor"
+
+#: ../src/dialogs.py:1347
+#, python-format
+msgid "%s is not the name of a group chat."
+msgstr "%s nije ime grupnog razgovora."
+
+#: ../src/dialogs.py:1386
+#, fuzzy
+msgid "Without a connection, you can not synchronise your contacts."
+msgstr "Bez veze nije moguća promena lozinke."
+
+#: ../src/dialogs.py:1400
+msgid "Server"
+msgstr "Server"
+
+#: ../src/dialogs.py:1433
+#, fuzzy
+msgid "This account is not connected to the server"
+msgstr "Račun \"%s\" je povezan na server"
+
+#: ../src/dialogs.py:1434
+#, fuzzy
+msgid "You cannot synchronize with an account unless it is connected."
+msgstr "Ne možete se priključiti grupnom razgovoru ako niste povezani."
+
+#: ../src/dialogs.py:1458
+msgid "Synchronise"
+msgstr ""
+
+#: ../src/dialogs.py:1516
+#, python-format
+msgid "Start Chat with account %s"
+msgstr "Započni razgovor sa razunom %s"
+
+#: ../src/dialogs.py:1518
+msgid "Start Chat"
+msgstr "Započni razgovor"
+
+#: ../src/dialogs.py:1519
+msgid ""
+"Fill in the nickname or the Jabber ID of the contact you would like\n"
+"to send a chat message to:"
+msgstr ""
+"Ispunite džaber ID kontakta kome želite\n"
+"poslati poruku:"
+
+#. if offline or connecting
+#: ../src/dialogs.py:1544 ../src/dialogs.py:1891 ../src/dialogs.py:2027
+msgid "Connection not available"
+msgstr "Veza nije dostupna"
+
+#: ../src/dialogs.py:1545 ../src/dialogs.py:1892 ../src/dialogs.py:2028
+#, python-format
+msgid "Please make sure you are connected with \"%s\"."
+msgstr "Molimo potvrdite da ste spojeni na \"%s\"."
+
+#: ../src/dialogs.py:1554 ../src/dialogs.py:1557
+msgid "Invalid JID"
+msgstr "Neispravan džaber ID"
+
+#: ../src/dialogs.py:1557
+#, python-format
+msgid "Unable to parse \"%s\"."
+msgstr "Nije moguće razložiti \"%s\"."
+
+#: ../src/dialogs.py:1566
+msgid "Without a connection, you can not change your password."
+msgstr "Bez veze nije moguća promena lozinke."
+
+#: ../src/dialogs.py:1584
+msgid "Invalid password"
+msgstr "Neispravna lozinka"
+
+#: ../src/dialogs.py:1585
+msgid "You must enter a password."
+msgstr "Morate da unesete lozinku"
+
+#: ../src/dialogs.py:1589
+msgid "Passwords do not match"
+msgstr "Lozinke se ne poklapaju"
+
+#: ../src/dialogs.py:1590
+msgid "The passwords typed in both fields must be identical."
+msgstr "Lozinke upisane u oba polja moraju biti identične."
+
+#. img to display
+#. default value
+#: ../src/dialogs.py:1632 ../src/notify.py:219 ../src/notify.py:429
+msgid "Contact Signed In"
+msgstr "Kontakt je na vezi"
+
+#: ../src/dialogs.py:1634 ../src/notify.py:227 ../src/notify.py:431
+msgid "Contact Signed Out"
+msgstr "Kontakt je otišao sa veze"
+
+#. chat message
+#: ../src/dialogs.py:1636 ../src/notify.py:250 ../src/notify.py:433
+msgid "New Message"
+msgstr "Nova Poruka"
+
+#. single message
+#: ../src/dialogs.py:1636 ../src/notify.py:231 ../src/notify.py:433
+msgid "New Single Message"
+msgstr "Nova Samostalna Poruka"
+
+#. private message
+#: ../src/dialogs.py:1637 ../src/notify.py:238 ../src/notify.py:434
+msgid "New Private Message"
+msgstr "Nova Privatna Poruka"
+
+#: ../src/dialogs.py:1637 ../src/gajim.py:1460 ../src/notify.py:442
+msgid "New E-mail"
+msgstr "Novi E-mejl"
+
+#: ../src/dialogs.py:1639 ../src/gajim.py:1668 ../src/notify.py:436
+msgid "File Transfer Request"
+msgstr "Zahtev za prenosom datoteke"
+
+#: ../src/dialogs.py:1641 ../src/gajim.py:1432 ../src/gajim.py:1644
+#: ../src/notify.py:438
+msgid "File Transfer Error"
+msgstr "Greška pri prenosu datoteke"
+
+#: ../src/dialogs.py:1643 ../src/gajim.py:1707 ../src/gajim.py:1729
+#: ../src/gajim.py:1746 ../src/notify.py:440
+msgid "File Transfer Completed"
+msgstr "Prenos datoteke završen"
+
+#: ../src/dialogs.py:1644 ../src/gajim.py:1710 ../src/notify.py:440
+msgid "File Transfer Stopped"
+msgstr "Prenos datoteke zaustavljen"
+
+#: ../src/dialogs.py:1646 ../src/gajim.py:1328 ../src/notify.py:444
+msgid "Groupchat Invitation"
+msgstr "Poziv na grupni razgovor"
+
+#: ../src/dialogs.py:1648 ../src/notify.py:211 ../src/notify.py:446
+msgid "Contact Changed Status"
+msgstr "Kontakt promenio status"
+
+#: ../src/dialogs.py:1821
+#, python-format
+msgid "Single Message using account %s"
+msgstr "Samostalna poruka koristeći nalog %s"
+
+#: ../src/dialogs.py:1823
+#, python-format
+msgid "Single Message in account %s"
+msgstr "Samostalna poruka na nalogu %s"
+
+#: ../src/dialogs.py:1825
+msgid "Single Message"
+msgstr "Samostalna Poruka"
+
+#. prepare UI for Sending
+#: ../src/dialogs.py:1828
+#, python-format
+msgid "Send %s"
+msgstr "Poslate %s"
+
+#. prepare UI for Receiving
+#: ../src/dialogs.py:1851
+#, python-format
+msgid "Received %s"
+msgstr "Primljene %s"
+
+#. we create a new blank window to send and we preset RE: and to jid
+#: ../src/dialogs.py:1928
+#, python-format
+msgid "RE: %s"
+msgstr "RE: %s"
+
+#: ../src/dialogs.py:1929
+#, python-format
+msgid "%s wrote:\n"
+msgstr "%s piše:\n"
+
+#: ../src/dialogs.py:1973
+#, python-format
+msgid "XML Console for %s"
+msgstr "XML Konzola za %s"
+
+#: ../src/dialogs.py:1975
+msgid "XML Console"
+msgstr "XML Konzola"
+
+#: ../src/dialogs.py:2098
+#, python-format
+msgid "Privacy List <b><i>%s</i></b>"
+msgstr "Lista privatnosti <b><i>%s</i></b>"
+
+#: ../src/dialogs.py:2102
+#, python-format
+msgid "Privacy List for %s"
+msgstr "Lista privatnosti za %s"
+
+#: ../src/dialogs.py:2158
+#, python-format
+msgid "Order: %s, action: %s, type: %s, value: %s"
+msgstr "Redosled: %s, akcija: %s, tip: %s, vrednost: %s"
+
+#: ../src/dialogs.py:2161
+#, python-format
+msgid "Order: %s, action: %s"
+msgstr "Redosled: %s, akcija: %s"
+
+#: ../src/dialogs.py:2203
+msgid "<b>Edit a rule</b>"
+msgstr "<b>Izmeni pravilo</b>"
+
+#: ../src/dialogs.py:2290
+msgid "<b>Add a rule</b>"
+msgstr "<b>Dodaj pravilo</b>"
+
+#: ../src/dialogs.py:2386
+#, python-format
+msgid "Privacy Lists for %s"
+msgstr "Lista privatnosti za %s"
+
+#: ../src/dialogs.py:2388
+msgid "Privacy Lists"
+msgstr "Lista privatnosti"
+
+#: ../src/dialogs.py:2458
+msgid "Invalid List Name"
+msgstr "Neispravno ime liste"
+
+#: ../src/dialogs.py:2459
+msgid "You must enter a name to create a privacy list."
+msgstr "Morate uneti ime za kreiranje liste privatnosti"
+
+#: ../src/dialogs.py:2496
+#, fuzzy
+msgid "$Contact has invited you to join a discussion"
+msgstr "$Contact Vas je pozvao na grupni razgovor u sobu %(room_jid)s"
+
+#: ../src/dialogs.py:2498
+#, python-format
+msgid "$Contact has invited you to group chat %(room_jid)s"
+msgstr "$Contact Vas je pozvao na grupni razgovor u sobu %(room_jid)s"
+
+#. only if not None and not ''
+#: ../src/dialogs.py:2510
+#, python-format
+msgid "Comment: %s"
+msgstr "Komentar: %s"
+
+#: ../src/dialogs.py:2576
+msgid "Choose Sound"
+msgstr "Odaberite zvuk"
+
+#: ../src/dialogs.py:2586 ../src/dialogs.py:2634
+msgid "All files"
+msgstr "Sve datoteke"
+
+#: ../src/dialogs.py:2591
+msgid "Wav Sounds"
+msgstr "Wav Zvukovi"
+
+#: ../src/dialogs.py:2624
+msgid "Choose Image"
+msgstr "Odaberite sliku"
+
+#: ../src/dialogs.py:2639
+msgid "Images"
+msgstr "Slike"
+
+#: ../src/dialogs.py:2703
+#, python-format
+msgid "When %s becomes:"
+msgstr "Kad %s postane:"
+
+#: ../src/dialogs.py:2705
+#, python-format
+msgid "Adding Special Notification for %s"
+msgstr "Dodavanje posebnog obaveštenja za %s"
+
+#. # means number
+#: ../src/dialogs.py:2776
+msgid "#"
+msgstr "#"
+
+#: ../src/dialogs.py:2782
+msgid "Condition"
+msgstr "Uslov"
+
+#: ../src/dialogs.py:2900
+msgid "when I am "
+msgstr "kada sam "
+
+#: ../src/disco.py:104
+msgid "Others"
+msgstr "Ostali"
+
+#: ../src/disco.py:105 ../src/disco.py:106 ../src/disco.py:1345
+#: ../src/gajim.py:644 ../src/roster_window.py:282 ../src/roster_window.py:342
+#: ../src/roster_window.py:382 ../src/roster_window.py:490
+#: ../src/roster_window.py:522 ../src/roster_window.py:524
+#: ../src/roster_window.py:4688 ../src/roster_window.py:4690
+#: ../src/common/contacts.py:290 ../src/common/contacts.py:305
+#: ../src/common/helpers.py:44
+msgid "Transports"
+msgstr "Prenosi"
+
+#. conference is a category for listing mostly groupchats in service discovery
+#: ../src/disco.py:108
+msgid "Conference"
+msgstr "Konferencija"
+
+#: ../src/disco.py:421
+msgid "Without a connection, you can not browse available services"
+msgstr "Bez uspostavljene veze, ne možete razgledati dostupne usluge"
+
+#: ../src/disco.py:495
+#, python-format
+msgid "Service Discovery using account %s"
+msgstr "Otkrivanje usluga sa naloga %s"
+
+#: ../src/disco.py:497
+msgid "Service Discovery"
+msgstr "Otkrivanje Usluga"
+
+#: ../src/disco.py:637
+msgid "The service could not be found"
+msgstr "Usluga ne može biti nađena"
+
+#: ../src/disco.py:638
+msgid ""
+"There is no service at the address you entered, or it is not responding. "
+"Check the address and try again."
+msgstr ""
+"Na navedenoj adresi nema usuga, ili nema odgovora. Proverite adresu i "
+"pokušajte ponovo."
+
+#: ../src/disco.py:642 ../src/disco.py:923
+msgid "The service is not browsable"
+msgstr "Usluge nisu pretražive"
+
+#: ../src/disco.py:643
+msgid "This type of service does not contain any items to browse."
+msgstr "Ovaj tip usluge ne sadrži elemente za pretragu"
+
+#: ../src/disco.py:723
+#, python-format
+msgid "Browsing %s using account %s"
+msgstr "Pretraga %s koristeći račun %s"
+
+#: ../src/disco.py:762
+msgid "_Browse"
+msgstr "_Pregled"
+
+#: ../src/disco.py:924
+msgid "This service does not contain any items to browse."
+msgstr "Ova usluga ne sadrži elemente za pretragu"
+
+#: ../src/disco.py:1142
+#, fuzzy
+msgid "_Execute Command"
+msgstr "_Izvrši naredbu..."
+
+#: ../src/disco.py:1152 ../src/disco.py:1350
+msgid "Re_gister"
+msgstr "Re_gistracija"
+
+#: ../src/disco.py:1387
+#, python-format
+msgid "Scanning %d / %d.."
+msgstr "Skeniranje %d / %d.."
+
+#. Users column
+#: ../src/disco.py:1569
+msgid "Users"
+msgstr "Korisnici"
+
+#. Description column
+#: ../src/disco.py:1577
+msgid "Description"
+msgstr "Opis"
+
+#. Id column
+#: ../src/disco.py:1585
+msgid "Id"
+msgstr "Identifikacija"
+
+#: ../src/disco.py:1814
+msgid "Subscribed"
+msgstr "Pretplaćen"
+
+#: ../src/disco.py:1822
+#, fuzzy
+msgid "Node"
+msgstr "Ništa"
+
+#: ../src/disco.py:1879
+msgid "New post"
+msgstr "Nova objava"
+
+#: ../src/disco.py:1885
+msgid "_Subscribe"
+msgstr "_Pretplati se"
+
+#: ../src/disco.py:1891
+msgid "_Unsubscribe"
+msgstr "_Ukini pretplatu"
+
+#: ../src/filetransfers_window.py:72
+msgid "File"
+msgstr "Datoteka"
+
+#: ../src/filetransfers_window.py:87
+msgid "Time"
+msgstr "Vreme"
+
+#: ../src/filetransfers_window.py:99
+msgid "Progress"
+msgstr "Napredak"
+
+#: ../src/filetransfers_window.py:159 ../src/filetransfers_window.py:213
+#, python-format
+msgid "Filename: %s"
+msgstr "Ime datoteke: %s"
+
+#: ../src/filetransfers_window.py:160 ../src/filetransfers_window.py:288
+#, python-format
+msgid "Size: %s"
+msgstr "Veličina: %s"
+
+#. You is a reply of who sent a file
+#. You is a reply of who received a file
+#: ../src/filetransfers_window.py:169 ../src/filetransfers_window.py:179
+#: ../src/history_manager.py:463
+msgid "You"
+msgstr "Vi"
+
+#: ../src/filetransfers_window.py:170
+#, python-format
+msgid "Sender: %s"
+msgstr "Pošaljilac: %s"
+
+#: ../src/filetransfers_window.py:171 ../src/filetransfers_window.py:577
+#: ../src/tooltips.py:586
+msgid "Recipient: "
+msgstr "Primaoc: "
+
+#: ../src/filetransfers_window.py:182
+#, python-format
+msgid "Saved in: %s"
+msgstr "Sačuvano u: %s"
+
+#: ../src/filetransfers_window.py:184
+msgid "File transfer completed"
+msgstr "Prenos datoteke završen"
+
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:204
+msgid "File transfer cancelled"
+msgstr "Prenos datoteke prekinut"
+
+#: ../src/filetransfers_window.py:198 ../src/filetransfers_window.py:205
+msgid "Connection with peer cannot be established."
+msgstr "Nije moguće uspostaviti vezu sa drugom stranom."
+
+#: ../src/filetransfers_window.py:214
+#, python-format
+msgid "Recipient: %s"
+msgstr "Primaoc: %s"
+
+#: ../src/filetransfers_window.py:216
+#, python-format
+msgid "Error message: %s"
+msgstr "Poruka greške: %s"
+
+#: ../src/filetransfers_window.py:217
+msgid "File transfer stopped by the contact at the other end"
+msgstr "Prenos datoteke je zaustavljen od kontakta sa druge strane"
+
+#: ../src/filetransfers_window.py:234
+msgid "Choose File to Send..."
+msgstr "Odaberite datoteku za slanje..."
+
+#: ../src/filetransfers_window.py:253
+msgid "Gajim cannot access this file"
+msgstr "Gajim ne može pristupiti ovoj datoteci"
+
+#: ../src/filetransfers_window.py:254
+msgid "This file is being used by another process."
+msgstr "Ovu datoteku koristi neki drugi proces."
+
+#: ../src/filetransfers_window.py:286
+#, python-format
+msgid "File: %s"
+msgstr "Datoteka: %s"
+
+#: ../src/filetransfers_window.py:291
+#, python-format
+msgid "Type: %s"
+msgstr "Tip: %s"
+
+#: ../src/filetransfers_window.py:293
+#, python-format
+msgid "Description: %s"
+msgstr "Opis: %s"
+
+#: ../src/filetransfers_window.py:294
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s Vam želi poslati datoteku:"
+
+#: ../src/filetransfers_window.py:308 ../src/gtkgui_helpers.py:767
+#, python-format
+msgid "Cannot overwrite existing file \"%s\""
+msgstr "Nije moguće prepisati postojeću datoteku \"%s\""
+
+#: ../src/filetransfers_window.py:309 ../src/gtkgui_helpers.py:769
+msgid ""
+"A file with this name already exists and you do not have permission to "
+"overwrite it."
+msgstr "Datoteka sa ovim imenom već postoji i nemate privilegijaprepisati je."
+
+#: ../src/filetransfers_window.py:316 ../src/gtkgui_helpers.py:773
+msgid "This file already exists"
+msgstr "Ova datoteka već postoji"
+
+#: ../src/filetransfers_window.py:316 ../src/gtkgui_helpers.py:773
+msgid "What do you want to do?"
+msgstr "Šta želite da uradite?"
+
+#: ../src/filetransfers_window.py:328 ../src/gtkgui_helpers.py:783
+#, python-format
+msgid "Directory \"%s\" is not writable"
+msgstr "U fasciklu \"%s\" nije moguće pisanje"
+
+#: ../src/filetransfers_window.py:328 ../src/gtkgui_helpers.py:784
+msgid "You do not have permission to create files in this directory."
+msgstr "Nemate privilegija za pisanje u ovoj fascikli"
+
+#: ../src/filetransfers_window.py:338
+msgid "Save File as..."
+msgstr "Snimi datoteku kao..."
+
+#. Print remaining time in format 00:00:00
+#. You can change the places of (hours), (minutes), (seconds) -
+#. they are not translatable.
+#: ../src/filetransfers_window.py:419
+#, python-format
+msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
+msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
+
+#. This should make the string Kb/s,
+#. where 'Kb' part is taken from %s.
+#. Only the 's' after / (which means second) should be translated.
+#: ../src/filetransfers_window.py:508
+#, python-format
+msgid "(%(filesize_unit)s/s)"
+msgstr "(%(filesize_unit)s/sek)"
+
+#: ../src/filetransfers_window.py:547 ../src/filetransfers_window.py:550
+msgid "Invalid File"
+msgstr "Neispravna datoteka"
+
+#: ../src/filetransfers_window.py:547
+msgid "File: "
+msgstr "Datoteka: "
+
+#: ../src/filetransfers_window.py:551
+msgid "It is not possible to send empty files"
+msgstr "Nije moguće poslati praznu datoteku"
+
+#: ../src/filetransfers_window.py:573 ../src/tooltips.py:576
+msgid "Name: "
+msgstr "Ime: "
+
+#: ../src/filetransfers_window.py:575 ../src/tooltips.py:580
+msgid "Sender: "
+msgstr "Pošaljilac: "
+
+#: ../src/filetransfers_window.py:763
+msgid "Pause"
+msgstr "Pauza"
+
+#: ../src/gajim.py:50
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr ""
+
+#: ../src/gajim.py:143
+msgid "Gajim needs X server to run. Quiting..."
+msgstr "Gajimu treba X server da bi se pokrenuo. Završavam..."
+
+#: ../src/gajim.py:147
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above"
+msgstr "Gajimu treba pyGTK 2.6 ili veća verzija"
+
+#: ../src/gajim.py:148
+#, fuzzy
+msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
+msgstr "Gajimu treba pyGTK 2.6 ili veća verzija. Završavam..."
+
+#: ../src/gajim.py:150
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above"
+msgstr "Gajimu treba pyGTK 2.6 ili veća verzija"
+
+#: ../src/gajim.py:151
+#, fuzzy
+msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
+msgstr "Gajimu treba pyGTK 2.6 ili veća verzija. Završavam..."
+
+#: ../src/gajim.py:156
+msgid "GTK+ runtime is missing libglade support"
+msgstr "GTK+ nema podršku za libglade"
+
+#: ../src/gajim.py:158
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"Molimo uklonite Vaš trenutni GTK+ i instalirajte poslednju stabilnu verziju "
+"sa %s"
+
+#: ../src/gajim.py:160
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr ""
+"Molimo proverite da GTK+ i PyGTK imaju podršku za libglade na Vašem sistemu"
+
+#: ../src/gajim.py:165
+msgid "Gajim needs PySQLite2 to run"
+msgstr "Gajimu treba PySQLite2 za pokretanje"
+
+#: ../src/gajim.py:173
+msgid "Gajim needs pywin32 to run"
+msgstr "Gajimu treba pywin32 za pokretanje"
+
+#: ../src/gajim.py:174
+#, python-format
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+msgstr ""
+"Molimo osigurajte se da je Pywin32 instaliran na Vašem sistemu. Možete ga "
+"naći na %s"
+
+#. set the icon to all newly opened wind
+#: ../src/gajim.py:317
+msgid "Gajim is already running"
+msgstr "Gajim je već pokrenut"
+
+#: ../src/gajim.py:318
+msgid ""
+"Another instance of Gajim seems to be running\n"
+"Run anyway?"
+msgstr ""
+"Jedna instanca Gajima izgleda već radi\n"
+"Svejedno želite pokrenuti?"
+
+#: ../src/gajim.py:341 ../src/common/connection_handlers.py:900
+#: ../src/common/connection_handlers.py:1601
+#: ../src/common/connection_handlers.py:1629
+#: ../src/common/connection_handlers.py:1639
+#: ../src/common/connection_handlers.py:1658
+#: ../src/common/connection_handlers.py:1889
+#: ../src/common/connection_handlers.py:2001 ../src/common/connection.py:925
+msgid "Disk Write Error"
+msgstr "Greška pri pisanju na disk"
+
+#: ../src/gajim.py:434
+msgid "Do you accept this request?"
+msgstr "Prihvatate li ovaj zahtev?"
+
+#: ../src/gajim.py:437
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
+msgstr "HTTP (%s) Autorizacija za %s (id: %s)"
+
+#: ../src/gajim.py:484 ../src/notify.py:448
+msgid "Connection Failed"
+msgstr "Veza prekinuta"
+
+#: ../src/gajim.py:817
+#, python-format
+msgid "Subject: %s"
+msgstr "Tema: %s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time))
+#: ../src/gajim.py:864 ../src/gajim.py:877
+#, python-format
+msgid "error while sending %s ( %s )"
+msgstr "greška prilikom slanja %s ( %s )"
+
+#: ../src/gajim.py:910
+msgid "Authorization accepted"
+msgstr "Autorizacija prihvaćena"
+
+#: ../src/gajim.py:911
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "Kontakt \"%s\" je prihvatio da vidite njegov/njen status."
+
+#: ../src/gajim.py:919
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "Kontakt \"%s\" je ukinuo pretplatu na njega"
+
+#: ../src/gajim.py:920
+msgid "You will always see him or her as offline."
+msgstr "Uvek ćete njega/nju videti kao da nije na vezi."
+
+#: ../src/gajim.py:964
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "Kontakt sa \"%s\" se ne može uspostaviti"
+
+#: ../src/gajim.py:965 ../src/common/connection.py:466
+msgid "Check your connection or try again later."
+msgstr "Proverite Vašu konekciju ili pokušajte kasnije."
+
+#: ../src/gajim.py:1136 ../src/roster_window.py:1348
+#, python-format
+msgid "%s is now %s (%s)"
+msgstr "%s je sada %s (%s)"
+
+#. No status message
+#: ../src/gajim.py:1139 ../src/groupchat_control.py:1101
+#: ../src/roster_window.py:1351
+#, python-format
+msgid "%s is now %s"
+msgstr "%s je sada %s"
+
+#. Can be a presence (see chg_contact_status in groupchat_contol.py)
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/gajim.py:1259 ../src/groupchat_control.py:913
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#: ../src/gajim.py:1261
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gajim.py:1263
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gajim.py:1266
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_contol.py)
+#: ../src/gajim.py:1269
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gajim.py:1271
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gajim.py:1273
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1275
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1277
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gajim.py:1308
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it"
+msgstr "Lozinka potrebna za pridruživanje ovom grupnom razgovoru."
+
+#: ../src/gajim.py:1338
+msgid "Your passphrase is incorrect"
+msgstr "Vaša lozinka nije tačna"
+
+#: ../src/gajim.py:1339
+msgid "You are currently connected without your OpenPGP key."
+msgstr "Trenutno ste povezani bez OpenPGP ključa."
+
+#: ../src/gajim.py:1443
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr "Novi e-mejl za %(gmail_mail_address)s"
+
+#: ../src/gajim.py:1445
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "Imate %d novi e-mejl razgovor"
+msgstr[1] "Imate %d nova e-mejl razgovora"
+msgstr[2] "Imate %d novih e-mejl razgovora"
+
+#. FIXME: emulate Gtalk client popups. find out what they parse and how
+#. they decide what to show
+#. each message has a 'From', 'Subject' and 'Snippet' field
+#: ../src/gajim.py:1454
+#, python-format
+msgid ""
+"\n"
+"From: %(from_address)s"
+msgstr ""
+"\n"
+"Od: %(from_address)s"
+
+#: ../src/gajim.py:1665
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s Vam želi poslati datoteku."
+
+#: ../src/gajim.py:1730
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "Uspešno ste primili datoteku %(filename)s od kontakta %(name)s."
+
+#. ft stopped
+#: ../src/gajim.py:1734
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "Prenos datoteke %(filename)s od kontakta %(name)s je zaustavljen."
+
+#: ../src/gajim.py:1747
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "Uspešno ste poslali datoteku %(filename)s za kontakt %(name)s"
+
+#. ft stopped
+#: ../src/gajim.py:1751
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "Prenos %(filename)s za kontakt %(name)s je zaustavljen. "
+
+#: ../src/gajim.py:1846
+msgid "Session negotiation cancelled"
+msgstr ""
+
+#: ../src/gajim.py:1847
+#, python-format
+msgid "The client at %s cancelled the session negotiation."
+msgstr ""
+
+#: ../src/gajim.py:1887 ../src/gajim.py:1928
+msgid "Confirm these session options"
+msgstr ""
+
+#: ../src/gajim.py:1888
+#, python-format
+msgid ""
+"The remote client wants to negotiate an session with these features:\n"
+"\n"
+"\t%s\n"
+"\n"
+"\tAre these options acceptable?"
+msgstr ""
+
+#: ../src/gajim.py:1929
+#, python-format
+msgid ""
+"The remote client selected these options:\n"
+"\n"
+"%s\n"
+"\n"
+"Continue with the session?"
+msgstr ""
+
+#: ../src/gajim.py:2041
+msgid "Username Conflict"
+msgstr "Konflikt korisničkog imena"
+
+#: ../src/gajim.py:2042
+msgid "Please type a new username for your local account"
+msgstr "Molimo Vas unesite novo korisničko ime za Vaš lokalni nalog"
+
+#: ../src/gajim.py:2059
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gajim.py:2067
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gajim.py:2073
+msgid "Error."
+msgstr ""
+
+#: ../src/gajim.py:2098
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "Konflikt korisničkog imena"
+
+#: ../src/gajim.py:2099
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:2461
+msgid "Could not save your settings and preferences"
+msgstr "Nije moguće čuvanje Vaših podešavanja"
+
+#. sorted alphanum
+#: ../src/gajim.py:2596 ../src/common/config.py:86 ../src/common/config.py:395
+#: ../src/common/optparser.py:194 ../src/common/optparser.py:412
+#: ../src/common/optparser.py:446
+msgid "default"
+msgstr "podrazumevano"
+
+#: ../src/gajim.py:2683
+msgid "Network Manager support not available"
+msgstr "Podrška za upravitelja mreže nije dostupna"
+
+#: ../src/gajim.py:2784
+msgid "Session Management support not available (missing gnome.ui module)"
+msgstr ""
+"Podrška za upravljanje sesijama nije dostupna (nedostaje gnome.ui modul)"
+
+#: ../src/gajim-remote.py:65
+msgid "Shows a help on specific command"
+msgstr "Prikazuje pomoć za određenu naredbu"
+
+#. User gets help for the command, specified by this parameter
+#: ../src/gajim-remote.py:68
+msgid "command"
+msgstr "naredba"
+
+#: ../src/gajim-remote.py:69
+msgid "show help on command"
+msgstr "prikaži pomoć za komandu"
+
+#: ../src/gajim-remote.py:73
+msgid "Shows or hides the roster window"
+msgstr "Prikazuje ili skriva prozor liste kontakata "
+
+#: ../src/gajim-remote.py:77
+msgid "Pops up a window with the next pending event"
+msgstr "Iskače prozor sa sledećim događajem na čekanju"
+
+#: ../src/gajim-remote.py:81
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appears on a "
+"separate line"
+msgstr ""
+"Ispisuje listu svih kontakata sa liste kontakata. Svaki kontakt se "
+"pojavljuje u posebnoj liniji"
+
+#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:205 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:246 ../src/gajim-remote.py:255
+msgid "account"
+msgstr "nalog"
+
+#: ../src/gajim-remote.py:84
+msgid "show only contacts of the given account"
+msgstr "prikazuje samo kontakte sa ovog naloga"
+
+#: ../src/gajim-remote.py:90
+msgid "Prints a list of registered accounts"
+msgstr "Ispisuje listu registrovanih naloga"
+
+#: ../src/gajim-remote.py:94
+msgid "Changes the status of account or accounts"
+msgstr "Menja status jednog ili više naloga"
+
+#. offline, online, chat, away, xa, dnd, invisible should not be translated
+#: ../src/gajim-remote.py:97
+msgid "status"
+msgstr "status"
+
+#: ../src/gajim-remote.py:97
+msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+msgstr ""
+"jedno od: nije na vezi, na vezi, priča, odsutan, produženo odsutan, ne "
+"uznemiravaj, nevidljiv"
+
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:144
+msgid "message"
+msgstr "poruka"
+
+#: ../src/gajim-remote.py:98
+msgid "status message"
+msgstr "statusna poruka"
+
+#: ../src/gajim-remote.py:99
+msgid ""
+"change status of account \"account\". If not specified, try to change status "
+"of all accounts that have \"sync with global status\" option set"
+msgstr ""
+"izmena statusa naloga \"nalog\". Ako nije određen, pokušaj promene statusa "
+"svih naloga koji imaju uključenu opciju \"sinhronizacija sa globalnim "
+"statusom\""
+
+#: ../src/gajim-remote.py:105
+msgid "Shows the chat dialog so that you can send messages to a contact"
+msgstr "Prikazuje dijalog razgovora kako biste mogli razgovarati sa kontaktom"
+
+#: ../src/gajim-remote.py:107
+msgid "JID of the contact that you want to chat with"
+msgstr "Džaber ID kontakta sa kojim želite razgovarati"
+
+#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:196
+msgid "if specified, contact is taken from the contact list of this account"
+msgstr "ako je naznačeno, kontakt se uzima sa liste kontakata ovog naloga"
+
+#: ../src/gajim-remote.py:114
+msgid ""
+"Sends new chat message to a contact in the roster. Both OpenPGP key and "
+"account are optional. If you want to set only 'account', without 'OpenPGP "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Šalje novu poruku kontaktu na listi, OpenPGP ključ i nalog su opcioni. Ako "
+"želite postaviti samo 'nalog', bez 'OpenPGP ključ', samo postavite 'OpenPGP "
+"ključ' na ''."
+
+#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:131
+msgid "JID of the contact that will receive the message"
+msgstr "Džaber ID kontakta koji će primiti poruku"
+
+#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144
+msgid "message contents"
+msgstr "sadržaj poruke"
+
+#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134
+msgid "pgp key"
+msgstr "pgp ključ"
+
+#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134
+msgid "if specified, the message will be encrypted using this public key"
+msgstr "ako je naznačeno, poruka će biti šifrovana koristeći ovaj javni ključ"
+
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:145
+msgid "if specified, the message will be sent using this account"
+msgstr "ako je naznačeno, poruka će biti poslata koristeći ovaj nalog"
+
+#: ../src/gajim-remote.py:127
+msgid ""
+"Sends new single message to a contact in the roster. Both OpenPGP key and "
+"account are optional. If you want to set only 'account', without 'OpenPGP "
+"key', just set 'OpenPGP key' to ''."
+msgstr ""
+"Šalje novu poruku kontaktu na listi, OpenPGP ključ i nalog su opcioni. Ako "
+"želite postaviti samo 'nalog', bez 'OpenPGP ključ', samo postavite 'OpenPGP "
+"ključ' na ''."
+
+#: ../src/gajim-remote.py:132
+msgid "subject"
+msgstr "tema"
+
+#: ../src/gajim-remote.py:132
+msgid "message subject"
+msgstr "tema poruke"
+
+#: ../src/gajim-remote.py:141
+msgid "Sends new message to a groupchat you've joined."
+msgstr ""
+
+#: ../src/gajim-remote.py:143
+#, fuzzy
+msgid "JID of the room that will receive the message"
+msgstr "Džaber ID kontakta koji će primiti poruku"
+
+#: ../src/gajim-remote.py:150
+msgid "Gets detailed info on a contact"
+msgstr "Daje detaljne informacije o kontaktu"
+
+#: ../src/gajim-remote.py:152 ../src/gajim-remote.py:165
+#: ../src/gajim-remote.py:195 ../src/gajim-remote.py:204
+msgid "JID of the contact"
+msgstr "Džaber ID kontakta"
+
+#: ../src/gajim-remote.py:156
+msgid "Gets detailed info on a account"
+msgstr "Daje detaljne informacije o nalogu"
+
+#: ../src/gajim-remote.py:158
+msgid "Name of the account"
+msgstr "Ime naloga"
+
+#: ../src/gajim-remote.py:162
+msgid "Sends file to a contact"
+msgstr "Šalje datoteku kontaktu"
+
+#: ../src/gajim-remote.py:164
+msgid "file"
+msgstr "datoteka"
+
+#: ../src/gajim-remote.py:164
+msgid "File path"
+msgstr "Putanja do datoteke"
+
+#: ../src/gajim-remote.py:166
+msgid "if specified, file will be sent using this account"
+msgstr "ako je naznačeno, datoteka će biti poslata koriteći ovaj nalog"
+
+#: ../src/gajim-remote.py:171
+msgid "Lists all preferences and their values"
+msgstr "Prikazuje sva podešavanja i njihove vrednosti"
+
+#: ../src/gajim-remote.py:175
+msgid "Sets value of 'key' to 'value'."
+msgstr "Postavlja vrednost 'ključa' na 'vrednost'."
+
+#: ../src/gajim-remote.py:177
+msgid "key=value"
+msgstr "ključ=vrednost"
+
+#: ../src/gajim-remote.py:177
+msgid "'key' is the name of the preference, 'value' is the value to set it to"
+msgstr ""
+"'ključ' je ime stavke podešavanja, 'vrednost' je vrednost na koju će se "
+"stavka postaviti"
+
+#: ../src/gajim-remote.py:182
+msgid "Deletes a preference item"
+msgstr "Briše stavku podešavanja"
+
+#: ../src/gajim-remote.py:184
+msgid "key"
+msgstr "ključ"
+
+#: ../src/gajim-remote.py:184
+msgid "name of the preference to be deleted"
+msgstr "ime stavke podešavanja koje će se brisati"
+
+#: ../src/gajim-remote.py:188
+msgid "Writes the current state of Gajim preferences to the .config file"
+msgstr "Zapisuje trenutno stanje Gajim podešavanja u .config datoteku"
+
+#: ../src/gajim-remote.py:193
+msgid "Removes contact from roster"
+msgstr "Uklanja kontakt sa liste"
+
+#: ../src/gajim-remote.py:202
+msgid "Adds contact to roster"
+msgstr "Dodaje kontakt na listu"
+
+#: ../src/gajim-remote.py:204
+msgid "jid"
+msgstr "džid"
+
+#: ../src/gajim-remote.py:205
+msgid "Adds new contact to this account"
+msgstr "Dodaje novi kontakt ovom računu"
+
+#: ../src/gajim-remote.py:210
+msgid "Returns current status (the global one unless account is specified)"
+msgstr "Vraća trenutni status (globalni ako nije naznačen nalog)"
+
+#: ../src/gajim-remote.py:217
+msgid ""
+"Returns current status message(the global one unless account is specified)"
+msgstr "Vraća trenutnu statusnu poruku (globalnu ako nije naznačen nalog)"
+
+#: ../src/gajim-remote.py:224
+msgid "Returns number of unread messages"
+msgstr "Vraća broj nepročitanih poruka"
+
+#: ../src/gajim-remote.py:228
+msgid "Opens 'Start Chat' dialog"
+msgstr "Otvara dijalog za započinjanje razgovora"
+
+#: ../src/gajim-remote.py:230
+msgid "Starts chat, using this account"
+msgstr "Započinje razgovor, koristeći ovaj nalog"
+
+#: ../src/gajim-remote.py:234
+msgid "Sends custom XML"
+msgstr "Šalje korisnički definisan XML"
+
+#: ../src/gajim-remote.py:236
+msgid "XML to send"
+msgstr "XML za slanje"
+
+#: ../src/gajim-remote.py:237
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Nalog za koji će biti poslan xml ; ako nije određen, xml će biti poslat za "
+"sve naloge"
+
+#: ../src/gajim-remote.py:243
+msgid "Handle a xmpp:/ uri"
+msgstr "Rukuj sa xmpp:/ uri-jem"
+
+#: ../src/gajim-remote.py:245
+msgid "uri"
+msgstr "uri"
+
+#: ../src/gajim-remote.py:250
+msgid "Join a MUC room"
+msgstr "_Pridruži se novoj MUC sobi"
+
+#: ../src/gajim-remote.py:252
+msgid "room"
+msgstr "soba"
+
+#: ../src/gajim-remote.py:253
+msgid "nick"
+msgstr "nadimak"
+
+#: ../src/gajim-remote.py:254
+msgid "password"
+msgstr "Lozinka"
+
+#: ../src/gajim-remote.py:277
+msgid "Missing argument \"contact_jid\""
+msgstr "Nedostaje argument \"contact_jid\""
+
+#: ../src/gajim-remote.py:296
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
+msgstr ""
+"'%s' nije na Vašj listi.\n"
+"Molimo odredite nalog za slanje poruke."
+
+#: ../src/gajim-remote.py:299
+msgid "You have no active account"
+msgstr "nemate aktivnih računa"
+
+#: ../src/gajim-remote.py:363
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
+msgstr ""
+"Korišćenje: %s %s %s \n"
+"\t %s"
+
+#: ../src/gajim-remote.py:366
+msgid "Arguments:"
+msgstr "Argumenti:"
+
+#: ../src/gajim-remote.py:370
+#, python-format
+msgid "%s not found"
+msgstr "%s nije pronađen"
+
+#: ../src/gajim-remote.py:374
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
+msgstr ""
+"Korišćenje: %s naredba [argumenti]\n"
+"Naredba je jedna od:\n"
+
+#: ../src/gajim-remote.py:447
+#, python-format
+msgid ""
+"Too many arguments. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Previše argumenata. \n"
+"Ukucajte \"%s help %s\" za više informacija"
+
+#: ../src/gajim-remote.py:451
+#, python-format
+msgid ""
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
+msgstr ""
+"Argument \"%s\" nije naveden. \n"
+"Ukucajte \"%s help %s\" za više informacija"
+
+#: ../src/gajim-remote.py:469
+msgid "Wrong uri"
+msgstr "Loš uri"
+
+#: ../src/gajim_themes_window.py:62
+msgid "Theme"
+msgstr "Tema"
+
+#: ../src/gajim_themes_window.py:100
+#, fuzzy
+msgid "You cannot make changes to the default theme"
+msgstr "Ne možete izbrisati Vašu trenutnu temu"
+
+#: ../src/gajim_themes_window.py:101
+msgid "Please create a clean new theme with your desired name."
+msgstr ""
+
+#. don't confuse translators
+#: ../src/gajim_themes_window.py:175
+msgid "theme name"
+msgstr "ime teme"
+
+#: ../src/gajim_themes_window.py:192
+msgid "You cannot delete your current theme"
+msgstr "Ne možete izbrisati Vašu trenutnu temu"
+
+#: ../src/gajim_themes_window.py:193
+msgid "Please first choose another for your current theme."
+msgstr "Molimo Vas da prvo odaberete neku drugu temu."
+
+#: ../src/groupchat_control.py:134
+msgid "Sending private message failed"
+msgstr "Neuspešno slanje privatne poruke"
+
+#. in second %s code replaces with nickname
+#: ../src/groupchat_control.py:136
+#, python-format
+msgid "You are no longer in group chat \"%s\" or \"%s\" has left."
+msgstr "Više niste u grupnom razgovoru \"%s\" ili je \"%s\" otišao."
+
+#: ../src/groupchat_control.py:342
+msgid "Insert Nickname"
+msgstr "Ubaci nadimak"
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:916
+msgid "Room logging is enabled"
+msgstr ""
+
+#: ../src/groupchat_control.py:918
+#, fuzzy
+msgid "A new room has been created"
+msgstr "Vaš novi nalog je uspešno napravljen"
+
+#: ../src/groupchat_control.py:921
+msgid "The server has assigned or modified your roomnick"
+msgstr ""
+
+#. do not print 'kicked by None'
+#: ../src/groupchat_control.py:927
+#, python-format
+msgid "%(nick)s has been kicked: %(reason)s"
+msgstr "%(nick)s je izbačen: %(reason)s"
+
+#: ../src/groupchat_control.py:931
+#, python-format
+msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
+msgstr "%(nick)s je izbačen od strane %(who)s: %(reason)s"
+
+#. do not print 'banned by None'
+#: ../src/groupchat_control.py:938
+#, python-format
+msgid "%(nick)s has been banned: %(reason)s"
+msgstr "%(nick)s ima zabranu: %(reason)s"
+
+#: ../src/groupchat_control.py:942
+#, python-format
+msgid "%(nick)s has been banned by %(who)s: %(reason)s"
+msgstr "%(nick)s ima zabranu od člana %(who)s: %(reason)s"
+
+#. Someone changed his or her nick
+#. We changed our nick
+#: ../src/groupchat_control.py:949
+#, python-format
+msgid "You are now known as %s"
+msgstr "Od sada ste poznati kao %s"
+
+#: ../src/groupchat_control.py:951
+#, python-format
+msgid "%s is now known as %s"
+msgstr "%s je od sada poznat kao %s"
+
+#: ../src/groupchat_control.py:984 ../src/groupchat_control.py:988
+#: ../src/groupchat_control.py:993
+#, fuzzy, python-format
+msgid "%(nick)s has been removed from the room (%(reason)s)"
+msgstr "%(nick)s je izbačen od strane %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:985
+#, fuzzy
+msgid "affiliation changed"
+msgstr "Pripadnost:"
+
+#: ../src/groupchat_control.py:990
+msgid "room configuration changed to members-only"
+msgstr ""
+
+#: ../src/groupchat_control.py:995
+msgid "system shutdown"
+msgstr ""
+
+#: ../src/groupchat_control.py:1094
+#, python-format
+msgid "%s has left"
+msgstr "%s je otišao"
+
+#: ../src/groupchat_control.py:1099
+#, python-format
+msgid "%s has joined the group chat"
+msgstr "%s se pridružio grupnom razgovoru"
+
+#. Invalid Nickname
+#. invalid char
+#: ../src/groupchat_control.py:1212 ../src/groupchat_control.py:1491
+msgid "Invalid nickname"
+msgstr "Neispravan nadimak"
+
+#: ../src/groupchat_control.py:1213 ../src/groupchat_control.py:1492
+msgid "The nickname has not allowed characters."
+msgstr "Nadimak ima nedozvoljene znake."
+
+#: ../src/groupchat_control.py:1236 ../src/groupchat_control.py:1254
+#: ../src/groupchat_control.py:1338 ../src/groupchat_control.py:1355
+#, python-format
+msgid "Nickname not found: %s"
+msgstr "Nadimak nije pronađen: %s "
+
+#: ../src/groupchat_control.py:1270
+msgid "This group chat has no subject"
+msgstr "Ovaj grupni razgovor nema temu"
+
+#: ../src/groupchat_control.py:1281
+#, python-format
+msgid "Invited %(contact_jid)s to %(room_jid)s."
+msgstr "Pozvali ste %(contact_jid)s u sobu %(room_jid)s"
+
+#: ../src/groupchat_control.py:1418
+#, python-format
+msgid ""
+"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
+"nickname of an occupant may be substituted, but not if it contains \"@\". If "
+"the JID is currently in the group chat, he/she/it will also be kicked. Does "
+"NOT support spaces in nickname."
+msgstr ""
+"Korišćenje: /%s <nadimak|džid> [razlog], zabranjuje pristup DŽID-u u sobu. "
+"Nadimak učesnika može biti zamenjen, ali ne i ako sadrži \"@\". Ako je "
+"Džaber ID trenutno u sobi, on/ona će biti izbačen(a). Razmaci u imenima NISU "
+"podržani."
+
+#: ../src/groupchat_control.py:1425
+#, python-format
+msgid ""
+"Usage: /%s <nickname>, opens a private chat window with the specified "
+"occupant."
+msgstr ""
+"Način korišćenja: /%s <nadimak>, otvara prozor privatnog razgovor sa  "
+"navedenim učesnikom"
+
+#: ../src/groupchat_control.py:1431
+#, python-format
+msgid ""
+"Usage: /%s [reason], closes the current window or tab, displaying reason if "
+"specified."
+msgstr ""
+"Način korišćenja: /%s [razlog], zatvara trenutni prozor ili jezičak, i "
+"prikazuje razlog ako je naznačen."
+
+#: ../src/groupchat_control.py:1437
+#, python-format
+msgid ""
+"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
+"providing a reason."
+msgstr ""
+"Način korišćenja: /%s DŽID> [razlog], poziva Džaber ID u trenutni grupni "
+"razgovor, opciono dajući razlog."
+
+#: ../src/groupchat_control.py:1441
+#, python-format
+msgid ""
+"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
+"using specified nickname."
+msgstr ""
+"Način korišćenja: /%s <soba>@<server>[/nadimak], nudi mogućnost spajanja na "
+"soba@server koristeći navedeni nadimak."
+
+#: ../src/groupchat_control.py:1445
+#, python-format
+msgid ""
+"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
+"from the group chat and optionally displays a reason. Does NOT support "
+"spaces in nickname."
+msgstr ""
+"Način korišćenja: /%s <nadimak> [razlog], uklanja učesnika sa zadatim "
+"nadimkom iz grupnog razgovora i opciono prikazuje razlog. NE podržava blanko "
+"znakove u nadimku."
+
+#: ../src/groupchat_control.py:1454
+#, python-format
+msgid ""
+"Usage: /%s <nickname> [message], opens a private message window and sends "
+"message to the occupant specified by nickname."
+msgstr ""
+"Način korišćenja: /%s <nadimak> [poruka], otvara prozor privatne poruke i "
+"šalje poruku učesniku zadatim sa nadimkom."
+
+#: ../src/groupchat_control.py:1459
+#, python-format
+msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
+msgstr ""
+"Način korišćenja: /%s <nadimak>, menja Vaš nadimak u trenutnom grupnom "
+"razgovoru."
+
+#: ../src/groupchat_control.py:1463
+#, python-format
+msgid "Usage: /%s , display the names of group chat occupants."
+msgstr "Način korišćenja: /%s , prikazuje imena učesnika u grupnom razgovoru."
+
+#: ../src/groupchat_control.py:1467
+#, python-format
+msgid "Usage: /%s [topic], displays or updates the current group chat topic."
+msgstr ""
+"Način korišćenja: /%s [tema], prikazuje ili ažurira temu grupnog razgovora."
+
+#: ../src/groupchat_control.py:1470
+#, python-format
+msgid ""
+"Usage: /%s <message>, sends a message without looking for other commands."
+msgstr ""
+"Način korišćenja: /%s <poruka>, šalje poruku ne gledajući ostale komande."
+
+#: ../src/groupchat_control.py:1565
+#, python-format
+msgid "Are you sure you want to leave group chat \"%s\"?"
+msgstr "Jeste li sigurni da želite napustiti grupni razgovor \"%s\"?"
+
+#: ../src/groupchat_control.py:1567
+msgid ""
+"If you close this window, you will be disconnected from this group chat."
+msgstr ""
+"Ako zatvorite ovaj prozor, bićete isključeni sa ovoh grupnog razgovora."
+
+#: ../src/groupchat_control.py:1571 ../src/roster_window.py:4836
+msgid "Do _not ask me again"
+msgstr "_Ne pitaj me više"
+
+#: ../src/groupchat_control.py:1605
+msgid "Changing Subject"
+msgstr "Promena Teme"
+
+#: ../src/groupchat_control.py:1606
+msgid "Please specify the new subject:"
+msgstr "Molimo odredite novu temu:"
+
+#: ../src/groupchat_control.py:1615
+msgid "Changing Nickname"
+msgstr "Promena nadimka"
+
+#: ../src/groupchat_control.py:1616
+msgid "Please specify the new nickname you want to use:"
+msgstr "Molimo odredite novi nadimak koji želite da koristite:"
+
+#. Ask for a reason
+#: ../src/groupchat_control.py:1631
+#, fuzzy, python-format
+msgid "Destroying %s"
+msgstr "Opis: %s"
+
+#: ../src/groupchat_control.py:1632
+msgid ""
+"You are going to definitively destroy this room.\n"
+"You may specify a reason below:"
+msgstr ""
+
+#: ../src/groupchat_control.py:1634
+msgid "You may also enter an alternate venue:"
+msgstr ""
+
+#: ../src/groupchat_control.py:1665
+msgid "Bookmark already set"
+msgstr "Marker je već postavljen"
+
+#: ../src/groupchat_control.py:1666
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Grupni razgovor \"%s\" je već markiran."
+
+#: ../src/groupchat_control.py:1675
+msgid "Bookmark has been added successfully"
+msgstr "Marker uspešno dodat"
+
+#: ../src/groupchat_control.py:1676
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr ""
+"Možete upravljati Vašim markerima pomoću menija Akcije iz Vaše liste "
+"kontakata."
+
+#. ask for reason
+#: ../src/groupchat_control.py:1828
+#, python-format
+msgid "Kicking %s"
+msgstr "Izbacujem %s"
+
+#: ../src/groupchat_control.py:1829 ../src/groupchat_control.py:2129
+msgid "You may specify a reason below:"
+msgstr "Možete navesti razlog ispod:"
+
+#. ask for reason
+#: ../src/groupchat_control.py:2128
+#, python-format
+msgid "Banning %s"
+msgstr "Zabranjujem %s"
+
+#: ../src/gtkexcepthook.py:41
+msgid "A programming error has been detected"
+msgstr "Programska greška je otkrivena"
+
+#: ../src/gtkexcepthook.py:42
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
+msgstr "Najverovatnije nije ništa strašno, ali je ipak javite programerima."
+
+#: ../src/gtkexcepthook.py:48
+msgid "_Report Bug"
+msgstr "_Prijavi grešku"
+
+#: ../src/gtkexcepthook.py:71
+msgid "Details"
+msgstr "Detalji"
+
+#. we talk about file
+#: ../src/gtkgui_helpers.py:157 ../src/gtkgui_helpers.py:172
+#, python-format
+msgid "Error: cannot open %s for reading"
+msgstr "Greška: nije moguće otvoriti %s za čitanje"
+
+#: ../src/gtkgui_helpers.py:337
+msgid "Error reading file:"
+msgstr "Greška pri čitanju datoteke:"
+
+#: ../src/gtkgui_helpers.py:340
+msgid "Error parsing file:"
+msgstr "Greška pri učitavanju datoteke"
+
+#. do not traceback (could be a permission problem)
+#. we talk about a file here
+#: ../src/gtkgui_helpers.py:377
+#, python-format
+msgid "Could not write to %s. Session Management support will not work"
+msgstr "Nije moguće pisati u %s. Upravljanje sesijama neće biti moguće"
+
+#. xmpp: is currently handled by another program, so ask the user
+#: ../src/gtkgui_helpers.py:711
+msgid "Gajim is not the default Jabber client"
+msgstr "Gajim nije podrazumevani Džaber klijent"
+
+#: ../src/gtkgui_helpers.py:712
+msgid "Would you like to make Gajim the default Jabber client?"
+msgstr "Da li biste želeli da Gajim bude podrazumevani Gajim klijent?"
+
+#: ../src/gtkgui_helpers.py:713
+msgid "Always check to see if Gajim is the default Jabber client on startup"
+msgstr ""
+"Uvek proveravaj da li je Gajim podrazumevani Džaber klijent po pokretanju"
+
+#: ../src/gtkgui_helpers.py:812
+msgid "Extension not supported"
+msgstr "Ekstenzija nije podržana"
+
+#: ../src/gtkgui_helpers.py:813
+#, python-format
+msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
+msgstr ""
+"Sliku nije moguće sačuvati u %(type)s formatu. Sačuvati kao %(new_filename)s?"
+
+#: ../src/gtkgui_helpers.py:822
+msgid "Save Image as..."
+msgstr "Snimi sliku kao..."
+
+#: ../src/history_manager.py:68
+msgid "Cannot find history logs database"
+msgstr "Nije moguće pronaći dnevnik istorijata baze podataka"
+
+#. holds jid
+#: ../src/history_manager.py:108
+msgid "Contacts"
+msgstr "Kontakti"
+
+#. holds time
+#: ../src/history_manager.py:121 ../src/history_manager.py:161
+#: ../src/history_window.py:116
+msgid "Date"
+msgstr "Datum"
+
+#. holds nickname
+#: ../src/history_manager.py:127 ../src/history_manager.py:179
+msgid "Nickname"
+msgstr "Nadimak"
+
+#. holds message
+#: ../src/history_manager.py:135 ../src/history_manager.py:167
+#: ../src/history_window.py:124
+msgid "Message"
+msgstr "Poruka"
+
+#: ../src/history_manager.py:187
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
+msgstr ""
+"Želite li počistiti bazu podataka? (NE PREPORUČUJE SE AKO JE GAJIM POKRENUT)"
+
+#: ../src/history_manager.py:189
+msgid ""
+"Normally allocated database size will not be freed, it will just become "
+"reusable. If you really want to reduce database filesize, click YES, else "
+"click NO.\n"
+"\n"
+"In case you click YES, please wait..."
+msgstr ""
+"Normalno, veličina alociranog prostora neće biti oslobođena,samo će postati "
+"ponovo koristiva. Ukoliko zaista želite smanjiti veličinu baze podataka "
+"pritisnite Da, inače pritisnite Ne.\n"
+"\n"
+"Ukoliko pritisnite Da, molimo sačekajte..."
+
+#: ../src/history_manager.py:401
+msgid "Exporting History Logs..."
+msgstr "Izvoženje dnevnika istorijata..."
+
+#: ../src/history_manager.py:476
+#, python-format
+msgid "%(who)s on %(time)s said: %(message)s\n"
+msgstr "%(who)s u %(time)s kaže: %(message)s\n"
+
+#: ../src/history_manager.py:514
+msgid "Do you really want to delete logs of the selected contact?"
+msgid_plural "Do you really want to delete logs of the selected contacts?"
+msgstr[0] "Da li zaista želite izbrisati dnevnik razgovora označenog kontakta?"
+msgstr[1] ""
+"Da li zaista želite izbrisati dnevnike razgovora označenih kontakata?"
+msgstr[2] ""
+"Da li zaista želite izbrisati dnevnike razgovora označenih kontakata?"
+
+#: ../src/history_manager.py:518 ../src/history_manager.py:554
+msgid "This is an irreversible operation."
+msgstr "Ova operacija je nepovratna."
+
+#: ../src/history_manager.py:551
+msgid "Do you really want to delete the selected message?"
+msgid_plural "Do you really want to delete the selected messages?"
+msgstr[0] "Da li zaista želite da izbrišete označenu poruku?"
+msgstr[1] "Da li zaista želite da izbrišete označene poruke?"
+msgstr[2] "Da li zaista želite da izbrišete označene poruke?"
+
+#: ../src/history_window.py:185 ../src/history_window.py:187
+#, python-format
+msgid "Conversation History with %s"
+msgstr "Istorijat razgovora sa %s"
+
+#: ../src/history_window.py:332
+#, python-format
+msgid "%(nick)s is now %(status)s: %(status_msg)s"
+msgstr "%(nick)s je trenutno %(status)s: %(status_msg)s"
+
+#: ../src/history_window.py:336 ../src/notify.py:206
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s je trenutno %(status)s"
+
+#: ../src/history_window.py:342
+#, python-format
+msgid "Status is now: %(status)s: %(status_msg)s"
+msgstr "Status je trenutno: %(status)s: %(status_msg)s"
+
+#: ../src/history_window.py:345
+#, python-format
+msgid "Status is now: %(status)s"
+msgstr "Status je trenutno: %(status)s"
+
+#: ../src/htmltextview.py:583 ../src/htmltextview.py:594
+msgid "Timeout loading image"
+msgstr "Isteklo vreme za učitavanje slike"
+
+#: ../src/htmltextview.py:604
+msgid "Image is too big"
+msgstr "Slika je prevelika"
+
+#: ../src/message_window.py:288
+msgid "Chats"
+msgstr "Razgovori"
+
+#: ../src/message_window.py:290
+msgid "Group Chats"
+msgstr "Grupni razgovori"
+
+#: ../src/message_window.py:292
+msgid "Private Chats"
+msgstr "Privatni Razgovori"
+
+#: ../src/message_window.py:294
+msgid "Messages"
+msgstr "Poruke"
+
+#: ../src/message_window.py:295
+#, python-format
+msgid "%s - Gajim"
+msgstr "%s - Gajim"
+
+#: ../src/notify.py:204
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s je promenio status"
+
+#: ../src/notify.py:214
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s je na vezi"
+
+#: ../src/notify.py:222
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s je otišao"
+
+#: ../src/notify.py:234
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "Nova samostalna poruka od kontakta %(nickname)s"
+
+#: ../src/notify.py:242
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "Nova privatna poruka sa grupnog razgovora %s"
+
+#: ../src/notify.py:244
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s: %(message)s"
+
+#: ../src/notify.py:247
+#, fuzzy, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "Nova poruka od %(nickname)s"
+
+#: ../src/notify.py:253
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "Nova poruka od %(nickname)s"
+
+#: ../src/profile_window.py:72
+msgid "Retrieving profile..."
+msgstr "Dohvatanje profila..."
+
+#: ../src/profile_window.py:123 ../src/roster_window.py:1882
+#, fuzzy
+msgid "File is empty"
+msgstr "Putanja do datoteke"
+
+#: ../src/profile_window.py:126 ../src/roster_window.py:1885
+#, fuzzy
+msgid "File does not exist"
+msgstr "Ne postoji ovakav grupni razgovor."
+
+#. keep identation
+#. unknown format
+#: ../src/profile_window.py:140 ../src/profile_window.py:156
+#: ../src/roster_window.py:1887 ../src/roster_window.py:1898
+msgid "Could not load image"
+msgstr "Ne mogu učitati sliku"
+
+#: ../src/profile_window.py:257
+msgid "Information received"
+msgstr "Informacije primljene"
+
+#: ../src/profile_window.py:326
+msgid "Without a connection you can not publish your contact information."
+msgstr "Ako niste na vezi, ne možete objaviti Baše informacije"
+
+#: ../src/profile_window.py:338
+msgid "Sending profile..."
+msgstr "Slanje profila..."
+
+#: ../src/profile_window.py:353
+msgid "Information NOT published"
+msgstr "Informacije NISU objavljene"
+
+#: ../src/profile_window.py:360
+msgid "vCard publication failed"
+msgstr "Publikacija vCard neuspela"
+
+#: ../src/profile_window.py:361
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Nastala je greška prilikom objavljivanja Vaših ličnih informacija, pokušajte "
+"ponovo kasnije."
+
+#: ../src/roster_window.py:182 ../src/roster_window.py:237
+msgid "Merged accounts"
+msgstr "Spojeni nalozi"
+
+#: ../src/roster_window.py:357 ../src/roster_window.py:622
+#: ../src/roster_window.py:2110 ../src/common/contacts.py:307
+#: ../src/common/helpers.py:44
+msgid "Observers"
+msgstr "Posmatrači"
+
+#. Make special context menu if group is Groupchats
+#: ../src/roster_window.py:441 ../src/roster_window.py:446
+#: ../src/roster_window.py:1935 ../src/roster_window.py:1938
+#: ../src/roster_window.py:2607 ../src/roster_window.py:2610
+#: ../src/roster_window.py:2635 ../src/roster_window.py:4696
+#: ../src/roster_window.py:4698 ../src/common/commands.py:194
+#: ../src/common/contacts.py:97 ../src/common/helpers.py:44
+msgid "Groupchats"
+msgstr "Grupni razgovori"
+
+#: ../src/roster_window.py:771 ../src/roster_window.py:3952
+msgid "You cannot join a group chat while you are invisible"
+msgstr "Nemoguće je pristupiti grupnom razgovoru ako ste nevidljivi"
+
+#. new chat
+#. single message
+#. for chat_with
+#. for single message
+#. join gc
+#: ../src/roster_window.py:984 ../src/roster_window.py:994
+#: ../src/roster_window.py:1003 ../src/systray.py:207 ../src/systray.py:212
+#: ../src/systray.py:218
+#, python-format
+msgid "using account %s"
+msgstr "koristeći račun %s"
+
+#. add
+#: ../src/roster_window.py:1010
+#, python-format
+msgid "to %s account"
+msgstr "na %s nalog"
+
+#. disco
+#: ../src/roster_window.py:1015
+#, python-format
+msgid "using %s account"
+msgstr "koristeći %s račun"
+
+#: ../src/roster_window.py:1096
+msgid "_Manage Bookmarks..."
+msgstr "Upravljanje _markerima..."
+
+#. profile, avatar
+#: ../src/roster_window.py:1115
+#, python-format
+msgid "of account %s"
+msgstr "naloga %s"
+
+#: ../src/roster_window.py:1155
+#, python-format
+msgid "for account %s"
+msgstr "za nalog %s"
+
+#. History manager
+#: ../src/roster_window.py:1176
+msgid "History Manager"
+msgstr "Upravnik istorijatom"
+
+#: ../src/roster_window.py:1185
+msgid "_Join New Group Chat"
+msgstr "_Pridruživanje novom grupnom razgovoru"
+
+#: ../src/roster_window.py:1544 ../src/roster_window.py:4150
+#: ../src/roster_window.py:4157
+msgid "You have unread messages"
+msgstr "Imate nepročitanih poruka"
+
+#: ../src/roster_window.py:1545
+msgid "You must read them before removing this transport."
+msgstr "Morate ih pročitati pre uklanjanja ovog transporta."
+
+#: ../src/roster_window.py:1548
+#, python-format
+msgid "Transport \"%s\" will be removed"
+msgstr "Transport \"%s\" će biti uklonjen"
+
+#: ../src/roster_window.py:1549
+msgid ""
+"You will no longer be able to send and receive messages from contacts using "
+"this transport."
+msgstr ""
+"Nećete više biti u mogućnosti da razmenjujete poruke od kontakata sa ovog "
+"transporta."
+
+#: ../src/roster_window.py:1552
+msgid "Transports will be removed"
+msgstr "Transport će biti uklonjen"
+
+#: ../src/roster_window.py:1557
+#, python-format
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports:%s"
+msgstr ""
+"Nećete više biti u mogućnosti da razmenjujete poruke sa kontkatima sa ovog "
+"transporta:%s"
+
+#. it's jid
+#: ../src/roster_window.py:1723
+msgid "Rename Contact"
+msgstr "Preimenuj kontakt"
+
+#: ../src/roster_window.py:1724
+#, python-format
+msgid "Enter a new nickname for contact %s"
+msgstr "Unesite novi nadimak za kontakt %s"
+
+#: ../src/roster_window.py:1731
+msgid "Rename Group"
+msgstr "Preimenuj grupu"
+
+#: ../src/roster_window.py:1732
+#, python-format
+msgid "Enter a new name for group %s"
+msgstr "Unesite novo ime za grupu %s"
+
+#: ../src/roster_window.py:1807
+msgid "Remove Group"
+msgstr "Ukloni grupu"
+
+#: ../src/roster_window.py:1808
+#, python-format
+msgid "Do you want to remove group %s from the roster?"
+msgstr "Želite li ukloniti grupu %s sa liste kontakata?"
+
+#: ../src/roster_window.py:1809
+msgid "Remove also all contacts in this group from your roster"
+msgstr "Ujedno ukloni i sve kontakte iz ove grupe iz liste kontakata"
+
+#: ../src/roster_window.py:1840
+msgid "Assign OpenPGP Key"
+msgstr "Pridruži OpenPGP Ključ"
+
+#: ../src/roster_window.py:1841
+msgid "Select a key to apply to the contact"
+msgstr "Odaberite ključ za pridruživanje kontaktu"
+
+#: ../src/roster_window.py:2156
+#, fuzzy
+msgid "_New Group Chat"
+msgstr "Novi grupni razgovor"
+
+#: ../src/roster_window.py:2298
+msgid "I would like to add you to my roster"
+msgstr "Želeo bih Vas dodati na moju listu kontakata"
+
+#. Send Group Message
+#: ../src/roster_window.py:2432 ../src/roster_window.py:2644
+msgid "Send Group M_essage"
+msgstr "P_ošalji grupnu poruku"
+
+#: ../src/roster_window.py:2451
+msgid "_New group chat"
+msgstr "_Novi grupni razgovor"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:2489
+#, fuzzy
+msgid "_Manage Contacts"
+msgstr "Preimenuj kontakt"
+
+#: ../src/roster_window.py:2550
+msgid "_Maximize"
+msgstr ""
+
+#: ../src/roster_window.py:2557
+#, fuzzy
+msgid "_Disconnect"
+msgstr "Kontakt Otišao Sa Veze"
+
+#: ../src/roster_window.py:2636
+msgid "_Maximize All"
+msgstr ""
+
+#: ../src/roster_window.py:2652
+msgid "To all users"
+msgstr "Svim korisnicima"
+
+#: ../src/roster_window.py:2655
+msgid "To all online users"
+msgstr "Svim korisnicima na vezi"
+
+#. Log Off
+#: ../src/roster_window.py:2772
+#, fuzzy
+msgid "_Log off"
+msgstr "_Odjava"
+
+#. Log on
+#: ../src/roster_window.py:2778
+msgid "_Log on"
+msgstr "_Prijava"
+
+#. Send single message
+#: ../src/roster_window.py:2790
+#, fuzzy
+msgid "Send Single Message"
+msgstr "_Pošalji jednu poruku"
+
+#. Manage Transport submenu
+#: ../src/roster_window.py:2837
+#, fuzzy
+msgid "_Manage Transport"
+msgstr "Prenosi"
+
+#. Modify Transport
+#: ../src/roster_window.py:2845
+#, fuzzy
+msgid "_Modify Transport"
+msgstr "Prikaži trans_porte"
+
+#. Information
+#: ../src/roster_window.py:2882
+#, fuzzy
+msgid "_Information"
+msgstr "Informacije kontakta"
+
+#: ../src/roster_window.py:2959 ../src/roster_window.py:3033
+msgid "_Change Status Message"
+msgstr "_Izmeni statusnu poruku"
+
+#: ../src/roster_window.py:3105
+msgid "Authorization has been sent"
+msgstr "Autorizacija poslata"
+
+#: ../src/roster_window.py:3106
+#, python-format
+msgid "Now \"%s\" will know your status."
+msgstr "Sada će kontakt \"%s\" znati Vaš status."
+
+#: ../src/roster_window.py:3126
+msgid "Subscription request has been sent"
+msgstr "Zahtev za pretplatom poslat"
+
+#: ../src/roster_window.py:3127
+#, python-format
+msgid "If \"%s\" accepts this request you will know his or her status."
+msgstr "Ako kontakt \"%s\" prihvati ovaj zahtev, znaćete njegov/njen status."
+
+#: ../src/roster_window.py:3139
+msgid "Authorization has been removed"
+msgstr "Autorizacija uklonjena"
+
+#: ../src/roster_window.py:3140
+#, python-format
+msgid "Now \"%s\" will always see you as offline."
+msgstr "Sada će Vas kontakt \"%s\" uvek videti kao da niste na vezi."
+
+#: ../src/roster_window.py:3338
+#, python-format
+msgid "Contact \"%s\" will be removed from your roster"
+msgstr "Kontakt \"%s\" će biti uklonjen sa Vaše liste kontakata"
+
+#: ../src/roster_window.py:3342
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Uklanjanjem ovog kontakta ujedno uklanjate i odobrenje što znači da će Vas "
+"ta osoba uvek videti kao da niste na vezi."
+
+#: ../src/roster_window.py:3347
+msgid ""
+"By removing this contact you also by default remove authorization resulting "
+"in him or her always seeing you as offline."
+msgstr ""
+"Uklanjanjem ovog kontakta ujedno podrazumevano uklanjate i odobrenje što "
+"znači da će Vas ta osoba uvek videti kao da niste na vezi."
+
+#: ../src/roster_window.py:3350
+msgid "I want this contact to know my status after removal"
+msgstr "Želim da ovaj kontakt zna moj status i nakon uklanjanja"
+
+#. several contact to remove at the same time
+#: ../src/roster_window.py:3354
+msgid "Contacts will be removed from your roster"
+msgstr "Kontakti će biti uklonjeni sa Vaše liste kontakata"
+
+#: ../src/roster_window.py:3358
+#, python-format
+msgid ""
+"By removing these contacts:%s\n"
+"you also remove authorization resulting in them always seeing you as offline."
+msgstr ""
+"Uklanjanjem ovih kontakata:%s\n"
+"ujedno uklanjate i odobrenje pto znači da će Vas te osobe uvek videti kao da "
+"niste na vezi."
+
+#: ../src/roster_window.py:3390
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
+msgstr ""
+"Gnomov Keyring je instaliran, ali nije korektno pokrenut (promenljive "
+"okruženja verovatno nisu dobro podešene)"
+
+#: ../src/roster_window.py:3417
+msgid "GPG is not usable"
+msgstr ""
+
+#. %s is the account name here
+#: ../src/roster_window.py:3417 ../src/common/connection.py:684
+#: ../src/common/zeroconf/connection_zeroconf.py:165
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "Povezaćete se na %s bez OpenPGP ključa."
+
+#: ../src/roster_window.py:3434
+msgid "Passphrase Required"
+msgstr "Lozinka neophodna"
+
+#: ../src/roster_window.py:3435
+#, python-format
+msgid "Enter GPG key passphrase for account %s."
+msgstr "Unesite lozinku GPG ključa za nalog %s."
+
+#: ../src/roster_window.py:3440
+msgid "Save passphrase"
+msgstr "Sačuvati lozinku"
+
+#: ../src/roster_window.py:3448
+msgid "Wrong Passphrase"
+msgstr "Neispravna lozinka"
+
+#: ../src/roster_window.py:3449
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "Molimo ponovo ukucajte Vašu GPG lozinku ili pritisnite Odustani"
+
+#: ../src/roster_window.py:3532 ../src/roster_window.py:3609
+msgid "You are participating in one or more group chats"
+msgstr "Učestvujete u jednom ili više grupnih razgovora"
+
+#: ../src/roster_window.py:3533 ../src/roster_window.py:3610
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+msgstr ""
+"Promena Vašeg statusa u Nevidljiv će rezultovati  odvezivanjem sa tih "
+"grupnih razgovora. Jeste li sigurni da želite ići na nevidljivo?"
+
+#: ../src/roster_window.py:3567
+msgid "No account available"
+msgstr "Nema dostupnih naloga"
+
+#: ../src/roster_window.py:3568
+msgid "You must create an account before you can chat with other contacts."
+msgstr ""
+"Morate kreirati nalog pre nego što možete da razgovarate sa ostalim "
+"kontaktima."
+
+#: ../src/roster_window.py:3696
+#, python-format
+msgid "\"%(title)s\" by %(artist)s"
+msgstr "\"%(title)s\" od %(artist)s"
+
+#: ../src/roster_window.py:4151 ../src/roster_window.py:4158
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled."
+msgstr ""
+"Poruke će biti dostupne za čitanje i kasnije ako imate omogućen istorijat."
+
+#: ../src/roster_window.py:4782
+msgid "Metacontacts storage not supported by your server"
+msgstr "Čuvanje pseudokontakata nije podržano od strane Vašeg servera"
+
+#: ../src/roster_window.py:4784
+#, fuzzy
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"information will not be saved on next reconnection."
+msgstr ""
+"Vaš server ne podržava čuvanje informacija pseudokontakata. Te informacije "
+"neće biti sačuvane pri sledećem povezivanju."
+
+#: ../src/roster_window.py:4830
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
+msgstr ""
+"Upravo ćete napraviti pseudokontkat. Jeste li sigurni da želite nastaviti?"
+
+#: ../src/roster_window.py:4832
+msgid ""
+"Metacontacts are a way to regroup several contacts in one line. Generally it "
+"is used when the same person has several Jabber accounts or transport "
+"accounts."
+msgstr ""
+"Pseudokontakti su način grupisanja nekoliko kontakata u jednu liniju. "
+"Generalno, oni se koriste kada ista osoba ima nekoliko Džaber naloga ili "
+"transportnih naloga."
+
+#: ../src/roster_window.py:4930
+#, fuzzy, python-format
+msgid "Do you want to send that file to %s:"
+msgid_plural "Do you want to send those files to %s:"
+msgstr[0] "%s Vam želi poslati datoteku:"
+msgstr[1] "%s Vam želi poslati datoteku:"
+msgstr[2] "%s Vam želi poslati datoteku:"
+
+#: ../src/roster_window.py:5212
+msgid "Change Status Message..."
+msgstr "Promeni statusnu poruku..."
+
+#: ../src/systray.py:164
+msgid "_Change Status Message..."
+msgstr "_Promeni statusnu poruku..."
+
+#: ../src/systray.py:249
+msgid "Hide this menu"
+msgstr "Sakrij ovaj meni"
+
+#: ../src/tooltips.py:310 ../src/tooltips.py:503
+msgid "Jabber ID: "
+msgstr "Džaber ID: "
+
+#: ../src/tooltips.py:313 ../src/tooltips.py:507
+msgid "Resource: "
+msgstr "Resurs: "
+
+#: ../src/tooltips.py:318
+#, python-format
+msgid "%(owner_or_admin_or_member)s of this group chat"
+msgstr "%(owner_or_admin_or_member)s ovog grupnog razgovora"
+
+#: ../src/tooltips.py:416
+msgid " [blocked]"
+msgstr ""
+
+#: ../src/tooltips.py:420
+msgid " [minimized]"
+msgstr ""
+
+#: ../src/tooltips.py:435 ../src/tooltips.py:623
+msgid "Status: "
+msgstr "Status: "
+
+#: ../src/tooltips.py:465
+#, python-format
+msgid "Last status: %s"
+msgstr "Poslednji status: %s"
+
+#: ../src/tooltips.py:467
+#, python-format
+msgid " since %s"
+msgstr " od %s"
+
+#: ../src/tooltips.py:485
+#, fuzzy
+msgid "Connected"
+msgstr "Veza"
+
+#: ../src/tooltips.py:487
+#, fuzzy
+msgid "Disconnected"
+msgstr "Kontakt Otišao Sa Veze"
+
+#. ('both' is the normal sub so we don't show it)
+#: ../src/tooltips.py:514
+msgid "Subscription: "
+msgstr "Pretplata: "
+
+#: ../src/tooltips.py:524
+msgid "OpenPGP: "
+msgstr "OpenPGP: "
+
+#: ../src/tooltips.py:579
+msgid "Download"
+msgstr "Skidanje"
+
+#: ../src/tooltips.py:585
+msgid "Upload"
+msgstr "Slanje"
+
+#: ../src/tooltips.py:592
+msgid "Type: "
+msgstr "Tip: "
+
+#: ../src/tooltips.py:598
+msgid "Transferred: "
+msgstr "Prenešeno: "
+
+#: ../src/tooltips.py:601 ../src/tooltips.py:622
+msgid "Not started"
+msgstr "Nije počeo"
+
+#: ../src/tooltips.py:605
+msgid "Stopped"
+msgstr "Zaustavljen"
+
+#: ../src/tooltips.py:607 ../src/tooltips.py:610
+msgid "Completed"
+msgstr "Završen"
+
+#: ../src/tooltips.py:614
+msgid "?transfer status:Paused"
+msgstr "?status prenosa:Pauziran"
+
+#. stalled is not paused. it is like 'frozen' it stopped alone
+#: ../src/tooltips.py:618
+msgid "Stalled"
+msgstr "Zastoj"
+
+#: ../src/tooltips.py:620
+msgid "Transferring"
+msgstr "Prenos u toku"
+
+#: ../src/tooltips.py:652
+msgid "This service has not yet responded with detailed information"
+msgstr "Ovaj servis još nije pružio detaljne informacije"
+
+#: ../src/tooltips.py:655
+msgid ""
+"This service could not respond with detailed information.\n"
+"It is most likely legacy or broken"
+msgstr ""
+"Ovaj servis nije mogao odgovoriti sa detaljnim informacijama.\n"
+"Najverovatnije je zastareo ili u kvaru"
+
+#: ../src/vcard.py:240
+msgid "?Client:Unknown"
+msgstr "?Klijent:Nepoznat"
+
+#: ../src/vcard.py:242
+msgid "?OS:Unknown"
+msgstr "?OS:Nepoznat"
+
+#: ../src/vcard.py:267 ../src/vcard.py:277 ../src/vcard.py:467
+#, python-format
+msgid "since %s"
+msgstr "od %s"
+
+#: ../src/vcard.py:306
+msgid "Affiliation:"
+msgstr "Pripadnost:"
+
+#: ../src/vcard.py:314
+msgid ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
+msgstr ""
+"Ovaj kontakt je zainteresovan za informacije o Vašem prisustvu, ali Vas ne "
+"zanimaju informacije o njegovom/njenom prisustvu."
+
+#: ../src/vcard.py:316
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
+msgstr ""
+"Vi ste zainteresovani za informacije o prisustvu nekog kontakta, ali njega/"
+"nju ne zanima Vaše prisustvo"
+
+#: ../src/vcard.py:318
+msgid "You and the contact are interested in each other's presence information"
+msgstr ""
+"I Vi i Vaš kontakt ste zainteresovani za informacije o prisustvu jedan drugog"
+
+#. None
+#: ../src/vcard.py:320
+msgid ""
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
+msgstr ""
+"Ne interesuje Vas prisutnost kontakta, niti Vaša prisutnost interesuje njega/"
+"nju"
+
+#: ../src/vcard.py:328
+msgid "You are waiting contact's answer about your subscription request"
+msgstr "Čekate odgovor kontakta o Vašem zahtevu za pretplatom"
+
+#: ../src/vcard.py:332 ../src/vcard.py:369 ../src/vcard.py:492
+msgid " resource with priority "
+msgstr " resurs sa prioritetom "
+
+#: ../src/common/check_paths.py:33
+msgid "creating logs database"
+msgstr "kreiram bazu dnevnika"
+
+#: ../src/common/check_paths.py:96 ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:114
+#, python-format
+msgid "%s is a file but it should be a directory"
+msgstr "%s je datoteka, ali bi trebala biti fascikla"
+
+#: ../src/common/check_paths.py:97 ../src/common/check_paths.py:108
+#: ../src/common/check_paths.py:115 ../src/common/check_paths.py:123
+msgid "Gajim will now exit"
+msgstr "Gajim će se sada završiti"
+
+#: ../src/common/check_paths.py:122
+#, python-format
+msgid "%s is a directory but should be a file"
+msgstr "%s je fascikla, ali bi trebala biti datoteka"
+
+#: ../src/common/check_paths.py:138
+#, python-format
+msgid "creating %s directory"
+msgstr "kreiram fasciklu %s"
+
+#: ../src/common/commands.py:69
+msgid "Change status information"
+msgstr "Promena statusnih informacija"
+
+#: ../src/common/commands.py:82
+msgid "Change status"
+msgstr "Promena statusa"
+
+#: ../src/common/commands.py:83
+msgid "Set the presence type and description"
+msgstr "Postavite tip prisutnosti i opis"
+
+#: ../src/common/commands.py:89
+msgid "Free for chat"
+msgstr "Slobodan za razgovor"
+
+#: ../src/common/commands.py:90
+msgid "Online"
+msgstr "Na vezi"
+
+#: ../src/common/commands.py:92
+msgid "Extended away"
+msgstr "Produženo odsutan"
+
+#: ../src/common/commands.py:93
+msgid "Do not disturb"
+msgstr "Ne uznemiravaj."
+
+#: ../src/common/commands.py:94
+msgid "Offline - disconnect"
+msgstr "Nije na vezi - nepovezan"
+
+#: ../src/common/commands.py:99
+msgid "Presence description:"
+msgstr "opis prisutnosti:"
+
+#: ../src/common/commands.py:134
+msgid "The status has been changed."
+msgstr "Status je promenjen."
+
+#: ../src/common/commands.py:179
+#, python-format
+msgid "%(nickname)s on %(room_jid)s"
+msgstr "%(nickname)s u sobi %(room_jid)s"
+
+#: ../src/common/commands.py:183
+msgid "You have not joined a groupchat."
+msgstr "Pridružili ste se grupnom razgovoru"
+
+#: ../src/common/commands.py:189
+msgid "Leave Groupchats"
+msgstr "Napusti grupne razgovore"
+
+#: ../src/common/commands.py:190
+msgid "Choose the groupchats you want to leave"
+msgstr "Odaberite grupne razgovore koje želite napustiti"
+
+#: ../src/common/commands.py:230
+#, fuzzy
+msgid "You left the following groupchats:"
+msgstr "Napustili ste sledeće grupne razgovore:"
+
+#: ../src/common/commands.py:242
+#, fuzzy
+msgid "Forward unread messages"
+msgstr "%d nepročitana poruka"
+
+#: ../src/common/commands.py:262
+msgid "All unread messages have been forwarded."
+msgstr ""
+
+#: ../src/common/config.py:58
+msgid "Use D-Bus and Notification-Daemon to show notifications"
+msgstr "Koristi DBus i demon obaveštenja za prikazivanje obaveštenja"
+
+#: ../src/common/config.py:63
+msgid "Time in minutes, after which your status changes to away."
+msgstr "Vreme u minutama, nakom koga će se Vaš status promeiti u Odsutan."
+
+#: ../src/common/config.py:64
+msgid "Away as a result of being idle"
+msgstr "Odsutan, kao posledica mirovanja"
+
+#: ../src/common/config.py:66
+msgid "Time in minutes, after which your status changes to not available."
+msgstr ""
+"Vreme u minutama, nakom koga će se Vaš status promeiti u Nije dostupan."
+
+#: ../src/common/config.py:67
+msgid "Not available as a result of being idle"
+msgstr "Nije dostupan, kao posledica mirovanja."
+
+#: ../src/common/config.py:85
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"Lista (odvojena blanko znakovima) redova (naloga i grupa) koji su otvoreni."
+
+#: ../src/common/config.py:90
+msgid "Enable link-local/zeroconf messaging"
+msgstr "Omogući lokalnu vezu/zeroconf poruke"
+
+#: ../src/common/config.py:93
+msgid "Language used by speller"
+msgstr "Jezik koji koristi pravopis"
+
+#: ../src/common/config.py:94
+msgid ""
+"'always' - print time for every message.\n"
+"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
+"'never' - never print time."
+msgstr ""
+"'uvek' - ispisuj vreme za svaku poruku.\n"
+"'ponekad' - ispisuj vreme svakih print_ichat_every_foo_minutes minuta.\n"
+"'nikad' - nikad ne ispisuj vreme."
+
+#: ../src/common/config.py:95
+msgid ""
+"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
+"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
+"This is used only if print_time is 'sometimes'."
+msgstr ""
+"Ispisuj vreme u razgovorima koristeći Rasplinuti Sat. Vrednost rasplinutosti "
+"od  1 do 4 ili 0 za onemogućivanje nejasnog sata. 1 je najprecizniji sat, 4 "
+"najneprecizniji. Ovo se koristi samo ukoliko je print_time postavnjeno na "
+"'sometimes'."
+
+#: ../src/common/config.py:98
+msgid "Treat * / _ pairs as possible formatting characters."
+msgstr "Smatraj * / _ parove kao znakove za formatiranje."
+
+#: ../src/common/config.py:99
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+msgstr ""
+"Ako je istinito, ne uklanjaj */_ . Tako će *abv* biti podebljano, ali "
+"iokruženo sa * *."
+
+#: ../src/common/config.py:102
+msgid ""
+"Uses ReStructured text markup to send HTML, plus ascii formatting if "
+"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html (If you want to use this, install docutils)"
+msgstr ""
+"Koristi ReStructured tekst markup za slanje HTML-a i ascii formatiranje ako "
+"je odabrano. Za sintaksu, pogledajte http://docutils.sourceforge.net/docs/"
+"ref/rst/restructuredtext.html (Ako želite da koristite ovo, instalirajte "
+"docutils)"
+
+#: ../src/common/config.py:111
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Karakter za dodavanje posle nadimka kada se koristi dovršavanje nadimka "
+"(tasterom tab) u grupnom razgovoru"
+
+#: ../src/common/config.py:112
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Karakter koji želite dodati posle željenog nadimka ukoliko je željeni "
+"nadimak u grupnom razgovoru već upotrebljen"
+
+#: ../src/common/config.py:135
+msgid ""
+"This option let you customize timestamp that is printed in conversation. For "
+"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
+"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+msgstr ""
+"Ova opcija Vam omogućava prilagođavanje ispisa vremena u razgovoru. Na "
+"primer \"[%H:%M] \" će prikazati \"[sat:minut] \". Pogledajte python "
+"dokumentaciju za strftime funkciju za puno razumevanje: http://docs.python."
+"org/lib/module-time.html"
+
+#: ../src/common/config.py:136
+msgid "Characters that are printed before the nickname in conversations"
+msgstr "Karakteri odštampani pre nadimka u razgovoru"
+
+#: ../src/common/config.py:137
+msgid "Characters that are printed after the nickname in conversations"
+msgstr "Karakteri odštampani posle nadimka u razgovoru"
+
+#: ../src/common/config.py:144
+msgid "Add * and [n] in roster title?"
+msgstr "Dodaj * i [n] u naslov liste kontakata?"
+
+#: ../src/common/config.py:145
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Koliko linija prethodnog razgovora pamtiti kada se prozor/jezičak  za "
+"razgovor ponovo otvori."
+
+#: ../src/common/config.py:146
+msgid "How many minutes should last lines from previous conversation last."
+msgstr "Koliko minuta da traju linije prethodnog razgovora."
+
+#: ../src/common/config.py:147
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Pošalji poruku sa Ctrl+Enter, a sa Enter pravi novu liniju. (Podrazumevano "
+"ponašanje Miralabisovog ICQ klijenta)"
+
+#: ../src/common/config.py:149
+msgid "How many lines to store for Ctrl+KeyUP."
+msgstr "Koliko linija sačuvati sa Ctrl+KeyUP"
+
+#: ../src/common/config.py:152
+#, python-format
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Ili Vaš specificirani URL sa %s u njemu gde je %s reč ili fraza ili 'VIKI-"
+"REČNIK' što znači korišćenje viki-rečnika."
+
+#: ../src/common/config.py:155
+msgid "If checked, Gajim can be controlled remotely using gajim-remote."
+msgstr "Ako je označeno, Gajim se može kontrolisati korišćenjem gajim-remote."
+
+#: ../src/common/config.py:156
+msgid ""
+"If True, listen to D-Bus signals from NetworkManager and change the status "
+"of accounts (provided they do not have listen_to_network_manager set to "
+"False and they sync with global status) based upon the status of the network "
+"connection."
+msgstr ""
+"Ako je istinit, osluškuj D-Bus signale iz Menadžera Mreže i promeni status "
+"računa (ako nemaju listen_to_network_manager postavljen na neistinito i "
+"sinhronizuj sa globalnim statusom) u zavisnosti od statusa mrežne konekcije."
+
+#: ../src/common/config.py:157
+msgid ""
+"Sent chat state notifications. Can be one of all, composing_only, disabled."
+msgstr ""
+"Poslata obaveštenja o stanju razgovora. Može biti jedno od "
+"'svi','samo_sastavljanje', 'onemogućeno'."
+
+#: ../src/common/config.py:158
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Prikazana obaveštenja o stanju razgovora u prozoru za razgovor. Može biti "
+"jedno od 'svi', 'samo_sastavljanje', 'onemogućeno'."
+
+#: ../src/common/config.py:160
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"Ako se ne ispisuje vreme za svaku poruku (print_time==ponekad), ispisati ga "
+"svakih x minuta"
+
+#: ../src/common/config.py:161
+msgid "Ask before closing a group chat tab/window."
+msgstr "Pitaj pre zatvaranja prozora/jezička grupnog razgovora."
+
+#: ../src/common/config.py:162
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Uvek pitaj pre zatvaranja jezička/prozora kada je u pitanju ova lista "
+"odvojena blanko karakterima džaber ID-ova grupnih razgovora."
+
+#: ../src/common/config.py:163
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"of group chat jids."
+msgstr ""
+"Nikad ne pitaj pre zatvaranja jezička/prozora grupnog razgovora kada je u "
+"pitanju ova listaodovojena blanko znacima džaber ID-ova grupnih razgovora."
+
+#: ../src/common/config.py:166
+#, fuzzy
+msgid ""
+"Comma separated list of hosts that we send, in addition of local interfaces, "
+"for File Transfer in case of address translation/port forwarding."
+msgstr ""
+"Prepisuje ime hosta koji šaljem za prenos datoteka u slučaju prosleđivanja "
+"porta/NATovanja."
+
+#: ../src/common/config.py:168
+msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
+msgstr "IEC standard definiše KiB = 1024 bajtova, KB = 1000 bajtova"
+
+#: ../src/common/config.py:170
+msgid "Notify of events in the system trayicon."
+msgstr "Obavesti me o svim događajima u ikoni sistemske kasete."
+
+#: ../src/common/config.py:176
+msgid "Show tab when only one conversation?"
+msgstr "Prikaži jezičak iako je samo jedan razgovor?"
+
+#: ../src/common/config.py:177
+msgid "Show tabbed notebook border in chat windows?"
+msgstr "Prikaši granicu sveske u prozorima razgovora?"
+
+#: ../src/common/config.py:178
+msgid "Show close button in tab?"
+msgstr "Prikaši dugme za zatvaranje u jezičku?"
+
+#: ../src/common/config.py:179
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+
+#: ../src/common/config.py:188
+msgid "Preview new messages in notification popup?"
+msgstr ""
+
+#: ../src/common/config.py:193
+msgid ""
+"A semicolon-separated list of words that will be highlighted in group chats."
+msgstr ""
+"Lista reči odvojena blanko karakterima koje će biti obojene u grupnim "
+"razgovorima"
+
+#: ../src/common/config.py:194
+msgid ""
+"If True, quits Gajim when X button of Window Manager is clicked. This "
+"setting is taken into account only if trayicon is used."
+msgstr ""
+"Ako je istinito, Gajim se završava kada se pritisne X dugme. Ovo podešavanje "
+"se koristi samo ako je ikona sistemske kasete u upotrebi."
+
+#: ../src/common/config.py:195
+msgid ""
+"If True, Gajim will check if it's the default jabber client on each startup."
+msgstr ""
+"Ako je istinito, Gajim će provaravati da li je podrazumevani Džaber klijent "
+"pri svakom pokretanju."
+
+#: ../src/common/config.py:196
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Ako je istinito, Gajim će prikazivati ikonu na svakom jezičku koji sadrži "
+"nepročitane poruke. U zavisnosti od teme, ikona može biti i animirana."
+
+#: ../src/common/config.py:197
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+msgstr ""
+"Ako je istinito, Gajim će prikazivati statusnu poruku (ako nije prazna) za "
+"svaki kontakt u listi kontakata"
+
+#: ../src/common/config.py:199
+msgid ""
+"If True, Gajim will ask for avatar each contact that did not have an avatar "
+"last time or has one cached that is too old."
+msgstr ""
+"Ako je istinito, Gajim će poslati upit za avatar za svaki kontakt koji "
+"prošlog puta nije  imao avatar ili je onaj u memoriji prestar"
+
+#: ../src/common/config.py:200
+msgid ""
+"If False, Gajim will no longer print status line in chats when a contact "
+"changes his or her status and/or his or her status message."
+msgstr ""
+"Ako je neistinito, više nećete videti statusnu porukuu razgovorima kada "
+"kontakt promeni svoj status i/ili statusnu poruku."
+
+#: ../src/common/config.py:201
+msgid ""
+"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"longer print status line in groupchats when a member changes his or her "
+"status and/or his or her status message. If \"all\" Gajim will print all "
+"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
+"group chat."
+msgstr ""
+"može biti \"none\", \"all\" ili \"in_and_out\". Ako je \"none\", Gajim više "
+"neće ispisivati statusnu liniju u grupnim razgovorima kada član promeni svoj "
+"status i/ili izmeni statusnu poruku. Ako je \"all\", Gajim će prikazivati "
+"sve statusne poruke. Ako je \"in_and_out\" Gajim će prikazivati samo poruke "
+"tipa taj i taj je ušao/izašao u/iz sobe."
+
+#: ../src/common/config.py:203
+msgid "Background color of contacts when they just signed in."
+msgstr "Boja pozadine kontakta kada tek dođu na vezu."
+
+#: ../src/common/config.py:204
+msgid "Background color of contacts when they just signed out."
+msgstr "Boja pozadine kontakta kada tek odu sa veze."
+
+#: ../src/common/config.py:206
+msgid ""
+"If True, restored messages will use a smaller font than the default one."
+msgstr ""
+"Ako je istinito, vraćene poruke iz istorijata će biti manjeg fonta od "
+"podrazumevanog."
+
+#: ../src/common/config.py:207
+msgid "Don't show avatar for the transport itself."
+msgstr "Ne prikazuj avatar za sam transport."
+
+#: ../src/common/config.py:208
+msgid "Don't show roster in the system taskbar."
+msgstr "Ne prikazuj listu kontakata u sistemskoj kaseti."
+
+#: ../src/common/config.py:209
+msgid ""
+"If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
+"window flash (the default behaviour in most Window Managers) when holding "
+"pending events."
+msgstr ""
+"Ako je istinito, i instalirane verzije GTK+ i PyGTK su barem 2.8, neka "
+"prozor bljeska (podrazumevano ponašanje u većini menadžera prozora) pri "
+"novim događajima."
+
+#: ../src/common/config.py:211
+msgid ""
+"Jabberd1.4 does not like sha info when one join a password protected group "
+"chat. Turn this option to False to stop sending sha info in group chat "
+"presences."
+msgstr ""
+"Jabberd1.4 ne voli sha informacije kada neko uđe u grupni razgovor koji je "
+"zaštićen lozinkom. Isključite ovu opciju da prestanete slati sha informacije "
+"u grupnim razgovorima"
+
+#. always, never, peracct, pertype should not be translated
+#: ../src/common/config.py:214
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'never' - All messages get their own window.\n"
+"'peracct' - Messages for each account are sent to a specific window.\n"
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect."
+msgstr ""
+"Kontroliše prozor gde se smeštaju nove poruke.\n"
+"'uvek' - Sve poruke se šalju u isti prozor.\n"
+"'nikad' - Svaka poruka dobija svoj prozor.\n"
+"'ponalogu' - Poruke za isti nalog se šalju i isti prozor.\n"
+"'potipu' - Poruke istog tipa (npr., razgovori i grupni razgovori) se šalju u "
+"isti prozor. Promena ove opcije zahteva da ponovo pokrenete Gajim kako bi "
+"promene stupile na snagu."
+
+#: ../src/common/config.py:215
+msgid "If False, you will no longer see the avatar in the chat window."
+msgstr "Ako nije istinito, nećete više videti avatar u prozoru razgovora."
+
+#: ../src/common/config.py:216
+msgid "If True, pressing the escape key closes a tab/window."
+msgstr "Ako je istinito, pritisak na taster 'esc' zatvara jezičak/prozor."
+
+#: ../src/common/config.py:217
+#, fuzzy
+msgid "Hides the buttons in chat windows."
+msgstr "Sakriva dugmad u prozoru grupnog razgovora."
+
+#: ../src/common/config.py:218
+msgid "Hides the banner in a group chat window"
+msgstr "Sakriva baner u prozoru grupnog razgovora."
+
+#: ../src/common/config.py:219
+msgid "Hides the banner in two persons chat window"
+msgstr "Sakriva baner u prozoru razgovora dve osobe"
+
+#: ../src/common/config.py:220
+msgid "Hides the group chat occupants list in group chat window."
+msgstr "Sakriva listu učesnika u prozoru grupnog razgovora"
+
+#: ../src/common/config.py:221
+msgid ""
+"In a chat, show the nickname at the beginning of a line only when it's not "
+"the same person talking than in previous message."
+msgstr ""
+"U razgovoru, prikaži nadimak na početku novog reda samo kada se ne radi o "
+"istoj osobi koja je pričala i u prošloj poruci."
+
+#: ../src/common/config.py:222
+msgid "Indentation when using merge consecutive nickname."
+msgstr "Uvlačenje pri korišćenju spajanja toka po nadimcima."
+
+#: ../src/common/config.py:223
+#, fuzzy
+msgid "Smooth scroll message in conversation window"
+msgstr "Pošalji poruku i zatvori prozor"
+
+#: ../src/common/config.py:224
+msgid "List of colors that will be used to color nicknames in group chats."
+msgstr ""
+"Lista boja koje će biti korišćene za bojenje nadimaka u grupnim razgovorima."
+
+#: ../src/common/config.py:225
+msgid "Ctrl-Tab go to next composing tab when none is unread."
+msgstr "Ctrl-Tab ide na sledeći jezičak kada nema nepročitanih jezičaka"
+
+#: ../src/common/config.py:226
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Treba li pitati za potvrdu stvaranja pseudokontakta ili ne? Prazan niz znači "
+"da nikada ne prikazujemo upit."
+
+#: ../src/common/config.py:227
+msgid ""
+"If True, you will be able to set a negative priority to your account in "
+"account modification window. BE CAREFUL, when you are logged in with a "
+"negative priority, you will NOT receive any message from your server."
+msgstr ""
+"Ako je istinito, bićete u mogućnosti postaviti negativan prioritet na Vaš "
+"nalog u prozoru za izmenu podešavanja naloga. BUDITE OPREZNI, kada ste "
+"povezani sa negativnim prioritetom NEĆETE primati nikakve poruke od servera."
+
+#: ../src/common/config.py:228
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"Ako je istinito, Gajim će koristiti Gnomov Keyring (ako je dostupan) za "
+"skladištenje lozinki naloga."
+
+#: ../src/common/config.py:229
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"Ako je istinito, Gajim će prikazivati ukupan i broj kontakata na vezi u "
+"nalogu i u grupnim redovima."
+
+#: ../src/common/config.py:230
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+"Može biti prazno, 'chat' ili 'normal'. Ako je prazno, tretiraj sve dolazne "
+"poruke kao da su ovog tipa"
+
+#: ../src/common/config.py:231
+msgid ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+
+#: ../src/common/config.py:232
+msgid ""
+"If True, Gajim will convert string between $$ and $$ to an image using dvips "
+"and convert before insterting it in chat window."
+msgstr ""
+
+#: ../src/common/config.py:233
+msgid "Time of inactivity needed before the change status window closes down."
+msgstr ""
+
+#: ../src/common/config.py:234
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+
+#: ../src/common/config.py:245
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Prioritet će se automatski promeniti u zavisnosti od Vašeg statusa. "
+"Prioriteti su definsani u autopriority_* podešavanjima."
+
+#. yes, no, ask
+#: ../src/common/config.py:275
+msgid "Jabberd2 workaround"
+msgstr "Jabberd2 privremeno rešenje"
+
+#: ../src/common/config.py:279
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Ako je označeno, Gajim će koristiti Vašu IP adresu u proksi koji je "
+"difinisan u file_transfer_proxies podešavanjima za prenos."
+
+#: ../src/common/config.py:338
+msgid "Is OpenPGP enabled for this contact?"
+msgstr "Da li je OpenPGP omogućen za ovaj kontakt?"
+
+#: ../src/common/config.py:339 ../src/common/config.py:342
+msgid "Language for which we want to check misspelled words"
+msgstr "Jezik u kome želite proveravati neispravno napisane reči"
+
+#: ../src/common/config.py:348
+msgid "all or space separated status"
+msgstr "sve ili razmakom odvojen status"
+
+#: ../src/common/config.py:349
+msgid "'yes', 'no', or 'both'"
+msgstr "'da', 'ne', ili 'oboje'"
+
+#: ../src/common/config.py:350 ../src/common/config.py:352
+#: ../src/common/config.py:353 ../src/common/config.py:356
+#: ../src/common/config.py:357
+msgid "'yes', 'no' or ''"
+msgstr "'da', 'ne' ili ''"
+
+#: ../src/common/config.py:363
+msgid "Sleeping"
+msgstr "Spavam"
+
+#: ../src/common/config.py:364
+msgid "Back soon"
+msgstr "Vraćam se brzo"
+
+#: ../src/common/config.py:364
+msgid "Back in some minutes."
+msgstr "Vraćam se za par minuta."
+
+#: ../src/common/config.py:365
+msgid "Eating"
+msgstr "Jedem"
+
+#: ../src/common/config.py:365
+msgid "I'm eating, so leave me a message."
+msgstr "Jedem, ostavite poruku."
+
+#: ../src/common/config.py:366
+msgid "Movie"
+msgstr "Film"
+
+#: ../src/common/config.py:366
+msgid "I'm watching a movie."
+msgstr "Gledam film."
+
+#: ../src/common/config.py:367
+msgid "Working"
+msgstr "Radim."
+
+#: ../src/common/config.py:367
+msgid "I'm working."
+msgstr "Radim."
+
+#: ../src/common/config.py:368
+msgid "Phone"
+msgstr "Telefon"
+
+#: ../src/common/config.py:368
+msgid "I'm on the phone."
+msgstr "Telefoniram."
+
+#: ../src/common/config.py:369
+msgid "Out"
+msgstr "Napolju"
+
+#: ../src/common/config.py:369
+msgid "I'm out enjoying life."
+msgstr "Napolju sam, uživam u životu."
+
+#: ../src/common/config.py:373
+msgid "I'm available."
+msgstr "Dostupan sam."
+
+#: ../src/common/config.py:374
+msgid "I'm free for chat."
+msgstr "Slobodan sam za razgovor."
+
+#: ../src/common/config.py:376
+msgid "I'm not available."
+msgstr "Nedostupan sam."
+
+#: ../src/common/config.py:377
+msgid "Do not disturb."
+msgstr "Ne smetaj."
+
+#: ../src/common/config.py:378 ../src/common/config.py:379
+msgid "Bye!"
+msgstr "Pozdrav!"
+
+#: ../src/common/config.py:388
+msgid ""
+"Sound to play when a group chat message contains one of the words in "
+"muc_highlight_words, or when a group chat message contains your nickname."
+msgstr ""
+"Zvuk koji će se pustiti kada poruka grupnog razgovora sadrži neku reč iz "
+"muc_highlight_words, ili kada neka poruka grupnog razgovora sadrži Vaš "
+"nadimak."
+
+#: ../src/common/config.py:389
+msgid "Sound to play when any MUC message arrives."
+msgstr "Zvuk koji će se pustiti kada stigne neka MUC poruka."
+
+#: ../src/common/config.py:398 ../src/common/optparser.py:208
+msgid "green"
+msgstr "zelena"
+
+#: ../src/common/config.py:402 ../src/common/optparser.py:194
+msgid "grocery"
+msgstr "namirnice"
+
+#: ../src/common/config.py:406
+msgid "human"
+msgstr "ljudska"
+
+#: ../src/common/config.py:410
+msgid "marine"
+msgstr "morska"
+
+#: ../src/common/connection_handlers.py:56
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:44
+msgid "Unable to load idle module"
+msgstr "Nije moguće učitavanje modula idle"
+
+#: ../src/common/connection_handlers.py:184
+#: ../src/common/connection_handlers.py:219
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:236
+msgid "Wrong host"
+msgstr "Loš host"
+
+#: ../src/common/connection_handlers.py:184
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:236
+#, fuzzy, python-format
+msgid ""
+"The host %s you configured as the ft_add_hosts_to_send advanced option is "
+"not valid, so ignored."
+msgstr ""
+"Host koji ste postavili kao ft_override_host_to_send napredno podešavanje "
+"nije ispravan. pa je ignorisan."
+
+#: ../src/common/connection_handlers.py:220
+msgid "Invalid local address? :-O"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:612
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "Informacije o registraciji za transport %s nisu došle na vreme"
+
+#: ../src/common/connection_handlers.py:1776
+#, python-format
+msgid "Nickname not allowed: %s"
+msgstr "Nedozvoljen nadimak: %s "
+
+#. we are banned
+#. group chat does not exist
+#: ../src/common/connection_handlers.py:1846
+#: ../src/common/connection_handlers.py:1849
+#: ../src/common/connection_handlers.py:1852
+#: ../src/common/connection_handlers.py:1855
+#: ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1868
+msgid "Unable to join group chat"
+msgstr "Nije moguće pridružiti se grupnom razgovoru"
+
+#: ../src/common/connection_handlers.py:1847
+#, fuzzy, python-format
+msgid "You are banned from group chat %s."
+msgstr "Zabranjen Vam je pristup ovom grupnom razgovoru."
+
+#: ../src/common/connection_handlers.py:1850
+#, fuzzy, python-format
+msgid "Group chat %s does not exist."
+msgstr "Ne postoji ovakav grupni razgovor."
+
+#: ../src/common/connection_handlers.py:1853
+msgid "Group chat creation is restricted."
+msgstr "Stvaranje grupnih razgovora Vam nije dozvoljeno."
+
+#: ../src/common/connection_handlers.py:1856
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat %s."
+msgstr "Morate koristiti Vaš registrovani nadimak."
+
+#: ../src/common/connection_handlers.py:1860
+#, fuzzy, python-format
+msgid "You are not in the members list in groupchat %s."
+msgstr "Niste u listi članova."
+
+#: ../src/common/connection_handlers.py:1869
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Vaš željeni nadimak je trenutno u upotrebi ili je registrovan od strane "
+"nekog od učesnika.\n"
+"Molimo odredite drugi nadimak ispod:"
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers.py:1900
+#, fuzzy
+msgid "Room has been destroyed"
+msgstr "Autorizacija uklonjena"
+
+#: ../src/common/connection_handlers.py:1907
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1934
+msgid "I would like to add you to my roster."
+msgstr "Želeo bih da te dodam na moju listu kontakata."
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:1955
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr "sada ste pretplaćeni na %s"
+
+#: ../src/common/connection_handlers.py:1957
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "zahtev za ukidanje pretplate od kontakta %s"
+
+#: ../src/common/connection_handlers.py:1959
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr "sada Vam je ukinuta pretplata od kontakta %s"
+
+#: ../src/common/connection_handlers.py:2081
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"Džaber ID %s ne poštuje RFC pravila. Neće biti dodat na Vašu listu "
+"kontakata. Upotrebite alate kao što je http://jru.jabberstudio.org/ da biste "
+"ga uklonili"
+
+#: ../src/common/connection.py:244
+#: ../src/common/zeroconf/connection_zeroconf.py:203
+#, python-format
+msgid "Connection with account \"%s\" has been lost"
+msgstr "Izgubljena veza sa računom \"%s\""
+
+#: ../src/common/connection.py:245
+msgid "Reconnect manually."
+msgstr "Ponovo se povežite ručno."
+
+#: ../src/common/connection.py:256
+#, fuzzy, python-format
+msgid "Server %s answered wrongly to register request: %s"
+msgstr "Transport %s je loše odgovorio na registraciju: %s"
+
+#. wrong answer
+#: ../src/common/connection.py:264
+msgid "Invalid answer"
+msgstr "Neispravan odgovor"
+
+#: ../src/common/connection.py:265
+#, python-format
+msgid "Transport %s answered wrongly to register request: %s"
+msgstr "Transport %s je loše odgovorio na registraciju: %s"
+
+#: ../src/common/connection.py:411
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Veza prekinuta"
+
+#: ../src/common/connection.py:465 ../src/common/connection.py:511
+#: ../src/common/connection.py:1067
+#: ../src/common/zeroconf/connection_zeroconf.py:237
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "Veza sa \"%s\" nije moguća"
+
+#: ../src/common/connection.py:479
+#, python-format
+msgid "Connected to server %s:%s with %s"
+msgstr "Povezan na server %s:%s sa %s"
+
+#: ../src/common/connection.py:512
+msgid "Check your connection or try again later"
+msgstr "Proverite Vašu konekciju ili pokušajte kasnije"
+
+#: ../src/common/connection.py:537
+#, python-format
+msgid "Authentication failed with \"%s\""
+msgstr "Autentikacija sa \"%s\" neuspešna"
+
+#: ../src/common/connection.py:538
+msgid "Please check your login and password for correctness."
+msgstr "Molimo Vas da proverite Vaše korisničko ime i lozinku od grešaka."
+
+#: ../src/common/connection.py:581
+msgid "Error while removing privacy list"
+msgstr "Greška prilikom uklanjanja liste privatnosti"
+
+#: ../src/common/connection.py:582
+#, python-format
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+msgstr ""
+"Lista privatnosti %s je uklonjena. Možda je aktivna u nekom od Vaših "
+"povezanih resursa. Deaktivirajte je i pokušajte ponovo."
+
+#. We didn't set a passphrase
+#: ../src/common/connection.py:682
+#: ../src/common/zeroconf/connection_zeroconf.py:163
+msgid "OpenPGP passphrase was not given"
+msgstr "Lozinka za OpenPGP nije uneta"
+
+#. we're not english
+#. one  in locale and one en
+#: ../src/common/connection.py:845
+msgid "[This message is *encrypted* (See :JEP:`27`]"
+msgstr "[Ova poruka je *šifrovana* (Pogledajte :JEP:`27`]"
+
+#: ../src/common/connection.py:916
+#: ../src/common/zeroconf/connection_zeroconf.py:423
+#, python-format
+msgid ""
+"Subject: %s\n"
+"%s"
+msgstr ""
+"Tema: %s\n"
+"%s"
+
+#: ../src/common/connection.py:1099
+msgid "Not fetched because of invisible status"
+msgstr "Nije dohvaćeno zbog statusa nevidljivosti"
+
+#: ../src/common/contacts.py:294
+msgid "Not in roster"
+msgstr "Nije na listi kontakata"
+
+#. only say that to non Windows users
+#: ../src/common/dbus_support.py:33
+msgid "D-Bus python bindings are missing in this computer"
+msgstr "Na ovom računaru nedostaju python vezivanja za D-Bus"
+
+#: ../src/common/dbus_support.py:34
+msgid "D-Bus capabilities of Gajim cannot be used"
+msgstr "D-Bus mogućnosti Gajima se ne mogu koristiti"
+
+#: ../src/common/exceptions.py:22
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr "pysqlite2 (poznat kao python-pysqlite2) nedostaje. Izlazim..."
+
+#: ../src/common/exceptions.py:39
+msgid "Service not available: Gajim is not running, or remote_control is False"
+msgstr ""
+"Servis nije dostupan: Gajim nije pokrenut ili je stavka podešavanja "
+"remote_control neistinita"
+
+#: ../src/common/exceptions.py:47
+msgid "D-Bus is not present on this machine or python module is missing"
+msgstr "D-Bus ne postoji na ovom računaru ili nema python modula."
+
+#: ../src/common/exceptions.py:55
+msgid ""
+"Session bus is not available.\n"
+"Try reading http://trac.gajim.org/wiki/GajimDBus"
+msgstr ""
+"Linija sesije nije dostupna.\n"
+"Pročitajte http:/trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "one"
+msgstr "jedan"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "two"
+msgstr "dva"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "three"
+msgstr "tri"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "four"
+msgstr "četiri"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "five"
+msgstr "pet"
+
+#: ../src/common/fuzzyclock.py:42
+msgid "six"
+msgstr "šest"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "seven"
+msgstr "sedam"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eight"
+msgstr "osam"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "nine"
+msgstr "devet"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "ten"
+msgstr "deset"
+
+#: ../src/common/fuzzyclock.py:43
+msgid "eleven"
+msgstr "jedanaest"
+
+#: ../src/common/fuzzyclock.py:44
+msgid "twelve"
+msgstr "dvanaest"
+
+#. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). '''
+#. A "singular-form". It is used when talking about hour 0
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "$0 o'clock"
+msgstr "$0 sati"
+
+#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
+msgid "five past $0"
+msgstr "$0 i pet"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "ten past $0"
+msgstr "$0 i deset"
+
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+msgid "quarter past $0"
+msgstr "$0 i petnaest"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty past $0"
+msgstr "$0 i dvadeset"
+
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
+msgid "twenty five past $0"
+msgstr "$0 i dvadeset i pet"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "half past $0"
+msgstr "$0 i trideset minuta"
+
+#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+msgid "twenty five to $1"
+msgstr "dvadeset i pet do $1"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "twenty to $1"
+msgstr "dvadeset do $1"
+
+#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+msgid "quarter to $1"
+msgstr "petnaest minuta do $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "ten to $1"
+msgstr "deset do $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+msgid "five to $1"
+msgstr "pet do $1"
+
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
+msgid "$1 o'clock"
+msgstr "$1 sati"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Night"
+msgstr "Noć"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Early morning"
+msgstr "Rano jutro"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Morning"
+msgstr "Jutro"
+
+#: ../src/common/fuzzyclock.py:64
+msgid "Almost noon"
+msgstr "Skoro podne"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Noon"
+msgstr "Podne"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Afternoon"
+msgstr "Poslepodne"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Evening"
+msgstr "Veče"
+
+#: ../src/common/fuzzyclock.py:65
+msgid "Late evening"
+msgstr "Kasno veče"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Start of week"
+msgstr "Početak nedelje"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "Middle of week"
+msgstr "Sredina nedelje"
+
+#: ../src/common/fuzzyclock.py:67
+msgid "End of week"
+msgstr "Kraj nedelje"
+
+#: ../src/common/fuzzyclock.py:68
+msgid "Weekend!"
+msgstr "Vikend!"
+
+#: ../src/common/helpers.py:115
+msgid "Invalid character in username."
+msgstr "Neispravan karakter u korisničkom imenu."
+
+#: ../src/common/helpers.py:120
+msgid "Server address required."
+msgstr "Potrebna je adresa servera."
+
+#: ../src/common/helpers.py:125
+msgid "Invalid character in hostname."
+msgstr "Neispravan karakter u imenu hosta."
+
+#: ../src/common/helpers.py:131
+msgid "Invalid character in resource."
+msgstr "Neispravan karakter u resursu."
+
+#. GiB means gibibyte
+#: ../src/common/helpers.py:171
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:174
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:178
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:181
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:185
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:188
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:191
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:222
+msgid "_Busy"
+msgstr "_Zauzet"
+
+#: ../src/common/helpers.py:224
+msgid "Busy"
+msgstr "Zauzet"
+
+#: ../src/common/helpers.py:227
+msgid "_Not Available"
+msgstr "_Nedostupan"
+
+#: ../src/common/helpers.py:232
+msgid "_Free for Chat"
+msgstr "_Slobodan za razgovor"
+
+#: ../src/common/helpers.py:234
+msgid "Free for Chat"
+msgstr "Slobodan za razgovor"
+
+#: ../src/common/helpers.py:237
+msgid "_Available"
+msgstr "_Dostupan"
+
+#: ../src/common/helpers.py:239
+msgid "Available"
+msgstr "Dostupan"
+
+#: ../src/common/helpers.py:241
+msgid "Connecting"
+msgstr "Povezivanje"
+
+#: ../src/common/helpers.py:244
+msgid "A_way"
+msgstr "O_dsutan"
+
+#: ../src/common/helpers.py:249
+msgid "_Offline"
+msgstr "_Nije na vezi"
+
+#: ../src/common/helpers.py:251
+msgid "Offline"
+msgstr "Nije na vezi"
+
+#: ../src/common/helpers.py:254
+msgid "_Invisible"
+msgstr "_Nevidljiv"
+
+#: ../src/common/helpers.py:260
+msgid "?contact has status:Unknown"
+msgstr "?kontakt ima status:Nepoznat"
+
+#: ../src/common/helpers.py:262
+msgid "?contact has status:Has errors"
+msgstr "?kontakt ima status:Postoje greške"
+
+#: ../src/common/helpers.py:267
+msgid "?Subscription we already have:None"
+msgstr "?Trenutna pretplata:Nijedna"
+
+#: ../src/common/helpers.py:269
+msgid "To"
+msgstr "Za"
+
+#: ../src/common/helpers.py:273
+msgid "Both"
+msgstr "Oboje"
+
+#: ../src/common/helpers.py:281
+msgid "?Ask (for Subscription):None"
+msgstr "?Pitaj (za pretplatu):Nijedna"
+
+#: ../src/common/helpers.py:283
+msgid "Subscribe"
+msgstr "Pretplatite se"
+
+#: ../src/common/helpers.py:292
+msgid "?Group Chat Contact Role:None"
+msgstr "?Uloga kontakta u grupnom razgovoru:Nikakva"
+
+#: ../src/common/helpers.py:295
+msgid "Moderators"
+msgstr "Moderatori"
+
+#: ../src/common/helpers.py:297
+msgid "Moderator"
+msgstr "Moderator"
+
+#: ../src/common/helpers.py:300
+msgid "Participants"
+msgstr "Učesnici"
+
+#: ../src/common/helpers.py:302
+msgid "Participant"
+msgstr "Učesnik"
+
+#: ../src/common/helpers.py:305
+msgid "Visitors"
+msgstr "Posjetitelji"
+
+#: ../src/common/helpers.py:307
+msgid "Visitor"
+msgstr "Posetilac"
+
+#: ../src/common/helpers.py:313
+msgid "?Group Chat Contact Affiliation:None"
+msgstr "?Vezanost kontakta u grupnom razogovru:Nikakva"
+
+#: ../src/common/helpers.py:315
+msgid "Owner"
+msgstr "Vlasnik"
+
+#: ../src/common/helpers.py:317
+msgid "Administrator"
+msgstr "Administrator"
+
+#: ../src/common/helpers.py:319
+msgid "Member"
+msgstr "Član"
+
+#: ../src/common/helpers.py:358
+msgid "is paying attention to the conversation"
+msgstr "sluša konverzaciju"
+
+#: ../src/common/helpers.py:360
+msgid "is doing something else"
+msgstr "radi nešto drugo"
+
+#: ../src/common/helpers.py:362
+msgid "is composing a message..."
+msgstr "piše poruku..."
+
+#. paused means he or she was composing but has stopped for a while
+#: ../src/common/helpers.py:365
+msgid "paused composing a message"
+msgstr "pauza pri pisanju poruke"
+
+#: ../src/common/helpers.py:367
+msgid "has closed the chat window or tab"
+msgstr "je zatvorio/zatvorila prozor ili jezičak razgovora"
+
+#: ../src/common/helpers.py:913 ../src/common/helpers.py:920
+#, fuzzy, python-format
+msgid "%d message pending"
+msgid_plural "%d messages pending"
+msgstr[0] "Pošalji poruku"
+msgstr[1] "Pošalji poruku"
+msgstr[2] "Pošalji poruku"
+
+#: ../src/common/helpers.py:926
+#, python-format
+msgid " from room %s"
+msgstr ""
+
+#: ../src/common/helpers.py:929 ../src/common/helpers.py:948
+#, python-format
+msgid " from user %s"
+msgstr ""
+
+#: ../src/common/helpers.py:931
+#, python-format
+msgid " from %s"
+msgstr ""
+
+#: ../src/common/helpers.py:938 ../src/common/helpers.py:945
+#, python-format
+msgid "%d event pending"
+msgid_plural "%d events pending"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../src/common/helpers.py:978
+#, python-format
+msgid "Gajim - %s"
+msgstr "Gajim - %s"
+
+#. we talk about a file
+#: ../src/common/optparser.py:60
+#, python-format
+msgid "error: cannot open %s for reading"
+msgstr "greška: ne mogu otvoriti %s za čitanje"
+
+#: ../src/common/optparser.py:203 ../src/common/optparser.py:204
+msgid "cyan"
+msgstr "cijan"
+
+#: ../src/common/optparser.py:320
+msgid "migrating logs database to indices"
+msgstr "prebacujem bazu dnevnika u indekse"
+
+#: ../src/common/passwords.py:82
+#, python-format
+msgid "Gajim account %s"
+msgstr "Gajim nalog %s"
+
+#: ../src/common/zeroconf/client_zeroconf.py:135
+#: ../src/common/zeroconf/client_zeroconf.py:218
+msgid "Connection to host could not be established"
+msgstr "Nije moguće ostvariti vezu sa hostom"
+
+#: ../src/common/zeroconf/client_zeroconf.py:192
+msgid ""
+"Connection to host could not be established: Incorrect answer from server."
+msgstr "Nije moguće ostvariti vezu sa hostom: Neispravan odgovor servera."
+
+#: ../src/common/zeroconf/client_zeroconf.py:352
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"Nije moguće ostvariti vezu sa hostom: Vreme za slanje podataka je isteklo."
+
+#: ../src/common/zeroconf/client_zeroconf.py:638
+msgid "Contact is offline. Your message could not be sent."
+msgstr "Kontakt nije na vezi. Vašu poruku nije moguće poslati."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:204
+msgid "To continue sending and receiving messages, you will need to reconnect."
+msgstr ""
+"Ako želite nastaviti sa slanjem i primanjem poruka, morate se isključiti i "
+"ponovo doći na vezu."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+msgid "Avahi error"
+msgstr "Avahi greška"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:227
+#, python-format
+msgid ""
+"%s\n"
+"Link-local messaging might not work properly."
+msgstr ""
+"%s\n"
+"Poruke lokalne mreže možda neće raditi kako treba."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:238
+msgid "Please check if Avahi is installed."
+msgstr "Proverite da li je Avahi instaliran."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:247
+#: ../src/common/zeroconf/connection_zeroconf.py:251
+msgid "Could not start local service"
+msgstr "Nije moguće pokrenuti lokalni servis"
+
+#: ../src/common/zeroconf/connection_zeroconf.py:248
+#, python-format
+msgid "Unable to bind to port %d."
+msgstr "Ne mogu se povezati na port %d."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:252
+#: ../src/common/zeroconf/connection_zeroconf.py:347
+msgid "Please check if avahi-daemon is running."
+msgstr "Molimo proverite da li je avahi-demon pokrenut."
+
+#: ../src/common/zeroconf/connection_zeroconf.py:346
+#, python-format
+msgid "Could not change status of account \"%s\""
+msgstr "Nije moguće promeniti status računa \"%s\""
+
+#: ../src/common/zeroconf/connection_zeroconf.py:363
+msgid ""
+"You are not connected or not visible to others. Your message could not be "
+"sent."
+msgstr ""
+"Niste spojeni ili ste nevidljivi za druge. Vaša poruka ne može biti poslata."
+
+#. we're not english
+#: ../src/common/zeroconf/connection_zeroconf.py:375
+msgid "[This message is encrypted]"
+msgstr "[Ova poruka je šifrovana]"
+
+#~ msgid "_Discover Services..."
+#~ msgstr "_Otkrivanje usluga..."
+
+#~ msgid "_Retype Password:"
+#~ msgstr "_Ponovo ukucajte lozinku:"
+
+#~ msgid "_Use proxy"
+#~ msgstr "_Koristi proksi"
+
+#~ msgid "Accounts"
+#~ msgstr "Nalozi"
+
+#~ msgid ""
+#~ "If checked, all local contacts that use a Bonjour compatible chat client "
+#~ "(like iChat, Trillian or Gaim) will be shown in roster. You don't need to "
+#~ "be connected to a jabber server for it to work.\n"
+#~ "This is only available if python-avahi is installed and avahi-daemon is "
+#~ "running."
+#~ msgstr ""
+#~ "Ako je označeno, svi lokalni kontakti koji koriste Bonjour kompatibilni "
+#~ "klijent za razgovor (kao iChat, Trillian ili Gaim) će biti prikazani na "
+#~ "listi kontakata. Ne morate biti spojeni na džaber server kako bi ovo "
+#~ "radilo.\n"
+#~ "Ovo je dostupno samo ako je instaliran python-avahi i avahi-demon je  "
+#~ "pokrenut."
+
+#~ msgid ""
+#~ "If you have 2 or more accounts and this is checked, Gajim will list all "
+#~ "contacts as if you had one account"
+#~ msgstr ""
+#~ "Ako imate 2 ili više naloga i ovo je označeno, Gajim će prikazivati sve "
+#~ "kontakte kao da imate jedan nalog"
+
+#~ msgid "_Enable link-local messaging"
+#~ msgstr "_Omogući poruke preko lokalne veze"
+
+#~ msgid "_Modify"
+#~ msgstr "_Izmeni"
+
+#~ msgid "_Compact View    Alt+C"
+#~ msgstr "_Kompaktan pregled    Alt+K"
+
+#~ msgid "<b>Interface Customization</b>"
+#~ msgstr "<b>Prilagođavanje interfejsa</b>"
+
+#~ msgid "Also known as iChat style"
+#~ msgstr "Takođe znan i kao iChat stil"
+
+#~ msgid "Chat"
+#~ msgstr "Razgovor"
+
+#~ msgid "E_very 5 minutes"
+#~ msgstr "Na svakih 5 minuta"
+
+#~ msgid ""
+#~ "Gajim will automatically show new events by popping up the relative window"
+#~ msgstr ""
+#~ "Gajim će automatski prikazati nove događaje sa odogovarajućim iskačućim "
+#~ "prozorom"
+
+#~ msgid ""
+#~ "Gajim will notify you for new events via a popup in the bottom right of "
+#~ "the screen"
+#~ msgstr ""
+#~ "Gajim će Vas obavestiti o novim događajima preko iskačućeg obaveštenja u "
+#~ "donjem desnom uglu ekrana"
+
+#~ msgid ""
+#~ "Gajim will notify you via a popup window in the bottom right of the "
+#~ "screen about contacts that just signed in"
+#~ msgstr ""
+#~ "Gajim će Vas obavestiti o kontaktima koji su se upravo pojavili sa "
+#~ "iskačućim prozorom u donjem desnom uglu ekrana"
+
+#~ msgid ""
+#~ "Gajim will only change the icon of the contact that triggered the new "
+#~ "event"
+#~ msgstr "Gajim će samo izmeniti ikonu kontakta koji je izazvao novi događaj"
+
+#~ msgid ""
+#~ "If checked, Gajim will remember the roster and chat window positions in "
+#~ "the screen and the sizes of them next time you run it"
+#~ msgstr ""
+#~ "Ako je označeno, Gajim će pamtiti veličinu i poziciju prozora liste "
+#~ "kontakata i prozora razgovora sledeći put kada se pokrene"
+
+#~ msgid "On every _message"
+#~ msgstr "Na svaku poruku"
+
+#~ msgid "Outgoing Chat state noti_fications:"
+#~ msgstr "Obaveštenja o stanju odlaznog razgovora"
+
+#~ msgid "Print time:"
+#~ msgstr "Ispis vremena:"
+
+#~ msgid "Save _position and size for roster and chat windows"
+#~ msgstr "Čuvaj pozicije i veličine prozora za kontakte i za razgovor"
+
+#~ msgid "Show only in _roster"
+#~ msgstr "Prikaži samo u listi kontakata"
+
+#~ msgid "Use t_rayicon (aka. notification area icon)"
+#~ msgstr "Koristi ikonu panel (tzv. ikonu obaveštenja)"
+
+#~ msgid ""
+#~ "When a new event (message, file transfer request etc..) is received, the "
+#~ "following methods may be used to inform you about it. Please note that "
+#~ "events about new messages only occur if it is a new message from a "
+#~ "contact you are not already chatting with"
+#~ msgstr ""
+#~ "Kada se primi novi događaj (poruka, zahtev za prenos datoteke i sl.), "
+#~ "mogu se korisititi sledeće metode obaveštavanja. Imajte na umu da se "
+#~ "obaveštavanja o novim porukama prikazuju samo za kontakte sa kojima "
+#~ "trenutno ne razgovarate"
+
+#~ msgid "_Never"
+#~ msgstr "_Nikada"
+
+#~ msgid "_Notify me about it"
+#~ msgstr "_Obavesti me o tome"
+
+#~ msgid "_Pop it up"
+#~ msgstr "_Iskoči ga"
+
+#~ msgid "_Remove from Roster"
+#~ msgstr "_Izbriši sa liste kontakata"
+
+#~ msgid "Add _Contact"
+#~ msgstr "Dodaj _kontakt"
+
+#~ msgid "_Filter:"
+#~ msgstr "_Filter:"
+
+#~ msgid ""
+#~ "If that is not your language for which you want to highlight misspelled "
+#~ "words, then please set your $LANG as appropriate. Eg. for French do "
+#~ "export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to "
+#~ "make it global in /etc/profile.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "Ako ovo nije Vaš jezik za koji želite da obojite loše napisane reči, "
+#~ "molimo podesite $LANG promenljivu okruženja na odgovarajuću vrednost. "
+#~ "Npr. za francuski, uradite export LANG=fr_FR ili export LANG=fr_FR.UTF-8 "
+#~ "u ~/.bash_profile ili, kako bi bilo globalno u /etc/profile.\n"
+#~ "\n"
+#~ "Mogućnost bojenja loše napisanih reči neće biti korišćena"
+
+#~ msgid "Every %s _minutes"
+#~ msgstr "Svaka %s _minuta"
+
+#~ msgid "You must enter a password for the new account."
+#~ msgstr "Morate uneti lozinku za novi nalog"
+
+#~ msgid "%s does not appear to be a valid JID"
+#~ msgstr "%s ne liči da je validan Džaber ID"
+
+#~ msgid "Drop %s in group %s"
+#~ msgstr "Spusti %s u grupu %s"
+
+#~ msgid "Make %s and %s metacontacts"
+#~ msgstr "Napravi od %s i %s pseudokontakte"
+
+#~ msgid "Hides the buttons in two persons chat window."
+#~ msgstr "Sakriva dugmad u prozoru razgovora dve osobe."
+
+#~ msgid " %d unread single message"
+#~ msgid_plural " %d unread single messages"
+#~ msgstr[0] "%d nepročitana samostalna poruka"
+#~ msgstr[1] "%d nepročitane samostalne poruke"
+#~ msgstr[2] "%d nepročitanih samostalnih poruka"
+
+#~ msgid " %d unread group chat message"
+#~ msgid_plural " %d unread group chat messages"
+#~ msgstr[0] "%d nepročitana poruka grupnog razgovora"
+#~ msgstr[1] "%d nepročitane poruke grupnog razgovora"
+#~ msgstr[2] "%d nepročitanih poruka grupnog razgovora"
+
+#~ msgid " %d unread private message"
+#~ msgid_plural " %d unread private messages"
+#~ msgstr[0] "%d nepročitana privatna poruka"
+#~ msgstr[1] "%d nepročitane privatne poruke"
+#~ msgstr[2] "%d nepročitanih privatnih poruka"
+
+#~ msgid "Error while adding service. %s"
+#~ msgstr "Greška prilikom dodavanja servisa. %s"