← 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-19 12:22:23 UTC
  • mfrom: (6143.1.8 i18n-plurals)
  • Revision ID: pqm@pqm.ubuntu.com-20110919122223-243tgzmfebanxxbi
(jr) Use ngettext instead of "words(s) with brackets" for plurals (Jonathan
 Riddell)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
146
146
            if file_list is None:
147
147
                un_resolved, resolved = tree.auto_resolve()
148
148
                if len(un_resolved) > 0:
149
 
                    trace.note(gettext('%d conflict(s) auto-resolved.'), len(resolved))
 
149
                    trace.note(ngettext('%d conflict auto-resolved.',
 
150
                        '%d conflicts auto-resolved.', len(resolved)),
 
151
                        len(resolved))
150
152
                    trace.note(gettext('Remaining conflicts:'))
151
153
                    for conflict in un_resolved:
152
154
                        trace.note(unicode(conflict))