diff --git a/po/gajim.pot b/po/gajim.pot
index a023bca52e2f19be0132ce3e65b6872762a7eaf5..2c88d4989e32d35ad2df3212754693178110a7ad 100644
--- a/po/gajim.pot
+++ b/po/gajim.pot
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: ../src/gajim-remote.py:204 ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:205 ../src/gajim-remote.py:212
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-13 12:52+0200\n"
+"POT-Creation-Date: 2006-05-26 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,3453 +30,3693 @@ msgstr ""
 msgid "Jabber IM Client"
 msgstr ""
 
-#: ../src/advanced.py:71
-msgid "Preference Name"
+#: ../data/glade/account_context_menu.glade.h:1
+msgid "Send Single _Message..."
 msgstr ""
 
-#: ../src/advanced.py:77
-msgid "Value"
+#: ../data/glade/account_context_menu.glade.h:2
+msgid "_Add Contact..."
 msgstr ""
 
-#: ../src/advanced.py:86
-msgid "Type"
+#: ../data/glade/account_context_menu.glade.h:3
+msgid "_Discover Services..."
 msgstr ""
 
-#. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:142
-msgid "(None)"
+#: ../data/glade/account_context_menu.glade.h:4
+#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/systray_context_menu.glade.h:5
+msgid "_Group Chat"
 msgstr ""
 
-#. we talk about password
-#: ../src/advanced.py:241
-msgid "Hidden"
+#: ../data/glade/account_context_menu.glade.h:5
+msgid "_Modify Account..."
 msgstr ""
 
-#. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat_control.py:157 ../src/dialogs.py:1207
+#: ../data/glade/account_context_menu.glade.h:6
+msgid "_Status"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:1
 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"
+"<b>Account is being created</b>\n"
 "\n"
-"Highlighting misspelled words feature will not be used"
+"Please wait..."
 msgstr ""
 
-#. we are not connected
-#: ../src/chat_control.py:170 ../src/chat_control.py:373
-msgid "A connection is not available"
+#: ../data/glade/account_creation_wizard_window.glade.h:4
+msgid "<b>Please choose one of the options below:</b>"
 msgstr ""
 
-#: ../src/chat_control.py:171 ../src/chat_control.py:374
-msgid "Your message can not be sent until you are connected."
+#: ../data/glade/account_creation_wizard_window.glade.h:5
+msgid "<b>Please fill in the data for your new account</b>"
 msgstr ""
 
-#: ../src/chat_control.py:689 ../src/gtkgui.glade.h:81
-msgid "Chat"
+#: ../data/glade/account_creation_wizard_window.glade.h:6
+msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 
-#: ../src/chat_control.py:689
-msgid "Chats"
+#: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid "Connect when I press Finish"
 msgstr ""
 
-#: ../src/chat_control.py:897 ../src/gtkgui.glade.h:207
-msgid "OpenPGP Encryption"
+#: ../data/glade/account_creation_wizard_window.glade.h:8
+msgid "Gajim: Account Creation Wizard"
 msgstr ""
 
-#. we talk about a contact here
-#: ../src/chat_control.py:901
-#, python-format
-msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#: ../data/glade/account_creation_wizard_window.glade.h:9
+msgid "I already have an account I want to use"
 msgstr ""
 
-#: ../src/chat_control.py:1025
-msgid "Encryption enabled"
+#: ../data/glade/account_creation_wizard_window.glade.h:10
+msgid "I want to _register for a new account"
 msgstr ""
 
-#: ../src/chat_control.py:1030
-msgid "Encryption disabled"
+#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/glade/account_modification_window.glade.h:18
+msgid "If checked, Gajim will remember the password for this account"
 msgstr ""
 
-#. add_to_roster_menuitem
-#. show user in not in roster group
-#: ../src/chat_control.py:1152 ../src/conversation_textview.py:373
-#: ../src/dialogs.py:465 ../src/gajim.py:684 ../src/gajim.py:685
-#: ../src/roster_window.py:1335 ../src/roster_window.py:1641
-#: ../src/roster_window.py:1819 ../src/roster_window.py:2118
-#: ../src/roster_window.py:2164 ../src/roster_window.py:2944
-#: ../src/roster_window.py:2946 ../src/systray.py:284
-#: ../src/common/helpers.py:42 ../src/common/helpers.py:225
-msgid "Not in Roster"
+#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/manage_proxies_window.glade.h:6
+msgid "Pass_word:"
 msgstr ""
 
-#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:1267
-#, python-format
-msgid "You just received a new message from \"%s\""
+#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_modification_window.glade.h:37
+msgid "Save pass_word"
 msgstr ""
 
-#: ../src/chat_control.py:1268
-msgid ""
-"If you close this tab and you have history disabled, this message will be "
-"lost."
+#: ../data/glade/account_creation_wizard_window.glade.h:14
+msgid "Servers Features"
 msgstr ""
 
-#: ../src/config.py:208
-#, python-format
-msgid "Every %s _minutes"
+#: ../data/glade/account_creation_wizard_window.glade.h:15
+msgid "Set my profile when I connect"
 msgstr ""
 
-#: ../src/config.py:333 ../src/gtkgui.glade.h:41
-msgid "Active"
+#: ../data/glade/account_creation_wizard_window.glade.h:16
+msgid ""
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
 
-#: ../src/config.py:341
-msgid "Event"
+#: ../data/glade/account_creation_wizard_window.glade.h:18
+msgid "Your JID:"
 msgstr ""
 
-#: ../src/config.py:511
-msgid "Disabled"
+#: ../data/glade/account_creation_wizard_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:10
+msgid "_Advanced"
 msgstr ""
 
-#: ../src/config.py:859
-msgid "status message title"
+#: ../data/glade/account_creation_wizard_window.glade.h:20
+msgid "_Finish"
 msgstr ""
 
-#: ../src/config.py:859
-msgid "status message text"
+#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../data/glade/manage_proxies_window.glade.h:9
+msgid "_Host:"
 msgstr ""
 
-#: ../src/config.py:894
-msgid "First Message Received"
+#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../data/glade/account_modification_window.glade.h:45
+msgid "_Password:"
 msgstr ""
 
-#: ../src/config.py:895
-msgid "Next Message Received"
+#: ../data/glade/account_creation_wizard_window.glade.h:23
+#: ../data/glade/manage_proxies_window.glade.h:10
+msgid "_Port:"
 msgstr ""
 
-#: ../src/config.py:896
-msgid "Contact Connected"
+#: ../data/glade/account_creation_wizard_window.glade.h:24
+msgid "_Retype Password:"
 msgstr ""
 
-#: ../src/config.py:897
-msgid "Contact Disconnected"
+#: ../data/glade/account_creation_wizard_window.glade.h:25
+msgid "_Server:"
 msgstr ""
 
-#: ../src/config.py:898
-msgid "Message Sent"
+#: ../data/glade/account_creation_wizard_window.glade.h:26
+msgid "_Use proxy"
 msgstr ""
 
-#: ../src/config.py:899
-msgid "Group Chat Message Highlight"
+#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/manage_proxies_window.glade.h:11
+msgid "_Username:"
 msgstr ""
 
-#: ../src/config.py:900
-msgid "Group Chat Message Received"
+#: ../data/glade/account_modification_window.glade.h:1
+#: ../data/glade/preferences_window.glade.h:7
+msgid "<b>Miscellaneous</b>"
 msgstr ""
 
-#: ../src/config.py:1090
-msgid "OpenPGP is not usable in this computer"
+#: ../data/glade/account_modification_window.glade.h:2
+msgid "<b>OpenPGP</b>"
 msgstr ""
 
-#: ../src/config.py:1132
-msgid "You are currently connected to the server"
+#: ../data/glade/account_modification_window.glade.h:3
+msgid "<b>Personal Information</b>"
 msgstr ""
 
-#: ../src/config.py:1133
-msgid "To change the account name, you must be disconnected."
+#: ../data/glade/account_modification_window.glade.h:4
+msgid "Account"
 msgstr ""
 
-#: ../src/config.py:1136 ../src/config.py:1676
-msgid "Unread events"
+#: ../data/glade/account_modification_window.glade.h:5
+msgid "Account Modification"
 msgstr ""
 
-#: ../src/config.py:1137
-msgid "To change the account name, you must read all pending events."
+#: ../data/glade/account_modification_window.glade.h:6
+msgid "Autoreconnect when connection is lost"
 msgstr ""
 
-#: ../src/config.py:1141
-msgid "Account Name Already Used"
+#: ../data/glade/account_modification_window.glade.h:7
+msgid "C_onnect on Gajim startup"
+msgstr ""
+
+#: ../data/glade/account_modification_window.glade.h:8
+msgid "Chan_ge Password"
 msgstr ""
 
-#: ../src/config.py:1142
+#: ../data/glade/account_modification_window.glade.h:9
 msgid ""
-"This name is already used by another of your accounts. Please choose another "
-"name."
+"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 ""
 
-#: ../src/config.py:1146 ../src/config.py:1150
-msgid "Invalid account name"
+#: ../data/glade/account_modification_window.glade.h:10
+msgid "Choose _Key..."
 msgstr ""
 
-#: ../src/config.py:1147
-msgid "Account name cannot be empty."
+#: ../data/glade/account_modification_window.glade.h:11
+msgid "Click to change account's password"
 msgstr ""
 
-#: ../src/config.py:1151
-msgid "Account name cannot contain spaces."
+#: ../data/glade/account_modification_window.glade.h:12
+msgid "Connection"
 msgstr ""
 
-#: ../src/config.py:1159 ../src/config.py:1165 ../src/config.py:1174
-#: ../src/config.py:2588
-msgid "Invalid Jabber ID"
+#: ../data/glade/account_modification_window.glade.h:13
+msgid "Edit Personal Information..."
 msgstr ""
 
-#: ../src/config.py:1166
-msgid "A Jabber ID must be in the form \"user@servername\"."
+#: ../data/glade/account_modification_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:303
+#: ../src/notify.py:325 ../src/notify.py:337 ../src/tooltips.py:353
+msgid "Gajim"
 msgstr ""
 
-#: ../src/config.py:1222
-msgid "Invalid entry"
+#: ../data/glade/account_modification_window.glade.h:15
+#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/vcard_information_window.glade.h:17
+#: ../src/roster_window.py:297 ../src/roster_window.py:1177
+#: ../src/roster_window.py:1398
+msgid "General"
 msgstr ""
 
-#: ../src/config.py:1223
-msgid "Custom port must be a port number."
+#: ../data/glade/account_modification_window.glade.h:16
+msgid "Hostname: "
 msgstr ""
 
-#: ../src/config.py:1335
-msgid "Be right back."
+#: ../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 ""
 
-#: ../src/config.py:1338
-msgid "Relogin now?"
+#: ../data/glade/account_modification_window.glade.h:19
+msgid ""
+"If checked, Gajim will send keep-alive packets so it prevents connection "
+"timeout which results in disconnection"
 msgstr ""
 
-#: ../src/config.py:1339
-msgid "If you want all the changes to apply instantly, you must relogin."
+#: ../data/glade/account_modification_window.glade.h:20
+msgid ""
+"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+"permission only for you"
 msgstr ""
 
-#: ../src/config.py:1357
-msgid "No such account available"
+#: ../data/glade/account_modification_window.glade.h:21
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
 msgstr ""
 
-#: ../src/config.py:1358
-msgid "You must create your account before editing your personal information."
+#: ../data/glade/account_modification_window.glade.h:22
+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 ""
 
-#: ../src/config.py:1365 ../src/dialogs.py:871 ../src/dialogs.py:1017
-#: ../src/disco.py:419 ../src/vcard.py:433 ../src/vcard.py:462
-msgid "You are not connected to the server"
+#: ../data/glade/account_modification_window.glade.h:23
+msgid "Information about you, as stored in the server"
 msgstr ""
 
-#: ../src/config.py:1366
-msgid "Without a connection, you can not edit your personal information."
+#: ../data/glade/account_modification_window.glade.h:24
+msgid "Manage..."
 msgstr ""
 
-#: ../src/config.py:1396
-msgid "Failed to get secret keys"
+#: ../data/glade/account_modification_window.glade.h:25 ../src/config.py:1451
+msgid "No key selected"
 msgstr ""
 
-#: ../src/config.py:1397
-msgid "There was a problem retrieving your OpenPGP secret keys."
+#. None means no proxy profile selected
+#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1051
+#: ../src/config.py:1056 ../src/config.py:1228 ../src/config.py:1508
+#: ../src/config.py:1581 ../src/config.py:2285
+msgid "None"
 msgstr ""
 
-#: ../src/config.py:1400
-msgid "OpenPGP Key Selection"
+#: ../data/glade/account_modification_window.glade.h:28
+msgid "Personal Information"
 msgstr ""
 
-#: ../src/config.py:1401
-msgid "Choose your OpenPGP key"
+#: ../data/glade/account_modification_window.glade.h:29
+msgid "Port: "
 msgstr ""
 
-#: ../src/config.py:1409 ../src/gtkgui.glade.h:199
-msgid "No key selected"
+#: ../data/glade/account_modification_window.glade.h:30
+msgid "Priori_ty:"
 msgstr ""
 
-#. Name column
-#: ../src/config.py:1628 ../src/disco.py:736 ../src/disco.py:1475
-#: ../src/history_window.py:86
-msgid "Name"
+#: ../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 ""
 
-#: ../src/config.py:1631
-msgid "Server"
+#: ../data/glade/account_modification_window.glade.h:32
+msgid "Proxy:"
 msgstr ""
 
-#: ../src/config.py:1677
-msgid "Read all pending events before removing this account."
+#: ../data/glade/account_modification_window.glade.h:33
+msgid "Resour_ce: "
 msgstr ""
 
-#: ../src/config.py:1872
-#, python-format
-msgid "Edit %s"
+#: ../data/glade/account_modification_window.glade.h:34
+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 ""
 
-#: ../src/config.py:1874
-#, python-format
-msgid "Register to %s"
+#: ../data/glade/account_modification_window.glade.h:35
+msgid "Save _passphrase (insecure)"
 msgstr ""
 
-#: ../src/config.py:1945
-msgid "Ban List"
+#: ../data/glade/account_modification_window.glade.h:36
+msgid "Save conversation _logs for all contacts"
 msgstr ""
 
-#: ../src/config.py:1946
-msgid "Member List"
+#: ../data/glade/account_modification_window.glade.h:38
+msgid "Send keep-alive packets"
 msgstr ""
 
-#: ../src/config.py:1947
-msgid "Owner List"
+#: ../data/glade/account_modification_window.glade.h:39
+msgid "Synch_ronize account status with global status"
 msgstr ""
 
-#: ../src/config.py:1948
-msgid "Administrator List"
+#: ../data/glade/account_modification_window.glade.h:40
+msgid "Use _SSL (legacy)"
 msgstr ""
 
-#. Address column
-#. holds JID (who said this)
-#: ../src/config.py:1981 ../src/disco.py:743 ../src/history_manager.py:149
-msgid "JID"
+#: ../data/glade/account_modification_window.glade.h:41
+msgid "Use custom hostname/port"
 msgstr ""
 
-#: ../src/config.py:1989
-msgid "Reason"
+#: ../data/glade/account_modification_window.glade.h:42
+msgid "Use file transfer proxies"
 msgstr ""
 
-#: ../src/config.py:1994
-msgid "Nick"
+#: ../data/glade/account_modification_window.glade.h:43
+#: ../data/glade/add_new_contact_window.glade.h:6
+msgid "_Jabber ID:"
 msgstr ""
 
-#: ../src/config.py:1998
-msgid "Role"
+#: ../data/glade/account_modification_window.glade.h:44
+msgid "_Name: "
 msgstr ""
 
-#: ../src/config.py:2019
-msgid "Banning..."
+#: ../data/glade/accounts_window.glade.h:1
+msgid "Accounts"
 msgstr ""
 
-#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2021
+#: ../data/glade/accounts_window.glade.h:2
 msgid ""
-"<b>Whom do you want to ban?</b>\n"
-"\n"
+"If you have 2 or more accounts and it is checked, Gajim will list all "
+"contacts as if you had one account"
 msgstr ""
 
-#: ../src/config.py:2023
-msgid "Adding Member..."
+#: ../data/glade/accounts_window.glade.h:3
+msgid "_Merge accounts"
 msgstr ""
 
-#: ../src/config.py:2024
-msgid ""
-"<b>Whom do you want to make a member?</b>\n"
-"\n"
+#: ../data/glade/accounts_window.glade.h:4
+msgid "_Modify"
 msgstr ""
 
-#: ../src/config.py:2026
-msgid "Adding Owner..."
+#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/remove_account_window.glade.h:4
+msgid "_Remove"
 msgstr ""
 
-#: ../src/config.py:2027
-msgid ""
-"<b>Whom do you want to make a owner?</b>\n"
-"\n"
+#: ../data/glade/add_new_contact_window.glade.h:1
+msgid "A_llow this contact to view my status"
 msgstr ""
 
-#: ../src/config.py:2029
-msgid "Adding Administrator..."
+#: ../data/glade/add_new_contact_window.glade.h:2
+msgid "Add New Contact"
 msgstr ""
 
-#: ../src/config.py:2030
-msgid ""
-"<b>Whom do you want to make an administrator?</b>\n"
-"\n"
+#: ../data/glade/add_new_contact_window.glade.h:3
+msgid "I would like to add you to my contact list."
 msgstr ""
 
-#: ../src/config.py:2031
-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."
+#: ../data/glade/add_new_contact_window.glade.h:4
+msgid "_Account:"
 msgstr ""
 
-#: ../src/config.py:2127
-#, python-format
-msgid "Removing %s account"
+#: ../data/glade/add_new_contact_window.glade.h:5
+msgid "_Group:"
 msgstr ""
 
-#: ../src/config.py:2144 ../src/roster_window.py:1859
-msgid "Password Required"
+#: ../data/glade/add_new_contact_window.glade.h:7
+msgid "_Nickname:"
 msgstr ""
 
-#: ../src/config.py:2145 ../src/roster_window.py:1860
-#, python-format
-msgid "Enter your password for account %s"
+#: ../data/glade/add_new_contact_window.glade.h:8
+msgid "_Protocol:"
 msgstr ""
 
-#: ../src/config.py:2146 ../src/roster_window.py:1861
-msgid "Save password"
+#: ../data/glade/add_new_contact_window.glade.h:9
+msgid "_Subscribe"
 msgstr ""
 
-#: ../src/config.py:2159
-#, python-format
-msgid "Account \"%s\" is connected to the server"
+#: ../data/glade/add_new_contact_window.glade.h:10
+msgid "_User ID:"
 msgstr ""
 
-#: ../src/config.py:2160
-msgid "If you remove it, the connection will be lost."
+#: ../data/glade/advanced_configuration_window.glade.h:1
+msgid "<b>Description</b>"
 msgstr ""
 
-#: ../src/config.py:2295
-msgid "New Room"
+#: ../data/glade/advanced_configuration_window.glade.h:2
+msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
 msgstr ""
 
-#: ../src/config.py:2326
-msgid "This bookmark has invalid data"
+#: ../data/glade/advanced_configuration_window.glade.h:3
+msgid "Advanced Configuration Editor"
 msgstr ""
 
-#: ../src/config.py:2327
-msgid ""
-"Please be sure to fill out server and room fields or remove this bookmark."
+#: ../data/glade/advanced_configuration_window.glade.h:4
+msgid "Filter:"
 msgstr ""
 
-#: ../src/config.py:2564
-msgid "Invalid username"
+#: ../data/glade/advanced_menuitem_menu.glade.h:1
+msgid "Delete MOTD"
 msgstr ""
 
-#: ../src/config.py:2565
-msgid "You must provide a username to configure this account."
+#: ../data/glade/advanced_menuitem_menu.glade.h:2
+msgid "Deletes Message of the Day"
 msgstr ""
 
-#: ../src/config.py:2574 ../src/dialogs.py:1036
-msgid "Invalid password"
+#: ../data/glade/advanced_menuitem_menu.glade.h:3
+msgid "Sends a message to currently connected users to this server"
 msgstr ""
 
-#: ../src/config.py:2575
-msgid "You must enter a password for the new account."
+#: ../data/glade/advanced_menuitem_menu.glade.h:4
+msgid "Set MOTD"
 msgstr ""
 
-#: ../src/config.py:2579 ../src/dialogs.py:1041
-msgid "Passwords do not match"
+#: ../data/glade/advanced_menuitem_menu.glade.h:5
+msgid "Sets Message of the Day"
 msgstr ""
 
-#: ../src/config.py:2580 ../src/dialogs.py:1042
-msgid "The passwords typed in both fields must be identical."
+#: ../data/glade/advanced_menuitem_menu.glade.h:6
+msgid "Show _XML Console"
 msgstr ""
 
