diff options
author | Yann Leboulanger <asterix@lagaule.org> | 2008-08-01 17:03:23 +0400 |
---|---|---|
committer | Yann Leboulanger <asterix@lagaule.org> | 2008-08-01 17:03:23 +0400 |
commit | 4eebf0e0361ec873098ccc3a72752109553fd6cb (patch) | |
tree | c416c56914ec3fa570d1e0f7f9e0278c52ce8336 | |
parent | eaf9f1c3bc556e885fb3dfb6e246d6e311c7bd59 (diff) |
fix some translated strings
-rw-r--r-- | src/common/config.py | 2 | ||||
-rwxr-xr-x | src/gajim-remote.py | 15 | ||||
-rw-r--r-- | src/groupchat_control.py | 18 | ||||
-rw-r--r-- | src/message_window.py | 4 |
4 files changed, 22 insertions, 17 deletions
diff --git a/src/common/config.py b/src/common/config.py index 5978b11b8..9943b5e17 100644 --- a/src/common/config.py +++ b/src/common/config.py @@ -167,7 +167,7 @@ class Config: 'key_up_lines': [opt_int, 25, _('How many lines to store for Ctrl+KeyUP.')], 'version': [ opt_str, defs.version ], # which version created the config 'search_engine': [opt_str, 'http://www.google.com/search?&q=%s&sourceid=gajim'], - 'dictionary_url': [opt_str, 'WIKTIONARY', _("Either custom url with %%s in it where %%s is the word/phrase or 'WIKTIONARY' which means use wiktionary.")], + 'dictionary_url': [opt_str, 'WIKTIONARY', _("Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary.")], 'always_english_wikipedia': [opt_bool, False], 'always_english_wiktionary': [opt_bool, True], 'remote_control': [opt_bool, True, _('If checked, Gajim can be controlled remotely using gajim-remote.'), True], diff --git a/src/gajim-remote.py b/src/gajim-remote.py index 0a2beadd0..3e7032ec1 100755 --- a/src/gajim-remote.py +++ b/src/gajim-remote.py @@ -409,8 +409,9 @@ class GajimRemote: if command in self.commands: command_props = self.commands[command] arguments_str = self.make_arguments_row(command_props[1]) - str = _('Usage: %s %s %s \n\t %s') % (BASENAME, command, - arguments_str, command_props[0]) + str = _('Usage: %(basename)s %(command)s %(arguments)s \n\t %(help)s')\ + % {'basename': BASENAME, 'command': command, + 'arguments': arguments_str, 'help': command_props[0]} if len(command_props[1]) > 0: str += '\n\n' + _('Arguments:') + '\n' for argument in command_props[1]: @@ -494,12 +495,14 @@ class GajimRemote: args = self.commands[self.command][1] if len(args) < argv_len: send_error(_('Too many arguments. \n' - 'Type "%s help %s" for more info') % (BASENAME, self.command)) + 'Type "%(basename)s help %(command)s" for more info') % { + 'basename': BASENAME, 'command': self.command}) if len(args) > argv_len: if args[argv_len][2]: - send_error(_('Argument "%s" is not specified. \n' - 'Type "%s help %s" for more info') % - (args[argv_len][0], BASENAME, self.command)) + send_error(_('Argument "%(arg)s" is not specified. \n' + 'Type "%(basename)s help %(command)s" for more info') % + {'arg': args[argv_len][0], 'basename': BASENAME, + 'command': self.command}) self.arguments = [] i = 0 for arg in sys.argv[2:]: diff --git a/src/groupchat_control.py b/src/groupchat_control.py index f824d01db..f136025be 100644 --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -145,8 +145,8 @@ class PrivateChatControl(ChatControl): dialogs.ErrorDialog( _('Sending private message failed'), #in second %s code replaces with nickname - _('You are no longer in group chat "%s" or "%s" has left.') % \ - (room, nick)) + _('You are no longer in group chat "%(room)s" or "%(nick)s" has ' + 'left.') % {'room': room, 'nick': nick}) return ChatControl.send_message(self, message) @@ -1062,7 +1062,8 @@ class GroupchatControl(ChatControlBase): self.new_nick = '' s = _('You are now known as %s') % new_nick else: - s = _('%s is now known as %s') % (nick, new_nick) + s = _('%(nick)s is now known as %(new_nick)s') % { + 'nick': nick, 'new_nick': new_nick} # We add new nick to muc roster here, so we don't see # that "new_nick has joined the room" when he just changed nick. # add_contact_to_roster will be called a second time @@ -1211,7 +1212,8 @@ class GroupchatControl(ChatControlBase): if newly_created and print_status in ('all', 'in_and_out'): st = _('%s has joined the group chat') % nick_jid elif print_status == 'all': - st = _('%s is now %s') % (nick_jid, helpers.get_uf_show(show)) + st = _('%(nick)s is now %(status)s') % {'nick': nick_jid, + 'status': helpers.get_uf_show(show)} if st: if status: st += ' (' + status + ')' @@ -1553,9 +1555,9 @@ class GroupchatControl(ChatControlBase): 'optionally displays a reason. Does NOT support spaces in ' 'nickname.') % command, 'info') elif command == 'me': - self.print_conversation(_('Usage: /%s <action>, sends action to the ' - 'current group chat. Use third person. (e.g. /%s explodes.)') % \ - (command, command), 'info') + self.print_conversation(_('Usage: /%(command)s <action>, sends action ' + 'to the current group chat. Use third person. (e.g. /%(command)s ' + 'explodes.)') % {'command': command}, 'info') elif command == 'msg': s = _('Usage: /%s <nickname> [message], opens a private message window' ' and sends message to the occupant specified by nickname.') % \ @@ -2321,4 +2323,4 @@ class GroupchatControl(ChatControlBase): else: self.revoke_owner(widget, jid) -# vim: se ts=3:
\ No newline at end of file +# vim: se ts=3: diff --git a/src/message_window.py b/src/message_window.py index 48acffa11..e7745042a 100644 --- a/src/message_window.py +++ b/src/message_window.py @@ -405,7 +405,7 @@ class MessageWindow(object): title = 'Gajim' if label: - title = _('%s - %s') % (label, title) + title = '%s - %s' % (label, title) if window_mode == MessageWindowMgr.ONE_MSG_WINDOW_PERACCT: title = title + ": " + control.account @@ -1088,4 +1088,4 @@ May be useful some day in the future?''' ctrl.parent_win = mw mw.new_tab(ctrl) -# vim: se ts=3:
\ No newline at end of file +# vim: se ts=3: |