← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Jonathan Riddell
  • Date: 2011-09-15 11:31:47 UTC
  • mto: This revision was merged to the branch mainline in revision 6143.
  • Revision ID: jriddell@canonical.com-20110915113147-bgleett47i4jjxya
add gettext() to uses of trace.note()

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
38
38
    versionedfile,
39
39
    workingtree,
40
40
    )
 
41
from bzrlib.i18n import gettext
41
42
""")
42
43
from bzrlib import (
43
44
    decorators,
711
712
        merge = operation.run_simple()
712
713
        if len(merge.cooked_conflicts) == 0:
713
714
            if not self.ignore_zero and not trace.is_quiet():
714
 
                trace.note("All changes applied successfully.")
 
715
                trace.note(gettext("All changes applied successfully."))
715
716
        else:
716
 
            trace.note("%d conflicts encountered."
 
717
            trace.note(gettext("%d conflicts encountered.")
717
718
                       % len(merge.cooked_conflicts))
718
719
 
719
720
        return len(merge.cooked_conflicts)