-#: ../src/config.py:2599
-msgid "Duplicate Jabber ID"
+#: ../data/glade/advanced_menuitem_menu.glade.h:7
+msgid "Update MOTD"
 msgstr ""
 
-#: ../src/config.py:2600
-msgid "This account is already configured in Gajim."
+#: ../data/glade/advanced_menuitem_menu.glade.h:8
+msgid "Updates Message of the Day"
 msgstr ""
 
-#: ../src/config.py:2617
-msgid "Account has been added successfully"
+#: ../data/glade/advanced_menuitem_menu.glade.h:9
+msgid "_Administrator"
 msgstr ""
 
-#: ../src/config.py:2618 ../src/config.py:2651
-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."
+#: ../data/glade/advanced_menuitem_menu.glade.h:10
+msgid "_Send Server Message"
 msgstr ""
 
-#: ../src/config.py:2650
-msgid "Your new account has been created successfully"
+#: ../data/glade/advanced_menuitem_menu.glade.h:11
+msgid "_Send Single Message"
 msgstr ""
 
-#: ../src/config.py:2666
-msgid "An error occured during account creation"
+#: ../data/glade/advanced_notifications_window.glade.h:1
+msgid " a window/tab opened with that contact "
 msgstr ""
 
-#: ../src/config.py:2723
-msgid "Account name is in use"
+#: ../data/glade/advanced_notifications_window.glade.h:2
+msgid "<b>Actions</b>"
 msgstr ""
 
-#: ../src/config.py:2724
-msgid "You already have an account using this name."
+#: ../data/glade/advanced_notifications_window.glade.h:3
+msgid "<b>Conditions</b>"
 msgstr ""
 
-#: ../src/conversation_textview.py:182
-msgid ""
-"Text below this line is what has been said since the last time you paid "
-"attention to this group chat"
+#: ../data/glade/advanced_notifications_window.glade.h:4
+#: ../data/glade/preferences_window.glade.h:9
+msgid "<b>Sounds</b>"
 msgstr ""
 
-#: ../src/conversation_textview.py:239
-#, python-format
-msgid "Actions for \"%s\""
+#: ../data/glade/advanced_notifications_window.glade.h:5
+msgid "Add"
 msgstr ""
 
-#: ../src/conversation_textview.py:251
-msgid "Read _Wikipedia Article"
+#: ../data/glade/advanced_notifications_window.glade.h:6
+msgid "Advanced Actions"
 msgstr ""
 
-#: ../src/conversation_textview.py:255
-msgid "Look it up in _Dictionary"
+#: ../data/glade/advanced_notifications_window.glade.h:7
+msgid "Advanced Notifications Control"
 msgstr ""
 
-#. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:270
-#, python-format
-msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
+#: ../data/glade/advanced_notifications_window.glade.h:8
+msgid "All Status "
 msgstr ""
 
-#. we must have %s in the url
-#: ../src/conversation_textview.py:281
-#, python-format
-msgid "Web Search URL is missing an \"%s\""
+#: ../data/glade/advanced_notifications_window.glade.h:9
+msgid "And I "
 msgstr ""
 
-#: ../src/conversation_textview.py:284
-msgid "Web _Search for it"
+#: ../data/glade/advanced_notifications_window.glade.h:10
+msgid "Away "
 msgstr ""
 
-#: ../src/conversation_textview.py:574
-msgid "Yesterday"
+#: ../data/glade/advanced_notifications_window.glade.h:11
+msgid "Busy "
 msgstr ""
 
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:578
-#, python-format
-msgid "%i days ago"
+#: ../data/glade/advanced_notifications_window.glade.h:12
+msgid "Don't have "
 msgstr ""
 
-#. if we have subject, show it too!
-#: ../src/conversation_textview.py:634
-#, python-format
-msgid "Subject: %s\n"
+#: ../data/glade/advanced_notifications_window.glade.h:13
+msgid "Down"
 msgstr ""
 
-#. only say that to non Windows users
-#: ../src/dbus_support.py:34
-msgid "D-Bus python bindings are missing in this computer"
+#: ../data/glade/advanced_notifications_window.glade.h:14
+msgid "Have "
 msgstr ""
 
-#: ../src/dbus_support.py:35
-msgid "D-Bus capabilities of Gajim cannot be used"
+#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../src/common/helpers.py:242
+msgid "Invisible"
 msgstr ""
 
-#: ../src/dialogs.py:64
-#, python-format
-msgid "Contact's name: <i>%s</i>"
+#: ../data/glade/advanced_notifications_window.glade.h:16
+msgid "Launch a command"
 msgstr ""
 
-#: ../src/dialogs.py:66
-#, python-format
-msgid "JID: <i>%s</i>"
+#: ../data/glade/advanced_notifications_window.glade.h:17
+msgid "List of special notifications settings"
 msgstr ""
 
-#: ../src/dialogs.py:169
-msgid "Group"
+#: ../data/glade/advanced_notifications_window.glade.h:18
+msgid "Not Available "
 msgstr ""
 
-#: ../src/dialogs.py:176
-msgid "In the group"
+#: ../data/glade/advanced_notifications_window.glade.h:19
+msgid "Online / Free For Chat"
 msgstr ""
 
-#: ../src/dialogs.py:226
-msgid "KeyID"
+#: ../data/glade/advanced_notifications_window.glade.h:20
+msgid "Play a sound"
 msgstr ""
 
-#: ../src/dialogs.py:229
-msgid "Contact name"
+#: ../data/glade/advanced_notifications_window.glade.h:21
+msgid ""
+"Receive a Message\n"
+"Contact Connected\n"
+"Contact Disconnected\n"
+"Contact Change Status\n"
+"Group Chat Message Highlight\n"
+"Group Chat Message Received\n"
+"File Transfert Resquest\n"
+"File Transfert Started\n"
+"File Transfert Finished"
 msgstr ""
 
-#: ../src/dialogs.py:263
-#, python-format
-msgid "%s Status Message"
+#: ../data/glade/advanced_notifications_window.glade.h:30
+msgid "Some special(s) status..."
 msgstr ""
 
-#: ../src/dialogs.py:265
-msgid "Status Message"
+#: ../data/glade/advanced_notifications_window.glade.h:31
+msgid "Up"
 msgstr ""
 
-#: ../src/dialogs.py:340
-msgid "Save as Preset Status Message"
+#: ../data/glade/advanced_notifications_window.glade.h:32
+msgid "When "
 msgstr ""
 
-#: ../src/dialogs.py:341
-msgid "Please type a name for this status message"
+#: ../data/glade/advanced_notifications_window.glade.h:33
+msgid "_Activate Windows manager UrgencyHint to make chat taskbar to flash"
 msgstr ""
 
-#: ../src/dialogs.py:369
-#, python-format
-msgid "Please fill in the data of the contact you want to add in account %s"
+#: ../data/glade/advanced_notifications_window.glade.h:34
+msgid "_Disable auto opening chat window"
 msgstr ""
 
-#: ../src/dialogs.py:371
-msgid "Please fill in the data of the contact you want to add"
+#: ../data/glade/advanced_notifications_window.glade.h:35
+msgid "_Disable existing popup window"
 msgstr ""
 
-#. the user can be in mutiple groups, see in all of them
-#: ../src/dialogs.py:380 ../src/disco.py:118 ../src/disco.py:119
-#: ../src/disco.py:1258 ../src/roster_window.py:214
-#: ../src/roster_window.py:275 ../src/roster_window.py:310
-#: ../src/roster_window.py:330 ../src/roster_window.py:354
-#: ../src/roster_window.py:2940 ../src/roster_window.py:2942
-#: ../src/systray.py:291 ../src/common/helpers.py:42
-msgid "Transports"
+#: ../data/glade/advanced_notifications_window.glade.h:36
+msgid "_Disable existing sound for this event"
 msgstr ""
 
-#: ../src/dialogs.py:452 ../src/dialogs.py:458
-msgid "Invalid User ID"
+#: ../data/glade/advanced_notifications_window.glade.h:37
+msgid "_Disable showing event in roster"
 msgstr ""
 
-#: ../src/dialogs.py:459
-msgid "The user ID must not contain a resource."
+#: ../data/glade/advanced_notifications_window.glade.h:38
+msgid "_Disable showing event in systray"
 msgstr ""
 
-#: ../src/dialogs.py:466
-msgid "Contact already in roster"
+#: ../data/glade/advanced_notifications_window.glade.h:39
+msgid "_Inform me with a popup window"
 msgstr ""
 
-#: ../src/dialogs.py:467
-msgid "This contact is already listed in your roster."
+#: ../data/glade/advanced_notifications_window.glade.h:40
+msgid "_Open chat window with user"
 msgstr ""
 
-#: ../src/dialogs.py:528
-msgid "A GTK+ jabber client"
+#: ../data/glade/advanced_notifications_window.glade.h:41
+msgid "_Show event in roster"
 msgstr ""
 
-#: ../src/dialogs.py:539
-msgid "Past Developers:"
+#: ../data/glade/advanced_notifications_window.glade.h:42
+msgid "_Show event in systray"
 msgstr ""
 
-#: ../src/dialogs.py:543
-msgid "THANKS:"
+#: ../data/glade/advanced_notifications_window.glade.h:43
+msgid ""
+"contact(s)\n"
+"group(s)\n"
+"everybody"
 msgstr ""
 
-#. remove one english setence
-#. and add it manually as translatable
-#: ../src/dialogs.py:550
-msgid "Last but not least, we would like to thank all the package maintainers."
+#: ../data/glade/advanced_notifications_window.glade.h:46
+msgid "for "
 msgstr ""
 
-#. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:564
-msgid "translator-credits"
+#: ../data/glade/advanced_notifications_window.glade.h:47
+msgid "when I'm "
 msgstr ""
 
-#: ../src/dialogs.py:826
-#, python-format
-msgid "Subscription request for account %s from %s"
+#: ../data/glade/change_password_dialog.glade.h:1
+msgid "Change Password"
 msgstr ""
 
-#: ../src/dialogs.py:829
-#, python-format
-msgid "Subscription request from %s"
+#: ../data/glade/change_password_dialog.glade.h:2
+msgid "Enter it again for confirmation:"
 msgstr ""
 
-#: ../src/dialogs.py:872
-msgid "You can not join a group chat unless you are connected."
+#: ../data/glade/change_password_dialog.glade.h:3
+msgid "Enter new password:"
 msgstr ""
 
-#: ../src/dialogs.py:885
-#, python-format
-msgid "Join Group Chat with account %s"
+#: ../data/glade/change_status_message_dialog.glade.h:1
+msgid "<b>Type your new status message</b>"
 msgstr ""
 
-#: ../src/dialogs.py:887 ../src/gtkgui.glade.h:177
-msgid "Join Group Chat"
+#: ../data/glade/change_status_message_dialog.glade.h:2
+msgid "Preset messages:"
 msgstr ""
 
-#: ../src/dialogs.py:976
-msgid "Invalid room or server name"
+#: ../data/glade/change_status_message_dialog.glade.h:3
+msgid "Save as Preset..."
 msgstr ""
 
-#: ../src/dialogs.py:977
-msgid "The room name or server name has not allowed characters."
+#: ../data/glade/chat_context_menu.glade.h:1
+msgid "Join _Group Chat"
 msgstr ""
 
-#: ../src/dialogs.py:996
-#, python-format
-msgid "Start Chat with account %s"
+#: ../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:8
+msgid "_Add to Roster"
 msgstr ""
 
-#: ../src/dialogs.py:998
-msgid "Start Chat"
+#: ../data/glade/chat_context_menu.glade.h:3
+msgid "_Copy JID/Email Address"
 msgstr ""
 
-#: ../src/dialogs.py:999
-msgid ""
-"Fill in the contact ID of the contact you would like\n"
-"to send a chat message to:"
+#: ../data/glade/chat_context_menu.glade.h:4
+msgid "_Copy Link Location"
 msgstr ""
 
-#. if offline or connecting
-#: ../src/dialogs.py:1007 ../src/dialogs.py:1330 ../src/dialogs.py:1450
-msgid "Connection not available"
+#: ../data/glade/chat_context_menu.glade.h:5
+msgid "_Open Email Composer"
 msgstr ""
 
-#: ../src/dialogs.py:1008 ../src/dialogs.py:1331 ../src/dialogs.py:1451
-#, python-format
-msgid "Please make sure you are connected with \"%s\"."
+#: ../data/glade/chat_context_menu.glade.h:6
+msgid "_Open Link in Browser"
 msgstr ""
 
-#: ../src/dialogs.py:1018
-msgid "Without a connection, you can not change your password."
+#: ../data/glade/chat_context_menu.glade.h:7
+#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/systray_context_menu.glade.h:6
+msgid "_Start Chat"
 msgstr ""
 
-#: ../src/dialogs.py:1037
-msgid "You must enter a password."
+#: ../data/glade/chat_control_popup_menu.glade.h:1
+msgid "Click to see past conversations with this contact"
 msgstr ""
 
-#. img to display
-#. default value
-#: ../src/dialogs.py:1083 ../src/gajim.py:443 ../src/notify.py:129
-msgid "Contact Signed In"
+#: ../data/glade/chat_control_popup_menu.glade.h:2
+#: ../data/glade/roster_contact_context_menu.glade.h:6
+msgid "Send _File"
 msgstr ""
 
-#: ../src/dialogs.py:1085 ../src/gajim.py:474 ../src/notify.py:131
-msgid "Contact Signed Out"
+#: ../data/glade/chat_control_popup_menu.glade.h:3
+msgid "Toggle Open_PGP Encryption"
 msgstr ""
 
-#. chat message
-#: ../src/dialogs.py:1087 ../src/gajim.py:609 ../src/notify.py:133
-msgid "New Message"
+#: ../data/glade/chat_control_popup_menu.glade.h:5
+#: ../data/glade/gc_control_popup_menu.glade.h:6
+msgid "_Compact View    Alt+C"
 msgstr ""
 
-#. single message
-#: ../src/dialogs.py:1087 ../src/gajim.py:603 ../src/notify.py:133
-msgid "New Single Message"
+#: ../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:5
+#: ../data/glade/roster_contact_context_menu.glade.h:11
+msgid "_History"
 msgstr ""
 
-#: ../src/dialogs.py:1088 ../src/gajim.py:586 ../src/notify.py:134
-msgid "New Private Message"
+#: ../data/glade/data_form_window.glade.h:1
+msgid "Room Configuration"
 msgstr ""
 
-#: ../src/dialogs.py:1088 ../src/gajim.py:1049 ../src/notify.py:142
-msgid "New E-mail"
+#: ../data/glade/edit_groups_dialog.glade.h:1
+msgid "Edit Groups"
 msgstr ""
 
-#: ../src/dialogs.py:1090 ../src/gajim.py:1187 ../src/notify.py:136
-msgid "File Transfer Request"
+#: ../data/glade/filetransfers.glade.h:1
+msgid "A list of active, completed and stopped file transfers"
 msgstr ""
 
-#: ../src/dialogs.py:1092 ../src/gajim.py:1035 ../src/gajim.py:1164
-#: ../src/notify.py:138
-msgid "File Transfer Error"
+#: ../data/glade/filetransfers.glade.h:2
+msgid "Cancel file transfer"
 msgstr ""
 
-#: ../src/dialogs.py:1094 ../src/gajim.py:1222 ../src/gajim.py:1244
-#: ../src/gajim.py:1261 ../src/notify.py:140
-msgid "File Transfer Completed"
+#: ../data/glade/filetransfers.glade.h:3
+msgid "Cancels the selected file transfer"
 msgstr ""
 
-#: ../src/dialogs.py:1095 ../src/gajim.py:1225 ../src/notify.py:140
-msgid "File Transfer Stopped"
+#: ../data/glade/filetransfers.glade.h:4
+msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr ""
 
-#: ../src/dialogs.py:1097 ../src/gajim.py:953 ../src/notify.py:144
-msgid "Groupchat Invitation"
+#: ../data/glade/filetransfers.glade.h:5
+msgid "Clean _up"
 msgstr ""
 
-#. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1262
-#, python-format
-msgid "Single Message with account %s"
+#: ../data/glade/filetransfers.glade.h:6
+msgid "File Transfers"
 msgstr ""
 
-#: ../src/dialogs.py:1264
-msgid "Single Message"
+#: ../data/glade/filetransfers.glade.h:7
+msgid "Hides the window"
 msgstr ""
 
-#. prepare UI for Sending
-#: ../src/dialogs.py:1267
-#, python-format
-msgid "Send %s"
+#: ../data/glade/filetransfers.glade.h:8
+msgid "Remove file transfer from the list."
 msgstr ""
 
-#. prepare UI for Receiving
-#: ../src/dialogs.py:1290
-#, python-format
-msgid "Received %s"
+#: ../data/glade/filetransfers.glade.h:9
+msgid "Removes completed, canceled and failed file transfers from the list"
 msgstr ""
 
-#. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1355
-#, python-format
-msgid "RE: %s"
+#: ../data/glade/filetransfers.glade.h:10
+msgid "Shows a list of file transfers between you and other"
 msgstr ""
 
-#: ../src/dialogs.py:1356
-#, python-format
-msgid "%s wrote:\n"
+#: ../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 ""
 
-#: ../src/dialogs.py:1400
-#, python-format
-msgid "XML Console for %s"
+#: ../data/glade/filetransfers.glade.h:12
+msgid "When a file transfer is complete show a popup notification"
 msgstr ""
 
-#: ../src/dialogs.py:1402
-msgid "XML Console"
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761
+msgid "_Continue"
 msgstr ""
 
-#. FIXME: use nickname instead of contact_jid
-#: ../src/dialogs.py:1488
-#, python-format
-msgid "%(contact_jid)s has invited you to %(room_jid)s room"
+#: ../data/glade/filetransfers.glade.h:14
+msgid "_Notify me when a file transfer is complete"
 msgstr ""
 
-#. only if not None and not ''
-#: ../src/dialogs.py:1494
-#, python-format
-msgid "Comment: %s"
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:198
+msgid "_Open Containing Folder"
 msgstr ""
 
-#: ../src/dialogs.py:1554
-msgid "Choose Sound"
+#: ../data/glade/filetransfers.glade.h:16
+msgid "_Pause"
 msgstr ""
 
-#: ../src/dialogs.py:1564 ../src/dialogs.py:1607
-msgid "All files"
+#: ../data/glade/filetransfers.glade.h:17
+msgid "file transfers list"
 msgstr ""
 
-#: ../src/dialogs.py:1569
-msgid "Wav Sounds"
+#: ../data/glade/gajim_themes_window.glade.h:1
+msgid "<b>Chatstate Tab Colors</b>"
 msgstr ""
 
-#: ../src/dialogs.py:1597
-msgid "Choose Image"
+#: ../data/glade/gajim_themes_window.glade.h:2
+msgid ""
+"Account\n"
+"Group\n"
+"Contact\n"
+"Banner"
 msgstr ""
 
-#: ../src/dialogs.py:1612
-msgid "Images"
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/config.py:336
+msgid "Active"
 msgstr ""
 
-#: ../src/dialogs.py:1658
-#, python-format
-msgid "When %s becomes:"
+#: ../data/glade/gajim_themes_window.glade.h:7
+msgid "Bold"
 msgstr ""
 
-#: ../src/dialogs.py:1660
-#, python-format
-msgid "Adding Special Notification for %s"
+#: ../data/glade/gajim_themes_window.glade.h:8
+msgid "Composing"
 msgstr ""
 
-#: ../src/disco.py:117
-msgid "Others"
+#: ../data/glade/gajim_themes_window.glade.h:9
+msgid "Font style:"
 msgstr ""
 
-#. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:121
-msgid "Conference"
+#: ../data/glade/gajim_themes_window.glade.h:10
+msgid "Gajim Themes Customization"
 msgstr ""
 
-#: ../src/disco.py:420
-msgid "Without a connection, you can not browse available services"
+#: ../data/glade/gajim_themes_window.glade.h:11
+msgid "Gone"
 msgstr ""
 
-#: ../src/disco.py:499
-#, python-format
-msgid "Service Discovery using account %s"
+#: ../data/glade/gajim_themes_window.glade.h:12
+msgid "Inactive"
 msgstr ""
 
-#: ../src/disco.py:500
-msgid "Service Discovery"
+#: ../data/glade/gajim_themes_window.glade.h:13
+msgid "Italic"
 msgstr ""
 
-#: ../src/disco.py:637
-msgid "The service could not be found"
+#: ../data/glade/gajim_themes_window.glade.h:14
+msgid ""
+"MUC\n"
+"Messages"
 msgstr ""
 
