← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

(jr) Add gettext() to progress bar text
 (Jonathan Riddell)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
859
859
            self.active_hooks = [hook for hook in hooks if hook is not None]
860
860
            for num, (file_id, changed, parents3, names3,
861
861
                      executable3) in enumerate(entries):
862
 
                child_pb.update('Preparing file merge', num, len(entries))
 
862
                child_pb.update(gettext('Preparing file merge'), num, len(entries))
863
863
                self._merge_names(file_id, parents3, names3, resolver=resolver)
864
864
                if changed:
865
865
                    file_status = self._do_merge_contents(file_id)
1907
1907
            entries = self._entries_to_incorporate()
1908
1908
            entries = list(entries)
1909
1909
            for num, (entry, parent_id) in enumerate(entries):
1910
 
                child_pb.update('Preparing file merge', num, len(entries))
 
1910
                child_pb.update(gettext('Preparing file merge'), num, len(entries))
1911
1911
                parent_trans_id = self.tt.trans_id_file_id(parent_id)
1912
1912
                trans_id = transform.new_by_entry(self.tt, entry,
1913
1913
                    parent_trans_id, self.other_tree)