[PATCH 1 of 3] add missing localization markup

Mads Kiilerich mads at kiilerich.com
Thu Nov 10 18:37:06 CST 2011


# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1320970030 -3600
# Node ID 48bbf3b5d220e2a80cf1812c9ffa5f56f28ae031
# Parent  1bb0a5b02da9ef3505bfb4ac02b2d51cf220220f
add missing localization markup

diff --git a/mercurial/discovery.py b/mercurial/discovery.py
--- a/mercurial/discovery.py
+++ b/mercurial/discovery.py
@@ -174,9 +174,9 @@
                         hint = _("did you forget to merge? "
                                  "use push -f to force")
                 if branch is not None:
-                    repo.ui.note("new remote heads on branch '%s'\n" % branch)
+                    repo.ui.note(_("new remote heads on branch '%s'\n") % branch)
                 for h in dhs:
-                    repo.ui.note("new remote head %s\n" % short(h))
+                    repo.ui.note(_("new remote head %s\n") % short(h))
         if error:
             raise util.Abort(error, hint=hint)
 
diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py
--- a/mercurial/dispatch.py
+++ b/mercurial/dispatch.py
@@ -124,7 +124,7 @@
             ui.warn(_("hg: %s\n") % inst.args[1])
             commands.help_(ui, 'shortlist')
     except error.OutOfBandError, inst:
-        ui.warn("abort: remote error:\n")
+        ui.warn(_("abort: remote error:\n"))
         ui.warn(''.join(inst.args))
     except error.RepoError, inst:
         ui.warn(_("abort: %s!\n") % inst)
diff --git a/mercurial/setdiscovery.py b/mercurial/setdiscovery.py
--- a/mercurial/setdiscovery.py
+++ b/mercurial/setdiscovery.py
@@ -128,7 +128,7 @@
         return (srvheadhashes, False, srvheadhashes,)
 
     if sample and util.all(yesno):
-        ui.note("all local heads known remotely\n")
+        ui.note(_("all local heads known remotely\n"))
         ownheadhashes = dag.externalizeall(ownheads)
         return (ownheadhashes, True, srvheadhashes,)
 
@@ -158,7 +158,7 @@
             break
 
         if full:
-            ui.note("sampling from both directions\n")
+            ui.note(_("sampling from both directions\n"))
             sample = _takefullsample(dag, undecided, size=fullsamplesize)
         elif common:
             # use cheapish initial sample


More information about the Mercurial-devel mailing list