-#: ../src/disco.py:638
+#: ../data/glade/gajim_themes_window.glade.h:16
 msgid ""
-"There is no service at the address you entered, or it is not responding. "
-"Check the address and try again."
+"MUC Directed\n"
+"Messages"
 msgstr ""
 
-#: ../src/disco.py:642 ../src/disco.py:924
-msgid "The service is not browsable"
+#: ../data/glade/gajim_themes_window.glade.h:18 ../src/tooltips.py:660
+msgid "Paused"
 msgstr ""
 
-#: ../src/disco.py:643
-msgid "This type of service does not contain any items to browse."
+#: ../data/glade/gajim_themes_window.glade.h:19
+msgid "Text _color:"
 msgstr ""
 
-#: ../src/disco.py:723
-#, python-format
-msgid "Browsing %s using account %s"
+#: ../data/glade/gajim_themes_window.glade.h:20
+msgid "Text _font:"
 msgstr ""
 
-#: ../src/disco.py:762
-msgid "_Browse"
+#: ../data/glade/gajim_themes_window.glade.h:21
+msgid "_Background:"
 msgstr ""
 
-#: ../src/disco.py:925
-msgid "This service does not contain any items to browse."
+#: ../data/glade/gc_control_popup_menu.glade.h:1
+msgid "Change _Nickname"
 msgstr ""
 
-#: ../src/disco.py:1146 ../src/disco.py:1263
-msgid "Re_gister"
+#: ../data/glade/gc_control_popup_menu.glade.h:2
+msgid "Change _Subject"
 msgstr ""
 
-#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:350
-msgid "_Join"
+#: ../data/glade/gc_control_popup_menu.glade.h:3
+msgid "Click to see past conversation in this room"
 msgstr ""
 
-#: ../src/disco.py:1261 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1462
-msgid "_Edit"
+#: ../data/glade/gc_control_popup_menu.glade.h:4
+msgid "Configure _Room"
 msgstr ""
 
-#: ../src/disco.py:1300
-#, python-format
-msgid "Scanning %d / %d.."
+#: ../data/glade/gc_control_popup_menu.glade.h:5
+msgid "_Bookmark This Room"
 msgstr ""
 
-#. Users column
-#: ../src/disco.py:1482
-msgid "Users"
+#: ../data/glade/gc_occupants_menu.glade.h:1
+msgid "Mo_derator"
 msgstr ""
 
-#. Description column
-#: ../src/disco.py:1489
-msgid "Description"
+#: ../data/glade/gc_occupants_menu.glade.h:3
+msgid "_Admin"
 msgstr ""
 
-#: ../src/filetransfers_window.py:81
-msgid "File"
+#: ../data/glade/gc_occupants_menu.glade.h:4
+msgid "_Ban"
 msgstr ""
 
-#: ../src/filetransfers_window.py:96
-msgid "Time"
+#: ../data/glade/gc_occupants_menu.glade.h:6
+msgid "_Kick"
 msgstr ""
 
-#: ../src/filetransfers_window.py:108
-msgid "Progress"
+#: ../data/glade/gc_occupants_menu.glade.h:7
+msgid "_Member"
 msgstr ""
 
-#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:238
-#, python-format
-msgid "Filename: %s"
+#: ../data/glade/gc_occupants_menu.glade.h:8
+msgid "_Occupant Actions"
 msgstr ""
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:308
-#, python-format
-msgid "Size: %s"
+#: ../data/glade/gc_occupants_menu.glade.h:9
+msgid "_Owner"
 msgstr ""
 
-#. You is a reply of who sent a file
-#. You is a reply of who received a file
-#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:452
-msgid "You"
+#: ../data/glade/gc_occupants_menu.glade.h:10
+msgid "_Send Private Message"
 msgstr ""
 
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:240
-#, python-format
-msgid "Sender: %s"
+#: ../data/glade/gc_occupants_menu.glade.h:11
+msgid "_Voice"
 msgstr ""
 
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:555
-#: ../src/tooltips.py:617
-msgid "Recipient: "
+#: ../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 ""
 
-#: ../src/filetransfers_window.py:200
-#, python-format
-msgid "Saved in: %s"
+#: ../data/glade/history_manager.glade.h:7
+msgid "Delete"
 msgstr ""
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
+#: ../data/glade/history_manager.glade.h:8
+msgid "Export"
 msgstr ""
 
-#: ../src/filetransfers_window.py:205 ../src/gtkgui.glade.h:366
-msgid "_Open Containing Folder"
+#: ../data/glade/history_manager.glade.h:9
+msgid "Gajim History Logs Manager"
 msgstr ""
 
-#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:227
-msgid "File transfer canceled"
+#: ../data/glade/history_manager.glade.h:10
+msgid "_Search Database"
 msgstr ""
 
-#: ../src/filetransfers_window.py:219 ../src/filetransfers_window.py:228
-msgid "Connection with peer cannot be established."
+#: ../data/glade/history_window.glade.h:1
+msgid "Build custom query"
 msgstr ""
 
-#: ../src/filetransfers_window.py:242
-msgid "File transfer stopped by the contact of the other side"
+#: ../data/glade/history_window.glade.h:2
+msgid "Conversation History"
 msgstr ""
 
-#: ../src/filetransfers_window.py:259
-msgid "Choose File to Send..."
+#: ../data/glade/history_window.glade.h:3
+msgid "Query Builder..."
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/filetransfers_window.py:266 ../src/gtkgui.glade.h:390
-msgid "_Send"
+#: ../data/glade/history_window.glade.h:4
+msgid "Search"
 msgstr ""
 
-#: ../src/filetransfers_window.py:273
-msgid "Gajim cannot access this file"
+#: ../data/glade/history_window.glade.h:5
+msgid "_Search"
 msgstr ""
 
-#: ../src/filetransfers_window.py:274
-msgid "This file is being used by another process."
+#: ../data/glade/invitation_received_dialog.glade.h:1
+msgid "Accept"
 msgstr ""
 
-#: ../src/filetransfers_window.py:306
-#, python-format
-msgid "File: %s"
+#: ../data/glade/invitation_received_dialog.glade.h:2
+msgid "Deny"
 msgstr ""
 
-#: ../src/filetransfers_window.py:311
-#, python-format
-msgid "Type: %s"
+#: ../data/glade/invitation_received_dialog.glade.h:3
+msgid "Invitation Received"
 msgstr ""
 
-#: ../src/filetransfers_window.py:313
-#, python-format
-msgid "Description: %s"
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:929
+msgid "Join Group Chat"
 msgstr ""
 
-#: ../src/filetransfers_window.py:314
-#, python-format
-msgid "%s wants to send you a file:"
+#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/glade/vcard_information_window.glade.h:28
+msgid "Nickname:"
 msgstr ""
 
-#: ../src/filetransfers_window.py:329
-msgid "This file already exists"
+#: ../data/glade/join_groupchat_window.glade.h:3
+#: ../data/glade/manage_bookmarks_window.glade.h:5
+msgid "Password:"
 msgstr ""
 
-#: ../src/filetransfers_window.py:329
-msgid "What do you want to do?"
+#: ../data/glade/join_groupchat_window.glade.h:4
+msgid "Recently:"
 msgstr ""
 
-#: ../src/filetransfers_window.py:344
-msgid "Save File as..."
+#: ../data/glade/join_groupchat_window.glade.h:5
+#: ../data/glade/manage_bookmarks_window.glade.h:7
+msgid "Room:"
 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:419
-#, python-format
-msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
+#: ../data/glade/join_groupchat_window.glade.h:6
+#: ../data/glade/manage_bookmarks_window.glade.h:8
+msgid "Server:"
 msgstr ""
 
-#. 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:491
-#, python-format
-msgid "(%(filesize_unit)s/s)"
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1152
+#: ../src/disco.py:1514
+msgid "_Join"
 msgstr ""
 
-#: ../src/filetransfers_window.py:527 ../src/filetransfers_window.py:530
-msgid "Invalid File"
+#: ../data/glade/manage_accounts_window.glade.h:1
+msgid "Manage Accounts"
 msgstr ""
 
-#: ../src/filetransfers_window.py:527
-msgid "File: "
+#: ../data/glade/manage_bookmarks_window.glade.h:1
+msgid "Auto join"
 msgstr ""
 
-#: ../src/filetransfers_window.py:531
-msgid "It is not possible to send empty files"
+#: ../data/glade/manage_bookmarks_window.glade.h:2
+msgid "If checked, Gajim will join this group chat on startup"
 msgstr ""
 
-#: ../src/filetransfers_window.py:551 ../src/tooltips.py:498
-#: ../src/tooltips.py:607
-msgid "Name: "
+#: ../data/glade/manage_bookmarks_window.glade.h:3
+msgid "Manage Bookmarks"
 msgstr ""
 
-#: ../src/filetransfers_window.py:553 ../src/tooltips.py:611
-msgid "Sender: "
+#: ../data/glade/manage_bookmarks_window.glade.h:6
+msgid "Print status:"
 msgstr ""
 
-#: ../src/filetransfers_window.py:742
-msgid "Pause"
+#: ../data/glade/manage_bookmarks_window.glade.h:9
+msgid "Title:"
 msgstr ""
 
-#: ../src/filetransfers_window.py:753 ../src/gtkgui.glade.h:328
-msgid "_Continue"
+#: ../data/glade/manage_proxies_window.glade.h:1
+msgid "<b>Properties</b>"
 msgstr ""
 
-#: ../src/gajim-remote.py:84
-msgid "shows a help on specific command"
+#: ../data/glade/manage_proxies_window.glade.h:2
+msgid "<b>Settings</b>"
 msgstr ""
 
-#. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:87
-msgid "command"
+#: ../data/glade/manage_proxies_window.glade.h:3
+msgid "HTTP Connect"
 msgstr ""
 
-#: ../src/gajim-remote.py:88
-msgid "show help on command"
+#: ../data/glade/manage_proxies_window.glade.h:4
+msgid "Manage Proxy Profiles"
 msgstr ""
 
-#: ../src/gajim-remote.py:92
-msgid "Shows or hides the roster window"
+#: ../data/glade/manage_proxies_window.glade.h:5
+#: ../data/glade/vcard_information_window.glade.h:27
+msgid "Name:"
 msgstr ""
 
-#: ../src/gajim-remote.py:96
-msgid "Popups a window with the next unread message"
+#: ../data/glade/manage_proxies_window.glade.h:7
+msgid "Type:"
 msgstr ""
 
-#: ../src/gajim-remote.py:100
-msgid ""
-"Prints a list of all contacts in the roster. Each contact appear on a "
-"separate line"
+#: ../data/glade/manage_proxies_window.glade.h:8
+msgid "Use authentication"
 msgstr ""
 
-#: ../src/gajim-remote.py:102 ../src/gajim-remote.py:115
-#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:138
-#: ../src/gajim-remote.py:159 ../src/gajim-remote.py:189
-#: ../src/gajim-remote.py:197 ../src/gajim-remote.py:204
-#: ../src/gajim-remote.py:211
-msgid "account"
+#: ../data/glade/message_window.glade.h:1
+msgid "Click to insert an emoticon (Alt+M)"
 msgstr ""
 
-#: ../src/gajim-remote.py:102
-msgid "show only contacts of the given account"
+#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:943
+msgid "OpenPGP Encryption"
 msgstr ""
 
-#: ../src/gajim-remote.py:107
-msgid "Prints a list of registered accounts"
+#. 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:9
+msgid "_Actions"
 msgstr ""
 
-#: ../src/gajim-remote.py:111
-msgid "Changes the status of account or accounts"
+#. 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:257
+msgid "_Send"
 msgstr ""
 
-#: ../src/gajim-remote.py:113
-msgid "status"
+#: ../data/glade/passphrase_dialog.glade.h:1
+msgid "Passphrase"
 msgstr ""
 
-#: ../src/gajim-remote.py:113
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#: ../data/glade/preferences_window.glade.h:1
+msgid "<b>Advanced Configuration Editor</b>"
 msgstr ""
 
-#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:135
-msgid "message"
+#: ../data/glade/preferences_window.glade.h:2
+msgid "<b>Applications</b>"
 msgstr ""
 
-#: ../src/gajim-remote.py:114
-msgid "status message"
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/glade/preferences_window.glade.h:4
+msgid "<b>Custom</b>"
 msgstr ""
 
-#: ../src/gajim-remote.py:115
-msgid ""
-"change status of account \"account\". If not specified, try to change status "
-"of all accounts that have \"sync with global status\" option set"
+#: ../data/glade/preferences_window.glade.h:5
+msgid "<b>Format of a line</b>"
 msgstr ""
 
-#: ../src/gajim-remote.py:121
-msgid "Shows the chat dialog so that you can send messages to a contact"
+#: ../data/glade/preferences_window.glade.h:6
+msgid "<b>Interface Customization</b>"
 msgstr ""
 
-#: ../src/gajim-remote.py:123
-msgid "JID of the contact that you want to chat with"
+#: ../data/glade/preferences_window.glade.h:8
+msgid "<b>Preset Status Messages</b>"
 msgstr ""
 
-#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:189
-msgid "if specified, contact is taken from the contact list of this account"
+#: ../data/glade/preferences_window.glade.h:10
+msgid "<b>Visual Notifications</b>"
 msgstr ""
 
-#: ../src/gajim-remote.py:130
-msgid ""
-"Sends new 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 ''."
+#: ../data/glade/preferences_window.glade.h:11
+msgid "A_fter nickname:"
 msgstr ""
 
-#: ../src/gajim-remote.py:134
-msgid "JID of the contact that will receive the message"
+#: ../data/glade/preferences_window.glade.h:12
+msgid "Advanced"
 msgstr ""
 
-#: ../src/gajim-remote.py:135
-msgid "message contents"
+#: ../data/glade/preferences_window.glade.h:13
+msgid ""
+"All chat states\n"
+"Composing only\n"
+"Disabled"
 msgstr ""
 
-#: ../src/gajim-remote.py:136
-msgid "pgp key"
+#: ../data/glade/preferences_window.glade.h:16
+msgid "Allow _OS information to be sent"
 msgstr ""
 
-#: ../src/gajim-remote.py:136
-msgid "if specified, the message will be encrypted using this public key"
+#: ../data/glade/preferences_window.glade.h:17
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 
-#: ../src/gajim-remote.py:138
-msgid "if specified, the message will be sent using this account"
+#: ../data/glade/preferences_window.glade.h:18
+msgid "Also known as iChat style"
 msgstr ""
 
-#: ../src/gajim-remote.py:143
-msgid "Gets detailed info on a contact"
+#: ../data/glade/preferences_window.glade.h:19
+msgid "Ask status message when I:"
 msgstr ""
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:188
-msgid "JID of the contact"
+#: ../data/glade/preferences_window.glade.h:20
+msgid "Auto _away after:"
 msgstr ""
 
-#: ../src/gajim-remote.py:149
-msgid "Gets detailed info on a account"
+#: ../data/glade/preferences_window.glade.h:21
+msgid "Auto _not available after:"
 msgstr ""
 
-#: ../src/gajim-remote.py:151
-msgid "Name of the account"
+#: ../data/glade/preferences_window.glade.h:22
+msgid ""
+"Autodetect on every Gajim startup\n"
+"Always use GNOME default applications\n"
+"Always use KDE default applications\n"
+"Custom"
 msgstr ""
 
-#: ../src/gajim-remote.py:155
-msgid "Sends file to a contact"
+#: ../data/glade/preferences_window.glade.h:26
+msgid "B_efore nickname:"
 msgstr ""
 
-#: ../src/gajim-remote.py:157
-msgid "file"
+#: ../data/glade/preferences_window.glade.h:27 ../src/chat_control.py:714
+msgid "Chat"
 msgstr ""
 
-#: ../src/gajim-remote.py:157
-msgid "File path"
+#: ../data/glade/preferences_window.glade.h:28
+msgid "Chat state noti_fications:"
 msgstr ""
 
-#: ../src/gajim-remote.py:159
-msgid "if specified, file will be sent using this account"
+#: ../data/glade/preferences_window.glade.h:29
+msgid ""
+"Check this option, only if someone you don't have in the roster spams/annoys "
+"you. Use with caution, cause it blocks all messages from any contact that is "
+"not in the roster"
 msgstr ""
 
-#: ../src/gajim-remote.py:164
-msgid "Lists all preferences and their values"
+#: ../data/glade/preferences_window.glade.h:30
+msgid "Default status _iconset:"
 msgstr ""
 
-#: ../src/gajim-remote.py:168
-msgid "Sets value of 'key' to 'value'."
+#: ../data/glade/preferences_window.glade.h:31
+msgid "Display a_vatars of contacts in roster"
 msgstr ""
 
-#: ../src/gajim-remote.py:170
-msgid "key=value"
+#: ../data/glade/preferences_window.glade.h:32
+msgid "Display status _messages of contacts in roster"
 msgstr ""
 
-#: ../src/gajim-remote.py:170
-msgid "'key' is the name of the preference, 'value' is the value to set it to"
+#: ../data/glade/preferences_window.glade.h:33
+msgid "E_very 5 minutes"
 msgstr ""
 
-#: ../src/gajim-remote.py:175
-msgid "Deletes a preference item"
+#: ../data/glade/preferences_window.glade.h:34
+msgid "Emoticons:"
 msgstr ""
 
-#: ../src/gajim-remote.py:177
-msgid "key"
+#: ../data/glade/preferences_window.glade.h:35
+msgid "Events"
 msgstr ""
 
-#: ../src/gajim-remote.py:177
-msgid "name of the preference to be deleted"
+#: ../data/glade/preferences_window.glade.h:36
+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 ""
 
-#: ../src/gajim-remote.py:181
-msgid "Writes the current state of Gajim preferences to the .config file"
+#: ../data/glade/preferences_window.glade.h:37
+msgid ""
+"Gajim will automatically show new events by poping up the relative window"
 msgstr ""
 
-#: ../src/gajim-remote.py:186
-msgid "Removes contact from roster"
+#: ../data/glade/preferences_window.glade.h:38
+msgid ""
+"Gajim will notify you for new events via a popup in the bottom right of the "
+"screen"
 msgstr ""
 
-#: ../src/gajim-remote.py:195
-msgid "Adds contact to roster"
+#: ../data/glade/preferences_window.glade.h:39
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed in"
 msgstr ""
 
-#: ../src/gajim-remote.py:197
-msgid "Adds new contact to this account."
+#: ../data/glade/preferences_window.glade.h:40
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 msgstr ""
 
-#: ../src/gajim-remote.py:202
-msgid "Returns current status (the global one unless account is specified)"
+#: ../data/glade/preferences_window.glade.h:41
+msgid ""
+"Gajim will only change the icon of the contact that triggered the new event"
 msgstr ""
 
-#: ../src/gajim-remote.py:209
+#: ../data/glade/preferences_window.glade.h:43
 msgid ""
-"Returns current status message(the global one unless account is specified)"
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
 msgstr ""
 
-#: ../src/gajim-remote.py:216
-msgid "Returns number of unreaded messages"
+#: ../data/glade/preferences_window.glade.h:44
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
 msgstr ""
 
-#: ../src/gajim-remote.py:236
-msgid "Missing argument \"contact_jid\""
+#: ../data/glade/preferences_window.glade.h:45
+msgid ""
+"If checked, Gajim will remember the roster and chat window positions in the "
+"screen and the sizes of them next time you run it"
 msgstr ""
 
-#: ../src/gajim-remote.py:255
-#, python-format
+#: ../data/glade/preferences_window.glade.h:46
 msgid ""
-"'%s' is not in your roster.\n"
-"Please specify account for sending the message."
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
 msgstr ""
 
-#: ../src/gajim-remote.py:258
-msgid "You have no active account"
+#: ../data/glade/preferences_window.glade.h:47
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
 msgstr ""
 
-#: ../src/gajim-remote.py:301
-#, python-format
-msgid "Unknown D-Bus version: %s"
+#: ../data/glade/preferences_window.glade.h:48
+msgid "Ma_nage..."
 msgstr ""
 
-#: ../src/gajim-remote.py:328
-#, python-format
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Never\n"
+"Always\n"
+"Per account\n"
+"Per type"
 msgstr ""
 
-#: ../src/gajim-remote.py:331
-msgid "Arguments:"
+#: ../data/glade/preferences_window.glade.h:53
+msgid "Notify me about contacts that: "
 msgstr ""
 
-#: ../src/gajim-remote.py:335
-#, python-format
-msgid "%s not found"
+#: ../data/glade/preferences_window.glade.h:54
+msgid "Notify on new _Gmail e-mail"
 msgstr ""
 
-#: ../src/gajim-remote.py:339
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
+#: ../data/glade/preferences_window.glade.h:55
+msgid "On every _message"
 msgstr ""
 
