← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Patch Queue Manager
  • Date: 2011-09-16 13:27:14 UTC
  • mfrom: (6138.3.15 i18n-gettext-errors)
  • Revision ID: pqm@pqm.ubuntu.com-20110916132714-w81xvesg996w68r6
(jr) Add gettext() to user error messages
 (Jonathan Riddell)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
121
121
    def run(self, file_list=None, all=False, action=None, directory=None):
122
122
        if all:
123
123
            if file_list:
124
 
                raise errors.BzrCommandError("If --all is specified,"
125
 
                                             " no FILE may be provided")
 
124
                raise errors.BzrCommandError(gettext("If --all is specified,"
 
125
                                             " no FILE may be provided"))
126
126
            if directory is None:
127
127
                directory = u'.'
128
128
            tree = workingtree.WorkingTree.open_containing(directory)[0]