/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/bundle/apply_bundle.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/bundle/apply_bundle.py
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