-#: ../src/gajim-remote.py:413
-#, python-format
-msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
+#: ../data/glade/preferences_window.glade.h:56
+msgid "One message _window:"
 msgstr ""
 
-#: ../src/gajim.py:48
-msgid "Gajim needs Xserver to run. Quiting..."
+#: ../data/glade/preferences_window.glade.h:57
+msgid "Play _sounds"
 msgstr ""
 
-#: ../src/gajim.py:52
-msgid "Gajim needs PyGTK 2.6 or above"
+#: ../data/glade/preferences_window.glade.h:58
+msgid "Preferences"
 msgstr ""
 
-#: ../src/gajim.py:53
-msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
+#: ../data/glade/preferences_window.glade.h:59
+msgid "Print time:"
 msgstr ""
 
-#: ../src/gajim.py:55
-msgid "Gajim needs GTK 2.6 or above"
+#: ../data/glade/preferences_window.glade.h:60
+msgid "Save _position and size for roster and chat windows"
 msgstr ""
 
-#: ../src/gajim.py:56
-msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
+#: ../data/glade/preferences_window.glade.h:61
+msgid "Show only in _roster"
 msgstr ""
 
-#: ../src/gajim.py:61
-msgid "GTK+ runtime is missing libglade support"
+#: ../data/glade/preferences_window.glade.h:62
+msgid "Sign _in"
 msgstr ""
 
-#: ../src/gajim.py:63
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
+#: ../data/glade/preferences_window.glade.h:63
+msgid "Sign _out"
 msgstr ""
 
-#: ../src/gajim.py:65
+#: ../data/glade/preferences_window.glade.h:64
+msgid "Status"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:65
+msgid "T_heme:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:66
+msgid "The auto away status message"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:67
+msgid "The auto not available status message"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:68
+msgid "Use _transports iconsets"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:69
+msgid "Use system _default"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:70
+msgid "Use t_rayicon (aka. notification area icon)"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:71
 msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
+"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 ""
 
-#: ../src/gajim.py:70
-msgid "Gajim needs PySQLite2 to run"
+#: ../data/glade/preferences_window.glade.h:72
+msgid "When new event is received"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:73
+msgid "_Advanced Notifications Control..."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:74
+msgid "_After time:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:75
+msgid "_Before time:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:76
+msgid "_Browser:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:77
+msgid "_File manager:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:78
+msgid "_Font:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:79
+msgid "_Highlight misspelled words"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:80
+msgid "_Ignore events from contacts not in the roster"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:81
+msgid "_Incoming message:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:82
+msgid "_Log status changes of contacts"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:83
+msgid "_Mail client:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:84
+msgid "_Never"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:85
+msgid "_Notify me about it"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:86
+msgid "_Open..."
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:87
+msgid "_Outgoing message:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:88
+msgid "_Player:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:89
+msgid "_Pop it up"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:90
+msgid "_Reset to Default Colors"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:91
+msgid "_Sort contacts by status"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:92
+msgid "_Status message:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:93
+msgid "_URL:"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:94
+msgid "minutes"
+msgstr ""
+
+#: ../data/glade/remove_account_window.glade.h:1
+msgid "<b>What do you want to do?</b>"
+msgstr ""
+
+#: ../data/glade/remove_account_window.glade.h:2
+msgid "Remove account _only from Gajim"
+msgstr ""
+
+#: ../data/glade/remove_account_window.glade.h:3
+msgid "Remove account from Gajim and from _server"
+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
+msgid "Add Special _Notification"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:3
+msgid "Assign Open_PGP Key"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:4
+msgid "Edit _Groups"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../data/glade/systray_context_menu.glade.h:1
+msgid "Send Single _Message"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:7
+msgid "Start _Chat"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:9
+msgid "_Allow him/her to see my status"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:10
+msgid "_Forbid him/her to see my status"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../src/roster_window.py:1475
+msgid "_Remove from Roster"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../src/roster_window.py:1463
+msgid "_Rename"
+msgstr ""
+
+#: ../data/glade/roster_contact_context_menu.glade.h:14
+msgid "_Subscription"
+msgstr ""
+
+#: ../data/glade/roster_window.glade.h:1
+msgid "A_ccounts"
+msgstr ""
+
+#: ../data/glade/roster_window.glade.h:2
+msgid "Add _Contact"
+msgstr ""
+
+#: ../data/glade/roster_window.glade.h:3
+msgid "File _Transfers"
+msgstr ""
+
+#: ../data/glade/roster_window.glade.h:4
+msgid "Frequently Asked Questions (online)"
+msgstr ""
+
+#: ../data/glade/roster_window.glade.h:6
+msgid "Help online"
+msgstr ""
+
+#: ../data/glade/roster_window.glade.h:7
+msgid "Profile, Avatar"
 msgstr ""
 
-#: ../src/gajim.py:235
-#, python-format
-msgid "HTTP (%s) Authorization for %s (id: %s)"
+#: ../data/glade/roster_window.glade.h:8
+msgid "Show _Offline Contacts"
 msgstr ""
 
-#: ../src/gajim.py:236
-msgid "Do you accept this request?"
+#: ../data/glade/roster_window.glade.h:11
+msgid "_Contents"
 msgstr ""
 
-#: ../src/gajim.py:438
-#, python-format
-msgid "%(nickname)s Signed In"
+#: ../data/glade/roster_window.glade.h:12
+msgid "_Discover Services"
 msgstr ""
 
-#: ../src/gajim.py:469
-#, python-format
-msgid "%(nickname)s Signed Out"
+#: ../data/glade/roster_window.glade.h:13 ../src/disco.py:1259
+#: ../src/roster_window.py:1455
+msgid "_Edit"
 msgstr ""
 
-#: ../src/gajim.py:583
-#, python-format
-msgid "New Private Message from room %s"
+#: ../data/glade/roster_window.glade.h:14
+msgid "_FAQ"
 msgstr ""
 
-#: ../src/gajim.py:584
-#, python-format
-msgid "%(nickname)s: %(message)s"
+#: ../data/glade/roster_window.glade.h:16
+msgid "_Help"
 msgstr ""
 
-#: ../src/gajim.py:606
-#, python-format
-msgid "New Single Message from %(nickname)s"
+#: ../data/glade/roster_window.glade.h:17
+msgid "_Preferences"
 msgstr ""
 
-#: ../src/gajim.py:612
-#, python-format
-msgid "New Message from %(nickname)s"
+#: ../data/glade/roster_window.glade.h:18
+msgid "_Quit"
 msgstr ""
 
-#: ../src/gajim.py:660
-#, python-format
-msgid "error while sending %s ( %s )"
+#: ../data/glade/service_discovery_window.glade.h:1
+msgid "G_o"
 msgstr ""
 
-#: ../src/gajim.py:700
-msgid "Authorization accepted"
+#: ../data/glade/service_discovery_window.glade.h:2
+msgid "_Address:"
 msgstr ""
 
-#: ../src/gajim.py:701
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
+#: ../data/glade/service_discovery_window.glade.h:3
+msgid "_Filter:"
 msgstr ""
 
-#: ../src/gajim.py:709
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
+#: ../data/glade/service_registration_window.glade.h:1
+msgid "Register to"
 msgstr ""
 
-#: ../src/gajim.py:710
-msgid "You will always see him or her as offline."
+#: ../data/glade/service_registration_window.glade.h:2
+msgid "_Cancel"
 msgstr ""
 
-#: ../src/gajim.py:736
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
 msgstr ""
 
-#: ../src/gajim.py:737 ../src/common/connection.py:349
-msgid "Check your connection or try again later."
+#: ../data/glade/single_message_window.glade.h:1
+msgid "0"
 msgstr ""
 
-#: ../src/gajim.py:874 ../src/roster_window.py:1012
-#, python-format
-msgid "%s is now %s (%s)"
+#: ../data/glade/single_message_window.glade.h:2
+msgid "From:"
 msgstr ""
 
-#: ../src/gajim.py:963
-msgid "Your passphrase is incorrect"
+#: ../data/glade/single_message_window.glade.h:3
+msgid "Reply to this message"
 msgstr ""
 
-#: ../src/gajim.py:964
-msgid "You are currently connected without your OpenPGP key."
+#: ../data/glade/single_message_window.glade.h:4
+msgid "Sen_d"
 msgstr ""
 
-#. FIXME: find a better image
-#: ../src/gajim.py:1045
-#, python-format
-msgid "New E-mail on %(gmail_mail_address)s"
+#: ../data/glade/single_message_window.glade.h:5
+msgid "Send message"
 msgstr ""
 
-#: ../src/gajim.py:1047
-#, python-format
-msgid "You have %d new E-mail message"
-msgid_plural "You have %d new E-mail messages"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../src/gajim.py:1185
-#, python-format
-msgid "%s wants to send you a file."
+#: ../data/glade/single_message_window.glade.h:6
+msgid "Send message and close window"
 msgstr ""
 
-#: ../src/gajim.py:1245
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
+#: ../data/glade/single_message_window.glade.h:7
+msgid "Subject:"
 msgstr ""
 
-#. ft stopped
-#: ../src/gajim.py:1249
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
+#: ../data/glade/single_message_window.glade.h:8
+msgid "To:"
 msgstr ""
 
-#: ../src/gajim.py:1262
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
+#: ../data/glade/single_message_window.glade.h:9
+msgid "_Reply"
 msgstr ""
 
-#. ft stopped
-#: ../src/gajim.py:1266
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
+#: ../data/glade/single_message_window.glade.h:10
+msgid "_Send & Close"
 msgstr ""
 
-#: ../src/gajim.py:1295
-msgid "vCard publication succeeded"
+#: ../data/glade/subscription_request_window.glade.h:1
+msgid "Authorize contact so he can know when you're connected"
 msgstr ""
 
-#: ../src/gajim.py:1295
-msgid "Your personal information has been published successfully."
+#: ../data/glade/subscription_request_window.glade.h:2
+msgid "Contact _Info"
 msgstr ""
 
-#: ../src/gajim.py:1304
-msgid "vCard publication failed"
+#: ../data/glade/subscription_request_window.glade.h:3
+msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 
-#: ../src/gajim.py:1304
-msgid ""
-"There was an error while publishing your personal information, try again "
-"later."
+#: ../data/glade/subscription_request_window.glade.h:4
+msgid "Subscription Request"
 msgstr ""
 
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1634
-msgid "Could not save your settings and preferences"
+#: ../data/glade/subscription_request_window.glade.h:5
+msgid "_Authorize"
 msgstr ""
 
-#: ../src/gajim.py:1848
-msgid "Session Management support not available (missing gnome.ui module)"
+#: ../data/glade/subscription_request_window.glade.h:6
+msgid "_Deny"
 msgstr ""
 
-#: ../src/gajim.py:1878
-msgid "Migrating Logs..."
+#: ../data/glade/systray_context_menu.glade.h:2
+msgid "Show All Pending _Events"
 msgstr ""
 
-#: ../src/gajim.py:1879
-msgid "Please wait while logs are being migrated..."
+#: ../data/glade/systray_context_menu.glade.h:3
+msgid "Show _Roster"
 msgstr ""
 
-#: ../src/gajim_themes_window.py:67
-msgid "Theme"
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Sta_tus"
 msgstr ""
 
-#. don't confuse translators
-#: ../src/gajim_themes_window.py:149
-msgid "theme name"
+#. "About" is the text of a tab of vcard window
+#: ../data/glade/vcard_information_window.glade.h:2
+msgid "About"
 msgstr ""
 
-#: ../src/gajim_themes_window.py:166
-msgid "You cannot delete your current theme"
+#: ../data/glade/vcard_information_window.glade.h:3
+msgid "Address"
 msgstr ""
 
-#: ../src/gajim_themes_window.py:167
-msgid "Please first choose another for your current theme."
+#: ../data/glade/vcard_information_window.glade.h:4
+msgid "Ask:"
 msgstr ""
 
-#: ../src/groupchat_control.py:68
-msgid "Private Chat"
+#: ../data/glade/vcard_information_window.glade.h:5
+msgid "Birthday:"
 msgstr ""
 
-#: ../src/groupchat_control.py:68
-msgid "Private Chats"
+#: ../data/glade/vcard_information_window.glade.h:6
+msgid "City:"
 msgstr ""
 
-#: ../src/groupchat_control.py:84
-msgid "Sending private message failed"
+#: ../data/glade/vcard_information_window.glade.h:7
+msgid "Client:"
 msgstr ""
 
-#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:86
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
+#: ../data/glade/vcard_information_window.glade.h:8
+msgid "Company:"
 msgstr ""
 
-#: ../src/groupchat_control.py:98
-msgid "Group Chat"
+#: ../data/glade/vcard_information_window.glade.h:9
+msgid "Contact Information"
 msgstr ""
 
-#: ../src/groupchat_control.py:98
-msgid "Group Chats"
+#: ../data/glade/vcard_information_window.glade.h:10
+msgid "Country:"
 msgstr ""
 
-#: ../src/groupchat_control.py:595
-msgid "This room has no subject"
+#: ../data/glade/vcard_information_window.glade.h:11
+msgid "Department:"
 msgstr ""
 
-#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:693
-#, python-format
-msgid "%(nick)s has been kicked: %(reason)s"
+#: ../data/glade/vcard_information_window.glade.h:12
+msgid "E-Mail:"
 msgstr ""
 
-#: ../src/groupchat_control.py:697
-#, python-format
-msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
+#: ../data/glade/vcard_information_window.glade.h:13
+msgid "Extra Address:"
 msgstr ""
 
-#. do not print 'banned by None'
-#: ../src/groupchat_control.py:704
-#, python-format
-msgid "%(nick)s has been banned: %(reason)s"
+#. Family Name
+#: ../data/glade/vcard_information_window.glade.h:15
+msgid "Family:"
 msgstr ""
 
-#: ../src/groupchat_control.py:708
-#, python-format
-msgid "%(nick)s has been banned by %(who)s: %(reason)s"
+#: ../data/glade/vcard_information_window.glade.h:16
+msgid "Format: YYYY-MM-DD"
 msgstr ""
 
-#: ../src/groupchat_control.py:716
-#, python-format
-msgid "You are now known as %s"
+#. Given Name
+#: ../data/glade/vcard_information_window.glade.h:19
+msgid "Given:"
 msgstr ""
 
-#: ../src/groupchat_control.py:718
-#, python-format
-msgid "%s is now known as %s"
+#: ../data/glade/vcard_information_window.glade.h:20
+msgid "Homepage:"
 msgstr ""
 
-#: ../src/groupchat_control.py:757
-#, python-format
-msgid "%s has left"
+#: ../data/glade/vcard_information_window.glade.h:21
+msgid "Jabber"
 msgstr ""
 
-#. No status message
-#: ../src/groupchat_control.py:759 ../src/roster_window.py:1015
-#, python-format
-msgid "%s is now %s"
+#: ../data/glade/vcard_information_window.glade.h:22
+msgid "Jabber ID:"
 msgstr ""
 
-#: ../src/groupchat_control.py:871 ../src/groupchat_control.py:888
-#: ../src/groupchat_control.py:981 ../src/groupchat_control.py:997
-#, python-format
-msgid "Nickname not found: %s"
+#: ../data/glade/vcard_information_window.glade.h:23
+msgid "Location"
 msgstr ""
 
-#: ../src/groupchat_control.py:915
-#, python-format
-msgid "Invited %(contact_jid)s to %(room_jid)s."
+#. Middle Name
+#: ../data/glade/vcard_information_window.glade.h:25
+msgid "Middle:"
 msgstr ""
 
-#. %s is something the user wrote but it is not a jid so we inform
-#: ../src/groupchat_control.py:922 ../src/groupchat_control.py:952
-#, python-format
-msgid "%s does not appear to be a valid JID"
+#: ../data/glade/vcard_information_window.glade.h:26
+msgid "More"
 msgstr ""
 
-#: ../src/groupchat_control.py:1019
-#, python-format
-msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#: ../data/glade/vcard_information_window.glade.h:29
+msgid "OS:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1041
-#, python-format
-msgid "Commands: %s"
+#: ../data/glade/vcard_information_window.glade.h:30
+msgid "Phone No.:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1043
-#, python-format
-msgid ""
-"Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
-"of an occupant may be substituted, but not if it contains \"@\". If the JID "
-"is currently in the room, he/she/it will also be kicked. Does NOT support "
-"spaces in nickname."
+#: ../data/glade/vcard_information_window.glade.h:31
+msgid "Position:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1049
-#, python-format
-msgid ""
-"Usage: /%s <nickname>, opens a private chat window to the specified occupant."
+#: ../data/glade/vcard_information_window.glade.h:32
+msgid "Postal Code:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1053
-#, python-format
-msgid "Usage: /%s, clears the text window."
+#. Prefix in Name
+#: ../data/glade/vcard_information_window.glade.h:34
+msgid "Prefix:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1055
-#, python-format
-msgid ""
-"Usage: /%s [reason], closes the current window or tab, displaying reason if "
-"specified."
+#: ../data/glade/vcard_information_window.glade.h:35
+msgid "Resource:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1058
-#, python-format
-msgid "Usage: /%s, hide the chat buttons."
+#: ../data/glade/vcard_information_window.glade.h:36
+msgid "Role:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1060
-#, python-format
-msgid ""
-"Usage: /%s <JID> [reason], invites JID to the current room, optionally "
-"providing a reason."
+#: ../data/glade/vcard_information_window.glade.h:37
+msgid "Set _Avatar"
 msgstr ""
 
-#: ../src/groupchat_control.py:1064
-#, python-format
-msgid ""
-"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
-"using specified nickname."
+#: ../data/glade/vcard_information_window.glade.h:38
+msgid "State:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1068
-#, python-format
-msgid ""
-"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the room and optionally displays a reason. Does NOT support spaces in "
-"nickname."
+#: ../data/glade/vcard_information_window.glade.h:39
+msgid "Status:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1073
-#, python-format
-msgid ""
-"Usage: /%s <action>, sends action to the current room. Use third person. (e."
-"g. /%s explodes.)"
+#: ../data/glade/vcard_information_window.glade.h:40
+msgid "Street:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1077
-#, python-format
-msgid ""
-"Usage: /%s <nickname> [message], opens a private message windowand sends "
-"message to the occupant specified by nickname."
+#: ../data/glade/vcard_information_window.glade.h:41
+msgid "Subscription:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1082
-#, python-format
-msgid "Usage: /%s <nickname>, changes your nickname in current room."
+#. Suffix in Name
+#: ../data/glade/vcard_information_window.glade.h:43
+msgid "Suffix:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1086
-#, python-format
-msgid "Usage: /%s [topic], displays or updates the current room topic."
+#: ../data/glade/vcard_information_window.glade.h:44
+msgid "Work"
 msgstr ""
 
-#: ../src/groupchat_control.py:1089
-#, python-format
-msgid ""
-"Usage: /%s <message>, sends a message without looking for other commands."
+#: ../data/glade/vcard_information_window.glade.h:45
+msgid "_Log conversation history"
 msgstr ""
 
-#: ../src/groupchat_control.py:1092
-#, python-format
-msgid "No help info for /%s"
+#: ../data/glade/vcard_information_window.glade.h:46
+msgid "_Publish"
 msgstr ""
 
-#: ../src/groupchat_control.py:1128
-#, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
+#: ../data/glade/vcard_information_window.glade.h:47
+msgid "_Retrieve"
 msgstr ""
 
-#: ../src/groupchat_control.py:1129
-msgid "If you close this window, you will be disconnected from this room."
+#: ../data/glade/xml_console_window.glade.h:1
+msgid "<b>Jabber Traffic</b>"
 msgstr ""
 
-#: ../src/groupchat_control.py:1133
-msgid "Do _not ask me again"
+#: ../data/glade/xml_console_window.glade.h:2
+msgid "<b>XML Input</b>"
 msgstr ""
 
-#: ../src/groupchat_control.py:1167
-msgid "Changing Subject"
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
 msgstr ""
 
-#: ../src/groupchat_control.py:1168
-msgid "Please specify the new subject:"
+#. 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 ""
 
-#: ../src/groupchat_control.py:1176
-msgid "Changing Nickname"
+#. 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 ""
 
-#: ../src/groupchat_control.py:1177
-msgid "Please specify the new nickname you want to use:"
+#: ../data/glade/xml_console_window.glade.h:9
+msgid "_Message"
 msgstr ""
 
-#: ../src/groupchat_control.py:1202
-msgid "Bookmark already set"
+#: ../data/glade/xml_console_window.glade.h:10
+msgid "_Presence"
 msgstr ""
 
-#: ../src/groupchat_control.py:1203
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
+#: ../src/advanced.py:72
+msgid "Preference Name"
 msgstr ""
 
