changeset 9e5688f59968 in /home/hg/repos/gajim
branches:
details:http://hg.gajim.org/gajim?cmd=changeset;node=9e5688f59968
description: use correct translation function. Fixes #7267
diffstat:
src/gajim-remote.py | 53 +++++++++++++++++++++++++++--------------------------
1 files changed, 27 insertions(+), 26 deletions(-)
diffs (171 lines):
diff -r cb1255893834 -r 9e5688f59968 src/gajim-remote.py
--- a/src/gajim-remote.py Thu Jul 25 10:37:03 2013 +0200
+++ b/src/gajim-remote.py Thu Jul 25 19:03:43 2013 +0200
@@ -34,6 +34,7 @@
from common import exceptions
from common import i18n # This installs _() function
+from common.i18n import Q_
try:
PREFERRED_ENCODING = locale.getpreferredencoding()
@@ -93,7 +94,7 @@
_('Prints a list of all contacts in the
roster. Each contact '
'appears on a separate line'),
[
- (_('?CLI:account'), _('show only contacts
of the given account'),
+ (Q_('?CLI:account'), _('show only contacts
of the given account'),
False)
]
@@ -106,9 +107,9 @@
_('Changes the status of account or accounts'),
[
#offline, online, chat, away, xa, dnd, invisible should not be translated
- (_('?CLI:status'), _('one of: offline,
online, chat, away, xa, dnd, invisible. If not set, use account\'s previous
status'), False),
- (_('?CLI:message'), _('status message'),
False),
- (_('?CLI:account'), _('change status of
account "account". '
+ (Q_('?CLI:status'), _('one of: offline,
online, chat, away, xa, dnd, invisible. If not set, use account\'s previous
status'), False),
+ (Q_('?CLI:message'), _('status message'),
False),
+ (Q_('?CLI:account'), _('change status of
account "account". '
'If not specified, try to change status of all accounts that have '
'"sync with global status" option set'), False)
]
@@ -116,9 +117,9 @@
'set_priority': [
_('Changes the priority of account or
accounts'),
[
- (_('?CLI:priority'), _('priority you want
to give to the account'),
+ (Q_('?CLI:priority'), _('priority you want
to give to the account'),
True),
- (_('?CLI:account'), _('change the priority
of the given account. '
+ (Q_('?CLI:account'), _('change the
priority of the given account. '
'If not specified, change
status of all accounts that have'
' "sync with global status"
option set'), False)
]
@@ -128,9 +129,9 @@
[
('jid', _('JID of the contact that you
want to chat with'),
True),
- (_('?CLI:account'), _('if specified,
contact is taken from the '
+ (Q_('?CLI:account'), _('if specified,
contact is taken from the '
'contact list of this
account'), False),
- (_('?CLI:message'),
+ (Q_('?CLI:message'),
_('message content. The
account must be specified or ""'),
False)
]
@@ -141,10 +142,10 @@
'without \'OpenPGP key\', just set \'OpenPGP
key\' to \'\'.'),
[
('jid', _('JID of the contact that
will receive the message'), True),
- (_('?CLI:message'), _('message
contents'), True),
+ (Q_('?CLI:message'), _('message
contents'), True),
(_('pgp key'), _('if specified, the
message will be encrypted '
'using this public key'),
False),
- (_('?CLI:account'), _('if specified,
the message will be sent '
+ (Q_('?CLI:account'), _('if specified,
the message will be sent '
'using this account'), False),
]
],
@@ -155,10 +156,10 @@
[
('jid', _('JID of the contact that
will receive the message'), True),
(_('subject'), _('message subject'),
True),
- (_('?CLI:message'), _('message
contents'), True),
+ (Q_('?CLI:message'), _('message
contents'), True),
(_('pgp key'), _('if specified, the
message will be encrypted '
'using this public key'),
False),
- (_('?CLI:account'), _('if specified,
the message will be sent '
+ (Q_('?CLI:account'), _('if specified,
the message will be sent '
'using this account'), False),
]
],
@@ -166,8 +167,8 @@
_('Sends new message to a groupchat you\'ve
joined.'),
[
('room_jid', _('JID of the room that
will receive the message'), True),
- (_('?CLI:message'), _('message
contents'), True),
- (_('?CLI:account'), _('if specified,
the message will be sent '
+ (Q_('?CLI:message'), _('message
contents'), True),
+ (Q_('?CLI:account'), _('if specified,
the message will be sent '
'using this account'), False),
]
],
@@ -188,7 +189,7 @@
[
(_('file'), _('File path'), True),
('jid', _('JID of the contact'), True),
- (_('?CLI:account'), _('if specified,
file will be sent using this '
+ (Q_('?CLI:account'), _('if specified,
file will be sent using this '
'account'), False)
]
],
@@ -218,7 +219,7 @@
_('Removes contact from roster'),
[
('jid', _('JID of the contact'), True),
- (_('?CLI:account'), _('if specified,
contact is taken from the '
+ (Q_('?CLI:account'), _('if specified,
contact is taken from the '
'contact list of this
account'), False)
]
@@ -227,21 +228,21 @@
_('Adds contact to roster'),
[
(_('jid'), _('JID of the contact'),
True),
- (_('?CLI:account'), _('Adds new
contact to this account'), False)
+ (Q_('?CLI:account'), _('Adds new
contact to this account'), False)
]
],
'get_status': [
_('Returns current status (the global one unless
account is specified)'),
[
- (_('?CLI:account'), '', False)
+ (Q_('?CLI:account'), '', False)
]
],
'get_status_message': [
_('Returns current status message (the global one
unless account is specified)'),
[
- (_('?CLI:account'), '', False)
+ (Q_('?CLI:account'), '', False)
]
],
@@ -252,7 +253,7 @@
'start_chat': [
_('Opens \'Start Chat\' dialog'),
[
- (_('?CLI:account'), _('Starts chat,
using this account'), True)
+ (Q_('?CLI:account'), _('Starts chat,
using this account'), True)
]
],
'send_xml': [
@@ -277,18 +278,18 @@
_('Handle a xmpp:/ uri'),
[
(_('uri'), _('URI to handle'), True),
- (_('?CLI:account'), _('Account in
which you want to handle it'),
+ (Q_('?CLI:account'), _('Account in
which you want to handle it'),
False),
- (_('?CLI:message'), _('Message
content'), False)
+ (Q_('?CLI:message'), _('Message
content'), False)
]
],
'join_room': [
_('Join a MUC room'),
[
- (_('?CLI:room'), _('Room JID'), True),
- (_('?CLI:nick'), _('Nickname to use'),
False),
- (_('?CLI:password'), _('Password to
enter the room'), False),
- (_('?CLI:account'), _('Account from
which you want to enter the '
+ (Q_('?CLI:room'), _('Room JID'), True),
+ (Q_('?CLI:nick'), _('Nickname to
use'), False),
+ (Q_('?CLI:password'), _('Password to
enter the room'), False),
+ (Q_('?CLI:account'), _('Account from
which you want to enter the '
'room'), False)
]
],
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits