← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Jonathan Riddell
  • Date: 2011-09-14 14:57:54 UTC
  • mto: This revision was merged to the branch mainline in revision 6143.
  • Revision ID: jriddell@canonical.com-20110914145754-yklo20ib7e5xlksl
use gettext() in more files

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
40
40
        ui,
41
41
        urlutils,
42
42
        )
 
43
from bzrlib.i18n import gettext
43
44
""")
44
45
 
45
46
from bzrlib import (
3134
3135
        tag_updates = getattr(self, "tag_updates", None)
3135
3136
        if not is_quiet():
3136
3137
            if self.old_revid != self.new_revid:
3137
 
                note('Pushed up to revision %d.' % self.new_revno)
 
3138
                note(gettext('Pushed up to revision %d.') % self.new_revno)
3138
3139
            if tag_updates:
3139
 
                note('%d tag(s) updated.' % len(tag_updates))
 
3140
                note(gettext('%d tag(s) updated.') % len(tag_updates))
3140
3141
            if self.old_revid == self.new_revid and not tag_updates:
3141
3142
                if not tag_conflicts:
3142
 
                    note('No new revisions or tags to push.')
 
3143
                    note(gettext('No new revisions or tags to push.'))
3143
3144
                else:
3144
 
                    note('No new revisions to push.')
 
3145
                    note(gettext('No new revisions to push.'))
3145
3146
        self._show_tag_conficts(to_file)
3146
3147
 
3147
3148
 
3161
3162
        :param verbose: Requests more detailed display of what was checked,
3162
3163
            if any.
3163
3164
        """
3164
 
        note('checked branch %s format %s', self.branch.user_url,
 
3165
        note(gettext('checked branch %s format %s'), self.branch.user_url,
3165
3166
            self.branch._format)
3166
3167
        for error in self.errors:
3167
 
            note('found error:%s', error)
 
3168
            note(gettext('found error:%s'), error)
3168
3169
 
3169
3170
 
3170
3171
class Converter5to6(object):