Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/gajim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann Leboulanger <asterix@lagaule.org>2008-11-11 22:59:22 +0300
committerYann Leboulanger <asterix@lagaule.org>2008-11-11 22:59:22 +0300
commit2efad84d5db5090870555f59a769ff022a10cb58 (patch)
treefe3f1b4f9695fc4ff73853ed9dd257de32bc0031 /po/en_GB.po
parentf1526df24317c3cd10e6b95a2696fb09a565c510 (diff)
updated pot/po files for beta release
Diffstat (limited to 'po/en_GB.po')
-rw-r--r--po/en_GB.po2865
1 files changed, 1597 insertions, 1268 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index 55c81c8f9..f5b467bdc 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Gajim - A Jabber Instant Messager 0.11.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-25 11:26+0200\n"
+"POT-Creation-Date: 2008-11-11 20:49+0100\n"
"PO-Revision-Date: 2008-08-17 00:58+1000\n"
"Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
"Language-Team: English <en_gb@li.org>\n"
@@ -29,7 +29,7 @@ msgid "Jabber IM Client"
msgstr "Jabber IM Client"
#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:8
+#: ../data/glade/roster_window.glade.h:7
msgid "Join _Group Chat..."
msgstr "Join _Group Chat..."
@@ -288,9 +288,9 @@ msgstr "Edit Personal Information..."
#. No configured account
#: ../data/glade/account_modification_window.glade.h:16
#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/roster_window.glade.h:6 ../src/common/helpers.py:1030
-#: ../src/common/helpers.py:1042 ../src/notify.py:502 ../src/notify.py:533
-#: ../src/notify.py:545
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1043
+#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
+#: ../src/notify.py:544
msgid "Gajim"
msgstr "Gajim"
@@ -299,11 +299,11 @@ msgstr "Gajim"
#. General group cannot be changed
#: ../data/glade/account_modification_window.glade.h:17
#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:49
#: ../data/glade/zeroconf_properties_window.glade.h:7
#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:165 ../src/roster_window.py:2690
-#: ../src/roster_window.py:5170
+#: ../src/dialogs.py:166 ../src/roster_window.py:2673
+#: ../src/roster_window.py:5158
msgid "General"
msgstr "General"
@@ -368,20 +368,20 @@ msgstr "Information about you, as stored in the server"
#: ../data/glade/account_modification_window.glade.h:27
#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1551
-#: ../src/config.py:2045
+#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
+#: ../src/config.py:2057
msgid "No key selected"
msgstr "No key selected"
#. None means no proxy profile selected
#: ../data/glade/account_modification_window.glade.h:29
#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1140
-#: ../src/config.py:1211 ../src/config.py:1459 ../src/config.py:1464
-#: ../src/config.py:1953 ../src/config.py:2031 ../src/config.py:2044
-#: ../src/config.py:3147 ../src/config.py:3215 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:514 ../src/roster_window.py:2758
-#: ../src/roster_window.py:2764 ../src/roster_window.py:2769
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
+#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
+#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
+#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
+#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
+#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
msgid "None"
msgstr "None"
@@ -545,7 +545,7 @@ msgstr ""
#: ../data/glade/accounts_window.glade.h:32
#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:670
+#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
msgid "Jabber ID:"
msgstr "Jabber ID:"
@@ -560,7 +560,7 @@ msgid "Mer_ge accounts"
msgstr "Mer_ge accounts"
#. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5122
+#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
msgid "Re_name"
msgstr "Re_name"
@@ -777,7 +777,7 @@ msgid "All statuses"
msgstr "All statuses"
#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:277
+#: ../src/common/commands.py:102 ../src/common/helpers.py:291
msgid "Away"
msgstr "Away"
@@ -794,7 +794,7 @@ msgid "Have "
msgstr "Have "
#: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:301
msgid "Invisible"
msgstr "Invisible"
@@ -803,7 +803,7 @@ msgid "Launch a command"
msgstr "Launch a command"
#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:274
msgid "Not Available"
msgstr "Not Available"
@@ -980,7 +980,7 @@ msgid "Join _Group Chat"
msgstr "Join _Group Chat"
#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/roster_contact_context_menu.glade.h:12
+#: ../data/glade/roster_contact_context_menu.glade.h:13
msgid "_Add to Roster..."
msgstr "_Add to Roster..."
@@ -1032,10 +1032,10 @@ msgstr "_Add to Roster"
#: ../data/glade/chat_control_popup_menu.glade.h:6
#: ../data/glade/gc_control_popup_menu.glade.h:6
#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../data/glade/roster_contact_context_menu.glade.h:16
+#: ../data/glade/roster_contact_context_menu.glade.h:17
#: ../data/glade/roster_window.glade.h:20
#: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5797
+#: ../src/roster_window.py:5805
msgid "_History"
msgstr "_History"
@@ -1143,7 +1143,7 @@ msgstr ""
msgid "When a file transfer is complete show a popup notification"
msgstr "Show a pop-up notification when a file transfer is complete "
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:795
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
msgid "_Continue"
msgstr "_Continue"
@@ -1151,7 +1151,7 @@ msgstr "_Continue"
msgid "_Notify me when a file transfer is complete"
msgstr "_Notify me when a file transfer is complete"
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:190
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
msgid "_Open Containing Folder"
msgstr "_Open Containing Folder"
@@ -1199,7 +1199,7 @@ msgstr "Gajim Themes Customisation"
msgid "Gone"
msgstr "Gone"
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:101
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
msgid "Inactive"
msgstr "Inactive"
@@ -1307,7 +1307,7 @@ msgstr "_Voice"
msgid "Create new post"
msgstr "Create new post"
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:302
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
msgid "From"
msgstr "From"
@@ -1361,7 +1361,7 @@ msgstr ""
msgid "_Search Database"
msgstr "_Search Database"
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:302
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
msgid "Conversation History"
msgstr "Conversation History"
@@ -1384,7 +1384,7 @@ msgstr "Search:"
msgid "_Log conversation history"
msgstr "_Log conversation history"
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1696
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
msgid "Join Group Chat"
msgstr "Join Group Chat"
@@ -1411,8 +1411,8 @@ msgstr "Recently:"
msgid "Room:"
msgstr "Room:"
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1182
-#: ../src/disco.py:1603
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
+#: ../src/disco.py:1618
msgid "_Join"
msgstr "_Join"
@@ -1513,7 +1513,8 @@ msgid "Browse the chat history (Ctrl+H)"
msgstr "Browse the chat history (Ctrl+H)"
#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Ctrl+T)"
+#, fuzzy
+msgid "Change the room's subject (Alt+T)"
msgstr "Change the room's subject (Ctrl+T)"
#: ../data/glade/message_window.glade.h:5
@@ -1543,7 +1544,7 @@ msgstr "Show the contact's profile (Ctrl+I)"
#. 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:12
#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:261
msgid "_Send"
msgstr "_Send"
@@ -1707,10 +1708,6 @@ msgid "Display status _messages of contacts in roster"
msgstr "Display status _messages of contacts in roster"
#: ../data/glade/preferences_window.glade.h:46
-msgid "Emoticons:"
-msgstr "Emoticons:"
-
-#: ../data/glade/preferences_window.glade.h:47
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 "
@@ -1720,7 +1717,7 @@ msgstr ""
"may have with a contact. Here you can specify which chatstates you want to "
"display in chat windows."
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:47
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 "
@@ -1730,7 +1727,7 @@ msgstr ""
"may have with a contact. Here you can specify which chatstates you want to "
"send to the other party."
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:48
msgid ""
"Gajim will notify you via a popup window in the bottom right of the screen "
"about contacts that just signed out"
@@ -1738,11 +1735,11 @@ msgstr ""
"Gajim will notify you via a pop-up window in the bottom right of the screen "
"about contacts that just signed out"
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:50
msgid "Hide all buttons in chat windows"
msgstr "Hide all buttons in chat windows"
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:51
msgid ""
"If checked, Gajim will allow others to detect the operation system you are "
"using"
@@ -1750,7 +1747,7 @@ msgstr ""
"If ticked, Gajim will allow others to detect the operation system you are "
"using"
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:52
msgid ""
"If checked, Gajim will also include information about the sender of the new "
"emails"
@@ -1758,13 +1755,13 @@ msgstr ""
"If ticked, Gajim will also include information about the sender of the new e-"
"mails"
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:53
msgid ""
"If checked, Gajim will change status to Away when the computer is unused."
msgstr ""
"If ticked, Gajim will change status to Away when the computer is unused."
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:54
msgid ""
"If checked, Gajim will change status to Not Available when the computer has "
"not been used even longer"
@@ -1772,7 +1769,7 @@ msgstr ""
"If ticked, Gajim will change status to Not Available when the computer has "
"not been used even longer"
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:55
msgid ""
"If checked, Gajim will display avatars of contacts in roster window and in "
"group chats"
@@ -1780,7 +1777,7 @@ msgstr ""
"If ticked, Gajim will display avatars of contacts in roster window and in "
"group chats"
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:56
msgid ""
"If checked, Gajim will display status messages of contacts under the contact "
"name in roster window and in group chats"
@@ -1788,25 +1785,25 @@ msgstr ""
"If ticked, Gajim will display status messages of contacts under the contact "
"name in roster window and in group chats"
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:57
msgid ""
"If checked, Gajim will display the activity of contacts in the roster window"
msgstr ""
"If ticked, Gajim will display the activity of contacts in the roster window"
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:58
msgid ""
"If checked, Gajim will display the mood of contacts in the roster window"
msgstr ""
"If ticked, Gajim will display the mood of contacts in the roster window"
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:59
msgid ""
"If checked, Gajim will display the tunes of contacts in the roster window"
msgstr ""
"If ticked, Gajim will display the tunes of contacts in the roster window"
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:60
msgid ""
"If checked, Gajim will highlight spelling errors in input fields of chat "
"windows. If no language is explicitly set via right click on the input "
@@ -1816,7 +1813,7 @@ msgstr ""
"windows. If no language is explicitly set via right click on the input "
"field, the default language will be used for this contact or group chat."
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:61
msgid ""
"If checked, Gajim will ignore incoming events from unauthorized contacts. "
"Use with caution, because it blocks all messages from any contact that is "
@@ -1826,7 +1823,7 @@ msgstr ""
"with caution, because it blocks all messages from any contact that is not in "
"the roster"
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:62
msgid ""
"If checked, Gajim will keep logs for encrypted messages. Please note that "
"when using E2E encryption the remote party has to agree on logging, else the "
@@ -1836,7 +1833,7 @@ msgstr ""
"when using E2E encryption the remote party has to agree on logging, else the "
"messages will not be logged."
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:63
msgid ""
"If checked, Gajim will show a notification when a new e-mail is received via "
"GMail"
@@ -1844,15 +1841,7 @@ msgstr ""
"If ticked, Gajim will show a notification when a new e-mail is received via "
"GMail"
-#: ../data/glade/preferences_window.glade.h:65
-msgid ""
-"If checked, Gajim will sort contacts in roster window and groupchats by "
-"their status and not by the shown name"
-msgstr ""
-"If ticked, Gajim will sort contacts in roster window and groupchats by their "
-"status and not by the shown name"
-
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:64
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, "
@@ -1862,7 +1851,7 @@ msgstr ""
"from MSN will have the equivalent MSN icon for status online, away, busy, "
"etc...)"
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:65
msgid ""
"If enabled, Gajim will not ask for a status message. The specified default "
"message will be used instead."
@@ -1870,7 +1859,7 @@ msgstr ""
"If enabled, Gajim will not ask for a status message. The specified default "
"message will be used instead."
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:66
msgid ""
"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
"animated or static graphical emoticons"
@@ -1878,47 +1867,43 @@ msgstr ""
"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
"animated or static graphical emoticons"
-#: ../data/glade/preferences_window.glade.h:69
-msgid "Ignore rich content in incoming messages"
-msgstr "Ignore rich content in incoming messages"
-
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:67
msgid "Log _encrypted chat session"
msgstr "Log _encrypted chat session"
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:68
msgid "Ma_ke message windows compact"
msgstr "Ma_ke message windows compact"
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:69
msgid "Ma_nage..."
msgstr "Ma_nage..."
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:70
msgid "Notifications"
msgstr "Notifications"
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:71
msgid "Notify me about contacts that sign _in"
msgstr "Notify me about contacts that sign _in"
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:72
msgid "Notify me about contacts that sign _out"
msgstr "Notify me about contacts that sign _out"
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:73
msgid "Notify on new _GMail email"
msgstr "Notify on new _GMail email"
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:74
msgid "Personal Events"
msgstr "Personal Events"
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:75
msgid "Play _sounds"
msgstr "Play _sounds"
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:76
msgid ""
"Pop it up\n"
"Notify me about it\n"
@@ -1928,19 +1913,19 @@ msgstr ""
"Notify me about it\n"
"Show only in roster"
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:79
msgid "Preferences"
msgstr "Preferences"
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:80
msgid "Sign _in"
msgstr "Sign _in"
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:81
msgid "Sign _out"
msgstr "Sign _out"
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:82
msgid ""
"Some messages may include rich content (formatting, colors etc). If checked, "
"Gajim will just display the raw message text."
@@ -1948,23 +1933,28 @@ msgstr ""
"Some messages may include rich content (formatting, colours etc). If ticked, "
"Gajim will just display the raw message text."
-#: ../data/glade/preferences_window.glade.h:86 ../src/config.py:398
+#: ../data/glade/preferences_window.glade.h:83
+#, fuzzy
+msgid "Sort contacts by status"
+msgstr "_Sort contacts by status"
+
+#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
msgid "Status"
msgstr "Status"
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:85
msgid "Status _iconset:"
msgstr "Status _iconset:"
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:86
msgid "Style"
msgstr "Style"
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:87
msgid "T_heme:"
msgstr "T_heme:"
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:88
msgid ""
"The auto away status message. If empty, Gajim will not change the current "
"status message"
@@ -1972,7 +1962,7 @@ msgstr ""
"The auto away status message. If empty, Gajim will not change the current "
"status message"
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:89
msgid ""
"The auto not available status message. If empty, Gajim will not change the "
"current status message"
@@ -1980,42 +1970,52 @@ msgstr ""
"The auto not available status message. If empty, Gajim will not change the "
"current status message"
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:90
msgid "Use _transports icons"
msgstr "Use _transports icons"
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:91
msgid "Use system _default"
msgstr "Use system _default"
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:92
msgid "When new event is received:"
msgstr "When new event is received:"
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:93
msgid "_Away after:"
msgstr "_Away after:"
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:94
msgid "_Browser:"
msgstr "_Browser:"
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:95
msgid "_Display chat state notifications:"
msgstr "_Display chat state notifications:"
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
+msgid "_Emoticons:"
+msgstr "Emoticons:"
+
+#: ../data/glade/preferences_window.glade.h:97
msgid "_File manager:"
msgstr "_File manager:"
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:98
msgid "_Highlight misspelled words"
msgstr "_Highlight misspelt words"
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:99
msgid "_Ignore events from contacts not in the roster"
msgstr "_Ignore events from contacts not in the roster"
+#: ../data/glade/preferences_window.glade.h:100
+#, fuzzy
+msgid "_Ignore rich content in incoming messages"
+msgstr "Ignore rich content in incoming messages"
+
#: ../data/glade/preferences_window.glade.h:101
msgid "_Incoming message:"
msgstr "_Incoming message:"
@@ -2049,22 +2049,28 @@ msgid "_Send chat state notifications:"
msgstr "_Send chat state notifications:"
#: ../data/glade/preferences_window.glade.h:109
-msgid "_Sort contacts by status"
-msgstr "_Sort contacts by status"
-
-#: ../data/glade/preferences_window.glade.h:110
msgid "_Status message:"
msgstr "_Status message:"
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:110
msgid "_URL highlight:"
msgstr "_URL highlight:"
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:111
msgid "_Window behavior:"
msgstr "_Window behaviour:"
+#: ../data/glade/preferences_window.glade.h:112
+#, fuzzy
+msgid "in _group chats"
+msgstr "Join _Group Chat"
+
#: ../data/glade/preferences_window.glade.h:113
+#, fuzzy
+msgid "in _roster"
+msgstr "Not in roster"
+
+#: ../data/glade/preferences_window.glade.h:114
msgid "minutes"
msgstr "minutes"
@@ -2112,7 +2118,7 @@ msgstr "JabberID"
msgid "Order:"
msgstr "Order:"
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2565
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
msgid "Privacy List"
msgstr "Privacy List"
@@ -2256,7 +2262,7 @@ msgid "<b>Prefix:</b>"
msgstr "<b>Prefix:</b>"
#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:308
+#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
msgid "<b>Role:</b>"
msgstr "<b>Role:</b>"
@@ -2316,10 +2322,8 @@ msgstr "Remove account from Gajim and from _server"
#. Remove group
#. Remove
-#: ../data/glade/remove_account_window.glade.h:4
-#: ../data/glade/roster_contact_context_menu.glade.h:19
-#: ../src/roster_window.py:5158 ../src/roster_window.py:5615
-#: ../src/roster_window.py:5744
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
+#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
msgid "_Remove"
msgstr "_Remove"
@@ -2341,59 +2345,64 @@ msgstr "Edit _Groups..."
#. Execute Command
#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5687
+#: ../src/roster_window.py:5695
msgid "Execute Command..."
msgstr "Execute Command..."
#. Invite to
#. Invite to Groupchat
#: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5077 ../src/roster_window.py:5568
+#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
msgid "In_vite to"
msgstr "In_vite to"
-#. Send Custom Status
#: ../data/glade/roster_contact_context_menu.glade.h:7
-#: ../src/roster_window.py:5087 ../src/roster_window.py:5653
+#, fuzzy
+msgid "Remo_ve"
+msgstr "_Remove"
+
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
msgid "Send Cus_tom Status"
msgstr "Send Cus_tom Status"
-#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../data/glade/roster_contact_context_menu.glade.h:9
msgid "Send Single _Message..."
msgstr "Send Single _Message..."
-#: ../data/glade/roster_contact_context_menu.glade.h:9
+#: ../data/glade/roster_contact_context_menu.glade.h:10
msgid "Send _File..."
msgstr "Send _File..."
-#: ../data/glade/roster_contact_context_menu.glade.h:10
+#: ../data/glade/roster_contact_context_menu.glade.h:11
msgid "Set Custom _Avatar..."
msgstr "Set Custom _Avatar..."
-#: ../data/glade/roster_contact_context_menu.glade.h:11
+#: ../data/glade/roster_contact_context_menu.glade.h:12
#: ../data/glade/zeroconf_contact_context_menu.glade.h:5
msgid "Start _Chat"
msgstr "Start _Chat"
-#: ../data/glade/roster_contact_context_menu.glade.h:13
+#: ../data/glade/roster_contact_context_menu.glade.h:14
msgid "_Allow him/her to see my status"
msgstr "_Allow him/her to see my status"
-#: ../data/glade/roster_contact_context_menu.glade.h:14
-#: ../src/roster_window.py:5149 ../src/roster_window.py:5605
-#: ../src/roster_window.py:5734
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5742
msgid "_Block"
msgstr "_Block"
-#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../data/glade/roster_contact_context_menu.glade.h:16
msgid "_Forbid him/her to see my status"
msgstr "_Forbid him/her to see my status"
-#: ../data/glade/roster_contact_context_menu.glade.h:17
+#: ../data/glade/roster_contact_context_menu.glade.h:18
msgid "_Ignore"
msgstr "_Ignore"
-#: ../data/glade/roster_contact_context_menu.glade.h:18
+#: ../data/glade/roster_contact_context_menu.glade.h:19
#: ../data/glade/zeroconf_contact_context_menu.glade.h:7
msgid "_Manage Contact"
msgstr "_Manage Contact"
@@ -2407,8 +2416,8 @@ msgid "_Subscription"
msgstr "_Subscription"
#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5143 ../src/roster_window.py:5599
-#: ../src/roster_window.py:5731
+#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
+#: ../src/roster_window.py:5739
msgid "_Unblock"
msgstr "_Unblock"
@@ -2417,45 +2426,46 @@ msgid "_Unignore"
msgstr "_Unignore"
#: ../data/glade/roster_window.glade.h:1
-msgid "A_ccounts"
-msgstr "A_ccounts"
-
-#: ../data/glade/roster_window.glade.h:2
msgid "Add _Contact..."
msgstr "Add _Contact..."
-#: ../data/glade/roster_window.glade.h:3
+#: ../data/glade/roster_window.glade.h:2
msgid "Fea_tures"
msgstr "Fea_tures"
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/glade/roster_window.glade.h:3
msgid "File _Transfers"
msgstr "File _Transfers"
-#: ../data/glade/roster_window.glade.h:5
+#: ../data/glade/roster_window.glade.h:4
msgid "Frequently Asked Questions (online)"
msgstr "Frequently Asked Questions (online)"
-#: ../data/glade/roster_window.glade.h:7
+#: ../data/glade/roster_window.glade.h:6
msgid "Help online"
msgstr "Help online"
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/glade/roster_window.glade.h:8
msgid "Profile, A_vatar"
msgstr "Profile, A_vatar"
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:9
msgid "Show Trans_ports"
msgstr "Show Trans_ports"
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/glade/roster_window.glade.h:10
msgid "Show _Offline Contacts"
msgstr "Show _Offline Contacts"
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:11
msgid "Show _roster"
msgstr "Show _roster"
+#: ../data/glade/roster_window.glade.h:12
+#, fuzzy
+msgid "_Accounts"
+msgstr "Accounts"
+
#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
#: ../data/glade/roster_window.glade.h:13
#: ../data/glade/subscription_request_window.glade.h:6
@@ -2466,7 +2476,7 @@ msgstr "_Actions"
msgid "_Contents"
msgstr "_Contents"
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1336
+#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
msgid "_Edit"
msgstr "_Edit"
@@ -2507,11 +2517,11 @@ msgid "_Add contact"
msgstr "_Add contact"
#. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5756
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
msgid "_Information"
msgstr "_Information"
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1194
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
msgid "_Search"
msgstr "_Search"
@@ -2731,13 +2741,13 @@ msgstr "Assign Open_PGP Key"
#. Edit Groups
#: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5588
+#: ../src/roster_window.py:5596
msgid "Edit _Groups"
msgstr "Edit _Groups"
#. Rename
#: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5714
+#: ../src/roster_window.py:5722
msgid "_Rename"
msgstr "_Rename"
@@ -2789,49 +2799,48 @@ msgid "Service returned an error."
msgstr "Service returned an error."
#. For i18n
-#: ../src/advanced.py:60
+#: ../src/advanced.py:97
msgid "Activated"
msgstr "Activated"
-#: ../src/advanced.py:60
+#: ../src/advanced.py:97
msgid "Deactivated"
msgstr "Deactivated"
-#: ../src/advanced.py:62
+#: ../src/advanced.py:99
msgid "Boolean"
msgstr "Boolean"
-#: ../src/advanced.py:63
+#: ../src/advanced.py:100
msgid "Integer"
msgstr "Integer"
-#: ../src/advanced.py:64
+#: ../src/advanced.py:101
msgid "Text"
msgstr "Text"
-#: ../src/advanced.py:65
+#: ../src/advanced.py:102
msgid "Color"
msgstr "Colour"
-#: ../src/advanced.py:74
+#: ../src/advanced.py:113
msgid "Preference Name"
msgstr "Preference Name"
-#: ../src/advanced.py:80
+#: ../src/advanced.py:119
msgid "Value"
msgstr "Value"
-#: ../src/advanced.py:88
+#: ../src/advanced.py:127
msgid "Type"
msgstr "Type"
#. we talk about option description in advanced configuration editor
-#: ../src/advanced.py:144
+#: ../src/advanced.py:180
msgid "(None)"
msgstr "(None)"
-#. we talk about password
-#: ../src/advanced.py:247
+#: ../src/advanced.py:263
msgid "Hidden"
msgstr "Hidden"
@@ -2840,203 +2849,226 @@ msgstr "Hidden"
#. #!/bin/sh
#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "English"
msgstr "English"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Belarusian"
msgstr "Belarusian"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Bulgarian"
msgstr "Bulgarian"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Breton"
msgstr "Breton"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Czech"
msgstr "Czech"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "German"
msgstr "German"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Greek"
msgstr "Greek"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "British"
msgstr "British"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Esperanto"
msgstr "Esperanto"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Spanish"
msgstr "Spanish"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Basque"
msgstr "Basque"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "French"
msgstr "French"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Croatian"
msgstr "Croatian"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Italian"
msgstr "Italian"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Norwegian (b)"
msgstr "Norwegian (b)"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Dutch"
msgstr "Dutch"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Norwegian"
msgstr "Norwegian"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Polish"
msgstr "Polish"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Portuguese"
msgstr "Portuguese"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Brazilian Portuguese"
msgstr "Brazilian Portuguese"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Russian"
msgstr "Russian"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Serbian"
msgstr "Serbian"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Slovak"
msgstr "Slovak"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Swedish"
msgstr "Swedish"
-#: ../src/chat_control.py:69
+#: ../src/chat_control.py:68
msgid "Chinese (Ch)"
msgstr "Chinese (Ch)"
-#: ../src/chat_control.py:333
+#: ../src/chat_control.py:332
msgid "Spelling language"
msgstr "Spelling language"
#. we are not connected
-#: ../src/chat_control.py:356 ../src/chat_control.py:549
+#: ../src/chat_control.py:355 ../src/chat_control.py:549
msgid "A connection is not available"
msgstr "A connection is not available"
-#: ../src/chat_control.py:357 ../src/chat_control.py:550
+#: ../src/chat_control.py:356 ../src/chat_control.py:550
msgid "Your message can not be sent until you are connected."
msgstr "Your message can not be sent until you are connected."
-#: ../src/chat_control.py:1142 ../src/chat_control.py:1534
+#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
msgid "GPG encryption enabled"
msgstr "GPG encryption enabled"
#. Add to roster
#. add_to_roster_menuitem
-#: ../src/chat_control.py:1164 ../src/chat_control.py:2014
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:75
-#: ../src/common/helpers.py:289 ../src/conversation_textview.py:843
-#: ../src/dialogs.py:896 ../src/gajim.py:1622 ../src/roster_window.py:926
-#: ../src/roster_window.py:1527 ../src/roster_window.py:1529
-#: ../src/roster_window.py:1869 ../src/roster_window.py:5262
-#: ../src/roster_window.py:5439
+#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
+#: ../src/dialogs.py:913 ../src/gajim.py:1630 ../src/normal_control.py:483
+#: ../src/roster_window.py:916 ../src/roster_window.py:1542
+#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
+#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
+#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
msgid "Not in Roster"
msgstr "Not in Roster"
-#: ../src/chat_control.py:1293 ../src/tooltips.py:629
+#: ../src/chat_control.py:1301 ../src/tooltips.py:627
msgid "Unknown Artist"
msgstr "Unknown Artist"
-#: ../src/chat_control.py:1295 ../src/tooltips.py:634
+#: ../src/chat_control.py:1303 ../src/tooltips.py:632
msgid "Unknown Title"
msgstr "Unknown Title"
-#: ../src/chat_control.py:1297 ../src/tooltips.py:639
+#: ../src/chat_control.py:1305 ../src/tooltips.py:637
msgid "Unknown Source"
msgstr "Unknown Source"
-#: ../src/chat_control.py:1301
+#: ../src/chat_control.py:1309 ../src/tooltips.py:639
#, python-format
-msgid "<b>\"%(title)s\"</b> by "
-msgstr "<b>\"%(title)s\"</b> by "
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
-#: ../src/chat_control.py:1308
-#, python-format
-msgid "%(title)s by %(artist)s\n"
-msgstr "%(title)s by %(artist)s\n"
+#: ../src/chat_control.py:1314
+#, fuzzy, python-format
+msgid ""
+"%(title)s by %(artist)s\n"
+"from %(source)s"
+msgstr ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
-#: ../src/chat_control.py:1435
+#: ../src/chat_control.py:1438
#, python-format
msgid "%(nickname)s from group chat %(room_name)s"
msgstr "%(nickname)s from group chat %(room_name)s"
+#. No key assigned nor a key is used by remote contact
+#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+msgid "No GPG key assigned"
+msgstr ""
+
#: ../src/chat_control.py:1524
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+msgstr ""
+
+#: ../src/chat_control.py:1533
msgid "GPG encryption disabled"
msgstr "GPG encryption disabled"
-#: ../src/chat_control.py:1542 ../src/chat_control.py:1796
-msgid "Session WILL NOT be logged"
-msgstr "Session WILL NOT be logged"
-
-#: ../src/chat_control.py:1544 ../src/chat_control.py:1794
+#: ../src/chat_control.py:1558
msgid "Session WILL be logged"
msgstr "Session WILL be logged"
+#: ../src/chat_control.py:1560
+msgid "Session WILL NOT be logged"
+msgstr "Session WILL NOT be logged"
+
#. encryption %s active
-#: ../src/chat_control.py:1562
+#: ../src/chat_control.py:1574
msgid "is"
msgstr "is"
-#: ../src/chat_control.py:1562
+#: ../src/chat_control.py:1574
msgid "is NOT"
msgstr "is NOT"
#. chat session %s be logged
-#: ../src/chat_control.py:1564
+#: ../src/chat_control.py:1576
msgid "will"
msgstr "will"
-#: ../src/chat_control.py:1564
+#: ../src/chat_control.py:1576
msgid "will NOT"
msgstr "will NOT"
#. About encrypted chat session
-#: ../src/chat_control.py:1568
+#: ../src/chat_control.py:1580
msgid "and authenticated"
msgstr "and authenticated"
#. About encrypted chat session
-#: ../src/chat_control.py:1572
+#: ../src/chat_control.py:1584
msgid "and NOT authenticated"
msgstr "and NOT authenticated"
-#: ../src/chat_control.py:1575
+#. status will become 'is' or 'is not', authentificaed will become
+#. 'and authentificated' or 'and not authentificated', logged will become
+#. 'will' or 'will not'
+#: ../src/chat_control.py:1590
#, python-format
msgid ""
"%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3045,26 +3077,26 @@ msgstr ""
"%(type)s encryption %(status)s active %(authenticated)s.\n"
"Your chat session %(logged)s be logged."
-#: ../src/chat_control.py:1621
+#: ../src/chat_control.py:1638
msgid "Command not supported for zeroconf account."
msgstr "Command not supported for zeroconf account."
-#: ../src/chat_control.py:1632 ../src/groupchat_control.py:1524
+#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
#, python-format
msgid "Commands: %s"
msgstr "Commands: %s"
-#: ../src/chat_control.py:1635 ../src/groupchat_control.py:1538
+#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
#, python-format
msgid "Usage: /%s, clears the text window."
msgstr "Usage: /%s, clears the text window."
-#: ../src/chat_control.py:1638 ../src/groupchat_control.py:1543
+#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
#, python-format
msgid "Usage: /%s, hide the chat buttons."
msgstr "Usage: /%s, hide the chat buttons."
-#: ../src/chat_control.py:1641 ../src/groupchat_control.py:1559
+#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
#, python-format
msgid ""
"Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -3073,30 +3105,41 @@ msgstr ""
"Usage: /%(command)s <action>, sends action to the current group chat. Use "
"third person. (e.g. /%(command)s explodes.)"
-#: ../src/chat_control.py:1646
+#: ../src/chat_control.py:1663
#, python-format
msgid "Usage: /%s, sends a ping to the contact"
msgstr "Usage: /%s, sends a ping to the contact"
-#: ../src/chat_control.py:1649
+#: ../src/chat_control.py:1666
#, python-format
msgid "Usage: /%s, send the message to the contact"
msgstr "Usage: /%s, send the message to the contact"
-#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1582
+#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
#, python-format
msgid "No help info for /%s"
msgstr "No help info for /%s"
-#: ../src/chat_control.py:1783
+#: ../src/chat_control.py:1800
msgid "Session negotiation cancelled"
msgstr "Session negotiation cancelled"
-#: ../src/chat_control.py:1790
-msgid "E2E encryption enabled"
-msgstr "E2E encryption enabled"
+#: ../src/chat_control.py:1807
+#, fuzzy
+msgid "This session is encrypted"
+msgstr "[This message is encrypted]"
-#: ../src/chat_control.py:1801
+#: ../src/chat_control.py:1810
+#, fuzzy
+msgid " and WILL be logged"
+msgstr "Session WILL be logged"
+
+#: ../src/chat_control.py:1812
+#, fuzzy
+msgid " and WILL NOT be logged"
+msgstr "Session WILL NOT be logged"
+
+#: ../src/chat_control.py:1817
msgid ""
"Remote contact's identity not verified. Click the shield button for more "
"details."
@@ -3104,22 +3147,27 @@ msgstr ""
"Remote contact's identity not verified. Click the shield button for more "
"details."
-#: ../src/chat_control.py:1803
+#: ../src/chat_control.py:1819
msgid "E2E encryption disabled"
msgstr "E2E encryption disabled"
-#: ../src/chat_control.py:1832 ../src/chat_control.py:1839
-#: ../src/chat_control.py:1845
-msgid "The following message was "
+#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#, fuzzy
+msgid "The following message was NOT encrypted"
+msgstr "The following message was "
+
+#: ../src/chat_control.py:1854
+#, fuzzy
+msgid "The following message was encrypted"
msgstr "The following message was "
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2193
+#: ../src/chat_control.py:2225
#, python-format
msgid "You just received a new message from \"%s\""
msgstr "You just received a new message from \"%s\""
-#: ../src/chat_control.py:2194
+#: ../src/chat_control.py:2226
msgid ""
"If you close this tab and you have history disabled, this message will be "
"lost."
@@ -3127,20 +3175,24 @@ msgstr ""
"If you close this tab and you have history disabled, this message will be "
"lost."
-#: ../src/chat_control.py:2345 ../src/gajim.py:170
+#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1905
+#: ../src/common/connection_handlers.py:2093
+#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
+#: ../src/gajim.py:170
msgid "Database Error"
msgstr "Database Error"
-#: ../src/chat_control.py:2346 ../src/gajim.py:171
-#, python-format
+#: ../src/chat_control.py:2377
+#, fuzzy, python-format
msgid ""
-"The database file (%s) cannot be read. Try to repare it or remove it (all "
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
"history will be lost)."
msgstr ""
"The database file (%s) cannot be read. Try to repair it or remove it (all "
"history will be lost)."
-#: ../src/chat_control.py:2578
+#: ../src/chat_control.py:2608
#, python-format
msgid "%(name)s is now %(status)s"
msgstr "%(name)s is now %(status)s"
@@ -3210,40 +3262,40 @@ msgstr "Presence description:"
msgid "The status has been changed."
msgstr "The status has been changed."
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:177 ../src/common/commands.py:201
msgid "Leave Groupchats"
msgstr "Leave Groupchats"
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:191
#, python-format
msgid "%(nickname)s on %(room_jid)s"
msgstr "%(nickname)s on %(room_jid)s"
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:195
msgid "You have not joined a groupchat."
msgstr "You have not joined a groupchat."
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:202
msgid "Choose the groupchats you want to leave"
msgstr "Choose the groupchats you want to leave"
#. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/contacts.py:126 ../src/common/helpers.py:75
-#: ../src/roster_window.py:794 ../src/roster_window.py:1531
-#: ../src/roster_window.py:1533 ../src/roster_window.py:5047
+#: ../src/common/commands.py:206 ../src/common/contacts.py:94
+#: ../src/common/helpers.py:73 ../src/roster_window.py:788
+#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
+#: ../src/roster_window.py:5034
msgid "Groupchats"
msgstr "Groupchats"
-#: ../src/common/commands.py:241
+#: ../src/common/commands.py:247
msgid "You left the following groupchats:"
msgstr "You left the following groupchats:"
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:259
msgid "Forward unread messages"
msgstr "Forward unread messages"
-#: ../src/common/commands.py:273
+#: ../src/common/commands.py:279
msgid "All unread messages have been forwarded."
msgstr "All unread messages have been forwarded."
@@ -3283,20 +3335,20 @@ msgstr ""
#. sorted alphanum
#: ../src/common/config.py:112 ../src/common/config.py:448
-#: ../src/common/optparser.py:220 ../src/common/optparser.py:438
-#: ../src/common/optparser.py:472 ../src/gajim.py:3087
+#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
+#: ../src/common/optparser.py:467 ../src/gajim.py:3111
msgid "default"
msgstr "default"
-#: ../src/common/config.py:115
+#: ../src/common/config.py:116
msgid "Enable link-local/zeroconf messaging"
msgstr "Enable link-local/zeroconf messaging"
-#: ../src/common/config.py:118
+#: ../src/common/config.py:119
msgid "Language used by speller"
msgstr "Language used by speller"
-#: ../src/common/config.py:119
+#: ../src/common/config.py:120
msgid ""
"'always' - print time for every message.\n"
"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3306,7 +3358,7 @@ msgstr ""
"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
"'never' - never print time."
-#: ../src/common/config.py:120
+#: ../src/common/config.py:121
msgid ""
"Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3316,17 +3368,17 @@ msgstr ""
"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
"This is used only if print_time is 'sometimes'."
-#: ../src/common/config.py:123
+#: ../src/common/config.py:124
msgid "Treat * / _ pairs as possible formatting characters."
msgstr "Treat * / _ pairs as possible formatting characters."
-#: ../src/common/config.py:124
+#: ../src/common/config.py:125
msgid ""
"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
msgstr ""
"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
-#: ../src/common/config.py:127
+#: ../src/common/config.py:128
msgid ""
"Uses ReStructured text markup to send HTML, plus ascii formatting if "
"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3336,7 +3388,7 @@ msgstr ""
"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
"restructuredtext.html (If you want to use this, install docutils)"
-#: ../src/common/config.py:136
+#: ../src/common/config.py:137
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
@@ -3344,7 +3396,7 @@ msgstr ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
-#: ../src/common/config.py:137
+#: ../src/common/config.py:138
msgid ""
"Character to propose to add after desired nickname when desired nickname is "
"used by someone else in group chat."
@@ -3352,7 +3404,7 @@ msgstr ""
"Character to propose to add after desired nickname when desired nickname is "
"used by someone else in group chat."
-#: ../src/common/config.py:160
+#: ../src/common/config.py:161
msgid ""
"This option let you customize timestamp that is printed in conversation. For "
"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3362,18 +3414,14 @@ msgstr ""
"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
"strftime for full documentation: http://docs.python.org/lib/module-time.html"
-#: ../src/common/config.py:161
+#: ../src/common/config.py:162
msgid "Characters that are printed before the nickname in conversations"
msgstr "Characters that are printed before the nickname in conversations"
-#: ../src/common/config.py:162
+#: ../src/common/config.py:163
msgid "Characters that are printed after the nickname in conversations"
msgstr "Characters that are printed after the nickname in conversations"
-#: ../src/common/config.py:164
-msgid "The username used to identify the Last.fm account."
-msgstr "The username used to identify the Last.fm account."
-
#: ../src/common/config.py:168
msgid "Add * and [n] in roster title?"
msgstr "Add * and [n] in roster title?"
@@ -3695,7 +3743,10 @@ msgid "Smooth scroll message in conversation window"
msgstr "Smooth scroll message in conversation window"
#: ../src/common/config.py:253
-msgid "List of colors that will be used to color nicknames in group chats."
+#, fuzzy
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
msgstr "List of colours that will be used to colour nicknames in group chats."
#: ../src/common/config.py:254
@@ -3915,7 +3966,7 @@ msgstr "'yes', 'no', or 'both'"
msgid "'yes', 'no' or ''"
msgstr "'yes', 'no' or ''"
-#: ../src/common/config.py:415 ../src/common/pep.py:106
+#: ../src/common/config.py:415 ../src/common/pep.py:159
msgid "Sleeping"
msgstr "Sleeping"
@@ -3927,7 +3978,7 @@ msgstr "Back soon"
msgid "Back in some minutes."
msgstr "Back in some minutes."
-#: ../src/common/config.py:417 ../src/common/pep.py:79
+#: ../src/common/config.py:417 ../src/common/pep.py:129
msgid "Eating"
msgstr "Eating"
@@ -3943,7 +3994,7 @@ msgstr "Movie"
msgid "I'm watching a movie."
msgstr "I'm watching a movie."
-#: ../src/common/config.py:419 ../src/common/pep.py:132
+#: ../src/common/config.py:419 ../src/common/pep.py:188
msgid "Working"
msgstr "Working"
@@ -3975,7 +4026,7 @@ msgstr "I'm available."
msgid "I'm free for chat."
msgstr "I'm free for chat."
-#: ../src/common/config.py:427 ../src/config.py:1391
+#: ../src/common/config.py:427 ../src/config.py:1397
msgid "Be right back."
msgstr "Be right back."
@@ -4003,11 +4054,11 @@ msgstr ""
msgid "Sound to play when any MUC message arrives."
msgstr "Sound to play when any MUC message arrives."
-#: ../src/common/config.py:451 ../src/common/optparser.py:234
+#: ../src/common/config.py:451 ../src/common/optparser.py:229
msgid "green"
msgstr "green"
-#: ../src/common/config.py:455 ../src/common/optparser.py:220
+#: ../src/common/config.py:455 ../src/common/optparser.py:215
msgid "grocery"
msgstr "grocery"
@@ -4019,7 +4070,7 @@ msgstr "human"
msgid "marine"
msgstr "marine"
-#: ../src/common/connection_handlers.py:75
+#: ../src/common/connection_handlers.py:71
#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
msgid "Unable to load idle module"
msgstr "Unable to load idle module"
@@ -4033,112 +4084,114 @@ msgstr "Wrong host"
msgid "Invalid local address? :-O"
msgstr "Invalid local address? :-O"
-#: ../src/common/connection_handlers.py:635
+#: ../src/common/connection_handlers.py:639
#, python-format
msgid "Registration information for transport %s has not arrived in time"
msgstr "Registration information for transport %s has not arrived in time"
-#: ../src/common/connection_handlers.py:918
-#: ../src/common/connection_handlers.py:1813
-#: ../src/common/connection_handlers.py:1860
-#: ../src/common/connection_handlers.py:2043
-#: ../src/common/connection_handlers.py:2162 ../src/common/connection.py:1203
+#: ../src/common/connection_handlers.py:930
+#: ../src/common/connection_handlers.py:1857
+#: ../src/common/connection_handlers.py:1903
+#: ../src/common/connection_handlers.py:2091
+#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
#: ../src/gajim.py:392
msgid "Disk Write Error"
msgstr "Disk Write Error"
-#: ../src/common/connection_handlers.py:1121 ../src/common/connection.py:840
+#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
msgid "Invisibility not supported"
msgstr "Invisibility not supported"
-#: ../src/common/connection_handlers.py:1122 ../src/common/connection.py:841
+#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
#, python-format
msgid "Account %s doesn't support invisibility."
msgstr "Account %s doesn't support invisibility."
-#: ../src/common/connection_handlers.py:1929
+#: ../src/common/connection_handlers.py:1860
+#: ../src/common/connection_handlers.py:1906
+#: ../src/common/connection_handlers.py:2094
+#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
+#: ../src/gajim.py:171
+#, fuzzy, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+
+#: ../src/common/connection_handlers.py:1978
#, python-format
msgid "Nickname not allowed: %s"
msgstr "Nickname not allowed: %s"
#. we are banned
#. group chat does not exist
-#: ../src/common/connection_handlers.py:2000
-#: ../src/common/connection_handlers.py:2003
-#: ../src/common/connection_handlers.py:2006
-#: ../src/common/connection_handlers.py:2009
-#: ../src/common/connection_handlers.py:2013
-#: ../src/common/connection_handlers.py:2022
+#. user may close the window before we are here
+#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2056
+#: ../src/common/connection_handlers.py:2059
+#: ../src/common/connection_handlers.py:2062
+#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
msgid "Unable to join group chat"
msgstr "Unable to join group chat"
-#: ../src/common/connection_handlers.py:2001
+#: ../src/common/connection_handlers.py:2054
#, python-format
msgid "You are banned from group chat %s."
msgstr "You are banned from group chat %s."
-#: ../src/common/connection_handlers.py:2004
+#: ../src/common/connection_handlers.py:2057
#, python-format
msgid "Group chat %s does not exist."
msgstr "Group chat %s does not exist."
-#: ../src/common/connection_handlers.py:2007
+#: ../src/common/connection_handlers.py:2060
msgid "Group chat creation is restricted."
msgstr "Group chat creation is restricted."
-#: ../src/common/connection_handlers.py:2010
+#: ../src/common/connection_handlers.py:2063
#, python-format
msgid "Your registered nickname must be used in group chat %s."
msgstr "Your registered nickname must be used in group chat %s."
-#: ../src/common/connection_handlers.py:2014
+#: ../src/common/connection_handlers.py:2067
#, python-format
msgid "You are not in the members list in groupchat %s."
msgstr "You are not in the members list in groupchat %s."
-#: ../src/common/connection_handlers.py:2023
-#, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-
#. Room has been destroyed. see
#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2054
+#: ../src/common/connection_handlers.py:2109
msgid "Room has been destroyed"
msgstr "Room has been destroyed"
-#: ../src/common/connection_handlers.py:2061
+#: ../src/common/connection_handlers.py:2116
#, python-format
msgid "You can join this room instead: %s"
msgstr "You can join this room instead: %s"
-#: ../src/common/connection_handlers.py:2088
+#: ../src/common/connection_handlers.py:2143
msgid "I would like to add you to my roster."
msgstr "I would like to add you to my roster."
#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2109
+#: ../src/common/connection_handlers.py:2164
#, python-format
msgid "we are now subscribed to %s"
msgstr "we are now subscribed to %s"
-#: ../src/common/connection_handlers.py:2111
+#: ../src/common/connection_handlers.py:2166
#, python-format
msgid "unsubscribe request from %s"
msgstr "unsubscribe request from %s"
-#: ../src/common/connection_handlers.py:2113
+#: ../src/common/connection_handlers.py:2168
#, python-format
msgid "we are now unsubscribed from %s"
msgstr "we are now unsubscribed from %s"
-#: ../src/common/connection_handlers.py:2275
+#: ../src/common/connection_handlers.py:2343
#, python-format
msgid ""
"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4148,203 +4201,213 @@ msgstr ""
"management tools such as http://jru.jabberstudio.org/ to remove it"
#. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2300
+#: ../src/common/connection_handlers.py:2368
#: ../src/common/zeroconf/connection_zeroconf.py:172
msgid "OpenPGP passphrase was not given"
msgstr "OpenPGP passphrase was not given"
#. %s is the account name here
-#: ../src/common/connection_handlers.py:2302
+#: ../src/common/connection_handlers.py:2370
#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1920 ../src/roster_window.py:1940
+#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
#, python-format
msgid "You will be connected to %s without OpenPGP."
msgstr "You will be connected to %s without OpenPGP."
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:66
msgid "Unable to get issuer certificate"
msgstr "Unable to get issuer certificate"
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:67
msgid "Unable to get certificate CRL"
msgstr "Unable to get certificate CRL"
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:68
msgid "Unable to decrypt certificate's signature"
msgstr "Unable to decrypt certificate's signature"
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:69
msgid "Unable to decrypt CRL's signature"
msgstr "Unable to decrypt CRL's signature"
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:70
msgid "Unable to decode issuer public key"
msgstr "Unable to decode issuer public key"
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:71
msgid "Certificate signature failure"
msgstr "Certificate signature failure"
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:72
msgid "CRL signature failure"
msgstr "CRL signature failure"
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:73
msgid "Certificate is not yet valid"
msgstr "Certificate is not yet valid"
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:74
msgid "Certificate has expired"
msgstr "Certificate has expired"
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:75
msgid "CRL is not yet valid"
msgstr "CRL is not yet valid"
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:76
msgid "CRL has expired"
msgstr "CRL has expired"
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:77
msgid "Format error in certificate's notBefore field"
msgstr "Format error in certificate's notBefore field"
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:78
msgid "Format error in certificate's notAfter field"
msgstr "Format error in certificate's notAfter field"
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:79
msgid "Format error in CRL's lastUpdate field"
msgstr "Format error in CRL's lastUpdate field"
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:80
msgid "Format error in CRL's nextUpdate field"
msgstr "Format error in CRL's nextUpdate field"
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:81
msgid "Out of memory"
msgstr "Out of memory"
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:82
msgid "Self signed certificate"
msgstr "Self signed certificate"
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:83
msgid "Self signed certificate in certificate chain"
msgstr "Self signed certificate in certificate chain"
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:84
msgid "Unable to get local issuer certificate"
msgstr "Unable to get local issuer certificate"
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:85
msgid "Unable to verify the first certificate"
msgstr "Unable to verify the first certificate"
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:86
msgid "Certificate chain too long"
msgstr "Certificate chain too long"
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:87
msgid "Certificate revoked"
msgstr "Certificate revoked"
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:88
msgid "Invalid CA certificate"
msgstr "Invalid CA certificate"
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:89
msgid "Path length constraint exceeded"
msgstr "Path length constraint exceeded"
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:90
msgid "Unsupported certificate purpose"
msgstr "Unsupported certificate purpose"
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:91
msgid "Certificate not trusted"
msgstr "Certificate not trusted"
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:92
msgid "Certificate rejected"
msgstr "Certificate rejected"
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:93
msgid "Subject issuer mismatch"
msgstr "Subject issuer mismatch"
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:94
msgid "Authority and subject key identifier mismatch"
msgstr "Authority and subject key identifier mismatch"
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:95
msgid "Authority and issuer serial number mismatch"
msgstr "Authority and issuer serial number mismatch"
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:96
msgid "Key usage does not include certificate signing"
msgstr "Key usage does not include certificate signing"
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:97
msgid "Application verification failure"
msgstr "Application verification failure"
-#: ../src/common/connection.py:268
+#: ../src/common/connection.py:266
#: ../src/common/zeroconf/connection_zeroconf.py:214
#, python-format
msgid "Connection with account \"%s\" has been lost"
msgstr "Connection with account \"%s\" has been lost"
-#: ../src/common/connection.py:269
+#: ../src/common/connection.py:267
msgid "Reconnect manually."
msgstr "Reconnect manually."
-#: ../src/common/connection.py:280
+#: ../src/common/connection.py:278
#, python-format
msgid "Server %(name)s answered wrongly to register request: %(error)s"
msgstr "Server %(name)s answered wrongly to register request: %(error)s"
-#: ../src/common/connection.py:314
+#: ../src/common/connection.py:312
#, python-format
msgid "Server %s provided a different registration form"
msgstr "Server %s provided a different registration form"
-#: ../src/common/connection.py:330
+#: ../src/common/connection.py:325
#, python-format
msgid "Unknown SSL error: %d"
msgstr "Unknown SSL error: %d"
#. wrong answer
-#: ../src/common/connection.py:345
+#: ../src/common/connection.py:340
msgid "Invalid answer"
msgstr "Invalid answer"
-#: ../src/common/connection.py:346
+#: ../src/common/connection.py:341
#, python-format
msgid "Transport %(name)s answered wrongly to register request: %(error)s"
msgstr "Transport %(name)s answered wrongly to register request: %(error)s"
-#: ../src/common/connection.py:527
+#: ../src/common/connection.py:522
msgid "Connection to proxy failed"
msgstr "Connection to proxy failed"
-#: ../src/common/connection.py:612 ../src/common/connection.py:703
-#: ../src/common/connection.py:1332
+#: ../src/common/connection.py:610 ../src/common/connection.py:711
+#: ../src/common/connection.py:1362
#: ../src/common/zeroconf/connection_zeroconf.py:248
#, python-format
msgid "Could not connect to \"%s\""
msgstr "Could not connect to \"%s\""
-#: ../src/common/connection.py:613 ../src/gajim.py:1040
+#: ../src/common/connection.py:611 ../src/gajim.py:1052
msgid "Check your connection or try again later."
msgstr "Check your connection or try again later."
-#: ../src/common/connection.py:660
+#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#, fuzzy, python-format
+msgid "Could not connect to account %s"
+msgstr "Could not connect to \"%s\""
+
+#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#, fuzzy, python-format
+msgid "Connection with account %s has been lost. Retry connecting."
+msgstr "Connection with account \"%s\" has been lost"
+
+#: ../src/common/connection.py:666
#, python-format
msgid "The authenticity of the %s certificate could be invalid."
msgstr "The authenticity of the %s certificate could be invalid."
-#: ../src/common/connection.py:663
+#: ../src/common/connection.py:669
#, python-format
msgid ""
"\n"
@@ -4353,7 +4416,7 @@ msgstr ""
"\n"
"SSL Error: <b>%s</b>"
-#: ../src/common/connection.py:665
+#: ../src/common/connection.py:671
#, python-format
msgid ""
"\n"
@@ -4362,24 +4425,24 @@ msgstr ""
"\n"
"Unknown SSL error: %d"
-#: ../src/common/connection.py:704
+#: ../src/common/connection.py:712
msgid "Check your connection or try again later"
msgstr "Check your connection or try again later"
-#: ../src/common/connection.py:729
+#: ../src/common/connection.py:737
#, python-format
msgid "Authentication failed with \"%s\""
msgstr "Authentication failed with \"%s\""
-#: ../src/common/connection.py:731
+#: ../src/common/connection.py:739
msgid "Please check your login and password for correctness."
msgstr "Please check your login and password for correctness."
-#: ../src/common/connection.py:792
+#: ../src/common/connection.py:800
msgid "Error while removing privacy list"
msgstr "Error while removing privacy list"
-#: ../src/common/connection.py:793
+#: ../src/common/connection.py:801
#, python-format
msgid ""
"Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4388,12 +4451,12 @@ msgstr ""
"Privacy list %s has not been removed. It is maybe active in one of your "
"connected resources. Deactivate it and try again."
-#: ../src/common/connection.py:1084
+#: ../src/common/connection.py:1094
#: ../src/common/zeroconf/connection_zeroconf.py:381
msgid "Neither the remote presence is signed, nor a key was assigned."
msgstr "Neither the remote presence is signed, nor a key was assigned."
-#: ../src/common/connection.py:1086
+#: ../src/common/connection.py:1096
#: ../src/common/zeroconf/connection_zeroconf.py:383
#, python-format
msgid "The contact's key (%s) does not match the key assigned in Gajim."
@@ -4401,11 +4464,11 @@ msgstr "The contact's key (%s) does not match the key assigned in Gajim."
#. we're not english
#. one in locale and one en
-#: ../src/common/connection.py:1095
+#: ../src/common/connection.py:1105
msgid "[This message is *encrypted* (See :XEP:`27`]"
msgstr "[This message is *encrypted* (See :XEP:`27`]"
-#: ../src/common/connection.py:1193
+#: ../src/common/connection.py:1217
#: ../src/common/zeroconf/connection_zeroconf.py:445
#, python-format
msgid ""
@@ -4415,32 +4478,32 @@ msgstr ""
"Subject: %(subject)s\n"
"%(message)s"
-#: ../src/common/connection.py:1365
+#: ../src/common/connection.py:1395
msgid "Not fetched because of invisible status"
msgstr "Not fetched because of invisible status"
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:75
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
msgid "Observers"
msgstr "Observers"
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:347
-#: ../src/common/helpers.py:75 ../src/disco.py:116 ../src/disco.py:117
-#: ../src/disco.py:1333 ../src/gajim.py:791 ../src/roster_window.py:828
-#: ../src/roster_window.py:1456 ../src/roster_window.py:1523
-#: ../src/roster_window.py:1525 ../src/roster_window.py:1668
+#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
+#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
+#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
+#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
msgid "Transports"
msgstr "Transports"
-#: ../src/common/contacts.py:355
+#: ../src/common/contacts.py:356
msgid "Not in roster"
msgstr "Not in roster"
#. only say that to non Windows users
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:47
msgid "D-Bus python bindings are missing in this computer"
msgstr "D-Bus python bindings are missing in this computer"
-#: ../src/common/dbus_support.py:49
+#: ../src/common/dbus_support.py:48
msgid "D-Bus capabilities of Gajim cannot be used"
msgstr "D-Bus capabilities of Gajim cannot be used"
@@ -4619,250 +4682,250 @@ msgstr "End of week"
msgid "Weekend!"
msgstr "Weekend!"
-#: ../src/common/helpers.py:146
+#: ../src/common/helpers.py:158
msgid "Invalid character in username."
msgstr "Invalid character in username."
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:163
msgid "Server address required."
msgstr "Server address required."
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:169
msgid "Invalid character in hostname."
msgstr "Invalid character in hostname."
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:176
msgid "Invalid character in resource."
msgstr "Invalid character in resource."
#. GiB means gibibyte
-#: ../src/common/helpers.py:202
+#: ../src/common/helpers.py:216
#, python-format
msgid "%s GiB"
msgstr "%s GiB"
#. GB means gigabyte
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
#, python-format
msgid "%s GB"
msgstr "%s GB"
#. MiB means mibibyte
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:223
#, python-format
msgid "%s MiB"
msgstr "%s MiB"
#. MB means megabyte
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:226
#, python-format
msgid "%s MB"
msgstr "%s MB"
#. KiB means kibibyte
-#: ../src/common/helpers.py:216
+#: ../src/common/helpers.py:230
#, python-format
msgid "%s KiB"
msgstr "%s KiB"
#. KB means kilo bytes
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:233
#, python-format
msgid "%s KB"
msgstr "%s KB"
#. B means bytes
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
#, python-format
msgid "%s B"
msgstr "%s B"
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:267
msgid "_Busy"
msgstr "_Busy"
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:269
msgid "Busy"
msgstr "Busy"
-#: ../src/common/helpers.py:258
+#: ../src/common/helpers.py:272
msgid "_Not Available"
msgstr "_Not Available"
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:277
msgid "_Free for Chat"
msgstr "_Free for Chat"
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
msgid "Free for Chat"
msgstr "Free for Chat"
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
msgid "_Available"
msgstr "_Available"
-#: ../src/common/helpers.py:270 ../src/features_window.py:121
+#: ../src/common/helpers.py:284 ../src/features_window.py:121
msgid "Available"
msgstr "Available"
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:286
msgid "Connecting"
msgstr "Connecting"
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
msgid "A_way"
msgstr "A_way"
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
msgid "_Offline"
msgstr "_Offline"
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:296
msgid "Offline"
msgstr "Offline"
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:299
msgid "_Invisible"
msgstr "_Invisible"
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:305
msgid "?contact has status:Unknown"
msgstr "Unknown"
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:307
msgid "?contact has status:Has errors"
msgstr "Has errors"
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:312
msgid "?Subscription we already have:None"
msgstr "None"
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:314
msgid "To"
msgstr "To"
-#: ../src/common/helpers.py:304
+#: ../src/common/helpers.py:318
msgid "Both"
msgstr "Both"
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:326
msgid "?Ask (for Subscription):None"
msgstr "None"
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:328
msgid "Subscribe"
msgstr "Subscribe"
-#: ../src/common/helpers.py:323
+#: ../src/common/helpers.py:337
msgid "?Group Chat Contact Role:None"
msgstr "None"
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:340
msgid "Moderators"
msgstr "Moderators"
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:342
msgid "Moderator"
msgstr "Moderator"
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:345
msgid "Participants"
msgstr "Participants"
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:347
msgid "Participant"
msgstr "Participant"
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:350
msgid "Visitors"
msgstr "Visitors"
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:352
msgid "Visitor"
msgstr "Visitor"
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:358
msgid "?Group Chat Contact Affiliation:None"
msgstr "None"
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:360
msgid "Owner"
msgstr "Owner"
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:362
msgid "Administrator"
msgstr "Administrator"
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:364
msgid "Member"
msgstr "Member"
-#: ../src/common/helpers.py:388
+#: ../src/common/helpers.py:401
msgid "is paying attention to the conversation"
msgstr "is paying attention to the conversation"
-#: ../src/common/helpers.py:390
+#: ../src/common/helpers.py:403
msgid "is doing something else"
msgstr "is doing something else"
-#: ../src/common/helpers.py:392
+#: ../src/common/helpers.py:405
msgid "is composing a message..."
msgstr "is composing a message..."
#. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:395
+#: ../src/common/helpers.py:408
msgid "paused composing a message"
msgstr "paused composing a message"
-#: ../src/common/helpers.py:397
+#: ../src/common/helpers.py:410
msgid "has closed the chat window or tab"
msgstr "has closed the chat window or tab"
-#: ../src/common/helpers.py:979 ../src/common/helpers.py:986
+#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
#, python-format
msgid "%d message pending"
msgid_plural "%d messages pending"
msgstr[0] "%d message pending"
msgstr[1] "%d messages pending"
-#: ../src/common/helpers.py:992
+#: ../src/common/helpers.py:1005
#, python-format
msgid " from room %s"
msgstr " from room %s"
-#: ../src/common/helpers.py:995 ../src/common/helpers.py:1014
+#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
#, python-format
msgid " from user %s"
msgstr " from user %s"
-#: ../src/common/helpers.py:997
+#: ../src/common/helpers.py:1010
#, python-format
msgid " from %s"
msgstr " from %s"
-#: ../src/common/helpers.py:1004 ../src/common/helpers.py:1011
+#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
#, python-format
msgid "%d event pending"
msgid_plural "%d events pending"
msgstr[0] "%d event pending"
msgstr[1] "%d events pending"
-#: ../src/common/helpers.py:1044
+#: ../src/common/helpers.py:1057
#, python-format
msgid "Gajim - %s"
msgstr "Gajim - %s"
#. we talk about a file
-#: ../src/common/optparser.py:73
+#: ../src/common/optparser.py:56
#, python-format
msgid "error: cannot open %s for reading"
msgstr "error: cannot open %s for reading"
-#: ../src/common/optparser.py:229 ../src/common/optparser.py:230
+#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
msgid "cyan"
msgstr "cyan"
-#: ../src/common/optparser.py:346
+#: ../src/common/optparser.py:341
msgid "migrating logs database to indices"
msgstr "migrating logs database to indices"
@@ -4875,520 +4938,669 @@ msgstr "Gajim account %s"
msgid "Afraid"
msgstr "Afraid"
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
msgid "Amazed"
msgstr "Amazed"
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
+#, fuzzy
+msgid "Amorous"
+msgstr "Aroused"
+
+#: ../src/common/pep.py:32
msgid "Angry"
msgstr "Angry"
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:33
msgid "Annoyed"
msgstr "Annoyed"
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:34
msgid "Anxious"
msgstr "Anxious"
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:35
msgid "Aroused"
msgstr "Aroused"
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:36
msgid "Ashamed"
msgstr "Ashamed"
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:37
msgid "Bored"
msgstr "Bored"
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:38
msgid "Brave"
msgstr "Brave"
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:39
msgid "Calm"
msgstr "Calm"
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:40
+#, fuzzy
+msgid "Cautious"
+msgstr "Curious"
+
+#: ../src/common/pep.py:41
msgid "Cold"
msgstr "Cold"
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:42
+#, fuzzy
+msgid "Confident"
+msgstr "_Contents"
+
+#: ../src/common/pep.py:43
msgid "Confused"
msgstr "Confused"
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:44
+#, fuzzy
+msgid "Contemplative"
+msgstr "Contented"
+
+#: ../src/common/pep.py:45
msgid "Contented"
msgstr "Contented"
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:46
msgid "Cranky"
msgstr "Cranky"
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:47
+#, fuzzy
+msgid "Crazy"
+msgstr "Cranky"
+
+#: ../src/common/pep.py:48
+#, fuzzy
+msgid "Creative"
+msgstr "Deactivated"
+
+#: ../src/common/pep.py:49
msgid "Curious"
msgstr "Curious"
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:50
+#, fuzzy
+msgid "Dejected"
+msgstr "Delete"
+
+#: ../src/common/pep.py:51
msgid "Depressed"
msgstr "Depressed"
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:52
msgid "Disappointed"
msgstr "Disappointed"
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:53
msgid "Disgusted"
msgstr "Disgusted"
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:54
+#, fuzzy
+msgid "Dismayed"
+msgstr "Disabled"
+
+#: ../src/common/pep.py:55
msgid "Distracted"
msgstr "Distracted"
-#: ../src/common/pep.py:38
-msgid "Embarassed"
+#: ../src/common/pep.py:56
+#, fuzzy
+msgid "Embarrassed"
msgstr "Embarrassed"
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:57
+#, fuzzy
+msgid "Envious"
+msgstr "Anxious"
+
+#: ../src/common/pep.py:58
msgid "Excited"
msgstr "Excited"
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:59
msgid "Flirtatious"
msgstr "Flirtatious"
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:60
msgid "Frustrated"
msgstr "Frustrated"
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:61
+msgid "Grateful"
+msgstr ""
+
+#: ../src/common/pep.py:62
+#, fuzzy
+msgid "Grieving"
+msgstr "Driving"
+
+#: ../src/common/pep.py:63
msgid "Grumpy"
msgstr "Grumpy"
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:64
msgid "Guilty"
msgstr "Guilty"
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:65
msgid "Happy"
msgstr "Happy"
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:66
+msgid "Hopeful"
+msgstr ""
+
+#: ../src/common/pep.py:67
msgid "Hot"
msgstr "Hot"
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:68
msgid "Humbled"
msgstr "Humbled"
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:69
msgid "Humiliated"
msgstr "Humiliated"
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:70
msgid "Hungry"
msgstr "Hungry"
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:71
msgid "Hurt"
msgstr "Hurt"
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:72
msgid "Impressed"
msgstr "Impressed"
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:73
msgid "In Awe"
msgstr "In Awe"
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:74
msgid "In Love"
msgstr "In Love"
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:75
msgid "Indignant"
msgstr "Indignant"
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:76
msgid "Interested"
msgstr "Interested"
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:77
msgid "Intoxicated"
msgstr "Intoxicated"
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:78
msgid "Invincible"
msgstr "Invincible"
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:79
msgid "Jealous"
msgstr "Jealous"
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:80
msgid "Lonely"
msgstr "Lonely"
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:81
+#, fuzzy
+msgid "Lost"
+msgstr "_Host:"
+
+#: ../src/common/pep.py:82
+msgid "Lucky"
+msgstr ""
+
+#: ../src/common/pep.py:83
msgid "Mean"
msgstr "Mean"
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:84
msgid "Moody"
msgstr "Moody"
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:85
msgid "Nervous"
msgstr "Nervous"
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:86
msgid "Neutral"
msgstr "Neutral"
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:87
msgid "Offended"
msgstr "Offended"
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:88
+#, fuzzy
+msgid "Outraged"
+msgstr "Frustrated"
+
+#: ../src/common/pep.py:89
msgid "Playful"
msgstr "Playful"
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:90
msgid "Proud"
msgstr "Proud"
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:91
+#, fuzzy
+msgid "Relaxed"
+msgstr "Relieved"
+
+#: ../src/common/pep.py:92
msgid "Relieved"
msgstr "Relieved"
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:93
msgid "Remorseful"
msgstr "Remorseful"
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:94
msgid "Restless"
msgstr "Restless"
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:95
msgid "Sad"
msgstr "Sad"
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:96
msgid "Sarcastic"
msgstr "Sarcastic"
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:97
+#, fuzzy
+msgid "Satisfied"
+msgstr "Last modified:"
+
+#: ../src/common/pep.py:98
msgid "Serious"
msgstr "Serious"
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:99
msgid "Shocked"
msgstr "Shocked"
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:100
msgid "Shy"
msgstr "Shy"
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:101
msgid "Sick"
msgstr "Sick"
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:102
msgid "Sleepy"
msgstr "Sleepy"
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:103
+msgid "Spontaneous"
+msgstr ""
+
+#: ../src/common/pep.py:104
msgid "Stressed"
msgstr "Stressed"
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:105
+msgid "Strong"
+msgstr ""
+
+#: ../src/common/pep.py:106
msgid "Surprised"
msgstr "Surprised"
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:107
+msgid "Thankful"
+msgstr ""
+
+#: ../src/common/pep.py:108
msgid "Thirsty"
msgstr "Thirsty"
-#: ../src/common/pep.py:59
-msgid "Thoughtful"
-msgstr "Thoughtful"
+#: ../src/common/pep.py:109
+#, fuzzy
+msgid "Tired"
+msgstr "Time"
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:110
+#, fuzzy
+msgid "Undefined"
+msgstr "nine"
+
+#: ../src/common/pep.py:111
+msgid "Weak"
+msgstr ""
+
+#: ../src/common/pep.py:112
msgid "Worried"
msgstr "Worried"
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:115
msgid "Doing Chores"
msgstr "Doing Chores"
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:116
msgid "Buying Groceries"
msgstr "Buying Groceries"
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:117
msgid "Cleaning"
msgstr "Cleaning"
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:118
msgid "Cooking"
msgstr "Cooking"
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:119
msgid "Doing Maintenance"
msgstr "Doing Maintenance"
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:120
msgid "Doing the Dishes"
msgstr "Doing the Dishes"
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:121
msgid "Doing the Laundry"
msgstr "Doing the Laundry"
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:122
msgid "Gardening"
msgstr "Gardening"
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:123
msgid "Running an Errand"
msgstr "Running an Errand"
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:124
msgid "Walking the Dog"
msgstr "Walking the Dog"
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:125
msgid "Drinking"
msgstr "Drinking"
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:126
msgid "Having a Beer"
msgstr "Having a Beer"
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:127
msgid "Having Coffee"
msgstr "Having Coffee"
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:128
msgid "Having Tea"
msgstr "Having Tea"
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:130
msgid "Having a Snack"
msgstr "Having a Snack"
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:131
msgid "Having Breakfast"
msgstr "Having Breakfast"
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:132
msgid "Having Dinner"
msgstr "Having Dinner"
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:133
msgid "Having Lunch"
msgstr "Having Lunch"
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:134
msgid "Exercising"
msgstr "Exercising"
-#: ../src/common/pep.py:85 ../src/common/pep.py:124
+#: ../src/common/pep.py:135 ../src/common/pep.py:180
msgid "Cycling"
msgstr "Cycling"
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:136
+#, fuzzy
+msgid "Dancing"
+msgstr "Cleaning"
+
+#: ../src/common/pep.py:137
msgid "Hiking"
msgstr "Hiking"
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:138
msgid "Jogging"
msgstr "Jogging"
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:139
msgid "Playing Sports"
msgstr "Playing Sports"
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:140
msgid "Running"
msgstr "Running"
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:141
msgid "Skiing"
msgstr "Skiing"
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:142
msgid "Swimming"
msgstr "Swimming"
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:143
msgid "Working out"
msgstr "Working out"
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:144
msgid "Grooming"
msgstr "Grooming"
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:145
msgid "At the Spa"
msgstr "At the Spa"
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:146
msgid "Brushing Teeth"
msgstr "Brushing Teeth"
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:147
msgid "Getting a Haircut"
msgstr "Getting a Haircut"
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:148
msgid "Shaving"
msgstr "Shaving"
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:149
msgid "Taking a Bath"
msgstr "Taking a Bath"
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:150
msgid "Taking a Shower"
msgstr "Taking a Shower"
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:151
msgid "Having an Appointment"
msgstr "Having an Appointment"
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:153
msgid "Day Off"
msgstr "Day Off"
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:154
msgid "Hanging out"
msgstr "Hanging out"
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:155
+#, fuzzy
+msgid "Hiding"
+msgstr "Hiking"
+
+#: ../src/common/pep.py:156
msgid "On Vacation"
msgstr "On Vacation"
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:157
+#, fuzzy
+msgid "Praying"
+msgstr "Partying"
+
+#: ../src/common/pep.py:158
msgid "Scheduled Holiday"
msgstr "Scheduled Holiday"
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:160
+#, fuzzy
+msgid "Thinking"
+msgstr "Drinking"
+
+#: ../src/common/pep.py:161
msgid "Relaxing"
msgstr "Relaxing"
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:162
+#, fuzzy
+msgid "Fishing"
+msgstr "Hiking"
+
+#: ../src/common/pep.py:163
msgid "Gaming"
msgstr "Gaming"
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:164
msgid "Going out"
msgstr "Going out"
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:165
msgid "Partying"
msgstr "Partying"
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:166
msgid "Reading"
msgstr "Reading"
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:167
msgid "Rehearsing"
msgstr "Rehearsing"
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:168
msgid "Shopping"
msgstr "Shopping"
-#: ../src/common/pep.py:114
+#: ../src/common/pep.py:169
+#, fuzzy
+msgid "Smoking"
+msgstr "Skiing"
+
+#: ../src/common/pep.py:170
msgid "Socializing"
msgstr "Socialising"
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:171
msgid "Sunbathing"
msgstr "Sunbathing"
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:172
msgid "Watching TV"
msgstr "Watching TV"
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:173
msgid "Watching a Movie"
msgstr "Watching a Movie"
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:174
msgid "Talking"
msgstr "Talking"
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:175
msgid "In Real Life"
msgstr "In Real Life"
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:176
msgid "On the Phone"
msgstr "On the Phone"
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:177
msgid "On Video Phone"
msgstr "On Video Phone"
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:178
msgid "Traveling"
msgstr "Travelling"
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:179
msgid "Commuting"
msgstr "Commuting"
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:181
msgid "Driving"
msgstr "Driving"
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:182
msgid "In a Car"
msgstr "In a Car"
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:183
msgid "On a Bus"
msgstr "On a Bus"
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:184
msgid "On a Plane"
msgstr "On a Plane"
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:185
msgid "On a Train"
msgstr "On a Train"
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:186
msgid "On a Trip"
msgstr "On a Trip"
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:187
msgid "Walking"
msgstr "Walking"
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:189
msgid "Coding"
msgstr "Coding"
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:190
msgid "In a Meeting"
msgstr "In a Meeting"
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:191
msgid "Studying"
msgstr "Studying"
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:192
msgid "Writing"
msgstr "Writing"
+#. We cannot bind port, call error callback and fail
+#: ../src/common/socks5.py:84
+#, python-format
+msgid "Unable to bind to port %s."
+msgstr "Unable to bind to port %s."
+
+#: ../src/common/socks5.py:85
+msgid ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+msgstr ""
+"Maybe you have another running instance of Gajim. File Transfer will be "
+"cancelled."
+
#. we're not english
-#: ../src/common/stanza_session.py:282
+#: ../src/common/stanza_session.py:278
msgid ""
"[This is part of an encrypted session. If you see this message, something "
"went wrong.]"
@@ -5481,40 +5693,40 @@ msgstr "Contact is offline. Your message could not be sent."
msgid "Error while adding service. %s"
msgstr "Error while adding service. %s"
-#: ../src/config.py:148 ../src/config.py:574
+#: ../src/config.py:150 ../src/config.py:582
msgid "Disabled"
msgstr "Disabled"
-#: ../src/config.py:319
+#: ../src/config.py:321
msgid "Active"
msgstr "Active"
-#: ../src/config.py:327
+#: ../src/config.py:329
msgid "Event"
msgstr "Event"
-#: ../src/config.py:403
+#: ../src/config.py:405
msgid "Default Message"
msgstr "Default Message"
-#: ../src/config.py:410
+#: ../src/config.py:412
msgid "Enabled"
msgstr "Enabled"
-#: ../src/config.py:452
+#: ../src/config.py:454
msgid "Always use OS/X default applications"
msgstr "Always use OS/X default applications"
-#: ../src/config.py:453
+#: ../src/config.py:455
msgid "Custom"
msgstr "Custom"
-#: ../src/config.py:643 ../src/dialogs.py:1198
+#: ../src/config.py:650 ../src/dialogs.py:1209
#, python-format
msgid "Dictionary for lang %s not available"
msgstr "Dictionary for lang %s not available"
-#: ../src/config.py:644
+#: ../src/config.py:651
#, python-format
msgid ""
"You have to install %s dictionary to use spellchecking, or choose another "
@@ -5523,104 +5735,104 @@ msgstr ""
"You have to install %s dictionary to use spellchecking, or choose another "
"language by setting the speller_language option."
-#: ../src/config.py:1009
+#: ../src/config.py:1016
msgid "status message title"
msgstr "status message title"
-#: ../src/config.py:1009
+#: ../src/config.py:1016
msgid "status message text"
msgstr "status message text"
-#: ../src/config.py:1046
+#: ../src/config.py:1053
msgid "First Message Received"
msgstr "First Message Received"
-#: ../src/config.py:1047
+#: ../src/config.py:1054
msgid "Next Message Received Focused"
msgstr "Next Message Received Focused"
-#: ../src/config.py:1049
+#: ../src/config.py:1056
msgid "Next Message Received Unfocused"
msgstr "Next Message Received Unfocused"
-#: ../src/config.py:1050
+#: ../src/config.py:1057
msgid "Contact Connected"
msgstr "Contact Connected"
-#: ../src/config.py:1051
+#: ../src/config.py:1058
msgid "Contact Disconnected"
msgstr "Contact Disconnected"
-#: ../src/config.py:1052
+#: ../src/config.py:1059
msgid "Message Sent"
msgstr "Message Sent"
-#: ../src/config.py:1053
+#: ../src/config.py:1060
msgid "Group Chat Message Highlight"
msgstr "Group Chat Message Highlight"
-#: ../src/config.py:1054
+#: ../src/config.py:1061
msgid "Group Chat Message Received"
msgstr "Group Chat Message Received"
-#: ../src/config.py:1055
+#: ../src/config.py:1062
msgid "GMail Email Received"
msgstr "GMail E-mail Received"
#. Name column
-#: ../src/config.py:1312 ../src/dialogs.py:1822 ../src/dialogs.py:1886
-#: ../src/disco.py:755 ../src/disco.py:1547 ../src/disco.py:1793
-#: ../src/history_window.py:86
+#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
+#: ../src/disco.py:768 ../src/disco.py:1562 ../src/disco.py:1809
+#: ../src/history_window.py:87
msgid "Name"
msgstr "Name"
-#: ../src/config.py:1400
+#: ../src/config.py:1405
msgid "Relogin now?"
msgstr "Relogin now?"
-#: ../src/config.py:1401
+#: ../src/config.py:1406
msgid "If you want all the changes to apply instantly, you must relogin."
msgstr "If you want all the changes to apply instantly, you must relogin."
-#: ../src/config.py:1525 ../src/config.py:1624
+#: ../src/config.py:1531 ../src/config.py:1630
msgid "OpenPGP is not usable in this computer"
msgstr "OpenPGP is not usable in this computer"
-#: ../src/config.py:1660 ../src/config.py:1701
+#: ../src/config.py:1666 ../src/config.py:1709
msgid "Unread events"
msgstr "Unread events"
-#: ../src/config.py:1661
+#: ../src/config.py:1667
msgid "Read all pending events before removing this account."
msgstr "Read all pending events before removing this account."
-#: ../src/config.py:1687
+#: ../src/config.py:1693
#, python-format
msgid "You have opened chat in account %s"
msgstr "You have opened chat in account %s"
-#: ../src/config.py:1688
+#: ../src/config.py:1694
msgid "All chat and groupchat windows will be closed. Do you want to continue?"
msgstr ""
"All chat and groupchat windows will be closed. Do you want to continue?"
-#: ../src/config.py:1697
+#: ../src/config.py:1705
msgid "You are currently connected to the server"
msgstr "You are currently connected to the server"
-#: ../src/config.py:1698
+#: ../src/config.py:1706
msgid "To change the account name, you must be disconnected."
msgstr "To change the account name, you must be disconnected."
-#: ../src/config.py:1702
+#: ../src/config.py:1710
msgid "To change the account name, you must read all pending events."
msgstr "To change the account name, you must read all pending events."
-#: ../src/config.py:1708
+#: ../src/config.py:1716
msgid "Account Name Already Used"
msgstr "Account Name Already Used"
-#: ../src/config.py:1709
+#: ../src/config.py:1717
msgid ""
"This name is already used by another of your accounts. Please choose another "
"name."
@@ -5628,144 +5840,144 @@ msgstr ""
"This name is already used by another of your accounts. Please choose another "
"name."
-#: ../src/config.py:1713 ../src/config.py:1717
+#: ../src/config.py:1721 ../src/config.py:1725
msgid "Invalid account name"
msgstr "Invalid account name"
-#: ../src/config.py:1714
+#: ../src/config.py:1722
msgid "Account name cannot be empty."
msgstr "Account name cannot be empty."
-#: ../src/config.py:1718
+#: ../src/config.py:1726
msgid "Account name cannot contain spaces."
msgstr "Account name cannot contain spaces."
-#: ../src/config.py:1789
+#: ../src/config.py:1800
msgid "Rename Account"
msgstr "Rename Account"
-#: ../src/config.py:1790
+#: ../src/config.py:1801
#, python-format
msgid "Enter a new name for account %s"
msgstr "Enter a new name for account %s"
-#: ../src/config.py:1808 ../src/config.py:1816 ../src/config.py:1858
-#: ../src/config.py:3085 ../src/dataforms_widget.py:536
+#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
+#: ../src/config.py:3089 ../src/dataforms_widget.py:536
msgid "Invalid Jabber ID"
msgstr "Invalid Jabber ID"
-#: ../src/config.py:1817
+#: ../src/config.py:1828
msgid "A Jabber ID must be in the form \"user@servername\"."
msgstr "A Jabber ID must be in the form \"user@servername\"."
-#: ../src/config.py:2006 ../src/config.py:3157
+#: ../src/config.py:2018 ../src/config.py:3161
msgid "Invalid entry"
msgstr "Invalid entry"
-#: ../src/config.py:2007 ../src/config.py:3158
+#: ../src/config.py:2019 ../src/config.py:3162
msgid "Custom port must be a port number."
msgstr "Custom port must be a port number."
-#: ../src/config.py:2028
+#: ../src/config.py:2040
msgid "Failed to get secret keys"
msgstr "Failed to get secret keys"
-#: ../src/config.py:2029
+#: ../src/config.py:2041
msgid "There was a problem retrieving your OpenPGP secret keys."
msgstr "There was a problem retrieving your OpenPGP secret keys."
-#: ../src/config.py:2064
+#: ../src/config.py:2076
msgid "OpenPGP Key Selection"
msgstr "OpenPGP Key Selection"
-#: ../src/config.py:2065
+#: ../src/config.py:2077
msgid "Choose your OpenPGP key"
msgstr "Choose your OpenPGP key"
-#: ../src/config.py:2076
+#: ../src/config.py:2088
msgid "No such account available"
msgstr "No such account available"
-#: ../src/config.py:2077
+#: ../src/config.py:2089
msgid "You must create your account before editing your personal information."
msgstr "You must create your account before editing your personal information."
-#: ../src/config.py:2084 ../src/dialogs.py:1674 ../src/dialogs.py:1810
-#: ../src/dialogs.py:1990 ../src/disco.py:438 ../src/profile_window.py:320
+#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
+#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
msgid "You are not connected to the server"
msgstr "You are not connected to the server"
-#: ../src/config.py:2085
+#: ../src/config.py:2097
msgid "Without a connection, you can not edit your personal information."
msgstr "Without a connection, you can not edit your personal information."
-#: ../src/config.py:2089
+#: ../src/config.py:2101
msgid "Your server doesn't support Vcard"
msgstr "Your server doesn't support Vcard"
-#: ../src/config.py:2090
+#: ../src/config.py:2102
msgid "Your server can't save your personal information."
msgstr "Your server can't save your personal information."
-#: ../src/config.py:2121
+#: ../src/config.py:2133
msgid "Account Local already exists."
msgstr "Account Local already exists."
-#: ../src/config.py:2122
+#: ../src/config.py:2134
msgid "Please rename or remove it before enabling link-local messaging."
msgstr "Please rename or remove it before enabling link-local messaging."
-#: ../src/config.py:2305
+#: ../src/config.py:2317
#, python-format
msgid "Edit %s"
msgstr "Edit %s"
-#: ../src/config.py:2307
+#: ../src/config.py:2319
#, python-format
msgid "Register to %s"
msgstr "Register to %s"
#. list at the beginning
-#: ../src/config.py:2343
+#: ../src/config.py:2355
msgid "Ban List"
msgstr "Ban List"
-#: ../src/config.py:2344
+#: ../src/config.py:2356
msgid "Member List"
msgstr "Member List"
-#: ../src/config.py:2345
+#: ../src/config.py:2357
msgid "Owner List"
msgstr "Owner List"
-#: ../src/config.py:2346
+#: ../src/config.py:2358
msgid "Administrator List"
msgstr "Administrator List"
#. Address column
#. holds JID (who said this)
-#: ../src/config.py:2395 ../src/disco.py:762 ../src/history_manager.py:184
+#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
msgid "JID"
msgstr "JID"
-#: ../src/config.py:2403
+#: ../src/config.py:2415
msgid "Reason"
msgstr "Reason"
-#: ../src/config.py:2408
+#: ../src/config.py:2420
msgid "Nick"
msgstr "Nick"
-#: ../src/config.py:2412
+#: ../src/config.py:2424
msgid "Role"
msgstr "Role"
-#: ../src/config.py:2437
+#: ../src/config.py:2449
msgid "Banning..."
msgstr "Banning..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2439
+#: ../src/config.py:2451
msgid ""
"<b>Whom do you want to ban?</b>\n"
"\n"
@@ -5773,11 +5985,11 @@ msgstr ""
"<b>Whom do you want to ban?</b>\n"
"\n"
-#: ../src/config.py:2441
+#: ../src/config.py:2453
msgid "Adding Member..."
msgstr "Adding Member..."
-#: ../src/config.py:2442
+#: ../src/config.py:2454
msgid ""
"<b>Whom do you want to make a member?</b>\n"
"\n"
@@ -5785,11 +5997,11 @@ msgstr ""
"<b>Whom do you want to make a member?</b>\n"
"\n"
-#: ../src/config.py:2444
+#: ../src/config.py:2456
msgid "Adding Owner..."
msgstr "Adding Owner..."
-#: ../src/config.py:2445
+#: ../src/config.py:2457
msgid ""
"<b>Whom do you want to make an owner?</b>\n"
"\n"
@@ -5797,11 +6009,11 @@ msgstr ""
"<b>Whom do you want to make an owner?</b>\n"
"\n"
-#: ../src/config.py:2447
+#: ../src/config.py:2459
msgid "Adding Administrator..."
msgstr "Adding Administrator..."
-#: ../src/config.py:2448
+#: ../src/config.py:2460
msgid ""
"<b>Whom do you want to make an administrator?</b>\n"
"\n"
@@ -5809,7 +6021,7 @@ msgstr ""
"<b>Whom do you want to make an administrator?</b>\n"
"\n"
-#: ../src/config.py:2449
+#: ../src/config.py:2461
msgid ""
"Can be one of the following:\n"
"1. user@domain/resource (only that resource matches).\n"
@@ -5825,84 +6037,84 @@ msgstr ""
"4. domain (the domain itself matches, as does any user@domain,\n"
"domain/resource, or address containing a subdomain."
-#: ../src/config.py:2552
+#: ../src/config.py:2558
#, python-format
msgid "Removing %s account"
msgstr "Removing %s account"
-#: ../src/config.py:2574 ../src/gajim.py:1411 ../src/roster_window.py:1932
+#: ../src/config.py:2580 ../src/gajim.py:1421 ../src/roster_window.py:1943
msgid "Password Required"
msgstr "Password Required"
-#: ../src/config.py:2575 ../src/roster_window.py:1906
+#: ../src/config.py:2581 ../src/roster_window.py:1917
#, python-format
msgid "Enter your password for account %s"
msgstr "Enter your password for account %s"
-#: ../src/config.py:2576 ../src/roster_window.py:1933
+#: ../src/config.py:2582 ../src/roster_window.py:1944
msgid "Save password"
msgstr "Save password"
-#: ../src/config.py:2585
+#: ../src/config.py:2591
#, python-format
msgid "Account \"%s\" is connected to the server"
msgstr "Account \"%s\" is connected to the server"
-#: ../src/config.py:2586
+#: ../src/config.py:2592
msgid "If you remove it, the connection will be lost."
msgstr "If you remove it, the connection will be lost."
-#: ../src/config.py:2682
+#: ../src/config.py:2688
msgid "Default"
msgstr "Default"
-#: ../src/config.py:2682
+#: ../src/config.py:2688
msgid "?print_status:All"
msgstr "All"
-#: ../src/config.py:2683
+#: ../src/config.py:2689
msgid "Enter and leave only"
msgstr "Enter and leave only"
-#: ../src/config.py:2684
+#: ../src/config.py:2690
msgid "?print_status:None"
msgstr "None"
-#: ../src/config.py:2753
+#: ../src/config.py:2758
msgid "New Group Chat"
msgstr "New Group Chat"
-#: ../src/config.py:2786
+#: ../src/config.py:2791
msgid "This bookmark has invalid data"
msgstr "This bookmark has invalid data"
-#: ../src/config.py:2787
+#: ../src/config.py:2792
msgid ""
"Please be sure to fill out server and room fields or remove this bookmark."
msgstr ""
"Please be sure to fill out server and room fields or remove this bookmark."
-#: ../src/config.py:3068
+#: ../src/config.py:3072
msgid "Invalid username"
msgstr "Invalid username"
-#: ../src/config.py:3070
+#: ../src/config.py:3074
msgid "You must provide a username to configure this account."
msgstr "You must provide a username to configure this account."
-#: ../src/config.py:3096
+#: ../src/config.py:3100
msgid "Duplicate Jabber ID"
msgstr "Duplicate Jabber ID"
-#: ../src/config.py:3097
+#: ../src/config.py:3101
msgid "This account is already configured in Gajim."
msgstr "This account is already configured in Gajim."
-#: ../src/config.py:3114
+#: ../src/config.py:3118
msgid "Account has been added successfully"
msgstr "Account has been added successfully"
-#: ../src/config.py:3115 ../src/config.py:3302
+#: ../src/config.py:3119 ../src/config.py:3308
msgid ""
"You can set advanced account options by pressing the Advanced button, or "
"later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -5912,24 +6124,24 @@ msgstr ""
"later by choosing the Accounts menuitem under the Edit menu from the main "
"window."
-#: ../src/config.py:3133
+#: ../src/config.py:3137
msgid "Invalid server"
msgstr "Invalid server"
-#: ../src/config.py:3134
+#: ../src/config.py:3138
msgid "Please provide a server on which you want to register."
msgstr "Please provide a server on which you want to register."
-#: ../src/config.py:3185 ../src/gajim.py:1983
+#: ../src/config.py:3189 ../src/gajim.py:1993
msgid "Certificate Already in File"
msgstr "Certificate Already in File"
-#: ../src/config.py:3186 ../src/gajim.py:1984
+#: ../src/config.py:3190 ../src/gajim.py:1994
#, python-format
msgid "This certificate is already in file %s, so it's not added again."
msgstr "This certificate is already in file %s, so it's not added again."
-#: ../src/config.py:3254
+#: ../src/config.py:3258
#, python-format
msgid ""
"<b>Security Warning</b>\n"
@@ -5944,7 +6156,7 @@ msgstr ""
"SSL Error: %(error)s\n"
"Do you still want to connect to this server?"
-#: ../src/config.py:3260 ../src/gajim.py:2007
+#: ../src/config.py:3264 ../src/gajim.py:2017
#, python-format
msgid ""
"Add this certificate to the list of trusted certificates.\n"
@@ -5955,23 +6167,23 @@ msgstr ""
"SHA1 fingerprint of the certificate:\n"
"%s"
-#: ../src/config.py:3281 ../src/config.py:3320
+#: ../src/config.py:3287 ../src/config.py:3326
msgid "An error occurred during account creation"
msgstr "An error occurred during account creation"
-#: ../src/config.py:3301
+#: ../src/config.py:3307
msgid "Your new account has been created successfully"
msgstr "Your new account has been successfully created"
-#: ../src/config.py:3404
+#: ../src/config.py:3410
msgid "Account name is in use"
msgstr "Account name is in use"
-#: ../src/config.py:3405
+#: ../src/config.py:3411
msgid "You already have an account using this name."
msgstr "You already have an account using this name."
-#: ../src/conversation_textview.py:547
+#: ../src/conversation_textview.py:549
msgid ""
"This icon indicates that this message has not yet\n"
"been received by the remote end. If this icon stays\n"
@@ -5981,7 +6193,7 @@ msgstr ""
"been received by the remote end. If this icon stays\n"
"for a long time, it's likely the message got lost."
-#: ../src/conversation_textview.py:566
+#: ../src/conversation_textview.py:568
msgid ""
"Text below this line is what has been said since the\n"
"last time you paid attention to this group chat"
@@ -5989,51 +6201,56 @@ msgstr ""
"Text below this line is what has been said since the\n"
"last time you paid attention to this group chat"
-#: ../src/conversation_textview.py:676
+#: ../src/conversation_textview.py:678
#, python-format
msgid "_Actions for \"%s\""
msgstr "_Actions for \"%s\""
-#: ../src/conversation_textview.py:688
+#: ../src/conversation_textview.py:690
msgid "Read _Wikipedia Article"
msgstr "Read _Wikipedia Article"
-#: ../src/conversation_textview.py:693
+#: ../src/conversation_textview.py:695
msgid "Look it up in _Dictionary"
msgstr "Look it up in _Dictionary"
-#: ../src/conversation_textview.py:710
+#: ../src/conversation_textview.py:712
#, python-format
msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
msgstr "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
#. we must have %s in the url
-#: ../src/conversation_textview.py:723
+#: ../src/conversation_textview.py:725
#, python-format
msgid "Web Search URL is missing an \"%s\""
msgstr "Web Search URL is missing an \"%s\""
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:728
msgid "Web _Search for it"
msgstr "Web _Search for it"
-#: ../src/conversation_textview.py:732
+#: ../src/conversation_textview.py:734
msgid "Open as _Link"
msgstr "Open as _Link"
-#: ../src/conversation_textview.py:1221
+#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
+#, fuzzy, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr "error while sending %(message)s ( %(error)s )"
+
+#: ../src/conversation_textview.py:1238
msgid "Yesterday"
msgstr "Yesterday"
#. the number is >= 2
#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1225
+#: ../src/conversation_textview.py:1242
#, python-format
msgid "%i days ago"
msgstr "%i days ago"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:1259
+#: ../src/conversation_textview.py:1276
#, python-format
msgid "Subject: %s\n"
msgstr "Subject: %s\n"
@@ -6066,156 +6283,143 @@ msgstr "Contact name: <i>%s</i>"
msgid "Jabber ID: <i>%s</i>"
msgstr "Jabber ID: <i>%s</i>"
-#: ../src/dialogs.py:186
+#: ../src/dialogs.py:187
msgid "Group"
msgstr "Group"
-#: ../src/dialogs.py:193
+#: ../src/dialogs.py:194
msgid "In the group"
msgstr "In the group"
-#: ../src/dialogs.py:278
+#: ../src/dialogs.py:279
msgid "KeyID"
msgstr "KeyID"
-#: ../src/dialogs.py:283
+#: ../src/dialogs.py:284
msgid "Contact name"
msgstr "Contact name"
-#: ../src/dialogs.py:452
+#: ../src/dialogs.py:461
msgid "Set Mood"
msgstr "Set Mood"
-#: ../src/dialogs.py:540
+#: ../src/dialogs.py:558
#, python-format
msgid "%s Status Message"
msgstr "%s Status Message"
-#: ../src/dialogs.py:542
+#: ../src/dialogs.py:560
msgid "Status Message"
msgstr "Status Message"
-#: ../src/dialogs.py:654
+#: ../src/dialogs.py:672
msgid "Overwrite Status Message?"
msgstr "Overwrite Status Message?"
-#: ../src/dialogs.py:655
+#: ../src/dialogs.py:673
msgid ""
"This name is already used. Do you want to overwrite this status message?"
msgstr ""
"This name is already used. Do you want to overwrite this status message?"
-#: ../src/dialogs.py:664
+#: ../src/dialogs.py:682
msgid "Save as Preset Status Message"
msgstr "Save as Preset Status Message"
-#: ../src/dialogs.py:665
+#: ../src/dialogs.py:683
msgid "Please type a name for this status message"
msgstr "Please type a name for this status message"
-#: ../src/dialogs.py:671
+#: ../src/dialogs.py:689
msgid "AIM Address:"
msgstr "AIM Address:"
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:690
msgid "GG Number:"
msgstr "GG Number:"
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:691
msgid "ICQ Number:"
msgstr "ICQ Number:"
-#: ../src/dialogs.py:674
+#: ../src/dialogs.py:692
msgid "MSN Address:"
msgstr "MSN Address:"
-#: ../src/dialogs.py:675
+#: ../src/dialogs.py:693
msgid "Yahoo! Address:"
msgstr "Yahoo! Address:"
-#: ../src/dialogs.py:712
+#: ../src/dialogs.py:729
#, python-format
msgid "Please fill in the data of the contact you want to add in account %s"
msgstr "Please fill in the data of the contact you want to add in account %s"
-#: ../src/dialogs.py:714
+#: ../src/dialogs.py:731
msgid "Please fill in the data of the contact you want to add"
msgstr "Please fill in the data of the contact you want to add"
-#: ../src/dialogs.py:871 ../src/dialogs.py:877 ../src/dialogs.py:882
+#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
msgid "Invalid User ID"
msgstr "Invalid User ID"
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:895
msgid "The user ID must not contain a resource."
msgstr "The user ID must not contain a resource."
-#: ../src/dialogs.py:883
+#: ../src/dialogs.py:900
msgid "You cannot add yourself to your roster."
msgstr "You cannot add yourself to your roster."
-#: ../src/dialogs.py:897
+#: ../src/dialogs.py:914
msgid "Contact already in roster"
msgstr "Contact already in roster"
-#: ../src/dialogs.py:898
+#: ../src/dialogs.py:915
msgid "This contact is already listed in your roster."
msgstr "This contact is already listed in your roster."
-#: ../src/dialogs.py:934
+#: ../src/dialogs.py:951
msgid "User ID:"
msgstr "User ID:"
-#: ../src/dialogs.py:992
+#: ../src/dialogs.py:1009
msgid "A GTK+ jabber client"
msgstr "A GTK+ jabber client"
-#: ../src/dialogs.py:993
+#: ../src/dialogs.py:1010
msgid "GTK+ Version:"
msgstr "GTK+ Version:"
-#: ../src/dialogs.py:994
+#: ../src/dialogs.py:1011
msgid "PyGTK Version:"
msgstr "PyGTK Version:"
-#: ../src/dialogs.py:1004
+#: ../src/dialogs.py:1021
msgid "Current Developers:"
msgstr "Current Developers:"
-#: ../src/dialogs.py:1006
+#: ../src/dialogs.py:1023
msgid "Past Developers:"
msgstr "Past Developers:"
-#: ../src/dialogs.py:1012
+#: ../src/dialogs.py:1029
msgid "THANKS:"
msgstr "THANKS:"
#. remove one english sentence
#. and add it manually as translatable
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1035
msgid "Last but not least, we would like to thank all the package maintainers."
msgstr ""
"Last but not least, we would like to thank all the package maintainers."
#. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1031
+#: ../src/dialogs.py:1048
msgid "translator-credits"
msgstr "Jeff Bailes <thepizzaking@gmail.com>"
-#: ../src/dialogs.py:1191
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "Unable to bind to port %s."
-
-#: ../src/dialogs.py:1192
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-
-#: ../src/dialogs.py:1199
+#: ../src/dialogs.py:1210
#, python-format
msgid ""
"You have to install %s dictionary to use spellchecking, or choose another "
@@ -6228,88 +6432,88 @@ msgstr ""
"\n"
"Highlighting misspelt words feature will not be used"
-#: ../src/dialogs.py:1603
+#: ../src/dialogs.py:1614
#, python-format
msgid "Subscription request for account %(account)s from %(jid)s"
msgstr "Subscription request for account %(account)s from %(jid)s"
-#: ../src/dialogs.py:1606
+#: ../src/dialogs.py:1617
#, python-format
msgid "Subscription request from %s"
msgstr "Subscription request from %s"
-#: ../src/dialogs.py:1667 ../src/gajim.py:2589
+#: ../src/dialogs.py:1678 ../src/gajim.py:2614
#, python-format
msgid "You are already in group chat %s"
msgstr "You are already in group chat %s"
-#: ../src/dialogs.py:1675
+#: ../src/dialogs.py:1686
msgid "You can not join a group chat unless you are connected."
msgstr "You can not join a group chat unless you are connected."
-#: ../src/dialogs.py:1694
+#: ../src/dialogs.py:1705
#, python-format
msgid "Join Group Chat with account %s"
msgstr "Join Group Chat with account %s"
-#: ../src/dialogs.py:1765
+#: ../src/dialogs.py:1776
msgid "Invalid Nickname"
msgstr "Invalid Nickname"
-#: ../src/dialogs.py:1766 ../src/groupchat_control.py:1329
-#: ../src/groupchat_control.py:1601
+#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
+#: ../src/groupchat_control.py:1734
msgid "The nickname has not allowed characters."
msgstr "The nickname has not allowed characters."
-#: ../src/dialogs.py:1770 ../src/dialogs.py:1776
-#: ../src/groupchat_control.py:1766
+#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
+#: ../src/groupchat_control.py:1901
msgid "Invalid group chat Jabber ID"
msgstr "Invalid group chat Jabber ID"
-#: ../src/dialogs.py:1771 ../src/dialogs.py:1777
-#: ../src/groupchat_control.py:1767
+#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
+#: ../src/groupchat_control.py:1902
msgid "The group chat Jabber ID has not allowed characters."
msgstr "The group chat Jabber ID has invalid characters."
-#: ../src/dialogs.py:1783
+#: ../src/dialogs.py:1794
msgid "This is not a group chat"
msgstr "This is not a group chat"
-#: ../src/dialogs.py:1784
+#: ../src/dialogs.py:1795
#, python-format
msgid "%s is not the name of a group chat."
msgstr "%s is not the name of a group chat."
-#: ../src/dialogs.py:1811
+#: ../src/dialogs.py:1822
msgid "Without a connection, you can not synchronise your contacts."
msgstr "Without a connection, you can not synchronise your contacts."
-#: ../src/dialogs.py:1825
+#: ../src/dialogs.py:1836
msgid "Server"
msgstr "Server"
-#: ../src/dialogs.py:1858
+#: ../src/dialogs.py:1869
msgid "This account is not connected to the server"
msgstr "This account is not connected to the server"
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1870
msgid "You cannot synchronize with an account unless it is connected."
msgstr "You cannot synchronise with an account unless it is connected."
-#: ../src/dialogs.py:1883
+#: ../src/dialogs.py:1894
msgid "Synchronise"
msgstr "Synchronise"
-#: ../src/dialogs.py:1941
+#: ../src/dialogs.py:1952
#, python-format
msgid "Start Chat with account %s"
msgstr "Start Chat with account %s"
-#: ../src/dialogs.py:1943
+#: ../src/dialogs.py:1954
msgid "Start Chat"
msgstr "Start Chat"
-#: ../src/dialogs.py:1944
+#: ../src/dialogs.py:1955
msgid ""
"Fill in the nickname or the Jabber ID of the contact you would like\n"
"to send a chat message to:"
@@ -6318,311 +6522,325 @@ msgstr ""
"to send a chat message to:"
#. if offline or connecting
-#: ../src/dialogs.py:1969 ../src/dialogs.py:2344 ../src/dialogs.py:2487
+#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
+#: ../src/normal_control.py:640
msgid "Connection not available"
msgstr "Connection not available"
-#: ../src/dialogs.py:1970 ../src/dialogs.py:2345 ../src/dialogs.py:2488
+#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
+#: ../src/normal_control.py:641
#, python-format
msgid "Please make sure you are connected with \"%s\"."
msgstr "Please make sure you are connected with \"%s\"."
-#: ../src/dialogs.py:1979 ../src/dialogs.py:1982
+#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
msgid "Invalid JID"
msgstr "Invalid JID"
-#: ../src/dialogs.py:1982
+#: ../src/dialogs.py:1992
#, python-format
msgid "Unable to parse \"%s\"."
msgstr "Unable to parse \"%s\"."
-#: ../src/dialogs.py:1991
+#: ../src/dialogs.py:2001
msgid "Without a connection, you can not change your password."
msgstr "Without a connection, you can not change your password."
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2020
msgid "Invalid password"
msgstr "Invalid password"
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2020
msgid "You must enter a password."
msgstr "You must enter a password."
-#: ../src/dialogs.py:2014
+#: ../src/dialogs.py:2024
msgid "Passwords do not match"
msgstr "Passwords do not match"
-#: ../src/dialogs.py:2015
+#: ../src/dialogs.py:2025
msgid "The passwords typed in both fields must be identical."
msgstr "The passwords typed in both fields must be identical."
#. img to display
#. default value
-#: ../src/dialogs.py:2054 ../src/notify.py:246 ../src/notify.py:460
+#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
#: ../src/osx/growler.py:12
msgid "Contact Signed In"
msgstr "Contact Signed In"
-#: ../src/dialogs.py:2056 ../src/notify.py:254 ../src/notify.py:462
+#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
#: ../src/osx/growler.py:12
msgid "Contact Signed Out"
msgstr "Contact Signed Out"
#. chat message
-#: ../src/dialogs.py:2058 ../src/notify.py:277 ../src/notify.py:464
+#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
#: ../src/osx/growler.py:12
msgid "New Message"
msgstr "New Message"
#. single message
-#: ../src/dialogs.py:2058 ../src/notify.py:258 ../src/notify.py:464
+#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
#: ../src/osx/growler.py:13
msgid "New Single Message"
msgstr "New Single Message"
#. private message
-#: ../src/dialogs.py:2059 ../src/notify.py:265 ../src/notify.py:465
+#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
#: ../src/osx/growler.py:13
msgid "New Private Message"
msgstr "New Private Message"
-#: ../src/dialogs.py:2059 ../src/gajim.py:1576 ../src/notify.py:473
+#: ../src/dialogs.py:2069 ../src/gajim.py:1584 ../src/notify.py:472
#: ../src/osx/growler.py:13
msgid "New E-mail"
msgstr "New E-mail"
-#: ../src/dialogs.py:2061 ../src/gajim.py:1642 ../src/notify.py:467
+#: ../src/dialogs.py:2071 ../src/gajim.py:1650 ../src/notify.py:466
#: ../src/osx/growler.py:14
msgid "File Transfer Request"
msgstr "File Transfer Request"
-#: ../src/dialogs.py:2063 ../src/gajim.py:1541 ../src/gajim.py:1609
-#: ../src/notify.py:469 ../src/osx/growler.py:14
+#: ../src/dialogs.py:2073 ../src/gajim.py:1550 ../src/gajim.py:1617
+#: ../src/notify.py:468 ../src/osx/growler.py:14
msgid "File Transfer Error"
msgstr "File Transfer Error"
-#: ../src/dialogs.py:2065 ../src/gajim.py:1681 ../src/gajim.py:1703
-#: ../src/gajim.py:1720 ../src/notify.py:471 ../src/osx/growler.py:15
+#: ../src/dialogs.py:2075 ../src/gajim.py:1692 ../src/gajim.py:1714
+#: ../src/gajim.py:1731 ../src/notify.py:470 ../src/osx/growler.py:15
msgid "File Transfer Completed"
msgstr "File Transfer Completed"
-#: ../src/dialogs.py:2066 ../src/gajim.py:1684 ../src/notify.py:471
+#: ../src/dialogs.py:2076 ../src/gajim.py:1695 ../src/notify.py:470
#: ../src/osx/growler.py:15
msgid "File Transfer Stopped"
msgstr "File Transfer Stopped"
-#: ../src/dialogs.py:2068 ../src/gajim.py:1432 ../src/notify.py:475
+#: ../src/dialogs.py:2078 ../src/gajim.py:1442 ../src/notify.py:474
#: ../src/osx/growler.py:16
msgid "Groupchat Invitation"
msgstr "Groupchat Invitation"
-#: ../src/dialogs.py:2070 ../src/notify.py:238 ../src/notify.py:477
+#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
#: ../src/osx/growler.py:16
msgid "Contact Changed Status"
msgstr "Contact Changed Status"
-#: ../src/dialogs.py:2263
+#: ../src/dialogs.py:2272 ../src/normal_control.py:241
#, python-format
msgid "Single Message using account %s"
msgstr "Single Message using account %s"
-#: ../src/dialogs.py:2265
+#: ../src/dialogs.py:2274 ../src/normal_control.py:243
#, python-format
msgid "Single Message in account %s"
msgstr "Single Message in account %s"
-#: ../src/dialogs.py:2267
+#: ../src/dialogs.py:2276 ../src/normal_control.py:245
msgid "Single Message"
msgstr "Single Message"
#. prepare UI for Sending
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2279 ../src/normal_control.py:248
#, python-format
msgid "Send %s"
msgstr "Send %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2293
+#: ../src/dialogs.py:2302 ../src/normal_control.py:290
#, python-format
msgid "Received %s"
msgstr "Received %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2316
+#: ../src/dialogs.py:2325 ../src/normal_control.py:324
#, python-format
msgid "Form %s"
msgstr "Form %s"
#. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2388
+#: ../src/dialogs.py:2397 ../src/normal_control.py:692
#, python-format
msgid "RE: %s"
msgstr "RE: %s"
-#: ../src/dialogs.py:2389
+#: ../src/dialogs.py:2398 ../src/normal_control.py:696
#, python-format
msgid "%s wrote:\n"
msgstr "%s wrote:\n"
-#: ../src/dialogs.py:2433
+#: ../src/dialogs.py:2442
#, python-format
msgid "XML Console for %s"
msgstr "XML Console for %s"
-#: ../src/dialogs.py:2435
+#: ../src/dialogs.py:2444
msgid "XML Console"
msgstr "XML Console"
-#: ../src/dialogs.py:2559
+#: ../src/dialogs.py:2568
#, python-format
msgid "Privacy List <b><i>%s</i></b>"
msgstr "Privacy List <b><i>%s</i></b>"
-#: ../src/dialogs.py:2563
+#: ../src/dialogs.py:2572
#, python-format
msgid "Privacy List for %s"
msgstr "Privacy List for %s"
-#: ../src/dialogs.py:2619
+#: ../src/dialogs.py:2628
#, python-format
msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
msgstr "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
-#: ../src/dialogs.py:2624
+#: ../src/dialogs.py:2633
#, python-format
msgid "Order: %(order)s, action: %(action)s"
msgstr "Order: %(order)s, action: %(action)s"
-#: ../src/dialogs.py:2666
+#: ../src/dialogs.py:2675
msgid "<b>Edit a rule</b>"
msgstr "<b>Edit a rule</b>"
-#: ../src/dialogs.py:2753
+#: ../src/dialogs.py:2762
msgid "<b>Add a rule</b>"
msgstr "<b>Add a rule</b>"
-#: ../src/dialogs.py:2849
+#: ../src/dialogs.py:2858
#, python-format
msgid "Privacy Lists for %s"
msgstr "Privacy Lists for %s"
-#: ../src/dialogs.py:2851
+#: ../src/dialogs.py:2860
msgid "Privacy Lists"
msgstr "Privacy Lists"
-#: ../src/dialogs.py:2921
+#: ../src/dialogs.py:2930
msgid "Invalid List Name"
msgstr "Invalid List Name"
-#: ../src/dialogs.py:2922
+#: ../src/dialogs.py:2931
msgid "You must enter a name to create a privacy list."
msgstr "You must enter a name to create a privacy list."
-#: ../src/dialogs.py:2955
+#: ../src/dialogs.py:2963
msgid "You are invited to a groupchat"
msgstr "You are invited to a groupchat"
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:2966
msgid "$Contact has invited you to join a discussion"
msgstr "$Contact has invited you to join a discussion"
-#: ../src/dialogs.py:2960
+#: ../src/dialogs.py:2968
#, python-format
msgid "$Contact has invited you to group chat %(room_jid)s"
msgstr "$Contact has invited you to group chat %(room_jid)s"
-#: ../src/dialogs.py:2968
+#: ../src/dialogs.py:2976
#, python-format
msgid "Comment: %s"
msgstr "Comment: %s"
-#: ../src/dialogs.py:2970
+#: ../src/dialogs.py:2978
msgid "Do you want to accept the invitation?"
msgstr "Do you want to accept the invitation?"
-#: ../src/dialogs.py:3025
+#: ../src/dialogs.py:3033
msgid "Choose Sound"
msgstr "Choose Sound"
-#: ../src/dialogs.py:3035 ../src/dialogs.py:3086
+#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
msgid "All files"
msgstr "All files"
-#: ../src/dialogs.py:3040
+#: ../src/dialogs.py:3048
msgid "Wav Sounds"
msgstr "Wav Sounds"
-#: ../src/dialogs.py:3073
+#: ../src/dialogs.py:3081
msgid "Choose Image"
msgstr "Choose Image"
-#: ../src/dialogs.py:3091
+#: ../src/dialogs.py:3099
msgid "Images"
msgstr "Images"
-#: ../src/dialogs.py:3156
+#: ../src/dialogs.py:3164
#, python-format
msgid "When %s becomes:"
msgstr "When %s becomes:"
-#: ../src/dialogs.py:3158
+#: ../src/dialogs.py:3166
#, python-format
msgid "Adding Special Notification for %s"
msgstr "Adding Special Notification for %s"
#. # means number
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3237
msgid "#"
msgstr "#"
-#: ../src/dialogs.py:3235
+#: ../src/dialogs.py:3243
msgid "Condition"
msgstr "Condition"
-#: ../src/dialogs.py:3353
+#: ../src/dialogs.py:3361
msgid "when I am "
msgstr "when I am "
-#: ../src/dialogs.py:3827
-#, python-format
+#: ../src/dialogs.py:3836
+#, fuzzy, python-format
msgid ""
-"Your chat session with %(jid)s is encrypted.\n"
+"Your chat session with <b>%(jid)s</b> is encrypted.\n"
"\n"
-"This session's Short Authentication String is %(sas)s."
+"This session's Short Authentication String is <b>%(sas)s</b>."
msgstr ""
"Your chat session with %(jid)s is encrypted.\n"
"\n"
"This session's Short Authentication String is %(sas)s."
-#: ../src/dialogs.py:3831
+#: ../src/dialogs.py:3840
msgid "You have already verified this contact's identity."
msgstr "You have already verified this contact's identity."
-#: ../src/dialogs.py:3836
+#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
msgid "Contact's identity verified"
msgstr "Contact's identity verified"
-#: ../src/dialogs.py:3840
+#: ../src/dialogs.py:3854
+msgid "Verify again..."
+msgstr ""
+
+#: ../src/dialogs.py:3859
+#, fuzzy
msgid ""
-"To be certain that only the expected person can read your messages or send "
-"you messages, you need to verify their identity."
+"To be certain that <b>only</b> the expected person can read your messages or "
+"send you messages, you need to verify their identity by clicking the button "
+"below."
msgstr ""
"To be certain that only the expected person can read your messages or send "
"you messages, you need to verify their identity."
-#: ../src/dialogs.py:3842
+#: ../src/dialogs.py:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
msgid "Contact's identity NOT verified"
msgstr "Contact's identity NOT verified"
-#: ../src/dialogs.py:3854
-msgid "Have you verified the remote contact's identity?"
+#: ../src/dialogs.py:3869
+#, fuzzy
+msgid "Verify..."
+msgstr "_Verify"
+
+#: ../src/dialogs.py:3881
+#, fuzzy
+msgid "Have you verified the contact's identity?"
msgstr "Have you verified the remote contact's identity?"
-#: ../src/dialogs.py:3855
-#, python-format
+#: ../src/dialogs.py:3882
+#, fuzzy, python-format
msgid ""
-"To prevent a man-in-the-middle attack, you should speak to %(jid)s directly "
-"(in person or on the phone) and verify that they see the same Short "
+"To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
+"directly (in person or on the phone) and verify that they see the same Short "
"Authentication String (SAS) as you.\n"
"\n"
"This session's Short Authentication String is <b>%(sas)s</b>."
@@ -6633,37 +6851,58 @@ msgstr ""
"\n"
"This session's Short Authentication String is <b>%(sas)s</b>."
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:3883
msgid "Did you talk to the remote contact and verify the SAS?"
msgstr "Did you talk to the remote contact and verify the SAS?"
-#: ../src/disco.py:115
+#: ../src/dialogs.py:3915
+#, fuzzy, python-format
+msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
+msgstr "The contact's key (%s) does not match the key assigned in Gajim."
+
+#: ../src/dialogs.py:3921
+msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+msgstr ""
+
+#: ../src/dialogs.py:3928
+msgid ""
+"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
+"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+msgstr ""
+
+#: ../src/dialogs.py:3934
+msgid ""
+"GPG Key is assigned to this contact, and you trust his key, so messages will "
+"be encrypted."
+msgstr ""
+
+#: ../src/disco.py:116
msgid "Others"
msgstr "Others"
#. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:119
+#: ../src/disco.py:120
msgid "Conference"
msgstr "Conference"
-#: ../src/disco.py:439
+#: ../src/disco.py:440
msgid "Without a connection, you can not browse available services"
msgstr "Without a connection, you can not browse available services"
-#: ../src/disco.py:513
+#: ../src/disco.py:514
#, python-format
msgid "Service Discovery using account %s"
msgstr "Service Discovery using account %s"
-#: ../src/disco.py:515
+#: ../src/disco.py:516
msgid "Service Discovery"
msgstr "Service Discovery"
-#: ../src/disco.py:655
+#: ../src/disco.py:656
msgid "The service could not be found"
msgstr "The service could not be found"
-#: ../src/disco.py:656
+#: ../src/disco.py:657
msgid ""
"There is no service at the address you entered, or it is not responding. "
"Check the address and try again."
@@ -6671,72 +6910,77 @@ msgstr ""
"There is no service at the address you entered, or it is not responding. "
"Check the address and try again."
-#: ../src/disco.py:660 ../src/disco.py:942
+#: ../src/disco.py:661 ../src/disco.py:955
msgid "The service is not browsable"
msgstr "The service is not browsable"
-#: ../src/disco.py:661
+#: ../src/disco.py:662
msgid "This type of service does not contain any items to browse."
msgstr "This type of service does not contain any items to browse."
-#: ../src/disco.py:741
+#: ../src/disco.py:699 ../src/disco.py:709
+#, fuzzy
+msgid "Invalid Server Name"
+msgstr "Invalid server"
+
+#: ../src/disco.py:754
#, python-format
msgid "Browsing %(address)s using account %(account)s"
msgstr "Browsing %(address)s using account %(account)s"
-#: ../src/disco.py:781
+#: ../src/disco.py:794
msgid "_Browse"
msgstr "_Browse"
-#: ../src/disco.py:943
+#: ../src/disco.py:956
msgid "This service does not contain any items to browse."
msgstr "This service does not contain any items to browse."
-#: ../src/disco.py:1164
+#: ../src/disco.py:1179
msgid "_Execute Command"
msgstr "_Execute Command"
-#: ../src/disco.py:1174 ../src/disco.py:1338
+#: ../src/disco.py:1189 ../src/disco.py:1353
msgid "Re_gister"
msgstr "Re_gister"
-#: ../src/disco.py:1375
+#: ../src/disco.py:1390
#, python-format
msgid "Scanning %(current)d / %(total)d.."
msgstr "Scanning %(current)d / %(total)d.."
#. Users column
-#: ../src/disco.py:1557
+#: ../src/disco.py:1572
msgid "Users"
msgstr "Users"
#. Description column
-#: ../src/disco.py:1565
+#: ../src/disco.py:1580
msgid "Description"
msgstr "Description"
#. Id column
-#: ../src/disco.py:1573
+#: ../src/disco.py:1588
msgid "Id"
msgstr "Id"
-#: ../src/disco.py:1802
+#: ../src/disco.py:1818
msgid "Subscribed"
msgstr "Subscribed"
-#: ../src/disco.py:1810
+#: ../src/disco.py:1826
msgid "Node"
msgstr "Node"
-#: ../src/disco.py:1867
+#: ../src/disco.py:1883
msgid "New post"
msgstr "New post"
-#: ../src/disco.py:1873
+#: ../src/disco.py:1889
msgid "_Subscribe"
msgstr "_Subscribe"
-#: ../src/disco.py:1879
+#: ../src/disco.py:1895
msgid "_Unsubscribe"
msgstr "_Unsubscribe"
@@ -6775,7 +7019,8 @@ msgid "gajim-remote"
msgstr "gajim-remote"
#: ../src/features_window.py:60
-msgid "A script to controle Gajim via commandline."
+#, fuzzy
+msgid "A script to control Gajim via commandline."
msgstr "A script to control Gajim via commandline."
#: ../src/features_window.py:61
@@ -6785,7 +7030,7 @@ msgstr "Requires python-dbus."
#: ../src/features_window.py:62 ../src/features_window.py:66
#: ../src/features_window.py:70 ../src/features_window.py:74
#: ../src/features_window.py:78 ../src/features_window.py:86
-#: ../src/features_window.py:90 ../src/features_window.py:102
+#: ../src/features_window.py:90
msgid "Feature not available under Windows."
msgstr "Feature not available under Windows."
@@ -6924,9 +7169,19 @@ msgid "Transform LaTeX expressions between $$ $$."
msgstr "Transform LaTeX expressions between $$ $$."
#: ../src/features_window.py:101
+#, fuzzy
msgid ""
+"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
+"in the Advanced Configuration Editor."
+msgstr ""
"Requires texlive-latex-base, dvips and imagemagick. You have to set "
"'use_latex' to True in the Advanced Configuration Editor."
+
+#: ../src/features_window.py:102
+#, fuzzy
+msgid ""
+"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
+"'use_latex' to True in the Advanced Configuration Editor."
msgstr ""
"Requires texlive-latex-base, dvips and imagemagick. You have to set "
"'use_latex' to True in the Advanced Configuration Editor."
@@ -6987,106 +7242,106 @@ msgstr "Time"
msgid "Progress"
msgstr "Progress"
-#: ../src/filetransfers_window.py:163 ../src/filetransfers_window.py:217
+#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
#, python-format
msgid "Filename: %s"
msgstr "Filename: %s"
-#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:303
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
#, python-format
msgid "Size: %s"
msgstr "Size: %s"
#. You is a reply of who sent a file
#. You is a reply of who received a file
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183
+#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
#: ../src/history_manager.py:499
msgid "You"
msgstr "You"
-#: ../src/filetransfers_window.py:174
+#: ../src/filetransfers_window.py:184
#, python-format
msgid "Sender: %s"
msgstr "Sender: %s"
-#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:598
-#: ../src/tooltips.py:673
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:671
msgid "Recipient: "
msgstr "Recipient: "
-#: ../src/filetransfers_window.py:186
+#: ../src/filetransfers_window.py:196
#, python-format
msgid "Saved in: %s"
msgstr "Saved in: %s"
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:198
msgid "File transfer completed"
msgstr "File transfer completed"
-#: ../src/filetransfers_window.py:202 ../src/filetransfers_window.py:208
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
msgid "File transfer cancelled"
msgstr "File transfer cancelled"
-#: ../src/filetransfers_window.py:202 ../src/filetransfers_window.py:209
+#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
msgid "Connection with peer cannot be established."
msgstr "Connection with peer cannot be established."
-#: ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:228
#, python-format
msgid "Recipient: %s"
msgstr "Recipient: %s"
-#: ../src/filetransfers_window.py:220
+#: ../src/filetransfers_window.py:230
#, python-format
msgid "Error message: %s"
msgstr "Error message: %s"
-#: ../src/filetransfers_window.py:221
+#: ../src/filetransfers_window.py:231
msgid "File transfer stopped by the contact at the other end"
msgstr "File transfer stopped by the contact at the other end"
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:252
msgid "Choose File to Send..."
msgstr "Choose File to Send..."
-#: ../src/filetransfers_window.py:258 ../src/tooltips.py:713
+#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
msgid "Description: "
msgstr "Description: "
-#: ../src/filetransfers_window.py:269
+#: ../src/filetransfers_window.py:279
msgid "Gajim cannot access this file"
msgstr "Gajim cannot access this file"
-#: ../src/filetransfers_window.py:270
+#: ../src/filetransfers_window.py:280
msgid "This file is being used by another process."
msgstr "This file is being used by another process."
-#: ../src/filetransfers_window.py:301
+#: ../src/filetransfers_window.py:311
#, python-format
msgid "File: %s"
msgstr "File: %s"
-#: ../src/filetransfers_window.py:306
+#: ../src/filetransfers_window.py:316
#, python-format
msgid "Type: %s"
msgstr "Type: %s"
-#: ../src/filetransfers_window.py:308
+#: ../src/filetransfers_window.py:318
#, python-format
msgid "Description: %s"
msgstr "Description: %s"
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:319
#, python-format
msgid "%s wants to send you a file:"
msgstr "%s wants to send you a file:"
-#: ../src/filetransfers_window.py:322 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
#, python-format
msgid "Cannot overwrite existing file \"%s\""
msgstr "Cannot overwrite existing file \"%s\""
-#: ../src/filetransfers_window.py:323 ../src/gtkgui_helpers.py:823
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
msgid ""
"A file with this name already exists and you do not have permission to "
"overwrite it."
@@ -7094,33 +7349,33 @@ msgstr ""
"A file with this name already exists and you do not have permission to "
"overwrite it."
-#: ../src/filetransfers_window.py:339 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
msgid "This file already exists"
msgstr "This file already exists"
-#: ../src/filetransfers_window.py:339 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
msgid "What do you want to do?"
msgstr "What do you want to do?"
#. read-only bit is used to mark special folder under windows,
#. not to mark that a folder is read-only. See ticket #3587
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:834
#, python-format
msgid "Directory \"%s\" is not writable"
msgstr "Directory \"%s\" is not writable"
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
msgid "You do not have permission to create files in this directory."
msgstr "You do not have permission to create files in this directory."
-#: ../src/filetransfers_window.py:359
+#: ../src/filetransfers_window.py:369
msgid "Save File as..."
msgstr "Save File as..."
#. Print remaining time in format 00:00:00
#. You can change the places of (hours), (minutes), (seconds) -
#. they are not translatable.
-#: ../src/filetransfers_window.py:439
+#: ../src/filetransfers_window.py:435
#, python-format
msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7128,32 +7383,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
#. This should make the string Kb/s,
#. where 'Kb' part is taken from %s.
#. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:528
+#: ../src/filetransfers_window.py:526
#, python-format
msgid "(%(filesize_unit)s/s)"
msgstr "(%(filesize_unit)s/s)"
-#: ../src/filetransfers_window.py:568 ../src/filetransfers_window.py:571
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
msgid "Invalid File"
msgstr "Invalid File"
-#: ../src/filetransfers_window.py:568
+#: ../src/filetransfers_window.py:566
msgid "File: "
msgstr "File: "
-#: ../src/filetransfers_window.py:572
+#: ../src/filetransfers_window.py:570
msgid "It is not possible to send empty files"
msgstr "It is not possible to send empty files"
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:663
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
msgid "Name: "
msgstr "Name: "
-#: ../src/filetransfers_window.py:596 ../src/tooltips.py:667
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
msgid "Sender: "
msgstr "Sender: "
-#: ../src/filetransfers_window.py:784
+#: ../src/filetransfers_window.py:782
msgid "Pause"
msgstr "Pause"
@@ -7231,68 +7486,79 @@ msgstr ""
"Another instance of Gajim seems to be running\n"
"Run anyway?"
-#: ../src/gajim.py:483
+#: ../src/gajim.py:493
msgid "Passphrase Required"
msgstr "Passphrase Required"
-#: ../src/gajim.py:484
+#: ../src/gajim.py:494
#, python-format
msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
msgstr "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
#. ask again
-#: ../src/gajim.py:499
+#: ../src/gajim.py:509
msgid "Wrong Passphrase"
msgstr "Wrong Passphrase"
-#: ../src/gajim.py:500
+#: ../src/gajim.py:510
msgid "Please retype your GPG passphrase or press Cancel."
msgstr "Please retype your GPG passphrase or press Cancel."
-#: ../src/gajim.py:560
+#: ../src/gajim.py:557
+#, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+
+#: ../src/gajim.py:571
msgid "Do you accept this request?"
msgstr "Do you accept this request?"
-#: ../src/gajim.py:562
+#: ../src/gajim.py:573
#, python-format
msgid "Do you accept this request on account %s?"
msgstr "Do you accept this request on account %s?"
-#: ../src/gajim.py:565
+#: ../src/gajim.py:576
#, python-format
msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
msgstr "HTTP (%(method)s) Authorisation for %(url)s (id: %(id)s)"
-#: ../src/gajim.py:613 ../src/notify.py:479 ../src/osx/growler.py:17
+#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
msgid "Connection Failed"
msgstr "Connection Failed"
-#: ../src/gajim.py:919 ../src/gajim.py:923
+#: ../src/gajim.py:930 ../src/gajim.py:934
#, python-format
msgid "Error %(code)s: %(msg)s"
msgstr "Error %(code)s: %(msg)s"
#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:933 ../src/gajim.py:946
+#: ../src/gajim.py:944 ../src/gajim.py:957
#, python-format
msgid "error while sending %(message)s ( %(error)s )"
msgstr "error while sending %(message)s ( %(error)s )"
-#: ../src/gajim.py:977
+#: ../src/gajim.py:989
msgid "Authorization accepted"
msgstr "Authorisation accepted"
-#: ../src/gajim.py:978
+#: ../src/gajim.py:990
#, python-format
msgid "The contact \"%s\" has authorized you to see his or her status."
msgstr "The contact \"%s\" has authorised you to see his or her status."
-#: ../src/gajim.py:997
+#: ../src/gajim.py:1009
#, python-format
msgid "Contact \"%s\" removed subscription from you"
msgstr "Contact \"%s\" removed subscription from you"
-#: ../src/gajim.py:998
+#: ../src/gajim.py:1010
msgid ""
"You will always see him or her as offline.\n"
"Do you want to remove him or her from your contact list?"
@@ -7300,72 +7566,72 @@ msgstr ""
"You will always see him or her as offline.\n"
"Do you want to remove him or her from your contact list?"
-#: ../src/gajim.py:1039
+#: ../src/gajim.py:1051
#, python-format
msgid "Contact with \"%s\" cannot be established"
msgstr "Contact with \"%s\" cannot be established"
-#: ../src/gajim.py:1218 ../src/groupchat_control.py:1066
+#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
#, python-format
msgid "%(nick)s is now known as %(new_nick)s"
msgstr "%(nick)s is now known as %(new_nick)s"
-#: ../src/gajim.py:1233 ../src/groupchat_control.py:1216
-#: ../src/history_window.py:408 ../src/notify.py:233
+#: ../src/gajim.py:1242 ../src/groupchat_control.py:1339
+#: ../src/history_window.py:417 ../src/notify.py:232
#, python-format
msgid "%(nick)s is now %(status)s"
msgstr "%(nick)s is now %(status)s"
-#: ../src/gajim.py:1296
+#: ../src/gajim.py:1305
#, python-format
-msgid "%s has set the subject to %s"
+msgid "%(jid)s has set the subject to %(subject)s"
msgstr ""
#. Can be a presence (see chg_contact_status in groupchat_control.py)
#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1359 ../src/groupchat_control.py:1026
+#: ../src/gajim.py:1369 ../src/groupchat_control.py:1124
msgid "Any occupant is allowed to see your full JID"
msgstr "Any occupant is allowed to see your full JID"
-#: ../src/gajim.py:1362
+#: ../src/gajim.py:1372
msgid "Room now shows unavailable member"
msgstr "Room now shows unavailable member"
-#: ../src/gajim.py:1364
+#: ../src/gajim.py:1374
msgid "room now does not show unavailable members"
msgstr "room now does not show unavailable members"
-#: ../src/gajim.py:1367
+#: ../src/gajim.py:1377
msgid "A non-privacy-related room configuration change has occurred"
msgstr "A non-privacy-related room configuration change has occurred"
#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1370
+#: ../src/gajim.py:1380
msgid "Room logging is now enabled"
msgstr "Room logging is now enabled"
-#: ../src/gajim.py:1372
+#: ../src/gajim.py:1382
msgid "Room logging is now disabled"
msgstr "Room logging is now disabled"
-#: ../src/gajim.py:1374
+#: ../src/gajim.py:1384
msgid "Room is now non-anonymous"
msgstr "Room is now non-anonymous"
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1387
msgid "Room is now semi-anonymous"
msgstr "Room is now semi-anonymous"
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1390
msgid "Room is now fully-anonymous"
msgstr "Room is now fully-anonymous"
-#: ../src/gajim.py:1412
+#: ../src/gajim.py:1422
#, python-format
msgid "A Password is required to join the room %s. Please type it."
msgstr "A Password is required to join the room %s. Please type it."
-#: ../src/gajim.py:1446
+#: ../src/gajim.py:1456
msgid ""
"You configured Gajim to use GPG agent, but there is no GPG agent running or "
"it returned a wrong passphrase.\n"
@@ -7373,27 +7639,27 @@ msgstr ""
"You configured Gajim to use GPG agent, but there is no GPG agent running or "
"it returned a wrong passphrase.\n"
-#: ../src/gajim.py:1448
+#: ../src/gajim.py:1458
msgid "You are currently connected without your OpenPGP key."
msgstr "You are currently connected without your OpenPGP key."
-#: ../src/gajim.py:1451
+#: ../src/gajim.py:1461
msgid "Your passphrase is incorrect"
msgstr "Your passphrase is incorrect"
-#: ../src/gajim.py:1552
+#: ../src/gajim.py:1561
#, python-format
msgid "New mail on %(gmail_mail_address)s"
msgstr "New mail on %(gmail_mail_address)s"
-#: ../src/gajim.py:1554
+#: ../src/gajim.py:1563
#, python-format
msgid "You have %d new mail conversation"
msgid_plural "You have %d new mail conversations"
msgstr[0] "You have %d new mail conversation"
msgstr[1] "You have %d new mail conversations"
-#: ../src/gajim.py:1568
+#: ../src/gajim.py:1576
#, python-format
msgid ""
"\n"
@@ -7408,34 +7674,34 @@ msgstr ""
"Subject: %(subject)s\n"
"%(snippet)s"
-#: ../src/gajim.py:1639
+#: ../src/gajim.py:1647
#, python-format
msgid "%s wants to send you a file."
msgstr "%s wants to send you a file."
-#: ../src/gajim.py:1704
+#: ../src/gajim.py:1715
#, python-format
msgid "You successfully received %(filename)s from %(name)s."
msgstr "You successfully received %(filename)s from %(name)s."
#. ft stopped
-#: ../src/gajim.py:1708
+#: ../src/gajim.py:1719
#, python-format
msgid "File transfer of %(filename)s from %(name)s stopped."
msgstr "File transfer of %(filename)s from %(name)s stopped."
-#: ../src/gajim.py:1721
+#: ../src/gajim.py:1732
#, python-format
msgid "You successfully sent %(filename)s to %(name)s."
msgstr "You successfully sent %(filename)s to %(name)s."
#. ft stopped
-#: ../src/gajim.py:1725
+#: ../src/gajim.py:1736
#, python-format
msgid "File transfer of %(filename)s to %(name)s stopped."
msgstr "File transfer of %(filename)s to %(name)s stopped."
-#: ../src/gajim.py:1811
+#: ../src/gajim.py:1820
#, python-format
msgid ""
"Unable to decrypt message from %s\n"
@@ -7444,36 +7710,36 @@ msgstr ""
"Unable to decrypt message from %s\n"
"It may have been tampered with."
-#: ../src/gajim.py:1818
+#: ../src/gajim.py:1827
msgid "Unable to decrypt message"
msgstr "Unable to decrypt message"
-#: ../src/gajim.py:1888
+#: ../src/gajim.py:1898
msgid "Username Conflict"
msgstr "Username Conflict"
-#: ../src/gajim.py:1889
+#: ../src/gajim.py:1899
msgid "Please type a new username for your local account"
msgstr "Please type a new username for your local account"
-#: ../src/gajim.py:1901
+#: ../src/gajim.py:1911
msgid "Ping?"
msgstr "Ping?"
-#: ../src/gajim.py:1914
+#: ../src/gajim.py:1924
#, python-format
msgid "Pong! (%s s.)"
msgstr "Pong! (%s s.)"
-#: ../src/gajim.py:1925
+#: ../src/gajim.py:1935
msgid "Error."
msgstr "Error."
-#: ../src/gajim.py:1950
+#: ../src/gajim.py:1960
msgid "Resource Conflict"
msgstr "Resource Conflict"
-#: ../src/gajim.py:1951
+#: ../src/gajim.py:1961
msgid ""
"You are already connected to this account with the same resource. Please "
"type a new one"
@@ -7481,11 +7747,11 @@ msgstr ""
"You are already connected to this account with the same resource. Please "
"type a new one"
-#: ../src/gajim.py:2004
+#: ../src/gajim.py:2014
msgid "Error verifying SSL certificate"
msgstr "Error verifying SSL certificate"
-#: ../src/gajim.py:2005
+#: ../src/gajim.py:2015
#, python-format
msgid ""
"There was an error verifying the SSL certificate of your jabber server: %"
@@ -7496,15 +7762,15 @@ msgstr ""
"(error)s\n"
"Do you still want to connect to this server?"
-#: ../src/gajim.py:2010
+#: ../src/gajim.py:2020
msgid "Ignore this error for this certificate."
msgstr "Ignore this error for this certificate."
-#: ../src/gajim.py:2025
+#: ../src/gajim.py:2035
msgid "SSL certificate error"
msgstr "SSL certificate error"
-#: ../src/gajim.py:2026
+#: ../src/gajim.py:2036
#, python-format
msgid ""
"It seems the SSL certificate has changed or your connection is being "
@@ -7521,11 +7787,11 @@ msgstr ""
"\n"
"Do you still want to connect and update the fingerprint of the certificate?"
-#: ../src/gajim.py:2048 ../src/gajim.py:2078
+#: ../src/gajim.py:2058 ../src/gajim.py:2088
msgid "Insecure connection"
msgstr "Insecure connection"
-#: ../src/gajim.py:2049
+#: ../src/gajim.py:2059
msgid ""
"You are about to send your password on an unencrypted connection. Are you "
"sure you want to do that?"
@@ -7533,16 +7799,16 @@ msgstr ""
"You are about to send your password on an unencrypted connection. Are you "
"sure you want to do that?"
-#: ../src/gajim.py:2051 ../src/gajim.py:2081
+#: ../src/gajim.py:2061 ../src/gajim.py:2091
msgid "Yes, I really want to connect insecurely"
msgstr "Yes, I really want to connect insecurely"
-#: ../src/gajim.py:2052 ../src/gajim.py:2082 ../src/groupchat_control.py:1707
-#: ../src/roster_window.py:3806
+#: ../src/gajim.py:2062 ../src/gajim.py:2092 ../src/groupchat_control.py:1843
+#: ../src/roster_window.py:3790
msgid "Do _not ask me again"
msgstr "Do _not ask me again"
-#: ../src/gajim.py:2079
+#: ../src/gajim.py:2089
msgid ""
"You are about to send your password on an insecure connection. You should "
"install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -7550,21 +7816,21 @@ msgstr ""
"You are about to send your password on an insecure connection. You should "
"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-#: ../src/gajim.py:2096
+#: ../src/gajim.py:2106
msgid "PEP node was not removed"
msgstr "PEP node was not removed"
-#: ../src/gajim.py:2097
+#: ../src/gajim.py:2107
#, python-format
msgid "PEP node %(node)s was not removed: %(message)s"
msgstr "PEP node %(node)s was not removed: %(message)s"
#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2547 ../src/gajim.py:2568
+#: ../src/gajim.py:2572 ../src/gajim.py:2593
msgid "Emoticons disabled"
msgstr "Emoticons disabled"
-#: ../src/gajim.py:2548
+#: ../src/gajim.py:2573
msgid ""
"Your configured emoticons theme has not been found, so emoticons have been "
"disabled."
@@ -7572,7 +7838,7 @@ msgstr ""
"Your configured emoticons theme has not been found, so emoticons have been "
"disabled."
-#: ../src/gajim.py:2569
+#: ../src/gajim.py:2594
msgid ""
"Your configured emoticons theme cannot been loaded. You maybe need to update "
"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
@@ -7582,63 +7848,55 @@ msgstr ""
"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
"for more details."
-#: ../src/gajim.py:2595 ../src/roster_window.py:3334
+#: ../src/gajim.py:2620 ../src/roster_window.py:3324
msgid "You cannot join a group chat while you are invisible"
msgstr "You cannot join a group chat while you are invisible"
#. it is good to notify the user
#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2876
+#: ../src/gajim.py:2900
msgid "Could not save your settings and preferences"
msgstr "Could not save your settings and preferences"
-#: ../src/gajim.py:2973
+#: ../src/gajim.py:2997
msgid "Bookmark already set"
msgstr "Bookmark already set"
-#: ../src/gajim.py:2974
+#: ../src/gajim.py:2998
#, python-format
msgid "Group Chat \"%s\" is already in your bookmarks."
msgstr "Group Chat \"%s\" is already in your bookmarks."
-#: ../src/gajim.py:2987
+#: ../src/gajim.py:3011
msgid "Bookmark has been added successfully"
msgstr "Bookmark has been added successfully"
-#: ../src/gajim.py:2988
+#: ../src/gajim.py:3012
msgid "You can manage your bookmarks via Actions menu in your roster."
msgstr "You can manage your bookmarks via Actions menu in your roster."
-#: ../src/gajim.py:3175
-msgid "Network Manager support not available"
-msgstr "Network Manager support not available"
-
-#: ../src/gajim.py:3299
-msgid "Session Management support not available (missing gnome.ui module)"
-msgstr "Session Management support not available (missing gnome.ui module)"
-
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:79
msgid "Shows a help on specific command"
msgstr "Shows a help on specific command"
#. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
msgid "command"
msgstr "command"
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:83
msgid "show help on command"
msgstr "show help on command"
-#: ../src/gajim-remote.py:88
+#: ../src/gajim-remote.py:87
msgid "Shows or hides the roster window"
msgstr "Shows or hides the roster window"
-#: ../src/gajim-remote.py:92
+#: ../src/gajim-remote.py:91
msgid "Pops up a window with the next pending event"
msgstr "Pops up a window with the next pending event"
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:95
msgid ""
"Prints a list of all contacts in the roster. Each contact appears on a "
"separate line"
@@ -7646,47 +7904,47 @@ msgstr ""
"Prints a list of all contacts in the roster. Each contact appears on a "
"separate line"
-#: ../src/gajim-remote.py:99 ../src/gajim-remote.py:114
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:137
-#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:160
-#: ../src/gajim-remote.py:181 ../src/gajim-remote.py:211
-#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:227
-#: ../src/gajim-remote.py:234 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:261 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
+#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
msgid "account"
msgstr "account"
-#: ../src/gajim-remote.py:99
+#: ../src/gajim-remote.py:98
msgid "show only contacts of the given account"
msgstr "show only contacts of the given account"
-#: ../src/gajim-remote.py:105
+#: ../src/gajim-remote.py:104
msgid "Prints a list of registered accounts"
msgstr "Prints a list of registered accounts"
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:108
msgid "Changes the status of account or accounts"
msgstr "Changes the status of account or accounts"
#. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
msgid "status"
msgstr "status"
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
msgid "one of: offline, online, chat, away, xa, dnd, invisible "
msgstr "one of: offline, online, chat, away, xa, dnd, invisible "
-#: ../src/gajim-remote.py:113 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
msgid "message"
msgstr "message"
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:112
msgid "status message"
msgstr "status message"
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:113
msgid ""
"change status of account \"account\". If not specified, try to change status "
"of all accounts that have \"sync with global status\" option set"
@@ -7694,19 +7952,19 @@ msgstr ""
"change status of account \"account\". If not specified, try to change status "
"of all accounts that have \"sync with global status\" option set"
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
msgid "Shows the chat dialog so that you can send messages to a contact"
msgstr "Shows the chat dialogue so that you can send messages to a contact"
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
msgid "JID of the contact that you want to chat with"
msgstr "JID of the contact that you want to chat with"
-#: ../src/gajim-remote.py:124 ../src/gajim-remote.py:211
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
msgid "if specified, contact is taken from the contact list of this account"
msgstr "if specified, contact is taken from the contact list of this account"
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:128
msgid ""
"Sends new chat message to a contact in the roster. Both OpenPGP key and "
"account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -7716,29 +7974,29 @@ msgstr ""
"account are optional. If you want to set only 'account', without 'OpenPGP "
"key', just set 'OpenPGP key' to ''."
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
msgid "JID of the contact that will receive the message"
msgstr "JID of the contact that will receive the message"
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:158
msgid "message contents"
msgstr "message contents"
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
msgid "pgp key"
msgstr "pgp key"
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
msgid "if specified, the message will be encrypted using this public key"
msgstr "if specified, the message will be encrypted using this public key"
-#: ../src/gajim-remote.py:137 ../src/gajim-remote.py:151
-#: ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:159
msgid "if specified, the message will be sent using this account"
msgstr "if specified, the message will be sent using this account"
-#: ../src/gajim-remote.py:142
+#: ../src/gajim-remote.py:141
msgid ""
"Sends new single message to a contact in the roster. Both OpenPGP key and "
"account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -7748,134 +8006,134 @@ msgstr ""
"account are optional. If you want to set only 'account', without 'OpenPGP "
"key', just set 'OpenPGP key' to ''."
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:146
msgid "subject"
msgstr "subject"
-#: ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:146
msgid "message subject"
msgstr "message subject"
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:155
msgid "Sends new message to a groupchat you've joined."
msgstr "Sends new message to a groupchat you've joined."
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
msgid "JID of the room that will receive the message"
msgstr "JID of the room that will receive the message"
-#: ../src/gajim-remote.py:165
+#: ../src/gajim-remote.py:164
msgid "Gets detailed info on a contact"
msgstr "Gets detailed info on a contact"
-#: ../src/gajim-remote.py:167 ../src/gajim-remote.py:180
-#: ../src/gajim-remote.py:210 ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
msgid "JID of the contact"
msgstr "JID of the contact"
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:170
msgid "Gets detailed info on a account"
msgstr "Gets detailed info on a account"
-#: ../src/gajim-remote.py:173
+#: ../src/gajim-remote.py:172
msgid "Name of the account"
msgstr "Name of the account"
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:176
msgid "Sends file to a contact"
msgstr "Sends file to a contact"
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:178
msgid "file"
msgstr "file"
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:178
msgid "File path"
msgstr "File path"
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:180
msgid "if specified, file will be sent using this account"
msgstr "if specified, file will be sent using this account"
-#: ../src/gajim-remote.py:186
+#: ../src/gajim-remote.py:185
msgid "Lists all preferences and their values"
msgstr "Lists all preferences and their values"
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
msgid "Sets value of 'key' to 'value'."
msgstr "Sets value of 'key' to 'value'."
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
msgid "key=value"
msgstr "key=value"
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
msgid "'key' is the name of the preference, 'value' is the value to set it to"
msgstr "'key' is the name of the preference, 'value' is the value to set it to"
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
msgid "Deletes a preference item"
msgstr "Deletes a preference item"
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:198
msgid "key"
msgstr "key"
-#: ../src/gajim-remote.py:199
+#: ../src/gajim-remote.py:198
msgid "name of the preference to be deleted"
msgstr "name of the preference to be deleted"
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
msgid "Writes the current state of Gajim preferences to the .config file"
msgstr "Writes the current state of Gajim preferences to the .config file"
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
msgid "Removes contact from roster"
msgstr "Removes contact from roster"
-#: ../src/gajim-remote.py:217
+#: ../src/gajim-remote.py:216
msgid "Adds contact to roster"
msgstr "Adds contact to roster"
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
msgid "jid"
msgstr "jid"
-#: ../src/gajim-remote.py:220
+#: ../src/gajim-remote.py:219
msgid "Adds new contact to this account"
msgstr "Adds new contact to this account"
-#: ../src/gajim-remote.py:225
+#: ../src/gajim-remote.py:224
msgid "Returns current status (the global one unless account is specified)"
msgstr "Returns current status (the global one unless account is specified)"
-#: ../src/gajim-remote.py:232
+#: ../src/gajim-remote.py:231
msgid ""
"Returns current status message (the global one unless account is specified)"
msgstr ""
"Returns current status message (the global one unless account is specified)"
-#: ../src/gajim-remote.py:239
+#: ../src/gajim-remote.py:238
msgid "Returns number of unread messages"
msgstr "Returns number of unread messages"
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
msgid "Opens 'Start Chat' dialog"
msgstr "Opens 'Start Chat' dialogue"
-#: ../src/gajim-remote.py:245
+#: ../src/gajim-remote.py:244
msgid "Starts chat, using this account"
msgstr "Starts chat, using this account"
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:248
msgid "Sends custom XML"
msgstr "Sends custom XML"
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:250
msgid "XML to send"
msgstr "XML to send"
-#: ../src/gajim-remote.py:252
+#: ../src/gajim-remote.py:251
msgid ""
"Account in which the xml will be sent; if not specified, xml will be sent to "
"all accounts"
@@ -7883,67 +8141,67 @@ msgstr ""
"Account in which the xml will be sent; if not specified, xml will be sent to "
"all accounts"
-#: ../src/gajim-remote.py:258
+#: ../src/gajim-remote.py:257
msgid "Handle a xmpp:/ uri"
msgstr "Handle a xmpp:/ uri"
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
msgid "uri"
msgstr "uri"
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
msgid "URI to handle"
msgstr "URI to handle"
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:260
msgid "Account in which you want to handle it"
msgstr "Account in which you want to handle it"
-#: ../src/gajim-remote.py:266
+#: ../src/gajim-remote.py:265
msgid "Join a MUC room"
msgstr "Join a MUC room"
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:267
msgid "room"
msgstr "room"
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:267
msgid "Room JID"
msgstr "Room JID"
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
msgid "nick"
msgstr "nick"
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
msgid "Nickname to use"
msgstr "Nickname to use"
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:269
msgid "password"
msgstr "password"
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:269
msgid "Password to enter the room"
msgstr "Password to enter the room"
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
msgid "Account from which you want to enter the room"
msgstr "Account from which you want to enter the room"
-#: ../src/gajim-remote.py:276
+#: ../src/gajim-remote.py:275
msgid "Check if Gajim is running"
msgstr "Check if Gajim is running"
-#: ../src/gajim-remote.py:280 ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:279
msgid "Shows or hides the ipython window"
msgstr "Shows or hides the ipython window"
-#: ../src/gajim-remote.py:314
+#: ../src/gajim-remote.py:306
msgid "Missing argument \"contact_jid\""
msgstr "Missing argument \"contact_jid\""
-#: ../src/gajim-remote.py:333
+#: ../src/gajim-remote.py:325
#, python-format
msgid ""
"'%s' is not in your roster.\n"
@@ -7952,15 +8210,15 @@ msgstr ""
"'%s' is not in your roster.\n"
"Please specify account for sending the message."
-#: ../src/gajim-remote.py:336
+#: ../src/gajim-remote.py:328
msgid "You have no active account"
msgstr "You have no active account"
-#: ../src/gajim-remote.py:389
+#: ../src/gajim-remote.py:380
msgid "It seems Gajim is not running. So you can't use gajim-remote."
msgstr "It seems Gajim is not running. So you can't use gajim-remote."
-#: ../src/gajim-remote.py:418
+#: ../src/gajim-remote.py:409
#, python-format
msgid ""
"Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -7969,16 +8227,16 @@ msgstr ""
"Usage: %(basename)s %(command)s %(arguments)s \n"
"\t %(help)s"
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:413
msgid "Arguments:"
msgstr "Arguments:"
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:417
#, python-format
msgid "%s not found"
msgstr "%s not found"
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:421
#, python-format
msgid ""
"Usage: %s command [arguments]\n"
@@ -7987,7 +8245,7 @@ msgstr ""
"Usage: %s command [arguments]\n"
"Command is one of:\n"
-#: ../src/gajim-remote.py:503
+#: ../src/gajim-remote.py:493
#, python-format
msgid ""
"Too many arguments. \n"
@@ -7996,7 +8254,7 @@ msgstr ""
"Too many arguments. \n"
"Type \"%(basename)s help %(command)s\" for more info"
-#: ../src/gajim-remote.py:508
+#: ../src/gajim-remote.py:498
#, python-format
msgid ""
"Argument \"%(arg)s\" is not specified. \n"
@@ -8005,7 +8263,7 @@ msgstr ""
"Argument \"%(arg)s\" is not specified. \n"
"Type \"%(basename)s help %(command)s\" for more info"
-#: ../src/gajim-remote.py:527
+#: ../src/gajim-remote.py:517
msgid "Wrong uri"
msgstr "Wrong uri"
@@ -8034,127 +8292,147 @@ msgstr "You cannot delete your current theme"
msgid "Please first choose another for your current theme."
msgstr "Please first choose another for your current theme."
-#: ../src/groupchat_control.py:145
+#: ../src/groupchat_control.py:150
msgid "Sending private message failed"
msgstr "Sending private message failed"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:147
+#: ../src/groupchat_control.py:152
#, python-format
msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
msgstr "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
-#: ../src/groupchat_control.py:383
+#: ../src/groupchat_control.py:451
msgid "Insert Nickname"
msgstr "Insert Nickname"
-#: ../src/groupchat_control.py:535
+#: ../src/groupchat_control.py:603
msgid "Conversation with "
msgstr "Conversation with "
-#: ../src/groupchat_control.py:537
+#: ../src/groupchat_control.py:605
msgid "Continued conversation"
msgstr "Continued conversation"
-#: ../src/groupchat_control.py:954
+#: ../src/groupchat_control.py:1027
msgid "Really send file?"
msgstr "Really send file?"
-#: ../src/groupchat_control.py:955
+#: ../src/groupchat_control.py:1028
#, python-format
msgid "If you send a file to %s, he/she will know your real Jabber ID."
msgstr "If you send a file to %s, he/she will know your real Jabber ID."
#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1029
+#: ../src/groupchat_control.py:1127
msgid "Room logging is enabled"
msgstr "Room logging is enabled"
-#: ../src/groupchat_control.py:1031
+#: ../src/groupchat_control.py:1129
msgid "A new room has been created"
msgstr "A new room has been created"
-#: ../src/groupchat_control.py:1034
+#: ../src/groupchat_control.py:1132
msgid "The server has assigned or modified your roomnick"
msgstr "The server has assigned or modified your roomnick"
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1040
+#: ../src/groupchat_control.py:1138
#, python-format
msgid "%(nick)s has been kicked: %(reason)s"
msgstr "%(nick)s has been kicked: %(reason)s"
-#: ../src/groupchat_control.py:1044
+#: ../src/groupchat_control.py:1142
#, python-format
msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
msgstr "%(nick)s has been kicked by %(who)s: %(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:1051
+#: ../src/groupchat_control.py:1149
#, python-format
msgid "%(nick)s has been banned: %(reason)s"
msgstr "%(nick)s has been banned: %(reason)s"
-#: ../src/groupchat_control.py:1055
+#: ../src/groupchat_control.py:1153
#, python-format
msgid "%(nick)s has been banned by %(who)s: %(reason)s"
msgstr "%(nick)s has been banned by %(who)s: %(reason)s"
-#: ../src/groupchat_control.py:1064
+#: ../src/groupchat_control.py:1162
#, python-format
msgid "You are now known as %s"
msgstr "You are now known as %s"
-#: ../src/groupchat_control.py:1101 ../src/groupchat_control.py:1105
-#: ../src/groupchat_control.py:1110
+#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1209
#, python-format
msgid "%(nick)s has been removed from the room (%(reason)s)"
msgstr "%(nick)s has been removed from the room (%(reason)s)"
-#: ../src/groupchat_control.py:1102
+#: ../src/groupchat_control.py:1201
msgid "affiliation changed"
msgstr "affiliation changed"
-#: ../src/groupchat_control.py:1107
+#: ../src/groupchat_control.py:1206
msgid "room configuration changed to members-only"
msgstr "room configuration changed to members-only"
-#: ../src/groupchat_control.py:1112
+#: ../src/groupchat_control.py:1211
msgid "system shutdown"
msgstr "system shutdown"
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1280
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1284
+#, python-format
+msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
+msgstr ""
+
+#: ../src/groupchat_control.py:1299
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
+msgstr "%(nick)s has been kicked by %(who)s: %(reason)s"
+
+#: ../src/groupchat_control.py:1303
+#, fuzzy, python-format
+msgid "** Role of %(nick)s has been set to %(role)s"
+msgstr "%(nick)s has been kicked: %(reason)s"
+
+#: ../src/groupchat_control.py:1332
#, python-format
msgid "%s has left"
msgstr "%s has left"
-#: ../src/groupchat_control.py:1214
+#: ../src/groupchat_control.py:1337
#, python-format
msgid "%s has joined the group chat"
msgstr "%s has joined the group chat"
#. Invalid Nickname
#. invalid char
-#: ../src/groupchat_control.py:1328 ../src/groupchat_control.py:1600
+#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
msgid "Invalid nickname"
msgstr "Invalid nickname"
-#: ../src/groupchat_control.py:1352 ../src/groupchat_control.py:1370
-#: ../src/groupchat_control.py:1454 ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
+#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
#, python-format
msgid "Nickname not found: %s"
msgstr "Nickname not found: %s"
-#: ../src/groupchat_control.py:1386
+#: ../src/groupchat_control.py:1510
msgid "This group chat has no subject"
msgstr "This group chat has no subject"
-#: ../src/groupchat_control.py:1397
+#: ../src/groupchat_control.py:1521
#, python-format
msgid "Invited %(contact_jid)s to %(room_jid)s."
msgstr "Invited %(contact_jid)s to %(room_jid)s."
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1656
#, python-format
msgid ""
"Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -8167,7 +8445,7 @@ msgstr ""
"the JID is currently in the group chat, he/she/it will also be kicked. Does "
"NOT support spaces in nickname."
-#: ../src/groupchat_control.py:1534
+#: ../src/groupchat_control.py:1663
#, python-format
msgid ""
"Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8176,7 +8454,7 @@ msgstr ""
"Usage: /%s <nickname>, opens a private chat window with the specified "
"occupant."
-#: ../src/groupchat_control.py:1540
+#: ../src/groupchat_control.py:1669
#, python-format
msgid ""
"Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8185,7 +8463,7 @@ msgstr ""
"Usage: /%s [reason], closes the current window or tab, displaying reason if "
"specified."
-#: ../src/groupchat_control.py:1546
+#: ../src/groupchat_control.py:1675
#, python-format
msgid ""
"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8194,7 +8472,7 @@ msgstr ""
"Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
"providing a reason."
-#: ../src/groupchat_control.py:1550
+#: ../src/groupchat_control.py:1679
#, python-format
msgid ""
"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8203,7 +8481,7 @@ msgstr ""
"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
"using specified nickname."
-#: ../src/groupchat_control.py:1554
+#: ../src/groupchat_control.py:1683
#, python-format
msgid ""
"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -8214,7 +8492,7 @@ msgstr ""
"from the group chat and optionally displays a reason. Does NOT support "
"spaces in nickname."
-#: ../src/groupchat_control.py:1563
+#: ../src/groupchat_control.py:1692
#, python-format
msgid ""
"Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8223,62 +8501,62 @@ msgstr ""
"Usage: /%s <nickname> [message], opens a private message window and sends "
"message to the occupant specified by nickname."
-#: ../src/groupchat_control.py:1568
+#: ../src/groupchat_control.py:1697
#, python-format
msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
msgstr "Usage: /%s <nickname>, changes your nickname in current group chat."
-#: ../src/groupchat_control.py:1572
+#: ../src/groupchat_control.py:1701
#, python-format
msgid "Usage: /%s , display the names of group chat occupants."
msgstr "Usage: /%s , display the names of group chat occupants."
-#: ../src/groupchat_control.py:1576
+#: ../src/groupchat_control.py:1705
#, python-format
msgid "Usage: /%s [topic], displays or updates the current group chat topic."
msgstr "Usage: /%s [topic], displays or updates the current group chat topic."
-#: ../src/groupchat_control.py:1579
+#: ../src/groupchat_control.py:1708
#, python-format
msgid ""
"Usage: /%s <message>, sends a message without looking for other commands."
msgstr ""
"Usage: /%s <message>, sends a message without looking for other commands."
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1837
#, python-format
msgid "Are you sure you want to leave group chat \"%s\"?"
msgstr "Are you sure you want to leave group chat \"%s\"?"
-#: ../src/groupchat_control.py:1703
+#: ../src/groupchat_control.py:1839
msgid ""
"If you close this window, you will be disconnected from this group chat."
msgstr ""
"If you close this window, you will be disconnected from this group chat."
-#: ../src/groupchat_control.py:1740
+#: ../src/groupchat_control.py:1876
msgid "Changing Subject"
msgstr "Changing Subject"
-#: ../src/groupchat_control.py:1741
+#: ../src/groupchat_control.py:1877
msgid "Please specify the new subject:"
msgstr "Please specify the new subject:"
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1881
msgid "Changing Nickname"
msgstr "Changing Nickname"
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1882
msgid "Please specify the new nickname you want to use:"
msgstr "Please specify the new nickname you want to use:"
#. Ask for a reason
-#: ../src/groupchat_control.py:1773
+#: ../src/groupchat_control.py:1908
#, python-format
msgid "Destroying %s"
msgstr "Destroying %s"
-#: ../src/groupchat_control.py:1774
+#: ../src/groupchat_control.py:1909
msgid ""
"You are going to definitively destroy this room.\n"
"You may specify a reason below:"
@@ -8286,22 +8564,22 @@ msgstr ""
"You are going to definitively destroy this room.\n"
"You may specify a reason below:"
-#: ../src/groupchat_control.py:1776
+#: ../src/groupchat_control.py:1911
msgid "You may also enter an alternate venue:"
msgstr "You may also enter an alternate venue:"
#. ask for reason
-#: ../src/groupchat_control.py:1950
+#: ../src/groupchat_control.py:2083
#, python-format
msgid "Kicking %s"
msgstr "Kicking %s"
-#: ../src/groupchat_control.py:1951 ../src/groupchat_control.py:2248
+#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
msgid "You may specify a reason below:"
msgstr "You may specify a reason below:"
#. ask for reason
-#: ../src/groupchat_control.py:2247
+#: ../src/groupchat_control.py:2387
#, python-format
msgid "Banning %s"
msgstr "Banning %s"
@@ -8384,7 +8662,7 @@ msgstr "Contacts"
#. holds time
#: ../src/history_manager.py:150 ../src/history_manager.py:190
-#: ../src/history_window.py:94
+#: ../src/history_window.py:95
msgid "Date"
msgstr "Date"
@@ -8395,7 +8673,7 @@ msgstr "Nickname"
#. holds message
#: ../src/history_manager.py:164 ../src/history_manager.py:196
-#: ../src/history_window.py:102
+#: ../src/history_window.py:103
msgid "Message"
msgstr "Message"
@@ -8446,22 +8724,27 @@ msgid_plural "Do you really want to delete the selected messages?"
msgstr[0] "Do you really want to delete the selected message?"
msgstr[1] "Do you really want to delete the selected messages?"
-#: ../src/history_window.py:284
+#: ../src/history_window.py:287
#, python-format
msgid "Conversation History with %s"
msgstr "Conversation History with %s"
-#: ../src/history_window.py:404
+#: ../src/history_window.py:332
+#, fuzzy
+msgid "Disk Error"
+msgstr "Disk WriteError"
+
+#: ../src/history_window.py:413
#, python-format
msgid "%(nick)s is now %(status)s: %(status_msg)s"
msgstr "%(nick)s is now %(status)s: %(status_msg)s"
-#: ../src/history_window.py:414
+#: ../src/history_window.py:423
#, python-format
msgid "Status is now: %(status)s: %(status_msg)s"
msgstr "Status is now: %(status)s: %(status_msg)s"
-#: ../src/history_window.py:417
+#: ../src/history_window.py:426
#, python-format
msgid "Status is now: %(status)s"
msgstr "Status is now: %(status)s"
@@ -8474,19 +8757,19 @@ msgstr "Timeout loading image"
msgid "Image is too big"
msgstr "Image is too big"
-#: ../src/message_window.py:440
+#: ../src/message_window.py:446
msgid "Chats"
msgstr "Chats"
-#: ../src/message_window.py:442
+#: ../src/message_window.py:448
msgid "Group Chats"
msgstr "Group Chats"
-#: ../src/message_window.py:444
+#: ../src/message_window.py:450
msgid "Private Chats"
msgstr "Private Chats"
-#: ../src/message_window.py:450
+#: ../src/message_window.py:456
msgid "Messages"
msgstr "Messages"
@@ -8498,42 +8781,42 @@ msgstr "- messages will be logged"
msgid "- messages will not be logged"
msgstr "- messages will not be logged"
-#: ../src/notify.py:231
+#: ../src/notify.py:230
#, python-format
msgid "%(nick)s Changed Status"
msgstr "%(nick)s Changed Status"
-#: ../src/notify.py:241
+#: ../src/notify.py:240
#, python-format
msgid "%(nickname)s Signed In"
msgstr "%(nickname)s Signed In"
-#: ../src/notify.py:249
+#: ../src/notify.py:248
#, python-format
msgid "%(nickname)s Signed Out"
msgstr "%(nickname)s Signed Out"
-#: ../src/notify.py:261
+#: ../src/notify.py:260
#, python-format
msgid "New Single Message from %(nickname)s"
msgstr "New Single Message from %(nickname)s"
-#: ../src/notify.py:269
+#: ../src/notify.py:268
#, python-format
msgid "New Private Message from group chat %s"
msgstr "New Private Message from group chat %s"
-#: ../src/notify.py:271
+#: ../src/notify.py:270
#, python-format
msgid "%(nickname)s: %(message)s"
msgstr "%(nickname)s: %(message)s"
-#: ../src/notify.py:274
+#: ../src/notify.py:273
#, python-format
msgid "Messaged by %(nickname)s"
msgstr "Messaged by %(nickname)s"
-#: ../src/notify.py:280
+#: ../src/notify.py:279
#, python-format
msgid "New Message from %(nickname)s"
msgstr "New Message from %(nickname)s"
@@ -8546,18 +8829,18 @@ msgstr "Generic"
msgid "Retrieving profile..."
msgstr "Retrieving profile..."
-#: ../src/profile_window.py:109 ../src/roster_window.py:2803
+#: ../src/profile_window.py:109 ../src/roster_window.py:2787
msgid "File is empty"
msgstr "File is empty"
-#: ../src/profile_window.py:112 ../src/roster_window.py:2806
+#: ../src/profile_window.py:112 ../src/roster_window.py:2790
msgid "File does not exist"
msgstr "File does not exist"
#. keep identation
#. unknown format
#: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2808 ../src/roster_window.py:2819
+#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
msgid "Could not load image"
msgstr "Could not load image"
@@ -8589,38 +8872,38 @@ msgstr ""
"There was an error while publishing your personal information, try again "
"later."
-#: ../src/roster_window.py:290 ../src/roster_window.py:955
+#: ../src/roster_window.py:288 ../src/roster_window.py:945
msgid "Merged accounts"
msgstr "Merged accounts"
-#: ../src/roster_window.py:1849
+#: ../src/roster_window.py:1860
msgid "Authorization has been sent"
msgstr "Authorisation has been sent"
-#: ../src/roster_window.py:1850
+#: ../src/roster_window.py:1861
#, python-format
msgid "Now \"%s\" will know your status."
msgstr "Now \"%s\" will know your status."
-#: ../src/roster_window.py:1870
+#: ../src/roster_window.py:1881
msgid "Subscription request has been sent"
msgstr "Subscription request has been sent"
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1882
#, python-format
msgid "If \"%s\" accepts this request you will know his or her status."
msgstr "If \"%s\" accepts this request you will know his or her status."
-#: ../src/roster_window.py:1883
+#: ../src/roster_window.py:1894
msgid "Authorization has been removed"
msgstr "Authorisation has been removed"
-#: ../src/roster_window.py:1884
+#: ../src/roster_window.py:1895
#, python-format
msgid "Now \"%s\" will always see you as offline."
msgstr "Now \"%s\" will always see you as offline."
-#: ../src/roster_window.py:1909
+#: ../src/roster_window.py:1920
msgid ""
"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
@@ -8628,15 +8911,15 @@ msgstr ""
"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
-#: ../src/roster_window.py:1919 ../src/roster_window.py:1939
+#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
msgid "GPG is not usable"
msgstr "GPG is not usable"
-#: ../src/roster_window.py:2095 ../src/roster_window.py:3277
+#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
msgid "You are participating in one or more group chats"
msgstr "You are participating in one or more group chats"
-#: ../src/roster_window.py:2096 ../src/roster_window.py:3278
+#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
msgid ""
"Changing your status to invisible will result in disconnection from those "
"group chats. Are you sure you want to go invisible?"
@@ -8644,15 +8927,15 @@ msgstr ""
"Changing your status to invisible will result in disconnection from those "
"group chats. Are you sure you want to go invisible?"
-#: ../src/roster_window.py:2122
+#: ../src/roster_window.py:2146
msgid "desync'ed"
msgstr "desync'ed"
-#: ../src/roster_window.py:2256 ../src/roster_window.py:2493
+#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
msgid "You have unread messages"
msgstr "You have unread messages"
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2285
msgid ""
"Messages will only be available for reading them later if you have history "
"enabled and contact is in your roster."
@@ -8660,16 +8943,16 @@ msgstr ""
"Messages will only be available for reading them later if you have history "
"enabled and contact is in your roster."
-#: ../src/roster_window.py:2494
+#: ../src/roster_window.py:2522
msgid "You must read them before removing this transport."
msgstr "You must read them before removing this transport."
-#: ../src/roster_window.py:2497
+#: ../src/roster_window.py:2525
#, python-format
msgid "Transport \"%s\" will be removed"
msgstr "Transport \"%s\" will be removed"
-#: ../src/roster_window.py:2498
+#: ../src/roster_window.py:2526
msgid ""
"You will no longer be able to send and receive messages from contacts using "
"this transport."
@@ -8677,11 +8960,11 @@ msgstr ""
"You will no longer be able to send and receive messages from contacts using "
"this transport."
-#: ../src/roster_window.py:2501
+#: ../src/roster_window.py:2529
msgid "Transports will be removed"
msgstr "Transports will be removed"
-#: ../src/roster_window.py:2506
+#: ../src/roster_window.py:2534
#, python-format
msgid ""
"You will no longer be able to send and receive messages to contacts from "
@@ -8691,51 +8974,52 @@ msgstr ""
"these transports: %s"
#. it's jid
-#: ../src/roster_window.py:2685
+#: ../src/roster_window.py:2668
msgid "Rename Contact"
msgstr "Rename Contact"
-#: ../src/roster_window.py:2686
+#: ../src/roster_window.py:2669
#, python-format
msgid "Enter a new nickname for contact %s"
msgstr "Enter a new nickname for contact %s"
-#: ../src/roster_window.py:2693
+#: ../src/roster_window.py:2676
msgid "Rename Group"
msgstr "Rename Group"
-#: ../src/roster_window.py:2694
+#: ../src/roster_window.py:2677
#, python-format
msgid "Enter a new name for group %s"
msgstr "Enter a new name for group %s"
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2733
msgid "Remove Group"
msgstr "Remove Group"
-#: ../src/roster_window.py:2743
+#: ../src/roster_window.py:2734
#, python-format
msgid "Do you want to remove group %s from the roster?"
msgstr "Do you want to remove group %s from the roster?"
-#: ../src/roster_window.py:2744
-msgid "Remove also all contacts in this group from your roster"
+#: ../src/roster_window.py:2735
+#, fuzzy
+msgid "Also remove all contacts in this group from your roster"
msgstr "Remove also all contacts in this group from your roster"
-#: ../src/roster_window.py:2790
+#: ../src/roster_window.py:2774
msgid "Assign OpenPGP Key"
msgstr "Assign OpenPGP Key"
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2775
msgid "Select a key to apply to the contact"
msgstr "Select a key to apply to the contact"
-#: ../src/roster_window.py:3142
+#: ../src/roster_window.py:3128
#, python-format
msgid "Contact \"%s\" will be removed from your roster"
msgstr "Contact \"%s\" will be removed from your roster"
-#: ../src/roster_window.py:3146
+#: ../src/roster_window.py:3132
msgid ""
"By removing this contact you also remove authorization resulting in him or "
"her always seeing you as offline."
@@ -8743,7 +9027,13 @@ msgstr ""
"By removing this contact you also remove authorisation resulting in him or "
"her always seeing you as offline."
-#: ../src/roster_window.py:3151
+#. Contact is not in roster
+#: ../src/roster_window.py:3137
+#, fuzzy
+msgid "Do you want to continue?"
+msgstr "Do you want to accept the invitation?"
+
+#: ../src/roster_window.py:3141
msgid ""
"By removing this contact you also by default remove authorization resulting "
"in him or her always seeing you as offline."
@@ -8751,16 +9041,16 @@ msgstr ""
"By removing this contact you also by default remove authorisation resulting "
"in him or her always seeing you as offline."
-#: ../src/roster_window.py:3154
+#: ../src/roster_window.py:3144
msgid "I want this contact to know my status after removal"
msgstr "I want this contact to know my status after removal"
#. several contact to remove at the same time
-#: ../src/roster_window.py:3158
+#: ../src/roster_window.py:3148
msgid "Contacts will be removed from your roster"
msgstr "Contacts will be removed from your roster"
-#: ../src/roster_window.py:3162
+#: ../src/roster_window.py:3152
#, python-format
msgid ""
"By removing these contacts:%s\n"
@@ -8769,19 +9059,19 @@ msgstr ""
"By removing these contacts:%s\n"
"you also remove authorisation resulting in them always seeing you as offline."
-#: ../src/roster_window.py:3201
+#: ../src/roster_window.py:3191
msgid "No account available"
msgstr "No account available"
-#: ../src/roster_window.py:3202
+#: ../src/roster_window.py:3192
msgid "You must create an account before you can chat with other contacts."
msgstr "You must create an account before you can chat with other contacts."
-#: ../src/roster_window.py:3720
+#: ../src/roster_window.py:3708
msgid "Metacontacts storage not supported by your server"
msgstr "Metacontacts storage not supported by your server"
-#: ../src/roster_window.py:3722
+#: ../src/roster_window.py:3710
msgid ""
"Your server does not support storing metacontacts information. So those "
"information will not be saved on next reconnection."
@@ -8789,13 +9079,13 @@ msgstr ""
"Your server does not support storing metacontacts information. So those "
"information will not be saved on next reconnection."
-#: ../src/roster_window.py:3800
+#: ../src/roster_window.py:3784
msgid ""
"You are about to create a metacontact. Are you sure you want to continue?"
msgstr ""
"You are about to create a metacontact. Are you sure you want to continue?"
-#: ../src/roster_window.py:3802
+#: ../src/roster_window.py:3786
msgid ""
"Metacontacts are a way to regroup several contacts in one line. Generally it "
"is used when the same person has several Jabber accounts or transport "
@@ -8805,14 +9095,14 @@ msgstr ""
"is used when the same person has several Jabber accounts or transport "
"accounts."
-#: ../src/roster_window.py:3915
+#: ../src/roster_window.py:3899
msgid "Invalid file URI:"
msgstr "Invalid file URI:"
-#: ../src/roster_window.py:3926
-#, python-format
+#: ../src/roster_window.py:3910
+#, fuzzy, python-format
msgid "Do you want to send this file to %s:"
-msgid_plural "Do you want to send those files to %s:"
+msgid_plural "Do you want to send these files to %s:"
msgstr[0] "Do you want to send this file to %s:"
msgstr[1] "Do you want to send these files to %s:"
@@ -8821,123 +9111,123 @@ msgstr[1] "Do you want to send these files to %s:"
#. for chat_with
#. for single message
#. join gc
-#: ../src/roster_window.py:4598 ../src/roster_window.py:4669
-#: ../src/roster_window.py:4678 ../src/systray.py:219 ../src/systray.py:224
-#: ../src/systray.py:230
+#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
+#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
+#: ../src/systray.py:266
#, python-format
msgid "using account %s"
msgstr "using account %s"
#. add
-#: ../src/roster_window.py:4685
+#: ../src/roster_window.py:4674
#, python-format
msgid "to %s account"
msgstr "to %s account"
#. disco
-#: ../src/roster_window.py:4690
+#: ../src/roster_window.py:4679
#, python-format
msgid "using %s account"
msgstr "using %s account"
-#: ../src/roster_window.py:4730
+#: ../src/roster_window.py:4716 ../src/systray.py:303
msgid "_Manage Bookmarks..."
msgstr "_Manage Bookmarks..."
#. profile, avatar
-#: ../src/roster_window.py:4749
+#: ../src/roster_window.py:4736
#, python-format
msgid "of account %s"
msgstr "of account %s"
-#: ../src/roster_window.py:4789
+#: ../src/roster_window.py:4776
#, python-format
msgid "for account %s"
msgstr "for account %s"
-#: ../src/roster_window.py:4851 ../src/roster_window.py:4960
+#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
msgid "_Change Status Message"
msgstr "_Change Status Message"
-#: ../src/roster_window.py:4878
+#: ../src/roster_window.py:4865
msgid "Publish Tune"
msgstr "Publish Tune"
-#: ../src/roster_window.py:4885
+#: ../src/roster_window.py:4873
msgid "Mood"
msgstr "Mood"
-#: ../src/roster_window.py:4889
+#: ../src/roster_window.py:4879
msgid "Activity"
msgstr "Activity"
-#: ../src/roster_window.py:4894
+#: ../src/roster_window.py:4884
msgid "Configure Services..."
msgstr "Configure Services..."
-#: ../src/roster_window.py:5048
+#: ../src/roster_window.py:5035
msgid "_Maximize All"
msgstr "_Maximise All"
#. Send Group Message
-#: ../src/roster_window.py:5056 ../src/roster_window.py:5560
+#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
msgid "Send Group M_essage"
msgstr "Send Group M_essage"
-#: ../src/roster_window.py:5064
+#: ../src/roster_window.py:5051
msgid "To all users"
msgstr "To all users"
-#: ../src/roster_window.py:5068
+#: ../src/roster_window.py:5055
msgid "To all online users"
msgstr "To all online users"
-#: ../src/roster_window.py:5462
+#: ../src/roster_window.py:5465
msgid "I would like to add you to my roster"
msgstr "I would like to add you to my roster"
#. Manage Transport submenu
-#: ../src/roster_window.py:5580
+#: ../src/roster_window.py:5588
msgid "_Manage Contacts"
msgstr "_Manage Contacts"
#. Send single message
-#: ../src/roster_window.py:5641
+#: ../src/roster_window.py:5649
msgid "Send Single Message"
msgstr "Send Single Message"
#. Manage Transport submenu
-#: ../src/roster_window.py:5697
+#: ../src/roster_window.py:5705
msgid "_Manage Transport"
msgstr "_Manage Transport"
#. Modify Transport
-#: ../src/roster_window.py:5705
+#: ../src/roster_window.py:5713
msgid "_Modify Transport"
msgstr "_Modify Transport"
-#: ../src/roster_window.py:5780
+#: ../src/roster_window.py:5788
msgid "_Maximize"
msgstr "_Maximise"
-#: ../src/roster_window.py:5787
+#: ../src/roster_window.py:5795
msgid "_Disconnect"
msgstr "_Disconnect"
-#: ../src/roster_window.py:5867
+#: ../src/roster_window.py:5875
msgid "_New Group Chat"
msgstr "_New Group Chat"
#. History manager
-#: ../src/roster_window.py:5980
+#: ../src/roster_window.py:5988
msgid "History Manager"
msgstr "History Manager"
-#: ../src/roster_window.py:5989
+#: ../src/roster_window.py:5997 ../src/systray.py:341
msgid "_Join New Group Chat"
msgstr "_Join New Group Chat"
-#: ../src/roster_window.py:6199
+#: ../src/roster_window.py:6207
msgid "Change Status Message..."
msgstr "Change Status Message..."
@@ -8954,27 +9244,27 @@ msgstr "Error in received dataform"
msgid "No result"
msgstr "No result"
-#: ../src/session.py:122
+#: ../src/session.py:124
msgid "Disk WriteError"
msgstr "Disk WriteError"
-#: ../src/session.py:232
+#: ../src/session.py:238
#, python-format
msgid "Subject: %s"
msgstr "Subject: %s"
-#: ../src/session.py:392 ../src/session.py:430
+#: ../src/session.py:398 ../src/session.py:433
msgid "Confirm these session options"
msgstr "Confirm these session options"
-#: ../src/session.py:393
-#, python-format
+#: ../src/session.py:400
+#, fuzzy, python-format
msgid ""
"The remote client wants to negotiate an session with these features:\n"
"\n"
-"\t\t%s\n"
+"\t%s\n"
"\n"
-"\t\tAre these options acceptable?"
+"\tAre these options acceptable?"
msgstr ""
"The remote client wants to negotiate an session with these features:\n"
"\n"
@@ -8982,7 +9272,7 @@ msgstr ""
"\n"
"\t\tAre these options acceptable?"
-#: ../src/session.py:431
+#: ../src/session.py:434
#, python-format
msgid ""
"The remote client selected these options:\n"
@@ -8997,19 +9287,19 @@ msgstr ""
"\n"
"Continue with the session?"
-#: ../src/systray.py:176
+#: ../src/systray.py:188
msgid "_Change Status Message..."
msgstr "_Change Status Message..."
-#: ../src/systray.py:261
+#: ../src/systray.py:322
msgid "Hide this menu"
msgstr "Hide this menu"
-#: ../src/tooltips.py:327 ../src/tooltips.py:522
+#: ../src/tooltips.py:327 ../src/tooltips.py:521
msgid "Jabber ID: "
msgstr "Jabber ID: "
-#: ../src/tooltips.py:330 ../src/tooltips.py:526
+#: ../src/tooltips.py:330 ../src/tooltips.py:525
msgid "Resource: "
msgstr "Resource: "
@@ -9026,104 +9316,95 @@ msgstr " [blocked]"
msgid " [minimized]"
msgstr " [minimised]"
-#: ../src/tooltips.py:451 ../src/tooltips.py:710
+#: ../src/tooltips.py:451 ../src/tooltips.py:706
msgid "Status: "
msgstr "Status: "
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
#, python-format
msgid "Last status: %s"
msgstr "Last status: %s"
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
#, python-format
msgid " since %s"
msgstr " since %s"
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
msgid "Connected"
msgstr "Connected"
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
msgid "Disconnected"
msgstr "Disconnected"
#. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:532
msgid "Subscription: "
msgstr "Subscription: "
-#: ../src/tooltips.py:543
+#: ../src/tooltips.py:542
msgid "OpenPGP: "
msgstr "OpenPGP: "
-#: ../src/tooltips.py:589
+#: ../src/tooltips.py:587
msgid "Mood:"
msgstr "Mood:"
-#: ../src/tooltips.py:604
+#: ../src/tooltips.py:602
msgid "Activity:"
msgstr "Activity:"
-#: ../src/tooltips.py:640
+#: ../src/tooltips.py:638
msgid "Tune:"
msgstr "Tune:"
-#: ../src/tooltips.py:641
-#, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
-msgstr ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
-
-#: ../src/tooltips.py:666
+#: ../src/tooltips.py:664
msgid "Download"
msgstr "Download"
-#: ../src/tooltips.py:672
+#: ../src/tooltips.py:670
msgid "Upload"
msgstr "Upload"
-#: ../src/tooltips.py:679
+#: ../src/tooltips.py:677
msgid "Type: "
msgstr "Type: "
-#: ../src/tooltips.py:685
+#: ../src/tooltips.py:681
msgid "Transferred: "
msgstr "Transferred: "
-#: ../src/tooltips.py:688 ../src/tooltips.py:709
+#: ../src/tooltips.py:684 ../src/tooltips.py:705
msgid "Not started"
msgstr "Not started"
-#: ../src/tooltips.py:692
+#: ../src/tooltips.py:688
msgid "Stopped"
msgstr "Stopped"
-#: ../src/tooltips.py:694 ../src/tooltips.py:697
+#: ../src/tooltips.py:690 ../src/tooltips.py:693
msgid "Completed"
msgstr "Completed"
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:697
msgid "?transfer status:Paused"
msgstr "Paused"
#. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:705
+#: ../src/tooltips.py:701
msgid "Stalled"
msgstr "Stalled"
-#: ../src/tooltips.py:707
+#: ../src/tooltips.py:703
msgid "Transferring"
msgstr "Transferring"
-#: ../src/tooltips.py:743
+#: ../src/tooltips.py:739
msgid "This service has not yet responded with detailed information"
msgstr "This service has not yet responded with detailed information"
-#: ../src/tooltips.py:746
+#: ../src/tooltips.py:742
msgid ""
"This service could not respond with detailed information.\n"
"It is most likely legacy or broken"
@@ -9131,24 +9412,24 @@ msgstr ""
"This service could not respond with detailed information.\n"
"It is most likely legacy or broken"
-#: ../src/vcard.py:246
+#: ../src/vcard.py:245
msgid "?Client:Unknown"
msgstr "Unknown"
-#: ../src/vcard.py:248
+#: ../src/vcard.py:247
msgid "?OS:Unknown"
msgstr "Unknown"
-#: ../src/vcard.py:273 ../src/vcard.py:283 ../src/vcard.py:482
+#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
#, python-format
msgid "since %s"
msgstr "since %s"
-#: ../src/vcard.py:312
+#: ../src/vcard.py:311
msgid "<b>Affiliation:</b>"
msgstr "<b>Affiliation:</b>"
-#: ../src/vcard.py:320
+#: ../src/vcard.py:319
msgid ""
"This contact is interested in your presence information, but you are not "
"interested in his/her presence"
@@ -9156,7 +9437,7 @@ msgstr ""
"This contact is interested in your presence information, but you are not "
"interested in his/her presence"
-#: ../src/vcard.py:322
+#: ../src/vcard.py:321
msgid ""
"You are interested in the contact's presence information, but he/she is not "
"interested in yours"
@@ -9164,13 +9445,13 @@ msgstr ""
"You are interested in the contact's presence information, but he/she is not "
"interested in yours"
-#: ../src/vcard.py:324
+#: ../src/vcard.py:323
msgid "You and the contact are interested in each other's presence information"
msgstr ""
"You and the contact are interested in each other's presence information"
#. None
-#: ../src/vcard.py:326
+#: ../src/vcard.py:325
msgid ""
"You are not interested in the contact's presence, and neither he/she is "
"interested in yours"
@@ -9178,18 +9459,73 @@ msgstr ""
"You are not interested in the contact's presence, and neither he/she is "
"interested in yours"
-#: ../src/vcard.py:333
+#: ../src/vcard.py:332
msgid "You are waiting contact's answer about your subscription request"
msgstr "You are waiting contact's answer about your subscription request"
-#: ../src/vcard.py:335
+#: ../src/vcard.py:334
msgid "There is no pending subscription request."
msgstr "There is no pending subscription request."
-#: ../src/vcard.py:340 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
msgid " resource with priority "
msgstr " resource with priority "
+#, fuzzy
+#~ msgid "OpenPGP Encryption"
+#~ msgstr "Toggle Open_PGP Encryption"
+
+#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+#~ msgstr "%s has not broadcast an OpenPGP key, nor has one been assigned"
+
+#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
+#~ msgstr ""
+#~ "No such command: /%s (if you want to send this, prefix it with /say)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: /%s <action>, sends action to the current group chat. Use third "
+#~ "person. (e.g. /%s explodes.)"
+#~ msgstr ""
+#~ "Usage: /%(command)s <action>, sends action to the current group chat. Use "
+#~ "third person. (e.g. /%(command)s explodes.)"
+
+#, fuzzy
+#~ msgid "Encryption enabled"
+#~ msgstr "E2E encryption enabled"
+
+#, fuzzy
+#~ msgid "Encryption disabled"
+#~ msgstr "E2E encryption disabled"
+
+#~ msgid ""
+#~ "If checked, Gajim will sort contacts in roster window and groupchats by "
+#~ "their status and not by the shown name"
+#~ msgstr ""
+#~ "If ticked, Gajim will sort contacts in roster window and groupchats by "
+#~ "their status and not by the shown name"
+
+#~ msgid "A_ccounts"
+#~ msgstr "A_ccounts"
+
+#~ msgid "<b>\"%(title)s\"</b> by "
+#~ msgstr "<b>\"%(title)s\"</b> by "
+
+#~ msgid "%(title)s by %(artist)s\n"
+#~ msgstr "%(title)s by %(artist)s\n"
+
+#~ msgid "The username used to identify the Last.fm account."
+#~ msgstr "The username used to identify the Last.fm account."
+
+#~ msgid "Thoughtful"
+#~ msgstr "Thoughtful"
+
+#~ msgid "Network Manager support not available"
+#~ msgstr "Network Manager support not available"
+
+#~ msgid "Session Management support not available (missing gnome.ui module)"
+#~ msgstr "Session Management support not available (missing gnome.ui module)"
+
#~ msgid "_Retype Password:"
#~ msgstr "_Retype Password:"
@@ -9461,9 +9797,6 @@ msgstr " resource with priority "
#~ "\n"
#~ "Highlighting misspelt words feature will not be used"
-#~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
-#~ msgstr "%s has not broadcast an OpenPGP key, nor has one been assigned"
-
#~ msgid "Every %s _minutes"
#~ msgstr "Every %s _minutes"
@@ -9502,10 +9835,6 @@ msgstr " resource with priority "
#~ msgid "%s does not appear to be a valid JID"
#~ msgstr "%s does not appear to be a valid JID"
-#~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
-#~ msgstr ""
-#~ "No such command: /%s (if you want to send this, prefix it with /say)"
-
#~ msgid "%s - Gajim"
#~ msgstr "%s - Gajim"