/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to diff.py

  • Committer: Vincent Ladeuil
  • Date: 2008-05-20 07:04:00 UTC
  • mfrom: (475.1.4 gtk)
  • mto: This revision was merged to the branch mainline in revision 490.
  • Revision ID: v.ladeuil+lp@free.fr-20080520070400-4ny0vah1qji2249k
(vila) Replace _() calls by _i18n() calls. (#187283)

Show diffs side-by-side

added added

removed removed

Lines of Context:
diff.py
41
41
from bzrlib.errors import NoSuchFile
42
42
from bzrlib.patches import parse_patches
43
43
from bzrlib.trace import warning
 
44
from bzrlib.plugins.gtk import _i18n
44
45
from bzrlib.plugins.gtk.window import Window
45
46
from dialog import error_dialog, info_dialog, warning_dialog
46
47
 
510
511
                merger.set_pending()
511
512
                if conflict_count == 0:
512
513
                    # No conflicts found.
513
 
                    info_dialog(_('Merge successful'),
514
 
                                _('All changes applied successfully.'))
 
514
                    info_dialog(_i18n('Merge successful'),
 
515
                                _i18n('All changes applied successfully.'))
515
516
                else:
516
517
                    # There are conflicts to be resolved.
517
 
                    warning_dialog(_('Conflicts encountered'),
518
 
                                   _('Please resolve the conflicts manually'
519
 
                                     ' before committing.'))
 
518
                    warning_dialog(_i18n('Conflicts encountered'),
 
519
                                   _i18n('Please resolve the conflicts manually'
 
520
                                         ' before committing.'))
520
521
                self.destroy()
521
522
            except Exception, e:
522
523
                error_dialog('Error', str(e))