Yann Leboulanger pushed to branch gajim_1.2 at gajim / gajim

Commits:

2 changed files:

Changes:

  • gajim/groupchat_control.py
    ... ... @@ -828,8 +828,8 @@ class GroupchatControl(ChatControlBase):
    828 828
             NewConfirmationDialog(
    
    829 829
                 _('Voice Request'),
    
    830 830
                 _('Voice Request'),
    
    831
    -            _('<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice') % (
    
    832
    -                event.voice_request.nick, self.room_name),
    
    831
    +            _('<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice') % {
    
    832
    +                'nick': event.voice_request.nick, 'room_name': self.room_name},
    
    833 833
                 [DialogButton.make('Cancel'),
    
    834 834
                  DialogButton.make('Accept',
    
    835 835
                                    text=_('_Approve'),
    

  • gajim/gui_interface.py
    ... ... @@ -352,7 +352,8 @@ class Interface:
    352 352
             jid = contact.jid
    
    353 353
             NewConfirmationDialog(
    
    354 354
                 _('Subscription Removed'),
    
    355
    -            _('%(name)s (%(jid)s) has removed subscription from you') % (name, jid),
    
    355
    +            _('%(name)s (%(jid)s) has removed subscription from you') % {
    
    356
    +                'name': name, 'jid': jid},
    
    356 357
                 _('You will always see this contact as offline.\n'
    
    357 358
                   'Do you want to remove them from your contact list?'),
    
    358 359
                 [DialogButton.make('Cancel',