diff mercurial/commands.py @ 9188:4c287332e03b

Merge with crew-stable
author Matt Mackall <mpm@selenic.com>
date Wed, 22 Jul 2009 18:08:02 -0500
parents 7bb1dbfd3082 d0225fa2f6c4
children c2041f80f22a
line wrap: on
line diff
--- a/mercurial/commands.py	Wed Jul 22 17:59:11 2009 -0500
+++ b/mercurial/commands.py	Wed Jul 22 18:08:02 2009 -0500
@@ -246,7 +246,8 @@
     commit_opts = opts.copy()
     commit_opts['addremove'] = False
     if not commit_opts['message'] and not commit_opts['logfile']:
-        commit_opts['message'] = _("Backed out changeset %s") % (short(node))
+        # we don't translate commit messages
+        commit_opts['message'] = "Backed out changeset %s" % (short(node))
         commit_opts['force_editor'] = True
     commit(ui, repo, **commit_opts)
     def nice(node):
@@ -2914,7 +2915,8 @@
                     raise util.Abort(_('tag \'%s\' is not a local tag') % n)
         rev_ = nullid
         if not message:
-            message = _('Removed tag %s') % ', '.join(names)
+            # we don't translate commit messages
+            message = 'Removed tag %s' % ', '.join(names)
     elif not opts.get('force'):
         for n in names:
             if n in repo.tags():
@@ -2926,7 +2928,8 @@
     r = repo[rev_].node()
 
     if not message:
-        message = (_('Added tag %s for changeset %s') %
+        # we don't translate commit messages
+        message = ('Added tag %s for changeset %s' %
                    (', '.join(names), short(r)))
 
     date = opts.get('date')