-#: ../src/groupchat_control.py:1212
-msgid "Bookmark has been added successfully"
+#: ../src/advanced.py:78
+msgid "Value"
 msgstr ""
 
-#: ../src/groupchat_control.py:1213
-msgid "You can manage your bookmarks via Actions menu in your roster."
+#: ../src/advanced.py:87
+msgid "Type"
 msgstr ""
 
-#. ask for reason
-#: ../src/groupchat_control.py:1322
-#, python-format
-msgid "Kicking %s"
+#. we talk about option description in advanced configuration editor
+#: ../src/advanced.py:143
+msgid "(None)"
 msgstr ""
 
-#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1568
-msgid "You may specify a reason below:"
+#. we talk about password
+#: ../src/advanced.py:242
+msgid "Hidden"
 msgstr ""
 
-#. ask for reason
-#: ../src/groupchat_control.py:1567
-#, python-format
-msgid "Banning %s"
+#. FIXME: add a ui for this use spell.set_language()
+#: ../src/chat_control.py:168 ../src/dialogs.py:1270
+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 ""
 
-#: ../src/gtkexcepthook.py:52
-msgid "A programming error has been detected"
+#. we are not connected
+#: ../src/chat_control.py:187 ../src/chat_control.py:392
+msgid "A connection is not available"
 msgstr ""
 
-#: ../src/gtkexcepthook.py:53
-msgid ""
-"It probably is not fatal, but should be reported to the developers "
-"nonetheless."
+#: ../src/chat_control.py:188 ../src/chat_control.py:393
+msgid "Your message can not be sent until you are connected."
 msgstr ""
 
-#: ../src/gtkexcepthook.py:59
-msgid "_Report Bug"
+#: ../src/chat_control.py:714
+msgid "Chats"
 msgstr ""
 
-#: ../src/gtkexcepthook.py:82
-msgid "Details"
+#. we talk about a contact here
+#: ../src/chat_control.py:957
+#, python-format
+msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 
-#. this always tracebacks
-#: ../src/gtkgui.glade.h:1
-msgid "0"
+#: ../src/chat_control.py:1083
+msgid "Encryption enabled"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:2
-msgid ""
-"<b>Account is being created</b>\n"
-"\n"
-"Please wait..."
+#: ../src/chat_control.py:1088
+msgid "Encryption disabled"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:5
-msgid "<b>Advanced Configuration Editor</b>"
+#. add_to_roster_menuitem
+#: ../src/chat_control.py:1216 ../src/conversation_textview.py:403
+#: ../src/dialogs.py:505 ../src/gajim.py:596 ../src/gajim.py:597
+#: ../src/gajim.py:916 ../src/roster_window.py:1328
+#: ../src/roster_window.py:1638 ../src/roster_window.py:1798
+#: ../src/roster_window.py:2098 ../src/roster_window.py:2145
+#: ../src/roster_window.py:2935 ../src/roster_window.py:2937
+#: ../src/common/helpers.py:42 ../src/common/helpers.py:244
+msgid "Not in Roster"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:6
-msgid "<b>Applications</b>"
+#. %s is being replaced in the code with JID
+#: ../src/chat_control.py:1357
+#, python-format
+msgid "You just received a new message from \"%s\""
 msgstr ""
 
-#: ../src/gtkgui.glade.h:7
-msgid "<b>Chatstate Tab Colors</b>"
+#: ../src/chat_control.py:1358
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
 msgstr ""
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../src/gtkgui.glade.h:9
-msgid "<b>Custom</b>"
+#: ../src/config.py:206
+#, python-format
+msgid "Every %s _minutes"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:10
-msgid "<b>Description</b>"
+#: ../src/config.py:344
+msgid "Event"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:11
-msgid "<b>Format of a line</b>"
+#: ../src/config.py:516
+msgid "Disabled"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:12
-msgid "<b>Interface Customization</b>"
+#: ../src/config.py:879
+msgid "status message title"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:13
-msgid "<b>Jabber Traffic</b>"
+#: ../src/config.py:879
+msgid "status message text"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:14
-msgid "<b>Miscellaneous</b>"
+#: ../src/config.py:914
+msgid "First Message Received"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:15
-msgid "<b>NOTE:</b> You should restart gajim for some setting to take effect"
+#: ../src/config.py:915
+msgid "Next Message Received"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:16
-msgid "<b>OpenPGP</b>"
+#: ../src/config.py:916
+msgid "Contact Connected"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:17
-msgid "<b>Personal Information</b>"
+#: ../src/config.py:917
+msgid "Contact Disconnected"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:18
-msgid "<b>Please choose one of the options below:</b>"
+#: ../src/config.py:918
+msgid "Message Sent"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:19
-msgid "<b>Please fill in the data for your new account</b>"
+#: ../src/config.py:919
+msgid "Group Chat Message Highlight"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:20
-msgid "<b>Preset Status Messages</b>"
+#: ../src/config.py:920
+msgid "Group Chat Message Received"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:21
-msgid "<b>Properties</b>"
+#: ../src/config.py:1110
+msgid "OpenPGP is not usable in this computer"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:22
-msgid "<b>Settings</b>"
+#: ../src/config.py:1152
+msgid "You are currently connected to the server"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:23
-msgid "<b>Sounds</b>"
+#: ../src/config.py:1153
+msgid "To change the account name, you must be disconnected."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:24
-msgid "<b>Type your new status message</b>"
+#: ../src/config.py:1156 ../src/config.py:1718
+msgid "Unread events"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:25
-msgid "<b>Visual Notifications</b>"
+#: ../src/config.py:1157
+msgid "To change the account name, you must read all pending events."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:26
-msgid "<b>What do you want to do?</b>"
+#: ../src/config.py:1161
+msgid "Account Name Already Used"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:27
-msgid "<b>XML Input</b>"
+#: ../src/config.py:1162
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:28
-msgid "A list of active, completed and stopped file transfers"
+#: ../src/config.py:1166 ../src/config.py:1170
+msgid "Invalid account name"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:29
-msgid "A_ccounts"
+#: ../src/config.py:1167
+msgid "Account name cannot be empty."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:30
-msgid "A_fter nickname:"
+#: ../src/config.py:1171
+msgid "Account name cannot contain spaces."
 msgstr ""
 
-#. "About" is the text of a tab of vcard window
-#: ../src/gtkgui.glade.h:32
-msgid "About"
+#: ../src/config.py:1179 ../src/config.py:1185 ../src/config.py:1194
+#: ../src/config.py:2663
+msgid "Invalid Jabber ID"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:33
-msgid "Accept"
+#: ../src/config.py:1186
+msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:34
-msgid "Account"
+#: ../src/config.py:1242
+msgid "Invalid entry"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:35
-msgid ""
-"Account\n"
-"Group\n"
-"Contact\n"
-"Banner"
+#: ../src/config.py:1243
+msgid "Custom port must be a port number."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:39
-msgid "Account Modification"
+#: ../src/config.py:1363
+msgid "Be right back."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:40
-msgid "Accounts"
+#: ../src/config.py:1373
+msgid "Relogin now?"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:42
-msgid "Add New Contact"
+#: ../src/config.py:1374
+msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:43
-msgid "Add Special _Notification"
+#: ../src/config.py:1400
+msgid "No such account available"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:44
-msgid "Add _Contact"
+#: ../src/config.py:1401
+msgid "You must create your account before editing your personal information."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:45
-msgid "Address"
+#: ../src/config.py:1408 ../src/dialogs.py:913 ../src/dialogs.py:1078
+#: ../src/disco.py:417 ../src/vcard.py:429 ../src/vcard.py:458
+msgid "You are not connected to the server"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:46
-msgid "Advanced"
+#: ../src/config.py:1409
+msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:47
-msgid "Advanced Configuration Editor"
+#: ../src/config.py:1438
+msgid "Failed to get secret keys"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:48
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
+#: ../src/config.py:1439
+msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:51
-msgid "Allow _OS information to be sent"
+#: ../src/config.py:1442
+msgid "OpenPGP Key Selection"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:52
-msgid "Allow him/her to see my status"
+#: ../src/config.py:1443
+msgid "Choose your OpenPGP key"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:53
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+#. Name column
+#: ../src/config.py:1670 ../src/disco.py:734 ../src/disco.py:1473
+#: ../src/history_window.py:84
+msgid "Name"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:54
-msgid "Also known as iChat style"
+#: ../src/config.py:1673
+msgid "Server"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:55
-msgid "Ask status message when I:"
+#: ../src/config.py:1719
+msgid "Read all pending events before removing this account."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:56
-msgid "Ask to see his/her status"
+#: ../src/config.py:1914
+#, python-format
+msgid "Edit %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:57
-msgid "Ask:"
+#: ../src/config.py:1916
+#, python-format
+msgid "Register to %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:58
-msgid "Assign Open_PGP Key"
+#: ../src/config.py:1987
+msgid "Ban List"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:59
-msgid "Authorize contact so he can know when you're connected"
+#: ../src/config.py:1988
+msgid "Member List"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:60
-msgid "Auto _away after:"
+#: ../src/config.py:1989
+msgid "Owner List"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:61
-msgid "Auto _not available after:"
+#: ../src/config.py:1990
+msgid "Administrator List"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:62
-msgid "Auto join"
+#. Address column
+#. holds JID (who said this)
+#: ../src/config.py:2023 ../src/disco.py:741 ../src/history_manager.py:155
+msgid "JID"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:63
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Custom"
+#: ../src/config.py:2031
+msgid "Reason"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:67
-msgid "Automatically authorize contact"
+#: ../src/config.py:2036
+msgid "Nick"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:68
-msgid "Autoreconnect when connection is lost"
+#: ../src/config.py:2040
+msgid "Role"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:69
-msgid "B_efore nickname:"
+#: ../src/config.py:2061
+msgid "Banning..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:70
-msgid "Birthday:"
+#. You can move '\n' before user@domain if that line is TOO BIG
+#: ../src/config.py:2063
+msgid ""
+"<b>Whom do you want to ban?</b>\n"
+"\n"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:71
-msgid "Bold"
+#: ../src/config.py:2065
+msgid "Adding Member..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:72
-msgid "Build custom query"
+#: ../src/config.py:2066
+msgid ""
+"<b>Whom do you want to make a member?</b>\n"
+"\n"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:73
-msgid "C_onnect on Gajim startup"
+#: ../src/config.py:2068
+msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:74
-msgid "Cancel file transfer"
+#: ../src/config.py:2069
+msgid ""
+"<b>Whom do you want to make a owner?</b>\n"
+"\n"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:75
-msgid "Cancels the selected file transfer"
+#: ../src/config.py:2071
+msgid "Adding Administrator..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:76
-msgid "Cancels the selected file transfer and removes incomplete file"
+#: ../src/config.py:2072
+msgid ""
+"<b>Whom do you want to make an administrator?</b>\n"
+"\n"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:77
-msgid "Chan_ge Password"
+#: ../src/config.py:2073
+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 ""
 
-#: ../src/gtkgui.glade.h:78
-msgid "Change Password"
+#: ../src/config.py:2169
+#, python-format
+msgid "Removing %s account"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:79
-msgid "Change _Nickname"
+#: ../src/config.py:2186 ../src/roster_window.py:1838
+msgid "Password Required"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:80
-msgid "Change _Subject"
+#: ../src/config.py:2187 ../src/roster_window.py:1839
+#, python-format
+msgid "Enter your password for account %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:82
-msgid "Chat state noti_fications:"
+#: ../src/config.py:2188 ../src/roster_window.py:1840
+msgid "Save password"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:83
-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"
+#: ../src/config.py:2201
+#, python-format
+msgid "Account \"%s\" is connected to the server"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:84
-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"
+#: ../src/config.py:2202
+msgid "If you remove it, the connection will be lost."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:85
-msgid "Choose _Key..."
+#: ../src/config.py:2284
+msgid "All"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:86
-msgid "City:"
+#: ../src/config.py:2285
+msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:87
-msgid "Clean _up"
+#: ../src/config.py:2355
+msgid "New Room"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:88
-msgid "Click to change account's password"
+#: ../src/config.py:2386
+msgid "This bookmark has invalid data"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:89
-msgid "Click to insert an emoticon (Alt+M)"
+#: ../src/config.py:2387
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:90
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+#: ../src/config.py:2639
+msgid "Invalid username"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:91
-msgid "Click to see past conversation in this room"
+#: ../src/config.py:2640
+msgid "You must provide a username to configure this account."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:92
-msgid "Click to see past conversations with this contact"
+#: ../src/config.py:2649 ../src/dialogs.py:1097
+msgid "Invalid password"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:93
-msgid "Client:"
+#: ../src/config.py:2650
+msgid "You must enter a password for the new account."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:94
-msgid "Company:"
+#: ../src/config.py:2654 ../src/dialogs.py:1102
+msgid "Passwords do not match"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:95
-msgid "Composing"
+#: ../src/config.py:2655 ../src/dialogs.py:1103
+msgid "The passwords typed in both fields must be identical."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:96
-msgid "Configure _Room"
+#: ../src/config.py:2674
+msgid "Duplicate Jabber ID"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:97
-msgid "Connect when I press Finish"
+#: ../src/config.py:2675
+msgid "This account is already configured in Gajim."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:98
-msgid "Connection"
+#: ../src/config.py:2692
+msgid "Account has been added successfully"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:99
-msgid "Contact Information"
+#: ../src/config.py:2693 ../src/config.py:2726
+msgid ""
+"You can set advanced account options by pressing Advanced button, or later "
+"by clicking in Accounts menuitem under Edit menu from the main window."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:100
-msgid "Contact _Info"
+#: ../src/config.py:2725
+msgid "Your new account has been created successfully"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:101
-msgid "Conversation History"
+#: ../src/config.py:2741
+msgid "An error occured during account creation"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:102
-msgid "Country:"
+#: ../src/config.py:2798
+msgid "Account name is in use"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:103
-msgid "Default status _iconset:"
+#: ../src/config.py:2799
+msgid "You already have an account using this name."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:104
-msgid "Delete MOTD"
+#: ../src/conversation_textview.py:201
+msgid ""
+"Text below this line is what has been said since the last time you paid "
+"attention to this group chat"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:105
-msgid "Deletes Message of the Day"
+#: ../src/conversation_textview.py:259
+#, python-format
+msgid "Actions for \"%s\""
 msgstr ""
 
-#: ../src/gtkgui.glade.h:106
-msgid "Deny"
+#: ../src/conversation_textview.py:271
+msgid "Read _Wikipedia Article"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:107
-msgid "Deny authorization from contact so he cannot know when you're connected"
+#: ../src/conversation_textview.py:276
+msgid "Look it up in _Dictionary"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:108
-msgid "Department:"
+#. we must have %s in the url if not WIKTIONARY
+#: ../src/conversation_textview.py:292
+#, python-format
+msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:109
-msgid "Display a_vatars of contacts in roster"
+#. we must have %s in the url
+#: ../src/conversation_textview.py:304
+#, python-format
+msgid "Web Search URL is missing an \"%s\""
 msgstr ""
 
-#: ../src/gtkgui.glade.h:110
-msgid "Display status _messages of contacts in roster"
+#: ../src/conversation_textview.py:307
+msgid "Web _Search for it"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:111
-msgid "E-Mail:"
+#: ../src/conversation_textview.py:606
+msgid "Yesterday"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:112
-msgid "E_very 5 minutes"
+#. the number is >= 2
+#. %i is day in year (1-365), %d (1-31) we want %i
+#: ../src/conversation_textview.py:610
+#, python-format
+msgid "%i days ago"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:113
-msgid "Edit Groups"
+#. if we have subject, show it too!
+#: ../src/conversation_textview.py:675
+#, python-format
+msgid "Subject: %s\n"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:114
-msgid "Edit Personal Information..."
+#. only say that to non Windows users
+#: ../src/dbus_support.py:34
+msgid "D-Bus python bindings are missing in this computer"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:115
-msgid "Edit _Groups"
+#: ../src/dbus_support.py:35
+msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:116
-msgid "Emoticons:"
+#: ../src/dialogs.py:62
+#, python-format
+msgid "Contact's name: <i>%s</i>"
 msgstr ""
 
-#. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
-msgid "Enable"
+#: ../src/dialogs.py:64
+#, python-format
+msgid "JID: <i>%s</i>"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:119
-msgid "Enter it again for confirmation:"
+#. Group name
+#. In group boolean
+#: ../src/dialogs.py:174
+msgid "Group"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:120
-msgid "Enter new password:"
+#: ../src/dialogs.py:181
+msgid "In the group"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:121
-msgid "Events"
+#: ../src/dialogs.py:231
+msgid "KeyID"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:122
-msgid "Extra Address:"
+#: ../src/dialogs.py:234
+msgid "Contact name"
 msgstr ""
 
-#. Family Name
-#: ../src/gtkgui.glade.h:124
-msgid "Family:"
+#: ../src/dialogs.py:267
+#, python-format
+msgid "%s Status Message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:125
-msgid "File Transfers"
+#: ../src/dialogs.py:269
+msgid "Status Message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:126
-msgid "File _Transfers"
+#: ../src/dialogs.py:344
+msgid "Save as Preset Status Message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:127
-msgid "Filter:"
+#: ../src/dialogs.py:345
+msgid "Please type a name for this status message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:128
-msgid "Font style:"
+#: ../src/dialogs.py:391
+#, python-format
+msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:129
-msgid "Forbid him/her to see my status"
+#: ../src/dialogs.py:393
+msgid "Please fill in the data of the contact you want to add"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:130
-msgid "Format: YYYY-MM-DD"
+#: ../src/dialogs.py:403 ../src/disco.py:116 ../src/disco.py:117
+#: ../src/disco.py:1256 ../src/roster_window.py:214
+#: ../src/roster_window.py:281 ../src/roster_window.py:316
+#: ../src/roster_window.py:336 ../src/roster_window.py:360
+#: ../src/roster_window.py:2931 ../src/roster_window.py:2933
+#: ../src/common/helpers.py:42
+msgid "Transports"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:131
-msgid "Frequently Asked Questions (online)"
+#: ../src/dialogs.py:486 ../src/dialogs.py:492
+msgid "Invalid User ID"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:132
-msgid "From:"
+#: ../src/dialogs.py:493
+msgid "The user ID must not contain a resource."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:133
-msgid "G_o"
+#: ../src/dialogs.py:506
+msgid "Contact already in roster"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:134 ../src/notify.py:167 ../src/notify.py:189
-#: ../src/notify.py:201 ../src/tooltips.py:339
-msgid "Gajim"
+#: ../src/dialogs.py:507
+msgid "This contact is already listed in your roster."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:135
-msgid "Gajim Themes Customization"
+#. FIXME: do versions strings translatable after .10
+#. FIXME: use %s then
+#: ../src/dialogs.py:570
+msgid "A GTK+ jabber client"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:136
-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."
+#: ../src/dialogs.py:582
+msgid "Past Developers:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:137
-msgid ""
-"Gajim will automatically show new events by poping up the relative window"
+#: ../src/dialogs.py:586
+msgid "THANKS:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:138
-msgid ""
-"Gajim will notify you for new events via a popup in the bottom right of the "
-"screen"
+#. remove one english setence
+#. and add it manually as translatable
+#: ../src/dialogs.py:593
+msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:139
-msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed in"
+#. here you write your name in the form Name FamilyName <someone@somewhere>
+#: ../src/dialogs.py:607
+msgid "translator-credits"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:140
-msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed out"
+#: ../src/dialogs.py:869
+#, python-format
+msgid "Subscription request for account %s from %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:141
-msgid ""
-"Gajim will only change the icon of the contact that triggered the new event"
+#: ../src/dialogs.py:872
+#, python-format
+msgid "Subscription request from %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:142
-msgid "Gajim: Account Creation Wizard"
+#: ../src/dialogs.py:914
+msgid "You can not join a group chat unless you are connected."
 msgstr ""
 
-#. user has no group, print him in General
-#: ../src/gtkgui.glade.h:143 ../src/roster_window.py:291
-#: ../src/roster_window.py:1183 ../src/roster_window.py:1405
-#: ../src/systray.py:286
-msgid "General"
+#: ../src/dialogs.py:927
+#, python-format
+msgid "Join Group Chat with account %s"
 msgstr ""
 
