--- a/mercurial/discovery.py Wed Nov 16 00:10:56 2011 +0100
+++ b/mercurial/discovery.py Fri Nov 11 01:07:10 2011 +0100
@@ -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)
--- a/mercurial/dispatch.py Wed Nov 16 00:10:56 2011 +0100
+++ b/mercurial/dispatch.py Fri Nov 11 01:07:10 2011 +0100
@@ -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)
--- a/mercurial/setdiscovery.py Wed Nov 16 00:10:56 2011 +0100
+++ b/mercurial/setdiscovery.py Fri Nov 11 01:07:10 2011 +0100
@@ -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