facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

add missing localization markup

Browse Source
This commit is contained in:
Mads Kiilerich 2011-11-11 01:07:10 +01:00
parent 5d7000644a
commit 065de91b14
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mercurial/discovery.py
View File

@ -174,9 +174,9 @@ def prepush(repo, remote, force, revs, newbranch):
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)

2
mercurial/dispatch.py
View File

@ -124,7 +124,7 @@ def _runcatch(req):
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)

4
mercurial/setdiscovery.py
View File

@ -128,7 +128,7 @@ def findcommonheads(ui, local, remote,
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 @@ def findcommonheads(ui, local, remote,
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