-#. Given Name
-#: ../src/gtkgui.glade.h:145
-msgid "Given:"
+#: ../src/dialogs.py:1018
+msgid "Invalid room or server name"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:146
-msgid "Gone"
+#: ../src/dialogs.py:1019
+msgid "The room name or server name has not allowed characters."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:147
-msgid "Group:"
+#: ../src/dialogs.py:1038
+#, python-format
+msgid "Start Chat with account %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:148
-msgid "HTTP Connect"
+#: ../src/dialogs.py:1040
+msgid "Start Chat"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:149
-msgid "Help online"
+#: ../src/dialogs.py:1041
+msgid ""
+"Fill in the jid, or nick of the contact you would like\n"
+"to send a chat message to:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:150
-msgid "Hides the window"
+#. if offline or connecting
+#: ../src/dialogs.py:1066 ../src/dialogs.py:1406 ../src/dialogs.py:1528
+msgid "Connection not available"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:151
-msgid "Homepage:"
+#: ../src/dialogs.py:1067 ../src/dialogs.py:1407 ../src/dialogs.py:1529
+#, python-format
+msgid "Please make sure you are connected with \"%s\"."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:152
-msgid "Hostname: "
+#: ../src/dialogs.py:1079
+msgid "Without a connection, you can not change your password."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:153
-msgid "I already have an account I want to use"
+#: ../src/dialogs.py:1098
+msgid "You must enter a password."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:154
-msgid "I want to _register for a new account"
+#. img to display
+#. default value
+#: ../src/dialogs.py:1144 ../src/notify.py:121 ../src/notify.py:263
+msgid "Contact Signed In"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:155
-msgid "I would like to add you to my contact list."
+#: ../src/dialogs.py:1146 ../src/notify.py:129 ../src/notify.py:265
+msgid "Contact Signed Out"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:156
-msgid ""
-"If checked, Gajim will also broadcast some more IPs except from just your "
-"IP, so file transfer has higher chances of working right."
+#. chat message
+#: ../src/dialogs.py:1148 ../src/notify.py:149 ../src/notify.py:267
+msgid "New Message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:157
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
+#. single message
+#: ../src/dialogs.py:1148 ../src/notify.py:133 ../src/notify.py:267
+msgid "New Single Message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:158
-msgid ""
-"If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window and in group chats"
+#. private message
+#: ../src/dialogs.py:1149 ../src/notify.py:140 ../src/notify.py:268
+msgid "New Private Message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:159
-msgid "If checked, Gajim will join this group chat on startup"
+#: ../src/dialogs.py:1149 ../src/gajim.py:997 ../src/notify.py:276
+msgid "New E-mail"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:160
-msgid "If checked, Gajim will remember the password for this account"
+#: ../src/dialogs.py:1151 ../src/gajim.py:1140 ../src/notify.py:270
+msgid "File Transfer Request"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:161
-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"
+#: ../src/dialogs.py:1153 ../src/gajim.py:983 ../src/gajim.py:1117
+#: ../src/notify.py:272
+msgid "File Transfer Error"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:162
-msgid ""
-"If checked, Gajim will send keep-alive packets so it prevents connection "
-"timeout which results in disconnection"
+#: ../src/dialogs.py:1155 ../src/gajim.py:1175 ../src/gajim.py:1197
+#: ../src/gajim.py:1214 ../src/notify.py:274
+msgid "File Transfer Completed"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:163
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
+#: ../src/dialogs.py:1156 ../src/gajim.py:1178 ../src/notify.py:274
+msgid "File Transfer Stopped"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:164
-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...)"
+#: ../src/dialogs.py:1158 ../src/gajim.py:881 ../src/notify.py:278
+msgid "Groupchat Invitation"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:165
-msgid ""
-"If checked, Gajim, when launched, will automatically connect to jabber using "
-"this account"
+#: ../src/dialogs.py:1160 ../src/notify.py:113 ../src/notify.py:280
+msgid "Contact Changed Status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:166
-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"
+#. FIXME: for Received with should become 'in'
+#: ../src/dialogs.py:1338
+#, python-format
+msgid "Single Message with account %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:167
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
+#: ../src/dialogs.py:1340
+msgid "Single Message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:168
-msgid ""
-"If you have 2 or more accounts and it is checked, Gajim will list all "
-"contacts as if you had one account"
+#. prepare UI for Sending
+#: ../src/dialogs.py:1343
+#, python-format
+msgid "Send %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:169
-msgid "Inactive"
+#. prepare UI for Receiving
+#: ../src/dialogs.py:1366
+#, python-format
+msgid "Received %s"
 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)
-#: ../src/gtkgui.glade.h:171
-msgid "Info/Query"
+#. we create a new blank window to send and we preset RE: and to jid
+#: ../src/dialogs.py:1433
+#, python-format
+msgid "RE: %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:172
-msgid "Information about you, as stored in the server"
+#: ../src/dialogs.py:1434
+#, python-format
+msgid "%s wrote:\n"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:173
-msgid "Invitation Received"
+#: ../src/dialogs.py:1478
+#, python-format
+msgid "XML Console for %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:174
-msgid "Italic"
+#: ../src/dialogs.py:1480
+msgid "XML Console"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:175
-msgid "Jabber"
+#. FIXME: use nickname instead of contact_jid
+#: ../src/dialogs.py:1566
+#, python-format
+msgid "%(contact_jid)s has invited you to %(room_jid)s room"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:176
-msgid "Jabber ID:"
+#. only if not None and not ''
+#: ../src/dialogs.py:1572
+#, python-format
+msgid "Comment: %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:178
-msgid "Join _Group Chat"
+#: ../src/dialogs.py:1632
+msgid "Choose Sound"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:179
-msgid "Location"
+#: ../src/dialogs.py:1642 ../src/dialogs.py:1685
+msgid "All files"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:180
-msgid ""
-"MUC\n"
-"Messages"
+#: ../src/dialogs.py:1647
+msgid "Wav Sounds"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:182
-msgid ""
-"MUC Directed\n"
-"Messages"
+#: ../src/dialogs.py:1675
+msgid "Choose Image"
+msgstr ""
+
+#: ../src/dialogs.py:1690
+msgid "Images"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:184
-msgid "Ma_nage..."
+#: ../src/dialogs.py:1735
+#, python-format
+msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:185
-msgid "Manage Accounts"
+#: ../src/dialogs.py:1737
+#, python-format
+msgid "Adding Special Notification for %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:186
-msgid "Manage Bookmarks"
+#: ../src/dialogs.py:1810
+msgid "Condition"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:187
-msgid "Manage Proxy Profiles"
+#: ../src/disco.py:115
+msgid "Others"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:188
-msgid "Manage..."
+#. conference is a category for listing mostly groupchats in service discovery
+#: ../src/disco.py:119
+msgid "Conference"
 msgstr ""
 
-#. Middle Name
-#: ../src/gtkgui.glade.h:190
-msgid "Middle:"
+#: ../src/disco.py:418
+msgid "Without a connection, you can not browse available services"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:191
-msgid "Mo_derator"
+#: ../src/disco.py:497
+#, python-format
+msgid "Service Discovery using account %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:192
-msgid "More"
+#: ../src/disco.py:498
+msgid "Service Discovery"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:193
-msgid "Name:"
+#: ../src/disco.py:635
+msgid "The service could not be found"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:194
+#: ../src/disco.py:636
 msgid ""
-"Never\n"
-"Always\n"
-"Per account\n"
-"Per type"
+"There is no service at the address you entered, or it is not responding. "
+"Check the address and try again."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:198
-msgid "Nickname:"
+#: ../src/disco.py:640 ../src/disco.py:922
+msgid "The service is not browsable"
 msgstr ""
 
-#. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:201
-msgid "None"
+#: ../src/disco.py:641
+msgid "This type of service does not contain any items to browse."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:202
-msgid "Notify me about contacts that: "
+#: ../src/disco.py:721
+#, python-format
+msgid "Browsing %s using account %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:203
-msgid "Notify on new _Gmail e-mail"
+#: ../src/disco.py:760
+msgid "_Browse"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:204
-msgid "OS:"
+#: ../src/disco.py:923
+msgid "This service does not contain any items to browse."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:205
-msgid "On every _message"
+#: ../src/disco.py:1144 ../src/disco.py:1261
+msgid "Re_gister"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:206
-msgid "One message _window:"
+#: ../src/disco.py:1298
+#, python-format
+msgid "Scanning %d / %d.."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:208
-msgid "Pass_word:"
+#. Users column
+#: ../src/disco.py:1480
+msgid "Users"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:209
-msgid "Passphrase"
+#. Description column
+#: ../src/disco.py:1487
+msgid "Description"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:210
-msgid "Password:"
+#: ../src/filetransfers_window.py:79
+msgid "File"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:211 ../src/tooltips.py:645
-msgid "Paused"
+#: ../src/filetransfers_window.py:94
+msgid "Time"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:212
-msgid "Personal Information"
+#: ../src/filetransfers_window.py:106
+msgid "Progress"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:213
-msgid "Phone No.:"
+#: ../src/filetransfers_window.py:171 ../src/filetransfers_window.py:231
+#, python-format
+msgid "Filename: %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:214
-msgid "Play _sounds"
+#: ../src/filetransfers_window.py:172 ../src/filetransfers_window.py:299
+#, python-format
+msgid "Size: %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:215
-msgid "Port: "
+#. You is a reply of who sent a file
+#. You is a reply of who received a file
+#: ../src/filetransfers_window.py:181 ../src/filetransfers_window.py:191
+#: ../src/history_manager.py:458
+msgid "You"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:216
-msgid "Position:"
+#: ../src/filetransfers_window.py:182 ../src/filetransfers_window.py:232
+#, python-format
+msgid "Sender: %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:217
-msgid "Postal Code:"
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:564
+#: ../src/tooltips.py:632
+msgid "Recipient: "
 msgstr ""
 
-#: ../src/gtkgui.glade.h:218
-msgid "Preferences"
+#: ../src/filetransfers_window.py:194
+#, python-format
+msgid "Saved in: %s"
 msgstr ""
 
-#. Prefix in Name
-#: ../src/gtkgui.glade.h:220
-msgid "Prefix:"
+#: ../src/filetransfers_window.py:196
+msgid "File transfer completed"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:221
-msgid "Preset messages:"
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:220
+msgid "File transfer canceled"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:222
-msgid "Print time:"
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:221
+msgid "Connection with peer cannot be established."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:223
-msgid "Priori_ty:"
+#: ../src/filetransfers_window.py:233
+msgid "File transfer stopped by the contact of the other side"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:224
-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"
+#: ../src/filetransfers_window.py:250
+msgid "Choose File to Send..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:225
-msgid "Profile, Avatar"
+#: ../src/filetransfers_window.py:264
+msgid "Gajim cannot access this file"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:226
-msgid "Protocol:"
+#: ../src/filetransfers_window.py:265
+msgid "This file is being used by another process."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:227
-msgid "Proxy:"
+#: ../src/filetransfers_window.py:297
+#, python-format
+msgid "File: %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:228
-msgid "Query Builder..."
+#: ../src/filetransfers_window.py:302
+#, python-format
+msgid "Type: %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:229
-msgid "Recently:"
+#: ../src/filetransfers_window.py:304
+#, python-format
+msgid "Description: %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:230
-msgid "Register to"
+#: ../src/filetransfers_window.py:305
+#, python-format
+msgid "%s wants to send you a file:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:231
-msgid "Remove account _only from Gajim"
+#: ../src/filetransfers_window.py:319
+#, python-format
+msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/gtkgui.glade.h:232
-msgid "Remove account from Gajim and from _server"
+#: ../src/filetransfers_window.py:320
+msgid ""
+"A file with this name already exists and you do not have permission to "
+"overwrite it."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:233
-msgid "Remove file transfer from the list."
+#: ../src/filetransfers_window.py:327
+msgid "This file already exists"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:234
-msgid "Removes completed, canceled and failed file transfers from the list"
+#: ../src/filetransfers_window.py:327
+msgid "What do you want to do?"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:235
-msgid "Reply to this message"
+#: ../src/filetransfers_window.py:339
+#, python-format
+msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:236
-msgid "Resour_ce: "
+#: ../src/filetransfers_window.py:339
+msgid "You do not have permission to create files in this directory."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:237
-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)"
+#: ../src/filetransfers_window.py:349
+msgid "Save File as..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:238
-msgid "Resource:"
+#. 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:428
+#, python-format
+msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:239
-msgid "Role:"
+#. 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:500
+#, python-format
+msgid "(%(filesize_unit)s/s)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:240
-msgid "Room Configuration"
+#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539
+msgid "Invalid File"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:241
-msgid "Room:"
+#: ../src/filetransfers_window.py:536
+msgid "File: "
 msgstr ""
 
-#: ../src/gtkgui.glade.h:242
-msgid "Save _passphrase (insecure)"
+#: ../src/filetransfers_window.py:540
+msgid "It is not possible to send empty files"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:243
-msgid "Save _position and size for roster and chat windows"
+#: ../src/filetransfers_window.py:560 ../src/tooltips.py:513
+#: ../src/tooltips.py:622
+msgid "Name: "
 msgstr ""
 
-#: ../src/gtkgui.glade.h:244
-msgid "Save as Preset..."
+#: ../src/filetransfers_window.py:562 ../src/tooltips.py:626
+msgid "Sender: "
 msgstr ""
 
-#: ../src/gtkgui.glade.h:245
-msgid "Save conversation _logs for all contacts"
+#: ../src/filetransfers_window.py:750
+msgid "Pause"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:246
-msgid "Save pass_word"
+#: ../src/gajim-remote.py:84
+msgid "shows a help on specific command"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:247
-msgid "Search"
+#. User gets help for the command, specified by this parameter
+#: ../src/gajim-remote.py:87
+msgid "command"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:248
-msgid "Sen_d"
+#: ../src/gajim-remote.py:88
+msgid "show help on command"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:249
-msgid "Send File"
+#: ../src/gajim-remote.py:92
+msgid "Shows or hides the roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:250
-msgid "Send Single _Message"
+#: ../src/gajim-remote.py:96
+msgid "Popups a window with the next unread message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:251
-msgid "Send Single _Message..."
+#: ../src/gajim-remote.py:100
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appear on a "
+"separate line"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:252
-msgid "Send _File"
+#: ../src/gajim-remote.py:102 ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:159 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:198 ../src/gajim-remote.py:205
+#: ../src/gajim-remote.py:212 ../src/gajim-remote.py:223
+msgid "account"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:253
-msgid "Send keep-alive packets"
+#: ../src/gajim-remote.py:102
+msgid "show only contacts of the given account"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:254
-msgid "Send message"
+#: ../src/gajim-remote.py:107
+msgid "Prints a list of registered accounts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:255
-msgid "Send message and close window"
+#: ../src/gajim-remote.py:111
+msgid "Changes the status of account or accounts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:256
-msgid "Sends a message to currently connected users to this server"
+#: ../src/gajim-remote.py:113
+msgid "status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:257
-msgid "Server:"
+#: ../src/gajim-remote.py:113
+msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 
-#: ../src/gtkgui.glade.h:258
-msgid "Servers Features"
+#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:135
+msgid "message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:259
-msgid "Set MOTD"
+#: ../src/gajim-remote.py:114
+msgid "status message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:260
-msgid "Set _Avatar"
+#: ../src/gajim-remote.py:115
+msgid ""
+"change status of account \"account\". If not specified, try to change status "
+"of all accounts that have \"sync with global status\" option set"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:261
-msgid "Set my profile when I connect"
+#: ../src/gajim-remote.py:121
+msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:262
-msgid "Sets Message of the Day"
+#: ../src/gajim-remote.py:123
+msgid "JID of the contact that you want to chat with"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:263
-msgid "Show All Pending _Events"
+#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:189
+msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:264
-msgid "Show _Offline Contacts"
+#: ../src/gajim-remote.py:130
+msgid ""
+"Sends new 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 ""
 
-#: ../src/gtkgui.glade.h:265
-msgid "Show _Roster"
+#: ../src/gajim-remote.py:134
+msgid "JID of the contact that will receive the message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:266
-msgid "Show _XML Console"
+#: ../src/gajim-remote.py:135
+msgid "message contents"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:267
-msgid "Show only in _roster"
+#: ../src/gajim-remote.py:136
+msgid "pgp key"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:268
-msgid "Shows a list of file transfers between you and other"
+#: ../src/gajim-remote.py:136
+msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:269
-msgid "Sign _in"
+#: ../src/gajim-remote.py:138
+msgid "if specified, the message will be sent using this account"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:270
-msgid "Sign _out"
+#: ../src/gajim-remote.py:143
+msgid "Gets detailed info on a contact"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:271
-msgid "Sta_tus"
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:188 ../src/gajim-remote.py:197
+msgid "JID of the contact"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:272
-msgid "Start _Chat"
+#: ../src/gajim-remote.py:149
+msgid "Gets detailed info on a account"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:273
-msgid "State:"
+#: ../src/gajim-remote.py:151
+msgid "Name of the account"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:274
-msgid "Status"
+#: ../src/gajim-remote.py:155
+msgid "Sends file to a contact"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:275
-msgid "Status:"
+#: ../src/gajim-remote.py:157
+msgid "file"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:276
-msgid "Street:"
+#: ../src/gajim-remote.py:157
+msgid "File path"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:277
-msgid "Subject:"
+#: ../src/gajim-remote.py:159
+msgid "if specified, file will be sent using this account"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:278
-msgid "Subscription Request"
+#: ../src/gajim-remote.py:164
+msgid "Lists all preferences and their values"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:279
-msgid "Subscription:"
+#: ../src/gajim-remote.py:168
+msgid "Sets value of 'key' to 'value'."
 msgstr ""
 
-#. Suffix in Name
-#: ../src/gtkgui.glade.h:281
-msgid "Suffix:"
+#: ../src/gajim-remote.py:170
+msgid "key=value"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:282
-msgid "Synch_ronize account status with global status"
+#: ../src/gajim-remote.py:170
+msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:283
-msgid "T_heme:"
+#: ../src/gajim-remote.py:175
+msgid "Deletes a preference item"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:284
-msgid "Text _color:"
+#: ../src/gajim-remote.py:177
+msgid "key"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:285
-msgid "Text _font:"
+#: ../src/gajim-remote.py:177
+msgid "name of the preference to be deleted"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:286
-msgid "The auto away status message"
+#: ../src/gajim-remote.py:181
+msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:287
-msgid "The auto not available status message"
+#: ../src/gajim-remote.py:186
+msgid "Removes contact from roster"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:288
-msgid ""
-"This action removes single file transfer from the list. If the transfer is "
-"active, it is first stopped and then removed"
+#: ../src/gajim-remote.py:195
+msgid "Adds contact to roster"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:289
-msgid "Title:"
+#: ../src/gajim-remote.py:197
+msgid "jid"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:290
-msgid "To:"
+#: ../src/gajim-remote.py:198
+msgid "Adds new contact to this account"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:291
-msgid "Toggle Open_PGP Encryption"
+#: ../src/gajim-remote.py:203
+msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:292
-msgid "Type:"
+#: ../src/gajim-remote.py:210
+msgid ""
+"Returns current status message(the global one unless account is specified)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:293
-msgid "Underline"
+#: ../src/gajim-remote.py:217
+msgid "Returns number of unreaded messages"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:294
-msgid "Update MOTD"
+#: ../src/gajim-remote.py:221
+msgid "Open 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:295
-msgid "Updates Message of the Day"
+#: ../src/gajim-remote.py:223
+msgid "Starts chat, using this account"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:296
-msgid "Use _SSL (legacy)"
+#: ../src/gajim-remote.py:243
+msgid "Missing argument \"contact_jid\""
 msgstr ""
 
-#: ../src/gtkgui.glade.h:297
-msgid "Use _transports iconsets"
+#: ../src/gajim-remote.py:262
+#, python-format
+msgid ""
+"'%s' is not in your roster.\n"
+"Please specify account for sending the message."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:298
-msgid "Use authentication"
+#: ../src/gajim-remote.py:265
+msgid "You have no active account"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:299
-msgid "Use custom hostname/port"
+#: ../src/gajim-remote.py:308
+#, python-format
+msgid "Unknown D-Bus version: %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:300
-msgid "Use file transfer proxies"
+#: ../src/gajim-remote.py:335
+#, python-format
+msgid ""
+"Usage: %s %s %s \n"
+"\t %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:301
-msgid "Use t_rayicon (aka. notification area icon)"
+#: ../src/gajim-remote.py:338
+msgid "Arguments:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:302
-msgid "User ID:"
+#: ../src/gajim-remote.py:342
+#, python-format
+msgid "%s not found"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:303
-msgid "When a file transfer is complete show a popup notification"
+#: ../src/gajim-remote.py:346
+#, python-format
+msgid ""
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:304
+#: ../src/gajim-remote.py:420
+#, python-format
 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"
