Show
Ignore:
Timestamp:
01/06/07 12:00:50 (2 years ago)
Author:
asterix
Message:

merge changeset from trunk except pyopenssl stuff

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • branches/gajim_0.11/src/filetransfers_window.py

    r7659 r7787  
    202202                self.window.present() 
    203203                self.window.window.focus() 
    204                 dialogs.InformationDialog(_('File transfer canceled'), _('Connection with peer cannot be established.')) 
     204                dialogs.InformationDialog(_('File transfer cancelled'), _('Connection with peer cannot be established.')) 
    205205                self.tree.get_selection().unselect_all() 
    206206 
    … …  
    210210                self.window.present() 
    211211                self.window.window.focus() 
    212                 dialogs.InformationDialog(_('File transfer canceled'), 
     212                dialogs.InformationDialog(_('File transfer cancelled'), 
    213213_('Connection with peer cannot be established.')) 
    214214                self.tree.get_selection().unselect_all() 
    … …  
    225225                if error_msg: 
    226226                        sectext += '\n\t' + _('Error message: %s') % error_msg 
    227                 dialogs.ErrorDialog(_('File transfer stopped by the contact of the other side'), \ 
    228                         sectext) 
     227                dialogs.ErrorDialog(_('File transfer stopped by the contact at the other ' 
     228                        'end'), sectext) 
    229229                self.tree.get_selection().unselect_all() 
    230230