copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix passive voice. now translators can write more free

This commit is contained in:
Nikos Kouremenos 2005-09-03 16:30:01 +00:00
parent ac7e0c2af8
commit faab65d973
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/dialogs.py
View File

@ -1215,8 +1215,9 @@ class InvitationReceivedDialog(HigDialog):
btn_deny = gtk.Button(stock = 'inv-deny') btn_deny = gtk.Button(stock = 'inv-deny')
btn_accept = gtk.Button(stock = 'inv-accept') btn_accept = gtk.Button(stock = 'inv-accept')
#FIXME: add pano markup #FIXME: add pango markup
pritext = _('You have been invited to the %s room by %s') % (room_jid, contact_jid) pritext = _('You have been invited to the %(room_jid)s room by %(contact_jid)s') % {
'room_jid': room_jid, 'contact_jid': contact_jid }
if comment is not None: if comment is not None:
string += '\n' + _('Comment: %s') % comment string += '\n' + _('Comment: %s') % comment

27
src/groupchat_window.py
View File

@ -335,19 +335,28 @@ class GroupchatWindow(chat.Chat):
model = self.list_treeview[room_jid].get_model() model = self.list_treeview[room_jid].get_model()
if show in ('offline', 'error'): if show in ('offline', 'error'):
if statusCode == '307': if statusCode == '307':
self.print_conversation(_('%s has been kicked by %s: %s') % (nick, s = _('%(nick)s has been kicked by %(who)s: %(reason)s') % {
actor, reason), room_jid) 'nick': nick,
#FIXME: this produced foo has been kciked by JID: reason 'who': actor,
#Should we show the JID to everyone? the same for ban 'reason': reason }
#I propose we use nick self.print_conversation(s, room_jid)
#FIXME: this produced foo has been kicked by JID: reason
# Should we show the JID to everyone? the same for ban
# I propose we use nick
elif statusCode == '301': elif statusCode == '301':
self.print_conversation(_('%s has been banned by %s: %s') % (nick, s = _('%(nick)s has been banned by %(who)s: %(reason)s') % {
actor, reason), room_jid) 'nick': nick,
'who': actor,
'reason': reason }
self.print_conversation(s, room_jid)
elif statusCode == '303': # Someone changed his nick elif statusCode == '303': # Someone changed his nick
self.print_conversation(_('%s is now known as %s') % (nick,
new_nick), room_jid)
if nick == self.nicks[room_jid]: # We changed our nick if nick == self.nicks[room_jid]: # We changed our nick
self.nicks[room_jid] = new_nick self.nicks[room_jid] = new_nick
s = _('You are now known as %s') % new_nick
else:
s = _('%s is now known as %s') % (nick, new_nick)
self.print_conversation(s, room_jid)
self.remove_contact(room_jid, nick) self.remove_contact(room_jid, nick)
if nick == self.nicks[room_jid] and statusCode != '303': # We became offline if nick == self.nicks[room_jid] and statusCode != '303': # We became offline
self.got_disconnected(room_jid) self.got_disconnected(room_jid)