+"Argument \"%s\" is not specified. \n"
+"Type \"%s help %s\" for more info"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:305
-msgid "When new event is received"
+#: ../src/gajim.py:49
+msgid "Gajim needs Xserver to run. Quiting..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:306
-msgid "Work"
+#: ../src/gajim.py:53
+msgid "Gajim needs PyGTK 2.6 or above"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:307
-msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+#: ../src/gajim.py:54
+msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:309
-msgid "Your JID:"
+#: ../src/gajim.py:56
+msgid "Gajim needs GTK 2.6 or above"
 msgstr ""
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:311
-msgid "_Actions"
+#: ../src/gajim.py:57
+msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:312
-msgid "_Add Contact..."
+#: ../src/gajim.py:62
+msgid "GTK+ runtime is missing libglade support"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:313
-msgid "_Add to Roster"
+#: ../src/gajim.py:64
+#, python-format
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:314
-msgid "_Address:"
+#: ../src/gajim.py:66
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:315
-msgid "_Admin"
+#: ../src/gajim.py:71
+msgid "Gajim needs PySQLite2 to run"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:316
-msgid "_Administrator"
+#: ../src/gajim.py:234
+#, python-format
+msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:317
-msgid "_Advanced"
+#: ../src/gajim.py:235
+msgid "Do you accept this request?"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:318
-msgid "_After time:"
+#: ../src/gajim.py:572
+#, python-format
+msgid "error while sending %s ( %s )"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:319
-msgid "_Authorize"
+#: ../src/gajim.py:612
+msgid "Authorization accepted"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:320
-msgid "_Background:"
+#: ../src/gajim.py:613
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:321
-msgid "_Ban"
+#: ../src/gajim.py:621
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:322
-msgid "_Before time:"
+#: ../src/gajim.py:622
+msgid "You will always see him or her as offline."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:323
-msgid "_Bookmark This Room"
+#: ../src/gajim.py:665
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:324
-msgid "_Browser:"
+#: ../src/gajim.py:666 ../src/common/connection.py:363
+msgid "Check your connection or try again later."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:325
-msgid "_Cancel"
+#: ../src/gajim.py:810 ../src/roster_window.py:1018
+#, python-format
+msgid "%s is now %s (%s)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:326
-msgid "_Compact View    Alt+C"
+#: ../src/gajim.py:891
+msgid "Your passphrase is incorrect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:327
-msgid "_Contents"
+#: ../src/gajim.py:892
+msgid "You are currently connected without your OpenPGP key."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:329
-msgid "_Copy JID/Email Address"
+#. FIXME: find a better image
+#: ../src/gajim.py:993
+#, python-format
+msgid "New E-mail on %(gmail_mail_address)s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:330
-msgid "_Copy Link Location"
-msgstr ""
+#: ../src/gajim.py:995
+#, python-format
+msgid "You have %d new E-mail message"
+msgid_plural "You have %d new E-mail messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/gtkgui.glade.h:331
-msgid "_Deny"
+#: ../src/gajim.py:1138
+#, python-format
+msgid "%s wants to send you a file."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:332
-msgid "_Discover Services"
+#: ../src/gajim.py:1198
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:333
-msgid "_Discover Services..."
+#. ft stopped
+#: ../src/gajim.py:1202
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:335
-msgid "_FAQ"
+#: ../src/gajim.py:1215
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:336
-msgid "_File manager:"
+#. ft stopped
+#: ../src/gajim.py:1219
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:337
-msgid "_Filter:"
+#: ../src/gajim.py:1248
+msgid "vCard publication succeeded"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:338
-msgid "_Finish"
+#: ../src/gajim.py:1248
+msgid "Your personal information has been published successfully."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:339
-msgid "_Font:"
+#: ../src/gajim.py:1257
+msgid "vCard publication failed"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:340
-msgid "_Group Chat"
+#: ../src/gajim.py:1257
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:341
-msgid "_Help"
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gajim.py:1605
+msgid "Could not save your settings and preferences"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:342
-msgid "_Highlight misspelled words"
+#: ../src/gajim.py:1822
+msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:343
-msgid "_History"
+#: ../src/gajim.py:1852
+msgid "Migrating Logs..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:344
-msgid "_Host:"
+#: ../src/gajim.py:1853
+msgid "Please wait while logs are being migrated..."
 msgstr ""
 
-#. 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))
-#: ../src/gtkgui.glade.h:346
-msgid "_IQ"
+#: ../src/gajim_themes_window.py:65
+msgid "Theme"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:347
-msgid "_Ignore events from contacts not in the roster"
+#. don't confuse translators
+#: ../src/gajim_themes_window.py:147
+msgid "theme name"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:348
-msgid "_Incoming message:"
+#: ../src/gajim_themes_window.py:164
+msgid "You cannot delete your current theme"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:349
-msgid "_Jabber ID:"
+#: ../src/gajim_themes_window.py:165
+msgid "Please first choose another for your current theme."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:351
-msgid "_Kick"
+#: ../src/groupchat_control.py:107
+msgid "Private Chat"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:352
-msgid "_Log conversation history"
+#: ../src/groupchat_control.py:107
+msgid "Private Chats"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:353
-msgid "_Log status changes of contacts"
+#: ../src/groupchat_control.py:123
+msgid "Sending private message failed"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:354
-msgid "_Mail client:"
+#. in second %s code replaces with nickname
+#: ../src/groupchat_control.py:125
+#, python-format
+msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:355
-msgid "_Member"
+#: ../src/groupchat_control.py:137
+msgid "Group Chat"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:356
-msgid "_Merge accounts"
+#: ../src/groupchat_control.py:137
+msgid "Group Chats"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:357
-msgid "_Message"
+#: ../src/groupchat_control.py:316
+msgid "Insert Nickname"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:358
-msgid "_Modify"
+#: ../src/groupchat_control.py:695
+msgid "This room has no subject"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:359
-msgid "_Modify Account..."
+#. do not print 'kicked by None'
+#: ../src/groupchat_control.py:794
+#, python-format
+msgid "%(nick)s has been kicked: %(reason)s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:360
-msgid "_Name: "
+#: ../src/groupchat_control.py:798
+#, python-format
+msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:361
-msgid "_Never"
+#. do not print 'banned by None'
+#: ../src/groupchat_control.py:805
+#, python-format
+msgid "%(nick)s has been banned: %(reason)s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:362
-msgid "_Notify me about it"
+#: ../src/groupchat_control.py:809
+#, python-format
+msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:363
-msgid "_Notify me when a file transfer is complete"
+#: ../src/groupchat_control.py:817
+#, python-format
+msgid "You are now known as %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:364
-msgid "_OK"
+#: ../src/groupchat_control.py:819
+#, python-format
+msgid "%s is now known as %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:365
-msgid "_Occupant Actions"
+#: ../src/groupchat_control.py:874
+#, python-format
+msgid "%s has left"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:367
-msgid "_Open Email Composer"
+#: ../src/groupchat_control.py:879
+#, python-format
+msgid "%s has joined the room"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:368
-msgid "_Open Link in Browser"
+#. No status message
+#: ../src/groupchat_control.py:881 ../src/roster_window.py:1021
+#, python-format
+msgid "%s is now %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:369
-msgid "_Open..."
+#: ../src/groupchat_control.py:994 ../src/groupchat_control.py:1011
+#: ../src/groupchat_control.py:1104 ../src/groupchat_control.py:1120
+#, python-format
+msgid "Nickname not found: %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:370
-msgid "_Outgoing message:"
+#: ../src/groupchat_control.py:1038
+#, python-format
+msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:371
-msgid "_Owner"
+#. %s is something the user wrote but it is not a jid so we inform
+#: ../src/groupchat_control.py:1045 ../src/groupchat_control.py:1075
+#, python-format
+msgid "%s does not appear to be a valid JID"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:372
-msgid "_Password:"
+#: ../src/groupchat_control.py:1142
+#, python-format
+msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:373
-msgid "_Pause"
+#: ../src/groupchat_control.py:1164
+#, python-format
+msgid "Commands: %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:374
-msgid "_Player:"
+#: ../src/groupchat_control.py:1166
+#, python-format
+msgid ""
+"Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
+"of an occupant may be substituted, but not if it contains \"@\". If the JID "
+"is currently in the room, he/she/it will also be kicked. Does NOT support "
+"spaces in nickname."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:375
-msgid "_Pop it up"
+#: ../src/groupchat_control.py:1172
+#, python-format
+msgid ""
+"Usage: /%s <nickname>, opens a private chat window to the specified occupant."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:376
-msgid "_Port:"
+#: ../src/groupchat_control.py:1176
+#, python-format
+msgid "Usage: /%s, clears the text window."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:377
-msgid "_Preferences"
+#: ../src/groupchat_control.py:1178
+#, python-format
+msgid ""
+"Usage: /%s [reason], closes the current window or tab, displaying reason if "
+"specified."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:378
-msgid "_Presence"
+#: ../src/groupchat_control.py:1181
+#, python-format
+msgid "Usage: /%s, hide the chat buttons."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:379
-msgid "_Publish"
+#: ../src/groupchat_control.py:1183
+#, python-format
+msgid ""
+"Usage: /%s <JID> [reason], invites JID to the current room, optionally "
+"providing a reason."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:380
-msgid "_Quit"
+#: ../src/groupchat_control.py:1187
+#, python-format
+msgid ""
+"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
+"using specified nickname."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:381
-msgid "_Remove"
+#: ../src/groupchat_control.py:1191
+#, python-format
+msgid ""
+"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
+"from the room and optionally displays a reason. Does NOT support spaces in "
+"nickname."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:382 ../src/roster_window.py:1482
-msgid "_Remove from Roster"
+#: ../src/groupchat_control.py:1196
+#, python-format
+msgid ""
+"Usage: /%s <action>, sends action to the current room. Use third person. (e."
+"g. /%s explodes.)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:383 ../src/roster_window.py:1470
-msgid "_Rename"
+#: ../src/groupchat_control.py:1200
+#, python-format
+msgid ""
+"Usage: /%s <nickname> [message], opens a private message windowand sends "
+"message to the occupant specified by nickname."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:384
-msgid "_Reply"
+#: ../src/groupchat_control.py:1205
+#, python-format
+msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:385
-msgid "_Reset to Default Colors"
+#: ../src/groupchat_control.py:1209
+#, python-format
+msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:386
-msgid "_Retrieve"
+#: ../src/groupchat_control.py:1212
+#, python-format
+msgid ""
+"Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:387
-msgid "_Retype Password:"
+#: ../src/groupchat_control.py:1215
+#, python-format
+msgid "No help info for /%s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:388
-msgid "_Search"
+#: ../src/groupchat_control.py:1257
+#, python-format
+msgid "Are you sure you want to leave room \"%s\"?"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:391
-msgid "_Send & Close"
+#: ../src/groupchat_control.py:1258
+msgid "If you close this window, you will be disconnected from this room."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:392
-msgid "_Send Private Message"
+#: ../src/groupchat_control.py:1262
+msgid "Do _not ask me again"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:393
-msgid "_Send Server Message"
+#: ../src/groupchat_control.py:1296
+msgid "Changing Subject"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:394
-msgid "_Send Single Message"
+#: ../src/groupchat_control.py:1297
+msgid "Please specify the new subject:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:395
-msgid "_Server:"
+#: ../src/groupchat_control.py:1305
+msgid "Changing Nickname"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:396
-msgid "_Sort contacts by status"
+#: ../src/groupchat_control.py:1306
+msgid "Please specify the new nickname you want to use:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:397
-msgid "_Start Chat"
+#: ../src/groupchat_control.py:1332
+msgid "Bookmark already set"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:398
-msgid "_Status"
+#: ../src/groupchat_control.py:1333
+#, python-format
+msgid "Room \"%s\" is already in your bookmarks."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:399
-msgid "_Status message:"
+#: ../src/groupchat_control.py:1342
+msgid "Bookmark has been added successfully"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:400
-msgid "_Subscribe"
+#: ../src/groupchat_control.py:1343
+msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:401
-msgid "_Subscription"
+#. ask for reason
+#: ../src/groupchat_control.py:1453
+#, python-format
+msgid "Kicking %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:402
-msgid "_URL:"
+#: ../src/groupchat_control.py:1454 ../src/groupchat_control.py:1732
+msgid "You may specify a reason below:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:403
-msgid "_Use proxy"
+#. ask for reason
+#: ../src/groupchat_control.py:1731
+#, python-format
+msgid "Banning %s"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:404
-msgid "_Username:"
+#: ../src/gtkexcepthook.py:52
+msgid "A programming error has been detected"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:405
-msgid "_Voice"
+#: ../src/gtkexcepthook.py:53
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:406
-msgid "file transfers list"
+#: ../src/gtkexcepthook.py:59
+msgid "_Report Bug"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:407
-msgid "minutes"
+#: ../src/gtkexcepthook.py:82
+msgid "Details"
 msgstr ""
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:98 ../src/gtkgui_helpers.py:113
+#: ../src/gtkgui_helpers.py:151 ../src/gtkgui_helpers.py:166
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:242
+#: ../src/gtkgui_helpers.py:295
 msgid "Error reading file:"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:245
+#: ../src/gtkgui_helpers.py:298
 msgid "Error parsing file:"
 msgstr ""
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:283
+#: ../src/gtkgui_helpers.py:336
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 
-#: ../src/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 ""
-
-#: ../src/history_manager.glade.h:7
-msgid "Delete"
-msgstr ""
-
-#: ../src/history_manager.glade.h:8
-msgid "Export"
-msgstr ""
-
-#: ../src/history_manager.glade.h:9
-msgid "Gajim History Logs Manager"
-msgstr ""
-
-#: ../src/history_manager.glade.h:10
-msgid "_Search Database"
-msgstr ""
-
-#: ../src/history_manager.py:58
+#: ../src/history_manager.py:65
 msgid "Cannot find history logs database"
 msgstr ""
 
 #. holds jid
-#: ../src/history_manager.py:102
+#: ../src/history_manager.py:108
 msgid "Contacts"
 msgstr ""
 
 #. holds time
-#: ../src/history_manager.py:115 ../src/history_manager.py:155
-#: ../src/history_window.py:94
+#: ../src/history_manager.py:121 ../src/history_manager.py:161
+#: ../src/history_window.py:92
 msgid "Date"
 msgstr ""
 
 #. holds nickname
-#: ../src/history_manager.py:121 ../src/history_manager.py:173
+#: ../src/history_manager.py:127 ../src/history_manager.py:179
 msgid "Nickname"
 msgstr ""
 
 #. holds message
-#: ../src/history_manager.py:129 ../src/history_manager.py:161
-#: ../src/history_window.py:102
+#: ../src/history_manager.py:135 ../src/history_manager.py:167
+#: ../src/history_window.py:100
 msgid "Message"
 msgstr ""
 
 #. holds subject
-#: ../src/history_manager.py:136 ../src/history_manager.py:167
+#: ../src/history_manager.py:142 ../src/history_manager.py:173
 msgid "Subject"
 msgstr ""
 
-#: ../src/history_manager.py:181
+#: ../src/history_manager.py:187
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:183
+#: ../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 "
@@ -3485,464 +3725,510 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:389
+#: ../src/history_manager.py:395
 msgid "Exporting History Logs..."
 msgstr ""
 
-#: ../src/history_manager.py:465
+#: ../src/history_manager.py:471
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:465
+#: ../src/history_manager.py:471
 msgid "who"
 msgstr ""
 
-#: ../src/history_manager.py:503
+#: ../src/history_manager.py:509
 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] ""
 
-#: ../src/history_manager.py:507 ../src/history_manager.py:543
+#: ../src/history_manager.py:513 ../src/history_manager.py:549
 msgid "This is an irreversible operation."
 msgstr ""
 
-#: ../src/history_manager.py:540
+#: ../src/history_manager.py:546
 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] ""
 
-#: ../src/history_window.py:111 ../src/history_window.py:113
+#: ../src/history_window.py:109 ../src/history_window.py:111
 #, python-format
 msgid "Conversation History with %s"
 msgstr ""
 
-#: ../src/history_window.py:265
+#: ../src/history_window.py:264
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr ""
 
-#: ../src/history_window.py:269
+#: ../src/history_window.py:268 ../src/notify.py:108
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr ""
 
-#: ../src/history_window.py:275
+#: ../src/history_window.py:274
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr ""
 
-#: ../src/history_window.py:278
+#: ../src/history_window.py:277
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr ""
 
-#: ../src/message_window.py:233
+#: ../src/message_window.py:251
 msgid "Messages"
 msgstr ""
 
-#: ../src/message_window.py:234
+#: ../src/message_window.py:252
 #, python-format
 msgid "%s - Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:140
+#: ../src/notify.py:106
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr ""
+
+#: ../src/notify.py:116
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr ""
+
+#: ../src/notify.py:124
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr ""
+
+#: ../src/notify.py:136
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr ""
+
+#: ../src/notify.py:145
+#, python-format
+msgid "New Private Message from room %s"
+msgstr ""
+
+#: ../src/notify.py:146
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr ""
+
+#: ../src/notify.py:152
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr ""
+
+#: ../src/roster_window.py:138
 msgid "Merged accounts"
 msgstr ""
 
-#: ../src/roster_window.py:289 ../src/common/helpers.py:42
+#: ../src/roster_window.py:295 ../src/common/helpers.py:42
 msgid "Observers"
 msgstr ""
 
-#: ../src/roster_window.py:542
+#: ../src/roster_window.py:548
 #, python-format
 msgid "You are already in room %s"
 msgstr ""
 
-#: ../src/roster_window.py:546 ../src/roster_window.py:2262
+#: ../src/roster_window.py:552 ../src/roster_window.py:2246
 msgid "You cannot join a room while you are invisible"
 msgstr ""
 
 #. the 'manage gc bookmarks' item is showed
 #. below to avoid duplicate code
 #. add
-#: ../src/roster_window.py:735
+#: ../src/roster_window.py:741
 #, python-format
 msgid "to %s account"
 msgstr ""
 
 #. disco
-#: ../src/roster_window.py:742
+#: ../src/roster_window.py:748
 #, python-format
 msgid "using %s account"
 msgstr ""
 
-#. new message
+#. new chat
 #. for chat_with
 #. for single message
-#: ../src/roster_window.py:750 ../src/systray.py:194 ../src/systray.py:201
+#: ../src/roster_window.py:756 ../src/systray.py:200 ../src/systray.py:205
 #, python-format
 msgid "using account %s"
 msgstr ""
 
 #. profile, avatar
-#: ../src/roster_window.py:759
+#: ../src/roster_window.py:765
 #, python-format
 msgid "of account %s"
 msgstr ""
 
-#: ../src/roster_window.py:818
+#: ../src/roster_window.py:824
 msgid "Manage Bookmarks..."
 msgstr ""
 
-#: ../src/roster_window.py:842
+#: ../src/roster_window.py:848
 #, python-format
 msgid "for account %s"
 msgstr ""
 
 #. History manager
-#: ../src/roster_window.py:863
+#: ../src/roster_window.py:869
 msgid "History Manager"
 msgstr ""
 
-#: ../src/roster_window.py:872
+#: ../src/roster_window.py:878
 msgid "_Join New Room"
 msgstr ""
 
-#: ../src/roster_window.py:1158
+#: ../src/roster_window.py:1152
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr ""
 
-#: ../src/roster_window.py:1158
+#: ../src/roster_window.py:1152
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 msgstr ""
 
-#: ../src/roster_window.py:1200
+#: ../src/roster_window.py:1194
 msgid "Assign OpenPGP Key"
 msgstr ""
 
-#: ../src/roster_window.py:1201
+#: ../src/roster_window.py:1195
 msgid "Select a key to apply to the contact"
 msgstr ""
 
-#: ../src/roster_window.py:1358
+#: ../src/roster_window.py:1351
 msgid "I would like to add you to my roster"
 msgstr ""
 
-#: ../src/roster_window.py:1410
+#: ../src/roster_window.py:1403
 msgid "Re_name"
 msgstr ""
 
-#: ../src/roster_window.py:1441
+#: ../src/roster_window.py:1434
 msgid "_Log on"
 msgstr ""
 
-#: ../src/roster_window.py:1450
+#: ../src/roster_window.py:1443
 msgid "Log _off"
 msgstr ""
 
-#: ../src/roster_window.py:1545
+#: ../src/roster_window.py:1538
 msgid "_Change Status Message"
 msgstr ""
 
-#: ../src/roster_window.py:1617
+#: ../src/roster_window.py:1614
 msgid "Authorization has been sent"
 msgstr ""
 
-#: ../src/roster_window.py:1618
+#: ../src/roster_window.py:1615
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr ""
 
-#: ../src/roster_window.py:1642
+#: ../src/roster_window.py:1639
 msgid "Subscription request has been sent"
 msgstr ""
 
