~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/apply_bundle.py

(jr) Add gettext() to uses of note() (Jonathan Riddell)

Show diffs side-by-side

added added

removed removed

Lines of Context:
64
64
        merger.pp.next_phase()
65
65
        merger.find_base()
66
66
        if merger.base_rev_id == merger.other_rev_id:
67
 
            note("Nothing to do.")
 
67
            note(gettext("Nothing to do."))
68
68
            return 0
69
69
        merger.merge_type = merge_type
70
70
        merger.show_base = show_base