-#: ../src/roster_window.py:1643
+#: ../src/roster_window.py:1640
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 
-#: ../src/roster_window.py:1654
+#: ../src/roster_window.py:1651
 msgid "Authorization has been removed"
 msgstr ""
 
-#: ../src/roster_window.py:1655
+#: ../src/roster_window.py:1652
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr ""
 
-#: ../src/roster_window.py:1824
+#: ../src/roster_window.py:1803
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr ""
 
-#: ../src/roster_window.py:1828
+#: ../src/roster_window.py:1807
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
 msgstr ""
 
-#: ../src/roster_window.py:1832
+#: ../src/roster_window.py:1811
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
 msgstr ""
 
-#: ../src/roster_window.py:1833
+#: ../src/roster_window.py:1812
 msgid "I want this contact to know my status after removal"
 msgstr ""
 
-#: ../src/roster_window.py:1901
+#: ../src/roster_window.py:1880
 msgid "Passphrase Required"
 msgstr ""
 
-#: ../src/roster_window.py:1902
+#: ../src/roster_window.py:1881
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr ""
 
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1886
 msgid "Save passphrase"
 msgstr ""
 
-#: ../src/roster_window.py:1915
+#: ../src/roster_window.py:1894
 msgid "Wrong Passphrase"
 msgstr ""
 
-#: ../src/roster_window.py:1916
+#: ../src/roster_window.py:1895
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:2021
+#: ../src/roster_window.py:1944 ../src/roster_window.py:2001
 msgid "You are participating in one or more group chats"
 msgstr ""
 
-#: ../src/roster_window.py:1965 ../src/roster_window.py:2022
+#: ../src/roster_window.py:1945 ../src/roster_window.py:2002
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 msgstr ""
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:1961
 msgid "No account available"
 msgstr ""
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:1962
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 
-#: ../src/roster_window.py:2427 ../src/roster_window.py:2433
+#: ../src/roster_window.py:2414 ../src/roster_window.py:2420
 msgid "You have unread messages"
 msgstr ""
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2434
+#: ../src/roster_window.py:2415 ../src/roster_window.py:2421
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
 msgstr ""
 
-#: ../src/roster_window.py:3184
+#: ../src/roster_window.py:3181
 #, python-format
 msgid "Drop %s in group %s"
 msgstr ""
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3190
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr ""
 
-#: ../src/roster_window.py:3358
+#. source and dest account are not the same, disable meta
+#: ../src/roster_window.py:3198
+msgid "Can't create a metacontact with contacts from two different accounts"
+msgstr ""
+
+#: ../src/roster_window.py:3361
 msgid "Change Status Message..."
 msgstr ""
 
-#: ../src/systray.py:155
+#: ../src/systray.py:161
 msgid "_Change Status Message..."
 msgstr ""
 
-#: ../src/systray.py:236
+#: ../src/systray.py:238
 msgid "Hide this menu"
 msgstr ""
 
-#: ../src/systraywin32.py:266 ../src/systraywin32.py:285
-#: ../src/tooltips.py:315
+#: ../src/systraywin32.py:265 ../src/systraywin32.py:284
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/tooltips.py:321
+#: ../src/tooltips.py:329
 #, python-format
-msgid "Gajim - %d unread single message"
-msgid_plural "Gajim - %d unread single messages"
+msgid " %d unread message"
+msgid_plural " %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/tooltips.py:327
+#: ../src/tooltips.py:335
 #, python-format
-msgid "Gajim - %d unread group chat message"
-msgid_plural "Gajim - %d unread group chat messages"
+msgid " %d unread single message"
+msgid_plural " %d unread single messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/tooltips.py:333
+#: ../src/tooltips.py:341
 #, python-format
-msgid "Gajim - %d unread private message"
-msgid_plural "Gajim - %d unread private messages"
+msgid " %d unread group chat message"
+msgid_plural " %d unread group chat messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/tooltips.py:348 ../src/tooltips.py:350
+#: ../src/tooltips.py:347
+#, python-format
+msgid " %d unread private message"
+msgid_plural " %d unread private messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/tooltips.py:362 ../src/tooltips.py:364
 #, python-format
 msgid "Gajim - %s"
 msgstr ""
 
-#: ../src/tooltips.py:383
+#: ../src/tooltips.py:397
 msgid "Role: "
 msgstr ""
 
-#: ../src/tooltips.py:384
+#: ../src/tooltips.py:398
 msgid "Affiliation: "
 msgstr ""
 
-#: ../src/tooltips.py:386 ../src/tooltips.py:518
+#: ../src/tooltips.py:400 ../src/tooltips.py:533
 msgid "Resource: "
 msgstr ""
 
-#: ../src/tooltips.py:394 ../src/tooltips.py:521 ../src/tooltips.py:543
-#: ../src/tooltips.py:654
+#: ../src/tooltips.py:409 ../src/tooltips.py:536 ../src/tooltips.py:558
+#: ../src/tooltips.py:669
 msgid "Status: "
 msgstr ""
 
-#: ../src/tooltips.py:501
+#: ../src/tooltips.py:516
 msgid "Subscription: "
 msgstr ""
 
-#: ../src/tooltips.py:510
+#: ../src/tooltips.py:525
 msgid "OpenPGP: "
 msgstr ""
 
-#: ../src/tooltips.py:548
+#: ../src/tooltips.py:563
 #, python-format
 msgid "Last status on %s"
 msgstr ""
 
-#: ../src/tooltips.py:550
+#: ../src/tooltips.py:565
 #, python-format
 msgid "Since %s"
 msgstr ""
 
-#: ../src/tooltips.py:610
+#: ../src/tooltips.py:625
 msgid "Download"
 msgstr ""
 
-#: ../src/tooltips.py:616
+#: ../src/tooltips.py:631
 msgid "Upload"
 msgstr ""
 
-#: ../src/tooltips.py:623
+#: ../src/tooltips.py:638
 msgid "Type: "
 msgstr ""
 
-#: ../src/tooltips.py:629
+#: ../src/tooltips.py:644
 msgid "Transferred: "
 msgstr ""
 
-#: ../src/tooltips.py:632 ../src/tooltips.py:653
+#: ../src/tooltips.py:647 ../src/tooltips.py:668
 msgid "Not started"
 msgstr ""
 
-#: ../src/tooltips.py:636
+#: ../src/tooltips.py:651
 msgid "Stopped"
 msgstr ""
 
-#: ../src/tooltips.py:638 ../src/tooltips.py:641
+#: ../src/tooltips.py:653 ../src/tooltips.py:656
 msgid "Completed"
 msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:649
+#: ../src/tooltips.py:664
 msgid "Stalled"
 msgstr ""
 
-#: ../src/tooltips.py:651
+#: ../src/tooltips.py:666
 msgid "Transferring"
 msgstr ""
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:698
 msgid "This service has not yet responded with detailed information"
 msgstr ""
 
-#: ../src/tooltips.py:686
+#: ../src/tooltips.py:701
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
 msgstr ""
 
 #. keep identation
-#: ../src/vcard.py:186
+#: ../src/vcard.py:185
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:262
+#: ../src/vcard.py:261
 msgid "?Client:Unknown"
 msgstr ""
 
-#: ../src/vcard.py:264
+#: ../src/vcard.py:263
 msgid "?OS:Unknown"
 msgstr ""
 
-#: ../src/vcard.py:281
+#: ../src/vcard.py:280
 #, python-format
 msgid "since %s"
 msgstr ""
 
-#: ../src/vcard.py:305
+#: ../src/vcard.py:304
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr ""
 
-#: ../src/vcard.py:307
+#: ../src/vcard.py:306
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr ""
 
-#: ../src/vcard.py:309
+#: ../src/vcard.py:308
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 
 #. None
-#: ../src/vcard.py:311
+#: ../src/vcard.py:310
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
 
-#: ../src/vcard.py:320
+#: ../src/vcard.py:319
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 
-#: ../src/vcard.py:332 ../src/vcard.py:355
+#: ../src/vcard.py:331 ../src/vcard.py:354
 msgid " resource with priority "
 msgstr ""
 
-#: ../src/vcard.py:434
+#: ../src/vcard.py:430
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 
-#: ../src/vcard.py:463
+#: ../src/vcard.py:459
 msgid "Without a connection, you can not get your contact information."
 msgstr ""
 
-#: ../src/vcard.py:467
+#: ../src/vcard.py:463
 msgid "Personal details"
 msgstr ""
 
@@ -3950,23 +4236,23 @@ msgstr ""
 msgid "creating logs database"
 msgstr ""
 
-#: ../src/common/check_paths.py:84 ../src/common/check_paths.py:95
-#: ../src/common/check_paths.py:102
+#: ../src/common/check_paths.py:86 ../src/common/check_paths.py:97
+#: ../src/common/check_paths.py:104
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr ""
 
-#: ../src/common/check_paths.py:85 ../src/common/check_paths.py:96
-#: ../src/common/check_paths.py:103 ../src/common/check_paths.py:110
+#: ../src/common/check_paths.py:87 ../src/common/check_paths.py:98
+#: ../src/common/check_paths.py:105 ../src/common/check_paths.py:113
 msgid "Gajim will now exit"
 msgstr ""
 
-#: ../src/common/check_paths.py:109
+#: ../src/common/check_paths.py:112
 #, python-format
 msgid "%s is directory but should be file"
 msgstr ""
 
-#: ../src/common/check_paths.py:125
+#: ../src/common/check_paths.py:128
 #, python-format
 msgid "creating %s directory"
 msgstr ""
@@ -4009,6 +4295,17 @@ msgstr ""
 msgid "Not available as a result of being idle"
 msgstr ""
 
+#: ../src/common/config.py:79
+msgid "List (space separated) of rows (accounts and groups) that are collapsed"
+msgstr ""
+
+#: ../src/common/config.py:85
+msgid ""
+"'always' - print time for every message.\n"
+"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
+"'never' - never print time."
+msgstr ""
+
 #: ../src/common/config.py:88
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
@@ -4018,6 +4315,18 @@ msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 
+#: ../src/common/config.py:99
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat"
+msgstr ""
+
+#: ../src/common/config.py:100
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat"
+msgstr ""
+
 #: ../src/common/config.py:131
 msgid "Add * and [n] in roster title?"
 msgstr ""
@@ -4053,6 +4362,12 @@ msgstr ""
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 
+#: ../src/common/config.py:145
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes"
+msgstr ""
+
 #: ../src/common/config.py:146
 msgid "Ask before closing a group chat tab/window."
 msgstr ""
@@ -4084,7 +4399,7 @@ msgid "Show tab when only one conversation?"
 msgstr ""
 
 #: ../src/common/config.py:162
-msgid "Show tab border if one conversation?"
+msgid "Show tabbed notebook border in chat windows?"
 msgstr ""
 
 #: ../src/common/config.py:163
@@ -4125,11 +4440,23 @@ msgid ""
 "last time or has one cached that is too old."
 msgstr ""
 
-#. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
+#: ../src/common/config.py:183
+msgid ""
+"If False, Gajim will no longer print status line in chats when a contact "
+"changes his or her status and/or his or her status message."
+msgstr ""
+
 #: ../src/common/config.py:184
 msgid ""
-"If False, you will no longer see status line in chats when a contact changes "
-"his or her status and/or his status message."
+"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 "
+"room"
+msgstr ""
+
+#: ../src/common/config.py:187
+msgid "Don't show avatar for the transport itself."
 msgstr ""
 
 #: ../src/common/config.py:189
@@ -4184,181 +4511,264 @@ msgstr ""
 msgid "Hides the room occupants list in groupchat window"
 msgstr ""
 
+#: ../src/common/config.py:201
+msgid "Merge consecutive nickname in chat window"
+msgstr ""
+
+#: ../src/common/config.py:202
+msgid "Indentation when using merge consecutive nickame"
+msgstr ""
+
 #. yes, no, ask
-#: ../src/common/config.py:233
+#: ../src/common/config.py:235
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:239
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:295
 msgid "Sleeping"
 msgstr ""
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:296
 msgid "Back soon"
 msgstr ""
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:296
 msgid "Back in some minutes."
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:297
 msgid "Eating"
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:297
 msgid "I'm eating, so leave me a message."
 msgstr ""
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:298
 msgid "Movie"
 msgstr ""
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:298
 msgid "I'm watching a movie."
 msgstr ""
 
-#: ../src/common/config.py:294
+#: ../src/common/config.py:299
 msgid "Working"
 msgstr ""
 
-#: ../src/common/config.py:294
+#: ../src/common/config.py:299
 msgid "I'm working."
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:300
 msgid "Phone"
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:300
 msgid "I'm on the phone."
 msgstr ""
 
-#: ../src/common/config.py:296
+#: ../src/common/config.py:301
 msgid "Out"
 msgstr ""
 
-#: ../src/common/config.py:296
+#: ../src/common/config.py:301
 msgid "I'm out enjoying life"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:310
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
 msgstr ""
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:311
 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 ""
 
-#: ../src/common/config.py:314 ../src/common/optparser.py:181
+#: ../src/common/config.py:319 ../src/common/optparser.py:183
 msgid "green"
 msgstr ""
 
-#: ../src/common/config.py:318 ../src/common/optparser.py:167
+#: ../src/common/config.py:323 ../src/common/optparser.py:169
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:327
 msgid "human"
 msgstr ""
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:331
 msgid "marine"
 msgstr ""
 
-#: ../src/common/connection.py:152
+#: ../src/common/connection.py:165
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr ""
 
-#: ../src/common/connection.py:153
+#: ../src/common/connection.py:166
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 
-#: ../src/common/connection.py:169 ../src/common/connection.py:195
+#: ../src/common/connection.py:178 ../src/common/connection.py:204
 #, python-format
 msgid "Transport %s answered wrongly to register request."
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:194
+#: ../src/common/connection.py:203
 msgid "Invalid answer"
 msgstr ""
 
-#: ../src/common/connection.py:348 ../src/common/connection.py:384
-#: ../src/common/connection.py:754
+#: ../src/common/connection.py:362 ../src/common/connection.py:398
+#: ../src/common/connection.py:776
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr ""
 
-#: ../src/common/connection.py:362
+#: ../src/common/connection.py:376
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr ""
 
-#: ../src/common/connection.py:385
+#: ../src/common/connection.py:399
 msgid "Check your connection or try again later"
 msgstr ""
 
-#: ../src/common/connection.py:410
+#: ../src/common/connection.py:424
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr ""
 
-#: ../src/common/connection.py:411
+#: ../src/common/connection.py:425
 msgid "Please check your login and password for correctness."
 msgstr ""
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:487
+#: ../src/common/connection.py:501
 msgid "OpenPGP passphrase was not given"
 msgstr ""
 
 #. %s is the account name here
-#: ../src/common/connection.py:489
+#: ../src/common/connection.py:503
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr ""
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:526
+#: ../src/common/connection.py:540
 msgid "invisible"
 msgstr ""
 
-#: ../src/common/connection.py:527
+#: ../src/common/connection.py:541
 msgid "offline"
 msgstr ""
 
-#: ../src/common/connection.py:528
+#: ../src/common/connection.py:542
 #, python-format
 msgid "I'm %s"
 msgstr ""
 
 #. we're not english
-#: ../src/common/connection.py:611
+#: ../src/common/connection.py:626
 msgid "[This message is encrypted]"
 msgstr ""
 
-#: ../src/common/connection.py:649
+#: ../src/common/connection.py:664
 #, python-format
 msgid ""
 "Subject: %s\n"
 "%s"
 msgstr ""
 
-#: ../src/common/connection.py:699
+#: ../src/common/connection.py:714 ../src/common/connection_handlers.py:1481
 msgid "I would like to add you to my roster."
 msgstr ""
 
+#: ../src/common/connection_handlers.py:51
+msgid "Unable to load idle module"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:583
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr ""
+
+#. password required to join
+#. we are banned
+#. room does not exist
+#: ../src/common/connection_handlers.py:1420
+#: ../src/common/connection_handlers.py:1423
+#: ../src/common/connection_handlers.py:1426
+#: ../src/common/connection_handlers.py:1429
+#: ../src/common/connection_handlers.py:1432
+#: ../src/common/connection_handlers.py:1435
+#: ../src/common/connection_handlers.py:1443
+msgid "Unable to join room"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1421
+msgid "A password is required to join this room."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1424
+msgid "You are banned from this room."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1427
+msgid "Such room does not exist."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1430
+msgid "Room creation is restricted."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1433
+msgid "Your registered nickname must be used."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1436
+msgid "You are not in the members list."
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1444
+msgid ""
+"Your desired nickname is in use or registered by another occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+
+#. BE CAREFUL: no con.updateRosterItem() in a callback
+#: ../src/common/connection_handlers.py:1489
+#, python-format
+msgid "we are now subscribed to %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1491
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1493
+#, python-format
+msgid "we are now unsubscribed from %s"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:1650
+#, 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 ""
+
 #: ../src/common/helpers.py:103
 msgid "Invalid character in username."
 msgstr ""
@@ -4417,144 +4827,140 @@ msgstr ""
 msgid "%s B"
 msgstr ""
 
-#: ../src/common/helpers.py:189
+#: ../src/common/helpers.py:208
 msgid "_Busy"
 msgstr ""
 
-#: ../src/common/helpers.py:191
+#: ../src/common/helpers.py:210
 msgid "Busy"
 msgstr ""
 
-#: ../src/common/helpers.py:194
+#: ../src/common/helpers.py:213
 msgid "_Not Available"
 msgstr ""
 
-#: ../src/common/helpers.py:196
+#: ../src/common/helpers.py:215
 msgid "Not Available"
 msgstr ""
 
-#: ../src/common/helpers.py:199
+#: ../src/common/helpers.py:218
 msgid "_Free for Chat"
 msgstr ""
 
-#: ../src/common/helpers.py:201
+#: ../src/common/helpers.py:220
 msgid "Free for Chat"
 msgstr ""
 
-#: ../src/common/helpers.py:204
+#: ../src/common/helpers.py:223
 msgid "_Available"
 msgstr ""
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:225
 msgid "Available"
 msgstr ""
 
-#: ../src/common/helpers.py:208
+#: ../src/common/helpers.py:227
 msgid "Connecting"
 msgstr ""
 
-#: ../src/common/helpers.py:211
+#: ../src/common/helpers.py:230
 msgid "A_way"
 msgstr ""
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:232
 msgid "Away"
 msgstr ""
 
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:235
 msgid "_Offline"
 msgstr ""
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:237
 msgid "Offline"
 msgstr ""
 
-#: ../src/common/helpers.py:221
+#: ../src/common/helpers.py:240
 msgid "_Invisible"
 msgstr ""
 
-#: ../src/common/helpers.py:223
-msgid "Invisible"
-msgstr ""
-
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:246
 msgid "?contact has status:Unknown"
 msgstr ""
 
-#: ../src/common/helpers.py:229
+#: ../src/common/helpers.py:248
 msgid "?contact has status:Has errors"
 msgstr ""
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:253
 msgid "?Subscription we already have:None"
 msgstr ""
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:255
 msgid "To"
 msgstr ""
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:257
 msgid "From"
 msgstr ""
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:259
 msgid "Both"
 msgstr ""
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:267
 msgid "?Ask (for Subscription):None"
 msgstr ""
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:269
 msgid "Subscribe"
 msgstr ""
 
-#: ../src/common/helpers.py:259
+#: ../src/common/helpers.py:278
 msgid "?Group Chat Contact Role:None"
 msgstr ""
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:281
 msgid "Moderators"
 msgstr ""
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:283
 msgid "Moderator"
 msgstr ""
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:286
 msgid "Participants"
 msgstr ""
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:288
 msgid "Participant"
 msgstr ""
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:291
 msgid "Visitors"
 msgstr ""
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:293
 msgid "Visitor"
 msgstr ""
 
-#: ../src/common/helpers.py:310
+#: ../src/common/helpers.py:329
 msgid "is paying attention to the conversation"
 msgstr ""
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:331
 msgid "is doing something else"
 msgstr ""
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:333
 msgid "is composing a message..."
 msgstr ""
 
 #. paused means he or she was compoing but has stopped for a while
-#: ../src/common/helpers.py:317
+#: ../src/common/helpers.py:336
 msgid "paused composing a message"
 msgstr ""
 
-#: ../src/common/helpers.py:319
+#: ../src/common/helpers.py:338
 msgid "has closed the chat window or tab"
 msgstr ""
 
@@ -4564,10 +4970,10 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr ""
 
-#: ../src/common/optparser.py:167
+#: ../src/common/optparser.py:169
 msgid "gtk+"
 msgstr ""
 
-#: ../src/common/optparser.py:176 ../src/common/optparser.py:177
+#: ../src/common/optparser.py:178 ../src/common/optparser.py:179
 msgid "cyan"
 msgstr ""