--- a/.hgsigs Wed Oct 20 23:48:33 2010 +0200
+++ b/.hgsigs Tue Nov 02 09:47:47 2010 +0100
@@ -28,3 +28,4 @@
c00f03a4982e467fb6b6bd45908767db6df4771d 0 iEYEABECAAYFAkxXDqsACgkQywK+sNU5EO/GJACfT9Rz4hZOxPQEs91JwtmfjevO84gAmwSmtfo5mmWSm8gtTUebCcdTv0Kf
ff5cec76b1c5b6be9c3bb923aae8c3c6d079d6b9 0 iD8DBQBMdo+qywK+sNU5EO8RAqQpAJ975BL2CCAiWMz9SXthNQ9xG181IwCgp4O+KViHPkufZVFn2aTKMNvcr1A=
93d8bff78c96fe7e33237b257558ee97290048a4 0 iD8DBQBMpfvdywK+sNU5EO8RAsxVAJ0UaL1XB51C76JUBhafc9GBefuMxwCdEWkTOzwvE0SarJBe9i008jhbqW4=
+333421b9e0f96c7bc788e5667c146a58a9440a55 0 iD8DBQBMz0HOywK+sNU5EO8RAlsEAJ0USh6yOG7OrWkADGunVt9QimBQnwCbBqeMnKgSbwEw8jZwE3Iz1mdrYlo=
--- a/.hgtags Wed Oct 20 23:48:33 2010 +0200
+++ b/.hgtags Tue Nov 02 09:47:47 2010 +0100
@@ -40,3 +40,4 @@
c00f03a4982e467fb6b6bd45908767db6df4771d 1.6.2
ff5cec76b1c5b6be9c3bb923aae8c3c6d079d6b9 1.6.3
93d8bff78c96fe7e33237b257558ee97290048a4 1.6.4
+333421b9e0f96c7bc788e5667c146a58a9440a55 1.7
--- a/Makefile Wed Oct 20 23:48:33 2010 +0200
+++ b/Makefile Tue Nov 02 09:47:47 2010 +0100
@@ -8,7 +8,8 @@
export PREFIX
PYTHON=python
PURE=
-PYTHON_FILES:=$(shell find mercurial hgext doc -name '*.py')
+PYFILES:=$(shell find mercurial hgext doc -name '*.py')
+DOCFILES=mercurial/help/*.txt
help:
@echo 'Commonly used make targets:'
@@ -85,20 +86,21 @@
update-pot: i18n/hg.pot
-i18n/hg.pot: $(PYTHON_FILES) mercurial/help/*.txt
+i18n/hg.pot: $(PYFILES) $(DOCFILES)
$(PYTHON) i18n/hggettext mercurial/commands.py \
- hgext/*.py hgext/*/__init__.py mercurial/help/*.txt > i18n/hg.pot
+ hgext/*.py hgext/*/__init__.py mercurial/revset.py \
+ $(DOCFILES) > i18n/hg.pot
# All strings marked for translation in Mercurial contain
# ASCII characters only. But some files contain string
# literals like this '\037\213'. xgettext thinks it has to
# parse them even though they are not marked for translation.
# Extracting with an explicit encoding of ISO-8859-1 will make
# xgettext "parse" and ignore them.
- echo $(PYTHON_FILES) | xargs \
+ echo $(PYFILES) | xargs \
xgettext --package-name "Mercurial" \
--msgid-bugs-address "<mercurial-devel@selenic.com>" \
--copyright-holder "Matt Mackall <mpm@selenic.com> and others" \
- --from-code ISO-8859-1 --join --sort-by-file \
+ --from-code ISO-8859-1 --join --sort-by-file --add-comments=i18n: \
-d hg -p i18n -o hg.pot
$(PYTHON) i18n/posplit i18n/hg.pot
--- a/README Wed Oct 20 23:48:33 2010 +0200
+++ b/README Tue Nov 02 09:47:47 2010 +0100
@@ -1,3 +1,9 @@
+Mercurial
+=========
+
+Mercurial is a fast, easy to use, distributed revision control tool
+for software developers.
+
Basic install:
$ make # see install targets
@@ -7,4 +13,3 @@
See http://mercurial.selenic.com/ for detailed installation
instructions, platform-specific notes, and Mercurial user information.
-
--- a/contrib/mercurial.el Wed Oct 20 23:48:33 2010 +0200
+++ b/contrib/mercurial.el Tue Nov 02 09:47:47 2010 +0100
@@ -145,7 +145,7 @@
:type 'string
:group 'mercurial)
-(defcustom hg-outgoing-repository "default-push"
+(defcustom hg-outgoing-repository ""
"The repository to which changes are pushed to by default.
This should be a symbolic repository name, since it is used for all
repository-related commands."
--- a/contrib/setup3k.py Wed Oct 20 23:48:33 2010 +0200
+++ b/contrib/setup3k.py Tue Nov 02 09:47:47 2010 +0100
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
#
# This is an experimental py3k-enabled mercurial setup script.
#
--- a/contrib/shrink-revlog.py Wed Oct 20 23:48:33 2010 +0200
+++ b/contrib/shrink-revlog.py Tue Nov 02 09:47:47 2010 +0100
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
"""\
reorder a revlog (the manifest by default) to save space
--- a/contrib/wix/guids.wxi Wed Oct 20 23:48:33 2010 +0200
+++ b/contrib/wix/guids.wxi Tue Nov 02 09:47:47 2010 +0100
@@ -15,7 +15,7 @@
<?define doc.style.css = {172F8262-98E0-4711-BD39-4DAE0D77EF05} ?>
<!-- help.wxs -->
- <?define helpFolder.guid = {870F98CE-5BC1-4396-9228-CEB234DFEC97} ?>
+ <?define helpFolder.guid = {21FE9CF9-933E-4C2E-B2EC-413A569FB996} ?>
<!-- i18n.wxs -->
<?define i18nFolder.guid = {EADFA693-A0B5-4f31-87C9-3997CFAC1B42} ?>
--- a/contrib/wix/help.wxs Wed Oct 20 23:48:33 2010 +0200
+++ b/contrib/wix/help.wxs Tue Nov 02 09:47:47 2010 +0100
@@ -19,6 +19,7 @@
<File Name="patterns.txt" />
<File Name="revisions.txt" />
<File Name="revsets.txt" />
+ <File Name="subrepos.txt" />
<File Name="templates.txt" />
<File Name="urls.txt" />
</Component>
--- a/doc/Makefile Wed Oct 20 23:48:33 2010 +0200
+++ b/doc/Makefile Tue Nov 02 09:47:47 2010 +0100
@@ -34,7 +34,7 @@
MANIFEST: man html
# tracked files are already in the main MANIFEST
$(RM) $@
- for i in $(MAN) $(HTML) hg.1.gendoc.txt; do \
+ for i in $(MAN) $(HTML); do \
echo "doc/$$i" >> $@ ; \
done
@@ -46,4 +46,4 @@
done
clean:
- $(RM) $(MAN) $(MAN:%=%.html) *.[0-9].gendoc.txt MANIFEST
+ $(RM) $(MAN) $(HTML) hg.1.gendoc.txt MANIFEST
--- a/doc/gendoc.py Wed Oct 20 23:48:33 2010 +0200
+++ b/doc/gendoc.py Tue Nov 02 09:47:47 2010 +0100
@@ -79,7 +79,7 @@
# print options
section(ui, _("Options"))
for optstr, desc in get_opts(globalopts):
- ui.write("%s\n%s\n\n" % (optstr, desc))
+ ui.write("%s\n %s\n\n" % (optstr, desc))
# print cmds
section(ui, _("Commands"))
@@ -97,7 +97,7 @@
ui.write("\n")
section(ui, _("Extensions"))
- ui.write(_("This section contains help for extensions that is distributed "
+ ui.write(_("This section contains help for extensions that are distributed "
"together with Mercurial. Help for other extensions is available "
"in the help system."))
ui.write("\n\n"
@@ -130,8 +130,13 @@
d = get_cmd(h[f], cmdtable)
sectionfunc(ui, d['cmd'])
# synopsis
- ui.write("``%s``\n" % d['synopsis'].replace("hg ","", 1))
- ui.write("\n")
+ ui.write("::\n\n")
+ synopsislines = d['synopsis'].splitlines()
+ for line in synopsislines:
+ # some commands (such as rebase) have a multi-line
+ # synopsis
+ ui.write(" %s\n" % line)
+ ui.write('\n')
# description
ui.write("%s\n\n" % d['desc'][1])
# options
--- a/doc/hgmanpage.py Wed Oct 20 23:48:33 2010 +0200
+++ b/doc/hgmanpage.py Tue Nov 02 09:47:47 2010 +0100
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
# $Id: manpage.py 6110 2009-08-31 14:40:33Z grubert $
# Author: Engelbert Gruber <grubert@users.sourceforge.net>
--- a/doc/hgrc.5.txt Wed Oct 20 23:48:33 2010 +0200
+++ b/doc/hgrc.5.txt Tue Nov 02 09:47:47 2010 +0100
@@ -797,6 +797,23 @@
checking that all new file revisions specified in manifests are
present. Default is False.
+``subpaths``
+""""""""""""
+Defines subrepositories source locations rewriting rules of the form::
+
+ <pattern> = <replacement>
+
+Where ``pattern`` is a regular expression matching the source and
+``replacement`` is the replacement string used to rewrite it. Groups
+can be matched in ``pattern`` and referenced in ``replacements``. For
+instance::
+
+ http://server/(.*)-hg/ = http://hg.server/\1/
+
+rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``.
+
+All patterns are applied in definition order.
+
``trusted``
"""""""""""
--- a/hg Wed Oct 20 23:48:33 2010 +0200
+++ b/hg Tue Nov 02 09:47:47 2010 +0100
@@ -14,7 +14,8 @@
if libdir != '@' 'LIBDIR' '@':
if not os.path.isabs(libdir):
- libdir = os.path.join(os.path.dirname(__file__), libdir)
+ libdir = os.path.join(os.path.dirname(os.path.realpath(__file__)),
+ libdir)
libdir = os.path.abspath(libdir)
sys.path.insert(0, libdir)
--- a/hgext/bookmarks.py Wed Oct 20 23:48:33 2010 +0200
+++ b/hgext/bookmarks.py Tue Nov 02 09:47:47 2010 +0100
@@ -469,7 +469,7 @@
return result
def diffbookmarks(ui, repo, remote):
- ui.status(_("searching for changes\n"))
+ ui.status(_("searching for changed bookmarks\n"))
lmarks = repo.listkeys('bookmarks')
rmarks = remote.listkeys('bookmarks')
@@ -479,7 +479,7 @@
ui.write(" %-25s %s\n" % (k, rmarks[k][:12]))
if len(diff) <= 0:
- ui.status(_("no changes found\n"))
+ ui.status(_("no changed bookmarks found\n"))
return 1
return 0
@@ -538,9 +538,14 @@
return res
def bmrevset(repo, subset, x):
+ """``bookmark([name])``
+ The named bookmark or all bookmarks.
+ """
+ # i18n: "bookmark" is a keyword
args = revset.getargs(x, 0, 1, _('bookmark takes one or no arguments'))
if args:
bm = revset.getstring(args[0],
+ # i18n: "bookmark" is a keyword
_('the argument to bookmark must be a string'))
bmrev = listbookmarks(repo).get(bm, None)
if bmrev:
@@ -548,14 +553,9 @@
return [r for r in subset if r == bmrev]
bms = set([repo.changelog.rev(bin(r)) for r in listbookmarks(repo).values()])
return [r for r in subset if r in bms]
-revset.symbols['bookmark'] = bmrevset
-def revsetdoc():
- doc = help.loaddoc('revsets')()
- doc += _('\nAdded by the bookmarks extension:\n\n'
- '``bookmark([name])``\n'
- ' The named bookmark or all bookmarks.\n')
- return doc
+def extsetup(ui):
+ revset.symbols['bookmark'] = bmrevset
cmdtable = {
"bookmarks":
@@ -568,3 +568,6 @@
}
colortable = {'bookmarks.current': 'green'}
+
+# tell hggettext to extract docstrings from these functions:
+i18nfunctions = [bmrevset]
--- a/hgext/color.py Wed Oct 20 23:48:33 2010 +0200
+++ b/hgext/color.py Tue Nov 02 09:47:47 2010 +0100
@@ -226,6 +226,8 @@
def extsetup(ui):
commands.globalopts.append(
('', 'color', 'auto',
+ # i18n: 'always', 'auto', and 'never' are keywords and should
+ # not be translated
_("when to colorize (boolean, always, auto, or never)"),
_('TYPE')))
--- a/hgext/convert/p4.py Wed Oct 20 23:48:33 2010 +0200
+++ b/hgext/convert/p4.py Tue Nov 02 09:47:47 2010 +0100
@@ -105,10 +105,9 @@
ui.status(_('collecting p4 changelists\n'))
lastid = None
for change in self.p4changes:
- cmd = "p4 -G describe %s" % change
+ cmd = "p4 -G describe -s %s" % change
stdout = util.popen(cmd, mode='rb')
d = marshal.load(stdout)
-
desc = self.recode(d["desc"])
shortdesc = desc.split("\n", 1)[0]
t = '%s %s' % (d["change"], repr(shortdesc)[1:-1])
--- a/hgext/eol.py Wed Oct 20 23:48:33 2010 +0200
+++ b/hgext/eol.py Tue Nov 02 09:47:47 2010 +0100
@@ -51,7 +51,7 @@
behavior. There are two settings:
- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or
- ``CRLF`` override the default interpretation of ``native`` for
+ ``CRLF`` to override the default interpretation of ``native`` for
checkout. This can be used with :hg:`archive` on Unix, say, to
generate an archive where files have line endings for Windows.
--- a/hgext/keyword.py Wed Oct 20 23:48:33 2010 +0200
+++ b/hgext/keyword.py Tue Nov 02 09:47:47 2010 +0100
@@ -205,11 +205,11 @@
def overwrite(self, ctx, candidates, lookup, expand, rekw=False):
'''Overwrites selected files expanding/shrinking keywords.'''
- if self.restrict or lookup: # exclude kw_copy
+ if self.restrict or lookup or self.record: # exclude kw_copy
candidates = self.iskwfile(candidates, ctx)
if not candidates:
return
- commit = self.restrict and not lookup
+ kwcmd = self.restrict and lookup # kwexpand/kwshrink
if self.restrict or expand and lookup:
mf = ctx.manifest()
fctx = ctx
@@ -234,7 +234,7 @@
if found:
self.ui.note(msg % f)
self.repo.wwrite(f, data, ctx.flags(f))
- if commit:
+ if kwcmd:
self.repo.dirstate.normal(f)
elif self.record:
self.repo.dirstate.normallookup(f)
--- a/hgext/mq.py Wed Oct 20 23:48:33 2010 +0200
+++ b/hgext/mq.py Tue Nov 02 09:47:47 2010 +0100
@@ -654,9 +654,11 @@
message = ph.message
if not message:
+ # The commit message should not be translated
message = "imported patch %s\n" % patchname
else:
if list:
+ # The commit message should not be translated
message.append("\nimported patch %s" % patchname)
message = '\n'.join(message)
@@ -690,7 +692,7 @@
n = repo.commit(message, ph.user, ph.date, match=match, force=True)
if n is None:
- raise util.Abort(_("repo commit failed"))
+ raise util.Abort(_("repository commit failed"))
if update_status:
self.applied.append(statusentry(n, patchname))
@@ -819,7 +821,11 @@
diffopts = self.diffopts({'git': opts.get('git')})
self.check_reserved_name(patchfn)
if os.path.exists(self.join(patchfn)):
- raise util.Abort(_('patch "%s" already exists') % patchfn)
+ if os.path.isdir(self.join(patchfn)):
+ raise util.Abort(_('"%s" already exists as a directory')
+ % patchfn)
+ else:
+ raise util.Abort(_('patch "%s" already exists') % patchfn)
if opts.get('include') or opts.get('exclude') or pats:
match = cmdutil.match(repo, pats, opts)
# detect missing files in pats
@@ -837,8 +843,12 @@
insert = self.full_series_end()
wlock = repo.wlock()
try:
- # if patch file write fails, abort early
- p = self.opener(patchfn, "w")
+ try:
+ # if patch file write fails, abort early
+ p = self.opener(patchfn, "w")
+ except IOError, e:
+ raise util.Abort(_('cannot write patch "%s": %s')
+ % (patchfn, e.strerror))
try:
if self.plainmode:
if user:
@@ -1542,7 +1552,7 @@
self.ui.warn(_("saved queue repository parents: %s %s\n") %
(short(qpp[0]), short(qpp[1])))
if qupdate:
- self.ui.status(_("queue directory updating\n"))
+ self.ui.status(_("updating queue directory\n"))
r = self.qrepo()
if not r:
self.ui.warn(_("Unable to load queue repository\n"))
@@ -2398,7 +2408,7 @@
os.makedirs(destdir)
util.rename(q.join(patch), absdest)
r = q.qrepo()
- if r:
+ if r and patch in r.dirstate:
wctx = r[None]
wlock = r.wlock()
try:
--- a/hgext/pager.py Wed Oct 20 23:48:33 2010 +0200
+++ b/hgext/pager.py Tue Nov 02 09:47:47 2010 +0100
@@ -17,17 +17,11 @@
To set the pager that should be used, set the application variable::
[pager]
- pager = LESS='FSRX' less
+ pager = less -FRSX
If no pager is set, the pager extensions uses the environment variable
$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.
-By default, the pager is only executed if a command has output. To
-force the pager to run even if a command prints nothing, set::
-
- [pager]
- force = True
-
If you notice "BROKEN PIPE" error messages, you can disable them by
setting::
@@ -63,7 +57,7 @@
from mercurial import commands, dispatch, util, extensions
from mercurial.i18n import _
-def _runpager(p, sigpipe=False):
+def _runpager(p):
if not hasattr(os, 'fork'):
sys.stderr = sys.stdout = util.popen(p, 'wb')
return
@@ -74,8 +68,6 @@
os.dup2(fdout, sys.stdout.fileno())
os.dup2(fdout, sys.stderr.fileno())
os.close(fdout)
- if sigpipe:
- signal.signal(signal.SIGPIPE, signal.SIG_DFL)
return
os.dup2(fdin, sys.stdin.fileno())
os.close(fdin)
@@ -94,23 +86,6 @@
if ui.plain():
return
- class pagerui(ui.__class__):
- _pager = None
- _pagerstarted = False
-
- def write(self, *args, **opts):
- if self._pager and not self._pagerstarted:
- self._pagerstarted = True
- self._pager()
- return super(pagerui, self).write(*args, **opts)
-
- def write_err(self, *args, **opts):
- if self._pager and not self._pagerstarted:
- self._pagerstarted = True
- self._pager()
- return super(pagerui, self).write(*args, **opts)
- ui.__class__ = pagerui
-
def pagecmd(orig, ui, options, cmd, cmdfunc):
p = ui.config("pager", "pager", os.environ.get("PAGER"))
if p and sys.stdout.isatty() and '--debugger' not in sys.argv:
@@ -122,11 +97,9 @@
(cmd not in ui.configlist('pager', 'ignore') and not attend))):
ui.setconfig('ui', 'formatted', ui.formatted())
ui.setconfig('ui', 'interactive', False)
- sigpipe = ui.configbool('pager', 'quiet')
- if ui.configbool('pager', 'force'):
- _runpager(p, sigpipe)
- else:
- ui._pager = lambda: _runpager(p, sigpipe)
+ _runpager(p)
+ if ui.configbool('pager', 'quiet'):
+ signal.signal(signal.SIGPIPE, signal.SIG_DFL)
return orig(ui, options, cmd, cmdfunc)
extensions.wrapfunction(dispatch, '_runcommand', pagecmd)
--- a/hgext/patchbomb.py Wed Oct 20 23:48:33 2010 +0200
+++ b/hgext/patchbomb.py Tue Nov 02 09:47:47 2010 +0100
@@ -213,7 +213,7 @@
hg email -o -m mbox && # generate an mbox file...
mutt -R -f mbox # ... and view it with mutt
hg email -o -m mbox && # generate an mbox file ...
- formail -s sendmail \ # ... and use formail to send from the mbox
+ formail -s sendmail \\ # ... and use formail to send from the mbox
-bm -t < mbox # ... using sendmail
Before using this command, you will need to enable email in your
--- a/hgext/rebase.py Wed Oct 20 23:48:33 2010 +0200
+++ b/hgext/rebase.py Tue Nov 02 09:47:47 2010 +0100
@@ -165,8 +165,8 @@
else:
stats = rebasenode(repo, rev, p1, p2, state)
if stats and stats[3] > 0:
- raise util.Abort(_('fix unresolved conflicts with hg '
- 'resolve then run hg rebase --continue'))
+ raise util.Abort(_('unresolved conflicts (see hg '
+ 'resolve, then hg rebase --continue)'))
updatedirstate(repo, rev, target, p2)
if not collapsef:
newrev = concludenode(repo, rev, p1, p2, extrafn=extrafn)
@@ -451,7 +451,7 @@
# no backup of rebased cset versions needed
repair.strip(repo.ui, repo, repo[strippoint].node())
clearstatus(repo)
- repo.ui.status(_('rebase aborted\n'))
+ repo.ui.warn(_('rebase aborted\n'))
return 0
def buildstate(repo, dest, src, base, detach):
--- a/hgext/transplant.py Wed Oct 20 23:48:33 2010 +0200
+++ b/hgext/transplant.py Tue Nov 02 09:47:47 2010 +0100
@@ -17,7 +17,7 @@
import os, tempfile
from mercurial import bundlerepo, cmdutil, hg, merge, match
from mercurial import patch, revlog, util, error
-from mercurial import revset, help
+from mercurial import revset
class transplantentry(object):
def __init__(self, lnode, rnode):
@@ -589,6 +589,9 @@
os.unlink(bundle)
def revsettransplanted(repo, subset, x):
+ """``transplanted(set)``
+ Transplanted changesets in set.
+ """
if x:
s = revset.getset(repo, subset, x)
else:
@@ -599,17 +602,7 @@
cs.add(r)
return [r for r in s if r in cs]
-def revsetdoc():
- doc = help.loaddoc('revsets')()
- doc += _('\nAdded by the transplant extension:\n\n'
- '``transplanted(set)``\n'
- ' Transplanted changesets in set.\n')
- return doc
-
-def uisetup(ui):
- 'Add the transplanted revset predicate'
- for i in (i for i, x in enumerate(help.helptable) if x[0] == ['revsets']):
- help.helptable[i] = (['revsets'], _("Specifying Revision Sets"), revsetdoc)
+def extsetup(ui):
revset.symbols['transplanted'] = revsettransplanted
cmdtable = {
@@ -632,3 +625,6 @@
_('hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] '
'[-m REV] [REV]...'))
}
+
+# tell hggettext to extract docstrings from these functions:
+i18nfunctions = [revsettransplanted]
--- a/hgext/win32text.py Wed Oct 20 23:48:33 2010 +0200
+++ b/hgext/win32text.py Tue Nov 02 09:47:47 2010 +0100
@@ -164,3 +164,7 @@
for name, fn in _filters.iteritems():
repo.adddatafilter(name, fn)
+def extsetup(ui):
+ if ui.configbool('win32text', 'warn', True):
+ ui.warn(_("win32text is deprecated: "
+ "http://mercurial.selenic.com/wiki/Win32TextExtension\n"))
--- a/i18n/da.po Wed Oct 20 23:48:33 2010 +0200
+++ b/i18n/da.po Tue Nov 02 09:47:47 2010 +0100
@@ -17,14 +17,14 @@
msgstr ""
"Project-Id-Version: Mercurial\n"
"Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2010-09-18 21:41+0200\n"
-"PO-Revision-Date: 2010-09-18 22:02+0200\n"
+"POT-Creation-Date: 2010-10-28 09:50+0200\n"
+"PO-Revision-Date: 2010-10-28 10:01+0200\n"
"Last-Translator: <mg@lazybytes.net>\n"
"Language-Team: Danish\n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: Danish\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#, python-format
@@ -37,8 +37,16 @@
msgid "Commands"
msgstr "Kommandoer"
-msgid " options:"
-msgstr " tilvalg:"
+msgid "Extensions"
+msgstr "Udvidelser"
+
+msgid ""
+"This section contains help for extensions that are distributed together with "
+"Mercurial. Help for other extensions is available in the help system."
+msgstr ""
+
+msgid "options:"
+msgstr "tilvalg:"
#, python-format
msgid " aliases: %s"
@@ -83,7 +91,7 @@
msgid ""
"Branch-based Access Control\n"
-"---------------------------"
+"..........................."
msgstr ""
msgid ""
@@ -107,7 +115,7 @@
msgid ""
"Path-based Access Control\n"
-"-------------------------"
+"........................."
msgstr ""
msgid ""
@@ -119,7 +127,7 @@
msgid ""
"Groups\n"
-"------"
+"......"
msgstr ""
msgid ""
@@ -136,7 +144,7 @@
msgid ""
"Example Configuration\n"
-"---------------------"
+"....................."
msgstr ""
msgid "::"
@@ -290,11 +298,17 @@
"changeset that is based on a changeset that has a bookmark on it, the\n"
"bookmark shifts to the new changeset."
msgstr ""
+"Bogmærker er lokale markeringer af ændringer. Ethvert bogmærke peger\n"
+"på en ændring som er identificeret ved dennes hashværdi. Hvis du\n"
+"deponerer en ændring som er baseret på en ændring med et bogmærke\n"
+"tilknyttet, så vil bogmærket bliver flyttet til den nye ændring."
msgid ""
"It is possible to use bookmark names in every revision lookup (e.g.\n"
":hg:`merge`, :hg:`update`)."
msgstr ""
+"Man kan bruge navne på bogmærker alle steder hvor en revision bliver\n"
+"brugt (e.g. :hg:`merge`, :hg:`update`)."
msgid ""
"By default, when several bookmarks point to the same changeset, they\n"
@@ -302,6 +316,9 @@
"git-like experience by adding the following configuration option to\n"
"your configuration file::"
msgstr ""
+"Når flere bogmærker peget på samme ændring, så vil de som udgangspunkt\n"
+"bliver flyttet fremad sammen. Man kan opnå en mere git-agtig opførsel\n"
+"ved at tilføje følgende til din konfigurationsfil::"
msgid ""
" [bookmarks]\n"
@@ -315,6 +332,9 @@
"using, and only update it. This is similar to git's approach to\n"
"branching.\n"
msgstr ""
+"Dette vil få Mercurial til at holde styr på hvilket bogmærke du bruger\n"
+"i øjeblikket og Mercurial vil så kun opdatere dette. Det minder om\n"
+"git's måde at lave grene på.\n"
msgid ""
" Bookmarks are pointers to certain commits that move when\n"
@@ -322,14 +342,34 @@
" deleted. It is possible to use bookmark names in :hg:`merge` and\n"
" :hg:`update` to merge and update respectively to a given bookmark."
msgstr ""
+" Bogmærker er pegepinde til bestemte ændringer og pegepindene\n"
+" flytter sig når man deponerer nye ændringer. Bogmærkerne er\n"
+" lokale. De kan omdøbes, kopieres og slettes. Det er muligt at\n"
+" bruge navne på bogmærker i :hg:`merge` og :hg:`update` for\n"
+" respektivt at sammenføje eller opdatere til det givne bogmærke."
msgid ""
" You can use :hg:`bookmark NAME` to set a bookmark on the working\n"
" directory's parent revision with the given name. If you specify\n"
" a revision using -r REV (where REV may be an existing bookmark),\n"
-" the bookmark is assigned to that revision.\n"
+" the bookmark is assigned to that revision."
+msgstr ""
+" Du kan bruge :hg:`bookmark NAVN` for at sætte et bogmærke på\n"
+" arbejdskatalogets forælderrevision med det givne navn. Hvis du\n"
+" specificerer en revision med -r REV (hvor REV kan være et\n"
+" eksisterende bogmærke), så bliver bogmærket tildelt denne\n"
+" revision."
+
+msgid ""
+" Bookmarks can be pushed and pulled between repositories (see :hg:`help\n"
+" push` and :hg:`help pull`). This requires the bookmark extension to be\n"
+" enabled for both the local and remote repositories.\n"
" "
msgstr ""
+" Bogmærker kan bliver skubbet og hevet mellem depoter (se :hg:`help\n"
+" push` og :hg:`help pull`). Dette kræver at bookmark-udviddelsen er\n"
+" slået til i både lokal- og fjerndepotet.\n"
+" "
msgid "a bookmark of this name does not exist"
msgstr "et bogmærke med dette navn findes ikke"
@@ -361,7 +401,7 @@
#, python-format
msgid "not updating divergent bookmark %s\n"
-msgstr ""
+msgstr "opdaterer ikke divergerende bogmærke %s\n"
#, python-format
msgid "updating bookmark %s failed!\n"
@@ -385,13 +425,13 @@
#, python-format
msgid "bookmark %s does not exist on the local or remote repository!\n"
-msgstr ""
-
-msgid "searching for changes\n"
-msgstr "leder efter ændringer\n"
-
-msgid "no changes found\n"
-msgstr "fandt ingen ændringer\n"
+msgstr "bogmærke %s eksisterer ikke i hverken lokal- eller fjerndepotet!\n"
+
+msgid "searching for changed bookmarks\n"
+msgstr "leder efter ændrede bogmærker\n"
+
+msgid "no changed bookmarks found\n"
+msgstr "fandt ingen ændrede bogmærker\n"
#, python-format
msgid "comparing with %s\n"
@@ -401,7 +441,7 @@
msgstr "bogmærke der skal importeres"
msgid "BOOKMARK"
-msgstr ""
+msgstr "BOGMÆRKE"
msgid "bookmark to export"
msgstr "bogmærke der skal eksporteres"
@@ -409,6 +449,21 @@
msgid "compare bookmark"
msgstr "sammenlign bogmærke"
+msgid ""
+"``bookmark([name])``\n"
+" The named bookmark or all bookmarks."
+msgstr ""
+"``bookmark([name])``\n"
+" Det navngivne bogmærke eller alle bogmærker."
+
+#. i18n: "bookmark" is a keyword
+msgid "bookmark takes one or no arguments"
+msgstr "bookmark tager et eller to argumenter"
+
+#. i18n: "bookmark" is a keyword
+msgid "the argument to bookmark must be a string"
+msgstr "argumentet til bookmark skal være en streng"
+
msgid "force"
msgstr "gennemtving"
@@ -998,6 +1053,8 @@
msgid "win32console not found, please install pywin32\n"
msgstr "win32console blev ikke fundet, installer venligst pywin32\n"
+#. i18n: 'always', 'auto', and 'never' are keywords and should
+#. not be translated
msgid "when to colorize (boolean, always, auto, or never)"
msgstr ""
"hvornår der skal farvelægges (boolks værdi, \"always\", \"auto\" eller "
@@ -1190,7 +1247,7 @@
msgid ""
" Mercurial Source\n"
-" ----------------"
+" ''''''''''''''''"
msgstr ""
msgid ""
@@ -1207,7 +1264,7 @@
msgid ""
" CVS Source\n"
-" ----------"
+" ''''''''''"
msgstr ""
msgid ""
@@ -1264,7 +1321,7 @@
msgid ""
" Subversion Source\n"
-" -----------------"
+" '''''''''''''''''"
msgstr ""
msgid ""
@@ -1302,7 +1359,7 @@
msgid ""
" Perforce Source\n"
-" ---------------"
+" '''''''''''''''"
msgstr ""
msgid ""
@@ -1326,7 +1383,7 @@
msgid ""
" Mercurial Destination\n"
-" ---------------------"
+" '''''''''''''''''''''"
msgstr ""
msgid ""
@@ -1665,6 +1722,13 @@
msgid "Python ElementTree module is not available"
msgstr "Python ElementTree modulet er ikke tilstede"
+#, python-format
+msgid "%s repository format is unsupported, please upgrade"
+msgstr ""
+
+msgid "failed to detect repository format!"
+msgstr ""
+
msgid "internal calling inconsistency"
msgstr "intern kaldeinkonsistens"
@@ -1982,7 +2046,7 @@
msgid ""
"- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or\n"
-" ``CRLF`` override the default interpretation of ``native`` for\n"
+" ``CRLF`` to override the default interpretation of ``native`` for\n"
" checkout. This can be used with :hg:`archive` on Unix, say, to\n"
" generate an archive where files have line endings for Windows."
msgstr ""
@@ -2205,12 +2269,14 @@
" order, use --switch-parent."
msgstr ""
-msgid ""
-" See :hg:`help dates` for a list of formats valid for -d/--date.\n"
+msgid " See :hg:`help dates` for a list of formats valid for -d/--date."
+msgstr ""
+" Se :hg:`help dates` for en liste af gyldige formater til -d/--date."
+
+msgid ""
+" Returns 0 on success.\n"
" "
msgstr ""
-" Se :hg:`help dates` for en liste af gyldige formater til -d/--date.\n"
-" "
msgid ""
"working dir not at branch tip (use \"hg update\" to check out branch tip)"
@@ -2321,6 +2387,13 @@
" Hvis der ikke angives en revision, så bruges forældren til\n"
" arbejdskataloget, eller tip, hvis der ikke er hentet en revision."
+msgid ""
+" See :hg:`help dates` for a list of formats valid for -d/--date.\n"
+" "
+msgstr ""
+" Se :hg:`help dates` for en liste af gyldige formater til -d/--date.\n"
+" "
+
msgid "uncommitted merge - please provide a specific revision"
msgstr "udeponeret sammenføjning - angiv venligst en specifik revision"
@@ -2694,8 +2767,8 @@
#, python-format
msgid "*** the current per-user limit on the number of inotify watches is %s\n"
msgstr ""
-"*** den nuværende grænse pr bruger for antallet af inotify overvågninger er "
-"%s\n"
+"*** den nuværende grænse pr bruger for antallet af inotify overvågninger er %"
+"s\n"
msgid "*** this limit is too low to watch every directory in this repository\n"
msgstr ""
@@ -2876,8 +2949,9 @@
msgstr ""
msgid ""
-"NOTE: the more specific you are in your filename patterns the less you\n"
-"lose speed in huge repositories."
+".. note::\n"
+" The more specific you are in your filename patterns the less you\n"
+" lose speed in huge repositories."
msgstr ""
msgid ""
@@ -3273,6 +3347,9 @@
msgid "patch %s is empty\n"
msgstr "rettelsen %s er tom\n"
+msgid "repository commit failed"
+msgstr "deponering fejlede"
+
msgid "patch failed, rejects left in working dir\n"
msgstr "rettelse fejlede, afvisninger er efterladt i arbejdskataloget\n"
@@ -3446,8 +3523,8 @@
msgid "saved queue repository parents: %s %s\n"
msgstr ""
-msgid "queue directory updating\n"
-msgstr "opdaterer rettelsesdepotet\n"
+msgid "updating queue directory\n"
+msgstr "opdaterer køkatalog\n"
msgid "Unable to load queue repository\n"
msgstr ""
@@ -3537,6 +3614,9 @@
msgid "print the patches already applied"
msgstr "udskriver rettelserne som allerede er anvendt"
+msgid " Returns 0 on success."
+msgstr ""
+
msgid "only one patch applied\n"
msgstr "kun én rettelse er anvendt\n"
@@ -3607,10 +3687,15 @@
msgid " To import an existing patch while renaming it::"
msgstr ""
-msgid ""
-" hg qimport -e existing-patch -n new-name\n"
+msgid " hg qimport -e existing-patch -n new-name"
+msgstr ""
+
+msgid ""
+" Returns 0 if import succeeded.\n"
" "
msgstr ""
+" Returnerer 0 hvis importeringen lykkedes.\n"
+" "
msgid "init a new queue repository (DEPRECATED)"
msgstr "opret et nyt kø-depot (FORÆLDET)"
@@ -3653,9 +3738,15 @@
msgid ""
" The patch directory must be a nested Mercurial repository, as\n"
-" would be created by :hg:`init --mq`.\n"
+" would be created by :hg:`init --mq`."
+msgstr ""
+
+msgid ""
+" Return 0 on success.\n"
" "
msgstr ""
+" Returnerer 0 ved succes.\n"
+" "
msgid "versioned patch repository not found (see init --mq)"
msgstr "versionsstyret rettelsesdepot blev ikke fundet (se init --mq)"
@@ -3718,9 +3809,19 @@
" Use the -g/--git option to keep the patch in the git extended diff\n"
" format. Read the diffs help topic for more information on why this\n"
" is important for preserving permission changes and copy/rename\n"
-" information.\n"
+" information."
+msgstr ""
+" Brug -g/--git tilvalget for at generere ændringer i det udvidede\n"
+" git diff-format. Se :hg:`help diffs` for mere information om\n"
+" hvorfor dette er vigtigt for at bevare filrettigheder og\n"
+" information om kopieringer og omdøbninger."
+
+msgid ""
+" Returns 0 on successful creation of a new patch.\n"
" "
msgstr ""
+" Returnerer 0 hvis patchen blev oprettet.\n"
+" "
msgid "update the current patch"
msgstr "opdater den aktuelle patch"
@@ -3753,14 +3854,12 @@
" hg add/remove/copy/rename work as usual, though you might want to\n"
" use git-style patches (-g/--git or [diff] git=1) to track copies\n"
" and renames. See the diffs help topic for more information on the\n"
-" git diff format.\n"
-" "
+" git diff format."
msgstr ""
" hg add/remove/copy/rename virker som sædvanlig, dog vil du måske\n"
" bruge git-patches (-g/--git eller [diff] git=1) for at følge\n"
" kopier og omdøbninger. Se 'hg help diffs' for mere information om\n"
-" git diff formatet.\n"
-" "
+" git diff formatet."
msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
msgstr "tilvalg \"-e\" er inkompatibelt med \"-m\" eller \"-l\""
@@ -3783,14 +3882,12 @@
" Use :hg:`diff` if you only want to see the changes made since the\n"
" last qrefresh, or :hg:`export qtip` if you want to see changes\n"
" made by the current patch without including changes made since the\n"
-" qrefresh.\n"
-" "
+" qrefresh."
msgstr ""
" Brug :hg:`diff` hvis du kun vil se ændringer lavet siden den\n"
" sidste qrefresh, eller :hg:`export qtip` hvis du vil se ændringer\n"
" lavet af den nuværende patch uden at inkludere ændringer lavet\n"
-" siden qrefresh.\n"
-" "
+" siden qrefresh."
msgid "fold the named patches into the current patch"
msgstr ""
@@ -3806,7 +3903,7 @@
msgid ""
" The header for each folded patch will be concatenated with the\n"
-" current patch header, separated by a line of '* * *'."
+" current patch header, separated by a line of ``* * *``."
msgstr ""
msgid "qfold requires at least one patch name"
@@ -3849,22 +3946,21 @@
msgid ""
" With no arguments, print the currently active guards.\n"
-" With arguments, set guards for the named patch.\n"
-" NOTE: Specifying negative guards now requires '--'."
-msgstr ""
-" Uden argumenter vises de nuværende aktive filtre.\n"
-" Med argumenter sættes filtre for den navngivne rettelse.\n"
-" BEMÆRK: negative filtre skal nu specificeres med '--'."
+" With arguments, set guards for the named patch."
+msgstr ""
+" Uden argumenter: vis de aktiverede filtre.\n"
+" Med argumenter: sæt filtre for den navngivne patch."
+
+msgid ""
+" .. note::\n"
+" Specifying negative guards now requires '--'."
+msgstr ""
msgid " To set guards on another patch::"
msgstr " For at sætte filtre på en anden rettelse::"
-msgid ""
-" hg qguard other.patch -- +2.6.17 -stable\n"
-" "
-msgstr ""
-" hg qguard other.patch -- +2.6.17 -stable\n"
-" "
+msgid " hg qguard other.patch -- +2.6.17 -stable"
+msgstr " hg qguard other.patch -- +2.6.17 -stable"
msgid "cannot mix -l/--list with options or arguments"
msgstr "kan ikke blande -l/--list med tilvalg eller argumenter"
@@ -3884,11 +3980,16 @@
msgid ""
" When -f/--force is applied, all local changes in patched files\n"
-" will be lost.\n"
-" "
+" will be lost."
msgstr ""
" Når -f/--force er angivet, så vil alle lokale ændringer i de\n"
-" rettede filer gå tabt.\n"
+" rettede filer gå tabt."
+
+msgid ""
+" Return 0 on succces.\n"
+" "
+msgstr ""
+" Returnerer 0 ved succes.\n"
" "
msgid "no saved queues found, please use -n\n"
@@ -3904,13 +4005,11 @@
msgid ""
" By default, pops off the top of the patch stack. If given a patch\n"
" name, keeps popping off patches until the named patch is at the\n"
-" top of the stack.\n"
-" "
+" top of the stack."
msgstr ""
" Som standard fjernes toppen af stakken. Hvis der angives en\n"
" rettelse, så vil der blive fjernet rettelser indtil den angivne\n"
-" rettelse er på toppen af stakken.\n"
-" "
+" rettelse er på toppen af stakken."
#, python-format
msgid "using patch queue: %s\n"
@@ -3937,8 +4036,8 @@
msgid "restore the queue state saved by a revision (DEPRECATED)"
msgstr ""
-msgid " This command is deprecated, use rebase --mq instead."
-msgstr ""
+msgid " This command is deprecated, use :hg:`rebase` instead."
+msgstr " Denne kommando er forældet. Brug :hg:`rebase` i stedet."
msgid "save current queue state (DEPRECATED)"
msgstr ""
@@ -3985,8 +4084,10 @@
msgid ""
" Use the --no-backup option to discard the backup bundle once the\n"
-" operation completes.\n"
-" "
+" operation completes."
+msgstr ""
+
+msgid "empty revision set"
msgstr ""
msgid "set or print guarded patches to push"
@@ -4115,8 +4216,7 @@
msgid ""
" This can be especially useful if your changes have been applied to\n"
" an upstream repository, or if you are about to push your changes\n"
-" to upstream.\n"
-" "
+" to upstream."
msgstr ""
msgid "no revisions specified"
@@ -4148,8 +4248,7 @@
msgid ""
" To delete an existing queue, use --delete. You cannot delete the "
"currently\n"
-" active queue.\n"
-" "
+" active queue."
msgstr ""
msgid "patches applied - cannot set new queue active"
@@ -4261,8 +4360,8 @@
msgid "stop managing a revision (DEPRECATED)"
msgstr ""
-msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
-msgstr "hg qdelete [-k] [-r REV]... [RETTELSE]..."
+msgid "hg qdelete [-k] [PATCH]..."
+msgstr "hg qdelete [-k] [RETTELSE]..."
msgid "edit patch header"
msgstr "rediger rettelsens hoved"
@@ -4354,11 +4453,11 @@
msgid "forget any local changes to patched files"
msgstr "glem eventuelle lokale ændringer i de rettede filer"
-msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
-msgstr "hg qpop [-a] [-n NAVN] [-f] [RETTELSE | INDEKS]"
-
-msgid "apply if the patch has rejects"
-msgstr ""
+msgid "hg qpop [-a] [-f] [PATCH | INDEX]"
+msgstr "hg qpop [-a] [-f] [RETTELSE | INDEKS]"
+
+msgid "apply on top of local changes"
+msgstr "anvend ovenpå lokale ændringer"
msgid "list patch name in commit text"
msgstr ""
@@ -4375,8 +4474,8 @@
msgid "reorder patch series and apply only the patch"
msgstr ""
-msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [--move] [PATCH | INDEX]"
-msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NAVN] [--move] [RETTELSE | INDEKS]"
+msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]"
+msgstr "hg qpush [-f] [-l] [-a] [--move] [RETTELSE | INDEKS]"
msgid "refresh only files already in the patch and specified files"
msgstr "genopfrisk kun filer som allerede findes i rettelsen og angivne filer"
@@ -4460,8 +4559,11 @@
msgid "no backups (DEPRECATED)"
msgstr "ingen backupper (FORÆLDET)"
-msgid "hg strip [-f] [-n] REV..."
-msgstr "hg strip [-f] [-n] REV..."
+msgid "do not modify working copy during strip"
+msgstr ""
+
+msgid "hg strip [-k] [-f] [-n] REV..."
+msgstr "hg strip [-k] [-f] [-n] REV..."
msgid "hg qtop [-s]"
msgstr "hg qtop [-s]"
@@ -4632,6 +4734,18 @@
msgstr ""
msgid ""
+"By default, the pager is only executed if a command has output. To\n"
+"force the pager to run even if a command prints nothing, set::"
+msgstr ""
+
+msgid ""
+" [pager]\n"
+" force = True"
+msgstr ""
+" [pager]\n"
+" force = True"
+
+msgid ""
"If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
"setting::"
msgstr ""
@@ -4675,8 +4789,19 @@
msgid ""
"To ignore global commands like :hg:`version` or :hg:`help`, you have\n"
-"to specify them in your user configuration file.\n"
-msgstr ""
+"to specify them in your user configuration file."
+msgstr ""
+
+msgid ""
+"The --pager=... option can also be used to control when the pager is\n"
+"used. Use a boolean value like yes, no, on, off, or use auto for\n"
+"normal behavior.\n"
+msgstr ""
+
+msgid "when to paginate (boolean, always, auto, or never)"
+msgstr ""
+"hvornår der skal farvelægges (boolks værdi, \"always\", \"auto\" eller "
+"\"never\")"
msgid "interpret suffixes to refer to ancestor revisions"
msgstr "fortolk suffikser for at referere til forfader-revisioner"
@@ -4742,12 +4867,6 @@
msgstr ""
msgid ""
-"With the -d/--diffstat or -c/--confirm options, you will be presented\n"
-"with a final summary of all messages and asked for confirmation before\n"
-"the messages are sent."
-msgstr ""
-
-msgid ""
"To configure other defaults, add a section like this to your hgrc\n"
"file::"
msgstr ""
@@ -4772,39 +4891,6 @@
msgstr ""
msgid ""
-"To avoid sending patches prematurely, it is a good idea to first run\n"
-"the :hg:`email` command with the \"-n\" option (test only). You will be\n"
-"prompted for an email recipient address, a subject and an introductory\n"
-"message describing the patches of your patchbomb. Then when all is\n"
-"done, patchbomb messages are displayed. If the PAGER environment\n"
-"variable is set, your pager will be fired up once for each patchbomb\n"
-"message, so you can verify everything is alright."
-msgstr ""
-
-msgid ""
-"The -m/--mbox option is also very useful. Instead of previewing each\n"
-"patchbomb message in a pager or sending the messages directly, it will\n"
-"create a UNIX mailbox file with the patch emails. This mailbox file\n"
-"can be previewed with any mail user agent which supports UNIX mbox\n"
-"files, e.g. with mutt::"
-msgstr ""
-
-msgid " % mutt -R -f mbox"
-msgstr ""
-
-msgid ""
-"When you are previewing the patchbomb messages, you can use ``formail``\n"
-"(a utility that is commonly installed as part of the procmail\n"
-"package), to send each message out::"
-msgstr ""
-
-msgid " % formail -s sendmail -bm -t < mbox"
-msgstr " % formail -s sendmail -bm -t < mbox"
-
-msgid "That should be all. Now your patchbomb is on its way out."
-msgstr ""
-
-msgid ""
"You can also either configure the method option in the email section\n"
"to be a sendmail compatible mailer or fill out the [smtp] section so\n"
"that the patchbomb extension can automatically send patchbombs\n"
@@ -4832,10 +4918,21 @@
" Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
" the first line of the changeset description as the subject text.\n"
" The message contains two or three parts. First, the changeset\n"
-" description. Next, (optionally) if the diffstat program is\n"
-" installed and -d/--diffstat is used, the result of running\n"
-" diffstat on the patch. Finally, the patch itself, as generated by\n"
-" :hg:`export`."
+" description."
+msgstr ""
+
+msgid ""
+" With the -d/--diffstat option, if the diffstat program is\n"
+" installed, the result of running diffstat on the patch is inserted."
+msgstr ""
+
+msgid " Finally, the patch itself, as generated by :hg:`export`."
+msgstr ""
+
+msgid ""
+" With the -d/--diffstat or -c/--confirm options, you will be presented\n"
+" with a final summary of all messages and asked for confirmation before\n"
+" the messages are sent."
msgstr ""
msgid ""
@@ -4858,6 +4955,23 @@
msgstr ""
msgid ""
+" With -m/--mbox, instead of previewing each patchbomb message in a\n"
+" pager or sending the messages directly, it will create a UNIX\n"
+" mailbox file with the patch emails. This mailbox file can be\n"
+" previewed with any mail user agent which supports UNIX mbox\n"
+" files."
+msgstr ""
+
+msgid ""
+" With -n/--test, all steps will run, but mail will not be sent.\n"
+" You will be prompted for an email recipient address, a subject and\n"
+" an introductory message describing the patches of your patchbomb.\n"
+" Then when all is done, patchbomb messages are displayed. If the\n"
+" PAGER environment variable is set, your pager will be fired up once\n"
+" for each patchbomb message, so you can verify everything is alright."
+msgstr ""
+
+msgid ""
" hg email -r 3000 # send patch 3000 only\n"
" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
" hg email -r 3000:3005 # send patches 3000 through 3005\n"
@@ -4880,11 +4994,23 @@
msgstr ""
msgid ""
+" hg email -o -m mbox && # generate an mbox file...\n"
+" mutt -R -f mbox # ... and view it with mutt\n"
+" hg email -o -m mbox && # generate an mbox file ...\n"
+" formail -s sendmail \\ # ... and use formail to send from the "
+"mbox\n"
+" -bm -t < mbox # ... using sendmail"
+msgstr ""
+
+msgid ""
" Before using this command, you will need to enable email in your\n"
" hgrc. See the [email] section in hgrc(5) for details.\n"
" "
msgstr ""
+msgid "no changes found\n"
+msgstr "fandt ingen ændringer\n"
+
msgid "specify at least one changeset with -r or -o"
msgstr "angiv mindst en ændring med -r eller -o"
@@ -5237,8 +5363,8 @@
msgid "rebasing"
msgstr ""
-msgid " changesets"
-msgstr " ændringer"
+msgid "changesets"
+msgstr "ændringer"
msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
msgstr "ret uløste konflikter med hg resolve og kør så hg rebase --continue"
@@ -5392,10 +5518,6 @@
" Hvis en liste af filer er udeladt, så vil alle ændringer\n"
" rapporteret af :hg:`status` være kandidater til at blive optaget."
-msgid " See :hg:`help dates` for a list of formats valid for -d/--date."
-msgstr ""
-" Se :hg:`help dates` for en liste af gyldige formater til -d/--date."
-
msgid ""
" You will be prompted for whether to record changes to each\n"
" modified file, and for files with multiple changes, for each\n"
@@ -5447,9 +5569,6 @@
msgid "no changes to record\n"
msgstr "ingen ændringer at optage\n"
-msgid "patch failed to apply"
-msgstr "rettelse kunne ikke tilføjes"
-
msgid "hg record [OPTION]... [FILE]..."
msgstr "hg record [TILVALG]... [FIL]..."
@@ -5525,9 +5644,6 @@
msgid "not linkable: %s\n"
msgstr "kan ikke sammenkædes: %s\n"
-msgid " files"
-msgstr " filer"
-
msgid "pruning"
msgstr "beskærer"
@@ -5621,15 +5737,16 @@
msgstr ""
msgid ""
-" NOTE: using rollback or extensions that destroy/modify history\n"
-" (mq, rebase, etc.) can cause considerable confusion with shared\n"
-" clones. In particular, if two shared clones are both updated to\n"
-" the same changeset, and one of them destroys that changeset with\n"
-" rollback, the other clone will suddenly stop working: all\n"
-" operations will fail with \"abort: working directory has unknown\n"
-" parent\". The only known workaround is to use debugsetparents on\n"
-" the broken clone to reset it to a changeset that still exists\n"
-" (e.g. tip).\n"
+" .. note::\n"
+" using rollback or extensions that destroy/modify history (mq,\n"
+" rebase, etc.) can cause considerable confusion with shared\n"
+" clones. In particular, if two shared clones are both updated to\n"
+" the same changeset, and one of them destroys that changeset\n"
+" with rollback, the other clone will suddenly stop working: all\n"
+" operations will fail with \"abort: working directory has unknown\n"
+" parent\". The only known workaround is to use debugsetparents on\n"
+" the broken clone to reset it to a changeset that still exists\n"
+" (e.g. tip).\n"
" "
msgstr ""
@@ -5786,6 +5903,11 @@
msgid "outstanding local changes"
msgstr "udestående lokale ændringer"
+msgid ""
+"``transplanted(set)``\n"
+" Transplanted changesets in set."
+msgstr ""
+
msgid "pull patches from REPO"
msgstr "hiv rettelser fra DEPOT"
@@ -5988,6 +6110,12 @@
"[decode]\n"
"** = %sdecode:\n"
+msgid ""
+"win32text is deprecated: http://mercurial.selenic.com/wiki/"
+"Win32TextExtension\n"
+msgstr ""
+"win32text er forældet: http://mercurial.selenic.com/wiki/Win32TextExtension\n"
+
msgid "discover and advertise repositories on the local network"
msgstr ""
@@ -6080,9 +6208,6 @@
msgid "limit must be positive"
msgstr "grænsen skal være positiv"
-msgid "too many revisions specified"
-msgstr "der er specificeret for mange revisioner"
-
#, python-format
msgid "invalid format spec '%%%s' in output filename"
msgstr "ugyldig formatspecifikation '%%%s' i output filnavn"
@@ -6142,8 +6267,8 @@
#, python-format
msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
msgstr ""
-"%s er endnu ikke comitted, så der vil ikke blive gemt kopieringsdata for "
-"%s.\n"
+"%s er endnu ikke comitted, så der vil ikke blive gemt kopieringsdata for %"
+"s.\n"
msgid "no source or destination specified"
msgstr "ingen kilde eller destination angivet"
@@ -6408,11 +6533,6 @@
" annotering alligevel, selvom resultatet sandsynligvis vil være\n"
" hverken brugbart eller ønskværdigt."
-msgid ""
-" Returns 0 on success.\n"
-" "
-msgstr ""
-
msgid "at least one filename or pattern is required"
msgstr "kræver mindst et filnavn eller mønster"
@@ -6473,33 +6593,38 @@
msgstr "omgør effekten af tidligere ændringer"
msgid ""
-" Commit the backed out changes as a new changeset. The new\n"
-" changeset is a child of the backed out changeset."
-msgstr ""
-" Deponerer de omgjorte ændringer som en ny ændring. Den nye ændring\n"
-" er et barn af den omgjorte ændring."
-
-msgid ""
-" If you backout a changeset other than the tip, a new head is\n"
-" created. This head will be the new tip and you should merge this\n"
-" backout changeset with another head."
-msgstr ""
-" Hvis du omgør en ændring som ikke er spidsen, så vil et der blive\n"
-" lavet et nyt hoved. Dette hoved vil være den nye spids og du bør\n"
-" sammenføje denne omgjorte ændring med et andet hoved (det\n"
-" nuværende hoved som standard)."
-
-msgid ""
+" The backout command merges the reverse effect of the reverted\n"
+" changeset into the working directory."
+msgstr ""
+
+msgid ""
+" With the --merge option, it first commits the reverted changes\n"
+" as a new changeset. This new changeset is a child of the reverted\n"
+" changeset.\n"
" The --merge option remembers the parent of the working directory\n"
" before starting the backout, then merges the new head with that\n"
-" changeset afterwards. This saves you from doing the merge by hand.\n"
-" The result of this merge is not committed, as with a normal merge."
-msgstr ""
-" Med --merge tilvalget vil forælderen til arbejdskataloget blive\n"
-" husket og det nye hoved vil blive sammenføjet med denne ændring\n"
-" bagefter. Dette sparer dig for at lave sammenføjningen selv.\n"
-" Resultatet af denne sammenføjning er ikke lagt i depot, som ved en\n"
-" normal sammenføjning."
+" changeset afterwards.\n"
+" This will result in an explicit merge in the history."
+msgstr ""
+" Med --merge tilvalget bliver de omgjorte ændringer først deponeret\n"
+" som en ny ændring. Denne nye ændring vil være et barn af den\n"
+" omgjorte ændring. Derefter bliver det nye hoved sammenføjet med\n"
+" arbejdskatalogets forælderrevision. Derved skabes der en eksplicit\n"
+" sammenføjning i historien."
+
+msgid ""
+" If you backout a changeset other than the original parent of the\n"
+" working directory, the result of this merge is not committed,\n"
+" as with a normal merge. Otherwise, no merge is needed and the\n"
+" commit is automatic."
+msgstr ""
+
+msgid ""
+" Note that the default behavior (without --merge) has changed in\n"
+" version 1.7. To restore the previous default behavior, use\n"
+" :hg:`backout --merge` and then :hg:`update --clean .` to get rid of\n"
+" the ongoing merge."
+msgstr ""
msgid "please specify just one revision"
msgstr "angiv venligst kun en revision"
@@ -6531,12 +6656,6 @@
msgid "merging with changeset %s\n"
msgstr "sammenføjer med ændring %s\n"
-msgid "the backout changeset is a new head - do not forget to merge\n"
-msgstr ""
-
-msgid "(use \"backout --merge\" if you want to auto-merge)\n"
-msgstr "(brug \"backout --merge\" hvis du vil sammenføje automatisk)\n"
-
msgid "subdivision search of changesets"
msgstr ""
@@ -7230,7 +7349,7 @@
msgid ""
" Internal patcher failure, please report this error to http://mercurial."
-"selenic.com/bts/\n"
+"selenic.com/wiki/BugTracker\n"
msgstr ""
msgid "Checking commit editor...\n"
@@ -7283,14 +7402,15 @@
msgstr " Ændringerne mellem filerne vises i unified diff-formatet."
msgid ""
-" NOTE: diff may generate unexpected results for merges, as it will\n"
-" default to comparing against the working directory's first parent\n"
-" changeset if no revisions are specified."
-msgstr ""
-" BEMÆRK: diff kan generere overraskende resultater for\n"
-" sammenføjninger, idet den som udgangspunkt vil sammenligne med\n"
-" arbejdskatalogets første forælder, hvis der ikke angivet en\n"
-" revision."
+" .. note::\n"
+" diff may generate unexpected results for merges, as it will\n"
+" default to comparing against the working directory's first\n"
+" parent changeset if no revisions are specified."
+msgstr ""
+" .. note::\n"
+" diff kan generere overraskende resultater for sammenføjninger,\n"
+" idet den som udgangspunkt vil sammenligne med arbejdskatalogets\n"
+" første forælder, hvis der ikke angivet en revision."
msgid ""
" Alternatively you can specify -c/--change with a revision to see\n"
@@ -7333,13 +7453,15 @@
" og deponeringsbeskeden."
msgid ""
-" NOTE: export may generate unexpected diff output for merge\n"
-" changesets, as it will compare the merge changeset against its\n"
-" first parent only."
-msgstr ""
-" BEMÆRK: export kan generere uventet diff uddata for\n"
-" sammenføjningsændringer idet den kun vil sammenligne\n"
-" sammenføjningsændringen med dennes første forælder."
+" .. note::\n"
+" export may generate unexpected diff output for merge\n"
+" changesets, as it will compare the merge changeset against its\n"
+" first parent only."
+msgstr ""
+" .. note::\n"
+" export kan generere uventet diff uddata for\n"
+" sammenføjningsændringer idet den kun vil sammenligne\n"
+" sammenføjningsændringen med dennes første forælder."
msgid ""
" Output may be to a file, in which case the name of the file is\n"
@@ -7814,13 +7936,13 @@
" følger kun den første forældre for sammenføjningsrevisioner."
msgid ""
-" If no revision range is specified, the default is tip:0 unless\n"
+" If no revision range is specified, the default is ``tip:0`` unless\n"
" --follow is set, in which case the working directory parent is\n"
" used as the starting revision. You can specify a revision set for\n"
" log, see :hg:`help revsets` for more information."
msgstr ""
-" Hvis der ikke angives et revisionsinterval, da bruges tip:0 som\n"
-" standard, med mindre --follow er brugt, i hvilket tilfælde\n"
+" Hvis der ikke angives et revisionsinterval, da bruges ``tip:0``\n"
+" som standard, med mindre --follow er brugt, i hvilket tilfælde\n"
" arbejdskatalogets forælder bruges som startrevision. Du kan\n"
" specificere en mængde af ændringer til log, se :hg:`help revsets`\n"
" for mere information."
@@ -7837,15 +7959,17 @@
" listen af ændrede filer og den fulde deponeringsbesked."
msgid ""
-" NOTE: log -p/--patch may generate unexpected diff output for merge\n"
-" changesets, as it will only compare the merge changeset against\n"
-" its first parent. Also, only files different from BOTH parents\n"
-" will appear in files:."
-msgstr ""
-" BEMÆRK: log -p/--patch kan generere uventet diff output for\n"
-" sammenføjningsændringer idet den kun sammenligner ændringen med\n"
-" dennes første forælder. Ydermere vises kun filer som er\n"
-" forskellige fra BEGGE forældre i files:."
+" .. note::\n"
+" log -p/--patch may generate unexpected diff output for merge\n"
+" changesets, as it will only compare the merge changeset against\n"
+" its first parent. Also, only files different from BOTH parents\n"
+" will appear in files:."
+msgstr ""
+" .. note::\n"
+" log -p/--patch kan generere uventet diff output for\n"
+" sammenføjningsændringer idet den kun sammenligner ændringen med\n"
+" dennes første forælder. Ydermere vises kun filer som er\n"
+" forskellige fra BEGGE forældre i files:."
msgid "output the current or given revision of the project manifest"
msgstr ""
@@ -7883,6 +8007,12 @@
" næste deponerede ændring får to forældre."
msgid ""
+" ``--tool`` can be used to specify the merge tool used for file\n"
+" merges. It overrides the HGMERGE environment variable and your\n"
+" configuration files."
+msgstr ""
+
+msgid ""
" If no revision is specified, the working directory's parent is a\n"
" head revision, and the current branch contains exactly one other\n"
" head, the other head is merged with by default. Otherwise, an\n"
@@ -7893,6 +8023,10 @@
" hoved, så sammenføjes der med dette hoved som standard. Ellers\n"
" skal en eksplicit revision angives."
+msgid " :hg:`resolve` must be used to resolve unresolved files."
+msgstr ""
+" :hg:`resolve` skal bruges for at prøve at sammenføje uløste filer igen"
+
msgid ""
" To undo an uncommitted merge, use :hg:`update --clean .` which\n"
" will check out a clean copy of the original merge parent, losing\n"
@@ -8249,10 +8383,13 @@
msgstr ""
msgid ""
-" - :hg:`resolve FILE...`: attempt to re-merge the specified files,\n"
-" discarding any previous merge attempts. Re-merging is not\n"
+" - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the "
+"specified\n"
+" files, discarding any previous merge attempts. Re-merging is not\n"
" performed for files already marked as resolved. Use ``--all/-a``\n"
-" to selects all unresolved files."
+" to selects all unresolved files. ``--tool`` can be used to specify\n"
+" the merge tool used for the given files. It overrides the HGMERGE\n"
+" environment variable and your configuration files."
msgstr ""
msgid ""
@@ -8297,13 +8434,13 @@
msgstr ""
msgid ""
-" NOTE: This command is most likely not what you are looking for. revert\n"
-" will partially overwrite content in the working directory without "
-"changing\n"
-" the working directory parents. Use :hg:`update -r rev` to check out "
-"earlier\n"
-" revisions, or :hg:`update --clean .` to undo a merge which has added\n"
-" another parent."
+" .. note::\n"
+" This command is most likely not what you are looking for.\n"
+" Revert will partially overwrite content in the working\n"
+" directory without changing the working directory parents. Use\n"
+" :hg:`update -r rev` to check out earlier revisions, or\n"
+" :hg:`update --clean .` to undo a merge which has added another\n"
+" parent."
msgstr ""
msgid ""
@@ -8493,16 +8630,18 @@
" -u/--unknown eller -i/--ignored."
msgid ""
-" NOTE: status may appear to disagree with diff if permissions have\n"
-" changed or a merge has occurred. The standard diff format does not\n"
-" report permission changes and diff only reports changes relative\n"
-" to one merge parent."
-msgstr ""
-" BEMÆRK: status kan tilsyneladende være forskellig fra diff hvis\n"
-" rettigheder er blevet ændret eller hvis en sammenføjning har\n"
-" fundet sted. Det normale diff-format rapporterer ikke ændringer i\n"
-" rettigheder og diff rapporterer kun ænringer relativt til en\n"
-" sammenføjningsforældre."
+" .. note::\n"
+" status may appear to disagree with diff if permissions have\n"
+" changed or a merge has occurred. The standard diff format does\n"
+" not report permission changes and diff only reports changes\n"
+" relative to one merge parent."
+msgstr ""
+" .. note::\n"
+" status kan tilsyneladende være forskellig fra diff hvis\n"
+" rettigheder er blevet ændret eller hvis en sammenføjning har\n"
+" fundet sted. Det normale diff-format rapporterer ikke ændringer\n"
+" i rettigheder og diff rapporterer kun ænringer relativt til en\n"
+" sammenføjningsforældre."
msgid ""
" If one revision is given, it is used as the base revision.\n"
@@ -8747,18 +8886,20 @@
msgid ""
" Update the repository's working directory to the specified\n"
+" changeset. If no changeset is specified, update to the tip of the\n"
+" current named branch."
+msgstr ""
+" Opdater depotets arbejdskatalog til den angivne ændring. Hvis der\n"
+" ikke angives en ændring, da opdateres til spidsen af den nuværende\n"
+" gren."
+
+msgid ""
+" If the changeset is not a descendant of the working directory's\n"
+" parent, the update is aborted. With the -c/--check option, the\n"
+" working directory is checked for uncommitted changes; if none are\n"
+" found, the working directory is updated to the specified\n"
" changeset."
-msgstr " Opdater depotets arbejdskatalog til den angivne ændring."
-
-msgid ""
-" If no changeset is specified, attempt to update to the tip of the\n"
-" current branch. If this changeset is a descendant of the working\n"
-" directory's parent, update to it, otherwise abort."
-msgstr ""
-" Hvis der ikke er angivet nogen ændring, forsøg da at opdatere til\n"
-" spidsen af den nuværende gren. Hvis denne ændring nedstammer fra\n"
-" arbejdskatalogets forælder, da opdateres der til det, ellers\n"
-" afbrydes der."
+msgstr ""
msgid ""
" The following rules apply when the working directory contains\n"
@@ -8808,8 +8949,8 @@
" :hg:`clone -U`)."
msgid ""
-" If you want to update just one file to an older changeset, use :hg:"
-"`revert`."
+" If you want to update just one file to an older changeset, use\n"
+" :hg:`revert`."
msgstr ""
" Hvis du vil opdatere blot en enkelt fil til en ældre revision,\n"
" brug da :hg:`revert`."
@@ -8844,14 +8985,15 @@
msgid "Mercurial Distributed SCM (version %s)\n"
msgstr "Mercurial Distribueret SCM (version %s)\n"
-msgid ""
-"\n"
-"Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
+msgid "(see http://mercurial.selenic.com for more information)"
+msgstr "(se http://mercurial.selenic.com for mere information)"
+
+msgid ""
+"Copyright (C) 2005-2010 Matt Mackall and others\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-"\n"
-"Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> og andre\n"
+"Copyright (C) 2005-2010 Matt Mackall og andre\n"
"Dette er frit programmel; se kildekoden for kopieringsbetingelser. Der\n"
"gives INGEN GARANTI; ikke engang for SALGBARHED eller EGNETHED FOR\n"
"NOGET BESTEMT FORMÃ…L.\n"
@@ -9048,6 +9190,9 @@
msgid "parent to choose when backing out merge"
msgstr ""
+msgid "specify merge tool"
+msgstr "angiv sammenføjningsværktøj"
+
msgid "revision to backout"
msgstr "revision som skal bakkes ud"
@@ -9273,8 +9418,11 @@
msgid "[OPTION]... PATTERN [FILE]..."
msgstr "[TILVALG]... MØNSTER [FIL]..."
-msgid "show only heads which are descendants of REV"
-msgstr "vis kun hoveder som er efterkommere af REV"
+msgid "show only heads which are descendants of STARTREV"
+msgstr "vis kun hoveder som er efterkommere af STARTREV"
+
+msgid "STARTREV"
+msgstr "STARTREV"
msgid "show topological heads only"
msgstr ""
@@ -9285,8 +9433,8 @@
msgid "show normal and closed branch heads"
msgstr "vis normale og lukkede grenhoveder"
-msgid "[-ac] [-r REV] [REV]..."
-msgstr "[-ac] [-r REV] [REV]..."
+msgid "[-ac] [-r STARTREV] [REV]..."
+msgstr "[-ac] [-r STARTREV] [REV]..."
msgid "[TOPIC]"
msgstr "[EMNE]"
@@ -9521,8 +9669,8 @@
msgid "name to show in web pages (default: working directory)"
msgstr "navn der skal vises på websider (standard: arbejdskatalog)"
-msgid "name of the hgweb config file (serve more than one repository)"
-msgstr "navn på hgweb konfigurationsfil (serve mere end et depot)"
+msgid "name of the hgweb config file (see \"hg help hgweb\")"
+msgstr "navn på hgweb konfigurationsfil (se \"hg help hgweb\")"
msgid "name of the hgweb config file (DEPRECATED)"
msgstr "navn på hgweb konfigurationsfilen (FORÆLDET)"
@@ -9614,8 +9762,8 @@
msgid "discard uncommitted changes (no backup)"
msgstr "kasser ikke-deponerede ændringer (ingen sikkerhedskopi)"
-msgid "check for uncommitted changes"
-msgstr "kontroller for udeponerede ændringer"
+msgid "update across branches if no uncommitted changes"
+msgstr "opdater på tværs af grene hvis der er ingen udeponerede ændringer"
msgid "[-c] [-C] [-d DATE] [[-r] REV]"
msgstr "[-c] [-C] [-d DATO] [[-r] REV]"
@@ -9734,6 +9882,9 @@
msgid "unsupported file type (type is %s)"
msgstr "usupporteret filtype (typen er %s)"
+msgid "searching for changes\n"
+msgstr "leder efter ændringer\n"
+
msgid "queries"
msgstr ""
@@ -9777,6 +9928,10 @@
msgstr "afbrudt: %s\n"
#, python-format
+msgid "(%s)\n"
+msgstr "(%s)\n"
+
+#, python-format
msgid "hg: parse error at %s: %s\n"
msgstr "hg: konfigurationsfejl på %s: %s\n"
@@ -9837,10 +9992,6 @@
msgid "hg: unknown command '%s'\n"
msgstr "hg: ukendt kommando '%s'\n"
-#, python-format
-msgid "(%s)\n"
-msgstr ""
-
msgid "(did you forget to compile extensions?)\n"
msgstr "(glemte du at kompilere udvidelserne?)\n"
@@ -9867,18 +10018,15 @@
msgid "abort: out of memory\n"
msgstr "afbrudt: løbet tør for hukommelse\n"
-msgid "** unknown exception encountered, details follow\n"
-msgstr "** der opstod en ukendt fejl, detaljer følger\n"
-
-msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
-msgstr "** angiv fejldetaljer på http://mercurial.selenic.com/bts/\n"
-
-msgid "** or mercurial@selenic.com\n"
-msgstr "** eller mercurial@selenic.com\n"
+msgid "** unknown exception encountered, please report by visiting\n"
+msgstr "** der opstod en ukendt fejl, meld den venligst ved at besøge\n"
+
+msgid "** http://mercurial.selenic.com/wiki/BugTracker\n"
+msgstr "** http://mercurial.selenic.com/wiki/BugTracker\n"
#, python-format
msgid "** Python %s\n"
-msgstr ""
+msgstr "** Python %s\n"
#, python-format
msgid "** Mercurial Distributed SCM (version %s)\n"
@@ -10056,6 +10204,9 @@
msgid "Diff Formats"
msgstr ""
+msgid "Merge Tools"
+msgstr ""
+
msgid "Template Usage"
msgstr "Brug af skabeloner"
@@ -10065,6 +10216,9 @@
msgid "Using additional features"
msgstr "Brug af yderligere funktioner"
+msgid "Subrepositories"
+msgstr "Underdepoter"
+
msgid "Configuring hgweb"
msgstr "Konfigurering af hgweb"
@@ -10332,6 +10486,15 @@
msgstr ""
msgid ""
+"HGENCODINGAMBIGUOUS\n"
+" This sets Mercurial's behavior for handling characters with\n"
+" \"ambiguous\" widths like accented Latin characters with East Asian\n"
+" fonts. By default, Mercurial assumes ambiguous characters are\n"
+" narrow, set this variable to \"wide\" if such characters cause\n"
+" formatting problems."
+msgstr ""
+
+msgid ""
"HGMERGE\n"
" An executable to use for resolving merge conflicts. The program\n"
" will be executed with three arguments: local file, remote file,\n"
@@ -11087,6 +11250,182 @@
"``bar`` and ``quux/baz`` respectively.\n"
msgstr ""
+msgid "To merge files Mercurial uses merge tools."
+msgstr ""
+
+msgid ""
+"A merge tool combines two different versions of a file into a merged\n"
+"file. Merge tools are given the two files and the greatest common\n"
+"ancestor of the two file versions, so they can determine the changes\n"
+"made on both branches."
+msgstr ""
+
+msgid ""
+"Merge tools are used both for :hg:`resolve`, :hg:`merge`, :hg:`update`,\n"
+":hg:`backout` and in several extensions."
+msgstr ""
+
+msgid ""
+"Usually, the merge tool tries to automatically reconcile the files by\n"
+"combining all non-overlapping changes that occurred separately in\n"
+"the two different evolutions of the same initial base file. Furthermore, "
+"some\n"
+"interactive merge programs make it easier to manually resolve\n"
+"conflicting merges, either in a graphical way, or by inserting some\n"
+"conflict markers. Mercurial does not include any interactive merge\n"
+"programs but relies on external tools for that."
+msgstr ""
+
+msgid ""
+"Available merge tools\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"External merge tools and their properties are configured in the\n"
+"merge-tools configuration section - see hgrc(5) - but they can often just\n"
+"be named by their executable."
+msgstr ""
+
+msgid ""
+"A merge tool is generally usable if its executable can be found on the\n"
+"system and if it can handle the merge. The executable is found if it\n"
+"is an absolute or relative executable path or the name of an\n"
+"application in the executable search path. The tool is assumed to be\n"
+"able to handle the merge if it can handle symlinks if the file is a\n"
+"symlink, if it can handle binary files if the file is binary, and if a\n"
+"GUI is available if the tool requires a GUI."
+msgstr ""
+
+msgid ""
+"There are some internal merge tools which can be used. The internal\n"
+"merge tools are:"
+msgstr ""
+
+msgid ""
+"``internal:merge``\n"
+" Uses the internal non-interactive simple merge algorithm for merging\n"
+" files. It will fail if there are any conflicts and leave markers in\n"
+" the partially merged file."
+msgstr ""
+
+msgid ""
+"``internal:fail``\n"
+" Rather than attempting to merge files that were modified on both\n"
+" branches, it marks them as unresolved. The resolve command must be\n"
+" used to resolve these conflicts."
+msgstr ""
+
+msgid ""
+"``internal:local``\n"
+" Uses the local version of files as the merged version."
+msgstr ""
+
+msgid ""
+"``internal:other``\n"
+" Uses the other version of files as the merged version."
+msgstr ""
+
+msgid ""
+"``internal:prompt``\n"
+" Asks the user which of the local or the other version to keep as\n"
+" the merged version."
+msgstr ""
+
+msgid ""
+"``internal:dump``\n"
+" Creates three versions of the files to merge, containing the\n"
+" contents of local, other and base. These files can then be used to\n"
+" perform a merge manually. If the file to be merged is named\n"
+" ``a.txt``, these files will accordingly be named ``a.txt.local``,\n"
+" ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n"
+" same directory as ``a.txt``."
+msgstr ""
+
+msgid ""
+"Internal tools are always available and do not require a GUI but will by "
+"default\n"
+"not handle symlinks or binary files."
+msgstr ""
+
+msgid ""
+"Choosing a merge tool\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "Mercurial uses these rules when deciding which merge tool to use:"
+msgstr ""
+
+msgid ""
+"1. If a tool has been specified with the --tool option to merge or resolve, "
+"it\n"
+" is used. If it is the name of a tool in the merge-tools configuration, "
+"its\n"
+" configuration is used. Otherwise the specified tool must be executable "
+"by\n"
+" the shell."
+msgstr ""
+
+msgid ""
+"2. If the ``HGMERGE`` environment variable is present, its value is used "
+"and\n"
+" must be executable by the shell."
+msgstr ""
+
+msgid ""
+"3. If the filename of the file to be merged matches any of the patterns in "
+"the\n"
+" merge-patterns configuration section, the first usable merge tool\n"
+" corresponding to a matching pattern is used. Here, binary capabilities of "
+"the\n"
+" merge tool are not considered."
+msgstr ""
+
+msgid ""
+"4. If ui.merge is set it will be considered next. If the value is not the "
+"name\n"
+" of a configured tool, the specified value is used and must be executable "
+"by\n"
+" the shell. Otherwise the named tool is used if it is usable."
+msgstr ""
+
+msgid ""
+"5. If any usable merge tools are present in the merge-tools configuration\n"
+" section, the one with the highest priority is used."
+msgstr ""
+
+msgid ""
+"6. If a program named ``hgmerge`` can be found on the system, it is used - "
+"but\n"
+" it will by default not be used for symlinks and binary files."
+msgstr ""
+
+msgid ""
+"7. If the file to be merged is not binary and is not a symlink, then\n"
+" ``internal:merge`` is used."
+msgstr ""
+
+msgid "8. The merge of the file fails and must be resolved before commit."
+msgstr ""
+
+msgid ""
+".. note::\n"
+" After selecting a merge program, Mercurial will by default attempt\n"
+" to merge the files using a simple merge algorithm first. Only if it "
+"doesn't\n"
+" succeed because of conflicting changes Mercurial will actually execute "
+"the\n"
+" merge program. Whether to use the simple merge algorithm first can be\n"
+" controlled by the premerge setting of the merge tool. Premerge is enabled "
+"by\n"
+" default unless the file is binary or a symlink."
+msgstr ""
+
+msgid ""
+"See the merge-tools and ui sections of hgrc(5) for details on the\n"
+"configuration of merge tools.\n"
+msgstr ""
+
msgid ""
"When Mercurial accepts more than one revision, they may be specified\n"
"individually, or provided as a topologically continuous range,\n"
@@ -11243,8 +11582,13 @@
"Identifiers such as branch names must be quoted with single or double\n"
"quotes if they contain characters outside of\n"
"``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n"
-"predicates. Special characters can be used in quoted identifiers by\n"
-"escaping them, e.g., ``\\n`` is interpreted as a newline."
+"predicates."
+msgstr ""
+
+msgid ""
+"Special characters can be used in quoted identifiers by escaping them,\n"
+"e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n"
+"interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``."
msgstr ""
msgid "There is a single prefix operator:"
@@ -11295,184 +11639,7 @@
msgid "The following predicates are supported:"
msgstr ""
-msgid ""
-"``adds(pattern)``\n"
-" Changesets that add a file matching pattern."
-msgstr ""
-
-msgid ""
-"``all()``\n"
-" All changesets, the same as ``0:tip``."
-msgstr ""
-
-msgid ""
-"``ancestor(single, single)``\n"
-" Greatest common ancestor of the two changesets."
-msgstr ""
-
-msgid ""
-"``ancestors(set)``\n"
-" Changesets that are ancestors of a changeset in set."
-msgstr ""
-
-msgid ""
-"``author(string)``\n"
-" Alias for ``user(string)``."
-msgstr ""
-
-msgid ""
-"``branch(set)``\n"
-" All changesets belonging to the branches of changesets in set."
-msgstr ""
-
-msgid ""
-"``children(set)``\n"
-" Child changesets of changesets in set."
-msgstr ""
-
-msgid ""
-"``closed()``\n"
-" Changeset is closed."
-msgstr ""
-
-msgid ""
-"``contains(pattern)``\n"
-" Revision contains pattern."
-msgstr ""
-
-msgid ""
-"``date(interval)``\n"
-" Changesets within the interval, see :hg:`help dates`."
-msgstr ""
-
-msgid ""
-"``descendants(set)``\n"
-" Changesets which are descendants of changesets in set."
-msgstr ""
-
-msgid ""
-"``file(pattern)``\n"
-" Changesets affecting files matched by pattern."
-msgstr ""
-
-msgid ""
-"``follow()``\n"
-" An alias for ``::.`` (ancestors of the working copy's first parent)."
-msgstr ""
-
-msgid ""
-"``grep(regex)``\n"
-" Like ``keyword(string)`` but accepts a regex."
-msgstr ""
-
-msgid ""
-"``head()``\n"
-" Changeset is a head."
-msgstr ""
-
-msgid ""
-"``heads(set)``\n"
-" Members of set with no children in set."
-msgstr ""
-
-msgid ""
-"``keyword(string)``\n"
-" Search commit message, user name, and names of changed files for\n"
-" string."
-msgstr ""
-
-msgid ""
-"``limit(set, n)``\n"
-" First n members of set."
-msgstr ""
-
-msgid ""
-"``max(set)``\n"
-" Changeset with highest revision number in set."
-msgstr ""
-
-msgid ""
-"``min(set)``\n"
-" Changeset with lowest revision number in set."
-msgstr ""
-
-msgid ""
-"``merge()``\n"
-" Changeset is a merge changeset."
-msgstr ""
-
-msgid ""
-"``modifies(pattern)``\n"
-" Changesets modifying files matched by pattern."
-msgstr ""
-
-msgid ""
-"``outgoing([path])``\n"
-" Changesets not found in the specified destination repository, or the\n"
-" default push location."
-msgstr ""
-
-msgid ""
-"``p1(set)``\n"
-" First parent of changesets in set."
-msgstr ""
-
-msgid ""
-"``p2(set)``\n"
-" Second parent of changesets in set."
-msgstr ""
-
-msgid ""
-"``parents(set)``\n"
-" The set of all parents for all changesets in set."
-msgstr ""
-
-msgid ""
-"``present(set)``\n"
-" An empty set, if any revision in set isn't found; otherwise,\n"
-" all revisions in set."
-msgstr ""
-
-msgid ""
-"``removes(pattern)``\n"
-" Changesets which remove files matching pattern."
-msgstr ""
-
-msgid ""
-"``reverse(set)``\n"
-" Reverse order of set."
-msgstr ""
-
-msgid ""
-"``roots(set)``\n"
-" Changesets with no parent changeset in set."
-msgstr ""
-
-msgid ""
-"``sort(set[, [-]key...])``\n"
-" Sort set by keys. The default sort order is ascending, specify a key\n"
-" as ``-key`` to sort in descending order."
-msgstr ""
-
-msgid " The keys can be:"
-msgstr ""
-
-msgid ""
-" - ``rev`` for the revision number,\n"
-" - ``branch`` for the branch name,\n"
-" - ``desc`` for the commit message (description),\n"
-" - ``user`` for user name (``author`` can be used as an alias),\n"
-" - ``date`` for the commit date"
-msgstr ""
-
-msgid ""
-"``tagged()``\n"
-" Changeset is tagged."
-msgstr ""
-
-msgid ""
-"``user(string)``\n"
-" User name is string."
+msgid ".. predicatesmarker"
msgstr ""
msgid "Command line equivalents for :hg:`log`::"
@@ -11497,21 +11664,236 @@
" -P x -> !::x\n"
" -l x -> limit(expr, x)"
-msgid "Some sample queries::"
-msgstr ""
-
-msgid ""
-" hg log -r 'branch(default)'\n"
-" hg log -r 'branch(default) and 1.5:: and not merge()'\n"
-" hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n"
-" hg log -r 'sort(date(\"May 2008\"), user)'\n"
-" hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n"
-msgstr ""
-" hg log -r 'branch(default)'\n"
-" hg log -r 'branch(default) and 1.5:: and not merge()'\n"
-" hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n"
-" hg log -r 'sort(date(\"May 2008\"), user)'\n"
-" hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n"
+msgid "Some sample queries:"
+msgstr ""
+
+msgid "- Changesets on the default branch::"
+msgstr "- Ændringer på default grenen::"
+
+msgid " hg log -r \"branch(default)\""
+msgstr " hg log -r \"branch(default)\""
+
+msgid "- Changesets on the default branch since tag 1.5 (excluding merges)::"
+msgstr ""
+
+msgid " hg log -r \"branch(default) and 1.5:: and not merge()\""
+msgstr " hg log -r \"branch(default) and 1.5:: and not merge()\""
+
+msgid "- Open branch heads::"
+msgstr "- Ã…bne grenhoveder::"
+
+msgid " hg log -r \"head() and not closed()\""
+msgstr " hg log -r \"head() and not closed()\""
+
+msgid ""
+"- Changesets between tags 1.3 and 1.5 mentioning \"bug\" that affect\n"
+" ``hgext/*``::"
+msgstr ""
+
+msgid " hg log -r \"1.3::1.5 and keyword(bug) and file('hgext/*')\""
+msgstr " hg log -r \"1.3::1.5 and keyword(bug) and file(\"hgext/*\")\""
+
+msgid "- Changesets in committed May 2008, sorted by user::"
+msgstr ""
+
+msgid " hg log -r \"sort(date('May 2008'), user)\""
+msgstr " hg log -r \"sort(date(\"May 2008\"), user)\""
+
+msgid ""
+"- Changesets mentioning \"bug\" or \"issue\" that are not in a tagged\n"
+" release::"
+msgstr ""
+
+msgid ""
+" hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged())"
+"\"\n"
+msgstr ""
+" hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged())"
+"\"\n"
+
+msgid ""
+"Subrepositories let you nest external repositories or projects into a\n"
+"parent Mercurial repository, and make commands operate on them as a\n"
+"group. External Mercurial and Subversion projects are currently\n"
+"supported."
+msgstr ""
+
+msgid "Subrepositories are made of three components:"
+msgstr ""
+
+msgid ""
+"1. Nested repository checkouts. They can appear anywhere in the\n"
+" parent working directory, and are Mercurial clones or Subversion\n"
+" checkouts."
+msgstr ""
+
+msgid ""
+"2. Nested repository references. They are defined in ``.hgsub`` and\n"
+" tell where the subrepository checkouts come from. Mercurial\n"
+" subrepositories are referenced like:"
+msgstr ""
+
+msgid " path/to/nested = https://example.com/nested/repo/path"
+msgstr ""
+
+msgid ""
+" where ``path/to/nested`` is the checkout location relatively to the\n"
+" parent Mercurial root, and ``https://example.com/nested/repo/path``\n"
+" is the source repository path. The source can also reference a\n"
+" filesystem path. Subversion repositories are defined with:"
+msgstr ""
+
+msgid " path/to/nested = [svn]https://example.com/nested/trunk/path"
+msgstr ""
+
+msgid ""
+" Note that ``.hgsub`` does not exist by default in Mercurial\n"
+" repositories, you have to create and add it to the parent\n"
+" repository before using subrepositories."
+msgstr ""
+
+msgid ""
+"3. Nested repository states. They are defined in ``.hgsubstate`` and\n"
+" capture whatever information is required to restore the\n"
+" subrepositories to the state they were committed in a parent\n"
+" repository changeset. Mercurial automatically record the nested\n"
+" repositories states when committing in the parent repository."
+msgstr ""
+
+msgid ""
+" .. note::\n"
+" The ``.hgsubstate`` file should not be edited manually."
+msgstr ""
+
+msgid ""
+"\n"
+"Adding a Subrepository\n"
+"----------------------"
+msgstr ""
+
+msgid ""
+"If ``.hgsub`` does not exist, create it and add it to the parent\n"
+"repository. Clone or checkout the external projects where you want it\n"
+"to live in the parent repository. Edit ``.hgsub`` and add the\n"
+"subrepository entry as described above. At this point, the\n"
+"subrepository is tracked and the next commit will record its state in\n"
+"``.hgsubstate`` and bind it to the committed changeset."
+msgstr ""
+
+msgid ""
+"Synchronizing a Subrepository\n"
+"-----------------------------"
+msgstr ""
+
+msgid ""
+"Subrepos do not automatically track the latest changeset of their\n"
+"sources. Instead, they are updated to the changeset that corresponds\n"
+"with the changeset checked out in the top-level changeset. This is so\n"
+"developers always get a consistent set of compatible code and\n"
+"libraries when they update."
+msgstr ""
+
+msgid ""
+"Thus, updating subrepos is a manual process. Simply check out target\n"
+"subrepo at the desired revision, test in the top-level repo, then\n"
+"commit in the parent repository to record the new combination."
+msgstr ""
+
+msgid ""
+"Deleting a Subrepository\n"
+"------------------------"
+msgstr ""
+
+msgid ""
+"To remove a subrepository from the parent repository, delete its\n"
+"reference from ``.hgsub``, then remove its files."
+msgstr ""
+
+msgid ""
+"Interaction with Mercurial Commands\n"
+"-----------------------------------"
+msgstr ""
+
+msgid ""
+":add: add does not recurse in subrepos unless -S/--subrepos is\n"
+" specified. Subversion subrepositories are currently silently\n"
+" ignored."
+msgstr ""
+
+msgid ""
+":archive: archive does not recurse in subrepositories unless\n"
+" -S/--subrepos is specified."
+msgstr ""
+
+msgid ""
+":commit: commit creates a consistent snapshot of the state of the\n"
+" entire project and its subrepositories. It does this by first\n"
+" attempting to commit all modified subrepositories, then recording\n"
+" their state and finally committing it in the parent repository."
+msgstr ""
+
+msgid ""
+":diff: diff does not recurse in subrepos unless -S/--subrepos is\n"
+" specified. Changes are displayed as usual, on the subrepositories\n"
+" elements. Subversion subrepositories are currently silently\n"
+" ignored."
+msgstr ""
+
+msgid ""
+":incoming: incoming does not recurse in subrepos unless -S/--subrepos\n"
+" is specified. Subversion subrepositories are currently silently\n"
+" ignored."
+msgstr ""
+
+msgid ""
+":outgoing: outgoing does not recurse in subrepos unless -S/--subrepos\n"
+" is specified. Subversion subrepositories are currently silently\n"
+" ignored."
+msgstr ""
+
+msgid ""
+":pull: pull is not recursive since it is not clear what to pull prior\n"
+" to running :hg:`update`. Listing and retrieving all\n"
+" subrepositories changes referenced by the parent repository pulled\n"
+" changesets is expensive at best, impossible in the Subversion\n"
+" case."
+msgstr ""
+
+msgid ""
+":push: Mercurial will automatically push all subrepositories first\n"
+" when the parent repository is being pushed. This ensures new\n"
+" subrepository changes are available when referenced by top-level\n"
+" repositories."
+msgstr ""
+
+msgid ""
+":status: status does not recurse into subrepositories unless\n"
+" -S/--subrepos is specified. Subrepository changes are displayed as\n"
+" regular Mercurial changes on the subrepository\n"
+" elements. Subversion subrepositories are currently silently\n"
+" ignored."
+msgstr ""
+
+msgid ""
+":update: update restores the subrepos in the state they were\n"
+" originally committed in target changeset. If the recorded\n"
+" changeset is not available in the current subrepository, Mercurial\n"
+" will pull it in first before updating. This means that updating\n"
+" can require network access when using subrepositories."
+msgstr ""
+
+msgid ""
+"Remapping Subrepositories Sources\n"
+"---------------------------------"
+msgstr ""
+
+msgid ""
+"A subrepository source location may change during a project life,\n"
+"invalidating references stored in the parent repository history. To\n"
+"fix this, rewriting rules can be defined in parent repository ``hgrc``\n"
+"file or in Mercurial configuration. See the ``[subpaths]`` section in\n"
+"hgrc(5) for more details."
+msgstr ""
msgid ""
"Mercurial allows you to customize output of commands through\n"
@@ -11684,6 +12066,11 @@
" and \">\" with XML entities."
msgstr ""
+msgid ""
+":hex: Any text. Convert a binary Mercurial node identifier into\n"
+" its long hexadecimal representation."
+msgstr ""
+
msgid ":fill68: Any text. Wraps the text to fit in 68 columns."
msgstr ""
@@ -11796,6 +12183,11 @@
"server."
msgstr ""
+msgid ""
+"Note that the security of HTTPS URLs depends on proper configuration of\n"
+"web.cacerts."
+msgstr ""
+
msgid "Some notes about using SSH with Mercurial:"
msgstr ""
@@ -12199,9 +12591,6 @@
msgid "adding changesets\n"
msgstr "tilføjer ændringer\n"
-msgid "changesets"
-msgstr "ændringer"
-
msgid "received changelog group is empty"
msgstr "modtagen changelog-gruppe er tom"
@@ -12372,7 +12761,7 @@
msgstr "henter %s til %s\n"
#, python-format
-msgid "warning: detected divergent renames of %s to:\n"
+msgid "note: possible conflict - %s was renamed multiple times to:\n"
msgstr ""
#, python-format
@@ -12389,15 +12778,42 @@
msgstr ""
"udestående ikke-deponerede ændringer (brug 'hg status' for at se ændringer)"
-msgid ""
-"crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard "
-"changes)"
-msgstr ""
-"krydser grene (brug 'hg merge' for at sammenføje eller 'hg update -C' for at "
-"kassere ændringerne)"
-
-msgid "crosses branches (use 'hg merge' or use 'hg update -c')"
-msgstr "krydser grene (brug 'hg merge' eller 'hg update -c')"
+msgid "crosses branches (merge branches or use --clean to discard changes)"
+msgstr ""
+"krydser grene (sammenføj grenene eller brug --clean for at kassere "
+"ændringerne)"
+
+msgid "crosses branches (merge branches or use --check to force update)"
+msgstr ""
+"krydser grene (sammenføj grenene eller brug --check for at forcere "
+"opdateringen)"
+
+msgid "Attention:"
+msgstr ""
+
+msgid "Caution:"
+msgstr "Forsigtig:"
+
+msgid "!Danger!"
+msgstr "!Fare!"
+
+msgid "Error:"
+msgstr "Fejl:"
+
+msgid "Hint:"
+msgstr ""
+
+msgid "Important:"
+msgstr "Vigtigt:"
+
+msgid "Note:"
+msgstr "Bemærk:"
+
+msgid "Tip:"
+msgstr "Tip:"
+
+msgid "Warning!"
+msgstr "Advarsel!"
#, python-format
msgid "cannot create %s: destination already exists"
@@ -12477,14 +12893,8 @@
msgid "unsupported line endings type: %s"
msgstr "linieendelse %s understøttes ikke"
-msgid ""
-"internal patcher failed\n"
-"please report details to http://mercurial.selenic.com/bts/\n"
-"or mercurial@selenic.com\n"
-msgstr ""
-"intern lappe-funktionalitet fejlede\n"
-"angiv venligst fejldetaljer på http://mercurial.selenic.com/bts/\n"
-"eller mercurial@selenic.com\n"
+msgid "patch failed to apply"
+msgstr "rettelse kunne ikke tilføjes"
#, python-format
msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
@@ -12557,12 +12967,12 @@
msgid "%s not found in the transaction"
msgstr "%s ikke fundet i transaktionen"
+msgid "consistency error in delta"
+msgstr "konsistensfejl i delta"
+
msgid "unknown base"
msgstr ""
-msgid "consistency error adding group"
-msgstr "konsistensfejl ved tilføjelse af gruppe"
-
msgid "unterminated string"
msgstr ""
@@ -12583,61 +12993,269 @@
msgid "not a function: %s"
msgstr "ikke en funktion: %s"
-msgid "limit wants two arguments"
-msgstr ""
-
-msgid "limit wants a number"
-msgstr ""
-
+msgid ""
+"``id(string)``\n"
+" Revision non-ambiguously specified by the given hex string prefix."
+msgstr ""
+
+#. i18n: "id" is a keyword
+msgid "id requires one argument"
+msgstr "id kræver et argument"
+
+#. i18n: "id" is a keyword
+msgid "id requires a string"
+msgstr ""
+
+msgid ""
+"``rev(number)``\n"
+" Revision with the given numeric identifier."
+msgstr ""
+
+#. i18n: "rev" is a keyword
+msgid "rev requires one argument"
+msgstr ""
+
+#. i18n: "rev" is a keyword
+msgid "rev requires a number"
+msgstr ""
+
+#. i18n: "rev" is a keyword
+msgid "rev expects a number"
+msgstr "rev forventer et revisionsnummer"
+
+msgid ""
+"``p1(set)``\n"
+" First parent of changesets in set."
+msgstr ""
+
+msgid ""
+"``p2(set)``\n"
+" Second parent of changesets in set."
+msgstr ""
+
+msgid ""
+"``parents(set)``\n"
+" The set of all parents for all changesets in set."
+msgstr ""
+
+msgid ""
+"``max(set)``\n"
+" Changeset with highest revision number in set."
+msgstr ""
+
+msgid ""
+"``min(set)``\n"
+" Changeset with lowest revision number in set."
+msgstr ""
+
+msgid ""
+"``limit(set, n)``\n"
+" First n members of set."
+msgstr ""
+
+#. i18n: "limit" is a keyword
+msgid "limit requires two arguments"
+msgstr "limit kræver to argumenter"
+
+#. i18n: "limit" is a keyword
+msgid "limit requires a number"
+msgstr "limit kræver et tal"
+
+#. i18n: "limit" is a keyword
msgid "limit expects a number"
msgstr ""
-msgid "ancestor wants two arguments"
-msgstr ""
-
+msgid ""
+"``children(set)``\n"
+" Child changesets of changesets in set."
+msgstr ""
+
+msgid ""
+"``branch(set)``\n"
+" All changesets belonging to the branches of changesets in set."
+msgstr ""
+
+msgid ""
+"``ancestor(single, single)``\n"
+" Greatest common ancestor of the two changesets."
+msgstr ""
+
+#. i18n: "ancestor" is a keyword
+msgid "ancestor requires two arguments"
+msgstr ""
+
+#. i18n: "ancestor" is a keyword
msgid "ancestor arguments must be single revisions"
msgstr ""
+msgid ""
+"``ancestors(set)``\n"
+" Changesets that are ancestors of a changeset in set."
+msgstr ""
+
+msgid ""
+"``descendants(set)``\n"
+" Changesets which are descendants of changesets in set."
+msgstr ""
+
+msgid ""
+"``follow()``\n"
+" An alias for ``::.`` (ancestors of the working copy's first parent)."
+msgstr ""
+
+#. i18n: "follow" is a keyword
msgid "follow takes no arguments"
msgstr ""
-msgid "date wants a string"
-msgstr ""
-
-msgid "keyword wants a string"
-msgstr ""
-
-msgid "grep wants a string"
-msgstr ""
-
-msgid "author wants a string"
-msgstr ""
-
-msgid "file wants a pattern"
-msgstr ""
-
-msgid "contains wants a pattern"
-msgstr ""
-
-msgid "modifies wants a pattern"
-msgstr ""
-
-msgid "adds wants a pattern"
-msgstr ""
-
-msgid "removes wants a pattern"
-msgstr ""
-
+msgid ""
+"``date(interval)``\n"
+" Changesets within the interval, see :hg:`help dates`."
+msgstr ""
+
+#. i18n: "date" is a keyword
+msgid "date requires a string"
+msgstr ""
+
+msgid ""
+"``keyword(string)``\n"
+" Search commit message, user name, and names of changed files for\n"
+" string."
+msgstr ""
+
+#. i18n: "keyword" is a keyword
+msgid "keyword requires a string"
+msgstr ""
+
+msgid ""
+"``grep(regex)``\n"
+" Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``\n"
+" to ensure special escape characters are handled correctly."
+msgstr ""
+
+#. i18n: "grep" is a keyword
+msgid "grep requires a string"
+msgstr ""
+
+#, python-format
+msgid "invalid match pattern: %s"
+msgstr "ugyldigt søgemønster: %s"
+
+msgid ""
+"``author(string)``\n"
+" Alias for ``user(string)``."
+msgstr ""
+
+#. i18n: "author" is a keyword
+msgid "author requires a string"
+msgstr ""
+
+msgid ""
+"``user(string)``\n"
+" User name is string."
+msgstr ""
+
+msgid ""
+"``file(pattern)``\n"
+" Changesets affecting files matched by pattern."
+msgstr ""
+
+#. i18n: "file" is a keyword
+msgid "file requires a pattern"
+msgstr ""
+
+msgid ""
+"``contains(pattern)``\n"
+" Revision contains pattern."
+msgstr ""
+
+#. i18n: "contains" is a keyword
+msgid "contains requires a pattern"
+msgstr ""
+
+msgid ""
+"``modifies(pattern)``\n"
+" Changesets modifying files matched by pattern."
+msgstr ""
+
+#. i18n: "modifies" is a keyword
+msgid "modifies requires a pattern"
+msgstr ""
+
+msgid ""
+"``adds(pattern)``\n"
+" Changesets that add a file matching pattern."
+msgstr ""
+
+#. i18n: "adds" is a keyword
+msgid "adds requires a pattern"
+msgstr ""
+
+msgid ""
+"``removes(pattern)``\n"
+" Changesets which remove files matching pattern."
+msgstr ""
+
+#. i18n: "removes" is a keyword
+msgid "removes requires a pattern"
+msgstr ""
+
+msgid ""
+"``merge()``\n"
+" Changeset is a merge changeset."
+msgstr ""
+
+#. i18n: "merge" is a keyword
msgid "merge takes no arguments"
msgstr ""
+msgid ""
+"``closed()``\n"
+" Changeset is closed."
+msgstr ""
+
+#. i18n: "closed" is a keyword
msgid "closed takes no arguments"
msgstr ""
+msgid ""
+"``head()``\n"
+" Changeset is a named branch head."
+msgstr ""
+
+#. i18n: "head" is a keyword
msgid "head takes no arguments"
msgstr ""
-msgid "sort wants one or two arguments"
+msgid ""
+"``reverse(set)``\n"
+" Reverse order of set."
+msgstr ""
+
+msgid ""
+"``present(set)``\n"
+" An empty set, if any revision in set isn't found; otherwise,\n"
+" all revisions in set."
+msgstr ""
+
+msgid ""
+"``sort(set[, [-]key...])``\n"
+" Sort set by keys. The default sort order is ascending, specify a key\n"
+" as ``-key`` to sort in descending order."
+msgstr ""
+
+msgid " The keys can be:"
+msgstr ""
+
+msgid ""
+" - ``rev`` for the revision number,\n"
+" - ``branch`` for the branch name,\n"
+" - ``desc`` for the commit message (description),\n"
+" - ``user`` for user name (``author`` can be used as an alias),\n"
+" - ``date`` for the commit date"
+msgstr ""
+
+#. i18n: "sort" is a keyword
+msgid "sort requires one or two arguments"
msgstr ""
msgid "sort spec must be a string"
@@ -12647,13 +13265,46 @@
msgid "unknown sort key %r"
msgstr "ukendt sorteringsnøgle %r"
+msgid ""
+"``all()``\n"
+" All changesets, the same as ``0:tip``."
+msgstr ""
+
+#. i18n: "all" is a keyword
msgid "all takes no arguments"
msgstr ""
-msgid "outgoing wants a repository path"
-msgstr ""
-
-msgid "tagged takes no arguments"
+msgid ""
+"``heads(set)``\n"
+" Members of set with no children in set."
+msgstr ""
+
+msgid ""
+"``roots(set)``\n"
+" Changesets with no parent changeset in set."
+msgstr ""
+
+msgid ""
+"``outgoing([path])``\n"
+" Changesets not found in the specified destination repository, or the\n"
+" default push location."
+msgstr ""
+
+#. i18n: "outgoing" is a keyword
+msgid "outgoing requires a repository path"
+msgstr ""
+
+msgid ""
+"``tag(name)``\n"
+" The specified tag by name, or all tagged revisions if no name is given."
+msgstr ""
+
+#. i18n: "tag" is a keyword
+msgid "tag takes one or no arguments"
+msgstr ""
+
+#. i18n: "tag" is a keyword
+msgid "the argument to tag must be a string"
msgstr ""
msgid "can't negate that"
@@ -12748,12 +13399,16 @@
msgstr ""
#, python-format
+msgid "default path for subrepository %s not found"
+msgstr ""
+
+#, python-format
msgid "unknown subrepo type %s"
msgstr "ukendt underdepottype %s"
#, python-format
-msgid "warning: %s in %s\n"
-msgstr "advarsel: %s i %s\n"
+msgid "warning: error \"%s\" in subrepository \"%s\"\n"
+msgstr "advarsel: fejl \"%s\" i underdepot \"%s\"\n"
#, python-format
msgid "removing subrepo %s\n"
@@ -12785,6 +13440,9 @@
msgid "node '%s' is not well formed"
msgstr "knude '%s' er ikke korrekt formet"
+msgid ".hg/tags.cache is corrupt, rebuilding it\n"
+msgstr ""
+
msgid "unmatched quotes"
msgstr ""
@@ -12829,6 +13487,10 @@
msgstr "Ignoreret: %s\n"
#, python-format
+msgid "(deprecated '%%' in path %s=%s from %s)\n"
+msgstr ""
+
+#, python-format
msgid "ignoring untrusted configuration option %s.%s = %s\n"
msgstr ""
@@ -12850,10 +13512,6 @@
msgid "username %s contains a newline\n"
msgstr "brugernavn %s indeholder et linieskift\n"
-#, python-format
-msgid "(deprecated '%%' in path %s=%s from %s)\n"
-msgstr ""
-
msgid "response expected"
msgstr "svar forventet"
@@ -12894,7 +13552,18 @@
msgid "certificate checking requires Python 2.6"
msgstr ""
-msgid "server identity verification succeeded\n"
+msgid "no certificate received"
+msgstr "modtog ikke noget certifikat"
+
+#, python-format
+msgid "certificate is for %s"
+msgstr "certifikatet er for %s"
+
+msgid "no commonName found in certificate"
+msgstr ""
+
+#, python-format
+msgid "%s certificate error: %s"
msgstr ""
#, python-format
@@ -13044,6 +13713,9 @@
msgid "checking changesets\n"
msgstr "kontrollerer ændringer\n"
+msgid "checking"
+msgstr "kontrollerer"
+
#, python-format
msgid "unpacking changeset %s"
msgstr "udpakker ændring %s"
@@ -13085,9 +13757,6 @@
msgid "cannot decode filename '%s'"
msgstr "kan ikke dekode filnavn '%s'"
-msgid "checking"
-msgstr "kontrollerer"
-
#, python-format
msgid "broken revlog! (%s)"
msgstr "beskadiget revlog! (%s)"
--- a/i18n/hggettext Wed Oct 20 23:48:33 2010 +0200
+++ b/i18n/hggettext Tue Nov 02 09:47:47 2010 +0100
@@ -97,19 +97,25 @@
lineno = 1 + offset(src, mod.__doc__, path, 7)
print poentry(path, lineno, mod.__doc__)
+ functions = list(getattr(mod, 'i18nfunctions', []))
+ functions = [(f, True) for f in functions]
+
cmdtable = getattr(mod, 'cmdtable', {})
if not cmdtable:
# Maybe we are processing mercurial.commands?
cmdtable = getattr(mod, 'table', {})
+ functions.extend((c[0], False) for c in cmdtable.itervalues())
- for entry in cmdtable.itervalues():
- func = entry[0]
+ for func, rstrip in functions:
if func.__doc__:
src = inspect.getsource(func)
name = "%s.%s" % (path, func.__name__)
lineno = func.func_code.co_firstlineno
- lineno += offset(src, func.__doc__, name, 1)
- print poentry(path, lineno, func.__doc__)
+ doc = func.__doc__
+ if rstrip:
+ doc = doc.rstrip()
+ lineno += offset(src, doc, name, 1)
+ print poentry(path, lineno, doc)
def rawtext(path):
--- a/i18n/ja.po Wed Oct 20 23:48:33 2010 +0200
+++ b/i18n/ja.po Tue Nov 02 09:47:47 2010 +0100
@@ -99,7 +99,7 @@
msgstr ""
"Project-Id-Version: Mercurial\n"
"Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2010-10-01 16:57+0900\n"
+"POT-Creation-Date: 2010-10-28 23:52+0900\n"
"PO-Revision-Date: 2009-11-16 21:24+0100\n"
"Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n"
"Language-Team: Japanese\n"
@@ -119,8 +119,19 @@
msgid "Commands"
msgstr "コマンド"
-msgid " options:"
-msgstr " オプション:"
+msgid "Extensions"
+msgstr "エクステンション"
+
+msgid ""
+"This section contains help for extensions that are distributed together with "
+"Mercurial. Help for other extensions is available in the help system."
+msgstr ""
+"ã“ã“ã§ã¯ã€ Mercurial ã«åŒæ¢±ã•ã‚Œã‚‹ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ã«ã¤ã„ã¦èª¬æ˜Žã—ã¾ã™ã€‚ ãれ以"
+"外ã®ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ã«é–¢ã—ã¦ã¯ã€ å„コマンドã®ã‚ªãƒ³ãƒ©ã‚¤ãƒ³ãƒ˜ãƒ«ãƒ—ã‚’å‚ç…§ã—ã¦ãã ã•"
+"ã„。"
+
+msgid "options:"
+msgstr "オプション:"
#, python-format
msgid " aliases: %s"
@@ -134,8 +145,8 @@
"branches and paths of a repository when receiving incoming changesets\n"
"via pretxnchangegroup and pretxncommit."
msgstr ""
-"アクセス制御用フックを使用ã™ã‚‹ã“ã¨ã§ã€pretxnchangegroup ã‚„ pretxncommit\n"
-"契機ã§æ›´æ–°åæ˜ ã‚’å—ç†ã—ãŸéš›ã«ã€æŒ‡å®šã•ã‚ŒãŸãƒ–ランãƒã‚„パスã«å¯¾ã—ã¦ã€\n"
+"アクセス制御用フックを使用ã™ã‚‹ã“ã¨ã§ã€ pretxnchangegroup ã‚„ pretxncommit\n"
+"契機ã§æ›´æ–°åæ˜ ã‚’å—ç†ã—ãŸéš›ã«ã€ 指定ã•ã‚ŒãŸãƒ–ランãƒã‚„パスã«å¯¾ã—ã¦ã€ \n"
"書ãè¾¼ã¿ã®å¯å¦ã‚’制御ã§ãã¾ã™ã€‚"
msgid ""
@@ -168,7 +179,7 @@
msgid ""
"Branch-based Access Control\n"
-"---------------------------"
+"..........................."
msgstr ""
msgid ""
@@ -192,7 +203,7 @@
msgid ""
"Path-based Access Control\n"
-"-------------------------"
+"........................."
msgstr ""
msgid ""
@@ -204,7 +215,7 @@
msgid ""
"Groups\n"
-"------"
+"......"
msgstr ""
msgid ""
@@ -221,7 +232,7 @@
msgid ""
"Example Configuration\n"
-"---------------------"
+"....................."
msgstr ""
msgid "::"
@@ -409,7 +420,13 @@
" You can use :hg:`bookmark NAME` to set a bookmark on the working\n"
" directory's parent revision with the given name. If you specify\n"
" a revision using -r REV (where REV may be an existing bookmark),\n"
-" the bookmark is assigned to that revision.\n"
+" the bookmark is assigned to that revision."
+msgstr ""
+
+msgid ""
+" Bookmarks can be pushed and pulled between repositories (see :hg:`help\n"
+" push` and :hg:`help pull`). This requires the bookmark extension to be\n"
+" enabled for both the local and remote repositories.\n"
" "
msgstr ""
@@ -469,11 +486,11 @@
msgid "bookmark %s does not exist on the local or remote repository!\n"
msgstr ""
-msgid "searching for changes\n"
-msgstr "変更点を探索ä¸\n"
-
-msgid "no changes found\n"
-msgstr "差分ã¯ã‚ã‚Šã¾ã›ã‚“\n"
+msgid "searching for changed bookmarks\n"
+msgstr "変更ã•ã‚ŒãŸãƒ–ックマークを探索ä¸\n"
+
+msgid "no changed bookmarks found\n"
+msgstr "変更ã•ã‚ŒãŸãƒ–ックマークã¯ã‚ã‚Šã¾ã›ã‚“\n"
#, python-format
msgid "comparing with %s\n"
@@ -482,12 +499,28 @@
msgid "bookmark to import"
msgstr "ブックマークã®å–ã‚Šè¾¼ã¿"
+msgid "BOOKMARK"
+msgstr ""
+
msgid "bookmark to export"
msgstr "ブックマークã®åæ˜ "
msgid "compare bookmark"
msgstr "ブックマークã®æ¯”較"
+msgid ""
+"``bookmark([name])``\n"
+" The named bookmark or all bookmarks."
+msgstr ""
+
+#. i18n: "bookmark" is a keyword
+msgid "bookmark takes one or no arguments"
+msgstr "bookmark 指定ã«ã¯1個ãªã„ã—2個ã®å¼•æ•°ãŒå¿…è¦ã§ã™"
+
+#. i18n: "bookmark" is a keyword
+msgid "the argument to bookmark must be a string"
+msgstr ""
+
msgid "force"
msgstr "強制実施"
@@ -765,7 +798,7 @@
"details:\n"
"\t{desc|tabindent}"
msgstr ""
-"リãƒã‚¸ãƒˆãƒª {root} ã®ãƒªãƒ“ジョン {node|short} ãŒãƒã‚° {bug} ã«é–¢é€£ã€‚\n"
+"リãƒã‚¸ãƒˆãƒª {root} ã®ãƒªãƒ“ジョン {node|short} ãŒãƒã‚° {bug} ã«é–¢é€£ã€‚ \n"
"詳細:\n"
"\t{desc|tabindent}"
@@ -795,9 +828,9 @@
" argument to --rev if given) is printed.\n"
" "
msgstr ""
-" 作æ¥é ˜åŸŸã®åリビジョンを表示ã—ã¾ã™ã€‚-r/--rev ã«ã‚ˆã‚‹ãƒªãƒ“ジョン指定ãŒ\n"
-" ã‚ã‚‹å ´åˆã¯ã€æŒ‡å®šãƒªãƒ“ジョンã®åリビジョンを表示ã—ã¾ã™ã€‚引数ã¨ã—ã¦\n"
-" ファイルãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ãƒ•ã‚¡ã‚¤ãƒ«ãŒ(作æ¥é ˜åŸŸã®ãƒªãƒ“ジョンãªã„ã—\n"
+" 作æ¥é ˜åŸŸã®åリビジョンを表示ã—ã¾ã™ã€‚ -r/--rev ã«ã‚ˆã‚‹ãƒªãƒ“ジョン指定ãŒ\n"
+" ã‚ã‚‹å ´åˆã¯ã€ 指定リビジョンã®åリビジョンを表示ã—ã¾ã™ã€‚ 引数ã¨ã—ã¦\n"
+" ファイルãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ ファイルãŒ(作æ¥é ˜åŸŸã®ãƒªãƒ“ジョンãªã„ã—\n"
" --rev ã§æŒ‡å®šã•ã‚ŒãŸãƒªãƒ“ジョンã®å¾Œã§)最後ã«å¤‰æ›´ã•ã‚ŒãŸãƒªãƒ“ジョンを表示\n"
" ã—ã¾ã™ã€‚\n"
" "
@@ -828,19 +861,19 @@
" The --dateformat option may be used to group the results by\n"
" date instead."
msgstr ""
-" 本コマンドã¯ã€å¤‰æ›´è¡Œæ•°ãªã„ã—リビジョン数ã®åº¦æ•°åˆ†å¸ƒã‚’ã€ãƒ†ãƒ³ãƒ—レート\n"
-" 指定ã«ã‚ˆã£ã¦ã‚°ãƒ«ãƒ¼ãƒ—化ã—ã¦ã‚°ãƒ©ãƒ•è¡¨ç¤ºã—ã¾ã™ã€‚\n"
-" 特ã«æŒ‡å®šã®ç„¡ã„å ´åˆã€ãƒªãƒ“ジョン作æˆè€…毎ã«å¤‰æ›´è¡Œæ•°ã‚’グループ化ã—ã¾ã™ã€‚\n"
-" --dateformat ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€åº¦æ•°åˆ†å¸ƒã¯æ—¥æ™‚ã§ã‚°ãƒ«ãƒ¼ãƒ—化ã•ã‚Œã¾ã™ã€‚"
+" 本コマンドã¯ã€ 変更行数ãªã„ã—リビジョン数ã®åº¦æ•°åˆ†å¸ƒã‚’〠テンプレート\n"
+" 指定ã«ã‚ˆã£ã¦ã‚°ãƒ«ãƒ¼ãƒ—化ã—ã¦ã‚°ãƒ©ãƒ•è¡¨ç¤ºã—ã¾ã™ã€‚ \n"
+" 特ã«æŒ‡å®šã®ç„¡ã„å ´åˆã€ リビジョン作æˆè€…毎ã«å¤‰æ›´è¡Œæ•°ã‚’グループ化ã—ã¾ã™ã€‚ \n"
+" --dateformat ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 度数分布ã¯æ—¥æ™‚ã§ã‚°ãƒ«ãƒ¼ãƒ—化ã•ã‚Œã¾ã™ã€‚ "
msgid ""
" Statistics are based on the number of changed lines, or\n"
" alternatively the number of matching revisions if the\n"
" --changesets option is specified."
msgstr ""
-" 特ã«æŒ‡å®šã®ç„¡ã„å ´åˆã€åº¦æ•°åˆ†å¸ƒã®çµ±è¨ˆå¯¾è±¡ã¯å¤‰æ›´è¡Œæ•°ã¨ãªã‚Šã¾ã™ãŒã€\n"
-" --changesets ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã¯ã€å¯¾è±¡ãƒªãƒ“ジョンã®æ•°ãŒçµ±è¨ˆå¯¾è±¡ã¨\n"
-" ãªã‚Šã¾ã™ã€‚"
+" 特ã«æŒ‡å®šã®ç„¡ã„å ´åˆã€ 度数分布ã®çµ±è¨ˆå¯¾è±¡ã¯å¤‰æ›´è¡Œæ•°ã¨ãªã‚Šã¾ã™ãŒã€ \n"
+" --changesets ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã¯ã€ 対象リビジョンã®æ•°ãŒçµ±è¨ˆå¯¾è±¡ã¨\n"
+" ãªã‚Šã¾ã™ã€‚ "
msgid " Examples::"
msgstr " 例::"
@@ -877,7 +910,7 @@
" It is possible to map alternate email addresses to a main address\n"
" by providing a file using the following format::"
msgstr ""
-" 以下ã®å½¢å¼ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’指定ã™ã‚‹ã“ã¨ã§ã€ãƒªãƒ“ジョンã«è¨˜éŒ²ã•ã‚ŒãŸé›»å\n"
+" 以下ã®å½¢å¼ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’指定ã™ã‚‹ã“ã¨ã§ã€ リビジョンã«è¨˜éŒ²ã•ã‚ŒãŸé›»å\n"
" メールアドレスを別ã®ã‚‚ã®ã«å¤‰æ›ã™ã‚‹ã“ã¨ãŒå¯èƒ½ã§ã™::"
msgid " <alias email> = <actual email>"
@@ -888,8 +921,8 @@
" a .hgchurn file will be looked for in the working directory root.\n"
" "
msgstr ""
-" 上記形å¼ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€--aliases ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã¯æŒ‡å®šã•ã‚ŒãŸ\n"
-" ファイルãŒèªã¿è¾¼ã¾ã‚Œã¾ã™ãŒã€ç‰¹ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€ãƒªãƒã‚¸ãƒˆãƒªã®ãƒ«ãƒ¼ãƒˆ\n"
+" 上記形å¼ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€ --aliases ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã¯æŒ‡å®šã•ã‚ŒãŸ\n"
+" ファイルãŒèªã¿è¾¼ã¾ã‚Œã¾ã™ãŒã€ 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€ リãƒã‚¸ãƒˆãƒªã®ãƒ«ãƒ¼ãƒˆ\n"
" 直下ã«ã‚ã‚‹ .hgchurn ã¨ã„ã†ãƒ•ã‚¡ã‚¤ãƒ«ã‚’èªã¿è¾¼ã‚‚ã†ã¨ã—ã¾ã™ã€‚\n"
" "
@@ -928,7 +961,7 @@
msgstr "è¿½åŠ ï¼å‰Šé™¤è¡Œè¡¨ç¤ºã®åˆ†é›¢"
msgid "FILE"
-msgstr "FILE"
+msgstr "ファイル"
msgid "file with email aliases"
msgstr "ユーザå変æ›ç”¨ãƒ•ã‚¡ã‚¤ãƒ«"
@@ -1001,6 +1034,13 @@
msgstr ""
msgid ""
+" branches.active = none\n"
+" branches.closed = black bold\n"
+" branches.current = green\n"
+" branches.inactive = none"
+msgstr ""
+
+msgid ""
"The color extension will try to detect whether to use ANSI codes or\n"
"Win32 console APIs, unless it is made explicit::"
msgstr ""
@@ -1020,8 +1060,11 @@
msgid "win32console not found, please install pywin32\n"
msgstr ""
-msgid "when to colorize (always, auto, or never)"
-msgstr "色ã¥ã‘実施種別。always(常時), auto(自動)ãªã„ã— never(ç¦æ¢)"
+#. i18n: 'always', 'auto', and 'never' are keywords and should
+#. not be translated
+msgid "when to colorize (boolean, always, auto, or never)"
+msgstr ""
+"カラー表示種別。 true/always(常時), auto(自動) ãªã„ã— false/never(ç¦æ¢)"
msgid "TYPE"
msgstr "種別"
@@ -1108,10 +1151,10 @@
msgstr ""
msgid ""
-" The username mapping file is a simple text file that maps each\n"
-" source commit author to a destination commit author. It is handy\n"
-" for source SCMs that use unix logins to identify authors (eg:\n"
-" CVS). One line per author mapping and the line format is::"
+" The authormap is a simple text file that maps each source commit\n"
+" author to a destination commit author. It is handy for source SCMs\n"
+" that use unix logins to identify authors (eg: CVS). One line per\n"
+" author mapping and the line format is::"
msgstr ""
msgid " source author = destination author"
@@ -1136,7 +1179,7 @@
msgstr ""
msgid ""
-" Comment lines start with ``#``. A specificed path matches if it\n"
+" Comment lines start with ``#``. A specified path matches if it\n"
" equals the full relative name of a file or one of its parent\n"
" directories. The ``include`` or ``exclude`` directive with the\n"
" longest matching path applies, so line order does not matter."
@@ -1148,8 +1191,8 @@
" exclusion of all other files and directories not explicitly\n"
" included. The ``exclude`` directive causes files or directories to\n"
" be omitted. The ``rename`` directive renames a file or directory if\n"
-" is converted. To rename from a subdirectory into the root of the\n"
-" repository, use ``.`` as the path to rename to."
+" it is converted. To rename from a subdirectory into the root of\n"
+" the repository, use ``.`` as the path to rename to."
msgstr ""
msgid ""
@@ -1197,7 +1240,7 @@
msgid ""
" Mercurial Source\n"
-" ----------------"
+" ''''''''''''''''"
msgstr ""
msgid ""
@@ -1214,7 +1257,7 @@
msgid ""
" CVS Source\n"
-" ----------"
+" ''''''''''"
msgstr ""
msgid ""
@@ -1271,7 +1314,7 @@
msgid ""
" Subversion Source\n"
-" -----------------"
+" '''''''''''''''''"
msgstr ""
msgid ""
@@ -1309,7 +1352,7 @@
msgid ""
" Perforce Source\n"
-" ---------------"
+" '''''''''''''''"
msgstr ""
msgid ""
@@ -1333,7 +1376,7 @@
msgid ""
" Mercurial Destination\n"
-" ---------------------"
+" '''''''''''''''''''''"
msgstr ""
msgid ""
@@ -1356,8 +1399,8 @@
" Mercurial converter, and can be used as a direct replacement for\n"
" cvsps."
msgstr ""
-" 本コマンドã®ä½ç½®ä»˜ã‘ã¯ã€CVS ã‹ã‚‰ Mercurial ã¸ã®å¤‰æ›ã«ãŠã‘るデãƒãƒƒã‚°\n"
-" ツールã§ã‚ã‚Šã€cvsps ã®ä»£æ›¿ãƒ„ールã¨ã—ã¦ä½¿ç”¨å¯èƒ½ã§ã™ã€‚"
+" 本コマンドã®ä½ç½®ä»˜ã‘ã¯ã€ CVS ã‹ã‚‰ Mercurial ã¸ã®å¤‰æ›ã«ãŠã‘るデãƒãƒƒã‚°\n"
+" ツールã§ã‚り〠cvsps ã®ä»£æ›¿ãƒ„ールã¨ã—ã¦ä½¿ç”¨å¯èƒ½ã§ã™ã€‚"
msgid ""
" Hg debugcvsps reads the CVS rlog for current directory (or any\n"
@@ -1365,25 +1408,28 @@
" series of changesets based on matching commit log entries and\n"
" dates."
msgstr ""
-" 本コマンドã¯ã€ç¾ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª(ãªã„ã—指定ディレクトリ)ä¸ã® CVS rlog ã‚’\n"
-" èªã¿è¾¼ã¿ã€ã‚³ãƒŸãƒƒãƒˆãƒã‚°ã®å†…容ã¨æ—¥ä»˜ã‚’å…ƒã«æŽ¨æ¸¬ã•ã‚Œã‚‹ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã¸ã¨\n"
+" 本コマンドã¯ã€ ç¾ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª(ãªã„ã—指定ディレクトリ)ä¸ã® CVS rlog ã‚’\n"
+" èªã¿è¾¼ã¿ã€ コミットãƒã‚°ã®å†…容ã¨æ—¥ä»˜ã‚’å…ƒã«æŽ¨æ¸¬ã•ã‚Œã‚‹ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã¸ã¨\n"
" 変æ›ã—ã¾ã™ã€‚"
-msgid "username mapping filename"
-msgstr "ユーザå対応付ã‘ファイルã®æŒ‡å®š"
+msgid "username mapping filename (DEPRECATED, use --authormap instead)"
+msgstr ""
+
+msgid "source repository type"
+msgstr "変æ›å…ƒãƒªãƒã‚¸ãƒˆãƒªç¨®åˆ¥"
msgid "destination repository type"
msgstr "変æ›å…ˆã®ãƒªãƒã‚¸ãƒˆãƒªç¨®åˆ¥"
+msgid "import up to target revision REV"
+msgstr "指定リビジョンã¾ã§ã®å–ã‚Šè¾¼ã¿"
+
+msgid "remap usernames using this file"
+msgstr "変æ›æ™‚ã®ãƒ¦ãƒ¼ã‚¶å変æ›ç”¨ãƒ•ã‚¡ã‚¤ãƒ«"
+
msgid "remap file names using contents of file"
msgstr "変æ›æ™‚ã®ãƒ•ã‚¡ã‚¤ãƒ«å変æ›ç”¨ãƒ•ã‚¡ã‚¤ãƒ«"
-msgid "import up to target revision REV"
-msgstr "指定リビジョンã¾ã§ã®å–ã‚Šè¾¼ã¿"
-
-msgid "source repository type"
-msgstr "変æ›å…ƒãƒªãƒã‚¸ãƒˆãƒªç¨®åˆ¥"
-
msgid "splice synthesized history into place"
msgstr "å±¥æ´ã®åˆæˆ"
@@ -1484,7 +1530,7 @@
#, python-format
msgid "%s: missing or unsupported repository"
-msgstr "%s: リãƒã‚¸ãƒˆãƒªãŒè¦‹ã¤ã‹ã‚‰ãªã„ã‹ã€ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„å½¢å¼ã§ã™"
+msgstr "%s: リãƒã‚¸ãƒˆãƒªãŒè¦‹ã¤ã‹ã‚‰ãªã„ã‹ã€ サãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„å½¢å¼ã§ã™"
#, python-format
msgid "%s: invalid destination repository type"
@@ -1532,7 +1578,7 @@
#, python-format
msgid "overriding mapping for author %s, was %s, will be %s\n"
-msgstr "作æˆè€… %s ã® %s ã¸ã®å¤‰æ›ã‚’ã€%s ã¸ã®å¤‰æ›ã§ä¸Šæ›¸ãã—ã¾ã™\n"
+msgstr "作æˆè€… %s ã® %s ã¸ã®å¤‰æ›ã‚’〠%s ã¸ã®å¤‰æ›ã§ä¸Šæ›¸ãã—ã¾ã™\n"
#, python-format
msgid "spliced in %s as parents of %s\n"
@@ -1687,10 +1733,18 @@
msgstr "ファイルマップã§ã®è§£æžã‚¨ãƒ©ãƒ¼"
#, python-format
+msgid "%s:%d: path to %s is missing\n"
+msgstr ""
+
+#, python-format
msgid "%s:%d: %r already in %s list\n"
msgstr "%s:%d: %r ã¯æ—¢ã« %s ä¸ã«ã‚ã‚Šã¾ã™\n"
#, python-format
+msgid "%s:%d: superfluous / in %s %r\n"
+msgstr ""
+
+#, python-format
msgid "%s:%d: unknown directive %r\n"
msgstr "%s:%d: %r ã¯æœªçŸ¥ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒ†ã‚£ãƒ–ã§ã™\n"
@@ -1785,13 +1839,13 @@
msgstr "p4 ãƒã‚§ãƒ³ã‚¸ãƒªã‚¹ãƒˆã®åŽé›†ä¸\n"
msgid "Mercurial failed to run itself, check hg executable is in PATH"
-msgstr "Mercurial 自身ã®å®Ÿè¡Œã«å¤±æ•—。PATH è¨å®šã¨ hg コマンドを確èªã—ã¦ãã ã•ã„"
+msgstr "Mercurial 自身ã®å®Ÿè¡Œã«å¤±æ•—。 PATH è¨å®šã¨ hg コマンドを確èªã—ã¦ãã ã•ã„"
msgid ""
"svn: cannot probe remote repository, assume it could be a subversion "
"repository. Use --source-type if you know better.\n"
msgstr ""
-"svn: subversion ã®é 隔リãƒã‚¸ãƒˆãƒªã®ç¢ºèªã«å¤±æ•—ã—ã¾ã—ãŸã€‚--source-type ã®ä½¿ç”¨ã‚’"
+"svn: subversion ã®é 隔リãƒã‚¸ãƒˆãƒªã®ç¢ºèªã«å¤±æ•—ã—ã¾ã—ãŸã€‚ --source-type ã®ä½¿ç”¨ã‚’"
"検討ã—ã¦ãã ã•ã„。\n"
#, python-format
@@ -1953,7 +2007,7 @@
msgid ""
"- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or\n"
-" ``CRLF`` override the default interpretation of ``native`` for\n"
+" ``CRLF`` to override the default interpretation of ``native`` for\n"
" checkout. This can be used with :hg:`archive` on Unix, say, to\n"
" generate an archive where files have line endings for Windows."
msgstr ""
@@ -2104,9 +2158,9 @@
" revisions are specified, the working directory files are compared\n"
" to its parent."
msgstr ""
-" 2ã¤ã®ãƒªãƒ“ジョンãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ãƒªãƒ“ジョン間ã®å·®åˆ†ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚\n"
-" 1ã¤ã®ãƒªãƒ“ジョンãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€æŒ‡å®šãƒªãƒ“ジョンã¨ä½œæ¥é ˜åŸŸé–“ã®å·®åˆ†ãŒ\n"
-" 表示ã•ã‚Œã¾ã™ã€‚何もリビジョンãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€ä½œæ¥é ˜åŸŸã¨ãã®\n"
+" 2ã¤ã®ãƒªãƒ“ジョンãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ リビジョン間ã®å·®åˆ†ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚\n"
+" 1ã¤ã®ãƒªãƒ“ジョンãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 指定リビジョンã¨ä½œæ¥é ˜åŸŸé–“ã®å·®åˆ†ãŒ\n"
+" 表示ã•ã‚Œã¾ã™ã€‚ 何もリビジョンãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€ 作æ¥é ˜åŸŸã¨ãã®\n"
" 親リビジョン間ã®å·®åˆ†ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚"
msgid "CMD"
@@ -2145,7 +2199,7 @@
msgstr "pull, update, merge ã®ä¸€æ‹¬å®Ÿè¡Œ"
msgid "pull changes from a remote repository, merge new changes if needed."
-msgstr "é 隔リãƒã‚¸ãƒˆãƒªã‹ã‚‰ã®å–ã‚Šè¾¼ã¿ã¨ã€å¿…è¦ã«ãŠã†ã˜ãŸãƒžãƒ¼ã‚¸å®Ÿæ–½"
+msgstr "é 隔リãƒã‚¸ãƒˆãƒªã‹ã‚‰ã®å–ã‚Šè¾¼ã¿ã¨ã€ å¿…è¦ã«ãŠã†ã˜ãŸãƒžãƒ¼ã‚¸å®Ÿæ–½"
msgid ""
" This finds all changes from the repository at the specified path\n"
@@ -2166,11 +2220,14 @@
" order, use --switch-parent."
msgstr ""
-msgid ""
-" See :hg:`help dates` for a list of formats valid for -d/--date.\n"
-" "
-msgstr ""
-" -d/--date ã§ã®æ—¥æ™‚表記㯠:he:`help dates` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。\n"
+msgid " See :hg:`help dates` for a list of formats valid for -d/--date."
+msgstr " -d/--date ã§ã®æ—¥æ™‚表記㯠:hg:`help dates` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
+
+msgid ""
+" Returns 0 on success.\n"
+" "
+msgstr ""
+" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0 ã§ã™ã€‚\n"
" "
msgid ""
@@ -2189,7 +2246,7 @@
msgid ""
"multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
msgstr ""
-"ブランãƒã«è¤‡æ•°ã®ãƒ˜ãƒƒãƒ‰ãŒã‚ã‚Šã¾ã™(:hg:`heads .` ã§ç¢ºèªã€:hg:`merge` ã§ãƒžãƒ¼ã‚¸)"
+"ブランãƒã«è¤‡æ•°ã®ãƒ˜ãƒƒãƒ‰ãŒã‚ã‚Šã¾ã™(:hg:`heads .` ã§ç¢ºèªã€ :hg:`merge` ã§ãƒžãƒ¼ã‚¸)"
#, python-format
msgid "pulling from %s\n"
@@ -2198,14 +2255,14 @@
msgid ""
"Other repository doesn't support revision lookup, so a rev cannot be "
"specified."
-msgstr "連æºå…ˆã§ãƒªãƒ“ジョンãŒç‰¹å®šå‡ºæ¥ãªã„ãŸã‚ã€ãƒªãƒ“ジョンã¯æŒ‡å®šã§ãã¾ã›ã‚“"
+msgstr "連æºå…ˆã§ãƒªãƒ“ジョンãŒç‰¹å®šå‡ºæ¥ãªã„ãŸã‚〠リビジョンã¯æŒ‡å®šã§ãã¾ã›ã‚“"
#, python-format
msgid ""
"not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
"\" to merge them)\n"
msgstr ""
-"æ–°è¦ãƒ˜ãƒƒãƒ‰ %d 個ã¯ãƒžãƒ¼ã‚¸æœªå®Ÿæ–½(:hg:`heads .` ã§ç¢ºèªã€:hg:`merge` ã§ãƒžãƒ¼ã‚¸)\n"
+"æ–°è¦ãƒ˜ãƒƒãƒ‰ %d 個ã¯ãƒžãƒ¼ã‚¸æœªå®Ÿæ–½(:hg:`heads .` ã§ç¢ºèªã€ :hg:`merge` ã§ãƒžãƒ¼ã‚¸)\n"
#, python-format
msgid "updating to %d:%s\n"
@@ -2274,6 +2331,13 @@
" or tip if no revision is checked out."
msgstr ""
+msgid ""
+" See :hg:`help dates` for a list of formats valid for -d/--date.\n"
+" "
+msgstr ""
+" -d/--date ã§ã®æ—¥æ™‚表記㯠:he:`help dates` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。\n"
+" "
+
msgid "uncommitted merge - please provide a specific revision"
msgstr "マージãŒæœªã‚³ãƒŸãƒƒãƒˆã§ã™ - 対象リビジョンを指定ã—ã¦ãã ã•ã„"
@@ -2331,8 +2395,8 @@
"commands. When this options is given, an ASCII representation of the\n"
"revision graph is also shown.\n"
msgstr ""
-"本エクステンションã¯ã€incoming, outgoing ãŠã‚ˆã³ log コマンド㫠--graph\n"
-"オプションを付与ã—ã¾ã™ã€‚ã“ã®ã‚ªãƒ—ションãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ASCII æ–‡å—ã«ã‚ˆã‚‹\n"
+"本エクステンションã¯ã€ incoming, outgoing ãŠã‚ˆã³ log コマンド㫠--graph\n"
+"オプションを付与ã—ã¾ã™ã€‚ ã“ã®ã‚ªãƒ—ションãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ ASCII æ–‡å—ã«ã‚ˆã‚‹\n"
"リビジョングラフãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚\n"
#, python-format
@@ -2345,14 +2409,15 @@
msgid ""
" Print a revision history alongside a revision graph drawn with\n"
" ASCII characters."
-msgstr " ASCII æ–‡å—ã«ã‚ˆã‚‹ãƒªãƒ“ジョングラフ表示を伴ã£ãŸå¤‰æ›´å±¥æ´ã‚’表示ã—ã¾ã™ã€‚"
+msgstr ""
+" ASCII æ–‡å—ã«ã‚ˆã‚‹ãƒªãƒ“ジョングラフ表示を伴ã£ãŸå¤‰æ›´å±¥æ´ã‚’表示ã—ã¾ã™ã€‚"
msgid ""
" Nodes printed as an @ character are parents of the working\n"
" directory.\n"
" "
msgstr ""
-" @ æ–‡å—ã§è¡¨ç¤ºã•ã‚Œã‚‹ãƒªãƒ“ジョンã¯ã€ä½œæ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã§ã™ã€‚\n"
+" @ æ–‡å—ã§è¡¨ç¤ºã•ã‚Œã‚‹ãƒªãƒ“ジョンã¯ã€ 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã§ã™ã€‚\n"
" "
msgid "show the revision DAG"
@@ -2368,7 +2433,7 @@
msgstr "パッãƒå½¢å¼ã§ã®è¡¨ç¤º"
msgid "show the specified revision or range"
-msgstr "指定ã•ã‚ŒãŸå˜ä¸€ã€ãªã„ã—リビジョン区間ã®è¡¨ç¤º"
+msgstr "指定ã•ã‚ŒãŸå˜ä¸€ã€ ãªã„ã—リビジョン区間ã®è¡¨ç¤º"
msgid "hg glog [OPTION]... [FILE]"
msgstr "hg glog [OPTION]... [FILE]"
@@ -2629,7 +2694,7 @@
#, python-format
msgid "(inotify: received '%s' response when expecting '%s')\n"
-msgstr "(inotify: 想定外㮠'%s' å¿œç”ã‚’å—ç†ã€‚想定応ç”㯠'%s')\n"
+msgstr "(inotify: 想定外㮠'%s' å¿œç”ã‚’å—ç†ã€‚ 想定応ç”㯠'%s')\n"
msgid "this system does not seem to support inotify"
msgstr "ã“ã®ã‚·ã‚¹ãƒ†ãƒ ã§ã¯ inotify ã¯åˆ©ç”¨ã§ããªã„よã†ã«è¦‹ãˆã¾ã™"
@@ -2743,7 +2808,7 @@
"will be automatically expanded into links or any other arbitrary\n"
"expression, much like InterWiki does."
msgstr ""
-"本エクステンションã¯ã€ãƒªãƒ³ã‚¯ãªã‚Šä»»æ„ã®å¼ã®å½¢å¼ã¸ã¨è‡ªå‹•çš„ã«å¤‰æ›ã•ã‚Œã‚‹\n"
+"本エクステンションã¯ã€ リンクãªã‚Šä»»æ„ã®å¼ã®å½¢å¼ã¸ã¨è‡ªå‹•çš„ã«å¤‰æ›ã•ã‚Œã‚‹\n"
"InterWiki ã®ã‚ˆã†ãªç‰¹åˆ¥ãªæ›¸å¼ã‚’用ã„ãŸã‚³ãƒŸãƒƒãƒˆãƒã‚°ã®è¨˜è¿°ã‚’å¯èƒ½ã«ã—ã¾ã™ã€‚"
msgid ""
@@ -2781,27 +2846,30 @@
"This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
"tracked text files selected by your configuration."
msgstr ""
-"本エクステンションã¯ã€æ§‹æˆç®¡ç†å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ä¸ã® RCS/CVS çš„(カスタマイズ\n"
-"å¯èƒ½)㪠$Keywords$ ã‚’ã€è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã§ã®è¨˜è¿°ã«å¾“ã„展開ã—ã¾ã™ã€‚"
+"本エクステンションã¯ã€ 構æˆç®¡ç†å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ä¸ã® RCS/CVS çš„\n"
+"(カスタマイズå¯èƒ½)㪠$Keywords$ を〠è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã§ã®è¨˜è¿°ã«å¾“ã„\n"
+"展開ã—ã¾ã™ã€‚"
msgid ""
"Keywords are only expanded in local repositories and not stored in the\n"
"change history. The mechanism can be regarded as a convenience for the\n"
"current user or for archive distribution."
msgstr ""
-"ã‚ーワード展開ã¯ä½œæ¥é ˜åŸŸã§ã®ã¿è¡Œã‚ã‚Œã€å±¥æ´ã«ã¯æ®‹ã‚Šã¾ã›ã‚“。ã“ã®ä»•çµ„ã¿ã¯\n"
-"ç¾è¡Œãƒ¦ãƒ¼ã‚¶ã‚„アーカイブé…布者ã«é…æ…®ã—ã¦ã„ã¾ã™ã€‚"
+"ã‚ーワード展開ã¯ä½œæ¥é ˜åŸŸã§ã®ã¿è¡Œã‚れ〠履æ´ã«ã¯æ®‹ã‚Šã¾ã›ã‚“。\n"
+"ã“ã®ä»•çµ„ã¿ã¯ç¾è¡Œãƒ¦ãƒ¼ã‚¶ã‚„アーカイブé…布者ã«é…æ…®ã—ã¦ã„ã¾ã™ã€‚"
msgid ""
"Keywords expand to the changeset data pertaining to the latest change\n"
"relative to the working directory parent of each file."
msgstr ""
+"作æ¥é ˜åŸŸã®å„ファイルã«å¯¾ã™ã‚‹ç›´è¿‘ã®æ›´æ–°å†…容を使用ã—ã¦ã€ \n"
+"ã‚ーワードã®å±•é–‹ãŒè¡Œã‚ã‚Œã¾ã™"
msgid ""
"Configuration is done in the [keyword], [keywordset] and [keywordmaps]\n"
"sections of hgrc files."
msgstr ""
-"è¨å®šã¯ã€è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ä¸ã® [keyword] [keywordset] ãŠã‚ˆã³ [keywordmaps]\n"
+"è¨å®šã¯ã€ è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ä¸ã® [keyword] [keywordset] ãŠã‚ˆã³ [keywordmaps]\n"
"セクションã«è¨˜è¿°ã—ã¾ã™ã€‚"
msgid "Example::"
@@ -2823,21 +2891,26 @@
" # prefer svn- over cvs-like default keywordmaps\n"
" svn = True"
msgstr ""
-
-msgid ""
-"NOTE: the more specific you are in your filename patterns the less you\n"
-"lose speed in huge repositories."
-msgstr ""
-"備考: ファイルåパターンãŒæ›´ã«ç‰¹æ®Šã«ãªã‚‹å ´åˆã€\n"
-"リãƒã‚¸ãƒˆãƒªã‚µã‚¤ã‚ºæ¬¡ç¬¬ã§ã¯æ€§èƒ½åŠ£åŒ–ãŒç”Ÿã˜å¾—ã¾ã™ã€‚"
+" [keywordset]\n"
+" # CVS çš„ãªã‚ーワード展開よりも SVN çš„ãªã‚‚ã®ã‚’é¸æŠž\n"
+" svn = True"
+
+msgid ""
+".. note::\n"
+" The more specific you are in your filename patterns the less you\n"
+" lose speed in huge repositories."
+msgstr ""
+".. note::\n"
+" ファイルåパターンãŒæ›´ã«ç‰¹æ®Šã«ãªã‚‹å ´åˆã€ \n"
+" リãƒã‚¸ãƒˆãƒªã‚µã‚¤ã‚ºæ¬¡ç¬¬ã§ã¯æ€§èƒ½åŠ£åŒ–ãŒç”Ÿã˜å¾—ã¾ã™ã€‚"
msgid ""
"For [keywordmaps] template mapping and expansion demonstration and\n"
"control run :hg:`kwdemo`. See :hg:`help templates` for a list of\n"
"available templates and filters."
msgstr ""
-"[keywordmaps] ã§ã®ãƒ†ãƒ³ãƒ—レートè¨å®šã®å±•é–‹ã‚’実演ã™ã‚‹ã«ã¯ã€:hg:`kwdemo`\n"
-"を実行ã—ã¾ã™ã€‚使用å¯èƒ½ãªãƒ†ãƒ³ãƒ—レートやフィルタã«é–¢ã—ã¦ã¯\n"
+"[keywordmaps] ã§ã®ãƒ†ãƒ³ãƒ—レートè¨å®šã®å±•é–‹ã‚’実演ã™ã‚‹ã«ã¯ã€ :hg:`kwdemo`\n"
+"を実行ã—ã¾ã™ã€‚ 使用å¯èƒ½ãªãƒ†ãƒ³ãƒ—レートやフィルタã«é–¢ã—ã¦ã¯\n"
":hg:`help templates` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
msgid "Three additional date template filters are provided::"
@@ -2857,7 +2930,7 @@
"replaced with customized keywords and templates. Again, run\n"
":hg:`kwdemo` to control the results of your config changes."
msgstr ""
-"無指定時ã®ãƒ†ãƒ³ãƒ—レートè¨å®š(:hg:`kwdemo -d` ã§é–²è¦§å¯èƒ½)ã¯ã€ã‚ーワード\n"
+"無指定時ã®ãƒ†ãƒ³ãƒ—レートè¨å®š(:hg:`kwdemo -d` ã§é–²è¦§å¯èƒ½)ã¯ã€ ã‚ーワード\n"
"åŠã³ãƒ†ãƒ³ãƒ—レートã®ã‚«ã‚¹ã‚¿ãƒžã‚¤ã‚ºã§ç½®ãæ›ãˆã‚‹ã“ã¨ãŒå¯èƒ½ã§ã™ã€‚\n"
"ç¹°ã‚Šè¿”ã—ã¾ã™ãŒè¨å®šå¤‰æ›´ã®ç¢ºèªã¯ :hg:`kwdemo` ã§è¡Œã†ã“ã¨ãŒã§ãã¾ã™ã€‚"
@@ -2866,14 +2939,14 @@
"the risk of inadvertently storing expanded keywords in the change\n"
"history."
msgstr ""
-"展開済ã¿ã‚ーワードãŒæ„図ã›ãšå±¥æ´ã«è¨˜éŒ²ã•ã‚Œã¦ã—ã¾ã†ã“ã¨ã‚’防ããŸã‚ã«ã€\n"
+"展開済ã¿ã‚ーワードãŒæ„図ã›ãšå±¥æ´ã«è¨˜éŒ²ã•ã‚Œã¦ã—ã¾ã†ã“ã¨ã‚’防ããŸã‚ã«ã€ \n"
"ã‚ーワードã®è¨å®šå¤‰æ›´/無効化ã®å‰ã«ã¯ :hg:`kwshrink` を実行ã—ã¦ãã ã•ã„。"
msgid ""
"To force expansion after enabling it, or a configuration change, run\n"
":hg:`kwexpand`."
msgstr ""
-"ã‚ーワードã®è¨å®šå¤‰æ›´/有効化後ã«ã€å¼·åˆ¶çš„ã«å±•é–‹ã™ã‚‹å ´åˆã¯ :hg:`kwexpand`\n"
+"ã‚ーワードã®è¨å®šå¤‰æ›´/有効化後ã«ã€ 強制的ã«å±•é–‹ã™ã‚‹å ´åˆã¯ :hg:`kwexpand`\n"
"を実行ã—ã¦ãã ã•ã„。"
msgid ""
@@ -2881,8 +2954,8 @@
"like CVS' $Log$, are not supported. A keyword template map \"Log =\n"
"{desc}\" expands to the first line of the changeset description.\n"
msgstr ""
-"複数行ã«æ¸¡ã‚‹å±•é–‹ã‚„ã€CVS ã® $Log$ ã®ã‚ˆã†ãªå¢—åŠ ã™ã‚‹å†…容ã®å±•é–‹ã¯ã‚µãƒãƒ¼ãƒˆ\n"
-"ã—ã¦ã„ã¾ã›ã‚“。ã‚ーワードテンプレートè¨å®š \"Log = {desc}\" ã¯ã€\n"
+"複数行ã«æ¸¡ã‚‹å±•é–‹ã‚„〠CVS ã® $Log$ ã®ã‚ˆã†ãªå¢—åŠ ã™ã‚‹å†…容ã®å±•é–‹ã¯ã‚µãƒãƒ¼ãƒˆ\n"
+"ã—ã¦ã„ã¾ã›ã‚“。 ã‚ーワードテンプレートè¨å®š \"Log = {desc}\" ã¯ã€ \n"
"コミットメッセージã®æœ€åˆã®ä¸€è¡Œã‚’埋ã‚è¾¼ã¿ã¾ã™ã€‚\n"
#, python-format
@@ -2906,19 +2979,19 @@
" Show current, custom, or default keyword template maps and their\n"
" expansions."
msgstr ""
-" ç¾æ™‚点ã€å›ºæœ‰ãªã„ã—デフォルトã®ã‚ーワードテンプレートマップã€\n"
+" ç¾æ™‚点〠固有ãªã„ã—デフォルトã®ã‚ーワードテンプレートマップ〠\n"
" ãŠã‚ˆã³ãã®å±•é–‹ä¾‹ã‚’表示ã—ã¾ã™ã€‚"
msgid ""
" Extend the current configuration by specifying maps as arguments\n"
" and using -f/--rcfile to source an external hgrc file."
msgstr ""
-" 引数ã§ã®ãƒžãƒƒãƒ—指定やã€-f/--rcfile 指定ã«ã‚ˆã‚‹å¤–部è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰ã®\n"
-" èªã¿è¾¼ã¿ã«ã‚ˆã‚Šã€ç¾æ™‚点ã§ã®è¨å®šã‚’æ‹¡å¼µã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
+" 引数ã§ã®ãƒžãƒƒãƒ—指定や〠-f/--rcfile 指定ã«ã‚ˆã‚‹å¤–部è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰ã®\n"
+" èªã¿è¾¼ã¿ã«ã‚ˆã‚Šã€ ç¾æ™‚点ã§ã®è¨å®šã‚’æ‹¡å¼µã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
msgid " Use -d/--default to disable current configuration."
msgstr ""
-" -d/--default 指定ã«ã‚ˆã‚Šã€ç¾æ™‚点ã®ã‚ーワードテンプレートè¨å®šã‚’\n"
+" -d/--default 指定ã«ã‚ˆã‚Šã€ ç¾æ™‚点ã®ã‚ーワードテンプレートè¨å®šã‚’\n"
" 一時的ã«ç„¡åŠ¹åŒ–ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚"
msgid ""
@@ -2972,7 +3045,7 @@
"ã‚ーワードを %s ã«æ›¸ãè¾¼ã¿ã¾ã—ãŸ:\n"
msgid "hg keyword configuration and expansion example"
-msgstr ""
+msgstr "keyword エクステンションã®è¨å®šï¼å±•é–‹ã®ä¾‹"
msgid ""
"\n"
@@ -2991,7 +3064,7 @@
" kwexpand refuses to run if given files contain local changes.\n"
" "
msgstr ""
-" 指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã«æœªã‚³ãƒŸãƒƒãƒˆå¤‰æ›´ãŒã‚ã‚‹å ´åˆã€å®Ÿè¡Œã¯ä¸æ–ã•ã‚Œã¾ã™ã€‚\n"
+" 指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã«æœªã‚³ãƒŸãƒƒãƒˆå¤‰æ›´ãŒã‚ã‚‹å ´åˆã€ 実行ã¯ä¸æ–ã•ã‚Œã¾ã™ã€‚\n"
" "
msgid "show files configured for keyword expansion"
@@ -3001,7 +3074,7 @@
" List which files in the working directory are matched by the\n"
" [keyword] configuration patterns."
msgstr ""
-" 作æ¥é ˜åŸŸä¸ã®ãƒ•ã‚¡ã‚¤ãƒ«ã§ã€[keyword] è¨å®šã§ã®ãƒ‘ターンã«åˆè‡´ã™ã‚‹\n"
+" 作æ¥é ˜åŸŸä¸ã®ãƒ•ã‚¡ã‚¤ãƒ«ã§ã€ [keyword] è¨å®šã§ã®ãƒ‘ターンã«åˆè‡´ã™ã‚‹\n"
" ファイルã®ä¸€è¦§ã‚’表示ã—ã¾ã™ã€‚"
msgid ""
@@ -3009,20 +3082,20 @@
" execution by including only files that are actual candidates for\n"
" expansion."
msgstr ""
-" 予期ã›ã¬ã‚ーワード展開ã®é˜²æ¢ã¨ã€å®Ÿè¡Œæ€§èƒ½å‘上ã®ãŸã‚ã«ã€å®Ÿéš›ã®\n"
+" 予期ã›ã¬ã‚ーワード展開ã®é˜²æ¢ã¨ã€ 実行性能å‘上ã®ãŸã‚ã«ã€ 実際ã®\n"
" 埋ã‚è¾¼ã¿å¯¾è±¡ã¨ãªã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã®ã¿ã‚’è¨å®šã™ã‚‹ã“ã¨ã‚’ãŠå‹§ã‚ã—ã¾ã™ã€‚"
msgid ""
" See :hg:`help keyword` on how to construct patterns both for\n"
" inclusion and exclusion of files."
msgstr ""
-" パターンåˆè‡´ã«é–¢ã™ã‚‹è©³ç´°ã¯ã€:hg:`help keyword` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
+" パターンåˆè‡´ã«é–¢ã™ã‚‹è©³ç´°ã¯ã€ :hg:`help keyword` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
msgid ""
" With -A/--all and -v/--verbose the codes used to show the status\n"
" of files are::"
msgstr ""
-" -a/--all ãŠã‚ˆã³ -v/--verbose 指定ã®ã‚ã‚‹å ´åˆã€å„ファイルã®çŠ¶æ³ã¯\n"
+" -a/--all ãŠã‚ˆã³ -v/--verbose 指定ã®ã‚ã‚‹å ´åˆã€ å„ファイルã®çŠ¶æ³ã¯\n"
" 以下ã®è¨˜å·ã§è¡¨ç¾ã•ã‚Œã¾ã™::"
msgid ""
@@ -3045,14 +3118,14 @@
" Run before changing/disabling active keywords or if you experience\n"
" problems with :hg:`import` or :hg:`merge`."
msgstr ""
-" ã‚ーワードè¨å®šã®å¤‰æ›´å‰ã‚„ã€:hg:`import` ãªã„ã— :hg:`merge` ã§å•é¡ŒãŒ\n"
+" ã‚ーワードè¨å®šã®å¤‰æ›´å‰ã‚„〠:hg:`import` ãªã„ã— :hg:`merge` ã§å•é¡ŒãŒ\n"
" 発生ã—ãŸçµŒé¨“ãŒã‚ã‚‹å ´åˆã«å®Ÿè¡Œã—ã¦ãã ã•ã„。"
msgid ""
" kwshrink refuses to run if given files contain local changes.\n"
" "
msgstr ""
-" 指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã«æœªã‚³ãƒŸãƒƒãƒˆå¤‰æ›´ãŒã‚ã‚‹å ´åˆã€å®Ÿè¡Œã¯ä¸æ–ã•ã‚Œã¾ã™ã€‚\n"
+" 指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã«æœªã‚³ãƒŸãƒƒãƒˆå¤‰æ›´ãŒã‚ã‚‹å ´åˆã€ 実行ã¯ä¸æ–ã•ã‚Œã¾ã™ã€‚\n"
" "
msgid "show default keyword template maps"
@@ -3090,17 +3163,17 @@
"repository. It manages two stacks of patches - all known patches, and\n"
"applied patches (subset of known patches)."
msgstr ""
-"本エクステンションã¯ã€Mercurial リãƒã‚¸ãƒˆãƒªã®ä½œæ¥é ˜åŸŸã«ãŠã„ã¦ã€ãƒ‘ッãƒã‚’\n"
-"併用ã—ãŸä½œæ¥ã‚’å¯èƒ½ã«ã—ã¾ã™ã€‚本エクステンションã§ã¯ã€ã€Œæ—¢çŸ¥ã®ãƒ‘ッãƒã€ã¨\n"
-"「é©ç”¨ä¸ã®ãƒ‘ッãƒã€(「既知ã®ãƒ‘ッãƒã€ã®éƒ¨åˆ†é›†åˆ)ã®2ã¤ã®é›†åˆã‚’ã€ã‚¹ã‚¿ãƒƒã‚¯\n"
+"本エクステンションã¯ã€ Mercurial リãƒã‚¸ãƒˆãƒªã®ä½œæ¥é ˜åŸŸã«ãŠã„ã¦ã€ パッãƒã‚’\n"
+"併用ã—ãŸä½œæ¥ã‚’å¯èƒ½ã«ã—ã¾ã™ã€‚ 本エクステンションã§ã¯ã€ 「既知ã®ãƒ‘ッãƒã€ã¨\n"
+"「é©ç”¨ä¸ã®ãƒ‘ッãƒã€(「既知ã®ãƒ‘ッãƒã€ã®éƒ¨åˆ†é›†åˆ)ã®2ã¤ã®é›†åˆã‚’〠スタック\n"
"を用ã„ã¦ç®¡ç†ã—ã¾ã™ã€‚"
msgid ""
"Known patches are represented as patch files in the .hg/patches\n"
"directory. Applied patches are both patch files and changesets."
msgstr ""
-"「既知ã®ãƒ‘ッãƒã€ã¯ã€.hg/patches ディレクトリé…下ã«ç½®ã‹ã‚ŒãŸãƒ‘ッãƒãƒ•ã‚¡ã‚¤ãƒ«\n"
-"ã«ç›¸å½“ã—ã¾ã™ã€‚「é©ç”¨ä¸ã®ãƒ‘ッãƒã€ã¯ã€ã€Œæ—¢çŸ¥ã®ãƒ‘ッãƒã€ã®ã†ã¡ã€å¯¾å¿œã™ã‚‹\n"
+"「既知ã®ãƒ‘ッãƒã€ã¯ã€ .hg/patches ディレクトリé…下ã«ç½®ã‹ã‚ŒãŸãƒ‘ッãƒãƒ•ã‚¡ã‚¤ãƒ«\n"
+"ã«ç›¸å½“ã—ã¾ã™ã€‚ 「é©ç”¨ä¸ã®ãƒ‘ッãƒã€ã¯ã€ 「既知ã®ãƒ‘ッãƒã€ã®ã†ã¡ã€ 対応ã™ã‚‹\n"
"リビジョンãŒãƒªãƒã‚¸ãƒˆãƒªã®å±¥æ´ã«(一時的ã«)記録ã•ã‚Œã¦ã„ã‚‹ã‚‚ã®ã‚’指ã—ã¾ã™ã€‚"
msgid "Common tasks (use :hg:`help command` for more details)::"
@@ -3134,9 +3207,9 @@
"avoid losing file mode changes, copy records, binary files or empty\n"
"files creations or deletions. This behaviour can be configured with::"
msgstr ""
-"ファイルモードã®å¤‰æ›´ã‚„ã€è¤‡è£½å±¥æ´ã€ãƒã‚¤ãƒŠãƒªãƒ•ã‚¡ã‚¤ãƒ«ã‚„空ファイルã®ç”Ÿæˆ\n"
-"ï¼å‰Šé™¤ç‰ã®æƒ…å ±ã‚’ç¶æŒã™ã‚‹ãŸã‚ã«ã€mq ã¯å¿…è¦ã«å¿œã˜ã¦ git å½¢å¼ã®ãƒ‘ッãƒã‚’\n"
-"自動的ã«ä½¿ç”¨ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ã“ã®æŒ¯ã‚‹èˆžã„ã¯ä»¥ä¸‹ã®æŒ‡å®šã§åˆ¶å¾¡ã—ã¾ã™::"
+"ファイルモードã®å¤‰æ›´ã‚„〠複製履æ´ã€ ãƒã‚¤ãƒŠãƒªãƒ•ã‚¡ã‚¤ãƒ«ã‚„空ファイルã®ç”Ÿæˆ\n"
+"ï¼å‰Šé™¤ç‰ã®æƒ…å ±ã‚’ç¶æŒã™ã‚‹ãŸã‚ã«ã€ mq ã¯å¿…è¦ã«å¿œã˜ã¦ git å½¢å¼ã®ãƒ‘ッãƒã‚’\n"
+"自動的ã«ä½¿ç”¨ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ ã“ã®æŒ¯ã‚‹èˆžã„ã¯ä»¥ä¸‹ã®æŒ‡å®šã§åˆ¶å¾¡ã—ã¾ã™::"
msgid ""
" [mq]\n"
@@ -3151,18 +3224,18 @@
"'no', mq will override the [diff] section and always generate git or\n"
"regular patches, possibly losing data in the second case."
msgstr ""
-"'keep' ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€æ—¢å˜ã® qrefresh 対象ã¨ãªã‚‹ãƒ‘ッãƒãŒ git å½¢å¼\n"
-"パッãƒã§ã‚ã‚‹é–“ã¯ã€MQ 㯠[diff] セクションã®è¨å®šã«å¾“ã„ã¾ã™ã€‚\n"
-"'yes' ãªã„ã— 'no' ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€MQ 㯠[diff] セクションã®è¨å®šã‚’無視\n"
-"ã—ã¦ã€git パッãƒãªã„ã—通常パッãƒã‚’生æˆã—ã¾ã™ã€‚通常パッãƒã‚’生æˆã™ã‚‹å ´åˆã€\n"
+"'keep' ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ æ—¢å˜ã® qrefresh 対象ã¨ãªã‚‹ãƒ‘ッãƒãŒ git å½¢å¼\n"
+"パッãƒã§ã‚ã‚‹é–“ã¯ã€ MQ 㯠[diff] セクションã®è¨å®šã«å¾“ã„ã¾ã™ã€‚\n"
+"'yes' ãªã„ã— 'no' ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ MQ 㯠[diff] セクションã®è¨å®šã‚’無視\n"
+"ã—ã¦ã€ git パッãƒãªã„ã—通常パッãƒã‚’生æˆã—ã¾ã™ã€‚ 通常パッãƒã‚’生æˆã™ã‚‹å ´åˆã€ \n"
"æƒ…å ±ãŒå¤±ã‚れるå¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚"
msgid ""
"You will by default be managing a patch queue named \"patches\". You can\n"
"create other, independent patch queues with the :hg:`qqueue` command.\n"
msgstr ""
-"特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€ãƒ‘ッãƒã¯ \"patches\" ã¨ã„ã†åå‰ã®ã‚ューã§ç®¡ç†\n"
-"ã•ã‚Œã¾ã™ã€‚ :hg:`qqueue` を使ã†ã“ã¨ã§ã€ç›¸äº’ã«ç‹¬ç«‹ã—ãŸåˆ¥ã®ç®¡ç†ã‚ューを\n"
+"特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€ パッãƒã¯ \"patches\" ã¨ã„ã†åå‰ã®ã‚ューã§ç®¡ç†\n"
+"ã•ã‚Œã¾ã™ã€‚ :hg:`qqueue` を使ã†ã“ã¨ã§ã€ 相互ã«ç‹¬ç«‹ã—ãŸåˆ¥ã®ç®¡ç†ã‚ューを\n"
"作æˆã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚\n"
#, python-format
@@ -3258,11 +3331,14 @@
msgid "patch %s is empty\n"
msgstr "パッム%s ã¯ç©ºã§ã™\n"
+msgid "repository commit failed"
+msgstr "リãƒã‚¸ãƒˆãƒªã®ã‚³ãƒŸãƒƒãƒˆæ“作ã«å¤±æ•—"
+
msgid "patch failed, rejects left in working dir\n"
-msgstr "パッãƒé©ç”¨ãŒå¤±æ•—ã—ã€å´ä¸‹å·®åˆ†ã¯ä½œæ¥é ˜åŸŸã«æ®‹ã•ã‚Œã¦ã„ã¾ã™\n"
+msgstr "パッãƒé©ç”¨ãŒå¤±æ•—ã—〠å´ä¸‹å·®åˆ†ã¯ä½œæ¥é ˜åŸŸã«æ®‹ã•ã‚Œã¦ã„ã¾ã™\n"
msgid "fuzz found when applying patch, stopping\n"
-msgstr "パッãƒãŒæ›–昧ãªãŸã‚ã€é©ç”¨ã‚’ä¸æ¢\n"
+msgstr "パッãƒãŒæ›–昧ãªãŸã‚〠é©ç”¨ã‚’ä¸æ¢\n"
#, python-format
msgid "revision %d is not managed"
@@ -3361,7 +3437,7 @@
#, python-format
msgid "errors during apply, please fix and refresh %s\n"
-msgstr "é©ç”¨ãŒå¤±æ•—ã—ãŸãŸã‚ã€å¯¾å‡¦å¾Œã« %s ã¸ã® qrefresh を実施ã—ã¦ãã ã•ã„\n"
+msgstr "é©ç”¨ãŒå¤±æ•—ã—ãŸãŸã‚〠対処後㫠%s ã¸ã® qrefresh を実施ã—ã¦ãã ã•ã„\n"
#, python-format
msgid "now at: %s\n"
@@ -3431,7 +3507,7 @@
msgid "saved queue repository parents: %s %s\n"
msgstr "パッãƒçŠ¶æ…‹ä¿å˜ãƒªãƒ“ジョンã®è¦ª: %s %s\n"
-msgid "queue directory updating\n"
+msgid "updating queue directory\n"
msgstr "パッãƒç®¡ç†é ˜åŸŸã®æ›´æ–°ä¸\n"
msgid "Unable to load queue repository\n"
@@ -3481,7 +3557,7 @@
#, python-format
msgid "revision %d is not the parent of %d"
-msgstr "リビジョン %d ã¯ã€%d ã®è¦ªãƒªãƒ“ジョンã§ã¯ã‚ã‚Šã¾ã›ã‚“"
+msgstr "リビジョン %d ã¯ã€ %d ã®è¦ªãƒªãƒ“ジョンã§ã¯ã‚ã‚Šã¾ã›ã‚“"
msgid "-e is incompatible with import from -"
msgstr "標準入力(-)ã‹ã‚‰ã®å–ã‚Šè¾¼ã¿ã®éš›ã® -e 指定ã¯ä¸é©åˆ‡ã§ã™"
@@ -3490,6 +3566,10 @@
msgid "patch %s does not exist"
msgstr "パッム%s ã¯å˜åœ¨ã—ã¾ã›ã‚“"
+#, python-format
+msgid "renaming %s to %s\n"
+msgstr "%s ã‹ã‚‰ %s ã«æ”¹åä¸\n"
+
msgid "need --name to import a patch from -"
msgstr "標準入力(-)ã‹ã‚‰ã®å–ã‚Šè¾¼ã¿ã®éš›ã«ã¯ --name 指定ãŒå¿…è¦ã§ã™"
@@ -3509,8 +3589,8 @@
"With\n"
" -k/--keep, the patch files are preserved in the patch directory."
msgstr ""
-" 対象パッãƒã¯æœªé©ç”¨ã§ãªã‘ã‚Œã°ãªã‚‰ãšã€æœ€ä½Ž1ã¤ã®ãƒ‘ッãƒåã®æŒ‡å®šãŒ\n"
-" å¿…è¦ã§ã™ã€‚-k/--keep を指定ã—ãŸå ´åˆã€ãƒ‘ッãƒãƒ•ã‚¡ã‚¤ãƒ«ãã®ã‚‚ã®ã¯\n"
+" 対象パッãƒã¯æœªé©ç”¨ã§ãªã‘ã‚Œã°ãªã‚‰ãšã€ 最低1ã¤ã®ãƒ‘ッãƒåã®æŒ‡å®šãŒ\n"
+" å¿…è¦ã§ã™ã€‚ -k/--keep を指定ã—ãŸå ´åˆã€ パッãƒãƒ•ã‚¡ã‚¤ãƒ«ãã®ã‚‚ã®ã¯\n"
" 管ç†é ˜åŸŸã«æ®‹ã•ã‚ŒãŸã¾ã¾ã¨ãªã‚Šã¾ã™ã€‚"
msgid ""
@@ -3523,6 +3603,9 @@
msgid "print the patches already applied"
msgstr "é©ç”¨ä¸ã®ãƒ‘ッãƒä¸€è¦§ã®è¡¨ç¤º"
+msgid " Returns 0 on success."
+msgstr " æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0 ã§ã™ã€‚"
+
msgid "only one patch applied\n"
msgstr "å˜ä¸€ã®ãƒ‘ッãƒã ã‘ãŒé©ç”¨ä¸ã§ã™\n"
@@ -3540,28 +3623,28 @@
" patch. If no patches have been applied, qimport prepends the patch\n"
" to the series."
msgstr ""
-" å–ã‚Šè¾¼ã¾ã‚ŒãŸãƒ‘ッãƒã®é©ç”¨é †åºã¯ã€ç¾åœ¨é©ç”¨ä¸ã®æœ€ä¸Šä½ãƒ‘ッãƒã®æ¬¡ã«\n"
-" ãªã‚Šã¾ã™ã€‚é©ç”¨ä¸ã®ãƒ‘ッãƒãŒç„¡ã„å ´åˆã€å–ã‚Šè¾¼ã¾ã‚ŒãŸãƒ‘ッãƒã®é©ç”¨é †åºã¯\n"
+" å–ã‚Šè¾¼ã¾ã‚ŒãŸãƒ‘ッãƒã®é©ç”¨é †åºã¯ã€ ç¾åœ¨é©ç”¨ä¸ã®æœ€ä¸Šä½ãƒ‘ッãƒã®æ¬¡ã«\n"
+" ãªã‚Šã¾ã™ã€‚ é©ç”¨ä¸ã®ãƒ‘ッãƒãŒç„¡ã„å ´åˆã€ å–ã‚Šè¾¼ã¾ã‚ŒãŸãƒ‘ッãƒã®é©ç”¨é †åºã¯\n"
" 一番最åˆã«ãªã‚Šã¾ã™ã€‚"
msgid ""
" The patch will have the same name as its source file unless you\n"
" give it a new one with -n/--name."
msgstr ""
-" -n/--name ã«ã‚ˆã‚‹åå‰ã®æŒ‡å®šãŒç„¡ã„å ´åˆã€å–ã‚Šè¾¼ã¿å¯¾è±¡ã®ãƒ•ã‚¡ã‚¤ãƒ«åãŒ\n"
+" -n/--name ã«ã‚ˆã‚‹åå‰ã®æŒ‡å®šãŒç„¡ã„å ´åˆã€ å–ã‚Šè¾¼ã¿å¯¾è±¡ã®ãƒ•ã‚¡ã‚¤ãƒ«åãŒ\n"
" ãã®ã¾ã¾ãƒ‘ッãƒåã¨ãªã‚Šã¾ã™ã€‚"
msgid ""
" You can register an existing patch inside the patch directory with\n"
" the -e/--existing flag."
msgstr ""
-" -e/--existing を指定ã™ã‚‹ã“ã¨ã§ã€ãƒ‘ッãƒç®¡ç†é ˜åŸŸä¸ã®æ—¢å˜ãƒ•ã‚¡ã‚¤ãƒ«ã‚’\n"
+" -e/--existing を指定ã™ã‚‹ã“ã¨ã§ã€ パッãƒç®¡ç†é ˜åŸŸä¸ã®æ—¢å˜ãƒ•ã‚¡ã‚¤ãƒ«ã‚’\n"
" å–ã‚Šè¾¼ã¿å¯¾è±¡ã¨ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
msgid ""
" With -f/--force, an existing patch of the same name will be\n"
" overwritten."
-msgstr " -f/--force ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€åŒåã®æ—¢å˜ãƒ‘ッãƒã‚’上書ãã—ã¾ã™ã€‚"
+msgstr " -f/--force ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ åŒåã®æ—¢å˜ãƒ‘ッãƒã‚’上書ãã—ã¾ã™ã€‚"
msgid ""
" An existing changeset may be placed under mq control with -r/--rev\n"
@@ -3571,20 +3654,31 @@
" important for preserving rename/copy information and permission\n"
" changes."
msgstr ""
-" -r/--rev を指定ã™ã‚‹ã“ã¨ã§ã€æ—¢å˜ã®é€šå¸¸ãƒªãƒ“ジョンを MQ 管ç†ä¸‹ã«ç½®ã\n"
-" ã“ã¨ãŒã§ãã¾ã™(例: 'qimport --rev tip -n patch' ã¯ã€tip ã‚’ MQ 管ç†\n"
-" 下ã«ç½®ãã¾ã™)。-g/--git 指定ã¯ã€--rev 指定ã«ã‚ˆã‚‹å–ã‚Šè¾¼ã¿ã®éš›ã« git\n"
-" 差分形å¼ã‚’使用ã—ã¾ã™ã€‚改åï¼è¤‡è£½æƒ…å ±ã‚„ã€æ¨©é™è¨å®šã®æƒ…å ±ä¿æŒã«ã¨ã£ã¦ã®\n"
-" git 差分形å¼ã®æœ‰ç”¨æ€§ã«é–¢ã—ã¦ã¯ã€'help diffs' ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
+" -r/--rev を指定ã™ã‚‹ã“ã¨ã§ã€ æ—¢å˜ã®é€šå¸¸ãƒªãƒ“ジョンを MQ 管ç†ä¸‹ã«ç½®ã\n"
+" ã“ã¨ãŒã§ãã¾ã™(例: 'qimport --rev tip -n patch' ã¯ã€ tip ã‚’ MQ 管ç†\n"
+" 下ã«ç½®ãã¾ã™)。 -g/--git 指定ã¯ã€ --rev 指定ã«ã‚ˆã‚‹å–ã‚Šè¾¼ã¿ã®éš›ã« git\n"
+" 差分形å¼ã‚’使用ã—ã¾ã™ã€‚ 改åï¼è¤‡è£½æƒ…å ±ã‚„ã€ æ¨©é™è¨å®šã®æƒ…å ±ä¿æŒã«ã¨ã£ã¦ã®\n"
+" git 差分形å¼ã®æœ‰ç”¨æ€§ã«é–¢ã—ã¦ã¯ã€ 'help diffs' ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
msgid ""
" To import a patch from standard input, pass - as the patch file.\n"
" When importing from standard input, a patch name must be specified\n"
-" using the --name flag.\n"
-" "
-msgstr ""
-" 標準入力ã‹ã‚‰ãƒ‘ッãƒã‚’å–ã‚Šè¾¼ã‚€å ´åˆã€ãƒ•ã‚¡ã‚¤ãƒ«åã« '-' を指定ã—ã¾ã™ã€‚\n"
-" 標準入力ã‹ã‚‰ã®å–ã‚Šè¾¼ã¿ã®éš›ã«ã¯ã€--name ã§ã®ãƒ‘ッãƒå指定ãŒå¿…é ˆã§ã™ã€‚\n"
+" using the --name flag."
+msgstr ""
+" 標準入力ã‹ã‚‰ãƒ‘ッãƒã‚’å–ã‚Šè¾¼ã‚€å ´åˆã€ ファイルåã« '-' を指定ã—ã¾ã™ã€‚\n"
+" 標準入力ã‹ã‚‰ã®å–ã‚Šè¾¼ã¿ã®éš›ã«ã¯ã€ --name ã§ã®ãƒ‘ッãƒå指定ãŒå¿…é ˆã§ã™ã€‚"
+
+msgid " To import an existing patch while renaming it::"
+msgstr " æ—¢å˜ã®ãƒ‘ッãƒã‚’改åã—ã¤ã¤å–ã‚Šè¾¼ã‚€å ´åˆã¯::"
+
+msgid " hg qimport -e existing-patch -n new-name"
+msgstr " hg qimport -e æ—¢å˜ãƒ‘ッãƒã®åå‰ -n æ–°ã—ã„åå‰"
+
+msgid ""
+" Returns 0 if import succeeded.\n"
+" "
+msgstr ""
+" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0 ã§ã™ã€‚\n"
" "
msgid "init a new queue repository (DEPRECATED)"
@@ -3597,18 +3691,18 @@
" an unversioned patch repository into a versioned one). You can use\n"
" qcommit to commit changes to this queue repository."
msgstr ""
-" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€ãƒ‘ッãƒç®¡ç†é ˜åŸŸã¯æ§‹æˆç®¡ç†ã•ã‚Œã¾ã›ã‚“。\n"
-" -c/--create-repo ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€æœ¬ã‚³ãƒžãƒ³ãƒ‰ã¯ãƒ‘ッãƒç®¡ç†é ˜åŸŸè‡ªä½“ã‚’\n"
+" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€ パッãƒç®¡ç†é ˜åŸŸã¯æ§‹æˆç®¡ç†ã•ã‚Œã¾ã›ã‚“。\n"
+" -c/--create-repo ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 本コマンドã¯ãƒ‘ッãƒç®¡ç†é ˜åŸŸè‡ªä½“ã‚’\n"
" Mercurial ã®ãƒªãƒã‚¸ãƒˆãƒªã¨ã—ã¦ä½œæˆã—ã¾ã™(æ—¢å˜ã®ãƒ‘ッãƒç®¡ç†é ˜åŸŸã‚’後ã‹ã‚‰\n"
-" Mercurial リãƒã‚¸ãƒˆãƒªåŒ–ã™ã‚‹ã®ã«ã‚‚使用ã§ãã¾ã™)。管ç†é ˜åŸŸã®å¤‰æ›´å†…容ã¯\n"
+" Mercurial リãƒã‚¸ãƒˆãƒªåŒ–ã™ã‚‹ã®ã«ã‚‚使用ã§ãã¾ã™)。 管ç†é ˜åŸŸã®å¤‰æ›´å†…容ã¯\n"
" qcommit ã«ã‚ˆã£ã¦ã‚³ãƒŸãƒƒãƒˆã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
msgid ""
" This command is deprecated. Without -c, it's implied by other relevant\n"
" commands. With -c, use :hg:`init --mq` instead."
msgstr ""
-" 本コマンドã¯æŽ¨å¥¨ã•ã‚Œã¾ã›ã‚“。-c 指定無ã—ã§ã®ä½œæˆãªã‚‰ã€ä»–ã®é–¢é€£ã‚³ãƒžãƒ³ãƒ‰\n"
-" ã«ã‚ˆã£ã¦ä½œæˆã•ã‚Œã¾ã™ã€‚-c 指定有りã§ã®ä½œæˆãªã‚‰ã°ã€:hg:`init --mq`\n"
+" 本コマンドã¯æŽ¨å¥¨ã•ã‚Œã¾ã›ã‚“。 -c 指定無ã—ã§ã®ä½œæˆãªã‚‰ã€ ä»–ã®é–¢é€£ã‚³ãƒžãƒ³ãƒ‰\n"
+" ã«ã‚ˆã£ã¦ä½œæˆã•ã‚Œã¾ã™ã€‚ -c 指定有りã§ã®ä½œæˆãªã‚‰ã°ã€ :hg:`init --mq`\n"
" を使用ã—ã¦ãã ã•ã„。"
msgid "clone main and patch repository at same time"
@@ -3621,26 +3715,31 @@
" applied in destination. If you clone remote repository, be sure\n"
" before that it has no patches applied."
msgstr ""
-" 複製元ãŒåŒä¸€ãƒ›ã‚¹ãƒˆä¸Šã«ã‚ã‚‹å ´åˆã€è¤‡è£½å…ˆãƒªãƒã‚¸ãƒˆãƒªã§ã¯ã€å…¨ã¦ã®ãƒ‘ッãƒãŒ\n"
-" 未é©ç”¨ãªçŠ¶æ…‹ã¨ãªã‚Šã¾ã™ã€‚複製元ãŒé 隔ホストã«ã‚ã‚‹å ´åˆã€è¤‡è£½å…ƒã§ã®\n"
-" パッãƒé©ç”¨çŠ¶æ³ãŒä¸æ˜Žãªã®ã§ã€è¤‡è£½å…ˆã§ã®ãƒ‘ッãƒé©ç”¨çŠ¶æ³ã¯æœªä¿è¨¼ã§ã™ã€‚\n"
-" é 隔ホスト上ã®ãƒªãƒã‚¸ãƒˆãƒªã‚’複製ã™ã‚‹å ´åˆã€ãƒ‘ッãƒãŒæœªé©ç”¨ã§ã‚ã‚‹ã“ã¨ã‚’\n"
+" 複製元ãŒåŒä¸€ãƒ›ã‚¹ãƒˆä¸Šã«ã‚ã‚‹å ´åˆã€ 複製先リãƒã‚¸ãƒˆãƒªã§ã¯ã€ å…¨ã¦ã®ãƒ‘ッãƒãŒ\n"
+" 未é©ç”¨ãªçŠ¶æ…‹ã¨ãªã‚Šã¾ã™ã€‚ 複製元ãŒé 隔ホストã«ã‚ã‚‹å ´åˆã€ 複製元ã§ã®\n"
+" パッãƒé©ç”¨çŠ¶æ³ãŒä¸æ˜Žãªã®ã§ã€ 複製先ã§ã®ãƒ‘ッãƒé©ç”¨çŠ¶æ³ã¯æœªä¿è¨¼ã§ã™ã€‚\n"
+" é 隔ホスト上ã®ãƒªãƒã‚¸ãƒˆãƒªã‚’複製ã™ã‚‹å ´åˆã€ パッãƒãŒæœªé©ç”¨ã§ã‚ã‚‹ã“ã¨ã‚’\n"
" 確èªã—ã¦ãã ã•ã„。"
msgid ""
" Source patch repository is looked for in <src>/.hg/patches by\n"
" default. Use -p <url> to change."
msgstr ""
-" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€ãƒ‘ッãƒç®¡ç†é ˜åŸŸã¯ <src>/.hg/patches ã‹ã‚‰è¤‡è£½ã•ã‚Œ\n"
-" ã¾ã™ã€‚変更ã™ã‚‹å ´åˆã¯ -p <url> を使用ã—ã¾ã™ã€‚"
+" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€ パッãƒç®¡ç†é ˜åŸŸã¯ <src>/.hg/patches ã‹ã‚‰è¤‡è£½ã•ã‚Œ\n"
+" ã¾ã™ã€‚ 変更ã™ã‚‹å ´åˆã¯ -p <url> を使用ã—ã¾ã™ã€‚"
msgid ""
" The patch directory must be a nested Mercurial repository, as\n"
-" would be created by :hg:`init --mq`.\n"
-" "
-msgstr ""
-" パッãƒç®¡ç†é ˜åŸŸã¯ã€:hg:`init --mq` ã«ã‚ˆã£ã¦ç”Ÿæˆã•ã‚ŒãŸã€å…¥ã‚Œå状ã®\n"
-" Mercurial リãƒã‚¸ãƒˆãƒªã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。\n"
+" would be created by :hg:`init --mq`."
+msgstr ""
+" パッãƒç®¡ç†é ˜åŸŸã¯ã€ :hg:`init --mq` ã«ã‚ˆã£ã¦ç”Ÿæˆã•ã‚ŒãŸ\n"
+" 入れå状㮠Mercurial リãƒã‚¸ãƒˆãƒªã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
+
+msgid ""
+" Return 0 on success.\n"
+" "
+msgstr ""
+" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0 ã§ã™ã€‚\n"
" "
msgid "versioned patch repository not found (see init --mq)"
@@ -3662,7 +3761,7 @@
msgstr "パッãƒç®¡ç†é ˜åŸŸã®å¤‰æ›´ã‚’コミット(éžæŽ¨å¥¨)"
msgid " This command is deprecated; use :hg:`commit --mq` instead."
-msgstr " 本コマンドã¯éžæŽ¨å¥¨ã§ã™ã€‚:hg:`commit --mq` を使用ã—ã¦ãã ã•ã„。"
+msgstr " 本コマンドã¯éžæŽ¨å¥¨ã§ã™ã€‚ :hg:`commit --mq` を使用ã—ã¦ãã ã•ã„。"
msgid "print the entire series file"
msgstr "既知ã®ãƒ‘ッãƒä¸€è¦§ã®è¡¨ç¤º"
@@ -3687,11 +3786,11 @@
" only changes to matching files to the new patch, leaving the rest\n"
" as uncommitted modifications."
msgstr ""
-" 本コマンドã¯ã€(パッãƒé©ç”¨ä¸ã®å ´åˆã¯)é©ç”¨ä¸ãƒ‘ッãƒã®æœ€ä¸Šä½ã®ä½ç½®ã«\n"
-" æ–°è¦ãƒ‘ッãƒã‚’作æˆã—ã¾ã™ã€‚æ–°è¦ã®ãƒ‘ッãƒã¯ã€ä½œæ¥é ˜åŸŸä¸ã®å…¨ã¦ã®å¤‰æ›´ã‚’\n"
-" ä¿æŒã—ã¾ã™ã€‚-I/--includeã€-X/--exclude ã¨ã€ãƒ‘ッãƒåã«ç¶šã‘ã¦æŒ‡å®š\n"
-" ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«åã®çµ„ã¿åˆã‚ã›ã«ã‚ˆã£ã¦ã€æ–°è¦ãƒ‘ッãƒã«å¤‰æ›´ãŒå–ã‚Šè¾¼ã¾ã‚Œã‚‹\n"
-" ファイルをé™å®šã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚å–ã‚Šè¾¼ã¿å¯¾è±¡å¤–ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«ãŠã‘ã‚‹\n"
+" 本コマンドã¯ã€ (パッãƒé©ç”¨ä¸ã®å ´åˆã¯)é©ç”¨ä¸ãƒ‘ッãƒã®æœ€ä¸Šä½ã®ä½ç½®ã«\n"
+" æ–°è¦ãƒ‘ッãƒã‚’作æˆã—ã¾ã™ã€‚ æ–°è¦ã®ãƒ‘ッãƒã¯ã€ 作æ¥é ˜åŸŸä¸ã®å…¨ã¦ã®å¤‰æ›´ã‚’\n"
+" ä¿æŒã—ã¾ã™ã€‚ -I/--include〠-X/--exclude ã¨ã€ パッãƒåã«ç¶šã‘ã¦æŒ‡å®š\n"
+" ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«åã®çµ„ã¿åˆã‚ã›ã«ã‚ˆã£ã¦ã€ æ–°è¦ãƒ‘ッãƒã«å¤‰æ›´ãŒå–ã‚Šè¾¼ã¾ã‚Œã‚‹\n"
+" ファイルをé™å®šã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ å–ã‚Šè¾¼ã¿å¯¾è±¡å¤–ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«ãŠã‘ã‚‹\n"
" 変更ã¯æœªã‚³ãƒŸãƒƒãƒˆãªã¾ã¾æ®‹ã‚Šã¾ã™ã€‚"
msgid ""
@@ -3699,8 +3798,8 @@
" date, respectively. -U/--currentuser and -D/--currentdate set user\n"
" to current user and date to current date."
msgstr ""
-" -u/--user ãŠã‚ˆã³ -d/--date ã¯ã€ãã‚Œãžã‚ŒæŒ‡å®šã®ãƒ¦ãƒ¼ã‚¶åï¼æ—¥æ™‚ã®è¨˜éŒ²ã«\n"
-" 使用ã§ãã¾ã™ã€‚ -U/--currentuser ãŠã‚ˆã³ -D/--currendate ã¯ã€ãã‚Œãžã‚Œ\n"
+" -u/--user ãŠã‚ˆã³ -d/--date ã¯ã€ ãã‚Œãžã‚ŒæŒ‡å®šã®ãƒ¦ãƒ¼ã‚¶åï¼æ—¥æ™‚ã®è¨˜éŒ²ã«\n"
+" 使用ã§ãã¾ã™ã€‚ -U/--currentuser ãŠã‚ˆã³ -D/--currendate ã¯ã€ ãã‚Œãžã‚Œ\n"
" ç¾ãƒ¦ãƒ¼ã‚¶åï¼ç¾åœ¨æ—¥æ™‚を記録ã—ã¾ã™ã€‚"
msgid ""
@@ -3708,20 +3807,25 @@
" well as the commit message. If none is specified, the header is\n"
" empty and the commit message is '[mq]: PATCH'."
msgstr ""
-" -e/--edit, -m/--message ãªã„ã— -l/--logfile ã¯ã€ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¨\n"
-" åŒæ§˜ã«ã€ãƒ‘ッãƒã®ãƒ˜ãƒƒãƒ€ã«è¨˜éŒ²ã™ã‚‹æƒ…å ±ã‚’æŒ‡å®šã—ã¾ã™ã€‚指定ãŒç„¡ã„å ´åˆã¯ã€\n"
-" ヘッダã¯ç©ºã®ã¾ã¾ã€ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒ '[mq]: パッãƒå' ã¨ãªã‚Šã¾ã™ã€‚"
+" -e/--edit, -m/--message ãªã„ã— -l/--logfile ã¯ã€ コミットメッセージã¨\n"
+" åŒæ§˜ã«ã€ パッãƒã®ãƒ˜ãƒƒãƒ€ã«è¨˜éŒ²ã™ã‚‹æƒ…å ±ã‚’æŒ‡å®šã—ã¾ã™ã€‚ 指定ãŒç„¡ã„å ´åˆã¯ã€ \n"
+" ヘッダã¯ç©ºã®ã¾ã¾ã€ コミットメッセージ㌠'[mq]: パッãƒå' ã¨ãªã‚Šã¾ã™ã€‚"
msgid ""
" Use the -g/--git option to keep the patch in the git extended diff\n"
" format. Read the diffs help topic for more information on why this\n"
" is important for preserving permission changes and copy/rename\n"
-" information.\n"
-" "
-msgstr ""
-" git 拡張差分形å¼ã‚’使用ã™ã‚‹å ´åˆã¯ã€-g/--git を指定ã—ã¾ã™ã€‚改åï¼è¤‡è£½\n"
-" æƒ…å ±ã‚„ã€æ¨©é™è¨å®šã®æƒ…å ±ä¿æŒã«ã¨ã£ã¦ã® git 差分形å¼ã®æœ‰ç”¨æ€§ã«é–¢ã—ã¦ã¯ã€\n"
-" 'help diffs' ã‚’å‚ç…§ã—ã¦ãã ã•ã„。\n"
+" information."
+msgstr ""
+" git 拡張差分形å¼ã‚’使用ã™ã‚‹å ´åˆã¯ã€ -g/--git を指定ã—ã¾ã™ã€‚ 改åï¼è¤‡è£½\n"
+" æƒ…å ±ã‚„ã€ æ¨©é™è¨å®šã®æƒ…å ±ä¿æŒã«ã¨ã£ã¦ã® git 差分形å¼ã®æœ‰ç”¨æ€§ã«é–¢ã—ã¦ã¯ã€ \n"
+" 'help diffs' ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
+
+msgid ""
+" Returns 0 on successful creation of a new patch.\n"
+" "
+msgstr ""
+" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0 ã§ã™ã€‚\n"
" "
msgid "update the current patch"
@@ -3732,33 +3836,42 @@
" contain only the modifications that match those patterns; the\n"
" remaining modifications will remain in the working directory."
msgstr ""
-" 何らã‹ã®ãƒ‘ターンãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€æ›´æ–°å¾Œã®ãƒ‘ッãƒã¯å½“該パターンã«\n"
-" åˆè‡´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã®å¤‰æ›´å†…容ã ã‘ã‚’å«ã¿ã€ä»–ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®å¤‰æ›´å†…容ã¯ä½œæ¥\n"
+" 何らã‹ã®ãƒ‘ターンãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 更新後ã®ãƒ‘ッãƒã¯å½“該パターンã«\n"
+" åˆè‡´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã®å¤‰æ›´å†…容ã ã‘ã‚’å«ã¿ã€ ä»–ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®å¤‰æ›´å†…容ã¯ä½œæ¥\n"
" é ˜åŸŸã«æ®‹ã£ãŸã¾ã¾ã¨ãªã‚Šã¾ã™ã€‚"
msgid ""
" If -s/--short is specified, files currently included in the patch\n"
" will be refreshed just like matched files and remain in the patch."
msgstr ""
-" -s/--short ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ç¾è¡Œãƒ‘ッãƒãŒå¤‰æ›´ã‚’ä¿æŒã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã®ã¿ãŒ\n"
-" パッãƒå†…容更新ã®å¯¾è±¡ã¨ãªã£ã¦ã€ãƒ‘ッãƒã«ã¨ã©ã¾ã‚Šç¶šã‘ã¾ã™ã€‚"
+" -s/--short ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ ç¾è¡Œãƒ‘ッãƒãŒå¤‰æ›´ã‚’ä¿æŒã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã®ã¿ãŒ\n"
+" パッãƒå†…容更新ã®å¯¾è±¡ã¨ãªã£ã¦ã€ パッãƒã«ã¨ã©ã¾ã‚Šç¶šã‘ã¾ã™ã€‚"
+
+msgid ""
+" If -e/--edit is specified, Mercurial will start your configured editor "
+"for\n"
+" you to enter a message. In case qrefresh fails, you will find a backup "
+"of\n"
+" your message in ``.hg/last-message.txt``."
+msgstr ""
+" -e/--edit ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ メッセージ入力用ã®ãƒ—ãƒã‚°ãƒ©ãƒ ãŒ\n"
+" è¨å®šã«å¾“ã£ã¦èµ·å‹•ã•ã‚Œã¾ã™ã€‚ 処ç†ãŒå¤±æ•—ã—ãŸå ´åˆã€ \n"
+" 入力ã—ãŸãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯ ``.hg/last-message.txt`` ã«ä¿å˜ã•ã‚Œã¾ã™ã€‚"
msgid ""
" hg add/remove/copy/rename work as usual, though you might want to\n"
" use git-style patches (-g/--git or [diff] git=1) to track copies\n"
" and renames. See the diffs help topic for more information on the\n"
-" git diff format.\n"
-" "
+" git diff format."
msgstr ""
" 複製ï¼æ”¹åã«é–¢ã™ã‚‹å±¥æ´ä¿å˜ã®ãŸã‚ã« git 差分形å¼ã‚’使用(-g/--git 指定や\n"
-" è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã§ã® [diff] git=1 記述)ã™ã‚‹ã®ã§ã‚ã‚Œã°ã€\n"
-" add/remove/copy/rename ã¨ã„ã£ãŸ hg ã®ã‚³ãƒžãƒ³ãƒ‰ã«ã‚ˆã‚‹å±¥æ´è¨˜éŒ²ã‚‚ã€\n"
-" 通常ã¨å¤‰ã‚ã‚Šãªã機能ã—ã¾ã™ã€‚git 差分形å¼ã®è©³ç´°ã«é–¢ã—ã¦ã¯ã€\n"
-" 'help diffs' ã‚’å‚ç…§ã—ã¦ãã ã•ã„。\n"
-" "
+" è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã§ã® [diff] git=1 記述)ã™ã‚‹ã®ã§ã‚ã‚Œã°ã€ \n"
+" add/remove/copy/rename ã¨ã„ã£ãŸ hg ã®ã‚³ãƒžãƒ³ãƒ‰ã«ã‚ˆã‚‹å±¥æ´è¨˜éŒ²ã‚‚〠\n"
+" 通常ã¨å¤‰ã‚ã‚Šãªã機能ã—ã¾ã™ã€‚ git 差分形å¼ã®è©³ç´°ã«é–¢ã—ã¦ã¯ã€ \n"
+" 'help diffs' ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
-msgstr "\"-e\" ã¯ã€\"-m\" ãªã„ã— \"-l\" ã¨ä½µç”¨ã§ãã¾ã›ã‚“"
+msgstr "\"-e\" ã¯ã€ \"-m\" ãªã„ã— \"-l\" ã¨ä½µç”¨ã§ãã¾ã›ã‚“"
msgid "diff of the current patch and subsequent modifications"
msgstr "ç¾è¡Œãƒ‘ッãƒã¨ä½œæ¥é ˜åŸŸå¤‰æ›´ã®çµåˆçµæžœã®è¡¨ç¤º"
@@ -3769,7 +3882,7 @@
" last refresh (thus showing what the current patch would become\n"
" after a qrefresh)."
msgstr ""
-" ç¾è¡Œãƒ‘ッãƒã®å¤‰æ›´å†…容ã¨ã€å‰å›žã® qrefresh 実施以後ã®ä½œæ¥é ˜åŸŸã«ãŠã‘ã‚‹\n"
+" ç¾è¡Œãƒ‘ッãƒã®å¤‰æ›´å†…容ã¨ã€ å‰å›žã® qrefresh 実施以後ã®ä½œæ¥é ˜åŸŸã«ãŠã‘ã‚‹\n"
" 変更内容をåˆã‚ã›ãŸå·®åˆ†(ï¼ ç¾æ™‚点ã§ã® qrefresh 実施ã«ã‚ˆã‚‹ãƒ‘ッãƒå†…容ã®\n"
" æ›´æ–°çµæžœ)を表示ã—ã¾ã™ã€‚"
@@ -3777,13 +3890,11 @@
" Use :hg:`diff` if you only want to see the changes made since the\n"
" last qrefresh, or :hg:`export qtip` if you want to see changes\n"
" made by the current patch without including changes made since the\n"
-" qrefresh.\n"
-" "
+" qrefresh."
msgstr ""
" å‰å›žã® :hg:`qrefresh` 実施以後ã®ä½œæ¥é ˜åŸŸã«ãŠã‘る変更内容を見ãŸã„\n"
-" å ´åˆã¯ :hg:`diff` ã‚’ã€ä½œæ¥é ˜åŸŸã®å¤‰æ›´å†…容をå«ã¾ãªã„ç¾è¡Œãƒ‘ッãƒã®å†…容\n"
-" ã®ã¿ã‚’見ãŸã„å ´åˆã¯ :hg:`export qtip` を使用ã—ã¦ãã ã•ã„。\n"
-" "
+" å ´åˆã¯ :hg:`diff` を〠作æ¥é ˜åŸŸã®å¤‰æ›´å†…容をå«ã¾ãªã„ç¾è¡Œãƒ‘ッãƒã®å†…容\n"
+" ã®ã¿ã‚’見ãŸã„å ´åˆã¯ :hg:`export qtip` を使用ã—ã¦ãã ã•ã„。"
msgid "fold the named patches into the current patch"
msgstr "指定パッãƒã®ç¾è¡Œãƒ‘ッãƒã¸ã®çµ±åˆ"
@@ -3796,25 +3907,26 @@
" deleted. With -k/--keep, the folded patch files will not be\n"
" removed afterwards."
msgstr ""
-" 対象パッãƒã¯æœªé©ç”¨ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。ãã‚Œãžã‚Œã®ãƒ‘ッãƒã¯æŒ‡å®šã•ã‚ŒãŸ\n"
-" é †åºã§é€£ç¶šçš„ã«ç¾è¡Œãƒ‘ッãƒã«é©ç”¨ã•ã‚Œã¾ã™ã€‚å…¨ã¦ã®é©ç”¨ãŒæˆåŠŸã—ãŸå ´åˆã¯ã€\n"
-" ç¾è¡Œãƒ‘ッãƒãŒå…¨ã¦ã®ãƒ‘ッãƒã®ç´¯ç©ã¨ã—ã¦æ›´æ–°ã•ã‚Œã€çµ±åˆã•ã‚ŒãŸãƒ‘ッãƒã¯å‰Šé™¤\n"
-" ã•ã‚Œã¾ã™ã€‚-k/--keep ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã¯ã€çµ±åˆå®Ÿæ–½å¾Œã‚‚çµ±åˆã•ã‚Œï½”パッãƒã®\n"
+" 対象パッãƒã¯æœªé©ç”¨ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。 ãã‚Œãžã‚Œã®ãƒ‘ッãƒã¯æŒ‡å®šã•ã‚ŒãŸ\n"
+" é †åºã§é€£ç¶šçš„ã«ç¾è¡Œãƒ‘ッãƒã«é©ç”¨ã•ã‚Œã¾ã™ã€‚ å…¨ã¦ã®é©ç”¨ãŒæˆåŠŸã—ãŸå ´åˆã¯ã€ \n"
+" ç¾è¡Œãƒ‘ッãƒãŒå…¨ã¦ã®ãƒ‘ッãƒã®ç´¯ç©ã¨ã—ã¦æ›´æ–°ã•ã‚Œã€ çµ±åˆã•ã‚ŒãŸãƒ‘ッãƒã¯å‰Šé™¤\n"
+" ã•ã‚Œã¾ã™ã€‚ -k/--keep ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã¯ã€ çµ±åˆå®Ÿæ–½å¾Œã‚‚çµ±åˆã•ã‚Œï½”パッãƒ"
+"ã®\n"
" ファイルã¯æ®‹ã•ã‚Œã¾ã™ã€‚"
msgid ""
" The header for each folded patch will be concatenated with the\n"
-" current patch header, separated by a line of '* * *'."
-msgstr ""
-" çµ±åˆå¯¾è±¡ãƒ‘ッãƒã®ãƒ˜ãƒƒãƒ€æƒ…å ±ã¯ã€'* * *' 行を区切り記å·ã¨ã—ã¦ã€ç¾è¡Œã®\n"
-" パッãƒã«è¿½åŠ ã•ã‚Œã¾ã™ã€‚"
+" current patch header, separated by a line of ``* * *``."
+msgstr ""
+" çµ±åˆå¯¾è±¡ãƒ‘ッãƒã®ãƒ˜ãƒƒãƒ€æƒ…å ±ã¯ã€ ``* * *`` 行を区切り記å·ã¨ã—ã¦ã€ \n"
+" ç¾è¡Œã®ãƒ‘ッãƒã«è¿½åŠ ã•ã‚Œã¾ã™ã€‚"
msgid "qfold requires at least one patch name"
msgstr "çµ±åˆå®Ÿæ–½ã«ã¯æœ€ä½Ž1ã¤ã®ãƒ‘ッãƒå指定ãŒå¿…è¦ã§ã™"
#, python-format
-msgid "Skipping already folded patch %s"
-msgstr "æ—¢ã«çµ±åˆæ¸ˆã¿ã®ãƒ‘ッム%s ã¯ç„¡è¦–ã—ã¾ã™"
+msgid "Skipping already folded patch %s\n"
+msgstr "æ—¢ã«çµ±åˆæ¸ˆã¿ã®ãƒ‘ッム%s ã¯ç„¡è¦–ã—ã¾ã™\n"
#, python-format
msgid "qfold cannot fold already applied patch %s"
@@ -3838,33 +3950,34 @@
"command\n"
" has activated it."
msgstr ""
-" 「ガードã€ã¯ãƒ‘ッãƒé©ç”¨ã®å¯å¦ã‚’制御ã—ã¾ã™ã€‚ガードãŒè¨å®šã•ã‚Œã¦ã„ãªã„\n"
-" パッãƒã¯å¸¸ã«é©ç”¨ã•ã‚Œã¾ã™ã€‚「æ£ã€ã®ã‚¬ãƒ¼ãƒ‰(例: \"+foo\")ãŒè¨å®šã•ã‚ŒãŸ\n"
-" パッãƒã¯ã€:hg:`qselect` ã«ã‚ˆã£ã¦å½“該ガードãŒè¨å®šã•ã‚Œã¦ã„ã‚‹å ´åˆã«é™ã‚Š\n"
-" é©ç”¨ã•ã‚Œã¾ã™ã€‚ã€Œè² ã€ã®ã‚¬ãƒ¼ãƒ‰(例: \"-foo\")ãŒè¨å®šã•ã‚Œã¦ã„るパッãƒã¯ã€\n"
+" 「ガードã€ã¯ãƒ‘ッãƒé©ç”¨ã®å¯å¦ã‚’制御ã—ã¾ã™ã€‚ ガードãŒè¨å®šã•ã‚Œã¦ã„ãªã„\n"
+" パッãƒã¯å¸¸ã«é©ç”¨ã•ã‚Œã¾ã™ã€‚ 「æ£ã€ã®ã‚¬ãƒ¼ãƒ‰(例: \"+foo\")ãŒè¨å®šã•ã‚ŒãŸ\n"
+" パッãƒã¯ã€ :hg:`qselect` ã«ã‚ˆã£ã¦å½“該ガードãŒè¨å®šã•ã‚Œã¦ã„ã‚‹å ´åˆã«é™ã‚Š\n"
+" é©ç”¨ã•ã‚Œã¾ã™ã€‚ ã€Œè² ã€ã®ã‚¬ãƒ¼ãƒ‰(例: \"-foo\")ãŒè¨å®šã•ã‚Œã¦ã„るパッãƒã¯ã€ \n"
" :hg:`qselect` ã«ã‚ˆã£ã¦å½“該ガードãŒè¨å®šã•ã‚Œã¦ã„ã‚‹å ´åˆã¯é©ç”¨ã•ã‚Œã¾ã›ã‚“。"
msgid ""
" With no arguments, print the currently active guards.\n"
-" With arguments, set guards for the named patch.\n"
-" NOTE: Specifying negative guards now requires '--'."
-msgstr ""
-" 本コマンドãŒå¼•æ•°ç„¡ã—ã§å®Ÿè¡Œã•ã‚ŒãŸå ´åˆã€ç¾è¡Œã®ã‚¬ãƒ¼ãƒ‰è¨å®šã‚’表示ã—ã¾ã™ã€‚\n"
-" 引数有りã§å®Ÿè¡Œã•ã‚ŒãŸå ´åˆã€æŒ‡å®šã®ãƒ‘ッãƒã«å¯¾ã™ã‚‹ã‚¬ãƒ¼ãƒ‰è¨å®šã‚’è¡Œã„ã¾ã™ã€‚\n"
-" 備考: è² ã®ã‚¬ãƒ¼ãƒ‰ã®è¨å®šã«ã¯ '--' ãŒå¿…è¦ã§ã™ã€‚"
+" With arguments, set guards for the named patch."
+msgstr ""
+" 引数指定ãŒç„¡ã„å ´åˆã€ ç¾åœ¨ã®ã‚¬ãƒ¼ãƒ‰é¸æŠžçŠ¶æ³ã‚’表示ã—ã¾ã™ã€‚\n"
+" 引数ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 指定パッãƒã«å¯¾ã™ã‚‹ã‚¬ãƒ¼ãƒ‰é¸æŠžã‚’è¨å®šã—ã¾ã™ã€‚"
+
+msgid ""
+" .. note::\n"
+" Specifying negative guards now requires '--'."
+msgstr ""
+" .. note::\n"
+" ã€Œè² ã€ã®ã‚¬ãƒ¼ãƒ‰è¨å®šã«ã¯ã€ ガード指定ã®å‰ã« '--' 指定ãŒå¿…è¦ã§ã™ã€‚"
msgid " To set guards on another patch::"
msgstr " ç¾è¡Œãƒ‘ッãƒä»¥å¤–ã«ã‚¬ãƒ¼ãƒ‰ã‚’è¨å®šã™ã‚‹ã«ã¯::"
-msgid ""
-" hg qguard other.patch -- +2.6.17 -stable\n"
-" "
-msgstr ""
-" hg qguard 対象パッãƒå -- +2.6.17 -stable\n"
-" "
+msgid " hg qguard other.patch -- +2.6.17 -stable"
+msgstr " hg qguard 対象パッãƒå -- +2.6.17 -stable"
msgid "cannot mix -l/--list with options or arguments"
-msgstr "-l/--list ã¯ã€ä»–ã®ã‚ªãƒ—ションや引数ã¨åŒæ™‚ã«æŒ‡å®šã§ãã¾ã›ã‚“"
+msgstr "-l/--list ã¯ã€ ä»–ã®ã‚ªãƒ—ションや引数ã¨åŒæ™‚ã«æŒ‡å®šã§ãã¾ã›ã‚“"
msgid "no patch to work with"
msgstr "対象ã¨ã™ã¹ãパッãƒãŒã‚ã‚Šã¾ã›ã‚“"
@@ -3881,15 +3994,20 @@
msgid ""
" When -f/--force is applied, all local changes in patched files\n"
-" will be lost.\n"
-" "
-msgstr ""
-" -f/--force ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ãƒ‘ッãƒé©ç”¨å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ã®ã€ä½œæ¥é ˜åŸŸã«\n"
-" ãŠã‘る変更内容ã¯ç ´æ£„ã•ã‚Œã¾ã™ã€‚\n"
+" will be lost."
+msgstr ""
+" -f/--force ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ パッãƒé©ç”¨å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ã®ã€ \n"
+" 作æ¥é ˜åŸŸã«ãŠã‘る変更内容ã¯ç ´æ£„ã•ã‚Œã¾ã™ã€‚"
+
+msgid ""
+" Return 0 on succces.\n"
+" "
+msgstr ""
+" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0 ã§ã™ã€‚\n"
" "
msgid "no saved queues found, please use -n\n"
-msgstr "ä¿å˜ã•ã‚ŒãŸãƒ‘ッãƒç®¡ç†é ˜åŸŸãŒã‚ã‚Šã¾ã›ã‚“。-n を使用ã—ã¦ãã ã•ã„\n"
+msgstr "ä¿å˜ã•ã‚ŒãŸãƒ‘ッãƒç®¡ç†é ˜åŸŸãŒã‚ã‚Šã¾ã›ã‚“。 -n を使用ã—ã¦ãã ã•ã„\n"
#, python-format
msgid "merging with queue at: %s\n"
@@ -3901,13 +4019,11 @@
msgid ""
" By default, pops off the top of the patch stack. If given a patch\n"
" name, keeps popping off patches until the named patch is at the\n"
-" top of the stack.\n"
-" "
-msgstr ""
-" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€é©ç”¨ä¸ã®æœ€ä¸Šä½ãƒ‘ッãƒã‚’解除ã—ã¾ã™ã€‚パッãƒåãŒæŒ‡å®š\n"
-" ã•ã‚ŒãŸå ´åˆã€å½“該パッãƒãŒé©ç”¨ä¸ã®æœ€ä¸Šä½ãƒ‘ッãƒã«ãªã‚‹ã¾ã§ã€ä»–ã®ãƒ‘ッãƒã®\n"
-" é©ç”¨è§£é™¤ã‚’è¡Œã„ã¾ã™ã€‚\n"
-" "
+" top of the stack."
+msgstr ""
+" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€ é©ç”¨ä¸ã®æœ€ä¸Šä½ãƒ‘ッãƒã‚’解除ã—ã¾ã™ã€‚ パッãƒåãŒæŒ‡å®š\n"
+" ã•ã‚ŒãŸå ´åˆã€ 当該パッãƒãŒé©ç”¨ä¸ã®æœ€ä¸Šä½ãƒ‘ッãƒã«ãªã‚‹ã¾ã§ã€ ä»–ã®ãƒ‘ッãƒã®\n"
+" é©ç”¨è§£é™¤ã‚’è¡Œã„ã¾ã™ã€‚"
#, python-format
msgid "using patch queue: %s\n"
@@ -3920,8 +4036,8 @@
" With one argument, renames the current patch to PATCH1.\n"
" With two arguments, renames PATCH1 to PATCH2."
msgstr ""
-" 引数ãŒ1ã¤ã®å ´åˆã€ç¾è¡Œãƒ‘ッãƒã‚’指定ã•ã‚ŒãŸåå‰ã«æ”¹åã—ã¾ã™ã€‚\n"
-" 引数ãŒ2ã¤ã®å ´åˆã€1ã¤ç›®ã®ãƒ‘ッãƒã®åå‰ã‚’2ã¤ç›®ã«æ”¹åã—ã¾ã™ã€‚"
+" 引数ãŒ1ã¤ã®å ´åˆã€ ç¾è¡Œãƒ‘ッãƒã‚’指定ã•ã‚ŒãŸåå‰ã«æ”¹åã—ã¾ã™ã€‚\n"
+" 引数ãŒ2ã¤ã®å ´åˆã€ 1ã¤ç›®ã®ãƒ‘ッãƒã®åå‰ã‚’2ã¤ç›®ã«æ”¹åã—ã¾ã™ã€‚"
#, python-format
msgid "%s already exists"
@@ -3931,15 +4047,11 @@
msgid "A patch named %s already exists in the series file"
msgstr "åŒåã®ãƒ‘ッム%s ãŒæ—¢ã«å˜åœ¨ã—ã¾ã™"
-#, python-format
-msgid "renaming %s to %s\n"
-msgstr "%s ã‹ã‚‰ %s ã«æ”¹åä¸\n"
-
msgid "restore the queue state saved by a revision (DEPRECATED)"
msgstr "指定リビジョンã«ã‚ˆã£ã¦ä¿å˜ã•ã‚ŒãŸãƒ‘ッãƒç®¡ç†çŠ¶æ…‹ã®å¾©æ—§(éžæŽ¨å¥¨)"
msgid " This command is deprecated, use :hg:`rebase` instead."
-msgstr " 本コマンドã¯éžæŽ¨å¥¨ã§ã™ã€‚:hg:`rebase` を使用ã—ã¦ãã ã•ã„。"
+msgstr " 本コマンドã¯éžæŽ¨å¥¨ã§ã™ã€‚ :hg:`rebase` を使用ã—ã¦ãã ã•ã„。"
msgid "save current queue state (DEPRECATED)"
msgstr "パッãƒç®¡ç†çŠ¶æ…‹ã®ä¿å˜(éžæŽ¨å¥¨)"
@@ -3950,26 +4062,23 @@
#, python-format
msgid "destination %s exists, use -f to force"
-msgstr "ä¿å˜å…ˆ %s ãŒå˜åœ¨ã—ã¾ã™ã€‚実施ã™ã‚‹å ´åˆã¯ -f を指定ã—ã¦ãã ã•ã„"
+msgstr "ä¿å˜å…ˆ %s ãŒå˜åœ¨ã—ã¾ã™ã€‚ 実施ã™ã‚‹å ´åˆã¯ -f を指定ã—ã¦ãã ã•ã„"
#, python-format
msgid "copy %s to %s\n"
msgstr "%s ã‹ã‚‰ %s ã«è¤‡è£½ã—ã¾ã™\n"
-msgid "strip a changeset and all its descendants from the repository"
-msgstr "リãƒã‚¸ãƒˆãƒªã‹ã‚‰ã®ã€ç‰¹å®šãƒªãƒ“ジョンãŠã‚ˆã³ãã®åå«ã®é™¤å¤–"
-
-msgid ""
-" The strip command removes all changesets whose local revision\n"
-" number is greater than or equal to REV, and then restores any\n"
-" changesets that are not descendants of REV. If the working\n"
-" directory has uncommitted changes, the operation is aborted unless\n"
-" the --force flag is supplied."
-msgstr ""
-" :hg:`strip` ã¯æŒ‡å®šã®ãƒªãƒ“ジョンã¨åŒã˜ã‹ã€ãれ以上ã®ãƒªãƒ“ジョン番å·ã‚’\n"
-" æŒã¤ãƒªãƒ“ジョンを一旦å–り除ãã€æŒ‡å®šãƒªãƒ“ジョンã®åå«ä»¥å¤–を復旧ã—ã¾ã™ã€‚\n"
-" 作æ¥é ˜åŸŸã«æœªã‚³ãƒŸãƒƒãƒˆã®å¤‰æ›´ãŒã‚ã‚‹å ´åˆã€--force ãŒæŒ‡å®šã•ã‚Œãªã„é™ã‚Šã¯\n"
-" 処ç†ã‚’ä¸æ–ã—ã¾ã™ã€‚"
+msgid "strip changesets and all their descendants from the repository"
+msgstr "リãƒã‚¸ãƒˆãƒªã‹ã‚‰ã®ã€ 特定リビジョンãŠã‚ˆã³ãã®åå«ã®é™¤å¤–"
+
+msgid ""
+" The strip command removes the specified changesets and all their\n"
+" descendants. If the working directory has uncommitted changes,\n"
+" the operation is aborted unless the --force flag is supplied."
+msgstr ""
+" :hg:`strip` ã¯æŒ‡å®šã®ãƒªãƒ“ジョンãŠã‚ˆã³ã€ 指定リビジョンã®åå«ã‚’\n"
+" å–り除ãã¾ã™ã€‚ 作æ¥é ˜åŸŸã«æœªã‚³ãƒŸãƒƒãƒˆã®å¤‰æ›´ãŒã‚ã‚‹å ´åˆã€ \n"
+" --force ãŒæŒ‡å®šã•ã‚Œãªã„é™ã‚Šã¯å‡¦ç†ã‚’ä¸æ–ã—ã¾ã™ã€‚"
msgid ""
" If a parent of the working directory is stripped, then the working\n"
@@ -3977,7 +4086,7 @@
" available ancestor of the stripped parent after the operation\n"
" completes."
msgstr ""
-" 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンãŒé™¤å¤–対象ã«ãªã£ãŸå ´åˆã€é™¤å¤–æ“作ã®å®Œäº†å¾Œã«ã€\n"
+" 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンãŒé™¤å¤–対象ã«ãªã£ãŸå ´åˆã€ 除外æ“作ã®å®Œäº†å¾Œã«ã€ \n"
" 除外ã•ã‚ŒãŸè¦ªãƒªãƒ“ジョンã®å…ˆç¥–ã®ä¸ã§æœ€ã‚‚è¿‘ã„有効ãªãƒªãƒ“ジョンを使用ã—ã¦\n"
" 作æ¥é ˜åŸŸã‚’æ›´æ–°ã—ã¾ã™ã€‚"
@@ -3989,21 +4098,22 @@
" the local revision numbers will in general be different after the\n"
" restore."
msgstr ""
-" 除外ã•ã‚ŒãŸãƒªãƒ“ジョンã¯ã€bundle å½¢å¼ã§ ``.hg/strip-backup`` é…下ã«\n"
+" 除外ã•ã‚ŒãŸãƒªãƒ“ジョンã¯ã€ bundle å½¢å¼ã§ ``.hg/strip-backup`` é…下ã«\n"
" 退é¿ã•ã‚Œã¾ã™(bundle å½¢å¼ã«é–¢ã—ã¦ã¯ :hg:`help bundle` ãŠã‚ˆã³\n"
-" :hg:`help unbundle` å‚ç…§)。除外ã®éš›ã«ä½œæˆã•ã‚ŒãŸ BUNDLE ファイルã§\n"
+" :hg:`help unbundle` å‚ç…§)。 除外ã®éš›ã«ä½œæˆã•ã‚ŒãŸ BUNDLE ファイルã§\n"
" :hg:`unbundle .hg/strip-backup/BUNDLE` を実施ã™ã‚‹ã“ã¨ã§\n"
-" 除外ã•ã‚ŒãŸãƒªãƒ“ジョンを復旧ã•ã›ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚通常ã€å¾©æ—§ã®éš›ã«ã¯\n"
+" 除外ã•ã‚ŒãŸãƒªãƒ“ジョンを復旧ã•ã›ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ 通常〠復旧ã®éš›ã«ã¯\n"
" リビジョン番å·ãŒå¤‰æ›´ã•ã‚Œã¾ã™ã®ã§æ³¨æ„ã—ã¦ãã ã•ã„。"
msgid ""
-" Use the --nobackup option to discard the backup bundle once the\n"
-" operation completes.\n"
-" "
-msgstr ""
-" 除外処ç†å®Œäº†æ™‚点㧠bundle ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ç ´æ£„ã™ã‚‹å ´åˆã¯ --nobackup ã‚’\n"
-" 指定ã—ã¦ãã ã•ã„。\n"
-" "
+" Use the --no-backup option to discard the backup bundle once the\n"
+" operation completes."
+msgstr ""
+" 除外処ç†å®Œäº†æ™‚点㧠bundle ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ç ´æ£„ã™ã‚‹å ´åˆã¯\n"
+" --no-backup を指定ã—ã¦ãã ã•ã„。"
+
+msgid "empty revision set"
+msgstr "指定ã«è©²å½“ã™ã‚‹ãƒªãƒ“ジョンã¯ã‚ã‚Šã¾ã›ã‚“"
msgid "set or print guarded patches to push"
msgstr "作æ¥é ˜åŸŸã«ãŠã‘るガードé¸æŠžã®è¨å®šãªã„ã—表示"
@@ -4015,11 +4125,11 @@
" selected guard, but will not be pushed if any negative guards\n"
" match the current guard. For example::"
msgstr ""
-" パッãƒæ¯Žã®ã‚¬ãƒ¼ãƒ‰è¨å®šãªã„ã—表示ã«ã¯ :hg:`qguard` ã‚’ã€ä½œæ¥é ˜åŸŸã«ãŠã‘ã‚‹\n"
-" ガードã®é¸æŠžãªã„ã—表示ã«ã¯ :hg:`qselect` を使用ã—ã¾ã™ã€‚ガードãŒè¨å®š\n"
-" ã•ã‚Œã¦ã„ãªã„ã‹ã€ä½•ã‚‰ã‹ã®ã€Œæ£ã€ã®ã‚¬ãƒ¼ãƒ‰ãŒã‚¬ãƒ¼ãƒ‰é¸æŠžã«åˆè‡´ã™ã‚‹å ´åˆã«ã¯\n"
-" パッãƒãŒé©ç”¨ã•ã‚Œã¾ã™ãŒã€ä½•ã‚‰ã‹ã®ã€Œè² ã€ã®ã‚¬ãƒ¼ãƒ‰ãŒã‚¬ãƒ¼ãƒ‰é¸æŠžã«åˆè‡´ã™ã‚‹\n"
-" å ´åˆã«ã¯ãƒ‘ッãƒã¯é©ç”¨ã•ã‚Œã¾ã›ã‚“。例ãˆã°::"
+" パッãƒæ¯Žã®ã‚¬ãƒ¼ãƒ‰è¨å®šãªã„ã—表示ã«ã¯ :hg:`qguard` を〠作æ¥é ˜åŸŸã«ãŠã‘ã‚‹\n"
+" ガードã®é¸æŠžãªã„ã—表示ã«ã¯ :hg:`qselect` を使用ã—ã¾ã™ã€‚ ガードãŒè¨å®š\n"
+" ã•ã‚Œã¦ã„ãªã„ã‹ã€ 何らã‹ã®ã€Œæ£ã€ã®ã‚¬ãƒ¼ãƒ‰ãŒã‚¬ãƒ¼ãƒ‰é¸æŠžã«åˆè‡´ã™ã‚‹å ´åˆã«ã¯\n"
+" パッãƒãŒé©ç”¨ã•ã‚Œã¾ã™ãŒã€ 何らã‹ã®ã€Œè² ã€ã®ã‚¬ãƒ¼ãƒ‰ãŒã‚¬ãƒ¼ãƒ‰é¸æŠžã«åˆè‡´ã™ã‚‹\n"
+" å ´åˆã«ã¯ãƒ‘ッãƒã¯é©ç”¨ã•ã‚Œã¾ã›ã‚“。 例ãˆã°::"
msgid ""
" qguard foo.patch -stable (negative guard)\n"
@@ -4035,25 +4145,25 @@
" it has a negative match) but push bar.patch (because it has a\n"
" positive match)."
msgstr ""
-" 上記㮠qselect 実行ã«ã‚ˆã‚Šã€\"stable\" ガードãŒé¸æŠžã•ã‚Œã¾ã™ã€‚MQ ã¯\n"
-" foo.patch ã®é©ç”¨ã‚’(ã€Œè² ã€ã®ã‚¬ãƒ¼ãƒ‰ã«åˆè‡´ã™ã‚‹ãŸã‚)見é€ã‚Šã¾ã™ãŒã€\n"
+" 上記㮠qselect 実行ã«ã‚ˆã‚Šã€ \"stable\" ガードãŒé¸æŠžã•ã‚Œã¾ã™ã€‚ MQ ã¯\n"
+" foo.patch ã®é©ç”¨ã‚’(ã€Œè² ã€ã®ã‚¬ãƒ¼ãƒ‰ã«åˆè‡´ã™ã‚‹ãŸã‚)見é€ã‚Šã¾ã™ãŒã€ \n"
" bar.patch ã®é©ç”¨ã¯(「æ£ã€ã®ã‚¬ãƒ¼ãƒ‰ã«åˆè‡´ã™ã‚‹ãŸã‚)実施ã—ã¾ã™ã€‚"
msgid ""
" With no arguments, prints the currently active guards.\n"
" With one argument, sets the active guard."
msgstr ""
-" 本コマンドãŒå¼•æ•°ç„¡ã—ã§å®Ÿè¡Œã•ã‚ŒãŸå ´åˆã€ç¾åœ¨ã®ã‚¬ãƒ¼ãƒ‰é¸æŠžçŠ¶æ³ã‚’表示\n"
-" ã—ã¾ã™ã€‚引数ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ã‚¬ãƒ¼ãƒ‰é¸æŠžã‚’è¨å®šã—ã¾ã™ã€‚"
+" 本コマンドãŒå¼•æ•°ç„¡ã—ã§å®Ÿè¡Œã•ã‚ŒãŸå ´åˆã€ ç¾åœ¨ã®ã‚¬ãƒ¼ãƒ‰é¸æŠžçŠ¶æ³ã‚’表示\n"
+" ã—ã¾ã™ã€‚ 引数ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ ガードé¸æŠžã‚’è¨å®šã—ã¾ã™ã€‚"
msgid ""
" Use -n/--none to deactivate guards (no other arguments needed).\n"
" When no guards are active, patches with positive guards are\n"
" skipped and patches with negative guards are pushed."
msgstr ""
-" -n/--none を指定ã™ã‚‹ã“ã¨ã§ã€ã‚¬ãƒ¼ãƒ‰é¸æŠžã‚’無効化ã—ã¾ã™(ä»–ã®å¼•æ•°ã¯å¿…è¦\n"
-" ã‚ã‚Šã¾ã›ã‚“)。ã„ãšã‚Œã®ã‚¬ãƒ¼ãƒ‰ã‚‚é¸æŠžã•ã‚Œã¦ã„ãªã„å ´åˆã€ã€Œæ£ã€ã®ã‚¬ãƒ¼ãƒ‰ãŒ\n"
-" è¨å®šã•ã‚ŒãŸãƒ‘ッãƒã®é©ç”¨ã¯è¦‹é€ã‚‰ã‚Œã¾ã™ãŒã€ã€Œè² ã€ã®ã‚¬ãƒ¼ãƒ‰ãŒè¨å®šã•ã‚ŒãŸ\n"
+" -n/--none を指定ã™ã‚‹ã“ã¨ã§ã€ ガードé¸æŠžã‚’無効化ã—ã¾ã™(ä»–ã®å¼•æ•°ã¯å¿…è¦\n"
+" ã‚ã‚Šã¾ã›ã‚“)。 ã„ãšã‚Œã®ã‚¬ãƒ¼ãƒ‰ã‚‚é¸æŠžã•ã‚Œã¦ã„ãªã„å ´åˆã€ 「æ£ã€ã®ã‚¬ãƒ¼ãƒ‰ãŒ\n"
+" è¨å®šã•ã‚ŒãŸãƒ‘ッãƒã®é©ç”¨ã¯è¦‹é€ã‚‰ã‚Œã¾ã™ãŒã€ ã€Œè² ã€ã®ã‚¬ãƒ¼ãƒ‰ãŒè¨å®šã•ã‚ŒãŸ\n"
" パッãƒã¯é©ç”¨ã•ã‚Œã¾ã™ã€‚"
msgid ""
@@ -4063,30 +4173,30 @@
" --pop) to push back to the current patch afterwards, but skip\n"
" guarded patches."
msgstr ""
-" 本コマンドã®å®Ÿè¡Œã«ã‚ˆã‚Šã€é©ç”¨ä¸ã®ãƒ‘ッãƒã®é©ç”¨å¯å¦ã‚‚変化ã—å¾—ã¾ã™ã€‚特ã«\n"
-" 指定ãŒç„¡ã„å ´åˆã€ã‚¬ãƒ¼ãƒ‰ãŒæœ‰åŠ¹ãªãƒ‘ッãƒã®é©ç”¨è§£é™¤ã¯è¡Œã‚ã‚Œã¾ã›ã‚“。 \n"
-" --pop ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€é©ç”¨å¯å¦ãŒå¤‰ã‚る最åˆã®ãƒ‘ッãƒã¾ã§ã®ãƒ‘ッãƒãŒ\n"
-" é©ç”¨è§£é™¤ã•ã‚Œã¾ã™ã€‚--reapply ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€--pop 相当ã®å‡¦ç†å¾Œã«ã€\n"
-" ガードãŒæœ‰åŠ¹ãªãƒ‘ッãƒã®é©ç”¨ã‚’見é€ã‚Šã¤ã¤ã€ç¾è¡Œãƒ‘ッãƒã«è‡³ã‚‹ã¾ã§ãƒ‘ッãƒã‚’\n"
+" 本コマンドã®å®Ÿè¡Œã«ã‚ˆã‚Šã€ é©ç”¨ä¸ã®ãƒ‘ッãƒã®é©ç”¨å¯å¦ã‚‚変化ã—å¾—ã¾ã™ã€‚ 特ã«\n"
+" 指定ãŒç„¡ã„å ´åˆã€ ガードãŒæœ‰åŠ¹ãªãƒ‘ッãƒã®é©ç”¨è§£é™¤ã¯è¡Œã‚ã‚Œã¾ã›ã‚“。 \n"
+" --pop ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ é©ç”¨å¯å¦ãŒå¤‰ã‚る最åˆã®ãƒ‘ッãƒã¾ã§ã®ãƒ‘ッãƒãŒ\n"
+" é©ç”¨è§£é™¤ã•ã‚Œã¾ã™ã€‚ --reapply ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ --pop 相当ã®å‡¦ç†å¾Œã«ã€ \n"
+" ガードãŒæœ‰åŠ¹ãªãƒ‘ッãƒã®é©ç”¨ã‚’見é€ã‚Šã¤ã¤ã€ ç¾è¡Œãƒ‘ッãƒã«è‡³ã‚‹ã¾ã§ãƒ‘ッãƒã‚’\n"
" å†é©ç”¨ã—ã¾ã™ã€‚"
msgid ""
" Use -s/--series to print a list of all guards in the series file\n"
" (no other arguments needed). Use -v for more information."
msgstr ""
-" -s/--series ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ãƒ‘ッãƒã«è¨å®šã•ã‚ŒãŸã‚¬ãƒ¼ãƒ‰ã‚’一覧化ã—ã¦\n"
-" 表示ã—ã¾ã™(ä»–ã®å¼•æ•°ã¯ä¸è¦)。詳細表示ã«ã¯ -v を指定ã—ã¦ãã ã•ã„。"
+" -s/--series ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ パッãƒã«è¨å®šã•ã‚ŒãŸã‚¬ãƒ¼ãƒ‰ã‚’一覧化ã—ã¦\n"
+" 表示ã—ã¾ã™(ä»–ã®å¼•æ•°ã¯ä¸è¦)。 詳細表示ã«ã¯ -v を指定ã—ã¦ãã ã•ã„。"
msgid "guards deactivated\n"
msgstr "ガードè¨å®šã‚’無効化ã—ã¾ã™\n"
#, python-format
msgid "number of unguarded, unapplied patches has changed from %d to %d\n"
-msgstr "ガードè¨å®šã®å¤‰æ›´ã«ã‚ˆã‚Šã€é©ç”¨é™¤å¤–パッãƒæ•°ãŒ %d ã‹ã‚‰ %d ã«ãªã‚Šã¾ã—ãŸ\n"
+msgstr "ガードè¨å®šã®å¤‰æ›´ã«ã‚ˆã‚Šã€ é©ç”¨é™¤å¤–パッãƒæ•°ãŒ %d ã‹ã‚‰ %d ã«ãªã‚Šã¾ã—ãŸ\n"
#, python-format
msgid "number of guarded, applied patches has changed from %d to %d\n"
-msgstr "ガードè¨å®šã®å¤‰æ›´ã«ã‚ˆã‚Šã€é©ç”¨å¯¾è±¡ãƒ‘ッãƒæ•°ãŒ %d ã‹ã‚‰ %d ã«ãªã‚Šã¾ã—ãŸ\n"
+msgstr "ガードè¨å®šã®å¤‰æ›´ã«ã‚ˆã‚Šã€ é©ç”¨å¯¾è±¡ãƒ‘ッãƒæ•°ãŒ %d ã‹ã‚‰ %d ã«ãªã‚Šã¾ã—ãŸ\n"
msgid "guards in series file:\n"
msgstr "パッãƒã«è¨å®šã•ã‚Œã¦ã„るガードã®ä¸€è¦§:\n"
@@ -4114,7 +4224,7 @@
" patches) by moving them out of mq control into regular repository\n"
" history."
msgstr ""
-" 指定ã•ã‚ŒãŸãƒªãƒ“ジョン(é©ç”¨ä¸ãƒ‘ッãƒã«ç›¸å½“)ã‚’ã€MQ 管ç†ä¸‹ã‹ã‚‰é™¤å¤–ã—ã€\n"
+" 指定ã•ã‚ŒãŸãƒªãƒ“ジョン(é©ç”¨ä¸ãƒ‘ッãƒã«ç›¸å½“)を〠MQ 管ç†ä¸‹ã‹ã‚‰é™¤å¤–ã—〠\n"
" 通常ã®ãƒªãƒ“ジョンã¨ã—ã¦ãƒªãƒã‚¸ãƒˆãƒªã«è¨˜éŒ²ã—ã¾ã™ã€‚"
msgid ""
@@ -4123,20 +4233,18 @@
" control. Otherwise, the given revisions must be at the base of the\n"
" stack of applied patches."
msgstr ""
-" リビジョン範囲指定やã€-a/--applied ãŒæŒ‡å®šå¯èƒ½ã§ã™ã€‚--applied ãŒæŒ‡å®š\n"
-" ã•ã‚ŒãŸå ´åˆã€å…¨ã¦ã®é©ç”¨ä¸ãƒ‘ッãƒãŒ MQ 管ç†ä¸‹ã‹ã‚‰é™¤å¤–ã•ã‚Œã¾ã™ã€‚ãã‚Œ\n"
-" 以外ã®å ´åˆã€æŒ‡å®šã•ã‚ŒãŸãƒªãƒ“ジョンã¯ã€é©ç”¨ä¸ã‚¹ã‚¿ãƒƒã‚¯ã®æœ€ä¸‹ä½ã‹ã‚‰ã®\n"
+" リビジョン範囲指定や〠-a/--applied ãŒæŒ‡å®šå¯èƒ½ã§ã™ã€‚ --applied ãŒæŒ‡å®š\n"
+" ã•ã‚ŒãŸå ´åˆã€ å…¨ã¦ã®é©ç”¨ä¸ãƒ‘ッãƒãŒ MQ 管ç†ä¸‹ã‹ã‚‰é™¤å¤–ã•ã‚Œã¾ã™ã€‚ ãã‚Œ\n"
+" 以外ã®å ´åˆã€ 指定ã•ã‚ŒãŸãƒªãƒ“ジョンã¯ã€ é©ç”¨ä¸ã‚¹ã‚¿ãƒƒã‚¯ã®æœ€ä¸‹ä½ã‹ã‚‰ã®\n"
" 一連ã®ãƒªãƒ“ジョンã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
msgid ""
" This can be especially useful if your changes have been applied to\n"
" an upstream repository, or if you are about to push your changes\n"
-" to upstream.\n"
-" "
-msgstr ""
-" ã“ã®æ©Ÿèƒ½ã¯ã€ä¸Šæµã®ãƒªãƒã‚¸ãƒˆãƒªã§ãƒ‘ッãƒãŒå—ç†ã•ã‚ŒãŸå ´åˆã‚„ã€ãƒ‘ッãƒå†…容を\n"
-" 上æµãƒªãƒã‚¸ãƒˆãƒªã«åæ˜ ã—よã†ã¨ã—ã¦ã„ã‚‹å ´åˆãªã©ã«æœ‰ç”¨ã§ã™ã€‚\n"
-" "
+" to upstream."
+msgstr ""
+" ã“ã®æ©Ÿèƒ½ã¯ã€ 上æµã®ãƒªãƒã‚¸ãƒˆãƒªã§ãƒ‘ッãƒãŒå—ç†ã•ã‚ŒãŸå ´åˆã‚„〠\n"
+" パッãƒå†…容を上æµãƒªãƒã‚¸ãƒˆãƒªã«åæ˜ ã™ã‚‹å ´åˆãªã©ã«æœ‰ç”¨ã§ã™ã€‚"
msgid "no revisions specified"
msgstr "リビジョン指定ãŒã‚ã‚Šã¾ã›ã‚“"
@@ -4148,7 +4256,7 @@
" Supports switching between different patch queues, as well as creating\n"
" new patch queues and deleting existing ones."
msgstr ""
-" 複数ã®ç•°ãªã‚‹ãƒ‘ッãƒã‚ューã®é–“ã§ã®åˆ‡ã‚Šæ›¿ãˆã€æ–°è¦ãƒ‘ッãƒã‚ューã®ä½œæˆ\n"
+" 複数ã®ç•°ãªã‚‹ãƒ‘ッãƒã‚ューã®é–“ã§ã®åˆ‡ã‚Šæ›¿ãˆã€ æ–°è¦ãƒ‘ッãƒã‚ューã®ä½œæˆ\n"
" ãŠã‚ˆã³æ—¢å˜ãƒ‘ッãƒã‚ューã®å‰Šé™¤ã‚’è¡Œã„ã¾ã™ã€‚"
msgid ""
@@ -4158,9 +4266,9 @@
"currently\n"
" active queue will be marked with \"(active)\"."
msgstr ""
-" ã‚ューå称を指定ã—ãªã„ã‹ã€-l/--list ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ç™»éŒ²æ¸ˆã¿ã®\n"
+" ã‚ューå称を指定ã—ãªã„ã‹ã€ -l/--list ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 登録済ã¿ã®\n"
" ã‚ューã®ä¸€è¦§ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ - 通常㯠\"normal\" パッãƒã‚ューãŒç™»éŒ²\n"
-" 済ã¿ã§ã™ã€‚当該時点ã§ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªã‚ューã«ã¯ \"(アクティブ)\" ãŒè¡¨ç¤º\n"
+" 済ã¿ã§ã™ã€‚ 当該時点ã§ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªã‚ューã«ã¯ \"(アクティブ)\" ãŒè¡¨ç¤º\n"
" ã•ã‚Œã¾ã™ã€‚"
msgid ""
@@ -4169,24 +4277,28 @@
" currently active queue in the repository. Then the queue will only be\n"
" created and switching will fail."
msgstr ""
-" -c/--create ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€æ–°è¦ã‚ューを作æˆã—ã¾ã™ã€‚当該時点ã§\n"
-" アクティブãªã‚ューã‹ã‚‰ãƒ‘ッãƒãŒé©ç”¨ä¸ã®å ´åˆã‚’除ãã€æ–°è¦ä½œæˆã•ã‚ŒãŸ\n"
-" ã‚ューãŒè‡ªå‹•çš„ã«ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªã‚ューã¨ãªã‚Šã¾ã™ã€‚ã“ã®å ´åˆã€\n"
+" -c/--create ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ æ–°è¦ã‚ューを作æˆã—ã¾ã™ã€‚ 当該時点ã§\n"
+" アクティブãªã‚ューã‹ã‚‰ãƒ‘ッãƒãŒé©ç”¨ä¸ã®å ´åˆã‚’除ã〠新è¦ä½œæˆã•ã‚ŒãŸ\n"
+" ã‚ューãŒè‡ªå‹•çš„ã«ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªã‚ューã¨ãªã‚Šã¾ã™ã€‚ ã“ã®å ´åˆã€ \n"
" æ–°è¦ã‚ューã¯ç”Ÿæˆã•ã‚Œã¾ã™ãŒã‚ューã®åˆ‡ã‚Šæ›¿ãˆã¯å®Ÿæ–½ã•ã‚Œã¾ã›ã‚“。"
msgid ""
" To delete an existing queue, use --delete. You cannot delete the "
"currently\n"
-" active queue.\n"
-" "
-msgstr ""
-" --delete ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€æ—¢å˜ã®ã‚ューを削除ã—ã¾ã™ã€‚当該時点ã§\n"
-" アクティブãªã‚ューã¯å‰Šé™¤ã§ãã¾ã›ã‚“。\n"
-" "
+" active queue."
+msgstr ""
+" --delete ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ æ—¢å˜ã®ã‚ューを削除ã—ã¾ã™ã€‚\n"
+" 当該時点ã§ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªã‚ューã¯å‰Šé™¤ã§ãã¾ã›ã‚“。"
msgid "patches applied - cannot set new queue active"
msgstr "パッãƒé©ç”¨ä¸ - æ–°è¦ã‚ューã¯ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ã«ã§ãã¾ã›ã‚“"
+msgid "cannot delete queue that does not exist"
+msgstr "å˜åœ¨ã—ãªã„ã‚ューã¯å‰Šé™¤ã§ãã¾ã›ã‚“"
+
+msgid "cannot delete currently active queue"
+msgstr "ç¾æ™‚点ã§ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªã‚ューã¯å‰Šé™¤ã§ãã¾ã›ã‚“"
+
msgid " (active)\n"
msgstr " (アクティブ)\n"
@@ -4197,11 +4309,13 @@
msgid "queue \"%s\" already exists"
msgstr "ã‚ュー \"%s\" ã¯æ—¢ã«å˜åœ¨ã—ã¾ã™"
-msgid "cannot delete queue that does not exist"
-msgstr "å˜åœ¨ã—ãªã„ã‚ューã¯å‰Šé™¤ã§ãã¾ã›ã‚“"
-
-msgid "cannot delete currently active queue"
-msgstr "ç¾æ™‚点ã§ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªã‚ューã¯å‰Šé™¤ã§ãã¾ã›ã‚“"
+#, python-format
+msgid "can't rename \"%s\" to its current name"
+msgstr "\"%s\" ã‚’åŒã˜åå‰ã«æ”¹åã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“"
+
+#, python-format
+msgid "non-queue directory \"%s\" already exists"
+msgstr "パッãƒç®¡ç†é ˜åŸŸã§ãªã„åŒåディレクトリ \"%s\" ãŒæ—¢ã«å˜åœ¨ã—ã¾ã™"
msgid "use --create to create a new queue"
msgstr "æ–°è¦ã‚ューã®ä½œæˆã«ã¯ --create を指定ã—ã¦ãã ã•ã„"
@@ -4285,8 +4399,8 @@
msgid "stop managing a revision (DEPRECATED)"
msgstr "指定リビジョンを管ç†å¯¾è±¡ã‹ã‚‰é™¤å¤–(éžæŽ¨å¥¨)"
-msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
-msgstr "hg qdelete [-k] [-r REV]... [PATCH]..."
+msgid "hg qdelete [-k] [PATCH]..."
+msgstr "hg qdelete [-k] [PATCH]..."
msgid "edit patch header"
msgstr "パッãƒãƒ˜ãƒƒãƒ€å†…容ã®ç·¨é›†"
@@ -4378,11 +4492,11 @@
msgid "forget any local changes to patched files"
msgstr "パッãƒå¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã™ã‚‹ä½œæ¥é ˜åŸŸä¸ã®å¤‰æ›´ã‚’ç ´æ£„"
-msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
-msgstr "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
-
-msgid "apply if the patch has rejects"
-msgstr "パッãƒé©ç”¨ãŒæ‹’å¦ã•ã‚Œã¦ã‚‚続行"
+msgid "hg qpop [-a] [-f] [PATCH | INDEX]"
+msgstr "hg qpop [-a] [-f] [PATCH | INDEX]"
+
+msgid "apply on top of local changes"
+msgstr "作æ¥é ˜åŸŸã®å¤‰æ›´ã‚’ãã®ã¾ã¾ã§ãƒ‘ッãƒã‚’é©ç”¨"
msgid "list patch name in commit text"
msgstr "コミットメッセージã¨ã—ã¦ãƒ‘ッãƒåを列挙"
@@ -4399,11 +4513,11 @@
msgid "reorder patch series and apply only the patch"
msgstr "パッãƒä¸€è¦§ã®é †åºå¤‰æ›´ã¨ãƒ‘ッãƒé©ç”¨"
-msgid "hg qpush [-f] [-l] [-a] [-n NAME] [--move] [PATCH | INDEX]"
-msgstr "hg qpush [-f] [-l] [-a] [-n NAME] [--move] [PATCH | INDEX]"
+msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]"
+msgstr "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]"
msgid "refresh only files already in the patch and specified files"
-msgstr "パッãƒå¯¾è±¡ã‹ã€æ˜Žç¤ºæŒ‡å®šã®ã‚ã£ãŸãƒ•ã‚¡ã‚¤ãƒ«ã®ã¿ã‚’処ç†å¯¾è±¡ã«ã™ã‚‹"
+msgstr "パッãƒå¯¾è±¡ã‹ã€ 明示指定ã®ã‚ã£ãŸãƒ•ã‚¡ã‚¤ãƒ«ã®ã¿ã‚’処ç†å¯¾è±¡ã«ã™ã‚‹"
msgid "add/update author field in patch with current user"
msgstr "パッãƒä½œæˆè€…æƒ…å ±ã‚’ç¾è¡Œãƒ¦ãƒ¼ã‚¶ã«è¨å®š"
@@ -4482,8 +4596,14 @@
msgid "no backups"
msgstr "ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—作æˆã®æŠ‘æ¢"
-msgid "hg strip [-f] [-n] REV"
-msgstr "hg strip [-f] [-n] REV"
+msgid "no backups (DEPRECATED)"
+msgstr "ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—作æˆã®æŠ‘æ¢(éžæŽ¨å¥¨)"
+
+msgid "do not modify working copy during strip"
+msgstr "処ç†ä¸ã®ä½œæ¥é ˜åŸŸæ›´æ–°ã‚’抑æ¢"
+
+msgid "hg strip [-k] [-f] [-n] REV..."
+msgstr "hg strip [-k] [-f] [-n] REV..."
msgid "hg qtop [-s]"
msgstr "hg qtop [-s]"
@@ -4506,8 +4626,14 @@
msgid "create new queue"
msgstr "æ–°è¦ã‚ューã®ä½œæˆ"
+msgid "rename active queue"
+msgstr "ç¾è¡Œã‚ューã®æ”¹å"
+
msgid "delete reference to queue"
-msgstr "ã‚ューã®å‰Šé™¤"
+msgstr "ã‚ューã¸ã®å‚ç…§ã®å‰Šé™¤"
+
+msgid "delete queue, and remove patch dir"
+msgstr "ã‚ューãŠã‚ˆã³ç®¡ç†ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã®å‰Šé™¤"
msgid "[OPTION] [QUEUE]"
msgstr "[OPTION] [QUEUE]"
@@ -4644,6 +4770,16 @@
msgstr ""
msgid ""
+"By default, the pager is only executed if a command has output. To\n"
+"force the pager to run even if a command prints nothing, set::"
+msgstr ""
+
+msgid ""
+" [pager]\n"
+" force = True"
+msgstr ""
+
+msgid ""
"If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
"setting::"
msgstr ""
@@ -4683,7 +4819,16 @@
msgid ""
"To ignore global commands like :hg:`version` or :hg:`help`, you have\n"
-"to specify them in your user configuration file.\n"
+"to specify them in your user configuration file."
+msgstr ""
+
+msgid ""
+"The --pager=... option can also be used to control when the pager is\n"
+"used. Use a boolean value like yes, no, on, off, or use auto for\n"
+"normal behavior.\n"
+msgstr ""
+
+msgid "when to paginate (boolean, always, auto, or never)"
msgstr ""
msgid "interpret suffixes to refer to ancestor revisions"
@@ -4719,7 +4864,7 @@
"The series is started off with a \"[PATCH 0 of N]\" introduction, which\n"
"describes the series as a whole."
msgstr ""
-"一連ã®ãƒ¡ãƒ¼ãƒ«ã¯ã€\"[PATCH 0 of N]\" ã‚’ Subject ヘッダã«æŒã¤ã€èª¬æ˜Žãƒ¡ãƒ¼ãƒ«\n"
+"一連ã®ãƒ¡ãƒ¼ãƒ«ã¯ã€ \"[PATCH 0 of N]\" ã‚’ Subject ヘッダã«æŒã¤ã€ 説明メール\n"
"ã‹ã‚‰å§‹ã¾ã‚Šã¾ã™ã€‚"
msgid ""
@@ -4727,9 +4872,9 @@
"first line of the changeset description as the subject text. The\n"
"message contains two or three body parts:"
msgstr ""
-"個々ã®ãƒ¡ãƒ¼ãƒ«ã® Subject ヘッダã¯ã€\"[PATCH M of N]\" ã§å§‹ã¾ã‚Šã€å¯¾å¿œã™ã‚‹\n"
-"リビジョンã®ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®æœ€åˆã®è¡Œã®å†…容ãŒè¨˜è¼‰ã•ã‚Œã¾ã™ã€‚メールã®\n"
-"本文ã¯ã€ä»¥ä¸‹ã®æ§˜ãª2ãªã„ã—3ã®éƒ¨ä½ã‹ã‚‰æ§‹æˆã•ã‚Œã¾ã™:"
+"個々ã®ãƒ¡ãƒ¼ãƒ«ã® Subject ヘッダã¯ã€ \"[PATCH M of N]\" ã§å§‹ã¾ã‚Šã€ 対応ã™ã‚‹\n"
+"リビジョンã®ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®æœ€åˆã®è¡Œã®å†…容ãŒè¨˜è¼‰ã•ã‚Œã¾ã™ã€‚ メールã®\n"
+"本文ã¯ã€ 以下ã®æ§˜ãª2ãªã„ã—3ã®éƒ¨ä½ã‹ã‚‰æ§‹æˆã•ã‚Œã¾ã™:"
msgid ""
"- The changeset description.\n"
@@ -4745,23 +4890,15 @@
"and References headers, so they will show up as a sequence in threaded\n"
"mail and news readers, and in mail archives."
msgstr ""
-"個々ã®ãƒ¡ãƒ¼ãƒ«ã¯ã€In-Reply-To ãŠã‚ˆã³ References ヘッダを使用ã—ã¦ã€1通目ã®\n"
-"メールをå‚ç…§ã—ã¾ã™ã®ã§ã€ãƒ¡ãƒ¼ãƒ«ãƒªãƒ¼ãƒ€ãƒ¼ã‚„ニュースリーダーã§ã®å‚照時やã€\n"
-"メールアーカイブã«ãŠã„ã¦ã¯ã€ä¸€é€£ã®ã‚¹ãƒ¬ãƒƒãƒ‰ã¨ã—ã¦æ‰±ã‚ã‚Œã¾ã™ã€‚"
-
-msgid ""
-"With the -d/--diffstat option, you will be prompted for each changeset\n"
-"with a diffstat summary and the changeset summary, so you can be sure\n"
-"you are sending the right changes."
-msgstr ""
-"-d/--diffstat を指定ã—ãŸå ´åˆã€å·®åˆ†çµ±è¨ˆçµæžœã‚„コミットメッセージを伴ã£ã¦\n"
-"é€ä¿¡ã®æœ‰ç„¡ã®å•ã„åˆã‚ã›ãŒã‚ã‚Šã¾ã™ã®ã§ã€ç¢ºèªã—ãªãŒã‚‰é€ä¿¡ã§ãã¾ã™ã€‚"
+"個々ã®ãƒ¡ãƒ¼ãƒ«ã¯ã€ In-Reply-To ãŠã‚ˆã³ References ヘッダを使用ã—ã¦ã€ 1通目ã®\n"
+"メールをå‚ç…§ã—ã¾ã™ã®ã§ã€ メールリーダーやニュースリーダーã§ã®å‚照時や〠\n"
+"メールアーカイブã«ãŠã„ã¦ã¯ã€ 一連ã®ã‚¹ãƒ¬ãƒƒãƒ‰ã¨ã—ã¦æ‰±ã‚ã‚Œã¾ã™ã€‚"
msgid ""
"To configure other defaults, add a section like this to your hgrc\n"
"file::"
msgstr ""
-"以下ã®æ§˜ãªè¨˜è¿°ã‚’è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«è¿½åŠ ã™ã‚‹ã“ã¨ã§ã€ç„¡æŒ‡å®šæ™‚ã®è¨å®šã‚’変更ã§ã\n"
+"以下ã®æ§˜ãªè¨˜è¿°ã‚’è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«è¿½åŠ ã™ã‚‹ã“ã¨ã§ã€ 無指定時ã®è¨å®šã‚’変更ã§ã\n"
"ã¾ã™::"
msgid ""
@@ -4784,73 +4921,26 @@
"override global ``[email]`` address settings."
msgstr ""
"``[email]`` セクションã«ãŠã‘ã‚‹ã‚°ãƒãƒ¼ãƒãƒ«ãªã‚¢ãƒ‰ãƒ¬ã‚¹è¨å®šã‚ˆã‚Šã‚‚優先ã•ã›ãŸã„\n"
-"è¨å®šãŒã‚ã‚‹å ´åˆã«ã¯ã€``[patchbomb]`` セクションを使ã£ã¦è¨˜è¿°ã—ã¦ãã ã•ã„。"
+"è¨å®šãŒã‚ã‚‹å ´åˆã«ã¯ã€ ``[patchbomb]`` セクションを使ã£ã¦è¨˜è¿°ã—ã¦ãã ã•ã„。"
msgid ""
"Then you can use the :hg:`email` command to mail a series of\n"
"changesets as a patchbomb."
msgstr ""
-"ã“ã“ã¾ã§è¨å®šã§ããŸãªã‚‰ã€:hg:`email` コマンドを使用ã—ã¦ã€ä¸€é€£ã®\n"
+"ã“ã“ã¾ã§è¨å®šã§ããŸãªã‚‰ã€ :hg:`email` コマンドを使用ã—ã¦ã€ 一連ã®\n"
"リビジョンをパッãƒçˆ†å¼¾(patchbomb)ã¨ã—ã¦ãƒ¡ãƒ¼ãƒ«é€ä¿¡ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
msgid ""
-"To avoid sending patches prematurely, it is a good idea to first run\n"
-"the :hg:`email` command with the \"-n\" option (test only). You will be\n"
-"prompted for an email recipient address, a subject and an introductory\n"
-"message describing the patches of your patchbomb. Then when all is\n"
-"done, patchbomb messages are displayed. If the PAGER environment\n"
-"variable is set, your pager will be fired up once for each patchbomb\n"
-"message, so you can verify everything is alright."
-msgstr ""
-"ä¸å®Œå…¨ãªãƒ‘ッãƒã®é€ä¿¡ã‚’防ã上ã§ã€ã¾ãšã¯ \"-n\"(ï¼ã€Œè¡¨ç¤ºã®ã¿ã€)指定付ãã§\n"
-":hg:`email` コマンドを実行ã™ã‚‹ã®ãŒãŠå‹§ã‚ã§ã™ã€‚ã“れを指定ã—ãŸå®Ÿè¡Œã®éš›ã«ã¯\n"
-"é€ä¿¡å…ˆã‚¢ãƒ‰ãƒ¬ã‚¹ã‚„ã€ä¸€é€£ã®ãƒ‘ッãƒã‹ã‚‰æˆã‚‹ãƒ‘ッãƒçˆ†å¼¾ã®èª¬æ˜Žæ–‡ç‰ã®å…¥åŠ›ãŒä¿ƒã•ã‚Œ\n"
-"ã¾ã™ã€‚å¿…è¦ãªå…¥åŠ›ãŒå®Œäº†ã™ã‚‹ã¨ã€é€ä¿¡ã•ã‚Œã‚‹ãƒ¡ãƒ¼ãƒ«ã®å†…容ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚\n"
-"PAGER 環境変数ãŒè¨å®šã•ã‚Œã¦ã„ã‚‹å ´åˆã€ãƒ‘ッãƒçˆ†å¼¾ã‚’構æˆã™ã‚‹ãƒ¡ãƒ¼ãƒ«ã”ã¨ã«ã€\n"
-"環境変数ã«è¨å®šã•ã‚ŒãŸãƒ—ãƒã‚°ãƒ©ãƒ ãŒèµ·å‹•ã•ã‚Œã¾ã™ã®ã§ã€å†…容を確èªã™ã‚‹ã“ã¨ãŒ\n"
-"出æ¥ã¾ã™ã€‚"
-
-msgid ""
-"The -m/--mbox option is also very useful. Instead of previewing each\n"
-"patchbomb message in a pager or sending the messages directly, it will\n"
-"create a UNIX mailbox file with the patch emails. This mailbox file\n"
-"can be previewed with any mail user agent which supports UNIX mbox\n"
-"files, e.g. with mutt::"
-msgstr ""
-"-m/--mbox も有用ã§ã™ã€‚PAGER ã§ã®è¡¨ç¤ºã‚„メールé€ä¿¡ã®ä»£ã‚ã‚Šã«ã€ãƒ‘ッãƒã®\n"
-"ãƒ¡ãƒ¼ãƒ«ã‚’æ ¼ç´ã—㟠UNIX mailbox å½¢å¼ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’作æˆã—ã¾ã™ã€‚ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯\n"
-"UNIX mailbox å½¢å¼ãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾å¿œã—ã¦ã„ã‚‹ä»»æ„ã®ãƒ„ールã§é–²è¦§ã™ã‚‹ã“ã¨ãŒã§ã\n"
-"ã¾ã™ã€‚例ãˆã° mutt ã¨ã„ã†ãƒ„ールã®å ´åˆ::"
-
-msgid " % mutt -R -f mbox"
-msgstr " % mutt -R -f mbox"
-
-msgid ""
-"When you are previewing the patchbomb messages, you can use ``formail``\n"
-"(a utility that is commonly installed as part of the procmail\n"
-"package), to send each message out::"
-msgstr ""
-"パッãƒçˆ†å¼¾ã®å†…容を閲覧ä¸ã«ã€``formail``(procmail パッケージã®ä¸€éƒ¨ã¨ã—ã¦\n"
-"大抵ã®ã‚·ã‚¹ãƒ†ãƒ ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„るユーティリティã§ã™)を使用ã—ã¦\n"
-"メールをé€ä¿¡ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™::"
-
-msgid " % formail -s sendmail -bm -t < mbox"
-msgstr " % formail -s sendmail -bm -t < mbox"
-
-msgid "That should be all. Now your patchbomb is on its way out."
-msgstr "以上ã§å®Œäº†ã§ã™ã€‚ã“ã‚Œã§ãƒ‘ッãƒçˆ†å¼¾ãŒé€ä¿¡ã•ã‚Œã¾ã—ãŸã€‚"
-
-msgid ""
"You can also either configure the method option in the email section\n"
"to be a sendmail compatible mailer or fill out the [smtp] section so\n"
"that the patchbomb extension can automatically send patchbombs\n"
"directly from the commandline. See the [email] and [smtp] sections in\n"
"hgrc(5) for details.\n"
msgstr ""
-"è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã® [email] セクション㧠method 指定を行ã†ã“ã¨ã§ã€sendmail\n"
-"互æ›ã®ãƒ¡ãƒ¼ãƒ«é€ä¿¡ãƒ—ãƒã‚°ãƒ©ãƒ を指定ã™ã‚‹ã“ã¨ã‚‚ã§ãã‚Œã°ã€[smtp] セクションã«\n"
-"å¿…è¦ãªæƒ…å ±ã‚’è¨˜è¿°ã™ã‚‹ã“ã¨ã§ã€å¤–部プãƒã‚°ãƒ©ãƒ ã®åŠ©ã‘を借りãšã« Mercurial ã‹ã‚‰\n"
-"直接パッãƒçˆ†å¼¾ã‚’é€ä¿¡ã™ã‚‹ã“ã¨ã‚‚å¯èƒ½ã§ã™ã€‚ã“れらã®ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã«é–¢ã™ã‚‹è©³ç´°ã¯\n"
+"è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã® [email] セクション㧠method 指定を行ã†ã“ã¨ã§ã€ sendmail\n"
+"互æ›ã®ãƒ¡ãƒ¼ãƒ«é€ä¿¡ãƒ—ãƒã‚°ãƒ©ãƒ を指定ã™ã‚‹ã“ã¨ã‚‚ã§ãã‚Œã°ã€ [smtp] セクションã«\n"
+"å¿…è¦ãªæƒ…å ±ã‚’è¨˜è¿°ã™ã‚‹ã“ã¨ã§ã€ 外部プãƒã‚°ãƒ©ãƒ ã®åŠ©ã‘を借りãšã« Mercurial ã‹ã‚‰\n"
+"直接パッãƒçˆ†å¼¾ã‚’é€ä¿¡ã™ã‚‹ã“ã¨ã‚‚å¯èƒ½ã§ã™ã€‚ ã“れらã®ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã«é–¢ã™ã‚‹è©³ç´°ã¯\n"
"è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«é–¢ã™ã‚‹ãƒ‰ã‚ュメント(hgrc(5))ã‚’å‚ç…§ã—ã¦ãã ã•ã„。\n"
#, python-format
@@ -4860,12 +4950,6 @@
msgid "Please enter a valid value.\n"
msgstr "é©åˆ‡ãªå€¤ã‚’入力ã—ã¦ãã ã•ã„。\n"
-msgid "does the diffstat above look okay?"
-msgstr "上記ã®å·®åˆ†çµ±è¨ˆã§é–“é•ã„ã‚ã‚Šã¾ã›ã‚“ã‹ï¼Ÿ "
-
-msgid "diffstat rejected"
-msgstr "差分統計ãŒå´ä¸‹ã•ã‚Œã¾ã—ãŸ"
-
msgid "send changesets by email"
msgstr "é›»åメールã«ã‚ˆã‚‹å¤‰æ›´å†…容ã®ãƒ‘ッãƒé€ä»˜"
@@ -4874,26 +4958,39 @@
" :hg:`export`, one per message. The series starts with a \"[PATCH 0\n"
" of N]\" introduction, which describes the series as a whole."
msgstr ""
-" 特ã«æŒ‡å®šã®ç„¡ã„å ´åˆã€:hg:`export` ã®ç”Ÿæˆã™ã‚‹å·®åˆ†å½¢å¼ã§ãƒªãƒ“ジョン毎ã«\n"
-" メールãŒé€ä¿¡ã•ã‚Œã¾ã™ã€‚一連ã®ãƒ¡ãƒ¼ãƒ«ã¯ã€\"[PATCH 0 of N]\" ã‚’ Subject\n"
-" ヘッダã«æŒã¤ã€èª¬æ˜Žãƒ¡ãƒ¼ãƒ«ã‹ã‚‰å§‹ã¾ã‚Šã¾ã™ã€‚"
+" 特ã«æŒ‡å®šã®ç„¡ã„å ´åˆã€ :hg:`export` ã®ç”Ÿæˆã™ã‚‹å·®åˆ†å½¢å¼ã§ãƒªãƒ“ジョン毎ã«\n"
+" メールãŒé€ä¿¡ã•ã‚Œã¾ã™ã€‚ 一連ã®ãƒ¡ãƒ¼ãƒ«ã¯ã€ \"[PATCH 0 of N]\" ã‚’ Subject\n"
+" ヘッダã«æŒã¤ã€ 説明メールã‹ã‚‰å§‹ã¾ã‚Šã¾ã™ã€‚"
msgid ""
" Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
" the first line of the changeset description as the subject text.\n"
" The message contains two or three parts. First, the changeset\n"
-" description. Next, (optionally) if the diffstat program is\n"
-" installed and -d/--diffstat is used, the result of running\n"
-" diffstat on the patch. Finally, the patch itself, as generated by\n"
-" :hg:`export`."
-msgstr ""
-" 個々ã®ãƒ¡ãƒ¼ãƒ«ã® Subject ヘッダã¯ã€\"[PATCH M of N]\" ã§å§‹ã¾ã‚Šã€\n"
+" description."
+msgstr ""
+" 個々ã®ãƒ¡ãƒ¼ãƒ«ã® Subject ヘッダã¯ã€ \"[PATCH M of N]\" ã§å§‹ã¾ã‚Šã€ \n"
" 対応ã™ã‚‹ãƒªãƒ“ジョンã®ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®1行目ãŒè¨˜è¼‰ã•ã‚Œã¾ã™ã€‚\n"
-" メール本文ã¯ã€2ãªã„ã—3ã®éƒ¨ä½ã‹ã‚‰æ§‹æˆã•ã‚Œã¾ã™ã€‚最åˆã®éƒ¨ä½ã«ã¯ã‚³ãƒŸãƒƒãƒˆ\n"
-" メッセージã®ç¶šããŒé…ç½®ã•ã‚Œã¾ã™ã€‚diffstat コマンドãŒåˆ©ç”¨å¯èƒ½ã§\n"
-" 且㤠-d/--diffstat ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€æ¬¡ã®éƒ¨ä½ã«ã¯ãƒ‘ッãƒã®å·®åˆ†çµ±è¨ˆãŒ\n"
-" é…ç½®ã•ã‚Œã¾ã™ã€‚最後ã®éƒ¨ä½ã«ã¯ã€:hg:`export` ã®ç”Ÿæˆã™ã‚‹å·®åˆ†ã«ã‚ˆã‚‹\n"
-" パッãƒãŒé…ç½®ã•ã‚Œã¾ã™ã€‚"
+" メール本文ã¯ã€ 2ãªã„ã—3ã®éƒ¨ä½ã‹ã‚‰æ§‹æˆã•ã‚Œã¾ã™ã€‚\n"
+" 最åˆã®éƒ¨ä½ã«ã¯ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®ç¶šããŒé…ç½®ã•ã‚Œã¾ã™ã€‚"
+
+msgid ""
+" With the -d/--diffstat option, if the diffstat program is\n"
+" installed, the result of running diffstat on the patch is inserted."
+msgstr ""
+" -d/--diffstat ãŒæŒ‡å®šã•ã‚Œã€ diffstat コマンドãŒåˆ©ç”¨å¯èƒ½ãªå ´åˆã€ \n"
+" パッãƒã«å¯¾ã™ã‚‹ diffstat ã®å®Ÿè¡ŒçµæžœãŒé…ç½®ã•ã‚Œã¾ã™ã€‚"
+
+msgid " Finally, the patch itself, as generated by :hg:`export`."
+msgstr " 最後ã®éƒ¨ä½ã«ã¯ :hg:`export` ãŒç”Ÿæˆã™ã‚‹å·®åˆ†ãŒé…ç½®ã•ã‚Œã¾ã™ã€‚"
+
+msgid ""
+" With the -d/--diffstat or -c/--confirm options, you will be presented\n"
+" with a final summary of all messages and asked for confirmation before\n"
+" the messages are sent."
+msgstr ""
+" -d/--diffstat ãªã„ã— -c/--confirm ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ \n"
+" メッセージã®é€ä¿¡ã«å…ˆç«‹ã£ã¦ã€ 全メッセージã®ã¾ã¨ã‚ã‚’ä¼´ã£ã¦ã€ \n"
+" 確èªã®å•ã„åˆã‚ã›ãŒã‚ã‚Šã¾ã™ã€‚"
msgid ""
" By default the patch is included as text in the email body for\n"
@@ -4901,17 +4998,17 @@
" an attachment for the patch. With -i/--inline an inline attachment\n"
" will be created."
msgstr ""
-" 特ã«æŒ‡å®šã®ç„¡ã„å ´åˆã€ãƒ‘ッãƒã¯ãƒ¡ãƒ¼ãƒ«æœ¬æ–‡ä¸ã«é€šå¸¸ãƒ†ã‚ストã¨ã—ã¦åŸ‹ã‚è¾¼ã¾\n"
-" ã‚Œã¾ã™ã€‚-a/--attach 指定ã«ã‚ˆã‚Šã€ãƒ‘ッãƒãŒæ·»ä»˜ãƒ•ã‚¡ã‚¤ãƒ«åŒ–ã•ã‚Œã¾ã™ã€‚\n"
-" -i/--inline 指定ã«ã‚ˆã‚Šã€ã‚¤ãƒ³ãƒ©ã‚¤ãƒ³æ·»ä»˜ãƒ•ã‚¡ã‚¤ãƒ«ã¨ãªã‚Šã¾ã™ã€‚"
+" 特ã«æŒ‡å®šã®ç„¡ã„å ´åˆã€ パッãƒã¯ãƒ¡ãƒ¼ãƒ«æœ¬æ–‡ä¸ã«é€šå¸¸ãƒ†ã‚ストã¨ã—ã¦åŸ‹ã‚è¾¼ã¾\n"
+" ã‚Œã¾ã™ã€‚ -a/--attach 指定ã«ã‚ˆã‚Šã€ パッãƒãŒæ·»ä»˜ãƒ•ã‚¡ã‚¤ãƒ«åŒ–ã•ã‚Œã¾ã™ã€‚\n"
+" -i/--inline 指定ã«ã‚ˆã‚Šã€ インライン添付ファイルã¨ãªã‚Šã¾ã™ã€‚"
msgid ""
" With -o/--outgoing, emails will be generated for patches not found\n"
" in the destination repository (or only those which are ancestors\n"
" of the specified revisions if any are provided)"
msgstr ""
-" -o/--outgoing 指定ãŒã‚ã‚‹å ´åˆã€é€£æºå¯¾è±¡ãƒªãƒã‚¸ãƒˆãƒªã«å˜åœ¨ã—ãªã„\n"
-" (ã‚ã‚‹ã„ã¯ã€æŒ‡å®šãƒªãƒ“ジョンã®åå«ã¨ãªã‚‹)リビジョンã®ãŸã‚ã®ãƒ‘ッãƒã®ã¿ãŒ\n"
+" -o/--outgoing 指定ãŒã‚ã‚‹å ´åˆã€ 連æºå¯¾è±¡ãƒªãƒã‚¸ãƒˆãƒªã«å˜åœ¨ã—ãªã„\n"
+" (ã‚ã‚‹ã„ã¯ã€ 指定リビジョンã®åå«ã¨ãªã‚‹)リビジョンã®ãŸã‚ã®ãƒ‘ッãƒã®ã¿ãŒ\n"
" メールã§é€ä¿¡ã•ã‚Œã¾ã™ã€‚"
msgid ""
@@ -4919,11 +5016,38 @@
" single email containing a binary Mercurial bundle as an attachment\n"
" will be sent."
msgstr ""
-" -b/--bundle 指定ãŒã‚ã‚‹å ´åˆã€å¯¾è±¡ãƒªãƒ“ジョンã®é¸æŠžã¯ --outgoing 指定\n"
-" 時ã¨åŒæ§˜ã«è¡Œã‚ã‚Œã¾ã™ãŒã€Mercurial ã®ãƒãƒ³ãƒ‰ãƒ«å½¢å¼ãƒ•ã‚¡ã‚¤ãƒ«ã‚’添付\n"
+" -b/--bundle 指定ãŒã‚ã‚‹å ´åˆã€ 対象リビジョンã®é¸æŠžã¯ --outgoing 指定\n"
+" 時ã¨åŒæ§˜ã«è¡Œã‚ã‚Œã¾ã™ãŒã€ Mercurial ã®ãƒãƒ³ãƒ‰ãƒ«å½¢å¼ãƒ•ã‚¡ã‚¤ãƒ«ã‚’添付\n"
" ファイルã¨ã™ã‚‹å˜ä¸€ã®ãƒ¡ãƒ¼ãƒ«ã¨ã—ã¦é€ä¿¡ã•ã‚Œã¾ã™ã€‚"
msgid ""
+" With -m/--mbox, instead of previewing each patchbomb message in a\n"
+" pager or sending the messages directly, it will create a UNIX\n"
+" mailbox file with the patch emails. This mailbox file can be\n"
+" previewed with any mail user agent which supports UNIX mbox\n"
+" files."
+msgstr ""
+" -m/--mbox ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ PAGER ã§ã®è¡¨ç¤ºã‚„メールé€ä¿¡ã®ä»£ã‚ã‚Šã«ã€ \n"
+" パッãƒã®ãƒ¡ãƒ¼ãƒ«ã‚’æ ¼ç´ã—㟠UNIX mbox å½¢å¼ãƒ•ã‚¡ã‚¤ãƒ«ã‚’作æˆã—ã¾ã™ã€‚\n"
+" ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ UNIX mbox å½¢å¼ã«å¯¾å¿œã—ã¦ã„るツールã§é–²è¦§å¯èƒ½ã§ã™ã€‚"
+
+msgid ""
+" With -n/--test, all steps will run, but mail will not be sent.\n"
+" You will be prompted for an email recipient address, a subject and\n"
+" an introductory message describing the patches of your patchbomb.\n"
+" Then when all is done, patchbomb messages are displayed. If the\n"
+" PAGER environment variable is set, your pager will be fired up once\n"
+" for each patchbomb message, so you can verify everything is alright."
+msgstr ""
+" -n/--test 指定ã®ã‚ã‚‹å ´åˆã€ 一連ã®å‡¦ç†æ‰‹é †ã¯å®Ÿè¡Œã•ã‚Œã¾ã™ãŒã€ \n"
+" メールã®é€ä¿¡ã¯è¡Œã‚ã‚Œã¾ã›ã‚“。 ãã®ä»£ã‚ã‚Šã«ã€ é€ä¿¡å…ˆã‚¢ãƒ‰ãƒ¬ã‚¹ã‚„〠\n"
+" パッãƒèª¬æ˜Žæ–‡ã®å…¥åŠ›ãŒä¿ƒã•ã‚Œã¾ã™ã€‚ å¿…è¦ãªå…¥åŠ›ãŒå®Œäº†ã™ã‚‹ã¨ã€ \n"
+" é€ä¿¡ã•ã‚Œã‚‹ãƒ¡ãƒ¼ãƒ«ã®å†…容ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚\n"
+" PAGER 環境変数ãŒè¨å®šã•ã‚Œã¦ã„ã‚‹å ´åˆã€ パッãƒçˆ†å¼¾ã‚’構æˆã™ã‚‹\n"
+" メールã”ã¨ã«ã€ 環境変数ã«è¨å®šã•ã‚ŒãŸãƒ—ãƒã‚°ãƒ©ãƒ ãŒèµ·å‹•ã•ã‚Œã¾ã™ã®ã§ã€ \n"
+" 内容を確èªã™ã‚‹ã“ã¨ãŒå‡ºæ¥ã¾ã™ã€‚"
+
+msgid ""
" hg email -r 3000 # send patch 3000 only\n"
" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
" hg email -r 3000:3005 # send patches 3000 through 3005\n"
@@ -4958,15 +5082,32 @@
" hg email -b -r 3000 DEST # DEST ã«ç„¡ã„ 3000 以後を bundle å½¢å¼ã§"
msgid ""
+" hg email -o -m mbox && # generate an mbox file...\n"
+" mutt -R -f mbox # ... and view it with mutt\n"
+" hg email -o -m mbox && # generate an mbox file ...\n"
+" formail -s sendmail \\ # ... and use formail to send from the "
+"mbox\n"
+" -bm -t < mbox # ... using sendmail"
+msgstr ""
+" hg email -o -m mbox && # mbox ファイルを生æˆã—...\n"
+" mutt -R -f mbox # ... mutt ã§é–²è¦§\n"
+" hg email -o -m mbox && # mbox ファイルを生æˆã— ...\n"
+" formail -s sendmail \\ # ... formail を使用ã—ã¦\n"
+" -bm -t < mbox # ... sendmail 経由ã§é€ä¿¡"
+
+msgid ""
" Before using this command, you will need to enable email in your\n"
" hgrc. See the [email] section in hgrc(5) for details.\n"
" "
msgstr ""
-" 本コマンドを使用ã™ã‚‹å‰ã«ã€è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«é›»åメール関連è¨å®šã‚’記述ã™ã‚‹\n"
-" å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«é–¢ã™ã‚‹ãƒ‰ã‚ュメント(hgrc(5))ã‚’å‚ç…§ã—ã¦\n"
+" 本コマンドを使用ã™ã‚‹å‰ã«ã€ è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«é›»åメール関連è¨å®šã‚’記述ã™ã‚‹\n"
+" å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«é–¢ã™ã‚‹ãƒ‰ã‚ュメント(hgrc(5))ã‚’å‚ç…§ã—ã¦\n"
" ãã ã•ã„。\n"
" "
+msgid "no changes found\n"
+msgstr "差分ã¯ã‚ã‚Šã¾ã›ã‚“\n"
+
msgid "specify at least one changeset with -r or -o"
msgstr "-r åˆã¯ -o を使用ã—ã¦ãƒªãƒ“ジョンを指定ã—ã¦ãã ã•ã„"
@@ -4990,8 +5131,24 @@
msgid "This patch series consists of %d patches."
msgstr "一連ã®ãƒ‘ッãƒã¯ %d 個ã®ãƒ‘ッãƒã‹ã‚‰æ§‹æˆã•ã‚Œã¦ã„ã¾ã™ã€‚"
-msgid "Final summary:\n"
-msgstr "統計çµæžœ:\n"
+msgid ""
+"\n"
+"Final summary:"
+msgstr ""
+"\n"
+"統計çµæžœ:"
+
+msgid "are you sure you want to send (yn)?"
+msgstr "メールをé€ä¿¡ã—ã¾ã™ã‹ï¼Ÿ(yn)"
+
+msgid "&No"
+msgstr "&No"
+
+msgid "&Yes"
+msgstr "&Yes"
+
+msgid "patchbomb canceled"
+msgstr "メールã¯é€ä¿¡ã—ã¾ã›ã‚“"
msgid "Displaying "
msgstr "è¡¨ç¤ºä¸ "
@@ -4999,9 +5156,15 @@
msgid "Writing "
msgstr "書ã出ã—ä¸ "
+msgid "writing"
+msgstr "書ã出ã—ä¸"
+
msgid "Sending "
msgstr "é€ä¿¡ä¸ "
+msgid "sending"
+msgstr "é€ä¿¡ä¸"
+
msgid "send patches as attachments"
msgstr "添付ファイルã¨ã—ã¦ãƒ‘ッãƒã‚’é€ä¿¡"
@@ -5014,6 +5177,9 @@
msgid "email addresses of copy recipients"
msgstr "CC 宛先ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹"
+msgid "ask for confirmation before sending"
+msgstr "é€ä¿¡å‰ã«ç¢ºèªã‚’実施"
+
msgid "add diffstat output to messages"
msgstr "差分統計を出力ã«è¿½åŠ "
@@ -5030,7 +5196,7 @@
msgstr "é€ä¿¡äºˆå®šã®ãƒ¡ãƒ¼ãƒ«ã®å†…容を表示"
msgid "write messages to mbox file instead of sending them"
-msgstr "メールé€ä¿¡ã®ä»£ã‚ã‚Šã«ã€mbox ファイルã«æ›¸ã出ã™"
+msgstr "メールé€ä¿¡ã®ä»£ã‚ã‚Šã«ã€ mbox ファイルã«æ›¸ã出ã™"
msgid "email addresses replies should be sent to"
msgstr "返信メールã®é€ä»˜å…ˆã‚¢ãƒ‰ãƒ¬ã‚¹"
@@ -5166,7 +5332,7 @@
msgstr "ディレクトリ %s を削除ã—ã¦ã„ã¾ã™\n"
msgid "abort if an error occurs"
-msgstr "エラーãŒç™ºç”Ÿã—ãŸå ´åˆã€ä¸æ–ã™ã‚‹"
+msgstr "エラーãŒç™ºç”Ÿã—ãŸå ´åˆã€ ä¸æ–ã™ã‚‹"
msgid "purge ignored files too"
msgstr "無視ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚‚削除ã™ã‚‹"
@@ -5187,7 +5353,7 @@
"This extension lets you rebase changesets in an existing Mercurial\n"
"repository."
msgstr ""
-"本エクステンションã¯ã€æ—¢å˜ã® Mercurial リãƒã‚¸ãƒˆãƒªã«ãŠã‘るリビジョンã®\n"
+"本エクステンションã¯ã€ æ—¢å˜ã® Mercurial リãƒã‚¸ãƒˆãƒªã«ãŠã‘るリビジョンã®\n"
"リベースをå¯èƒ½ã«ã—ã¾ã™ã€‚"
msgid ""
@@ -5207,8 +5373,8 @@
" development tree."
msgstr ""
" ã‚ã‚‹å±¥æ´ä½ç½®(移動元)ã‹ã‚‰åˆ¥ãªä½ç½®(移動先)ã¸ã¨ãƒªãƒ“ジョンを移動ã™ã‚‹ãŸã‚\n"
-" 本コマンドã¯å復的ãªãƒžãƒ¼ã‚¸ã‚’è¡Œãªã„ã¾ã™ã€‚ã“ã®æ©Ÿèƒ½ã¯ã€æ‰‹å…ƒã®ãƒªãƒã‚¸ãƒˆãƒª\n"
-" ã«ãŠã‘ã‚‹æˆæžœã‚’ã€é–‹ç™ºç”¨ã®ãƒžã‚¹ã‚¿ãƒ¼ãƒªãƒã‚¸ãƒˆãƒªã«åæ˜ ã™ã‚‹éš›ã«ã€æžåˆ†ã‹ã‚Œã®\n"
+" 本コマンドã¯å復的ãªãƒžãƒ¼ã‚¸ã‚’è¡Œãªã„ã¾ã™ã€‚ ã“ã®æ©Ÿèƒ½ã¯ã€ 手元ã®ãƒªãƒã‚¸ãƒˆãƒª\n"
+" ã«ãŠã‘ã‚‹æˆæžœã‚’〠開発用ã®ãƒžã‚¹ã‚¿ãƒ¼ãƒªãƒã‚¸ãƒˆãƒªã«åæ˜ ã™ã‚‹éš›ã«ã€ æžåˆ†ã‹ã‚Œã®\n"
" ç„¡ã„状態ã«ã—ãŸã„å ´åˆãªã©ã§æœ‰ç”¨ã§ã™ã€‚"
msgid ""
@@ -5217,9 +5383,9 @@
" same rebase or they will end up with duplicated changesets after\n"
" pulling in your rebased changesets."
msgstr ""
-" ä»–ã®åˆ©ç”¨è€…ã«å…¬é–‹æ¸ˆã¿ã®ãƒªãƒ“ジョンã¯ã€ç§»å‹•ã™ã¹ãã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n"
-" 公開済ã¿ãƒªãƒ“ジョンã®ç§»å‹•ã¯ã€ä»–ã®åˆ©ç”¨è€…ã«åŒæ§˜ã®ç§»å‹•æ“作を強制ã™ã‚‹\n"
-" ã“ã¨ã«ãªã£ãŸã‚Šã€ã‚ãªãŸãŒç§»å‹•ã—ãŸå¾Œã®ãƒªãƒ“ジョンをå–り込むã“ã¨ã§ã€\n"
+" ä»–ã®åˆ©ç”¨è€…ã«å…¬é–‹æ¸ˆã¿ã®ãƒªãƒ“ジョンã¯ã€ 移動ã™ã¹ãã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n"
+" 公開済ã¿ãƒªãƒ“ジョンã®ç§»å‹•ã¯ã€ ä»–ã®åˆ©ç”¨è€…ã«åŒæ§˜ã®ç§»å‹•æ“作を強制ã™ã‚‹\n"
+" ã“ã¨ã«ãªã£ãŸã‚Šã€ ã‚ãªãŸãŒç§»å‹•ã—ãŸå¾Œã®ãƒªãƒ“ジョンをå–り込むã“ã¨ã§ã€ \n"
" åŒä¸€ãƒªãƒ“ジョンãŒé‡è¤‡ã—ãŸçŠ¶æ…‹ã«ãªã£ã¦ã—ã¾ã£ãŸã‚Šã—ã¾ã™ã€‚"
msgid ""
@@ -5228,9 +5394,9 @@
" destination. (The destination changeset is not modified by\n"
" rebasing, but new changesets are added as its descendants.)"
msgstr ""
-" 移動先リビジョン (``-d/--dest``) ãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€ç¾è¡Œãƒ–ランãƒã®\n"
-" 最新ヘッドを移動先ã¨ã¿ãªã—ã¾ã™ã€‚(移動先リビジョンãŒæ”¹å¤‰ã•ã‚Œã‚‹ã“ã¨ã¯\n"
-" ã‚ã‚Šã¾ã›ã‚“ãŒã€ç§»å‹•å…ˆã®åå«ã¨ã—ã¦æ–°è¦ãƒªãƒ“ジョンãŒè¿½åŠ ã•ã‚Œã¾ã™)"
+" 移動先リビジョン (``-d/--dest``) ãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€ ç¾è¡Œãƒ–ランãƒã®\n"
+" 最新ヘッドを移動先ã¨ã¿ãªã—ã¾ã™ã€‚ (移動先リビジョンãŒæ”¹å¤‰ã•ã‚Œã‚‹ã“ã¨ã¯\n"
+" ã‚ã‚Šã¾ã›ã‚“ãŒã€ 移動先ã®åå«ã¨ã—ã¦æ–°è¦ãƒªãƒ“ジョンãŒè¿½åŠ ã•ã‚Œã¾ã™)"
msgid ""
" You can specify which changesets to rebase in two ways: as a\n"
@@ -5245,16 +5411,16 @@
" the whole branch. If you specify neither ``-s`` nor ``-b``, rebase\n"
" uses the parent of the working directory as the base."
msgstr ""
-" 移動対象リビジョンã¯ã€\"source\" 指定㨠\"base\" 指定ã®2ã¤ã®æ–¹æ³•ã§\n"
-" 指定å¯èƒ½ã§ã™ã€‚ã©ã¡ã‚‰ã‚‚å±¥æ´ãƒ„リー上ã‹ã‚‰ã€Œç§»å‹•å…ƒãƒ–ランãƒã€ãƒªãƒ“ジョンを\n"
-" 抽出ã™ã‚‹ãŸã‚ã®ç°¡ç•¥è¡¨ç¾ã§ã™ã€‚ \"source\" (``-s/--source``) を指定ã—ãŸ\n"
-" å ´åˆã€æŒ‡å®šãƒªãƒ“ジョンãŠã‚ˆã³ãã®åå«å…¨ã¦ã‚’移動ã—ã¾ã™ã€‚ \"base\" \n"
-" (``-b/--base``) を指定ã—ãŸå ´åˆã€ç§»å‹•å…ˆãƒªãƒ“ジョンã¨å…±é€šã¨ãªã‚‹å…ˆç¥–ã‚’\n"
-" å«ã¾ãªã„範囲ã§æŒ‡å®šãƒªãƒ“ジョンã®å…ˆç¥–ã¸ã¨é¡ã‚Šã€ç§»å‹•å¯¾è±¡ã‚’é¸æŠžã—ã¾ã™ã€‚\n"
-" ãã®ãŸã‚ã€``-s`` ã§ã®æŒ‡å®šã¨æ¯”較ã—ã¦ã€ ``-b`` ã§ã®æŒ‡å®šã¯ç²¾å¯†ã•ã§ã¯\n"
-" 劣りã¾ã™ãŒã€ãã®åˆ†ä¾¿åˆ©ã§ã™ã€‚移動元ã®ãƒ–ランãƒã§ä»»æ„ã®ãƒªãƒ“ジョンを\n"
-" é¸æŠžã™ã‚‹ã“ã¨ã§ã€ãƒ–ランãƒå…¨ä½“ã‹ã‚‰å¯¾è±¡ãŒè‡ªå‹•çš„ã«é¸æŠžã•ã‚Œã¾ã™ã€‚\n"
-" ``-s`` ã‚‚ ``-b`` も指定ã—ãªã„å ´åˆã€ä½œæ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンを \n"
+" 移動対象リビジョンã¯ã€ \"source\" 指定㨠\"base\" 指定ã®2ã¤ã®æ–¹æ³•ã§\n"
+" 指定å¯èƒ½ã§ã™ã€‚ ã©ã¡ã‚‰ã‚‚å±¥æ´ãƒ„リー上ã‹ã‚‰ã€Œç§»å‹•å…ƒãƒ–ランãƒã€ãƒªãƒ“ジョンを\n"
+" 抽出ã™ã‚‹ãŸã‚ã®ç°¡ç•¥è¡¨ç¾ã§ã™ã€‚ \"source\" (``-s/--source``) を指定ã—ãŸ\n"
+" å ´åˆã€ 指定リビジョンãŠã‚ˆã³ãã®åå«å…¨ã¦ã‚’移動ã—ã¾ã™ã€‚ \"base\" \n"
+" (``-b/--base``) を指定ã—ãŸå ´åˆã€ 移動先リビジョンã¨å…±é€šã¨ãªã‚‹å…ˆç¥–ã‚’\n"
+" å«ã¾ãªã„範囲ã§æŒ‡å®šãƒªãƒ“ジョンã®å…ˆç¥–ã¸ã¨é¡ã‚Šã€ 移動対象をé¸æŠžã—ã¾ã™ã€‚\n"
+" ãã®ãŸã‚〠``-s`` ã§ã®æŒ‡å®šã¨æ¯”較ã—ã¦ã€ ``-b`` ã§ã®æŒ‡å®šã¯ç²¾å¯†ã•ã§ã¯\n"
+" 劣りã¾ã™ãŒã€ ãã®åˆ†ä¾¿åˆ©ã§ã™ã€‚ 移動元ã®ãƒ–ランãƒã§ä»»æ„ã®ãƒªãƒ“ジョンを\n"
+" é¸æŠžã™ã‚‹ã“ã¨ã§ã€ ブランãƒå…¨ä½“ã‹ã‚‰å¯¾è±¡ãŒè‡ªå‹•çš„ã«é¸æŠžã•ã‚Œã¾ã™ã€‚\n"
+" ``-s`` ã‚‚ ``-b`` も指定ã—ãªã„å ´åˆã€ 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンを \n"
" \"base\" ã¨ã¿ãªã—ã¾ã™ã€‚"
msgid ""
@@ -5264,10 +5430,10 @@
" changesets in the source branch (e.g. merges from the destination\n"
" branch) may be dropped if they no longer contribute any change."
msgstr ""
-" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€æœ¬ã‚³ãƒžãƒ³ãƒ‰ã¯ç§»å‹•å…ƒãƒ–ランãƒã®ãƒªãƒ“ジョンをã€\n"
-" 移動先ã®åå«ã¨ã—ã¦å†ç”Ÿæˆã—ã€ãã®å¾Œã«å…ƒãƒªãƒ“ã‚¸ãƒ§ãƒ³ã‚’ç ´æ£„ã—ã¾ã™ã€‚\n"
-" 移動元リビジョンを残ã™å ´åˆã€``--keep`` を指定ã—ã¦ãã ã•ã„。\n"
-" 移動元ブランãƒã®ãƒªãƒ“ジョンã®ã†ã¡ã€ä½•ã‚‚貢献ã®ç„¡ã„リビジョン\n"
+" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€ 本コマンドã¯ç§»å‹•å…ƒãƒ–ランãƒã®ãƒªãƒ“ジョンを〠\n"
+" 移動先ã®åå«ã¨ã—ã¦å†ç”Ÿæˆã—〠ãã®å¾Œã«å…ƒãƒªãƒ“ã‚¸ãƒ§ãƒ³ã‚’ç ´æ£„ã—ã¾ã™ã€‚\n"
+" 移動元リビジョンを残ã™å ´åˆã€ ``--keep`` を指定ã—ã¦ãã ã•ã„。\n"
+" 移動元ブランãƒã®ãƒªãƒ“ジョンã®ã†ã¡ã€ 何も貢献ã®ç„¡ã„リビジョン\n"
" (例: 移動先ブランãƒã¨ã®ãƒžãƒ¼ã‚¸å®Ÿæ–½ãƒªãƒ“ジョンç‰) ã¯ç„¡è¦–ã•ã‚Œã¾ã™ã€‚"
msgid ""
@@ -5283,14 +5449,14 @@
" If a rebase is interrupted to manually resolve a merge, it can be\n"
" continued with --continue/-c or aborted with --abort/-a."
msgstr ""
-" 手動マージã«ã‚ˆã‚‹è¡çªè§£æ¶ˆã®å¿…è¦ã‹ã‚‰ä¸æ–ã•ã‚ŒãŸå ´åˆã€--continue/-c ã§\n"
-" 処ç†ã‚’継続ã—ãŸã‚Šã€--abort/-a ã§å‡¦ç†ã‚’終了ã•ã›ãŸã‚Šã§ãã¾ã™ã€‚"
+" 手動マージã«ã‚ˆã‚‹è¡çªè§£æ¶ˆã®å¿…è¦ã‹ã‚‰ä¸æ–ã•ã‚ŒãŸå ´åˆã€ --continue/-c ã§\n"
+" 処ç†ã‚’継続ã—ãŸã‚Šã€ --abort/-a ã§å‡¦ç†ã‚’終了ã•ã›ãŸã‚Šã§ãã¾ã™ã€‚"
msgid ""
" Returns 0 on success, 1 if nothing to rebase.\n"
" "
msgstr ""
-" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0ã€ç§»æ¤ãŒå®Ÿæ–½ã•ã‚Œãªã„å ´åˆã¯ 1 ã§ã™ã€‚\n"
+" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0〠移æ¤ãŒå®Ÿæ–½ã•ã‚Œãªã„å ´åˆã¯ 1 ã§ã™ã€‚\n"
" "
msgid "cannot use both abort and continue"
@@ -5303,7 +5469,7 @@
msgstr "--detach 㯠--abort ã‚„ --continue ã¨ä½µç”¨ã§ãã¾ã›ã‚“"
msgid "abort and continue do not allow specifying revisions"
-msgstr "--abort ã‚„ --continue ã¯ã€ã‚Šãƒ“ジョン指定ã¨ä½µç”¨ã§ãã¾ã›ã‚“"
+msgstr "--abort ã‚„ --continue ã¯ã€ りビジョン指定ã¨ä½µç”¨ã§ãã¾ã›ã‚“"
msgid "cannot specify both a revision and a base"
msgstr "--soruce 㨠--base ã¯ä½µç”¨ã§ãã¾ã›ã‚“"
@@ -5320,18 +5486,24 @@
msgid "cannot use both keepbranches and extrafn"
msgstr "--keepbranches 㨠--extrafn ã¯ä½µç”¨ã§ãã¾ã›ã‚“"
+msgid "rebasing"
+msgstr "リベース実施ä¸"
+
+msgid "changesets"
+msgstr "ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆ"
+
msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
msgstr " 'hg resolve' ã§è¡çªè§£æ¶ˆã—ã¦ã‹ã‚‰ 'hg rebase --continue' ã—ã¦ãã ã•ã„"
#, python-format
msgid "no changes, revision %d skipped\n"
-msgstr "変更ãŒãªã„ã®ã§ã€ãƒªãƒ“ジョン %d をスã‚ップ\n"
+msgstr "変更ãŒãªã„ã®ã§ã€ リビジョン %d をスã‚ップ\n"
msgid "rebase merging completed\n"
msgstr "リベースã®ãƒžãƒ¼ã‚¸å‡¦ç†ãŒå®Œäº†\n"
msgid "warning: new changesets detected on source branch, not stripping\n"
-msgstr "è¦å‘Š: リベース元ã«æ–°è¦ãƒªãƒ“ジョンを検出ã—ãŸã®ã§ã€ç ´æ£„ã—ã¾ã›ã‚“\n"
+msgstr "è¦å‘Š: リベース元ã«æ–°è¦ãƒªãƒ“ジョンを検出ã—ãŸã®ã§ã€ ç ´æ£„ã—ã¾ã›ã‚“\n"
msgid "rebase completed\n"
msgstr "リベース完了\n"
@@ -5341,11 +5513,11 @@
msgstr "%d 個ã®ãƒªãƒ“ジョンをスã‚ップ\n"
msgid "unable to collapse, there is more than one external parent"
-msgstr "複数ã®è¦ªã¨ã®é–¢ä¿‚ã‹ã‚‰ã€--collapse ã¯æŒ‡å®šã§ãã¾ã›ã‚“"
+msgstr "複数ã®è¦ªã¨ã®é–¢ä¿‚ã‹ã‚‰ã€ --collapse ã¯æŒ‡å®šã§ãã¾ã›ã‚“"
#, python-format
msgid "cannot use revision %d as base, result would have 3 parents"
-msgstr "親リビジョン㌠3 ã¤ã«ãªã‚‹ã®ã§ã€ãƒªãƒ“ジョン %d をベースã«ã§ãã¾ã›ã‚“"
+msgstr "親リビジョン㌠3 ã¤ã«ãªã‚‹ã®ã§ã€ リビジョン %d をベースã«ã§ãã¾ã›ã‚“"
msgid "no rebase in progress"
msgstr "進行ä¸ã®ãƒªãƒ™ãƒ¼ã‚¹çŠ¶æ…‹ã¯ã‚ã‚Šã¾ã›ã‚“"
@@ -5415,7 +5587,7 @@
#, python-format
msgid "%d hunks, %d lines changed\n"
-msgstr "%d 個ã®ãƒãƒ³ã‚¯ã€%d è¡Œã®å¤‰æ›´\n"
+msgstr "%d 個ã®ãƒãƒ³ã‚¯ã€ %d è¡Œã®å¤‰æ›´\n"
msgid "[Ynsfdaq?]"
msgstr "[Ynsfdaq?]"
@@ -5472,9 +5644,6 @@
" ファイル一覧ãŒæŒ‡å®šã•ã‚Œãªã‹ã£ãŸå ´åˆã¯ :hg:`status` ã§è¡¨ç¤ºã•ã‚Œã‚‹\n"
" å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒè¨˜éŒ²ã®å¯¾è±¡ã¨ãªã‚Šã¾ã™ã€‚"
-msgid " See :hg:`help dates` for a list of formats valid for -d/--date."
-msgstr " -d/--date ã§ã®æ—¥æ™‚表記㯠:hg:`help dates` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
-
msgid ""
" You will be prompted for whether to record changes to each\n"
" modified file, and for files with multiple changes, for each\n"
@@ -5525,9 +5694,6 @@
msgid "no changes to record\n"
msgstr "記録å¯èƒ½ãªå¤‰æ›´ãŒã‚ã‚Šã¾ã›ã‚“\n"
-msgid "patch failed to apply"
-msgstr "パッãƒã®é©ç”¨ã«å¤±æ•—"
-
msgid "hg record [OPTION]... [FILE]..."
msgstr "hg record [OPTION]... [FILE]..."
@@ -5603,9 +5769,6 @@
msgid "not linkable: %s\n"
msgstr "リンクä¸å¯ãƒ•ã‚¡ã‚¤ãƒ«: %s\n"
-msgid " files"
-msgstr " ファイル"
-
msgid "pruning"
msgstr "刈り込ã¿ä¸"
@@ -5689,15 +5852,16 @@
msgstr ""
msgid ""
-" NOTE: using rollback or extensions that destroy/modify history\n"
-" (mq, rebase, etc.) can cause considerable confusion with shared\n"
-" clones. In particular, if two shared clones are both updated to\n"
-" the same changeset, and one of them destroys that changeset with\n"
-" rollback, the other clone will suddenly stop working: all\n"
-" operations will fail with \"abort: working directory has unknown\n"
-" parent\". The only known workaround is to use debugsetparents on\n"
-" the broken clone to reset it to a changeset that still exists\n"
-" (e.g. tip).\n"
+" .. note::\n"
+" using rollback or extensions that destroy/modify history (mq,\n"
+" rebase, etc.) can cause considerable confusion with shared\n"
+" clones. In particular, if two shared clones are both updated to\n"
+" the same changeset, and one of them destroys that changeset\n"
+" with rollback, the other clone will suddenly stop working: all\n"
+" operations will fail with \"abort: working directory has unknown\n"
+" parent\". The only known workaround is to use debugsetparents on\n"
+" the broken clone to reset it to a changeset that still exists\n"
+" (e.g. tip).\n"
" "
msgstr ""
@@ -5711,14 +5875,14 @@
msgstr "別ブランãƒã‹ã‚‰ãƒ‘ッãƒã‚’移æ¤ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰"
msgid "This extension allows you to transplant patches from another branch."
-msgstr "本エクステンションã¯ã€åˆ¥ãƒ–ランãƒã‹ã‚‰ã®ãƒ‘ッãƒã®ç§»æ¤ã‚’å¯èƒ½ã«ã—ã¾ã™ã€‚"
+msgstr "本エクステンションã¯ã€ 別ブランãƒã‹ã‚‰ã®ãƒ‘ッãƒã®ç§»æ¤ã‚’å¯èƒ½ã«ã—ã¾ã™ã€‚"
msgid ""
"Transplanted patches are recorded in .hg/transplant/transplants, as a\n"
"map from a changeset hash to its hash in the source repository.\n"
msgstr ""
-"移æ¤ã•ã‚ŒãŸãƒ‘ッãƒã®æƒ…å ±ã¯ã€ç§»æ¤å…ˆãƒªãƒ“ジョンã®ãƒãƒƒã‚·ãƒ¥å€¤ã‹ã‚‰ã€ç§»æ¤å…ƒ\n"
-"リãƒã‚¸ãƒˆãƒªã«ãŠã‘ã‚‹ãƒãƒƒã‚·ãƒ¥å€¤ã¸ã®å¤‰æ›ã¨ã—ã¦ã€.hg/transplant/transplants\n"
+"移æ¤ã•ã‚ŒãŸãƒ‘ッãƒã®æƒ…å ±ã¯ã€ 移æ¤å…ˆãƒªãƒ“ジョンã®ãƒãƒƒã‚·ãƒ¥å€¤ã‹ã‚‰ã€ 移æ¤å…ƒ\n"
+"リãƒã‚¸ãƒˆãƒªã«ãŠã‘ã‚‹ãƒãƒƒã‚·ãƒ¥å€¤ã¸ã®å¤‰æ›ã¨ã—ã¦ã€ .hg/transplant/transplants\n"
"ã«è¨˜éŒ²ã•ã‚Œã¾ã™ã€‚\n"
#, python-format
@@ -5799,8 +5963,8 @@
" directory with the log of the original changeset. If --log is\n"
" specified, log messages will have a comment appended of the form::"
msgstr ""
-" é¸æŠžã•ã‚ŒãŸãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã¯ã€å…ƒãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã®ã‚³ãƒŸãƒƒãƒˆãƒã‚°ã¨ä¸€ç·’ã«\n"
-" ç¾åœ¨ã®ä½œæ¥é ˜åŸŸä¸Šã«é©ç”¨ã•ã‚Œã¾ã™ã€‚--log 指定ãŒã‚ã‚‹å ´åˆã€ä»¥ä¸‹ã®å½¢å¼ã®\n"
+" é¸æŠžã•ã‚ŒãŸãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã¯ã€ å…ƒãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã®ã‚³ãƒŸãƒƒãƒˆãƒã‚°ã¨ä¸€ç·’ã«\n"
+" ç¾åœ¨ã®ä½œæ¥é ˜åŸŸä¸Šã«é©ç”¨ã•ã‚Œã¾ã™ã€‚ --log 指定ãŒã‚ã‚‹å ´åˆã€ 以下ã®å½¢å¼ã®\n"
" メッセージãŒè¿½åŠ ã•ã‚Œã¾ã™::"
msgid " (transplanted from CHANGESETHASH)"
@@ -5811,8 +5975,8 @@
" Its argument will be invoked with the current changelog message as\n"
" $1 and the patch as $2."
msgstr ""
-" --filter ã«ã‚ˆã‚Šã‚³ãƒŸãƒƒãƒˆãƒã‚°ã‚’改変ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚指定ã•ã‚ŒãŸå€¤ã¯\n"
-" コマンド起動ã«ä½¿ç”¨ã•ã‚Œã€ç¬¬1引数ã«ã¯ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã€ç¬¬2引数ã«ã¯\n"
+" --filter ã«ã‚ˆã‚Šã‚³ãƒŸãƒƒãƒˆãƒã‚°ã‚’改変ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ 指定ã•ã‚ŒãŸå€¤ã¯\n"
+" コマンド起動ã«ä½¿ç”¨ã•ã‚Œã€ 第1引数ã«ã¯ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã€ 第2引数ã«ã¯\n"
" パッãƒãŒæŒ‡å®šã•ã‚Œã¾ã™ã€‚"
msgid ""
@@ -5823,10 +5987,10 @@
" transplanted, otherwise you will be prompted to select the\n"
" changesets you want."
msgstr ""
-" --source/-s ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€æŒ‡å®šã®ãƒªãƒã‚¸ãƒˆãƒªã‹ã‚‰ç§»æ¤ã•ã‚Œã¾ã™ã€‚\n"
-" --branch/-b ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€æŒ‡å®šã®åå‰ã‚’æŒã¤ãƒ–ランãƒã‹ã‚‰ç§»æ¤\n"
-" ã•ã‚Œã¾ã™ã€‚--all/-a ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€æŒ‡å®šã•ã‚ŒãŸãƒ–ランãƒä¸ã®å…¨ã¦ã®\n"
-" ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆãŒç§»æ¤å¯¾å‡¦ã¨ãªã‚Šã€ãれ以外ã®å ´åˆã¯ç§»æ¤å¯¾è±¡ã¨ã™ã‚‹\n"
+" --source/-s ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 指定ã®ãƒªãƒã‚¸ãƒˆãƒªã‹ã‚‰ç§»æ¤ã•ã‚Œã¾ã™ã€‚\n"
+" --branch/-b ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 指定ã®åå‰ã‚’æŒã¤ãƒ–ランãƒã‹ã‚‰ç§»æ¤\n"
+" ã•ã‚Œã¾ã™ã€‚ --all/-a ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 指定ã•ã‚ŒãŸãƒ–ランãƒä¸ã®å…¨ã¦ã®\n"
+" ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆãŒç§»æ¤å¯¾å‡¦ã¨ãªã‚Šã€ ãれ以外ã®å ´åˆã¯ç§»æ¤å¯¾è±¡ã¨ã™ã‚‹\n"
" ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã®å•ã„åˆã‚ã›ãŒã‚ã‚Šã¾ã™ã€‚"
msgid ""
@@ -5834,8 +5998,8 @@
" branch (up to the named revision) onto your current working\n"
" directory."
msgstr ""
-" :hg:`transplant --branch REVISION --all` å½¢å¼ã§ã®èµ·å‹•ã®å ´åˆã€\n"
-" 指定 REVISION ã¾ã§ã®ãƒ–ランãƒå…¨ä½“ãŒã€ç¾åœ¨ã®ä½œæ¥é ˜åŸŸä¸Šã«ç§»æ¤ã•ã‚Œã¾ã™ã€‚"
+" :hg:`transplant --branch REVISION --all` å½¢å¼ã§ã®èµ·å‹•ã®å ´åˆã€ \n"
+" 指定 REVISION ã¾ã§ã®ãƒ–ランãƒå…¨ä½“ãŒã€ ç¾åœ¨ã®ä½œæ¥é ˜åŸŸä¸Šã«ç§»æ¤ã•ã‚Œã¾ã™ã€‚"
msgid ""
" You can optionally mark selected transplanted changesets as merge\n"
@@ -5843,15 +6007,15 @@
" of a merged transplant, and you can merge descendants of them\n"
" normally instead of transplanting them."
msgstr ""
-" é¸æŠžã—ãŸå¯¾è±¡ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã®ç§»æ¤ã‚’ã€ãƒžãƒ¼ã‚¸å®Ÿæ–½ã¨ã¿ãªã™ã“ã¨ã‚‚å¯èƒ½\n"
-" ã§ã™ã€‚移æ¤ã®éš›ã«ãƒžãƒ¼ã‚¸å¯¾è±¡ãƒªãƒ“ジョンã«é–¢ã™ã‚‹å•ã„åˆã‚ã›ã¯ç„¡ãã€ç§»æ¤\n"
-" 後ã®ç§»æ¤å…ƒã®åå«ã«å¯¾ã—ã¦ã¯ã€ç§»æ¤ã§ã¯ãªã通常ã®ãƒžãƒ¼ã‚¸ãŒå¯èƒ½ã§ã™ã€‚"
+" é¸æŠžã—ãŸå¯¾è±¡ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã®ç§»æ¤ã‚’〠マージ実施ã¨ã¿ãªã™ã“ã¨ã‚‚å¯èƒ½\n"
+" ã§ã™ã€‚ 移æ¤ã®éš›ã«ãƒžãƒ¼ã‚¸å¯¾è±¡ãƒªãƒ“ジョンã«é–¢ã™ã‚‹å•ã„åˆã‚ã›ã¯ç„¡ã〠移æ¤\n"
+" 後ã®ç§»æ¤å…ƒã®åå«ã«å¯¾ã—ã¦ã¯ã€ 移æ¤ã§ã¯ãªã通常ã®ãƒžãƒ¼ã‚¸ãŒå¯èƒ½ã§ã™ã€‚"
msgid ""
" If no merges or revisions are provided, :hg:`transplant` will\n"
" start an interactive changeset browser."
msgstr ""
-" マージ対象もリビジョン指定もãªã„å ´åˆã€:hg:`transplant` ã¯å¯¾è©±çš„ã«\n"
+" マージ対象もリビジョン指定もãªã„å ´åˆã€ :hg:`transplant` ã¯å¯¾è©±çš„ã«\n"
" 移æ¤ã‚’è¡Œãªã„ã¾ã™ã€‚"
msgid ""
@@ -5860,15 +6024,15 @@
" --continue/-c`.\n"
" "
msgstr ""
-" 移æ¤ã«å¤±æ•—ã—ãŸå ´åˆã€æ‰‹å‹•ã§ã®è¡çªè§£æ¶ˆå¾Œã« :hg:`transplant\n"
-" --continue/-c` を実行ã™ã‚‹ã“ã¨ã§ã€ä¸æ–ã•ã‚ŒãŸç§»æ¤ã‚’å†é–‹å¯èƒ½ã§ã™ã€‚\n"
+" 移æ¤ã«å¤±æ•—ã—ãŸå ´åˆã€ 手動ã§ã®è¡çªè§£æ¶ˆå¾Œã« :hg:`transplant\n"
+" --continue/-c` を実行ã™ã‚‹ã“ã¨ã§ã€ ä¸æ–ã•ã‚ŒãŸç§»æ¤ã‚’å†é–‹å¯èƒ½ã§ã™ã€‚\n"
" "
msgid "--continue is incompatible with branch, all or merge"
-msgstr "--continue 㯠--branchã€--allã€--merge ã¨ä½µç”¨ã§ãã¾ã›ã‚“"
+msgstr "--continue 㯠--branch〠--all〠--merge ã¨ä½µç”¨ã§ãã¾ã›ã‚“"
msgid "no source URL, branch tag or revision list provided"
-msgstr "å…ƒ URLã€ãƒ–ランãƒã‚¿ã‚°ã€ãƒªãƒ“ジョン指定ã®ã„ãšã‚Œã‚‚指定ã•ã‚Œã¦ã„ã¾ã›ã‚“"
+msgstr "å…ƒ URL〠ブランãƒã‚¿ã‚°ã€ リビジョン指定ã®ã„ãšã‚Œã‚‚指定ã•ã‚Œã¦ã„ã¾ã›ã‚“"
msgid "--all requires a branch revision"
msgstr "--all 指定ã«ã¯ãƒ–ランãƒãƒªãƒ“ジョンãŒå¿…è¦ã§ã™"
@@ -5885,6 +6049,11 @@
msgid "outstanding local changes"
msgstr "未コミットã®å¤‰æ›´ãŒã‚ã‚Šã¾ã™"
+msgid ""
+"``transplanted(set)``\n"
+" Transplanted changesets in set."
+msgstr ""
+
msgid "pull patches from REPO"
msgstr "パッãƒå–ã‚Šè¾¼ã¿å…ƒãƒªãƒã‚¸ãƒˆãƒªã®æŒ‡å®š"
@@ -5926,11 +6095,11 @@
"wrapping some functions to convert to Unicode string before path\n"
"operation."
msgstr ""
-"パスåã®å–り扱ã„(例: パスè¦ç´ ã®åˆ†å‰²ã€æ–‡å—大å°å¤‰æ›ç‰)上ã€ä¸é©åˆ‡ãªæ–‡å—ã‚’\n"
-"å«ã‚€å¤šãƒã‚¤ãƒˆç¬¦å·åŒ–æ–‡å—セット(MBCS)ãŒå˜åœ¨ã—ã¾ã™ã€‚ã“ã“ã§ã¯ãã®ã‚ˆã†ãªæ–‡å—\n"
+"パスåã®å–り扱ã„(例: パスè¦ç´ ã®åˆ†å‰²ã€ æ–‡å—大å°å¤‰æ›ç‰)上〠ä¸é©åˆ‡ãªæ–‡å—ã‚’\n"
+"å«ã‚€å¤šãƒã‚¤ãƒˆç¬¦å·åŒ–æ–‡å—セット(MBCS)ãŒå˜åœ¨ã—ã¾ã™ã€‚ ã“ã“ã§ã¯ãã®ã‚ˆã†ãªæ–‡å—\n"
"セット(例: shift_jis ãŠã‚ˆã³ big5)を「å•é¡Œæ–‡å—コードã€ã¨å‘¼ã³ã¾ã™ã€‚\n"
-"本エクステンションã¯ã€ãƒ‘スæ“作ã®å®Ÿæ–½å‰ã« unicode æ–‡å—列化ã™ã‚‹å‡¦ç†ã‚’\n"
-"割り込ã¾ã›ã‚‹ã“ã¨ã§ã€å•é¡Œæ–‡å—コードã«ã‚ˆã£ã¦ç™ºç”Ÿã™ã‚‹éšœå®³ã‚’防ãŽã¾ã™ã€‚"
+"本エクステンションã¯ã€ パスæ“作ã®å®Ÿæ–½å‰ã« unicode æ–‡å—列化ã™ã‚‹å‡¦ç†ã‚’\n"
+"割り込ã¾ã›ã‚‹ã“ã¨ã§ã€ å•é¡Œæ–‡å—コードã«ã‚ˆã£ã¦ç™ºç”Ÿã™ã‚‹éšœå®³ã‚’防ãŽã¾ã™ã€‚"
msgid "This extension is useful for:"
msgstr "ã“ã®ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ã¯ä»¥ä¸‹ã®å ´åˆã«æœ‰ç”¨ã§ã™:"
@@ -5943,7 +6112,7 @@
msgstr ""
"- shift_jis æ–‡å—コードを使用ã™ã‚‹æ—¥æœ¬èªž Windows ã®ãƒ¦ãƒ¼ã‚¶\n"
"- big5 æ–‡å—コードを使用ã™ã‚‹ä¸å›½èªž Windows ã®ãƒ¦ãƒ¼ã‚¶\n"
-"- æ–‡å—大å°ã‚’区別ã§ããªã„ファイルシステム上ã§ã€å•é¡Œæ–‡å—コードを\n"
+"- æ–‡å—大å°ã‚’区別ã§ããªã„ファイルシステム上ã§ã€ å•é¡Œæ–‡å—コードを\n"
" 使用ã—ãŸãƒªãƒã‚¸ãƒˆãƒªã‚’é‹ç”¨ã™ã‚‹ãƒ¦ãƒ¼ã‚¶"
msgid "This extension is not needed for:"
@@ -5968,9 +6137,9 @@
"You can specify the encoding by config option::"
msgstr ""
"\n"
-"指定ã®ç„¡ã„å ´åˆã€win32mbcs 㯠Mercurial ã«ã‚ˆã‚Šæ±ºå®šã•ã‚Œã‚‹\n"
+"指定ã®ç„¡ã„å ´åˆã€ win32mbcs 㯠Mercurial ã«ã‚ˆã‚Šæ±ºå®šã•ã‚Œã‚‹\n"
"(Python プãƒã‚°ãƒ©ãƒ 上ã®) encoding.encoding 変数値を使用ã—ã¾ã™ã€‚\n"
-"以下ã®è¨å®šè¨˜è¿°ã«ã‚ˆã‚Šã€æ–‡å—コードを指定ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™::"
+"以下ã®è¨å®šè¨˜è¿°ã«ã‚ˆã‚Šã€ æ–‡å—コードを指定ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™::"
msgid ""
" [win32mbcs]\n"
@@ -5997,7 +6166,7 @@
" the extension again and again for each clone since the configuration\n"
" is not copied when cloning."
msgstr ""
-" éžæŽ¨å¥¨: リãƒã‚¸ãƒˆãƒªã®è¤‡è£½ã®éš›ã«è¨å®šã¯è¤‡è£½ã•ã‚Œãªã„ãŸã‚〠win32text\n"
+" éžæŽ¨å¥¨: リãƒã‚¸ãƒˆãƒªã®è¤‡è£½ã®éš›ã«è¨å®šã¯è¤‡è£½ã•ã‚Œãªã„ãŸã‚〠win32text\n"
" エクステンションã¯å€‹ã€…ã®è¤‡è£½ï¼å€‹ã€…ã®ãƒ¦ãƒ¼ã‚¶ã”ã¨ã«éƒ½åº¦è¨å®šã™ã‚‹å¿…è¦ãŒ\n"
" ã‚ã‚Šã¾ã™ã€‚"
@@ -6006,12 +6175,12 @@
" uses a version controlled file for its configuration and each clone\n"
" will therefore use the right settings from the start."
msgstr ""
-" ãã®ãŸã‚ã€ä»£æ›¿æ‰‹æ®µã¨ã—㦠``eol`` エクステンションãŒæä¾›ã•ã‚Œã¦ã„ã¾ã™ã€‚\n"
-" ``eol`` エクステンションã§ã¯ã€æ§‹æˆç®¡ç†å¯èƒ½ãªãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚ˆã‚‹è¨å®šãŒ\n"
-" å¯èƒ½ã§ã™ã®ã§ã€è¤‡è£½ã—ãŸãƒªãƒã‚¸ãƒˆãƒªã¯æœ€åˆã‹ã‚‰é©åˆ‡ãªçŠ¶æ…‹ã§ä½¿ç”¨ã§ãã¾ã™ã€‚"
+" ãã®ãŸã‚〠代替手段ã¨ã—㦠``eol`` エクステンションãŒæä¾›ã•ã‚Œã¦ã„ã¾ã™ã€‚\n"
+" ``eol`` エクステンションã§ã¯ã€ 構æˆç®¡ç†å¯èƒ½ãªãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚ˆã‚‹è¨å®šãŒ\n"
+" å¯èƒ½ã§ã™ã®ã§ã€ 複製ã—ãŸãƒªãƒã‚¸ãƒˆãƒªã¯æœ€åˆã‹ã‚‰é©åˆ‡ãªçŠ¶æ…‹ã§ä½¿ç”¨ã§ãã¾ã™ã€‚"
msgid "To perform automatic newline conversion, use::"
-msgstr "改行形å¼ã®è‡ªå‹•å¤‰æ›ã‚’è¡Œã†å ´åˆã€ä»¥ä¸‹ã®ã‚ˆã†ã«è¨å®šã—ã¾ã™::"
+msgstr "改行形å¼ã®è‡ªå‹•å¤‰æ›ã‚’è¡Œã†å ´åˆã€ 以下ã®ã‚ˆã†ã«è¨å®šã—ã¾ã™::"
msgid ""
" [extensions]\n"
@@ -6037,7 +6206,7 @@
msgid ""
"If not doing conversion, to make sure you do not commit CRLF/CR by accident::"
-msgstr "変æ›ã¯ã—ãªã„ã‚‚ã®ã®ã€é–“é•ã£ãŸæ”¹è¡Œå½¢å¼ã§ã®ã‚³ãƒŸãƒƒãƒˆã‚’防æ¢ã—ãŸã„å ´åˆã¯::"
+msgstr "変æ›ã¯ã—ãªã„ã‚‚ã®ã®ã€ é–“é•ã£ãŸæ”¹è¡Œå½¢å¼ã§ã®ã‚³ãƒŸãƒƒãƒˆã‚’防æ¢ã—ãŸã„å ´åˆã¯::"
msgid ""
" [hooks]\n"
@@ -6051,7 +6220,8 @@
msgid ""
"To do the same check on a server to prevent CRLF/CR from being\n"
"pushed or pulled::"
-msgstr "æ„図ã›ã¬å±¥æ´åæ˜ ã®é˜²æ¢ã®ãŸã‚ã«ã€ã‚µãƒ¼ãƒå´ã§åŒæ§˜ã®ç¢ºèªã‚’è¡Œã„ãŸã„å ´åˆã¯::"
+msgstr ""
+"æ„図ã›ã¬å±¥æ´åæ˜ ã®é˜²æ¢ã®ãŸã‚ã«ã€ サーãƒå´ã§åŒæ§˜ã®ç¢ºèªã‚’è¡Œã„ãŸã„å ´åˆã¯::"
msgid ""
" [hooks]\n"
@@ -6071,7 +6241,7 @@
msgstr ""
"è¦å‘Š: %s ã¯æ—¢ã«è¡Œæœ«ãŒ %s å½¢å¼ã§ã™\n"
"ãã®ãŸã‚ win32text ã«ã‚ˆã‚‹è¡Œæœ«å½¢å¼å¤‰æ›ã¯ä¸è¦ã§ã™ã€‚\n"
-"次回㮠commit ã¾ã§ã«ã€Mercurial.ini ãªã‚Š %s ã«ãŠã‘ã‚‹ encode/decode è¨å®šã‚’\n"
+"次回㮠commit ã¾ã§ã«ã€ Mercurial.ini ãªã‚Š %s ã«ãŠã‘ã‚‹ encode/decode è¨å®šã‚’\n"
"見直ã™ã“ã¨ã‚’ãŠå‹§ã‚ã—ã¾ã™ã€‚\n"
#, python-format
@@ -6089,7 +6259,7 @@
"add to Mercurial.ini or .hg/hgrc:"
msgstr ""
"\n"
-"åŒæ§˜ã®é–“é•ã„を防ãã«ã¯ã€ä»¥ä¸‹ã®è¨å®šã‚’ Mercurial.ini ãªã„ã— .hg/hgrc ã«\n"
+"åŒæ§˜ã®é–“é•ã„を防ãã«ã¯ã€ 以下ã®è¨å®šã‚’ Mercurial.ini ãªã„ã— .hg/hgrc ã«\n"
"以下ã®è¨˜è¿°ã‚’è¿½åŠ ã—ã¦ãã ã•ã„:"
#, python-format
@@ -6120,6 +6290,13 @@
"[decode]\n"
"** = %sdecode:\n"
+msgid ""
+"win32text is deprecated: http://mercurial.selenic.com/wiki/"
+"Win32TextExtension\n"
+msgstr ""
+"win32text ã¯æŽ¨å¥¨ã•ã‚Œã¦ã„ã¾ã›ã‚“: http://mercurial.selenic.com/wiki/"
+"Win32TextExtension å‚ç…§\n"
+
msgid "discover and advertise repositories on the local network"
msgstr ""
@@ -6169,24 +6346,20 @@
msgid "integrity check failed on %s:%d"
msgstr "%s:%d ã®ä¸€è²«æ€§ãƒã‚§ãƒƒã‚¯ã«å¤±æ•—"
-#, python-format
-msgid "%s: not a Mercurial bundle file"
-msgstr "%s: Mercurial ã«ãƒãƒ³ãƒ‰ãƒ«ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã§ã¯ã‚ã‚Šã¾ã›ã‚“"
-
-#, python-format
-msgid "%s: unknown bundle version"
-msgstr "%s: 未知ã®ãƒãƒ³ãƒ‰ãƒ«ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
-
-#, python-format
-msgid "%s: unknown bundle compression type"
-msgstr "%s: 未知ã®ãƒãƒ³ãƒ‰ãƒ«åœ§ç¸®æ–¹æ³•"
-
msgid "cannot create new bundle repository"
msgstr "ãƒãƒ³ãƒ‰ãƒ«ãƒªãƒã‚¸ãƒˆãƒªã®æ–°è¦ä½œæˆã¯ã§ãã¾ã›ã‚“"
#, python-format
msgid "premature EOF reading chunk (got %d bytes, expected %d)"
-msgstr "予期ã—ãªã„ EOF (%d ãƒã‚¤ãƒˆã®ã¿èªè¾¼æ¸ˆã€æœ¬å½“㯠%d ãƒã‚¤ãƒˆ)"
+msgstr "予期ã—ãªã„ EOF (%d ãƒã‚¤ãƒˆã®ã¿èªè¾¼æ¸ˆã€ 本当㯠%d ãƒã‚¤ãƒˆ)"
+
+#, python-format
+msgid "%s: not a Mercurial bundle"
+msgstr "%s: Mercurial ã®ãƒãƒ³ãƒ‰ãƒ«å½¢å¼ã§ã¯ã‚ã‚Šã¾ã›ã‚“"
+
+#, python-format
+msgid "%s: unknown bundle version %s"
+msgstr "%s: 未知ã®ãƒãƒ³ãƒ‰ãƒ«å½¢å¼ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s"
msgid "empty username"
msgstr "ユーザåãŒç©ºã§ã™"
@@ -6212,9 +6385,6 @@
msgid "limit must be positive"
msgstr "制é™ã¯æ£æ•°ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
-msgid "too many revisions specified"
-msgstr "リビジョンã®æŒ‡å®šãŒå¤šã™ãŽã¾ã™"
-
#, python-format
msgid "invalid format spec '%%%s' in output filename"
msgstr "出力ファイルåã«ä¸æ£ãªãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆ '%%%s' 指定"
@@ -6273,7 +6443,7 @@
#, python-format
msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
-msgstr "%s ã¯æœªã‚³ãƒŸãƒƒãƒˆãªã®ã§ã€%s ã®ã‚³ãƒ”ーデータã¯æ®‹ã‚Šã¾ã›ã‚“\n"
+msgstr "%s ã¯æœªã‚³ãƒŸãƒƒãƒˆãªã®ã§ã€ %s ã®ã‚³ãƒ”ーデータã¯æ®‹ã‚Šã¾ã›ã‚“\n"
msgid "no source or destination specified"
msgstr "作æ¥å…ƒã‚‚ã—ãã¯ä½œæ¥å…ˆã‚’指定ã—ã¦ã„ã¾ã›ã‚“"
@@ -6282,7 +6452,7 @@
msgstr "作æ¥å…ˆã‚’指定ã—ã¦ã„ã¾ã›ã‚“"
msgid "with multiple sources, destination must be an existing directory"
-msgstr "複数ã®ä½œæ¥å…ƒã®å ´åˆã€ä½œæ¥å…ˆã¯å˜åœ¨ã™ã‚‹ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
+msgstr "複数ã®ä½œæ¥å…ƒã®å ´åˆã€ 作æ¥å…ˆã¯å˜åœ¨ã™ã‚‹ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
#, python-format
msgid "destination %s is not a directory"
@@ -6371,9 +6541,13 @@
msgid "can only follow copies/renames for explicit filenames"
msgstr "ファイルåãŒæ˜Žç¤ºã•ã‚ŒãŸå ´åˆã®ã¿è¤‡è£½/改åを追跡å¯èƒ½ã§ã™"
+#, python-format
+msgid "skipping missing subrepository: %s\n"
+msgstr "å˜åœ¨ã—ãªã„副リãƒã‚¸ãƒˆãƒªã¸ã®å‡¦ç†ã‚’çœç•¥: %s\n"
+
msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
msgstr ""
-"HG: コミットメッセージを入力ã—ã¦ãã ã•ã„。 HG: ã§å§‹ã¾ã‚‹è¡Œã¯ç„¡è¦–ã•ã‚Œã¾ã™ã€‚"
+"HG: コミットメッセージを入力ã—ã¦ãã ã•ã„。 HG: ã§å§‹ã¾ã‚‹è¡Œã¯ç„¡è¦–ã•ã‚Œã¾ã™ã€‚"
msgid "HG: Leave message empty to abort commit."
msgstr "HG: メッセージãŒç©ºã ã¨ã‚³ãƒŸãƒƒãƒˆã§ãã¾ã›ã‚“。"
@@ -6424,11 +6598,12 @@
" undo an add before that, see :hg:`forget`."
msgstr ""
" 指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯æ¬¡å›žã®ã‚³ãƒŸãƒƒãƒˆã‹ã‚‰æ§‹æˆç®¡ç†å¯¾è±¡ã¨ãªã‚Šã¾ã™ã€‚\n"
-" è¿½åŠ ç™»éŒ²ã®ã‚³ãƒŸãƒƒãƒˆå‰å–り消ã—ã¯ã€:hg:`help revert` ã‚’å‚ç…§ã—ã¦\n"
+" è¿½åŠ ç™»éŒ²ã®ã‚³ãƒŸãƒƒãƒˆå‰å–り消ã—ã¯ã€ :hg:`help revert` ã‚’å‚ç…§ã—ã¦\n"
" ãã ã•ã„。"
msgid " If no names are given, add all files to the repository."
-msgstr " ファイルå指定ãŒç„¡ã„å ´åˆã€ä½œæ¥é ˜åŸŸä¸ã®å…¨ãƒ•ã‚¡ã‚¤ãƒ«ãŒå¯¾è±¡ã¨ãªã‚Šã¾ã™ã€‚"
+msgstr ""
+" ファイルå指定ãŒç„¡ã„å ´åˆã€ 作æ¥é ˜åŸŸä¸ã®å…¨ãƒ•ã‚¡ã‚¤ãƒ«ãŒå¯¾è±¡ã¨ãªã‚Šã¾ã™ã€‚"
msgid " .. container:: verbose"
msgstr " .. container:: verbose"
@@ -6437,7 +6612,7 @@
" An example showing how new (unknown) files are added\n"
" automatically by :hg:`add`::"
msgstr ""
-" 以下ã®å®Ÿè¡Œä¾‹ã¯ã€:hg:`add` 実行ã«ãŠã‘ã‚‹(未知ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®)自動的ãª\n"
+" 以下ã®å®Ÿè¡Œä¾‹ã¯ã€ :hg:`add` 実行ã«ãŠã‘ã‚‹(未知ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®)自動的ãª\n"
" è¿½åŠ ã®ä¾‹ã§ã™::"
msgid ""
@@ -6467,13 +6642,13 @@
" "
msgid "add all new files, delete all missing files"
-msgstr "æ–°è¦ãƒ•ã‚¡ã‚¤ãƒ«ã®è¿½åŠ 登録ã€ãŠã‚ˆã³ä¸åœ¨ãƒ•ã‚¡ã‚¤ãƒ«ã®ç™»éŒ²é™¤å¤–"
+msgstr "æ–°è¦ãƒ•ã‚¡ã‚¤ãƒ«ã®è¿½åŠ 登録〠ãŠã‚ˆã³ä¸åœ¨ãƒ•ã‚¡ã‚¤ãƒ«ã®ç™»éŒ²é™¤å¤–"
msgid ""
" Add all new files and remove all missing files from the\n"
" repository."
msgstr ""
-" 作æ¥é ˜åŸŸä¸ã®æ–°è¦ãƒ•ã‚¡ã‚¤ãƒ«ã®è¿½åŠ 登録ã€ãŠã‚ˆã³å…¨ä¸åœ¨ãƒ•ã‚¡ã‚¤ãƒ«ã®ç™»éŒ²é™¤å¤–ã‚’\n"
+" 作æ¥é ˜åŸŸä¸ã®æ–°è¦ãƒ•ã‚¡ã‚¤ãƒ«ã®è¿½åŠ 登録〠ãŠã‚ˆã³å…¨ä¸åœ¨ãƒ•ã‚¡ã‚¤ãƒ«ã®ç™»éŒ²é™¤å¤–ã‚’\n"
" è¡Œãªã„ã¾ã™ã€‚"
msgid ""
@@ -6482,7 +6657,7 @@
" commit."
msgstr ""
" .hgignore ã«è¨˜è¿°ã•ã‚ŒãŸãƒ‘ターンã«åˆè‡´ã™ã‚‹æ–°è¦ãƒ•ã‚¡ã‚¤ãƒ«ã¯ç„¡è¦–ã•ã‚Œã¾ã™ã€‚\n"
-" :hg:`add` ã¨åŒæ§˜ã«ã€å®Ÿè¡ŒåŠ¹æžœãŒç™ºæ®ã•ã‚Œã‚‹ã®ã¯æ¬¡å›žã‚³ãƒŸãƒƒãƒˆæ™‚点ã§ã™ã€‚"
+" :hg:`add` ã¨åŒæ§˜ã«ã€ 実行効果ãŒç™ºæ®ã•ã‚Œã‚‹ã®ã¯æ¬¡å›žã‚³ãƒŸãƒƒãƒˆæ™‚点ã§ã™ã€‚"
msgid ""
" Use the -s/--similarity option to detect renamed files. With a\n"
@@ -6493,12 +6668,12 @@
" can be expensive. After using this option, :hg:`status -C` can be\n"
" used to check which files were identified as moved or renamed."
msgstr ""
-" ファイルã®æ”¹åを検知ã™ã‚‹ã«ã¯ -s/--similarity を使用ã—ã¾ã™ã€‚0 より\n"
-" 大ããªå€¤ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€è¿½åŠ ・除外ファイルã®å…¨ã¦ãŒæ¯”較ã•ã‚Œã€æ”¹åã¨\n"
-" ã¿ãªã›ã‚‹ã‹å¦ã‹ãŒåˆ¤å®šã•ã‚Œã¾ã™ã€‚ã“ã®ã‚ªãƒ—ションã«ã¯ã€0(改å比較無ã—)\n"
+" ファイルã®æ”¹åを検知ã™ã‚‹ã«ã¯ -s/--similarity を使用ã—ã¾ã™ã€‚ 0 より\n"
+" 大ããªå€¤ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ è¿½åŠ ãƒ»é™¤å¤–ãƒ•ã‚¡ã‚¤ãƒ«ã®å…¨ã¦ãŒæ¯”較ã•ã‚Œã€ 改åã¨\n"
+" ã¿ãªã›ã‚‹ã‹å¦ã‹ãŒåˆ¤å®šã•ã‚Œã¾ã™ã€‚ ã“ã®ã‚ªãƒ—ションã«ã¯ã€ 0(改å比較無ã—)\n"
" ã‹ã‚‰ 100 (完全一致ã§åˆ¤å®š)ã¾ã§ã®ç¯„囲ã§ãƒ‘ーセンテージを指定ã—ã¾ã™ã€‚\n"
-" 改å判定ã«ã¯å®Ÿè¡Œæ™‚é–“ã‚’è¦ã™ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ã“ã®ã‚ªãƒ—ションã®ä½¿ç”¨\n"
-" 後ã«ã€:hg:`status -C` を実施ã™ã‚‹ã“ã¨ã§ã€ç§»å‹•ï¼æ”¹åãŒæ¤œçŸ¥ã•ã‚ŒãŸ\n"
+" 改å判定ã«ã¯å®Ÿè¡Œæ™‚é–“ã‚’è¦ã™ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ ã“ã®ã‚ªãƒ—ションã®ä½¿ç”¨\n"
+" 後ã«ã€ :hg:`status -C` を実施ã™ã‚‹ã“ã¨ã§ã€ 移動ï¼æ”¹åãŒæ¤œçŸ¥ã•ã‚ŒãŸ\n"
" ファイルを確èªã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
msgid "similarity must be a number"
@@ -6513,12 +6688,12 @@
msgid ""
" List changes in files, showing the revision id responsible for\n"
" each line"
-msgstr " ファイルã®å„行毎ã«ã€ãã®å†…容ãŒç”±æ¥ã™ã‚‹ãƒªãƒ“ジョンIDを表示ã—ã¾ã™ã€‚"
+msgstr " ファイルã®å„行毎ã«ã€ ãã®å†…容ãŒç”±æ¥ã™ã‚‹ãƒªãƒ“ジョンIDを表示ã—ã¾ã™ã€‚"
msgid ""
" This command is useful for discovering when a change was made and\n"
" by whom."
-msgstr " 本コマンドã¯ã€å¤‰æ›´ã®å®Ÿæ–½è€…ãªã„ã—実施時期を特定ã™ã‚‹ã®ã«æœ‰ç”¨ã§ã™ã€‚"
+msgstr " 本コマンドã¯ã€ 変更ã®å®Ÿæ–½è€…ãªã„ã—実施時期を特定ã™ã‚‹ã®ã«æœ‰ç”¨ã§ã™ã€‚"
msgid ""
" Without the -a/--text option, annotate will avoid processing files\n"
@@ -6526,18 +6701,11 @@
" anyway, although the results will probably be neither useful\n"
" nor desirable."
msgstr ""
-" -a/--text 指定ãŒç„¡ã„å ´åˆã€ãƒã‚¤ãƒŠãƒªã¨æ€ã—ãファイルã¯å‡¦ç†å¯¾è±¡ã‹ã‚‰\n"
-" 除外ã•ã‚Œã¾ã™ã€‚-a 指定ãŒæœ‰ã‚‹å ´åˆã€çµæžœã®æœ‰ç”¨æ€§ã®æœ‰ç„¡ã«é–¢ã‚らãš\n"
+" -a/--text 指定ãŒç„¡ã„å ´åˆã€ ãƒã‚¤ãƒŠãƒªã¨æ€ã—ãファイルã¯å‡¦ç†å¯¾è±¡ã‹ã‚‰\n"
+" 除外ã•ã‚Œã¾ã™ã€‚ -a 指定ãŒæœ‰ã‚‹å ´åˆã€ çµæžœã®æœ‰ç”¨æ€§ã®æœ‰ç„¡ã«é–¢ã‚らãš\n"
" å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒå‡¦ç†å¯¾è±¡ã¨ãªã‚Šã¾ã™ã€‚\n"
" "
-msgid ""
-" Returns 0 on success.\n"
-" "
-msgstr ""
-" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0 ã§ã™ã€‚\n"
-" "
-
msgid "at least one filename or pattern is required"
msgstr "ファイルåãªã„ã—パターンを最低1ã¤æŒ‡å®šã—ã¦ãã ã•ã„"
@@ -6555,14 +6723,14 @@
" By default, the revision used is the parent of the working\n"
" directory; use -r/--rev to specify a different revision."
msgstr ""
-" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€ä½œæ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚\n"
+" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€ 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚\n"
" ä»–ã®ãƒªãƒ“ジョンを指定ã™ã‚‹å ´åˆã¯ -r/--rev を使用ã—ã¾ã™ã€‚"
msgid ""
" The archive type is automatically detected based on file\n"
" extension (or override using -t/--type)."
msgstr ""
-" アーカイブ種別ã¯ã€å‡ºåŠ›å…ˆãƒ•ã‚¡ã‚¤ãƒ«ã®æ‹¡å¼µåã‹ã‚‰è‡ªå‹•çš„ã«åˆ¤å®šã•ã‚Œã¾ã™ãŒ\n"
+" アーカイブ種別ã¯ã€ 出力先ファイルã®æ‹¡å¼µåã‹ã‚‰è‡ªå‹•çš„ã«åˆ¤å®šã•ã‚Œã¾ã™ãŒ\n"
" -t/--type ã§å¼·åˆ¶ã™ã‚‹ã“ã¨ã‚‚å¯èƒ½ã§ã™ã€‚"
msgid " Valid types are:"
@@ -6588,7 +6756,7 @@
" using a format string; see :hg:`help export` for details."
msgstr ""
" アーカイブ生æˆå…ˆã¨ãªã‚‹ãƒ•ã‚¡ã‚¤ãƒ«åãªã„ã—ディレクトリåã®æŒ‡å®šã«ã¯\n"
-" ç½®æ›æŒ‡å®šã‚’使用ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ç½®æ›æŒ‡å®šã«é–¢ã™ã‚‹è©³ç´°ã¯ \n"
+" ç½®æ›æŒ‡å®šã‚’使用ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ ç½®æ›æŒ‡å®šã«é–¢ã™ã‚‹è©³ç´°ã¯ \n"
" :hg:`help export` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
msgid ""
@@ -6597,9 +6765,9 @@
" prefix. The default is the basename of the archive, with suffixes\n"
" removed."
msgstr ""
-" アーカイブ生æˆã®éš›ã«ã¯ã€å±•é–‹æ™‚ã®æ ¼ç´å…ˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªåãŒè¨˜éŒ²ã•ã‚Œã¾ã™ã€‚\n"
-" -p/--prefix ã«ã‚ˆã‚Šãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªåを指定ã§ãã¾ã™(ç½®æ›æŒ‡å®šå¯èƒ½)。特ã«\n"
-" 指定ãŒç„¡ã„å ´åˆã¯ã€ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–åã‹ã‚‰æ‹¡å¼µåを除ã„ãŸã‚‚ã®ãŒè¨˜éŒ²ã•ã‚Œã¾ã™ã€‚\n"
+" アーカイブ生æˆã®éš›ã«ã¯ã€ 展開時ã®æ ¼ç´å…ˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªåãŒè¨˜éŒ²ã•ã‚Œã¾ã™ã€‚\n"
+" -p/--prefix ã«ã‚ˆã‚Šãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªåを指定ã§ãã¾ã™(ç½®æ›æŒ‡å®šå¯èƒ½)。 特ã«\n"
+" 指定ãŒç„¡ã„å ´åˆã¯ã€ アーカイブåã‹ã‚‰æ‹¡å¼µåを除ã„ãŸã‚‚ã®ãŒè¨˜éŒ²ã•ã‚Œã¾ã™ã€‚\n"
" "
msgid "no working directory: please specify a revision"
@@ -6615,32 +6783,54 @@
msgstr "以å‰ã®ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã«ãŠã‘る変更ã®æ‰“ã¡æ¶ˆã—"
msgid ""
-" Commit the backed out changes as a new changeset. The new\n"
-" changeset is a child of the backed out changeset."
-msgstr ""
-" 打ã¡æ¶ˆã—用ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã‚’æ–°è¦ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã¨ã—ã¦ã‚³ãƒŸãƒƒãƒˆã—ã¾ã™ã€‚\n"
-" æ–°è¦ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã¯ã€æ‰“消ã—対象ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã®åãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆ\n"
-" ã¨ã—ã¦ä½œæˆã•ã‚Œã¾ã™ã€‚"
-
-msgid ""
-" If you backout a changeset other than the tip, a new head is\n"
-" created. This head will be the new tip and you should merge this\n"
-" backout changeset with another head."
-msgstr ""
-" tip 以外ã®ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã‚’打ã¡æ¶ˆã™å ´åˆã€æ–°è¦ãƒ˜ãƒƒãƒ‰ãŒç”Ÿæˆã•ã‚Œã¾ã™ã€‚\n"
-" ã“ã®ãƒ˜ãƒƒãƒ‰ã¯æ–°è¦ tip ã¨ãªã‚Šã¾ã™ã®ã§ã€ã“ã®æ‰“ã¡æ¶ˆã—ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã¨\n"
-" ä»–ã®ãƒ˜ãƒƒãƒ‰(通常ã¯æ‰“ã¡æ¶ˆã—実施å‰ã®ãƒ˜ãƒƒãƒ‰)をマージã—ã¦ãã ã•ã„。"
-
-msgid ""
+" The backout command merges the reverse effect of the reverted\n"
+" changeset into the working directory."
+msgstr ""
+" 本コマンドã¯ã€ 対象リビジョンã§ã®å¤‰æ›´ã‚’打ã¡æ¶ˆã™åŠ¹æžœã‚’æŒã¤å¤‰æ›´ã‚’\n"
+" 作æ¥é ˜åŸŸã¸ã¨åæ˜ ã—ã¾ã™ã€‚"
+
+msgid ""
+" With the --merge option, it first commits the reverted changes\n"
+" as a new changeset. This new changeset is a child of the reverted\n"
+" changeset.\n"
" The --merge option remembers the parent of the working directory\n"
" before starting the backout, then merges the new head with that\n"
-" changeset afterwards. This saves you from doing the merge by hand.\n"
-" The result of this merge is not committed, as with a normal merge."
-msgstr ""
-" --merge 指定時ã¯ã€å‡¦ç†å®Ÿæ–½å‰ã«ä½œæ¥é ˜åŸŸã®è¦ªãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆãŒè¨˜éŒ²ã•ã‚Œã€\n"
-" 処ç†å®Ÿæ–½å¾Œã«æ–°ãŸãªãƒ˜ãƒƒãƒ‰ã¨ãã®ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆãŒãƒžãƒ¼ã‚¸ã•ã‚Œã¾ã™ã€‚\n"
-" ã“ã‚Œã«ã‚ˆã‚Šæ‰‹å‹•ãƒžãƒ¼ã‚¸ã®æ‰‹é–“ãŒçœã‘ã¾ã™ã€‚通常㮠merge ã¨åŒæ§˜ã«ã€\n"
-" ã“ã®ãƒžãƒ¼ã‚¸çµæžœã¯è‡ªå‹•çš„ã«ã¯ commit ã•ã‚Œã¾ã›ã‚“。"
+" changeset afterwards.\n"
+" This will result in an explicit merge in the history."
+msgstr ""
+" --merge ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ ã¾ãšã¯æ‰“ã¡æ¶ˆã—効果をæŒã¤å¤‰æ›´ãŒã€ \n"
+" 打ã¡æ¶ˆã—対象リビジョンã®åリビジョンã¨ã—ã¦ã€ æ–°è¦ä½œæˆã•ã‚Œã¾ã™ã€‚\n"
+" ãã®å¾Œã€ 打ã¡æ¶ˆã—効果をæŒã¤æ–°è¦ãƒªãƒ“ジョンã«ã‚ˆã‚‹ãƒ˜ãƒƒãƒ‰ã¨ã€ \n"
+" 処ç†ã®å®Ÿæ–½ã«å…ˆç«‹ã£ã¦è¨˜éŒ²ã•ã‚ŒãŸä½œæ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã«å¯¾ã—ã¦ã€ \n"
+" :hg:`merge` 相当ã®å‡¦ç†ãŒå®Ÿæ–½ã•ã‚Œã¾ã™ã€‚\n"
+" マージçµæžœã‚’å±¥æ´ã«è¨˜éŒ²ã™ã‚‹ã«ã¯ :hg:`commit` 実施ãŒå¿…è¦ã§ã™ã€‚\n"
+" (訳注: --merge ãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€ 打ã¡æ¶ˆã—ã®ãŸã‚ã®å¤‰æ›´ã®é©ç”¨ã¯ã€ \n"
+" 作æ¥é ˜åŸŸã«å¯¾ã—ã¦å®Ÿæ–½ã•ã‚Œã€ æ–°ãŸãªãƒ˜ãƒƒãƒ‰ã¯ä½œæˆã•ã‚Œã¾ã›ã‚“)"
+
+msgid ""
+" If you backout a changeset other than the original parent of the\n"
+" working directory, the result of this merge is not committed,\n"
+" as with a normal merge. Otherwise, no merge is needed and the\n"
+" commit is automatic."
+msgstr ""
+" 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョン「以外ã€ã®å¤‰æ›´ã‚’打ã¡æ¶ˆã™å ´åˆã«ã€ \n"
+" (--merge 指定ã«é–¢ã‚らãš) 実行çµæžœãŒè‡ªå‹•çš„ã«ã‚³ãƒŸãƒƒãƒˆã•ã‚Œãªã„ã®ã¯ã€ \n"
+" 通常㮠:hg:`merge` 実行相当ã®å‡¦ç†ãŒå®Ÿæ–½ã•ã‚Œã¦ã„ã‚‹ãŸã‚ã§ã™ã€‚\n"
+" 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã®å¤‰æ›´ã‚’打ã¡æ¶ˆã™å ´åˆã€ \n"
+" :hg:`merge` 相当ã®å‡¦ç†ã¯å®Ÿæ–½ã•ã‚Œãªã„ãŸã‚〠\n"
+" 打ã¡æ¶ˆã—çµæžœã¯è‡ªå‹•çš„ã«ã‚³ãƒŸãƒƒãƒˆã•ã‚Œã¾ã™ã€‚"
+
+msgid ""
+" Note that the default behavior (without --merge) has changed in\n"
+" version 1.7. To restore the previous default behavior, use\n"
+" :hg:`backout --merge` and then :hg:`update --clean .` to get rid of\n"
+" the ongoing merge."
+msgstr ""
+" 注æ„: --merge 指定ãŒç„¡ã„å ´åˆã®æŒ™å‹•ã¯ã€ 1.7 版ã«ãŠã„ã¦å¤‰æ›´ã•ã‚Œã¾ã—ãŸã€‚\n"
+" (訳注: 旧版ã§ã¯ --merge ã®æœ‰ç„¡ã«é–¢ã‚らãšã€ 常ã«æ–°è¦ãƒ˜ãƒƒãƒ‰ãŒä½œæˆ)\n"
+" 以å‰ã®ç‰ˆã«ãŠã‘ã‚‹ --merge 指定無ã—時ã®æŒ™å‹•ã¨åŒç‰ã®çµæžœã‚’å¾—ã‚‹ã«ã¯ã€ \n"
+" :hg:`backout --merge` 後㫠:hg:`update --clean .` を実行ã™ã‚‹ã“ã¨ã§ã€ \n"
+" 仕掛ã‹ã‚Šä¸ã®ãƒžãƒ¼ã‚¸å‡¦ç†ã‚’å–り消ã—ã¦ãã ã•ã„。"
msgid "please specify just one revision"
msgstr "リビジョン指定ã¯1ã¤ã ã‘ã§ã™"
@@ -6672,12 +6862,6 @@
msgid "merging with changeset %s\n"
msgstr "リビジョン %s ã¨ãƒžãƒ¼ã‚¸ä¸\n"
-msgid "the backout changeset is a new head - do not forget to merge\n"
-msgstr "打ã¡æ¶ˆã—リビジョンã«ã‚ˆã‚Šãƒ˜ãƒƒãƒ‰ãŒå¢—ãˆã¾ã™ - マージを忘れãšã«\n"
-
-msgid "(use \"backout --merge\" if you want to auto-merge)\n"
-msgstr "(自動的ã«ãƒžãƒ¼ã‚¸ã™ã‚‹å ´åˆã¯ \"backout --merge\" ã—ã¦ãã ã•ã„)\n"
-
msgid "subdivision search of changesets"
msgstr "リビジョンã®åˆ†å‰²æŽ¢ç´¢"
@@ -6691,19 +6875,19 @@
" bad, and bisect will either update to another candidate changeset\n"
" or announce that it has found the bad revision."
msgstr ""
-" å•é¡Œç™ºç”Ÿå¥‘æ©Ÿã¨ãªã‚‹ãƒªãƒ“ジョンã®ç‰¹å®šã‚’補助ã—ã¾ã™ã€‚使用開始ã®éš›ã«ã¯ã€\n"
-" å•é¡ŒãŒç™ºç”Ÿã™ã‚‹æ—¢çŸ¥ã®ãƒªãƒ“ジョンã®ã†ã¡ã€æœ€å¤ã®ã‚‚ã®ã‚’ bad ã¨ãƒžãƒ¼ã‚¯ã—ã€\n"
-" å•é¡ŒãŒç™ºç”Ÿã—ãªã„既知ã®ãƒªãƒ“ジョンã®ã†ã¡ã€æœ€æ–°ã®ã‚‚ã®ã‚’ good ã¨ãƒžãƒ¼ã‚¯\n"
-" ã—ã¾ã™ã€‚本コマンドã¯ã€æ¤œè¨¼å¯¾è±¡ãƒªãƒ“ジョンã§ä½œæ¥é ˜åŸŸã‚’æ›´æ–°ã—ã¾ã™(-U/\n"
-" --noupdate 指定時除ã)。当該リビジョンを検証ã—ãŸãªã‚‰ã€bad ã‚ã‚‹ã„ã¯\n"
-" good ã§ãƒžãƒ¼ã‚¯ã—ã¦ãã ã•ã„。本コマンドã¯ã€æ¬¡ã®æ¤œè¨¼å€™è£œãƒªãƒ“ジョンã§\n"
-" 作æ¥é ˜åŸŸã‚’æ›´æ–°ã™ã‚‹ã‹ã€å•é¡Œå¥‘機リビジョンを特定ã§ããŸæ—¨ã‚’出力ã—ã¾ã™ã€‚"
+" å•é¡Œç™ºç”Ÿå¥‘æ©Ÿã¨ãªã‚‹ãƒªãƒ“ジョンã®ç‰¹å®šã‚’補助ã—ã¾ã™ã€‚ 使用開始ã®éš›ã«ã¯ã€ \n"
+" å•é¡ŒãŒç™ºç”Ÿã™ã‚‹æ—¢çŸ¥ã®ãƒªãƒ“ジョンã®ã†ã¡ã€ 最å¤ã®ã‚‚ã®ã‚’ bad ã¨ãƒžãƒ¼ã‚¯ã—〠\n"
+" å•é¡ŒãŒç™ºç”Ÿã—ãªã„既知ã®ãƒªãƒ“ジョンã®ã†ã¡ã€ 最新ã®ã‚‚ã®ã‚’ good ã¨ãƒžãƒ¼ã‚¯\n"
+" ã—ã¾ã™ã€‚ 本コマンドã¯ã€ 検証対象リビジョンã§ä½œæ¥é ˜åŸŸã‚’æ›´æ–°ã—ã¾ã™(-U/\n"
+" --noupdate 指定時除ã)。 当該リビジョンを検証ã—ãŸãªã‚‰ã€ bad ã‚ã‚‹ã„ã¯\n"
+" good ã§ãƒžãƒ¼ã‚¯ã—ã¦ãã ã•ã„。 本コマンドã¯ã€ 次ã®æ¤œè¨¼å€™è£œãƒªãƒ“ジョンã§\n"
+" 作æ¥é ˜åŸŸã‚’æ›´æ–°ã™ã‚‹ã‹ã€ å•é¡Œå¥‘機リビジョンを特定ã§ããŸæ—¨ã‚’出力ã—ã¾ã™ã€‚"
msgid ""
" As a shortcut, you can also use the revision argument to mark a\n"
" revision as good or bad without checking it out first."
msgstr ""
-" ã¦ã¿ã˜ã‹ãªæ‰‹é †ã¨ã—ã¦ã¯ã€ä½œæ¥é ˜åŸŸã‚’æ›´æ–°ã›ãšã«ã€ãƒªãƒ“ジョン指定を使用\n"
+" ã¦ã¿ã˜ã‹ãªæ‰‹é †ã¨ã—ã¦ã¯ã€ 作æ¥é ˜åŸŸã‚’æ›´æ–°ã›ãšã«ã€ リビジョン指定を使用\n"
" ã—ã¦ãƒªãƒ“ジョンを good ãªã„ã— bad ã«ãƒžãƒ¼ã‚¯ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚"
msgid ""
@@ -6713,10 +6897,10 @@
" (command not found) will abort the bisection, and any other\n"
" non-zero exit status means the revision is bad."
msgstr ""
-" コマンドãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€è‡ªå‹•çš„ãªãƒªãƒ“ジョン検証ã«ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚\n"
+" コマンドãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 自動的ãªãƒªãƒ“ジョン検証ã«ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚\n"
" コマンドã®çµ‚了コードã¯ãƒªãƒ“ジョンã«å¯¾ã™ã‚‹ bad ãªã„ã— good ã®ãƒžãƒ¼ã‚¯\n"
-" 付ã‘ã«ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚終了コード 0 㯠goodã€125 ã¯ãƒªãƒ“ジョンã®ã‚¹ã‚ップ\n"
-" 127(コマンドãŒè¦‹ã¤ã‹ã‚‰ãªã„å ´åˆ)ã¯åˆ†å‰²æŽ¢ç´¢ä¸æ–ã€ãれ以外㮠0 より\n"
+" 付ã‘ã«ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚ 終了コード 0 㯠good〠125 ã¯ãƒªãƒ“ジョンã®ã‚¹ã‚ップ\n"
+" 127(コマンドãŒè¦‹ã¤ã‹ã‚‰ãªã„å ´åˆ)ã¯åˆ†å‰²æŽ¢ç´¢ä¸æ–〠ãれ以外㮠0 より\n"
" 大ãã„終了コード㯠bad ã®ãƒžãƒ¼ã‚¯ä»˜ã‘ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚"
msgid "The first good revision is:\n"
@@ -6725,11 +6909,19 @@
msgid "The first bad revision is:\n"
msgstr "最åˆã® bad ãªãƒªãƒ“ジョンã¯:\n"
+#, python-format
+msgid ""
+"Not all ancestors of this changeset have been checked.\n"
+"To check the other ancestors, start from the common ancestor, %s.\n"
+msgstr ""
+"ã“ã®ãƒªãƒ“ジョンã®ç¥–å…ˆã«å¯¾ã™ã‚‹ç¢ºèªã¯å®Œå…¨ã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n"
+"å…¨ã¦ã‚’確èªã™ã‚‹ã«ã¯ã€ 共通ã®ç¥–å…ˆ %s ã‹ã‚‰æ¤œç´¢ã‚’開始ã—ã¦ãã ã•ã„。\n"
+
msgid "Due to skipped revisions, the first good revision could be any of:\n"
-msgstr "検証çœç•¥ã«ã‚ˆã‚Šã€æœ€åˆã® good ãªãƒªãƒ“ジョンã¯ä»¥ä¸‹ã‹ã‚‰é¸æŠžå¯èƒ½ã§ã™:\n"
+msgstr "検証çœç•¥ã«ã‚ˆã‚Šã€ 最åˆã® good ãªãƒªãƒ“ジョンã¯ä»¥ä¸‹ã‹ã‚‰é¸æŠžå¯èƒ½ã§ã™:\n"
msgid "Due to skipped revisions, the first bad revision could be any of:\n"
-msgstr "検証çœç•¥ã«ã‚ˆã‚Šã€æœ€åˆã® bad ãªãƒªãƒ“ジョンã¯ä»¥ä¸‹ã‹ã‚‰é¸æŠžå¯èƒ½ã§ã™:\n"
+msgstr "検証çœç•¥ã«ã‚ˆã‚Šã€ 最åˆã® bad ãªãƒªãƒ“ジョンã¯ä»¥ä¸‹ã‹ã‚‰é¸æŠžå¯èƒ½ã§ã™:\n"
msgid "cannot bisect (no known good revisions)"
msgstr "分割探索出æ¥ã¾ã›ã‚“(good リビジョンãŒæœªæŒ‡å®šã§ã™)"
@@ -6757,10 +6949,10 @@
#, python-format
msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
-msgstr "リビジョン %d:%s を検証ä¸(検証残 %dã€æ¤œè¨¼æ¸ˆã¿ %d)\n"
+msgstr "リビジョン %d:%s を検証ä¸(検証残 %d〠検証済㿠%d)\n"
msgid "set or show the current branch name"
-msgstr "ブランãƒåã®è¨å®šã€ãªã„ã—ç¾ãƒ–ランãƒåã®è¡¨ç¤º"
+msgstr "ブランãƒåã®è¨å®šã€ ãªã„ã—ç¾ãƒ–ランãƒåã®è¡¨ç¤º"
msgid ""
" With no argument, show the current branch name. With one argument,\n"
@@ -6769,16 +6961,16 @@
" recommends that primary development take place on the 'default'\n"
" branch."
msgstr ""
-" 引数無ã—ã®å ´åˆã€ç¾ãƒ–ランãƒåを表示ã—ã¾ã™ã€‚引数ãŒï¼‘ã¤æŒ‡å®šã•ã‚ŒãŸå ´åˆã€\n"
-" 作æ¥é ˜åŸŸã®ãƒ–ランãƒåã‚’è¨å®šã—ã¾ã™(次回コミット時ã¾ã§ã€ãƒ–ランãƒã¯ç”Ÿæˆ\n"
-" ã•ã‚Œã¾ã›ã‚“)。作æ¥æ™‚ã«åŸºæœ¬ã¨ã™ã‚‹ãƒ–ランãƒã«ã¯ã€'default' ブランãƒã‚’\n"
+" 引数無ã—ã®å ´åˆã€ ç¾ãƒ–ランãƒåを表示ã—ã¾ã™ã€‚ 引数ãŒï¼‘ã¤æŒ‡å®šã•ã‚ŒãŸå ´åˆã€ \n"
+" 作æ¥é ˜åŸŸã®ãƒ–ランãƒåã‚’è¨å®šã—ã¾ã™(次回コミット時ã¾ã§ã€ ブランãƒã¯ç”Ÿæˆ\n"
+" ã•ã‚Œã¾ã›ã‚“)。 作æ¥æ™‚ã«åŸºæœ¬ã¨ã™ã‚‹ãƒ–ランãƒã«ã¯ã€ 'default' ブランãƒã‚’\n"
" 使用ã™ã‚‹ã“ã¨ã‚’ãŠå‹§ã‚ã—ã¾ã™ã€‚"
msgid ""
" Unless -f/--force is specified, branch will not let you set a\n"
" branch name that already exists, even if it's inactive."
msgstr ""
-" -f/--force 指定ãŒç„¡ã„å ´åˆã€ä¾‹ãˆãã‚ŒãŒéžã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªã‚‚ã®ã§ã‚ã£ã¦ã‚‚ã€\n"
+" -f/--force 指定ãŒç„¡ã„å ´åˆã€ 例ãˆãã‚ŒãŒéžã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªã‚‚ã®ã§ã‚ã£ã¦ã‚‚〠\n"
" æ—¢å˜ãƒ–ランãƒã¨åŒã˜åå‰ã¯è¨å®šã§ãã¾ã›ã‚“。"
msgid ""
@@ -6786,7 +6978,7 @@
" the parent of the working directory, negating a previous branch\n"
" change."
msgstr ""
-" -C/--clean を指定ã™ã‚‹ã“ã¨ã§ã€ä»¥å‰ã®ãƒ–ランãƒåè¨å®šã‚’無効ã«ã—ã¦ã€ä½œæ¥\n"
+" -C/--clean を指定ã™ã‚‹ã“ã¨ã§ã€ 以å‰ã®ãƒ–ランãƒåè¨å®šã‚’無効ã«ã—ã¦ã€ 作æ¥\n"
" é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã®ãƒ–ランãƒåã«æˆ»ã—ã¾ã™ã€‚"
msgid ""
@@ -6794,7 +6986,7 @@
" :hg:`commit --close-branch` to mark this branch as closed."
msgstr ""
" 作æ¥é ˜åŸŸã®å†…容を既å˜ãƒ–ランãƒã®ã‚‚ã®ã§æ›´æ–°ã™ã‚‹å ´åˆã¯ :hg:`update` ã‚’\n"
-" 使用ã—ã¦ãã ã•ã„。ç¾ãƒ–ランãƒã‚’閉鎖ã™ã‚‹å ´åˆã¯\n"
+" 使用ã—ã¦ãã ã•ã„。 ç¾ãƒ–ランãƒã‚’閉鎖ã™ã‚‹å ´åˆã¯\n"
" :hg:`commit --close-branch` を使用ã—ã¦ãã ã•ã„。"
#, python-format
@@ -6817,15 +7009,15 @@
" inactive. If -c/--closed is specified, also list branches which have\n"
" been marked closed (see :hg:`commit --close-branch`)."
msgstr ""
-" リãƒã‚¸ãƒˆãƒªä¸ã®åå‰ä»˜ãブランãƒã‚’ã€éžæ´»æ€§(inactive)ã‹å¦ã‹ã¨å…±ã«\n"
-" 一覧表示ã—ã¾ã™ã€‚-c/--closed 指定時ã«ã¯ã€é–‰éŽ–済ã¿ã®ãƒ–ランãƒ\n"
+" リãƒã‚¸ãƒˆãƒªä¸ã®åå‰ä»˜ãブランãƒã‚’〠éžæ´»æ€§(inactive)ã‹å¦ã‹ã¨å…±ã«\n"
+" 一覧表示ã—ã¾ã™ã€‚ -c/--closed 指定時ã«ã¯ã€ 閉鎖済ã¿ã®ãƒ–ランãƒ\n"
" (:hg:`commit --close-branch` å‚ç…§)も表示ã•ã‚Œã¾ã™ã€‚"
msgid ""
" If -a/--active is specified, only show active branches. A branch\n"
" is considered active if it contains repository heads."
msgstr ""
-" -a/--active 指定時ã«ã¯ã€æ´»æ€§(active)ブランãƒã®ã¿ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚\n"
+" -a/--active 指定時ã«ã¯ã€ 活性(active)ブランãƒã®ã¿ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚\n"
" リãƒã‚¸ãƒˆãƒªä¸ã«ãƒ˜ãƒƒãƒ‰ã‚’æŒã¤ã‚‚ã®ãŒæ´»æ€§ãƒ–ランãƒã¨ã¿ãªã•ã‚Œã¾ã™ã€‚"
msgid " Use the command :hg:`update` to switch to an existing branch."
@@ -6853,7 +7045,7 @@
" Generate a compressed changegroup file collecting changesets not\n"
" known to be in another repository."
msgstr ""
-" 連æºå¯¾è±¡ãƒªãƒã‚¸ãƒˆãƒªã«å˜åœ¨ã—ãªã„リビジョンã®æƒ…å ±ã‚’ã¾ã¨ã‚ã¦ã€åœ§ç¸®\n"
+" 連æºå¯¾è±¡ãƒªãƒã‚¸ãƒˆãƒªã«å˜åœ¨ã—ãªã„リビジョンã®æƒ…å ±ã‚’ã¾ã¨ã‚ã¦ã€ 圧縮\n"
" 付ããƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã‚’生æˆã—ã¾ã™ã€‚"
msgid ""
@@ -6862,9 +7054,9 @@
" parameters. To create a bundle containing all changesets, use\n"
" -a/--all (or --base null)."
msgstr ""
-" 連æºå¯¾è±¡ãƒªãƒã‚¸ãƒˆãƒªãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€1ã¤ä»¥ä¸Šã® --base ã§æŒ‡å®š\n"
-" ã•ã‚ŒãŸãƒªãƒ“ジョンをæŒã¤ãƒªãƒã‚¸ãƒˆãƒªãŒæƒ³å®šã•ã‚Œã¾ã™ã€‚å…¨ã¦ã®ãƒªãƒ“ジョンを\n"
-" å«ã‚€ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã‚’生æˆã™ã‚‹ã«ã¯ã€-a/--all (ãªã„ã— --base null)ã‚’\n"
+" 連æºå¯¾è±¡ãƒªãƒã‚¸ãƒˆãƒªãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€ 1ã¤ä»¥ä¸Šã® --base ã§æŒ‡å®š\n"
+" ã•ã‚ŒãŸãƒªãƒ“ジョンをæŒã¤ãƒªãƒã‚¸ãƒˆãƒªãŒæƒ³å®šã•ã‚Œã¾ã™ã€‚ å…¨ã¦ã®ãƒªãƒ“ジョンを\n"
+" å«ã‚€ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã‚’生æˆã™ã‚‹ã«ã¯ã€ -a/--all (ãªã„ã— --base null)ã‚’\n"
" 指定ã—ã¾ã™ã€‚"
msgid ""
@@ -6872,7 +7064,7 @@
" The available compression methods are: none, bzip2, and\n"
" gzip (by default, bundles are compressed using bzip2)."
msgstr ""
-" 圧縮方å¼ã‚’変更ã™ã‚‹å ´åˆã¯ -t/--type を使用ã—ã¾ã™ã€‚利用å¯èƒ½ãªåœ§ç¸®\n"
+" 圧縮方å¼ã‚’変更ã™ã‚‹å ´åˆã¯ -t/--type を使用ã—ã¾ã™ã€‚ 利用å¯èƒ½ãªåœ§ç¸®\n"
" å½¢å¼ã¯ none(無圧縮), bzip2, gzip ã§ã™(無指定時㯠bzip2 圧縮)。"
msgid ""
@@ -6881,23 +7073,23 @@
" command. This is useful when direct push and pull are not\n"
" available or when exporting an entire repository is undesirable."
msgstr ""
-" ä»»æ„ã®æ–¹æ³•ã§è»¢é€ã—ãŸãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€ä»–ã®ãƒªãƒã‚¸ãƒˆãƒªä¸Šã§\n"
-" 'hg unbundle' ãªã„ã— 'hg pull' ã«ã‚ˆã‚Šé©ç”¨å¯èƒ½ã§ã™ã€‚ãƒãƒ³ãƒ‰ãƒ«ã«ã‚ˆã‚‹\n"
-" ä¼æ’ã¯ã€ 'hg push/pull' ã«ã‚ˆã‚‹ç›´æŽ¥è»¢é€ãŒã§ããªã„å ´åˆã‚„ã€ãƒªãƒã‚¸ãƒˆãƒª\n"
+" ä»»æ„ã®æ–¹æ³•ã§è»¢é€ã—ãŸãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€ ä»–ã®ãƒªãƒã‚¸ãƒˆãƒªä¸Šã§\n"
+" 'hg unbundle' ãªã„ã— 'hg pull' ã«ã‚ˆã‚Šé©ç”¨å¯èƒ½ã§ã™ã€‚ ãƒãƒ³ãƒ‰ãƒ«ã«ã‚ˆã‚‹\n"
+" ä¼æ’ã¯ã€ 'hg push/pull' ã«ã‚ˆã‚‹ç›´æŽ¥è»¢é€ãŒã§ããªã„å ´åˆã‚„〠リãƒã‚¸ãƒˆãƒª\n"
" 全体ã®å…¬é–‹ãŒæœ›ã¾ã—ãç„¡ã„å ´åˆã«æœ‰ç”¨ã§ã™ã€‚"
msgid ""
" Applying bundles preserves all changeset contents including\n"
" permissions, copy/rename information, and revision history."
msgstr ""
-" ãƒãƒ³ãƒ‰ãƒ«ã®é©ç”¨ã§ã¯ã€æ¨©é™è¨å®šã€è¤‡è£½ï¼æ”¹åã€å¤‰æ›´å±¥æ´ã¨ã„ã£ãŸæƒ…å ±ã‚’\n"
+" ãƒãƒ³ãƒ‰ãƒ«ã®é©ç”¨ã§ã¯ã€ 権é™è¨å®šã€ 複製ï¼æ”¹å〠変更履æ´ã¨ã„ã£ãŸæƒ…å ±ã‚’\n"
" å«ã‚€å…¨ã¦ã®æ›´æ–°å†…容ãŒå–ã‚Šè¾¼ã¾ã‚Œã¾ã™ã€‚"
msgid ""
" Returns 0 on success, 1 if no changes found.\n"
" "
msgstr ""
-" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰ã®çµ‚了値㯠0ã€å¤‰æ›´ãŒæ¤œå‡ºã§ããªã„å ´åˆã¯ 1 ã§ã™ã€‚\n"
+" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰ã®çµ‚了値㯠0〠変更ãŒæ¤œå‡ºã§ããªã„å ´åˆã¯ 1 ã§ã™ã€‚\n"
" "
msgid "--base is incompatible with specifying a destination"
@@ -6914,8 +7106,8 @@
" no revision is given, the parent of the working directory is used,\n"
" or tip if no revision is checked out."
msgstr ""
-" 指定ã•ã‚ŒãŸãƒªãƒ“ジョン時点ã§ã®ãƒ•ã‚¡ã‚¤ãƒ«å†…容を出力ã—ã¾ã™ã€‚リビジョンãŒ\n"
-" 指定ã•ã‚Œãªã„å ´åˆã¯ä½œæ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンãŒã€ä½œæ¥é ˜åŸŸã®æ›´æ–°å‰ãªã‚‰ tip\n"
+" 指定ã•ã‚ŒãŸãƒªãƒ“ジョン時点ã§ã®ãƒ•ã‚¡ã‚¤ãƒ«å†…容を出力ã—ã¾ã™ã€‚ リビジョンãŒ\n"
+" 指定ã•ã‚Œãªã„å ´åˆã¯ä½œæ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンãŒã€ 作æ¥é ˜åŸŸã®æ›´æ–°å‰ãªã‚‰ tip\n"
" ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚"
msgid ""
@@ -6923,7 +7115,7 @@
" given using a format string. The formatting rules are the same as\n"
" for the export command, with the following additions:"
msgstr ""
-" 出力先指定(ç½®æ›æŒ‡å®šå¯èƒ½)ãŒã‚ã‚‹å ´åˆã€å‡ºåŠ›ã¯ãƒ•ã‚¡ã‚¤ãƒ«ã«ä¿å˜ã•ã‚Œã¾ã™ã€‚\n"
+" 出力先指定(ç½®æ›æŒ‡å®šå¯èƒ½)ãŒã‚ã‚‹å ´åˆã€ 出力ã¯ãƒ•ã‚¡ã‚¤ãƒ«ã«ä¿å˜ã•ã‚Œã¾ã™ã€‚\n"
" ç½®æ›æŒ‡å®šã«ã¯ 'hg export' ã§æŒ‡å®šå¯èƒ½ãªã‚‚ã®ã«åŠ ãˆã¦ä»¥ä¸‹ã®ã‚‚ã®ã‚’指定\n"
" ã§ãã¾ã™:"
@@ -6933,7 +7125,7 @@
" :``%p``: root-relative path name of file being printed"
msgstr ""
" :``%s``: 対象ファイルã®ãƒ™ãƒ¼ã‚¹å\n"
-" :``%d``: 対象ファイルã®æ ¼ç´ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã€ãªã„ã— '.'(ルートã®å ´åˆ)\n"
+" :``%d``: 対象ファイルã®æ ¼ç´ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã€ ãªã„ã— '.'(ルートã®å ´åˆ)\n"
" :``%p``: 対象ファイルã®ãƒªãƒã‚¸ãƒˆãƒªãƒ«ãƒ¼ãƒˆã‹ã‚‰ã®ç›¸å¯¾ãƒ‘ス\n"
" "
@@ -6941,33 +7133,33 @@
msgstr "æ—¢å˜ãƒªãƒã‚¸ãƒˆãƒªã®è¤‡è£½"
msgid " Create a copy of an existing repository in a new directory."
-msgstr " æ—¢å˜ãƒªãƒã‚¸ãƒˆãƒªã‚’ã€æ–°è¦ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«è¤‡è£½ã—ã¾ã™ã€‚"
+msgstr " æ—¢å˜ãƒªãƒã‚¸ãƒˆãƒªã‚’〠新è¦ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«è¤‡è£½ã—ã¾ã™ã€‚"
msgid ""
" If no destination directory name is specified, it defaults to the\n"
" basename of the source."
msgstr ""
-" 複製先ディレクトリãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€è¤‡è£½å…ƒã®ãƒ™ãƒ¼ã‚¹å(パスåã®\n"
+" 複製先ディレクトリãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€ 複製元ã®ãƒ™ãƒ¼ã‚¹å(パスåã®\n"
" 末尾è¦ç´ )を使用ã—ã¾ã™ã€‚"
msgid ""
" The location of the source is added to the new repository's\n"
" .hg/hgrc file, as the default to be used for future pulls."
msgstr ""
-" å°†æ¥çš„㪠'hg pull' 実施ã«å‚™ãˆã¦ã€è¤‡è£½å…ˆãƒªãƒã‚¸ãƒˆãƒªã® .hg/hgrc \n"
-" ファイルã«ã¯ã€è¤‡è£½å…ƒãƒªãƒã‚¸ãƒˆãƒªä½ç½®ãŒ default å義ã§è¨˜éŒ²ã•ã‚Œã¾ã™ã€‚"
+" å°†æ¥çš„㪠'hg pull' 実施ã«å‚™ãˆã¦ã€ 複製先リãƒã‚¸ãƒˆãƒªã® .hg/hgrc \n"
+" ファイルã«ã¯ã€ 複製元リãƒã‚¸ãƒˆãƒªä½ç½®ãŒ default å義ã§è¨˜éŒ²ã•ã‚Œã¾ã™ã€‚"
msgid " See :hg:`help urls` for valid source format details."
-msgstr " リãƒã‚¸ãƒˆãƒªä½ç½®æŒ‡å®šã®è©³ç´°ã¯ã€:hg:`help urls` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
+msgstr " リãƒã‚¸ãƒˆãƒªä½ç½®æŒ‡å®šã®è©³ç´°ã¯ã€ :hg:`help urls` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
msgid ""
" It is possible to specify an ``ssh://`` URL as the destination, but no\n"
" .hg/hgrc and working directory will be created on the remote side.\n"
" Please see :hg:`help urls` for important details about ``ssh://`` URLs."
msgstr ""
-" 複製先ã¨ã—㦠``ssh://`` URL å½¢å¼ã‚’指定ã™ã‚‹ã“ã¨ã‚‚å¯èƒ½ã§ã™ãŒã€\n"
-" é 隔ホスト上ã§ã¯ã€.hg/hgrc ã®ä½œæˆã‚‚ã€ä½œæ¥é ˜åŸŸã®æ›´æ–°ã‚‚è¡Œã‚ã‚Œã¾ã›ã‚“。\n"
-" ``ssh://`` URL å½¢å¼ã®è©³ç´°ã¯ã€:hg:`help urls` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
+" 複製先ã¨ã—㦠``ssh://`` URL å½¢å¼ã‚’指定ã™ã‚‹ã“ã¨ã‚‚å¯èƒ½ã§ã™ãŒã€ \n"
+" é 隔ホスト上ã§ã¯ã€ .hg/hgrc ã®ä½œæˆã‚‚〠作æ¥é ˜åŸŸã®æ›´æ–°ã‚‚è¡Œã‚ã‚Œã¾ã›ã‚“。\n"
+" ``ssh://`` URL å½¢å¼ã®è©³ç´°ã¯ã€ :hg:`help urls` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
msgid ""
" A set of changesets (tags, or branch names) to pull may be specified\n"
@@ -6979,13 +7171,13 @@
" No subsequent changesets (including subsequent tags) will be present\n"
" in the destination."
msgstr ""
-" 複製先ã«å–り込む一連ã®ãƒªãƒ“ジョンã¯ã€-r/--rev を使用ã—ã¦ãƒªãƒ“ジョン\n"
+" 複製先ã«å–り込む一連ã®ãƒªãƒ“ジョンã¯ã€ -r/--rev を使用ã—ã¦ãƒªãƒ“ジョン\n"
" (ã‚¿ã‚°åやブランãƒåã‚‚å¯)を列挙ã™ã‚‹ã“ã¨ã§æŒ‡å®šã—ã¾ã™ã€‚\n"
-" -r/--rev ã«ã‚ˆã‚‹ãƒªãƒ“ジョン指定複製を行ãªã†å ´åˆã€è¤‡è£½å…ˆãƒªãƒã‚¸ãƒˆãƒªã¯\n"
+" -r/--rev ã«ã‚ˆã‚‹ãƒªãƒ“ジョン指定複製を行ãªã†å ´åˆã€ 複製先リãƒã‚¸ãƒˆãƒªã¯\n"
" 複製元リãƒã‚¸ãƒˆãƒªã®æŒã¤ãƒªãƒ“ジョンã®ä¸€éƒ¨ã®ã¿ãŒå–ã‚Šè¾¼ã¾ã‚Œã¾ã™ã€‚\n"
" -r/--rev ã«ã‚ˆã£ã¦æŒ‡å®šã•ã‚ŒãŸãƒªãƒ“ジョン(ãŠã‚ˆã³ãã®ç¥–å…ˆã¨ãªã‚‹ãƒªãƒ“ジョン)\n"
" ãŒå–ã‚Šè¾¼ã¿å¯¾è±¡ã¨ãªã‚Šã¾ã™ã€‚\n"
-" 複製先リãƒã‚¸ãƒˆãƒªã«ã¯ã€æŒ‡å®šãƒªãƒ“ジョン以後ã®ãƒªãƒ“ジョンã¯å–ã‚Šè¾¼ã¾ã‚Œã¾ã›ã‚“\n"
+" 複製先リãƒã‚¸ãƒˆãƒªã«ã¯ã€ 指定リビジョン以後ã®ãƒªãƒ“ジョンã¯å–ã‚Šè¾¼ã¾ã‚Œã¾ã›ã‚“\n"
" (後続ã®ã‚¿ã‚°ä»˜ã‘リビジョンも除外ã•ã‚Œã¾ã™)。"
msgid ""
@@ -6993,7 +7185,7 @@
" local source repositories."
msgstr ""
" -r/--rev 指定付ã(ãªã„ã—㯠'hg clone 複製元#リビジョン' å½¢å¼)\n"
-" 複製ã®å ´åˆã€åŒä¸€ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ 上ã§ã®è¤‡è£½ã§ã‚ã£ã¦ã‚‚ã€\n"
+" 複製ã®å ´åˆã€ åŒä¸€ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ 上ã§ã®è¤‡è£½ã§ã‚ã£ã¦ã‚‚〠\n"
" 暗黙的㫠--pull 指定を伴ã„ã¾ã™ã€‚"
msgid ""
@@ -7004,18 +7196,18 @@
" do not report errors. In these cases, use the --pull option to\n"
" avoid hardlinking."
msgstr ""
-" 複製元ï¼è¤‡è£½å…ˆãŒåŒä¸€ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ 上ã«ã‚ã‚‹å ´åˆã€è³‡æºåŠ¹çŽ‡ç‰ã®\n"
+" 複製元ï¼è¤‡è£½å…ˆãŒåŒä¸€ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ 上ã«ã‚ã‚‹å ´åˆã€ 資æºåŠ¹çŽ‡ç‰ã®\n"
" ç†ç”±ã‹ã‚‰(リãƒã‚¸ãƒˆãƒªã®å†…部管ç†ãƒ‡ãƒ¼ã‚¿ã«å¯¾ã—ã¦ã®ã¿)ãƒãƒ¼ãƒ‰ãƒªãƒ³ã‚¯ãŒä½¿ç”¨\n"
-" ã•ã‚Œã¾ã™ã€‚AFS ã‚’å«ã‚€å¹¾ã¤ã‹ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ ã¯ã€ãƒãƒ¼ãƒ‰ãƒªãƒ³ã‚¯å®Ÿè£…ãŒ\n"
-" ä¸é©åˆ‡ã§ã‚ã‚‹ã«ã‚‚é–¢ã‚らãšã€ã‚¨ãƒ©ãƒ¼é€šçŸ¥ãŒã‚ã‚Šã¾ã›ã‚“。ã“ã®ã‚ˆã†ãªå ´åˆã«ã¯\n"
-" --pull を指定ã™ã‚‹ã“ã¨ã§ã€ãƒãƒ¼ãƒ‰ãƒªãƒ³ã‚¯ã‚’抑æ¢ã—ã¾ã™ã€‚"
+" ã•ã‚Œã¾ã™ã€‚ AFS ã‚’å«ã‚€å¹¾ã¤ã‹ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ ã¯ã€ ãƒãƒ¼ãƒ‰ãƒªãƒ³ã‚¯å®Ÿè£…ãŒ\n"
+" ä¸é©åˆ‡ã§ã‚ã‚‹ã«ã‚‚é–¢ã‚らãšã€ エラー通知ãŒã‚ã‚Šã¾ã›ã‚“。 ã“ã®ã‚ˆã†ãªå ´åˆã«ã¯\n"
+" --pull を指定ã™ã‚‹ã“ã¨ã§ã€ ãƒãƒ¼ãƒ‰ãƒªãƒ³ã‚¯ã‚’抑æ¢ã—ã¾ã™ã€‚"
msgid ""
" In some cases, you can clone repositories and the working directory\n"
" using full hardlinks with ::"
msgstr ""
-" リãƒã‚¸ãƒˆãƒªã®å†…部管ç†ãƒ‡ãƒ¼ã‚¿ã¨ä½œæ¥é ˜åŸŸä¸ã®ãƒ•ã‚¡ã‚¤ãƒ«å…¨ã¦ã«å¯¾ã™ã‚‹ã€\n"
-" ãƒãƒ¼ãƒ‰ãƒªãƒ³ã‚¯ã«ã‚ˆã‚‹è¤‡è£½ã®ä½œæˆã«ã¯ã€ä»¥ä¸‹ã®æ–¹æ³•ãŒä½¿ãˆã‚‹ã‹ã‚‚知れã¾ã›ã‚“::"
+" リãƒã‚¸ãƒˆãƒªã®å†…部管ç†ãƒ‡ãƒ¼ã‚¿ã¨ä½œæ¥é ˜åŸŸä¸ã®ãƒ•ã‚¡ã‚¤ãƒ«å…¨ã¦ã«å¯¾ã™ã‚‹ã€ \n"
+" ãƒãƒ¼ãƒ‰ãƒªãƒ³ã‚¯ã«ã‚ˆã‚‹è¤‡è£½ã®ä½œæˆã«ã¯ã€ 以下ã®æ–¹æ³•ãŒä½¿ãˆã‚‹ã‹ã‚‚知れã¾ã›ã‚“::"
msgid " $ cp -al REPO REPOCLONE"
msgstr " $ cp -al REPO REPOCLONE"
@@ -7028,18 +7220,18 @@
" this is not compatible with certain extensions that place their\n"
" metadata under the .hg directory, such as mq."
msgstr ""
-" ã“ã®æ–¹æ³•ã¯æœ€é€Ÿã®è¤‡è£½æ–¹æ³•ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“ãŒã€å¸¸ã«å®‰å…¨ã¨ã¯é™ã‚Šã¾ã›ã‚“。\n"
+" ã“ã®æ–¹æ³•ã¯æœ€é€Ÿã®è¤‡è£½æ–¹æ³•ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“ãŒã€ 常ã«å®‰å…¨ã¨ã¯é™ã‚Šã¾ã›ã‚“。\n"
" æ“作ã®å˜ä¸€æ€§ã¯ä¿éšœã•ã‚Œã¾ã›ã‚“(リãƒã‚¸ãƒˆãƒªã®è¤‡è£½ä¸æ”¹å¤‰ã®é˜²æ¢ã¯åˆ©ç”¨è€…\n"
-" 責務)ã—ã€åˆ©ç”¨ã™ã‚‹ã‚¨ãƒ‡ã‚£ã‚¿ã®ãƒ•ã‚¡ã‚¤ãƒ«æ”¹å¤‰æ™‚ã®æŒ¯ã‚‹èˆžã„ãŒã€ãƒãƒ¼ãƒ‰ãƒªãƒ³ã‚¯\n"
+" 責務)ã—〠利用ã™ã‚‹ã‚¨ãƒ‡ã‚£ã‚¿ã®ãƒ•ã‚¡ã‚¤ãƒ«æ”¹å¤‰æ™‚ã®æŒ¯ã‚‹èˆžã„ãŒã€ ãƒãƒ¼ãƒ‰ãƒªãƒ³ã‚¯\n"
" ã‚’ç ´æ£„ã™ã‚‹ã‚‚ã®ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™(Emacs ãŠã‚ˆã³å¤šãã® Linux ç³»\n"
-" ツールã¯ãã®ã‚ˆã†ã«æŒ¯èˆžã„ã¾ã™)。ã“ã®åˆ¶ç´„㯠.hg ディレクトリé…下ã«\n"
-" メタデータをé…ç½®ã™ã‚‹ã€MQ ãªã©ã®ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ã¨ã¯ç›¸å®¹ã‚Œã¾ã›ã‚“。"
+" ツールã¯ãã®ã‚ˆã†ã«æŒ¯èˆžã„ã¾ã™)。 ã“ã®åˆ¶ç´„㯠.hg ディレクトリé…下ã«\n"
+" メタデータをé…ç½®ã™ã‚‹ã€ MQ ãªã©ã®ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ã¨ã¯ç›¸å®¹ã‚Œã¾ã›ã‚“。"
msgid ""
" Mercurial will update the working directory to the first applicable\n"
" revision from this list:"
msgstr ""
-" Mercurial ã¯ã€ä»¥ä¸‹ã®ä¸€è¦§ä¸ã§æœ€åˆã«åˆ©ç”¨å¯èƒ½ãªãƒªãƒ“ジョンを用ã„ã¦\n"
+" Mercurial ã¯ã€ 以下ã®ä¸€è¦§ä¸ã§æœ€åˆã«åˆ©ç”¨å¯èƒ½ãªãƒªãƒ“ジョンを用ã„ã¦\n"
" 作æ¥é ˜åŸŸã‚’æ›´æ–°ã—ã¾ã™:"
msgid ""
@@ -7054,10 +7246,10 @@
" g) the tipmost head of the default branch\n"
" h) tip"
msgstr ""
-" a) -U ãŒæŒ‡å®šã•ã‚Œã‚‹ã‹ã€å…ƒãƒªãƒã‚¸ãƒˆãƒªå±¥æ´ãŒç©ºã®å ´åˆã¯ null リビジョン\n"
-" b) -u . ãŒæŒ‡å®šã•ã‚Œã€ä¸”ã¤å…ƒãƒªãƒã‚¸ãƒˆãƒªãŒåŒä¸€ãƒ›ã‚¹ãƒˆã®å ´åˆã€\n"
+" a) -U ãŒæŒ‡å®šã•ã‚Œã‚‹ã‹ã€ 元リãƒã‚¸ãƒˆãƒªå±¥æ´ãŒç©ºã®å ´åˆã¯ null リビジョン\n"
+" b) -u . ãŒæŒ‡å®šã•ã‚Œã€ 且ã¤å…ƒãƒªãƒã‚¸ãƒˆãƒªãŒåŒä¸€ãƒ›ã‚¹ãƒˆã®å ´åˆã€ \n"
" 元リãƒã‚¸ãƒˆãƒªã®ä½œæ¥é ˜åŸŸã®ç¬¬1親リビジョン\n"
-" c) -u ã§æŒ‡å®šã•ã‚ŒãŸãƒªãƒ“ジョン(ブランãƒåãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€\n"
+" c) -u ã§æŒ‡å®šã•ã‚ŒãŸãƒªãƒ“ジョン(ブランãƒåãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ \n"
" 当該ブランãƒã®æœ€æ–°ãƒ˜ãƒƒãƒ‰ãƒªãƒ“ジョン)\n"
" d) -r ã§æŒ‡å®šã•ã‚ŒãŸãƒªãƒ“ジョン\n"
" e) -b ã§æŒ‡å®šsã‚ŒãŸãƒ–ランãƒã®æœ€æ–°ãƒ˜ãƒƒãƒ‰ãƒªãƒ“ジョン\n"
@@ -7077,22 +7269,22 @@
" :hg:`push` for a way to actively distribute your changes."
msgstr ""
" 指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã®å¤‰æ›´å†…容を管ç†é ˜åŸŸã«è¨˜éŒ²(コミット)ã—ã¾ã™ã€‚\n"
-" RCS ã®ã‚ˆã†ãªä¸å¤®é›†æ¨©çš„ãªãƒ„ールã¨ç•°ãªã‚Šã€ã“ã®æ“作ã¯æ‰‹å…ƒã®ç®¡ç†é ˜åŸŸã«\n"
-" 対ã™ã‚‹è¨˜éŒ²ã—ã‹è¡Œã„ã¾ã›ã‚“。変更を能動的ã«å…¬é–‹ã™ã‚‹æ–¹æ³•ã«é–¢ã—ã¦ã¯\n"
+" RCS ã®ã‚ˆã†ãªä¸å¤®é›†æ¨©çš„ãªãƒ„ールã¨ç•°ãªã‚Šã€ ã“ã®æ“作ã¯æ‰‹å…ƒã®ç®¡ç†é ˜åŸŸã«\n"
+" 対ã™ã‚‹è¨˜éŒ²ã—ã‹è¡Œã„ã¾ã›ã‚“。 変更を能動的ã«å…¬é–‹ã™ã‚‹æ–¹æ³•ã«é–¢ã—ã¦ã¯\n"
" :hg:`help push` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
msgid ""
" If a list of files is omitted, all changes reported by :hg:`status`\n"
" will be committed."
msgstr ""
-" ファイル指定ãŒçœç•¥ã•ã‚ŒãŸå ´åˆã€:hg:`status` ã«ã‚ˆã‚Šæ¤œå‡ºã•ã‚Œã‚‹å…¨ã¦ã®\n"
+" ファイル指定ãŒçœç•¥ã•ã‚ŒãŸå ´åˆã€ :hg:`status` ã«ã‚ˆã‚Šæ¤œå‡ºã•ã‚Œã‚‹å…¨ã¦ã®\n"
" 変更内容ãŒã‚³ãƒŸãƒƒãƒˆã•ã‚Œã¾ã™ã€‚"
msgid ""
" If you are committing the result of a merge, do not provide any\n"
" filenames or -I/-X filters."
msgstr ""
-" 'hg merge' çµæžœã‚’コミットã™ã‚‹å ´åˆã€ãƒ•ã‚¡ã‚¤ãƒ«åãªã„ã— -I/-X ã®ã„ãšã‚Œã‚‚\n"
+" 'hg merge' çµæžœã‚’コミットã™ã‚‹å ´åˆã€ ファイルåãªã„ã— -I/-X ã®ã„ãšã‚Œã‚‚\n"
" 指定ã—ãªã„ã§ãã ã•ã„。"
msgid ""
@@ -7101,15 +7293,15 @@
" commit fails, you will find a backup of your message in\n"
" ``.hg/last-message.txt``."
msgstr ""
-" コミットメッセージãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸å…¥åŠ›ç”¨ã®ãƒ—ãƒã‚°ãƒ©ãƒ ãŒ\n"
-" è¨å®šã«å¾“ã£ã¦èµ·å‹•ã•ã‚Œã¾ã™ã€‚コミット処ç†ãŒå¤±æ•—ã—ãŸå ´åˆã§ã‚‚ã€\n"
+" コミットメッセージãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€ メッセージ入力用ã®ãƒ—ãƒã‚°ãƒ©ãƒ ãŒ\n"
+" è¨å®šã«å¾“ã£ã¦èµ·å‹•ã•ã‚Œã¾ã™ã€‚ コミット処ç†ãŒå¤±æ•—ã—ãŸå ´åˆã§ã‚‚〠\n"
" 入力ã—ãŸãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã¯ ``.hg/last-message.txt`` ã«ä¿å˜ã•ã‚Œã¾ã™ã€‚"
msgid ""
" Returns 0 on success, 1 if nothing changed.\n"
" "
msgstr ""
-" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰ã®çµ‚了値㯠0ã€å¤‰æ›´ãŒæ¤œå‡ºã§ããªã„å ´åˆã¯ 1 ã§ã™ã€‚\n"
+" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰ã®çµ‚了値㯠0〠変更ãŒæ¤œå‡ºã§ããªã„å ´åˆã¯ 1 ã§ã™ã€‚\n"
" "
msgid "can only close branch heads"
@@ -7137,32 +7329,32 @@
" directory, copies are put in that directory. If dest is a file,\n"
" the source must be a single file."
msgstr ""
-" 対象ファイルãŒè¤‡è£½å…ƒã‹ã‚‰ã®è¤‡è£½ã§ã‚ã‚‹ã“ã¨ã‚’記録ã—ã¾ã™ã€‚複製先指定ãŒ\n"
-" ディレクトリã®å ´åˆã€ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªå†…ã«è¤‡è£½ãŒä½œæˆã•ã‚Œã¾ã™ã€‚複製先指定ãŒ\n"
-" ファイルã®å ´åˆã€è¤‡è£½å…ƒã¯1ã¤ã—ã‹æŒ‡å®šã§ãã¾ã›ã‚“。"
+" 対象ファイルãŒè¤‡è£½å…ƒã‹ã‚‰ã®è¤‡è£½ã§ã‚ã‚‹ã“ã¨ã‚’記録ã—ã¾ã™ã€‚ 複製先指定ãŒ\n"
+" ディレクトリã®å ´åˆã€ ディレクトリ内ã«è¤‡è£½ãŒä½œæˆã•ã‚Œã¾ã™ã€‚ 複製先指定ãŒ\n"
+" ファイルã®å ´åˆã€ 複製元ã¯1ã¤ã—ã‹æŒ‡å®šã§ãã¾ã›ã‚“。"
msgid ""
" By default, this command copies the contents of files as they\n"
" exist in the working directory. If invoked with -A/--after, the\n"
" operation is recorded, but no copying is performed."
msgstr ""
-" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€è¤‡è£½å…ƒãƒ•ã‚¡ã‚¤ãƒ«ã®å†…容をæŒã¤è¤‡è£½å…ˆãƒ•ã‚¡ã‚¤ãƒ«ã‚’作æ¥\n"
-" é ˜åŸŸã«ä½œæˆã—ã¾ã™ã€‚-A/--after 指定ãŒã‚ã‚‹å ´åˆã€ã€Œè¤‡è£½ã€æ“作ã¯è¨˜éŒ²ã•ã‚Œ\n"
-" ã¾ã™ãŒã€ãƒ•ã‚¡ã‚¤ãƒ«ã®è¤‡è£½ã¯è¡Œã‚ã‚Œã¾ã›ã‚“。"
+" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€ 複製元ファイルã®å†…容をæŒã¤è¤‡è£½å…ˆãƒ•ã‚¡ã‚¤ãƒ«ã‚’作æ¥\n"
+" é ˜åŸŸã«ä½œæˆã—ã¾ã™ã€‚ -A/--after 指定ãŒã‚ã‚‹å ´åˆã€ 「複製ã€æ“作ã¯è¨˜éŒ²ã•ã‚Œ\n"
+" ã¾ã™ãŒã€ ファイルã®è¤‡è£½ã¯è¡Œã‚ã‚Œã¾ã›ã‚“。"
msgid ""
" This command takes effect with the next commit. To undo a copy\n"
" before that, see :hg:`revert`."
msgstr ""
" 本コマンドã®å®Ÿè¡Œçµæžœã¯æ¬¡å›žã®ã‚³ãƒŸãƒƒãƒˆã®éš›ã«åŠ¹æžœã‚’発æ®ã—ã¾ã™ã€‚\n"
-" 複製æ“作ã®ã‚³ãƒŸãƒƒãƒˆå‰å–り消ã—ã¯ã€:hg:`help revert` ã‚’å‚ç…§ã—ã¦\n"
+" 複製æ“作ã®ã‚³ãƒŸãƒƒãƒˆå‰å–り消ã—ã¯ã€ :hg:`help revert` ã‚’å‚ç…§ã—ã¦\n"
" ãã ã•ã„。"
msgid ""
" Returns 0 on success, 1 if errors are encountered.\n"
" "
msgstr ""
-" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰ã®çµ‚了値㯠0ã€ã‚¨ãƒ©ãƒ¼ç™ºç”Ÿæ™‚㯠1 ã§ã™ã€‚\n"
+" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰ã®çµ‚了値㯠0〠エラー発生時㯠1 ã§ã™ã€‚\n"
" "
msgid "find the ancestor revision of two revisions in a given index"
@@ -7246,19 +7438,19 @@
#, python-format
msgid "%s in state %s, but not in manifest1\n"
-msgstr "%s ã®çŠ¶æ…‹ã¯ %s ã§ã™ãŒã€ç®¡ç†å¯¾è±¡ã§ã¯ã‚ã‚Šã¾ã›ã‚“\n"
+msgstr "%s ã®çŠ¶æ…‹ã¯ %s ã§ã™ãŒã€ 管ç†å¯¾è±¡ã§ã¯ã‚ã‚Šã¾ã›ã‚“\n"
#, python-format
msgid "%s in state %s, but also in manifest1\n"
-msgstr "%s ã®çŠ¶æ…‹ã¯ %s ã§ã™ãŒã€æ—¢ã«ç®¡ç†å¯¾è±¡ã«ãªã£ã¦ã„ã¾ã™\n"
+msgstr "%s ã®çŠ¶æ…‹ã¯ %s ã§ã™ãŒã€ æ—¢ã«ç®¡ç†å¯¾è±¡ã«ãªã£ã¦ã„ã¾ã™\n"
#, python-format
msgid "%s in state %s, but not in either manifest\n"
-msgstr "%s ã®çŠ¶æ…‹ã¯ %s ã§ã™ãŒã€ç®¡ç†å¯¾è±¡ã§ã¯ã‚ã‚Šã¾ã›ã‚“\n"
+msgstr "%s ã®çŠ¶æ…‹ã¯ %s ã§ã™ãŒã€ 管ç†å¯¾è±¡ã§ã¯ã‚ã‚Šã¾ã›ã‚“\n"
#, python-format
msgid "%s in manifest1, but listed as state %s"
-msgstr "%s ã¯ç®¡ç†å¯¾è±¡ã§ã™ãŒã€çŠ¶æ…‹ %s ã§ã™"
+msgstr "%s ã¯ç®¡ç†å¯¾è±¡ã§ã™ãŒã€ 状態 %s ã§ã™"
msgid ".hg/dirstate inconsistent with current parent's manifest"
msgstr "親リビジョンã®ç®¡ç†æƒ…å ±ã¨ .hg/dirstate ã®é–“ã«ä¸æ•´åˆãŒã‚ã‚Šã¾ã™"
@@ -7267,27 +7459,28 @@
msgstr "å…¨è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚ˆã‚‹æœ€çµ‚çš„ãªè¨å®šå†…容ã®è¡¨ç¤º"
msgid " With no arguments, print names and values of all config items."
-msgstr " 引数指定ãŒç„¡ã„å ´åˆã€å…¨ã¦ã®è¨å®šé …ç›®ã«å¯¾ã—ã¦ã€åå‰ã¨å€¤ã‚’表示ã—ã¾ã™ã€‚"
+msgstr ""
+" 引数指定ãŒç„¡ã„å ´åˆã€ å…¨ã¦ã®è¨å®šé …ç›®ã«å¯¾ã—ã¦ã€ åå‰ã¨å€¤ã‚’表示ã—ã¾ã™ã€‚"
msgid ""
" With one argument of the form section.name, print just the value\n"
" of that config item."
msgstr ""
-" 'section.name' å½¢å¼ã«åˆè‡´ã™ã‚‹å¼•æ•°ã‚’1ã¤ã ã‘指定ã—ãŸå ´åˆã€ãã®è¨å®šé …ç›®\n"
+" 'section.name' å½¢å¼ã«åˆè‡´ã™ã‚‹å¼•æ•°ã‚’1ã¤ã ã‘指定ã—ãŸå ´åˆã€ ãã®è¨å®šé …ç›®\n"
" 値ã®ã¿ã‚’表示ã—ã¾ã™ã€‚"
msgid ""
" With multiple arguments, print names and values of all config\n"
" items with matching section names."
msgstr ""
-" 複数ã®å¼•æ•°ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ãれらをセクションåã¨ã¿ãªã—ã€è©²å½“ã™ã‚‹\n"
+" 複数ã®å¼•æ•°ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ ãれらをセクションåã¨ã¿ãªã—〠該当ã™ã‚‹\n"
" セクションã®è¨å®šé …目を全ã¦è¡¨ç¤ºã—ã¾ã™ã€‚"
msgid ""
" With --debug, the source (filename and line number) is printed\n"
" for each config item."
msgstr ""
-" --debug 指定ãŒã‚ã‚‹å ´åˆã€è¨å®šé …目毎ã«è¨˜è¿°ä½ç½®(ファイルåã¨è¡Œç•ªå·)ãŒ\n"
+" --debug 指定ãŒã‚ã‚‹å ´åˆã€ è¨å®šé …目毎ã«è¨˜è¿°ä½ç½®(ファイルåã¨è¡Œç•ªå·)ãŒ\n"
" 表示ã•ã‚Œã¾ã™ã€‚\n"
" "
@@ -7320,7 +7513,7 @@
" This is useful for writing repository conversion tools, but should\n"
" be used with care."
msgstr ""
-" 本コマンドã¯ãƒªãƒã‚¸ãƒˆãƒªå¤‰æ›ãƒ„ールã®ä½œæˆã«æœ‰ç”¨ã§ã™ãŒã€åˆ©ç”¨ã«ã¯æ³¨æ„ãŒ\n"
+" 本コマンドã¯ãƒªãƒã‚¸ãƒˆãƒªå¤‰æ›ãƒ„ールã®ä½œæˆã«æœ‰ç”¨ã§ã™ãŒã€ 利用ã«ã¯æ³¨æ„ãŒ\n"
" å¿…è¦ã§ã™ã€‚"
msgid "show the contents of the current dirstate"
@@ -7372,8 +7565,9 @@
msgid " (check that your locale is properly set)\n"
msgstr " (ãƒã‚±ãƒ¼ãƒ«è¨å®šã®å¦¥å½“性を確èªã—ã¦ãã ã•ã„)\n"
-msgid "Checking extensions...\n"
-msgstr "エクステンションã®æ¤œè¨¼ä¸...\n"
+#, python-format
+msgid "Checking installed modules (%s)...\n"
+msgstr "インストール済ã¿ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã®ç¢ºèªä¸(%s)...\n"
msgid " One or more extensions could not be found"
msgstr " 見ã¤ã‹ã‚‰ãªã„エクステンションãŒã‚ã‚Šã¾ã™"
@@ -7402,14 +7596,14 @@
msgid ""
" (Current patch tool may be incompatible with patch, or misconfigured. "
"Please check your configuration file)\n"
-msgstr " (ツールãŒæœªå¯¾å¿œãªãƒ‘ッãƒå½¢å¼ã‹ã€è¨å®šãƒŸã‚¹ã§ã™ã€‚è¨å®šç¢ºèªãŒå¿…è¦ã§ã™)\n"
+msgstr " (ツールãŒæœªå¯¾å¿œãªãƒ‘ッãƒå½¢å¼ã‹ã€ è¨å®šãƒŸã‚¹ã§ã™ã€‚ è¨å®šç¢ºèªãŒå¿…è¦ã§ã™)\n"
msgid ""
" Internal patcher failure, please report this error to http://mercurial."
-"selenic.com/bts/\n"
-msgstr ""
-" 内部パッãƒãƒ„ールãŒæ©Ÿèƒ½ã—ã¾ã›ã‚“。\n"
-"http://mercurial.selenic.com/bts ã¸ã®ã‚¨ãƒ©ãƒ¼å ±å‘Šã«ã”å”力ãã ã•ã„\n"
+"selenic.com/wiki/BugTracker\n"
+msgstr ""
+" 内部パッãƒãƒ„ールãŒæ©Ÿèƒ½ã—ã¾ã›ã‚“。 http://mercurial.selenic.com/wiki/"
+"BugTrackerã¸ã®ã‚¨ãƒ©ãƒ¼å ±å‘Šã«ã”å”力ãã ã•ã„\n"
msgid "Checking commit editor...\n"
msgstr "メッセージ入力用エディタã®æ¤œè¨¼ä¸...\n"
@@ -7435,7 +7629,7 @@
#, python-format
msgid "%s problems detected, please check your install!\n"
-msgstr "障害ãŒ%s件検出ã•ã‚Œã¾ã—ãŸã€‚インストール内容を確èªã—ã¦ãã ã•ã„\n"
+msgstr "障害ãŒ%s件検出ã•ã‚Œã¾ã—ãŸã€‚ インストール内容を確èªã—ã¦ãã ã•ã„\n"
msgid "dump rename information"
msgstr "改åæƒ…å ±ã®è¡¨ç¤º"
@@ -7455,24 +7649,27 @@
msgstr "作æ¥é ˜åŸŸå…¨ä½“(ãªã„ã—指定ファイル)ã®å·®åˆ†æŠ½å‡º"
msgid " Show differences between revisions for the specified files."
-msgstr " 指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã—ã¦ã€ãƒªãƒ“ジョン間ã®å·®åˆ†ã‚’表示ã—ã¾ã™ã€‚"
+msgstr " 指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã—ã¦ã€ リビジョン間ã®å·®åˆ†ã‚’表示ã—ã¾ã™ã€‚"
msgid " Differences between files are shown using the unified diff format."
msgstr " 差分㯠unified diff å½¢å¼ã§è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚"
msgid ""
-" NOTE: diff may generate unexpected results for merges, as it will\n"
-" default to comparing against the working directory's first parent\n"
-" changeset if no revisions are specified."
-msgstr ""
-" 備考: マージã«å¯¾ã™ã‚‹å·®åˆ†è¡¨ç¤ºãŒæœŸå¾…ã¨ç•°ãªã‚‹å ´åˆãŒã‚ã‚‹ã®ã¯ã€ç„¡æŒ‡å®šæ™‚ã«\n"
-" 比較対象ã¨ãªã‚‹ã®ãŒã€ä½œæ¥é ˜åŸŸã®ç¬¬1親ã§ã‚ã‚‹ãŸã‚ã§ã™ã€‚"
+" .. note::\n"
+" diff may generate unexpected results for merges, as it will\n"
+" default to comparing against the working directory's first\n"
+" parent changeset if no revisions are specified."
+msgstr ""
+" .. note::\n"
+" マージ実施リビジョンã«å¯¾ã™ã‚‹æœ¬ã‚³ãƒžãƒ³ãƒ‰ã®å·®åˆ†å‡ºåŠ›ãŒã€ \n"
+" 期待ã¨ç•°ãªã‚‹å ´åˆãŒã‚ã‚‹ã®ã¯ã€ 対象リビジョンãŒç„¡æŒ‡å®šã®å ´åˆã«\n"
+" 比較対象ã¨ãªã‚‹ã®ãŒã€ 作æ¥é ˜åŸŸã®ç¬¬1親ã«å›ºå®šã•ã‚Œã¦ã„ã‚‹ãŸã‚ã§ã™ã€‚"
msgid ""
" Alternatively you can specify -c/--change with a revision to see\n"
" the changes in that changeset relative to its first parent."
msgstr ""
-" 指定リビジョンã¨ã€ãã®ç¬¬1親ã¨ã®é–“ã®å·®åˆ†ã‚’見るã«ã¯ã€-c/--change ã§\n"
+" 指定リビジョンã¨ã€ ãã®ç¬¬1親ã¨ã®é–“ã®å·®åˆ†ã‚’見るã«ã¯ã€ -c/--change ã§\n"
" 対象リビジョンを指定ã™ã‚‹æ–¹æ³•ã‚‚使用ã§ãã¾ã™ã€‚"
msgid ""
@@ -7480,15 +7677,15 @@
" files it detects as binary. With -a, diff will generate a diff\n"
" anyway, probably with undesirable results."
msgstr ""
-" -a/--text 指定ãŒç„¡ã„å ´åˆã€ãƒã‚¤ãƒŠãƒªã¨æ€ã—ãファイルã¯å‡¦ç†å¯¾è±¡ã‹ã‚‰\n"
-" 除外ã•ã‚Œã¾ã™ã€‚-a 指定ãŒæœ‰ã‚‹å ´åˆã€çµæžœã«é–¢ã‚らãšå…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒ\n"
+" -a/--text 指定ãŒç„¡ã„å ´åˆã€ ãƒã‚¤ãƒŠãƒªã¨æ€ã—ãファイルã¯å‡¦ç†å¯¾è±¡ã‹ã‚‰\n"
+" 除外ã•ã‚Œã¾ã™ã€‚ -a 指定ãŒæœ‰ã‚‹å ´åˆã€ çµæžœã«é–¢ã‚らãšå…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒ\n"
" 処ç†å¯¾è±¡ã¨ãªã‚Šã¾ã™ã€‚"
msgid ""
" Use the -g/--git option to generate diffs in the git extended diff\n"
" format. For more information, read :hg:`help diffs`."
msgstr ""
-" git 拡張差分形å¼ã§è¡¨ç¤ºã™ã‚‹ã«ã¯ -g/--git を指定ã—ã¾ã™ã€‚詳細ã¯\n"
+" git 拡張差分形å¼ã§è¡¨ç¤ºã™ã‚‹ã«ã¯ -g/--git を指定ã—ã¾ã™ã€‚ 詳細ã¯\n"
" :hg:`help diffs` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
msgid "dump the header and diffs for one or more changesets"
@@ -7496,7 +7693,7 @@
msgid " Print the changeset header and diffs for one or more revisions."
msgstr ""
-" 1ã¤ä»¥ä¸Šã®ãƒªãƒ“ジョンã«å¯¾ã—ã¦ã€ãƒ˜ãƒƒãƒ€æƒ…å ±ãŠã‚ˆã³å¤‰æ›´å†…容を表示ã—ã¾ã™ã€‚"
+" 1ã¤ä»¥ä¸Šã®ãƒªãƒ“ジョンã«å¯¾ã—ã¦ã€ ãƒ˜ãƒƒãƒ€æƒ…å ±ãŠã‚ˆã³å¤‰æ›´å†…容を表示ã—ã¾ã™ã€‚"
msgid ""
" The information shown in the changeset header is: author, date,\n"
@@ -7507,27 +7704,30 @@
" (default 以外ã®å ´åˆã¯)ブランãƒåå‰/ãƒãƒƒã‚·ãƒ¥å€¤/親リビジョン/コミットãƒã‚°"
msgid ""
-" NOTE: export may generate unexpected diff output for merge\n"
-" changesets, as it will compare the merge changeset against its\n"
-" first parent only."
-msgstr ""
-" 備考: マージ実施リビジョンã«å¯¾ã—ã¦ã€æœ¬ã‚³ãƒžãƒ³ãƒ‰ãŒæœŸå¾…ã¨ç•°ãªã‚‹å·®åˆ†ã‚’\n"
-" 出力ã™ã‚‹ã®ã¯ã€ç¬¬1親ã¨ã®å·®åˆ†ã®ã¿ã‚’出力ã™ã‚‹ãŸã‚ã§ã™ã€‚"
+" .. note::\n"
+" export may generate unexpected diff output for merge\n"
+" changesets, as it will compare the merge changeset against its\n"
+" first parent only."
+msgstr ""
+" .. note::\n"
+" マージ実施リビジョンã«å¯¾ã™ã‚‹æœ¬ã‚³ãƒžãƒ³ãƒ‰ã®å·®åˆ†å‡ºåŠ›ãŒã€ \n"
+" 期待ã¨ç•°ãªã‚‹å ´åˆãŒã‚ã‚‹ã®ã¯ã€ 比較対象ãŒå¯¾è±¡ãƒªãƒ“ジョンã®ç¬¬1親ã«\n"
+" 固定ã•ã‚Œã¦ã„ã‚‹ãŸã‚ã§ã™ã€‚"
msgid ""
" Output may be to a file, in which case the name of the file is\n"
" given using a format string. The formatting rules are as follows:"
msgstr ""
-" 出力先指定(ç½®æ›æŒ‡å®šå¯èƒ½)ãŒã‚ã‚‹å ´åˆã€å‡ºåŠ›ã¯ãƒ•ã‚¡ã‚¤ãƒ«ã«ä¿å˜ã•ã‚Œã¾ã™ã€‚\n"
+" 出力先指定(ç½®æ›æŒ‡å®šå¯èƒ½)ãŒã‚ã‚‹å ´åˆã€ 出力ã¯ãƒ•ã‚¡ã‚¤ãƒ«ã«ä¿å˜ã•ã‚Œã¾ã™ã€‚\n"
" ç½®æ›æŒ‡å®šã¨ã—ã¦ä»¥ä¸‹ã®ã‚‚ã®ãŒä½¿ç”¨å¯èƒ½ã§ã™:"
msgid ""
" :``%%``: literal \"%\" character\n"
-" :``%H``: changeset hash (40 bytes of hexadecimal)\n"
+" :``%H``: changeset hash (40 hexadecimal digits)\n"
" :``%N``: number of patches being generated\n"
" :``%R``: changeset revision number\n"
" :``%b``: basename of the exporting repository\n"
-" :``%h``: short-form changeset hash (12 bytes of hexadecimal)\n"
+" :``%h``: short-form changeset hash (12 hexadecimal digits)\n"
" :``%n``: zero-padded sequence number, starting at 1\n"
" :``%r``: zero-padded changeset revision number"
msgstr ""
@@ -7545,22 +7745,22 @@
" of files it detects as binary. With -a, export will generate a\n"
" diff anyway, probably with undesirable results."
msgstr ""
-" -a/--text 指定ãŒç„¡ã„å ´åˆã€ãƒã‚¤ãƒŠãƒªã¨æ€ã—ãファイルã¯å‡¦ç†å¯¾è±¡ã‹ã‚‰\n"
-" 除外ã•ã‚Œã¾ã™ã€‚-a 指定ãŒæœ‰ã‚‹å ´åˆã€çµæžœã«é–¢ã‚らãšã€å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒ\n"
+" -a/--text 指定ãŒç„¡ã„å ´åˆã€ ãƒã‚¤ãƒŠãƒªã¨æ€ã—ãファイルã¯å‡¦ç†å¯¾è±¡ã‹ã‚‰\n"
+" 除外ã•ã‚Œã¾ã™ã€‚ -a 指定ãŒæœ‰ã‚‹å ´åˆã€ çµæžœã«é–¢ã‚らãšã€ å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒ\n"
" 処ç†å¯¾è±¡ã¨ãªã‚Šã¾ã™ã€‚"
msgid ""
" Use the -g/--git option to generate diffs in the git extended diff\n"
" format. See :hg:`help diffs` for more information."
msgstr ""
-" git 拡張差分形å¼ã§å‡ºåŠ›ã™ã‚‹ã«ã¯ -g/--git を指定ã—ã¾ã™ã€‚詳細ã¯\n"
+" git 拡張差分形å¼ã§å‡ºåŠ›ã™ã‚‹ã«ã¯ -g/--git を指定ã—ã¾ã™ã€‚ 詳細ã¯\n"
" :hg:`help diffs` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
msgid ""
" With the --switch-parent option, the diff will be against the\n"
" second parent. It can be useful to review a merge."
msgstr ""
-" --switch-parent を指定ã™ã‚‹ã“ã¨ã§ã€æ¯”較対象ãŒç¬¬2親ã«ãªã‚Šã¾ã™ã€‚\n"
+" --switch-parent を指定ã™ã‚‹ã“ã¨ã§ã€ 比較対象ãŒç¬¬2親ã«ãªã‚Šã¾ã™ã€‚\n"
" ã“ã‚Œã¯ãƒžãƒ¼ã‚¸ã®ãƒ¬ãƒ“ューã®éš›ãªã©ã«æœ‰åŠ¹ã§ã™ã€‚"
msgid "export requires at least one changeset"
@@ -7585,12 +7785,12 @@
" entire project history, and it does not delete them from the\n"
" working directory."
msgstr ""
-" 本コマンドã§ã®ç™»éŒ²é™¤å¤–ã¯ã€ç¾ãƒ–ランãƒã«ãŠã‘る登録除外ã®ã¿ã‚’æ„味ã—ã€\n"
-" å±¥æ´ãã®ã‚‚ã®ã¯ä¿æŒã•ã‚Œç¶šã‘ã¾ã™ã—ã€ä½œæ¥é ˜åŸŸã‹ã‚‰ã‚‚削除ã•ã‚Œã¾ã›ã‚“。"
+" 本コマンドã§ã®ç™»éŒ²é™¤å¤–ã¯ã€ ç¾ãƒ–ランãƒã«ãŠã‘る登録除外ã®ã¿ã‚’æ„味ã—〠\n"
+" å±¥æ´ãã®ã‚‚ã®ã¯ä¿æŒã•ã‚Œç¶šã‘ã¾ã™ã—〠作æ¥é ˜åŸŸã‹ã‚‰ã‚‚削除ã•ã‚Œã¾ã›ã‚“。"
msgid " To undo a forget before the next commit, see :hg:`add`."
msgstr ""
-" 登録除外æ“作ã®ã‚³ãƒŸãƒƒãƒˆå‰å–り消ã—ã¯ã€:hg:`help add` ã‚’å‚ç…§ã—ã¦\n"
+" 登録除外æ“作ã®ã‚³ãƒŸãƒƒãƒˆå‰å–り消ã—ã¯ã€ :hg:`help add` ã‚’å‚ç…§ã—ã¦\n"
" ãã ã•ã„。"
msgid "no files specified"
@@ -7612,9 +7812,10 @@
" working directory. It always prints the revision number in which a\n"
" match appears."
msgstr ""
-" 本コマンドã®æŒ™å‹•ã¯ Unix ã® grep ã¨ã¯ç•°ãªã‚Šã¾ã™ã€‚解釈å¯èƒ½ãªæ£è¦è¡¨ç¾ã¯\n"
-" Python/Perl å½¢å¼ã®ã‚‚ã®ã ã‘ã§ã™ã€‚検索対象ã¯ãƒªãƒã‚¸ãƒˆãƒªå†…ã®ãƒ‡ãƒ¼ã‚¿ã®ã¿ã§ã€\n"
-" 作æ¥é ˜åŸŸã¯æ¤œç´¢å¯¾è±¡ã«ã¯å«ã¾ã‚Œã¾ã›ã‚“。パターンã«åˆè‡´ã™ã‚‹å†…容ãŒç¾ã‚ŒãŸ\n"
+" 本コマンドã®æŒ™å‹•ã¯ Unix ã® grep ã¨ã¯ç•°ãªã‚Šã¾ã™ã€‚ 解釈å¯èƒ½ãªæ£è¦è¡¨ç¾ã¯\n"
+" Python/Perl å½¢å¼ã®ã‚‚ã®ã ã‘ã§ã™ã€‚ 検索対象ã¯ãƒªãƒã‚¸ãƒˆãƒªå†…ã®ãƒ‡ãƒ¼ã‚¿ã®ã¿"
+"ã§ã€ \n"
+" 作æ¥é ˜åŸŸã¯æ¤œç´¢å¯¾è±¡ã«ã¯å«ã¾ã‚Œã¾ã›ã‚“。 パターンã«åˆè‡´ã™ã‚‹å†…容ãŒç¾ã‚ŒãŸ\n"
" リビジョンを表示ã—ã¾ã™ã€‚"
msgid ""
@@ -7624,16 +7825,16 @@
" becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
" use the --all flag."
msgstr ""
-" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€æœ¬ã‚³ãƒžãƒ³ãƒ‰ã¯ãƒ‘ターンã«åˆè‡´ã™ã‚‹å†…容ãŒæœ€åˆã«ç¾ã‚ŒãŸ\n"
-" リビジョンをå„ファイル毎ã«è¡¨ç¤ºã—ã¾ã™ã€‚パターンã«åˆè‡´ã™ã‚‹å¤‰æ›´ã®ã‚ã£ãŸ\n"
-" å…¨ã¦ã®ãƒªãƒ“ジョンを表示ã™ã‚‹å ´åˆã€--all を指定ã—ã¾ã™(パターンåˆè‡´éƒ¨ãŒ\n"
-" 削除æ“作ãªã‚‰ \"-\"ã€è¿½åŠ æ“作ãªã‚‰ \"+\" ãŒæ¤œç´¢çµæžœã«è¡¨ç¤º)。"
+" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€ 本コマンドã¯ãƒ‘ターンã«åˆè‡´ã™ã‚‹å†…容ãŒæœ€åˆã«ç¾ã‚ŒãŸ\n"
+" リビジョンをå„ファイル毎ã«è¡¨ç¤ºã—ã¾ã™ã€‚ パターンã«åˆè‡´ã™ã‚‹å¤‰æ›´ã®ã‚ã£ãŸ\n"
+" å…¨ã¦ã®ãƒªãƒ“ジョンを表示ã™ã‚‹å ´åˆã€ --all を指定ã—ã¾ã™(パターンåˆè‡´éƒ¨ãŒ\n"
+" 削除æ“作ãªã‚‰ \"-\"ã€ è¿½åŠ æ“作ãªã‚‰ \"+\" ãŒæ¤œç´¢çµæžœã«è¡¨ç¤º)。"
msgid ""
" Returns 0 if a match is found, 1 otherwise.\n"
" "
msgstr ""
-" パターンåˆè‡´ãŒã‚ã‚‹å ´åˆã®ã‚³ãƒžãƒ³ãƒ‰ã®çµ‚了値㯠0ã€ãれ以外㯠1 ã§ã™ã€‚\n"
+" パターンåˆè‡´ãŒã‚ã‚‹å ´åˆã®ã‚³ãƒžãƒ³ãƒ‰ã®çµ‚了値㯠0〠ãれ以外㯠1 ã§ã™ã€‚\n"
" "
#, python-format
@@ -7645,7 +7846,7 @@
msgid " With no arguments, show all repository branch heads."
msgstr ""
-" 引数指定ãŒç„¡ã„å ´åˆã€ãƒªãƒã‚¸ãƒˆãƒªä¸ã®å…¨ã¦ã®ãƒ–ランãƒãƒ˜ãƒƒãƒ‰ã‚’表示ã—ã¾ã™ã€‚"
+" 引数指定ãŒç„¡ã„å ´åˆã€ リãƒã‚¸ãƒˆãƒªä¸ã®å…¨ã¦ã®ãƒ–ランãƒãƒ˜ãƒƒãƒ‰ã‚’表示ã—ã¾ã™ã€‚"
msgid ""
" Repository \"heads\" are changesets with no child changesets. They are\n"
@@ -7653,45 +7854,46 @@
" for update and merge operations. Branch heads are changesets that have\n"
" no child changeset on the same branch."
msgstr ""
-" リãƒã‚¸ãƒˆãƒªã®ã€Œãƒ˜ãƒƒãƒ‰ã€ã¨ã¯ã€åリビジョンをæŒãŸãªã„リビジョンã®\n"
-" ã“ã¨ã‚’指ã—ã¾ã™ã€‚改変作æ¥ã®å®Ÿæ–½ã‚„ã€update/merge コマンド実施ã®éš›ã«ã¯ã€\n"
-" ã“ã®ãƒªãƒ“ジョンを対象ã¨ã™ã‚‹ã®ãŒä¸€èˆ¬çš„ã§ã™ã€‚「ブランãƒãƒ˜ãƒƒãƒ‰ã€ã¨ã¯ã€\n"
+" リãƒã‚¸ãƒˆãƒªã®ã€Œãƒ˜ãƒƒãƒ‰ã€ã¨ã¯ã€ åリビジョンをæŒãŸãªã„リビジョンã®\n"
+" ã“ã¨ã‚’指ã—ã¾ã™ã€‚ 改変作æ¥ã®å®Ÿæ–½ã‚„〠update/merge コマンド実施ã®éš›ã«"
+"ã¯ã€ \n"
+" ã“ã®ãƒªãƒ“ジョンを対象ã¨ã™ã‚‹ã®ãŒä¸€èˆ¬çš„ã§ã™ã€‚ 「ブランãƒãƒ˜ãƒƒãƒ‰ã€ã¨ã¯ã€ \n"
" åŒã˜åå‰ä»˜ãブランãƒå†…ã«åリビジョンをæŒãŸãªã„リビジョンã®ã“ã¨ã§ã™ã€‚"
msgid ""
" If one or more REVs are given, only branch heads on the branches\n"
" associated with the specified changesets are shown."
msgstr ""
-" 1ã¤ä»¥ä¸Šã®ãƒªãƒ“ジョンãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€æœ¬ã‚³ãƒžãƒ³ãƒ‰ã¯æŒ‡å®šãƒªãƒ“ジョンã®\n"
+" 1ã¤ä»¥ä¸Šã®ãƒªãƒ“ジョンãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 本コマンドã¯æŒ‡å®šãƒªãƒ“ジョンã®\n"
" 属ã™ã‚‹åå‰ä»˜ãブランãƒã®ãƒ–ランãƒãƒ˜ãƒƒãƒ‰ã‚’表示ã—ã¾ã™ã€‚"
msgid ""
" If -c/--closed is specified, also show branch heads marked closed\n"
" (see :hg:`commit --close-branch`)."
msgstr ""
-" -c/--closed 指定時ã«ã¯ã€é–‰éŽ–済ã¿ã®ãƒ–ランãƒ\n"
+" -c/--closed 指定時ã«ã¯ã€ 閉鎖済ã¿ã®ãƒ–ランãƒ\n"
" (:hg:`commit --close-branch` å‚ç…§)も表示ã•ã‚Œã¾ã™ã€‚"
msgid ""
" If STARTREV is specified, only those heads that are descendants of\n"
" STARTREV will be displayed."
msgstr ""
-" 引数ã¨ã—ã¦é–‹å§‹ãƒªãƒ“ジョンãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€\n"
-" 指定リビジョンã®åå«ã¨ãªã‚‹ãƒ˜ãƒƒãƒ‰ã®ã¿ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚"
+" 「開始リビジョンã€ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 指定ã•ã‚ŒãŸé–‹å§‹ãƒªãƒ“ジョンã®\n"
+" åå«ã¨ãªã‚‹ãƒ˜ãƒƒãƒ‰ã®ã¿ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚"
msgid ""
" If -t/--topo is specified, named branch mechanics will be ignored and "
"only\n"
" changesets without children will be shown."
msgstr ""
-" -t/--topo 指定時ã«ã¯ã€åå‰ä»˜ãブランãƒã«é–¢ã™ã‚‹åˆ¤å®šã¯ç„¡è¦–ã•ã‚Œã€\n"
+" -t/--topo 指定時ã«ã¯ã€ åå‰ä»˜ãブランãƒã«é–¢ã™ã‚‹åˆ¤å®šã¯ç„¡è¦–ã•ã‚Œã€ \n"
" å˜ã«åリビジョンをæŒãŸãªã„リビジョンãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚"
msgid ""
" Returns 0 if matching heads are found, 1 if not.\n"
" "
msgstr ""
-" åˆè‡´ã™ã‚‹ãƒ˜ãƒƒãƒ‰ãŒã‚ã‚‹å ´åˆã®ã‚³ãƒžãƒ³ãƒ‰ã®çµ‚了値㯠0ã€ãれ以外㯠1 ã§ã™ã€‚\n"
+" åˆè‡´ã™ã‚‹ãƒ˜ãƒƒãƒ‰ãŒã‚ã‚‹å ´åˆã®ã‚³ãƒžãƒ³ãƒ‰ã®çµ‚了値㯠0〠ãれ以外㯠1 ã§ã™ã€‚\n"
" "
#, python-format
@@ -7703,17 +7905,17 @@
msgstr "(%s ã‹ã‚‰é–‹å§‹)"
msgid "show help for a given topic or a help overview"
-msgstr "指定ã•ã‚ŒãŸãƒˆãƒ”ックã®ãƒ˜ãƒ«ãƒ—ã‚„ã€ãƒ˜ãƒ«ãƒ—概è¦ã®è¡¨ç¤º"
+msgstr "指定ã•ã‚ŒãŸãƒˆãƒ”ックã®ãƒ˜ãƒ«ãƒ—や〠ヘルプ概è¦ã®è¡¨ç¤º"
msgid ""
" With no arguments, print a list of commands with short help messages."
-msgstr " 引数指定ãŒç„¡ã„å ´åˆã€ã‚³ãƒžãƒ³ãƒ‰ã®ä¸€è¦§ã¨æ¦‚è¦ã‚’表示ã—ã¾ã™ã€‚"
+msgstr " 引数指定ãŒç„¡ã„å ´åˆã€ コマンドã®ä¸€è¦§ã¨æ¦‚è¦ã‚’表示ã—ã¾ã™ã€‚"
msgid ""
" Given a topic, extension, or command name, print help for that\n"
" topic."
msgstr ""
-" トピックやコマンドåãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€æŒ‡å®šå¯¾è±¡ã®ãƒ˜ãƒ«ãƒ—を表示ã—ã¾ã™ã€‚"
+" トピックやコマンドåãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 指定対象ã®ãƒ˜ãƒ«ãƒ—を表示ã—ã¾ã™ã€‚"
msgid ""
" Returns 0 if successful.\n"
@@ -7730,7 +7932,7 @@
msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
msgstr ""
-"全コマンドã®ä¸€è¦§ã¯ \"hg help\" ã§ã€ã‚³ãƒžãƒ³ãƒ‰è©³ç´°ã¯ \"hg -v\" ã§è¡¨ç¤ºã•ã‚Œã¾ã™"
+"全コマンドã®ä¸€è¦§ã¯ \"hg help\" ã§ã€ コマンド詳細㯠\"hg -v\" ã§è¡¨ç¤ºã•ã‚Œã¾ã™"
#, python-format
msgid "use \"hg -v help%s\" to show aliases and global options"
@@ -7755,8 +7957,16 @@
msgstr "(ヘルプã¯ã‚ã‚Šã¾ã›ã‚“)"
#, python-format
+msgid "shell alias for::"
+msgstr "シェルコマンドã®åˆ¥å::"
+
+#, python-format
+msgid " %s"
+msgstr " %s"
+
+#, python-format
msgid "alias for: hg %s"
-msgstr "hg %s ã®åˆ¥å"
+msgstr "コマンドã®åˆ¥å: hg %s"
#, python-format
msgid "%s"
@@ -7825,13 +8035,13 @@
msgid ""
" With no revision, print a summary of the current state of the\n"
" repository."
-msgstr " リビジョン指定無ã—ã®èµ·å‹•ã®éš›ã«ã¯ã€ä½œæ¥é ˜åŸŸã®çŠ¶æ…‹ã‚’表示ã—ã¾ã™ã€‚"
+msgstr " リビジョン指定無ã—ã®èµ·å‹•ã®éš›ã«ã¯ã€ 作æ¥é ˜åŸŸã®çŠ¶æ…‹ã‚’表示ã—ã¾ã™ã€‚"
msgid ""
" Specifying a path to a repository root or Mercurial bundle will\n"
" cause lookup to operate on that repository/bundle."
msgstr ""
-" パス指定有りã§ã®èµ·å‹•ã®éš›ã«ã¯ã€ä»–ã®ãƒªãƒã‚¸ãƒˆãƒªãªã„ã—ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã®\n"
+" パス指定有りã§ã®èµ·å‹•ã®éš›ã«ã¯ã€ ä»–ã®ãƒªãƒã‚¸ãƒˆãƒªãªã„ã—ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã®\n"
" 状態を表示ã—ã¾ã™ã€‚"
msgid ""
@@ -7840,10 +8050,10 @@
" uncommitted changes in the working directory, a list of tags for\n"
" this revision and a branch name for non-default branches."
msgstr ""
-" 本コマンドã®å‡ºåŠ›ã™ã‚‹è¦ç´„æƒ…å ±ã¯ã€1ã¤ãªã„ã—2ã¤ã®è¦ªãƒªãƒ“ジョンã®ãƒãƒƒã‚·ãƒ¥\n"
-" 値を使用ã—ã¦ã€ä½œæ¥é ˜åŸŸã®çŠ¶æ…‹ã‚’è˜åˆ¥ã—ã¾ã™ã€‚作æ¥é ˜åŸŸã«æœªã‚³ãƒŸãƒƒãƒˆã®\n"
-" 変更ãŒã‚ã‚‹å ´åˆã¯ \"+\"ã€å½“該リビジョンã«ã‚¿ã‚°ãŒä»˜ã„ã¦ã„ã‚‹å ´åˆã¯ã‚¿ã‚°ã®\n"
-" 一覧ã€default 以外ã®ãƒ–ランãƒã®å ´åˆã«ã¯ãƒ–ランãƒåãŒã€ãƒãƒƒã‚·ãƒ¥å€¤ã®å¾Œã«\n"
+" 本コマンドã®å‡ºåŠ›ã™ã‚‹è¦ç´„æƒ…å ±ã¯ã€ 1ã¤ãªã„ã—2ã¤ã®è¦ªãƒªãƒ“ジョンã®ãƒãƒƒã‚·ãƒ¥\n"
+" 値を使用ã—ã¦ã€ 作æ¥é ˜åŸŸã®çŠ¶æ…‹ã‚’è˜åˆ¥ã—ã¾ã™ã€‚ 作æ¥é ˜åŸŸã«æœªã‚³ãƒŸãƒƒãƒˆã®\n"
+" 変更ãŒã‚ã‚‹å ´åˆã¯ \"+\"〠当該リビジョンã«ã‚¿ã‚°ãŒä»˜ã„ã¦ã„ã‚‹å ´åˆã¯ã‚¿ã‚°ã®\n"
+" 一覧〠default 以外ã®ãƒ–ランãƒã®å ´åˆã«ã¯ãƒ–ランãƒåãŒã€ ãƒãƒƒã‚·ãƒ¥å€¤ã®å¾Œã«\n"
" 続ãã¾ã™ã€‚"
msgid "import an ordered set of patches"
@@ -7860,7 +8070,7 @@
" If there are outstanding changes in the working directory, import\n"
" will abort unless given the -f/--force flag."
msgstr ""
-" 作æ¥é ˜åŸŸã«æœªã‚³ãƒŸãƒƒãƒˆã®å¤‰æ›´ãŒã‚ã‚‹å ´åˆã€-f/--force ãŒæŒ‡å®šã•ã‚Œãªã„é™ã‚Š\n"
+" 作æ¥é ˜åŸŸã«æœªã‚³ãƒŸãƒƒãƒˆã®å¤‰æ›´ãŒã‚ã‚‹å ´åˆã€ -f/--force ãŒæŒ‡å®šã•ã‚Œãªã„é™ã‚Š\n"
" å–ã‚Šè¾¼ã¿ã¯å®Ÿæ–½ã•ã‚Œã¾ã›ã‚“。"
msgid ""
@@ -7871,11 +8081,11 @@
" text/plain body parts before first diff are added to commit\n"
" message."
msgstr ""
-" é›»åメールã‹ã‚‰ç›´æŽ¥ãƒ‘ッãƒã‚’å–り込むã“ã¨ã‚‚å¯èƒ½ã§ã™ã€‚添付ファイル\n"
-" å½¢å¼ã®ãƒ‘ッãƒã§ã‚ã£ã¦ã‚‚å–ã‚Šè¾¼ã¿å¯èƒ½ã§ã™(但ã—ã€text/plain ãªã„ã— \n"
-" text/x-patch åž‹ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“)。作æˆè€…ãŠã‚ˆã³ã‚³ãƒŸãƒƒãƒˆãƒã‚°ãŒç„¡ã„\n"
-" å ´åˆã€é›»åメール㮠From ãŠã‚ˆã³ Subject ヘッダ値ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚\n"
-" 最åˆã®ãƒ‘ッãƒãƒ‡ãƒ¼ã‚¿ã«å…ˆç«‹ã¤ text/plain ボディã¯ã€ã‚³ãƒŸãƒƒãƒˆãƒã‚°ã«è¿½è¨˜\n"
+" é›»åメールã‹ã‚‰ç›´æŽ¥ãƒ‘ッãƒã‚’å–り込むã“ã¨ã‚‚å¯èƒ½ã§ã™ã€‚ 添付ファイル\n"
+" å½¢å¼ã®ãƒ‘ッãƒã§ã‚ã£ã¦ã‚‚å–ã‚Šè¾¼ã¿å¯èƒ½ã§ã™(但ã—〠text/plain ãªã„ã— \n"
+" text/x-patch åž‹ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“)。 作æˆè€…ãŠã‚ˆã³ã‚³ãƒŸãƒƒãƒˆãƒã‚°ãŒç„¡ã„\n"
+" å ´åˆã€ é›»åメール㮠From ãŠã‚ˆã³ Subject ヘッダ値ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚\n"
+" 最åˆã®ãƒ‘ッãƒãƒ‡ãƒ¼ã‚¿ã«å…ˆç«‹ã¤ text/plain ボディã¯ã€ コミットãƒã‚°ã«è¿½è¨˜\n"
" ã•ã‚Œã¾ã™ã€‚"
msgid ""
@@ -7884,8 +8094,8 @@
" body. Values given on command line with -m/--message and -u/--user\n"
" override these."
msgstr ""
-" :hg:`export` ã«ã‚ˆã‚Šç”Ÿæˆã•ã‚ŒãŸãƒ‘ッãƒã‚’å–ã‚Šè¾¼ã‚€å ´åˆã€é›»åメールã®\n"
-" ヘッダやボディã®æƒ…å ±ã‚ˆã‚Šã‚‚ã€ãƒ‘ッãƒã«å«ã¾ã‚Œã‚‹æƒ…å ±ã®æ–¹ãŒå„ªå…ˆã—ã¾ã™ã€‚\n"
+" :hg:`export` ã«ã‚ˆã‚Šç”Ÿæˆã•ã‚ŒãŸãƒ‘ッãƒã‚’å–ã‚Šè¾¼ã‚€å ´åˆã€ é›»åメールã®\n"
+" ヘッダやボディã®æƒ…å ±ã‚ˆã‚Šã‚‚ã€ ãƒ‘ãƒƒãƒã«å«ã¾ã‚Œã‚‹æƒ…å ±ã®æ–¹ãŒå„ªå…ˆã—ã¾ã™ã€‚\n"
" コマンドラインã§ã® -m/--message ãªã„ã— -u/--user 指定ã¯ã“れらよりも\n"
" æ›´ã«å„ªå…ˆã—ã¾ã™ã€‚"
@@ -7896,26 +8106,26 @@
" the patch. This may happen due to character set problems or other\n"
" deficiencies in the text patch format."
msgstr ""
-" --exact ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ä½œæ¥é ˜åŸŸã‚’パッãƒã®è¦ªãƒªãƒ“ジョンã«æ›´æ–°ã—ã¦\n"
-" ã‹ã‚‰ãƒ‘ッãƒã‚’é©ç”¨ã—ã¾ã™ãŒã€ä½œæˆã•ã‚ŒãŸãƒªãƒ“ジョンã®ãƒãƒƒã‚·ãƒ¥å€¤ãŒã€ãƒ‘ッãƒ\n"
-" ã«è¨˜éŒ²ã•ã‚ŒãŸå€¤ã¨ç•°ãªã‚‹å ´åˆã€å–ã‚Šè¾¼ã¿ã¯å®Ÿæ–½ã•ã‚Œã¾ã›ã‚“。ã“ã®ç¾è±¡ã¯ã€\n"
-" 利用ã™ã‚‹æ–‡å—符å·åŒ–ã®å•é¡Œã‚„ã€ãƒ‘ッãƒã®ãƒ†ã‚スト部分ã®ä¸è¶³ãªã©ãŒåŽŸå› ã§\n"
+" --exact ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 作æ¥é ˜åŸŸã‚’パッãƒã®è¦ªãƒªãƒ“ジョンã«æ›´æ–°ã—ã¦\n"
+" ã‹ã‚‰ãƒ‘ッãƒã‚’é©ç”¨ã—ã¾ã™ãŒã€ 作æˆã•ã‚ŒãŸãƒªãƒ“ジョンã®ãƒãƒƒã‚·ãƒ¥å€¤ãŒã€ パッãƒ\n"
+" ã«è¨˜éŒ²ã•ã‚ŒãŸå€¤ã¨ç•°ãªã‚‹å ´åˆã€ å–ã‚Šè¾¼ã¿ã¯å®Ÿæ–½ã•ã‚Œã¾ã›ã‚“。 ã“ã®ç¾è±¡ã¯ã€ \n"
+" 利用ã™ã‚‹æ–‡å—符å·åŒ–ã®å•é¡Œã‚„〠パッãƒã®ãƒ†ã‚スト部分ã®ä¸è¶³ãªã©ãŒåŽŸå› ã§\n"
" 発生ã™ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚"
msgid ""
" With -s/--similarity, hg will attempt to discover renames and\n"
" copies in the patch in the same way as 'addremove'."
msgstr ""
-" -s/--similarity ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€'hg addremove' ã¨åŒæ§˜ãªæ–¹é‡ã§ã€\n"
-" パッãƒã«ã‚ˆã‚‹å¤‰æ›´çµæžœã‹ã‚‰ã€æ”¹åや複製を検出ã—ã¾ã™ã€‚"
+" -s/--similarity ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 'hg addremove' ã¨åŒæ§˜ãªæ–¹é‡ã§ã€ \n"
+" パッãƒã«ã‚ˆã‚‹å¤‰æ›´çµæžœã‹ã‚‰ã€ 改åや複製を検出ã—ã¾ã™ã€‚"
msgid ""
" To read a patch from standard input, use \"-\" as the patch name. If\n"
" a URL is specified, the patch will be downloaded from it.\n"
" See :hg:`help dates` for a list of formats valid for -d/--date."
msgstr ""
-" 標準入力ã‹ã‚‰ãƒ‘ッãƒã‚’å–り込むã«ã¯ã€ãƒ‘ッãƒåã« \"-\" を指定ã—ã¾ã™ã€‚\n"
-" URL ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ãƒ‘ッãƒã‚’当該 URL ã‹ã‚‰ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã—ã¾ã™ã€‚\n"
+" 標準入力ã‹ã‚‰ãƒ‘ッãƒã‚’å–り込むã«ã¯ã€ パッãƒåã« \"-\" を指定ã—ã¾ã™ã€‚\n"
+" URL ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ パッãƒã‚’当該 URL ã‹ã‚‰ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã—ã¾ã™ã€‚\n"
" -d/--date ã§ã®æ—¥æ™‚表記㯠:hg:`help dates` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
msgid "to working directory"
@@ -7945,16 +8155,16 @@
" pull location. These are the changesets that would have been pulled\n"
" if a pull at the time you issued this command."
msgstr ""
-" ファイルパスや URLã€'hg pull' ã® default å–ã‚Šè¾¼ã¿å¯¾è±¡ã«ã‚ˆã‚ŠæŒ‡å®š\n"
-" ã•ã‚Œã‚‹ãƒªãƒã‚¸ãƒˆãƒªä¸ã®ã€æœªå–ã‚Šè¾¼ã¿ãƒªãƒ“ジョンを検索ã—ã¾ã™ã€‚\n"
-" ã“れらã¯ã€'hg pull' を実行ã—ãŸéš›ã®å–ã‚Šè¾¼ã¿å¯¾è±¡ãƒªãƒ“ジョンã§ã™ã€‚"
+" ファイルパスや URL〠'hg pull' ã® default å–ã‚Šè¾¼ã¿å¯¾è±¡ã«ã‚ˆã‚ŠæŒ‡å®š\n"
+" ã•ã‚Œã‚‹ãƒªãƒã‚¸ãƒˆãƒªä¸ã®ã€ 未å–ã‚Šè¾¼ã¿ãƒªãƒ“ジョンを検索ã—ã¾ã™ã€‚\n"
+" ã“れらã¯ã€ 'hg pull' を実行ã—ãŸéš›ã®å–ã‚Šè¾¼ã¿å¯¾è±¡ãƒªãƒ“ジョンã§ã™ã€‚"
msgid ""
" For remote repository, using --bundle avoids downloading the\n"
" changesets twice if the incoming is followed by a pull."
msgstr ""
-" é 隔ホストã®ãƒªãƒã‚¸ãƒˆãƒªã®å ´åˆã€--bundle を使用ã™ã‚‹ã“ã¨ã§ã€æœ¬ã‚³ãƒžãƒ³ãƒ‰\n"
-" 実行後㮠'hg pull' 実施ã®éš›ã«ã€å†åº¦ã®ãƒªãƒ“ジョン検索を抑æ¢ã§ãã¾ã™ã€‚"
+" é 隔ホストã®ãƒªãƒã‚¸ãƒˆãƒªã®å ´åˆã€ --bundle を使用ã™ã‚‹ã“ã¨ã§ã€ 本コマンド\n"
+" 実行後㮠'hg pull' 実施ã®éš›ã«ã€ å†åº¦ã®ãƒªãƒ“ジョン検索を抑æ¢ã§ãã¾ã™ã€‚"
msgid " See pull for valid source format details."
msgstr " 対象リãƒã‚¸ãƒˆãƒªã®æŒ‡å®šå½¢å¼ã¯ :hg:`help pull` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
@@ -7963,8 +8173,11 @@
" Returns 0 if there are incoming changes, 1 otherwise.\n"
" "
msgstr ""
-" å–ã‚Šè¾¼ã¿å¯¾è±¡ãŒã‚ã‚‹å ´åˆã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0ã€ãれ以外㯠1 ã§ã™ã€‚\n"
-" "
+" å–ã‚Šè¾¼ã¿å¯¾è±¡ãŒã‚ã‚‹å ´åˆã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0〠ãれ以外㯠1 ã§ã™ã€‚\n"
+" "
+
+msgid "cannot combine --bundle and --subrepos"
+msgstr "--bundle 㨠--subrepos ã¯çµ„ã¿åˆã‚ã›ã‚‰ã‚Œã¾ã›ã‚“"
msgid "create a new repository in the given directory"
msgstr "指定ã•ã‚ŒãŸãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ã®æ–°è¦ãƒªãƒã‚¸ãƒˆãƒªã®ä½œæˆ"
@@ -7973,18 +8186,18 @@
" Initialize a new repository in the given directory. If the given\n"
" directory does not exist, it will be created."
msgstr ""
-" 指定ã•ã‚ŒãŸãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«æ–°è¦ãƒªãƒã‚¸ãƒˆãƒªã‚’作æˆã—ã¾ã™ã€‚指定ã•ã‚ŒãŸ\n"
-" ディレクトリãŒå˜åœ¨ã—ãªã„å ´åˆã«ã¯ã€ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’作æˆã—ã¾ã™ã€‚"
+" 指定ã•ã‚ŒãŸãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«æ–°è¦ãƒªãƒã‚¸ãƒˆãƒªã‚’作æˆã—ã¾ã™ã€‚ 指定ã•ã‚ŒãŸ\n"
+" ディレクトリãŒå˜åœ¨ã—ãªã„å ´åˆã«ã¯ã€ ディレクトリを作æˆã—ã¾ã™ã€‚"
msgid " If no directory is given, the current directory is used."
-msgstr " ディレクトリãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€ç¾ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãŒåˆæœŸåŒ–ã•ã‚Œã¾ã™ã€‚"
+msgstr " ディレクトリãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€ ç¾ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãŒåˆæœŸåŒ–ã•ã‚Œã¾ã™ã€‚"
msgid ""
" It is possible to specify an ``ssh://`` URL as the destination.\n"
" See :hg:`help urls` for more information."
msgstr ""
" 複製先ã¨ã—㦠``ssh://`` URL å½¢å¼ã‚’指定ã™ã‚‹ã“ã¨ã‚‚å¯èƒ½ã§ã™ã€‚\n"
-" 詳細ã«é–¢ã—ã¦ã¯ã€:hg:`help urls` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
+" 詳細ã«é–¢ã—ã¦ã¯ã€ :hg:`help urls` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
msgid "locate files matching specific patterns"
msgstr "指定ã•ã‚ŒãŸãƒ‘ターンã«åˆè‡´ã™ã‚‹åå‰ã‚’æŒã¤ãƒ•ã‚¡ã‚¤ãƒ«ã®ç‰¹å®š"
@@ -7993,7 +8206,7 @@
" Print files under Mercurial control in the working directory whose\n"
" names match the given patterns."
msgstr ""
-" 構æˆç®¡ç†å¯¾è±¡ã¨ãªã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã®ä¸ã‹ã‚‰ã€æŒ‡å®šã•ã‚ŒãŸãƒ‘ターンã«åˆè‡´ã™ã‚‹\n"
+" 構æˆç®¡ç†å¯¾è±¡ã¨ãªã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã®ä¸ã‹ã‚‰ã€ 指定ã•ã‚ŒãŸãƒ‘ターンã«åˆè‡´ã™ã‚‹\n"
" åå‰ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’特定ã—ã¾ã™ã€‚"
msgid ""
@@ -8001,15 +8214,15 @@
" directory. To search just the current directory and its\n"
" subdirectories, use \"--include .\"."
msgstr ""
-" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€æœ¬ã‚³ãƒžãƒ³ãƒ‰ã¯æ§‹æˆç®¡ç†å¯¾è±¡ã¨ãªã‚‹ä½œæ¥é ˜åŸŸä¸ã®\n"
-" 全ディレクトリを検索対象ã¨ã—ã¾ã™ã€‚ç¾ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¨ãã®é…下ã®ã¿ã‚’検索\n"
+" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€ 本コマンドã¯æ§‹æˆç®¡ç†å¯¾è±¡ã¨ãªã‚‹ä½œæ¥é ˜åŸŸä¸ã®\n"
+" 全ディレクトリを検索対象ã¨ã—ã¾ã™ã€‚ ç¾ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¨ãã®é…下ã®ã¿ã‚’検索\n"
" 対象ã¨ã™ã‚‹å ´åˆã¯ \"--include .\" を指定ã—ã¾ã™ã€‚"
msgid ""
" If no patterns are given to match, this command prints the names\n"
" of all files under Mercurial control in the working directory."
msgstr ""
-" パターン指定ãŒç„¡ã„å ´åˆã€æœ¬ã‚³ãƒžãƒ³ãƒ‰ã¯æ§‹æˆç®¡ç†å¯¾è±¡ä¸‹ã«ã‚る作æ¥é ˜åŸŸä¸ã®\n"
+" パターン指定ãŒç„¡ã„å ´åˆã€ 本コマンドã¯æ§‹æˆç®¡ç†å¯¾è±¡ä¸‹ã«ã‚る作æ¥é ˜åŸŸä¸ã®\n"
" å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«åを表示ã—ã¾ã™ã€‚"
msgid ""
@@ -8018,10 +8231,10 @@
" will avoid the problem of \"xargs\" treating single filenames that\n"
" contain whitespace as multiple filenames."
msgstr ""
-" 本コマンドã®å‡ºåŠ›ã‚’ \"xargs\" コマンドã¸ã¨æ¸¡ã™å ´åˆã€æœ¬ã‚³ãƒžãƒ³ãƒ‰ã¨\n"
-" \"xargs\" コマンドã®ä¸¡æ–¹ã« \"-0\" を指定ã—ã¦ãã ã•ã„。空白文å—ã‚’\n"
-" å«ã‚€å˜ä¸€ã®ãƒ•ã‚¡ã‚¤ãƒ«åã‚’ã€\"xargs\" ãŒè¤‡æ•°ã®ãƒ•ã‚¡ã‚¤ãƒ«åã«è§£é‡ˆã—ã¦\n"
-" ã—ã¾ã†å•é¡Œã¯ã€ã“ã®ã‚ªãƒ—ションã«ã‚ˆã‚Šè§£æ¶ˆã•ã‚Œã¾ã™ã€‚"
+" 本コマンドã®å‡ºåŠ›ã‚’ \"xargs\" コマンドã¸ã¨æ¸¡ã™å ´åˆã€ 本コマンドã¨\n"
+" \"xargs\" コマンドã®ä¸¡æ–¹ã« \"-0\" を指定ã—ã¦ãã ã•ã„。 空白文å—ã‚’\n"
+" å«ã‚€å˜ä¸€ã®ãƒ•ã‚¡ã‚¤ãƒ«åを〠\"xargs\" ãŒè¤‡æ•°ã®ãƒ•ã‚¡ã‚¤ãƒ«åã«è§£é‡ˆã—ã¦\n"
+" ã—ã¾ã†å•é¡Œã¯ã€ ã“ã®ã‚ªãƒ—ションã«ã‚ˆã‚Šè§£æ¶ˆã•ã‚Œã¾ã™ã€‚"
msgid "show revision history of entire repository or files"
msgstr "リãƒã‚¸ãƒˆãƒªå…¨ä½“ãªã„ã—ファイルã®å¤‰æ›´å±¥æ´ã®è¡¨ç¤º"
@@ -8038,23 +8251,23 @@
" ancestors or descendants of the starting revision. --follow-first\n"
" only follows the first parent of merge revisions."
msgstr ""
-" ファイルã®å±¥æ´è¡¨ç¤ºã§ã¯ã€æ”¹åï¼è¤‡è£½æ™‚ã®å…ƒãƒ•ã‚¡ã‚¤ãƒ«ã«ã¾ã§ã•ã‹ã®ã¼ã£ãŸ\n"
-" å±¥æ´ã¯è¡¨ç¤ºã—ã¾ã›ã‚“。元ファイルã®å±¥æ´ã‚’ã•ã‹ã®ã¼ã‚‹å ´åˆã¯ã€ãƒ•ã‚¡ã‚¤ãƒ«å\n"
-" ã¨ä¸€ç·’ã« -f/--follow を使用ã—ã¾ã™ã€‚--follow 指定ã®éš›ã«ãƒ•ã‚¡ã‚¤ãƒ«åãŒ\n"
-" 指定ã•ã‚Œãªã„å ´åˆã¯ã€é–‹å§‹ãƒªãƒ“ジョンã«é€£ãªã‚‹ãƒªãƒ“ジョンã®ã¿ã‚’表示\n"
-" ã—ã¾ã™ã€‚--follow-first 指定ã¯ã€ãƒžãƒ¼ã‚¸ãƒªãƒ“ジョンã«ãŠã„ã¦ç¬¬1親ã®å±¥æ´\n"
+" ファイルã®å±¥æ´è¡¨ç¤ºã§ã¯ã€ 改åï¼è¤‡è£½æ™‚ã®å…ƒãƒ•ã‚¡ã‚¤ãƒ«ã«ã¾ã§ã•ã‹ã®ã¼ã£ãŸ\n"
+" å±¥æ´ã¯è¡¨ç¤ºã—ã¾ã›ã‚“。 元ファイルã®å±¥æ´ã‚’ã•ã‹ã®ã¼ã‚‹å ´åˆã¯ã€ ファイルå\n"
+" ã¨ä¸€ç·’ã« -f/--follow を使用ã—ã¾ã™ã€‚ --follow 指定ã®éš›ã«ãƒ•ã‚¡ã‚¤ãƒ«åãŒ\n"
+" 指定ã•ã‚Œãªã„å ´åˆã¯ã€ 開始リビジョンã«é€£ãªã‚‹ãƒªãƒ“ジョンã®ã¿ã‚’表示\n"
+" ã—ã¾ã™ã€‚ --follow-first 指定ã¯ã€ マージリビジョンã«ãŠã„ã¦ç¬¬1親ã®å±¥æ´\n"
" ã®ã¿ã‚’ã•ã‹ã®ã¼ã‚Šã¾ã™ã€‚"
msgid ""
-" If no revision range is specified, the default is tip:0 unless\n"
+" If no revision range is specified, the default is ``tip:0`` unless\n"
" --follow is set, in which case the working directory parent is\n"
" used as the starting revision. You can specify a revision set for\n"
" log, see :hg:`help revsets` for more information."
msgstr ""
-" 特ã«æŒ‡å®šã•ã‚Œãªã„å ´åˆã€å¯¾è±¡ã¨ãªã‚‹ãƒªãƒ“ジョンã®ç¯„囲㯠tip:0 ã¨ã¿ãªã•ã‚Œ\n"
-" ã¾ã™ãŒã€--follow ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã¯ã€ä½œæ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンãŒé–‹å§‹\n"
-" リビジョンã¨ã¿ãªã•ã‚Œã¾ã™ã€‚複数ã®ãƒªãƒ“ジョンã®ãƒã‚°ã‚’一括ã—ã¦è¡¨ç¤ºã•ã›ã‚‹\n"
-" 方法㯠:hg:`help revsets` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
+" 特ã«æŒ‡å®šã•ã‚Œãªã„å ´åˆã€ 対象ã¨ãªã‚‹ãƒªãƒ“ジョンã®ç¯„囲㯠``tip:0``\n"
+" ã¨ã¿ãªã•ã‚Œã¾ã™ãŒã€ --follow ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã¯ã€ 作æ¥é ˜åŸŸã®\n"
+" 親リビジョンãŒé–‹å§‹ãƒªãƒ“ジョンã¨ã¿ãªã•ã‚Œã¾ã™ã€‚ 複数ã®ãƒªãƒ“ジョンã®\n"
+" ãƒã‚°ã‚’一括ã—ã¦è¡¨ç¤ºã•ã›ã‚‹æ–¹æ³•ã¯ :hg:`help revsets` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
msgid ""
" By default this command prints revision number and changeset id,\n"
@@ -8062,22 +8275,24 @@
" each commit. When the -v/--verbose switch is used, the list of\n"
" changed files and full commit message are shown."
msgstr ""
-" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€æœ¬ã‚³ãƒžãƒ³ãƒ‰ãŒå‡ºåŠ›ã™ã‚‹æƒ…å ±ã¯ -\n"
-" リビジョン番å·ã€è˜åˆ¥ç”¨ãƒãƒƒã‚·ãƒ¥å€¤ã€ã‚¿ã‚°ã€(リビジョン番å·ã®é›¢ã‚ŒãŸ)\n"
-" 親リビジョンã€ä½œæˆè€…ã€ä½œæˆæ—¥æ™‚ãŠã‚ˆã³ã‚³ãƒŸãƒƒãƒˆãƒã‚°ã®1行目 - ã§ã™ã€‚\n"
-" -v/--verbose ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€å¤‰æ›´å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ä¸€è¦§ã¨ã€ã‚³ãƒŸãƒƒãƒˆ\n"
+" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€ 本コマンドãŒå‡ºåŠ›ã™ã‚‹æƒ…å ±ã¯ -\n"
+" リビジョン番å·ã€ è˜åˆ¥ç”¨ãƒãƒƒã‚·ãƒ¥å€¤ã€ タグ〠(リビジョン番å·ã®é›¢ã‚ŒãŸ)\n"
+" 親リビジョン〠作æˆè€…〠作æˆæ—¥æ™‚ãŠã‚ˆã³ã‚³ãƒŸãƒƒãƒˆãƒã‚°ã®1行目 - ã§ã™ã€‚\n"
+" -v/--verbose ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 変更対象ファイル一覧ã¨ã€ コミット\n"
" ãƒã‚°ã®å…¨æ–‡ã‚‚表示ã•ã‚Œã¾ã™ã€‚"
msgid ""
-" NOTE: log -p/--patch may generate unexpected diff output for merge\n"
-" changesets, as it will only compare the merge changeset against\n"
-" its first parent. Also, only files different from BOTH parents\n"
-" will appear in files:."
-msgstr ""
-" 備考: マージ実施リビジョンã«å¯¾ã™ã‚‹ -p/--patch ãŒäºˆæœŸã›ã¬å‡ºåŠ›ã‚’生æˆ\n"
-" ã™ã‚‹ã®ã¯ã€å¸¸ã«ç¬¬1親ã¨ã®å·®åˆ†ã‚’表示ã™ã‚‹ãŸã‚ã§ã™ã€‚ファイル一覧ãŒäºˆæœŸ\n"
-" ã›ã¬å†…容ã¨ãªã‚‹ã®ã¯ã€ä¸¡æ–¹ã®è¦ªã¨ç•°ãªã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ãŒåˆ—挙ã•ã‚Œã‚‹ãŸã‚ã§ã™ã€‚\n"
-" "
+" .. note::\n"
+" log -p/--patch may generate unexpected diff output for merge\n"
+" changesets, as it will only compare the merge changeset against\n"
+" its first parent. Also, only files different from BOTH parents\n"
+" will appear in files:."
+msgstr ""
+" .. note::\n"
+" マージ実施リビジョンã«å¯¾ã™ã‚‹ -p/--patch 指定ã«ã‚ˆã‚‹å·®åˆ†å‡ºåŠ›ãŒã€ \n"
+" 期待ã¨ç•°ãªã‚‹å ´åˆãŒã‚ã‚‹ã®ã¯ã€ 比較対象ãŒå¯¾è±¡ãƒªãƒ“ジョンã®ç¬¬1親ã«\n"
+" 固定ã•ã‚Œã¦ã„ã‚‹ãŸã‚ã§ã™ã€‚ ファイル一覧ãŒäºˆæœŸã›ã¬å†…容ã¨ãªã‚‹ã®ã¯ã€ \n"
+" 親åŒå£«ã§å†…容ãŒç•°ãªã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã®ã¿ãŒåˆ—挙ã•ã‚Œã‚‹ãŸã‚ã§ã™ã€‚"
msgid "output the current or given revision of the project manifest"
msgstr "ç¾æ™‚点ãªã„ã—指定時点ã§ã®ãƒªãƒã‚¸ãƒˆãƒªãƒžãƒ‹ãƒ•ã‚§ã‚¹ãƒˆã®å‡ºåŠ›"
@@ -8088,16 +8303,16 @@
" is used, or the null revision if no revision is checked out."
msgstr ""
" 指定リビジョンã«ãŠã‘る構æˆç®¡ç†å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ã®ä¸€è¦§ã‚’表示ã—ã¾ã™ã€‚\n"
-" リビジョン指定ãŒç„¡ã„å ´åˆã€ä½œæ¥é ˜åŸŸã®(第1)親リビジョンã‹ã€\n"
+" リビジョン指定ãŒç„¡ã„å ´åˆã€ 作æ¥é ˜åŸŸã®(第1)親リビジョンã‹ã€ \n"
" 作æ¥é ˜åŸŸã®æ›´æ–°å‰ãªã‚‰ null ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚"
msgid ""
" With -v, print file permissions, symlink and executable bits.\n"
" With --debug, print file revision hashes."
msgstr ""
-" -v ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ãƒ•ã‚¡ã‚¤ãƒ«ã‚¢ã‚¯ã‚»ã‚¹æ¨©ã‚„シンボリックリンクã€\n"
+" -v ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ ファイルアクセス権やシンボリックリンク〠\n"
" 実行å¯èƒ½ãƒ“ットã¨ã„ã£ãŸã‚‚ã®ã‚‚表示ã•ã‚Œã¾ã™ã€‚\n"
-" --debug ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€å„ファイルã®ãƒªãƒ“ジョンã®ãƒãƒƒã‚·ãƒ¥å€¤ãŒ\n"
+" --debug ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ å„ファイルã®ãƒªãƒ“ジョンã®ãƒãƒƒã‚·ãƒ¥å€¤ãŒ\n"
" 表示ã•ã‚Œã¾ã™ã€‚"
msgid "merge working directory with another revision"
@@ -8107,7 +8322,7 @@
" The current working directory is updated with all changes made in\n"
" the requested revision since the last common predecessor revision."
msgstr ""
-" ç¾æ™‚点ã§ã®ä½œæ¥é ˜åŸŸã®å†…容をã€æŒ‡å®šã•ã‚ŒãŸãƒªãƒ“ジョンã¸ã¨è‡³ã‚‹ã¾ã§ã®\n"
+" ç¾æ™‚点ã§ã®ä½œæ¥é ˜åŸŸã®å†…容を〠指定ã•ã‚ŒãŸãƒªãƒ“ジョンã¸ã¨è‡³ã‚‹ã¾ã§ã®\n"
" 共通ã®è¦ªãƒªãƒ“ジョンã‹ã‚‰ã®å¤‰æ›´å†…容ã¨ãƒžãƒ¼ã‚¸ã—ã¾ã™ã€‚"
msgid ""
@@ -8116,35 +8331,47 @@
" updates to the repository are allowed. The next commit will have\n"
" two parents."
msgstr ""
-" 両方ã®è¦ªãƒªãƒ“ジョンã«å¯¾ã—ã¦å·®åˆ†ã®ã‚るファイルã¯ã€æ¬¡å›žã‚³ãƒŸãƒƒãƒˆã®éš›ã«ã¯\n"
-" 変更ã•ã‚ŒãŸã‚‚ã®ã¨ã—ã¦è¨˜éŒ²ã•ã‚Œã¾ã™ã®ã§ã€å¿…è¦ä»¥ä¸Šã®å¤‰æ›´ãŒå®Ÿæ–½ã•ã‚Œã‚‹å‰ã«\n"
-" コミットを実施ã—ã¦ãã ã•ã„。ã“ã®ã‚³ãƒŸãƒƒãƒˆæ™‚ã«ç”Ÿæˆã•ã‚Œã‚‹ãƒªãƒ“ジョンã¯ã€\n"
+" 両方ã®è¦ªãƒªãƒ“ジョンã«å¯¾ã—ã¦å·®åˆ†ã®ã‚るファイルã¯ã€ 次回コミットã®éš›ã«ã¯\n"
+" 変更ã•ã‚ŒãŸã‚‚ã®ã¨ã—ã¦è¨˜éŒ²ã•ã‚Œã¾ã™ã®ã§ã€ å¿…è¦ä»¥ä¸Šã®å¤‰æ›´ãŒå®Ÿæ–½ã•ã‚Œã‚‹å‰ã«\n"
+" コミットを実施ã—ã¦ãã ã•ã„。 ã“ã®ã‚³ãƒŸãƒƒãƒˆæ™‚ã«ç”Ÿæˆã•ã‚Œã‚‹ãƒªãƒ“ジョンã¯ã€ \n"
" 親リビジョンを2ã¤æŒã¤ãƒªãƒ“ジョンã¨ãªã‚Šã¾ã™ã€‚"
msgid ""
+" ``--tool`` can be used to specify the merge tool used for file\n"
+" merges. It overrides the HGMERGE environment variable and your\n"
+" configuration files."
+msgstr ""
+" ``--tool`` を使用ã™ã‚‹ã“ã¨ã§ã€ ファイルã®ãƒžãƒ¼ã‚¸ã«ä½¿ç”¨ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã‚’\n"
+" 指定å¯èƒ½ã§ã™ã€‚ ã“ã®ã‚ªãƒ—ションã«ã‚ˆã‚‹æŒ‡å®šã¯ã€ HGMERGE 環境変数や\n"
+" è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚ˆã‚‹æŒ‡å®šã‚’上書ãã—ã¾ã™ã€‚"
+
+msgid ""
" If no revision is specified, the working directory's parent is a\n"
" head revision, and the current branch contains exactly one other\n"
" head, the other head is merged with by default. Otherwise, an\n"
" explicit revision with which to merge with must be provided."
msgstr ""
-" マージ対象リビジョンã®æŒ‡å®šãŒç„¡ãã€ä½œæ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンãŒãƒ˜ãƒƒãƒ‰ã§ã€\n"
-" 且ã¤ç¾è¡Œãƒ–ランãƒãŒã‚‚ã†1ã¤ã ã‘ヘッドをæŒã¤å ´åˆã€ãã®ãƒ˜ãƒƒãƒ‰ãŒãƒžãƒ¼ã‚¸\n"
-" 対象ã¨ãªã‚Šã¾ã™ã€‚ãれ以外ã®å ´åˆã¯ã€æ˜Žç¤ºçš„ãªãƒªãƒ“ジョン指定ãŒå¿…è¦ã§ã™ã€‚"
+" マージ対象リビジョンã®æŒ‡å®šãŒç„¡ã〠作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンãŒãƒ˜ãƒƒãƒ‰ã§ã€ \n"
+" 且ã¤ç¾è¡Œãƒ–ランãƒãŒã‚‚ã†1ã¤ã ã‘ヘッドをæŒã¤å ´åˆã€ ãã®ãƒ˜ãƒƒãƒ‰ãŒãƒžãƒ¼ã‚¸\n"
+" 対象ã¨ãªã‚Šã¾ã™ã€‚ ãれ以外ã®å ´åˆã¯ã€ 明示的ãªãƒªãƒ“ジョン指定ãŒå¿…è¦ã§ã™ã€‚"
+
+msgid " :hg:`resolve` must be used to resolve unresolved files."
+msgstr " è¡çªæœªè§£æ¶ˆãªãƒ•ã‚¡ã‚¤ãƒ«ã¯ :hg:`resolve` ã§ã®è¡çªè§£æ¶ˆãŒå¿…è¦ã§ã™ã€‚"
msgid ""
" To undo an uncommitted merge, use :hg:`update --clean .` which\n"
" will check out a clean copy of the original merge parent, losing\n"
" all changes."
msgstr ""
-" コミットå‰ã«ãƒžãƒ¼ã‚¸å‡¦ç†ã‚’å–り消ã™å ´åˆã¯ã€:hg:`update --clean .`\n"
-" ãŒä½¿ç”¨ã§ãã¾ã™ãŒã€ãƒžãƒ¼ã‚¸å‰ã®è¦ªãƒªãƒ“ジョンã®å†…容ã§ä¸Šæ›¸ãã™ã‚‹ãŸã‚ã€\n"
+" コミットå‰ã«ãƒžãƒ¼ã‚¸å‡¦ç†ã‚’å–り消ã™å ´åˆã¯ã€ :hg:`update --clean .`\n"
+" ãŒä½¿ç”¨ã§ãã¾ã™ãŒã€ マージå‰ã®è¦ªãƒªãƒ“ジョンã®å†…容ã§ä¸Šæ›¸ãã™ã‚‹ãŸã‚〠\n"
" 作æ¥é ˜åŸŸä¸ã®å…¨ã¦ã®å¤‰æ›´å†…容ãŒå¤±ã‚ã‚Œã¾ã™ã€‚"
msgid ""
" Returns 0 on success, 1 if there are unresolved files.\n"
" "
msgstr ""
-" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0ã€æœªè§£æ±ºãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚‹å ´åˆã¯ 1 ã§ã™ã€‚\n"
+" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0〠未解決ファイルãŒã‚ã‚‹å ´åˆã¯ 1 ã§ã™ã€‚\n"
" "
#, python-format
@@ -8185,9 +8412,9 @@
" or the default push location. These are the changesets that would\n"
" be pushed if a push was requested."
msgstr ""
-" 指定ã•ã‚ŒãŸé€£æºå…ˆãƒªãƒã‚¸ãƒˆãƒª(ãªã„ã—ã€ç„¡æŒ‡å®šæ™‚ã® hg push 先リãƒã‚¸ãƒˆãƒª)ã«\n"
-" å«ã¾ã‚Œãªã„ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã‚’表示ã—ã¾ã™ã€‚ã“ã“ã§è¡¨ç¤ºã•ã‚Œã‚‹ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã¯\n"
-" hg push 実施ã®éš›ã«ã€é€£æºå…ˆãƒªãƒã‚¸ãƒˆãƒªã¸ã¨åæ˜ ã•ã‚Œã‚‹ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã§ã™ã€‚"
+" 指定ã•ã‚ŒãŸé€£æºå…ˆãƒªãƒã‚¸ãƒˆãƒª(ãªã„ã—〠無指定時㮠hg push 先リãƒã‚¸ãƒˆãƒª)ã«\n"
+" å«ã¾ã‚Œãªã„ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã‚’表示ã—ã¾ã™ã€‚ ã“ã“ã§è¡¨ç¤ºã•ã‚Œã‚‹ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã¯\n"
+" hg push 実施ã®éš›ã«ã€ 連æºå…ˆãƒªãƒã‚¸ãƒˆãƒªã¸ã¨åæ˜ ã•ã‚Œã‚‹ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã§ã™ã€‚"
msgid " See pull for details of valid destination formats."
msgstr " 有効ãªãƒªãƒã‚¸ãƒˆãƒªæŒ‡å®šå½¢å¼ã¯ :hg:`pull` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
@@ -8196,7 +8423,7 @@
" Returns 0 if there are outgoing changes, 1 otherwise.\n"
" "
msgstr ""
-" åæ˜ å¯èƒ½ãƒªãƒ“ジョンãŒã‚ã‚‹å ´åˆã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0ã€ãれ以外ã¯\n"
+" åæ˜ å¯èƒ½ãƒªãƒ“ジョンãŒã‚ã‚‹å ´åˆã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0〠ãれ以外ã¯\n"
" 1 ã§ã™ã€‚\n"
" "
@@ -8210,9 +8437,9 @@
" last changed (before the working directory revision or the\n"
" argument to --rev if given) is printed."
msgstr ""
-" 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンを表示ã—ã¾ã™ã€‚-r/--rev ã§ã®ãƒªãƒ“ジョン指定ãŒ\n"
-" ã‚ã‚‹å ´åˆã€æŒ‡å®šãƒªãƒ“ジョンã®è¦ªãƒªãƒ“ジョンを表示ã—ã¾ã™ã€‚ファイルãŒæŒ‡å®š\n"
-" ã•ã‚ŒãŸå ´åˆã€(作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã€ãªã„ã— --rev 指定ã®ãƒªãƒ“ジョン\n"
+" 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンを表示ã—ã¾ã™ã€‚ -r/--rev ã§ã®ãƒªãƒ“ジョン指定ãŒ\n"
+" ã‚ã‚‹å ´åˆã€ 指定リビジョンã®è¦ªãƒªãƒ“ジョンを表示ã—ã¾ã™ã€‚ ファイルãŒæŒ‡å®š\n"
+" ã•ã‚ŒãŸå ´åˆã€ (作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョン〠ãªã„ã— --rev 指定ã®ãƒªãƒ“ジョン\n"
" 以å‰ã®ã‚‚ã®ã§)ãã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’最後ã«æ›´æ–°ã—ãŸãƒªãƒ“ジョンを表示ã—ã¾ã™ã€‚"
msgid "can only specify an explicit filename"
@@ -8230,15 +8457,15 @@
" show definition of all available names."
msgstr ""
" 指定ã•ã‚ŒãŸã‚·ãƒ³ãƒœãƒ«åã«ç›¸å½“ã™ã‚‹é€£æºå…ˆãƒªãƒã‚¸ãƒˆãƒªã‚’表示ã—ã¾ã™ã€‚\n"
-" シンボルåãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€å…¨ã¦ã®åˆ¥å定義ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚"
+" シンボルåãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€ å…¨ã¦ã®åˆ¥å定義ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚"
msgid ""
" Path names are defined in the [paths] section of your\n"
" configuration file and in ``/etc/mercurial/hgrc``. If run inside a\n"
" repository, ``.hg/hgrc`` is used, too."
msgstr ""
-" シンボル定義ã¯ã€å€‹äººã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚„ ``/etc/mercurial/hgrc`` ç‰ã®\n"
-" [paths] セクションã«è¨˜è¿°ã•ã‚Œã¾ã™ã€‚作æ¥é ˜åŸŸã§ã®å®Ÿè¡Œã®å ´åˆã¯\n"
+" シンボル定義ã¯ã€ 個人ã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚„ ``/etc/mercurial/hgrc`` ç‰ã®\n"
+" [paths] セクションã«è¨˜è¿°ã•ã‚Œã¾ã™ã€‚ 作æ¥é ˜åŸŸã§ã®å®Ÿè¡Œã®å ´åˆã¯\n"
" ``.hg/hgrc`` ã§ã®è¨˜è¿°ã‚‚å‚ç…§ã•ã‚Œã¾ã™ã€‚"
msgid ""
@@ -8254,14 +8481,14 @@
" :hg:`bundle`) operations."
msgstr ""
" ``default`` ãŠã‚ˆã³ ``default-push`` ã¯ç‰¹åˆ¥ãªæ„味をæŒã¡ã¾ã™ã€‚\n"
-" push/pull ã®éš›ã«ã‚³ãƒžãƒ³ãƒ‰è¡Œã§é€£æºå…ˆãƒªãƒã‚¸ãƒˆãƒªãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€\n"
-" ã“れらã®ãƒ‘スãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚``default-push`` ãŒè¨å®šã•ã‚Œã¦ã„ã‚‹å ´åˆã€\n"
-" ``default-push`` 㯠:hg:`push` ã§ä½¿ç”¨ã•ã‚Œã€``default`` ã¯\n"
-" :hg:`pull` ã§ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚``default-push`` ãŒæœªè¨å®šã§ã‚ã‚Œã°ã€\n"
-" push/pull 共㫠``default`` を使用ã—ã¾ã™ã€‚リãƒã‚¸ãƒˆãƒªã®è¤‡è£½ã§ã¯ã€\n"
+" push/pull ã®éš›ã«ã‚³ãƒžãƒ³ãƒ‰è¡Œã§é€£æºå…ˆãƒªãƒã‚¸ãƒˆãƒªãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€ \n"
+" ã“れらã®ãƒ‘スãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚ ``default-push`` ãŒè¨å®šã•ã‚Œã¦ã„ã‚‹å ´åˆã€ \n"
+" ``default-push`` 㯠:hg:`push` ã§ä½¿ç”¨ã•ã‚Œã€ ``default`` ã¯\n"
+" :hg:`pull` ã§ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚ ``default-push`` ãŒæœªè¨å®šã§ã‚ã‚Œã°ã€ \n"
+" push/pull 共㫠``default`` を使用ã—ã¾ã™ã€‚ リãƒã‚¸ãƒˆãƒªã®è¤‡è£½ã§ã¯ã€ \n"
" 複製元リãƒã‚¸ãƒˆãƒªãŒ ``default`` ã¨ã—㦠``.hg/hgrc`` ã«è¨˜éŒ²ã•ã‚Œã¾ã™ã€‚\n"
" ``default`` ãŠã‚ˆã³ ``default-push`` ã¯å…¨ã¦ã®å–り込㿠(例: \n"
-" :hg:`incoming`) ãŠã‚ˆã³åæ˜ (例: :hg:`outgoing`ã€:hg:`email` ãŠã‚ˆã³\n"
+" :hg:`incoming`) ãŠã‚ˆã³åæ˜ (例: :hg:`outgoing`〠:hg:`email` ãŠã‚ˆã³\n"
" :hg:`bundle`) æ“作ã«ãŠã„ã¦é©ç”¨ã•ã‚Œã¾ã™ã€‚"
msgid " See :hg:`help urls` for more information."
@@ -8271,10 +8498,10 @@
msgstr "指定シンボルã¯ä¸æ˜Žã§ã™\n"
msgid "not updating, since new heads added\n"
-msgstr "æ–°è¦ãƒ˜ãƒƒãƒ‰ãŒè¿½åŠ ã•ã‚ŒãŸãŸã‚ã€ä½œæ¥é ˜åŸŸã¯æ›´æ–°ã—ã¾ã›ã‚“\n"
+msgstr "æ–°è¦ãƒ˜ãƒƒãƒ‰ãŒè¿½åŠ ã•ã‚ŒãŸãŸã‚〠作æ¥é ˜åŸŸã¯æ›´æ–°ã—ã¾ã›ã‚“\n"
msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
-msgstr "(ヘッド一覧表示㯠'hg heads'ã€ãƒžãƒ¼ã‚¸å®Ÿæ–½ã¯ 'hg merge')\n"
+msgstr "(ヘッド一覧表示㯠'hg heads'〠マージ実施㯠'hg merge')\n"
msgid "(run 'hg update' to get a working copy)\n"
msgstr "(作æ¥é ˜åŸŸã®æ›´æ–°ã¯ 'hg update')\n"
@@ -8291,9 +8518,9 @@
" -R is specified). By default, this does not update the copy of the\n"
" project in the working directory."
msgstr ""
-" パスや URL ã§æŒ‡å®šã•ã‚Œã‚‹é€£æºå…ˆãƒªãƒã‚¸ãƒˆãƒªä¸ã®ã€å…¨ã¦ã®ãƒªãƒ“ジョンãŒ\n"
+" パスや URL ã§æŒ‡å®šã•ã‚Œã‚‹é€£æºå…ˆãƒªãƒã‚¸ãƒˆãƒªä¸ã®ã€ å…¨ã¦ã®ãƒªãƒ“ジョンãŒ\n"
" (-R 指定ãŒç„¡ã„å ´åˆã¯ç¾åœ¨ã®)リãƒã‚¸ãƒˆãƒªã¸ã®å–ã‚Šè¾¼ã¿å¯¾è±¡ã¨ãªã‚Šã¾ã™ã€‚\n"
-" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’実行ã—ã¦ã‚‚ã€ä½œæ¥é ˜åŸŸã®å†…容ã¯æ›´æ–°\n"
+" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€ ã“ã®ã‚³ãƒžãƒ³ãƒ‰ã‚’実行ã—ã¦ã‚‚〠作æ¥é ˜åŸŸã®å†…容ã¯æ›´æ–°\n"
" ã•ã‚Œã¾ã›ã‚“。"
msgid ""
@@ -8302,30 +8529,30 @@
" to add those changes to the repository, you should use :hg:`pull\n"
" -r X` where ``X`` is the last changeset listed by :hg:`incoming`."
msgstr ""
-" :hg:`incoming` を使用ã™ã‚‹ã“ã¨ã§ã€å®Ÿéš›ã®å–ã‚Šè¾¼ã¿ã‚’ã›ãšã«ã€\n"
-" :hg:`pull` ã«ã‚ˆã‚‹å–ã‚Šè¾¼ã¿å¯¾è±¡ã‚’確èªã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚表示ã•ã‚ŒãŸ\n"
-" 内容ã®å–ã‚Šè¾¼ã¿ã‚’決æ–ã—ãŸãªã‚‰ã°ã€:hg:`incoming` 実行ã§è¡¨ç¤ºã•ã‚ŒãŸ\n"
+" :hg:`incoming` を使用ã™ã‚‹ã“ã¨ã§ã€ 実際ã®å–ã‚Šè¾¼ã¿ã‚’ã›ãšã«ã€ \n"
+" :hg:`pull` ã«ã‚ˆã‚‹å–ã‚Šè¾¼ã¿å¯¾è±¡ã‚’確èªã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ 表示ã•ã‚ŒãŸ\n"
+" 内容ã®å–ã‚Šè¾¼ã¿ã‚’決æ–ã—ãŸãªã‚‰ã°ã€ :hg:`incoming` 実行ã§è¡¨ç¤ºã•ã‚ŒãŸ\n"
" 最後ã®ãƒªãƒ“ジョンを ``-r`` ã®å¼•æ•°ã«ã—㦠:hg:`pull -r X` を実行ã—ã¾ã™ã€‚"
msgid ""
" If SOURCE is omitted, the 'default' path will be used.\n"
" See :hg:`help urls` for more information."
msgstr ""
-" 連æºå…ˆãŒçœç•¥ã•ã‚ŒãŸå ´åˆã€'default' パスãŒé€£æºå…ˆã¨ã—ã¦ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚\n"
+" 連æºå…ˆãŒçœç•¥ã•ã‚ŒãŸå ´åˆã€ 'default' パスãŒé€£æºå…ˆã¨ã—ã¦ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚\n"
" 詳細㯠:hg:`help urls` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
msgid ""
" Returns 0 on success, 1 if an update had unresolved files.\n"
" "
msgstr ""
-" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0ã€æ›´æ–°ã§æœªè§£æ±ºãƒ•ã‚¡ã‚¤ãƒ«ãŒæ¤œå‡ºã•ã‚ŒãŸå ´åˆã¯\n"
+" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0〠更新ã§æœªè§£æ±ºãƒ•ã‚¡ã‚¤ãƒ«ãŒæ¤œå‡ºã•ã‚ŒãŸå ´åˆã¯\n"
" 1 ã§ã™ã€‚\n"
" "
msgid ""
"other repository doesn't support revision lookup, so a rev cannot be "
"specified."
-msgstr "連æºå…ˆã§ãƒªãƒ“ジョンãŒç‰¹å®šå‡ºæ¥ãªã„ãŸã‚ã€ãƒªãƒ“ジョンã¯æŒ‡å®šã§ãã¾ã›ã‚“"
+msgstr "連æºå…ˆã§ãƒªãƒ“ジョンãŒç‰¹å®šå‡ºæ¥ãªã„ãŸã‚〠リビジョンã¯æŒ‡å®šã§ãã¾ã›ã‚“"
msgid "push changes to the specified destination"
msgstr "指定リãƒã‚¸ãƒˆãƒªã¸ã®å¤‰æ›´å±¥æ´ã®åæ˜ "
@@ -8339,7 +8566,7 @@
" This operation is symmetrical to pull: it is identical to a pull\n"
" in the destination repository from the current one."
msgstr ""
-" ã“れ㯠:hg:`pull` ã¨å¯¾ç§°çš„ãªæ“作ã§ã™:連æºå…ˆãƒªãƒã‚¸ãƒˆãƒªã«ãŠã„ã¦ã€\n"
+" ã“れ㯠:hg:`pull` ã¨å¯¾ç§°çš„ãªæ“作ã§ã™:連æºå…ˆãƒªãƒã‚¸ãƒˆãƒªã«ãŠã„ã¦ã€ \n"
" ç¾ãƒªãƒã‚¸ãƒˆãƒªã«å¯¾ã™ã‚‹ :hg:`pull` ã‚’è¡Œã£ãŸå ´åˆã¨åŒä¸€ã®åŠ¹æžœã‚’æŒã¡ã¾ã™ã€‚"
msgid ""
@@ -8348,9 +8575,9 @@
" to use. In this situation, it is recommended to pull and merge\n"
" before pushing."
msgstr ""
-" 特ã«æŒ‡å®šã®ç„¡ã„å ´åˆã€è¤‡æ•°ãƒ˜ãƒƒãƒ‰çŠ¶æ…‹ã¯ã€ã©ã®ãƒ˜ãƒƒãƒ‰ãŒå¦¥å½“ãªã‚‚ã®ã§ã‚ã‚‹ã‹\n"
-" æ··ä¹±ã™ã‚‹ãŸã‚ã€é€£æºå…ˆã«æ–°è¦ãƒ˜ãƒƒãƒ‰ãŒä½œæˆã•ã‚Œã‚‹åæ˜ ã¯è¨±å¯ã•ã‚Œã¾ã›ã‚“。\n"
-" ã“ã®ã‚ˆã†ãªå ´åˆã€:hg:`push` 実施å‰ã«ã€:hg:`pull` ãŠã‚ˆã³ :hg:`merge`\n"
+" 特ã«æŒ‡å®šã®ç„¡ã„å ´åˆã€ 複数ヘッド状態ã¯ã€ ã©ã®ãƒ˜ãƒƒãƒ‰ãŒå¦¥å½“ãªã‚‚ã®ã§ã‚ã‚‹ã‹\n"
+" æ··ä¹±ã™ã‚‹ãŸã‚〠連æºå…ˆã«æ–°è¦ãƒ˜ãƒƒãƒ‰ãŒä½œæˆã•ã‚Œã‚‹åæ˜ ã¯è¨±å¯ã•ã‚Œã¾ã›ã‚“。\n"
+" ã“ã®ã‚ˆã†ãªå ´åˆã€ :hg:`push` 実施å‰ã«ã€ :hg:`pull` ãŠã‚ˆã³ :hg:`merge`\n"
" を実施ã™ã‚‹ã“ã¨ã‚’ãŠå‹§ã‚ã—ã¾ã™ã€‚"
msgid ""
@@ -8359,35 +8586,35 @@
" only create a new branch without forcing other changes."
msgstr ""
" 連æºå…ˆã«å˜åœ¨ã—ãªã„åå‰ä»˜ãブランãƒã‚’æ–°è¦ä½œæˆã™ã‚‹å ´åˆã¯ --new-branch\n"
-" を使用ã—ã¾ã™ã€‚ã“ã®ã‚ªãƒ—ション指定ã¯ã€æ–°è¦ãƒ–ランãƒã®ä½œæˆã®ã¿ã‚’許å¯\n"
+" を使用ã—ã¾ã™ã€‚ ã“ã®ã‚ªãƒ—ション指定ã¯ã€ æ–°è¦ãƒ–ランãƒã®ä½œæˆã®ã¿ã‚’許å¯\n"
" ã—ã¾ã™ã€‚"
msgid ""
" Use -f/--force to override the default behavior and push all\n"
" changesets on all branches."
msgstr ""
-" 通常挙動ã«ãŠã‘る制約を無視ã—ã¦ã€å…¨ã¦ã®ãƒ–ランãƒã«ãŠã‘ã‚‹å…¨ã¦ã®å¤‰æ›´ã‚’\n"
-" åæ˜ ã™ã‚‹å ´åˆã¯ã€-f/--force を使用ã—ã¾ã™ã€‚"
+" 通常挙動ã«ãŠã‘る制約を無視ã—ã¦ã€ å…¨ã¦ã®ãƒ–ランãƒã«ãŠã‘ã‚‹å…¨ã¦ã®å¤‰æ›´ã‚’\n"
+" åæ˜ ã™ã‚‹å ´åˆã¯ã€ -f/--force を使用ã—ã¾ã™ã€‚"
msgid ""
" If -r/--rev is used, the specified revision and all its ancestors\n"
" will be pushed to the remote repository."
msgstr ""
-" -r/--rev ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€æŒ‡å®šã•ã‚ŒãŸãƒªãƒ“ジョンã¨ã€ãã®ç¥–å…ˆã¨ãªã‚‹\n"
+" -r/--rev ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 指定ã•ã‚ŒãŸãƒªãƒ“ジョンã¨ã€ ãã®ç¥–å…ˆã¨ãªã‚‹\n"
" リビジョンãŒé€£æºå…ˆãƒªãƒã‚¸ãƒˆãƒªã¸ã¨åæ˜ ã•ã‚Œã¾ã™ã€‚"
msgid ""
" Please see :hg:`help urls` for important details about ``ssh://``\n"
" URLs. If DESTINATION is omitted, a default path will be used."
msgstr ""
-" ``ssh://`` URL å½¢å¼ã®è©³ç´°ã¯ã€:hg:`help urls` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。\n"
-" 連æºå…ˆãŒçœç•¥ã•ã‚ŒãŸå ´åˆã€'default' パスãŒé€£æºå…ˆã¨ã—ã¦ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚"
+" ``ssh://`` URL å½¢å¼ã®è©³ç´°ã¯ã€ :hg:`help urls` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。\n"
+" 連æºå…ˆãŒçœç•¥ã•ã‚ŒãŸå ´åˆã€ 'default' パスãŒé€£æºå…ˆã¨ã—ã¦ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚"
msgid ""
" Returns 0 if push was successful, 1 if nothing to push.\n"
" "
msgstr ""
-" åæ˜ æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0ã€ä½•ã‚‚åæ˜ ã•ã‚Œãªã‹ã£ãŸå ´åˆã¯ 1 ã§ã™ã€‚\n"
+" åæ˜ æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0〠何もåæ˜ ã•ã‚Œãªã‹ã£ãŸå ´åˆã¯ 1 ã§ã™ã€‚\n"
" "
#, python-format
@@ -8405,14 +8632,14 @@
" interrupted operation. It should only be necessary when Mercurial\n"
" suggests it."
msgstr ""
-" 本コマンドã¯ã€æ“作ãŒä¸æ–ã•ã‚ŒãŸéš›ã®ãƒªãƒã‚¸ãƒˆãƒªçŠ¶æ…‹ã®ä¿®å¾©ã‚’è¡Œã„ã¾ã™ã€‚\n"
-" 本コマンドã®å®Ÿè¡Œã¯ã€Mercurial ãŒå®Ÿè¡Œã‚’促ã—ãŸå ´åˆã®ã¿ã§å分ã§ã™ã€‚"
+" 本コマンドã¯ã€ æ“作ãŒä¸æ–ã•ã‚ŒãŸéš›ã®ãƒªãƒã‚¸ãƒˆãƒªçŠ¶æ…‹ã®ä¿®å¾©ã‚’è¡Œã„ã¾ã™ã€‚\n"
+" 本コマンドã®å®Ÿè¡Œã¯ã€ Mercurial ãŒå®Ÿè¡Œã‚’促ã—ãŸå ´åˆã®ã¿ã§å分ã§ã™ã€‚"
msgid ""
" Returns 0 if successful, 1 if nothing to recover or verify fails.\n"
" "
msgstr ""
-" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0ã€ä¿®å¾©ä¸è¦ãªã„ã—修復失敗時㯠1 ã§ã™ã€‚\n"
+" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0〠修復ä¸è¦ãªã„ã—修復失敗時㯠1 ã§ã™ã€‚\n"
" "
msgid "remove the specified files on the next commit"
@@ -8428,9 +8655,9 @@
" force deletion, and -Af can be used to remove files from the next\n"
" revision without deleting them from the working directory."
msgstr ""
-" ç¾è¡Œãƒ–ランãƒã«ãŠã‘る登録除外ã§ã‚ã‚Šã€ãƒªãƒã‚¸ãƒˆãƒªå±¥æ´ã‹ã‚‰æŠ¹æ¶ˆã•ã‚Œã‚‹\n"
-" ã‚ã‘ã§ã¯ã‚ã‚Šã¾ã›ã‚“。手動ã§å‰Šé™¤ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’登録除外ã™ã‚‹ã«ã¯\n"
-" -A/--after ã‚’ã€å¼·åˆ¶çš„ã«ç™»éŒ²é™¤å¤–ã™ã‚‹ã«ã¯ -f/--force ã‚’ã€ä½œæ¥é ˜åŸŸä¸ã®\n"
+" ç¾è¡Œãƒ–ランãƒã«ãŠã‘る登録除外ã§ã‚り〠リãƒã‚¸ãƒˆãƒªå±¥æ´ã‹ã‚‰æŠ¹æ¶ˆã•ã‚Œã‚‹\n"
+" ã‚ã‘ã§ã¯ã‚ã‚Šã¾ã›ã‚“。 手動ã§å‰Šé™¤ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’登録除外ã™ã‚‹ã«ã¯\n"
+" -A/--after を〠強制的ã«ç™»éŒ²é™¤å¤–ã™ã‚‹ã«ã¯ -f/--force を〠作æ¥é ˜åŸŸä¸ã®\n"
" ファイルを削除ã™ã‚‹ã“ã¨ãªã登録除外ã™ã‚‹ã«ã¯ -Af を指定ã—ã¾ã™ã€‚"
msgid ""
@@ -8440,11 +8667,11 @@
" reported by :hg:`status`). The actions are Warn, Remove (from\n"
" branch) and Delete (from disk)::"
msgstr ""
-" ファイルã®çŠ¶æ…‹(横)ã¨ã‚ªãƒ—ション指定(縦)ã®çµ„ã¿åˆã‚ã›ã«ãŠã‘る挙動ã¯ã€\n"
-" 以下ã®ä¸€è¦§ã‚’å‚ç…§ã—ã¦ãã ã•ã„。ファイルã®çŠ¶æ…‹ã¯ã€:hg:`status` ã®è¡¨ç¤º\n"
-" ã«å€£ã„ã€è¿½åŠ (Added)[A]ã€æ”¹å¤‰ç„¡ã—(Clean)[C]ã€æ”¹å¤‰æœ‰ã‚Š(Modified)[M] \n"
+" ファイルã®çŠ¶æ…‹(横)ã¨ã‚ªãƒ—ション指定(縦)ã®çµ„ã¿åˆã‚ã›ã«ãŠã‘る挙動ã¯ã€ \n"
+" 以下ã®ä¸€è¦§ã‚’å‚ç…§ã—ã¦ãã ã•ã„。 ファイルã®çŠ¶æ…‹ã¯ã€ :hg:`status` ã®è¡¨ç¤º\n"
+" ã«å€£ã„ã€ è¿½åŠ (Added)[A]〠改変無ã—(Clean)[C]〠改変有り(Modified)[M] \n"
" ãŠã‚ˆã³ä¸åœ¨(Missing)[!] ã§è¡¨ã—ã¾ã™ã€‚\n"
-" 挙動ã¯ã€è¦å‘Š(Warn)[W]ã€æ§‹æˆç®¡ç†ã‹ã‚‰ã®ç™»éŒ²é™¤å¤–(Remove)[R] ãŠã‚ˆã³\n"
+" 挙動ã¯ã€ è¦å‘Š(Warn)[W]〠構æˆç®¡ç†ã‹ã‚‰ã®ç™»éŒ²é™¤å¤–(Remove)[R] ãŠã‚ˆã³\n"
" 作æ¥é ˜åŸŸã‹ã‚‰ã®å‰Šé™¤(Delete)[D] ã§è¡¨ã—ã¾ã™::"
msgid ""
@@ -8464,14 +8691,14 @@
" This command schedules the files to be removed at the next commit.\n"
" To undo a remove before that, see :hg:`revert`."
msgstr ""
-" 指定ファイルã¯ã€æ¬¡å›žã®ã‚³ãƒŸãƒƒãƒˆã®éš›ã«ç™»éŒ²é™¤å¤–ã•ã‚Œã¾ã™ã€‚登録除外ã®\n"
+" 指定ファイルã¯ã€ 次回ã®ã‚³ãƒŸãƒƒãƒˆã®éš›ã«ç™»éŒ²é™¤å¤–ã•ã‚Œã¾ã™ã€‚ 登録除外ã®\n"
" コミットå‰å–り消ã—㯠:hg:`help revert` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
msgid ""
" Returns 0 on success, 1 if any warnings encountered.\n"
" "
msgstr ""
-" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0ã€è¦å‘Šæ¤œå‡ºæ™‚㯠1 ã§ã™ã€‚\n"
+" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0〠è¦å‘Šæ¤œå‡ºæ™‚㯠1 ã§ã™ã€‚\n"
" "
#, python-format
@@ -8501,19 +8728,19 @@
" is a directory, copies are put in that directory. If dest is a\n"
" file, there can only be one source."
msgstr ""
-" 改åå…ƒã®è¤‡è£½ã¨ã—ã¦æ”¹åå…ˆã‚’è¿½åŠ ç™»éŒ²ã—ã€æ”¹å元を登録除外ã—ã¾ã™ã€‚\n"
-" 改åå…ˆãŒãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã®å ´åˆã€ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªå†…ã«è¤‡è£½ãŒä½œæˆã•ã‚Œã¾ã™ã€‚\n"
-" 改åå…ˆãŒãƒ•ã‚¡ã‚¤ãƒ«ã®å ´åˆã€æ”¹åå…ƒã¯1ã¤ã—ã‹æŒ‡å®šã§ãã¾ã›ã‚“。"
+" 改åå…ƒã®è¤‡è£½ã¨ã—ã¦æ”¹åå…ˆã‚’è¿½åŠ ç™»éŒ²ã—〠改å元を登録除外ã—ã¾ã™ã€‚\n"
+" 改åå…ˆãŒãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã®å ´åˆã€ ディレクトリ内ã«è¤‡è£½ãŒä½œæˆã•ã‚Œã¾ã™ã€‚\n"
+" 改åå…ˆãŒãƒ•ã‚¡ã‚¤ãƒ«ã®å ´åˆã€ 改åå…ƒã¯1ã¤ã—ã‹æŒ‡å®šã§ãã¾ã›ã‚“。"
msgid ""
" This command takes effect at the next commit. To undo a rename\n"
" before that, see :hg:`revert`."
msgstr ""
-" 本コマンドã®å®Ÿè¡Œçµæžœã¯æ¬¡å›žã®ã‚³ãƒŸãƒƒãƒˆã®éš›ã«åŠ¹æžœã‚’発æ®ã—ã¾ã™ã€‚改å\n"
+" 本コマンドã®å®Ÿè¡Œçµæžœã¯æ¬¡å›žã®ã‚³ãƒŸãƒƒãƒˆã®éš›ã«åŠ¹æžœã‚’発æ®ã—ã¾ã™ã€‚ 改å\n"
" æ“作ã®ã‚³ãƒŸãƒƒãƒˆå‰å–り消ã—㯠:hg:`help revert` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
msgid "redo merges or set/view the merge status of files"
-msgstr "マージã®å†å®Ÿæ–½ã€ãªã„ã—å„ファイルã®ãƒžãƒ¼ã‚¸çŠ¶æ³ç®¡ç†"
+msgstr "マージã®å†å®Ÿæ–½ã€ ãªã„ã—å„ファイルã®ãƒžãƒ¼ã‚¸çŠ¶æ³ç®¡ç†"
msgid ""
" Merges with unresolved conflicts are often the result of\n"
@@ -8524,23 +8751,29 @@
" working directory must have two parents)."
msgstr ""
" 未解消ã®è¡çªã®å¤šã㯠``internal:merge`` ã‚„ ``diff3`` ãªã©ã‚’使用ã—ãŸ\n"
-" éžå¯¾è©±çš„ãªãƒžãƒ¼ã‚¸ã«ç”±æ¥ã—ã¾ã™ã€‚本コマンドã¯ã€:hg:`merge` 実行後ã‹ã‚‰\n"
-" :hg:`commit` 実行ã«ã‹ã‘ã¦ã€ãƒžãƒ¼ã‚¸ã«é–¢ä¸Žã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’管ç†ã—ã¾ã™ã€‚\n"
-" (ã“ã®éš›ã«ã¯ã€ä½œæ¥é ˜åŸŸã¯ï¼’ã¤ã®è¦ªãƒªãƒ“ジョンをæŒã¤å¿…è¦ãŒã‚ã‚Šã¾ã™)"
+" éžå¯¾è©±çš„ãªãƒžãƒ¼ã‚¸ã«ç”±æ¥ã—ã¾ã™ã€‚ 本コマンドã¯ã€ :hg:`merge` 実行後ã‹ã‚‰\n"
+" :hg:`commit` 実行ã«ã‹ã‘ã¦ã€ マージã«é–¢ä¸Žã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚’管ç†ã—ã¾ã™ã€‚\n"
+" (ã“ã®éš›ã«ã¯ã€ 作æ¥é ˜åŸŸã¯ï¼’ã¤ã®è¦ªãƒªãƒ“ジョンをæŒã¤å¿…è¦ãŒã‚ã‚Šã¾ã™)"
msgid " The resolve command can be used in the following ways:"
-msgstr " 本コマンドã¯ã€ä»¥ä¸‹ã®å½¢å¼ã§ä½¿ç”¨ã•ã‚Œã¾ã™:"
-
-msgid ""
-" - :hg:`resolve FILE...`: attempt to re-merge the specified files,\n"
-" discarding any previous merge attempts. Re-merging is not\n"
+msgstr " 本コマンドã¯ã€ 以下ã®å½¢å¼ã§ä½¿ç”¨ã•ã‚Œã¾ã™:"
+
+msgid ""
+" - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the "
+"specified\n"
+" files, discarding any previous merge attempts. Re-merging is not\n"
" performed for files already marked as resolved. Use ``--all/-a``\n"
-" to selects all unresolved files."
-msgstr ""
-" - :hg:`resolve FILE...`: 指定ファイルã®ãƒžãƒ¼ã‚¸ã‚’å†åº¦å®Ÿæ–½ã—ã¾ã™ã€‚\n"
-" ã“ã®éš›ã«ã¯ã€ç›´å‰ã¾ã§ã®å¤‰æ›´å†…容ã¯ç ´æ£„ã•ã‚Œã¾ã™ã€‚\n"
-" è¡çªè§£æ¶ˆæ¸ˆã¿ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã—ã¦ã¯ã€ãƒžãƒ¼ã‚¸ã®å®Ÿæ–½ã¯ã‚ã‚Šã¾ã›ã‚“。\n"
-" å…¨ã¦ã®æœªè§£æ¶ˆãƒ•ã‚¡ã‚¤ãƒ«ã«é©ç”¨ã™ã‚‹å ´åˆã¯ ``--all/-a`` を指定ã—ã¾ã™ã€‚"
+" to selects all unresolved files. ``--tool`` can be used to specify\n"
+" the merge tool used for the given files. It overrides the HGMERGE\n"
+" environment variable and your configuration files."
+msgstr ""
+" - :hg:`resolve [--tool TOOL] FILE...`: 指定ファイルã®ãƒžãƒ¼ã‚¸ã‚’\n"
+" å†åº¦å®Ÿæ–½ã—ã¾ã™ã€‚ ã“ã®éš›ã«ã¯ã€ ç›´å‰ã¾ã§ã®å¤‰æ›´å†…容ã¯ç ´æ£„ã•ã‚Œã¾ã™ã€‚\n"
+" è¡çªè§£æ¶ˆæ¸ˆã¿ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã—ã¦ã¯ã€ マージã®å®Ÿæ–½ã¯ã‚ã‚Šã¾ã›ã‚“。\n"
+" å…¨ã¦ã®æœªè§£æ¶ˆãƒ•ã‚¡ã‚¤ãƒ«ã«é©ç”¨ã™ã‚‹å ´åˆã¯ ``--all/-a`` を指定ã—ã¾ã™ã€‚\n"
+" ``--tool`` を使用ã™ã‚‹ã“ã¨ã§ã€ ファイルã®ãƒžãƒ¼ã‚¸ã«ä½¿ç”¨ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã‚’\n"
+" 指定å¯èƒ½ã§ã™ã€‚ ã“ã®ã‚ªãƒ—ションã«ã‚ˆã‚‹æŒ‡å®šã¯ã€ HGMERGE 環境変数や\n"
+" è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚ˆã‚‹æŒ‡å®šã‚’上書ãã—ã¾ã™ã€‚"
msgid ""
" - :hg:`resolve -m [FILE]`: mark a file as having been resolved\n"
@@ -8548,7 +8781,7 @@
" to mark all unresolved files."
msgstr ""
" - :hg:`resolve -m [FILE]`: 指定ファイルをè¡çªè§£æ¶ˆæ¸ˆã¿ã¨ã¿ãªã—ã¾ã™\n"
-" (例: 手動ã§ã®ä¿®æ£å¾Œã«å®Ÿæ–½)。特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€å…¨ã¦ã®æœªè§£æ¶ˆ\n"
+" (例: 手動ã§ã®ä¿®æ£å¾Œã«å®Ÿæ–½)。 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€ å…¨ã¦ã®æœªè§£æ¶ˆ\n"
" ファイルを解消済ã¿ã¨ã¿ãªã—ã¾ã™ã€‚"
msgid ""
@@ -8556,14 +8789,14 @@
" default is to mark all resolved files."
msgstr ""
" - :hg:`resolve -u [FILE]...`: 指定ファイルをè¡çªæœªè§£æ¶ˆã¨ã¿ãªã—ã¾ã™ã€‚\n"
-" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€å…¨ã¦ã®è§£æ¶ˆæ¸ˆã¿ãƒ•ã‚¡ã‚¤ãƒ«ã‚’未解消ã¨ã¿ãªã—ã¾ã™ã€‚"
+" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€ å…¨ã¦ã®è§£æ¶ˆæ¸ˆã¿ãƒ•ã‚¡ã‚¤ãƒ«ã‚’未解消ã¨ã¿ãªã—ã¾ã™ã€‚"
msgid ""
" - :hg:`resolve -l`: list files which had or still have conflicts.\n"
" In the printed list, ``U`` = unresolved and ``R`` = resolved."
msgstr ""
" - :hg:`resolve -l`: è¡çªãŒæ¤œå‡ºã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã®è§£æ¶ˆçŠ¶æ³ã‚’表示ã—ã¾ã™ã€‚\n"
-" 一覧表示ã«ãŠã„㦠`U`` ã¯æœªè§£æ¶ˆ(Unresolved)ã‚’ã€\n"
+" 一覧表示ã«ãŠã„㦠`U`` ã¯æœªè§£æ¶ˆ(Unresolved)を〠\n"
" ``R`` ã¯è§£æ¶ˆæ¸ˆã¿(Resolved)ã‚’æ„味ã—ã¾ã™ã€‚"
msgid ""
@@ -8572,14 +8805,14 @@
" commit after a conflicting merge."
msgstr ""
" è¡çªæœªè§£æ¶ˆã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚‹é–“ã¯ã‚³ãƒŸãƒƒãƒˆã§ãã¾ã›ã‚“。\n"
-" マージã«ãŠã‘ã‚‹è¡çªè§£æ¶ˆã®éš›ã«ã¯ã€ã‚³ãƒŸãƒƒãƒˆå‰ã« \n"
+" マージã«ãŠã‘ã‚‹è¡çªè§£æ¶ˆã®éš›ã«ã¯ã€ コミットå‰ã« \n"
" :hg:`resolve -m ...` を実施ã—ã¦ãã ã•ã„。"
msgid ""
" Returns 0 on success, 1 if any files fail a resolve attempt.\n"
" "
msgstr ""
-" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0ã€è¡çªè§£æ¶ˆå¤±æ•—ãŒã‚ã‚‹å ´åˆã¯ 1 ã§ã™ã€‚\n"
+" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0〠è¡çªè§£æ¶ˆå¤±æ•—ãŒã‚ã‚‹å ´åˆã¯ 1 ã§ã™ã€‚\n"
" "
msgid "too many options specified"
@@ -8589,25 +8822,27 @@
msgstr "--all ã¨ãƒ‘ターンã¯åŒæ™‚ã«æŒ‡å®šå‡ºæ¥ã¾ã›ã‚“"
msgid "no files or directories specified; use --all to remerge all files"
-msgstr "å†ãƒžãƒ¼ã‚¸ã«ã¯ã€ãƒ•ã‚¡ã‚¤ãƒ«ï¼ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‹ã€--all を指定ã—ã¦ãã ã•ã„"
+msgstr "å†ãƒžãƒ¼ã‚¸ã«ã¯ã€ ファイルï¼ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‹ã€ --all を指定ã—ã¦ãã ã•ã„"
msgid "restore individual files or directories to an earlier state"
msgstr "ファイルï¼ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªçŠ¶æ…‹ã®å¾©æ—§"
msgid ""
-" NOTE: This command is most likely not what you are looking for. revert\n"
-" will partially overwrite content in the working directory without "
-"changing\n"
-" the working directory parents. Use :hg:`update -r rev` to check out "
-"earlier\n"
-" revisions, or :hg:`update --clean .` to undo a merge which has added\n"
-" another parent."
-msgstr ""
-" 備考: 本コマンドã¯ã€ã‚ãªãŸã®æœŸå¾…ã™ã‚‹ã‚‚ã®ã¨é•ã†å¯èƒ½æ€§ãŒé«˜ã„ã§ã™ã€‚\n"
-" 本コマンドã¯ã€ä½œæ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã¯ãã®ã¾ã¾ã§ã€ä½œæ¥é ˜åŸŸã®ä¸€éƒ¨ã‚’\n"
-" 上書ãã—ã¾ã™ã€‚作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンを変更ã™ã‚‹å ´åˆã¯\n"
-" :hg:`update -r rev` ã‚’ã€ä»–ã®ãƒªãƒ“ジョンã¨ã®ãƒžãƒ¼ã‚¸ã‚’å–り消ã™å ´åˆã¯\n"
-" :hg:`update --clean .` を使用ã—ã¦ãã ã•ã„。"
+" .. note::\n"
+" This command is most likely not what you are looking for.\n"
+" Revert will partially overwrite content in the working\n"
+" directory without changing the working directory parents. Use\n"
+" :hg:`update -r rev` to check out earlier revisions, or\n"
+" :hg:`update --clean .` to undo a merge which has added another\n"
+" parent."
+msgstr ""
+" .. note::\n"
+" 本コマンドã¯ã€ ã‚ãªãŸã®æœŸå¾…ã™ã‚‹ã‚‚ã®ã¨é•ã†å¯èƒ½æ€§ãŒé«˜ã„ã§ã™ã€‚\n"
+" 本コマンドã¯ã€ 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã¯ãã®ã¾ã¾ã§ã€ 作æ¥é ˜åŸŸã®\n"
+" 一部を上書ãã—ã¾ã™ã€‚\n"
+" 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンを変更ã™ã‚‹å ´åˆã¯ :hg:`update -r rev` を〠\n"
+" ä»–ã®ãƒªãƒ“ジョンã¨ã®ãƒžãƒ¼ã‚¸ã‚’å–り消ã™å ´åˆã¯\n"
+" :hg:`update --clean .` を使用ã—ã¦ãã ã•ã„。"
msgid ""
" With no revision specified, revert the named files or directories\n"
@@ -8617,10 +8852,10 @@
" working directory has two parents, you must explicitly specify a\n"
" revision."
msgstr ""
-" リビジョン指定ãŒç„¡ã„å ´åˆã€æŒ‡å®šã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ï¼ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’作æ¥\n"
-" é ˜åŸŸã®è¦ªãƒªãƒ“ジョン時点ã®å†…容ã¸ã¨å¾©æ—§ã—ã¾ã™ã€‚本コマンドã¯å¯¾è±¡\n"
-" ファイルã«å¯¾ã—ã¦ã€çŠ¶æ…‹ã‚’「改変無ã—ã€ã¨ã—ã€add/remove/copy/rename\n"
-" 実行ã®åŠ¹æžœã‚’打ã¡æ¶ˆã—ã¾ã™ã€‚作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンãŒ2ã¤ã‚ã‚‹å ´åˆã¯ã€\n"
+" リビジョン指定ãŒç„¡ã„å ´åˆã€ 指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ï¼ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’作æ¥\n"
+" é ˜åŸŸã®è¦ªãƒªãƒ“ジョン時点ã®å†…容ã¸ã¨å¾©æ—§ã—ã¾ã™ã€‚ 本コマンドã¯å¯¾è±¡\n"
+" ファイルã«å¯¾ã—ã¦ã€ 状態を「改変無ã—ã€ã¨ã—〠add/remove/copy/rename\n"
+" 実行ã®åŠ¹æžœã‚’打ã¡æ¶ˆã—ã¾ã™ã€‚ 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンãŒ2ã¤ã‚ã‚‹å ´åˆã¯ã€ \n"
" ã©ã¡ã‚‰ã®å†…容ã§å¾©æ—§ã™ã‚‹ã®ã‹ã‚’明示的ã«æŒ‡å®šã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
msgid ""
@@ -8629,9 +8864,9 @@
" to \"roll back\" some or all of an earlier change. See :hg:`help\n"
" dates` for a list of formats valid for -d/--date."
msgstr ""
-" -r/--rev ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€æŒ‡å®šã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ï¼ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’ã€\n"
-" 指定ã•ã‚ŒãŸãƒªãƒ“ジョン時点ã®å†…容ã¸ã¨å¾©æ—§ã—ã¾ã™ã€‚以å‰ã®å¤‰æ›´å†…容ã®ä¸€éƒ¨\n"
-" ãªã„ã—全部をå–り消ã™ç”¨é€”ã«ã‚‚使用ã§ãã¾ã™ã€‚-d/--date ã§ã®æ—¥æ™‚表記ã¯\n"
+" -r/--rev ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ï¼ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’〠\n"
+" 指定ã•ã‚ŒãŸãƒªãƒ“ジョン時点ã®å†…容ã¸ã¨å¾©æ—§ã—ã¾ã™ã€‚ 以å‰ã®å¤‰æ›´å†…容ã®ä¸€éƒ¨\n"
+" ãªã„ã—全部をå–り消ã™ç”¨é€”ã«ã‚‚使用ã§ãã¾ã™ã€‚ -d/--date ã§ã®æ—¥æ™‚表記ã¯\n"
" :hg:`help dates` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。"
msgid ""
@@ -8641,38 +8876,38 @@
" directory, the reverted files will thus appear modified\n"
" afterwards."
msgstr ""
-" 本コマンドã¯ä½œæ¥é ˜åŸŸã®å†…容ã¯å¤‰æ›´ã—ã¾ã™ãŒã€å¤‰æ›´ã®ã‚³ãƒŸãƒƒãƒˆã‚„ã€ä½œæ¥\n"
-" é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã¯å¤‰æ›´ã—ã¾ã›ã‚“。ãã®ãŸã‚ã€ä½œæ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョン\n"
-" 以外ã®ãƒªãƒ“ジョンを指定ã—ã¦å¾©æ—§ã—ãŸå ´åˆã€å¾©æ—§å¾Œã®ãƒ•ã‚¡ã‚¤ãƒ«ã®çŠ¶æ…‹ã¯\n"
+" 本コマンドã¯ä½œæ¥é ˜åŸŸã®å†…容ã¯å¤‰æ›´ã—ã¾ã™ãŒã€ 変更ã®ã‚³ãƒŸãƒƒãƒˆã‚„〠作æ¥\n"
+" é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã¯å¤‰æ›´ã—ã¾ã›ã‚“。 ãã®ãŸã‚〠作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョン\n"
+" 以外ã®ãƒªãƒ“ジョンを指定ã—ã¦å¾©æ—§ã—ãŸå ´åˆã€ 復旧後ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®çŠ¶æ…‹ã¯\n"
" 「改変有りã€ã¨ã—ã¦æ‰±ã‚ã‚Œã¾ã™ã€‚"
msgid ""
" If a file has been deleted, it is restored. If the executable mode\n"
" of a file was changed, it is reset."
msgstr ""
-" ファイルãŒå‰Šé™¤ã•ã‚Œã¦ã„ãŸå ´åˆã€ãƒ•ã‚¡ã‚¤ãƒ«ã¯å¾©æ—§ã•ã‚Œã¾ã™ã€‚実行権é™ãŒå¤‰æ›´\n"
-" ã•ã‚Œã¦ã„ãŸå ´åˆã€å¤‰æ›´å‰ã®çŠ¶æ…‹ã«å¾©æ—§ã•ã‚Œã¾ã™ã€‚"
+" ファイルãŒå‰Šé™¤ã•ã‚Œã¦ã„ãŸå ´åˆã€ ファイルã¯å¾©æ—§ã•ã‚Œã¾ã™ã€‚ 実行権é™ãŒå¤‰æ›´\n"
+" ã•ã‚Œã¦ã„ãŸå ´åˆã€ 変更å‰ã®çŠ¶æ…‹ã«å¾©æ—§ã•ã‚Œã¾ã™ã€‚"
msgid ""
" If names are given, all files matching the names are reverted.\n"
" If no arguments are given, no files are reverted."
msgstr ""
-" 復旧対象ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€æŒ‡å®šã•ã‚ŒãŸåå‰ã«åˆè‡´ã™ã‚‹å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒ\n"
-" 復旧対象ã¨ãªã‚Šã¾ã™ã€‚復旧対象ãŒæŒ‡å®šã•ã‚Œãªã‹ã£ãŸå ´åˆã¯ã€ã„ãšã‚Œã®\n"
+" 復旧対象ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 指定ã•ã‚ŒãŸåå‰ã«åˆè‡´ã™ã‚‹å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒ\n"
+" 復旧対象ã¨ãªã‚Šã¾ã™ã€‚ 復旧対象ãŒæŒ‡å®šã•ã‚Œãªã‹ã£ãŸå ´åˆã¯ã€ ã„ãšã‚Œã®\n"
" ファイルも復旧ã•ã‚Œã¾ã›ã‚“。"
msgid ""
" Modified files are saved with a .orig suffix before reverting.\n"
" To disable these backups, use --no-backup."
msgstr ""
-" 改変ファイルã®å¾©æ—§ã®éš›ã«ã¯ã€å¾©æ—§å‰ã®å†…容㌠.orig æ‹¡å¼µåを付ã‘ãŸ\n"
-" ファイルã«ä¿å˜ã•ã‚Œã¾ã™ã€‚ã“ã®ä¿å˜ã¯ --no-backup ã§ç„¡åŠ¹åŒ–ã•ã‚Œã¾ã™ã€‚"
+" 改変ファイルã®å¾©æ—§ã®éš›ã«ã¯ã€ 復旧å‰ã®å†…容㌠.orig æ‹¡å¼µåを付ã‘ãŸ\n"
+" ファイルã«ä¿å˜ã•ã‚Œã¾ã™ã€‚ ã“ã®ä¿å˜ã¯ --no-backup ã§ç„¡åŠ¹åŒ–ã•ã‚Œã¾ã™ã€‚"
msgid "you can't specify a revision and a date"
msgstr "リビジョンã¨æ—¥æ™‚ã¯åŒæ™‚ã«ã¯æŒ‡å®šå‡ºæ¥ã¾ã›ã‚“"
msgid "no files or directories specified; use --all to revert the whole repo"
-msgstr "復旧ã«ã¯ã€ãƒ•ã‚¡ã‚¤ãƒ«ï¼ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‹ã€--all を指定ã—ã¦ãã ã•ã„"
+msgstr "復旧ã«ã¯ã€ ファイルï¼ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‹ã€ --all を指定ã—ã¦ãã ã•ã„"
#, python-format
msgid "forgetting %s\n"
@@ -8708,10 +8943,10 @@
" any dirstate changes since that time. This command does not alter\n"
" the working directory."
msgstr ""
-" 本コマンドã®ä½¿ç”¨ã«ã¯æ³¨æ„ãŒå¿…è¦ã§ã™ã€‚å·»ã戻ã—ã¯ï¼‘段階é™ã‚Šã§ã€å·»ã\n"
-" 戻ã—ãŸãƒˆãƒ©ãƒ³ã‚¶ã‚¯ã‚·ãƒ§ãƒ³ã®å†å®Ÿæ–½ã¯ã§ãã¾ã›ã‚“。本コマンドã¯ã€ç›´å‰ã®\n"
-" トランザクション実施時点㮠dirstate を復元ã—ã€ãã®æ™‚点以後ã®å¤‰æ›´ã¯\n"
-" å…¨ã¦å¤±ã‚ã‚Œã¾ã™ã€‚但ã—ã€ä½œæ¥é ˜åŸŸå†…容ã¯å¤‰æ›´ã•ã‚Œã¾ã›ã‚“。"
+" 本コマンドã®ä½¿ç”¨ã«ã¯æ³¨æ„ãŒå¿…è¦ã§ã™ã€‚ å·»ã戻ã—ã¯ï¼‘段階é™ã‚Šã§ã€ å·»ã\n"
+" 戻ã—ãŸãƒˆãƒ©ãƒ³ã‚¶ã‚¯ã‚·ãƒ§ãƒ³ã®å†å®Ÿæ–½ã¯ã§ãã¾ã›ã‚“。 本コマンドã¯ã€ ç›´å‰ã®\n"
+" トランザクション実施時点㮠dirstate を復元ã—〠ãã®æ™‚点以後ã®å¤‰æ›´ã¯\n"
+" å…¨ã¦å¤±ã‚ã‚Œã¾ã™ã€‚ 但ã—〠作æ¥é ˜åŸŸå†…容ã¯å¤‰æ›´ã•ã‚Œã¾ã›ã‚“。"
msgid ""
" Transactions are used to encapsulate the effects of all commands\n"
@@ -8719,9 +8954,9 @@
" repository. For example, the following commands are transactional,\n"
" and their effects can be rolled back:"
msgstr ""
-" トランザクションã¨ã¯ã€æ–°è¦ãƒªãƒ“ジョンã®ä½œæˆã€ãªã„ã—外部ã‹ã‚‰ã®æ—¢å˜\n"
+" トランザクションã¨ã¯ã€ æ–°è¦ãƒªãƒ“ジョンã®ä½œæˆã€ ãªã„ã—外部ã‹ã‚‰ã®æ—¢å˜\n"
" リビジョンã®å–ã‚Šè¾¼ã¿ã«ãŠã‘るコマンドã®æ”¹å¤‰æ“作を一括化ã™ã‚‹ã‚‚ã®ã§ã™ã€‚\n"
-" 例ãˆã°ã€ä»¥ä¸‹ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ã„ãšã‚Œã‚‚トランザクションを形æˆã™ã‚‹ã‚‚ã®ã§ã€\n"
+" 例ãˆã°ã€ 以下ã®ã‚³ãƒžãƒ³ãƒ‰ã¯ã„ãšã‚Œã‚‚トランザクションを形æˆã™ã‚‹ã‚‚ã®ã§ã€ \n"
" ãã®åŠ¹æžœã¯æœ¬ã‚³ãƒžãƒ³ãƒ‰ã«ã‚ˆã‚Šå·»ã戻ã—å¯èƒ½ã§ã™:"
msgid ""
@@ -8734,7 +8969,7 @@
" - commit\n"
" - import\n"
" - pull\n"
-" - push (ç¾ãƒªãƒã‚¸ãƒˆãƒªãŒã€åæ˜ å¯¾è±¡ã¨ã—ã¦æŒ‡å®šã•ã‚ŒãŸå ´åˆ)\n"
+" - push (ç¾ãƒªãƒã‚¸ãƒˆãƒªãŒã€ åæ˜ å¯¾è±¡ã¨ã—ã¦æŒ‡å®šã•ã‚ŒãŸå ´åˆ)\n"
" - unbundle"
msgid ""
@@ -8745,18 +8980,18 @@
" repository; for example an in-progress pull from the repository\n"
" may fail if a rollback is performed."
msgstr ""
-" 本コマンドã¯ã€å…¬é–‹ãƒªãƒã‚¸ãƒˆãƒªã§ã®å®Ÿè¡Œã‚’想定ã—ã¦ã„ã¾ã›ã‚“。一旦他ã®\n"
-" ユーザã‹ã‚‰ :hg:`pull` å¯èƒ½ãªçŠ¶æ…‹ã«ãªã£ã¦ã—ã¾ã£ãŸãªã‚‰ã€å…¬é–‹ãƒªãƒã‚¸ãƒˆãƒª\n"
+" 本コマンドã¯ã€ 公開リãƒã‚¸ãƒˆãƒªã§ã®å®Ÿè¡Œã‚’想定ã—ã¦ã„ã¾ã›ã‚“。 一旦他ã®\n"
+" ユーザã‹ã‚‰ :hg:`pull` å¯èƒ½ãªçŠ¶æ…‹ã«ãªã£ã¦ã—ã¾ã£ãŸãªã‚‰ã€ 公開リãƒã‚¸ãƒˆãƒª\n"
" ã§ãƒˆãƒ©ãƒ³ã‚¶ã‚¯ã‚·ãƒ§ãƒ³ã‚’å·»ã戻ã—ã¦ã‚‚(æ—¢ã«ä»–ã®ãƒ¦ãƒ¼ã‚¶ãŒè¤‡è£½ã—ã¦ã„ã‚‹å¯èƒ½æ€§\n"
-" ãŒã‚ã‚‹ã®ã§)効果をæŒã¡ã¾ã›ã‚“。ãã®ä¸Šã€ãƒªãƒã‚¸ãƒˆãƒªã‹ã‚‰ã®æƒ…å ±èªã¿å–ã‚Šã«\n"
-" éš›ã—ã¦ã€ç«¶åˆãŒç™ºç”Ÿã—å¾—ã¾ã™ã€‚例ãˆã°ã€ä½µèµ°ã—ã¦ã„ã‚‹ :hg:`pull` 処ç†ãŒ\n"
+" ãŒã‚ã‚‹ã®ã§)効果をæŒã¡ã¾ã›ã‚“。 ãã®ä¸Šã€ リãƒã‚¸ãƒˆãƒªã‹ã‚‰ã®æƒ…å ±èªã¿å–ã‚Šã«\n"
+" éš›ã—ã¦ã€ 競åˆãŒç™ºç”Ÿã—å¾—ã¾ã™ã€‚ 例ãˆã°ã€ 併走ã—ã¦ã„ã‚‹ :hg:`pull` 処ç†ãŒ\n"
" å·»ã戻ã—ã«ã‚ˆã£ã¦å¤±æ•—ã—ã¦ã—ã¾ã†å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚"
msgid ""
" Returns 0 on success, 1 if no rollback data is available.\n"
" "
msgstr ""
-" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0ã€å·»ã戻ã›ã‚‹ãƒ‡ãƒ¼ã‚¿ãŒç„¡ã„å ´åˆã¯ 1 ã§ã™ã€‚\n"
+" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0〠巻ã戻ã›ã‚‹ãƒ‡ãƒ¼ã‚¿ãŒç„¡ã„å ´åˆã¯ 1 ã§ã™ã€‚\n"
" "
msgid "print the root (top) of the current working directory"
@@ -8775,8 +9010,8 @@
" longer periods of time."
msgstr ""
" リãƒã‚¸ãƒˆãƒªå‚照㨠:hg:`pull` ã®ãŸã‚ã® HTTP サーãƒã‚’èµ·å‹•ã—ã¾ã™ã€‚\n"
-" ã“ã® HTTP サーãƒã‚’用ã„ã‚‹ã“ã¨ã§ã€å³å¸ã§ãƒªãƒã‚¸ãƒˆãƒªã®å…±æœ‰ï¼å‚照を\n"
-" è¡Œã†ã“ã¨ãŒã§ãã¾ã™ã€‚リãƒã‚¸ãƒˆãƒªã‚’長期間公開ã™ã‚‹éš›ã«ã¯ã€é€šå¸¸ã®ã‚¦ã‚§ãƒ–\n"
+" ã“ã® HTTP サーãƒã‚’用ã„ã‚‹ã“ã¨ã§ã€ å³å¸ã§ãƒªãƒã‚¸ãƒˆãƒªã®å…±æœ‰ï¼å‚照を\n"
+" è¡Œã†ã“ã¨ãŒã§ãã¾ã™ã€‚ リãƒã‚¸ãƒˆãƒªã‚’長期間公開ã™ã‚‹éš›ã«ã¯ã€ 通常ã®ã‚¦ã‚§ãƒ–\n"
" サーãƒã®ä½¿ç”¨ã‚’ãŠå‹§ã‚ã—ã¾ã™ã€‚"
msgid ""
@@ -8786,19 +9021,19 @@
" option to ``*`` to allow everybody to push to the server. You\n"
" should use a real web server if you need to authenticate users."
msgstr ""
-" 本コマンドã§èµ·å‹•ã•ã‚Œã‚‹ã‚µãƒ¼ãƒã¯ã€ã‚¢ã‚¯ã‚»ã‚¹åˆ¶å¾¡ãŒå®Ÿè£…ã•ã‚Œã¦ã„ã¾ã›ã‚“。\n"
-" 特ã«è¨å®šãŒç„¡ã„å ´åˆã€èª°ã‚‚ãŒãƒªãƒã‚¸ãƒˆãƒªã‚’å‚ç…§å¯èƒ½ã§ã€ä¸”ã¤ãƒªãƒã‚¸ãƒˆãƒªã¯\n"
-" 誰ã«ã‚‚æ›´æ–°ã§ããªã„状態ã«ã‚ã‚Šã¾ã™ã€‚``web.allow_push`` è¨å®šã‚’ ``*``\n"
-" ã«è¨å®šã™ã‚‹ã“ã¨ã§ã€èª°ã‚‚ãŒãƒªãƒã‚¸ãƒˆãƒªã« :hg:`push` ã§ãã¾ã™ã€‚\n"
-" ユーザèªè¨¼ãŒå¿…è¦ãªå ´åˆã¯ã€é€šå¸¸ã®ã‚¦ã‚§ãƒ–サーãƒã‚’使用ã—ã¦ãã ã•ã„。"
+" 本コマンドã§èµ·å‹•ã•ã‚Œã‚‹ã‚µãƒ¼ãƒã¯ã€ アクセス制御ãŒå®Ÿè£…ã•ã‚Œã¦ã„ã¾ã›ã‚“。\n"
+" 特ã«è¨å®šãŒç„¡ã„å ´åˆã€ 誰もãŒãƒªãƒã‚¸ãƒˆãƒªã‚’å‚ç…§å¯èƒ½ã§ã€ 且ã¤ãƒªãƒã‚¸ãƒˆãƒªã¯\n"
+" 誰ã«ã‚‚æ›´æ–°ã§ããªã„状態ã«ã‚ã‚Šã¾ã™ã€‚ ``web.allow_push`` è¨å®šã‚’ ``*``\n"
+" ã«è¨å®šã™ã‚‹ã“ã¨ã§ã€ 誰もãŒãƒªãƒã‚¸ãƒˆãƒªã« :hg:`push` ã§ãã¾ã™ã€‚\n"
+" ユーザèªè¨¼ãŒå¿…è¦ãªå ´åˆã¯ã€ 通常ã®ã‚¦ã‚§ãƒ–サーãƒã‚’使用ã—ã¦ãã ã•ã„。"
msgid ""
" By default, the server logs accesses to stdout and errors to\n"
" stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
" files."
msgstr ""
-" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€ã‚µãƒ¼ãƒã¯ã‚¢ã‚¯ã‚»ã‚¹ãƒã‚°ã‚’標準出力ã«ã€ã‚¨ãƒ©ãƒ¼ã‚’\n"
-" 標準エラー出力ã«è¡¨ç¤ºã—ã¾ã™ã€‚ãƒã‚°ã‚’ファイルã«è¨˜éŒ²ã™ã‚‹å ´åˆã¯ã€\n"
+" 特ã«æŒ‡å®šãŒç„¡ã„å ´åˆã€ サーãƒã¯ã‚¢ã‚¯ã‚»ã‚¹ãƒã‚°ã‚’標準出力ã«ã€ エラーを\n"
+" 標準エラー出力ã«è¡¨ç¤ºã—ã¾ã™ã€‚ ãƒã‚°ã‚’ファイルã«è¨˜éŒ²ã™ã‚‹å ´åˆã¯ã€ \n"
" -A/--accesslog ã‚„ -E/--errorlog ã§æŒ‡å®šã—ã¾ã™ã€‚"
msgid ""
@@ -8806,8 +9041,8 @@
" a port number of 0; in this case, the server will print the port\n"
" number it uses."
msgstr ""
-" サーãƒã«ç©ºããƒãƒ¼ãƒˆç•ªå·ã®æ¤œå‡ºãŠã‚ˆã³ä½¿ç”¨ã‚’ã•ã›ã‚‹å ´åˆã€ãƒãƒ¼ãƒˆç•ªå·ã«ã¯\n"
-" 0 を指定ã—ã¾ã™ã€‚ã“ã®å ´åˆã€ä½¿ç”¨ã™ã‚‹ãƒãƒ¼ãƒˆç•ªå·ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚"
+" サーãƒã«ç©ºããƒãƒ¼ãƒˆç•ªå·ã®æ¤œå‡ºãŠã‚ˆã³ä½¿ç”¨ã‚’ã•ã›ã‚‹å ´åˆã€ ãƒãƒ¼ãƒˆç•ªå·ã«ã¯\n"
+" 0 を指定ã—ã¾ã™ã€‚ ã“ã®å ´åˆã€ 使用ã™ã‚‹ãƒãƒ¼ãƒˆç•ªå·ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚"
msgid "There is no Mercurial repository here (.hg not found)"
msgstr "Mercurial リãƒã‚¸ãƒˆãƒªãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“(.hg ãŒä¸åœ¨ã§ã™)"
@@ -8827,31 +9062,34 @@
" Unless options described with \"show only ...\" are given, the\n"
" options -mardu are used."
msgstr ""
-" 作æ¥é ˜åŸŸã®ãƒ•ã‚¡ã‚¤ãƒ«çŠ¶æ…‹ã‚’表示ã—ã¾ã™ã€‚åå‰(パターン)指定ã®ã‚ã‚‹å ´åˆã€\n"
-" ãã®åå‰ã«åˆè‡´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã®ã¿ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚変更無ã—(clean)ã€\n"
-" 無視(ignored)ãªã„ã—複製(copy)・改å(rename)ã®å…ƒãƒ•ã‚¡ã‚¤ãƒ«ã«é–¢ã—ã¦ã¯ã€\n"
-" ãã‚Œãžã‚Œ -c/--cleanã€-i/--ignored ãªã„ã— -C/--copy ãŒæŒ‡å®šã•ã‚Œã‚‹ã‹ã€\n"
+" 作æ¥é ˜åŸŸã®ãƒ•ã‚¡ã‚¤ãƒ«çŠ¶æ…‹ã‚’表示ã—ã¾ã™ã€‚ åå‰(パターン)指定ã®ã‚ã‚‹å ´åˆã€ \n"
+" ãã®åå‰ã«åˆè‡´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã®ã¿ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ 変更無ã—(clean)〠\n"
+" 無視(ignored)ãªã„ã—複製(copy)・改å(rename)ã®å…ƒãƒ•ã‚¡ã‚¤ãƒ«ã«é–¢ã—ã¦ã¯ã€ \n"
+" ãã‚Œãžã‚Œ -c/--clean〠-i/--ignored ãªã„ã— -C/--copy ãŒæŒ‡å®šã•ã‚Œã‚‹ã‹ã€ \n"
" ã‚ã‚‹ã„㯠-A/--all ãŒæŒ‡å®šã•ã‚Œãªã„é™ã‚Šè¡¨ç¤ºã•ã‚Œã¾ã›ã‚“。\n"
-" ã„ãšã‚Œã®è¡¨ç¤ºå¯¾è±¡é¸æŠžã‚ªãƒ—ションも指定ã•ã‚Œãªã„å ´åˆã€\n"
+" ã„ãšã‚Œã®è¡¨ç¤ºå¯¾è±¡é¸æŠžã‚ªãƒ—ションも指定ã•ã‚Œãªã„å ´åˆã€ \n"
" -m -a -r -d -u ãŒæŒ‡å®šã•ã‚ŒãŸã‚‚ã®ã¨ã¿ãªã—ã¾ã™ã€‚"
msgid ""
" Option -q/--quiet hides untracked (unknown and ignored) files\n"
" unless explicitly requested with -u/--unknown or -i/--ignored."
msgstr ""
-" -q/--quiet 指定ãŒã‚ã‚‹å ´åˆã€-u/--unknown ãªã„ã— -i/--ignored ãŒæ˜Žç¤º\n"
-" çš„ã«æŒ‡å®šã•ã‚Œãªã„é™ã‚Šã€æ§‹æˆç®¡ç†å¯¾è±¡å¤–ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯è¡¨ç¤ºã•ã‚Œã¾ã›ã‚“。"
-
-msgid ""
-" NOTE: status may appear to disagree with diff if permissions have\n"
-" changed or a merge has occurred. The standard diff format does not\n"
-" report permission changes and diff only reports changes relative\n"
-" to one merge parent."
-msgstr ""
-" 備考: 権é™è¨å®šã®å¤‰æ›´ã‚„マージãŒè¡Œã‚ã‚ŒãŸå ´åˆã€å·®åˆ†è¡¨ç¤ºã‹ã‚‰æœŸå¾…ã•ã‚Œã‚‹\n"
-" çµæžœã¨ã¯ç•°ãªã‚‹çŠ¶æ…‹ãŒè¡¨ç¤ºã•ã‚Œã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚標準的ãªå·®åˆ†å½¢å¼ã¯\n"
-" 権é™å¤‰æ›´ã®æƒ…å ±ã‚’å«ã¿ã¾ã›ã‚“ã—ã€ãƒžãƒ¼ã‚¸ã®éš›ã«ã¯ä¸€æ–¹ã®è¦ªãƒªãƒ“ジョンã¨ã®\n"
-" 差分ã—ã‹è¡¨ç¤ºã—ã¾ã›ã‚“。"
+" -q/--quiet 指定ãŒã‚ã‚‹å ´åˆã€ -u/--unknown ãªã„ã— -i/--ignored ãŒæ˜Žç¤º\n"
+" çš„ã«æŒ‡å®šã•ã‚Œãªã„é™ã‚Šã€ 構æˆç®¡ç†å¯¾è±¡å¤–ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯è¡¨ç¤ºã•ã‚Œã¾ã›ã‚“。"
+
+msgid ""
+" .. note::\n"
+" status may appear to disagree with diff if permissions have\n"
+" changed or a merge has occurred. The standard diff format does\n"
+" not report permission changes and diff only reports changes\n"
+" relative to one merge parent."
+msgstr ""
+" .. note::\n"
+" 権é™è¨å®šã®å¤‰æ›´ã‚„マージãŒè¡Œã‚ã‚ŒãŸå ´åˆã€ 差分表示ã‹ã‚‰æœŸå¾…ã•ã‚Œã‚‹\n"
+" çµæžœã¨ã¯ç•°ãªã‚‹çŠ¶æ…‹ãŒè¡¨ç¤ºã•ã‚Œã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚\n"
+" 標準的ãªå·®åˆ†å½¢å¼ã¯æ¨©é™å¤‰æ›´ã®æƒ…å ±ã‚’å«ã¿ã¾ã›ã‚“ã—〠\n"
+" マージ実施リビジョンã«å¯¾ã—ã¦ã¯ã€ 一方ã®è¦ªãƒªãƒ“ジョンã¨ã®å·®åˆ†\n"
+" ã—ã‹è¡¨ç¤ºã—ãªã„ãŸã‚ã§ã™ã€‚"
msgid ""
" If one revision is given, it is used as the base revision.\n"
@@ -8859,9 +9097,9 @@
" shown. The --change option can also be used as a shortcut to list\n"
" the changed files of a revision from its first parent."
msgstr ""
-" 1ã¤ã®ãƒªãƒ“ジョンãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€æ¯”較元リビジョンã¨ã—ã¦æ‰±ã‚ã‚Œã¾ã™ã€‚\n"
-" 2ã¤ã®ãƒªãƒ“ジョンãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ä¸¡ãƒªãƒ“ジョン間ã§çŠ¶æ…‹ã‚’比較ã—ã¾ã™ã€‚\n"
-" --change 指定を使ã†ã“ã¨ã§ã€ç¬¬1親ã‹ã‚‰å¤‰æ›´ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ä¸€è¦§ã‚’ç°¡å˜ã«\n"
+" 1ã¤ã®ãƒªãƒ“ジョンãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 比較元リビジョンã¨ã—ã¦æ‰±ã‚ã‚Œã¾ã™ã€‚\n"
+" 2ã¤ã®ãƒªãƒ“ジョンãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 両リビジョン間ã§çŠ¶æ…‹ã‚’比較ã—ã¾ã™ã€‚\n"
+" --change 指定を使ã†ã“ã¨ã§ã€ 第1親ã‹ã‚‰å¤‰æ›´ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ä¸€è¦§ã‚’ç°¡å˜ã«\n"
" 表示ã•ã›ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
msgid " The codes used to show the status of files are::"
@@ -8893,15 +9131,15 @@
" This generates a brief summary of the working directory state,\n"
" including parents, branch, commit status, and available updates."
msgstr ""
-" 親リビジョンã€ãƒ–ランãƒã€æƒ³å®šã‚³ãƒŸãƒƒãƒˆçµæžœã‚„ã€ä½œæ¥é ˜åŸŸæ›´æ–°å€™è£œç‰ã‚’å«ã‚€\n"
+" 親リビジョン〠ブランãƒã€ 想定コミットçµæžœã‚„〠作æ¥é ˜åŸŸæ›´æ–°å€™è£œç‰ã‚’å«ã‚€\n"
" 作æ¥é ˜åŸŸçŠ¶æ…‹ã®æ¦‚è¦ã‚’表示ã—ã¾ã™ã€‚"
msgid ""
" With the --remote option, this will check the default paths for\n"
" incoming and outgoing changes. This can be time-consuming."
msgstr ""
-" --remote ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€default 連æºå…ˆã«å¯¾ã™ã‚‹å–ã‚Šè¾¼ã¿ï¼åæ˜ ã«\n"
-" é–¢ã™ã‚‹æ¦‚è¦ã‚‚表示ã—ã¾ã™ã€‚ã“ã®å‡¦ç†ã«ã¯æ™‚é–“ã‚’è¦ã™ã‚‹å ´åˆãŒã‚ã‚Šã¾ã™ã€‚"
+" --remote ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ default 連æºå…ˆã«å¯¾ã™ã‚‹å–ã‚Šè¾¼ã¿ï¼åæ˜ ã«\n"
+" é–¢ã™ã‚‹æ¦‚è¦ã‚‚表示ã—ã¾ã™ã€‚ ã“ã®å‡¦ç†ã«ã¯æ™‚é–“ã‚’è¦ã™ã‚‹å ´åˆãŒã‚ã‚Šã¾ã™ã€‚"
#, python-format
msgid "parent: %d:%s "
@@ -8985,7 +9223,7 @@
#, python-format
msgid "update: %d new changesets, %d branch heads (merge)\n"
-msgstr "update 候補 : %d ã®æ–°è¦ãƒªãƒ“ジョンã€%d ã®ãƒ–ランãƒãƒ˜ãƒƒãƒ‰(マージ)\n"
+msgstr "update 候補 : %d ã®æ–°è¦ãƒªãƒ“ジョン〠%d ã®ãƒ–ランãƒãƒ˜ãƒƒãƒ‰(マージ)\n"
msgid "1 or more incoming"
msgstr "1ã¤ä»¥ä¸Šã®ãƒªãƒ“ジョンã®å–ã‚Šè¾¼ã¿"
@@ -9005,22 +9243,24 @@
msgstr "ç¾ãƒªãƒ“ジョンãªã„ã—指定リビジョンã¸ã®ã‚¿ã‚°ã®ä»˜ä¸Ž"
msgid " Name a particular revision using <name>."
-msgstr " 特定ã®ãƒªãƒ“ジョンã«ã€æŒ‡å®šã•ã‚ŒãŸåå‰ã‚’付ã‘ã¾ã™ã€‚"
+msgstr " 特定ã®ãƒªãƒ“ジョンã«ã€ 指定ã•ã‚ŒãŸåå‰ã‚’付ã‘ã¾ã™ã€‚"
msgid ""
" Tags are used to name particular revisions of the repository and are\n"
" very useful to compare different revisions, to go back to significant\n"
" earlier versions or to mark branch points as releases, etc."
msgstr ""
-" リãƒã‚¸ãƒˆãƒªä¸ã®ç‰¹å®šã®ãƒªãƒ“ジョンã«ä»˜ã‘られãŸåå‰ã§ã‚ã‚‹ã‚¿ã‚°ã¯ã€ãƒªãƒ“ジョン\n"
-" é–“ã§ã®æ¯”較やã€é‡è¦ãªãƒªãƒ“ジョンã®å‚ç…§ã€åˆã¯ãƒªãƒªãƒ¼ã‚¹ã®éš›ã®åˆ†å²ç‚¹ã«å¯¾ã™ã‚‹\n"
+" リãƒã‚¸ãƒˆãƒªä¸ã®ç‰¹å®šã®ãƒªãƒ“ジョンã«ä»˜ã‘られãŸåå‰ã§ã‚ã‚‹ã‚¿ã‚°ã¯ã€ リビジョン\n"
+" é–“ã§ã®æ¯”較や〠é‡è¦ãªãƒªãƒ“ジョンã®å‚照〠åˆã¯ãƒªãƒªãƒ¼ã‚¹ã®éš›ã®åˆ†å²ç‚¹ã«å¯¾ã™"
+"ã‚‹\n"
" ç›®å°ã¨ã„ã£ãŸç”¨é€”ãªã©ã«ä½¿ç”¨ã™ã‚‹ã“ã¨ãŒå‡ºæ¥ã¾ã™ã€‚"
msgid ""
" If no revision is given, the parent of the working directory is\n"
" used, or tip if no revision is checked out."
msgstr ""
-" リビジョンãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€ä½œæ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã‹ã€ä½œæ¥é ˜åŸŸæ›´æ–°å‰\n"
+" リビジョンãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€ 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã‹ã€ 作æ¥é ˜åŸŸæ›´æ–°"
+"å‰\n"
" ãªã‚‰ tip ãŒã‚¿ã‚°ä»˜ã‘ã®å¯¾è±¡ã¨ãªã‚Šã¾ã™ã€‚"
msgid ""
@@ -9030,16 +9270,16 @@
" necessary. The file '.hg/localtags' is used for local tags (not\n"
" shared among repositories)."
msgstr ""
-" 分散構æˆç®¡ç†ã«ãŠã‘るタグ付ã‘ã®é›†ç´„を容易ã«ã™ã‚‹ãŸã‚ã«ã€æ§‹æˆç®¡ç†ä¸‹ã«ã‚ã‚‹\n"
-" ä»–ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¨åŒæ§˜ã«ã€ã‚¿ã‚°ã®æƒ…å ±ã¯ \".hgtags\" ファイルã§ç®¡ç†ã•ã‚Œã€\n"
-" å¿…è¦ã§ã‚ã‚Œã°æ‰‹å‹•ã§ã®ç·¨é›†ã‚‚å¯èƒ½ã§ã™ã€‚ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚°ã¯ '.hg/localtags' ã§\n"
+" 分散構æˆç®¡ç†ã«ãŠã‘るタグ付ã‘ã®é›†ç´„を容易ã«ã™ã‚‹ãŸã‚ã«ã€ 構æˆç®¡ç†ä¸‹ã«ã‚ã‚‹\n"
+" ä»–ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¨åŒæ§˜ã«ã€ ã‚¿ã‚°ã®æƒ…å ±ã¯ \".hgtags\" ファイルã§ç®¡ç†ã•ã‚Œã€ \n"
+" å¿…è¦ã§ã‚ã‚Œã°æ‰‹å‹•ã§ã®ç·¨é›†ã‚‚å¯èƒ½ã§ã™ã€‚ ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚°ã¯ '.hg/localtags' ã§\n"
" 管ç†ã•ã‚Œã¾ã™(リãƒã‚¸ãƒˆãƒªé–“ã§å…±æœ‰ã•ã‚Œã‚‹ã“ã¨ã¯ã‚ã‚Šã¾ã›ã‚“)"
msgid ""
" Since tag names have priority over branch names during revision\n"
" lookup, using an existing branch name as a tag name is discouraged."
msgstr ""
-" リビジョン特定ã«ãŠã„ã¦ã€ã‚¿ã‚°åã¯ãƒ–ランãƒåよりも優先度ãŒé«˜ã„ã®ã§ã€\n"
+" リビジョン特定ã«ãŠã„ã¦ã€ ã‚¿ã‚°åã¯ãƒ–ランãƒåよりも優先度ãŒé«˜ã„ã®ã§ã€ \n"
" æ—¢å˜ãƒ–ランãƒã¨åŒåã®ã‚¿ã‚°ã®ä½¿ç”¨ã¯æ¢ã‚ã¾ã—ょã†ã€‚"
msgid "tag names must be unique"
@@ -9074,8 +9314,8 @@
" This lists both regular and local tags. When the -v/--verbose\n"
" switch is used, a third column \"local\" is printed for local tags."
msgstr ""
-" 本コマンドã¯ã€é€šå¸¸ã®ã‚¿ã‚°ãŠã‚ˆã³ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚°ã®ä¸¡æ–¹ã‚’一覧表示ã—ã¾ã™ã€‚\n"
-" -v/--verbose ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚°ã«ã¯ \"local\" 表示ã®\n"
+" 本コマンドã¯ã€ 通常ã®ã‚¿ã‚°ãŠã‚ˆã³ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚°ã®ä¸¡æ–¹ã‚’一覧表示ã—ã¾ã™ã€‚\n"
+" -v/--verbose ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚°ã«ã¯ \"local\" 表示ã®\n"
" 第3ã®ã‚«ãƒ©ãƒ ãŒè¿½åŠ ã•ã‚Œã¾ã™ã€‚"
msgid "show the tip revision"
@@ -9086,8 +9326,8 @@
" most recently added to the repository (and therefore the most\n"
" recently changed head)."
msgstr ""
-" tip リビジョン(一般ã«ã¯å˜ã« tip ã¨è¡¨è¨˜)ã¨ã¯ã€ãƒªãƒã‚¸ãƒˆãƒªãŠã„ã¦æœ€ã‚‚\n"
-" æ–°ã—ãè¿½åŠ ã•ã‚ŒãŸãƒªãƒ“ジョンã§ã‚ã‚‹ã¨åŒæ™‚ã«ã€æœ€ã‚‚æ–°ã—ã変更ã•ã‚ŒãŸãƒ˜ãƒƒãƒ‰\n"
+" tip リビジョン(一般ã«ã¯å˜ã« tip ã¨è¡¨è¨˜)ã¨ã¯ã€ リãƒã‚¸ãƒˆãƒªãŠã„ã¦æœ€ã‚‚\n"
+" æ–°ã—ãè¿½åŠ ã•ã‚ŒãŸãƒªãƒ“ジョンã§ã‚ã‚‹ã¨åŒæ™‚ã«ã€ 最も新ã—ã変更ã•ã‚ŒãŸãƒ˜ãƒƒãƒ‰\n"
" ã®ã“ã¨ã§ã‚‚ã‚ã‚Šã¾ã™ã€‚"
msgid ""
@@ -9096,10 +9336,10 @@
" that repository becomes the current tip. The \"tip\" tag is special\n"
" and cannot be renamed or assigned to a different changeset."
msgstr ""
-" コミットã—ãŸç›´å¾Œã§ã‚ã‚Œã°ã€ç”Ÿæˆã•ã‚ŒãŸãƒªãƒ“ジョン㌠tip ã¨ãªã‚Šã¾ã™ã€‚\n"
-" ä»–ã®ãƒªãƒã‚¸ãƒˆãƒªã‹ã‚‰å¤‰æ›´å±¥æ´ã®å–ã‚Šè¾¼ã¿ã‚’ã—ãŸç›´å¾Œã§ã‚ã‚Œã°ã€é€£æºå…ˆ\n"
-" リãƒã‚¸ãƒˆãƒªã§ã® tip ãŒç¾ãƒªãƒã‚¸ãƒˆãƒªã® tip ã¨ãªã‚Šã¾ã™ã€‚\"tip\" ã‚¿ã‚°ã¯\n"
-" 特別ãªã‚¿ã‚°ã§ã€æ”¹åã‚„ã€ä»–ã®ãƒªãƒ“ジョンã¸ã®ä»˜ã‘替ãˆã¯ã§ãã¾ã›ã‚“。"
+" コミットã—ãŸç›´å¾Œã§ã‚ã‚Œã°ã€ 生æˆã•ã‚ŒãŸãƒªãƒ“ジョン㌠tip ã¨ãªã‚Šã¾ã™ã€‚\n"
+" ä»–ã®ãƒªãƒã‚¸ãƒˆãƒªã‹ã‚‰å¤‰æ›´å±¥æ´ã®å–ã‚Šè¾¼ã¿ã‚’ã—ãŸç›´å¾Œã§ã‚ã‚Œã°ã€ 連æºå…ˆ\n"
+" リãƒã‚¸ãƒˆãƒªã§ã® tip ãŒç¾ãƒªãƒã‚¸ãƒˆãƒªã® tip ã¨ãªã‚Šã¾ã™ã€‚ \"tip\" ã‚¿ã‚°ã¯\n"
+" 特別ãªã‚¿ã‚°ã§ã€ 改åや〠他ã®ãƒªãƒ“ジョンã¸ã®ä»˜ã‘替ãˆã¯ã§ãã¾ã›ã‚“。"
msgid "apply one or more changegroup files"
msgstr "ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã®é©ç”¨"
@@ -9113,7 +9353,7 @@
" Returns 0 on success, 1 if an update has unresolved files.\n"
" "
msgstr ""
-" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0ã€è¡çªæœªè§£æ¶ˆãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚‹å ´åˆã¯ 1 ã§ã™ã€‚\n"
+" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0〠è¡çªæœªè§£æ¶ˆãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚‹å ´åˆã¯ 1 ã§ã™ã€‚\n"
" "
msgid "update working directory (or switch revisions)"
@@ -9121,22 +9361,29 @@
msgid ""
" Update the repository's working directory to the specified\n"
+" changeset. If no changeset is specified, update to the tip of the\n"
+" current named branch."
+msgstr ""
+" 指定ã•ã‚ŒãŸãƒªãƒ“ジョン時点ã®å†…容ã§ã€ 作æ¥é ˜åŸŸã‚’æ›´æ–°ã—ã¾ã™ã€‚\n"
+" 対象リビジョンãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€ 作æ¥é ˜åŸŸã¨åŒã˜åå‰ä»˜ã\n"
+" ブランãƒã«ãŠã‘る最新リビジョンã§æ›´æ–°ã—ã¾ã™ã€‚"
+
+msgid ""
+" If the changeset is not a descendant of the working directory's\n"
+" parent, the update is aborted. With the -c/--check option, the\n"
+" working directory is checked for uncommitted changes; if none are\n"
+" found, the working directory is updated to the specified\n"
" changeset."
-msgstr " 指定ã•ã‚ŒãŸãƒªãƒ“ジョン時点ã®å†…容ã§ã€ä½œæ¥é ˜åŸŸã‚’æ›´æ–°ã—ã¾ã™ã€‚"
-
-msgid ""
-" If no changeset is specified, attempt to update to the tip of the\n"
-" current branch. If this changeset is a descendant of the working\n"
-" directory's parent, update to it, otherwise abort."
-msgstr ""
-" リビジョン指定ãŒç„¡ã„å ´åˆã€ç¾è¡Œãƒ–ランãƒã®æœ€æ–°ãƒªãƒ“ジョンã§æ›´æ–°ã—ã¾ã™ã€‚\n"
-" ã“ã®ãƒªãƒ“ジョンãŒã€ä½œæ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã®ç›´ç³»ã®åå«ã§ã‚ã‚Œã°ã€\n"
-" 作æ¥é ˜åŸŸã®æ›´æ–°ãŒå®Ÿæ–½ã•ã‚Œã¾ã™ãŒã€ãれ以外ã®å ´åˆã¯æ›´æ–°ã‚’ä¸æ–ã—ã¾ã™ã€‚"
+msgstr ""
+" 指定リビジョンãŒã€ 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã®ç›´ç³»ã®åå«ã§ãªã„å ´åˆã€ \n"
+" 作æ¥é ˜åŸŸã®æ›´æ–°ã¯ä¸æ–ã•ã‚Œã¾ã™ã€‚ -c/--check ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ \n"
+" 作æ¥é ˜åŸŸä¸ã®æœªã‚³ãƒŸãƒƒãƒˆå¤‰æ›´ã®æœ‰ç„¡ã‚’確èªã—〠変更ãŒç„¡ã‹ã£ãŸå ´åˆã«ã¯\n"
+" 作æ¥é ˜åŸŸã‚’指定リビジョンã§æ›´æ–°ã—ã¾ã™ã€‚"
msgid ""
" The following rules apply when the working directory contains\n"
" uncommitted changes:"
-msgstr " 作æ¥é ˜åŸŸã«æœªã‚³ãƒŸãƒƒãƒˆå¤‰æ›´ãŒã‚ã‚‹å ´åˆã€ä»¥ä¸‹ã®è¦å‰‡ãŒé©ç”¨ã•ã‚Œã¾ã™:"
+msgstr " 作æ¥é ˜åŸŸã«æœªã‚³ãƒŸãƒƒãƒˆå¤‰æ›´ãŒã‚ã‚‹å ´åˆã€ 以下ã®è¦å‰‡ãŒé©ç”¨ã•ã‚Œã¾ã™:"
msgid ""
" 1. If neither -c/--check nor -C/--clean is specified, and if\n"
@@ -9148,38 +9395,40 @@
" branch), the update is aborted and the uncommitted changes\n"
" are preserved."
msgstr ""
-" 1. -c/--check 㨠-C/--clean ã®ã„ãšã‚Œã‚‚指定ã•ã‚Œãšã€æŒ‡å®šãƒªãƒ“ジョンãŒ\n"
-" 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã«ã¨ã£ã¦ç›´ç³»ã®å…ˆç¥–ãªã„ã—åå«ã§ã‚ã£ãŸå ´åˆã€\n"
-" 未コミット変更ã®å†…容ã¯æŒ‡å®šãƒªãƒ“ジョンã¸ã¨ãƒžãƒ¼ã‚¸ã•ã‚Œã€\n"
+" 1. -c/--check 㨠-C/--clean ã®ã„ãšã‚Œã‚‚指定ã•ã‚Œãšã€ 指定リビジョンãŒ\n"
+" 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã«ã¨ã£ã¦ç›´ç³»ã®å…ˆç¥–ãªã„ã—åå«ã§ã‚ã£ãŸå ´åˆã€ \n"
+" 未コミット変更ã®å†…容ã¯æŒ‡å®šãƒªãƒ“ジョンã¸ã¨ãƒžãƒ¼ã‚¸ã•ã‚Œã€ \n"
" マージçµæžœã¯æœªã‚³ãƒŸãƒƒãƒˆã®ã¾ã¾ä½œæ¥é ˜åŸŸã«æ®‹ã‚Šã¾ã™ã€‚\n"
-" 別ã®(åå‰ç„¡ã—)ブランãƒä¸Šã«ã‚るリビジョンãªã©ã€ç›´ç³»ã®å…ˆç¥–ï¼åå«\n"
-" 以外ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€æ›´æ–°ã¯ä¸æ–ã•ã‚Œã€æœªã‚³ãƒŸãƒƒãƒˆå¤‰æ›´ã¯æ®‹ã‚Šã¾ã™ã€‚"
+" 別ã®(åå‰ç„¡ã—)ブランãƒä¸Šã«ã‚るリビジョンãªã©ã€ ç›´ç³»ã®å…ˆç¥–ï¼åå«\n"
+" 以外ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ æ›´æ–°ã¯ä¸æ–ã•ã‚Œã€ 未コミット変更ã¯æ®‹ã‚Šã¾ã™ã€‚"
msgid ""
" 2. With the -c/--check option, the update is aborted and the\n"
" uncommitted changes are preserved."
msgstr ""
-" 2. -c/--check ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€æ›´æ–°ã¯ä¸æ–ã•ã‚Œã€æœªã‚³ãƒŸãƒƒãƒˆå¤‰æ›´ã¯\n"
+" 2. -c/--check ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ æ›´æ–°ã¯ä¸æ–ã•ã‚Œã€ 未コミット変更ã¯\n"
" 残りã¾ã™ã€‚"
msgid ""
" 3. With the -C/--clean option, uncommitted changes are discarded and\n"
" the working directory is updated to the requested changeset."
msgstr ""
-" 3. -C/--clean ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€æœªã‚³ãƒŸãƒƒãƒˆå¤‰æ›´ã¯ç ´æ£„ã•ã‚Œã€\n"
+" 3. -C/--clean ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 未コミット変更ã¯ç ´æ£„ã•ã‚Œã€ \n"
" 作æ¥é ˜åŸŸã¯æŒ‡å®šã®ãƒªãƒ“ジョンã§æ›´æ–°ã•ã‚Œã¾ã™ã€‚"
msgid ""
" Use null as the changeset to remove the working directory (like\n"
" :hg:`clone -U`)."
msgstr ""
-" 作æ¥é ˜åŸŸä¸ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’削除ã™ã‚‹å ´åˆã¯ã€ãƒªãƒ“ジョン㫠null を指定ã—ã¾ã™\n"
+" 作æ¥é ˜åŸŸä¸ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’削除ã™ã‚‹å ´åˆã¯ã€ リビジョン㫠null を指定ã—ã¾ã™\n"
" (:hg:`clone -U` ã¨åŒç‰)。"
msgid ""
-" If you want to update just one file to an older changeset, use :hg:"
-"`revert`."
-msgstr " 特定ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’以å‰ã®çŠ¶æ…‹ã«æˆ»ã™ã«ã¯ :hg:`revert` を使用ã—ã¾ã™ã€‚"
+" If you want to update just one file to an older changeset, use\n"
+" :hg:`revert`."
+msgstr ""
+" 特定ã®ãƒ•ã‚¡ã‚¤ãƒ«ã ã‘を以å‰ã®çŠ¶æ…‹ã«æˆ»ã™å ´åˆã¯ :hg:`revert` \n"
+" を使用ã—ã¦ãã ã•ã„。"
msgid "cannot specify both -c/--check and -C/--clean"
msgstr "-c/--check 㨠-C/--clean ã¯ä½µç”¨ã§ãã¾ã›ã‚“"
@@ -9199,9 +9448,9 @@
" the changelog, manifest, and tracked files, as well as the\n"
" integrity of their crosslinks and indices."
msgstr ""
-" 本コマンドã¯ã€ãƒªãƒã‚¸ãƒˆãƒªã®æ•´åˆæ€§ã«é–¢ã™ã‚‹åºƒç¯„ãªæ¤œè¨¼ã‚’è¡Œã„ã¾ã™ã€‚\n"
+" 本コマンドã¯ã€ リãƒã‚¸ãƒˆãƒªã®æ•´åˆæ€§ã«é–¢ã™ã‚‹åºƒç¯„ãªæ¤œè¨¼ã‚’è¡Œã„ã¾ã™ã€‚\n"
" 変更履æ´ãƒ»ãƒžãƒ‹ãƒ•ã‚§ã‚¹ãƒˆãƒ»å„構æˆç®¡ç†å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ã«ãŠã‘ã‚‹ãƒãƒƒã‚·ãƒ¥å€¤\n"
-" ãŠã‚ˆã³ãƒã‚§ãƒƒã‚¯ã‚µãƒ ã€ç›¸äº’関連付ã‘ãŠã‚ˆã³ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ç‰ã®æ•´åˆæ€§ãŒ\n"
+" ãŠã‚ˆã³ãƒã‚§ãƒƒã‚¯ã‚µãƒ 〠相互関連付ã‘ãŠã‚ˆã³ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ç‰ã®æ•´åˆæ€§ãŒ\n"
" 検証ã•ã‚Œã¾ã™ã€‚"
msgid "output version and copyright information"
@@ -9211,19 +9460,21 @@
msgid "Mercurial Distributed SCM (version %s)\n"
msgstr "Mercurial - 分散構æˆç®¡ç†ãƒ„ール(ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s)\n"
-msgid ""
-"\n"
-"Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
+msgid "(see http://mercurial.selenic.com for more information)"
+msgstr "(詳細㯠http://mercurial.selenic.com ã‚’å‚ç…§ã®ã“ã¨)"
+
+msgid ""
+"Copyright (C) 2005-2010 Matt Mackall and others\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-"\n"
-"著作権 (C) 2005-2010 Matt Mackall <mpm@selenic.com> 他\n"
-"本製å“ã¯ãƒ•ãƒªãƒ¼ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã§ã™ã€‚é ’å¸ƒï¼æ”¹å¤‰ã®éš›ã¯ãƒ©ã‚¤ã‚»ãƒ³ã‚¹æ¡é …ã‚’ãŠèªã¿\n"
-"ãã ã•ã„ã€‚å¸‚å ´é©åˆæ€§ã‚„特定用途ã¸ã®å¯å¦ã‚’å«ã‚ã€æœ¬è£½å“ã¯ç„¡ä¿è¨¼ã§ã™ã€‚\n"
+"Copyright (C) 2005-2010 Matt Mackall ä»–\n"
+"本製å“ã¯ãƒ•ãƒªãƒ¼ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã§ã™ã€‚\n"
+"é ’å¸ƒæ¡ä»¶ã«é–¢ã—ã¦ã¯åŒæ¢±ã•ã‚Œã‚‹ãƒ©ã‚¤ã‚»ãƒ³ã‚¹æ¡é …ã‚’ãŠèªã¿ãã ã•ã„。\n"
+"å¸‚å ´é©åˆæ€§ã‚„特定用途ã¸ã®å¯å¦ã‚’å«ã‚〠本製å“ã¯ç„¡ä¿è¨¼ã§ã™ã€‚\n"
msgid "repository root directory or name of overlay bundle file"
-msgstr "リãƒã‚¸ãƒˆãƒªã®ãƒ«ãƒ¼ãƒˆä½ç½®ã€ãªã„ã—ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ‘ス"
+msgstr "リãƒã‚¸ãƒˆãƒªã®ãƒ«ãƒ¼ãƒˆä½ç½®ã€ ãªã„ã—ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ‘ス"
msgid "DIR"
msgstr "ディレクトリ"
@@ -9232,7 +9483,7 @@
msgstr "作æ¥é ˜åŸŸã®å¤‰æ›´"
msgid "do not prompt, assume 'yes' for any required answers"
-msgstr "å•ã„åˆã‚ã›ã‚’ã›ãšã€ç¢ºèªäº‹é …ã¯å…¨ã¦ 'yes' ã¨ã¿ãªã™"
+msgstr "å•ã„åˆã‚ã›ã‚’ã›ãšã€ 確èªäº‹é …ã¯å…¨ã¦ 'yes' ã¨ã¿ãªã™"
msgid "suppress output"
msgstr "出力を抑æ¢"
@@ -9354,6 +9605,9 @@
msgid "guess renamed files by similarity (0<=s<=100)"
msgstr "ファイル改å推定ã®éš›ã®é¡žä¼¼åº¦(0 以上 100 以下)"
+msgid "recurse into subrepositories"
+msgstr "副リãƒã‚¸ãƒˆãƒªã¸ã®å†å¸°çš„é©ç”¨"
+
msgid "[OPTION]... [FILE]..."
msgstr "[OPTION]... [FILE]..."
@@ -9361,7 +9615,7 @@
msgstr "当該リビジョン時点ã§ã®ç”±æ¥æƒ…å ±ã‚’è¡¨ç¤º"
msgid "follow copies/renames and list the filename (DEPRECATED)"
-msgstr "複製ï¼æ”¹å元ファイルã®å±¥æ´è¿½è·¡ã¨ã€ãƒ•ã‚¡ã‚¤ãƒ«åã®è¡¨ç¤º(éžæŽ¨å¥¨)"
+msgstr "複製ï¼æ”¹å元ファイルã®å±¥æ´è¿½è·¡ã¨ã€ ファイルåã®è¡¨ç¤º(éžæŽ¨å¥¨)"
msgid "don't follow copies and renames"
msgstr "複製ï¼æ”¹å元ファイル履æ´ã®è¿½è·¡ã‚’抑æ¢"
@@ -9411,6 +9665,9 @@
msgid "parent to choose when backing out merge"
msgstr "打ã¡æ¶ˆã—リビジョンã¨ã®ãƒžãƒ¼ã‚¸å¯¾è±¡"
+msgid "specify merge tool"
+msgstr "マージツールã®æŒ‡å®š"
+
msgid "revision to backout"
msgstr "打ã¡æ¶ˆã—対象リビジョン"
@@ -9442,7 +9699,7 @@
msgstr "åŒåæ—¢å˜ãƒ–ランãƒãŒå˜åœ¨ã™ã‚‹å ´åˆã§ã‚‚ブランãƒä½œæˆã‚’実施"
msgid "reset branch name to parent branch name"
-msgstr "ブランãƒåè¨å®šã‚’解消ã—ã€è¦ªãƒªãƒ“ジョンã®ãƒ–ランãƒã«æˆ»ã‚‹"
+msgstr "ブランãƒåè¨å®šã‚’解消ã—〠親リビジョンã®ãƒ–ランãƒã«æˆ»ã‚‹"
msgid "[-fC] [NAME]"
msgstr "[-fC] [NAME]"
@@ -9505,13 +9762,13 @@
msgstr "[OPTION]... SOURCE [DEST]"
msgid "mark new/missing files as added/removed before committing"
-msgstr "コミットå‰ã«ã€æ–°è¦ï¼ä¸åœ¨ãƒ•ã‚¡ã‚¤ãƒ«ã‚’登録ï¼é™¤å¤–"
+msgstr "コミットå‰ã«ã€ æ–°è¦ï¼ä¸åœ¨ãƒ•ã‚¡ã‚¤ãƒ«ã‚’登録ï¼é™¤å¤–"
msgid "mark a branch as closed, hiding it from the branch list"
-msgstr "ブランãƒã‚’閉鎖ã—ã€ãƒ–ランãƒä¸€è¦§ã§ã®è¡¨ç¤ºã‹ã‚‰é™¤å¤–"
+msgstr "ブランãƒã‚’閉鎖ã—〠ブランãƒä¸€è¦§ã§ã®è¡¨ç¤ºã‹ã‚‰é™¤å¤–"
msgid "record a copy that has already occurred"
-msgstr "手動ã§è¤‡è£½æ¸ˆã¿ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã—ã¦ã€è¤‡è£½ã®æ—¨ã‚’記録"
+msgstr "手動ã§è¤‡è£½æ¸ˆã¿ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã—ã¦ã€ 複製ã®æ—¨ã‚’記録"
msgid "forcibly copy over an existing managed file"
msgstr "åŒåã®ç™»éŒ²æ¸ˆã¿ãƒ•ã‚¡ã‚¤ãƒ«ãŒå˜åœ¨ã—ã¦ã‚‚複製を実施"
@@ -9636,8 +9893,11 @@
msgid "[OPTION]... PATTERN [FILE]..."
msgstr "[OPTION]... PATTERN [FILE]..."
-msgid "show only heads which are descendants of REV"
-msgstr "当該リビジョンã®åå«ã¨ãªã‚‹ãƒ˜ãƒƒãƒ‰ã®ã¿ã‚’表示"
+msgid "show only heads which are descendants of STARTREV"
+msgstr "指定リビジョンã®åå«ã¨ãªã‚‹ãƒ˜ãƒƒãƒ‰ã®ã¿ã‚’表示"
+
+msgid "STARTREV"
+msgstr "開始リビジョン"
msgid "show topological heads only"
msgstr "åã‚’æŒãŸãªã„å…¨ã¦ã®ãƒªãƒ“ジョンを表示"
@@ -9648,8 +9908,8 @@
msgid "show normal and closed branch heads"
msgstr "閉鎖ã—ãŸãƒ˜ãƒƒãƒ‰ã‚‚表示"
-msgid "[-ac] [-r REV] [REV]..."
-msgstr "[-ac] [-r REV] [REV]..."
+msgid "[-ac] [-r STARTREV] [REV]..."
+msgstr "[-ac] [-r STARTREV] [REV]..."
msgid "[TOPIC]"
msgstr "[TOPIC]"
@@ -9687,7 +9947,7 @@
msgstr "作æ¥é ˜åŸŸä¸ã®æœªã‚³ãƒŸãƒƒãƒˆå¤‰æ›´ã®ç¢ºèªã‚’çœç•¥"
msgid "don't commit, just update the working directory"
-msgstr "作æ¥é ˜åŸŸã®æ›´æ–°ã®ã¿ã§ã€ã‚³ãƒŸãƒƒãƒˆå®Ÿæ–½ã‚’抑æ¢"
+msgstr "作æ¥é ˜åŸŸã®æ›´æ–°ã®ã¿ã§ã€ コミット実施を抑æ¢"
msgid "apply patch to the nodes from which it was generated"
msgstr "パッãƒä½œæˆæ™‚ã¨åŒã˜è¦ªãƒªãƒ“ジョンã«å¯¾ã—ã¦é©ç”¨"
@@ -9819,13 +10079,13 @@
msgstr "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
msgid "record delete for missing files"
-msgstr "手動ã§å‰Šé™¤æ¸ˆã¿ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã—ã¦ã€ç™»éŒ²é™¤å¤–ã®æ—¨ã‚’記録"
+msgstr "手動ã§å‰Šé™¤æ¸ˆã¿ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã—ã¦ã€ 登録除外ã®æ—¨ã‚’記録"
msgid "remove (and delete) file even if added or modified"
msgstr "è¿½åŠ ç™»éŒ²ï¼å¤‰æ›´å¯¾è±¡ã§ã‚ã£ã¦ã‚‚登録除外(ファイルã¯å‰Šé™¤)"
msgid "record a rename that has already occurred"
-msgstr "手動ã§æ”¹å済ã¿ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã—ã¦ã€æ”¹åã®æ—¨ã‚’記録"
+msgstr "手動ã§æ”¹å済ã¿ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã—ã¦ã€ 改åã®æ—¨ã‚’記録"
msgid "[OPTION]... SOURCE... DEST"
msgstr "[OPTION]... SOURCE... DEST"
@@ -9846,7 +10106,7 @@
msgstr "状態記å·ã®è¡¨ç¤ºã‚’抑æ¢"
msgid "revert all changes when no arguments given"
-msgstr "引数指定ãŒç„¡ã„å ´åˆã«ã€å…¨ãƒ•ã‚¡ã‚¤ãƒ«ã®å†…容を復旧"
+msgstr "引数指定ãŒç„¡ã„å ´åˆã«ã€ 全ファイルã®å†…容を復旧"
msgid "tipmost revision matching date"
msgstr "当該日時ã®æœ€æ–°ãƒªãƒ“ジョンを使用"
@@ -9884,8 +10144,8 @@
msgid "name to show in web pages (default: working directory)"
msgstr "表示å(既定値: 作æ¥é ˜åŸŸã®ãƒ‘ス)"
-msgid "name of the hgweb config file (serve more than one repository)"
-msgstr "hgweb è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ä½ç½®(複数リãƒã‚¸ãƒˆãƒªã®å…¬é–‹)"
+msgid "name of the hgweb config file (see \"hg help hgweb\")"
+msgstr "hgweb è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ä½ç½®(\"hg help hgweb\" å‚ç…§)"
msgid "name of the hgweb config file (DEPRECATED)"
msgstr "hgweb è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ä½ç½® (éžæŽ¨å¥¨)"
@@ -9977,8 +10237,8 @@
msgid "discard uncommitted changes (no backup)"
msgstr "未コミット変更内容ã®ç ´æ£„(ä¿å˜ç„¡ã—)"
-msgid "check for uncommitted changes"
-msgstr "未コミット変更を確èª"
+msgid "update across branches if no uncommitted changes"
+msgstr "未コミット変更ãŒç„¡ã„å ´åˆã€ ブランãƒæ¨ªæ–ã§ã‚‚更新を実施ã—ã¾ã™"
msgid "[-c] [-C] [-d DATE] [[-r] REV]"
msgstr "[-c] [-C] [-d DATE] [[-r] REV]"
@@ -10098,6 +10358,9 @@
msgid "unsupported file type (type is %s)"
msgstr "未サãƒãƒ¼ãƒˆã®ãƒ•ã‚¡ã‚¤ãƒ«ç¨®åˆ¥(%s)"
+msgid "searching for changes\n"
+msgstr "変更点を探索ä¸\n"
+
msgid "queries"
msgstr "å•ã„åˆã‚ã›"
@@ -10114,24 +10377,24 @@
msgstr "無関係ãªãƒªãƒã‚¸ãƒˆãƒªã§ã™"
#, python-format
-msgid "abort: push creates new remote heads on branch '%s'!\n"
-msgstr "ä¸æ–: 連æºå…ˆã®ãƒ–ランム'%s' ã«æ–°ã—ã„ヘッドãŒä½œæˆã•ã‚Œã¾ã™!\n"
-
-msgid "abort: push creates new remote heads!\n"
-msgstr "ä¸æ–: 連æºå…ˆã«æ–°ã—ã„ヘッドãŒä½œæˆã•ã‚Œã¾ã™!\n"
-
-msgid "(you should pull and merge or use push -f to force)\n"
-msgstr "(pull 㨠merge を実施ã™ã‚‹ã‹ã€push -f ã§å¼·åˆ¶å®Ÿè¡Œã—ã¦ãã ã•ã„)\n"
-
-msgid "(did you forget to merge? use push -f to force)\n"
-msgstr "(マージã¯æ¸ˆã‚“ã§ã„ã¾ã™ã‹? push -f ã§å¼·åˆ¶å®Ÿè¡Œã§ãã¾ã™)\n"
-
-#, python-format
-msgid "abort: push creates new remote branches: %s!\n"
-msgstr "ä¸æ–: 連æºå…ˆã«æ–°ã—ã„ブランãƒãŒä½œæˆã•ã‚Œã¾ã™: %s!\n"
-
-msgid "(use 'hg push --new-branch' to create new remote branches)\n"
-msgstr "(連æºå…ˆã¸ã®æ–°è¦ãƒ–ランãƒä½œæˆã¯ 'hg push --new-branch')\n"
+msgid "push creates new remote branches: %s!"
+msgstr "連æºå…ˆã«æ–°ã—ã„ブランãƒãŒä½œæˆã•ã‚Œã¾ã™: %s!"
+
+msgid "use 'hg push --new-branch' to create new remote branches"
+msgstr "連æºå…ˆã¸ã®æ–°è¦ãƒ–ランãƒä½œæˆã¯ 'hg push --new-branch'"
+
+#, python-format
+msgid "push creates new remote heads on branch '%s'!"
+msgstr "連æºå…ˆã®ãƒ–ランム'%s' ã«æ–°ã—ã„ヘッドãŒä½œæˆã•ã‚Œã¾ã™!"
+
+msgid "push creates new remote heads!"
+msgstr "連æºå…ˆã«æ–°ã—ã„ヘッドãŒä½œæˆã•ã‚Œã¾ã™!"
+
+msgid "you should pull and merge or use push -f to force"
+msgstr "pull 㨠merge を実施ã™ã‚‹ã‹ã€ push -f ã§å¼·åˆ¶å®Ÿè¡Œã—ã¦ãã ã•ã„"
+
+msgid "did you forget to merge? use push -f to force"
+msgstr "マージã¯æ¸ˆã‚“ã§ã„ã¾ã™ã‹? push -f ã§å¼·åˆ¶å®Ÿè¡Œã§ãã¾ã™"
msgid "note: unsynced remote changes!\n"
msgstr "注æ„: 連æºå…ˆã§ã®å¤‰æ›´ç‚¹ãŒå–ã‚Šè¾¼ã¾ã‚Œã¦ã„ã¾ã›ã‚“!\n"
@@ -10141,6 +10404,10 @@
msgstr "ä¸æ¢: %s\n"
#, python-format
+msgid "(%s)\n"
+msgstr "(%s)\n"
+
+#, python-format
msgid "hg: parse error at %s: %s\n"
msgstr "hg: %s ã§ã®è§£æžã‚¨ãƒ©ãƒ¼: %s\n"
@@ -10148,6 +10415,9 @@
msgid "hg: parse error: %s\n"
msgstr "hg: 解æžã‚¨ãƒ©ãƒ¼: %s\n"
+msgid "entering debugger - type c to continue starting hg or h for help\n"
+msgstr "デãƒãƒƒã‚¬å‹•ä½œé–‹å§‹ - 継続ãªã‚‰ c 〠ヘルプãªã‚‰ h を入力ã—ã¦ãã ã•ã„\n"
+
#, python-format
msgid ""
"hg: command '%s' is ambiguous:\n"
@@ -10224,14 +10494,13 @@
msgid "abort: out of memory\n"
msgstr "ä¸æ–: メモリä¸è¶³\n"
-msgid "** unknown exception encountered, details follow\n"
-msgstr "** 予期ã›ã¬ä¾‹å¤–ãŒæµ®æšã•ã‚Œã¾ã—ãŸ\n"
-
-msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
-msgstr "** 障害詳細を http://mercurial.selenic.com/bts ã«å ±å‘Šã—ã¦ãã ã•ã„\n"
-
-msgid "** or mercurial@selenic.com\n"
-msgstr "** ãªã„ã— mercurial@selenic.com ã«å ±å‘Šã—ã¦ãã ã•ã„\n"
+msgid "** unknown exception encountered, please report by visiting\n"
+msgstr "** 予期ã›ã¬ä¾‹å¤–ãŒæµ®æšã•ã‚Œã¾ã—ãŸã€‚\n"
+
+msgid "** http://mercurial.selenic.com/wiki/BugTracker\n"
+msgstr ""
+"** http://mercurial.selenic.com/wiki/BugTracker ã¾ã§\n"
+"** 以下ã®æƒ…å ±ã‚’å ±å‘Šã—ã¦ãã ã•ã„。\n"
#, python-format
msgid "** Python %s\n"
@@ -10239,17 +10508,23 @@
#, python-format
msgid "** Mercurial Distributed SCM (version %s)\n"
-msgstr "** Mercurial - 分散構æˆç®¡ç†(ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s)\n"
+msgstr "** Mercurial Distributed SCM (version %s)\n"
#, python-format
msgid "** Extensions loaded: %s\n"
-msgstr "** èªã¿è¾¼ã¿æ¸ˆã¿ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³: %s\n"
+msgstr "** Extensions loaded: %s\n"
#, python-format
msgid "no definition for alias '%s'\n"
msgstr "'%s' を別åã«æŒã¤ã‚³ãƒžãƒ³ãƒ‰ã¯ã‚ã‚Šã¾ã›ã‚“\n"
#, python-format
+msgid ""
+"error in definition for alias '%s': %s may only be given on the command "
+"line\n"
+msgstr "別å定義 '%s' ã®ã‚¨ãƒ©ãƒ¼: %s ã¯ã‚³ãƒžãƒ³ãƒ‰è¡Œã§ã®ç›´æŽ¥æŒ‡å®šé™å®šã§ã™\n"
+
+#, python-format
msgid "alias '%s' resolves to unknown command '%s'\n"
msgstr "'%s' ãŒæœªçŸ¥ã®ã‚³ãƒžãƒ³ãƒ‰ '%s' ã®åˆ¥åã¨ã¿ãªã•ã‚Œã¾ã—ãŸ\n"
@@ -10278,7 +10553,7 @@
msgid ""
"Option -R has to be separated from other options (e.g. not -qR) and --"
"repository may only be abbreviated as --repo!"
-msgstr "-R ã¯ç‹¬ç«‹è¨˜è¿°(例: '-dR' ã¯ä¸å¯)ã€--repository ã®ç•¥è¨˜ã¯ --repo ã®ã¿"
+msgstr "-R ã¯ç‹¬ç«‹è¨˜è¿°(例: '-dR' ã¯ä¸å¯)〠--repository ã®ç•¥è¨˜ã¯ --repo ã®ã¿"
#, python-format
msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
@@ -10303,7 +10578,7 @@
"misc/lsprof/"
msgstr ""
"lsprof ãŒåˆ©ç”¨ã§ãã¾ã›ã‚“ - http://codespeak.net/svn/user/arigo/hack/misc/"
-"lsprof/ ã‹ã‚‰ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„"
+"lsprof/ã‹ã‚‰ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„"
#, python-format
msgid "*** failed to import extension %s from %s: %s\n"
@@ -10335,7 +10610,7 @@
"keep (l)ocal or take (o)ther?"
msgstr ""
" %s ã®ãƒžãƒ¼ã‚¸ã«é©åˆ‡ãªãƒ„ールãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“\n"
-"ã©ã†ã—ã¾ã™ã‹? 作æ¥é ˜åŸŸã®å†…容:(l)ocalã€ãƒžãƒ¼ã‚¸å¯¾è±¡ã®å†…容:(o)ther"
+"ã©ã†ã—ã¾ã™ã‹? 作æ¥é ˜åŸŸã®å†…容:(l)ocal〠マージ対象ã®å†…容:(o)ther"
msgid "&Local"
msgstr "&Local"
@@ -10359,12 +10634,6 @@
msgid "was merge of '%s' successful (yn)?"
msgstr "'%s' ã®ãƒžãƒ¼ã‚¸ã¯æˆåŠŸã—ã¾ã—ãŸã‹ï¼Ÿ(y/n) "
-msgid "&No"
-msgstr "&No"
-
-msgid "&Yes"
-msgstr "&Yes"
-
#, python-format
msgid ""
" output file %s appears unchanged\n"
@@ -10415,6 +10684,9 @@
msgid "Diff Formats"
msgstr "差分形å¼"
+msgid "Merge Tools"
+msgstr "マージツール"
+
msgid "Template Usage"
msgstr "テンプレートã®åˆ©ç”¨"
@@ -10424,6 +10696,9 @@
msgid "Using additional features"
msgstr "ä»˜åŠ æ©Ÿèƒ½ã®ä½¿ç”¨"
+msgid "Subrepositories"
+msgstr "副リãƒã‚¸ãƒˆãƒª"
+
msgid "Configuring hgweb"
msgstr "hgweb è¨å®šãƒ•ã‚¡ã‚¤ãƒ«"
@@ -10458,8 +10733,9 @@
"- ``%USERPROFILE%\\mercurial.ini``\n"
"- ``%HOME%\\.hgrc``\n"
"- ``%HOME%\\mercurial.ini``\n"
-"- ``C:\\mercurial\\mercurial.ini`` (regkeyã€hgrc.d\\ã€mercurial.ini ä¸åœ¨æ™‚\n"
-"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (hgrc.d\\ ã€mercurial.ini ä¸åœ¨"
+"- ``C:\\mercurial\\mercurial.ini`` (regkey〠hgrc.d\\〠mercurial.ini ä¸åœ¨"
+"時\n"
+"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (hgrc.d\\ 〠mercurial.ini ä¸åœ¨"
"時)\n"
"- ``<インストール先>\\hgrc.d\\*.rc`` (mercurial.ini ä¸åœ¨æ™‚)\n"
"- ``<インストール先>\\mercurial.ini``"
@@ -10486,7 +10762,7 @@
"If there is a per-repository configuration file which is not owned by\n"
"the active user, Mercurial will warn you that the file is skipped::"
msgstr ""
-"実行ユーザ以外ãŒæ‰€æœ‰ã¨ãªã£ã¦ã„るリãƒã‚¸ãƒˆãƒªæ¯Žè¨å®šãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚‹å ´åˆã€\n"
+"実行ユーザ以外ãŒæ‰€æœ‰ã¨ãªã£ã¦ã„るリãƒã‚¸ãƒˆãƒªæ¯Žè¨å®šãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚‹å ´åˆã€ \n"
"Mercurial ã¯å½“該ファイルをèªã¿è¾¼ã¾ãªã„æ—¨ã®è¦å‘Šã‚’表示ã—ã¾ã™::"
msgid ""
@@ -10498,8 +10774,8 @@
"be ignored) or trust can be established. Use one of the following\n"
"settings, the syntax is explained below:"
msgstr ""
-"ãã®ã‚ˆã†ãªãƒ•ã‚¡ã‚¤ãƒ«ã‚’æ„図的ã«ä½¿ç”¨ã—ã¦ã„ã‚‹å ´åˆã€è¦å‘Šè¡¨ç¤ºã‚’抑æ¢ã™ã‚‹(但ã—\n"
-"ファイルã¯èªã¿è¾¼ã¾ã‚Œã¾ã›ã‚“)ã“ã¨ã‚‚ã€ä¿¡é ¼ã—ã¦èªã¿è¾¼ã‚€ã“ã¨ã‚‚å¯èƒ½ã§ã™ã€‚\n"
+"ãã®ã‚ˆã†ãªãƒ•ã‚¡ã‚¤ãƒ«ã‚’æ„図的ã«ä½¿ç”¨ã—ã¦ã„ã‚‹å ´åˆã€ è¦å‘Šè¡¨ç¤ºã‚’抑æ¢ã™ã‚‹(但ã—\n"
+"ファイルã¯èªã¿è¾¼ã¾ã‚Œã¾ã›ã‚“)ã“ã¨ã‚‚ã€ ä¿¡é ¼ã—ã¦èªã¿è¾¼ã‚€ã“ã¨ã‚‚å¯èƒ½ã§ã™ã€‚\n"
"以下ã®æ–‡æ³•ã«å¾“ã„è¨å®šã‚’è¡Œã£ã¦ãã ã•ã„:"
msgid ""
@@ -10516,9 +10792,9 @@
"configuration file consists of sections, led by a ``[section]`` header\n"
"and followed by ``name = value`` entries::"
msgstr ""
-"Mercurial ã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€ã„ã‚ゆる ini ファイル形å¼ã§è¨˜è¿°ã•ã‚Œã¾ã™ã€‚\n"
-"è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€``[セクションå]`` å½¢å¼ã®ãƒ˜ãƒƒãƒ€ã‹ã‚‰å§‹ã¾ã‚‹ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã‹ã‚‰\n"
-"構æˆã•ã‚Œã€``åå‰ = 値`` å½¢å¼ã®è¦ç´ ãŒåˆ—挙ã•ã‚Œã¾ã™::"
+"Mercurial ã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€ ã„ã‚ゆる ini ファイル形å¼ã§è¨˜è¿°ã•ã‚Œã¾ã™ã€‚\n"
+"è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€ ``[セクションå]`` å½¢å¼ã®ãƒ˜ãƒƒãƒ€ã‹ã‚‰å§‹ã¾ã‚‹ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã‹ã‚‰\n"
+"構æˆã•ã‚Œã€ ``åå‰ = 値`` å½¢å¼ã®è¦ç´ ãŒåˆ—挙ã•ã‚Œã¾ã™::"
msgid ""
" [ui]\n"
@@ -10534,8 +10810,8 @@
"``ui.verbose``, respectively. Please see the hgrc man page for a full\n"
"description of the possible configuration values:"
msgstr ""
-"上記記述ã¯ãã‚Œãžã‚Œã€``ui.username`` ãŠã‚ˆã³ ``ui.verbose`` ã¨ã—ã¦\n"
-"å‚ç…§ã•ã‚Œã¾ã™ã€‚è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã§æŒ‡å®šå¯èƒ½ãªå€¤ã®è©³ç´°ã«é–¢ã—ã¦ã¯ã€\n"
+"上記記述ã¯ãã‚Œãžã‚Œã€ ``ui.username`` ãŠã‚ˆã³ ``ui.verbose`` ã¨ã—ã¦\n"
+"å‚ç…§ã•ã‚Œã¾ã™ã€‚ è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã§æŒ‡å®šå¯èƒ½ãªå€¤ã®è©³ç´°ã«é–¢ã—ã¦ã¯ã€ \n"
"hgrc ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸ã‚’å‚ç…§ã—ã¦ãã ã•ã„:"
msgid ""
@@ -10556,7 +10832,7 @@
"- log, revert, update: 日時ã«ã‚ˆã‚‹ãƒªãƒ“ジョンã®æŒ‡å®š"
msgid "Many date formats are valid. Here are some examples:"
-msgstr "有効ãªæ—¥æ™‚指定形å¼ã¯æ²¢å±±ã‚ã‚Šã¾ã™ã€‚以下ã«ã„ãã¤ã‹ã®ä¾‹ã‚’示ã—ã¾ã™:"
+msgstr "有効ãªæ—¥æ™‚指定形å¼ã¯æ²¢å±±ã‚ã‚Šã¾ã™ã€‚ 以下ã«ã„ãã¤ã‹ã®ä¾‹ã‚’示ã—ã¾ã™:"
msgid ""
"- ``Wed Dec 6 13:18:29 2006`` (local timezone assumed)\n"
@@ -10574,7 +10850,7 @@
"- ``12/6/6`` (Dec 6 2006)"
msgstr ""
"- ``Wed Dec 6 13:18:29 2006`` (「ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚¤ãƒ ゾーンã€ã‚’想定)\n"
-"- ``Dec 6 13:18 -0600`` (「今年ã€ã‚’想定ã€ã‚¿ã‚¤ãƒ ゾーンã¯ã‚ªãƒ•ã‚»ãƒƒãƒˆæŒ‡å®š)\n"
+"- ``Dec 6 13:18 -0600`` (「今年ã€ã‚’想定〠タイムゾーンã¯ã‚ªãƒ•ã‚»ãƒƒãƒˆæŒ‡å®š)\n"
"- ``Dec 6 13:18 UTC`` (UTC ãŠã‚ˆã³ GMT 㯠+0000 ã®åˆ¥å)\n"
"- ``Dec 6`` (「åˆå‰0時ã€ã‚’想定)\n"
"- ``13:18`` (「本日ã€ã‚’想定)\n"
@@ -10588,7 +10864,7 @@
"- ``12/6/6`` (2006年12月6日)"
msgid "Lastly, there is Mercurial's internal format:"
-msgstr "最後ã«ã€Mercurial 固有ã®å†…部形å¼ã‚’示ã—ã¾ã™:"
+msgstr "最後ã«ã€ Mercurial 固有ã®å†…部形å¼ã‚’示ã—ã¾ã™:"
msgid "- ``1165432709 0`` (Wed Dec 6 13:18:29 2006 UTC)"
msgstr "- ``1165432709 0`` (2006年12月6日 13:18:29 UTC)"
@@ -10599,12 +10875,12 @@
"the offset of the local timezone, in seconds west of UTC (negative if\n"
"the timezone is east of UTC)."
msgstr ""
-"ã“ã‚Œã¯æ—¥æ™‚ã®å†…部表ç¾å½¢å¼ã§ã™ã€‚基点ã¨ãªã‚‹ 1970å¹´1月1æ—¥ 00:00 UTC ã‹ã‚‰ã®\n"
-"経éŽç§’数を表㙠unixtime å½¢å¼éƒ¨åˆ†ã¨ã€ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚¤ãƒ ゾーンã®ã‚ªãƒ•ã‚»ãƒƒãƒˆå€¤\n"
+"ã“ã‚Œã¯æ—¥æ™‚ã®å†…部表ç¾å½¢å¼ã§ã™ã€‚ 基点ã¨ãªã‚‹ 1970å¹´1月1æ—¥ 00:00 UTC ã‹ã‚‰ã®\n"
+"経éŽç§’数を表㙠unixtime å½¢å¼éƒ¨åˆ†ã¨ã€ ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚¤ãƒ ゾーンã®ã‚ªãƒ•ã‚»ãƒƒãƒˆå€¤\n"
"(UTC よりもæ±å´ã®åœ°åŸŸã¯è² 値)を表ã™ã‚ªãƒ•ã‚»ãƒƒãƒˆéƒ¨åˆ†ã‹ã‚‰æ§‹æˆã•ã‚Œã¦ã„ã¾ã™ã€‚"
msgid "The log command also accepts date ranges:"
-msgstr "log コマンドã«ã¯ã€æ—¥æ™‚範囲指定å¯èƒ½ã§ã™:"
+msgstr "log コマンドã«ã¯ã€ 日時範囲指定å¯èƒ½ã§ã™:"
msgid ""
"- ``<{datetime}`` - at or before a given date/time\n"
@@ -10623,13 +10899,13 @@
"used by GNU patch and many other standard tools."
msgstr ""
"無指定時㫠Mercurial ãŒ2ã¤ã®ãƒªãƒ“ジョンを比較ã—ã¦å·®åˆ†è¡¨ç¤ºã™ã‚‹éš›ã®å½¢å¼ã¯\n"
-"GNU diff ã® unified å½¢å¼äº’æ›ã®ã‚‚ã®ã§ã€GNU patch ã‚’ã¯ã˜ã‚ã¨ã™ã‚‹å¤šãã®\n"
+"GNU diff ã® unified å½¢å¼äº’æ›ã®ã‚‚ã®ã§ã€ GNU patch ã‚’ã¯ã˜ã‚ã¨ã™ã‚‹å¤šãã®\n"
"標準的ãªãƒ„ールã§ä½¿ç”¨ã§ãã‚‹ã‚‚ã®ã§ã™ã€‚"
msgid ""
"While this standard format is often enough, it does not encode the\n"
"following information:"
-msgstr "ã“ã®æ¨™æº–çš„ãªå½¢å¼ã¯æ¦‚ãå分ãªã®ã§ã™ãŒã€ä»¥ä¸‹ã®ã‚ˆã†ãªæƒ…å ±ã¯å«ã¾ã‚Œã¾ã›ã‚“:"
+msgstr "ã“ã®æ¨™æº–çš„ãªå½¢å¼ã¯æ¦‚ãå分ãªã®ã§ã™ãŒã€ 以下ã®ã‚ˆã†ãªæƒ…å ±ã¯å«ã¾ã‚Œã¾ã›ã‚“:"
msgid ""
"- executable status and other permission bits\n"
@@ -10648,9 +10924,9 @@
"by default because a few widespread tools still do not understand this\n"
"format."
msgstr ""
-"Mercurial ã¯ã€åˆ¥ã®æ§‹æˆç®¡ç†ãƒ„ールã§ã‚ã‚‹ git ã«ç”±æ¥ã™ã‚‹æ‹¡å¼µå·®åˆ†å½¢å¼ã«ã‚‚\n"
-"対応ã—ã¦ãŠã‚Šã€ã“ã®å½¢å¼ã¯å¾“æ¥ã®å·®åˆ†å½¢å¼ã®æŒã¤åˆ¶é™ã‚’解消ã—ã¦ã„ã¾ã™ã€‚\n"
-"但ã—ã€æ™®åŠã—ã¦ã„るツールã®å¹¾ã¤ã‹ãŒ git 差分形å¼ã«å¯¾å¿œã—ã¦ã„ãªã„ãŸã‚ã€\n"
+"Mercurial ã¯ã€ 別ã®æ§‹æˆç®¡ç†ãƒ„ールã§ã‚ã‚‹ git ã«ç”±æ¥ã™ã‚‹æ‹¡å¼µå·®åˆ†å½¢å¼ã«ã‚‚\n"
+"対応ã—ã¦ãŠã‚Šã€ ã“ã®å½¢å¼ã¯å¾“æ¥ã®å·®åˆ†å½¢å¼ã®æŒã¤åˆ¶é™ã‚’解消ã—ã¦ã„ã¾ã™ã€‚\n"
+"但ã—〠普åŠã—ã¦ã„るツールã®å¹¾ã¤ã‹ãŒ git 差分形å¼ã«å¯¾å¿œã—ã¦ã„ãªã„ãŸã‚〠\n"
"Mercurial ã¯æŒ‡å®šãŒç„¡ã„å ´åˆã¯ã“ã®å½¢å¼ã§ã¯å‡ºåŠ›ã—ã¾ã›ã‚“。"
msgid ""
@@ -10662,12 +10938,12 @@
"pull) are not affected by this, because they use an internal binary\n"
"format for communicating changes."
msgstr ""
-"ã¤ã¾ã‚Šã€Mercurial ãŒ(:hg:`export` ç‰ã§)生æˆã—ãŸæ¨™æº–ã®å·®åˆ†å½¢å¼ã¯ã€\n"
-"ä»–ã®ãƒªãƒã‚¸ãƒˆãƒªã«å¯¾ã—ã¦é©ç”¨ã—ãŸå ´åˆã€ä¸Šè¿°ã—ãŸæƒ…å ±ã®æ¬ è½ãŒã‚ã‚‹ã“ã¨ã‹ã‚‰ã€\n"
-"ファイルã®è¤‡è£½ãƒ»æ”¹åã‚’ã¯ã˜ã‚ã¨ã™ã‚‹ä¸Šè¨˜ã®åˆ¶é™ã«é¡žã™ã‚‹æ“作ã«é–¢ã—ã¦ã¯ã€\n"
-"å分注æ„ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚:hg:`push` ã‚„ :hg:`pull` ã®ã‚ˆã†ãª\n"
-"Mercurial ã®å†…部形å¼ã§å®Ÿæ–½ã•ã‚Œã‚‹æ“作ã«é–¢ã—ã¦ã¯ã€ãƒã‚¤ãƒŠãƒªå½¢å¼ã§å¤‰æ›´\n"
-"æƒ…å ±ã®æŽˆå—ã‚’è¡Œã†ã“ã¨ã‹ã‚‰ã€æƒ…å ±ã®æ¬ è½ã«é–¢ã—ã¦ã¯å¿ƒé…ã™ã‚‹å¿…è¦ã¯ã‚ã‚Šã¾ã›ã‚“。"
+"ã¤ã¾ã‚Šã€ Mercurial ãŒ(:hg:`export` ç‰ã§)生æˆã—ãŸæ¨™æº–ã®å·®åˆ†å½¢å¼ã¯ã€ \n"
+"ä»–ã®ãƒªãƒã‚¸ãƒˆãƒªã«å¯¾ã—ã¦é©ç”¨ã—ãŸå ´åˆã€ 上述ã—ãŸæƒ…å ±ã®æ¬ è½ãŒã‚ã‚‹ã“ã¨ã‹ã‚‰ã€ \n"
+"ファイルã®è¤‡è£½ãƒ»æ”¹åã‚’ã¯ã˜ã‚ã¨ã™ã‚‹ä¸Šè¨˜ã®åˆ¶é™ã«é¡žã™ã‚‹æ“作ã«é–¢ã—ã¦ã¯ã€ \n"
+"å分注æ„ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ :hg:`push` ã‚„ :hg:`pull` ã®ã‚ˆã†ãª\n"
+"Mercurial ã®å†…部形å¼ã§å®Ÿæ–½ã•ã‚Œã‚‹æ“作ã«é–¢ã—ã¦ã¯ã€ ãƒã‚¤ãƒŠãƒªå½¢å¼ã§å¤‰æ›´\n"
+"æƒ…å ±ã®æŽˆå—ã‚’è¡Œã†ã“ã¨ã‹ã‚‰ã€ æƒ…å ±ã®æ¬ è½ã«é–¢ã—ã¦ã¯å¿ƒé…ã™ã‚‹å¿…è¦ã¯ã‚ã‚Šã¾ã›ã‚“。"
msgid ""
"To make Mercurial produce the git extended diff format, use the --git\n"
@@ -10675,10 +10951,10 @@
"section of your configuration file. You do not need to set this option\n"
"when importing diffs in this format or using them in the mq extension.\n"
msgstr ""
-"Mercurial ã‹ã‚‰ git 拡張差分形å¼ã®å‡ºåŠ›ã‚’å¾—ã‚‹ã«ã¯ã€å—ç†å¯èƒ½ãªã‚³ãƒžãƒ³ãƒ‰ã«\n"
-"対ã—㦠--git を指定ã™ã‚‹ã‹ã€è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã® [diff] セクションã«\n"
-"'git = True' è¨˜è¿°ã‚’è¿½åŠ ã—ã¦ãã ã•ã„。:hg:`import` ã‚„ \n"
-"mq エクステンションを使用ã™ã‚‹å ´åˆã¯ã€ã“ã®æŒ‡å®šã¯ä¸è¦ã§ã™ã€‚\n"
+"Mercurial ã‹ã‚‰ git 拡張差分形å¼ã®å‡ºåŠ›ã‚’å¾—ã‚‹ã«ã¯ã€ å—ç†å¯èƒ½ãªã‚³ãƒžãƒ³ãƒ‰ã«\n"
+"対ã—㦠--git を指定ã™ã‚‹ã‹ã€ è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã® [diff] セクションã«\n"
+"'git = True' è¨˜è¿°ã‚’è¿½åŠ ã—ã¦ãã ã•ã„。 :hg:`import` ã‚„ \n"
+"mq エクステンションを使用ã™ã‚‹å ´åˆã¯ã€ ã“ã®æŒ‡å®šã¯ä¸è¦ã§ã™ã€‚\n"
msgid ""
"HG\n"
@@ -10689,10 +10965,11 @@
" Windows) is searched."
msgstr ""
"HG\n"
-" 'hg' コマンドã¸ã®ãƒ‘ス。フックï¼ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ãªã„ã—外部ツールã®èµ·å‹•ã®\n"
-" éš›ã«è‡ªå‹•çš„ã«è¨å®šã•ã‚Œã¾ã™ã€‚未è¨å®šã‚„空ã®å ´åˆã¯ã€frozen å½¢å¼ã®\n"
-" hg 実行å¯èƒ½ãƒ•ã‚¡ã‚¤ãƒ«ã®åå‰ã‹è¨å®šã•ã‚Œã‚‹ã‹ã€'hg' ã¨ã„ã†åå‰ã®å®Ÿè¡Œå¯èƒ½\n"
-" ファイルãŒæ¤œç´¢ã•ã‚Œã¾ã™(Windows ã®å ´åˆã€PATHEXT 環境変数ã«è¨å®šã•ã‚ŒãŸ\n"
+" 'hg' コマンドã¸ã®ãƒ‘ス。 フックï¼ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ãªã„ã—外部ツールã®èµ·å‹•"
+"ã®\n"
+" éš›ã«è‡ªå‹•çš„ã«è¨å®šã•ã‚Œã¾ã™ã€‚ 未è¨å®šã‚„空ã®å ´åˆã¯ã€ frozen å½¢å¼ã®\n"
+" hg 実行å¯èƒ½ãƒ•ã‚¡ã‚¤ãƒ«ã®åå‰ã‹è¨å®šã•ã‚Œã‚‹ã‹ã€ 'hg' ã¨ã„ã†åå‰ã®å®Ÿè¡Œå¯èƒ½\n"
+" ファイルãŒæ¤œç´¢ã•ã‚Œã¾ã™(Windows ã®å ´åˆã€ PATHEXT 環境変数ã«è¨å®šã•ã‚ŒãŸ\n"
" COM/EXE/BAT/CMD ç‰ã®æ‹¡å¼µå付ã)。"
msgid ""
@@ -10700,7 +10977,8 @@
" This is the name of the editor to run when committing. See EDITOR."
msgstr ""
"HGEDITOR\n"
-" コミットã®éš›ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸å…¥åŠ›ã‚’è¡Œã†ãŸã‚ã®ã‚¨ãƒ‡ã‚£ã‚¿ã®åå‰ã€‚EDITOR 環境変数\n"
+" コミットã®éš›ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸å…¥åŠ›ã‚’è¡Œã†ãŸã‚ã®ã‚¨ãƒ‡ã‚£ã‚¿ã®åå‰ã€‚ EDITOR 環境変"
+"æ•°\n"
" ã«ã¤ã„ã¦ã‚‚å‚ç…§ã—ã¦ãã ã•ã„。"
msgid " (deprecated, use configuration file)"
@@ -10714,10 +10992,10 @@
" be overridden with the --encoding command-line option."
msgstr ""
"HGENCODING\n"
-" Mercurial ã«ã‚ˆã‚‹ãƒã‚±ãƒ¼ãƒ«è‡ªå‹•æ¤œå‡ºã®ä¸Šæ›¸ã。ã“ã®è¨å®šã¯ã€ãƒ¦ãƒ¼ã‚¶åã€\n"
-" コミットメッセージã€ã‚¿ã‚°åãŠã‚ˆã³ãƒ–ランãƒåを内部データ形å¼ã«å¤‰æ›ã™ã‚‹\n"
-" éš›ã«ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚ã“ã®ç’°å¢ƒå¤‰æ•°è¨å®šã¯ã€ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ã§ã® --encoding\n"
-" 使用ã«ã‚ˆã‚Šã€æ›´ã«ä¸Šæ›¸ãã™ã‚‹ã“ã¨ãŒå‡ºæ¥ã¾ã™ã€‚"
+" Mercurial ã«ã‚ˆã‚‹ãƒã‚±ãƒ¼ãƒ«è‡ªå‹•æ¤œå‡ºã®ä¸Šæ›¸ã。 ã“ã®è¨å®šã¯ã€ ユーザå〠\n"
+" コミットメッセージ〠タグåãŠã‚ˆã³ãƒ–ランãƒåを内部データ形å¼ã«å¤‰æ›ã™ã‚‹\n"
+" éš›ã«ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚ ã“ã®ç’°å¢ƒå¤‰æ•°è¨å®šã¯ã€ コマンドラインã§ã® --encoding\n"
+" 使用ã«ã‚ˆã‚Šã€ æ›´ã«ä¸Šæ›¸ãã™ã‚‹ã“ã¨ãŒå‡ºæ¥ã¾ã™ã€‚"
msgid ""
"HGENCODINGMODE\n"
@@ -10729,13 +11007,22 @@
" the --encodingmode command-line option."
msgstr ""
"HGENCODINGMODE\n"
-" ユーザã‹ã‚‰ã®æŒ‡å®šå€¤ã‚’内部データ形å¼ã«å¤‰æ›ã™ã‚‹éš›ã«ã€æŒ‡å®šã®ç¬¦å·åŒ–ã¨\n"
-" åˆè‡´ã—ãªã„æ–‡å—ãŒæ¤œå‡ºã•ã‚ŒãŸå ´åˆã® Mercurial ã®æŒ™å‹•ã®æŒ‡å®šã€‚無指定時ã¯ã€\n"
+" ユーザã‹ã‚‰ã®æŒ‡å®šå€¤ã‚’内部データ形å¼ã«å¤‰æ›ã™ã‚‹éš›ã«ã€ 指定ã®ç¬¦å·åŒ–ã¨\n"
+" åˆè‡´ã—ãªã„æ–‡å—ãŒæ¤œå‡ºã•ã‚ŒãŸå ´åˆã® Mercurial ã®æŒ™å‹•ã®æŒ‡å®šã€‚ 無指定時ã¯ã€ \n"
" 「指定ã®ç¬¦å·åŒ–ã¨åˆè‡´ã—ãªã„å ´åˆã¯å‡¦ç†ä¸æ–ã€ã‚’æ„味ã™ã‚‹ \"strict\" ãŒæŒ‡å®š\n"
-" ã•ã‚ŒãŸã‚‚ã®ã¨ã¿ãªã—ã¾ã™ã€‚ä»–ã«ã¯ã€ã€ŒæœªçŸ¥ã®æ–‡å—ã®ç½®ãæ›ãˆã€ã‚’æ„味ã™ã‚‹\n"
-" \"replace\" ã¨ã€ã€ŒæœªçŸ¥ã®æ–‡å—ã®åˆ‡ã‚Šæ¨ã¦ã€ã‚’æ„味ã™ã‚‹ \"ignore\" ãŒæŒ‡å®š\n"
-" 出æ¥ã¾ã™ã€‚ã“ã®ç’°å¢ƒå¤‰æ•°è¨å®šã¯ã€ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ã§ã® --encodingmode\n"
-" 使用ã«ã‚ˆã‚Šã€æ›´ã«ä¸Šæ›¸ãã™ã‚‹ã“ã¨ãŒå‡ºæ¥ã¾ã™ã€‚"
+" ã•ã‚ŒãŸã‚‚ã®ã¨ã¿ãªã—ã¾ã™ã€‚ ä»–ã«ã¯ã€ 「未知ã®æ–‡å—ã®ç½®ãæ›ãˆã€ã‚’æ„味ã™ã‚‹\n"
+" \"replace\" ã¨ã€ 「未知ã®æ–‡å—ã®åˆ‡ã‚Šæ¨ã¦ã€ã‚’æ„味ã™ã‚‹ \"ignore\" ãŒæŒ‡å®š\n"
+" 出æ¥ã¾ã™ã€‚ ã“ã®ç’°å¢ƒå¤‰æ•°è¨å®šã¯ã€ コマンドラインã§ã® --encodingmode\n"
+" 使用ã«ã‚ˆã‚Šã€ æ›´ã«ä¸Šæ›¸ãã™ã‚‹ã“ã¨ãŒå‡ºæ¥ã¾ã™ã€‚"
+
+msgid ""
+"HGENCODINGAMBIGUOUS\n"
+" This sets Mercurial's behavior for handling characters with\n"
+" \"ambiguous\" widths like accented Latin characters with East Asian\n"
+" fonts. By default, Mercurial assumes ambiguous characters are\n"
+" narrow, set this variable to \"wide\" if such characters cause\n"
+" formatting problems."
+msgstr ""
msgid ""
"HGMERGE\n"
@@ -10744,8 +11031,9 @@
" ancestor file."
msgstr ""
"HGMERGE\n"
-" マージã®éš›ã®è¡çªè§£æ¶ˆã«ä½¿ç”¨ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã€‚指定ã•ã‚ŒãŸã‚³ãƒžãƒ³ãƒ‰ã®èµ·å‹•ã«ã¯ã€\n"
-" 作æ¥é ˜åŸŸã®ãƒ•ã‚¡ã‚¤ãƒ«ã€ãƒžãƒ¼ã‚¸å¯¾è±¡åˆ¥ãƒªãƒ“ジョンã®ãƒ•ã‚¡ã‚¤ãƒ«ã€\n"
+" マージã®éš›ã®è¡çªè§£æ¶ˆã«ä½¿ç”¨ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã€‚ 指定ã•ã‚ŒãŸã‚³ãƒžãƒ³ãƒ‰ã®èµ·å‹•ã«"
+"ã¯ã€ \n"
+" 作æ¥é ˜åŸŸã®ãƒ•ã‚¡ã‚¤ãƒ«ã€ マージ対象別リビジョンã®ãƒ•ã‚¡ã‚¤ãƒ«ã€ \n"
" 両者ã®è¦ªãƒªãƒ“ジョンã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’表ã™3ã¤ã®å¼•æ•°ãŒæŒ‡å®šã•ã‚Œã¾ã™ã€‚"
msgid ""
@@ -10756,21 +11044,21 @@
" the .hg/hgrc from the current repository is read."
msgstr ""
"HGRCPATH\n"
-" è¨å®šãƒ•ã‚¡ã‚¤ãƒ«èªè¾¼ã®ãŸã‚ã®ã€ãƒ•ã‚¡ã‚¤ãƒ«ãªã„ã—ディレクトリã®ä¸€è¦§ã®æŒ‡å®šã€‚\n"
-" 一覧è¦ç´ ã®åŒºåˆ‡ã‚Šè¨˜å·ã¯ã€Unix ãªã‚‰ \":\"ã€WIndows ãªã‚‰ \";\" ã§ã™ã€‚\n"
-" HGRCPATH 環境変数ãŒè¨å®šã•ã‚Œã¦ã„ãªã„å ´åˆã€å„稼åƒç’°å¢ƒã«å¿œã˜ãŸ\n"
-" èªã¿è¾¼ã¿å…ˆã‹ã‚‰èªã¿è¾¼ã¾ã‚Œã¾ã™ã€‚空ã®å€¤ãŒè¨å®šã•ã‚Œã¦ã„ã‚‹å ´åˆã€\n"
+" è¨å®šãƒ•ã‚¡ã‚¤ãƒ«èªè¾¼ã®ãŸã‚ã®ã€ ファイルãªã„ã—ディレクトリã®ä¸€è¦§ã®æŒ‡å®šã€‚\n"
+" 一覧è¦ç´ ã®åŒºåˆ‡ã‚Šè¨˜å·ã¯ã€ Unix ãªã‚‰ \":\"〠WIndows ãªã‚‰ \";\" ã§ã™ã€‚\n"
+" HGRCPATH 環境変数ãŒè¨å®šã•ã‚Œã¦ã„ãªã„å ´åˆã€ å„稼åƒç’°å¢ƒã«å¿œã˜ãŸ\n"
+" èªã¿è¾¼ã¿å…ˆã‹ã‚‰èªã¿è¾¼ã¾ã‚Œã¾ã™ã€‚ 空ã®å€¤ãŒè¨å®šã•ã‚Œã¦ã„ã‚‹å ´åˆã€ \n"
" ç¾ãƒªãƒã‚¸ãƒˆãƒªã® .hg/hgrc ã®ã¿ãŒèªã¿è¾¼ã¾ã‚Œã¾ã™ã€‚"
msgid " For each element in HGRCPATH:"
-msgstr " 指定ã•ã‚ŒãŸä¸€è¦§ã®å„è¦ç´ ã«å¯¾ã—ã¦ã€ä»¥ä¸‹ã®ã‚ˆã†ã«æŒ¯èˆžã„ã¾ã™:"
+msgstr " 指定ã•ã‚ŒãŸä¸€è¦§ã®å„è¦ç´ ã«å¯¾ã—ã¦ã€ 以下ã®ã‚ˆã†ã«æŒ¯èˆžã„ã¾ã™:"
msgid ""
" - if it's a directory, all files ending with .rc are added\n"
" - otherwise, the file itself will be added"
msgstr ""
-" - ディレクトリãªã‚‰ã€é…下㮠\".rc\" ã§çµ‚ã‚ã‚‹åå‰ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’èªã¿è¾¼ã‚€\n"
-" - ファイルãªã‚‰ã€ãã®ãƒ•ã‚¡ã‚¤ãƒ«è‡ªèº«ã‚’èªã¿è¾¼ã‚€"
+" - ディレクトリãªã‚‰ã€ é…下㮠\".rc\" ã§çµ‚ã‚ã‚‹åå‰ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’èªã¿è¾¼ã‚€\n"
+" - ファイルãªã‚‰ã€ ãã®ãƒ•ã‚¡ã‚¤ãƒ«è‡ªèº«ã‚’èªã¿è¾¼ã‚€"
msgid ""
"HGPLAIN\n"
@@ -10781,10 +11069,11 @@
" in the face of existing user configuration."
msgstr ""
"HGPLAIN\n"
-" ã“ã®ç’°å¢ƒå¤‰æ•°ãŒè¨å®šã•ã‚ŒãŸå ´åˆã€Mercurial ã®è¡¨ç¤ºè¨å®šã‚’変更ã—å¾—ã‚‹\n"
-" è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ä¸ã®è¨˜è¿°ãŒå…¨ã¦ç„¡è¦–ã•ã‚Œã¾ã™ã€‚encoding ã‚„ defaults ã®æŒ‡å®šã€\n"
-" verbose モードã€debug モードã€quiet モードã€tracebacks ã‚„å„国語è¨å®šãŒ\n"
-" 対象ã¨ãªã‚Šã¾ã™ã€‚ユーザè¨å®šã‚’温å˜ã—ãŸã¾ã¾ã§ã€ãƒ„ールç‰ã‹ã‚‰ Mercurial ã‚’\n"
+" ã“ã®ç’°å¢ƒå¤‰æ•°ãŒè¨å®šã•ã‚ŒãŸå ´åˆã€ Mercurial ã®è¡¨ç¤ºè¨å®šã‚’変更ã—å¾—ã‚‹\n"
+" è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ä¸ã®è¨˜è¿°ãŒå…¨ã¦ç„¡è¦–ã•ã‚Œã¾ã™ã€‚ encoding ã‚„ defaults ã®æŒ‡å®šã€ \n"
+" verbose モード〠debug モード〠quiet モード〠tracebacks ã‚„å„国語è¨å®š"
+"ãŒ\n"
+" 対象ã¨ãªã‚Šã¾ã™ã€‚ ユーザè¨å®šã‚’温å˜ã—ãŸã¾ã¾ã§ã€ ツールç‰ã‹ã‚‰ Mercurial ã‚’\n"
" 使用ã™ã‚‹å ´åˆã«æœ‰ç”¨ã§ã™ã€‚"
msgid ""
@@ -10792,7 +11081,7 @@
" variables are not overridden."
msgstr ""
" コマンドラインや環境変数ã«ã‚ˆã£ã¦åŒç‰ã®ã‚ªãƒ—ションãŒæ˜Žç¤ºçš„ã«æŒ‡å®šã•ã‚ŒãŸ\n"
-" å ´åˆã«ã¯ã€ã“ららã¯ç„¡è¦–ã•ã‚Œã¾ã›ã‚“。"
+" å ´åˆã«ã¯ã€ ã“ららã¯ç„¡è¦–ã•ã‚Œã¾ã›ã‚“。"
msgid ""
"HGUSER\n"
@@ -10850,11 +11139,13 @@
" defaults to 'vi'."
msgstr ""
"EDITOR\n"
-" コミット時ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®ã‚ˆã†ã«ã€ã‚¨ãƒ‡ã‚£ã‚¿ã§ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ãã€ãƒ¦ãƒ¼ã‚¶ã«ã‚ˆã‚‹\n"
-" 編集を促ã™çŠ¶æ³ãŒã‚ã‚Šã¾ã™ã€‚ãã“ã§ä½¿ç”¨ã•ã‚Œã‚‹ã‚¨ãƒ‡ã‚£ã‚¿ã¯ã€HGEDITORã€VISUAL\n"
+" コミット時ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã®ã‚ˆã†ã«ã€ エディタã§ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ã〠ユーザã«ã‚ˆ"
+"ã‚‹\n"
+" 編集を促ã™çŠ¶æ³ãŒã‚ã‚Šã¾ã™ã€‚ ãã“ã§ä½¿ç”¨ã•ã‚Œã‚‹ã‚¨ãƒ‡ã‚£ã‚¿ã¯ã€ HGEDITOR〠"
+"VISUAL\n"
" ã‚ã‚‹ã„㯠EDITOR 環境変数ã«è¨å®šã•ã‚ŒãŸã‚‚ã®ã‚’(ã“ã®é †åºã§)使用ã—ã¾ã™ã€‚\n"
-" 最åˆã®ç©ºã§ç„¡ã„値ã«è¨å®šã•ã‚ŒãŸç’°å¢ƒå¤‰æ•°ã®å€¤ã‚’使用ã—ã¾ã™ã€‚ã„ãšã‚Œã‚‚未è¨å®š\n"
-" (ã‚ã‚‹ã„ã¯ç©º)ã®å ´åˆã¯ã€'vi' ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚"
+" 最åˆã®ç©ºã§ç„¡ã„値ã«è¨å®šã•ã‚ŒãŸç’°å¢ƒå¤‰æ•°ã®å€¤ã‚’使用ã—ã¾ã™ã€‚ ã„ãšã‚Œã‚‚未è¨å®š\n"
+" (ã‚ã‚‹ã„ã¯ç©º)ã®å ´åˆã¯ã€ 'vi' ãŒä½¿ç”¨ã•ã‚Œã¾ã™ã€‚"
msgid ""
"PYTHONPATH\n"
@@ -10862,8 +11153,8 @@
" set appropriately if this Mercurial is not installed system-wide.\n"
msgstr ""
"PYTHONPATH\n"
-" Mercurial ãŒå½“該システムã®å…±æœ‰é ˜åŸŸã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ãªã„å ´åˆã€\n"
-" Python ãŒå¿…è¦ãªãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã‚’èªã¿è¾¼ã‚€ãŸã‚ã«ã¯ã€ã“ã®ç’°å¢ƒå¤‰æ•°ã®è¨å®šãŒ\n"
+" Mercurial ãŒå½“該システムã®å…±æœ‰é ˜åŸŸã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ãªã„å ´åˆã€ \n"
+" Python ãŒå¿…è¦ãªãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ã‚’èªã¿è¾¼ã‚€ãŸã‚ã«ã¯ã€ ã“ã®ç’°å¢ƒå¤‰æ•°ã®è¨å®šãŒ\n"
" å¿…è¦ã§ã™ã€‚\n"
msgid ""
@@ -10872,9 +11163,9 @@
"existing commands, change the default behavior of commands, or\n"
"implement hooks."
msgstr ""
-"Mercurial ã«ã¯ã€æ–°è¦æ©Ÿèƒ½ã‚’「エクステンションã€ã¨ã„ã†æ©Ÿæ§‹ã‚’用ã„ã¦\n"
-"è¿½åŠ ã™ã‚‹ä»•çµ„ã¿ãŒå‚™ã‚ã£ã¦ã„ã¾ã™ã€‚エクステンションã§ã¯ã€ã‚³ãƒžãƒ³ãƒ‰ã®\n"
-"æ–°è¦è¿½åŠ ã€æ—¢å˜ã‚³ãƒžãƒ³ãƒ‰ã¸ã®ã‚ªãƒ—ションã®è¿½åŠ ã€ã‚³ãƒžãƒ³ãƒ‰ã®æŒ™å‹•ã®å¤‰æ›´ã€\n"
+"Mercurial ã«ã¯ã€ æ–°è¦æ©Ÿèƒ½ã‚’「エクステンションã€ã¨ã„ã†æ©Ÿæ§‹ã‚’用ã„ã¦\n"
+"è¿½åŠ ã™ã‚‹ä»•çµ„ã¿ãŒå‚™ã‚ã£ã¦ã„ã¾ã™ã€‚ エクステンションã§ã¯ã€ コマンドã®\n"
+"æ–°è¦è¿½åŠ 〠既å˜ã‚³ãƒžãƒ³ãƒ‰ã¸ã®ã‚ªãƒ—ションã®è¿½åŠ 〠コマンドã®æŒ™å‹•ã®å¤‰æ›´ã€ \n"
"フックã®å®Ÿè£…ã¨ã„ã£ãŸã“ã¨ãŒå¯èƒ½ã§ã™ã€‚"
msgid ""
@@ -10886,11 +11177,11 @@
"Mercurial. It is thus up to the user to activate extensions as\n"
"needed."
msgstr ""
-"様々ãªäº‹æƒ…ã‹ã‚‰ã€ç‰¹ã«æŒ‡å®šã®ç„¡ã„å ´åˆã«ã¯ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ã¯èªã¿è¾¼ã¾ã‚Œ\n"
-"ã¾ã›ã‚“ã€‚ä»˜åŠ çš„ãªèªã¿è¾¼ã¿ã¯ã€èµ·å‹•æ™‚é–“ã®å¢—åŠ ã‚’æ„味ã—ã¾ã™ã€‚上級用途\n"
-"é™å®šã®ã‚‚ã®ã‚‚ã‚ã‚Šã¾ã™ã€‚(å±¥æ´ã®ç ´å£Šã‚„改変ãªã©ã®)潜在的ãªå±é™ºæ€§ã‚’æŒã¤\n"
-"å ´åˆã‚‚ã‚ã‚Šã¾ã™ã€‚実験的ãªã‚‚ã®ã§ã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。ã“ã‚Œã¾ã§ã®\n"
-"Mercurial ã®æŒ¯ã‚‹èˆžã„を変ãˆã¦ã—ã¾ã†ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。エクステンションを\n"
+"様々ãªäº‹æƒ…ã‹ã‚‰ã€ 特ã«æŒ‡å®šã®ç„¡ã„å ´åˆã«ã¯ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ã¯èªã¿è¾¼ã¾ã‚Œ\n"
+"ã¾ã›ã‚“。 ä»˜åŠ çš„ãªèªã¿è¾¼ã¿ã¯ã€ 起動時間ã®å¢—åŠ ã‚’æ„味ã—ã¾ã™ã€‚ 上級用途\n"
+"é™å®šã®ã‚‚ã®ã‚‚ã‚ã‚Šã¾ã™ã€‚ (å±¥æ´ã®ç ´å£Šã‚„改変ãªã©ã®)潜在的ãªå±é™ºæ€§ã‚’æŒã¤\n"
+"å ´åˆã‚‚ã‚ã‚Šã¾ã™ã€‚ 実験的ãªã‚‚ã®ã§ã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。 ã“ã‚Œã¾ã§ã®\n"
+"Mercurial ã®æŒ¯ã‚‹èˆžã„を変ãˆã¦ã—ã¾ã†ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。 エクステンションを\n"
"å¿…è¦ã«å¿œã˜ã¦æœ‰åŠ¹åŒ–ã™ã‚‹ã®ã¯åˆ©ç”¨è€…ã®è²¬å‹™ã§ã™ã€‚"
msgid ""
@@ -10898,8 +11189,8 @@
"Python search path, create an entry for it in your configuration file,\n"
"like this::"
msgstr ""
-"\"foo\" ã¨ã„ã†ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ã‚’有効化ã™ã‚‹ã«ã¯ã€\n"
-"Mercurial åŒæ¢±ã®ã‚‚ã®ã§ã‚ã‚ã†ã¨ã€Python ã®æ¤œç´¢ãƒ‘スä¸ã®ã‚‚ã®ã§ã‚ã‚ã†ã¨ã€\n"
+"\"foo\" ã¨ã„ã†ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ã‚’有効化ã™ã‚‹ã«ã¯ã€ \n"
+"Mercurial åŒæ¢±ã®ã‚‚ã®ã§ã‚ã‚ã†ã¨ã€ Python ã®æ¤œç´¢ãƒ‘スä¸ã®ã‚‚ã®ã§ã‚ã‚ã†ã¨ã€ \n"
"è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«ãŠã„ã¦ä»¥ä¸‹ã®ã‚ˆã†ãªè¨˜è¿°ãŒå¿…è¦ã§ã™::"
msgid ""
@@ -10923,7 +11214,7 @@
"To explicitly disable an extension enabled in a configuration file of\n"
"broader scope, prepend its path with !::"
msgstr ""
-"明示的ã«ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ã‚’無効化ã™ã‚‹å ´åˆã€é©åˆ‡ãªè¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«ãŠã„ã¦\n"
+"明示的ã«ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ã‚’無効化ã™ã‚‹å ´åˆã€ é©åˆ‡ãªè¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«ãŠã„ã¦\n"
"パス指定部分㫠'!' を記述ã—ã¾ã™::"
msgid ""
@@ -10948,10 +11239,10 @@
" ancestor. See also: 'Descendant'."
msgstr ""
"Ancestor\n"
-" [祖先] 指定ã•ã‚ŒãŸãƒªãƒ“ジョンã‹ã‚‰ã€è¦ªãƒªãƒ“ã‚¸ãƒ§ãƒ³ã‚’é †ã«è¾¿ã‚‹äº‹ã§åˆ°é”\n"
-" å¯èƒ½ãªä»»æ„ã®ãƒªãƒ“ジョンã®ã“ã¨ã€‚よりæ£ç¢ºã«ã¯ã€ã‚るリビジョンã«ã¨ã£ã¦ã¯\n"
-" 直接ã®è¦ªãƒªãƒ“ジョンã¯ç¥–å…ˆã§ã‚ã‚Šã€ç¥–å…ˆ(ï¼ç›´æŽ¥ã®è¦ªãƒªãƒ“ジョンå«ã‚€)ã®\n"
-" 親リビジョンも祖先ã¨ãªã‚Šã¾ã™ã€‚'Descendant' ã‚‚å‚ç…§ã®ã“ã¨ã€‚"
+" [祖先] 指定ã•ã‚ŒãŸãƒªãƒ“ジョンã‹ã‚‰ã€ è¦ªãƒªãƒ“ã‚¸ãƒ§ãƒ³ã‚’é †ã«è¾¿ã‚‹äº‹ã§åˆ°é”\n"
+" å¯èƒ½ãªä»»æ„ã®ãƒªãƒ“ジョンã®ã“ã¨ã€‚ よりæ£ç¢ºã«ã¯ã€ ã‚るリビジョンã«ã¨ã£ã¦ã¯\n"
+" 直接ã®è¦ªãƒªãƒ“ジョンã¯ç¥–å…ˆã§ã‚り〠祖先(ï¼ç›´æŽ¥ã®è¦ªãƒªãƒ“ジョンå«ã‚€)ã®\n"
+" 親リビジョンも祖先ã¨ãªã‚Šã¾ã™ã€‚ 'Descendant' ã‚‚å‚ç…§ã®ã“ã¨ã€‚"
msgid ""
"Branch\n"
@@ -10963,11 +11254,11 @@
msgstr ""
"Branch\n"
" (åè©ž) [ブランãƒ] ヘッドã§ã¯ãªã„(ï¼ ä»–ã«åリビジョンをæŒã¤)\n"
-" リビジョンを親ã¨ã—ã¦ã€æ–°è¦ã«ä½œæˆã•ã‚ŒãŸåリビジョンã®ã“ã¨ã€‚\n"
+" リビジョンを親ã¨ã—ã¦ã€ æ–°è¦ã«ä½œæˆã•ã‚ŒãŸåリビジョンã®ã“ã¨ã€‚\n"
" ã“ã‚Œã¯ã€Œä½ç›¸çš„ (topological) ブランãƒã€ã¨å‘¼ã°ã‚Œã¾ã™ã€‚\n"
" ('Branch, topological' å‚ç…§) ä½ç›¸çš„ブランãƒã«åå‰ãŒä»˜ä¸Žã•ã‚ŒãŸå ´åˆã¯\n"
-" 「åå‰ä»˜ãブランãƒã€ã¨å‘¼ã°ã‚Œã¾ã™ã€‚åå‰ã‚’æŒãŸãªã„ä½ç›¸çš„ブランãƒã¯ã€\n"
-" 「åå‰ç„¡ã—ブランãƒã€ã¨å‘¼ã°ã‚Œã¾ã™ã€‚'Branch, anonymous' ãŠã‚ˆã³ \n"
+" 「åå‰ä»˜ãブランãƒã€ã¨å‘¼ã°ã‚Œã¾ã™ã€‚ åå‰ã‚’æŒãŸãªã„ä½ç›¸çš„ブランãƒã¯ã€ \n"
+" 「åå‰ç„¡ã—ブランãƒã€ã¨å‘¼ã°ã‚Œã¾ã™ã€‚ 'Branch, anonymous' ãŠã‚ˆã³ \n"
" 'Branch, named' ã‚‚å‚ç…§ã®ã“ã¨ã€‚"
msgid ""
@@ -10975,16 +11266,16 @@
" a remote repository, since new heads may be created by these\n"
" operations. Note that the term branch can also be used informally\n"
" to describe a development process in which certain development is\n"
-" done independently of other development.This is sometimes done\n"
+" done independently of other development. This is sometimes done\n"
" explicitly with a named branch, but it can also be done locally,\n"
" using bookmarks or clones and anonymous branches."
msgstr ""
-" ブランãƒã¯ã€åˆ¥ã®ãƒªãƒã‚¸ãƒˆãƒªã¨ã®é–“ã§ã®é€£æº (åæ˜ ï¼å–ã‚Šè¾¼ã¿) ã®éš›ã«\n"
-" 連æºå…ˆã§ç”Ÿæˆã•ã‚ŒãŸãƒªãƒ“ジョンãŒæ–°è¦ãƒ˜ãƒƒãƒ‰ã¨ã—ã¦å–ã‚Šè¾¼ã¾ã‚Œã‚‹ã“ã¨ã§ã€\n"
-" 生æˆã•ã‚Œã‚‹å ´åˆãŒã‚ã‚Šã¾ã™ã€‚「ブランãƒã€ã¨ã„ã†å‘¼ç§°ã¯ã€åˆ©ç”¨è€…ãŒç‹¬ç«‹ã—ã¦\n"
-" 開発を行ã†éŽç¨‹ã‚’指ã™ã®ã«ä½¿ç”¨ã•ã‚Œã‚‹å ´åˆãŒã‚ã‚Šã¾ã™ã€‚ã“ã®ã‚ˆã†ãªç›¸äº’ã«\n"
-" 独立ã—ãŸé–‹ç™ºã¯ã€åå‰ä»˜ãブランãƒã‚’明示的ã«ä½œæˆã—ã¦å®Ÿæ–½ã•ã‚Œã‚‹ã“ã¨ã‚‚\n"
-" ã‚ã‚Œã°ã€ãƒ–ックマーク機能やã€è¤‡è£½ã¨åå‰ç„¡ã—ブランãƒã‚’使用ã™ã‚‹ã“ã¨ã§\n"
+" ブランãƒã¯ã€ 別ã®ãƒªãƒã‚¸ãƒˆãƒªã¨ã®é–“ã§ã®é€£æº (åæ˜ ï¼å–ã‚Šè¾¼ã¿) ã®éš›ã«\n"
+" 連æºå…ˆã§ç”Ÿæˆã•ã‚ŒãŸãƒªãƒ“ジョンãŒæ–°è¦ãƒ˜ãƒƒãƒ‰ã¨ã—ã¦å–ã‚Šè¾¼ã¾ã‚Œã‚‹ã“ã¨ã§ã€ \n"
+" 生æˆã•ã‚Œã‚‹å ´åˆãŒã‚ã‚Šã¾ã™ã€‚ 「ブランãƒã€ã¨ã„ã†å‘¼ç§°ã¯ã€ 利用者ãŒç‹¬ç«‹ã—ã¦\n"
+" 開発を行ã†éŽç¨‹ã‚’指ã™ã®ã«ä½¿ç”¨ã•ã‚Œã‚‹å ´åˆãŒã‚ã‚Šã¾ã™ã€‚ ã“ã®ã‚ˆã†ãªç›¸äº’ã«\n"
+" 独立ã—ãŸé–‹ç™ºã¯ã€ åå‰ä»˜ãブランãƒã‚’明示的ã«ä½œæˆã—ã¦å®Ÿæ–½ã•ã‚Œã‚‹ã“ã¨ã‚‚\n"
+" ã‚ã‚Œã°ã€ ブックマーク機能や〠複製ã¨åå‰ç„¡ã—ブランãƒã‚’使用ã™ã‚‹ã“ã¨ã§\n"
" 実施ã•ã‚Œã‚‹å ´åˆã‚‚ã‚ã‚Šã¾ã™ã€‚"
msgid " Example: \"The experimental branch\"."
@@ -11008,15 +11299,15 @@
msgstr ""
"Branch, anonymous\n"
" [åå‰ç„¡ã—ブランãƒ/匿åブランãƒ] ヘッドã§ã¯ãªã„(ï¼ ä»–ã«åリビジョンを\n"
-" æŒã¤)リビジョンを親ã¨ã—ã¦ã€æ–°è¦ã«ä½œæˆã•ã‚ŒãŸãƒªãƒ“ジョンãŒã€è¦ªã¨åŒã˜\n"
-" ブランãƒã«å±žã™ã‚‹å ´åˆã€åå‰ç„¡ã—ブランãƒãŒä½œæˆã•ã‚ŒãŸã¨ã¿ãªã•ã‚Œã¾ã™ã€‚"
+" æŒã¤)リビジョンを親ã¨ã—ã¦ã€ æ–°è¦ã«ä½œæˆã•ã‚ŒãŸãƒªãƒ“ジョンãŒã€ 親ã¨åŒã˜\n"
+" ブランãƒã«å±žã™ã‚‹å ´åˆã€ åå‰ç„¡ã—ブランãƒãŒä½œæˆã•ã‚ŒãŸã¨ã¿ãªã•ã‚Œã¾ã™ã€‚"
msgid ""
"Branch, closed\n"
" A named branch whose branch heads have all been closed."
msgstr ""
"Branch, closed\n"
-" [閉鎖ブランãƒ] å…¨ã¦ã®ãƒ˜ãƒƒãƒ‰ãŒé–‰éŽ–ã•ã‚ŒãŸã€åå‰ä»˜ãブランãƒã®ã“ã¨ã€‚"
+" [閉鎖ブランãƒ] å…¨ã¦ã®ãƒ˜ãƒƒãƒ‰ãŒé–‰éŽ–ã•ã‚ŒãŸã€ åå‰ä»˜ãブランãƒã®ã“ã¨ã€‚"
msgid ""
"Branch, default\n"
@@ -11024,7 +11315,7 @@
" assigned."
msgstr ""
"Branch, default\n"
-" [デフォルトブランãƒ] åå‰ä»˜ãブランãƒã¸ã®æ‰€å±žãŒã€æ˜Žç¤ºçš„ã«æŒ‡å®š\n"
+" [デフォルトブランãƒ] åå‰ä»˜ãブランãƒã¸ã®æ‰€å±žãŒã€ 明示的ã«æŒ‡å®š\n"
" ã•ã‚Œãªã„リビジョンãŒå±žã™ã‚‹ãƒ–ランãƒã®ã“ã¨ã€‚"
msgid ""
@@ -11060,10 +11351,10 @@
msgstr ""
"Branch, named\n"
" [åå‰ä»˜ãブランãƒ] åŒä¸€ã®ãƒ–ランãƒåã‚’æŒã¤ãƒªãƒ“ジョンã®é›†åˆã®ã“ã¨ã€‚\n"
-" åå‰ä»˜ãブランãƒã«å±žã™ã‚‹ãƒªãƒ“ジョンã®åリビジョンã¯ã€åŒã˜åå‰ä»˜ã\n"
-" ブランãƒã«å±žã—ã¾ã™ã€‚明示的ã«æŒ‡å®šã™ã‚‹ã“ã¨ã§ã€åリビジョンを別ãª\n"
-" åå‰ä»˜ãブランãƒã«æ‰€å±žã•ã›ã‚‹ã“ã¨ã‚‚å¯èƒ½ã§ã™ã€‚ブランãƒç®¡ç†ã®è©³ç´°ã¯ã€\n"
-" :hg:`help branch`ã€:hg:`help branches` ãŠã‚ˆã³ \n"
+" åå‰ä»˜ãブランãƒã«å±žã™ã‚‹ãƒªãƒ“ジョンã®åリビジョンã¯ã€ åŒã˜åå‰ä»˜ã\n"
+" ブランãƒã«å±žã—ã¾ã™ã€‚ 明示的ã«æŒ‡å®šã™ã‚‹ã“ã¨ã§ã€ åリビジョンを別ãª\n"
+" åå‰ä»˜ãブランãƒã«æ‰€å±žã•ã›ã‚‹ã“ã¨ã‚‚å¯èƒ½ã§ã™ã€‚ ブランãƒç®¡ç†ã®è©³ç´°ã¯ã€ \n"
+" :hg:`help branch`〠:hg:`help branches` ãŠã‚ˆã³ \n"
" :hg:`commit --close-branch` ã‚’å‚ç…§ã®ã“ã¨ã€‚"
msgid ""
@@ -11075,12 +11366,12 @@
" further changesets are added to that previous branch, then that\n"
" previous branch will be a branch in name only."
msgstr ""
-" åå‰ä»˜ãブランãƒã¯ã€ãƒªãƒã‚¸ãƒˆãƒªã®å±¥æ´ã‚’構æˆã™ã‚‹ãƒªãƒ“ジョン群をã€\n"
-" é‡è¤‡ã®ç„¡ã„部分集åˆã¸ã¨åˆ†å‰²ã™ã‚‹ã€åå‰ç©ºé–“ã®ä¸€ç¨®ã¨ã‚‚言ãˆã¾ã™ã€‚\n"
-" åå‰ä»˜ãブランãƒã¯ã€å¿…ãšã—ã‚‚ä½ç›¸çš„ブランãƒã§ã‚ã‚‹å¿…è¦ã¯ã‚ã‚Šã¾ã›ã‚“。\n"
+" åå‰ä»˜ãブランãƒã¯ã€ リãƒã‚¸ãƒˆãƒªã®å±¥æ´ã‚’構æˆã™ã‚‹ãƒªãƒ“ジョン群を〠\n"
+" é‡è¤‡ã®ç„¡ã„部分集åˆã¸ã¨åˆ†å‰²ã™ã‚‹ã€ åå‰ç©ºé–“ã®ä¸€ç¨®ã¨ã‚‚言ãˆã¾ã™ã€‚\n"
+" åå‰ä»˜ãブランãƒã¯ã€ å¿…ãšã—ã‚‚ä½ç›¸çš„ブランãƒã§ã‚ã‚‹å¿…è¦ã¯ã‚ã‚Šã¾ã›ã‚“。\n"
" ä»»æ„ã®åå‰ä»˜ãブランãƒ(default ã§ã‚‚å¯)ã®ãƒ˜ãƒƒãƒ‰ã¨ãªã‚‹ãƒªãƒ“ジョンを\n"
-" 親ã¨ã—ã¦ã€æ–°ãŸãªåå‰ä»˜ãブランãƒã‚’生æˆã—ãŸå ´åˆã€å…ƒã¨ãªã‚‹ãƒ–ランãƒã«\n"
-" æ–°ãŸãªãƒªãƒ“ジョンãŒè¿½åŠ ã•ã‚Œãªã‘ã‚Œã°ã€å…ƒã®ãƒ–ランãƒã¯ (ä½ç›¸çš„ãª\n"
+" 親ã¨ã—ã¦ã€ æ–°ãŸãªåå‰ä»˜ãブランãƒã‚’生æˆã—ãŸå ´åˆã€ å…ƒã¨ãªã‚‹ãƒ–ランãƒã«\n"
+" æ–°ãŸãªãƒªãƒ“ジョンãŒè¿½åŠ ã•ã‚Œãªã‘ã‚Œã°ã€ å…ƒã®ãƒ–ランãƒã¯ (ä½ç›¸çš„ãª\n"
" ブランãƒã§ã¯ãªã) åå‰ä»˜ã‘ã®ãŸã‚ã ã‘ã®ãƒ–ランãƒã¨è¨€ãˆã¾ã™ã€‚"
msgid ""
@@ -11100,9 +11391,9 @@
msgstr ""
"Branch, topological\n"
" [ä½ç›¸çš„ブランãƒ] ヘッドã§ã¯ãªã„(ï¼ ä»–ã«åリビジョンをæŒã¤)\n"
-" リビジョンを親ã¨ã—ã¦ã€æ–°è¦ã«ä½œæˆã•ã‚ŒãŸãƒªãƒ“ジョンã¯ã€ä½ç›¸çš„ブランãƒ\n"
-" ã¨ãªã‚Šã¾ã™ã€‚ä½ç›¸çš„ブランãƒã«åå‰ãŒä¸Žãˆã‚‰ã‚ŒãŸå ´åˆã€ãã‚Œã¯åå‰ä»˜ã\n"
-" ブランãƒã¨ãªã‚Šã¾ã™ã€‚ä½ç›¸çš„ブランãƒã«åå‰ãŒä¸Žãˆã‚‰ã‚Œãªã„å ´åˆã€ç¾è¡Œ\n"
+" リビジョンを親ã¨ã—ã¦ã€ æ–°è¦ã«ä½œæˆã•ã‚ŒãŸãƒªãƒ“ジョンã¯ã€ ä½ç›¸çš„ブランãƒ\n"
+" ã¨ãªã‚Šã¾ã™ã€‚ ä½ç›¸çš„ブランãƒã«åå‰ãŒä¸Žãˆã‚‰ã‚ŒãŸå ´åˆã€ ãã‚Œã¯åå‰ä»˜ã\n"
+" ブランãƒã¨ãªã‚Šã¾ã™ã€‚ ä½ç›¸çš„ブランãƒã«åå‰ãŒä¸Žãˆã‚‰ã‚Œãªã„å ´åˆã€ ç¾è¡Œ\n"
" ブランム(通常㯠default) ã«ãŠã‘ã‚‹ç„¡åブランãƒã¨ãªã‚Šã¾ã™ã€‚"
msgid ""
@@ -11112,22 +11403,22 @@
" author, commit message, date, and list of changed files."
msgstr ""
"Changelog\n"
-" [変更履æ´/ãƒã‚§ãƒ³ã‚¸ãƒã‚°] å„リビジョンã®å†…容をã€ãƒªãƒã‚¸ãƒˆãƒªã«ç™»éŒ²ã•ã‚ŒãŸ\n"
-" é †ã«è¨˜éŒ²ã—ãŸã‚‚ã®ã€‚記録内容ã«ã¯ã€è˜åˆ¥ç”¨ãƒãƒƒã‚·ãƒ¥å€¤ã€ 作æˆè€…åã€\n"
-" コミットãƒã‚°ã€æ—¥ä»˜ãŠã‚ˆã³å¤‰æ›´å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ã®ä¸€è¦§ãŒå«ã¾ã‚Œã¾ã™ã€‚"
+" [変更履æ´/ãƒã‚§ãƒ³ã‚¸ãƒã‚°] å„リビジョンã®å†…容を〠リãƒã‚¸ãƒˆãƒªã«ç™»éŒ²ã•ã‚ŒãŸ\n"
+" é †ã«è¨˜éŒ²ã—ãŸã‚‚ã®ã€‚ 記録内容ã«ã¯ã€ è˜åˆ¥ç”¨ãƒãƒƒã‚·ãƒ¥å€¤ã€ 作æˆè€…å〠\n"
+" コミットãƒã‚°ã€ 日付ãŠã‚ˆã³å¤‰æ›´å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ã®ä¸€è¦§ãŒå«ã¾ã‚Œã¾ã™ã€‚"
msgid ""
"Changeset\n"
" A snapshot of the state of the repository used to record a change."
msgstr ""
"Changeset\n"
-" [ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆ] 変更内容ã®è¨˜éŒ²ã«ä½¿ç”¨ã™ã‚‹ã€ãƒªãƒã‚¸ãƒˆãƒªçŠ¶æ…‹ã®\n"
-" スナップショット。 ※ 訳注: æ´å²çš„ãªçµŒç·¯ã‹ã‚‰ã€ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã¨\n"
-" リビジョンã¯é€šå¸¸ã€åŒã˜æ„味ã§ä½¿ç”¨ã•ã‚Œã‚‹ã‚±ãƒ¼ã‚¹ãŒå¤šã„ã§ã™ã€‚日本語訳ã®\n"
-" éš›ã«ã¯ã€è¤‡æ•°ãƒ•ã‚¡ã‚¤ãƒ«ã«æ¸¡ã‚‹å·®åˆ†ä¸€å¼ã®ã“ã¨ã‚’指ã™å ´åˆã¯ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã€\n"
+" [ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆ] 変更内容ã®è¨˜éŒ²ã«ä½¿ç”¨ã™ã‚‹ã€ リãƒã‚¸ãƒˆãƒªçŠ¶æ…‹ã®\n"
+" スナップショット。 ※ 訳注: æ´å²çš„ãªçµŒç·¯ã‹ã‚‰ã€ ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã¨\n"
+" リビジョンã¯é€šå¸¸ã€ åŒã˜æ„味ã§ä½¿ç”¨ã•ã‚Œã‚‹ã‚±ãƒ¼ã‚¹ãŒå¤šã„ã§ã™ã€‚ 日本語訳ã®\n"
+" éš›ã«ã¯ã€ 複数ファイルã«æ¸¡ã‚‹å·®åˆ†ä¸€å¼ã®ã“ã¨ã‚’指ã™å ´åˆã¯ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã€ \n"
" リãƒã‚¸ãƒˆãƒªã«ç™»éŒ²ã•ã‚Œã‚‹ã“ã¨ã§å±¥æ´ä¸ã®ä½ç½®ãŒç¢ºå®šæ¸ˆã¿ã®ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆ\n"
-" ã®ã“ã¨ã¯ãƒªãƒ“ジョンã€ã¨å‘¼ç§°ã™ã‚‹ã“ã¨ãŒå¤šã„ã§ã™ãŒã€å¿…ãšã—も統一\n"
-" ã•ã‚Œã¦ã„る訳ã§ã¯ã‚ã‚Šã¾ã›ã‚“。'Revision' ã‚‚å‚ç…§ã®ã“ã¨ã€‚"
+" ã®ã“ã¨ã¯ãƒªãƒ“ジョン〠ã¨å‘¼ç§°ã™ã‚‹ã“ã¨ãŒå¤šã„ã§ã™ãŒã€ å¿…ãšã—も統一\n"
+" ã•ã‚Œã¦ã„る訳ã§ã¯ã‚ã‚Šã¾ã›ã‚“。 'Revision' ã‚‚å‚ç…§ã®ã“ã¨ã€‚"
msgid ""
"Changeset, child\n"
@@ -11137,22 +11428,22 @@
msgstr ""
"Changeset, child\n"
" [åãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆ/åリビジョン] 「親リビジョンã€ã®å¯¾ç¾©èªžã€‚\n"
-" リビジョン P ãŒãƒªãƒ“ジョン C ã®è¦ªãƒªãƒ“ジョンã§ã‚ã‚‹å ´åˆã€C 㯠P ã®\n"
-" åリビジョンã¨ãªã‚Šã¾ã™ã€‚1ã¤ã®è¦ªãƒªãƒ“ジョンã«å¯¾ã—ã¦ã€åリビジョンã®\n"
-" æ•°ã«ã¯ä¸Šé™ãŒã‚ã‚Šã¾ã›ã‚“。 訳注: 親ï¼å関係をæŒã¤ã€ã¨ã„ã†ã“ã¨ã¯ã€\n"
-" å±¥æ´ä¸ã®ä½ç½®ãŒç¢ºå®šã—ã¦ã„ã‚‹ã“ã¨ã‚’æ„味ã™ã‚‹ãŸã‚ã€ã“ã“ã§ã¯æ•¢ãˆã¦\n"
-" changeset を「リビジョンã€ã¨è¨³ã—ã¦ã„ã¾ã™ã€‚'Changeset' ã‚‚å‚ç…§ã®ã“ã¨ã€‚"
+" リビジョン P ãŒãƒªãƒ“ジョン C ã®è¦ªãƒªãƒ“ジョンã§ã‚ã‚‹å ´åˆã€ C 㯠P ã®\n"
+" åリビジョンã¨ãªã‚Šã¾ã™ã€‚ 1ã¤ã®è¦ªãƒªãƒ“ジョンã«å¯¾ã—ã¦ã€ åリビジョンã®\n"
+" æ•°ã«ã¯ä¸Šé™ãŒã‚ã‚Šã¾ã›ã‚“。 訳注: 親ï¼å関係をæŒã¤ã€ ã¨ã„ã†ã“ã¨ã¯ã€ \n"
+" å±¥æ´ä¸ã®ä½ç½®ãŒç¢ºå®šã—ã¦ã„ã‚‹ã“ã¨ã‚’æ„味ã™ã‚‹ãŸã‚〠ã“ã“ã§ã¯æ•¢ãˆã¦\n"
+" changeset を「リビジョンã€ã¨è¨³ã—ã¦ã„ã¾ã™ã€‚ 'Changeset' ã‚‚å‚ç…§ã®ã“ã¨ã€‚"
msgid ""
"Changeset id\n"
" A SHA-1 hash that uniquely identifies a changeset. It may be\n"
-" represented as either a \"long\" 40-byte hexadecimal string, or a\n"
-" \"short\" 12-byte hexadecimal string."
+" represented as either a \"long\" 40 hexadecimal digit string, or a\n"
+" \"short\" 12 hexadecimal digit string."
msgstr ""
"Changeset id\n"
" [ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆID/è˜åˆ¥ç”¨ãƒãƒƒã‚·ãƒ¥å€¤] ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã‚’一æ„ã«è˜åˆ¥\n"
-" ã™ã‚‹ãŸã‚ã® SHA-1 ãƒãƒƒã‚·ãƒ¥å€¤ã€‚40 æ¡ 16 進数ã¨ã—ã¦è¡¨ç¾ã•ã‚Œã‚‹\n"
-" 「完全長ã€ã¨ã€12 æ¡ 16 進数ã¨ã—ã¦è¡¨ç¾ã•ã‚Œã‚‹ã€ŒçŸç¸®ã€ã®å½¢å¼ãŒã‚ã‚Šã¾ã™ã€‚"
+" ã™ã‚‹ãŸã‚ã® SHA-1 ãƒãƒƒã‚·ãƒ¥å€¤ã€‚ 40 æ¡ 16 進数ã¨ã—ã¦è¡¨ç¾ã•ã‚Œã‚‹\n"
+" 「完全長ã€ã¨ã€ 12 æ¡ 16 進数ã¨ã—ã¦è¡¨ç¾ã•ã‚Œã‚‹ã€ŒçŸç¸®ã€ã®å½¢å¼ãŒã‚ã‚Šã¾ã™ã€‚"
msgid ""
"Changeset, merge\n"
@@ -11161,10 +11452,10 @@
msgstr ""
"Changeset, merge\n"
" [マージãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆ/マージリビジョン] 親リビジョンを２ã¤æŒã¤\n"
-" リビジョン。マージæ“作ãŒã‚³ãƒŸãƒƒãƒˆã•ã‚Œã‚‹éš›ã«ã“ã®ã‚ˆã†ãªãƒªãƒ“ジョンãŒ\n"
-" 生æˆã•ã‚Œã¾ã™ã€‚※ 訳注: 親ï¼å関係をæŒã¤ã€ã¨ã„ã†ã“ã¨ã¯ã€å±¥æ´ä¸ã®\n"
-" ä½ç½®ãŒç¢ºå®šã—ã¦ã„ã‚‹ã“ã¨ã‚’æ„味ã™ã‚‹ãŸã‚ã€ã“ã“ã§ã¯æ•¢ãˆã¦ changeset ã‚’\n"
-" 「リビジョンã€ã¨è¨³ã—ã¦ã„ã¾ã™ã€‚'Changeset' ã‚‚å‚ç…§ã®ã“ã¨ã€‚"
+" リビジョン。 マージæ“作ãŒã‚³ãƒŸãƒƒãƒˆã•ã‚Œã‚‹éš›ã«ã“ã®ã‚ˆã†ãªãƒªãƒ“ジョンãŒ\n"
+" 生æˆã•ã‚Œã¾ã™ã€‚ ※ 訳注: 親ï¼å関係をæŒã¤ã€ ã¨ã„ã†ã“ã¨ã¯ã€ å±¥æ´ä¸ã®\n"
+" ä½ç½®ãŒç¢ºå®šã—ã¦ã„ã‚‹ã“ã¨ã‚’æ„味ã™ã‚‹ãŸã‚〠ã“ã“ã§ã¯æ•¢ãˆã¦ changeset ã‚’\n"
+" 「リビジョンã€ã¨è¨³ã—ã¦ã„ã¾ã™ã€‚ 'Changeset' ã‚‚å‚ç…§ã®ã“ã¨ã€‚"
msgid ""
"Changeset, parent\n"
@@ -11175,12 +11466,12 @@
msgstr ""
"Changeset, parent\n"
" [親ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆ/親リビジョン] åリビジョンã®ç”±æ¥å…ƒã®ãƒªãƒ“ジョン。\n"
-" より明確ã«ã¯ã€ãƒªãƒ“ジョン C ã®è¦ªãƒªãƒ“ジョンã¯ã€(æ—§â†’æ–°é †ã®) å±¥æ´\n"
-" ツリーã«ãŠã„ã¦ã€ãƒªãƒ“ジョン C ã®ç›´å‰ã«ä½ç½®ã™ã‚‹ãƒªãƒ“ジョンを指ã—ã¾ã™ã€‚\n"
-" å„リビジョンã¯ã€æœ€å¤§ã§ 2 ã¤ã®è¦ªãƒªãƒ“ジョンをæŒã¡ã¾ã™ã€‚\n"
-" ※ 訳注: 親ï¼å関係をæŒã¤ã€ã¨ã„ã†ã“ã¨ã¯ã€å±¥æ´ä¸ã®ä½ç½®ãŒç¢ºå®šã—ã¦ã„ã‚‹\n"
-" ã“ã¨ã‚’æ„味ã™ã‚‹ãŸã‚ã€ã“ã“ã§ã¯æ•¢ãˆã¦ changeset を「リビジョンã€ã¨\n"
-" 訳ã—ã¦ã„ã¾ã™ã€‚'Changeset' ã‚‚å‚ç…§ã®ã“ã¨ã€‚"
+" より明確ã«ã¯ã€ リビジョン C ã®è¦ªãƒªãƒ“ジョンã¯ã€ (æ—§â†’æ–°é †ã®) å±¥æ´\n"
+" ツリーã«ãŠã„ã¦ã€ リビジョン C ã®ç›´å‰ã«ä½ç½®ã™ã‚‹ãƒªãƒ“ジョンを指ã—ã¾ã™ã€‚\n"
+" å„リビジョンã¯ã€ 最大㧠2 ã¤ã®è¦ªãƒªãƒ“ジョンをæŒã¡ã¾ã™ã€‚\n"
+" ※ 訳注: 親ï¼å関係をæŒã¤ã€ ã¨ã„ã†ã“ã¨ã¯ã€ å±¥æ´ä¸ã®ä½ç½®ãŒç¢ºå®šã—ã¦ã„ã‚‹\n"
+" ã“ã¨ã‚’æ„味ã™ã‚‹ãŸã‚〠ã“ã“ã§ã¯æ•¢ãˆã¦ changeset を「リビジョンã€ã¨\n"
+" 訳ã—ã¦ã„ã¾ã™ã€‚ 'Changeset' ã‚‚å‚ç…§ã®ã“ã¨ã€‚"
msgid ""
"Checkout\n"
@@ -11190,8 +11481,8 @@
msgstr ""
"Checkout\n"
" (åè©ž) [ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆ] 指定ã—ãŸãƒªãƒ“ジョン時点ã®å†…容ã§æ›´æ–°ã•ã‚ŒãŸ\n"
-" 作æ¥é ˜åŸŸã®ã“ã¨ã€‚åŒç‰ã®æ„味を表ã™å ´åˆã€ã€Œãƒªãƒ“ジョンã€ã®æ–¹ãŒå¦¥å½“ã§\n"
-" ã‚ã‚‹ãŸã‚ã€ã“ã®ç”¨æ³•ã§ã®ä½¿ç”¨ã¯é¿ã‘ã‚‹ã¹ãã§ã™ã€‚"
+" 作æ¥é ˜åŸŸã®ã“ã¨ã€‚ åŒç‰ã®æ„味を表ã™å ´åˆã€ 「リビジョンã€ã®æ–¹ãŒå¦¥å½“ã§\n"
+" ã‚ã‚‹ãŸã‚〠ã“ã®ç”¨æ³•ã§ã®ä½¿ç”¨ã¯é¿ã‘ã‚‹ã¹ãã§ã™ã€‚"
msgid " Example: \"I'm using checkout X.\""
msgstr " 例: \"ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã—㟠X を使用ã™ã‚‹ã€‚\""
@@ -11200,8 +11491,8 @@
" (Verb) Updating the working directory to a specific changeset. See\n"
" :hg:`help update`."
msgstr ""
-" (å‹•è©ž) [ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã™ã‚‹] 指定ã—ãŸãƒªãƒ“ジョンã®å†…容ã§ã€ä½œæ¥é ˜åŸŸã‚’\n"
-" æ›´æ–°ã™ã‚‹ã“ã¨ã€‚ :hg:`help update` ã‚‚å‚ç…§ã®ã“ã¨ã€‚"
+" (å‹•è©ž) [ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã™ã‚‹] 指定ã—ãŸãƒªãƒ“ジョンã®å†…容ã§ã€ 作æ¥é ˜åŸŸã‚’\n"
+" æ›´æ–°ã™ã‚‹ã“ã¨ã€‚ :hg:`help update` ã‚‚å‚ç…§ã®ã“ã¨ã€‚"
msgid " Example: \"I'm going to check out changeset X.\""
msgstr " 例: \"リビジョン X ã‚’ãƒã‚§ãƒƒã‚¯ã‚¢ã‚¦ãƒˆã™ã‚‹ã€‚\""
@@ -11233,8 +11524,8 @@
" clone must be in the form of a revision and its ancestors."
msgstr ""
"Clone\n"
-" (åè©ž) [複製(リãƒã‚¸ãƒˆãƒª)] ã‚るリãƒã‚¸ãƒˆãƒªã‹ã‚‰ã€å…¨ä½“ãªã„ã—一部を複製\n"
-" ã—ãŸãƒªãƒã‚¸ãƒˆãƒªã®ã“ã¨ã€‚部分複製リãƒã‚¸ãƒˆãƒªã®æŒã¤å¤‰æ›´å±¥æ´ã¯ã€\n"
+" (åè©ž) [複製(リãƒã‚¸ãƒˆãƒª)] ã‚るリãƒã‚¸ãƒˆãƒªã‹ã‚‰ã€ 全体ãªã„ã—一部を複製\n"
+" ã—ãŸãƒªãƒã‚¸ãƒˆãƒªã®ã“ã¨ã€‚ 部分複製リãƒã‚¸ãƒˆãƒªã®æŒã¤å¤‰æ›´å±¥æ´ã¯ã€ \n"
" 指定リビジョンã¨ãã®ç¥–å…ˆã‹ã‚‰æ§‹æˆã•ã‚Œã¾ã™ã€‚"
msgid " Example: \"Is your clone up to date?\"."
@@ -11260,13 +11551,13 @@
" (Noun) A synonym for changeset."
msgstr ""
"Commit\n"
-" (åè©ž) [コミット] リビジョンã®åˆ¥ç§°ã€‚ ※ 訳注: コミット済ã¿\n"
-" ã¨ã„ã†ã“ã¨ã¯ã€å±¥æ´ä¸ã®ä½ç½®ãŒç¢ºå®šã—ã¦ã„ã‚‹ã“ã¨ã‚’æ„味ã™ã‚‹ãŸã‚ã€\n"
+" (åè©ž) [コミット] リビジョンã®åˆ¥ç§°ã€‚ ※ 訳注: コミット済ã¿\n"
+" ã¨ã„ã†ã“ã¨ã¯ã€ å±¥æ´ä¸ã®ä½ç½®ãŒç¢ºå®šã—ã¦ã„ã‚‹ã“ã¨ã‚’æ„味ã™ã‚‹ãŸã‚〠\n"
" ã“ã“ã§ã¯æ•¢ãˆã¦ changeset を「リビジョンã€ã¨è¨³ã—ã¦ã„ã¾ã™ã€‚\n"
" 'Changeset' ã‚‚å‚ç…§ã®ã“ã¨ã€‚"
msgid " Example: \"Is the bug fixed in your recent commit?\""
-msgstr " 例: \"最新ã®ã‚³ãƒŸãƒƒãƒˆã§ã€ãƒã‚°ã¯ä¿®æ£ã•ã‚Œã¦ã„ã¾ã™ã‹ï¼Ÿ\""
+msgstr " 例: \"最新ã®ã‚³ãƒŸãƒƒãƒˆã§ã€ ãƒã‚°ã¯ä¿®æ£ã•ã‚Œã¦ã„ã¾ã™ã‹ï¼Ÿ\""
msgid ""
" (Verb) The act of recording changes to a repository. When files\n"
@@ -11275,12 +11566,12 @@
" changeset, creating a new changeset in the repository."
msgstr ""
" (å‹•è©ž) [コミットã™ã‚‹] 変更内容をリãƒã‚¸ãƒˆãƒªã«è¨˜éŒ²ã™ã‚‹æ“作ã®ã“ã¨ã€‚\n"
-" コミットã®éš›ã«ã¯ã€ã‚³ãƒŸãƒƒãƒˆå¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ã®ä½œæ¥é ˜åŸŸä¸ã®å†…容ã¨ã€\n"
-" 親リビジョン時点ã«ãŠã‘る内容ã¨ã®å·®åˆ†ãŒç¢ºèªã•ã‚Œã€æ–°è¦ã®ãƒªãƒ“ジョンãŒ\n"
+" コミットã®éš›ã«ã¯ã€ コミット対象ファイルã®ä½œæ¥é ˜åŸŸä¸ã®å†…容ã¨ã€ \n"
+" 親リビジョン時点ã«ãŠã‘る内容ã¨ã®å·®åˆ†ãŒç¢ºèªã•ã‚Œã€ æ–°è¦ã®ãƒªãƒ“ジョンãŒ\n"
" リãƒã‚¸ãƒˆãƒªã«ä½œæˆã•ã‚Œã¾ã™ã€‚"
msgid " Example: \"You should commit those changes now.\""
-msgstr " 例: \"ãã®å¤‰æ›´ã¯ã€ã™ãã«ã‚³ãƒŸãƒƒãƒˆã™ã¹ãã§ã™ã€‚\""
+msgstr " 例: \"ãã®å¤‰æ›´ã¯ã€ ã™ãã«ã‚³ãƒŸãƒƒãƒˆã™ã¹ãã§ã™ã€‚\""
msgid ""
"Cset\n"
@@ -11659,13 +11950,189 @@
"``bar`` and ``quux/baz`` respectively.\n"
msgstr ""
+msgid "To merge files Mercurial uses merge tools."
+msgstr ""
+
+msgid ""
+"A merge tool combines two different versions of a file into a merged\n"
+"file. Merge tools are given the two files and the greatest common\n"
+"ancestor of the two file versions, so they can determine the changes\n"
+"made on both branches."
+msgstr ""
+
+msgid ""
+"Merge tools are used both for :hg:`resolve`, :hg:`merge`, :hg:`update`,\n"
+":hg:`backout` and in several extensions."
+msgstr ""
+
+msgid ""
+"Usually, the merge tool tries to automatically reconcile the files by\n"
+"combining all non-overlapping changes that occurred separately in\n"
+"the two different evolutions of the same initial base file. Furthermore, "
+"some\n"
+"interactive merge programs make it easier to manually resolve\n"
+"conflicting merges, either in a graphical way, or by inserting some\n"
+"conflict markers. Mercurial does not include any interactive merge\n"
+"programs but relies on external tools for that."
+msgstr ""
+
+msgid ""
+"Available merge tools\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"External merge tools and their properties are configured in the\n"
+"merge-tools configuration section - see hgrc(5) - but they can often just\n"
+"be named by their executable."
+msgstr ""
+
+msgid ""
+"A merge tool is generally usable if its executable can be found on the\n"
+"system and if it can handle the merge. The executable is found if it\n"
+"is an absolute or relative executable path or the name of an\n"
+"application in the executable search path. The tool is assumed to be\n"
+"able to handle the merge if it can handle symlinks if the file is a\n"
+"symlink, if it can handle binary files if the file is binary, and if a\n"
+"GUI is available if the tool requires a GUI."
+msgstr ""
+
+msgid ""
+"There are some internal merge tools which can be used. The internal\n"
+"merge tools are:"
+msgstr ""
+
+msgid ""
+"``internal:merge``\n"
+" Uses the internal non-interactive simple merge algorithm for merging\n"
+" files. It will fail if there are any conflicts and leave markers in\n"
+" the partially merged file."
+msgstr ""
+
+msgid ""
+"``internal:fail``\n"
+" Rather than attempting to merge files that were modified on both\n"
+" branches, it marks them as unresolved. The resolve command must be\n"
+" used to resolve these conflicts."
+msgstr ""
+
+msgid ""
+"``internal:local``\n"
+" Uses the local version of files as the merged version."
+msgstr ""
+
+msgid ""
+"``internal:other``\n"
+" Uses the other version of files as the merged version."
+msgstr ""
+
+msgid ""
+"``internal:prompt``\n"
+" Asks the user which of the local or the other version to keep as\n"
+" the merged version."
+msgstr ""
+
+msgid ""
+"``internal:dump``\n"
+" Creates three versions of the files to merge, containing the\n"
+" contents of local, other and base. These files can then be used to\n"
+" perform a merge manually. If the file to be merged is named\n"
+" ``a.txt``, these files will accordingly be named ``a.txt.local``,\n"
+" ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n"
+" same directory as ``a.txt``."
+msgstr ""
+
+msgid ""
+"Internal tools are always available and do not require a GUI but will by "
+"default\n"
+"not handle symlinks or binary files."
+msgstr ""
+
+msgid ""
+"Choosing a merge tool\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "Mercurial uses these rules when deciding which merge tool to use:"
+msgstr ""
+
+msgid ""
+"1. If a tool has been specified with the --tool option to merge or resolve, "
+"it\n"
+" is used. If it is the name of a tool in the merge-tools configuration, "
+"its\n"
+" configuration is used. Otherwise the specified tool must be executable "
+"by\n"
+" the shell."
+msgstr ""
+
+msgid ""
+"2. If the ``HGMERGE`` environment variable is present, its value is used "
+"and\n"
+" must be executable by the shell."
+msgstr ""
+
+msgid ""
+"3. If the filename of the file to be merged matches any of the patterns in "
+"the\n"
+" merge-patterns configuration section, the first usable merge tool\n"
+" corresponding to a matching pattern is used. Here, binary capabilities of "
+"the\n"
+" merge tool are not considered."
+msgstr ""
+
+msgid ""
+"4. If ui.merge is set it will be considered next. If the value is not the "
+"name\n"
+" of a configured tool, the specified value is used and must be executable "
+"by\n"
+" the shell. Otherwise the named tool is used if it is usable."
+msgstr ""
+
+msgid ""
+"5. If any usable merge tools are present in the merge-tools configuration\n"
+" section, the one with the highest priority is used."
+msgstr ""
+
+msgid ""
+"6. If a program named ``hgmerge`` can be found on the system, it is used - "
+"but\n"
+" it will by default not be used for symlinks and binary files."
+msgstr ""
+
+msgid ""
+"7. If the file to be merged is not binary and is not a symlink, then\n"
+" ``internal:merge`` is used."
+msgstr ""
+
+msgid "8. The merge of the file fails and must be resolved before commit."
+msgstr ""
+
+msgid ""
+".. note::\n"
+" After selecting a merge program, Mercurial will by default attempt\n"
+" to merge the files using a simple merge algorithm first. Only if it "
+"doesn't\n"
+" succeed because of conflicting changes Mercurial will actually execute "
+"the\n"
+" merge program. Whether to use the simple merge algorithm first can be\n"
+" controlled by the premerge setting of the merge tool. Premerge is enabled "
+"by\n"
+" default unless the file is binary or a symlink."
+msgstr ""
+
+msgid ""
+"See the merge-tools and ui sections of hgrc(5) for details on the\n"
+"configuration of merge tools.\n"
+msgstr ""
+
msgid ""
"When Mercurial accepts more than one revision, they may be specified\n"
"individually, or provided as a topologically continuous range,\n"
"separated by the \":\" character."
msgstr ""
-"Mercurial ã«è¤‡æ•°ã®ãƒªãƒ“ジョンを指定ã™ã‚‹å ´åˆã®æ–¹æ³•ã«ã¯ã€\n"
-"個々ã®ãƒªãƒ“ジョンをãã‚Œãžã‚ŒæŒ‡å®šã™ã‚‹æ–¹æ³•ä»¥å¤–ã«ã‚‚ã€\":\" を区切り\n"
+"Mercurial ã«è¤‡æ•°ã®ãƒªãƒ“ジョンを指定ã™ã‚‹å ´åˆã®æ–¹æ³•ã«ã¯ã€ \n"
+"個々ã®ãƒªãƒ“ジョンをãã‚Œãžã‚ŒæŒ‡å®šã™ã‚‹æ–¹æ³•ä»¥å¤–ã«ã‚‚〠\":\" を区切り\n"
"記å·ã«ã—ãŸç¯„囲指定ã«ã‚ˆã‚‹æ–¹æ³•ãŒã‚ã‚Šã¾ã™ã€‚"
msgid ""
@@ -11674,48 +12141,48 @@
"specified, it defaults to revision number 0. If END is not specified,\n"
"it defaults to the tip. The range \":\" thus means \"all revisions\"."
msgstr ""
-"範囲表記ã®æ–‡æ³•ã¯ã€\"[開始]:[終了]\" ã¨ã„ã†ã‚‚ã®ã§ã€\"開始\"・\"終了\"\n"
+"範囲表記ã®æ–‡æ³•ã¯ã€ \"[開始]:[終了]\" ã¨ã„ã†ã‚‚ã®ã§ã€ \"開始\"・\"終了\"\n"
"部分ã«ã¯ãã‚Œãžã‚Œãƒªãƒ“ジョンè˜åˆ¥ç”¨ã®æƒ…å ±ãŒè¨˜è¿°ã•ã‚Œã¾ã™ã€‚\n"
-"\"開始\"・\"終了\" ã¯ãã‚Œãžã‚Œçœç•¥å¯èƒ½ã§ã™ã€‚\"開始\" 部分ãŒ\n"
-"記述ã•ã‚Œãªã„å ´åˆã€ãƒªãƒ“ã‚¸ãƒ§ãƒ³ç•ªå· 0 ãŒè¨˜è¿°ã•ã‚ŒãŸã‚‚ã®ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚\n"
-"\"終了\" 部分ãŒè¨˜è¿°ã•ã‚Œãªã„å ´åˆã€tip ãŒè¨˜è¿°ã•ã‚ŒãŸã‚‚ã®ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚\n"
-"以上ã®ã“ã¨ã‹ã‚‰ã€\":\" ã¨ã„ã†è¨˜è¿°ã¯ \"全リビジョン\" を指ã—ã¾ã™ã€‚"
+"\"開始\"・\"終了\" ã¯ãã‚Œãžã‚Œçœç•¥å¯èƒ½ã§ã™ã€‚ \"開始\" 部分ãŒ\n"
+"記述ã•ã‚Œãªã„å ´åˆã€ ãƒªãƒ“ã‚¸ãƒ§ãƒ³ç•ªå· 0 ãŒè¨˜è¿°ã•ã‚ŒãŸã‚‚ã®ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚\n"
+"\"終了\" 部分ãŒè¨˜è¿°ã•ã‚Œãªã„å ´åˆã€ tip ãŒè¨˜è¿°ã•ã‚ŒãŸã‚‚ã®ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚\n"
+"以上ã®ã“ã¨ã‹ã‚‰ã€ \":\" ã¨ã„ã†è¨˜è¿°ã¯ \"全リビジョン\" を指ã—ã¾ã™ã€‚"
msgid "If BEGIN is greater than END, revisions are treated in reverse order."
msgstr ""
-"\"開始\" 指定㌠\"終了\" 指定よりも後ã®ãƒªãƒ“ジョンã§ã‚ã‚‹å ´åˆã€é€†é †æŒ‡å®š\n"
+"\"開始\" 指定㌠\"終了\" 指定よりも後ã®ãƒªãƒ“ジョンã§ã‚ã‚‹å ´åˆã€ é€†é †æŒ‡å®š\n"
"ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚"
msgid ""
"A range acts as a closed interval. This means that a range of 3:5\n"
"gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
msgstr ""
-"範囲指定㯠\"閉区間\" ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚ã¤ã¾ã‚Šã€3:5 ã¨ã„ã†ç¯„囲指定ã¯\n"
-"3, 4, 5 ã®æŒ‡å®šã¨ç‰ä¾¡ã§ã™ã€‚åŒæ§˜ã« 9:6 ã¨ã„ã†æŒ‡å®šã¯ 9, 8, 7, 6 ã®æŒ‡å®šã¨\n"
+"範囲指定㯠\"閉区間\" ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚ ã¤ã¾ã‚Šã€ 3:5 ã¨ã„ã†ç¯„囲指定ã¯\n"
+"3, 4, 5 ã®æŒ‡å®šã¨ç‰ä¾¡ã§ã™ã€‚ åŒæ§˜ã« 9:6 ã¨ã„ã†æŒ‡å®šã¯ 9, 8, 7, 6 ã®æŒ‡å®šã¨\n"
"ç‰ä¾¡ã§ã™ã€‚\n"
msgid ""
"Mercurial accepts several notations for identifying one or more files\n"
"at a time."
-msgstr "Mercurial ã«ã¯ã€ãƒ•ã‚¡ã‚¤ãƒ«ã‚’特定ã™ã‚‹ãƒ‘ターン指定方法ãŒè¤‡æ•°ã‚ã‚Šã¾ã™ã€‚"
+msgstr "Mercurial ã«ã¯ã€ ファイルを特定ã™ã‚‹ãƒ‘ターン指定方法ãŒè¤‡æ•°ã‚ã‚Šã¾ã™ã€‚"
msgid ""
"By default, Mercurial treats filenames as shell-style extended glob\n"
"patterns."
msgstr ""
-"特ã«æŒ‡å®šã®ç„¡ã„å ´åˆã€Mercurial ã¯æŒ‡å®šã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«åã«å¯¾ã—ã¦ã€\n"
+"特ã«æŒ‡å®šã®ç„¡ã„å ´åˆã€ Mercurial ã¯æŒ‡å®šã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«åã«å¯¾ã—ã¦ã€ \n"
"shell å½¢å¼ã®æ‹¡å¼µãƒ¯ã‚¤ãƒ«ãƒ‰ã‚«ãƒ¼ãƒ‰åˆè‡´ã‚’è¡Œã„ã¾ã™ã€‚"
msgid "Alternate pattern notations must be specified explicitly."
-msgstr "別ãªå½¢å¼ã§ã®ãƒ‘ターン記述ã®éš›ã«ã¯ã€æ˜Žç¤ºçš„ã«ç¨®åˆ¥ã‚’指定ã—ã¦ãã ã•ã„。"
+msgstr "別ãªå½¢å¼ã§ã®ãƒ‘ターン記述ã®éš›ã«ã¯ã€ 明示的ã«ç¨®åˆ¥ã‚’指定ã—ã¦ãã ã•ã„。"
msgid ""
"To use a plain path name without any pattern matching, start it with\n"
"``path:``. These path names must completely match starting at the\n"
"current repository root."
msgstr ""
-"パターンåˆè‡´ã‚’è¡Œã‚ãšã«ã€æŒ‡å®šã•ã‚ŒãŸåå‰ã‚’ãã®ã¾ã¾ä½¿ç”¨ã™ã‚‹å ´åˆã€\n"
-"åå‰ã®å‰ã« ``path:`` を記述ã—ã¾ã™ã€‚ã“ã®å½¢å¼ã‚’使用ã™ã‚‹å ´åˆã€\n"
+"パターンåˆè‡´ã‚’è¡Œã‚ãšã«ã€ 指定ã•ã‚ŒãŸåå‰ã‚’ãã®ã¾ã¾ä½¿ç”¨ã™ã‚‹å ´åˆã€ \n"
+"åå‰ã®å‰ã« ``path:`` を記述ã—ã¾ã™ã€‚ ã“ã®å½¢å¼ã‚’使用ã™ã‚‹å ´åˆã€ \n"
"リãƒã‚¸ãƒˆãƒªã®ãƒ«ãƒ¼ãƒˆã‹ã‚‰ã®ãƒ‘スã¨å®Œå…¨ã«ä¸€è‡´ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。"
msgid ""
@@ -11723,23 +12190,23 @@
"at the current directory; a glob such as ``*.c`` will only match files\n"
"in the current directory ending with ``.c``."
msgstr ""
-"拡張ワイルドカードåˆè‡´ã®å ´åˆã€åå‰ã®å‰ã« ``glob:`` を記述ã—ã¾ã™ã€‚ã“ã®\n"
-"å½¢å¼ã§ã¯ã€ç¾ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‹ã‚‰ã®ç›¸å¯¾ã«ãªã‚Šã¾ã™ã®ã§ã€``*.c`` パターンã¯\n"
+"拡張ワイルドカードåˆè‡´ã®å ´åˆã€ åå‰ã®å‰ã« ``glob:`` を記述ã—ã¾ã™ã€‚ ã“ã®\n"
+"å½¢å¼ã§ã¯ã€ ç¾ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‹ã‚‰ã®ç›¸å¯¾ã«ãªã‚Šã¾ã™ã®ã§ã€ ``*.c`` パターンã¯\n"
"末尾㌠``.c`` ã§çµ‚ã‚ã‚‹ç¾ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªä¸ã®ãƒ•ã‚¡ã‚¤ãƒ«ã¨ã®ã¿åˆè‡´ã—ã¾ã™ã€‚"
msgid ""
"The supported glob syntax extensions are ``**`` to match any string\n"
"across path separators and ``{a,b}`` to mean \"a or b\"."
msgstr ""
-"ワイルドカードã®æ‹¡å¼µæ–‡æ³•ã«ã¯ã€ãƒ‘ス区切りもå«ã‚ãŸä»»æ„ã®æ–‡å—列ã¨åˆè‡´ã™ã‚‹\n"
-"``**`` ã¨ã€\"a ãªã„ã— b\" ã‚’æ„味ã™ã‚‹ ``{a,b}`` ã¨ã„ã†å½¢å¼ãŒã‚ã‚Šã¾ã™ã€‚"
+"ワイルドカードã®æ‹¡å¼µæ–‡æ³•ã«ã¯ã€ パス区切りもå«ã‚ãŸä»»æ„ã®æ–‡å—列ã¨åˆè‡´ã™ã‚‹\n"
+"``**`` ã¨ã€ \"a ãªã„ã— b\" ã‚’æ„味ã™ã‚‹ ``{a,b}`` ã¨ã„ã†å½¢å¼ãŒã‚ã‚Šã¾ã™ã€‚"
msgid ""
"To use a Perl/Python regular expression, start a name with ``re:``.\n"
"Regexp pattern matching is anchored at the root of the repository."
msgstr ""
-"Perl/Python å½¢å¼ã®æ£è¦è¡¨ç¾ã®å ´åˆã€åå‰ã®å‰ã« ``re:`` を記述ã—ã¾ã™ã€‚\n"
-"æ£è¦è¡¨ç¾å½¢å¼ã§ã¯ã€ãƒªãƒã‚¸ãƒˆãƒªã®ãƒ«ãƒ¼ãƒˆã‹ã‚‰ã®åˆè‡´ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚\n"
+"Perl/Python å½¢å¼ã®æ£è¦è¡¨ç¾ã®å ´åˆã€ åå‰ã®å‰ã« ``re:`` を記述ã—ã¾ã™ã€‚\n"
+"æ£è¦è¡¨ç¾å½¢å¼ã§ã¯ã€ リãƒã‚¸ãƒˆãƒªã®ãƒ«ãƒ¼ãƒˆã‹ã‚‰ã®åˆè‡´ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚\n"
"(訳注: .hgignore ã§ã®æŒ‡å®šã§ã¯ä»˜ä¸Žã€Œã•ã‚Œã¾ã›ã‚“ã€ã®ã§æ³¨æ„ãŒå¿…è¦ã§ã™)。"
msgid "Plain examples::"
@@ -11765,12 +12232,12 @@
" foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
" including itself."
msgstr ""
-" glob:*.c ç¾ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªç›´ä¸‹ã§ã€åå‰ãŒ \".c\" ã§çµ‚ã‚ã‚‹ã‚‚ã®\n"
-" *.c ç¾ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªç›´ä¸‹ã§ã€åå‰ãŒ \".c\" ã§çµ‚ã‚ã‚‹ã‚‚ã®\n"
-" **.c ç¾ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãªã„ã—ãã®é…下ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«ãŠã„ã¦ã€\n"
+" glob:*.c ç¾ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªç›´ä¸‹ã§ã€ åå‰ãŒ \".c\" ã§çµ‚ã‚ã‚‹ã‚‚ã®\n"
+" *.c ç¾ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªç›´ä¸‹ã§ã€ åå‰ãŒ \".c\" ã§çµ‚ã‚ã‚‹ã‚‚ã®\n"
+" **.c ç¾ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªãªã„ã—ãã®é…下ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«ãŠã„ã¦ã€ \n"
" åå‰ãŒ \".c\" ã§çµ‚ã‚ã‚‹ã‚‚ã®\n"
-" foo/*.c foo ディレクトリ直下ã§ã€åå‰ãŒ \".c\" ã§çµ‚ã‚ã‚‹ã‚‚ã®\n"
-" foo/**.c foo ディレクトリãªã„ã—ãã®é…下ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«ãŠã„ã¦ã€\n"
+" foo/*.c foo ディレクトリ直下ã§ã€ åå‰ãŒ \".c\" ã§çµ‚ã‚ã‚‹ã‚‚ã®\n"
+" foo/**.c foo ディレクトリãªã„ã—ãã®é…下ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«ãŠã„ã¦ã€ \n"
" åå‰ãŒ \".c\" ã§çµ‚ã‚ã‚‹ã‚‚ã®"
msgid "Regexp examples::"
@@ -11779,7 +12246,7 @@
msgid ""
" re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
msgstr ""
-" re:.*\\.c$ 作æ¥é ˜åŸŸä¸ã®ä»»æ„ã®ä½ç½®ã§ã€åå‰ãŒ \".c\" ã§çµ‚ã‚ã‚‹ã‚‚ã®\n"
+" re:.*\\.c$ 作æ¥é ˜åŸŸä¸ã®ä»»æ„ã®ä½ç½®ã§ã€ åå‰ãŒ \".c\" ã§çµ‚ã‚ã‚‹ã‚‚ã®\n"
msgid "Mercurial supports several ways to specify individual revisions."
msgstr "Mercurial ã«å€‹ã€…ã®ãƒªãƒ“ジョン指定ã™ã‚‹éš›ã«ã¯è¤‡æ•°ã®è¨˜æ³•ãŒä½¿ç”¨ã§ãã¾ã™ã€‚"
@@ -11789,13 +12256,13 @@
"treated as sequential offsets from the tip, with -1 denoting the tip,\n"
"-2 denoting the revision prior to the tip, and so forth."
msgstr ""
-"整数値ã¯ã€ã€Œãƒªãƒ“ジョン番å·ã€ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚è² å€¤ã¯ã€tip ã‹ã‚‰ã®è·é›¢ã‚’\n"
-"æ„味ã—ã€-1 㯠tip 自身をã€-2 㯠tip ã®ç›´å‰ã¨ã„ã£ãŸãƒªãƒ“ジョンを指ã—ã¾ã™ã€‚"
+"整数値ã¯ã€ 「リビジョン番å·ã€ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚ è² å€¤ã¯ã€ tip ã‹ã‚‰ã®è·é›¢ã‚’\n"
+"æ„味ã—〠-1 㯠tip 自身を〠-2 㯠tip ã®ç›´å‰ã¨ã„ã£ãŸãƒªãƒ“ジョンを指ã—ã¾ã™ã€‚"
msgid ""
"A 40-digit hexadecimal string is treated as a unique revision\n"
"identifier."
-msgstr "40æ¡ã®16進文å—列ã¯ã€ä¸€æ„ãªã€Œãƒªãƒ“ジョンè˜åˆ¥åã€ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚"
+msgstr "40æ¡ã®16進文å—列ã¯ã€ 一æ„ãªã€Œãƒªãƒ“ジョンè˜åˆ¥åã€ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚"
msgid ""
"A hexadecimal string less than 40 characters long is treated as a\n"
@@ -11803,8 +12270,8 @@
"identifier. A short-form identifier is only valid if it is the prefix\n"
"of exactly one full-length identifier."
msgstr ""
-"40æ¡æœªæº€ã®16進文å—列ã¯ã€ä¸€æ„ãªã€Œãƒªãƒ“ジョンè˜åˆ¥åã€ã®çŸç¸®å½¢å¼ã¨\n"
-"ã¿ãªã•ã‚Œã¾ã™ã€‚çŸç¸®å½¢å¼ã®è˜åˆ¥åã¯ã€åŽ³å¯†ã«1ã¤ã®å®Œå…¨é•·ã®è˜åˆ¥åã¨ã ã‘\n"
+"40æ¡æœªæº€ã®16進文å—列ã¯ã€ 一æ„ãªã€Œãƒªãƒ“ジョンè˜åˆ¥åã€ã®çŸç¸®å½¢å¼ã¨\n"
+"ã¿ãªã•ã‚Œã¾ã™ã€‚ çŸç¸®å½¢å¼ã®è˜åˆ¥åã¯ã€ 厳密ã«1ã¤ã®å®Œå…¨é•·ã®è˜åˆ¥åã¨ã ã‘\n"
"å‰æ–¹ä¸€è‡´ã™ã‚‹å ´åˆã«ã®ã¿æœ‰åŠ¹ã§ã™ã€‚"
msgid ""
@@ -11813,24 +12280,24 @@
"denotes the tipmost revision of that branch. Tag and branch names must\n"
"not contain the \":\" character."
msgstr ""
-"ãれ以外ã®æ–‡å—列ã¯ã€ã€Œã‚¿ã‚°åã€ãªã„ã—「ブランãƒåã€ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚\n"
+"ãれ以外ã®æ–‡å—列ã¯ã€ 「タグåã€ãªã„ã—「ブランãƒåã€ã¨ã¿ãªã•ã‚Œã¾ã™ã€‚\n"
"「タグåã€ã¯ãƒªãƒ“ジョンè˜åˆ¥åã«ä»˜ä¸Žã•ã‚ŒãŸã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãªåå‰ã§ã™ã€‚\n"
-"「ブランãƒåã€ã¯ã€ãƒ–ランãƒä¸ã®æœ€æ–°ãƒªãƒ“ジョンをæ„味ã—ã¾ã™ã€‚\n"
+"「ブランãƒåã€ã¯ã€ ブランãƒä¸ã®æœ€æ–°ãƒªãƒ“ジョンをæ„味ã—ã¾ã™ã€‚\n"
"ã‚¿ã‚°åãŠã‚ˆã³ãƒ–ランãƒå㯠\":\" ã‚’å«ã‚“ã§ã¯ãªã‚Šã¾ã›ã‚“。"
msgid ""
"The reserved name \"tip\" is a special tag that always identifies the\n"
"most recent revision."
msgstr ""
-"常ã«ã€Œæœ€æ–°ã®ãƒªãƒ“ジョンã€ã‚’æ„味ã™ã‚‹åå‰ \"tip\" ã¯ã€ç‰¹åˆ¥ãªã‚¿ã‚°åã¨ã—ã¦\n"
+"常ã«ã€Œæœ€æ–°ã®ãƒªãƒ“ジョンã€ã‚’æ„味ã™ã‚‹åå‰ \"tip\" ã¯ã€ 特別ãªã‚¿ã‚°åã¨ã—ã¦\n"
"予約ã•ã‚Œã¦ã„ã¾ã™ã€‚"
msgid ""
"The reserved name \"null\" indicates the null revision. This is the\n"
"revision of an empty repository, and the parent of revision 0."
msgstr ""
-"「空リビジョンã€ã‚’æ„味ã™ã‚‹åå‰ \"null\" ã¯ã€ç‰¹åˆ¥ãªåå‰ã¨ã—ã¦äºˆç´„\n"
-"ã•ã‚Œã¦ã„ã¾ã™ã€‚空リãƒã‚¸ãƒˆãƒªã«ãŠã‘るリビジョンã¯ã“ã®ãƒªãƒ“ジョンã§ã€\n"
+"「空リビジョンã€ã‚’æ„味ã™ã‚‹åå‰ \"null\" ã¯ã€ 特別ãªåå‰ã¨ã—ã¦äºˆç´„\n"
+"ã•ã‚Œã¦ã„ã¾ã™ã€‚ 空リãƒã‚¸ãƒˆãƒªã«ãŠã‘るリビジョンã¯ã“ã®ãƒªãƒ“ジョンã§ã€ \n"
"リビジョン 0 ã®è¦ªã¯ \"null\" リビジョンã§ã™ã€‚"
msgid ""
@@ -11839,15 +12306,15 @@
"uncommitted merge is in progress, \".\" is the revision of the first\n"
"parent.\n"
msgstr ""
-"常ã«ã€Œä½œæ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã€ã‚’示ã™ãŸã‚ã®åå‰ \".\" ã¯ã€ç‰¹åˆ¥ãªåå‰ã¨ã—ã¦\n"
-"予約ã•ã‚Œã¦ã„ã¾ã™ã€‚作æ¥é ˜åŸŸãŒæœªæ›´æ–°ã®å ´åˆã¯ã€\"null\" 指定ã¨ç‰ä¾¡ã§ã™ã€‚\n"
-"未コミットã®ãƒžãƒ¼ã‚¸ä¸ã®å ´åˆã€\".\" ã¯ç¬¬1親リビジョンを指ã—ã¾ã™ã€‚\n"
+"常ã«ã€Œä½œæ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã€ã‚’示ã™ãŸã‚ã®åå‰ \".\" ã¯ã€ 特別ãªåå‰ã¨ã—ã¦\n"
+"予約ã•ã‚Œã¦ã„ã¾ã™ã€‚ 作æ¥é ˜åŸŸãŒæœªæ›´æ–°ã®å ´åˆã¯ã€ \"null\" 指定ã¨ç‰ä¾¡ã§ã™ã€‚\n"
+"未コミットã®ãƒžãƒ¼ã‚¸ä¸ã®å ´åˆã€ \".\" ã¯ç¬¬1親リビジョンを指ã—ã¾ã™ã€‚\n"
msgid ""
"Mercurial supports a functional language for selecting a set of\n"
"revisions."
msgstr ""
-"Mercurial ã¯ã€è¤‡æ•°ã®ãƒªãƒ“ジョンを一括指定ã™ã‚‹ãŸã‚ã®å•ã„åˆã‚ã›è¨€èªžã‚’æä¾›\n"
+"Mercurial ã¯ã€ 複数ã®ãƒªãƒ“ジョンを一括指定ã™ã‚‹ãŸã‚ã®å•ã„åˆã‚ã›è¨€èªžã‚’æä¾›\n"
"ã—ã¦ã„ã¾ã™ã€‚"
msgid ""
@@ -11859,8 +12326,13 @@
"Identifiers such as branch names must be quoted with single or double\n"
"quotes if they contain characters outside of\n"
"``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n"
-"predicates. Special characters can be used in quoted identifiers by\n"
-"escaping them, e.g., ``\\n`` is interpreted as a newline."
+"predicates."
+msgstr ""
+
+msgid ""
+"Special characters can be used in quoted identifiers by escaping them,\n"
+"e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n"
+"interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``."
msgstr ""
msgid "There is a single prefix operator:"
@@ -11911,173 +12383,7 @@
msgid "The following predicates are supported:"
msgstr ""
-msgid ""
-"``adds(pattern)``\n"
-" Changesets that add a file matching pattern."
-msgstr ""
-
-msgid ""
-"``all()``\n"
-" All changesets, the same as ``0:tip``."
-msgstr ""
-
-msgid ""
-"``ancestor(single, single)``\n"
-" Greatest common ancestor of the two changesets."
-msgstr ""
-
-msgid ""
-"``ancestors(set)``\n"
-" Changesets that are ancestors of a changeset in set."
-msgstr ""
-
-msgid ""
-"``author(string)``\n"
-" Alias for ``user(string)``."
-msgstr ""
-
-msgid ""
-"``branch(set)``\n"
-" The branch names are found for changesets in set, and the result is\n"
-" all changesets belonging to one those branches."
-msgstr ""
-
-msgid ""
-"``children(set)``\n"
-" Child changesets of changesets in set."
-msgstr ""
-
-msgid ""
-"``closed()``\n"
-" Changeset is closed."
-msgstr ""
-
-msgid ""
-"``contains(pattern)``\n"
-" Revision contains pattern."
-msgstr ""
-
-msgid ""
-"``date(interval)``\n"
-" Changesets within the interval, see :hg:`help dates`."
-msgstr ""
-
-msgid ""
-"``descendants(set)``\n"
-" Changesets which are decendants of changesets in set."
-msgstr ""
-
-msgid ""
-"``file(pattern)``\n"
-" Changesets which manually affected files matching pattern."
-msgstr ""
-
-msgid ""
-"``follow()``\n"
-" An alias for ``::.`` (ancestors of the working copy's first parent)."
-msgstr ""
-
-msgid ""
-"``grep(regex)``\n"
-" Like ``keyword(string)`` but accepts a regex."
-msgstr ""
-
-msgid ""
-"``head()``\n"
-" Changeset is a head."
-msgstr ""
-
-msgid ""
-"``heads(set)``\n"
-" Members of set with no children in set."
-msgstr ""
-
-msgid ""
-"``keyword(string)``\n"
-" Search commit message, user name, and names of changed files for\n"
-" string."
-msgstr ""
-
-msgid ""
-"``limit(set, n)``\n"
-" First n members of set."
-msgstr ""
-
-msgid ""
-"``max(set)``\n"
-" Changeset with highest revision number in set."
-msgstr ""
-
-msgid ""
-"``merge()``\n"
-" Changeset is a merge changeset."
-msgstr ""
-
-msgid ""
-"``modifies(pattern)``\n"
-" Changesets which modify files matching pattern."
-msgstr ""
-
-msgid ""
-"``outgoing([path])``\n"
-" Changesets missing in path."
-msgstr ""
-
-msgid ""
-"``p1(set)``\n"
-" First parent of changesets in set."
-msgstr ""
-
-msgid ""
-"``p2(set)``\n"
-" Second parent of changesets in set."
-msgstr ""
-
-msgid ""
-"``parents(set)``\n"
-" The set of all parents for all changesets in set."
-msgstr ""
-
-msgid ""
-"``removes(pattern)``\n"
-" Changesets which remove files matching pattern."
-msgstr ""
-
-msgid ""
-"``reverse(set)``\n"
-" Reverse order of set."
-msgstr ""
-
-msgid ""
-"``roots(set)``\n"
-" Changesets with no parent changeset in set."
-msgstr ""
-
-msgid ""
-"``sort(set[, [-]key...])``\n"
-" Sort set by keys. The default sort order is ascending, specify a key\n"
-" as ``-key`` to sort in descending order."
-msgstr ""
-
-msgid " The keys can be:"
-msgstr ""
-
-msgid ""
-" - ``rev`` for the revision number,\n"
-" - ``branch`` for the branch name,\n"
-" - ``desc`` for the commit message (description),\n"
-" - ``user`` for user name (``author`` can be used as an alias),\n"
-" - ``date`` for the commit date"
-msgstr ""
-
-msgid ""
-"``tagged()``\n"
-" Changeset is tagged."
-msgstr ""
-
-msgid ""
-"``user(string)``\n"
-" User name is string."
+msgid ".. predicatesmarker"
msgstr ""
msgid "Command line equivalents for :hg:`log`::"
@@ -12094,15 +12400,233 @@
" -l x -> limit(expr, x)"
msgstr ""
-msgid "Some sample queries::"
-msgstr ""
-
-msgid ""
-" hg log -r 'branch(default)'\n"
-" hg log -r 'branch(default) and 1.5:: and not merge()'\n"
-" hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n"
-" hg log -r 'sort(date(\"May 2008\"), user)'\n"
-" hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n"
+msgid "Some sample queries:"
+msgstr ""
+
+msgid "- Changesets on the default branch::"
+msgstr ""
+
+msgid " hg log -r \"branch(default)\""
+msgstr ""
+
+msgid "- Changesets on the default branch since tag 1.5 (excluding merges)::"
+msgstr ""
+
+msgid " hg log -r \"branch(default) and 1.5:: and not merge()\""
+msgstr ""
+
+msgid "- Open branch heads::"
+msgstr ""
+
+msgid " hg log -r \"head() and not closed()\""
+msgstr ""
+
+msgid ""
+"- Changesets between tags 1.3 and 1.5 mentioning \"bug\" that affect\n"
+" ``hgext/*``::"
+msgstr ""
+
+msgid " hg log -r \"1.3::1.5 and keyword(bug) and file('hgext/*')\""
+msgstr ""
+
+msgid "- Changesets in committed May 2008, sorted by user::"
+msgstr ""
+
+msgid " hg log -r \"sort(date('May 2008'), user)\""
+msgstr ""
+
+msgid ""
+"- Changesets mentioning \"bug\" or \"issue\" that are not in a tagged\n"
+" release::"
+msgstr ""
+
+msgid ""
+" hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged())"
+"\"\n"
+msgstr ""
+
+msgid ""
+"Subrepositories let you nest external repositories or projects into a\n"
+"parent Mercurial repository, and make commands operate on them as a\n"
+"group. External Mercurial and Subversion projects are currently\n"
+"supported."
+msgstr ""
+
+msgid "Subrepositories are made of three components:"
+msgstr ""
+
+msgid ""
+"1. Nested repository checkouts. They can appear anywhere in the\n"
+" parent working directory, and are Mercurial clones or Subversion\n"
+" checkouts."
+msgstr ""
+
+msgid ""
+"2. Nested repository references. They are defined in ``.hgsub`` and\n"
+" tell where the subrepository checkouts come from. Mercurial\n"
+" subrepositories are referenced like:"
+msgstr ""
+
+msgid " path/to/nested = https://example.com/nested/repo/path"
+msgstr ""
+
+msgid ""
+" where ``path/to/nested`` is the checkout location relatively to the\n"
+" parent Mercurial root, and ``https://example.com/nested/repo/path``\n"
+" is the source repository path. The source can also reference a\n"
+" filesystem path. Subversion repositories are defined with:"
+msgstr ""
+
+msgid " path/to/nested = [svn]https://example.com/nested/trunk/path"
+msgstr ""
+
+msgid ""
+" Note that ``.hgsub`` does not exist by default in Mercurial\n"
+" repositories, you have to create and add it to the parent\n"
+" repository before using subrepositories."
+msgstr ""
+
+msgid ""
+"3. Nested repository states. They are defined in ``.hgsubstate`` and\n"
+" capture whatever information is required to restore the\n"
+" subrepositories to the state they were committed in a parent\n"
+" repository changeset. Mercurial automatically record the nested\n"
+" repositories states when committing in the parent repository."
+msgstr ""
+
+msgid ""
+" .. note::\n"
+" The ``.hgsubstate`` file should not be edited manually."
+msgstr ""
+
+msgid ""
+"\n"
+"Adding a Subrepository\n"
+"----------------------"
+msgstr ""
+
+msgid ""
+"If ``.hgsub`` does not exist, create it and add it to the parent\n"
+"repository. Clone or checkout the external projects where you want it\n"
+"to live in the parent repository. Edit ``.hgsub`` and add the\n"
+"subrepository entry as described above. At this point, the\n"
+"subrepository is tracked and the next commit will record its state in\n"
+"``.hgsubstate`` and bind it to the committed changeset."
+msgstr ""
+
+msgid ""
+"Synchronizing a Subrepository\n"
+"-----------------------------"
+msgstr ""
+
+msgid ""
+"Subrepos do not automatically track the latest changeset of their\n"
+"sources. Instead, they are updated to the changeset that corresponds\n"
+"with the changeset checked out in the top-level changeset. This is so\n"
+"developers always get a consistent set of compatible code and\n"
+"libraries when they update."
+msgstr ""
+
+msgid ""
+"Thus, updating subrepos is a manual process. Simply check out target\n"
+"subrepo at the desired revision, test in the top-level repo, then\n"
+"commit in the parent repository to record the new combination."
+msgstr ""
+
+msgid ""
+"Deleting a Subrepository\n"
+"------------------------"
+msgstr ""
+
+msgid ""
+"To remove a subrepository from the parent repository, delete its\n"
+"reference from ``.hgsub``, then remove its files."
+msgstr ""
+
+msgid ""
+"Interaction with Mercurial Commands\n"
+"-----------------------------------"
+msgstr ""
+
+msgid ""
+":add: add does not recurse in subrepos unless -S/--subrepos is\n"
+" specified. Subversion subrepositories are currently silently\n"
+" ignored."
+msgstr ""
+
+msgid ""
+":archive: archive does not recurse in subrepositories unless\n"
+" -S/--subrepos is specified."
+msgstr ""
+
+msgid ""
+":commit: commit creates a consistent snapshot of the state of the\n"
+" entire project and its subrepositories. It does this by first\n"
+" attempting to commit all modified subrepositories, then recording\n"
+" their state and finally committing it in the parent repository."
+msgstr ""
+
+msgid ""
+":diff: diff does not recurse in subrepos unless -S/--subrepos is\n"
+" specified. Changes are displayed as usual, on the subrepositories\n"
+" elements. Subversion subrepositories are currently silently\n"
+" ignored."
+msgstr ""
+
+msgid ""
+":incoming: incoming does not recurse in subrepos unless -S/--subrepos\n"
+" is specified. Subversion subrepositories are currently silently\n"
+" ignored."
+msgstr ""
+
+msgid ""
+":outgoing: outgoing does not recurse in subrepos unless -S/--subrepos\n"
+" is specified. Subversion subrepositories are currently silently\n"
+" ignored."
+msgstr ""
+
+msgid ""
+":pull: pull is not recursive since it is not clear what to pull prior\n"
+" to running :hg:`update`. Listing and retrieving all\n"
+" subrepositories changes referenced by the parent repository pulled\n"
+" changesets is expensive at best, impossible in the Subversion\n"
+" case."
+msgstr ""
+
+msgid ""
+":push: Mercurial will automatically push all subrepositories first\n"
+" when the parent repository is being pushed. This ensures new\n"
+" subrepository changes are available when referenced by top-level\n"
+" repositories."
+msgstr ""
+
+msgid ""
+":status: status does not recurse into subrepositories unless\n"
+" -S/--subrepos is specified. Subrepository changes are displayed as\n"
+" regular Mercurial changes on the subrepository\n"
+" elements. Subversion subrepositories are currently silently\n"
+" ignored."
+msgstr ""
+
+msgid ""
+":update: update restores the subrepos in the state they were\n"
+" originally committed in target changeset. If the recorded\n"
+" changeset is not available in the current subrepository, Mercurial\n"
+" will pull it in first before updating. This means that updating\n"
+" can require network access when using subrepositories."
+msgstr ""
+
+msgid ""
+"Remapping Subrepositories Sources\n"
+"---------------------------------"
+msgstr ""
+
+msgid ""
+"A subrepository source location may change during a project life,\n"
+"invalidating references stored in the parent repository history. To\n"
+"fix this, rewriting rules can be defined in parent repository ``hgrc``\n"
+"file or in Mercurial configuration. See the ``[subpaths]`` section in\n"
+"hgrc(5) for more details."
msgstr ""
msgid ""
@@ -12111,9 +12635,9 @@
"line, via the --template option, or select an existing\n"
"template-style (--style)."
msgstr ""
-"Mercurial ã§ã¯ã€ãƒ†ãƒ³ãƒ—レート機能ã«ã‚ˆã£ã¦ã‚³ãƒžãƒ³ãƒ‰ã®å‡ºåŠ›ã‚’カスタマイズ\n"
-"ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚コマンドラインã‹ã‚‰ã®æŒ‡å®šã§ã¯ã€--template ã«ã‚ˆã‚‹\n"
-"テンプレート指定ã¨ã€--style ã«ã‚ˆã‚‹ã‚¹ã‚¿ã‚¤ãƒ«æŒ‡å®šã®ä¸¡æ–¹ãŒä½¿ç”¨ã§ãã¾ã™ã€‚"
+"Mercurial ã§ã¯ã€ テンプレート機能ã«ã‚ˆã£ã¦ã‚³ãƒžãƒ³ãƒ‰ã®å‡ºåŠ›ã‚’カスタマイズ\n"
+"ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ コマンドラインã‹ã‚‰ã®æŒ‡å®šã§ã¯ã€ --template ã«ã‚ˆã‚‹\n"
+"テンプレート指定ã¨ã€ --style ã«ã‚ˆã‚‹ã‚¹ã‚¿ã‚¤ãƒ«æŒ‡å®šã®ä¸¡æ–¹ãŒä½¿ç”¨ã§ãã¾ã™ã€‚"
msgid ""
"You can customize output for any \"log-like\" command: log,\n"
@@ -12128,7 +12652,7 @@
"and xml.\n"
"Usage::"
msgstr ""
-"Mercurial ã«ã¯(明示的ãªæŒ‡å®šãŒç„¡ã„å ´åˆã«ä½¿ç”¨ã•ã‚Œã‚‹)defaultã€compact\n"
+"Mercurial ã«ã¯(明示的ãªæŒ‡å®šãŒç„¡ã„å ´åˆã«ä½¿ç”¨ã•ã‚Œã‚‹)default〠compact\n"
"changelog ãŠã‚ˆã³ xml ã®4ã¤ã®ã‚¹ã‚¿ã‚¤ãƒ«è¨å®šãŒåŒæ¢±ã•ã‚Œã¦ã„ã¾ã™ã€‚\n"
"利用方法ã¯::"
@@ -12138,7 +12662,7 @@
msgid ""
"A template is a piece of text, with markup to invoke variable\n"
"expansion::"
-msgstr "テンプレートã¨ã¯ã€å¤‰æ•°å±•é–‹ãƒžãƒ¼ã‚¯ã‚¢ãƒƒãƒ—機能を備ãˆãŸãƒ†ã‚ストã§ã™::"
+msgstr "テンプレートã¨ã¯ã€ 変数展開マークアップ機能を備ãˆãŸãƒ†ã‚ストã§ã™::"
msgid ""
" $ hg log -r1 --template \"{node}\\n\"\n"
@@ -12152,83 +12676,86 @@
"keywords depends on the exact context of the templater. These\n"
"keywords are usually available for templating a log-like command:"
msgstr ""
-"波括弧ã§å›²ã¾ã‚ŒãŸéƒ¨åˆ†ã¯ã€Œã‚ーワードã€ã¨å‘¼ã°ã‚Œã¾ã™ã€‚ã‚ーワード利用ã®\n"
-"å¯å¦ã¯ã€ãƒ†ãƒ³ãƒ—レートã®åˆ©ç”¨ã•ã‚Œã‚‹çŠ¶æ³ã«ä¾å˜ã—ã¾ã™ã€‚以下ã®ã‚ーワードã¯\n"
+"波括弧ã§å›²ã¾ã‚ŒãŸéƒ¨åˆ†ã¯ã€Œã‚ーワードã€ã¨å‘¼ã°ã‚Œã¾ã™ã€‚ ã‚ーワード利用ã®\n"
+"å¯å¦ã¯ã€ テンプレートã®åˆ©ç”¨ã•ã‚Œã‚‹çŠ¶æ³ã«ä¾å˜ã—ã¾ã™ã€‚ 以下ã®ã‚ーワードã¯\n"
"log çš„ãªã‚³ãƒžãƒ³ãƒ‰ã§ã®ãƒ†ãƒ³ãƒ—レート利用ã®éš›ã«ã¯å¸¸ã«ä½¿ç”¨å¯èƒ½ã§ã™:"
msgid ":author: String. The unmodified author of the changeset."
-msgstr ":author: æ–‡å—列。リビジョンã®ä½œè€…å(è¨˜éŒ²æƒ…å ±ãã®ã¾ã¾)。"
+msgstr ":author: æ–‡å—列。 リビジョンã®ä½œè€…å(è¨˜éŒ²æƒ…å ±ãã®ã¾ã¾)。"
msgid ""
":branches: String. The name of the branch on which the changeset was\n"
" committed. Will be empty if the branch name was default."
msgstr ""
-":branches: æ–‡å—列。リビジョンã®å±žã™ã‚‹ãƒ–ランãƒå。所属ブランãƒãŒ\n"
+":branches: æ–‡å—列。 リビジョンã®å±žã™ã‚‹ãƒ–ランãƒå。 所属ブランãƒãŒ\n"
" default ã®å ´åˆã¯ç©ºæ–‡å—列。"
+msgid ":children: List of strings. The children of the changeset."
+msgstr ":children: æ–‡å—列列挙。 リビジョンã®å供。"
+
msgid ":date: Date information. The date when the changeset was committed."
-msgstr ":date: æ—¥æ™‚æƒ…å ±ã€‚ãƒªãƒ“ã‚¸ãƒ§ãƒ³ãŒè¨˜éŒ²ã•ã‚ŒãŸæ—¥æ™‚。"
+msgstr ":date: æ—¥æ™‚æƒ…å ±ã€‚ リビジョンãŒè¨˜éŒ²ã•ã‚ŒãŸæ—¥æ™‚。"
msgid ":desc: String. The text of the changeset description."
-msgstr ":desc: æ–‡å—列。リビジョンã®ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã€‚"
+msgstr ":desc: æ–‡å—列。 リビジョンã®ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã€‚"
msgid ""
":diffstat: String. Statistics of changes with the following format:\n"
" \"modified files: +added/-removed lines\""
msgstr ""
-":diffstat: æ–‡å—列。以下ã®å½¢å¼ã§ã®å¤‰æ›´æ¦‚è¦ã€‚\n"
+":diffstat: æ–‡å—列。 以下ã®å½¢å¼ã§ã®å¤‰æ›´æ¦‚è¦ã€‚\n"
" \"変更対象ファイル: +è¿½åŠ è¡Œæ•°/-削除行数\""
msgid ""
":files: List of strings. All files modified, added, or removed by this\n"
" changeset."
msgstr ""
-":files: æ–‡å—列列挙。当該リビジョンã§ã®ã€å¤‰æ›´ï¼è¿½åŠ 登録ãªã„ã—\n"
+":files: æ–‡å—列列挙。 当該リビジョンã§ã®ã€ 変更ï¼è¿½åŠ 登録ãªã„ã—\n"
" 登録除外ファイルã®ä¸€è¦§ã€‚"
msgid ":file_adds: List of strings. Files added by this changeset."
-msgstr ":file_adds: æ–‡å—列列挙。当該リビジョンã§ã®è¿½åŠ ファイル一覧。"
+msgstr ":file_adds: æ–‡å—列列挙。 当該リビジョンã§ã®è¿½åŠ ファイル一覧。"
msgid ""
":file_copies: List of strings. Files copied in this changeset with\n"
" their sources."
-msgstr ":file_copies: æ–‡å—列列挙。 当該リビジョンã§ã®è¤‡è£½å…ƒãƒ•ã‚¡ã‚¤ãƒ«ä¸€è¦§ã€‚"
+msgstr ":file_copies: æ–‡å—列列挙。 当該リビジョンã§ã®è¤‡è£½å…ƒãƒ•ã‚¡ã‚¤ãƒ«ä¸€è¦§ã€‚"
msgid ""
":file_copies_switch: List of strings. Like \"file_copies\" but displayed\n"
" only if the --copied switch is set."
msgstr ""
-":file_copies_switch: æ–‡å—列列挙。 \"file_copies\" ã¨åŒç¾©ã ãŒã€\n"
+":file_copies_switch: æ–‡å—列列挙。 \"file_copies\" ã¨åŒç¾©ã ãŒã€ \n"
" --copied 指定ã®ã‚る時ã®ã¿è¡¨ç¤ºã€‚"
msgid ":file_mods: List of strings. Files modified by this changeset."
-msgstr ":file_mods: æ–‡å—列列挙。当該リビジョンã§ã®å¤‰æ›´ãƒ•ã‚¡ã‚¤ãƒ«ä¸€è¦§ã€‚"
+msgstr ":file_mods: æ–‡å—列列挙。 当該リビジョンã§ã®å¤‰æ›´ãƒ•ã‚¡ã‚¤ãƒ«ä¸€è¦§ã€‚"
msgid ":file_dels: List of strings. Files removed by this changeset."
-msgstr ":file_dels: æ–‡å—列列挙。当該リビジョンã§ã®ç™»éŒ²é™¤å¤–ファイル一覧。"
-
-msgid ""
-":node: String. The changeset identification hash, as a 40-character\n"
-" hexadecimal string."
-msgstr ":node: æ–‡å—列。リビジョンè˜åˆ¥ç”¨ã® 40 æ¡ 16 進数ãƒãƒƒã‚·ãƒ¥å€¤ã€‚"
+msgstr ":file_dels: æ–‡å—列列挙。 当該リビジョンã§ã®ç™»éŒ²é™¤å¤–ファイル一覧。"
+
+msgid ""
+":node: String. The changeset identification hash, as a 40 hexadecimal\n"
+" digit string."
+msgstr ":node: æ–‡å—列。 リビジョンè˜åˆ¥ç”¨ã® 40 æ¡ 16 進数ãƒãƒƒã‚·ãƒ¥å€¤ã€‚"
msgid ":parents: List of strings. The parents of the changeset."
-msgstr ":parents: æ–‡å—列列挙。リビジョンã®è¦ªã€‚"
+msgstr ":parents: æ–‡å—列列挙。 リビジョンã®è¦ªã€‚"
msgid ":rev: Integer. The repository-local changeset revision number."
-msgstr ":rev: 整数。å„リãƒã‚¸ãƒˆãƒªå›ºæœ‰ã®ãƒªãƒ“ジョン番å·ã€‚"
+msgstr ":rev: 整数。 å„リãƒã‚¸ãƒˆãƒªå›ºæœ‰ã®ãƒªãƒ“ジョン番å·ã€‚"
msgid ":tags: List of strings. Any tags associated with the changeset."
-msgstr ":tags: æ–‡å—列列挙。当該リビジョンã«ä»˜ä¸Žã•ã‚ŒãŸã‚¿ã‚°ã®ä¸€è¦§ã€‚"
+msgstr ":tags: æ–‡å—列列挙。 当該リビジョンã«ä»˜ä¸Žã•ã‚ŒãŸã‚¿ã‚°ã®ä¸€è¦§ã€‚"
msgid ""
":latesttag: String. Most recent global tag in the ancestors of this\n"
" changeset."
msgstr ""
-":latesttag: æ–‡å—列。当該リビジョンã®å…ˆç¥–ã«å¯¾ã—ã¦æœ€ã‚‚最近ã«ä»˜ä¸Žã•ã‚ŒãŸã‚¿ã‚°"
+":latesttag: æ–‡å—列。 当該リビジョンã®å…ˆç¥–ã«å¯¾ã—ã¦æœ€ã‚‚最近ã«ä»˜ä¸Žã•ã‚ŒãŸã‚¿ã‚°"
msgid ":latesttagdistance: Integer. Longest path to the latest tag."
-msgstr ":latesttagdistance: 整数。最新タグã¸ã®æœ€é•·ãƒ‘ス"
+msgstr ":latesttagdistance: 整数。 最新タグã¸ã®æœ€é•·ãƒ‘ス"
msgid ""
"The \"date\" keyword does not produce human-readable output. If you\n"
@@ -12238,11 +12765,11 @@
"applying a string-input filter to a list-like input variable.\n"
"You can also use a chain of filters to get the desired output::"
msgstr ""
-"\"date\" ã‚ーワードã®å‡ºåŠ›ã¯å¯èªå½¢å¼ã§ã¯ã‚ã‚Šã¾ã›ã‚“。出力ã«æ—¥æ™‚æƒ…å ±ã‚’\n"
-"å«ã‚ãŸã„å ´åˆã€å¯èªåŒ–ã™ã‚‹ãŸã‚ã®ã€Œãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã€ã‚’使用ã—ã¾ã™ã€‚\n"
-"「フィルターã€ã¨ã¯ã€å…¥åŠ›å€¤ã«åŸºã¥ã„ã¦æ–‡å—列を生æˆã™ã‚‹æ©Ÿèƒ½ã§ã™ã€‚\n"
-"一覧系ã®å…¥åŠ›ã«å¯¾ã—ã¦æ–‡å—列åã®ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã‚’é©ç”¨ã™ã‚‹å ´åˆã€æœ€åˆã« stringify\n"
-"フィルターをé©ç”¨ã—ã¦ãã ã•ã„。複数ã®ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã‚’連ãã‚‹ã“ã¨ã§ã€\n"
+"\"date\" ã‚ーワードã®å‡ºåŠ›ã¯å¯èªå½¢å¼ã§ã¯ã‚ã‚Šã¾ã›ã‚“。 出力ã«æ—¥æ™‚æƒ…å ±ã‚’\n"
+"å«ã‚ãŸã„å ´åˆã€ å¯èªåŒ–ã™ã‚‹ãŸã‚ã®ã€Œãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã€ã‚’使用ã—ã¾ã™ã€‚\n"
+"「フィルターã€ã¨ã¯ã€ 入力値ã«åŸºã¥ã„ã¦æ–‡å—列を生æˆã™ã‚‹æ©Ÿèƒ½ã§ã™ã€‚\n"
+"一覧系ã®å…¥åŠ›ã«å¯¾ã—ã¦æ–‡å—列åã®ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã‚’é©ç”¨ã™ã‚‹å ´åˆã€ 最åˆã« stringify\n"
+"フィルターをé©ç”¨ã—ã¦ãã ã•ã„。 複数ã®ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã‚’連ãã‚‹ã“ã¨ã§ã€ \n"
"様々ãªå‡ºåŠ›ã‚’å¾—ã‚‹ã“ã¨ãŒã§ãã¾ã™::"
msgid ""
@@ -12253,20 +12780,20 @@
" 2008-08-21 18:22 +0000"
msgid "List of filters:"
-msgstr "フィルター一覧(入力ã¨ã€ãã‚Œã«å¯¾ã™ã‚‹å‡ºåŠ›):"
+msgstr "フィルター一覧(入力ã¨ã€ ãã‚Œã«å¯¾ã™ã‚‹å‡ºåŠ›):"
msgid ""
":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
" every line except the last."
msgstr ""
-":addbreaks: æ–‡å—列。最終行を除ãå„è¡Œã®è¡Œæœ«ã« XHTML ã® \n"
+":addbreaks: æ–‡å—列。 最終行を除ãå„è¡Œã®è¡Œæœ«ã« XHTML ã® \n"
" \"<br />\" ã‚¿ã‚°ã‚’è¿½åŠ ã—ã¾ã™ã€‚"
msgid ""
":age: Date. Returns a human-readable date/time difference between the\n"
" given date/time and the current date/time."
msgstr ""
-":age: æ—¥æ™‚æƒ…å ±ã€‚ä¸Žãˆã‚‰ã‚ŒãŸæ—¥æ™‚ã¨ã€ç¾åœ¨æ—¥æ™‚ã¨ã®å·®åˆ†ã‚’表ã™\n"
+":age: æ—¥æ™‚æƒ…å ±ã€‚ 与ãˆã‚‰ã‚ŒãŸæ—¥æ™‚ã¨ã€ ç¾åœ¨æ—¥æ™‚ã¨ã®å·®åˆ†ã‚’表ã™\n"
" å¯èªå½¢å¼ã®æ–‡å—列を生æˆã—ã¾ã™ã€‚"
msgid ""
@@ -12275,16 +12802,16 @@
" (ignoring trailing separators). For example, \"foo/bar/baz\" becomes\n"
" \"baz\" and \"foo/bar//\" becomes \"bar\"."
msgstr ""
-":basename: æ–‡å—列。与ãˆã‚‰ã‚ŒãŸæ–‡å—列をパスã¨ã¿ãªã—ã€ãƒ‘ス区切りã§\n"
+":basename: æ–‡å—列。 与ãˆã‚‰ã‚ŒãŸæ–‡å—列をパスã¨ã¿ãªã—〠パス区切りã§\n"
" 区切られãŸæœ€å¾Œã®è¦ç´ ã ã‘ã‚’å–り出ã—ã¾ã™(末尾パス\n"
" 区切りã¯ç„¡è¦–ã•ã‚Œã¾ã™)。\n"
-" 例) \"foo/bar/baz\" 㯠\"baz\"ã€\"foo/bar//\" 㯠\"bar\""
+" 例) \"foo/bar/baz\" 㯠\"baz\"〠\"foo/bar//\" 㯠\"bar\""
msgid ""
":stripdir: Treat the text as path and strip a directory level, if\n"
" possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\"."
msgstr ""
-":stripdir: æ–‡å—列。与ãˆã‚‰ã‚ŒãŸæ–‡å—列をパスã¨ã¿ãªã—ã€ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª\n"
+":stripdir: æ–‡å—列。 与ãˆã‚‰ã‚ŒãŸæ–‡å—列をパスã¨ã¿ãªã—〠ディレクトリ\n"
" 階層ãŒã‚ã‚Œã°ãれをå–り除ãã¾ã™ã€‚\n"
" 例) \"foo\" ãŠã‚ˆã³ \"foo/bar\" 㯠\"foo\""
@@ -12292,7 +12819,7 @@
":date: Date. Returns a date in a Unix date format, including the\n"
" timezone: \"Mon Sep 04 15:13:13 2006 0700\"."
msgstr ""
-":date: æ—¥æ™‚æƒ…å ±ã€‚ã‚¿ã‚¤ãƒ ã‚¾ãƒ¼ãƒ³è¾¼ã¿ã® Unix date コマンド形å¼ã«ã—ã¾ã™ã€‚\n"
+":date: æ—¥æ™‚æƒ…å ±ã€‚ タイムゾーン込ã¿ã® Unix date コマンド形å¼ã«ã—ã¾ã™ã€‚\n"
" 例) \"Mon Sep 04 15:13:13 2006 0700\""
msgid ""
@@ -12300,7 +12827,7 @@
" address, and extracts just the domain component. Example: ``User\n"
" <user@example.com>`` becomes ``example.com``."
msgstr ""
-":domain: æ–‡å—列。メールアドレスã¨æ€ã—ã最åˆã®æ–‡å—列部分ã‹ã‚‰\n"
+":domain: æ–‡å—列。 メールアドレスã¨æ€ã—ã最åˆã®æ–‡å—列部分ã‹ã‚‰\n"
" ドメイン部分ã ã‘ã‚’å–り出ã—ã¾ã™ã€‚\n"
" 例) ``User <user@example.com>`` 㯠``example.com``"
@@ -12309,33 +12836,39 @@
" address. Example: ``User <user@example.com>`` becomes\n"
" ``user@example.com``."
msgstr ""
-":email: æ–‡å—列。メールアドレスã¨æ€ã—ã最åˆã®éƒ¨åˆ†ã‚’å–り出ã—ã¾ã™ã€‚\n"
+":email: æ–‡å—列。 メールアドレスã¨æ€ã—ã最åˆã®éƒ¨åˆ†ã‚’å–り出ã—ã¾ã™ã€‚\n"
" 例) ``User <user@example.com>`` 㯠``user@example.com``"
msgid ""
":escape: Any text. Replaces the special XML/XHTML characters \"&\", \"<\"\n"
" and \">\" with XML entities."
msgstr ""
-":escape: æ–‡å—列。XML/XHTML ã®ç‰¹æ®Šæ–‡å—ã§ã‚ã‚‹ \"&\"ã€\"<\" ãŠã‚ˆã³\n"
+":escape: æ–‡å—列。 XML/XHTML ã®ç‰¹æ®Šæ–‡å—ã§ã‚ã‚‹ \"&\"〠\"<\" ãŠã‚ˆã³\n"
" \">\" ã‚’ XML ã®ã‚¨ãƒ³ãƒ†ã‚£ãƒ†ã‚£å½¢å¼ã«å¤‰æ›ã—ã¾ã™ã€‚"
+msgid ""
+":hex: Any text. Convert a binary Mercurial node identifier into\n"
+" its long hexadecimal representation."
+msgstr ""
+":hex: æ–‡å—列。 Mercurial ã® node æƒ…å ±ã‚’ 40 æ¡ 16 進文å—列ã«å¤‰æ›ã—ã¾ã™ã€‚"
+
msgid ":fill68: Any text. Wraps the text to fit in 68 columns."
-msgstr ":fill68: æ–‡å—列。68 æ¡ã«åŽã¾ã‚‹ã‚ˆã†ã«æ–‡å—列を折り返ã—ã¾ã™ã€‚"
+msgstr ":fill68: æ–‡å—列。 68 æ¡ã«åŽã¾ã‚‹ã‚ˆã†ã«æ–‡å—列を折り返ã—ã¾ã™ã€‚"
msgid ":fill76: Any text. Wraps the text to fit in 76 columns."
-msgstr ":fill76: æ–‡å—列。76 æ¡ã«åŽã¾ã‚‹ã‚ˆã†ã«æ–‡å—列を折り返ã—ã¾ã™ã€‚"
+msgstr ":fill76: æ–‡å—列。 76 æ¡ã«åŽã¾ã‚‹ã‚ˆã†ã«æ–‡å—列を折り返ã—ã¾ã™ã€‚"
msgid ":firstline: Any text. Returns the first line of text."
-msgstr ":firstline: æ–‡å—列。最åˆã®è¡Œã®ã¿ã‚’å–り出ã—ã¾ã™ã€‚"
+msgstr ":firstline: æ–‡å—列。 最åˆã®è¡Œã®ã¿ã‚’å–り出ã—ã¾ã™ã€‚"
msgid ":nonempty: Any text. Returns '(none)' if the string is empty."
-msgstr ":nonempty: æ–‡å—列。与ãˆã‚‰ã‚ŒãŸæ–‡å—列ãŒç©ºã®å ´åˆ '(none)'ã¨ãªã‚Šã¾ã™ã€‚"
+msgstr ":nonempty: æ–‡å—列。 与ãˆã‚‰ã‚ŒãŸæ–‡å—列ãŒç©ºã®å ´åˆ '(none)'ã¨ãªã‚Šã¾ã™ã€‚"
msgid ""
":hgdate: Date. Returns the date as a pair of numbers: \"1157407993\n"
" 25200\" (Unix timestamp, timezone offset)."
msgstr ""
-":hgdate: æ—¥æ™‚æƒ…å ±ã€‚Unix タイムスタンプã¨ã‚¿ã‚¤ãƒ ゾーンオフセットã«ã‚ˆã‚‹\n"
+":hgdate: æ—¥æ™‚æƒ…å ±ã€‚ Unix タイムスタンプã¨ã‚¿ã‚¤ãƒ ゾーンオフセットã«ã‚ˆã‚‹\n"
" 数値対形å¼ã§å¯èªåŒ–ã—ã¾ã™ã€‚\n"
" 例) \"1157407993 25200\""
@@ -12343,7 +12876,7 @@
":isodate: Date. Returns the date in ISO 8601 format: \"2009-08-18 13:00\n"
" +0200\"."
msgstr ""
-":isodate: æ—¥æ™‚æƒ…å ±ã€‚ISO 8601 å½¢å¼ã§å¯èªåŒ–ã—ã¾ã™:\n"
+":isodate: æ—¥æ™‚æƒ…å ±ã€‚ ISO 8601 å½¢å¼ã§å¯èªåŒ–ã—ã¾ã™:\n"
" 例) \"2009-08-18 13:00 +0200\""
msgid ""
@@ -12351,65 +12884,65 @@
" seconds: \"2009-08-18 13:00:13 +0200\". See also the rfc3339date\n"
" filter."
msgstr ""
-":isodatesec: æ—¥æ™‚æƒ…å ±ã€‚ç§’æƒ…å ±ä»˜ãã® ISO 8601 å½¢å¼ã§å¯èªåŒ–ã—ã¾ã™:\n"
+":isodatesec: æ—¥æ™‚æƒ…å ±ã€‚ ç§’æƒ…å ±ä»˜ãã® ISO 8601 å½¢å¼ã§å¯èªåŒ–ã—ã¾ã™:\n"
" 例) \"2009-08-18 13:00:13 +0200\"\n"
" ※ 後述ã™ã‚‹ rfc3339date フィルタã®èª¬æ˜Žã‚‚å‚ç…§ã—ã¦ãã ã•ã„。"
msgid ":localdate: Date. Converts a date to local date."
-msgstr ":localdate: æ—¥æ™‚æƒ…å ±ã€‚ãƒãƒ¼ã‚«ãƒ«æ—¥æ™‚ã§å¯èªåŒ–ã—ã¾ã™ã€‚"
+msgstr ":localdate: æ—¥æ™‚æƒ…å ±ã€‚ ãƒãƒ¼ã‚«ãƒ«æ—¥æ™‚ã§å¯èªåŒ–ã—ã¾ã™ã€‚"
msgid ""
":obfuscate: Any text. Returns the input text rendered as a sequence of\n"
" XML entities."
-msgstr ":obfuscate: æ–‡å—列。全ã¦ã®æ–‡å—ã‚’ XML エンティティ形å¼ã«å¤‰æ›ã—ã¾ã™ã€‚"
+msgstr ":obfuscate: æ–‡å—列。 å…¨ã¦ã®æ–‡å—ã‚’ XML エンティティ形å¼ã«å¤‰æ›ã—ã¾ã™ã€‚"
msgid ":person: Any text. Returns the text before an email address."
-msgstr ":person: æ–‡å—列。メールアドレス直å‰ã®éƒ¨åˆ†ã ã‘ã‚’å–り出ã—ã¾ã™ã€‚"
+msgstr ":person: æ–‡å—列。 メールアドレス直å‰ã®éƒ¨åˆ†ã ã‘ã‚’å–り出ã—ã¾ã™ã€‚"
msgid ""
":rfc822date: Date. Returns a date using the same format used in email\n"
" headers: \"Tue, 18 Aug 2009 13:00:13 +0200\"."
msgstr ""
-":rfc822date: æ—¥æ™‚æƒ…å ±ã€‚ãƒ¡ãƒ¼ãƒ«ã®ãƒ˜ãƒƒãƒ€ã¨åŒå½¢å¼ã§å¯èªåŒ–ã—ã¾ã™:\n"
+":rfc822date: æ—¥æ™‚æƒ…å ±ã€‚ メールã®ãƒ˜ãƒƒãƒ€ã¨åŒå½¢å¼ã§å¯èªåŒ–ã—ã¾ã™:\n"
" 例) \"Tue, 18 Aug 2009 13:00:13 +0200\"."
msgid ""
":rfc3339date: Date. Returns a date using the Internet date format\n"
" specified in RFC 3339: \"2009-08-18T13:00:13+02:00\"."
msgstr ""
-":rfc3339date: æ—¥ä»˜æƒ…å ±ã€‚ RFC 3339 ã§å®šã‚られãŸæ—¥ä»˜å½¢å¼ã§å¯èªåŒ–ã—ã¾ã™ã€‚\n"
+":rfc3339date: æ—¥ä»˜æƒ…å ±ã€‚ RFC 3339 ã§å®šã‚られãŸæ—¥ä»˜å½¢å¼ã§å¯èªåŒ–ã—ã¾ã™ã€‚\n"
" 例) \"2009-08-18T13:00:13+02:00\"."
msgid ""
":short: Changeset hash. Returns the short form of a changeset hash,\n"
-" i.e. a 12-byte hexadecimal string."
-msgstr ":short: リビジョンãƒãƒƒã‚·ãƒ¥ 値。12 æ¡ç¨‹åº¦ã®çŸç¸®å½¢å¼ã«ã—ã¾ã™ã€‚"
+" i.e. a 12 hexadecimal digit string."
+msgstr ":short: リビジョンãƒãƒƒã‚·ãƒ¥ 値。 12 æ¡ç¨‹åº¦ã®çŸç¸®å½¢å¼ã«ã—ã¾ã™ã€‚"
msgid ":shortdate: Date. Returns a date like \"2006-09-18\"."
-msgstr ":shortdate: æ—¥æ™‚æƒ…å ±ã€‚\"2006-09-18\" å½¢å¼ã§å¯èªåŒ–ã—ã¾ã™ã€‚"
+msgstr ":shortdate: æ—¥æ™‚æƒ…å ±ã€‚ \"2006-09-18\" å½¢å¼ã§å¯èªåŒ–ã—ã¾ã™ã€‚"
msgid ""
":stringify: Any type. Turns the value into text by converting values into\n"
" text and concatenating them."
-msgstr ":stringify: ä»»æ„ã®ãƒ‡ãƒ¼ã‚¿ã€‚値を文å—列化ã—ã¦é€£çµã—ã¾ã™"
+msgstr ":stringify: ä»»æ„ã®ãƒ‡ãƒ¼ã‚¿ã€‚ 値を文å—列化ã—ã¦é€£çµã—ã¾ã™"
msgid ":strip: Any text. Strips all leading and trailing whitespace."
-msgstr ":strip: æ–‡å—列。先é ï¼æœ«å°¾ã®ç©ºç™½æ–‡å—ã‚’å–り除ãã¾ã™ã€‚"
+msgstr ":strip: æ–‡å—列。 å…ˆé ï¼æœ«å°¾ã®ç©ºç™½æ–‡å—ã‚’å–り除ãã¾ã™ã€‚"
msgid ""
":tabindent: Any text. Returns the text, with every line except the\n"
" first starting with a tab character."
-msgstr ":tabindent: æ–‡å—列。タブ文å—以外ã§å§‹ã¾ã‚‹è¡Œã‚’タブ文å—ã§å—下ã’ã—ã¾ã™ã€‚"
+msgstr ":tabindent: æ–‡å—列。 タブ文å—以外ã§å§‹ã¾ã‚‹è¡Œã‚’タブ文å—ã§å—下ã’ã—ã¾ã™ã€‚"
msgid ""
":urlescape: Any text. Escapes all \"special\" characters. For example,\n"
" \"foo bar\" becomes \"foo%20bar\"."
msgstr ""
-":urlescape: æ–‡å—列。全ã¦ã®ã€Œç‰¹æ®Šã€æ–‡å—を変æ›ã—ã¾ã™ã€‚\n"
+":urlescape: æ–‡å—列。 å…¨ã¦ã®ã€Œç‰¹æ®Šã€æ–‡å—を変æ›ã—ã¾ã™ã€‚\n"
" 例ãˆã° \"foo bar\" 㯠\"foo%20bar\" ã¨ãªã‚Šã¾ã™ã€‚"
msgid ":user: Any text. Returns the user portion of an email address.\n"
-msgstr ":user: æ–‡å—列。メールアドレスã®ãƒ¦ãƒ¼ã‚¶å部分をå–り出ã—ã¾ã™ã€‚\n"
+msgstr ":user: æ–‡å—列。 メールアドレスã®ãƒ¦ãƒ¼ã‚¶å部分をå–り出ã—ã¾ã™ã€‚\n"
msgid "Valid URLs are of the form::"
msgstr "有効㪠URL 指定ã¯ä»¥ä¸‹ã®å½¢å¼ã§ã™::"
@@ -12432,7 +12965,7 @@
"repositories or to bundle files (as created by :hg:`bundle` or :hg:`\n"
"incoming --bundle`)."
msgstr ""
-"ãƒãƒ¼ã‚«ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ 上ã®ãƒ‘スãŒæŒ‡ã™å…ˆã¯ã€Mercurial ã®ãƒªãƒã‚¸ãƒˆãƒªã§ã‚‚ã€\n"
+"ãƒãƒ¼ã‚«ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ 上ã®ãƒ‘スãŒæŒ‡ã™å…ˆã¯ã€ Mercurial ã®ãƒªãƒã‚¸ãƒˆãƒªã§ã‚‚〠\n"
"ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«(:hg:`bundle` ãªã„ã— :hg:`incoming --bundle` ã§ç”Ÿæˆ)ã§ã‚‚\n"
"構ã„ã¾ã›ã‚“。"
@@ -12441,8 +12974,8 @@
"changeset to use from the remote repository. See also :hg:`help\n"
"revisions`."
msgstr ""
-"連æºå…ˆãƒªãƒã‚¸ãƒˆãƒªæŒ‡å®šã«ãŠã„ã¦ã€'#' 記å·ã«ç¶šã‘ã¦è˜åˆ¥åを指定ã™ã‚‹ã“ã¨ã§ã€\n"
-"特定ã®ãƒ–ランãƒã€ã‚¿ã‚°ãªã„ã—ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã‚’指定ã™ã‚‹ã“ã¨ãŒå‡ºæ¥ã¾ã™ã€‚\n"
+"連æºå…ˆãƒªãƒã‚¸ãƒˆãƒªæŒ‡å®šã«ãŠã„ã¦ã€ '#' 記å·ã«ç¶šã‘ã¦è˜åˆ¥åを指定ã™ã‚‹ã“ã¨ã§ã€ \n"
+"特定ã®ãƒ–ランãƒã€ ã‚¿ã‚°ãªã„ã—ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã‚’指定ã™ã‚‹ã“ã¨ãŒå‡ºæ¥ã¾ã™ã€‚\n"
":hg:`help revisions` ã‚‚å‚ç…§ã—ã¦ãã ã•ã„。"
msgid ""
@@ -12451,9 +12984,16 @@
"server."
msgstr ""
"http:// ã‚„ https:// å½¢å¼ã® URL ã§æŒ‡å®šã•ã‚Œã‚‹é€£æºå…ˆã¸ã® push ã®æ§˜ãª\n"
-"機能ã®ã†ã¡ã®å¹¾ã¤ã‹ã¯ã€ãã®æ©Ÿèƒ½ãŒé€£æºå…ˆã® Mercurial サーãƒå´ã§æ˜Žç¤ºçš„ã«\n"
+"機能ã®ã†ã¡ã®å¹¾ã¤ã‹ã¯ã€ ãã®æ©Ÿèƒ½ãŒé€£æºå…ˆã® Mercurial サーãƒå´ã§æ˜Žç¤ºçš„ã«\n"
"利用å¯èƒ½ã«ãªã£ã¦ã„ã‚‹å ´åˆã«é™ã‚Šä½¿ç”¨å¯èƒ½ã§ã™ã€‚"
+msgid ""
+"Note that the security of HTTPS URLs depends on proper configuration of\n"
+"web.cacerts."
+msgstr ""
+"HTTPS ã«ã‚ˆã‚‹ URL 指定ã®å®‰å…¨æ€§ã¯ã€ web.cacerts ã«ãŠã‘ã‚‹è¨å®šã®\n"
+"妥当性ã«ä¾å˜ã—ã¾ã™ã€‚"
+
msgid "Some notes about using SSH with Mercurial:"
msgstr "Mercurial 㨠SSH を併用ã™ã‚‹å ´åˆã®æ³¨æ„点:"
@@ -12463,11 +13003,11 @@
"- path is relative to the remote user's home directory by default. Use\n"
" an extra slash at the start of a path to specify an absolute path::"
msgstr ""
-"- SSH アクセス先ホスト上ã«ã€shell アカウント㨠hg コマンドãŒå¿…è¦ã§ã™ã€‚\n"
+"- SSH アクセス先ホスト上ã«ã€ shell アカウント㨠hg コマンドãŒå¿…è¦ã§ã™ã€‚\n"
" hg コマンドãŒã‚¢ã‚¯ã‚»ã‚¹å…ˆãƒ›ã‚¹ãƒˆã® PATH è¨å®šã§åˆ©ç”¨å¯èƒ½ã«ãªã£ã¦ã„ãªã„\n"
-" å ´åˆã¯ã€--remotecmd ã§æ˜Žç¤ºçš„ã«æŒ‡å®šã—ã¦ãã ã•ã„。\n"
-"- URL ä¸ã®ãƒ‘ス指定ã¯ã€ã‚¢ã‚¯ã‚»ã‚¹å…ˆãƒ›ã‚¹ãƒˆä¸Šã®ãƒ¦ãƒ¼ã‚¶ã®ãƒ›ãƒ¼ãƒ ディレクトリ\n"
-" ã‹ã‚‰ã®ç›¸å¯¾ãƒ‘スã¨ã¿ãªã•ã‚Œã¾ã™ã€‚絶対パスを指定ã™ã‚‹å ´åˆã¯ã€ãƒ‘スã®å…ˆé ã«\n"
+" å ´åˆã¯ã€ --remotecmd ã§æ˜Žç¤ºçš„ã«æŒ‡å®šã—ã¦ãã ã•ã„。\n"
+"- URL ä¸ã®ãƒ‘ス指定ã¯ã€ アクセス先ホスト上ã®ãƒ¦ãƒ¼ã‚¶ã®ãƒ›ãƒ¼ãƒ ディレクトリ\n"
+" ã‹ã‚‰ã®ç›¸å¯¾ãƒ‘スã¨ã¿ãªã•ã‚Œã¾ã™ã€‚ 絶対パスを指定ã™ã‚‹å ´åˆã¯ã€ パスã®å…ˆé ã«\n"
" æ›´ã«ã‚¹ãƒ©ãƒƒã‚·ãƒ¥('/')を付与ã—ã¦ãã ã•ã„::"
msgid " ssh://example.com//tmp/repository"
@@ -12477,7 +13017,7 @@
"- Mercurial doesn't use its own compression via SSH; the right thing\n"
" to do is to configure it in your ~/.ssh/config, e.g.::"
msgstr ""
-"- SSH 連æºã®éš›ã«ã¯ Mercurial ã¯è‡ªèº«ã®åœ§ç¸®å‡¦ç†ã‚’è¡Œã„ã¾ã›ã‚“。以下ã®ã‚ˆã†ã«\n"
+"- SSH 連æºã®éš›ã«ã¯ Mercurial ã¯è‡ªèº«ã®åœ§ç¸®å‡¦ç†ã‚’è¡Œã„ã¾ã›ã‚“。 以下ã®ã‚ˆã†ã«\n"
" ~/.ssh/config ç‰ã§ SSH ã®åœ§ç¸®å®Ÿæ–½ã‚’指示ã™ã‚‹ã“ã¨ã‚’ãŠå‹§ã‚ã—ã¾ã™::"
msgid ""
@@ -12495,14 +13035,14 @@
" Alternatively specify \"ssh -C\" as your ssh command in your\n"
" configuration file or with the --ssh command line option."
msgstr ""
-" ã‚ã‚‹ã„ã¯ã€è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«ãŠã‘ã‚‹ ssh コマンド指定やã€ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ã§ã®\n"
-" --ssh オプションã«å¯¾ã—ã¦ã€'ssh -C' を指定ã™ã‚‹æ–¹æ³•ã‚‚ã‚ã‚Šã¾ã™ã€‚"
+" ã‚ã‚‹ã„ã¯ã€ è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«ãŠã‘ã‚‹ ssh コマンド指定や〠コマンドラインã§ã®\n"
+" --ssh オプションã«å¯¾ã—ã¦ã€ 'ssh -C' を指定ã™ã‚‹æ–¹æ³•ã‚‚ã‚ã‚Šã¾ã™ã€‚"
msgid ""
"These URLs can all be stored in your configuration file with path\n"
"aliases under the [paths] section like so::"
msgstr ""
-"連æºå…ˆ URL ã¯ã€è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã® [paths] セクションã§ã€\n"
+"連æºå…ˆ URL ã¯ã€ è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã® [paths] セクションã§ã€ \n"
"別åを付ã‘ã¦è¨˜è¿°ã™ã‚‹ã“ã¨ãŒå‡ºæ¥ã¾ã™::"
msgid ""
@@ -12520,14 +13060,14 @@
"You can then use the alias for any command that uses a URL (for\n"
"example :hg:`pull alias1` will be treated as :hg:`pull URL1`)."
msgstr ""
-"URL 指定ãŒå¿…è¦ãªã‚³ãƒžãƒ³ãƒ‰ã«å¯¾ã—ã¦ã¯ã€åˆ¥åを指定ã™ã‚‹ã“ã¨ãŒå‡ºæ¥ã¾ã™\n"
-"(例ãˆã°ã€:hg:`pull alias1` 㯠:hg:`pull URL1` ã¨åŒç¾©ã§ã™)。"
+"URL 指定ãŒå¿…è¦ãªã‚³ãƒžãƒ³ãƒ‰ã«å¯¾ã—ã¦ã¯ã€ 別åを指定ã™ã‚‹ã“ã¨ãŒå‡ºæ¥ã¾ã™\n"
+"(例ãˆã°ã€ :hg:`pull alias1` 㯠:hg:`pull URL1` ã¨åŒç¾©ã§ã™)。"
msgid ""
"Two path aliases are special because they are used as defaults when\n"
"you do not provide the URL to a command:"
msgstr ""
-"コマンド㫠URL を指定ã—ãªã‹ã£ãŸå ´åˆã«ã€æš—é»™ã®é€£æºå…ˆã¨ã—ã¦ä½¿ç”¨ã•ã‚Œã‚‹\n"
+"コマンド㫠URL を指定ã—ãªã‹ã£ãŸå ´åˆã«ã€ æš—é»™ã®é€£æºå…ˆã¨ã—ã¦ä½¿ç”¨ã•ã‚Œã‚‹\n"
"é‡è¦ãªåˆ¥åãŒ2ã¤ã‚ã‚Šã¾ã™:"
msgid ""
@@ -12538,10 +13078,10 @@
" pull-like commands (including incoming and outgoing)."
msgstr ""
"default:\n"
-" 'hg clone' ã«ã‚ˆã£ã¦è¤‡è£½ã—ãŸå ´åˆã€æ–°è¦ãƒªãƒã‚¸ãƒˆãƒªã® 'default' ã¨ã—ã¦\n"
+" 'hg clone' ã«ã‚ˆã£ã¦è¤‡è£½ã—ãŸå ´åˆã€ æ–°è¦ãƒªãƒã‚¸ãƒˆãƒªã® 'default' ã¨ã—ã¦\n"
" 複製元リãƒã‚¸ãƒˆãƒªã® URL ãŒä¿å˜ã•ã‚Œã¾ã™ã€‚\n"
-" 以後ã€é€£æºå…ˆã‚’çœç•¥ã—㦠'hg push' ã‚„ 'hg pull' ã«é¡žã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã‚’\n"
-" 実行ã—ãŸéš›ã«ã¯ã€ã“ã® URL ãŒé€£æºå…ˆã¨ã—ã¦ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚"
+" 以後〠連æºå…ˆã‚’çœç•¥ã—㦠'hg push' ã‚„ 'hg pull' ã«é¡žã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã‚’\n"
+" 実行ã—ãŸéš›ã«ã¯ã€ ã“ã® URL ãŒé€£æºå…ˆã¨ã—ã¦ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚"
msgid ""
"default-push:\n"
@@ -12549,8 +13089,8 @@
" prefer it over 'default' if both are defined.\n"
msgstr ""
"default-push:\n"
-" 'hg push' ã¯ã€'default-push' ã®åˆ¥åã§å®šç¾©ã•ã‚Œã‚‹ URL を探ã—ã¾ã™ã€‚\n"
-" 'default' ãŒå®šç¾©ã•ã‚Œã¦ã„ã‚‹å ´åˆã§ã‚‚ã€'default-push' ãŒå®šç¾©ã•ã‚Œã¦ã„ã‚Œã°\n"
+" 'hg push' ã¯ã€ 'default-push' ã®åˆ¥åã§å®šç¾©ã•ã‚Œã‚‹ URL を探ã—ã¾ã™ã€‚\n"
+" 'default' ãŒå®šç¾©ã•ã‚Œã¦ã„ã‚‹å ´åˆã§ã‚‚〠'default-push' ãŒå®šç¾©ã•ã‚Œã¦ã„ã‚Œã°\n"
" ã“ã¡ã‚‰ãŒå„ªå…ˆã•ã‚Œã¾ã™ã€‚\n"
msgid "remote branch lookup not supported"
@@ -12587,7 +13127,7 @@
msgid ""
"src repository does not support revision lookup and so doesn't support clone "
"by revision"
-msgstr "指定ã®è¤‡è£½å…ƒã§ã¯ã€ãƒªãƒ“ジョン指定付ãã§ã®è¤‡è£½ãŒã§ãã¾ã›ã‚“"
+msgstr "指定ã®è¤‡è£½å…ƒã§ã¯ã€ リビジョン指定付ãã§ã®è¤‡è£½ãŒã§ãã¾ã›ã‚“"
msgid "clone from remote to remote not supported"
msgstr "リモートã‹ã‚‰ãƒªãƒ¢ãƒ¼ãƒˆã®è¤‡è£½ã¯ã‚µãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“"
@@ -12599,15 +13139,16 @@
#, python-format
msgid ""
"%d files updated, %d files merged, %d files removed, %d files unresolved\n"
-msgstr "ファイル状態: æ›´æ–°æ•° %dã€ãƒžãƒ¼ã‚¸æ•° %dã€å‰Šé™¤æ•° %dã€è¡çªæœªè§£æ±ºæ•° %d\n"
+msgstr "ファイル状態: æ›´æ–°æ•° %d〠マージ数 %d〠削除数 %d〠è¡çªæœªè§£æ±ºæ•° %d\n"
msgid "use 'hg resolve' to retry unresolved file merges\n"
msgstr "'hg resolve' ã§ãƒžãƒ¼ã‚¸ã®è¡çªã‚’解消ã—ã¦ãã ã•ã„\n"
msgid ""
-"use 'hg resolve' to retry unresolved file merges or 'hg update -C' to "
+"use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to "
"abandon\n"
-msgstr "'hg resolve' ã§ã®å†åº¦è¡çªè§£æ¶ˆã‹ã€'hg up -C' ã§å¤‰æ›´ç ´æ£„ã—ã¦ãã ã•ã„\n"
+msgstr ""
+"'hg resolve' ã§å†åº¦è¡çªè§£æ¶ˆã™ã‚‹ã‹ã€ 'hg up -C .' ã§å¤‰æ›´ç ´æ£„ã—ã¦ãã ã•ã„\n"
msgid "(branch merge, don't forget to commit)\n"
msgstr "(マージçµæžœã® commit を忘れãšã«)\n"
@@ -12724,21 +13265,6 @@
msgid "'%s' uses newer protocol %s"
msgstr "'%s' ã¯æ–°ã—ã„プãƒãƒˆã‚³ãƒ« %s を使ã„ã¾ã™"
-msgid "look up remote revision"
-msgstr "連æºå…ˆã§ã®ãƒªãƒ“ジョンã®æ¤œç´¢"
-
-msgid "unexpected response:"
-msgstr "未知ã®å¿œç”:"
-
-msgid "look up remote changes"
-msgstr "連æºå…ˆã§ã®å¤‰æ›´ã®æ¤œç´¢"
-
-msgid "push failed (unexpected response):"
-msgstr "å±¥æ´åæ˜ ã«å¤±æ•—(未知ã®ãƒ¬ã‚¹ãƒãƒ³ã‚¹):"
-
-msgid "remote: "
-msgstr "é 隔ホスト: "
-
#, python-format
msgid "push failed: %s"
msgstr "å±¥æ´åæ˜ ã«å¤±æ•—: %s"
@@ -12814,7 +13340,7 @@
#, python-format
msgid "Named branch could not be reset, current branch still is: %s\n"
-msgstr "åå‰ã¤ãブランãƒã¯ãƒªã‚»ãƒƒãƒˆã§ãã¾ã›ã‚“ã®ã§ã€%s ã®ã¾ã¾ã§ã™\n"
+msgstr "åå‰ã¤ãブランãƒã¯ãƒªã‚»ãƒƒãƒˆã§ãã¾ã›ã‚“ã®ã§ã€ %s ã®ã¾ã¾ã§ã™\n"
msgid "no rollback information available\n"
msgstr "利用å¯èƒ½ãªãƒãƒ¼ãƒ«ãƒãƒƒã‚¯æƒ…å ±ãŒã‚ã‚Šã¾ã›ã‚“\n"
@@ -12867,7 +13393,8 @@
msgid ""
"partial pull cannot be done because other repository doesn't support "
"changegroupsubset."
-msgstr "連æºå…ˆã® changegroupsubset 機能未対応ã«ã‚ˆã‚Šã€éƒ¨åˆ†å–ã‚Šè¾¼ã¿ã§ãã¾ã›ã‚“。"
+msgstr ""
+"連æºå…ˆã® changegroupsubset 機能未対応ã«ã‚ˆã‚Šã€ 部分å–ã‚Šè¾¼ã¿ã§ãã¾ã›ã‚“。"
#, python-format
msgid "%d changesets found\n"
@@ -12892,9 +13419,6 @@
msgid "adding changesets\n"
msgstr "ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã‚’è¿½åŠ ä¸\n"
-msgid "changesets"
-msgstr "ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆ"
-
msgid "received changelog group is empty"
msgstr "å—ä¿¡ã—ãŸå¤‰æ›´å±¥æ´ã¯ç©ºã§ã™"
@@ -12950,7 +13474,7 @@
#, python-format
msgid "sending mail: smtp host %s, port %s\n"
-msgstr "メールé€ä¿¡ä¸: SMTP ホスト %sã€ãƒãƒ¼ãƒˆç•ªå· %s\n"
+msgstr "メールé€ä¿¡ä¸: SMTP ホスト %s〠ãƒãƒ¼ãƒˆç•ªå· %s\n"
msgid "can't use TLS: Python SSL support not installed"
msgstr "TLS を利用ã§ãã¾ã›ã‚“: Python SSL サãƒãƒ¼ãƒˆãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“"
@@ -12967,7 +13491,7 @@
msgstr "メールé€ä¿¡ä¸: %s\n"
msgid "smtp specified as email transport, but no smtp host configured"
-msgstr "メール転é€æ–¹å¼ã® 'smtp' 指定ã«ã‚‚é–¢ã‚らãšã€SMTP ホストãŒæœªè¨å®šã§ã™"
+msgstr "メール転é€æ–¹å¼ã® 'smtp' 指定ã«ã‚‚é–¢ã‚らãšã€ SMTP ホストãŒæœªè¨å®šã§ã™"
#, python-format
msgid "%r specified as email transport, but not in PATH"
@@ -13071,8 +13595,8 @@
msgstr "%s ã‹ã‚‰ %s ã«è¤‡è£½ä¸\n"
#, python-format
-msgid "warning: detected divergent renames of %s to:\n"
-msgstr "è¦å‘Š: %s ã®æ”¹åå…ˆãŒç•°ãªã‚Šã¾ã™:\n"
+msgid "note: possible conflict - %s was renamed multiple times to:\n"
+msgstr "備考: è¡çªã®å¯èƒ½æ€§ - %s ãŒè¤‡æ•°ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«æ”¹åã•ã‚Œã¾ã—ãŸ:\n"
#, python-format
msgid "branch %s not found"
@@ -13087,15 +13611,39 @@
msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
msgstr "未コミット変更ãŒã‚ã‚Šã¾ã™('hg status' ã§å¤‰æ›´ä¸€è¦§è¡¨ç¤ºå¯èƒ½)"
-msgid ""
-"crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard "
-"changes)"
-msgstr ""
-"ブランãƒæ¨ªæ–('hg merge' ã§ã®ãƒžãƒ¼ã‚¸ã‹ã€'hg update -C' ã§å¤‰æ›´ç ´æ£„ã—ã¦ãã ã•ã„)"
-
-msgid "crosses branches (use 'hg merge' or use 'hg update -c')"
-msgstr ""
-"ブランãƒæ¨ªæ–('hg merge' ã§ã®ãƒžãƒ¼ã‚¸ã‹ã€'hg update -c' ã§å¤‰æ›´ç¢ºèªã—ã¦ãã ã•ã„)"
+msgid "crosses branches (merge branches or use --clean to discard changes)"
+msgstr ""
+"ブランãƒæ¨ªæ–ã®æ›´æ–° (マージã™ã‚‹ã‹ã€ --clean 指定ã§å¤‰æ›´ã‚’ç ´æ£„ã—ã¦ãã ã•ã„)"
+
+msgid "crosses branches (merge branches or use --check to force update)"
+msgstr "ブランãƒæ¨ªæ–ã®æ›´æ–° (マージã™ã‚‹ã‹ã€ --check 指定ã§å¼·åˆ¶æ›´æ–°ã—ã¦ãã ã•ã„)"
+
+msgid "Attention:"
+msgstr "注æ„:"
+
+msgid "Caution:"
+msgstr "è¦å‘Š:"
+
+msgid "!Danger!"
+msgstr "!å±é™º!"
+
+msgid "Error:"
+msgstr "エラー:"
+
+msgid "Hint:"
+msgstr "ヒント:"
+
+msgid "Important:"
+msgstr "é‡è¦:"
+
+msgid "Note:"
+msgstr "備考:"
+
+msgid "Tip:"
+msgstr "æƒ…å ±:"
+
+msgid "Warning!"
+msgstr "è¦å‘Š!"
#, python-format
msgid "cannot create %s: destination already exists"
@@ -13127,7 +13675,7 @@
#, python-format
msgid "Hunk #%d succeeded at %d with fuzz %d (offset %d lines).\n"
-msgstr "ãƒãƒ³ã‚¯ #%d ã®é©ç”¨æˆåŠŸ:%d 行目ã€æ›–昧性 %d (ä½ç½®è£œæ£ %d è¡Œ)\n"
+msgstr "ãƒãƒ³ã‚¯ #%d ã®é©ç”¨æˆåŠŸ:%d 行目〠曖昧性 %d (ä½ç½®è£œæ£ %d è¡Œ)\n"
#, python-format
msgid "Hunk #%d succeeded at %d (offset %d lines).\n"
@@ -13154,7 +13702,7 @@
#, python-format
msgid "unable to strip away %d of %d dirs from %s"
-msgstr "%d 個ã®ãƒ‘スè¦ç´ ã¯ã€%d 個ã®ãƒ‘スè¦ç´ ã‚’æŒã¤ %s ã‹ã‚‰é™¤å¤–ã§ãã¾ã›ã‚“"
+msgstr "%d 個ã®ãƒ‘スè¦ç´ ã¯ã€ %d 個ã®ãƒ‘スè¦ç´ ã‚’æŒã¤ %s ã‹ã‚‰é™¤å¤–ã§ãã¾ã›ã‚“"
msgid "undefined source and destination files"
msgstr "パッãƒå¯¾è±¡ã®ãƒ•ã‚¡ã‚¤ãƒ«åãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“"
@@ -13175,18 +13723,12 @@
msgid "unsupported line endings type: %s"
msgstr "未サãƒãƒ¼ãƒˆã®è¡Œæœ«ç¨®åˆ¥: %s"
-msgid ""
-"internal patcher failed\n"
-"please report details to http://mercurial.selenic.com/bts/\n"
-"or mercurial@selenic.com\n"
-msgstr ""
-" 内部パッãƒãƒ„ールãŒæ©Ÿèƒ½ã—ã¾ã›ã‚“。\n"
-"http://mercurial.selenic.com/bts ãªã„ã— mercurial@selenic.com ã¸ã®\n"
-"ã‚¨ãƒ©ãƒ¼å ±å‘Šã«ã”å”力ãã ã•ã„\n"
+msgid "patch failed to apply"
+msgstr "パッãƒã®é©ç”¨ã«å¤±æ•—"
#, python-format
msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
-msgstr " %d ファイル変更ã€è¿½åŠ %d è¡Œ(+)ã€å‰Šé™¤ %d è¡Œ(-)\n"
+msgstr " %d ãƒ•ã‚¡ã‚¤ãƒ«å¤‰æ›´ã€ è¿½åŠ %d è¡Œ(+)〠削除 %d è¡Œ(-)\n"
#, python-format
msgid "exited with status %d"
@@ -13213,7 +13755,7 @@
#, python-format
msgid "cannot %s; remote repository does not support the %r capability"
-msgstr "%s ã§ãã¾ã›ã‚“。機能 %s ã¯ãƒªãƒ¢ãƒ¼ãƒˆãƒªãƒã‚¸ãƒˆãƒªã§ã¯æœªã‚µãƒãƒ¼ãƒˆã§ã™"
+msgstr "%s ã§ãã¾ã›ã‚“。 機能 %s ã¯ãƒªãƒ¢ãƒ¼ãƒˆãƒªãƒã‚¸ãƒˆãƒªã§ã¯æœªã‚µãƒãƒ¼ãƒˆã§ã™"
#, python-format
msgid "unknown compression type %r"
@@ -13255,12 +13797,12 @@
msgid "%s not found in the transaction"
msgstr "トランザクションä¸ã« %s ã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ"
+msgid "consistency error in delta"
+msgstr "å·®åˆ†æƒ…å ±ã®ä¸æ•´åˆ"
+
msgid "unknown base"
msgstr "未知ã®ãƒ™ãƒ¼ã‚¹ãƒªãƒ“ジョン"
-msgid "consistency error adding group"
-msgstr "グループã®è¿½åŠ ã«å¤±æ•—"
-
msgid "unterminated string"
msgstr "æ–‡å—列ãŒçµ‚端ã—ã¦ã„ã¾ã›ã‚“"
@@ -13281,66 +13823,270 @@
msgid "not a function: %s"
msgstr "関数ã§ã¯ã‚ã‚Šã¾ã›ã‚“: %s"
-msgid "limit wants two arguments"
-msgstr "limit ã«ã¯2ã¤ã®å¼•æ•°ãŒå¿…è¦ã§ã™"
-
-msgid "limit wants a number"
-msgstr "limit ã«ã¯æ•°å€¤ã‚’指定ã—ã¦ãã ã•ã„"
-
+msgid ""
+"``id(string)``\n"
+" Revision non-ambiguously specified by the given hex string prefix."
+msgstr ""
+
+#. i18n: "id" is a keyword
+msgid "id requires one argument"
+msgstr "id 指定ã«ã¯1ã¤ã®å¼•æ•°ãŒå¿…è¦ã§ã™"
+
+#. i18n: "id" is a keyword
+msgid "id requires a string"
+msgstr "id 指定ã¯æ–‡å—列ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
+
+msgid ""
+"``rev(number)``\n"
+" Revision with the given numeric identifier."
+msgstr ""
+
+#. i18n: "rev" is a keyword
+msgid "rev requires one argument"
+msgstr "rev 指定ã«ã¯1ã¤ã®å¼•æ•°ãŒå¿…è¦ã§ã™"
+
+#. i18n: "rev" is a keyword
+msgid "rev requires a number"
+msgstr "rev 指定ã¯æ•°å€¤ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
+
+#. i18n: "rev" is a keyword
+msgid "rev expects a number"
+msgstr "rev 指定ã¯æ•°å€¤ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
+
+msgid ""
+"``p1(set)``\n"
+" First parent of changesets in set."
+msgstr ""
+
+msgid ""
+"``p2(set)``\n"
+" Second parent of changesets in set."
+msgstr ""
+
+msgid ""
+"``parents(set)``\n"
+" The set of all parents for all changesets in set."
+msgstr ""
+
+msgid ""
+"``max(set)``\n"
+" Changeset with highest revision number in set."
+msgstr ""
+
+msgid ""
+"``min(set)``\n"
+" Changeset with lowest revision number in set."
+msgstr ""
+
+msgid ""
+"``limit(set, n)``\n"
+" First n members of set."
+msgstr ""
+
+#. i18n: "limit" is a keyword
+msgid "limit requires two arguments"
+msgstr "limit 指定ã«ã¯2ã¤ã®å¼•æ•°ãŒå¿…è¦ã§ã™"
+
+#. i18n: "limit" is a keyword
+msgid "limit requires a number"
+msgstr "limit 指定ã¯æ•°å€¤ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
+
+#. i18n: "limit" is a keyword
msgid "limit expects a number"
-msgstr "limit ã«ã¯æ•°å€¤ã‚’指定ã—ã¦ãã ã•ã„"
-
-msgid "ancestor wants two arguments"
-msgstr "ancestor ã«ã¯2ã¤ã®å¼•æ•°ãŒå¿…è¦ã§ã™"
-
+msgstr "limit 指定ã¯æ•°å€¤ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
+
+msgid ""
+"``children(set)``\n"
+" Child changesets of changesets in set."
+msgstr ""
+
+msgid ""
+"``branch(set)``\n"
+" All changesets belonging to the branches of changesets in set."
+msgstr ""
+
+msgid ""
+"``ancestor(single, single)``\n"
+" Greatest common ancestor of the two changesets."
+msgstr ""
+
+#. i18n: "ancestor" is a keyword
+msgid "ancestor requires two arguments"
+msgstr "ancestor 指定ã«ã¯2ã¤ã®å¼•æ•°ãŒå¿…è¦ã§ã™"
+
+#. i18n: "ancestor" is a keyword
msgid "ancestor arguments must be single revisions"
msgstr "ancestor ã®å¼•æ•°ã¯ãã‚Œãžã‚Œå˜ä¸€ãƒªãƒ“ジョンã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
+msgid ""
+"``ancestors(set)``\n"
+" Changesets that are ancestors of a changeset in set."
+msgstr ""
+
+msgid ""
+"``descendants(set)``\n"
+" Changesets which are descendants of changesets in set."
+msgstr ""
+
+msgid ""
+"``follow()``\n"
+" An alias for ``::.`` (ancestors of the working copy's first parent)."
+msgstr ""
+
+#. i18n: "follow" is a keyword
msgid "follow takes no arguments"
-msgstr "follow ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“"
-
-msgid "date wants a string"
-msgstr "date ã®å¼•æ•°ã¯æ–‡å—列ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
-
-msgid "keyword wants a string"
-msgstr "keyword ã®å¼•æ•°ã¯æ–‡å—列ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
-
-msgid "grep wants a string"
-msgstr "grep ã®å¼•æ•°ã¯æ–‡å—列ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
+msgstr "follow 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“"
+
+msgid ""
+"``date(interval)``\n"
+" Changesets within the interval, see :hg:`help dates`."
+msgstr ""
+
+#. i18n: "date" is a keyword
+msgid "date requires a string"
+msgstr "date 指定ã¯æ–‡å—列ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
+
+msgid ""
+"``keyword(string)``\n"
+" Search commit message, user name, and names of changed files for\n"
+" string."
+msgstr ""
+
+#. i18n: "keyword" is a keyword
+msgid "keyword requires a string"
+msgstr "keyword 指定ã¯æ–‡å—列ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
+
+msgid ""
+"``grep(regex)``\n"
+" Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``\n"
+" to ensure special escape characters are handled correctly."
+msgstr ""
+
+#. i18n: "grep" is a keyword
+msgid "grep requires a string"
+msgstr "grep 指定ã¯æ–‡å—列ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
#, python-format
msgid "invalid match pattern: %s"
msgstr "ä¸æ£ãªãƒžãƒƒãƒãƒ³ã‚°ãƒ‘ターン: %s"
-msgid "author wants a string"
-msgstr "author ã®å¼•æ•°ã¯æ–‡å—列ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
-
-msgid "file wants a pattern"
-msgstr "file ã®å¼•æ•°ã¯ãƒ‘ターンã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
-
-msgid "contains wants a pattern"
-msgstr "contains ã®å¼•æ•°ã¯ãƒ‘ターンã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
-
-msgid "modifies wants a pattern"
-msgstr "modifies ã®å¼•æ•°ã¯ãƒ‘ターンã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
-
-msgid "adds wants a pattern"
-msgstr "adds ã®å¼•æ•°ã¯ãƒ‘ターンã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
-
-msgid "removes wants a pattern"
-msgstr "removes ã®å¼•æ•°ã¯ãƒ‘ターンã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
-
+msgid ""
+"``author(string)``\n"
+" Alias for ``user(string)``."
+msgstr ""
+
+#. i18n: "author" is a keyword
+msgid "author requires a string"
+msgstr "author 指定ã¯æ–‡å—列ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
+
+msgid ""
+"``user(string)``\n"
+" User name is string."
+msgstr ""
+
+msgid ""
+"``file(pattern)``\n"
+" Changesets affecting files matched by pattern."
+msgstr ""
+
+#. i18n: "file" is a keyword
+msgid "file requires a pattern"
+msgstr "file 指定ã¯ãƒ‘ターンã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
+
+msgid ""
+"``contains(pattern)``\n"
+" Revision contains pattern."
+msgstr ""
+
+#. i18n: "contains" is a keyword
+msgid "contains requires a pattern"
+msgstr "contains 指定ã¯ãƒ‘ターンã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
+
+msgid ""
+"``modifies(pattern)``\n"
+" Changesets modifying files matched by pattern."
+msgstr ""
+
+#. i18n: "modifies" is a keyword
+msgid "modifies requires a pattern"
+msgstr "modifies 指定ã¯ãƒ‘ターンã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
+
+msgid ""
+"``adds(pattern)``\n"
+" Changesets that add a file matching pattern."
+msgstr ""
+
+#. i18n: "adds" is a keyword
+msgid "adds requires a pattern"
+msgstr "adds 指定ã¯ãƒ‘ターンã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
+
+msgid ""
+"``removes(pattern)``\n"
+" Changesets which remove files matching pattern."
+msgstr ""
+
+#. i18n: "removes" is a keyword
+msgid "removes requires a pattern"
+msgstr "removes 指定ã¯ãƒ‘ターンã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
+
+msgid ""
+"``merge()``\n"
+" Changeset is a merge changeset."
+msgstr ""
+
+#. i18n: "merge" is a keyword
msgid "merge takes no arguments"
-msgstr "merge ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“"
-
+msgstr "merge 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“"
+
+msgid ""
+"``closed()``\n"
+" Changeset is closed."
+msgstr ""
+
+#. i18n: "closed" is a keyword
msgid "closed takes no arguments"
-msgstr "closed ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“"
-
+msgstr "closed 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“"
+
+msgid ""
+"``head()``\n"
+" Changeset is a named branch head."
+msgstr ""
+
+#. i18n: "head" is a keyword
msgid "head takes no arguments"
-msgstr "head ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“"
-
-msgid "sort wants one or two arguments"
-msgstr "sort ã«ã¯1個ãªã„ã—2個ã®å¼•æ•°ãŒå¿…è¦ã§ã™"
+msgstr "head 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“"
+
+msgid ""
+"``reverse(set)``\n"
+" Reverse order of set."
+msgstr ""
+
+msgid ""
+"``present(set)``\n"
+" An empty set, if any revision in set isn't found; otherwise,\n"
+" all revisions in set."
+msgstr ""
+
+msgid ""
+"``sort(set[, [-]key...])``\n"
+" Sort set by keys. The default sort order is ascending, specify a key\n"
+" as ``-key`` to sort in descending order."
+msgstr ""
+
+msgid " The keys can be:"
+msgstr ""
+
+msgid ""
+" - ``rev`` for the revision number,\n"
+" - ``branch`` for the branch name,\n"
+" - ``desc`` for the commit message (description),\n"
+" - ``user`` for user name (``author`` can be used as an alias),\n"
+" - ``date`` for the commit date"
+msgstr ""
+
+#. i18n: "sort" is a keyword
+msgid "sort requires one or two arguments"
+msgstr "sort 指定ã«ã¯1個ãªã„ã—2個ã®å¼•æ•°ãŒå¿…è¦ã§ã™"
msgid "sort spec must be a string"
msgstr "sort ã¸ã®æ•´åˆ—æ–¹å¼æŒ‡å®šã¯æ–‡å—列ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
@@ -13349,14 +14095,47 @@
msgid "unknown sort key %r"
msgstr "未知ã®æ•´åˆ—æ–¹å¼ %r"
+msgid ""
+"``all()``\n"
+" All changesets, the same as ``0:tip``."
+msgstr ""
+
+#. i18n: "all" is a keyword
msgid "all takes no arguments"
-msgstr "all ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“"
-
-msgid "outgoing wants a repository path"
-msgstr "outgoing ã®å¼•æ•°ã¯ãƒªãƒã‚¸ãƒˆãƒªãƒ‘スã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
-
-msgid "tagged takes no arguments"
-msgstr "tagged ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“"
+msgstr "all 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“"
+
+msgid ""
+"``heads(set)``\n"
+" Members of set with no children in set."
+msgstr ""
+
+msgid ""
+"``roots(set)``\n"
+" Changesets with no parent changeset in set."
+msgstr ""
+
+msgid ""
+"``outgoing([path])``\n"
+" Changesets not found in the specified destination repository, or the\n"
+" default push location."
+msgstr ""
+
+#. i18n: "outgoing" is a keyword
+msgid "outgoing requires a repository path"
+msgstr "outgoing 指定ã¯ãƒªãƒã‚¸ãƒˆãƒªã®ãƒ‘スã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
+
+msgid ""
+"``tag(name)``\n"
+" The specified tag by name, or all tagged revisions if no name is given."
+msgstr ""
+
+#. i18n: "tag" is a keyword
+msgid "tag takes one or no arguments"
+msgstr "tagged 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“"
+
+#. i18n: "tag" is a keyword
+msgid "the argument to tag must be a string"
+msgstr "tag 指定ã¯æ–‡å—列ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“"
msgid "can't negate that"
msgstr "è² å€¤ã«ã§ãã¾ã›ã‚“"
@@ -13393,13 +14172,16 @@
msgid "no suitable response from remote hg"
msgstr "é 隔ホストã®å¿œç”ãŒä¸é©åˆ‡"
+msgid "remote: "
+msgstr "é 隔ホスト: "
+
+msgid "unexpected response:"
+msgstr "未知ã®å¿œç”:"
+
#, python-format
msgid "push refused: %s"
msgstr "å±¥æ´åæ˜ ãŒæ‹’å¦ã•ã‚Œã¾ã—ãŸ: %s"
-msgid "unsynced changes"
-msgstr "未å–ã‚Šè¾¼ã¿ã®å¤‰æ›´ãŒã‚ã‚Šã¾ã™"
-
#, python-format
msgid "'%s' does not appear to be an hg repository"
msgstr "'%s' 㯠Mercurial リãƒã‚¸ãƒˆãƒªå½¢å¼ã¨ã¯æ€ã‚ã‚Œã¾ã›ã‚“"
@@ -13422,12 +14204,16 @@
msgstr "副リãƒã‚¸ãƒˆãƒªå…ƒæŒ‡å®šã« ] ãŒã‚ã‚Šã¾ã›ã‚“"
#, python-format
+msgid "bad subrepository pattern in %s: %s"
+msgstr "%s ã«ãŠã‘る副リãƒã‚¸ãƒˆãƒªæŒ‡å®šã®ä¸æ£: %s"
+
+#, python-format
msgid ""
" subrepository sources for %s differ\n"
"use (l)ocal source (%s) or (r)emote source (%s)?"
msgstr ""
" サブリãƒã‚¸ãƒˆãƒª %s ã§å·®åˆ†ãŒæ¤œå‡ºã•ã‚Œã¾ã—ãŸ\n"
-"ã©ã¡ã‚‰ã®å†…容を採用ã—ã¾ã™ã‹ï¼Ÿæ‰‹å…ƒ:(%s)ã€é éš”:(%s)"
+"ã©ã¡ã‚‰ã®å†…容を採用ã—ã¾ã™ã‹ï¼Ÿæ‰‹å…ƒ:(%s)〠é éš”:(%s)"
msgid "&Remote"
msgstr "&Remote"
@@ -13449,10 +14235,18 @@
"ã©ã¡ã‚‰ã‚’採用ã—ã¾ã™ã‹ï¼Ÿå¤‰æ›´:(c)hange, 登録除外:(d)elete"
#, python-format
+msgid "default path for subrepository %s not found"
+msgstr "デフォルトã®å‰¯ãƒªãƒã‚¸ãƒˆãƒª %s ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
+
+#, python-format
msgid "unknown subrepo type %s"
msgstr "未知ã®å‰¯ãƒªãƒã‚¸ãƒˆãƒªç¨®åˆ¥ '%s'"
#, python-format
+msgid "warning: error \"%s\" in subrepository \"%s\"\n"
+msgstr "è¦å‘Š: エラー \"%s\" ãŒå‰¯ãƒªãƒã‚¸ãƒˆãƒª \"%s\" ã§ç™ºç”Ÿ\n"
+
+#, python-format
msgid "removing subrepo %s\n"
msgstr "副リãƒã‚¸ãƒˆãƒªã® %s を登録除外ä¸\n"
@@ -13469,7 +14263,7 @@
#, python-format
msgid "not removing repo %s because it has changes.\n"
-msgstr "変更ãŒå«ã¾ã‚Œã¦ã„ã‚‹ãŸã‚ã€ãƒªãƒã‚¸ãƒˆãƒª %s ã¯å‰Šé™¤ã•ã‚Œã¾ã›ã‚“\n"
+msgstr "変更ãŒå«ã¾ã‚Œã¦ã„ã‚‹ãŸã‚〠リãƒã‚¸ãƒˆãƒª %s ã¯å‰Šé™¤ã•ã‚Œã¾ã›ã‚“\n"
#, python-format
msgid "%s, line %s: %s\n"
@@ -13482,6 +14276,9 @@
msgid "node '%s' is not well formed"
msgstr "'%s' ã¨ã„ã†ãƒŽãƒ¼ãƒ‰ã¯ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆãŒä¸é©åˆ‡ã§ã™"
+msgid ".hg/tags.cache is corrupt, rebuilding it\n"
+msgstr ".hg/tags.cache ãŒç„¡åŠ¹ãªãŸã‚å†æ§‹ç¯‰ä¸\n"
+
msgid "unmatched quotes"
msgstr "引用符ã®å¯¾å¿œé–¢ä¿‚ãŒä¸æ£ã§ã™"
@@ -13526,6 +14323,10 @@
msgstr "無視ã—ã¾ã—ãŸ: %s\n"
#, python-format
+msgid "(deprecated '%%' in path %s=%s from %s)\n"
+msgstr "(パス定義 %s=%s(%s ç”±æ¥) ã«ãŠã„ã¦ã€ éžæŽ¨å¥¨ãª '%%' ãŒä½¿ç”¨)\n"
+
+#, python-format
msgid "ignoring untrusted configuration option %s.%s = %s\n"
msgstr "ä¿¡é ¼ã§ããªã„è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ä¸ã® '%s.%s = %s' è¨å®šã‚’無視\n"
@@ -13538,7 +14339,7 @@
#, python-format
msgid "No username found, using '%s' instead\n"
-msgstr "ユーザåãŒä¸æ˜Žã®ãŸã‚ã€'%s' を使用\n"
+msgstr "ユーザåãŒä¸æ˜Žã®ãŸã‚〠'%s' を使用\n"
msgid "no username supplied (see \"hg help config\")"
msgstr "ユーザåãŒæœªæŒ‡å®šã§ã™(\"hg help config\" å‚ç…§)"
@@ -13547,10 +14348,6 @@
msgid "username %s contains a newline\n"
msgstr "ユーザå %s ã¯æ”¹è¡Œã‚’å«ã‚“ã§ã„ã¾ã™\n"
-#, python-format
-msgid "(deprecated '%%' in path %s=%s from %s)\n"
-msgstr "(パス定義 %s=%s(%s ç”±æ¥) ã«ãŠã„ã¦ã€éžæŽ¨å¥¨ãª '%%' ãŒä½¿ç”¨)\n"
-
msgid "response expected"
msgstr "レスãƒãƒ³ã‚¹ãŒã‚ã‚Šã¾ã›ã‚“"
@@ -13591,8 +14388,19 @@
msgid "certificate checking requires Python 2.6"
msgstr "証明書検証ã«ã¯ Python 2.6 ãŒå¿…è¦ã§ã™"
-msgid "server identity verification succeeded\n"
-msgstr "サーãƒè¨¼æ˜Žæ›¸ã®æ¤œè¨¼ã«æˆåŠŸ\n"
+msgid "no certificate received"
+msgstr "証明書ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“"
+
+#, python-format
+msgid "certificate is for %s"
+msgstr "%s 用ã®è¨¼æ˜Žæ›¸ãƒ•ã‚¡ã‚¤ãƒ«"
+
+msgid "no commonName found in certificate"
+msgstr "証明書㫠commonName ãŒå«ã¾ã‚Œã¦ã„ã¾ã›ã‚“"
+
+#, python-format
+msgid "%s certificate error: %s"
+msgstr "%s 用ã®è¨¼æ˜Žæ›¸æ¤œè¨¼ãŒå¤±æ•—: %s"
#, python-format
msgid "command '%s' failed: %s"
@@ -13618,8 +14426,8 @@
msgstr "%r ã¸ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯ã§ãã¾ã›ã‚“: %s"
#, python-format
-msgid "invalid date: %r "
-msgstr "ä¸æ£ãªæ—¥ä»˜: %r "
+msgid "invalid date: %r"
+msgstr "ä¸æ£ãªæ—¥ä»˜: %r"
#, python-format
msgid "date exceeds 32 bits: %d"
@@ -13673,6 +14481,10 @@
msgid "%.0f bytes"
msgstr "%.0f ãƒã‚¤ãƒˆ"
+#, python-format
+msgid "no port number associated with service '%s'"
+msgstr "サービス '%s' 用ã®ãƒãƒ¼ãƒˆç•ªå·ãŒä¸æ˜Ž"
+
msgid "cannot verify bundle or remote repos"
msgstr "ãƒãƒ¼ã‚«ãƒ«ãƒªãƒã‚¸ãƒˆãƒªä»¥å¤–ã¯æ¤œè¨¼ã§ãã¾ã›ã‚“"
@@ -13681,7 +14493,7 @@
#, python-format
msgid "empty or missing %s"
-msgstr "%s ã¯ã€ç©ºã‹è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
+msgstr "%s ã¯ã€ 空ã‹è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
#, python-format
msgid "data length off by %d bytes"
@@ -13737,6 +14549,9 @@
msgid "checking changesets\n"
msgstr "ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã®ç¢ºèªä¸\n"
+msgid "checking"
+msgstr "確èªä¸"
+
#, python-format
msgid "unpacking changeset %s"
msgstr "リビジョン %s ã®å±•é–‹ä¸"
@@ -13778,9 +14593,6 @@
msgid "cannot decode filename '%s'"
msgstr "ファイルå '%s' ã®ãƒ‡ã‚³ãƒ¼ãƒ‰ã«å¤±æ•—"
-msgid "checking"
-msgstr "確èªä¸"
-
#, python-format
msgid "broken revlog! (%s)"
msgstr "ä¸æ£ãª revlog! (%s)"
@@ -13802,11 +14614,11 @@
#, python-format
msgid "warning: copy source of '%s' not in parents of %s"
-msgstr "è¦å‘Š: '%s' ã®è¤‡è£½å…ƒã¯ã€%s ã®è¦ªãƒªãƒ“ジョン時点ã§å˜åœ¨ã—ã¾ã›ã‚“"
+msgstr "è¦å‘Š: '%s' ã®è¤‡è£½å…ƒã¯ã€ %s ã®è¦ªãƒªãƒ“ジョン時点ã§å˜åœ¨ã—ã¾ã›ã‚“"
#, python-format
msgid "empty or missing copy source revlog %s:%s"
-msgstr "複製元 revlog %s:%s ã¯ã€ç©ºã‹è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
+msgstr "複製元 revlog %s:%s ã¯ã€ 空ã‹è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
#, python-format
msgid "warning: %s@%s: copy source revision is nullid %s:%s\n"
@@ -13826,7 +14638,7 @@
#, python-format
msgid "%d files, %d changesets, %d total revisions\n"
-msgstr "%d 個ã®ãƒ•ã‚¡ã‚¤ãƒ«ã€%d 件ã®ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã€åˆè¨ˆ %d 件ã®ãƒªãƒ“ジョン\n"
+msgstr "%d 個ã®ãƒ•ã‚¡ã‚¤ãƒ«ã€ %d 件ã®ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã€ åˆè¨ˆ %d 件ã®ãƒªãƒ“ジョン\n"
#, python-format
msgid "%d warnings encountered!\n"
@@ -13842,3 +14654,15 @@
msgid "user name not available - set USERNAME environment variable"
msgstr "ユーザåãŒåˆ©ç”¨ã§ãã¾ã›ã‚“ - 環境変数 USERNAME ã‚’è¨å®šã—ã¦ãã ã•ã„"
+
+msgid "look up remote revision"
+msgstr "連æºå…ˆã§ã®ãƒªãƒ“ジョンã®æ¤œç´¢"
+
+msgid "look up remote changes"
+msgstr "連æºå…ˆã§ã®å¤‰æ›´ã®æ¤œç´¢"
+
+msgid "push failed:"
+msgstr "å±¥æ´åæ˜ ã«å¤±æ•—:"
+
+msgid "push failed (unexpected response):"
+msgstr "å±¥æ´åæ˜ ã«å¤±æ•—(未知ã®ãƒ¬ã‚¹ãƒãƒ³ã‚¹):"
--- a/i18n/polib.py Wed Oct 20 23:48:33 2010 +0200
+++ b/i18n/polib.py Tue Nov 02 09:47:47 2010 +0100
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
# no-check-code
#
--- a/i18n/pt_BR.po Wed Oct 20 23:48:33 2010 +0200
+++ b/i18n/pt_BR.po Tue Nov 02 09:47:47 2010 +0100
@@ -54,8 +54,14 @@
msgid "Commands"
msgstr "Comandos"
-msgid " options:"
-msgstr " opções:"
+msgid "Extensions"
+msgstr "Extensões"
+
+msgid "This section contains help for extensions that are distributed together with Mercurial. Help for other extensions is available in the help system."
+msgstr "Esta seção contém texto de ajuda para extensões que são distribuÃdas junto com o Mercurial. A ajuda para outras extensões está disponÃvel no sistema de ajuda."
+
+msgid "options:"
+msgstr "opções:"
#, python-format
msgid " aliases: %s"
@@ -116,10 +122,10 @@
msgid ""
"Branch-based Access Control\n"
-"---------------------------"
-msgstr ""
-"Controle de Acesso Baseado em Ramos Nomeados\n"
-"--------------------------------------------"
+"..........................."
+msgstr ""
+"Controle de Acesso Baseado em Ramos\n"
+"..................................."
msgid ""
"Use the ``acl.deny.branches`` and ``acl.allow.branches`` sections to\n"
@@ -148,10 +154,10 @@
msgid ""
"Path-based Access Control\n"
-"-------------------------"
+"........................."
msgstr ""
"Controle de Acesso Baseado em Caminhos\n"
-"--------------------------------------"
+"......................................"
msgid ""
"Use the ``acl.deny`` and ``acl.allow`` sections to have path-based\n"
@@ -167,10 +173,10 @@
msgid ""
"Groups\n"
-"------"
+"......"
msgstr ""
"Grupos\n"
-"------"
+"......"
msgid ""
"Group names must be prefixed with an ``@`` symbol. Specifying a group\n"
@@ -193,10 +199,10 @@
msgid ""
"Example Configuration\n"
-"---------------------"
+"....................."
msgstr ""
"Exemplo de Configuração\n"
-"-----------------------"
+"......................."
msgid "::"
msgstr "::"
@@ -454,13 +460,23 @@
" You can use :hg:`bookmark NAME` to set a bookmark on the working\n"
" directory's parent revision with the given name. If you specify\n"
" a revision using -r REV (where REV may be an existing bookmark),\n"
-" the bookmark is assigned to that revision.\n"
-" "
+" the bookmark is assigned to that revision."
msgstr ""
" Você pode usar :hg:`bookmark NOME` para definir um marcador na\n"
-" revisão do diretório de trabalho com o nome informado. Se você\n"
+" revisão pai do diretório de trabalho com o nome informado. Se você\n"
" especificar a revisão usando -r REV (onde REV pode ser o nome de\n"
-" um marcador existente), o marcador é apontado para tal revisão.\n"
+" um marcador existente), o marcador é apontado para tal revisão."
+
+msgid ""
+" Bookmarks can be pushed and pulled between repositories (see :hg:`help\n"
+" push` and :hg:`help pull`). This requires the bookmark extension to be\n"
+" enabled for both the local and remote repositories.\n"
+" "
+msgstr ""
+" Marcadores podem ser transferidos entre repositórios usando push\n"
+" e pull (veja :hg:`help push` e :hg:`help pull`). Isto requer que\n"
+" a extensão bookmark esteja habilitada tanto no repositório local\n"
+" como no remoto.\n"
" "
msgid "a bookmark of this name does not exist"
@@ -519,11 +535,11 @@
msgid "bookmark %s does not exist on the local or remote repository!\n"
msgstr "o marcador %s não existe nem no repositório local nem no remoto!\n"
-msgid "searching for changes\n"
-msgstr "procurando por mudanças\n"
-
-msgid "no changes found\n"
-msgstr "nenhuma alteração encontrada\n"
+msgid "searching for changed bookmarks\n"
+msgstr "procurando por marcadores modificados\n"
+
+msgid "no changed bookmarks found\n"
+msgstr "nenhum marcador modificado encontrado\n"
#, python-format
msgid "comparing with %s\n"
@@ -532,12 +548,30 @@
msgid "bookmark to import"
msgstr "marcador a ser importado"
+msgid "BOOKMARK"
+msgstr "MARCADOR"
+
msgid "bookmark to export"
msgstr "marcador a ser exportado"
msgid "compare bookmark"
msgstr "compara marcador"
+msgid ""
+"``bookmark([name])``\n"
+" The named bookmark or all bookmarks."
+msgstr ""
+"``bookmark([nome])``\n"
+" O marcador chamado nome, ou todos os marcadores."
+
+#. i18n: "bookmark" is a keyword
+msgid "bookmark takes one or no arguments"
+msgstr "bookmark requer um ou nenhum argumento"
+
+#. i18n: "bookmark" is a keyword
+msgid "the argument to bookmark must be a string"
+msgstr "o argumento para o comando bookmark deve ser uma string"
+
msgid "force"
msgstr "forçar"
@@ -1188,6 +1222,17 @@
msgstr " bookmarks.current = green"
msgid ""
+" branches.active = none\n"
+" branches.closed = black bold\n"
+" branches.current = green\n"
+" branches.inactive = none"
+msgstr ""
+" branches.active = none\n"
+" branches.closed = black bold\n"
+" branches.current = green\n"
+" branches.inactive = none"
+
+msgid ""
"The color extension will try to detect whether to use ANSI codes or\n"
"Win32 console APIs, unless it is made explicit::"
msgstr ""
@@ -1213,8 +1258,10 @@
msgid "win32console not found, please install pywin32\n"
msgstr "win32console não encontrado, por favor instale pywin32\n"
-msgid "when to colorize (always, auto, or never)"
-msgstr "quando colorir (\"always\": sempre, \"never\": nunca ou \"auto\": automaticamente)"
+#. i18n: 'always', 'auto', and 'never' are keywords and should
+#. not be translated
+msgid "when to colorize (boolean, always, auto, or never)"
+msgstr "quando colorir (booleana, ou \"always\" (sempre), \"never\" (nunca) ou \"auto\" (automaticamente))"
msgid "TYPE"
msgstr "TIPO"
@@ -1339,12 +1386,12 @@
" interrompido e executado repetidamente para copiar novos commits."
msgid ""
-" The username mapping file is a simple text file that maps each\n"
-" source commit author to a destination commit author. It is handy\n"
-" for source SCMs that use unix logins to identify authors (eg:\n"
-" CVS). One line per author mapping and the line format is::"
-msgstr ""
-" O arquivo de mapeamento de nome de usuário é um arquivo texto simples\n"
+" The authormap is a simple text file that maps each source commit\n"
+" author to a destination commit author. It is handy for source SCMs\n"
+" that use unix logins to identify authors (eg: CVS). One line per\n"
+" author mapping and the line format is::"
+msgstr ""
+" O parâmetro authormap é um arquivo texto simples\n"
" que mapeia cada autor de commit da origem para um autor de commit\n"
" no destino. Isso auxilia na conversão de sistemas que utilizam\n"
" logins unix para identificar os autores (ex: CVS). É usada uma linha\n"
@@ -1374,7 +1421,7 @@
msgstr " rename caminho/para/a/origem caminho/para/o/destino"
msgid ""
-" Comment lines start with ``#``. A specificed path matches if it\n"
+" Comment lines start with ``#``. A specified path matches if it\n"
" equals the full relative name of a file or one of its parent\n"
" directories. The ``include`` or ``exclude`` directive with the\n"
" longest matching path applies, so line order does not matter."
@@ -1391,8 +1438,8 @@
" exclusion of all other files and directories not explicitly\n"
" included. The ``exclude`` directive causes files or directories to\n"
" be omitted. The ``rename`` directive renames a file or directory if\n"
-" is converted. To rename from a subdirectory into the root of the\n"
-" repository, use ``.`` as the path to rename to."
+" it is converted. To rename from a subdirectory into the root of\n"
+" the repository, use ``.`` as the path to rename to."
msgstr ""
" A diretiva ``include`` faz com que um arquivo, ou todos os arquivos\n"
" em um diretório, sejam incluÃdos no repositório de destino, e\n"
@@ -1473,10 +1520,10 @@
msgid ""
" Mercurial Source\n"
-" ----------------"
+" ''''''''''''''''"
msgstr ""
" Origem Mercurial\n"
-" ----------------"
+" ''''''''''''''''"
msgid ""
" --config convert.hg.ignoreerrors=False (boolean)\n"
@@ -1501,10 +1548,10 @@
msgid ""
" CVS Source\n"
-" ----------"
+" ''''''''''"
msgstr ""
" Origem CVS\n"
-" ----------"
+" ''''''''''"
msgid ""
" CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
@@ -1603,10 +1650,10 @@
msgid ""
" Subversion Source\n"
-" -----------------"
+" '''''''''''''''''"
msgstr ""
" Origem Subversion\n"
-" -----------------"
+" '''''''''''''''''"
msgid ""
" Subversion source detects classical trunk/branches/tags layouts.\n"
@@ -1665,10 +1712,10 @@
msgid ""
" Perforce Source\n"
-" ---------------"
+" '''''''''''''''"
msgstr ""
" Origem Perforce\n"
-" ---------------"
+" '''''''''''''''"
msgid ""
" The Perforce (P4) importer can be given a p4 depot path or a\n"
@@ -1702,10 +1749,10 @@
msgid ""
" Mercurial Destination\n"
-" ---------------------"
+" '''''''''''''''''''''"
msgstr ""
" Destino Mercurial\n"
-" -----------------"
+" '''''''''''''''''"
msgid ""
" --config convert.hg.clonebranches=False (boolean)\n"
@@ -1748,21 +1795,24 @@
" log em uma série de revisões baseadas na correspondência das\n"
" entradas no log de commit e datas."
-msgid "username mapping filename"
-msgstr "arquivo de mapeamento de nomes de usuário"
+msgid "username mapping filename (DEPRECATED, use --authormap instead)"
+msgstr "arquivo de mapeamento de nomes de usuário (OBSOLETO, use --authormap)"
+
+msgid "source repository type"
+msgstr "tipo de repositório de origem"
msgid "destination repository type"
msgstr "tipo de repositório de destino"
+msgid "import up to target revision REV"
+msgstr "importa até a revisão REV do alvo"
+
+msgid "remap usernames using this file"
+msgstr "arquivo de mapeamento de nomes de usuário"
+
msgid "remap file names using contents of file"
msgstr "arquivo de mapeamento de nomes de arquivo"
-msgid "import up to target revision REV"
-msgstr "importa até a revisão REV do alvo"
-
-msgid "source repository type"
-msgstr "tipo de repositório de origem"
-
msgid "splice synthesized history into place"
msgstr "junta o histórico sintetizado no lugar"
@@ -2063,10 +2113,18 @@
msgstr "erros no filemap"
#, python-format
+msgid "%s:%d: path to %s is missing\n"
+msgstr "%s:%d: está faltando o caminho para %s\n"
+
+#, python-format
msgid "%s:%d: %r already in %s list\n"
msgstr "%s:%d: %r já faz parte da lista %s\n"
#, python-format
+msgid "%s:%d: superfluous / in %s %r\n"
+msgstr "%s:%d: / supérflua em %s %r\n"
+
+#, python-format
msgid "%s:%d: unknown directive %r\n"
msgstr "%s:%d: diretiva desconhecida %r\n"
@@ -2364,14 +2422,15 @@
msgid ""
"- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or\n"
-" ``CRLF`` override the default interpretation of ``native`` for\n"
+" ``CRLF`` to override the default interpretation of ``native`` for\n"
" checkout. This can be used with :hg:`archive` on Unix, say, to\n"
" generate an archive where files have line endings for Windows."
msgstr ""
-"- ``eol.native`` (padrão ``os.linesep``) pode ser definido como ``LF``\n"
-" ou ``CRLF``, e sobrepõe a interpretação padrão de ``native`` para o\n"
-" checkout. Isto pode por exemplo ser usado com :hg:`archive` no Unix para\n"
-" gerar um pacote com arquivos contendo quebras de linha Windows."
+"- ``eol.native`` (padrão ``os.linesep``) pode ser definido como\n"
+" ``LF`` ou ``CRLF`` para sobrepor a interpretação padrão de\n"
+" ``native`` para o checkout. Isto pode por exemplo ser usado com\n"
+" :hg:`archive` no Unix para gerar um pacote com arquivos contendo\n"
+" quebras de linha Windows."
msgid ""
"- ``eol.only-consistent`` (default True) can be set to False to make\n"
@@ -2649,12 +2708,16 @@
" primeiro pai, e as mudanças locais como o segundo. Para mudar a\n"
" ordem de mesclagem, use --switch-parent."
-msgid ""
-" See :hg:`help dates` for a list of formats valid for -d/--date.\n"
-" "
-msgstr ""
-" Veja :hg:`help dates` para uma lista de formatos válidos para\n"
-" -d/--date.\n"
+msgid " See :hg:`help dates` for a list of formats valid for -d/--date."
+msgstr ""
+" Veja :hg:`help dates` para obter uma lista de todos os formatos\n"
+" válidos para -d/--date."
+
+msgid ""
+" Returns 0 on success.\n"
+" "
+msgstr ""
+" Devolve 0 para indicar sucesso.\n"
" "
msgid "working dir not at branch tip (use \"hg update\" to check out branch tip)"
@@ -2753,6 +2816,14 @@
" trabalho, ou a tip se o diretório de trabalho não estiver em\n"
" nenhuma revisão."
+msgid ""
+" See :hg:`help dates` for a list of formats valid for -d/--date.\n"
+" "
+msgstr ""
+" Veja :hg:`help dates` para uma lista de formatos válidos para\n"
+" -d/--date.\n"
+" "
+
msgid "uncommitted merge - please provide a specific revision"
msgstr "mesclagem não consolidada - por favor forneça uma revisão especÃfica"
@@ -3365,11 +3436,13 @@
" svn = True"
msgid ""
-"NOTE: the more specific you are in your filename patterns the less you\n"
-"lose speed in huge repositories."
-msgstr ""
-"NOTA: quanto mais especÃfico você for em seus padrões de arquivo,\n"
-"menos velocidade será perdida em repositórios muito grandes."
+".. note::\n"
+" The more specific you are in your filename patterns the less you\n"
+" lose speed in huge repositories."
+msgstr ""
+".. note::\n"
+" Quanto mais especÃfico você for em seus padrões de arquivo,\n"
+" menos velocidade será perdida em repositórios muito grandes."
msgid ""
"For [keywordmaps] template mapping and expansion demonstration and\n"
@@ -3424,7 +3497,7 @@
"{desc}\" expands to the first line of the changeset description.\n"
msgstr ""
"Expansões que alcancem mais de uma linha, e expansões incrementais\n"
-"como CVS' $Log$, não são suportadas. Um modelo de expansão\n"
+"como a $Log$ do CVS, não são suportadas. Um modelo de expansão\n"
"\"Log = {desc}\" expande para a primeira linha da descrição da\n"
"revisão.\n"
@@ -3804,6 +3877,9 @@
msgid "patch %s is empty\n"
msgstr "o patch %s é vazio\n"
+msgid "repository commit failed"
+msgstr "consolidação no repositório falhou"
+
msgid "patch failed, rejects left in working dir\n"
msgstr "o patch falhou, rejeitos deixados no diretório de trabalho\n"
@@ -3850,6 +3926,10 @@
msgstr "\"%s\" não pode ser usado como nome de um patch"
#, python-format
+msgid "\"%s\" already exists as a directory"
+msgstr "\"%s\" já existe, e é um diretório"
+
+#, python-format
msgid "patch \"%s\" already exists"
msgstr "o patch \"%s\" já existe"
@@ -3857,6 +3937,10 @@
msgstr "não se pode gerenciar revisões de mesclagem"
#, python-format
+msgid "cannot write patch \"%s\": %s"
+msgstr "não é possÃvel escrever o patch \"%s\": %s"
+
+#, python-format
msgid "error unlinking %s\n"
msgstr "erro removendo %s\n"
@@ -3975,7 +4059,7 @@
msgid "saved queue repository parents: %s %s\n"
msgstr "pais do repositório da fila salvos: %s %s\n"
-msgid "queue directory updating\n"
+msgid "updating queue directory\n"
msgstr "atualizando diretório da fila\n"
msgid "Unable to load queue repository\n"
@@ -4034,6 +4118,10 @@
msgid "patch %s does not exist"
msgstr "o patch %s não existe"
+#, python-format
+msgid "renaming %s to %s\n"
+msgstr "renomeando %s para %s\n"
+
msgid "need --name to import a patch from -"
msgstr "--name é necessário ao importar um patch de -"
@@ -4066,6 +4154,9 @@
msgid "print the patches already applied"
msgstr "imprime os patches já aplicados"
+msgid " Returns 0 on success."
+msgstr " Devolve 0 para indicar sucesso."
+
msgid "only one patch applied\n"
msgstr "apenas um patch aplicado\n"
@@ -4126,12 +4217,23 @@
msgid ""
" To import a patch from standard input, pass - as the patch file.\n"
" When importing from standard input, a patch name must be specified\n"
-" using the --name flag.\n"
-" "
+" using the --name flag."
msgstr ""
" Para importar um patch da entrada padrão, passe - como o arquivo\n"
" do patch. Ao importar da entrada padrão, um nome de patch deve\n"
-" ser especificado usando a opção --name.\n"
+" ser especificado usando a opção --name."
+
+msgid " To import an existing patch while renaming it::"
+msgstr " Para importar um patch existente com um novo nome::"
+
+msgid " hg qimport -e existing-patch -n new-name"
+msgstr " hg qimport -e patch-existente -n novo-nome"
+
+msgid ""
+" Returns 0 if import succeeded.\n"
+" "
+msgstr ""
+" Devolve 0 se a importação teve sucesso.\n"
" "
msgid "init a new queue repository (DEPRECATED)"
@@ -4184,11 +4286,16 @@
msgid ""
" The patch directory must be a nested Mercurial repository, as\n"
-" would be created by :hg:`init --mq`.\n"
-" "
+" would be created by :hg:`init --mq`."
msgstr ""
" O diretório de patches deve ser um repositório aninhado do\n"
-" Mercurial, como criado por :hg:`init --mq`.\n"
+" Mercurial, como criado por :hg:`init --mq`."
+
+msgid ""
+" Return 0 on success.\n"
+" "
+msgstr ""
+" Devolve 0 para indicar sucesso.\n"
" "
msgid "versioned patch repository not found (see init --mq)"
@@ -4267,13 +4374,18 @@
" Use the -g/--git option to keep the patch in the git extended diff\n"
" format. Read the diffs help topic for more information on why this\n"
" is important for preserving permission changes and copy/rename\n"
-" information.\n"
-" "
+" information."
msgstr ""
" Use a opção -g/--git para manter o patch no formato estendido git\n"
" diff. Leia o tópico de ajuda diffs para mais informações sobre\n"
" por que isso é importante para preservar mudanças de permissão\n"
-" e informações de cópia e renomeação.\n"
+" e informações de cópia e renomeação."
+
+msgid ""
+" Returns 0 on successful creation of a new patch.\n"
+" "
+msgstr ""
+" Devolve 0 para indicar sucesso na criação de um novo patch.\n"
" "
msgid "update the current patch"
@@ -4298,17 +4410,25 @@
" e permanecerão no patch."
msgid ""
+" If -e/--edit is specified, Mercurial will start your configured editor for\n"
+" you to enter a message. In case qrefresh fails, you will find a backup of\n"
+" your message in ``.hg/last-message.txt``."
+msgstr ""
+" Se for especificado -e/--edit, o Mercurial inicia o editor\n"
+" de texto configurado, para que você digite a mensagem. No\n"
+" caso de falha no comando qrefresh, é criada uma cópia de segurança\n"
+" dessa mensagem em ``.hg/last-message.txt``."
+
+msgid ""
" hg add/remove/copy/rename work as usual, though you might want to\n"
" use git-style patches (-g/--git or [diff] git=1) to track copies\n"
" and renames. See the diffs help topic for more information on the\n"
-" git diff format.\n"
-" "
+" git diff format."
msgstr ""
" hg add/remove/copy/rename funciona normalmente, mas você pode\n"
" querer usar patches estilo git (/g--git ou [diff] git=1) para\n"
" rastrear cópias e renomeações. Veja o tópico de ajuda diffs para\n"
-" mais informações sobre o formato git diff.\n"
-" "
+" mais informações sobre o formato git diff."
msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
msgstr "opção \"-e\" incompatÃvel com \"-m\" ou \"-l\""
@@ -4331,14 +4451,12 @@
" Use :hg:`diff` if you only want to see the changes made since the\n"
" last qrefresh, or :hg:`export qtip` if you want to see changes\n"
" made by the current patch without including changes made since the\n"
-" qrefresh.\n"
-" "
+" qrefresh."
msgstr ""
" Use :hg:`diff` se você quiser apenas ver as mudanças feitas desde\n"
" o último qrefresh, ou :hg:`export qtip` se você quiser ver\n"
" mudanças feitas pelo patch atual sem incluir as mudanças feitas\n"
-" desde o último qrefresh.\n"
-" "
+" desde o último qrefresh."
msgid "fold the named patches into the current patch"
msgstr "incorpora os patches pedidos no patch atual"
@@ -4360,17 +4478,17 @@
msgid ""
" The header for each folded patch will be concatenated with the\n"
-" current patch header, separated by a line of '* * *'."
+" current patch header, separated by a line of ``* * *``."
msgstr ""
" O cabeçalho de cada patch incorporado será concatenado com o\n"
-" cabeçalho do patch atual, separado por uma linha de '* * *'."
+" cabeçalho do patch atual, separado por uma linha de ``* * *``."
msgid "qfold requires at least one patch name"
msgstr "qfold requer ao menos um nome de patch"
#, python-format
-msgid "Skipping already folded patch %s"
-msgstr "Omitindo patch %s já incorporado"
+msgid "Skipping already folded patch %s\n"
+msgstr "Omitindo patch %s já incorporado\n"
#, python-format
msgid "qfold cannot fold already applied patch %s"
@@ -4402,22 +4520,23 @@
msgid ""
" With no arguments, print the currently active guards.\n"
-" With arguments, set guards for the named patch.\n"
-" NOTE: Specifying negative guards now requires '--'."
-msgstr ""
-" Sem argumentos, imprime as guardas ativas no momento. Com\n"
-" parâmetros, define guardas para o patch pedido.\n"
-" NOTA: A especificação de guardas negativas agora exige '--'."
+" With arguments, set guards for the named patch."
+msgstr ""
+" Sem argumentos, imprime as guardas ativas no momento.\n"
+" Com um argumento, define guardas para o patch pedido."
+
+msgid ""
+" .. note::\n"
+" Specifying negative guards now requires '--'."
+msgstr ""
+" .. note::\n"
+" A especificação de guardas negativas agora exige '--'."
msgid " To set guards on another patch::"
msgstr " Para definir guardas em um outro patch::"
-msgid ""
-" hg qguard other.patch -- +2.6.17 -stable\n"
-" "
-msgstr ""
-" hg qguard outro.patch -- +2.6.17 -stable\n"
-" "
+msgid " hg qguard other.patch -- +2.6.17 -stable"
+msgstr " hg qguard outro.patch -- +2.6.17 -stable"
msgid "cannot mix -l/--list with options or arguments"
msgstr "não se pode misturar -l/--list com opções ou argumentos"
@@ -4437,11 +4556,16 @@
msgid ""
" When -f/--force is applied, all local changes in patched files\n"
-" will be lost.\n"
-" "
+" will be lost."
msgstr ""
" Se -f/--force for pedido, todas as mudanças locais em arquivos\n"
-" modificados pelo patch serão perdidas.\n"
+" modificados pelo patch serão perdidas."
+
+msgid ""
+" Return 0 on succces.\n"
+" "
+msgstr ""
+" Devolve 0 para indicar sucesso.\n"
" "
msgid "no saved queues found, please use -n\n"
@@ -4457,13 +4581,11 @@
msgid ""
" By default, pops off the top of the patch stack. If given a patch\n"
" name, keeps popping off patches until the named patch is at the\n"
-" top of the stack.\n"
-" "
+" top of the stack."
msgstr ""
" Por padrão, desempilha o topo da pilha de patches. Se for\n"
" passado um nome, desempilha sucessivamente os patches até que\n"
-" o patch com esse nome esteja no topo da pilha.\n"
-" "
+" o patch com esse nome esteja no topo da pilha."
#, python-format
msgid "using patch queue: %s\n"
@@ -4487,10 +4609,6 @@
msgid "A patch named %s already exists in the series file"
msgstr "Um patch de nome %s já existe no arquivo series"
-#, python-format
-msgid "renaming %s to %s\n"
-msgstr "renomeando %s para %s\n"
-
msgid "restore the queue state saved by a revision (DEPRECATED)"
msgstr "restaura o estado da fila salvo por uma revisão (OBSOLETO)"
@@ -4512,21 +4630,18 @@
msgid "copy %s to %s\n"
msgstr "copia %s para %s\n"
-msgid "strip a changeset and all its descendants from the repository"
-msgstr "remove do repositório uma revisão e todos os seus descendentes"
-
-msgid ""
-" The strip command removes all changesets whose local revision\n"
-" number is greater than or equal to REV, and then restores any\n"
-" changesets that are not descendants of REV. If the working\n"
-" directory has uncommitted changes, the operation is aborted unless\n"
-" the --force flag is supplied."
-msgstr ""
-" O comando strip remove todas as revisões cujo número de revisão\n"
-" local for maior ou igual ao de REV (a revisão pedida), e em seguida\n"
-" restaura as revisões que não forem descendentes de REV. Se o\n"
-" diretório de trabalho tiver mudanças pendentes, essa operação será\n"
-" abortada, a não ser que seja usada a opção --force."
+msgid "strip changesets and all their descendants from the repository"
+msgstr "remove do repositório revisões e todos os seus descendentes"
+
+msgid ""
+" The strip command removes the specified changesets and all their\n"
+" descendants. If the working directory has uncommitted changes,\n"
+" the operation is aborted unless the --force flag is supplied."
+msgstr ""
+" O comando strip remove as revisões pedidas e todos os seus\n"
+" descendentes. Se o diretório de trabalho tiver mudanças\n"
+" pendentes, essa operação será abortada, a não ser que seja\n"
+" usada a opção --force."
msgid ""
" If a parent of the working directory is stripped, then the working\n"
@@ -4555,13 +4670,14 @@
" revisões serão em geral diferentes após a restauração."
msgid ""
-" Use the --nobackup option to discard the backup bundle once the\n"
-" operation completes.\n"
-" "
+" Use the --no-backup option to discard the backup bundle once the\n"
+" operation completes."
msgstr ""
" Use a opção --no-backup para descartar o bundle de backup assim\n"
-" que a operação terminar.\n"
-" "
+" que a operação terminar."
+
+msgid "empty revision set"
+msgstr "conjunto vazio de revisões"
msgid "set or print guarded patches to push"
msgstr "define ou imprime guardas de empilhamento de patches"
@@ -4690,13 +4806,11 @@
msgid ""
" This can be especially useful if your changes have been applied to\n"
" an upstream repository, or if you are about to push your changes\n"
-" to upstream.\n"
-" "
+" to upstream."
msgstr ""
" Isto pode ser especialmente útil se suas mudanças foram aplicadas\n"
" a um repositório upstream, ou se você pretender enviar essas\n"
-" mudanças para upstream.\n"
-" "
+" mudanças para upstream."
msgid "no revisions specified"
msgstr "nenhuma revisão especificada"
@@ -4734,16 +4848,20 @@
msgid ""
" To delete an existing queue, use --delete. You cannot delete the currently\n"
-" active queue.\n"
-" "
+" active queue."
msgstr ""
" Para remover uma fila existente, use --delete. Você não pode\n"
-" remover a fila ativa no momento.\n"
-" "
+" remover a fila ativa no momento."
msgid "patches applied - cannot set new queue active"
msgstr "patches aplicados - não é possÃvel ativar outra fila"
+msgid "cannot delete queue that does not exist"
+msgstr "não é possÃvel remover uma fila que não existe"
+
+msgid "cannot delete currently active queue"
+msgstr "não é possÃvel remover a fila ativa"
+
msgid " (active)\n"
msgstr " (ativa)\n"
@@ -4754,11 +4872,13 @@
msgid "queue \"%s\" already exists"
msgstr "a fila \"%s\" já existe"
-msgid "cannot delete queue that does not exist"
-msgstr "não é possÃvel remover uma fila que não existe"
-
-msgid "cannot delete currently active queue"
-msgstr "não é possÃvel remover a fila ativa"
+#, python-format
+msgid "can't rename \"%s\" to its current name"
+msgstr "não é possÃvel renomear \"%s\" para seu nome atual"
+
+#, python-format
+msgid "non-queue directory \"%s\" already exists"
+msgstr "o directory \"%s\", que não é uma fila de patches, já existe"
msgid "use --create to create a new queue"
msgstr "use --create para criar uma nova fila"
@@ -4842,8 +4962,8 @@
msgid "stop managing a revision (DEPRECATED)"
msgstr "deixa de gerenciar uma revisão (OBSOLETO)"
-msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
-msgstr "hg qdelete [-k] [-r REV]... [PATCH]..."
+msgid "hg qdelete [-k] [PATCH]..."
+msgstr "hg qdelete [-k] [PATCH]..."
msgid "edit patch header"
msgstr "edita o cabeçalho do patch"
@@ -4935,11 +5055,11 @@
msgid "forget any local changes to patched files"
msgstr "descarta qualquer mudança local a arquivos modificados pelo patch"
-msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
-msgstr "hg qpop [-a] [-n NOME] [-f] [PATCH | ÃNDICE]"
-
-msgid "apply if the patch has rejects"
-msgstr "aplica se o patch tiver partes rejeitadas"
+msgid "hg qpop [-a] [-f] [PATCH | INDEX]"
+msgstr "hg qpop [-a] [-f] [PATCH | ÃNDICE]"
+
+msgid "apply on top of local changes"
+msgstr "aplica por cima das nudanças locais"
msgid "list patch name in commit text"
msgstr "lista o nome do patch no texto de consolidação"
@@ -4956,8 +5076,8 @@
msgid "reorder patch series and apply only the patch"
msgstr "reordena a fila de patches e aplica apenas o patch"
-msgid "hg qpush [-f] [-l] [-a] [-n NAME] [--move] [PATCH | INDEX]"
-msgstr "hg qpush [-f] [-l] [-a] [-n NOME] [--move] [PATCH | ÃNDICE]"
+msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]"
+msgstr "hg qpush [-f] [-l] [-a] [--move] [PATCH | ÃNDICE]"
msgid "refresh only files already in the patch and specified files"
msgstr "renova apenas os arquivos especificados ou que já estão no patch"
@@ -5034,8 +5154,14 @@
msgid "no backups"
msgstr "nenhuma cópia de segurança"
-msgid "hg strip [-f] [-n] REV"
-msgstr "hg strip [-f] [-n] REV"
+msgid "no backups (DEPRECATED)"
+msgstr "sem cópias de segurança (OBSOLETO)"
+
+msgid "do not modify working copy during strip"
+msgstr "não modifica a cópia de trabalho durante o strip"
+
+msgid "hg strip [-k] [-f] [-n] REV..."
+msgstr "hg strip [-k] [-f] [-n] REV..."
msgid "hg qtop [-s]"
msgstr "hg qtop [-s]"
@@ -5058,9 +5184,15 @@
msgid "create new queue"
msgstr "cria uma nova fila"
+msgid "rename active queue"
+msgstr "renomeia a fila ativa"
+
msgid "delete reference to queue"
msgstr "remove referência para uma fila"
+msgid "delete queue, and remove patch dir"
+msgstr "apaga a fila e remove o diretório de patches"
+
msgid "[OPTION] [QUEUE]"
msgstr "[OPÇÃO] [FILA]"
@@ -5233,10 +5365,10 @@
msgid ""
" [pager]\n"
-" pager = LESS='FSRX' less"
+" pager = less -FRSX"
msgstr ""
" [pager]\n"
-" pager = LESS='FSRX' less"
+" pager = less -FRSX"
msgid ""
"If no pager is set, the pager extensions uses the environment variable\n"
@@ -5301,11 +5433,23 @@
msgid ""
"To ignore global commands like :hg:`version` or :hg:`help`, you have\n"
-"to specify them in your user configuration file.\n"
+"to specify them in your user configuration file."
msgstr ""
"Para ignorar comandos globais como :hg:`version`ou :hg:`help`,\n"
"você precisa especificá-los no seu arquivo de configuração de\n"
-"usuário.\n"
+"usuário."
+
+msgid ""
+"The --pager=... option can also be used to control when the pager is\n"
+"used. Use a boolean value like yes, no, on, off, or use auto for\n"
+"normal behavior.\n"
+msgstr ""
+"A opção --pager=... pode também ser usada para controlar em que momentos\n"
+"o pager será usado. Use um valor booleano como yes, no, on, off, ou use\n"
+"auto para comportamento normal.\n"
+
+msgid "when to paginate (boolean, always, auto, or never)"
+msgstr "quando paginar (booleana, ou \"always\" (sempre), \"never\" (nunca) ou \"auto\" (automaticamente))"
msgid "interpret suffixes to refer to ancestor revisions"
msgstr "interpreta sufixos para referência a revisões ancestrais"
@@ -5386,15 +5530,6 @@
"notÃcias, além de mail archives."
msgid ""
-"With the -d/--diffstat option, you will be prompted for each changeset\n"
-"with a diffstat summary and the changeset summary, so you can be sure\n"
-"you are sending the right changes."
-msgstr ""
-"Com a opção -d/--diffstat, para cada revisão você será consultado\n"
-"interativamente com um resumo do diffstat e o resumo da revisão,\n"
-"para que você tenha certeza de enviar as mudanças corretas."
-
-msgid ""
"To configure other defaults, add a section like this to your hgrc\n"
"file::"
msgstr ""
@@ -5431,55 +5566,6 @@
"uma série de revisões como uma \"patchbomb\"."
msgid ""
-"To avoid sending patches prematurely, it is a good idea to first run\n"
-"the :hg:`email` command with the \"-n\" option (test only). You will be\n"
-"prompted for an email recipient address, a subject and an introductory\n"
-"message describing the patches of your patchbomb. Then when all is\n"
-"done, patchbomb messages are displayed. If the PAGER environment\n"
-"variable is set, your pager will be fired up once for each patchbomb\n"
-"message, so you can verify everything is alright."
-msgstr ""
-"Para evitar o envio de patches de forma prematura, é uma boa idéia\n"
-"executar o comando :hg:`email` com a opção \"-n\" (somente teste).\n"
-"Será pedido um endereço de e-mail de destino, um assunto e uma\n"
-"mensagem introdutória descrevendo os patches de seu patchbomb.\n"
-"Quando tudo estiver feito, as mensagens do patchbomb serão\n"
-"exibidas. Se a variável de ambiente PAGER estiver definida, seu\n"
-"visualizador será executado uma vez para cada mensagem do patchbomb,\n"
-"para que você possa verificar se tudo está certo."
-
-msgid ""
-"The -m/--mbox option is also very useful. Instead of previewing each\n"
-"patchbomb message in a pager or sending the messages directly, it will\n"
-"create a UNIX mailbox file with the patch emails. This mailbox file\n"
-"can be previewed with any mail user agent which supports UNIX mbox\n"
-"files, e.g. with mutt::"
-msgstr ""
-"A opção -m/--mbox também é bem útil. Ao invés de visualizar as\n"
-"mensagens como texto ou enviá-las diretamente, o comando irá criar\n"
-"um arquivo de mailbox UNIX com os e-mails de patch. Este arquivo de\n"
-"mailbox pode ser visualizado com qualquer cliente de e-mails que\n"
-"suporte arquivos mbox UNIX, por exemplo o mutt::"
-
-msgid " % mutt -R -f mbox"
-msgstr " % mutt -R -f mbox"
-
-msgid ""
-"When you are previewing the patchbomb messages, you can use ``formail``\n"
-"(a utility that is commonly installed as part of the procmail\n"
-"package), to send each message out::"
-msgstr ""
-"Ao rever cada mensagem do patchbomb, você pode usar ``formail`` (um\n"
-"utilitário comumente instalado como parte do pacote procmail) para\n"
-"enviar cada mensagem::"
-
-msgid " % formail -s sendmail -bm -t < mbox"
-msgstr " % formail -s sendmail -bm -t < mbox"
-
-msgid "That should be all. Now your patchbomb is on its way out."
-msgstr "Isto deve ser o bastante. Agora seu patchbomb está a caminho."
-
-msgid ""
"You can also either configure the method option in the email section\n"
"to be a sendmail compatible mailer or fill out the [smtp] section so\n"
"that the patchbomb extension can automatically send patchbombs\n"
@@ -5500,12 +5586,6 @@
msgid "Please enter a valid value.\n"
msgstr "Por favor, entre um valor válido.\n"
-msgid "does the diffstat above look okay?"
-msgstr "o diffstat abaixo parece bom?"
-
-msgid "diffstat rejected"
-msgstr "diffstat rejeitado"
-
msgid "send changesets by email"
msgstr "envia revisões por e-mail"
@@ -5522,19 +5602,32 @@
" Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
" the first line of the changeset description as the subject text.\n"
" The message contains two or three parts. First, the changeset\n"
-" description. Next, (optionally) if the diffstat program is\n"
-" installed and -d/--diffstat is used, the result of running\n"
-" diffstat on the patch. Finally, the patch itself, as generated by\n"
-" :hg:`export`."
+" description."
msgstr ""
" Cada e-mail de patch tem uma linha Assunto com a forma\n"
" \"[PATCH M of N] ...\", usando a primeira linha da descrição da\n"
" revisão como texto do assunto. A mensagem contém duas ou três\n"
-" partes. Em primeiro lugar, a descrição da revisão. Em seguida\n"
-" (opcionalmente), se o programa diffstat estiver instalado e a\n"
-" opção -d/--diffstat for usada, o resultado da execução de\n"
-" diffstat no patch. Por fim, o patch em si, como gerado por\n"
-" :hg:`export`."
+" partes. Primeiro, a descrição da revisão."
+
+msgid ""
+" With the -d/--diffstat option, if the diffstat program is\n"
+" installed, the result of running diffstat on the patch is inserted."
+msgstr ""
+" Em seguida, se a opção -d/--diffstat for usada, e se o programa\n"
+" diffstat estiver instalado, é inserido o resultado da execução de\n"
+" diffstat no patch."
+
+msgid " Finally, the patch itself, as generated by :hg:`export`."
+msgstr " Por fim, o próprio patch, como gerado por :hg:`export`."
+
+msgid ""
+" With the -d/--diffstat or -c/--confirm options, you will be presented\n"
+" with a final summary of all messages and asked for confirmation before\n"
+" the messages are sent."
+msgstr ""
+" Com as opções -d/--diffstat ou -c/--confirm, será apresentado\n"
+" um resumo final de todas as mensagens, e haverá um pedido de\n"
+" confirmação antes do envio das mensagens."
msgid ""
" By default the patch is included as text in the email body for\n"
@@ -5566,6 +5659,36 @@
" binário do Mercurial será enviado."
msgid ""
+" With -m/--mbox, instead of previewing each patchbomb message in a\n"
+" pager or sending the messages directly, it will create a UNIX\n"
+" mailbox file with the patch emails. This mailbox file can be\n"
+" previewed with any mail user agent which supports UNIX mbox\n"
+" files."
+msgstr ""
+" Com a opção -m/--mbox, ao invés de visualizar cada mensagem do\n"
+" patchbomb em um pager ou enviá-las diretamente, o comando irá\n"
+" criar um arquivo de mailbox UNIX com os e-mails de patch. Este\n"
+" arquivo de mailbox pode ser visualizado com qualquer cliente de\n"
+" e-mails que suporte arquivos mbox UNIX."
+
+msgid ""
+" With -n/--test, all steps will run, but mail will not be sent.\n"
+" You will be prompted for an email recipient address, a subject and\n"
+" an introductory message describing the patches of your patchbomb.\n"
+" Then when all is done, patchbomb messages are displayed. If the\n"
+" PAGER environment variable is set, your pager will be fired up once\n"
+" for each patchbomb message, so you can verify everything is alright."
+msgstr ""
+" Com a opção -n/--test, todos os passos serão executados, mas as\n"
+" mensagens não serão enviadas. Você será consultado interativamente\n"
+" para fornecer um endereço de email de destino, um assunto e uma\n"
+" mensagem introdutória descrevendo os patches de sua patchbomb.\n"
+" Quando tudo estiver feito, as mensagens da patchbomb serão\n"
+" exibidas. Se a variável de ambiente PAGER estiver definida, seu\n"
+" visualizador será executado uma vez para cada mensagem do patchbomb,\n"
+" para que você possa verificar se tudo está certo."
+
+msgid ""
" hg email -r 3000 # send patch 3000 only\n"
" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
" hg email -r 3000:3005 # send patches 3000 through 3005\n"
@@ -5607,6 +5730,19 @@
" # 3000 não presentes em DEST"
msgid ""
+" hg email -o -m mbox && # generate an mbox file...\n"
+" mutt -R -f mbox # ... and view it with mutt\n"
+" hg email -o -m mbox && # generate an mbox file ...\n"
+" formail -s sendmail \\ # ... and use formail to send from the mbox\n"
+" -bm -t < mbox # ... using sendmail"
+msgstr ""
+" hg email -o -m mbox && # gera um arquivo mbox...\n"
+" mutt -R -f mbox # ... e o visualiza no mutt\n"
+" hg email -o -m mbox && # gera um arquivo mbox ...\n"
+" formail -s sendmail \\ # ... e usa o formail para enviar a\n"
+" -bm -t < mbox # partir do mbox, através do sendmail"
+
+msgid ""
" Before using this command, you will need to enable email in your\n"
" hgrc. See the [email] section in hgrc(5) for details.\n"
" "
@@ -5615,6 +5751,9 @@
" seu hgrc. Veja a seção [email] em hgrc(5) para mais detalhes.\n"
" "
+msgid "no changes found\n"
+msgstr "nenhuma alteração encontrada\n"
+
msgid "specify at least one changeset with -r or -o"
msgstr "especifique ao menos uma revisão com -r ou -o"
@@ -5638,8 +5777,24 @@
msgid "This patch series consists of %d patches."
msgstr "Esta série de patches consiste de %d patches."
-msgid "Final summary:\n"
-msgstr "Sumário final:\n"
+msgid ""
+"\n"
+"Final summary:"
+msgstr ""
+"\n"
+"Sumário final:"
+
+msgid "are you sure you want to send (yn)?"
+msgstr "você tem certeza que deseja enviar (yn)?"
+
+msgid "&No"
+msgstr "(&N) não"
+
+msgid "&Yes"
+msgstr "(&Y) sim"
+
+msgid "patchbomb canceled"
+msgstr "patchbomb cancelado"
msgid "Displaying "
msgstr "Exibindo "
@@ -5647,9 +5802,15 @@
msgid "Writing "
msgstr "Escrevendo "
+msgid "writing"
+msgstr "escrevendo"
+
msgid "Sending "
msgstr "Enviando "
+msgid "sending"
+msgstr "enviando"
+
msgid "send patches as attachments"
msgstr "envia patches como anexos"
@@ -5662,6 +5823,9 @@
msgid "email addresses of copy recipients"
msgstr "endereços de e-mail de destinatários para cópia"
+msgid "ask for confirmation before sending"
+msgstr "pede confirmação antes do envio"
+
msgid "add diffstat output to messages"
msgstr "adiciona a saÃda do diffstat a mensagens"
@@ -6017,8 +6181,14 @@
msgid "cannot use both keepbranches and extrafn"
msgstr "não se pode usar keepbranches e extrafn simultaneamente"
-msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
-msgstr "corrija conflitos não resolvidos com hg resolve e então execute hg rebase --continue"
+msgid "rebasing"
+msgstr "rebaseando"
+
+msgid "changesets"
+msgstr "revisões"
+
+msgid "unresolved conflicts (see hg resolve, then hg rebase --continue)"
+msgstr "conflitos não resolvidos (veja hg resolve, e em seguida hg rebase --continue)"
#, python-format
msgid "no changes, revision %d skipped\n"
@@ -6167,11 +6337,6 @@
" Se for omitida uma lista de arquivos, todas as alterações\n"
" informadas por :hg:`status` serão candidatas para gravação."
-msgid " See :hg:`help dates` for a list of formats valid for -d/--date."
-msgstr ""
-" Veja :hg:`help dates` para obter uma lista de todos os formatos\n"
-" válidos para -d/--date."
-
msgid ""
" You will be prompted for whether to record changes to each\n"
" modified file, and for files with multiple changes, for each\n"
@@ -6224,9 +6389,6 @@
msgid "no changes to record\n"
msgstr "nenhuma mudança a ser gravada\n"
-msgid "patch failed to apply"
-msgstr "aplicação do patch falhou"
-
msgid "hg record [OPTION]... [FILE]..."
msgstr "hg record [OPÇÃO]... [ARQUIVO]..."
@@ -6320,9 +6482,6 @@
msgid "not linkable: %s\n"
msgstr "não é possÃvel criar link: %s\n"
-msgid " files"
-msgstr " arquivos"
-
msgid "pruning"
msgstr "podando"
@@ -6429,27 +6588,29 @@
" compartilha seu histórico com outro repositório."
msgid ""
-" NOTE: using rollback or extensions that destroy/modify history\n"
-" (mq, rebase, etc.) can cause considerable confusion with shared\n"
-" clones. In particular, if two shared clones are both updated to\n"
-" the same changeset, and one of them destroys that changeset with\n"
-" rollback, the other clone will suddenly stop working: all\n"
-" operations will fail with \"abort: working directory has unknown\n"
-" parent\". The only known workaround is to use debugsetparents on\n"
-" the broken clone to reset it to a changeset that still exists\n"
-" (e.g. tip).\n"
-" "
-msgstr ""
-" NOTA: o uso de rollback ou extensões que destroem ou modificam\n"
-" o histórico (mq, rebase, etc) pode causar confusão considerável\n"
-" com clones compartilhados. Em particular, se dois clones\n"
-" compartilhados forem atualizados para a mesma revisão, e um\n"
-" deles destruir essa revisão usando rollback, o outro clone irá\n"
-" deixar de funcionar: todas as operações irão falhar com\n"
-" \"abortado: diretório de trabalho tem pai desconhecido\". A\n"
-" única correção conhecida é o uso do comando debugsetparents no\n"
-" clone quebrado para reposicioná-lo para uma revisão que ainda\n"
-" exista (por exemplo, a tip).\n"
+" .. note::\n"
+" using rollback or extensions that destroy/modify history (mq,\n"
+" rebase, etc.) can cause considerable confusion with shared\n"
+" clones. In particular, if two shared clones are both updated to\n"
+" the same changeset, and one of them destroys that changeset\n"
+" with rollback, the other clone will suddenly stop working: all\n"
+" operations will fail with \"abort: working directory has unknown\n"
+" parent\". The only known workaround is to use debugsetparents on\n"
+" the broken clone to reset it to a changeset that still exists\n"
+" (e.g. tip).\n"
+" "
+msgstr ""
+" .. note::\n"
+" o uso de rollback ou extensões que destroem ou modificam\n"
+" o histórico (mq, rebase, etc) pode causar confusão considerável\n"
+" com clones compartilhados. Em particular, se dois clones\n"
+" compartilhados forem atualizados para a mesma revisão, e um\n"
+" deles destruir essa revisão usando rollback, o outro clone irá\n"
+" deixar de funcionar: todas as operações irão falhar com\n"
+" \"abortado: diretório de trabalho tem pai desconhecido\". A\n"
+" única correção conhecida é o uso do comando debugsetparents no\n"
+" clone quebrado para reposicioná-lo para uma revisão que ainda\n"
+" exista (por exemplo, a tip).\n"
" "
msgid "do not create a working copy"
@@ -6642,6 +6803,13 @@
msgid "outstanding local changes"
msgstr "alterações locais pendentes"
+msgid ""
+"``transplanted(set)``\n"
+" Transplanted changesets in set."
+msgstr ""
+"``transplanted(set)``\n"
+" Revisões transplantadas no conjunto."
+
msgid "pull patches from REPO"
msgstr "traz patches do REPOSITÓRIO"
@@ -6883,6 +7051,9 @@
"[decode]\n"
"** = %sdecode:\n"
+msgid "win32text is deprecated: http://mercurial.selenic.com/wiki/Win32TextExtension\n"
+msgstr "win32text é obsoleta: http://mercurial.selenic.com/wiki/Win32TextExtension\n"
+
msgid "discover and advertise repositories on the local network"
msgstr "descobre e anuncia repositórios na rede local"
@@ -6943,18 +7114,6 @@
msgid "integrity check failed on %s:%d"
msgstr "checagem de integridade falhou em %s:%d"
-#, python-format
-msgid "%s: not a Mercurial bundle file"
-msgstr "%s: não é um arquivo de bundle do Mercurial"
-
-#, python-format
-msgid "%s: unknown bundle version"
-msgstr "%s: versão de bundle desconhecida"
-
-#, python-format
-msgid "%s: unknown bundle compression type"
-msgstr "%s: tipo de compressão de bundle desconhecido"
-
msgid "cannot create new bundle repository"
msgstr "não é possÃvel criar novo repositório de bundle"
@@ -6962,6 +7121,14 @@
msgid "premature EOF reading chunk (got %d bytes, expected %d)"
msgstr "fim de arquivo prematuro lendo trecho (%d bytes obtidos, %d esperados)"
+#, python-format
+msgid "%s: not a Mercurial bundle"
+msgstr "%s: não é um arquivo de bundle do Mercurial"
+
+#, python-format
+msgid "%s: unknown bundle version %s"
+msgstr "%s: versão de bundle %s desconhecida"
+
msgid "empty username"
msgstr "nome de usuário vazio"
@@ -6986,9 +7153,6 @@
msgid "limit must be positive"
msgstr "o limite deve ser positivo"
-msgid "too many revisions specified"
-msgstr "especificadas revisões demais"
-
#, python-format
msgid "invalid format spec '%%%s' in output filename"
msgstr "especificador inválido de formato '%%%s' no nome de arquivo de saÃda"
@@ -7006,6 +7170,10 @@
msgstr "gravando remoção de %s como renomeação para %s (%d%% de similaridade)\n"
#, python-format
+msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
+msgstr "%s ainda não foi consolidado, então dados de cópia não serão guardados para %s.\n"
+
+#, python-format
msgid "%s: not copying - file is not managed\n"
msgstr "%s: não copiado - o arquivo não é gerenciado\n"
@@ -7045,10 +7213,6 @@
msgid "copying %s to %s\n"
msgstr "copiando %s para %s\n"
-#, python-format
-msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
-msgstr "%s ainda não foi consolidado, então dados de cópia não serão guardados para %s.\n"
-
msgid "no source or destination specified"
msgstr "nenhuma origem ou destino especificado"
@@ -7145,6 +7309,10 @@
msgid "can only follow copies/renames for explicit filenames"
msgstr "é possÃvel acompanhar cópias/renomeações apenas para nomes de arquivo explÃcitos"
+#, python-format
+msgid "skipping missing subrepository: %s\n"
+msgstr "desconsiderando sub-repositório faltando: %s\n"
+
msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
msgstr ""
"HG: Edite a mensagem de consolidação.\n"
@@ -7317,13 +7485,6 @@
" qualquer maneira, embora os resultados provavelmente não serão\n"
" úteis."
-msgid ""
-" Returns 0 on success.\n"
-" "
-msgstr ""
-" Devolve 0 para indicar sucesso.\n"
-" "
-
msgid "at least one filename or pattern is required"
msgstr "exigido ao menos um nome de arquivo ou padrão"
@@ -7401,32 +7562,50 @@
msgstr "anula o efeito de uma revisão anterior"
msgid ""
-" Commit the backed out changes as a new changeset. The new\n"
-" changeset is a child of the backed out changeset."
-msgstr ""
-" Consolida a anulação das mudanças como uma nova revisão. Essa nova\n"
-" revisão é uma filha da revisão anulada."
-
-msgid ""
-" If you backout a changeset other than the tip, a new head is\n"
-" created. This head will be the new tip and you should merge this\n"
-" backout changeset with another head."
-msgstr ""
-" Se você anular uma revisão diferente da tip, uma nova cabeça é\n"
-" criada. Esta cabeça será a nova tip e você deve mesclar essa\n"
-" revisão de anulação com outra cabeça."
-
-msgid ""
+" The backout command merges the reverse effect of the reverted\n"
+" changeset into the working directory."
+msgstr ""
+" O comando backout mescla o efeito reverso da revisão revertida\n"
+" com o diretório de trabalho."
+
+msgid ""
+" With the --merge option, it first commits the reverted changes\n"
+" as a new changeset. This new changeset is a child of the reverted\n"
+" changeset.\n"
" The --merge option remembers the parent of the working directory\n"
" before starting the backout, then merges the new head with that\n"
-" changeset afterwards. This saves you from doing the merge by hand.\n"
-" The result of this merge is not committed, as with a normal merge."
-msgstr ""
+" changeset afterwards.\n"
+" This will result in an explicit merge in the history."
+msgstr ""
+" Com a opção --merge, em primeiro lugar as mudanças revertidas são\n"
+" consolidadas como uma nova revisão. Esta nova revisão é uma filha\n"
+" da revisão revertida.\n"
" A opção --merge lembra do pai do diretório de trabalho antes do\n"
" inÃcio da anulação, e mescla a nova cabeça com essa revisão\n"
-" logo em seguida. Isso poupa o trabalho de fazer uma mesclagem\n"
-" manual. O resultado da mesclagem não é gravado, assim como em uma\n"
-" mesclagem normal."
+" logo em seguida.\n"
+" Isso resultará em uma mesclagem explÃcita gravada no histórico."
+
+msgid ""
+" If you backout a changeset other than the original parent of the\n"
+" working directory, the result of this merge is not committed,\n"
+" as with a normal merge. Otherwise, no merge is needed and the\n"
+" commit is automatic."
+msgstr ""
+" Se você anular uma revisão diferente do pai original do diretório\n"
+" de trabalho, o resultado dessa mesclagem não será consolidado,\n"
+" como em uma mesclagem normal. Caso contrário, nenhuma mesclagem\n"
+" será necessária e a consolidação será automática."
+
+msgid ""
+" Note that the default behavior (without --merge) has changed in\n"
+" version 1.7. To restore the previous default behavior, use\n"
+" :hg:`backout --merge` and then :hg:`update --clean .` to get rid of\n"
+" the ongoing merge."
+msgstr ""
+" Note que o comportamento padrão (sem --merge) mudou na versão\n"
+" 1.7. Para obter o comportamento padrão anterior, use\n"
+" :hg:`backout --merge` e em seguida :hg:`update --clean .` para\n"
+" descartar a mesclagem em andamento."
msgid "please specify just one revision"
msgstr "por favor especifique apenas uma revisão"
@@ -7458,12 +7637,6 @@
msgid "merging with changeset %s\n"
msgstr "mesclando com revisão %s\n"
-msgid "the backout changeset is a new head - do not forget to merge\n"
-msgstr "a revisão de anulação é uma nova cabeça - não esqueça de mesclar\n"
-
-msgid "(use \"backout --merge\" if you want to auto-merge)\n"
-msgstr "(use \"backout --merge\" se você quiser mesclar automaticamente)\n"
-
msgid "subdivision search of changesets"
msgstr "busca revisões por subdivisão"
@@ -7514,6 +7687,15 @@
msgid "The first bad revision is:\n"
msgstr "A primeira revisão ruim é:\n"
+#, python-format
+msgid ""
+"Not all ancestors of this changeset have been checked.\n"
+"To check the other ancestors, start from the common ancestor, %s.\n"
+msgstr ""
+"Nem todos os ancestrais desta revisão foram verificados.\n"
+"Para verificar os outros ancestrais, comece do ancestral comum,\n"
+"%s.\n"
+
msgid "Due to skipped revisions, the first good revision could be any of:\n"
msgstr "Devido a revisões omitidas, a primeira revisão boa pode ser qualquer uma entre:\n"
@@ -8200,8 +8382,9 @@
msgid " (check that your locale is properly set)\n"
msgstr " (verifique se seu locale está configurado propriamente)\n"
-msgid "Checking extensions...\n"
-msgstr "Verificando extensões...\n"
+#, python-format
+msgid "Checking installed modules (%s)...\n"
+msgstr "Verificando módulos instalados (%s)...\n"
msgid " One or more extensions could not be found"
msgstr " Uma ou mais extensões não puderam ser encontradas"
@@ -8230,8 +8413,8 @@
msgid " (Current patch tool may be incompatible with patch, or misconfigured. Please check your configuration file)\n"
msgstr " (O utilitário de patch atual pode ser incompatÃvel com o patch, ou pode estar configurado incorretamente. Por favor verifique seu arquivo de configuração)\n"
-msgid " Internal patcher failure, please report this error to http://mercurial.selenic.com/bts/\n"
-msgstr " Falha do sistema interno de patches, por favor informe esse erro em http://mercurial.selenic.com/bts/\n"
+msgid " Internal patcher failure, please report this error to http://mercurial.selenic.com/wiki/BugTracker\n"
+msgstr " Falha do sistema interno de patches, por favor informe esse erro em http://mercurial.selenic.com/wiki/BugTracker\n"
msgid "Checking commit editor...\n"
msgstr "Verificando editor para consolidação...\n"
@@ -8285,13 +8468,15 @@
" \"unified diff\"."
msgid ""
-" NOTE: diff may generate unexpected results for merges, as it will\n"
-" default to comparing against the working directory's first parent\n"
-" changeset if no revisions are specified."
-msgstr ""
-" NOTA: diff pode gerar resultados inesperados para mesclagens, já\n"
-" que por padrão irá comparar com o primeiro pai do diretório de\n"
-" trabalho se uma revisão não for especificada."
+" .. note::\n"
+" diff may generate unexpected results for merges, as it will\n"
+" default to comparing against the working directory's first\n"
+" parent changeset if no revisions are specified."
+msgstr ""
+" .. note::\n"
+" diff pode gerar resultados inesperados para mesclagens, já\n"
+" que por padrão irá comparar com o primeiro pai do diretório de\n"
+" trabalho se uma revisão não for especificada."
msgid ""
" Alternatively you can specify -c/--change with a revision to see\n"
@@ -8334,13 +8519,15 @@
" e comentário de consolidação."
msgid ""
-" NOTE: export may generate unexpected diff output for merge\n"
-" changesets, as it will compare the merge changeset against its\n"
-" first parent only."
-msgstr ""
-" NOTA: export pode gerar saÃda de diff inesperada para revisões\n"
-" de mesclagem, já que irá comparar a revisão de mesclagem apenas\n"
-" com seu primeiro pai."
+" .. note::\n"
+" export may generate unexpected diff output for merge\n"
+" changesets, as it will compare the merge changeset against its\n"
+" first parent only."
+msgstr ""
+" .. note::\n"
+" export pode gerar saÃda de diff inesperada para revisões\n"
+" de mesclagem, já que irá comparar a revisão de mesclagem\n"
+" apenas com seu primeiro pai."
msgid ""
" Output may be to a file, in which case the name of the file is\n"
@@ -8352,11 +8539,11 @@
msgid ""
" :``%%``: literal \"%\" character\n"
-" :``%H``: changeset hash (40 bytes of hexadecimal)\n"
+" :``%H``: changeset hash (40 hexadecimal digits)\n"
" :``%N``: number of patches being generated\n"
" :``%R``: changeset revision number\n"
" :``%b``: basename of the exporting repository\n"
-" :``%h``: short-form changeset hash (12 bytes of hexadecimal)\n"
+" :``%h``: short-form changeset hash (12 hexadecimal digits)\n"
" :``%n``: zero-padded sequence number, starting at 1\n"
" :``%r``: zero-padded changeset revision number"
msgstr ""
@@ -8588,6 +8775,14 @@
msgstr "(texto de ajuda não disponÃvel)"
#, python-format
+msgid "shell alias for::"
+msgstr "apelido de shell para::"
+
+#, python-format
+msgid " %s"
+msgstr " %s"
+
+#, python-format
msgid "alias for: hg %s"
msgstr "apelido para: hg %s"
@@ -8804,6 +8999,9 @@
" Devolve 0 para indicar mudanças de entrada, 0 se não houver mudanças.\n"
" "
+msgid "cannot combine --bundle and --subrepos"
+msgstr "não é possÃvel combinar --bundle e --subrepos"
+
msgid "create a new repository in the given directory"
msgstr "cria um novo repositório no diretório pedido"
@@ -8889,15 +9087,16 @@
" revisões de mesclagem."
msgid ""
-" If no revision range is specified, the default is tip:0 unless\n"
+" If no revision range is specified, the default is ``tip:0`` unless\n"
" --follow is set, in which case the working directory parent is\n"
" used as the starting revision. You can specify a revision set for\n"
" log, see :hg:`help revsets` for more information."
msgstr ""
-" Se um intervalo de revisões não for pedido, o padrão é tip:0 a\n"
-" não ser que --follow seja pedido; nesse caso, o pai do diretório\n"
-" de trabalho é usado como revisão inicial. Você pode também especificar\n"
-" um conjunto de revisões, veja :hg:`help revsets` para mais informações."
+" Se um intervalo de revisões não for pedido, o padrão é ``tip:0``,\n"
+" a não ser que --follow seja pedido; nesse caso, o pai do\n"
+" diretório de trabalho será usado como revisão inicial. Você\n"
+" também pode especificar um conjunto de revisões: veja\n"
+" :hg:`help revsets` para mais informações."
msgid ""
" By default this command prints revision number and changeset id,\n"
@@ -8912,15 +9111,17 @@
" mensagem de consolidação completa."
msgid ""
-" NOTE: log -p/--patch may generate unexpected diff output for merge\n"
-" changesets, as it will only compare the merge changeset against\n"
-" its first parent. Also, only files different from BOTH parents\n"
-" will appear in files:."
-msgstr ""
-" NOTA: log -p/--patch pode gerar saÃdas de diff inesperadas para\n"
-" mesclagens, pois irá comparar a revisão de mesclagem apenas\n"
-" com seu primeiro pai. Além disso, apenas arquivos diferentes de\n"
-" AMBOS os pais aparecerão na lista de arquivos."
+" .. note::\n"
+" log -p/--patch may generate unexpected diff output for merge\n"
+" changesets, as it will only compare the merge changeset against\n"
+" its first parent. Also, only files different from BOTH parents\n"
+" will appear in files:."
+msgstr ""
+" .. note::\n"
+" log -p/--patch pode gerar saÃdas de diff inesperadas para\n"
+" mesclagens, pois irá comparar a revisão de mesclagem apenas\n"
+" com seu primeiro pai. Além disso, apenas arquivos diferentes\n"
+" de AMBOS os pais aparecerão na lista de arquivos."
msgid "output the current or given revision of the project manifest"
msgstr "mostra a revisão atual ou pedida do manifesto do projeto"
@@ -8965,6 +9166,16 @@
" permitida. Essa próxima consolidação terá dois pais."
msgid ""
+" ``--tool`` can be used to specify the merge tool used for file\n"
+" merges. It overrides the HGMERGE environment variable and your\n"
+" configuration files."
+msgstr ""
+" ``--tool`` pode ser usado pra especificar o utilitário de\n"
+" mesclagem usado para mesclagens de arquivo. Esta opção sobrepõe\n"
+" a variável de ambiente HGMERGE e os valores especificados nos\n"
+" arquivos de configuração."
+
+msgid ""
" If no revision is specified, the working directory's parent is a\n"
" head revision, and the current branch contains exactly one other\n"
" head, the other head is merged with by default. Otherwise, an\n"
@@ -8976,6 +9187,9 @@
" contrário, uma revisão com a qual mesclar deve ser fornecida\n"
" explicitamente."
+msgid " :hg:`resolve` must be used to resolve unresolved files."
+msgstr " :hg:`resolve` deve ser usado para resolver arquivos não resolvidos."
+
msgid ""
" To undo an uncommitted merge, use :hg:`update --clean .` which\n"
" will check out a clean copy of the original merge parent, losing\n"
@@ -9368,28 +9582,34 @@
" :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the\n"
" working directory must have two parents)."
msgstr ""
-" Mesclagens com conflitos não resolvidos podem resultar de mesclagens não\n"
-" interativas usando a opção ``internal:merge`` do arquivo de configuração\n"
-" ou um utilitário de mesclagem de linha de comando, como o ``diff3``.\n"
-" O comando resolve é usado para gerenciar os arquivos envolvidos em uma\n"
-" mesclagem após a execução de :hg:`merge` e antes da execução de\n"
-" :hg:`commit` (ou seja, enquanto o diretório de trabalho tiver dois\n"
-" pais)."
+" Mesclagens com conflitos não resolvidos podem resultar de\n"
+" mesclagens não interativas usando a opção ``internal:merge``\n"
+" do arquivo de configuração ou um utilitário de mesclagem de\n"
+" linha de comando, como o ``diff3``.\n"
+" O comando resolve é usado para gerenciar os arquivos envolvidos\n"
+" em uma mesclagem, após a execução de :hg:`merge` e antes da\n"
+" execução de :hg:`commit` (ou seja, enquanto o diretório de\n"
+" trabalho tiver dois pais)."
msgid " The resolve command can be used in the following ways:"
msgstr " O comando resolve pode ser usado das seguintes maneiras:"
msgid ""
-" - :hg:`resolve FILE...`: attempt to re-merge the specified files,\n"
-" discarding any previous merge attempts. Re-merging is not\n"
+" - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified\n"
+" files, discarding any previous merge attempts. Re-merging is not\n"
" performed for files already marked as resolved. Use ``--all/-a``\n"
-" to selects all unresolved files."
-msgstr ""
-" - :hg:`resolve ARQUIVO...`: tenta refazer a mesclagem dos arquivos\n"
-" especificados, descartando qualquer tentativa de mesclagem anterior.\n"
-" Essa nova tentativa não será feita em arquivos já marcados como\n"
-" resolvidos. Use ``--all/-a`` para indicar todos os arquivos não\n"
-" resolvidos."
+" to selects all unresolved files. ``--tool`` can be used to specify\n"
+" the merge tool used for the given files. It overrides the HGMERGE\n"
+" environment variable and your configuration files."
+msgstr ""
+" - :hg:`resolve [--tool] ARQUIVO...`: tenta refazer a mesclagem\n"
+" dos arquivos especificados, descartando qualquer tentativa de\n"
+" mesclagem anterior. Essa nova tentativa não será feita em\n"
+" arquivos já marcados como resolvidos. Use ``--all/-a`` para\n"
+" indicar todos os arquivos não resolvidos. ``--tool`` pode ser\n"
+" usado para especificar o utilitário de mesclagem usado para os\n"
+" arquivos pedidos. Esta opção sobrepõe a variável de ambiente\n"
+" HGMERGE e os valores especificados nos arquivos de configuração."
msgid ""
" - :hg:`resolve -m [FILE]`: mark a file as having been resolved\n"
@@ -9446,17 +9666,20 @@
msgstr "restaura arquivos ou diretórios para um estado anterior"
msgid ""
-" NOTE: This command is most likely not what you are looking for. revert\n"
-" will partially overwrite content in the working directory without changing\n"
-" the working directory parents. Use :hg:`update -r rev` to check out earlier\n"
-" revisions, or :hg:`update --clean .` to undo a merge which has added\n"
-" another parent."
-msgstr ""
-" NOTA: revert sobrescreve parcialmente o conteúdo do diretório de\n"
-" trabalho sem mudar os pais do diretório de trabalho. Use\n"
-" :hg:`update -r rev` para obter revisões anteriores, ou\n"
-" :hg:`update --clean .` para desfazer uma mesclagem (retirando o\n"
-" segundo pai adicionado por ela)."
+" .. note::\n"
+" This command is most likely not what you are looking for.\n"
+" Revert will partially overwrite content in the working\n"
+" directory without changing the working directory parents. Use\n"
+" :hg:`update -r rev` to check out earlier revisions, or\n"
+" :hg:`update --clean .` to undo a merge which has added another\n"
+" parent."
+msgstr ""
+" .. note::\n"
+" revert sobrescreve parcialmente o conteúdo do diretório de\n"
+" trabalho sem mudar os pais do diretório de trabalho. Use\n"
+" :hg:`update -r rev` para obter revisões anteriores, ou\n"
+" :hg:`update --clean .` para cancelar uma mesclagem (retirando\n"
+" o segundo pai adicionado por ela)."
msgid ""
" With no revision specified, revert the named files or directories\n"
@@ -9699,16 +9922,18 @@
" com -u/--unknown (desconhecidos) ou -i/--ignored (ignorados)."
msgid ""
-" NOTE: status may appear to disagree with diff if permissions have\n"
-" changed or a merge has occurred. The standard diff format does not\n"
-" report permission changes and diff only reports changes relative\n"
-" to one merge parent."
-msgstr ""
-" NOTA: o comando status pode aparentemente discordar do comando\n"
-" diff se ocorrer uma mudança de permissões ou uma mesclagem. O\n"
-" formato diff padrão não informa mudanças de permissão e o\n"
-" comando diff informa apenas mudanças relativas a um pai da\n"
-" mesclagem."
+" .. note::\n"
+" status may appear to disagree with diff if permissions have\n"
+" changed or a merge has occurred. The standard diff format does\n"
+" not report permission changes and diff only reports changes\n"
+" relative to one merge parent."
+msgstr ""
+" .. note::\n"
+" o comando status pode aparentemente discordar do comando\n"
+" diff se ocorrer uma mudança de permissões ou uma mesclagem. O\n"
+" formato diff padrão não informa mudanças de permissão e o\n"
+" comando diff informa apenas mudanças relativas a um pai da\n"
+" mesclagem."
msgid ""
" If one revision is given, it is used as the base revision.\n"
@@ -9989,19 +10214,25 @@
msgid ""
" Update the repository's working directory to the specified\n"
-" changeset."
+" changeset. If no changeset is specified, update to the tip of the\n"
+" current named branch."
msgstr ""
" Atualiza o diretório de trabalho do repositório para a revisão\n"
-" pedida."
-
-msgid ""
-" If no changeset is specified, attempt to update to the tip of the\n"
-" current branch. If this changeset is a descendant of the working\n"
-" directory's parent, update to it, otherwise abort."
-msgstr ""
-" Se nenhuma revisão for especificada, tenta atualizar para a tip\n"
-" do ramo atual. Se esta revisão for uma descendente do pai do\n"
-" diretório de trabalho, atualiza para ela, e aborta caso contrário."
+" pedida. Se não for especificada uma revisão, atualiza para a\n"
+" última revisão do ramo nomeado atual."
+
+msgid ""
+" If the changeset is not a descendant of the working directory's\n"
+" parent, the update is aborted. With the -c/--check option, the\n"
+" working directory is checked for uncommitted changes; if none are\n"
+" found, the working directory is updated to the specified\n"
+" changeset."
+msgstr ""
+" Se a revisão não for descendente do pai do diretório de trabalho,\n"
+" o comando update será abortado. Com a opção -c/--check, o comando\n"
+" verificará se existem mudanças não consolidadas no diretório de\n"
+" trabalho; caso não hajam mudanças, o diretório de trabalho será\n"
+" atualizado para a revisão pedida."
msgid ""
" The following rules apply when the working directory contains\n"
@@ -10050,7 +10281,9 @@
" Use null como revisão para remover o diretório de trabalho (com um\n"
" resultado semelhante a :hg:`clone -U`)."
-msgid " If you want to update just one file to an older changeset, use :hg:`revert`."
+msgid ""
+" If you want to update just one file to an older changeset, use\n"
+" :hg:`revert`."
msgstr ""
" Se você quiser atualizar apenas um arquivo para uma revisão\n"
" anterior, use :hg:`revert`."
@@ -10085,14 +10318,15 @@
msgid "Mercurial Distributed SCM (version %s)\n"
msgstr "Sistema de controle de versão distribuÃdo Mercurial (versão %s)\n"
-msgid ""
-"\n"
-"Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
+msgid "(see http://mercurial.selenic.com for more information)"
+msgstr "(veja http://mercurial.selenic.com para mais informações)"
+
+msgid ""
+"Copyright (C) 2005-2010 Matt Mackall and others\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-"\n"
-"Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> e outros\n"
+"Copyright (C) 2005-2010 Matt Mackall e outros\n"
"Este software é livre; veja os fontes para condições de cópia. Não\n"
"há garantias, nem mesmo de adequação para qualquer propósito em\n"
"particular.\n"
@@ -10229,6 +10463,9 @@
msgid "guess renamed files by similarity (0<=s<=100)"
msgstr "infere arquivos renomeados por similaridade (0<=s<=100)"
+msgid "recurse into subrepositories"
+msgstr "trabalha em sub-repositórios recursivamente"
+
msgid "[OPTION]... [FILE]..."
msgstr "[OPÇÃO]... [ARQUIVO]..."
@@ -10286,6 +10523,9 @@
msgid "parent to choose when backing out merge"
msgstr "pai a ser escolhido ao fazer o backout de mesclagem"
+msgid "specify merge tool"
+msgstr "especifica o utilitário de mesclagem"
+
msgid "revision to backout"
msgstr "revisão para fazer o backout"
@@ -10448,6 +10688,9 @@
msgid "[PATH]"
msgstr "[CAMINHO]"
+msgid "revlog format"
+msgstr "formato do revlog"
+
msgid "REPO NAMESPACE [KEY OLD NEW]"
msgstr "REPOSITÓRIO NAMESPACE [CHAVE ANTIGO NOVO]"
@@ -10511,8 +10754,11 @@
msgid "[OPTION]... PATTERN [FILE]..."
msgstr "[OPÇÃO]... PADRÃO [ARQUIVO]..."
-msgid "show only heads which are descendants of REV"
-msgstr "mostra apenas cabeças descendentes de REV"
+msgid "show only heads which are descendants of STARTREV"
+msgstr "mostra apenas cabeças descendentes de REVINICIAL"
+
+msgid "STARTREV"
+msgstr "REVINICIAL"
msgid "show topological heads only"
msgstr "mostra apenas cabeças topológicas"
@@ -10523,8 +10769,8 @@
msgid "show normal and closed branch heads"
msgstr "mostra cabeças de ramo normais e fechadas"
-msgid "[-ac] [-r REV] [REV]..."
-msgstr "[-ac] [-r REV] [REV]..."
+msgid "[-ac] [-r STARTREV] [REV]..."
+msgstr "[-ac] [-r REVINICIAL] [REV]..."
msgid "[TOPIC]"
msgstr "[TÓPICO]"
@@ -10757,8 +11003,8 @@
msgid "name to show in web pages (default: working directory)"
msgstr "nome a ser exibido em páginas web (padrão: diretório de trabalho)"
-msgid "name of the hgweb config file (serve more than one repository)"
-msgstr "nome do arquivo de configuração do hgweb (para servir mais de um repositório)"
+msgid "name of the hgweb config file (see \"hg help hgweb\")"
+msgstr "nome do arquivo de configuração do hgweb (veja \"hg help hgweb\")"
msgid "name of the hgweb config file (DEPRECATED)"
msgstr "nome do arquivo de configuração do hgweb (OBSOLETA)"
@@ -10850,8 +11096,8 @@
msgid "discard uncommitted changes (no backup)"
msgstr "descarta mudanças não consolidadas (sem backup)"
-msgid "check for uncommitted changes"
-msgstr "verifica mudanças ainda não consolidadas"
+msgid "update across branches if no uncommitted changes"
+msgstr "atualiza através de ramos, se não houverem mudanças pendentes"
msgid "[-c] [-C] [-d DATE] [[-r] REV]"
msgstr "[-c] [-C] [-d DATA] [[-r] REV]"
@@ -10971,6 +11217,9 @@
msgid "unsupported file type (type is %s)"
msgstr "tipo de arquivo não suportado (o tipo é %s)"
+msgid "searching for changes\n"
+msgstr "procurando por mudanças\n"
+
msgid "queries"
msgstr "consultas"
@@ -10987,24 +11236,24 @@
msgstr "repositório não é relacionado"
#, python-format
-msgid "abort: push creates new remote heads on branch '%s'!\n"
-msgstr "abortado: push cria novas cabeças remotas no ramo '%s'!\n"
-
-msgid "abort: push creates new remote heads!\n"
-msgstr "abortado: push cria novas cabeças remotas!\n"
-
-msgid "(you should pull and merge or use push -f to force)\n"
-msgstr "(você deve fazer o pull e mesclar ou usar push -f para forçar)\n"
-
-msgid "(did you forget to merge? use push -f to force)\n"
-msgstr "(você esqueceu de mesclar? Use push -f para forçar)\n"
-
-#, python-format
-msgid "abort: push creates new remote branches: %s!\n"
-msgstr "abortado: push cria novos ramos remotos: '%s'!\n"
-
-msgid "(use 'hg push --new-branch' to create new remote branches)\n"
-msgstr "(use 'hg push --new-branch' para criar novos ramos remotos)\n"
+msgid "push creates new remote branches: %s!"
+msgstr "push cria novos ramos remotos: '%s'!"
+
+msgid "use 'hg push --new-branch' to create new remote branches"
+msgstr "use 'hg push --new-branch' para criar novos ramos remotos"
+
+#, python-format
+msgid "push creates new remote heads on branch '%s'!"
+msgstr "push cria novas cabeças remotas no ramo '%s'!"
+
+msgid "push creates new remote heads!"
+msgstr "push cria novas cabeças remotas!"
+
+msgid "you should pull and merge or use push -f to force"
+msgstr "você deve fazer o pull e mesclar ou usar push -f para forçar"
+
+msgid "did you forget to merge? use push -f to force"
+msgstr "você esqueceu de mesclar? Use push -f para forçar"
msgid "note: unsynced remote changes!\n"
msgstr "aviso: mudanças remotas não sincronizadas!\n"
@@ -11014,6 +11263,10 @@
msgstr "abortado: %s\n"
#, python-format
+msgid "(%s)\n"
+msgstr "(%s)\n"
+
+#, python-format
msgid "hg: parse error at %s: %s\n"
msgstr "hg: erro de análise da entrada em %s: %s\n"
@@ -11021,6 +11274,9 @@
msgid "hg: parse error: %s\n"
msgstr "hg: erro de análise da entrada: %s\n"
+msgid "entering debugger - type c to continue starting hg or h for help\n"
+msgstr "entrando no depurador - digite c para continuar iniciando o hg ou h para ajuda\n"
+
#, python-format
msgid ""
"hg: command '%s' is ambiguous:\n"
@@ -11097,14 +11353,11 @@
msgid "abort: out of memory\n"
msgstr "abortado: sem memória\n"
-msgid "** unknown exception encountered, details follow\n"
-msgstr "** exceção desconhecida encontrada, segue detalhes\n"
-
-msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
-msgstr "** reporte detalhes de problemas para http://mercurial.selenic.com/bts/\n"
-
-msgid "** or mercurial@selenic.com\n"
-msgstr "** ou mercurial@selenic.com\n"
+msgid "** unknown exception encountered, please report by visiting\n"
+msgstr "** exceção desconhecida encontrada, por favor informe sobre esse erro visitando\n"
+
+msgid "** http://mercurial.selenic.com/wiki/BugTracker\n"
+msgstr "** http://mercurial.selenic.com/wiki/BugTracker\n"
#, python-format
msgid "** Python %s\n"
@@ -11123,6 +11376,10 @@
msgstr "nenhuma definição para o apelido '%s'\n"
#, python-format
+msgid "error in definition for alias '%s': %s may only be given on the command line\n"
+msgstr "erro na definição do apelido '%s': %s pode ser passado apenas na linha de comando\n"
+
+#, python-format
msgid "alias '%s' resolves to unknown command '%s'\n"
msgstr "apelido '%s' indica comando desconhecido '%s'\n"
@@ -11226,12 +11483,6 @@
msgid "was merge of '%s' successful (yn)?"
msgstr "a mesclagem de '%s' teve sucesso (yn)?"
-msgid "&No"
-msgstr "(&N) não"
-
-msgid "&Yes"
-msgstr "(&Y) sim"
-
#, python-format
msgid ""
" output file %s appears unchanged\n"
@@ -11282,6 +11533,9 @@
msgid "Diff Formats"
msgstr "Formatos de Diff"
+msgid "Merge Tools"
+msgstr "Utilitários de Mesclagem"
+
msgid "Template Usage"
msgstr "Uso de Modelos"
@@ -11291,6 +11545,9 @@
msgid "Using additional features"
msgstr "Usando funcionalidades adicionais"
+msgid "Subrepositories"
+msgstr "Sub-repositórios"
+
msgid "Configuring hgweb"
msgstr "Configuração do hgweb"
@@ -11607,6 +11864,22 @@
" sobreposta com a opção --encodingmode na linha de comando."
msgid ""
+"HGENCODINGAMBIGUOUS\n"
+" This sets Mercurial's behavior for handling characters with\n"
+" \"ambiguous\" widths like accented Latin characters with East Asian\n"
+" fonts. By default, Mercurial assumes ambiguous characters are\n"
+" narrow, set this variable to \"wide\" if such characters cause\n"
+" formatting problems."
+msgstr ""
+"HGENCODINGAMBIGUOUS\n"
+" Define o comportamento do Mercurial ao lidar com caracteres\n"
+" com larguras \"ambÃguas\" como caracteres latinos acentuados\n"
+" com fontes da Ãsia Oriental. Por padrão, o Mercurial assume\n"
+" que caracteres ambÃguos são \"narrow\" (estreitos); defina\n"
+" esta variável para \"wide\" (largos) se tais caracteres\n"
+" causarem problemas de formatação."
+
+msgid ""
"HGMERGE\n"
" An executable to use for resolving merge conflicts. The program\n"
" will be executed with three arguments: local file, remote file,\n"
@@ -11850,7 +12123,7 @@
" a remote repository, since new heads may be created by these\n"
" operations. Note that the term branch can also be used informally\n"
" to describe a development process in which certain development is\n"
-" done independently of other development.This is sometimes done\n"
+" done independently of other development. This is sometimes done\n"
" explicitly with a named branch, but it can also be done locally,\n"
" using bookmarks or clones and anonymous branches."
msgstr ""
@@ -12031,14 +12304,14 @@
msgid ""
"Changeset id\n"
" A SHA-1 hash that uniquely identifies a changeset. It may be\n"
-" represented as either a \"long\" 40-byte hexadecimal string, or a\n"
-" \"short\" 12-byte hexadecimal string."
+" represented as either a \"long\" 40 hexadecimal digit string, or a\n"
+" \"short\" 12 hexadecimal digit string."
msgstr ""
"Changeset id\n"
" Id de revisão. Um hash SHA-1 que identifica unicamente uma revisão.\n"
-" Pode ser representado tanto como uma cadeia \"longa\" de caracteres\n"
-" hexadecimais de 40 bytes, ou uma cadeia \"curta\" de 12 caracteres\n"
-" correspondente aos 12 primeiros caracteres da cadeia longa (veja\n"
+" Pode ser representado tanto como uma cadeia \"longa\" de 40 dÃgitos\n"
+" hexadecimais, ou uma cadeia \"curta\" de 12 dÃgitos hexadecimais\n"
+" correspondente aos 12 primeiros dÃgitos da cadeia longa (veja\n"
" :hg:`help revisions`)."
msgid ""
@@ -12768,6 +13041,265 @@
"do lado direito removidos. Assim, ``/foo/bar`` e ``foo/quux/baz`` serão\n"
"listados como ``bar`` e ``quux/baz`` respectivamente.\n"
+msgid "To merge files Mercurial uses merge tools."
+msgstr "Para mesclar arquivos o Mercurial usa utilitários de mesclagem."
+
+msgid ""
+"A merge tool combines two different versions of a file into a merged\n"
+"file. Merge tools are given the two files and the greatest common\n"
+"ancestor of the two file versions, so they can determine the changes\n"
+"made on both branches."
+msgstr ""
+"Um utilitário de mesclagem combina duas versões diferentes de\n"
+"um arquivo em um arquivo mesclado. Ao utilitário de mesclagem\n"
+"são passados os dois arquivos e o maior ancestral comum das\n"
+"duas revisões dos arquivos, para que ele possa determinar as\n"
+"mudanças feitas nos dois ramos."
+
+msgid ""
+"Merge tools are used both for :hg:`resolve`, :hg:`merge`, :hg:`update`,\n"
+":hg:`backout` and in several extensions."
+msgstr ""
+"Os utilitários de mesclagem são usados por :hg:`resolve`,\n"
+":hg:`merge`, :hg:`update`, :hg:`backout` e diversas extensões."
+
+msgid ""
+"Usually, the merge tool tries to automatically reconcile the files by\n"
+"combining all non-overlapping changes that occurred separately in\n"
+"the two different evolutions of the same initial base file. Furthermore, some\n"
+"interactive merge programs make it easier to manually resolve\n"
+"conflicting merges, either in a graphical way, or by inserting some\n"
+"conflict markers. Mercurial does not include any interactive merge\n"
+"programs but relies on external tools for that."
+msgstr ""
+"Tipicamente, o utilitário de mesclagem tenta automaticamente reconciliar\n"
+"os arquivos combinando todas as mudanças não sobrepostas que tiverem\n"
+"ocorrido separadamente nas duas evoluções diferentes do mesmo arquivo\n"
+"base inicial. Além disso, alguns programas de mesclagem interativos\n"
+"facilitam a resolução manual de conflitos de mesclagem, de maneira\n"
+"gráfica ou inserindo no arquivo algum marcador de conflitos. O Mercurial\n"
+"não inclui nenhum programa de mesclagem interativa, mas usa utilitários\n"
+"externos para essa tarefa."
+
+msgid ""
+"Available merge tools\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+"Utilitários de mesclagem disponÃveis\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+
+msgid ""
+"External merge tools and their properties are configured in the\n"
+"merge-tools configuration section - see hgrc(5) - but they can often just\n"
+"be named by their executable."
+msgstr ""
+"Utilitários externos de mesclagem e suas propriedades são\n"
+"configurados na seção de configuração merge-tools - veja\n"
+"hgrc(5) - mas tipicamente podem ser usados meramente\n"
+"através do nome do executável."
+
+msgid ""
+"A merge tool is generally usable if its executable can be found on the\n"
+"system and if it can handle the merge. The executable is found if it\n"
+"is an absolute or relative executable path or the name of an\n"
+"application in the executable search path. The tool is assumed to be\n"
+"able to handle the merge if it can handle symlinks if the file is a\n"
+"symlink, if it can handle binary files if the file is binary, and if a\n"
+"GUI is available if the tool requires a GUI."
+msgstr ""
+"Um utilitário de mesclagem pode ser usado se seu executável\n"
+"puder ser encontrado no sistema e se ele puder gerenciar a\n"
+"mesclagem. O executável será encontrado se corresponder a um\n"
+"caminho absoluto ou relativo ou se corresponder ao nome de\n"
+"uma aplicação no caminho de busca de executáveis. Assume-se\n"
+"que o utilitário pode lidar com a mesclagem se ele puder\n"
+"lidar com o tipo especÃfico de arquivo (no caso de links\n"
+"simbólicos ou arquivos binários) e se uma interface\n"
+"gráfica estiver disponÃvel (no caso de utilitários gráficos)."
+
+msgid ""
+"There are some internal merge tools which can be used. The internal\n"
+"merge tools are:"
+msgstr ""
+"Também estão disponÃveis os seguintes utilitários de mesclagem\n"
+"internos:"
+
+msgid ""
+"``internal:merge``\n"
+" Uses the internal non-interactive simple merge algorithm for merging\n"
+" files. It will fail if there are any conflicts and leave markers in\n"
+" the partially merged file."
+msgstr ""
+"``internal:merge``\n"
+" Usa o algoritmo não-interativo interno simples para mesclar arquivos.\n"
+" Se houver qualquer conflito, esse algoritmo falhará, deixando\n"
+" marcadores no arquivo parcialmente mesclado."
+
+msgid ""
+"``internal:fail``\n"
+" Rather than attempting to merge files that were modified on both\n"
+" branches, it marks them as unresolved. The resolve command must be\n"
+" used to resolve these conflicts."
+msgstr ""
+"``internal:fail``\n"
+" Ao invés de tentar mesclar arquivos modificados em ambos os ramos,\n"
+" marca tais arquivos como não resolvidos. O comando resolve deve\n"
+" então ser usado para resolver esses conflitos."
+
+msgid ""
+"``internal:local``\n"
+" Uses the local version of files as the merged version."
+msgstr ""
+"``internal:local``\n"
+" Usa a versão local de arquivos como resultado da mesclagem."
+
+msgid ""
+"``internal:other``\n"
+" Uses the other version of files as the merged version."
+msgstr ""
+"``internal:other``\n"
+" Usa a outra (não local) versão de arquivos como resultado da mesclagem."
+
+msgid ""
+"``internal:prompt``\n"
+" Asks the user which of the local or the other version to keep as\n"
+" the merged version."
+msgstr ""
+"``internal:prompt``\n"
+" Pergunta ao usuário se a versão local ou a outra deve ser usada\n"
+" como resultado da mesclagem."
+
+msgid ""
+"``internal:dump``\n"
+" Creates three versions of the files to merge, containing the\n"
+" contents of local, other and base. These files can then be used to\n"
+" perform a merge manually. If the file to be merged is named\n"
+" ``a.txt``, these files will accordingly be named ``a.txt.local``,\n"
+" ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n"
+" same directory as ``a.txt``."
+msgstr ""
+"``internal:dump``\n"
+" Cria três versões dos arquivos a serem mesclados, com os conteúdos\n"
+" das versões local, outra e base. Estes arquivos podem então ser\n"
+" usados para fazer uma mesclagem manual. Se o arquivo a ser mesclado\n"
+" se chamar ``a.txt``, estes arquivos serão chamados respectivamente\n"
+" ``a.txt.local``, ``a.txt.other`` e ``a.txt.base`` e serão colocados\n"
+" no mesmo diretório de ``a.txt``."
+
+msgid ""
+"Internal tools are always available and do not require a GUI but will by default\n"
+"not handle symlinks or binary files."
+msgstr ""
+"Esses utilitários internos estão sempre disponÃveis e não requerem uma\n"
+"interface gráfica, mas por padrão não lidam com links simbólicos e\n"
+"arquivos binários."
+
+msgid ""
+"Choosing a merge tool\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+"Escolhendo um utilitário de mesclagem\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+
+msgid "Mercurial uses these rules when deciding which merge tool to use:"
+msgstr ""
+"O Mercurial segue as seguintes regras para determinar qual utilitário\n"
+"de mesclagem será usado:"
+
+msgid ""
+"1. If a tool has been specified with the --tool option to merge or resolve, it\n"
+" is used. If it is the name of a tool in the merge-tools configuration, its\n"
+" configuration is used. Otherwise the specified tool must be executable by\n"
+" the shell."
+msgstr ""
+"1. Se um utilitário for especificado pela opção --tool, ele será usado.\n"
+" Se esse for o nome de um utilitário definido na seção de configuração\n"
+" merge-tools, essa configuração será usada; caso contrário, o\n"
+" utilitário especificado deve estar disponÃvel para execução através\n"
+" do shell."
+
+msgid ""
+"2. If the ``HGMERGE`` environment variable is present, its value is used and\n"
+" must be executable by the shell."
+msgstr ""
+"2. Se a variável de ambiente ``HGMERGE`` estiver presente, seu valor será\n"
+" usado; o utilitário especificado deve estar disponÃvel para execução\n"
+" através do shell."
+
+msgid ""
+"3. If the filename of the file to be merged matches any of the patterns in the\n"
+" merge-patterns configuration section, the first usable merge tool\n"
+" corresponding to a matching pattern is used. Here, binary capabilities of the\n"
+" merge tool are not considered."
+msgstr ""
+"3. Se o nome do arquivo a ser mesclado combinar com algum padrão definido\n"
+" na seção de configuração merge-patterns, será usado o primeiro utilitário\n"
+" de mesclagem que corresponda a um desses padrões. Aqui, não é considerada\n"
+" a capacidade do utilitário em lidar com arquivos binários."
+
+msgid ""
+"4. If ui.merge is set it will be considered next. If the value is not the name\n"
+" of a configured tool, the specified value is used and must be executable by\n"
+" the shell. Otherwise the named tool is used if it is usable."
+msgstr ""
+"4. Se ui.merge estiver definida, será utilizada.\n"
+" Se esse for o nome de um utilitário definido na seção de configuração\n"
+" merge-tools, essa configuração será usada; caso contrário, o\n"
+" utilitário especificado deve estar disponÃvel para execução através\n"
+" do shell."
+
+msgid ""
+"5. If any usable merge tools are present in the merge-tools configuration\n"
+" section, the one with the highest priority is used."
+msgstr ""
+"5. Se qualquer utilitário de mesclagem usável estiver presente na seção\n"
+" de configuração merge-tools, será utilizado o de maior prioridade."
+
+msgid ""
+"6. If a program named ``hgmerge`` can be found on the system, it is used - but\n"
+" it will by default not be used for symlinks and binary files."
+msgstr ""
+"6. Se um programa chamado ``hgmerge`` for encontrado no sistema,\n"
+" ele será usado - mas por padrão ele não será usado para\n"
+" links simbólicos e arquivos binários."
+
+msgid ""
+"7. If the file to be merged is not binary and is not a symlink, then\n"
+" ``internal:merge`` is used."
+msgstr ""
+"7. Se o arquivo a ser mesclado não for um link simbólico nem\n"
+" um arquivo binário, ``internal:merge`` será usado."
+
+msgid "8. The merge of the file fails and must be resolved before commit."
+msgstr ""
+"8. A mesclagem falha, e deve ser resolvida manualmente antes da\n"
+" consolidação."
+
+msgid ""
+".. note::\n"
+" After selecting a merge program, Mercurial will by default attempt\n"
+" to merge the files using a simple merge algorithm first. Only if it doesn't\n"
+" succeed because of conflicting changes Mercurial will actually execute the\n"
+" merge program. Whether to use the simple merge algorithm first can be\n"
+" controlled by the premerge setting of the merge tool. Premerge is enabled by\n"
+" default unless the file is binary or a symlink."
+msgstr ""
+".. note::\n"
+" Após selecionar um utilitário de mesclagem, o Mercurial por padrão\n"
+" tentará primeiro mesclar o arquivo usando um algoritmo simples de\n"
+" mesclagem. O utilitário só será usado se o algoritmo simples falhar\n"
+" por existirem mudanças conflitantes. Esse comportamento de\n"
+" pré-mesclagem pode ser controlado através da configuração premerge\n"
+" do utilitário de mesclagem. A pré-mesclagem é habilitada por\n"
+" padrão, a não ser que o arquivo seja binário ou um link simbólico."
+
+msgid ""
+"See the merge-tools and ui sections of hgrc(5) for details on the\n"
+"configuration of merge tools.\n"
+msgstr ""
+"Veja as seções merge-tools e ui sections da página de manual\n"
+"hgrc(5) para detalhes da configuração de utilitários de mesclagem.\n"
+
msgid ""
"When Mercurial accepts more than one revision, they may be specified\n"
"individually, or provided as a topologically continuous range,\n"
@@ -12987,16 +13519,23 @@
"Identifiers such as branch names must be quoted with single or double\n"
"quotes if they contain characters outside of\n"
"``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n"
-"predicates. Special characters can be used in quoted identifiers by\n"
-"escaping them, e.g., ``\\n`` is interpreted as a newline."
+"predicates."
msgstr ""
"Identificadores (como nomes de ramo ou etiquetas) que contenham\n"
"caracteres fora de ``[._a-zA-Z0-9\\x80-\\xff]`` ou que forem\n"
"iguais a algum dos predicados predefinidos devem ser passados\n"
-"entre aspas simples ou duplas.\n"
+"entre aspas simples ou duplas."
+
+msgid ""
+"Special characters can be used in quoted identifiers by escaping them,\n"
+"e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n"
+"interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``."
+msgstr ""
"Dentro de identificadores protegidos por aspas, caracteres\n"
"especiais podem ser especificados usando escapes; por exemplo,\n"
-"``\\n`` é interpretado como uma quebra de linha."
+"``\\n`` é interpretado como uma quebra de linha. Para evitar\n"
+"que eles sejam interpretados dessa maneira, strings podem ser\n"
+"prefixadas por ``r``, como em ``r'...'``."
msgid "There is a single prefix operator:"
msgstr "Há um único operador prefixo:"
@@ -13063,244 +13602,8 @@
msgid "The following predicates are supported:"
msgstr "Os seguintes predicados são suportados:"
-msgid ""
-"``adds(pattern)``\n"
-" Changesets that add a file matching pattern."
-msgstr ""
-"``adds(padrão)``\n"
-" Revisões que adicionam arquivos correspondentes ao padrão."
-
-msgid ""
-"``all()``\n"
-" All changesets, the same as ``0:tip``."
-msgstr ""
-"``all()``\n"
-" Todas as revisões, o mesmo que ``0:tip``."
-
-msgid ""
-"``ancestor(single, single)``\n"
-" Greatest common ancestor of the two changesets."
-msgstr ""
-"``ancestor(revisão, revisão)``\n"
-" Maior ancestral comum das duas revisões."
-
-msgid ""
-"``ancestors(set)``\n"
-" Changesets that are ancestors of a changeset in set."
-msgstr ""
-"``ancestors(conjunto)``\n"
-" Revisões ancestrais de revisões no conjunto."
-
-msgid ""
-"``author(string)``\n"
-" Alias for ``user(string)``."
-msgstr ""
-"``author(string)``\n"
-" Apelido para ``user(string)``."
-
-msgid ""
-"``branch(set)``\n"
-" The branch names are found for changesets in set, and the result is\n"
-" all changesets belonging to one those branches."
-msgstr ""
-"``branch(conjunto)``\n"
-" São determinados todos os nomes de ramo das revisões no conjunto, e o\n"
-" resultado são todas as revisões pertencentes a tais ramos."
-
-msgid ""
-"``children(set)``\n"
-" Child changesets of changesets in set."
-msgstr ""
-"``children(conjunto)``\n"
-" Revisões filhas das revisões no conjunto."
-
-msgid ""
-"``closed()``\n"
-" Changeset is closed."
-msgstr ""
-"``closed()``\n"
-" Revisões fechadas."
-
-msgid ""
-"``contains(pattern)``\n"
-" Revision contains pattern."
-msgstr ""
-"``contains(padrão)``\n"
-" Revisões contendo o padrão."
-
-msgid ""
-"``date(interval)``\n"
-" Changesets within the interval, see :hg:`help dates`."
-msgstr ""
-"``date(intervalo)``\n"
-" Revisões dentro do intervalo de datas, veja :hg:`help dates`."
-
-msgid ""
-"``descendants(set)``\n"
-" Changesets which are decendants of changesets in set."
-msgstr ""
-"``descendants(conjunto)``\n"
-" Revisões descendentes de revisões dentro do conjunto."
-
-msgid ""
-"``file(pattern)``\n"
-" Changesets which manually affected files matching pattern."
-msgstr ""
-"``file(padrão)``\n"
-" Revisões que afetam manualmente arquivos correspondentes ao padrão."
-
-msgid ""
-"``follow()``\n"
-" An alias for ``::.`` (ancestors of the working copy's first parent)."
-msgstr ""
-"``follow()``\n"
-" Um apelido para ``::.`` (ancestrais do primeiro pai da cópia de trabalho)."
-
-msgid ""
-"``grep(regex)``\n"
-" Like ``keyword(string)`` but accepts a regex."
-msgstr ""
-"``grep(regex)``\n"
-" Como ``keyword(string)`` mas aceita uma expressão regular."
-
-msgid ""
-"``head()``\n"
-" Changeset is a head."
-msgstr ""
-"``head()``\n"
-" Revisões de cabeça."
-
-msgid ""
-"``heads(set)``\n"
-" Members of set with no children in set."
-msgstr ""
-"``heads(conjunto)``\n"
-" Membros do conjunto que não tenham filhos no conjunto."
-
-msgid ""
-"``keyword(string)``\n"
-" Search commit message, user name, and names of changed files for\n"
-" string."
-msgstr ""
-"``keyword(string)``\n"
-" Revisões que contenham string na mensagem de consolidação, nome de\n"
-" usuário ou nomes de arquivos modificados."
-
-msgid ""
-"``limit(set, n)``\n"
-" First n members of set."
-msgstr ""
-"``limit(conjunto, n)``\n"
-" Os primeiros n membros do conjunto."
-
-msgid ""
-"``max(set)``\n"
-" Changeset with highest revision number in set."
-msgstr ""
-"``max(conjunto)``\n"
-" Revisão com maior número de revisão no conjunto."
-
-msgid ""
-"``merge()``\n"
-" Changeset is a merge changeset."
-msgstr ""
-"``merge()``\n"
-" Revisões de mesclagem."
-
-msgid ""
-"``modifies(pattern)``\n"
-" Changesets which modify files matching pattern."
-msgstr ""
-"``modifies(padrão)``\n"
-" Revisões que modificam arquivos correspondentes ao padrão."
-
-msgid ""
-"``outgoing([path])``\n"
-" Changesets missing in path."
-msgstr ""
-"``outgoing([caminho])``\n"
-" Revisões que faltam em caminho."
-
-msgid ""
-"``p1(set)``\n"
-" First parent of changesets in set."
-msgstr ""
-"``p1(conjunto)``\n"
-" O primeiro pai das revisões no conjunto."
-
-msgid ""
-"``p2(set)``\n"
-" Second parent of changesets in set."
-msgstr ""
-"``p2(conjunto)``\n"
-" O segundo pai das revisões no conjunto."
-
-msgid ""
-"``parents(set)``\n"
-" The set of all parents for all changesets in set."
-msgstr ""
-"``parents(conjunto)``\n"
-" O conjunto de todos os pais de todas as revisões no conjunto pedido."
-
-msgid ""
-"``removes(pattern)``\n"
-" Changesets which remove files matching pattern."
-msgstr ""
-"``removes(padrão)``\n"
-" Revisões que removem arquivos correspondentes ao padrão."
-
-msgid ""
-"``reverse(set)``\n"
-" Reverse order of set."
-msgstr ""
-"``reverse(set)``\n"
-" Ordem reversa do conjunto."
-
-msgid ""
-"``roots(set)``\n"
-" Changesets with no parent changeset in set."
-msgstr ""
-"``roots(conjunto)``\n"
-" Revisões sem revisões pais no conjunto."
-
-msgid ""
-"``sort(set[, [-]key...])``\n"
-" Sort set by keys. The default sort order is ascending, specify a key\n"
-" as ``-key`` to sort in descending order."
-msgstr ""
-"``sort(conjunto[, [-]chave...])``\n"
-" Ordena conjunto de acordo com as chaves. A ordem padrão é ascendente,\n"
-" especifique uma chave como ``-chave`` para ordem descendente."
-
-msgid " The keys can be:"
-msgstr " As chaves podem ser:"
-
-msgid ""
-" - ``rev`` for the revision number,\n"
-" - ``branch`` for the branch name,\n"
-" - ``desc`` for the commit message (description),\n"
-" - ``user`` for user name (``author`` can be used as an alias),\n"
-" - ``date`` for the commit date"
-msgstr ""
-" - ``rev`` para o número de revisão,\n"
-" - ``branch`` para o nome do ramo,\n"
-" - ``desc`` para a mensagem de consolidação (descrição),\n"
-" - ``user`` para o nome do usuário (``author`` também pode ser usado),\n"
-" - ``date`` para a data de consolidação"
-
-msgid ""
-"``tagged()``\n"
-" Changeset is tagged."
-msgstr ""
-"``tagged()``\n"
-" A revisão é etiquetada."
-
-msgid ""
-"``user(string)``\n"
-" User name is string."
-msgstr ""
-"``user(texto)``\n"
-" O nome do usuário é texto."
+msgid ".. predicatesmarker"
+msgstr ".. predicatesmarker"
msgid "Command line equivalents for :hg:`log`::"
msgstr "Opções de linha de comando equivalentes para :hg:`log`::"
@@ -13324,21 +13627,353 @@
" -P x -> !::x\n"
" -l x -> limit(expr, x)"
-msgid "Some sample queries::"
-msgstr "Alguns exemplos de consultas::"
-
-msgid ""
-" hg log -r 'branch(default)'\n"
-" hg log -r 'branch(default) and 1.5:: and not merge()'\n"
-" hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n"
-" hg log -r 'sort(date(\"May 2008\"), user)'\n"
-" hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n"
-msgstr ""
-" hg log -r 'branch(default)'\n"
-" hg log -r 'branch(default) and 1.5:: and not merge()'\n"
-" hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n"
-" hg log -r 'sort(date(\"May 2008\"), user)'\n"
-" hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n"
+msgid "Some sample queries:"
+msgstr "Alguns exemplos de consultas:"
+
+msgid "- Changesets on the default branch::"
+msgstr "- Revisões no ramo default::"
+
+msgid " hg log -r \"branch(default)\""
+msgstr " hg log -r \"branch(default)\""
+
+msgid "- Changesets on the default branch since tag 1.5 (excluding merges)::"
+msgstr ""
+"- Revisões no ramo default desde a etiqueta tag 1.5, excluindo\n"
+" mesclagens::"
+
+msgid " hg log -r \"branch(default) and 1.5:: and not merge()\""
+msgstr " hg log -r \"branch(default) and 1.5:: and not merge()\""
+
+msgid "- Open branch heads::"
+msgstr "- Cabeças de ramo abertas::"
+
+msgid " hg log -r \"head() and not closed()\""
+msgstr " hg log -r \"head() and not closed()\""
+
+msgid ""
+"- Changesets between tags 1.3 and 1.5 mentioning \"bug\" that affect\n"
+" ``hgext/*``::"
+msgstr ""
+"- Revisões entre as etiquetas 1.3 e 1.5 mencionando \"bug\" e que\n"
+" afetam ``hgext/*``::"
+
+msgid " hg log -r \"1.3::1.5 and keyword(bug) and file('hgext/*')\""
+msgstr " hg log -r \"1.3::1.5 and keyword(bug) and file('hgext/*')\""
+
+msgid "- Changesets in committed May 2008, sorted by user::"
+msgstr "- Revisões consolidadas em maio de 2008, ordenadas por autor::"
+
+msgid " hg log -r \"sort(date('May 2008'), user)\""
+msgstr " hg log -r \"sort(date('May 2008'), user)\""
+
+msgid ""
+"- Changesets mentioning \"bug\" or \"issue\" that are not in a tagged\n"
+" release::"
+msgstr ""
+"- Revisões mencionando \"bug\" ou \"issue\" que não descendem\n"
+" de revisões etiquetadas::"
+
+msgid " hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged())\"\n"
+msgstr " hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged())\"\n"
+
+msgid ""
+"Subrepositories let you nest external repositories or projects into a\n"
+"parent Mercurial repository, and make commands operate on them as a\n"
+"group. External Mercurial and Subversion projects are currently\n"
+"supported."
+msgstr ""
+"O suporte a sub-repositórios possibilita o aninhamento de\n"
+"repositórios externos ou projetos em um repositório pai do\n"
+"Mercurial, fornecendo suporte para a operação de diversos\n"
+"comandos no conjunto como um todo. No momento são suportados\n"
+"repositórios externos do Mercurial e do Subversion."
+
+msgid "Subrepositories are made of three components:"
+msgstr "Sub-repositórios são constituÃdos de três componentes:"
+
+msgid ""
+"1. Nested repository checkouts. They can appear anywhere in the\n"
+" parent working directory, and are Mercurial clones or Subversion\n"
+" checkouts."
+msgstr ""
+"1. Cópias locais aninhadas. São clones do Mercurial ou checkouts\n"
+" do Subversion, e podem aparecer em qualquer ponto do diretório\n"
+" de trabalho pai."
+
+msgid ""
+"2. Nested repository references. They are defined in ``.hgsub`` and\n"
+" tell where the subrepository checkouts come from. Mercurial\n"
+" subrepositories are referenced like:"
+msgstr ""
+"2. Referências a repositórios aninhados. São definidos no\n"
+" arquivo ``.hgsub`` e informam ao Mercurial de onde as cópias\n"
+" locais devem ser obtidas. Sub-repositórios do Mercurial são\n"
+" referenciados da seguinte maneira:"
+
+msgid " path/to/nested = https://example.com/nested/repo/path"
+msgstr " caminho/aninhado = https://exemplo.com/aninhado/repo/caminho"
+
+msgid ""
+" where ``path/to/nested`` is the checkout location relatively to the\n"
+" parent Mercurial root, and ``https://example.com/nested/repo/path``\n"
+" is the source repository path. The source can also reference a\n"
+" filesystem path. Subversion repositories are defined with:"
+msgstr ""
+" onde ``caminho/aninhado`` é a localização da cópia local relativa\n"
+" à raiz do repositório pai do Mercurial, e\n"
+" ``https://exemplo.com/aninhado/repo/caminho`` é o caminho do\n"
+" repositório de origem. A origem também pode ser um caminho no\n"
+" sistema de arquivos. Sub-repositórios do Subversion são definidos\n"
+" com:"
+
+msgid " path/to/nested = [svn]https://example.com/nested/trunk/path"
+msgstr " caminho/aninhado = [svn]https://exemplo.com/aninhado/trunk/caminho"
+
+msgid ""
+" Note that ``.hgsub`` does not exist by default in Mercurial\n"
+" repositories, you have to create and add it to the parent\n"
+" repository before using subrepositories."
+msgstr ""
+" Note que ``.hgsub`` não é criado por padrão em repositórios\n"
+" do Mercurial; você deve criá-lo e adicioná-lo manualmente ao\n"
+" repositório pai para poder usar sub-repositórios."
+
+msgid ""
+"3. Nested repository states. They are defined in ``.hgsubstate`` and\n"
+" capture whatever information is required to restore the\n"
+" subrepositories to the state they were committed in a parent\n"
+" repository changeset. Mercurial automatically record the nested\n"
+" repositories states when committing in the parent repository."
+msgstr ""
+"3. Os estados dos repositórios aninhados. Eles são definidos no\n"
+" arquivo ``.hgsubstate`` e capturam quaisquer informações\n"
+" necessárias para restaurar os sub-repositórios para o estado\n"
+" com o qual foram consolidados na revisão do repositório pai.\n"
+" O Mercurial grava esses estados automaticamente durante uma\n"
+" consolidação do repositório pai."
+
+msgid ""
+" .. note::\n"
+" The ``.hgsubstate`` file should not be edited manually."
+msgstr ""
+" .. note::\n"
+" O arquivo ``.hgsubstate`` não deve ser editado manualmente."
+
+msgid ""
+"\n"
+"Adding a Subrepository\n"
+"----------------------"
+msgstr ""
+"\n"
+"Como Adicionar um Sub-Repositório\n"
+"---------------------------------"
+
+msgid ""
+"If ``.hgsub`` does not exist, create it and add it to the parent\n"
+"repository. Clone or checkout the external projects where you want it\n"
+"to live in the parent repository. Edit ``.hgsub`` and add the\n"
+"subrepository entry as described above. At this point, the\n"
+"subrepository is tracked and the next commit will record its state in\n"
+"``.hgsubstate`` and bind it to the committed changeset."
+msgstr ""
+"Se ``.hgsub`` não existir, crie-o e adicione-o ao repositório\n"
+"pai. Clone ou faça um checkout dos projetos externos que você\n"
+"deseje adicionar como sub-repositórios ao repositório pai.\n"
+"Edite ``.hgsub`` e adicione as entradas de sub-repositórios\n"
+"como descritas acima. Neste ponto, o sub-repositório passa a\n"
+"ser rastreado e a próxima consolidação gravará seu estado\n"
+"em ``.hgsubstate`` e o associará à revisão consolidada."
+
+msgid ""
+"Synchronizing a Subrepository\n"
+"-----------------------------"
+msgstr ""
+"Como Sincronizar um Sub-Repositório\n"
+"-----------------------------------"
+
+msgid ""
+"Subrepos do not automatically track the latest changeset of their\n"
+"sources. Instead, they are updated to the changeset that corresponds\n"
+"with the changeset checked out in the top-level changeset. This is so\n"
+"developers always get a consistent set of compatible code and\n"
+"libraries when they update."
+msgstr ""
+"Sub-repositórios não rastreiam automaticamente as últimas\n"
+"mudanças de suas respectivas origens. Ao invés disso, eles são\n"
+"atualizados para a revisão correspondente à revisão atual do\n"
+"repositório pai. Isso é feito para que os desenvolvedores\n"
+"sempre recebam um conjunto consistente e compatÃvel de código\n"
+"e bibliotecas ao atualizar para uma revisão qualquer."
+
+msgid ""
+"Thus, updating subrepos is a manual process. Simply check out target\n"
+"subrepo at the desired revision, test in the top-level repo, then\n"
+"commit in the parent repository to record the new combination."
+msgstr ""
+"Ou seja, a atualização de sub-repositórios é um processo manual.\n"
+"Basta atualizar o sub-repositório em questão para a revisão\n"
+"desejada, testar no repositório pai, e consolidar no repositório\n"
+"pai para que a nova combinação seja gravada."
+
+msgid ""
+"Deleting a Subrepository\n"
+"------------------------"
+msgstr ""
+"Como Remover um Sub-Repositório\n"
+"-------------------------------"
+
+msgid ""
+"To remove a subrepository from the parent repository, delete its\n"
+"reference from ``.hgsub``, then remove its files."
+msgstr ""
+"Para remover a associação de um sub-repositório com seu repositório\n"
+"pai, remova a referência correspondente do arquivo ``.hgsub``, e\n"
+"em seguida apague manualmente seus arquivos."
+
+msgid ""
+"Interaction with Mercurial Commands\n"
+"-----------------------------------"
+msgstr ""
+"Interação com comandos do Mercurial\n"
+"-----------------------------------"
+
+msgid ""
+":add: add does not recurse in subrepos unless -S/--subrepos is\n"
+" specified. Subversion subrepositories are currently silently\n"
+" ignored."
+msgstr ""
+":add: add não é executado recursivamente em sub-repositórios, a não\n"
+" ser que -S/--subrepos seja especificado. Sub-repositórios do\n"
+" Subversion são no momento silenciosamente ignorados."
+
+msgid ""
+":archive: archive does not recurse in subrepositories unless\n"
+" -S/--subrepos is specified."
+msgstr ""
+":archive: archive não é executado recursivamente em sub-repositórios, a não\n"
+" ser que -S/--subrepos seja especificado."
+
+msgid ""
+":commit: commit creates a consistent snapshot of the state of the\n"
+" entire project and its subrepositories. It does this by first\n"
+" attempting to commit all modified subrepositories, then recording\n"
+" their state and finally committing it in the parent repository."
+msgstr ""
+":commit: commit cria uma referência consistente do estado do\n"
+" projeto e seus sub-repositórios como um todo. Ele primeiro\n"
+" tenta consolidar cada sub-repositório modificado; em seguida,\n"
+" grava seus estados; por fim, consolida esses estados no\n"
+" repositório pai (junto com eventuais modificações do próprio\n"
+" repositório pai)."
+
+msgid ""
+":diff: diff does not recurse in subrepos unless -S/--subrepos is\n"
+" specified. Changes are displayed as usual, on the subrepositories\n"
+" elements. Subversion subrepositories are currently silently\n"
+" ignored."
+msgstr ""
+":diff: diff não é executado recursivamente em sub-repositórios, a não\n"
+" ser que -S/--subrepos seja especificado. As mudanças são exibidas\n"
+" normalmente nos sub-repositórios do Mercurial. Sub-repositórios do\n"
+" Subversion são no momento silenciosamente ignorados."
+
+msgid ""
+":incoming: incoming does not recurse in subrepos unless -S/--subrepos\n"
+" is specified. Subversion subrepositories are currently silently\n"
+" ignored."
+msgstr ""
+":incoming: incoming não é executado recursivamente em\n"
+" sub-repositórios, a não ser que -S/--subrepos seja\n"
+" especificado.\n"
+" Sub-repositórios do Subversion são no momento\n"
+" silenciosamente ignorados."
+
+msgid ""
+":outgoing: outgoing does not recurse in subrepos unless -S/--subrepos\n"
+" is specified. Subversion subrepositories are currently silently\n"
+" ignored."
+msgstr ""
+":outgoing: outgoing não é executado recursivamente em\n"
+" sub-repositórios, a não ser que -S/--subrepos seja\n"
+" especificado.\n"
+" Sub-repositórios do Subversion são no momento\n"
+" silenciosamente ignorados."
+
+msgid ""
+":pull: pull is not recursive since it is not clear what to pull prior\n"
+" to running :hg:`update`. Listing and retrieving all\n"
+" subrepositories changes referenced by the parent repository pulled\n"
+" changesets is expensive at best, impossible in the Subversion\n"
+" case."
+msgstr ""
+":pull: pull não é recursivo, já que não se sabe quais revisões\n"
+" devem ser trazidas antes da execução de :hg:`update`. Listar\n"
+" e obter todas as mudanças em sub-repositórios referenciadas\n"
+" pelas revisões trazidas para o repositório pai é na melhor\n"
+" das hipóteses uma operação cara, e impossÃvel no caso de\n"
+" sub-repositórios do Subversion."
+
+msgid ""
+":push: Mercurial will automatically push all subrepositories first\n"
+" when the parent repository is being pushed. This ensures new\n"
+" subrepository changes are available when referenced by top-level\n"
+" repositories."
+msgstr ""
+":push: O Mercurial irá automaticamente executar push em\n"
+" todos os sub-repositórios ao realizar um push no repositório\n"
+" pai. Isto garante que novas mudanças em sub-repositórios\n"
+" estejam disponÃveis quando referenciadas por repositórios\n"
+" pais."
+
+msgid ""
+":status: status does not recurse into subrepositories unless\n"
+" -S/--subrepos is specified. Subrepository changes are displayed as\n"
+" regular Mercurial changes on the subrepository\n"
+" elements. Subversion subrepositories are currently silently\n"
+" ignored."
+msgstr ""
+":status: status não é executado recursivamente em\n"
+" sub-repositórios, a não ser que -S/--subrepos seja\n"
+" especificado.\n"
+" Mudanças em sub-repositórios são exibidas como mudanças\n"
+" comuns do Mercurial em cada sub-repositório.\n"
+" Sub-repositórios do Subversion são no momento\n"
+" silenciosamente ignorados."
+
+msgid ""
+":update: update restores the subrepos in the state they were\n"
+" originally committed in target changeset. If the recorded\n"
+" changeset is not available in the current subrepository, Mercurial\n"
+" will pull it in first before updating. This means that updating\n"
+" can require network access when using subrepositories."
+msgstr ""
+":update: update restaura cada sub-repositório para seu estado\n"
+" correspondente gravado pela revisão alvo. Se nesse momento a\n"
+" revisão gravada não estiver disponÃvel no sub-repositório,\n"
+" o Mercurial executará o pull dessa revisão antes de atualizar.\n"
+" Isto quer dizer que o comando update pode exigir acesso à rede\n"
+" caso sub-repositórios sejam usados."
+
+msgid ""
+"Remapping Subrepositories Sources\n"
+"---------------------------------"
+msgstr ""
+"Remapeando Origens de Sub-Repositórios\n"
+"--------------------------------------"
+
+msgid ""
+"A subrepository source location may change during a project life,\n"
+"invalidating references stored in the parent repository history. To\n"
+"fix this, rewriting rules can be defined in parent repository ``hgrc``\n"
+"file or in Mercurial configuration. See the ``[subpaths]`` section in\n"
+"hgrc(5) for more details."
+msgstr ""
+"A localização de origem de um sub-repositório pode mudar\n"
+"durante a vida de um projeto, invalidando as referências\n"
+"guardadas no histórico do repositório pai. Para corrigir\n"
+"isso, regras de reescrita podem ser definidas no arquivo\n"
+"``hgrc`` do repositório pai ou na configuração do Mercurial.\n"
+"Veja a seção ``[subpaths]`` em hgrc(5) para mais detalhes."
msgid ""
"Mercurial allows you to customize output of commands through\n"
@@ -13406,6 +14041,9 @@
":branches: String. O nome do ramo no qual a revisão foi\n"
" consolidada. Será vazio se o nome do ramo for default."
+msgid ":children: List of strings. The children of the changeset."
+msgstr ":children: Lista de strings. As revisões filhas da revisão."
+
msgid ":date: Date information. The date when the changeset was committed."
msgstr ":date: Informação de data. A data de consolidação da revisão."
@@ -13450,11 +14088,11 @@
msgstr ":file_dels: Lista de strings. Arquivos removidos por esta revisão."
msgid ""
-":node: String. The changeset identification hash, as a 40-character\n"
-" hexadecimal string."
+":node: String. The changeset identification hash, as a 40 hexadecimal\n"
+" digit string."
msgstr ""
":node: String. O hash de identificação da revisão, como uma string\n"
-" hexadecimal de 40 caracteres."
+" hexadecimal de 40 dÃgitos."
msgid ":parents: List of strings. The parents of the changeset."
msgstr ":parents: Lista de strings. Os pais da revisão."
@@ -13570,6 +14208,13 @@
":escape: Qualquer texto. Substitui os caracteres especiais\n"
" XML/XHTML \"&\", \"<\" e \">\" por entidades XML."
+msgid ""
+":hex: Any text. Convert a binary Mercurial node identifier into\n"
+" its long hexadecimal representation."
+msgstr ""
+":hex: Qualquer texto. Converte um identificador de nó binário do\n"
+" Mercurial em sua representação longa hexadecimal."
+
msgid ":fill68: Any text. Wraps the text to fit in 68 columns."
msgstr ""
":fill68: Qualquer texto. Quebra o texto para caber em 68\n"
@@ -13641,10 +14286,10 @@
msgid ""
":short: Changeset hash. Returns the short form of a changeset hash,\n"
-" i.e. a 12-byte hexadecimal string."
+" i.e. a 12 hexadecimal digit string."
msgstr ""
":short: Hash da revisão. Devolve a forma curta do hash de\n"
-" uma revisão, ou seja, uma string hexadecimal de 12 bytes."
+" uma revisão, ou seja, uma string hexadecimal de 12 dÃgitos."
msgid ":shortdate: Date. Returns a date like \"2006-09-18\"."
msgstr ":shortdate: Data. Devolve uma data como \"2006-09-18\"."
@@ -13880,8 +14525,8 @@
msgid "use 'hg resolve' to retry unresolved file merges\n"
msgstr "use 'hg resolve' para mesclar novamente arquivos não resolvidos\n"
-msgid "use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon\n"
-msgstr "use 'hg resolve' para mesclar novamente arquivos não resolvidos ou 'hg update -C' para abandonar\n"
+msgid "use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon\n"
+msgstr "use 'hg resolve' para mesclar novamente arquivos não resolvidos ou 'hg update -C .' para abandonar\n"
msgid "(branch merge, don't forget to commit)\n"
msgstr "(mesclagem de ramo, não esqueça de consolidar)\n"
@@ -13998,21 +14643,6 @@
msgid "'%s' uses newer protocol %s"
msgstr "'%s' usa protocolo mais novo %s"
-msgid "look up remote revision"
-msgstr "procurar revisão remota"
-
-msgid "unexpected response:"
-msgstr "resposta inesperada:"
-
-msgid "look up remote changes"
-msgstr "procurar mudanças remotas"
-
-msgid "push failed (unexpected response):"
-msgstr "o push falhou (resposta inesperada):"
-
-msgid "remote: "
-msgstr "remoto: "
-
#, python-format
msgid "push failed: %s"
msgstr "o push falhou: %s"
@@ -14164,9 +14794,6 @@
msgid "adding changesets\n"
msgstr "adicionando revisões\n"
-msgid "changesets"
-msgstr "revisões"
-
msgid "received changelog group is empty"
msgstr "grupo de changelogs recebido é vazio"
@@ -14341,8 +14968,8 @@
msgstr "obtendo %s para %s\n"
#, python-format
-msgid "warning: detected divergent renames of %s to:\n"
-msgstr "aviso: detectadas renomeações divergentes de %s para:\n"
+msgid "note: possible conflict - %s was renamed multiple times to:\n"
+msgstr "nota: possÃvel conflito - %s foi renomeado múltiplas vezes para:\n"
#, python-format
msgid "branch %s not found"
@@ -14357,11 +14984,38 @@
msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
msgstr "alterações não consolidadas pendentes (use 'hg status' para listar as mudanças)"
-msgid "crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)"
-msgstr "atravessa ramos (use 'hg merge' para mesclar ou 'hg update -C' para descartar mudanças)"
-
-msgid "crosses branches (use 'hg merge' or use 'hg update -c')"
-msgstr "atravessa ramos (use 'hg merge' ou 'hg update -c')"
+msgid "crosses branches (merge branches or use --clean to discard changes)"
+msgstr "atravessa ramos (mescle os ramos ou use --clean para descartar mudanças)"
+
+msgid "crosses branches (merge branches or use --check to force update)"
+msgstr "atravessa ramos (mescle os ramos ou use --check para forçar a atualização)"
+
+msgid "Attention:"
+msgstr "Atenção:"
+
+msgid "Caution:"
+msgstr "Cuidado:"
+
+msgid "!Danger!"
+msgstr "!Perigo!"
+
+msgid "Error:"
+msgstr "Erro:"
+
+msgid "Hint:"
+msgstr "Dica:"
+
+msgid "Important:"
+msgstr "Importante:"
+
+msgid "Note:"
+msgstr "Nota:"
+
+msgid "Tip:"
+msgstr "Tip:"
+
+msgid "Warning!"
+msgstr "Aviso!"
#, python-format
msgid "cannot create %s: destination already exists"
@@ -14441,14 +15095,8 @@
msgid "unsupported line endings type: %s"
msgstr "tipo de quebra de linha não suportado: %s"
-msgid ""
-"internal patcher failed\n"
-"please report details to http://mercurial.selenic.com/bts/\n"
-"or mercurial@selenic.com\n"
-msgstr ""
-"falha do sistema interno de patches\n"
-"por favor informe esse erro em http://mercurial.selenic.com/bts/\n"
-"ou mercurial@selenic.com\n"
+msgid "patch failed to apply"
+msgstr "aplicação do patch falhou"
#, python-format
msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
@@ -14521,12 +15169,12 @@
msgid "%s not found in the transaction"
msgstr "%s não encontrado na transação"
+msgid "consistency error in delta"
+msgstr "erro de consistência no delta"
+
msgid "unknown base"
msgstr "base desconhecida"
-msgid "consistency error adding group"
-msgstr "erro de consistência adicionando grupo"
-
msgid "unterminated string"
msgstr "string não terminada"
@@ -14547,65 +15195,340 @@
msgid "not a function: %s"
msgstr "não é uma função: %s"
-msgid "limit wants two arguments"
-msgstr "limit exige dois argumentos"
-
-msgid "limit wants a number"
-msgstr "limit exige um número"
-
+msgid ""
+"``id(string)``\n"
+" Revision non-ambiguously specified by the given hex string prefix."
+msgstr ""
+"``id(string)``\n"
+" Revisão especificada de modo não ambÃguo pelo\n"
+" prefixo hexadecimal fornecido em string."
+
+#. i18n: "id" is a keyword
+msgid "id requires one argument"
+msgstr "id requer um argumento"
+
+#. i18n: "id" is a keyword
+msgid "id requires a string"
+msgstr "id requer uma string"
+
+msgid ""
+"``rev(number)``\n"
+" Revision with the given numeric identifier."
+msgstr ""
+"``rev(number)``\n"
+" Revisão com o identificador numérico dado."
+
+#. i18n: "rev" is a keyword
+msgid "rev requires one argument"
+msgstr "rev requer um argumento"
+
+#. i18n: "rev" is a keyword
+msgid "rev requires a number"
+msgstr "rev requer um número"
+
+#. i18n: "rev" is a keyword
+msgid "rev expects a number"
+msgstr "rev espera um número"
+
+msgid ""
+"``p1(set)``\n"
+" First parent of changesets in set."
+msgstr ""
+"``p1(conjunto)``\n"
+" O primeiro pai das revisões no conjunto."
+
+msgid ""
+"``p2(set)``\n"
+" Second parent of changesets in set."
+msgstr ""
+"``p2(conjunto)``\n"
+" O segundo pai das revisões no conjunto."
+
+msgid ""
+"``parents(set)``\n"
+" The set of all parents for all changesets in set."
+msgstr ""
+"``parents(conjunto)``\n"
+" O conjunto de todos os pais de todas as revisões no conjunto pedido."
+
+msgid ""
+"``max(set)``\n"
+" Changeset with highest revision number in set."
+msgstr ""
+"``max(conjunto)``\n"
+" Revisão com maior número de revisão no conjunto."
+
+msgid ""
+"``min(set)``\n"
+" Changeset with lowest revision number in set."
+msgstr ""
+"``min(conjunto)``\n"
+" Revisão com menor número de revisão no conjunto."
+
+msgid ""
+"``limit(set, n)``\n"
+" First n members of set."
+msgstr ""
+"``limit(conjunto, n)``\n"
+" Os primeiros n membros do conjunto."
+
+#. i18n: "limit" is a keyword
+msgid "limit requires two arguments"
+msgstr "limit requer dois argumentos"
+
+#. i18n: "limit" is a keyword
+msgid "limit requires a number"
+msgstr "limit requer um número"
+
+#. i18n: "limit" is a keyword
msgid "limit expects a number"
-msgstr "limit exige um número"
-
-msgid "ancestor wants two arguments"
-msgstr "ancestor exige dois argumentos"
-
+msgstr "limit espera um número"
+
+msgid ""
+"``children(set)``\n"
+" Child changesets of changesets in set."
+msgstr ""
+"``children(conjunto)``\n"
+" Revisões filhas das revisões no conjunto."
+
+msgid ""
+"``branch(set)``\n"
+" All changesets belonging to the branches of changesets in set."
+msgstr ""
+"``branch(conjunto)``\n"
+" Todas as revisões pertencentes aos ramos de revisões no conjunto."
+
+msgid ""
+"``ancestor(single, single)``\n"
+" Greatest common ancestor of the two changesets."
+msgstr ""
+"``ancestor(revisão, revisão)``\n"
+" Maior ancestral comum das duas revisões."
+
+#. i18n: "ancestor" is a keyword
+msgid "ancestor requires two arguments"
+msgstr "ancestor requer dois argumentos"
+
+#. i18n: "ancestor" is a keyword
msgid "ancestor arguments must be single revisions"
msgstr "os argumentos de ancestor devem ser revisões únicas"
+msgid ""
+"``ancestors(set)``\n"
+" Changesets that are ancestors of a changeset in set."
+msgstr ""
+"``ancestors(conjunto)``\n"
+" Revisões ancestrais de revisões no conjunto."
+
+msgid ""
+"``descendants(set)``\n"
+" Changesets which are descendants of changesets in set."
+msgstr ""
+"``descendants(conjunto)``\n"
+" Todas as revisões descendentes de revisões do conjunto."
+
+msgid ""
+"``follow()``\n"
+" An alias for ``::.`` (ancestors of the working copy's first parent)."
+msgstr ""
+"``follow()``\n"
+" Um apelido para ``::.`` (ancestrais do primeiro pai da cópia de trabalho)."
+
+#. i18n: "follow" is a keyword
msgid "follow takes no arguments"
msgstr "follow não tem argumentos"
-msgid "date wants a string"
-msgstr "date exige uma string"
-
-msgid "keyword wants a string"
-msgstr "keyword exige uma string"
-
-msgid "grep wants a string"
-msgstr "grep exige uma string"
+msgid ""
+"``date(interval)``\n"
+" Changesets within the interval, see :hg:`help dates`."
+msgstr ""
+"``date(intervalo)``\n"
+" Revisões dentro do intervalo de datas, veja :hg:`help dates`."
+
+#. i18n: "date" is a keyword
+msgid "date requires a string"
+msgstr "date requer uma string"
+
+msgid ""
+"``keyword(string)``\n"
+" Search commit message, user name, and names of changed files for\n"
+" string."
+msgstr ""
+"``keyword(string)``\n"
+" Revisões que contenham string na mensagem de consolidação, nome de\n"
+" usuário ou nomes de arquivos modificados."
+
+#. i18n: "keyword" is a keyword
+msgid "keyword requires a string"
+msgstr "keyword requer uma string"
+
+msgid ""
+"``grep(regex)``\n"
+" Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``\n"
+" to ensure special escape characters are handled correctly."
+msgstr ""
+"``grep(regex)``\n"
+" Como ``keyword(string)`` mas aceita uma expressão regular. Use\n"
+" ``grep(r'...')`` para garantir que caracteres especiais sejam\n"
+" manipulados corretamente."
+
+#. i18n: "grep" is a keyword
+msgid "grep requires a string"
+msgstr "grep requer uma string"
#, python-format
msgid "invalid match pattern: %s"
msgstr "padrão de busca inválido: %s"
-msgid "author wants a string"
-msgstr "author exige uma string"
-
-msgid "file wants a pattern"
-msgstr "file exige um padrão"
-
-msgid "contains wants a pattern"
-msgstr "contains exige um padrão"
-
-msgid "modifies wants a pattern"
-msgstr "modifies exige um padrão"
-
-msgid "adds wants a pattern"
-msgstr "adds exige um padrão"
-
-msgid "removes wants a pattern"
-msgstr "removes exige um padrão"
-
+msgid ""
+"``author(string)``\n"
+" Alias for ``user(string)``."
+msgstr ""
+"``author(string)``\n"
+" Apelido para ``user(string)``."
+
+#. i18n: "author" is a keyword
+msgid "author requires a string"
+msgstr "author requer uma string"
+
+msgid ""
+"``user(string)``\n"
+" User name is string."
+msgstr ""
+"``user(texto)``\n"
+" O nome do usuário é texto."
+
+msgid ""
+"``file(pattern)``\n"
+" Changesets affecting files matched by pattern."
+msgstr ""
+"``file(padrão)``\n"
+" Revisões que afetam arquivos correspondentes ao padrão."
+
+#. i18n: "file" is a keyword
+msgid "file requires a pattern"
+msgstr "file requer um padrão"
+
+msgid ""
+"``contains(pattern)``\n"
+" Revision contains pattern."
+msgstr ""
+"``contains(padrão)``\n"
+" Revisões contendo o padrão."
+
+#. i18n: "contains" is a keyword
+msgid "contains requires a pattern"
+msgstr "contains requer um padrão"
+
+msgid ""
+"``modifies(pattern)``\n"
+" Changesets modifying files matched by pattern."
+msgstr ""
+"``modifies(padrão)``\n"
+" Revisões que modificam arquivos correspondentes ao padrão."
+
+#. i18n: "modifies" is a keyword
+msgid "modifies requires a pattern"
+msgstr "modifies requer um padrão"
+
+msgid ""
+"``adds(pattern)``\n"
+" Changesets that add a file matching pattern."
+msgstr ""
+"``adds(padrão)``\n"
+" Revisões que adicionam arquivos correspondentes ao padrão."
+
+#. i18n: "adds" is a keyword
+msgid "adds requires a pattern"
+msgstr "adds requer um padrão"
+
+msgid ""
+"``removes(pattern)``\n"
+" Changesets which remove files matching pattern."
+msgstr ""
+"``removes(padrão)``\n"
+" Revisões que removem arquivos correspondentes ao padrão."
+
+#. i18n: "removes" is a keyword
+msgid "removes requires a pattern"
+msgstr "removes requer um padrão"
+
+msgid ""
+"``merge()``\n"
+" Changeset is a merge changeset."
+msgstr ""
+"``merge()``\n"
+" Revisões de mesclagem."
+
+#. i18n: "merge" is a keyword
msgid "merge takes no arguments"
msgstr "merge não tem argumentos"
+msgid ""
+"``closed()``\n"
+" Changeset is closed."
+msgstr ""
+"``closed()``\n"
+" Revisões fechadas."
+
+#. i18n: "closed" is a keyword
msgid "closed takes no arguments"
msgstr "closed não tem argumentos"
+msgid ""
+"``head()``\n"
+" Changeset is a named branch head."
+msgstr ""
+"``head()``\n"
+" Revisões que forem cabeças de ramos nomeados."
+
+#. i18n: "head" is a keyword
msgid "head takes no arguments"
-msgstr "head não tem argumentos"
-
-msgid "sort wants one or two arguments"
+msgstr "head não tem argumentos"
+
+msgid ""
+"``reverse(set)``\n"
+" Reverse order of set."
+msgstr ""
+"``reverse(set)``\n"
+" Ordem reversa do conjunto."
+
+msgid ""
+"``present(set)``\n"
+" An empty set, if any revision in set isn't found; otherwise,\n"
+" all revisions in set."
+msgstr ""
+"``present(set)``\n"
+" Um conjunto vazio, se qualquer revisão no conjunto pedido não for\n"
+" encontrada; caso contrário, todas as revisões no conjunto pedido."
+
+msgid ""
+"``sort(set[, [-]key...])``\n"
+" Sort set by keys. The default sort order is ascending, specify a key\n"
+" as ``-key`` to sort in descending order."
+msgstr ""
+"``sort(conjunto[, [-]chave...])``\n"
+" Ordena conjunto de acordo com as chaves. A ordem padrão é ascendente,\n"
+" especifique uma chave como ``-chave`` para ordem descendente."
+
+msgid " The keys can be:"
+msgstr " As chaves podem ser:"
+
+msgid ""
+" - ``rev`` for the revision number,\n"
+" - ``branch`` for the branch name,\n"
+" - ``desc`` for the commit message (description),\n"
+" - ``user`` for user name (``author`` can be used as an alias),\n"
+" - ``date`` for the commit date"
+msgstr ""
+" - ``rev`` para o número de revisão,\n"
+" - ``branch`` para o nome do ramo,\n"
+" - ``desc`` para a mensagem de consolidação (descrição),\n"
+" - ``user`` para o nome do usuário (``author`` também pode ser usado),\n"
+" - ``date`` para a data de consolidação"
+
+#. i18n: "sort" is a keyword
+msgid "sort requires one or two arguments"
msgstr "sort exige um ou dois argumentos"
msgid "sort spec must be a string"
@@ -14615,14 +15538,60 @@
msgid "unknown sort key %r"
msgstr "especificação de ordenação desconhecida: %r"
+msgid ""
+"``all()``\n"
+" All changesets, the same as ``0:tip``."
+msgstr ""
+"``all()``\n"
+" Todas as revisões, o mesmo que ``0:tip``."
+
+#. i18n: "all" is a keyword
msgid "all takes no arguments"
msgstr "all não tem argumentos"
-msgid "outgoing wants a repository path"
+msgid ""
+"``heads(set)``\n"
+" Members of set with no children in set."
+msgstr ""
+"``heads(conjunto)``\n"
+" Membros do conjunto que não tenham filhos no conjunto."
+
+msgid ""
+"``roots(set)``\n"
+" Changesets with no parent changeset in set."
+msgstr ""
+"``roots(conjunto)``\n"
+" Revisões sem revisões pais no conjunto."
+
+msgid ""
+"``outgoing([path])``\n"
+" Changesets not found in the specified destination repository, or the\n"
+" default push location."
+msgstr ""
+"``outgoing([caminho])``\n"
+" Revisões não encontradas no repositório de destino\n"
+" especificado pelo caminho ou na localização padrão de push."
+
+#. i18n: "outgoing" is a keyword
+msgid "outgoing requires a repository path"
msgstr "outgoing exige um caminho para um repositório"
-msgid "tagged takes no arguments"
-msgstr "tagged não tem argumentos"
+msgid ""
+"``tag(name)``\n"
+" The specified tag by name, or all tagged revisions if no name is given."
+msgstr ""
+"``tag(nome)``\n"
+" Se nome for dado, a revisão correspondente à etiqueta\n"
+" especificada por nome; caso contrário, todas as revisões\n"
+" etiquetadas."
+
+#. i18n: "tag" is a keyword
+msgid "tag takes one or no arguments"
+msgstr "tag recebe um ou nenhum argumento"
+
+#. i18n: "tag" is a keyword
+msgid "the argument to tag must be a string"
+msgstr "o argumento de tag deve ser uma string"
msgid "can't negate that"
msgstr "não é possÃvel negar essa expressão"
@@ -14659,13 +15628,16 @@
msgid "no suitable response from remote hg"
msgstr "nenhuma resposta adequada do hg remoto"
+msgid "remote: "
+msgstr "remoto: "
+
+msgid "unexpected response:"
+msgstr "resposta inesperada:"
+
#, python-format
msgid "push refused: %s"
msgstr "envio recusado: %s"
-msgid "unsynced changes"
-msgstr "alterações não sincronizadas"
-
#, python-format
msgid "'%s' does not appear to be an hg repository"
msgstr "'%s' não parece ser um repositório hg"
@@ -14688,6 +15660,10 @@
msgstr "faltando ] na origem do sub-repositório"
#, python-format
+msgid "bad subrepository pattern in %s: %s"
+msgstr "padrão ruim de sub-repositório em %s: %s"
+
+#, python-format
msgid ""
" subrepository sources for %s differ\n"
"use (l)ocal source (%s) or (r)emote source (%s)?"
@@ -14715,10 +15691,18 @@
"use (c) a versão alterada ou (d) apague?"
#, python-format
+msgid "default path for subrepository %s not found"
+msgstr "o caminho padrão para o sub-repositório %s não foi encontrado"
+
+#, python-format
msgid "unknown subrepo type %s"
msgstr "tipo de sub-repositório %s desconhecido"
#, python-format
+msgid "warning: error \"%s\" in subrepository \"%s\"\n"
+msgstr "aviso: erro \"%s\" no sub-repositório \"%s\"\n"
+
+#, python-format
msgid "removing subrepo %s\n"
msgstr "removendo sub-repositório %s\n"
@@ -14748,6 +15732,9 @@
msgid "node '%s' is not well formed"
msgstr "nó '%s' não é bem formado"
+msgid ".hg/tags.cache is corrupt, rebuilding it\n"
+msgstr ".hg/tags.cache está corrompido, reconstruindo\n"
+
msgid "unmatched quotes"
msgstr "aspas não combinam"
@@ -14792,6 +15779,10 @@
msgstr "Ignorado: %s\n"
#, python-format
+msgid "(deprecated '%%' in path %s=%s from %s)\n"
+msgstr "('%%' obsoleto em caminho %s=%s de %s)\n"
+
+#, python-format
msgid "ignoring untrusted configuration option %s.%s = %s\n"
msgstr "ignorando opção de configuração não confiável %s.%s = %s\n"
@@ -14813,10 +15804,6 @@
msgid "username %s contains a newline\n"
msgstr "nome de usuário %s contém quebra de linha\n"
-#, python-format
-msgid "(deprecated '%%' in path %s=%s from %s)\n"
-msgstr "('%%' obsoleto em caminho %s=%s de %s)\n"
-
msgid "response expected"
msgstr "resposta esperada"
@@ -14861,14 +15848,6 @@
msgstr "nenhum certificado recebido"
#, python-format
-msgid "certificate expired %s"
-msgstr "o certificado expirou em %s"
-
-#, python-format
-msgid "certificate not valid before %s"
-msgstr "o certificado não é válido antes de %s"
-
-#, python-format
msgid "certificate is for %s"
msgstr "o certificado é para %s"
@@ -14880,10 +15859,6 @@
msgstr "erro no certificado de %s: %s"
#, python-format
-msgid "%s certificate successfully verified\n"
-msgstr "certificado %s verificado com sucesso\n"
-
-#, python-format
msgid "command '%s' failed: %s"
msgstr "falha ao executar o comando '%s' : %s"
@@ -14907,8 +15882,8 @@
msgstr "impossÃvel criar link simbólico para %r: %s"
#, python-format
-msgid "invalid date: %r "
-msgstr "data inválida: %r "
+msgid "invalid date: %r"
+msgstr "data inválida: %r"
#, python-format
msgid "date exceeds 32 bits: %d"
@@ -14962,6 +15937,10 @@
msgid "%.0f bytes"
msgstr "%.0f byte"
+#, python-format
+msgid "no port number associated with service '%s'"
+msgstr "nenhum número de porta associado ao serviço '%s'"
+
msgid "cannot verify bundle or remote repos"
msgstr "impossÃvel verificar bundle ou repositório remoto"
@@ -15026,6 +16005,9 @@
msgid "checking changesets\n"
msgstr "checando revisões\n"
+msgid "checking"
+msgstr "checando"
+
#, python-format
msgid "unpacking changeset %s"
msgstr "desempacotando revisão %s"
@@ -15067,9 +16049,6 @@
msgid "cannot decode filename '%s'"
msgstr "impossÃvel decodificar nome de arquivo '%s'"
-msgid "checking"
-msgstr "checando"
-
#, python-format
msgid "broken revlog! (%s)"
msgstr "revlog quebrado! (%s)"
@@ -15131,3 +16110,49 @@
msgid "user name not available - set USERNAME environment variable"
msgstr "nome de usuário indisponÃvel - defina a variável de ambiente USERNAME"
+
+msgid "look up remote revision"
+msgstr "procurar revisão remota"
+
+msgid "look up remote changes"
+msgstr "procurar mudanças remotas"
+
+msgid "push failed:"
+msgstr "o push falhou:"
+
+msgid "push failed (unexpected response):"
+msgstr "o push falhou (resposta inesperada):"
+
+msgid ""
+"By default, the pager is only executed if a command has output. To\n"
+"force the pager to run even if a command prints nothing, set::"
+msgstr ""
+"Por padrão, o pager será executado apenas se um comando gerar\n"
+"saÃda. Para forçar a execução do pager mesmo nesse caso, defina::"
+
+msgid ""
+" [pager]\n"
+" force = True"
+msgstr ""
+" [pager]\n"
+" force = True"
+
+msgid "queue directory updating\n"
+msgstr "atualizando diretório da fila\n"
+
+msgid ""
+"\n"
+"Added by the bookmarks extension:"
+msgstr ""
+"\n"
+"Adicionados pela extensão bookmarks:"
+
+msgid ""
+"\n"
+"Added by the transplant extension:"
+msgstr ""
+"\n"
+"Adicionados pela extensão transplant:"
+
+msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
+msgstr "** reporte detalhes de problemas para http://mercurial.selenic.com/bts/\n"
--- a/i18n/sv.po Wed Oct 20 23:48:33 2010 +0200
+++ b/i18n/sv.po Tue Nov 02 09:47:47 2010 +0100
@@ -13,8 +13,8 @@
msgstr ""
"Project-Id-Version: Mercurial\n"
"Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2010-08-01 22:36+0200\n"
-"PO-Revision-Date: 2010-08-01 22:42+0200\n"
+"POT-Creation-Date: 2010-11-01 13:33+0100\n"
+"PO-Revision-Date: 2010-11-01 13:42+0100\n"
"Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n"
"Language-Team: Swedish\n"
"Language: Swedish\n"
@@ -32,8 +32,18 @@
msgid "Commands"
msgstr "Kommandon"
-msgid " options:"
-msgstr " flaggor:"
+msgid "Extensions"
+msgstr "Utökningar"
+
+msgid ""
+"This section contains help for extensions that are distributed together with "
+"Mercurial. Help for other extensions is available in the help system."
+msgstr ""
+"Den här sektioner innehåller hjälp för utökningar som levereras med "
+"Mercurial. Hjälp för andra utälningar är tillgängliga i hjälpsystemet."
+
+msgid "options:"
+msgstr "flaggor:"
#, python-format
msgid " aliases: %s"
@@ -78,8 +88,10 @@
msgid ""
"Branch-based Access Control\n"
-"---------------------------"
-msgstr ""
+"..........................."
+msgstr ""
+"Grenbaserad Ã…tkomstkontroll\n"
+"..........................."
msgid ""
"Use the ``acl.deny.branches`` and ``acl.allow.branches`` sections to\n"
@@ -102,8 +114,10 @@
msgid ""
"Path-based Access Control\n"
-"-------------------------"
-msgstr ""
+"........................."
+msgstr ""
+"Sökvägsbaserad Åtkomstkontroll\n"
+".............................."
msgid ""
"Use the ``acl.deny`` and ``acl.allow`` sections to have path-based\n"
@@ -114,8 +128,10 @@
msgid ""
"Groups\n"
-"------"
-msgstr ""
+"......"
+msgstr ""
+"Grupper\n"
+"......."
msgid ""
"Group names must be prefixed with an ``@`` symbol. Specifying a group\n"
@@ -131,8 +147,10 @@
msgid ""
"Example Configuration\n"
-"---------------------"
-msgstr ""
+"....................."
+msgstr ""
+"Exempelkonfiguration\n"
+"...................."
msgid "::"
msgstr "::"
@@ -293,7 +311,7 @@
"By default, when several bookmarks point to the same changeset, they\n"
"will all move forward together. It is possible to obtain a more\n"
"git-like experience by adding the following configuration option to\n"
-"your .hgrc::"
+"your configuration file::"
msgstr ""
msgid ""
@@ -318,7 +336,13 @@
" You can use :hg:`bookmark NAME` to set a bookmark on the working\n"
" directory's parent revision with the given name. If you specify\n"
" a revision using -r REV (where REV may be an existing bookmark),\n"
-" the bookmark is assigned to that revision.\n"
+" the bookmark is assigned to that revision."
+msgstr ""
+
+msgid ""
+" Bookmarks can be pushed and pulled between repositories (see :hg:`help\n"
+" push` and :hg:`help pull`). This requires the bookmark extension to be\n"
+" enabled for both the local and remote repositories.\n"
" "
msgstr ""
@@ -374,11 +398,15 @@
msgid "deleting remote bookmark %s\n"
msgstr "raderar fjärrbokmärket %s\n"
-msgid "searching for changes\n"
-msgstr "söker efter ändringar\n"
-
-msgid "no changes found\n"
-msgstr "inga ändringar hittades\n"
+#, python-format
+msgid "bookmark %s does not exist on the local or remote repository!\n"
+msgstr "bokmärket %s existerar inte i lokal- eller fjärrarkiv!\n"
+
+msgid "searching for changed bookmarks\n"
+msgstr "söker efter ändrade bokmärken\n"
+
+msgid "no changed bookmarks found\n"
+msgstr "inga ändrade bokmärken hittades\n"
#, python-format
msgid "comparing with %s\n"
@@ -387,12 +415,30 @@
msgid "bookmark to import"
msgstr "bokmärke att importera"
+msgid "BOOKMARK"
+msgstr "BOKMÄRKE"
+
msgid "bookmark to export"
msgstr "bokmärke att exportera"
msgid "compare bookmark"
msgstr "jämför bokmärke"
+msgid ""
+"``bookmark([name])``\n"
+" The named bookmark or all bookmarks."
+msgstr ""
+"``bookmark([namn])``\n"
+" Det angivna bokmärket eller alla bokmärken."
+
+#. i18n: "bookmark" is a keyword
+msgid "bookmark takes one or no arguments"
+msgstr "bookmark tar ett eller inga argument"
+
+#. i18n: "bookmark" is a keyword
+msgid "the argument to bookmark must be a string"
+msgstr "argumentet till bookmark måste vara en sträng"
+
msgid "force"
msgstr "tvinga"
@@ -768,6 +814,10 @@
" "
msgstr ""
+#, python-format
+msgid "skipping malformed alias: %s\n"
+msgstr "hoppar över defekt alias: %s\n"
+
msgid "count rate for the specified revision or range"
msgstr ""
@@ -835,8 +885,8 @@
"(aka ANSI escape-koder). Denna modul tillhandahåller också funktionen\n"
"render_text, som kan användas för att lägga till effekter på valfri text."
-msgid "Default effects may be overridden from the .hgrc file::"
-msgstr "Standardeffekter kan ersättas från .hgrc-filen::"
+msgid "Default effects may be overridden from your configuration file::"
+msgstr "Standardeffekter kan ersättas från din konfiturationsfil::"
msgid ""
" [color]\n"
@@ -905,6 +955,17 @@
msgstr " bookmarks.current = green"
msgid ""
+" branches.active = none\n"
+" branches.closed = black bold\n"
+" branches.current = green\n"
+" branches.inactive = none"
+msgstr ""
+" branches.active = none\n"
+" branches.closed = black bold\n"
+" branches.current = green\n"
+" branches.inactive = none"
+
+msgid ""
"The color extension will try to detect whether to use ANSI codes or\n"
"Win32 console APIs, unless it is made explicit::"
msgstr ""
@@ -928,8 +989,10 @@
msgid "win32console not found, please install pywin32\n"
msgstr "win32console hittades inte, installera pywin32\n"
-msgid "when to colorize (always, auto, or never)"
-msgstr "när färgläggning ska ske (always, auto eller never)"
+#. i18n: 'always', 'auto', and 'never' are keywords and should
+#. not be translated
+msgid "when to colorize (boolean, always, auto, or never)"
+msgstr "när färgläggning ska ske (boolean, always, auto eller never)"
msgid "TYPE"
msgstr "TYP"
@@ -971,9 +1034,12 @@
msgid ""
" If no destination directory name is specified, it defaults to the\n"
-" basename of the source with '-hg' appended. If the destination\n"
+" basename of the source with ``-hg`` appended. If the destination\n"
" repository doesn't exist, it will be created."
msgstr ""
+" Om ingen destinationskatalog anges, kommer basnamnet för källan med\n"
+" ``-hg`` tillagd. Om destinationsarkivet inte existerar, så kommer det\n"
+" att skapas."
msgid ""
" By default, all sources except Mercurial will use --branchsort.\n"
@@ -1011,16 +1077,21 @@
msgid ""
" If the file doesn't exist, it's automatically created. It's\n"
-" updated on each commit copied, so convert-repo can be interrupted\n"
+" updated on each commit copied, so :hg:`convert` can be interrupted\n"
" and can be run repeatedly to copy new commits."
msgstr ""
msgid ""
-" The [username mapping] file is a simple text file that maps each\n"
-" source commit author to a destination commit author. It is handy\n"
-" for source SCMs that use unix logins to identify authors (eg:\n"
-" CVS). One line per author mapping and the line format is:\n"
-" srcauthor=whatever string you want"
+" The authormap is a simple text file that maps each source commit\n"
+" author to a destination commit author. It is handy for source SCMs\n"
+" that use unix logins to identify authors (eg: CVS). One line per\n"
+" author mapping and the line format is::"
+msgstr ""
+
+msgid " source author = destination author"
+msgstr ""
+
+msgid " Empty lines and lines starting with a ``#`` are ignored."
msgstr ""
msgid ""
@@ -1039,20 +1110,20 @@
msgstr " rename sökväg/till/källa sökväg/till/destination"
msgid ""
-" Comment lines start with '#'. A specificed path matches if it\n"
+" Comment lines start with ``#``. A specified path matches if it\n"
" equals the full relative name of a file or one of its parent\n"
-" directories. The 'include' or 'exclude' directive with the longest\n"
-" matching path applies, so line order does not matter."
-msgstr ""
-
-msgid ""
-" The 'include' directive causes a file, or all files under a\n"
+" directories. The ``include`` or ``exclude`` directive with the\n"
+" longest matching path applies, so line order does not matter."
+msgstr ""
+
+msgid ""
+" The ``include`` directive causes a file, or all files under a\n"
" directory, to be included in the destination repository, and the\n"
" exclusion of all other files and directories not explicitly\n"
-" included. The 'exclude' directive causes files or directories to\n"
-" be omitted. The 'rename' directive renames a file or directory if\n"
-" is converted. To rename from a subdirectory into the root of the\n"
-" repository, use '.' as the path to rename to."
+" included. The ``exclude`` directive causes files or directories to\n"
+" be omitted. The ``rename`` directive renames a file or directory if\n"
+" it is converted. To rename from a subdirectory into the root of\n"
+" the repository, use ``.`` as the path to rename to."
msgstr ""
msgid ""
@@ -1061,7 +1132,14 @@
" useful if you want to e.g. give a Subversion merge two parents, or\n"
" graft two disconnected series of history together. Each entry\n"
" contains a key, followed by a space, followed by one or two\n"
-" comma-separated values. The key is the revision ID in the source\n"
+" comma-separated values::"
+msgstr ""
+
+msgid " key parent1, parent2"
+msgstr ""
+
+msgid ""
+" The key is the revision ID in the source\n"
" revision control system whose parents should be modified (same\n"
" format as a key in .hg/shamap). The values are the revision IDs\n"
" (in either the source or destination revision control system) that\n"
@@ -1077,17 +1155,26 @@
" conjunction with a splicemap, it allows for a powerful combination\n"
" to help fix even the most badly mismanaged repositories and turn them\n"
" into nicely structured Mercurial repositories. The branchmap contains\n"
-" lines of the form \"original_branch_name new_branch_name\".\n"
-" \"original_branch_name\" is the name of the branch in the source\n"
-" repository, and \"new_branch_name\" is the name of the branch is the\n"
-" destination repository. This can be used to (for instance) move code\n"
-" in one repository from \"default\" to a named branch."
+" lines of the form::"
+msgstr ""
+
+msgid " original_branch_name new_branch_name"
+msgstr ""
+
+msgid ""
+" where \"original_branch_name\" is the name of the branch in the\n"
+" source repository, and \"new_branch_name\" is the name of the branch\n"
+" is the destination repository. No whitespace is allowed in the\n"
+" branch names. This can be used to (for instance) move code in one\n"
+" repository from \"default\" to a named branch."
msgstr ""
msgid ""
" Mercurial Source\n"
-" ----------------"
-msgstr ""
+" ''''''''''''''''"
+msgstr ""
+" Mercurial-källa\n"
+" '''''''''''''''"
msgid ""
" --config convert.hg.ignoreerrors=False (boolean)\n"
@@ -1103,8 +1190,10 @@
msgid ""
" CVS Source\n"
-" ----------"
-msgstr ""
+" ''''''''''"
+msgstr ""
+" CVS-källa\n"
+" '''''''''"
msgid ""
" CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n"
@@ -1160,8 +1249,10 @@
msgid ""
" Subversion Source\n"
-" -----------------"
-msgstr ""
+" '''''''''''''''''"
+msgstr ""
+" Subversion-källa\n"
+" ''''''''''''''''"
msgid ""
" Subversion source detects classical trunk/branches/tags layouts.\n"
@@ -1198,8 +1289,10 @@
msgid ""
" Perforce Source\n"
-" ---------------"
-msgstr ""
+" '''''''''''''''"
+msgstr ""
+" Perforce-källa\n"
+" ''''''''''''''"
msgid ""
" The Perforce (P4) importer can be given a p4 depot path or a\n"
@@ -1222,8 +1315,10 @@
msgid ""
" Mercurial Destination\n"
-" ---------------------"
-msgstr ""
+" '''''''''''''''''''''"
+msgstr ""
+" Mercurial-destination\n"
+" '''''''''''''''''''''"
msgid ""
" --config convert.hg.clonebranches=False (boolean)\n"
@@ -1253,21 +1348,24 @@
" dates."
msgstr ""
-msgid "username mapping filename"
+msgid "username mapping filename (DEPRECATED, use --authormap instead)"
+msgstr ""
+
+msgid "source repository type"
msgstr ""
msgid "destination repository type"
msgstr ""
+msgid "import up to target revision REV"
+msgstr ""
+
+msgid "remap usernames using this file"
+msgstr ""
+
msgid "remap file names using contents of file"
msgstr ""
-msgid "import up to target revision REV"
-msgstr ""
-
-msgid "source repository type"
-msgstr ""
-
msgid "splice synthesized history into place"
msgstr ""
@@ -1382,8 +1480,8 @@
msgid "%s: unknown repository type"
msgstr "%s: okänd arkivtyp"
-msgid "retrieving file"
-msgstr "hämtar fil"
+msgid "getting files"
+msgstr "hämtar filer"
msgid "revisions"
msgstr "revisioner"
@@ -1555,6 +1653,13 @@
msgid "Python ElementTree module is not available"
msgstr ""
+#, python-format
+msgid "%s repository format is unsupported, please upgrade"
+msgstr ""
+
+msgid "failed to detect repository format!"
+msgstr ""
+
msgid "internal calling inconsistency"
msgstr ""
@@ -1562,10 +1667,18 @@
msgstr ""
#, python-format
+msgid "%s:%d: path to %s is missing\n"
+msgstr ""
+
+#, python-format
msgid "%s:%d: %r already in %s list\n"
msgstr ""
#, python-format
+msgid "%s:%d: superfluous / in %s %r\n"
+msgstr ""
+
+#, python-format
msgid "%s:%d: unknown directive %r\n"
msgstr ""
@@ -1749,7 +1862,7 @@
msgid "unable to cope with svn output"
msgstr ""
-msgid "XXX TAGS NOT IMPLEMENTED YET\n"
+msgid "writing Subversion tags is not yet implemented\n"
msgstr ""
msgid "automatically manage newlines in repository files"
@@ -1824,7 +1937,7 @@
msgid ""
"- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or\n"
-" ``CRLF`` override the default interpretation of ``native`` for\n"
+" ``CRLF`` to override the default interpretation of ``native`` for\n"
" checkout. This can be used with :hg:`archive` on Unix, say, to\n"
" generate an archive where files have line endings for Windows."
msgstr ""
@@ -1974,9 +2087,13 @@
" revisions are specified, the working directory files are compared\n"
" to its parent."
msgstr ""
+" När två revisionsargument ges, kommer ändringar mellan revisionerna\n"
+" att visas. Om bara en revision anges så jämförs den revisionen med\n"
+" arbetskatalogen, och, när ingen revision anges, jämförs arbetskatalogen\n"
+" med dess förälder."
msgid "CMD"
-msgstr ""
+msgstr "KMD"
msgid "comparison program to run"
msgstr ""
@@ -2032,29 +2149,36 @@
" order, use --switch-parent."
msgstr ""
-msgid ""
-" See :hg:`help dates` for a list of formats valid for -d/--date.\n"
+msgid " See :hg:`help dates` for a list of formats valid for -d/--date."
+msgstr " Se :hg:`help dates` för en lista med giltiga format för -d/--date."
+
+msgid ""
+" Returns 0 on success.\n"
" "
msgstr ""
-" Se :hg:`help dates` för en lista med giltiga format för -d/--date.\n"
+" Returnerar 0 om kommandot lyckades.\n"
" "
msgid ""
"working dir not at branch tip (use \"hg update\" to check out branch tip)"
msgstr ""
+"arbetskatalogen är inte på grentoppen (använd \"hg update\" för att hämta ut "
+"grentoppen)"
msgid "outstanding uncommitted merge"
-msgstr ""
+msgstr "kvarvarande oarkiverad sammanfogning"
msgid "outstanding uncommitted changes"
-msgstr ""
+msgstr "kvarvarande oarkiverade ändringar"
msgid "working directory is missing some files"
-msgstr ""
+msgstr "arbetskatalogen saknar några filer"
msgid ""
"multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
msgstr ""
+"flera huvuden i denna gren (använd \"hg heads .\" och \"hg merge\" för att "
+"sammanfoga)"
#, python-format
msgid "pulling from %s\n"
@@ -2064,79 +2188,92 @@
"Other repository doesn't support revision lookup, so a rev cannot be "
"specified."
msgstr ""
+"Det andra arkivet stödjer inte revisionsuppslag, så en revision kan inte "
+"anges."
#, python-format
msgid ""
"not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
"\" to merge them)\n"
msgstr ""
+"sammanfogar inte med %d andra nya grenhuvuden (använd \"hg heads .\" och "
+"\"hg merge\" för att sammanfoga dem)\n"
#, python-format
msgid "updating to %d:%s\n"
-msgstr ""
+msgstr "uppdaterar till %d:%s\n"
#, python-format
msgid "merging with %d:%s\n"
-msgstr ""
+msgstr "sammanfogar med %d:%s\n"
#, python-format
msgid "new changeset %d:%s merges remote changes with local\n"
-msgstr ""
+msgstr "nya ändringen %d:%s sammanfogar fjärrändringar med lokala\n"
msgid "a specific revision you would like to pull"
-msgstr ""
+msgstr "en specifik revision som du vill dra"
msgid "edit commit message"
-msgstr ""
+msgstr "redigera arkiveringsmeddelande"
msgid "edit commit message (DEPRECATED)"
-msgstr ""
+msgstr "redigera arkiveringsmeddelande (FÖRÅLDRAD)"
msgid "switch parents when merging"
-msgstr ""
+msgstr "byt föräldrar vid sammanfogning"
msgid "hg fetch [SOURCE]"
-msgstr ""
+msgstr "hg fetch [KÄLLA]"
msgid "commands to sign and verify changesets"
-msgstr ""
+msgstr "kommandon för att signera och verifiera ändringar"
msgid "error while verifying signature"
-msgstr ""
+msgstr "fel vid verifiering av signatur"
#, python-format
msgid "%s Bad signature from \"%s\"\n"
-msgstr ""
+msgstr "%s Dålig signatur från \"%s\"\n"
#, python-format
msgid "%s Note: Signature has expired (signed by: \"%s\")\n"
-msgstr ""
+msgstr "%s Notera: Signaturen har gått ut (signerad av: \"%s\")\n"
#, python-format
msgid "%s Note: This key has expired (signed by: \"%s\")\n"
-msgstr ""
+msgstr "%s Notera: Den här nyckenl har gått ut (signerad av: \"%s\")\n"
msgid "list signed changesets"
-msgstr ""
+msgstr "visa signerade ändringar"
#, python-format
msgid "%s:%d node does not exist\n"
-msgstr ""
+msgstr "%s:%d noden existerar inte\n"
msgid "verify all the signatures there may be for a particular revision"
-msgstr ""
+msgstr "verifiera alla signaturerna som finns för en viss revision"
#, python-format
msgid "No valid signature for %s\n"
-msgstr ""
+msgstr "Ingen giltig signatur för %s\n"
msgid "add a signature for the current or given revision"
-msgstr ""
+msgstr "lägg till en signatur för den aktuella eller angivna revisionen"
msgid ""
" If no revision is given, the parent of the working directory is used,\n"
" or tip if no revision is checked out."
msgstr ""
+" Om ingen revision anges, så används arbetskatalogens föräldern, eller\n"
+" toppen om ingen revision är uthämtad."
+
+msgid ""
+" See :hg:`help dates` for a list of formats valid for -d/--date.\n"
+" "
+msgstr ""
+" Se :hg:`help dates` för en lista med giltiga format för -d/--date.\n"
+" "
msgid "uncommitted merge - please provide a specific revision"
msgstr ""
@@ -2145,7 +2282,7 @@
msgid "Signing %d:%s\n"
msgstr "Signerar %d:%s\n"
-msgid "Error while signing"
+msgid "error while signing"
msgstr ""
msgid ""
@@ -2313,7 +2450,7 @@
msgid ""
"The :hg:`view` command will launch the hgk Tcl script. For this command\n"
"to work, hgk must be in your search path. Alternately, you can specify\n"
-"the path to hgk in your .hgrc file::"
+"the path to hgk in your configuration file::"
msgstr ""
msgid ""
@@ -2642,6 +2779,11 @@
msgstr ""
msgid ""
+"Keywords expand to the changeset data pertaining to the latest change\n"
+"relative to the working directory parent of each file."
+msgstr ""
+
+msgid ""
"Configuration is done in the [keyword], [keywordset] and [keywordmaps]\n"
"sections of hgrc files."
msgstr ""
@@ -2663,8 +2805,9 @@
msgstr ""
msgid ""
-"NOTE: the more specific you are in your filename patterns the less you\n"
-"lose speed in huge repositories."
+".. note::\n"
+" The more specific you are in your filename patterns the less you\n"
+" lose speed in huge repositories."
msgstr ""
msgid ""
@@ -3016,6 +3159,9 @@
msgid "patch %s is empty\n"
msgstr ""
+msgid "repository commit failed"
+msgstr ""
+
msgid "patch failed, rejects left in working dir\n"
msgstr ""
@@ -3062,13 +3208,21 @@
msgstr ""
#, python-format
+msgid "\"%s\" already exists as a directory"
+msgstr "\"%s\" finns redan som katalog"
+
+#, python-format
msgid "patch \"%s\" already exists"
-msgstr ""
+msgstr "patchen \"%s\" existerar redan"
msgid "cannot manage merge changesets"
msgstr "kan inte hantera sammanfogningar"
#, python-format
+msgid "cannot write patch \"%s\": %s"
+msgstr "kan inte skriva patchen \"%s\": %s"
+
+#, python-format
msgid "error unlinking %s\n"
msgstr ""
@@ -3189,8 +3343,8 @@
msgid "saved queue repository parents: %s %s\n"
msgstr ""
-msgid "queue directory updating\n"
-msgstr ""
+msgid "updating queue directory\n"
+msgstr "uppdaterar kökatalog\n"
msgid "Unable to load queue repository\n"
msgstr ""
@@ -3248,6 +3402,10 @@
msgid "patch %s does not exist"
msgstr ""
+#, python-format
+msgid "renaming %s to %s\n"
+msgstr "döper om %s till %s\n"
+
msgid "need --name to import a patch from -"
msgstr ""
@@ -3276,6 +3434,9 @@
msgid "print the patches already applied"
msgstr ""
+msgid " Returns 0 on success."
+msgstr " Returnerar 0 om kommandot lyckades."
+
msgid "only one patch applied\n"
msgstr ""
@@ -3321,9 +3482,21 @@
msgid ""
" To import a patch from standard input, pass - as the patch file.\n"
" When importing from standard input, a patch name must be specified\n"
-" using the --name flag.\n"
+" using the --name flag."
+msgstr ""
+
+msgid " To import an existing patch while renaming it::"
+msgstr ""
+
+msgid " hg qimport -e existing-patch -n new-name"
+msgstr ""
+
+msgid ""
+" Returns 0 if import succeeded.\n"
" "
msgstr ""
+" Returnerar 0 om importeringen lyckades.\n"
+" "
msgid "init a new queue repository (DEPRECATED)"
msgstr ""
@@ -3359,9 +3532,15 @@
msgid ""
" The patch directory must be a nested Mercurial repository, as\n"
-" would be created by :hg:`init --mq`.\n"
+" would be created by :hg:`init --mq`."
+msgstr ""
+
+msgid ""
+" Return 0 on success.\n"
" "
msgstr ""
+" Returnerar 0 om kommandot lyckades.\n"
+" "
msgid "versioned patch repository not found (see init --mq)"
msgstr "versionshanterat patcharkiv hittades inte (se init --mq)"
@@ -3425,12 +3604,18 @@
" Use the -g/--git option to keep the patch in the git extended diff\n"
" format. Read the diffs help topic for more information on why this\n"
" is important for preserving permission changes and copy/rename\n"
-" information.\n"
+" information."
+msgstr ""
+
+msgid ""
+" Returns 0 on successful creation of a new patch.\n"
" "
msgstr ""
+" Returnerar 0 om en patch skapades.\n"
+" "
msgid "update the current patch"
-msgstr ""
+msgstr "uppdatera den nuvarande patchen"
msgid ""
" If any file patterns are provided, the refreshed patch will\n"
@@ -3444,11 +3629,18 @@
msgstr ""
msgid ""
+" If -e/--edit is specified, Mercurial will start your configured editor "
+"for\n"
+" you to enter a message. In case qrefresh fails, you will find a backup "
+"of\n"
+" your message in ``.hg/last-message.txt``."
+msgstr ""
+
+msgid ""
" hg add/remove/copy/rename work as usual, though you might want to\n"
" use git-style patches (-g/--git or [diff] git=1) to track copies\n"
" and renames. See the diffs help topic for more information on the\n"
-" git diff format.\n"
-" "
+" git diff format."
msgstr ""
msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
@@ -3468,8 +3660,7 @@
" Use :hg:`diff` if you only want to see the changes made since the\n"
" last qrefresh, or :hg:`export qtip` if you want to see changes\n"
" made by the current patch without including changes made since the\n"
-" qrefresh.\n"
-" "
+" qrefresh."
msgstr ""
msgid "fold the named patches into the current patch"
@@ -3486,25 +3677,22 @@
msgid ""
" The header for each folded patch will be concatenated with the\n"
-" current patch header, separated by a line of '* * *'."
+" current patch header, separated by a line of ``* * *``."
msgstr ""
msgid "qfold requires at least one patch name"
msgstr ""
-msgid "No patches applied"
-msgstr ""
-
-#, python-format
-msgid "Skipping already folded patch %s"
-msgstr ""
+#, python-format
+msgid "Skipping already folded patch %s\n"
+msgstr "Hoppar över redan hopvikta patchen %s\n"
#, python-format
msgid "qfold cannot fold already applied patch %s"
msgstr ""
#, python-format
-msgid "Error folding patch %s"
+msgid "error folding patch %s"
msgstr ""
msgid "push or pop patches until named patch is at top of stack"
@@ -3524,16 +3712,18 @@
msgid ""
" With no arguments, print the currently active guards.\n"
-" With arguments, set guards for the named patch.\n"
-" NOTE: Specifying negative guards now requires '--'."
+" With arguments, set guards for the named patch."
+msgstr ""
+
+msgid ""
+" .. note::\n"
+" Specifying negative guards now requires '--'."
msgstr ""
msgid " To set guards on another patch::"
msgstr ""
-msgid ""
-" hg qguard other.patch -- +2.6.17 -stable\n"
-" "
+msgid " hg qguard other.patch -- +2.6.17 -stable"
msgstr ""
msgid "cannot mix -l/--list with options or arguments"
@@ -3554,9 +3744,15 @@
msgid ""
" When -f/--force is applied, all local changes in patched files\n"
-" will be lost.\n"
+" will be lost."
+msgstr ""
+
+msgid ""
+" Return 0 on succces.\n"
" "
msgstr ""
+" Returnerar 0 om kommandot lyckades.\n"
+" "
msgid "no saved queues found, please use -n\n"
msgstr ""
@@ -3571,8 +3767,7 @@
msgid ""
" By default, pops off the top of the patch stack. If given a patch\n"
" name, keeps popping off patches until the named patch is at the\n"
-" top of the stack.\n"
-" "
+" top of the stack."
msgstr ""
#, python-format
@@ -3595,15 +3790,11 @@
msgid "A patch named %s already exists in the series file"
msgstr ""
-#, python-format
-msgid "renaming %s to %s\n"
-msgstr "döper om %s till %s\n"
-
msgid "restore the queue state saved by a revision (DEPRECATED)"
msgstr ""
-msgid " This command is deprecated, use rebase --mq instead."
-msgstr ""
+msgid " This command is deprecated, use :hg:`rebase` instead."
+msgstr " Detta är ett förlegat kommando; använd :hg:`rebase` istället."
msgid "save current queue state (DEPRECATED)"
msgstr ""
@@ -3620,15 +3811,13 @@
msgid "copy %s to %s\n"
msgstr ""
-msgid "strip a changeset and all its descendants from the repository"
-msgstr ""
-
-msgid ""
-" The strip command removes all changesets whose local revision\n"
-" number is greater than or equal to REV, and then restores any\n"
-" changesets that are not descendants of REV. If the working\n"
-" directory has uncommitted changes, the operation is aborted unless\n"
-" the --force flag is supplied."
+msgid "strip changesets and all their descendants from the repository"
+msgstr ""
+
+msgid ""
+" The strip command removes the specified changesets and all their\n"
+" descendants. If the working directory has uncommitted changes,\n"
+" the operation is aborted unless the --force flag is supplied."
msgstr ""
msgid ""
@@ -3648,10 +3837,12 @@
msgstr ""
msgid ""
-" Use the --nobackup option to discard the backup bundle once the\n"
-" operation completes.\n"
-" "
-msgstr ""
+" Use the --no-backup option to discard the backup bundle once the\n"
+" operation completes."
+msgstr ""
+
+msgid "empty revision set"
+msgstr "tomt revisionsset"
msgid "set or print guarded patches to push"
msgstr ""
@@ -3748,8 +3939,7 @@
msgid ""
" This can be especially useful if your changes have been applied to\n"
" an upstream repository, or if you are about to push your changes\n"
-" to upstream.\n"
-" "
+" to upstream."
msgstr ""
msgid "no revisions specified"
@@ -3781,13 +3971,18 @@
msgid ""
" To delete an existing queue, use --delete. You cannot delete the "
"currently\n"
-" active queue.\n"
-" "
+" active queue."
msgstr ""
msgid "patches applied - cannot set new queue active"
msgstr ""
+msgid "cannot delete queue that does not exist"
+msgstr ""
+
+msgid "cannot delete currently active queue"
+msgstr ""
+
msgid " (active)\n"
msgstr " (aktiv)\n"
@@ -3798,10 +3993,12 @@
msgid "queue \"%s\" already exists"
msgstr "kön \"%s\" finns redan"
-msgid "cannot delete queue that does not exist"
-msgstr ""
-
-msgid "cannot delete currently active queue"
+#, python-format
+msgid "can't rename \"%s\" to its current name"
+msgstr ""
+
+#, python-format
+msgid "non-queue directory \"%s\" already exists"
msgstr ""
msgid "use --create to create a new queue"
@@ -3827,8 +4024,8 @@
msgid "only a local queue repository may be initialized"
msgstr "bara ett lokalt köarkiv kan initialiseras"
-msgid "There is no Mercurial repository here (.hg not found)"
-msgstr "Det finns inget Mercurial-arkiv här (.hg hittades inte)"
+msgid "there is no Mercurial repository here (.hg not found)"
+msgstr "det finns inget Mercurial-arkiv här (.hg hittades inte)"
msgid "no queue repository"
msgstr "inget köarkiv"
@@ -3886,8 +4083,8 @@
msgid "stop managing a revision (DEPRECATED)"
msgstr ""
-msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
-msgstr ""
+msgid "hg qdelete [-k] [PATCH]..."
+msgstr "hg qdelete [-k] [PATCH]..."
msgid "edit patch header"
msgstr ""
@@ -3979,10 +4176,10 @@
msgid "forget any local changes to patched files"
msgstr ""
-msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
-msgstr ""
-
-msgid "apply if the patch has rejects"
+msgid "hg qpop [-a] [-f] [PATCH | INDEX]"
+msgstr "hg qpop [-a] [-f] [PATCH | INDEX]"
+
+msgid "apply on top of local changes"
msgstr ""
msgid "list patch name in commit text"
@@ -4000,8 +4197,8 @@
msgid "reorder patch series and apply only the patch"
msgstr "omordna patchserien och applicera bara patchen"
-msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [--move] [PATCH | INDEX]"
-msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NAMN] [--move] [PATCH | INDEX]"
+msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]"
+msgstr "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]"
msgid "refresh only files already in the patch and specified files"
msgstr ""
@@ -4084,25 +4281,31 @@
"ättling till REV (FÖRLEGAD)"
msgid "no backups"
-msgstr ""
-
-msgid "hg strip [-f] [-n] REV"
-msgstr "hg strip [-f] [-n] REV"
+msgstr "inga säkerhetskopior"
+
+msgid "no backups (DEPRECATED)"
+msgstr "inga säkerhetskopior (FÖRÅLDRAD)"
+
+msgid "do not modify working copy during strip"
+msgstr "modifiera inte arbetskopian vid strippning"
+
+msgid "hg strip [-k] [-f] [-n] REV..."
+msgstr "hg strip [-k] [-f] [-n] REV..."
msgid "hg qtop [-s]"
-msgstr ""
+msgstr "hg qtop [-s]"
msgid "show only the first patch"
msgstr "visa bara den första patchen"
msgid "hg qunapplied [-1] [-s] [PATCH]"
-msgstr ""
+msgstr "hg qunapplied [-1] [-s] [PATCH]"
msgid "finish all applied changesets"
msgstr ""
msgid "hg qfinish [-a] [REV]..."
-msgstr ""
+msgstr "hg qfinish [-a] [REV]..."
msgid "list all available queues"
msgstr "visa alla tillgängliga köer"
@@ -4110,9 +4313,15 @@
msgid "create new queue"
msgstr "skapa ny kö"
+msgid "rename active queue"
+msgstr "döp om aktiv kö"
+
msgid "delete reference to queue"
msgstr ""
+msgid "delete queue, and remove patch dir"
+msgstr ""
+
msgid "[OPTION] [QUEUE]"
msgstr "[FLAGGA] [KÖ]"
@@ -4235,8 +4444,10 @@
msgid ""
" [pager]\n"
-" pager = LESS='FSRX' less"
-msgstr ""
+" pager = less -FRSX"
+msgstr ""
+" [pager]\n"
+" pager = less -FRSX"
msgid ""
"If no pager is set, the pager extensions uses the environment variable\n"
@@ -4247,11 +4458,15 @@
"If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
"setting::"
msgstr ""
+"Om du får felmeddelanden om \"BROKEN PIPE\", så kan du deaktivera dem\n"
+"genom att sätta::"
msgid ""
" [pager]\n"
" quiet = True"
msgstr ""
+" [pager]\n"
+" quiet = True"
msgid ""
"You can disable the pager for certain commands by adding them to the\n"
@@ -4283,8 +4498,22 @@
msgid ""
"To ignore global commands like :hg:`version` or :hg:`help`, you have\n"
-"to specify them in the global .hgrc\n"
-msgstr ""
+"to specify them in your user configuration file."
+msgstr ""
+"För att ignorera globala kommandon som :hg:`version` eller :hg:`help`, så\n"
+"måste du ange dem i din användarkonfigurationsfil."
+
+msgid ""
+"The --pager=... option can also be used to control when the pager is\n"
+"used. Use a boolean value like yes, no, on, off, or use auto for\n"
+"normal behavior.\n"
+msgstr ""
+"Flaggan --pager=... kan också användas för att kontrollera när pagineraren\n"
+"används. Använd ett booleskt värde som yes, no, on off, eller använd auto\n"
+"för normalt uppförande.\n"
+
+msgid "when to paginate (boolean, always, auto, or never)"
+msgstr "när paginering ska ske (boolean, always, auto eller never)"
msgid "interpret suffixes to refer to ancestor revisions"
msgstr ""
@@ -4339,12 +4568,6 @@
msgstr ""
msgid ""
-"With the -d/--diffstat option, you will be prompted for each changeset\n"
-"with a diffstat summary and the changeset summary, so you can be sure\n"
-"you are sending the right changes."
-msgstr ""
-
-msgid ""
"To configure other defaults, add a section like this to your hgrc\n"
"file::"
msgstr ""
@@ -4369,39 +4592,6 @@
msgstr ""
msgid ""
-"To avoid sending patches prematurely, it is a good idea to first run\n"
-"the :hg:`email` command with the \"-n\" option (test only). You will be\n"
-"prompted for an email recipient address, a subject and an introductory\n"
-"message describing the patches of your patchbomb. Then when all is\n"
-"done, patchbomb messages are displayed. If the PAGER environment\n"
-"variable is set, your pager will be fired up once for each patchbomb\n"
-"message, so you can verify everything is alright."
-msgstr ""
-
-msgid ""
-"The -m/--mbox option is also very useful. Instead of previewing each\n"
-"patchbomb message in a pager or sending the messages directly, it will\n"
-"create a UNIX mailbox file with the patch emails. This mailbox file\n"
-"can be previewed with any mail user agent which supports UNIX mbox\n"
-"files, e.g. with mutt::"
-msgstr ""
-
-msgid " % mutt -R -f mbox"
-msgstr ""
-
-msgid ""
-"When you are previewing the patchbomb messages, you can use ``formail``\n"
-"(a utility that is commonly installed as part of the procmail\n"
-"package), to send each message out::"
-msgstr ""
-
-msgid " % formail -s sendmail -bm -t < mbox"
-msgstr ""
-
-msgid "That should be all. Now your patchbomb is on its way out."
-msgstr ""
-
-msgid ""
"You can also either configure the method option in the email section\n"
"to be a sendmail compatible mailer or fill out the [smtp] section so\n"
"that the patchbomb extension can automatically send patchbombs\n"
@@ -4416,12 +4606,6 @@
msgid "Please enter a valid value.\n"
msgstr "Ange ett giltigt värde.\n"
-msgid "does the diffstat above look okay?"
-msgstr "ser diffstaten ovanför okej ut?"
-
-msgid "diffstat rejected"
-msgstr "diffstat avvisad"
-
msgid "send changesets by email"
msgstr ""
@@ -4435,10 +4619,21 @@
" Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
" the first line of the changeset description as the subject text.\n"
" The message contains two or three parts. First, the changeset\n"
-" description. Next, (optionally) if the diffstat program is\n"
-" installed and -d/--diffstat is used, the result of running\n"
-" diffstat on the patch. Finally, the patch itself, as generated by\n"
-" :hg:`export`."
+" description."
+msgstr ""
+
+msgid ""
+" With the -d/--diffstat option, if the diffstat program is\n"
+" installed, the result of running diffstat on the patch is inserted."
+msgstr ""
+
+msgid " Finally, the patch itself, as generated by :hg:`export`."
+msgstr ""
+
+msgid ""
+" With the -d/--diffstat or -c/--confirm options, you will be presented\n"
+" with a final summary of all messages and asked for confirmation before\n"
+" the messages are sent."
msgstr ""
msgid ""
@@ -4461,6 +4656,23 @@
msgstr ""
msgid ""
+" With -m/--mbox, instead of previewing each patchbomb message in a\n"
+" pager or sending the messages directly, it will create a UNIX\n"
+" mailbox file with the patch emails. This mailbox file can be\n"
+" previewed with any mail user agent which supports UNIX mbox\n"
+" files."
+msgstr ""
+
+msgid ""
+" With -n/--test, all steps will run, but mail will not be sent.\n"
+" You will be prompted for an email recipient address, a subject and\n"
+" an introductory message describing the patches of your patchbomb.\n"
+" Then when all is done, patchbomb messages are displayed. If the\n"
+" PAGER environment variable is set, your pager will be fired up once\n"
+" for each patchbomb message, so you can verify everything is alright."
+msgstr ""
+
+msgid ""
" hg email -r 3000 # send patch 3000 only\n"
" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
" hg email -r 3000:3005 # send patches 3000 through 3005\n"
@@ -4483,11 +4695,23 @@
msgstr ""
msgid ""
+" hg email -o -m mbox && # generate an mbox file...\n"
+" mutt -R -f mbox # ... and view it with mutt\n"
+" hg email -o -m mbox && # generate an mbox file ...\n"
+" formail -s sendmail \\ # ... and use formail to send from the "
+"mbox\n"
+" -bm -t < mbox # ... using sendmail"
+msgstr ""
+
+msgid ""
" Before using this command, you will need to enable email in your\n"
" hgrc. See the [email] section in hgrc(5) for details.\n"
" "
msgstr ""
+msgid "no changes found\n"
+msgstr "inga ändringar hittades\n"
+
msgid "specify at least one changeset with -r or -o"
msgstr ""
@@ -4509,17 +4733,37 @@
msgid "This patch series consists of %d patches."
msgstr ""
-msgid "Final summary:\n"
+msgid ""
+"\n"
+"Final summary:"
+msgstr ""
+
+msgid "are you sure you want to send (yn)?"
+msgstr ""
+
+msgid "&No"
+msgstr ""
+
+msgid "&Yes"
+msgstr ""
+
+msgid "patchbomb canceled"
msgstr ""
msgid "Displaying "
-msgstr ""
+msgstr "Visar "
msgid "Writing "
-msgstr ""
+msgstr "Skriver "
+
+msgid "writing"
+msgstr "skriver"
msgid "Sending "
-msgstr ""
+msgstr "Sänder "
+
+msgid "sending"
+msgstr "sänder"
msgid "send patches as attachments"
msgstr ""
@@ -4533,6 +4777,9 @@
msgid "email addresses of copy recipients"
msgstr ""
+msgid "ask for confirmation before sending"
+msgstr ""
+
msgid "add diffstat output to messages"
msgstr ""
@@ -4804,6 +5051,12 @@
msgid "cannot use both keepbranches and extrafn"
msgstr ""
+msgid "rebasing"
+msgstr ""
+
+msgid "changesets"
+msgstr "ändringar"
+
msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
msgstr "fixa olösta konflikter med hg resolve, kör sedan hg rebase --continue"
@@ -4954,9 +5207,6 @@
" Om filer inte anges, kommer alla ändringar som :hg:`status`\n"
" rapporterar att arkiveras."
-msgid " See :hg:`help dates` for a list of formats valid for -d/--date."
-msgstr " Se :hg:`help dates` för en lista med giltiga format för -d/--date."
-
msgid ""
" You will be prompted for whether to record changes to each\n"
" modified file, and for files with multiple changes, for each\n"
@@ -4998,9 +5248,6 @@
msgid "no changes to record\n"
msgstr ""
-msgid "patch failed to apply"
-msgstr ""
-
msgid "hg record [OPTION]... [FILE]..."
msgstr ""
@@ -5076,9 +5323,6 @@
msgid "not linkable: %s\n"
msgstr "inte länkbar: %s\n"
-msgid " files"
-msgstr " filer"
-
msgid "pruning"
msgstr "putsar"
@@ -5162,15 +5406,16 @@
msgstr ""
msgid ""
-" NOTE: using rollback or extensions that destroy/modify history\n"
-" (mq, rebase, etc.) can cause considerable confusion with shared\n"
-" clones. In particular, if two shared clones are both updated to\n"
-" the same changeset, and one of them destroys that changeset with\n"
-" rollback, the other clone will suddenly stop working: all\n"
-" operations will fail with \"abort: working directory has unknown\n"
-" parent\". The only known workaround is to use debugsetparents on\n"
-" the broken clone to reset it to a changeset that still exists\n"
-" (e.g. tip).\n"
+" .. note::\n"
+" using rollback or extensions that destroy/modify history (mq,\n"
+" rebase, etc.) can cause considerable confusion with shared\n"
+" clones. In particular, if two shared clones are both updated to\n"
+" the same changeset, and one of them destroys that changeset\n"
+" with rollback, the other clone will suddenly stop working: all\n"
+" operations will fail with \"abort: working directory has unknown\n"
+" parent\". The only known workaround is to use debugsetparents on\n"
+" the broken clone to reset it to a changeset that still exists\n"
+" (e.g. tip).\n"
" "
msgstr ""
@@ -5221,7 +5466,7 @@
msgid "%s: empty changeset"
msgstr ""
-msgid "Fix up the merge and run hg transplant --continue"
+msgid "fix up the merge and run hg transplant --continue"
msgstr ""
#, python-format
@@ -5334,6 +5579,11 @@
msgid "outstanding local changes"
msgstr ""
+msgid ""
+"``transplanted(set)``\n"
+" Transplanted changesets in set."
+msgstr ""
+
msgid "pull patches from REPO"
msgstr ""
@@ -5517,6 +5767,11 @@
"** = %sdecode:\n"
msgstr ""
+msgid ""
+"win32text is deprecated: http://mercurial.selenic.com/wiki/"
+"Win32TextExtension\n"
+msgstr ""
+
msgid "discover and advertise repositories on the local network"
msgstr ""
@@ -5566,18 +5821,6 @@
msgid "integrity check failed on %s:%d"
msgstr ""
-#, python-format
-msgid "%s: not a Mercurial bundle file"
-msgstr ""
-
-#, python-format
-msgid "%s: unknown bundle version"
-msgstr ""
-
-#, python-format
-msgid "%s: unknown bundle compression type"
-msgstr ""
-
msgid "cannot create new bundle repository"
msgstr ""
@@ -5585,6 +5828,14 @@
msgid "premature EOF reading chunk (got %d bytes, expected %d)"
msgstr ""
+#, python-format
+msgid "%s: not a Mercurial bundle"
+msgstr "%s: inte en Mercurial-buntfil"
+
+#, python-format
+msgid "%s: unknown bundle version %s"
+msgstr "%s: okänd buntversion %s"
+
msgid "empty username"
msgstr "tomt användarnamn"
@@ -5609,9 +5860,6 @@
msgid "limit must be positive"
msgstr ""
-msgid "too many revisions specified"
-msgstr "för många revisioner angivna"
-
#, python-format
msgid "invalid format spec '%%%s' in output filename"
msgstr ""
@@ -5629,6 +5877,11 @@
msgstr ""
#, python-format
+msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
+msgstr ""
+"%s har inte arkiverats än, så ingen kopieringsinformation lagras för %s.\n"
+
+#, python-format
msgid "%s: not copying - file is not managed\n"
msgstr ""
@@ -5668,10 +5921,6 @@
msgid "copying %s to %s\n"
msgstr ""
-#, python-format
-msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
-msgstr ""
-
msgid "no source or destination specified"
msgstr ""
@@ -5768,6 +6017,10 @@
msgid "can only follow copies/renames for explicit filenames"
msgstr ""
+#, python-format
+msgid "skipping missing subrepository: %s\n"
+msgstr ""
+
msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
msgstr ""
@@ -5928,13 +6181,6 @@
" som upptäcks vara binära. Med -a, kommer filen att annoteras ändå, även\n"
" om resultatet antagligen inte kommer att vara användbart."
-msgid ""
-" Returns 0 on success.\n"
-" "
-msgstr ""
-" Returnerar 0 om kommandot lyckades.\n"
-" "
-
msgid "at least one filename or pattern is required"
msgstr ""
@@ -6010,32 +6256,50 @@
msgstr "omvänd effekten från en tidigare ändring"
msgid ""
-" Commit the backed out changes as a new changeset. The new\n"
-" changeset is a child of the backed out changeset."
-msgstr ""
-" Arkivera de återkallade ändringarna som en ny ändring. Den nya\n"
-" ändringen är ett barn till den återkallade ändringen."
-
-msgid ""
-" If you backout a changeset other than the tip, a new head is\n"
-" created. This head will be the new tip and you should merge this\n"
-" backout changeset with another head."
-msgstr ""
-" Om du återkallar en annan ändring än toppen, skapas ett nytt huvud.\n"
-" Detta huvud kommer att vara en nya toppen och du bör sammanfoga den med\n"
-" ett annat huvud."
-
-msgid ""
+" The backout command merges the reverse effect of the reverted\n"
+" changeset into the working directory."
+msgstr ""
+" Kommandot backout sammanfogar den omvända effekven av den återkallade\n"
+" ändringen i arbetskatalogen."
+
+msgid ""
+" With the --merge option, it first commits the reverted changes\n"
+" as a new changeset. This new changeset is a child of the reverted\n"
+" changeset.\n"
" The --merge option remembers the parent of the working directory\n"
" before starting the backout, then merges the new head with that\n"
-" changeset afterwards. This saves you from doing the merge by hand.\n"
-" The result of this merge is not committed, as with a normal merge."
-msgstr ""
+" changeset afterwards.\n"
+" This will result in an explicit merge in the history."
+msgstr ""
+" Med flaggan --merge arkiveras först de återkallade ändringarna som en\n"
+" ny ändring. Denna ny ändring är en ättling till den återkallade\n"
+" ändringen.\n"
" Flaggan --merge kommer ihåg arbetskatalogens förälder innan\n"
" återkallningen påbörjas, och sammanfogar sedan det nya huvudet med den\n"
-" ändringen efteråt. Detta gör att du inte behöver göra sammanfogningen\n"
-" manuellt. Resultatet av sammanfogningen arkiveras inte, precis som en\n"
-" vanlig sammanfogning."
+" ändringen efteråt.\n"
+" Detta resulterar i en explicit sammanfogning i historiken"
+
+msgid ""
+" If you backout a changeset other than the original parent of the\n"
+" working directory, the result of this merge is not committed,\n"
+" as with a normal merge. Otherwise, no merge is needed and the\n"
+" commit is automatic."
+msgstr ""
+" Om du tar tillbaka en annan ändring än originalföräldern till\n"
+" arbetskatalogen, så arkiveras inte resultatet av sammanfogningen, som\n"
+" vid en normal sammanfogning. Annars behövs ingen sammanfogning, och\n"
+" arkiveringen är automatisk."
+
+msgid ""
+" Note that the default behavior (without --merge) has changed in\n"
+" version 1.7. To restore the previous default behavior, use\n"
+" :hg:`backout --merge` and then :hg:`update --clean .` to get rid of\n"
+" the ongoing merge."
+msgstr ""
+" Notera att standardförfarandet (utan --merge) har ändrats i version\n"
+" 1.7. För att återställa det gamla standardförfarandet, använd :hg:`\n"
+" backout --merge` och sedan :hg:`update --clean .` för att bli av med\n"
+" den pågående sammanfogningen."
msgid "please specify just one revision"
msgstr "specificera bara en revision"
@@ -6067,12 +6331,6 @@
msgid "merging with changeset %s\n"
msgstr "sammanfogar med ändring %s\n"
-msgid "the backout changeset is a new head - do not forget to merge\n"
-msgstr "återkallningsändringen är ett nytt huvud - glöm inte att sammanfoga\n"
-
-msgid "(use \"backout --merge\" if you want to auto-merge)\n"
-msgstr "(använd \"backout --merge\" om du vill auto-sammanfoga)\n"
-
msgid "subdivision search of changesets"
msgstr "genomsökning av ändringar med halveringsmetoden"
@@ -6120,6 +6378,12 @@
msgid "The first bad revision is:\n"
msgstr "Den första dåliga revisionen är:\n"
+#, python-format
+msgid ""
+"Not all ancestors of this changeset have been checked.\n"
+"To check the other ancestors, start from the common ancestor, %s.\n"
+msgstr ""
+
msgid "Due to skipped revisions, the first good revision could be any of:\n"
msgstr ""
"Tack vare skippade revisioner, är den första bra revisionen någon av:\n"
@@ -6490,11 +6754,15 @@
" eller flaggorna -I/-X."
msgid ""
-" If no commit message is specified, the configured editor is\n"
-" started to prompt you for a message."
-msgstr ""
-" Om inget arkiveringsmeddelande anges, kommer den konfigurerade editorn\n"
-" att startas och fråga om meddelandet."
+" If no commit message is specified, Mercurial starts your\n"
+" configured editor where you can enter a message. In case your\n"
+" commit fails, you will find a backup of your message in\n"
+" ``.hg/last-message.txt``."
+msgstr ""
+" Om inget arkiveringsmeddelande anges, startar Mercurial din\n"
+" konfigurerade editor där du kan skriva ett meddelande. Om din\n"
+" arkivering misslyckas, kommer du att hitta en säkerhetskopia av ditt\n"
+" meddelande i ``.hg/last-message.txt``."
msgid ""
" Returns 0 on success, 1 if nothing changed.\n"
@@ -6600,7 +6868,7 @@
msgid ""
" All string valued-elements are either strictly alphanumeric, or must\n"
-" be enclosed in double quotes (\"...\"), with \"\" as escape character."
+" be enclosed in double quotes (\"...\"), with \"\\\" as escape character."
msgstr ""
msgid ""
@@ -6759,7 +7027,8 @@
msgid " (check that your locale is properly set)\n"
msgstr ""
-msgid "Checking extensions...\n"
+#, python-format
+msgid "Checking installed modules (%s)...\n"
msgstr ""
msgid " One or more extensions could not be found"
@@ -6788,12 +7057,12 @@
msgid ""
" (Current patch tool may be incompatible with patch, or misconfigured. "
-"Please check your .hgrc file)\n"
+"Please check your configuration file)\n"
msgstr ""
msgid ""
" Internal patcher failure, please report this error to http://mercurial."
-"selenic.com/bts/\n"
+"selenic.com/wiki/BugTracker\n"
msgstr ""
msgid "Checking commit editor...\n"
@@ -6802,7 +7071,7 @@
msgid " No commit editor set and can't find vi in PATH\n"
msgstr ""
-msgid " (specify a commit editor in your .hgrc file)\n"
+msgid " (specify a commit editor in your configuration file)\n"
msgstr ""
#, python-format
@@ -6812,7 +7081,7 @@
msgid "Checking username...\n"
msgstr ""
-msgid " (specify a username in your .hgrc file)\n"
+msgid " (specify a username in your configuration file)\n"
msgstr ""
msgid "No problems detected\n"
@@ -6846,13 +7115,15 @@
msgstr " Skillnaderna mellan filerna visas i unified diff-format."
msgid ""
-" NOTE: diff may generate unexpected results for merges, as it will\n"
-" default to comparing against the working directory's first parent\n"
-" changeset if no revisions are specified."
-msgstr ""
-" NOTERA: diff kan generera oväntade resultat för sammanfogningar,\n"
-" eftersom den som standard kommer att jämföra mot arbetskatalogens\n"
-" tidigare ändring om ingen revision anges."
+" .. note::\n"
+" diff may generate unexpected results for merges, as it will\n"
+" default to comparing against the working directory's first\n"
+" parent changeset if no revisions are specified."
+msgstr ""
+" .. note::\n"
+" diff kan generera oväntade resultat för sammanfogningar eftersom\n"
+" den som standard kommer att jämföra mot arbetskatalogens tidigare\n"
+" ändring om ingen revision anges."
msgid ""
" Alternatively you can specify -c/--change with a revision to see\n"
@@ -6893,13 +7164,14 @@
" arkiveringskommentar."
msgid ""
-" NOTE: export may generate unexpected diff output for merge\n"
-" changesets, as it will compare the merge changeset against its\n"
-" first parent only."
-msgstr ""
-" NOTERA: export kan generera oväntade resultat för sammanfogningar,\n"
-" eftersom den som standard bara kommer att jämföra mot den första\n"
-" föräldern."
+" .. note::\n"
+" export may generate unexpected diff output for merge\n"
+" changesets, as it will compare the merge changeset against its\n"
+" first parent only."
+msgstr ""
+" .. note::\n"
+" export kan generera oväntade resultat för sammanfogningar, eftersom\n"
+" den som standard bara kommer att jämföra mot den första föräldern."
msgid ""
" Output may be to a file, in which case the name of the file is\n"
@@ -6910,20 +7182,20 @@
msgid ""
" :``%%``: literal \"%\" character\n"
-" :``%H``: changeset hash (40 bytes of hexadecimal)\n"
+" :``%H``: changeset hash (40 hexadecimal digits)\n"
" :``%N``: number of patches being generated\n"
" :``%R``: changeset revision number\n"
" :``%b``: basename of the exporting repository\n"
-" :``%h``: short-form changeset hash (12 bytes of hexadecimal)\n"
+" :``%h``: short-form changeset hash (12 hexadecimal digits)\n"
" :``%n``: zero-padded sequence number, starting at 1\n"
" :``%r``: zero-padded changeset revision number"
msgstr ""
" :``%%``: ett \"%\"-tecken\n"
-" :``%H``: ändringshash (40 hexadecimala bytes)\n"
+" :``%H``: ändringshash (40 hexadecimala siffror)\n"
" :``%N``: antal genererade patchar\n"
" :``%R``: ändringens revisionsnummer\n"
" :``%b``: basnamn för det exporterande arkivet\n"
-" :``%h``: kort ändringshash (12 hexadecimala bytes)\n"
+" :``%h``: kort ändringshash (12 hexadecimala siffror)\n"
" :``%n``: nollpaddat sekvensnummer, börjar med 1\n"
" :``%r``: nollpaddat ändringsrevisionsnummer"
@@ -7142,6 +7414,14 @@
msgstr "(ingen hjälptext tillgänglig)"
#, python-format
+msgid "shell alias for::"
+msgstr "skal-alias för::"
+
+#, python-format
+msgid " %s"
+msgstr " %s"
+
+#, python-format
msgid "alias for: hg %s"
msgstr "alias för: hg %s"
@@ -7331,6 +7611,9 @@
" Returnerar 0 om det finns inkommande ändringar, 1 annars.\n"
" "
+msgid "cannot combine --bundle and --subrepos"
+msgstr ""
+
msgid "create a new repository in the given directory"
msgstr "skapa ett nytt arkiv i den angivna katalogen"
@@ -7412,12 +7695,12 @@
" följer bara den första föräldern i revisoner med sammanfogningar."
msgid ""
-" If no revision range is specified, the default is tip:0 unless\n"
+" If no revision range is specified, the default is ``tip:0`` unless\n"
" --follow is set, in which case the working directory parent is\n"
" used as the starting revision. You can specify a revision set for\n"
" log, see :hg:`help revsets` for more information."
msgstr ""
-" Om ingen revisionsserie specificeras, används tip:0 som standard om\n"
+" Om ingen revisionsserie specificeras, används ``tip:0`` som standard om\n"
" inte --follow är satt, då arbetskatalogens förälder används som första\n"
" revision. Du kan ange ett revisionsset för log, se :hg:`help revsets`\n"
" för mer information."
@@ -7434,15 +7717,17 @@
" visas listan med ändrade filer och fullständigt arkiveringsmeddelande."
msgid ""
-" NOTE: log -p/--patch may generate unexpected diff output for merge\n"
-" changesets, as it will only compare the merge changeset against\n"
-" its first parent. Also, only files different from BOTH parents\n"
-" will appear in files:."
-msgstr ""
-" NOTERA: log -p/--patch kan generera oväntad diff-utmatning för\n"
-" sammanfogningar, eftersom det bara kommer att jämföra ändringen mot den\n"
-" första förälder. Dessutom kommer bara filer som skiljer sig från BÅDA\n"
-" föräldrarna att visas i filer:."
+" .. note::\n"
+" log -p/--patch may generate unexpected diff output for merge\n"
+" changesets, as it will only compare the merge changeset against\n"
+" its first parent. Also, only files different from BOTH parents\n"
+" will appear in files:."
+msgstr ""
+" .. note::\n"
+" log -p/--patch kan generera oväntad diff-utmatning för\n"
+" sammanfogningar, eftersom det bara kommer att jämföra ändringen mot\n"
+" den första förälder. Dessutom kommer bara filer som skiljer sig från\n"
+" BÅDA föräldrarna att visas i filer:."
msgid "output the current or given revision of the project manifest"
msgstr "visa den nuvarande eller angivna revisionen av projektmanifestet"
@@ -7485,6 +7770,15 @@
" föräldrar."
msgid ""
+" ``--tool`` can be used to specify the merge tool used for file\n"
+" merges. It overrides the HGMERGE environment variable and your\n"
+" configuration files."
+msgstr ""
+" ``--tool`` kan användas för att ange sammanfogningsverktyg att\n"
+" använda för filsammanfogningar. Det har högre prioritet än\n"
+" miljövariabeln HGMERGE och dina konfigurationsfiler."
+
+msgid ""
" If no revision is specified, the working directory's parent is a\n"
" head revision, and the current branch contains exactly one other\n"
" head, the other head is merged with by default. Otherwise, an\n"
@@ -7495,6 +7789,9 @@
" det andra huvudet som standard. Om inte, måste en explicit revision\n"
" anges."
+msgid " :hg:`resolve` must be used to resolve unresolved files."
+msgstr " :hg:`resolve` måste användas för att lösa olästa filer."
+
msgid ""
" To undo an uncommitted merge, use :hg:`update --clean .` which\n"
" will check out a clean copy of the original merge parent, losing\n"
@@ -7596,12 +7893,13 @@
" definitionen för alla tillgängliga namn."
msgid ""
-" Path names are defined in the [paths] section of\n"
-" ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a\n"
+" Path names are defined in the [paths] section of your\n"
+" configuration file and in ``/etc/mercurial/hgrc``. If run inside a\n"
" repository, ``.hg/hgrc`` is used, too."
msgstr ""
-" Sökvägar definieras i sektionen [paths] i ``/etc/mercurial/hgrc`` och\n"
-" ``$HOME/.hgrc``. Om det körs i ett arkiv, så används ``.hg/hgrc`` också."
+" Sökvägar definieras i sektionen [paths] i din konfigurationsfil och i\n"
+" ``/etc/mercurial/hgrc``. Om det körs i ett arkiv, så används\n"
+" ``.hg/hgrc`` också."
msgid ""
" The path names ``default`` and ``default-push`` have a special\n"
@@ -7675,6 +7973,13 @@
" filer.\n"
" "
+msgid ""
+"other repository doesn't support revision lookup, so a rev cannot be "
+"specified."
+msgstr ""
+"det andra arkivet stödjer inte revisionsuppslag, så en revision kan inte "
+"anges."
+
msgid "push changes to the specified destination"
msgstr "tryck ändringar till den specificerade destinationen"
@@ -7830,17 +8135,17 @@
msgstr "raderar inte %s: filen är inte hanterad\n"
#, python-format
-msgid "not removing %s: file %s (use -f to force removal)\n"
-msgstr "raderar inte %s: filen %s (använd -f för att tvinga)\n"
-
-msgid "still exists"
-msgstr "existerar fortfarande"
-
-msgid "is modified"
-msgstr "är modifierad"
-
-msgid "has been marked for add"
-msgstr "har markerats för addering"
+msgid "not removing %s: file still exists (use -f to force removal)\n"
+msgstr "raderar inte %s: filen finns fortfarande (använd -f för att tvinga)\n"
+
+#, python-format
+msgid "not removing %s: file is modified (use -f to force removal)\n"
+msgstr "raderar inte %s: filen är ändrad (använd -f för att tvinga)\n"
+
+#, python-format
+msgid ""
+"not removing %s: file has been marked for add (use -f to force removal)\n"
+msgstr "raderar inte %s: filen har lags till (använd -f för att tvinga)\n"
msgid "rename files; equivalent of copy + remove"
msgstr "döp om filer; likvärdig med kopiering + radering"
@@ -7862,58 +8167,55 @@
" namnbyte innan det, se :hg:`revert`.\n"
" "
-msgid "various operations to help finish a merge"
-msgstr "diverse operationer för att slutföra sammanfogningar"
-
-msgid ""
-" This command includes several actions that are often useful while\n"
-" performing a merge, after running ``merge`` but before running\n"
-" ``commit``. (It is only meaningful if your working directory has\n"
-" two parents.) It is most relevant for merges with unresolved\n"
-" conflicts, which are typically a result of non-interactive merging with\n"
-" ``internal:merge`` or a command-line merge tool like ``diff3``."
-msgstr ""
-" Det här kommandot inkludera flera handlingar som ofta är nyttiga när\n"
-" en sammanfogning utförs, efter att ``merge`` körts men innan\n"
-" ``commit``. (Det är bara nyttigt om din arbetskatalog har två\n"
-" föräldrar.) Det är mest relevant för sammanfogningar med olösta\n"
-" konflikter, som är vanliga resultat av icke-interaktiv sammanfogning\n"
-" med ``internal:merge`` eller ett kommandoradsverktyg som ``diff3``."
-
-msgid " The available actions are:"
-msgstr " Tillgängliga handlingar är:"
-
-msgid ""
-" 1) list files that were merged with conflicts (U, for unresolved)\n"
-" and without conflicts (R, for resolved): ``hg resolve -l``\n"
-" (this is like ``status`` for merges)\n"
-" 2) record that you have resolved conflicts in certain files:\n"
-" ``hg resolve -m [file ...]`` (default: mark all unresolved files)\n"
-" 3) forget that you have resolved conflicts in certain files:\n"
-" ``hg resolve -u [file ...]`` (default: unmark all resolved files)\n"
-" 4) discard your current attempt(s) at resolving conflicts and\n"
-" restart the merge from scratch: ``hg resolve file...``\n"
-" (or ``-a`` for all unresolved files)"
-msgstr ""
-" 1) visa filer som är sammanfogade med konflikter (U för olösta) och\n"
-" utan konflikter (R för lösta): ``hg resolve -l`` (detta är som\n"
-" ``status`` för sammanfogningar)\n"
-" 2) lagra att du har löst konflikter i vissa filer:\n"
-" ``hg resolve -m [fil ...]`` (standard: markera alla olösta filer)\n"
-" 3) glöm att du har löst konflikter i vissa filer\n"
-" ``hg resolve -u [fil ...]`` (standard: avmarkera alla lösta filer)\n"
-" 4) kasta bort ditt nuvarande försök att lösa konflikter och starta\n"
-" sammanfogningen från noll: ``hg resolve fil...`` (eller ``-a``\n"
-" för alla olösta filer)"
-
-msgid ""
-" Note that Mercurial will not let you commit files with unresolved merge\n"
-" conflicts. You must use ``hg resolve -m ...`` before you can commit\n"
-" after a conflicting merge."
+msgid "redo merges or set/view the merge status of files"
+msgstr ""
+
+msgid ""
+" Merges with unresolved conflicts are often the result of\n"
+" non-interactive merging using the ``internal:merge`` configuration\n"
+" setting, or a command-line merge tool like ``diff3``. The resolve\n"
+" command is used to manage the files involved in a merge, after\n"
+" :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the\n"
+" working directory must have two parents)."
+msgstr ""
+
+msgid " The resolve command can be used in the following ways:"
+msgstr ""
+
+msgid ""
+" - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the "
+"specified\n"
+" files, discarding any previous merge attempts. Re-merging is not\n"
+" performed for files already marked as resolved. Use ``--all/-a``\n"
+" to selects all unresolved files. ``--tool`` can be used to specify\n"
+" the merge tool used for the given files. It overrides the HGMERGE\n"
+" environment variable and your configuration files."
+msgstr ""
+
+msgid ""
+" - :hg:`resolve -m [FILE]`: mark a file as having been resolved\n"
+" (e.g. after having manually fixed-up the files). The default is\n"
+" to mark all unresolved files."
+msgstr ""
+
+msgid ""
+" - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The\n"
+" default is to mark all resolved files."
+msgstr ""
+
+msgid ""
+" - :hg:`resolve -l`: list files which had or still have conflicts.\n"
+" In the printed list, ``U`` = unresolved and ``R`` = resolved."
+msgstr ""
+
+msgid ""
+" Note that Mercurial will not let you commit files with unresolved\n"
+" merge conflicts. You must use :hg:`resolve -m ...` before you can\n"
+" commit after a conflicting merge."
msgstr ""
" Notera att Mercurial inte låter dig arkivera filer med olösta\n"
-" konflikter från sammanfogningar. Du måste använda ``hg resolve -m ...``\n"
-" innan du kan arkivera efter en sammanfogning med konflikter"
+" konflikter från sammanfogningar. Du måste använda :hg:`resolve -m ...`\n"
+" innan du kan arkivera efter en sammanfogning med konflikter."
msgid ""
" Returns 0 on success, 1 if any files fail a resolve attempt.\n"
@@ -7937,19 +8239,20 @@
msgstr "återställ filer eller kataloger till ett tidigare tillstånd"
msgid ""
-" NOTE: This command is most likely not what you are looking for. revert\n"
-" will partially overwrite content in the working directory without "
-"changing\n"
-" the working directory parents. Use :hg:`update -r rev` to check out "
-"earlier\n"
-" revisions, or :hg:`update --clean .` to undo a merge which has added\n"
-" another parent."
-msgstr ""
-" NOTERA: Det här kommandot är troligtvis inte det du letar efter.\n"
-" revert kommer att delvis skriva över innehåll i arbetskatalogen utan\n"
-" att ändra arbetskatalogens föräldrar. Använd :hg:`update -r rev` för\n"
-" att hämta ut tidigare revisioner, eller :hg:`update --clean .` för att\n"
-" ångra en sammanfogning som har lagt till fler föräldrar."
+" .. note::\n"
+" This command is most likely not what you are looking for.\n"
+" Revert will partially overwrite content in the working\n"
+" directory without changing the working directory parents. Use\n"
+" :hg:`update -r rev` to check out earlier revisions, or\n"
+" :hg:`update --clean .` to undo a merge which has added another\n"
+" parent."
+msgstr ""
+" .. note::\n"
+" Det här kommandot är troligtvis inte det du letar efter. Revert\n"
+" kommer att delvis skriva över innehåll i arbetskatalogen utan att\n"
+" ändra arbetskatalogens föräldrar. Använd :hg:`update -r rev` för att\n"
+" hämta ut tidigare revisioner, eller :hg:`update --clean .` för att\n"
+" ångra en sammanfogning som har lagt till fler föräldrar."
msgid ""
" With no revision specified, revert the named files or directories\n"
@@ -8153,6 +8456,9 @@
" För att låta servern välja ett ledigt portnummer att lyssna på, ange 0\n"
" som portnummer; då visar servern det portnummer som används."
+msgid "There is no Mercurial repository here (.hg not found)"
+msgstr "Det finns inget Mercurial-arkiv här (.hg hittades inte)"
+
#, python-format
msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
msgstr "lyssnar på http://%s%s/%s (bunden till %s:%d)\n"
@@ -8182,15 +8488,17 @@
" inte bes om explicit med -u/--unknown eller -i/--ignored."
msgid ""
-" NOTE: status may appear to disagree with diff if permissions have\n"
-" changed or a merge has occurred. The standard diff format does not\n"
-" report permission changes and diff only reports changes relative\n"
-" to one merge parent."
-msgstr ""
-" NOTERA: status kan verka osams med diff om tillstånd har ändrat eller\n"
-" en sammanfogning har utförts. Det vanliga diff-formatet rapporterar\n"
-" inte förändringar av tillstånd och diff rapporterar bara ändringar\n"
-" relativt till en förälder vid sammanfogningar."
+" .. note::\n"
+" status may appear to disagree with diff if permissions have\n"
+" changed or a merge has occurred. The standard diff format does\n"
+" not report permission changes and diff only reports changes\n"
+" relative to one merge parent."
+msgstr ""
+" .. note::\n"
+" status kan verka osams med diff om tillstånd har ändrat eller en\n"
+" sammanfogning har utförts. Det vanliga diff-formatet rapporterar\n"
+" inte förändringar av tillstånd och diff rapporterar bara ändringar\n"
+" relativt till en förälder vid sammanfogningar."
msgid ""
" If one revision is given, it is used as the base revision.\n"
@@ -8460,17 +8768,20 @@
msgid ""
" Update the repository's working directory to the specified\n"
+" changeset. If no changeset is specified, update to the tip of the\n"
+" current named branch."
+msgstr ""
+" Uppdatera arkivets arbetskatalog till den angivna ändringen. Om ingen\n"
+" ändring anes, så uppdateras till toppen på den nuvarande namngivna\n"
+" grenen."
+
+msgid ""
+" If the changeset is not a descendant of the working directory's\n"
+" parent, the update is aborted. With the -c/--check option, the\n"
+" working directory is checked for uncommitted changes; if none are\n"
+" found, the working directory is updated to the specified\n"
" changeset."
-msgstr " Uppdatera arkivets arbetskatalog till den specificerade ändringen."
-
-msgid ""
-" If no changeset is specified, attempt to update to the tip of the\n"
-" current branch. If this changeset is a descendant of the working\n"
-" directory's parent, update to it, otherwise abort."
-msgstr ""
-" Om ingen ändring anges, kommer ett försök att göras för att hämta ut\n"
-" toppen på den nuvarande grenen. Om ändringen är en ättling till\n"
-" arbetskatalogens föräldrar, uppdatera till det, annars avbryt."
+msgstr ""
msgid ""
" The following rules apply when the working directory contains\n"
@@ -8515,15 +8826,15 @@
" Use null as the changeset to remove the working directory (like\n"
" :hg:`clone -U`)."
msgstr ""
-" Använd null som ändring för att radera arbetskatalogen (som :hg:`clone\n"
-" -U`)."
-
-msgid ""
-" If you want to update just one file to an older changeset, use :hg:"
-"`revert`."
-msgstr ""
-" Om du vill uppdatera bara en fil till en äldre ändring, använd :hg:"
-"`revert`."
+" Använd null som ändring för att radera arbetskatalogen (som\n"
+" :hg:`clone -U`)."
+
+msgid ""
+" If you want to update just one file to an older changeset, use\n"
+" :hg:`revert`."
+msgstr ""
+" Om du vill uppdatera bara en fil till en äldre ändring, använd\n"
+" :hg:`revert`."
msgid "cannot specify both -c/--check and -C/--clean"
msgstr ""
@@ -8554,14 +8865,15 @@
msgid "Mercurial Distributed SCM (version %s)\n"
msgstr "Mercurial Distribuerad SCM (version %s)\n"
-msgid ""
-"\n"
-"Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
+msgid "(see http://mercurial.selenic.com for more information)"
+msgstr "(se http://mercurial.selenic.com för mer information)"
+
+msgid ""
+"Copyright (C) 2005-2010 Matt Mackall and others\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
-"\n"
-"Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> och andra\n"
+"Copyright (C) 2005-2010 Matt Mackall och andra\n"
"Detta är fri mjukvara; se källkoden för kopieringsvillkor. Det ges INGEN\n"
"garanti; inte ens för SÄLJBARHET eller ATT PASSA FÖR ETT VISST ÄNDAMÅL.\n"
@@ -8697,6 +9009,9 @@
msgid "guess renamed files by similarity (0<=s<=100)"
msgstr "gissa omdöpta filer efter likhet (0<=s<=100)"
+msgid "recurse into subrepositories"
+msgstr "gå in i underarkiv"
+
msgid "[OPTION]... [FILE]..."
msgstr "[FLAGGA]... [FIL]..."
@@ -8754,6 +9069,9 @@
msgid "parent to choose when backing out merge"
msgstr "förälder att välja när en sammanfogning återkallas"
+msgid "specify merge tool"
+msgstr "ange sammanfogningsverktyg"
+
msgid "revision to backout"
msgstr "revision att återkalla"
@@ -8916,6 +9234,9 @@
msgid "[PATH]"
msgstr "[SÖKVÄG]"
+msgid "revlog format"
+msgstr ""
+
msgid "REPO NAMESPACE [KEY OLD NEW]"
msgstr ""
@@ -8980,20 +9301,23 @@
msgid "[OPTION]... PATTERN [FILE]..."
msgstr "[FLAGGA]... MÖNSTER [FIL]..."
-msgid "show only heads which are descendants of REV"
-msgstr "visa bara huvuden som har REV som anfader"
+msgid "show only heads which are descendants of STARTREV"
+msgstr "visa bara huvuden som är ättlingar till STARTREV"
+
+msgid "STARTREV"
+msgstr "STARTREV"
msgid "show topological heads only"
msgstr "visa bara topologiska huvuden"
-msgid "show active branchheads only [DEPRECATED]"
-msgstr "visa bara aktiva grenhuvuden [FÖRLEGAD]"
+msgid "show active branchheads only (DEPRECATED)"
+msgstr "visa bara aktiva grenhuvuden (FÖRLEGAD)"
msgid "show normal and closed branch heads"
msgstr "visa normala och stängda grenhuvuden"
-msgid "[-ac] [-r REV] [REV]..."
-msgstr "[-ac] [-r REV] [REV]..."
+msgid "[-ac] [-r STARTREV] [REV]..."
+msgstr "[-ac] [-r STARTREV] [REV]..."
msgid "[TOPIC]"
msgstr "[ÄMNE]"
@@ -9181,10 +9505,10 @@
msgstr "visa status för filer som behöver sammanfogas"
msgid "mark files as resolved"
-msgstr "markera filen som löst"
-
-msgid "unmark files as resolved"
-msgstr "avmarkera filen som löst"
+msgstr "markera filer som lösta"
+
+msgid "mark files as unresolved"
+msgstr "markera filer som olösta"
msgid "hide status prefix"
msgstr "göm statusprefix"
@@ -9228,8 +9552,8 @@
msgid "name to show in web pages (default: working directory)"
msgstr "namn att visa i webbsidor (standard: arbetskatalogen)"
-msgid "name of the hgweb config file (serve more than one repository)"
-msgstr "namn på webdir-konfigurationsfil (dela ut mer än ett arkiv)"
+msgid "name of the hgweb config file (see \"hg help hgweb\")"
+msgstr "namn på webdir-konfigurationsfil (se \"hg help hgweb\")"
msgid "name of the hgweb config file (DEPRECATED)"
msgstr "namn på webdir-konfigurationsfil (FÖRLEGAD)"
@@ -9321,8 +9645,8 @@
msgid "discard uncommitted changes (no backup)"
msgstr "kassera oarkiverade ändringar (ingen backup)"
-msgid "check for uncommitted changes"
-msgstr "leta efter icke arkiverade ändringar"
+msgid "update across branches if no uncommitted changes"
+msgstr ""
msgid "[-c] [-C] [-d DATE] [[-r] REV]"
msgstr "[-c] [-C] [-d DATUM] [[-r] REV]"
@@ -9334,6 +9658,10 @@
msgid "not found in manifest"
msgstr ""
+#, python-format
+msgid "no such file in rev %s"
+msgstr ""
+
msgid "branch name not in UTF-8!"
msgstr ""
@@ -9378,6 +9706,18 @@
msgstr ""
#, python-format
+msgid "invalid character in dag description: %s..."
+msgstr ""
+
+#, python-format
+msgid "expected id %i, got %i"
+msgstr ""
+
+#, python-format
+msgid "parent id %i is larger than current id %i"
+msgstr ""
+
+#, python-format
msgid "invalid event type in dag: %s"
msgstr ""
@@ -9426,6 +9766,9 @@
msgid "unsupported file type (type is %s)"
msgstr ""
+msgid "searching for changes\n"
+msgstr "söker efter ändringar\n"
+
msgid "queries"
msgstr "frågor"
@@ -9442,24 +9785,24 @@
msgstr "arkivet är obesläktat"
#, python-format
-msgid "abort: push creates new remote heads on branch '%s'!\n"
-msgstr "avbryter: push skapar nya fjärrhuvuden på grenen '%s'!\n"
-
-msgid "abort: push creates new remote heads!\n"
-msgstr "avbryter: push skapar nya fjärrhuvuden!\n"
-
-msgid "(you should pull and merge or use push -f to force)\n"
-msgstr "(du kan dra och sammanfoga eller använda push -f för att tvinga)\n"
-
-msgid "(did you forget to merge? use push -f to force)\n"
-msgstr "(glömde du att sammanfoga? använd push -f för att tvinga)\n"
-
-#, python-format
-msgid "abort: push creates new remote branches: %s!\n"
-msgstr "avbryter: push skapar nya fjärrgrenar: %s!\n"
-
-msgid "(use 'hg push --new-branch' to create new remote branches)\n"
-msgstr "(använd 'hg push --new-branch' för att skapa nya fjärrgrenar)\n"
+msgid "push creates new remote branches: %s!"
+msgstr "push skapar nya fjärrhuvuden: %s!"
+
+msgid "use 'hg push --new-branch' to create new remote branches"
+msgstr "använd 'hg push --new-branch' för att skapa nya fjärrgrenar"
+
+#, python-format
+msgid "push creates new remote heads on branch '%s'!"
+msgstr "push skapar nya fjärrhuvuden på grenen '%s'!"
+
+msgid "push creates new remote heads!"
+msgstr "push skapar nya fjärrhuvuden!"
+
+msgid "you should pull and merge or use push -f to force"
+msgstr "du kan dra och sammanfoga eller använda push -f för att tvinga"
+
+msgid "did you forget to merge? use push -f to force"
+msgstr "glömde du att sammanfoga? använd push -f för att tvinga"
msgid "note: unsynced remote changes!\n"
msgstr "notera: osynkade fjärrändringar!\n"
@@ -9469,6 +9812,10 @@
msgstr "avbryter: %s\n"
#, python-format
+msgid "(%s)\n"
+msgstr "(%s)\n"
+
+#, python-format
msgid "hg: parse error at %s: %s\n"
msgstr ""
@@ -9476,6 +9823,9 @@
msgid "hg: parse error: %s\n"
msgstr ""
+msgid "entering debugger - type c to continue starting hg or h for help\n"
+msgstr ""
+
#, python-format
msgid ""
"hg: command '%s' is ambiguous:\n"
@@ -9548,13 +9898,10 @@
msgid "abort: out of memory\n"
msgstr ""
-msgid "** unknown exception encountered, details follow\n"
-msgstr ""
-
-msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
-msgstr ""
-
-msgid "** or mercurial@selenic.com\n"
+msgid "** unknown exception encountered, please report by visiting\n"
+msgstr ""
+
+msgid "** http://mercurial.selenic.com/wiki/BugTracker\n"
msgstr ""
#, python-format
@@ -9574,6 +9921,12 @@
msgstr ""
#, python-format
+msgid ""
+"error in definition for alias '%s': %s may only be given on the command "
+"line\n"
+msgstr ""
+
+#, python-format
msgid "alias '%s' resolves to unknown command '%s'\n"
msgstr ""
@@ -9593,10 +9946,10 @@
msgid "extension '%s' overrides commands: %s\n"
msgstr "utökningen '%s' tar över dessa kommandon: %s\n"
-msgid "Option --config may not be abbreviated!"
-msgstr ""
-
-msgid "Option --cwd may not be abbreviated!"
+msgid "option --config may not be abbreviated!"
+msgstr ""
+
+msgid "option --cwd may not be abbreviated!"
msgstr ""
msgid ""
@@ -9679,12 +10032,6 @@
msgid "was merge of '%s' successful (yn)?"
msgstr ""
-msgid "&No"
-msgstr ""
-
-msgid "&Yes"
-msgstr ""
-
#, python-format
msgid ""
" output file %s appears unchanged\n"
@@ -9695,8 +10042,11 @@
msgid "merging %s failed!\n"
msgstr ""
-#, python-format
-msgid "Inconsistent state, %s:%s is good and bad"
+msgid "starting revisions are not directly related"
+msgstr ""
+
+#, python-format
+msgid "inconsistent state, %s:%s is good and bad"
msgstr ""
#, python-format
@@ -9730,6 +10080,9 @@
msgid "Diff Formats"
msgstr "Diff-format"
+msgid "Merge Tools"
+msgstr "Sammanfogningsverktyg"
+
msgid "Template Usage"
msgstr "Användning Av Mallar"
@@ -9739,6 +10092,9 @@
msgid "Using additional features"
msgstr "Använda ytterligare funktioner"
+msgid "Subrepositories"
+msgstr "Underarkiv"
+
msgid "Configuring hgweb"
msgstr "Konfiguration av hgweb"
@@ -9975,8 +10331,8 @@
msgid ""
"To make Mercurial produce the git extended diff format, use the --git\n"
"option available for many commands, or set 'git = True' in the [diff]\n"
-"section of your hgrc. You do not need to set this option when\n"
-"importing diffs in this format or using them in the mq extension.\n"
+"section of your configuration file. You do not need to set this option\n"
+"when importing diffs in this format or using them in the mq extension.\n"
msgstr ""
msgid ""
@@ -10001,8 +10357,8 @@
"HGEDITOR\n"
" Detta är namnet på editorn som ska köras vid arkivering. Se EDITOR."
-msgid " (deprecated, use .hgrc)"
-msgstr " (föråldrad, använd .hgrc)"
+msgid " (deprecated, use configuration file)"
+msgstr " (föråldrad, använd konfigurationsfilen)"
msgid ""
"HGENCODING\n"
@@ -10023,6 +10379,15 @@
msgstr ""
msgid ""
+"HGENCODINGAMBIGUOUS\n"
+" This sets Mercurial's behavior for handling characters with\n"
+" \"ambiguous\" widths like accented Latin characters with East Asian\n"
+" fonts. By default, Mercurial assumes ambiguous characters are\n"
+" narrow, set this variable to \"wide\" if such characters cause\n"
+" formatting problems."
+msgstr ""
+
+msgid ""
"HGMERGE\n"
" An executable to use for resolving merge conflicts. The program\n"
" will be executed with three arguments: local file, remote file,\n"
@@ -10031,10 +10396,10 @@
msgid ""
"HGRCPATH\n"
-" A list of files or directories to search for hgrc files. Item\n"
-" separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
-" platform default search path is used. If empty, only the .hg/hgrc\n"
-" from the current repository is read."
+" A list of files or directories to search for configuration\n"
+" files. Item separator is \":\" on Unix, \";\" on Windows. If HGRCPATH\n"
+" is not set, platform default search path is used. If empty, only\n"
+" the .hg/hgrc from the current repository is read."
msgstr ""
msgid " For each element in HGRCPATH:"
@@ -10047,9 +10412,9 @@
msgid ""
"HGPLAIN\n"
-" When set, this disables any options in .hgrc that might change\n"
-" Mercurial's default output. This includes encoding, defaults,\n"
-" verbose mode, debug mode, quiet mode, tracebacks, and\n"
+" When set, this disables any configuration settings that might\n"
+" change Mercurial's default output. This includes encoding,\n"
+" defaults, verbose mode, debug mode, quiet mode, tracebacks, and\n"
" localization. This can be useful when scripting against Mercurial\n"
" in the face of existing user configuration."
msgstr ""
@@ -10067,7 +10432,7 @@
msgid ""
" - HGUSER (deprecated)\n"
-" - hgrc files from the HGRCPATH\n"
+" - configuration files from the HGRCPATH\n"
" - EMAIL\n"
" - interactive prompt\n"
" - LOGNAME (with ``@hostname`` appended)"
@@ -10132,12 +10497,13 @@
"upp till användaren att aktiverade utökningar om de behövs."
msgid ""
-"To enable the \"foo\" extension, either shipped with Mercurial or in\n"
-"the Python search path, create an entry for it in your hgrc, like\n"
-"this::"
+"To enable the \"foo\" extension, either shipped with Mercurial or in the\n"
+"Python search path, create an entry for it in your configuration file,\n"
+"like this::"
msgstr ""
"För att aktivera utökningen \"foo\", som endera levereras med Mercurial\n"
-"eller finns i Pythons sökväg, skapa en post för den i din hgrc, så här::"
+"eller finns i Pythons sökväg, skapa en post för den i din\n"
+"konfigurationsfil, så här::"
msgid ""
" [extensions]\n"
@@ -10157,11 +10523,11 @@
" minfunktion = ~/.hgext/minfunktion.py"
msgid ""
-"To explicitly disable an extension enabled in an hgrc of broader\n"
-"scope, prepend its path with !::"
-msgstr ""
-"För att explicit deaktivera en utökning som aktiverats i en hgrc med större\n"
-"omfång, börja dess sökväg med !::"
+"To explicitly disable an extension enabled in a configuration file of\n"
+"broader scope, prepend its path with !::"
+msgstr ""
+"För att explicit deaktivera en utökning som aktiverats i en\n"
+"konfigurationsfil med större omfång, börja dess sökväg med !::"
msgid ""
" [extensions]\n"
@@ -10199,7 +10565,7 @@
" a remote repository, since new heads may be created by these\n"
" operations. Note that the term branch can also be used informally\n"
" to describe a development process in which certain development is\n"
-" done independently of other development.This is sometimes done\n"
+" done independently of other development. This is sometimes done\n"
" explicitly with a named branch, but it can also be done locally,\n"
" using bookmarks or clones and anonymous branches."
msgstr ""
@@ -10239,6 +10605,21 @@
msgstr ""
msgid ""
+"Branch, inactive\n"
+" If a named branch has no topological heads, it is considered to be\n"
+" inactive. As an example, a feature branch becomes inactive when it\n"
+" is merged into the default branch. The :hg:`branches` command\n"
+" shows inactive branches by default, though they can be hidden with\n"
+" :hg:`branches --active`."
+msgstr ""
+
+msgid ""
+" NOTE: this concept is deprecated because it is too implicit.\n"
+" Branches should now be explicitly closed using :hg:`commit\n"
+" --close-branch` when they are no longer needed."
+msgstr ""
+
+msgid ""
"Branch, named\n"
" A collection of changesets which have the same branch name. By\n"
" default, children of a changeset in a named branch belong to the\n"
@@ -10294,8 +10675,8 @@
msgid ""
"Changeset id\n"
" A SHA-1 hash that uniquely identifies a changeset. It may be\n"
-" represented as either a \"long\" 40-byte hexadecimal string, or a\n"
-" \"short\" 12-byte hexadecimal string."
+" represented as either a \"long\" 40 hexadecimal digit string, or a\n"
+" \"short\" 12 hexadecimal digit string."
msgstr ""
msgid ""
@@ -10796,6 +11177,182 @@
"högra sidan. Det innebär att ``/foo/bar`` och ``foo/quux/baz`` kommer att\n"
"visas som ``bar``och ``quux/baz``.\n"
+msgid "To merge files Mercurial uses merge tools."
+msgstr ""
+
+msgid ""
+"A merge tool combines two different versions of a file into a merged\n"
+"file. Merge tools are given the two files and the greatest common\n"
+"ancestor of the two file versions, so they can determine the changes\n"
+"made on both branches."
+msgstr ""
+
+msgid ""
+"Merge tools are used both for :hg:`resolve`, :hg:`merge`, :hg:`update`,\n"
+":hg:`backout` and in several extensions."
+msgstr ""
+
+msgid ""
+"Usually, the merge tool tries to automatically reconcile the files by\n"
+"combining all non-overlapping changes that occurred separately in\n"
+"the two different evolutions of the same initial base file. Furthermore, "
+"some\n"
+"interactive merge programs make it easier to manually resolve\n"
+"conflicting merges, either in a graphical way, or by inserting some\n"
+"conflict markers. Mercurial does not include any interactive merge\n"
+"programs but relies on external tools for that."
+msgstr ""
+
+msgid ""
+"Available merge tools\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"External merge tools and their properties are configured in the\n"
+"merge-tools configuration section - see hgrc(5) - but they can often just\n"
+"be named by their executable."
+msgstr ""
+
+msgid ""
+"A merge tool is generally usable if its executable can be found on the\n"
+"system and if it can handle the merge. The executable is found if it\n"
+"is an absolute or relative executable path or the name of an\n"
+"application in the executable search path. The tool is assumed to be\n"
+"able to handle the merge if it can handle symlinks if the file is a\n"
+"symlink, if it can handle binary files if the file is binary, and if a\n"
+"GUI is available if the tool requires a GUI."
+msgstr ""
+
+msgid ""
+"There are some internal merge tools which can be used. The internal\n"
+"merge tools are:"
+msgstr ""
+
+msgid ""
+"``internal:merge``\n"
+" Uses the internal non-interactive simple merge algorithm for merging\n"
+" files. It will fail if there are any conflicts and leave markers in\n"
+" the partially merged file."
+msgstr ""
+
+msgid ""
+"``internal:fail``\n"
+" Rather than attempting to merge files that were modified on both\n"
+" branches, it marks them as unresolved. The resolve command must be\n"
+" used to resolve these conflicts."
+msgstr ""
+
+msgid ""
+"``internal:local``\n"
+" Uses the local version of files as the merged version."
+msgstr ""
+
+msgid ""
+"``internal:other``\n"
+" Uses the other version of files as the merged version."
+msgstr ""
+
+msgid ""
+"``internal:prompt``\n"
+" Asks the user which of the local or the other version to keep as\n"
+" the merged version."
+msgstr ""
+
+msgid ""
+"``internal:dump``\n"
+" Creates three versions of the files to merge, containing the\n"
+" contents of local, other and base. These files can then be used to\n"
+" perform a merge manually. If the file to be merged is named\n"
+" ``a.txt``, these files will accordingly be named ``a.txt.local``,\n"
+" ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n"
+" same directory as ``a.txt``."
+msgstr ""
+
+msgid ""
+"Internal tools are always available and do not require a GUI but will by "
+"default\n"
+"not handle symlinks or binary files."
+msgstr ""
+
+msgid ""
+"Choosing a merge tool\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "Mercurial uses these rules when deciding which merge tool to use:"
+msgstr ""
+
+msgid ""
+"1. If a tool has been specified with the --tool option to merge or resolve, "
+"it\n"
+" is used. If it is the name of a tool in the merge-tools configuration, "
+"its\n"
+" configuration is used. Otherwise the specified tool must be executable "
+"by\n"
+" the shell."
+msgstr ""
+
+msgid ""
+"2. If the ``HGMERGE`` environment variable is present, its value is used "
+"and\n"
+" must be executable by the shell."
+msgstr ""
+
+msgid ""
+"3. If the filename of the file to be merged matches any of the patterns in "
+"the\n"
+" merge-patterns configuration section, the first usable merge tool\n"
+" corresponding to a matching pattern is used. Here, binary capabilities of "
+"the\n"
+" merge tool are not considered."
+msgstr ""
+
+msgid ""
+"4. If ui.merge is set it will be considered next. If the value is not the "
+"name\n"
+" of a configured tool, the specified value is used and must be executable "
+"by\n"
+" the shell. Otherwise the named tool is used if it is usable."
+msgstr ""
+
+msgid ""
+"5. If any usable merge tools are present in the merge-tools configuration\n"
+" section, the one with the highest priority is used."
+msgstr ""
+
+msgid ""
+"6. If a program named ``hgmerge`` can be found on the system, it is used - "
+"but\n"
+" it will by default not be used for symlinks and binary files."
+msgstr ""
+
+msgid ""
+"7. If the file to be merged is not binary and is not a symlink, then\n"
+" ``internal:merge`` is used."
+msgstr ""
+
+msgid "8. The merge of the file fails and must be resolved before commit."
+msgstr ""
+
+msgid ""
+".. note::\n"
+" After selecting a merge program, Mercurial will by default attempt\n"
+" to merge the files using a simple merge algorithm first. Only if it "
+"doesn't\n"
+" succeed because of conflicting changes Mercurial will actually execute "
+"the\n"
+" merge program. Whether to use the simple merge algorithm first can be\n"
+" controlled by the premerge setting of the merge tool. Premerge is enabled "
+"by\n"
+" default unless the file is binary or a symlink."
+msgstr ""
+
+msgid ""
+"See the merge-tools and ui sections of hgrc(5) for details on the\n"
+"configuration of merge tools.\n"
+msgstr ""
+
msgid ""
"When Mercurial accepts more than one revision, they may be specified\n"
"individually, or provided as a topologically continuous range,\n"
@@ -10984,8 +11541,13 @@
"Identifiers such as branch names must be quoted with single or double\n"
"quotes if they contain characters outside of\n"
"``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n"
-"predicates. Special characters can be used in quoted identifiers by\n"
-"escaping them, e.g., ``\\n`` is interpreted as a newline."
+"predicates."
+msgstr ""
+
+msgid ""
+"Special characters can be used in quoted identifiers by escaping them,\n"
+"e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n"
+"interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``."
msgstr ""
msgid "There is a single prefix operator:"
@@ -11036,173 +11598,7 @@
msgid "The following predicates are supported:"
msgstr ""
-msgid ""
-"``adds(pattern)``\n"
-" Changesets that add a file matching pattern."
-msgstr ""
-
-msgid ""
-"``all()``\n"
-" All changesets, the same as ``0:tip``."
-msgstr ""
-
-msgid ""
-"``ancestor(single, single)``\n"
-" Greatest common ancestor of the two changesets."
-msgstr ""
-
-msgid ""
-"``ancestors(set)``\n"
-" Changesets that are ancestors of a changeset in set."
-msgstr ""
-
-msgid ""
-"``author(string)``\n"
-" Alias for ``user(string)``."
-msgstr ""
-
-msgid ""
-"``branch(set)``\n"
-" The branch names are found for changesets in set, and the result is\n"
-" all changesets belonging to one those branches."
-msgstr ""
-
-msgid ""
-"``children(set)``\n"
-" Child changesets of changesets in set."
-msgstr ""
-
-msgid ""
-"``closed()``\n"
-" Changeset is closed."
-msgstr ""
-
-msgid ""
-"``contains(pattern)``\n"
-" Revision contains pattern."
-msgstr ""
-
-msgid ""
-"``date(interval)``\n"
-" Changesets within the interval, see :hg:`help dates`."
-msgstr ""
-
-msgid ""
-"``descendants(set)``\n"
-" Changesets which are decendants of changesets in set."
-msgstr ""
-
-msgid ""
-"``file(pattern)``\n"
-" Changesets which manually affected files matching pattern."
-msgstr ""
-
-msgid ""
-"``follow()``\n"
-" An alias for ``::.`` (ancestors of the working copy's first parent)."
-msgstr ""
-
-msgid ""
-"``grep(regex)``\n"
-" Like ``keyword(string)`` but accepts a regex."
-msgstr ""
-
-msgid ""
-"``head()``\n"
-" Changeset is a head."
-msgstr ""
-
-msgid ""
-"``heads(set)``\n"
-" Members of set with no children in set."
-msgstr ""
-
-msgid ""
-"``keyword(string)``\n"
-" Search commit message, user name, and names of changed files for\n"
-" string."
-msgstr ""
-
-msgid ""
-"``limit(set, n)``\n"
-" First n members of set."
-msgstr ""
-
-msgid ""
-"``max(set)``\n"
-" Changeset with highest revision number in set."
-msgstr ""
-
-msgid ""
-"``merge()``\n"
-" Changeset is a merge changeset."
-msgstr ""
-
-msgid ""
-"``modifies(pattern)``\n"
-" Changesets which modify files matching pattern."
-msgstr ""
-
-msgid ""
-"``outgoing([path])``\n"
-" Changesets missing in path."
-msgstr ""
-
-msgid ""
-"``p1(set)``\n"
-" First parent of changesets in set."
-msgstr ""
-
-msgid ""
-"``p2(set)``\n"
-" Second parent of changesets in set."
-msgstr ""
-
-msgid ""
-"``parents(set)``\n"
-" The set of all parents for all changesets in set."
-msgstr ""
-
-msgid ""
-"``removes(pattern)``\n"
-" Changesets which remove files matching pattern."
-msgstr ""
-
-msgid ""
-"``reverse(set)``\n"
-" Reverse order of set."
-msgstr ""
-
-msgid ""
-"``roots(set)``\n"
-" Changesets with no parent changeset in set."
-msgstr ""
-
-msgid ""
-"``sort(set[, [-]key...])``\n"
-" Sort set by keys. The default sort order is ascending, specify a key\n"
-" as ``-key`` to sort in descending order."
-msgstr ""
-
-msgid " The keys can be:"
-msgstr ""
-
-msgid ""
-" - ``rev`` for the revision number,\n"
-" - ``branch`` for the branch name,\n"
-" - ``desc`` for the commit message (description),\n"
-" - ``user`` for user name (``author`` can be used as an alias),\n"
-" - ``date`` for the commit date"
-msgstr ""
-
-msgid ""
-"``tagged()``\n"
-" Changeset is tagged."
-msgstr ""
-
-msgid ""
-"``user(string)``\n"
-" User name is string."
+msgid ".. predicatesmarker"
msgstr ""
msgid "Command line equivalents for :hg:`log`::"
@@ -11219,15 +11615,233 @@
" -l x -> limit(expr, x)"
msgstr ""
-msgid "Some sample queries::"
-msgstr ""
-
-msgid ""
-" hg log -r 'branch(default)'\n"
-" hg log -r 'branch(default) and 1.5:: and not merge()'\n"
-" hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n"
-" hg log -r 'sort(date(\"May 2008\"), user)'\n"
-" hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n"
+msgid "Some sample queries:"
+msgstr ""
+
+msgid "- Changesets on the default branch::"
+msgstr "- Ändringar på default-grenen::"
+
+msgid " hg log -r \"branch(default)\""
+msgstr " hg log -r \"branch(default)\""
+
+msgid "- Changesets on the default branch since tag 1.5 (excluding merges)::"
+msgstr ""
+
+msgid " hg log -r \"branch(default) and 1.5:: and not merge()\""
+msgstr " hg log -r \"branch(default) and 1.5:: and not merge()\""
+
+msgid "- Open branch heads::"
+msgstr "- Öppna grenhuvuden::"
+
+msgid " hg log -r \"head() and not closed()\""
+msgstr ""
+
+msgid ""
+"- Changesets between tags 1.3 and 1.5 mentioning \"bug\" that affect\n"
+" ``hgext/*``::"
+msgstr ""
+
+msgid " hg log -r \"1.3::1.5 and keyword(bug) and file('hgext/*')\""
+msgstr ""
+
+msgid "- Changesets in committed May 2008, sorted by user::"
+msgstr ""
+
+msgid " hg log -r \"sort(date('May 2008'), user)\""
+msgstr ""
+
+msgid ""
+"- Changesets mentioning \"bug\" or \"issue\" that are not in a tagged\n"
+" release::"
+msgstr ""
+
+msgid ""
+" hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged"
+"())\"\n"
+msgstr ""
+
+msgid ""
+"Subrepositories let you nest external repositories or projects into a\n"
+"parent Mercurial repository, and make commands operate on them as a\n"
+"group. External Mercurial and Subversion projects are currently\n"
+"supported."
+msgstr ""
+
+msgid "Subrepositories are made of three components:"
+msgstr ""
+
+msgid ""
+"1. Nested repository checkouts. They can appear anywhere in the\n"
+" parent working directory, and are Mercurial clones or Subversion\n"
+" checkouts."
+msgstr ""
+
+msgid ""
+"2. Nested repository references. They are defined in ``.hgsub`` and\n"
+" tell where the subrepository checkouts come from. Mercurial\n"
+" subrepositories are referenced like:"
+msgstr ""
+
+msgid " path/to/nested = https://example.com/nested/repo/path"
+msgstr ""
+
+msgid ""
+" where ``path/to/nested`` is the checkout location relatively to the\n"
+" parent Mercurial root, and ``https://example.com/nested/repo/path``\n"
+" is the source repository path. The source can also reference a\n"
+" filesystem path. Subversion repositories are defined with:"
+msgstr ""
+
+msgid " path/to/nested = [svn]https://example.com/nested/trunk/path"
+msgstr ""
+
+msgid ""
+" Note that ``.hgsub`` does not exist by default in Mercurial\n"
+" repositories, you have to create and add it to the parent\n"
+" repository before using subrepositories."
+msgstr ""
+
+msgid ""
+"3. Nested repository states. They are defined in ``.hgsubstate`` and\n"
+" capture whatever information is required to restore the\n"
+" subrepositories to the state they were committed in a parent\n"
+" repository changeset. Mercurial automatically record the nested\n"
+" repositories states when committing in the parent repository."
+msgstr ""
+
+msgid ""
+" .. note::\n"
+" The ``.hgsubstate`` file should not be edited manually."
+msgstr ""
+
+msgid ""
+"\n"
+"Adding a Subrepository\n"
+"----------------------"
+msgstr ""
+
+msgid ""
+"If ``.hgsub`` does not exist, create it and add it to the parent\n"
+"repository. Clone or checkout the external projects where you want it\n"
+"to live in the parent repository. Edit ``.hgsub`` and add the\n"
+"subrepository entry as described above. At this point, the\n"
+"subrepository is tracked and the next commit will record its state in\n"
+"``.hgsubstate`` and bind it to the committed changeset."
+msgstr ""
+
+msgid ""
+"Synchronizing a Subrepository\n"
+"-----------------------------"
+msgstr ""
+
+msgid ""
+"Subrepos do not automatically track the latest changeset of their\n"
+"sources. Instead, they are updated to the changeset that corresponds\n"
+"with the changeset checked out in the top-level changeset. This is so\n"
+"developers always get a consistent set of compatible code and\n"
+"libraries when they update."
+msgstr ""
+
+msgid ""
+"Thus, updating subrepos is a manual process. Simply check out target\n"
+"subrepo at the desired revision, test in the top-level repo, then\n"
+"commit in the parent repository to record the new combination."
+msgstr ""
+
+msgid ""
+"Deleting a Subrepository\n"
+"------------------------"
+msgstr ""
+
+msgid ""
+"To remove a subrepository from the parent repository, delete its\n"
+"reference from ``.hgsub``, then remove its files."
+msgstr ""
+
+msgid ""
+"Interaction with Mercurial Commands\n"
+"-----------------------------------"
+msgstr ""
+
+msgid ""
+":add: add does not recurse in subrepos unless -S/--subrepos is\n"
+" specified. Subversion subrepositories are currently silently\n"
+" ignored."
+msgstr ""
+
+msgid ""
+":archive: archive does not recurse in subrepositories unless\n"
+" -S/--subrepos is specified."
+msgstr ""
+
+msgid ""
+":commit: commit creates a consistent snapshot of the state of the\n"
+" entire project and its subrepositories. It does this by first\n"
+" attempting to commit all modified subrepositories, then recording\n"
+" their state and finally committing it in the parent repository."
+msgstr ""
+
+msgid ""
+":diff: diff does not recurse in subrepos unless -S/--subrepos is\n"
+" specified. Changes are displayed as usual, on the subrepositories\n"
+" elements. Subversion subrepositories are currently silently\n"
+" ignored."
+msgstr ""
+
+msgid ""
+":incoming: incoming does not recurse in subrepos unless -S/--subrepos\n"
+" is specified. Subversion subrepositories are currently silently\n"
+" ignored."
+msgstr ""
+
+msgid ""
+":outgoing: outgoing does not recurse in subrepos unless -S/--subrepos\n"
+" is specified. Subversion subrepositories are currently silently\n"
+" ignored."
+msgstr ""
+
+msgid ""
+":pull: pull is not recursive since it is not clear what to pull prior\n"
+" to running :hg:`update`. Listing and retrieving all\n"
+" subrepositories changes referenced by the parent repository pulled\n"
+" changesets is expensive at best, impossible in the Subversion\n"
+" case."
+msgstr ""
+
+msgid ""
+":push: Mercurial will automatically push all subrepositories first\n"
+" when the parent repository is being pushed. This ensures new\n"
+" subrepository changes are available when referenced by top-level\n"
+" repositories."
+msgstr ""
+
+msgid ""
+":status: status does not recurse into subrepositories unless\n"
+" -S/--subrepos is specified. Subrepository changes are displayed as\n"
+" regular Mercurial changes on the subrepository\n"
+" elements. Subversion subrepositories are currently silently\n"
+" ignored."
+msgstr ""
+
+msgid ""
+":update: update restores the subrepos in the state they were\n"
+" originally committed in target changeset. If the recorded\n"
+" changeset is not available in the current subrepository, Mercurial\n"
+" will pull it in first before updating. This means that updating\n"
+" can require network access when using subrepositories."
+msgstr ""
+
+msgid ""
+"Remapping Subrepositories Sources\n"
+"---------------------------------"
+msgstr ""
+
+msgid ""
+"A subrepository source location may change during a project life,\n"
+"invalidating references stored in the parent repository history. To\n"
+"fix this, rewriting rules can be defined in parent repository ``hgrc``\n"
+"file or in Mercurial configuration. See the ``[subpaths]`` section in\n"
+"hgrc(5) for more details."
msgstr ""
msgid ""
@@ -11276,6 +11890,9 @@
" committed. Will be empty if the branch name was default."
msgstr ""
+msgid ":children: List of strings. The children of the changeset."
+msgstr ""
+
msgid ":date: Date information. The date when the changeset was committed."
msgstr ""
@@ -11312,8 +11929,8 @@
msgstr ""
msgid ""
-":node: String. The changeset identification hash, as a 40-character\n"
-" hexadecimal string."
+":node: String. The changeset identification hash, as a 40 hexadecimal\n"
+" digit string."
msgstr ""
msgid ":parents: List of strings. The parents of the changeset."
@@ -11394,6 +12011,11 @@
" and \">\" with XML entities."
msgstr ""
+msgid ""
+":hex: Any text. Convert a binary Mercurial node identifier into\n"
+" its long hexadecimal representation."
+msgstr ""
+
msgid ":fill68: Any text. Wraps the text to fit in 68 columns."
msgstr ""
@@ -11445,12 +12067,17 @@
msgid ""
":short: Changeset hash. Returns the short form of a changeset hash,\n"
-" i.e. a 12-byte hexadecimal string."
+" i.e. a 12 hexadecimal digit string."
msgstr ""
msgid ":shortdate: Date. Returns a date like \"2006-09-18\"."
msgstr ""
+msgid ""
+":stringify: Any type. Turns the value into text by converting values into\n"
+" text and concatenating them."
+msgstr ""
+
msgid ":strip: Any text. Strips all leading and trailing whitespace."
msgstr ""
@@ -11496,6 +12123,11 @@
"server."
msgstr ""
+msgid ""
+"Note that the security of HTTPS URLs depends on proper configuration of\n"
+"web.cacerts."
+msgstr ""
+
msgid "Some notes about using SSH with Mercurial:"
msgstr ""
@@ -11522,13 +12154,13 @@
msgstr ""
msgid ""
-" Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n"
-" with the --ssh command line option."
-msgstr ""
-
-msgid ""
-"These URLs can all be stored in your hgrc with path aliases under the\n"
-"[paths] section like so::"
+" Alternatively specify \"ssh -C\" as your ssh command in your\n"
+" configuration file or with the --ssh command line option."
+msgstr ""
+
+msgid ""
+"These URLs can all be stored in your configuration file with path\n"
+"aliases under the [paths] section like so::"
msgstr ""
msgid ""
@@ -11618,7 +12250,7 @@
msgstr ""
msgid ""
-"use 'hg resolve' to retry unresolved file merges or 'hg update -C' to "
+"use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to "
"abandon\n"
msgstr ""
@@ -11629,6 +12261,10 @@
msgid "error reading %s/.hg/hgrc: %s\n"
msgstr ""
+#, python-format
+msgid "error accessing repository at %s\n"
+msgstr ""
+
msgid "SSL support is unavailable"
msgstr ""
@@ -11733,24 +12369,9 @@
msgid "'%s' uses newer protocol %s"
msgstr ""
-msgid "look up remote revision"
-msgstr ""
-
-msgid "unexpected response:"
-msgstr ""
-
-msgid "look up remote changes"
-msgstr ""
-
-msgid "push failed (unexpected response):"
-msgstr ""
-
-msgid "remote: "
-msgstr "fjärr: "
-
#, python-format
msgid "push failed: %s"
-msgstr ""
+msgstr "tryckning misslyckades: %s"
msgid "Python support for SSL and HTTPS is not installed"
msgstr ""
@@ -11874,10 +12495,10 @@
msgstr "efterfrågar alla ändringar\n"
msgid ""
-"Partial pull cannot be done because other repository doesn't support "
+"partial pull cannot be done because other repository doesn't support "
"changegroupsubset."
msgstr ""
-"Deldragningar kan inte göras eftersom det andra arkivet inte stödjer "
+"deldragningar kan inte göras eftersom det andra arkivet inte stödjer "
"changegroupsubset."
#, python-format
@@ -11903,9 +12524,6 @@
msgid "adding changesets\n"
msgstr "lägger till ändringar\n"
-msgid "changesets"
-msgstr "ändringar"
-
msgid "received changelog group is empty"
msgstr "mottagen ändringsgrupp är tom"
@@ -11956,8 +12574,8 @@
msgid "transferred %s in %.1f seconds (%s/sec)\n"
msgstr "överförde %s på %.1f sekunder (%s/sek)\n"
-msgid "no [smtp]host in hgrc - cannot send mail"
-msgstr "ingen [smtp]server i hgrc - kan inte sända mail"
+msgid "smtp.host not configured - cannot send mail"
+msgstr "smtp.host är inte konfigurerad - kan inte sända mail"
#, python-format
msgid "sending mail: smtp host %s, port %s\n"
@@ -12001,6 +12619,13 @@
msgstr ""
#, python-format
+msgid "invalid pattern (%s): %s"
+msgstr "ogiltigt mönster (%s): %s"
+
+msgid "invalid pattern"
+msgstr "ogiltigt mönster"
+
+#, python-format
msgid "diff context lines count must be an integer, not %r"
msgstr ""
@@ -12058,23 +12683,23 @@
#, python-format
msgid "update failed to remove %s: %s!\n"
-msgstr ""
+msgstr "update kunde inte ta bort %s: %s!\n"
#, python-format
msgid "getting %s\n"
-msgstr ""
+msgstr "hämtar %s\n"
#, python-format
msgid "getting %s to %s\n"
-msgstr ""
-
-#, python-format
-msgid "warning: detected divergent renames of %s to:\n"
-msgstr ""
+msgstr "hämtar %s till %s\n"
+
+#, python-format
+msgid "note: possible conflict - %s was renamed multiple times to:\n"
+msgstr "notera: möjlig konflikt - %s döptes om flera gånger till:\n"
#, python-format
msgid "branch %s not found"
-msgstr ""
+msgstr "grenen %s hittades inte"
msgid "merging with a working directory ancestor has no effect"
msgstr ""
@@ -12085,13 +12710,38 @@
msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
msgstr ""
-msgid ""
-"crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard "
-"changes)"
-msgstr ""
-
-msgid "crosses branches (use 'hg merge' or use 'hg update -c')"
-msgstr ""
+msgid "crosses branches (merge branches or use --clean to discard changes)"
+msgstr ""
+
+msgid "crosses branches (merge branches or use --check to force update)"
+msgstr ""
+
+msgid "Attention:"
+msgstr ""
+
+msgid "Caution:"
+msgstr ""
+
+msgid "!Danger!"
+msgstr ""
+
+msgid "Error:"
+msgstr "Fel:"
+
+msgid "Hint:"
+msgstr ""
+
+msgid "Important:"
+msgstr "Viktigt:"
+
+msgid "Note:"
+msgstr "Notera:"
+
+msgid "Tip:"
+msgstr "Tips:"
+
+msgid "Warning!"
+msgstr "Varning!"
#, python-format
msgid "cannot create %s: destination already exists"
@@ -12168,17 +12818,11 @@
msgstr ""
#, python-format
-msgid "Unsupported line endings type: %s"
-msgstr ""
-
-msgid ""
-"internal patcher failed\n"
-"please report details to http://mercurial.selenic.com/bts/\n"
-"or mercurial@selenic.com\n"
-msgstr ""
-"den interna patcharen misslyckades\n"
-"rapportera detaljer till http://mercurial.selenic.com/bts/\n"
-"eller mercurial@selenic.com\n"
+msgid "unsupported line endings type: %s"
+msgstr ""
+
+msgid "patch failed to apply"
+msgstr ""
#, python-format
msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
@@ -12251,12 +12895,12 @@
msgid "%s not found in the transaction"
msgstr ""
+msgid "consistency error in delta"
+msgstr ""
+
msgid "unknown base"
msgstr ""
-msgid "consistency error adding group"
-msgstr ""
-
msgid "unterminated string"
msgstr ""
@@ -12277,62 +12921,270 @@
msgid "not a function: %s"
msgstr "inte en funktion: %s"
-msgid "limit wants two arguments"
-msgstr "limit vill ha två argument"
-
-msgid "limit wants a number"
-msgstr "limit vill ha ett nummer"
-
+msgid ""
+"``id(string)``\n"
+" Revision non-ambiguously specified by the given hex string prefix."
+msgstr ""
+
+#. i18n: "id" is a keyword
+msgid "id requires one argument"
+msgstr "id kräver ett argument"
+
+#. i18n: "id" is a keyword
+msgid "id requires a string"
+msgstr "id kräver en sträng"
+
+msgid ""
+"``rev(number)``\n"
+" Revision with the given numeric identifier."
+msgstr ""
+
+#. i18n: "rev" is a keyword
+msgid "rev requires one argument"
+msgstr "rev kräver ett argument"
+
+#. i18n: "rev" is a keyword
+msgid "rev requires a number"
+msgstr "rev kräver ett nummer"
+
+#. i18n: "rev" is a keyword
+msgid "rev expects a number"
+msgstr "rev förväntar sig ett nummer"
+
+msgid ""
+"``p1(set)``\n"
+" First parent of changesets in set."
+msgstr ""
+
+msgid ""
+"``p2(set)``\n"
+" Second parent of changesets in set."
+msgstr ""
+
+msgid ""
+"``parents(set)``\n"
+" The set of all parents for all changesets in set."
+msgstr ""
+
+msgid ""
+"``max(set)``\n"
+" Changeset with highest revision number in set."
+msgstr ""
+
+msgid ""
+"``min(set)``\n"
+" Changeset with lowest revision number in set."
+msgstr ""
+
+msgid ""
+"``limit(set, n)``\n"
+" First n members of set."
+msgstr ""
+
+#. i18n: "limit" is a keyword
+msgid "limit requires two arguments"
+msgstr "limit kräver två argument"
+
+#. i18n: "limit" is a keyword
+msgid "limit requires a number"
+msgstr "limit kräver ett nummer"
+
+#. i18n: "limit" is a keyword
msgid "limit expects a number"
msgstr "limit förväntar sig ett nummer"
-msgid "ancestor wants two arguments"
-msgstr "ancestor vill ha två argument"
-
+msgid ""
+"``children(set)``\n"
+" Child changesets of changesets in set."
+msgstr ""
+
+msgid ""
+"``branch(set)``\n"
+" All changesets belonging to the branches of changesets in set."
+msgstr ""
+
+msgid ""
+"``ancestor(single, single)``\n"
+" Greatest common ancestor of the two changesets."
+msgstr ""
+
+#. i18n: "ancestor" is a keyword
+msgid "ancestor requires two arguments"
+msgstr "ancestor kräver två argument"
+
+#. i18n: "ancestor" is a keyword
msgid "ancestor arguments must be single revisions"
msgstr "argument till ancestor måste vara singelrevisioner"
+msgid ""
+"``ancestors(set)``\n"
+" Changesets that are ancestors of a changeset in set."
+msgstr ""
+
+msgid ""
+"``descendants(set)``\n"
+" Changesets which are descendants of changesets in set."
+msgstr ""
+
+msgid ""
+"``follow()``\n"
+" An alias for ``::.`` (ancestors of the working copy's first parent)."
+msgstr ""
+
+#. i18n: "follow" is a keyword
msgid "follow takes no arguments"
msgstr "follow tar inga argument"
-msgid "date wants a string"
-msgstr "date vill ha en sträng"
-
-msgid "keyword wants a string"
-msgstr "keyword vill ha en sträng"
-
-msgid "grep wants a string"
-msgstr "grep vill ha en sträng"
-
-msgid "author wants a string"
-msgstr "author vill ha ett mönster"
-
-msgid "file wants a pattern"
-msgstr "file vill ha ett mönster"
-
-msgid "contains wants a pattern"
-msgstr "contains vill ha ett mönster"
-
-msgid "modifies wants a pattern"
-msgstr "modifies vill ha ett mönster"
-
-msgid "adds wants a pattern"
-msgstr "adds vill ha ett mönster"
-
-msgid "removes wants a pattern"
-msgstr "removes vill ha ett mänster"
-
+msgid ""
+"``date(interval)``\n"
+" Changesets within the interval, see :hg:`help dates`."
+msgstr ""
+
+#. i18n: "date" is a keyword
+msgid "date requires a string"
+msgstr "date kräver en sträng"
+
+msgid ""
+"``keyword(string)``\n"
+" Search commit message, user name, and names of changed files for\n"
+" string."
+msgstr ""
+
+#. i18n: "keyword" is a keyword
+msgid "keyword requires a string"
+msgstr "keyword kräver en sträng"
+
+msgid ""
+"``grep(regex)``\n"
+" Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``\n"
+" to ensure special escape characters are handled correctly."
+msgstr ""
+
+#. i18n: "grep" is a keyword
+msgid "grep requires a string"
+msgstr "grep kräver en sträng"
+
+#, python-format
+msgid "invalid match pattern: %s"
+msgstr "ogiltigt träffmönster: %s"
+
+msgid ""
+"``author(string)``\n"
+" Alias for ``user(string)``."
+msgstr ""
+
+#. i18n: "author" is a keyword
+msgid "author requires a string"
+msgstr "author kräver en sträng"
+
+msgid ""
+"``user(string)``\n"
+" User name is string."
+msgstr ""
+
+msgid ""
+"``file(pattern)``\n"
+" Changesets affecting files matched by pattern."
+msgstr ""
+
+#. i18n: "file" is a keyword
+msgid "file requires a pattern"
+msgstr "file kräver ett mönster"
+
+msgid ""
+"``contains(pattern)``\n"
+" Revision contains pattern."
+msgstr ""
+
+#. i18n: "contains" is a keyword
+msgid "contains requires a pattern"
+msgstr "contains kräver ett mönster"
+
+msgid ""
+"``modifies(pattern)``\n"
+" Changesets modifying files matched by pattern."
+msgstr ""
+
+#. i18n: "modifies" is a keyword
+msgid "modifies requires a pattern"
+msgstr "modifies kräver ett mönster"
+
+msgid ""
+"``adds(pattern)``\n"
+" Changesets that add a file matching pattern."
+msgstr ""
+
+#. i18n: "adds" is a keyword
+msgid "adds requires a pattern"
+msgstr "adds kräver ett mönster"
+
+msgid ""
+"``removes(pattern)``\n"
+" Changesets which remove files matching pattern."
+msgstr ""
+
+#. i18n: "removes" is a keyword
+msgid "removes requires a pattern"
+msgstr "removes kräver ett mänster"
+
+msgid ""
+"``merge()``\n"
+" Changeset is a merge changeset."
+msgstr ""
+
+#. i18n: "merge" is a keyword
msgid "merge takes no arguments"
msgstr "merge tar inga argument"
+msgid ""
+"``closed()``\n"
+" Changeset is closed."
+msgstr ""
+
+#. i18n: "closed" is a keyword
msgid "closed takes no arguments"
msgstr "closed tar inga argument"
+msgid ""
+"``head()``\n"
+" Changeset is a named branch head."
+msgstr ""
+
+#. i18n: "head" is a keyword
msgid "head takes no arguments"
msgstr "head tar inga argument"
-msgid "sort wants one or two arguments"
-msgstr "sort vill ha ett eller två argument"
+msgid ""
+"``reverse(set)``\n"
+" Reverse order of set."
+msgstr ""
+
+msgid ""
+"``present(set)``\n"
+" An empty set, if any revision in set isn't found; otherwise,\n"
+" all revisions in set."
+msgstr ""
+
+msgid ""
+"``sort(set[, [-]key...])``\n"
+" Sort set by keys. The default sort order is ascending, specify a key\n"
+" as ``-key`` to sort in descending order."
+msgstr ""
+
+msgid " The keys can be:"
+msgstr ""
+
+msgid ""
+" - ``rev`` for the revision number,\n"
+" - ``branch`` for the branch name,\n"
+" - ``desc`` for the commit message (description),\n"
+" - ``user`` for user name (``author`` can be used as an alias),\n"
+" - ``date`` for the commit date"
+msgstr ""
+
+#. i18n: "sort" is a keyword
+msgid "sort requires one or two arguments"
+msgstr "sort kräver ett eller två argument"
msgid "sort spec must be a string"
msgstr "sort-spec måste vara en sträng"
@@ -12341,14 +13193,47 @@
msgid "unknown sort key %r"
msgstr "okänd sorteringsnyckel %r"
+msgid ""
+"``all()``\n"
+" All changesets, the same as ``0:tip``."
+msgstr ""
+
+#. i18n: "all" is a keyword
msgid "all takes no arguments"
msgstr "all tar inga argument"
-msgid "outgoing wants a repository path"
-msgstr "outgoing vill ha en arkivsökväg"
-
-msgid "tagged takes no arguments"
-msgstr "tagged tar inga argument"
+msgid ""
+"``heads(set)``\n"
+" Members of set with no children in set."
+msgstr ""
+
+msgid ""
+"``roots(set)``\n"
+" Changesets with no parent changeset in set."
+msgstr ""
+
+msgid ""
+"``outgoing([path])``\n"
+" Changesets not found in the specified destination repository, or the\n"
+" default push location."
+msgstr ""
+
+#. i18n: "outgoing" is a keyword
+msgid "outgoing requires a repository path"
+msgstr "outgoing kräver en arkivsökväg"
+
+msgid ""
+"``tag(name)``\n"
+" The specified tag by name, or all tagged revisions if no name is given."
+msgstr ""
+
+#. i18n: "tag" is a keyword
+msgid "tag takes one or no arguments"
+msgstr "tag tar ett eller inga argument"
+
+#. i18n: "tag" is a keyword
+msgid "the argument to tag must be a string"
+msgstr "argumentet till tag måste vara en sträng"
msgid "can't negate that"
msgstr "kan inte negera det"
@@ -12357,17 +13242,17 @@
msgstr "inte en symbol"
msgid "empty query"
-msgstr ""
+msgstr "tom fråga"
msgid "searching for exact renames"
-msgstr ""
+msgstr "söker efter exakta namnbyten"
msgid "searching for similar files"
msgstr "söker efter liknande filer"
#, python-format
msgid "%s looks like a binary file."
-msgstr ""
+msgstr "%s verkar vara en binärfil."
msgid "can only specify two labels."
msgstr ""
@@ -12385,13 +13270,16 @@
msgid "no suitable response from remote hg"
msgstr ""
+msgid "remote: "
+msgstr "fjärr: "
+
+msgid "unexpected response:"
+msgstr "oväntat svar:"
+
#, python-format
msgid "push refused: %s"
msgstr ""
-msgid "unsynced changes"
-msgstr ""
-
#, python-format
msgid "'%s' does not appear to be an hg repository"
msgstr ""
@@ -12414,6 +13302,10 @@
msgstr ""
#, python-format
+msgid "bad subrepository pattern in %s: %s"
+msgstr ""
+
+#, python-format
msgid ""
" subrepository sources for %s differ\n"
"use (l)ocal source (%s) or (r)emote source (%s)?"
@@ -12435,10 +13327,18 @@
msgstr ""
#, python-format
+msgid "default path for subrepository %s not found"
+msgstr ""
+
+#, python-format
msgid "unknown subrepo type %s"
msgstr ""
#, python-format
+msgid "warning: error \"%s\" in subrepository \"%s\"\n"
+msgstr ""
+
+#, python-format
msgid "removing subrepo %s\n"
msgstr ""
@@ -12468,6 +13368,9 @@
msgid "node '%s' is not well formed"
msgstr ""
+msgid ".hg/tags.cache is corrupt, rebuilding it\n"
+msgstr ".hg/tags.cache är korrupt, bygger om den\n"
+
msgid "unmatched quotes"
msgstr ""
@@ -12512,6 +13415,10 @@
msgstr ""
#, python-format
+msgid "(deprecated '%%' in path %s=%s from %s)\n"
+msgstr "(föråldrad '%%' i sökvägen %s=%s från %s)\n"
+
+#, python-format
msgid "ignoring untrusted configuration option %s.%s = %s\n"
msgstr ""
@@ -12533,10 +13440,6 @@
msgid "username %s contains a newline\n"
msgstr ""
-#, python-format
-msgid "(deprecated '%%' in path %s=%s from %s)\n"
-msgstr "(föråldrad '%%' i sökvägen %s=%s från %s)\n"
-
msgid "response expected"
msgstr ""
@@ -12577,12 +13480,23 @@
msgid "certificate checking requires Python 2.6"
msgstr "certifikatkontroll kräver Python 2.6"
-msgid "server identity verification succeeded\n"
-msgstr "verifiering av serveridentitet lyckades\n"
+msgid "no certificate received"
+msgstr "inget certifikat mottaget"
+
+#, python-format
+msgid "certificate is for %s"
+msgstr "certifikat är för %s"
+
+msgid "no commonName found in certificate"
+msgstr "inget commonName hittades i certifikat"
+
+#, python-format
+msgid "%s certificate error: %s"
+msgstr "%s certifikatfel: %s"
#, python-format
msgid "command '%s' failed: %s"
-msgstr ""
+msgstr "kommandot '%s' misslyckades: %s"
#, python-format
msgid "path contains illegal component: %s"
@@ -12604,8 +13518,8 @@
msgstr ""
#, python-format
-msgid "invalid date: %r "
-msgstr ""
+msgid "invalid date: %r"
+msgstr "ogiltigt datum: %r"
#, python-format
msgid "date exceeds 32 bits: %d"
@@ -12659,6 +13573,10 @@
msgid "%.0f bytes"
msgstr ""
+#, python-format
+msgid "no port number associated with service '%s'"
+msgstr ""
+
msgid "cannot verify bundle or remote repos"
msgstr ""
@@ -12723,6 +13641,9 @@
msgid "checking changesets\n"
msgstr "kontrollerar ändringar\n"
+msgid "checking"
+msgstr "kontrollerar"
+
#, python-format
msgid "unpacking changeset %s"
msgstr "packar upp ändringen %s"
@@ -12764,9 +13685,6 @@
msgid "cannot decode filename '%s'"
msgstr "kan inte avkoda filnamnet '%s'"
-msgid "checking"
-msgstr "kontrollerar"
-
#, python-format
msgid "broken revlog! (%s)"
msgstr "skadad revlog! (%s)"
@@ -12828,3 +13746,15 @@
msgid "user name not available - set USERNAME environment variable"
msgstr "användarnamnet är inte tillgängligt - sätt miljövariabeln USERNAME"
+
+msgid "look up remote revision"
+msgstr "söker fjärrevision"
+
+msgid "look up remote changes"
+msgstr "söker fjärrändringar"
+
+msgid "push failed:"
+msgstr "tryckning misslyckades:"
+
+msgid "push failed (unexpected response):"
+msgstr "tryckning misslyckades (oväntat svar):"
--- a/i18n/zh_TW.po Wed Oct 20 23:48:33 2010 +0200
+++ b/i18n/zh_TW.po Tue Nov 02 09:47:47 2010 +0100
@@ -2,647 +2,53 @@
# Copyright (C) 2009 Matt Mackall <mpm@selenic.com> and others
# This file is distributed under the same license as the Mercurial package.
# Chia-Huan Wu <willie.tw@gmail.com>, 2009.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: Mercurial\n"
"Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2009-10-25 12:38+0100\n"
+"POT-Creation-Date: 2010-10-31 22:27+0100\n"
"PO-Revision-Date: 2009-10-25 12:50+0100\n"
-"Last-Translator: Chia-Huan Wu <willie.tw@gmail.com>\n"
+"Last-Translator: Chia-Huan Wu <willie.tw@gmail.com>,"
+"leolarrel<leolarrel@gmail.com>\n"
"Language-Team: Traditional Chinese\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#, python-format
msgid " (default: %s)"
-msgstr " (é è¨: %s)"
-
-msgid "OPTIONS"
+msgstr "(內定: %s)"
+
+msgid "Options"
msgstr "é¸é …"
-msgid "COMMANDS"
-msgstr "命令"
-
-#, fuzzy
-msgid " options:"
-msgstr " é¸é …: \n"
+msgid "Commands"
+msgstr "基本命令"
+
+msgid "Extensions"
+msgstr "擴充套件"
+
+msgid ""
+"This section contains help for extensions that are distributed together with "
+"Mercurial. Help for other extensions is available in the help system."
+msgstr ""
+
+msgid "options:"
+msgstr "é¸é …:"
#, python-format
msgid " aliases: %s"
-msgstr " 別å: %s"
-
-msgid "Some commands allow the user to specify a date, e.g.:"
-msgstr ""
-
-msgid ""
-"- backout, commit, import, tag: Specify the commit date.\n"
-"- log, revert, update: Select revision(s) by date."
-msgstr ""
-
-msgid "Many date formats are valid. Here are some examples::"
-msgstr ""
-
-msgid ""
-" \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
-" \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
-" \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
-" \"Dec 6\" (midnight)\n"
-" \"13:18\" (today assumed)\n"
-" \"3:39\" (3:39AM assumed)\n"
-" \"3:39pm\" (15:39)\n"
-" \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
-" \"2006-12-6 13:18\"\n"
-" \"2006-12-6\"\n"
-" \"12-6\"\n"
-" \"12/6\"\n"
-" \"12/6/6\" (Dec 6 2006)"
-msgstr ""
-
-msgid "Lastly, there is Mercurial's internal format::"
-msgstr ""
-
-msgid " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)"
-msgstr ""
-
-msgid ""
-"This is the internal representation format for dates. unixtime is the\n"
-"number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n"
-"the offset of the local timezone, in seconds west of UTC (negative if\n"
-"the timezone is east of UTC)."
-msgstr ""
-
-msgid "The log command also accepts date ranges::"
-msgstr ""
-
-msgid ""
-" \"<{datetime}\" - at or before a given date/time\n"
-" \">{datetime}\" - on or after a given date/time\n"
-" \"{datetime} to {datetime}\" - a date range, inclusive\n"
-" \"-{days}\" - within a given number of days of today\n"
-msgstr ""
-
-msgid ""
-"Mercurial's default format for showing changes between two versions of\n"
-"a file is compatible with the unified format of GNU diff, which can be\n"
-"used by GNU patch and many other standard tools."
-msgstr ""
-
-msgid ""
-"While this standard format is often enough, it does not encode the\n"
-"following information:"
-msgstr ""
-
-msgid ""
-"- executable status and other permission bits\n"
-"- copy or rename information\n"
-"- changes in binary files\n"
-"- creation or deletion of empty files"
-msgstr ""
-
-msgid ""
-"Mercurial also supports the extended diff format from the git VCS\n"
-"which addresses these limitations. The git diff format is not produced\n"
-"by default because a few widespread tools still do not understand this\n"
-"format."
-msgstr ""
-
-msgid ""
-"This means that when generating diffs from a Mercurial repository\n"
-"(e.g. with \"hg export\"), you should be careful about things like file\n"
-"copies and renames or other things mentioned above, because when\n"
-"applying a standard diff to a different repository, this extra\n"
-"information is lost. Mercurial's internal operations (like push and\n"
-"pull) are not affected by this, because they use an internal binary\n"
-"format for communicating changes."
-msgstr ""
-
-msgid ""
-"To make Mercurial produce the git extended diff format, use the --git\n"
-"option available for many commands, or set 'git = True' in the [diff]\n"
-"section of your hgrc. You do not need to set this option when\n"
-"importing diffs in this format or using them in the mq extension.\n"
-msgstr ""
-
-msgid ""
-"HG\n"
-" Path to the 'hg' executable, automatically passed when running\n"
-" hooks, extensions or external tools. If unset or empty, this is\n"
-" the hg executable's name if it's frozen, or an executable named\n"
-" 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
-" Windows) is searched."
-msgstr ""
-
-msgid ""
-"HGEDITOR\n"
-" This is the name of the editor to run when committing. See EDITOR."
-msgstr ""
-
-msgid " (deprecated, use .hgrc)"
-msgstr ""
-
-msgid ""
-"HGENCODING\n"
-" This overrides the default locale setting detected by Mercurial.\n"
-" This setting is used to convert data including usernames,\n"
-" changeset descriptions, tag names, and branches. This setting can\n"
-" be overridden with the --encoding command-line option."
-msgstr ""
-
-msgid ""
-"HGENCODINGMODE\n"
-" This sets Mercurial's behavior for handling unknown characters\n"
-" while transcoding user input. The default is \"strict\", which\n"
-" causes Mercurial to abort if it can't map a character. Other\n"
-" settings include \"replace\", which replaces unknown characters, and\n"
-" \"ignore\", which drops them. This setting can be overridden with\n"
-" the --encodingmode command-line option."
-msgstr ""
-
-msgid ""
-"HGMERGE\n"
-" An executable to use for resolving merge conflicts. The program\n"
-" will be executed with three arguments: local file, remote file,\n"
-" ancestor file."
-msgstr ""
-
-msgid ""
-"HGRCPATH\n"
-" A list of files or directories to search for hgrc files. Item\n"
-" separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
-" platform default search path is used. If empty, only the .hg/hgrc\n"
-" from the current repository is read."
-msgstr ""
-
-msgid " For each element in HGRCPATH:"
-msgstr ""
-
-msgid ""
-" - if it's a directory, all files ending with .rc are added\n"
-" - otherwise, the file itself will be added"
-msgstr ""
-
-msgid ""
-"HGUSER\n"
-" This is the string used as the author of a commit. If not set,\n"
-" available values will be considered in this order:"
-msgstr ""
-
-msgid ""
-" - HGUSER (deprecated)\n"
-" - hgrc files from the HGRCPATH\n"
-" - EMAIL\n"
-" - interactive prompt\n"
-" - LOGNAME (with '@hostname' appended)"
-msgstr ""
-
-msgid ""
-"EMAIL\n"
-" May be used as the author of a commit; see HGUSER."
-msgstr ""
-
-msgid ""
-"LOGNAME\n"
-" May be used as the author of a commit; see HGUSER."
-msgstr ""
-
-msgid ""
-"VISUAL\n"
-" This is the name of the editor to use when committing. See EDITOR."
-msgstr ""
-
-msgid ""
-"EDITOR\n"
-" Sometimes Mercurial needs to open a text file in an editor for a\n"
-" user to modify, for example when writing commit messages. The\n"
-" editor it uses is determined by looking at the environment\n"
-" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
-" non-empty one is chosen. If all of them are empty, the editor\n"
-" defaults to 'vi'."
-msgstr ""
-
-msgid ""
-"PYTHONPATH\n"
-" This is used by Python to find imported modules and may need to be\n"
-" set appropriately if this Mercurial is not installed system-wide.\n"
-msgstr ""
-
-msgid ""
-"Mercurial has the ability to add new features through the use of\n"
-"extensions. Extensions may add new commands, add options to\n"
-"existing commands, change the default behavior of commands, or\n"
-"implement hooks."
-msgstr ""
-
-msgid ""
-"Extensions are not loaded by default for a variety of reasons:\n"
-"they can increase startup overhead; they may be meant for advanced\n"
-"usage only; they may provide potentially dangerous abilities (such\n"
-"as letting you destroy or modify history); they might not be ready\n"
-"for prime time; or they may alter some usual behaviors of stock\n"
-"Mercurial. It is thus up to the user to activate extensions as\n"
-"needed."
-msgstr ""
-
-msgid ""
-"To enable the \"foo\" extension, either shipped with Mercurial or in\n"
-"the Python search path, create an entry for it in your hgrc, like\n"
-"this::"
-msgstr ""
-
-msgid ""
-" [extensions]\n"
-" foo ="
-msgstr ""
-
-msgid "You may also specify the full path to an extension::"
-msgstr ""
-
-msgid ""
-" [extensions]\n"
-" myfeature = ~/.hgext/myfeature.py"
-msgstr ""
-
-msgid ""
-"To explicitly disable an extension enabled in an hgrc of broader\n"
-"scope, prepend its path with !::"
-msgstr ""
-
-msgid ""
-" [extensions]\n"
-" # disabling extension bar residing in /path/to/extension/bar.py\n"
-" bar = !/path/to/extension/bar.py\n"
-" # ditto, but no path was supplied for extension baz\n"
-" baz = !\n"
-msgstr ""
-
-msgid ""
-"When Mercurial accepts more than one revision, they may be specified\n"
-"individually, or provided as a topologically continuous range,\n"
-"separated by the \":\" character."
-msgstr ""
-
-msgid ""
-"The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n"
-"revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n"
-"specified, it defaults to revision number 0. If END is not specified,\n"
-"it defaults to the tip. The range \":\" thus means \"all revisions\"."
-msgstr ""
-
-msgid "If BEGIN is greater than END, revisions are treated in reverse order."
-msgstr ""
-
-msgid ""
-"A range acts as a closed interval. This means that a range of 3:5\n"
-"gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
-msgstr ""
-
-msgid ""
-"Mercurial accepts several notations for identifying one or more files\n"
-"at a time."
-msgstr ""
-
-msgid ""
-"By default, Mercurial treats filenames as shell-style extended glob\n"
-"patterns."
-msgstr ""
-
-msgid "Alternate pattern notations must be specified explicitly."
-msgstr ""
-
-msgid ""
-"To use a plain path name without any pattern matching, start it with\n"
-"``path:``. These path names must completely match starting at the\n"
-"current repository root."
-msgstr ""
-
-msgid ""
-"To use an extended glob, start a name with ``glob:``. Globs are rooted\n"
-"at the current directory; a glob such as ``*.c`` will only match files\n"
-"in the current directory ending with ``.c``."
-msgstr ""
-
-msgid ""
-"The supported glob syntax extensions are ``**`` to match any string\n"
-"across path separators and ``{a,b}`` to mean \"a or b\"."
-msgstr ""
-
-msgid ""
-"To use a Perl/Python regular expression, start a name with ``re:``.\n"
-"Regexp pattern matching is anchored at the root of the repository."
-msgstr ""
-
-msgid "Plain examples::"
-msgstr ""
-
-msgid ""
-" path:foo/bar a name bar in a directory named foo in the root\n"
-" of the repository\n"
-" path:path:name a file or directory named \"path:name\""
-msgstr ""
-
-msgid "Glob examples::"
-msgstr ""
-
-msgid ""
-" glob:*.c any name ending in \".c\" in the current directory\n"
-" *.c any name ending in \".c\" in the current directory\n"
-" **.c any name ending in \".c\" in any subdirectory of the\n"
-" current directory including itself.\n"
-" foo/*.c any name ending in \".c\" in the directory foo\n"
-" foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
-" including itself."
-msgstr ""
-
-msgid "Regexp examples::"
-msgstr ""
-
-msgid " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
-msgstr ""
-
-msgid "Mercurial supports several ways to specify individual revisions."
-msgstr ""
-
-msgid ""
-"A plain integer is treated as a revision number. Negative integers are\n"
-"treated as sequential offsets from the tip, with -1 denoting the tip,\n"
-"-2 denoting the revision prior to the tip, and so forth."
-msgstr ""
-
-msgid ""
-"A 40-digit hexadecimal string is treated as a unique revision\n"
-"identifier."
-msgstr ""
-
-msgid ""
-"A hexadecimal string less than 40 characters long is treated as a\n"
-"unique revision identifier and is referred to as a short-form\n"
-"identifier. A short-form identifier is only valid if it is the prefix\n"
-"of exactly one full-length identifier."
-msgstr ""
-
-msgid ""
-"Any other string is treated as a tag or branch name. A tag name is a\n"
-"symbolic name associated with a revision identifier. A branch name\n"
-"denotes the tipmost revision of that branch. Tag and branch names must\n"
-"not contain the \":\" character."
-msgstr ""
-
-msgid ""
-"The reserved name \"tip\" is a special tag that always identifies the\n"
-"most recent revision."
-msgstr ""
-
-msgid ""
-"The reserved name \"null\" indicates the null revision. This is the\n"
-"revision of an empty repository, and the parent of revision 0."
-msgstr ""
-
-msgid ""
-"The reserved name \".\" indicates the working directory parent. If no\n"
-"working directory is checked out, it is equivalent to null. If an\n"
-"uncommitted merge is in progress, \".\" is the revision of the first\n"
-"parent.\n"
-msgstr ""
-
-msgid ""
-"Mercurial allows you to customize output of commands through\n"
-"templates. You can either pass in a template from the command\n"
-"line, via the --template option, or select an existing\n"
-"template-style (--style)."
-msgstr ""
-
-msgid ""
-"You can customize output for any \"log-like\" command: log,\n"
-"outgoing, incoming, tip, parents, heads and glog."
-msgstr ""
-
-msgid ""
-"Three styles are packaged with Mercurial: default (the style used\n"
-"when no explicit preference is passed), compact and changelog.\n"
-"Usage::"
-msgstr ""
-
-msgid " $ hg log -r1 --style changelog"
-msgstr ""
-
-msgid ""
-"A template is a piece of text, with markup to invoke variable\n"
-"expansion::"
-msgstr ""
-
-msgid ""
-" $ hg log -r1 --template \"{node}\\n\"\n"
-" b56ce7b07c52de7d5fd79fb89701ea538af65746"
-msgstr ""
-
-msgid ""
-"Strings in curly braces are called keywords. The availability of\n"
-"keywords depends on the exact context of the templater. These\n"
-"keywords are usually available for templating a log-like command:"
-msgstr ""
-
-msgid ""
-":author: String. The unmodified author of the changeset.\n"
-":branches: String. The name of the branch on which the changeset\n"
-" was committed. Will be empty if the branch name was\n"
-" default.\n"
-":date: Date information. The date when the changeset was\n"
-" committed.\n"
-":desc: String. The text of the changeset description.\n"
-":diffstat: String. Statistics of changes with the following\n"
-" format: \"modified files: +added/-removed lines\"\n"
-":files: List of strings. All files modified, added, or removed\n"
-" by this changeset.\n"
-":file_adds: List of strings. Files added by this changeset.\n"
-":file_mods: List of strings. Files modified by this changeset.\n"
-":file_dels: List of strings. Files removed by this changeset.\n"
-":node: String. The changeset identification hash, as a\n"
-" 40-character hexadecimal string.\n"
-":parents: List of strings. The parents of the changeset.\n"
-":rev: Integer. The repository-local changeset revision\n"
-" number.\n"
-":tags: List of strings. Any tags associated with the\n"
-" changeset.\n"
-":latesttag: String. Most recent global tag in the ancestors of this\n"
-" changeset.\n"
-":latesttagdistance: Integer. Longest path to the latest tag."
-msgstr ""
-
-msgid ""
-"The \"date\" keyword does not produce human-readable output. If you\n"
-"want to use a date in your output, you can use a filter to process\n"
-"it. Filters are functions which return a string based on the input\n"
-"variable. You can also use a chain of filters to get the desired\n"
-"output::"
-msgstr ""
-
-msgid ""
-" $ hg tip --template \"{date|isodate}\\n\"\n"
-" 2008-08-21 18:22 +0000"
-msgstr ""
-
-msgid "List of filters:"
-msgstr ""
-
-msgid ""
-":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
-" every line except the last.\n"
-":age: Date. Returns a human-readable date/time difference\n"
-" between the given date/time and the current\n"
-" date/time.\n"
-":basename: Any text. Treats the text as a path, and returns the\n"
-" last component of the path after splitting by the\n"
-" path separator (ignoring trailing separators). For\n"
-" example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\"\n"
-" becomes \"bar\".\n"
-":stripdir: Treat the text as path and strip a directory level,\n"
-" if possible. For example, \"foo\" and \"foo/bar\" becomes\n"
-" \"foo\".\n"
-":date: Date. Returns a date in a Unix date format, including\n"
-" the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
-":domain: Any text. Finds the first string that looks like an\n"
-" email address, and extracts just the domain\n"
-" component. Example: 'User <user@example.com>' becomes\n"
-" 'example.com'.\n"
-":email: Any text. Extracts the first string that looks like\n"
-" an email address. Example: 'User <user@example.com>'\n"
-" becomes 'user@example.com'.\n"
-":escape: Any text. Replaces the special XML/XHTML characters\n"
-" \"&\", \"<\" and \">\" with XML entities.\n"
-":fill68: Any text. Wraps the text to fit in 68 columns.\n"
-":fill76: Any text. Wraps the text to fit in 76 columns.\n"
-":firstline: Any text. Returns the first line of text.\n"
-":nonempty: Any text. Returns '(none)' if the string is empty.\n"
-":hgdate: Date. Returns the date as a pair of numbers:\n"
-" \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
-":isodate: Date. Returns the date in ISO 8601 format:\n"
-" \"2009-08-18 13:00 +0200\".\n"
-":isodatesec: Date. Returns the date in ISO 8601 format, including\n"
-" seconds: \"2009-08-18 13:00:13 +0200\". See also the\n"
-" rfc3339date filter.\n"
-":localdate: Date. Converts a date to local date.\n"
-":obfuscate: Any text. Returns the input text rendered as a\n"
-" sequence of XML entities.\n"
-":person: Any text. Returns the text before an email address.\n"
-":rfc822date: Date. Returns a date using the same format used in\n"
-" email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n"
-":rfc3339date: Date. Returns a date using the Internet date format\n"
-" specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n"
-":short: Changeset hash. Returns the short form of a changeset\n"
-" hash, i.e. a 12-byte hexadecimal string.\n"
-":shortdate: Date. Returns a date like \"2006-09-18\".\n"
-":strip: Any text. Strips all leading and trailing whitespace.\n"
-":tabindent: Any text. Returns the text, with every line except\n"
-" the first starting with a tab character.\n"
-":urlescape: Any text. Escapes all \"special\" characters. For\n"
-" example, \"foo bar\" becomes \"foo%20bar\".\n"
-":user: Any text. Returns the user portion of an email\n"
-" address.\n"
-msgstr ""
-
-msgid "Valid URLs are of the form::"
-msgstr ""
-
-msgid ""
-" local/filesystem/path[#revision]\n"
-" file://local/filesystem/path[#revision]\n"
-" http://[user[:pass]@]host[:port]/[path][#revision]\n"
-" https://[user[:pass]@]host[:port]/[path][#revision]\n"
-" ssh://[user[:pass]@]host[:port]/[path][#revision]"
-msgstr ""
-
-msgid ""
-"Paths in the local filesystem can either point to Mercurial\n"
-"repositories or to bundle files (as created by 'hg bundle' or 'hg\n"
-"incoming --bundle')."
-msgstr ""
-
-msgid ""
-"An optional identifier after # indicates a particular branch, tag, or\n"
-"changeset to use from the remote repository. See also 'hg help\n"
-"revisions'."
-msgstr ""
-
-msgid ""
-"Some features, such as pushing to http:// and https:// URLs are only\n"
-"possible if the feature is explicitly enabled on the remote Mercurial\n"
-"server."
-msgstr ""
-
-msgid "Some notes about using SSH with Mercurial:"
-msgstr ""
-
-msgid ""
-"- SSH requires an accessible shell account on the destination machine\n"
-" and a copy of hg in the remote path or specified with as remotecmd.\n"
-"- path is relative to the remote user's home directory by default. Use\n"
-" an extra slash at the start of a path to specify an absolute path::"
-msgstr ""
-
-msgid " ssh://example.com//tmp/repository"
-msgstr ""
-
-msgid ""
-"- Mercurial doesn't use its own compression via SSH; the right thing\n"
-" to do is to configure it in your ~/.ssh/config, e.g.::"
-msgstr ""
-
-msgid ""
-" Host *.mylocalnetwork.example.com\n"
-" Compression no\n"
-" Host *\n"
-" Compression yes"
-msgstr ""
-
-msgid ""
-" Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n"
-" with the --ssh command line option."
-msgstr ""
-
-msgid ""
-"These URLs can all be stored in your hgrc with path aliases under the\n"
-"[paths] section like so::"
-msgstr ""
-
-msgid ""
-" [paths]\n"
-" alias1 = URL1\n"
-" alias2 = URL2\n"
-" ..."
-msgstr ""
-
-msgid ""
-"You can then use the alias for any command that uses a URL (for\n"
-"example 'hg pull alias1' would pull from the 'alias1' path)."
-msgstr ""
-
-msgid ""
-"Two path aliases are special because they are used as defaults when\n"
-"you do not provide the URL to a command:"
-msgstr ""
-
-msgid ""
-"default:\n"
-" When you create a repository with hg clone, the clone command saves\n"
-" the location of the source repository as the new repository's\n"
-" 'default' path. This is then used when you omit path from push- and\n"
-" pull-like commands (including incoming and outgoing)."
-msgstr ""
-
-msgid ""
-"default-push:\n"
-" The push command will look for a path named 'default-push', and\n"
-" prefer it over 'default' if both are defined.\n"
-msgstr ""
+msgstr "\t別å:%s"
msgid "hooks for controlling repository access"
msgstr ""
msgid ""
-"This hook makes it possible to allow or deny write access to portions\n"
-"of a repository when receiving incoming changesets."
+"This hook makes it possible to allow or deny write access to given\n"
+"branches and paths of a repository when receiving incoming changesets\n"
+"via pretxnchangegroup and pretxncommit."
msgstr ""
msgid ""
@@ -653,63 +59,223 @@
msgid ""
"The acl hook is best used along with a restricted shell like hgsh,\n"
-"preventing authenticating users from doing anything other than\n"
-"pushing or pulling. The hook is not safe to use if users have\n"
-"interactive shell access, as they can then disable the hook.\n"
-"Nor is it safe if remote users share an account, because then there\n"
-"is no way to distinguish them."
-msgstr ""
-
-msgid "To use this hook, configure the acl extension in your hgrc like this::"
-msgstr ""
-
-msgid ""
-" [extensions]\n"
-" acl ="
-msgstr ""
-
-msgid ""
-" [hooks]\n"
+"preventing authenticating users from doing anything other than pushing\n"
+"or pulling. The hook is not safe to use if users have interactive\n"
+"shell access, as they can then disable the hook. Nor is it safe if\n"
+"remote users share an account, because then there is no way to\n"
+"distinguish them."
+msgstr ""
+
+msgid "The order in which access checks are performed is:"
+msgstr ""
+
+msgid ""
+"1) Deny list for branches (section ``acl.deny.branches``)\n"
+"2) Allow list for branches (section ``acl.allow.branches``)\n"
+"3) Deny list for paths (section ``acl.deny``)\n"
+"4) Allow list for paths (section ``acl.allow``)"
+msgstr ""
+
+msgid "The allow and deny sections take key-value pairs."
+msgstr ""
+
+msgid ""
+"Branch-based Access Control\n"
+"..........................."
+msgstr ""
+
+msgid ""
+"Use the ``acl.deny.branches`` and ``acl.allow.branches`` sections to\n"
+"have branch-based access control. Keys in these sections can be\n"
+"either:"
+msgstr ""
+
+msgid ""
+"- a branch name, or\n"
+"- an asterisk, to match any branch;"
+msgstr ""
+
+msgid "The corresponding values can be either:"
+msgstr ""
+
+msgid ""
+"- a comma-separated list containing users and groups, or\n"
+"- an asterisk, to match anyone;"
+msgstr ""
+
+msgid ""
+"Path-based Access Control\n"
+"........................."
+msgstr ""
+
+msgid ""
+"Use the ``acl.deny`` and ``acl.allow`` sections to have path-based\n"
+"access control. Keys in these sections accept a subtree pattern (with\n"
+"a glob syntax by default). The corresponding values follow the same\n"
+"syntax as the other sections above."
+msgstr ""
+
+msgid ""
+"Groups\n"
+"......"
+msgstr ""
+
+msgid ""
+"Group names must be prefixed with an ``@`` symbol. Specifying a group\n"
+"name has the same effect as specifying all the users in that group."
+msgstr ""
+
+msgid ""
+"You can define group members in the ``acl.groups`` section.\n"
+"If a group name is not defined there, and Mercurial is running under\n"
+"a Unix-like system, the list of users will be taken from the OS.\n"
+"Otherwise, an exception will be raised."
+msgstr ""
+
+msgid ""
+"Example Configuration\n"
+"....................."
+msgstr ""
+
+msgid "::"
+msgstr ""
+
+msgid " [hooks]"
+msgstr ""
+
+msgid ""
+" # Use this if you want to check access restrictions at commit time\n"
+" pretxncommit.acl = python:hgext.acl.hook"
+msgstr ""
+
+msgid ""
+" # Use this if you want to check access restrictions for pull, push,\n"
+" # bundle and serve.\n"
" pretxnchangegroup.acl = python:hgext.acl.hook"
msgstr ""
msgid ""
" [acl]\n"
-" # Check whether the source of incoming changes is in this list\n"
-" # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
+" # Allow or deny access for incoming changes only if their source is\n"
+" # listed here, let them pass otherwise. Source is \"serve\" for all\n"
+" # remote access (http or ssh), \"push\", \"pull\" or \"bundle\" when the\n"
+" # related commands are run locally.\n"
+" # Default: serve\n"
" sources = serve"
msgstr ""
-msgid ""
-"The allow and deny sections take a subtree pattern as key (with a glob\n"
-"syntax by default), and a comma separated list of users as the\n"
-"corresponding value. The deny list is checked before the allow list\n"
-"is. ::"
+msgid " [acl.deny.branches]"
+msgstr ""
+
+msgid ""
+" # Everyone is denied to the frozen branch:\n"
+" frozen-branch = *"
+msgstr ""
+
+msgid ""
+" # A bad user is denied on all branches:\n"
+" * = bad-user"
+msgstr ""
+
+msgid " [acl.allow.branches]"
+msgstr ""
+
+msgid ""
+" # A few users are allowed on branch-a:\n"
+" branch-a = user-1, user-2, user-3"
+msgstr ""
+
+msgid ""
+" # Only one user is allowed on branch-b:\n"
+" branch-b = user-1"
+msgstr ""
+
+msgid ""
+" # The super user is allowed on any branch:\n"
+" * = super-user"
+msgstr ""
+
+msgid ""
+" # Everyone is allowed on branch-for-tests:\n"
+" branch-for-tests = *"
+msgstr ""
+
+msgid ""
+" [acl.deny]\n"
+" # This list is checked first. If a match is found, acl.allow is not\n"
+" # checked. All users are granted access if acl.deny is not present.\n"
+" # Format for both lists: glob pattern = user, ..., @group, ..."
+msgstr ""
+
+msgid ""
+" # To match everyone, use an asterisk for the user:\n"
+" # my/glob/pattern = *"
+msgstr ""
+
+msgid ""
+" # user6 will not have write access to any file:\n"
+" ** = user6"
+msgstr ""
+
+msgid ""
+" # Group \"hg-denied\" will not have write access to any file:\n"
+" ** = @hg-denied"
+msgstr ""
+
+msgid ""
+" # Nobody will be able to change \"DONT-TOUCH-THIS.txt\", despite\n"
+" # everyone being able to change all other files. See below.\n"
+" src/main/resources/DONT-TOUCH-THIS.txt = *"
msgstr ""
msgid ""
" [acl.allow]\n"
-" # If acl.allow is not present, all users are allowed by default.\n"
-" # An empty acl.allow section means no users allowed.\n"
-" docs/** = doc_writer\n"
-" .hgtags = release_engineer"
-msgstr ""
-
-msgid ""
-" [acl.deny]\n"
-" # If acl.deny is not present, no users are refused by default.\n"
-" # An empty acl.deny section means all users allowed.\n"
-" glob pattern = user4, user5\n"
-" ** = user6\n"
-msgstr ""
-
-#, python-format
-msgid "config error - hook type \"%s\" cannot stop incoming changesets"
+" # if acl.allow is not present, all users are allowed by default\n"
+" # empty acl.allow = no users allowed"
+msgstr ""
+
+msgid ""
+" # User \"doc_writer\" has write access to any file under the \"docs\"\n"
+" # folder:\n"
+" docs/** = doc_writer"
+msgstr ""
+
+msgid ""
+" # User \"jack\" and group \"designers\" have write access to any file\n"
+" # under the \"images\" folder:\n"
+" images/** = jack, @designers"
+msgstr ""
+
+msgid ""
+" # Everyone (except for \"user6\" - see acl.deny above) will have write\n"
+" # access to any file under the \"resources\" folder (except for 1\n"
+" # file. See acl.deny):\n"
+" src/main/resources/** = *"
+msgstr ""
+
+msgid " .hgtags = release_engineer"
+msgstr ""
+
+#, python-format
+msgid "group '%s' is undefined"
+msgstr "沒有定義'%s'群組"
+
+#, python-format
+msgid ""
+"config error - hook type \"%s\" cannot stop incoming changesets nor commits"
+msgstr ""
+
+#, python-format
+msgid "acl: user \"%s\" denied on branch \"%s\" (changeset \"%s\")"
+msgstr ""
+
+#, python-format
+msgid "acl: user \"%s\" not allowed on branch \"%s\" (changeset \"%s\")"
msgstr ""
#, python-format
msgid "acl: access denied for changeset %s"
-msgstr ""
+msgstr "acl: changeset %s 拒絕å˜å–"
msgid "track a line of development with movable markers"
msgstr ""
@@ -722,15 +288,15 @@
msgstr ""
msgid ""
-"It is possible to use bookmark names in every revision lookup (e.g. hg\n"
-"merge, hg update)."
+"It is possible to use bookmark names in every revision lookup (e.g.\n"
+":hg:`merge`, :hg:`update`)."
msgstr ""
msgid ""
"By default, when several bookmarks point to the same changeset, they\n"
"will all move forward together. It is possible to obtain a more\n"
"git-like experience by adding the following configuration option to\n"
-"your .hgrc::"
+"your configuration file::"
msgstr ""
msgid ""
@@ -747,47 +313,134 @@
msgid ""
" Bookmarks are pointers to certain commits that move when\n"
" committing. Bookmarks are local. They can be renamed, copied and\n"
-" deleted. It is possible to use bookmark names in 'hg merge' and\n"
-" 'hg update' to merge and update respectively to a given bookmark."
-msgstr ""
-
-msgid ""
-" You can use 'hg bookmark NAME' to set a bookmark on the working\n"
+" deleted. It is possible to use bookmark names in :hg:`merge` and\n"
+" :hg:`update` to merge and update respectively to a given bookmark."
+msgstr ""
+
+msgid ""
+" You can use :hg:`bookmark NAME` to set a bookmark on the working\n"
" directory's parent revision with the given name. If you specify\n"
" a revision using -r REV (where REV may be an existing bookmark),\n"
-" the bookmark is assigned to that revision.\n"
+" the bookmark is assigned to that revision."
+msgstr ""
+
+msgid ""
+" Bookmarks can be pushed and pulled between repositories (see :hg:`help\n"
+" push` and :hg:`help pull`). This requires the bookmark extension to be\n"
+" enabled for both the local and remote repositories.\n"
" "
msgstr ""
msgid "a bookmark of this name does not exist"
-msgstr ""
+msgstr "這個åå—的書籤ä¸å˜åœ¨"
msgid "a bookmark of the same name already exists"
-msgstr ""
+msgstr "已經有相åŒåå—的書籤了"
msgid "new bookmark name required"
-msgstr ""
+msgstr "需è¦æ–°çš„書籤åå—"
msgid "bookmark name required"
-msgstr ""
+msgstr "需è¦æ›¸ç±¤çš„åå—"
msgid "bookmark name cannot contain newlines"
+msgstr "書籤åå—ä¸å¯ä»¥æœ‰æ›è¡Œå—å…ƒ"
+
+msgid "bookmark names cannot consist entirely of whitespace"
msgstr ""
msgid "a bookmark cannot have the name of an existing branch"
msgstr ""
+msgid "no bookmarks set\n"
+msgstr "沒有è¨å®šæ›¸ç±¤\n"
+
+#, python-format
+msgid "updating bookmark %s\n"
+msgstr "更新書籤 %s\n"
+
+#, python-format
+msgid "not updating divergent bookmark %s\n"
+msgstr "沒有更新分æ§çš„書籤 %s\n"
+
+#, python-format
+msgid "updating bookmark %s failed!\n"
+msgstr "更新書籤 %s 失敗ï¼\n"
+
+#, python-format
+msgid "remote bookmark %s not found!"
+msgstr "找ä¸åˆ° %s書籤"
+
+#, python-format
+msgid "importing bookmark %s\n"
+msgstr "匯入書籤 %s\n"
+
+#, python-format
+msgid "exporting bookmark %s\n"
+msgstr "匯出書籤 %s\n"
+
+#, python-format
+msgid "deleting remote bookmark %s\n"
+msgstr "刪除é 端書籤 %s\n"
+
+#, python-format
+msgid "bookmark %s does not exist on the local or remote repository!\n"
+msgstr "%s 書籤沒有在本地或é 端儲å˜åº«!\n"
+
+#, fuzzy
+msgid "searching for changed bookmarks\n"
+msgstr "æ£åœ¨æœå°‹è®Šæ›´\n"
+
+#, fuzzy
+msgid "no changed bookmarks found\n"
+msgstr "找ä¸åˆ°è®Šæ›´\n"
+
+#, python-format
+msgid "comparing with %s\n"
+msgstr "æ£åœ¨è·Ÿ %s 比å°\n"
+
+msgid "bookmark to import"
+msgstr ""
+
+msgid "BOOKMARK"
+msgstr ""
+
+msgid "bookmark to export"
+msgstr ""
+
+msgid "compare bookmark"
+msgstr "比å°æ›¸ç±¤"
+
+msgid ""
+"``bookmark([name])``\n"
+" The named bookmark or all bookmarks."
+msgstr ""
+
+#. i18n: "bookmark" is a keyword
+msgid "bookmark takes one or no arguments"
+msgstr "bookmark 需è¦ä¸€å€‹åƒæ•¸æˆ–沒有åƒæ•¸"
+
+#. i18n: "bookmark" is a keyword
+msgid "the argument to bookmark must be a string"
+msgstr ""
+
msgid "force"
msgstr ""
+msgid "REV"
+msgstr ""
+
msgid "revision"
-msgstr ""
+msgstr "修定版"
msgid "delete a given bookmark"
+msgstr "刪除一個特定的書籤"
+
+msgid "NAME"
msgstr ""
msgid "rename a given bookmark"
-msgstr ""
+msgstr "æ›´å一個特定的書籤"
msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
msgstr ""
@@ -992,25 +645,25 @@
#, python-format
msgid "connecting to %s:%s as %s, password %s\n"
-msgstr ""
+msgstr "æ£åœ¨é€£ç·šåˆ° %s:%s as %s, 密碼是 %s\n"
#, python-format
msgid "query: %s %s\n"
-msgstr ""
+msgstr "查詢: %s %s\n"
#, python-format
msgid "failed query: %s %s\n"
-msgstr ""
+msgstr "查詢失敗了: %s %s\n"
msgid "unknown database schema"
-msgstr ""
+msgstr "未知的資料庫schema"
#, python-format
msgid "bug %d already knows about changeset %s\n"
msgstr ""
msgid "telling bugzilla to send mail:\n"
-msgstr ""
+msgstr "告訴bugzilla去寄信:\n"
#, python-format
msgid " bug %s\n"
@@ -1018,30 +671,30 @@
#, python-format
msgid "running notify command %s\n"
-msgstr ""
+msgstr "執行通知命令 %s\n"
#, python-format
msgid "bugzilla notify command %s"
-msgstr ""
+msgstr "bugzilla 通知命令 %s"
msgid "done\n"
-msgstr ""
+msgstr "完æˆ\n"
#, python-format
msgid "looking up user %s\n"
-msgstr ""
+msgstr "查閱使用者 %s\n"
#, python-format
msgid "cannot find bugzilla user id for %s"
-msgstr ""
+msgstr "找ä¸åˆ° bugzilla 使用者%s çš„ ID"
#, python-format
msgid "cannot find bugzilla user id for %s or %s"
-msgstr ""
+msgstr "找ä¸åˆ° bugzilla 使用者%s 或 %sçš„ ID"
#, python-format
msgid "bugzilla version %s not supported"
-msgstr ""
+msgstr "bugzilla版本 %s ä¸æ”¯æ´"
msgid ""
"changeset {node|short} in repo {root} refers to bug {bug}.\n"
@@ -1051,7 +704,7 @@
#, python-format
msgid "python mysql support not available: %s"
-msgstr ""
+msgstr "python mmysql 支æ´ä¸èƒ½ç”¨: %s"
#, python-format
msgid "hook type %s does not pass a changeset id"
@@ -1059,7 +712,7 @@
#, python-format
msgid "database error: %s"
-msgstr ""
+msgstr "資料庫錯誤: %s"
msgid "command to display child changesets"
msgstr ""
@@ -1089,9 +742,8 @@
msgid "Revision %d is a merge, ignoring...\n"
msgstr ""
-#, python-format
-msgid "generating stats: %d%%"
-msgstr ""
+msgid "analyzing"
+msgstr "分æžä¸"
msgid "histogram of changes to the repository"
msgstr ""
@@ -1138,7 +790,7 @@
" by providing a file using the following format::"
msgstr ""
-msgid " <alias email> <actual email>"
+msgid " <alias email> = <actual email>"
msgstr ""
msgid ""
@@ -1147,15 +799,28 @@
" "
msgstr ""
+#, python-format
+msgid "skipping malformed alias: %s\n"
+msgstr ""
+
msgid "count rate for the specified revision or range"
msgstr ""
+msgid "DATE"
+msgstr ""
+
msgid "count rate for revisions matching date spec"
msgstr ""
+msgid "TEMPLATE"
+msgstr ""
+
msgid "template to group changesets"
msgstr ""
+msgid "FORMAT"
+msgstr ""
+
msgid "strftime-compatible format for grouping by date"
msgstr ""
@@ -1165,21 +830,25 @@
msgid "sort by key (default: sort by count)"
msgstr ""
+msgid "display added/removed lines separately"
+msgstr ""
+
+msgid "FILE"
+msgstr ""
+
msgid "file with email aliases"
msgstr ""
-msgid "show progress"
-msgstr ""
-
-msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]"
+msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [FILE]"
msgstr ""
msgid "colorize output from some commands"
msgstr ""
msgid ""
-"This extension modifies the status command to add color to its output\n"
-"to reflect file status, the qseries command to add color to reflect\n"
+"This extension modifies the status and resolve commands to add color to "
+"their\n"
+"output to reflect file status, the qseries command to add color to reflect\n"
"patch status (applied, unapplied, missing), and to diff-related\n"
"commands to highlight additions, removals, diff headers, and trailing\n"
"whitespace."
@@ -1192,7 +861,7 @@
"render_text function, which can be used to add effects to any text."
msgstr ""
-msgid "Default effects may be overridden from the .hgrc file::"
+msgid "Default effects may be overridden from your configuration file::"
msgstr ""
msgid ""
@@ -1226,17 +895,50 @@
" diff.deleted = red\n"
" diff.inserted = green\n"
" diff.changed = white\n"
-" diff.trailingwhitespace = bold red_background\n"
-msgstr ""
-
-msgid "when to colorize (always, auto, or never)"
-msgstr ""
-
-msgid "don't colorize output (DEPRECATED)"
+" diff.trailingwhitespace = bold red_background"
+msgstr ""
+
+msgid ""
+" resolve.unresolved = red bold\n"
+" resolve.resolved = green bold"
+msgstr ""
+
+msgid " bookmarks.current = green"
+msgstr ""
+
+msgid ""
+" branches.active = none\n"
+" branches.closed = black bold\n"
+" branches.current = green\n"
+" branches.inactive = none"
+msgstr ""
+
+msgid ""
+"The color extension will try to detect whether to use ANSI codes or\n"
+"Win32 console APIs, unless it is made explicit::"
+msgstr ""
+
+msgid ""
+" [color]\n"
+" mode = ansi"
+msgstr ""
+
+msgid "Any value other than 'ansi', 'win32', or 'auto' will disable color."
msgstr ""
#, python-format
msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
+msgstr "忽略未知的é¡è‰²/效果 %r (被è¨å®šåœ¨ color.%s)\n"
+
+msgid "win32console not found, please install pywin32\n"
+msgstr "找ä¸åˆ°win32console,請安è£pywin32\n"
+
+#. i18n: 'always', 'auto', and 'never' are keywords and should
+#. not be translated
+msgid "when to colorize (boolean, always, auto, or never)"
+msgstr ""
+
+msgid "TYPE"
msgstr ""
msgid "import revisions from foreign VCS repositories into Mercurial"
@@ -1276,7 +978,7 @@
msgid ""
" If no destination directory name is specified, it defaults to the\n"
-" basename of the source with '-hg' appended. If the destination\n"
+" basename of the source with ``-hg`` appended. If the destination\n"
" repository doesn't exist, it will be created."
msgstr ""
@@ -1316,41 +1018,53 @@
msgid ""
" If the file doesn't exist, it's automatically created. It's\n"
-" updated on each commit copied, so convert-repo can be interrupted\n"
+" updated on each commit copied, so :hg:`convert` can be interrupted\n"
" and can be run repeatedly to copy new commits."
msgstr ""
msgid ""
-" The [username mapping] file is a simple text file that maps each\n"
-" source commit author to a destination commit author. It is handy\n"
-" for source SCMs that use unix logins to identify authors (eg:\n"
-" CVS). One line per author mapping and the line format is:\n"
-" srcauthor=whatever string you want"
+" The authormap is a simple text file that maps each source commit\n"
+" author to a destination commit author. It is handy for source SCMs\n"
+" that use unix logins to identify authors (eg: CVS). One line per\n"
+" author mapping and the line format is::"
+msgstr ""
+
+msgid " source author = destination author"
+msgstr ""
+
+msgid " Empty lines and lines starting with a ``#`` are ignored."
msgstr ""
msgid ""
" The filemap is a file that allows filtering and remapping of files\n"
-" and directories. Comment lines start with '#'. Each line can\n"
-" contain one of the following directives::"
-msgstr ""
-
-msgid " include path/to/file"
-msgstr ""
-
-msgid " exclude path/to/file"
-msgstr ""
-
-msgid " rename from/file to/file"
-msgstr ""
-
-msgid ""
-" The 'include' directive causes a file, or all files under a\n"
+" and directories. Each line can contain one of the following\n"
+" directives::"
+msgstr ""
+
+msgid " include path/to/file-or-dir"
+msgstr ""
+
+msgid " exclude path/to/file-or-dir"
+msgstr ""
+
+msgid " rename path/to/source path/to/destination"
+msgstr ""
+
+msgid ""
+" Comment lines start with ``#``. A specified path matches if it\n"
+" equals the full relative name of a file or one of its parent\n"
+" directories. The ``include`` or ``exclude`` directive with the\n"
+" longest matching path applies, so line order does not matter."
+msgstr ""
+
+msgid ""
+" The ``include`` directive causes a file, or all files under a\n"
" directory, to be included in the destination repository, and the\n"
" exclusion of all other files and directories not explicitly\n"
-" included. The 'exclude' directive causes files or directories to\n"
-" be omitted. The 'rename' directive renames a file or directory. To\n"
-" rename from a subdirectory into the root of the repository, use\n"
-" '.' as the path to rename to."
+" included. The ``exclude`` directive causes files or directories to\n"
+" be omitted. The ``rename`` directive renames a file or directory if\n"
+" it is converted. To rename from a subdirectory into the root of\n"
+" the repository, use ``.`` as the path to rename to."
msgstr ""
msgid ""
@@ -1359,11 +1073,21 @@
" useful if you want to e.g. give a Subversion merge two parents, or\n"
" graft two disconnected series of history together. Each entry\n"
" contains a key, followed by a space, followed by one or two\n"
-" comma-separated values. The key is the revision ID in the source\n"
+" comma-separated values::"
+msgstr ""
+
+msgid " key parent1, parent2"
+msgstr ""
+
+msgid ""
+" The key is the revision ID in the source\n"
" revision control system whose parents should be modified (same\n"
" format as a key in .hg/shamap). The values are the revision IDs\n"
" (in either the source or destination revision control system) that\n"
-" should be used as the new parents for that node."
+" should be used as the new parents for that node. For example, if\n"
+" you have merged \"release-1.0\" into \"trunk\", then you should\n"
+" specify the revision on \"trunk\" as the first parent and the one on\n"
+" the \"release-1.0\" branch as the second."
msgstr ""
msgid ""
@@ -1372,16 +1096,23 @@
" conjunction with a splicemap, it allows for a powerful combination\n"
" to help fix even the most badly mismanaged repositories and turn them\n"
" into nicely structured Mercurial repositories. The branchmap contains\n"
-" lines of the form \"original_branch_name new_branch_name\".\n"
-" \"original_branch_name\" is the name of the branch in the source\n"
-" repository, and \"new_branch_name\" is the name of the branch is the\n"
-" destination repository. This can be used to (for instance) move code\n"
-" in one repository from \"default\" to a named branch."
+" lines of the form::"
+msgstr ""
+
+msgid " original_branch_name new_branch_name"
+msgstr ""
+
+msgid ""
+" where \"original_branch_name\" is the name of the branch in the\n"
+" source repository, and \"new_branch_name\" is the name of the branch\n"
+" is the destination repository. No whitespace is allowed in the\n"
+" branch names. This can be used to (for instance) move code in one\n"
+" repository from \"default\" to a named branch."
msgstr ""
msgid ""
" Mercurial Source\n"
-" ----------------"
+" ''''''''''''''''"
msgstr ""
msgid ""
@@ -1398,7 +1129,7 @@
msgid ""
" CVS Source\n"
-" ----------"
+" ''''''''''"
msgstr ""
msgid ""
@@ -1434,7 +1165,16 @@
" Specify a regular expression to which commit log messages are\n"
" matched. If a match occurs, then the conversion process will\n"
" add the most recent revision on the branch indicated in the\n"
-" regex as the second parent of the changeset."
+" regex as the second parent of the changeset.\n"
+" --config hook.cvslog\n"
+" Specify a Python function to be called at the end of gathering\n"
+" the CVS log. The function is passed a list with the log entries,\n"
+" and can modify the entries in-place, or add or delete them.\n"
+" --config hook.cvschangesets\n"
+" Specify a Python function to be called after the changesets\n"
+" are calculated from the the CVS log. The function is passed\n"
+" a list with the changeset entries, and can modify the changesets\n"
+" in-place, or add or delete them."
msgstr ""
msgid ""
@@ -1446,7 +1186,7 @@
msgid ""
" Subversion Source\n"
-" -----------------"
+" '''''''''''''''''"
msgstr ""
msgid ""
@@ -1484,7 +1224,7 @@
msgid ""
" Perforce Source\n"
-" ---------------"
+" '''''''''''''''"
msgstr ""
msgid ""
@@ -1508,7 +1248,7 @@
msgid ""
" Mercurial Destination\n"
-" ---------------------"
+" '''''''''''''''''''''"
msgstr ""
msgid ""
@@ -1539,21 +1279,24 @@
" dates."
msgstr ""
-msgid "username mapping filename"
+msgid "username mapping filename (DEPRECATED, use --authormap instead)"
+msgstr ""
+
+msgid "source repository type"
msgstr ""
msgid "destination repository type"
msgstr ""
+msgid "import up to target revision REV"
+msgstr ""
+
+msgid "remap usernames using this file"
+msgstr ""
+
msgid "remap file names using contents of file"
msgstr ""
-msgid "import up to target revision REV"
-msgstr ""
-
-msgid "source repository type"
-msgstr ""
-
msgid "splice synthesized history into place"
msgstr ""
@@ -1605,15 +1348,24 @@
msgid "hg debugcvsps [OPTION]... [PATH]..."
msgstr ""
-msgid "warning: lightweight checkouts may cause conversion failures, try with a regular branch instead.\n"
+#, python-format
+msgid "%s does not look like a Bazaar repository"
+msgstr "%s 怎麼看都ä¸åƒæ˜¯ä¸€å€‹ Bazaar 儲å˜åº«"
+
+msgid "Bazaar modules could not be loaded"
+msgstr "Bazaar 模組ä¸èƒ½è¼‰å…¥"
+
+msgid ""
+"warning: lightweight checkouts may cause conversion failures, try with a "
+"regular branch instead.\n"
msgstr ""
msgid "bzr source type could not be determined\n"
-msgstr ""
+msgstr "bazaar 來æºåž‹æ…‹ä¸èƒ½è¢«æ±ºå®š\n"
#, python-format
msgid "%s is not a valid revision in current branch"
-msgstr ""
+msgstr "在目å‰çš„分支,%sä¸æ˜¯ä¸€å€‹æœ‰æ•ˆçš„修定版"
#, python-format
msgid "%s is not available in %s anymore"
@@ -1621,15 +1373,15 @@
#, python-format
msgid "%s.%s symlink has no target"
-msgstr ""
+msgstr "%s.%s 符號連çµæ²’有目標"
#, python-format
msgid "cannot find required \"%s\" tool"
-msgstr ""
+msgstr "找ä¸åˆ°éœ€è¦çš„ '%s' 工具"
#, python-format
msgid "%s error:\n"
-msgstr ""
+msgstr "%s 錯誤:\n"
#, python-format
msgid "syntax error in %s(%d): key/value pair expected"
@@ -1637,23 +1389,40 @@
#, python-format
msgid "could not open map file %r: %s"
-msgstr ""
+msgstr "ä¸èƒ½æ‰“é–‹ map 檔 %r: %s"
+
+#, python-format
+msgid "%s: invalid source repository type"
+msgstr "%s: 無效的來æºå„²å˜åº«åž‹æ…‹"
#, python-format
msgid "%s: missing or unsupported repository"
-msgstr ""
+msgstr "%s: éºå¤±äº† 或 ä¸æ”¯æ´çš„儲å˜åº«"
+
+#, python-format
+msgid "%s: invalid destination repository type"
+msgstr "%s: 未知的目的儲å˜åº«åž‹æ…‹"
#, python-format
msgid "convert: %s\n"
-msgstr ""
+msgstr "轉æ›: %s\n"
#, python-format
msgid "%s: unknown repository type"
-msgstr ""
+msgstr "%s: 未知的儲å˜åº«åž‹æ…‹"
+
+msgid "getting files"
+msgstr "å–得檔案ä¸..."
+
+msgid "revisions"
+msgstr "修定版"
+
+msgid "scanning"
+msgstr "掃æä¸"
#, python-format
msgid "unknown sort mode: %s"
-msgstr ""
+msgstr "未知的排åºæ¨¡å¼: %s"
#, python-format
msgid "cycle detected between %s and %s"
@@ -1683,27 +1452,34 @@
msgstr ""
msgid "scanning source...\n"
-msgstr ""
+msgstr "掃æ source ä¸\n"
msgid "sorting...\n"
-msgstr ""
+msgstr "排åºä¸\n"
msgid "converting...\n"
-msgstr ""
+msgstr "轉æ›ä¸...\n"
#, python-format
msgid "source: %s\n"
-msgstr ""
+msgstr "來æº: %s\n"
+
+msgid "converting"
+msgstr "轉æ›ä¸"
#, python-format
msgid "assuming destination %s\n"
msgstr ""
msgid "more than one sort mode specified"
-msgstr ""
+msgstr "æ述了ä¸åªä¸€å€‹æŽ’åºæ¨¡å¼"
msgid "--sourcesort is not supported by this data source"
-msgstr ""
+msgstr "--sourcesort ä¸æ”¯æ´é€™å€‹è³‡æ–™ä¾†æº"
+
+#, python-format
+msgid "%s does not look like a CVS checkout"
+msgstr "%s 怎麼看都ä¸åƒæ˜¯ä¸€å€‹ CVS çš„ checkout"
#, python-format
msgid "revision %s is not a patchset number"
@@ -1711,33 +1487,40 @@
#, python-format
msgid "connecting to %s\n"
-msgstr ""
+msgstr "連接到 %s\n"
msgid "CVS pserver authentication failed"
msgstr ""
#, python-format
-msgid "unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
+msgid ""
+"unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
msgstr ""
#, python-format
msgid "%d bytes missing from remote file"
-msgstr ""
+msgstr "從é 端檔案éºå¤±äº† %d ä½å…ƒçµ„s"
+
+msgid "malformed response from CVS"
+msgstr "從CVS那收到畸形的回應"
#, python-format
msgid "cvs server: %s\n"
-msgstr ""
+msgstr "cvs 伺æœå™¨: %s\n"
#, python-format
msgid "unknown CVS response: %s"
-msgstr ""
+msgstr "未知的CVS回應: %s"
msgid "collecting CVS rlog\n"
-msgstr ""
+msgstr "收集 CVS rlog\n"
+
+msgid "not a CVS sandbox"
+msgstr "ä¸æ˜¯ä¸€å€‹CVS sandbox"
#, python-format
msgid "reading cvs log cache %s\n"
-msgstr ""
+msgstr "è®€å– cvs 紀錄快å–(log cache) %s\n"
#, python-format
msgid "cache has %d log entries\n"
@@ -1745,11 +1528,11 @@
#, python-format
msgid "error reading cache: %r\n"
-msgstr ""
+msgstr "讀å–å¿«å–錯誤: %r\n"
#, python-format
msgid "running %s\n"
-msgstr ""
+msgstr "æ£åœ¨åŸ·è¡Œ %s\n"
msgid "RCS file must be followed by working file"
msgstr ""
@@ -1763,9 +1546,12 @@
msgid "revision must be followed by date line"
msgstr ""
+msgid "log cache overlaps with new log entries, re-run without cache."
+msgstr ""
+
#, python-format
msgid "writing cvs log cache %s\n"
-msgstr ""
+msgstr "寫入 CVS 紀錄快å–(log cache) %s\n"
#, python-format
msgid "%d log entries\n"
@@ -1788,11 +1574,22 @@
msgstr ""
#, python-format
+msgid "%s does not look like a darcs repository"
+msgstr "%s 怎麼看都ä¸åƒæ˜¯ä¸€å€‹ darcs 儲å˜åº«"
+
+#, python-format
msgid "darcs version 2.1 or newer needed (found %r)"
-msgstr ""
+msgstr "éœ€è¦ darcs 版本2.1以上 (找到的是 %r)"
msgid "Python ElementTree module is not available"
-msgstr ""
+msgstr "Python ElementTree module ä¸èƒ½ç”¨"
+
+#, python-format
+msgid "%s repository format is unsupported, please upgrade"
+msgstr "%s 儲å˜åº«æ ¼å¼ä¸æ”¯æ´,è«‹æ›´æ–°"
+
+msgid "failed to detect repository format!"
+msgstr "åµæ¸¬å„²å˜åº«æ ¼å¼å¤±æ•—!"
msgid "internal calling inconsistency"
msgstr ""
@@ -1801,10 +1598,18 @@
msgstr ""
#, python-format
+msgid "%s:%d: path to %s is missing\n"
+msgstr ""
+
+#, python-format
msgid "%s:%d: %r already in %s list\n"
msgstr ""
#, python-format
+msgid "%s:%d: superfluous / in %s %r\n"
+msgstr ""
+
+#, python-format
msgid "%s:%d: unknown directive %r\n"
msgstr ""
@@ -1812,18 +1617,38 @@
msgstr ""
#, python-format
-msgid "%s does not look like a GNU Arch repo"
-msgstr ""
+msgid "%s does not look like a Git repository"
+msgstr "%s 怎麼看都ä¸åƒæ˜¯ä¸€å€‹ Git 儲å˜åº«"
+
+msgid "cannot retrieve git heads"
+msgstr "ä¸èƒ½å–回git標é "
+
+#, python-format
+msgid "cannot read %r object at %s"
+msgstr ""
+
+#, python-format
+msgid "cannot read changes in %s"
+msgstr "ä¸èƒ½åœ¨%s讀å–變更"
+
+#, python-format
+msgid "cannot read tags from %s"
+msgstr "ä¸èƒ½å¾ž%s讀å–標記"
+
+#, python-format
+msgid "%s does not look like a GNU Arch repository"
+msgstr "%s 怎麼看都ä¸åƒæ˜¯ä¸€å€‹ GNU Arch 儲å˜åº«"
msgid "cannot find a GNU Arch tool"
-msgstr ""
+msgstr "找ä¸åˆ° GNU arch 工具"
#, python-format
msgid "analyzing tree version %s...\n"
msgstr ""
#, python-format
-msgid "tree analysis stopped because it points to an unregistered archive %s...\n"
+msgid ""
+"tree analysis stopped because it points to an unregistered archive %s...\n"
msgstr ""
#, python-format
@@ -1831,14 +1656,18 @@
msgstr ""
#, python-format
-msgid "%s is not a local Mercurial repo"
-msgstr ""
+msgid "%s is not a local Mercurial repository"
+msgstr "%s ä¸æ˜¯ä¸€å€‹æœ¬åœ°ç«¯çš„ Mercurial 儲å˜åº«"
#, python-format
msgid "initializing destination %s repository\n"
msgstr ""
#, python-format
+msgid "could not create hg repository %s as sink"
+msgstr ""
+
+#, python-format
msgid "pulling from %s into %s\n"
msgstr ""
@@ -1846,33 +1675,46 @@
msgstr ""
msgid "updating tags\n"
-msgstr ""
+msgstr "æ£åœ¨æ›´æ–°æ¨™è¨˜\n"
#, python-format
msgid "%s is not a valid start revision"
-msgstr ""
+msgstr "%s ä¸æ˜¯ä¸€å€‹æœ‰æ•ˆçš„開始修定版"
#, python-format
msgid "ignoring: %s\n"
-msgstr ""
-
-#, python-format
-msgid "%s does not look like a monotone repo"
-msgstr ""
+msgstr "忽略: %s\n"
+
+#, python-format
+msgid "%s does not look like a monotone repository"
+msgstr "%s 怎麼看都ä¸åƒæ˜¯ä¸€å€‹monotone 儲å˜åº«"
#, python-format
msgid "copying file in renamed directory from '%s' to '%s'"
msgstr ""
+#, python-format
+msgid "%s does not look like a P4 repository"
+msgstr "%s 怎麼看都ä¸åƒæ˜¯ä¸€å€‹ P4 儲å˜åº«"
+
msgid "reading p4 views\n"
-msgstr ""
+msgstr "æ£åœ¨è®€å–P4視å€\n"
msgid "collecting p4 changelists\n"
-msgstr ""
+msgstr "收集P4變更列表\n"
msgid "Mercurial failed to run itself, check hg executable is in PATH"
msgstr ""
+msgid ""
+"svn: cannot probe remote repository, assume it could be a subversion "
+"repository. Use --source-type if you know better.\n"
+msgstr ""
+
+#, python-format
+msgid "%s does not look like a Subversion repository"
+msgstr "%s 怎麼看都ä¸åƒæ˜¯ä¸€å€‹ Subversion 儲å˜åº«"
+
msgid "Subversion python bindings could not be loaded"
msgstr ""
@@ -1885,15 +1727,15 @@
#, python-format
msgid "svn: revision %s is not an integer"
-msgstr ""
+msgstr "svn:修定版 %s ä¸æ˜¯ä¸€å€‹æ•´æ•¸"
#, python-format
msgid "svn: start revision %s is not an integer"
-msgstr ""
+msgstr "svn:開始修定版%sä¸æ˜¯ä¸€å€‹æ•´æ•¸"
#, python-format
msgid "no revision found in module %s"
-msgstr ""
+msgstr "在%s模組ä¸æ‰¾ä¸åˆ°ä¿®å®šç‰ˆ"
#, python-format
msgid "expected %s to be at %r, but not found"
@@ -1901,15 +1743,15 @@
#, python-format
msgid "found %s at %r\n"
-msgstr ""
+msgstr "找到%s在%r\n"
#, python-format
msgid "ignoring empty branch %s\n"
-msgstr ""
+msgstr "忽略空白的分支 %s\n"
#, python-format
msgid "found branch %s at %d\n"
-msgstr ""
+msgstr "找到分支 %s 在 %d\n"
msgid "svn: start revision is not supported with more than one branch"
msgstr ""
@@ -1919,13 +1761,12 @@
msgstr ""
#, python-format
-msgid "no tags found at revision %d\n"
-msgstr ""
-
-#, python-format
msgid "%s not found up to revision %d"
msgstr ""
+msgid "scanning paths"
+msgstr "掃æ è£œä¸ ä¸"
+
#, python-format
msgid "found parent of branch %s at %d: %s\n"
msgstr ""
@@ -1936,23 +1777,132 @@
#, python-format
msgid "svn: branch has no revision %s"
-msgstr ""
-
-#, python-format
-msgid "initializing svn repo %r\n"
-msgstr ""
-
-#, python-format
-msgid "initializing svn wc %r\n"
-msgstr ""
+msgstr "svn:分支沒有修定版 %s"
+
+#, python-format
+msgid "initializing svn repository %r\n"
+msgstr "æ£åœ¨åˆå§‹åŒ–subversion儲å˜åº«%r\n"
+
+#, python-format
+msgid "initializing svn working copy %r\n"
+msgstr "åˆå§‹ Subversion 工作副本 %r\n"
msgid "unexpected svn output:\n"
-msgstr ""
+msgstr "æ„料之外的Subversion 輸出:\n"
msgid "unable to cope with svn output"
msgstr ""
-msgid "XXX TAGS NOT IMPLEMENTED YET\n"
+msgid "writing Subversion tags is not yet implemented\n"
+msgstr "還沒有實作 '寫入Subversion標記' 這個功能\n"
+
+msgid "automatically manage newlines in repository files"
+msgstr ""
+
+msgid ""
+"This extension allows you to manage the type of line endings (CRLF or\n"
+"LF) that are used in the repository and in the local working\n"
+"directory. That way you can get CRLF line endings on Windows and LF on\n"
+"Unix/Mac, thereby letting everybody use their OS native line endings."
+msgstr ""
+
+msgid ""
+"The extension reads its configuration from a versioned ``.hgeol``\n"
+"configuration file every time you run an ``hg`` command. The\n"
+"``.hgeol`` file use the same syntax as all other Mercurial\n"
+"configuration files. It uses two sections, ``[patterns]`` and\n"
+"``[repository]``."
+msgstr ""
+
+msgid ""
+"The ``[patterns]`` section specifies the line endings used in the\n"
+"working directory. The format is specified by a file pattern. The\n"
+"first match is used, so put more specific patterns first. The\n"
+"available line endings are ``LF``, ``CRLF``, and ``BIN``."
+msgstr ""
+
+msgid ""
+"Files with the declared format of ``CRLF`` or ``LF`` are always\n"
+"checked out in that format and files declared to be binary (``BIN``)\n"
+"are left unchanged. Additionally, ``native`` is an alias for the\n"
+"platform's default line ending: ``LF`` on Unix (including Mac OS X)\n"
+"and ``CRLF`` on Windows. Note that ``BIN`` (do nothing to line\n"
+"endings) is Mercurial's default behaviour; it is only needed if you\n"
+"need to override a later, more general pattern."
+msgstr ""
+
+msgid ""
+"The optional ``[repository]`` section specifies the line endings to\n"
+"use for files stored in the repository. It has a single setting,\n"
+"``native``, which determines the storage line endings for files\n"
+"declared as ``native`` in the ``[patterns]`` section. It can be set to\n"
+"``LF`` or ``CRLF``. The default is ``LF``. For example, this means\n"
+"that on Windows, files configured as ``native`` (``CRLF`` by default)\n"
+"will be converted to ``LF`` when stored in the repository. Files\n"
+"declared as ``LF``, ``CRLF``, or ``BIN`` in the ``[patterns]`` section\n"
+"are always stored as-is in the repository."
+msgstr ""
+
+msgid "Example versioned ``.hgeol`` file::"
+msgstr ""
+
+msgid ""
+" [patterns]\n"
+" **.py = native\n"
+" **.vcproj = CRLF\n"
+" **.txt = native\n"
+" Makefile = LF\n"
+" **.jpg = BIN"
+msgstr ""
+
+msgid ""
+" [repository]\n"
+" native = LF"
+msgstr ""
+
+msgid ""
+"The extension uses an optional ``[eol]`` section in your hgrc file\n"
+"(not the ``.hgeol`` file) for settings that control the overall\n"
+"behavior. There are two settings:"
+msgstr ""
+
+msgid ""
+"- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or\n"
+" ``CRLF`` to override the default interpretation of ``native`` for\n"
+" checkout. This can be used with :hg:`archive` on Unix, say, to\n"
+" generate an archive where files have line endings for Windows."
+msgstr ""
+
+msgid ""
+"- ``eol.only-consistent`` (default True) can be set to False to make\n"
+" the extension convert files with inconsistent EOLs. Inconsistent\n"
+" means that there is both ``CRLF`` and ``LF`` present in the file.\n"
+" Such files are normally not touched under the assumption that they\n"
+" have mixed EOLs on purpose."
+msgstr ""
+
+msgid ""
+"See :hg:`help patterns` for more information about the glob patterns\n"
+"used.\n"
+msgstr ""
+
+#, python-format
+msgid "%s should not have CRLF line endings"
+msgstr "%s ä¸æ‡‰è©²æœ‰CRLFçµæŸ"
+
+#, python-format
+msgid "%s should not have LF line endings"
+msgstr "%s ä¸æ‡‰è©²æœ‰LFçµæŸ"
+
+msgid "the eol extension is incompatible with the win32text extension"
+msgstr ""
+
+#, python-format
+msgid "ignoring unknown EOL style '%s' from %s\n"
+msgstr "忽略未知的æ›è¡Œåž‹æ…‹ '%s' 從 %s\n"
+
+#, python-format
+msgid "inconsistent newline style in %s\n"
msgstr ""
msgid "command to allow external programs to compare revisions"
@@ -1968,7 +1918,7 @@
msgid ""
"The extdiff extension also allows to configure new diff commands, so\n"
-"you do not need to type \"hg extdiff -p kdiff3\" always. ::"
+"you do not need to type :hg:`extdiff -p kdiff3` always. ::"
msgstr ""
msgid ""
@@ -1998,11 +1948,36 @@
" vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'"
msgstr ""
-msgid ""
-"You can use -I/-X and list of file or directory names like normal \"hg\n"
-"diff\" command. The extdiff extension makes snapshots of only needed\n"
-"files, so running the external diff program will actually be pretty\n"
-"fast (at least faster than having to compare the entire tree).\n"
+msgid "Tool arguments can include variables that are expanded at runtime::"
+msgstr ""
+
+msgid ""
+" $parent1, $plabel1 - filename, descriptive label of first parent\n"
+" $child, $clabel - filename, descriptive label of child revision\n"
+" $parent2, $plabel2 - filename, descriptive label of second parent\n"
+" $parent is an alias for $parent1."
+msgstr ""
+
+msgid ""
+"The extdiff extension will look in your [diff-tools] and [merge-tools]\n"
+"sections for diff tool arguments, when none are specified in [extdiff]."
+msgstr ""
+
+msgid ""
+" [extdiff]\n"
+" kdiff3 ="
+msgstr ""
+
+msgid ""
+" [diff-tools]\n"
+" kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child"
+msgstr ""
+
+msgid ""
+"You can use -I/-X and list of file or directory names like normal\n"
+":hg:`diff` command. The extdiff extension makes snapshots of only\n"
+"needed files, so running the external diff program will actually be\n"
+"pretty fast (at least faster than having to compare the entire tree).\n"
msgstr ""
#, python-format
@@ -2014,10 +1989,10 @@
msgstr ""
msgid "cannot specify --rev and --change at the same time"
-msgstr ""
+msgstr "ä¸å¯ä»¥åŒæ™‚æè¿° --rev è·Ÿ --change"
msgid "cleaning up temp directory\n"
-msgstr ""
+msgstr "清掉暫å˜ç›®éŒ„\n"
msgid "use external program to diff repository (or selected files)"
msgstr ""
@@ -2043,9 +2018,15 @@
" to its parent."
msgstr ""
+msgid "CMD"
+msgstr ""
+
msgid "comparison program to run"
msgstr ""
+msgid "OPT"
+msgstr ""
+
msgid "pass option to comparison program"
msgstr ""
@@ -2061,16 +2042,8 @@
#, python-format
msgid ""
-" Show differences between revisions for the specified files, using the\n"
-" %(path)s program."
-msgstr ""
-
-#, python-format
-msgid ""
-" When two revision arguments are given, then changes are shown between\n"
-" those revisions. If only one revision is specified then that revision is\n"
-" compared to the working directory, and, when no revisions are specified,\n"
-" the working directory files are compared to its parent."
+" Show differences between revisions for the specified files, using\n"
+" the %(path)s program."
msgstr ""
#, python-format
@@ -2102,12 +2075,16 @@
" order, use --switch-parent."
msgstr ""
-msgid ""
-" See 'hg help dates' for a list of formats valid for -d/--date.\n"
+msgid " See :hg:`help dates` for a list of formats valid for -d/--date."
+msgstr ""
+
+msgid ""
+" Returns 0 on success.\n"
" "
msgstr ""
-msgid "working dir not at branch tip (use \"hg update\" to check out branch tip)"
+msgid ""
+"working dir not at branch tip (use \"hg update\" to check out branch tip)"
msgstr ""
msgid "outstanding uncommitted merge"
@@ -2117,29 +2094,34 @@
msgstr ""
msgid "working directory is missing some files"
-msgstr ""
-
-msgid "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
-msgstr ""
+msgstr "工作目錄éºå¤±äº†ä¸€äº›æª”案"
+
+msgid ""
+"multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)"
+msgstr "這個分支有多個標é (使用'hg heads .' å’Œ 'hg merge' 去åˆä½µ)"
#, python-format
msgid "pulling from %s\n"
-msgstr ""
-
-msgid "Other repository doesn't support revision lookup, so a rev cannot be specified."
-msgstr ""
-
-#, python-format
-msgid "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge\" to merge them)\n"
+msgstr "從 %s 拉回ä¸\n"
+
+msgid ""
+"Other repository doesn't support revision lookup, so a rev cannot be "
+"specified."
+msgstr "其他儲å˜åº«ä¸æ”¯æ´ä¿®å®šç‰ˆæŸ¥é–±,所以ä¸èƒ½æ述一個修定版"
+
+#, python-format
+msgid ""
+"not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge"
+"\" to merge them)\n"
msgstr ""
#, python-format
msgid "updating to %d:%s\n"
-msgstr ""
+msgstr "更新到%d:%s ...\n"
#, python-format
msgid "merging with %d:%s\n"
-msgstr ""
+msgstr "è·Ÿ%dåˆä½µ:%s ...\n"
#, python-format
msgid "new changeset %d:%s merges remote changes with local\n"
@@ -2149,7 +2131,7 @@
msgstr ""
msgid "edit commit message"
-msgstr ""
+msgstr "編輯æ交訊æ¯"
msgid "edit commit message (DEPRECATED)"
msgstr ""
@@ -2183,7 +2165,7 @@
#, python-format
msgid "%s:%d node does not exist\n"
-msgstr ""
+msgstr "%s:%d 節點ä¸å˜åœ¨\n"
msgid "verify all the signatures there may be for a particular revision"
msgstr ""
@@ -2200,13 +2182,24 @@
" or tip if no revision is checked out."
msgstr ""
+msgid ""
+" See :hg:`help dates` for a list of formats valid for -d/--date.\n"
+" "
+msgstr ""
+
msgid "uncommitted merge - please provide a specific revision"
msgstr ""
-msgid "Error while signing"
-msgstr ""
-
-msgid "working copy of .hgsigs is changed (please commit .hgsigs manually or use --force)"
+#, python-format
+msgid "Signing %d:%s\n"
+msgstr ""
+
+msgid "error while signing"
+msgstr ""
+
+msgid ""
+"working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
+"force)"
msgstr ""
msgid "unknown signature version"
@@ -2221,11 +2214,17 @@
msgid "do not commit the sigfile after signing"
msgstr ""
+msgid "ID"
+msgstr ""
+
msgid "the key id to sign with"
msgstr ""
+msgid "TEXT"
+msgstr ""
+
msgid "commit message"
-msgstr ""
+msgstr "æ交訊æ¯"
msgid "hg sign [OPTION]... [REVISION]..."
msgstr ""
@@ -2263,16 +2262,12 @@
" "
msgstr ""
-#, python-format
-msgid "comparing with %s\n"
-msgstr ""
-
-msgid "no changes found\n"
-msgstr ""
-
msgid "show the revision DAG"
msgstr ""
+msgid "NUM"
+msgstr ""
+
msgid "limit number of changes displayed"
msgstr ""
@@ -2330,6 +2325,10 @@
msgstr ""
#, python-format
+msgid "%s returned an error: %s"
+msgstr ""
+
+#, python-format
msgid "hgcia: sending update to %s\n"
msgstr ""
@@ -2354,9 +2353,9 @@
msgstr ""
msgid ""
-"The hg view command will launch the hgk Tcl script. For this command\n"
+"The :hg:`view` command will launch the hgk Tcl script. For this command\n"
"to work, hgk must be in your search path. Alternately, you can specify\n"
-"the path to hgk in your .hgrc file::"
+"the path to hgk in your configuration file::"
msgstr ""
msgid ""
@@ -2389,7 +2388,7 @@
msgstr ""
msgid "cat-file: type or revision not supplied\n"
-msgstr ""
+msgstr "cat-file:型態或修定版ä¸æ”¯æ´\n"
msgid "aborting hg cat-file only understands commits\n"
msgstr ""
@@ -2511,22 +2510,22 @@
msgid "hg inserve [OPTION]..."
msgstr ""
-msgid "(found dead inotify server socket; removing it)\n"
-msgstr ""
-
-#, python-format
-msgid "could not start inotify server: %s\n"
-msgstr ""
-
-#, python-format
-msgid "could not talk to new inotify server: %s\n"
-msgstr ""
-
-#, python-format
-msgid "failed to contact inotify server: %s\n"
-msgstr ""
-
-msgid "received empty answer from inotify server"
+msgid "inotify-client: found dead inotify server socket; removing it\n"
+msgstr ""
+
+#, python-format
+msgid "inotify-client: could not start inotify server: %s\n"
+msgstr ""
+
+#, python-format
+msgid "inotify-client: could not talk to new inotify server: %s\n"
+msgstr ""
+
+#, python-format
+msgid "inotify-client: failed to contact inotify server: %s\n"
+msgstr ""
+
+msgid "inotify-client: received empty answer from inotify server"
msgstr ""
#, python-format
@@ -2552,7 +2551,7 @@
#, python-format
msgid "found %d\n"
-msgstr ""
+msgstr "找到 %d\n"
#, python-format
msgid "*** to raise the limit from %d to %d (run as root):\n"
@@ -2579,21 +2578,6 @@
msgstr ""
#, python-format
-msgid "status: %r %s -> %s\n"
-msgstr ""
-
-#, python-format
-msgid "%s dirstate reload\n"
-msgstr ""
-
-#, python-format
-msgid "%s end dirstate reload\n"
-msgstr ""
-
-msgid "rescanning due to .hgignore change\n"
-msgstr ""
-
-#, python-format
msgid "%s event: created %s\n"
msgstr ""
@@ -2625,8 +2609,22 @@
msgid "%s hooking back up with %d bytes readable\n"
msgstr ""
-#, python-format
-msgid "could not start server: %s"
+msgid "finished setup\n"
+msgstr ""
+
+#, python-format
+msgid "status: %r %s -> %s\n"
+msgstr ""
+
+msgid "rescanning due to .hgignore change\n"
+msgstr ""
+
+msgid "cannot start: socket is already bound"
+msgstr ""
+
+msgid ""
+"cannot start: tried linking .hg/inotify.sock to a temporary socket but .hg/"
+"inotify.sock already exists"
msgstr ""
#, python-format
@@ -2641,9 +2639,6 @@
msgid "unrecognized query type: %s\n"
msgstr ""
-msgid "finished setup\n"
-msgstr ""
-
msgid "expand expressions into changelog and summaries"
msgstr ""
@@ -2661,7 +2656,8 @@
msgid ""
" [interhg]\n"
" issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
-" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!i\n"
+" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!"
+"i\n"
" boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
msgstr ""
@@ -2688,8 +2684,13 @@
msgstr ""
msgid ""
-"Configuration is done in the [keyword] and [keywordmaps] sections of\n"
-"hgrc files."
+"Keywords expand to the changeset data pertaining to the latest change\n"
+"relative to the working directory parent of each file."
+msgstr ""
+
+msgid ""
+"Configuration is done in the [keyword], [keywordset] and [keywordmaps]\n"
+"sections of hgrc files."
msgstr ""
msgid "Example::"
@@ -2703,43 +2704,47 @@
msgstr ""
msgid ""
-"NOTE: the more specific you are in your filename patterns the less you\n"
-"lose speed in huge repositories."
+" [keywordset]\n"
+" # prefer svn- over cvs-like default keywordmaps\n"
+" svn = True"
+msgstr ""
+
+msgid ""
+".. note::\n"
+" The more specific you are in your filename patterns the less you\n"
+" lose speed in huge repositories."
msgstr ""
msgid ""
"For [keywordmaps] template mapping and expansion demonstration and\n"
-"control run \"hg kwdemo\". See \"hg help templates\" for a list of\n"
+"control run :hg:`kwdemo`. See :hg:`help templates` for a list of\n"
"available templates and filters."
msgstr ""
-msgid ""
-"An additional date template filter {date|utcdate} is provided. It\n"
-"returns a date like \"2006/09/18 15:13:13\"."
-msgstr ""
-
-msgid ""
-"The default template mappings (view with \"hg kwdemo -d\") can be\n"
-"replaced with customized keywords and templates. Again, run \"hg\n"
-"kwdemo\" to control the results of your config changes."
-msgstr ""
-
-msgid ""
-"Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n"
+msgid "Three additional date template filters are provided::"
+msgstr ""
+
+msgid ""
+" utcdate \"2006/09/18 15:13:13\"\n"
+" svnutcdate \"2006-09-18 15:13:13Z\"\n"
+" svnisodate \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\""
+msgstr ""
+
+msgid ""
+"The default template mappings (view with :hg:`kwdemo -d`) can be\n"
+"replaced with customized keywords and templates. Again, run\n"
+":hg:`kwdemo` to control the results of your config changes."
+msgstr ""
+
+msgid ""
+"Before changing/disabling active keywords, run :hg:`kwshrink` to avoid\n"
"the risk of inadvertently storing expanded keywords in the change\n"
"history."
msgstr ""
msgid ""
"To force expansion after enabling it, or a configuration change, run\n"
-"\"hg kwexpand\"."
-msgstr ""
-
-msgid ""
-"Also, when committing with the record extension or using mq's qrecord,\n"
-"be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n"
-"the files in question to update keyword expansions after all changes\n"
-"have been checked in."
+":hg:`kwexpand`."
msgstr ""
msgid ""
@@ -2779,7 +2784,7 @@
msgstr ""
msgid ""
-" See \"hg help templates\" for information on templates and filters.\n"
+" See :hg:`help templates` for information on templates and filters.\n"
" "
msgstr ""
@@ -2817,7 +2822,7 @@
"keywords written to %s:\n"
msgstr ""
-msgid "unhooked all commit hooks\n"
+msgid "hg keyword configuration and expansion example"
msgstr ""
msgid ""
@@ -2851,7 +2856,7 @@
msgstr ""
msgid ""
-" See \"hg help keyword\" on how to construct patterns both for\n"
+" See :hg:`help keyword` on how to construct patterns both for\n"
" inclusion and exclusion of files."
msgstr ""
@@ -2873,7 +2878,7 @@
msgid ""
" Run before changing/disabling active keywords or if you experience\n"
-" problems with \"hg import\" or \"hg merge\"."
+" problems with :hg:`import` or :hg:`merge`."
msgstr ""
msgid ""
@@ -2902,12 +2907,6 @@
msgid "only show unknown (not tracked) files"
msgstr ""
-msgid "show keyword status flags of all files (DEPRECATED)"
-msgstr ""
-
-msgid "only show untracked files (DEPRECATED)"
-msgstr ""
-
msgid "hg kwfiles [OPTION]... [FILE]..."
msgstr ""
@@ -2928,11 +2927,10 @@
"directory. Applied patches are both patch files and changesets."
msgstr ""
-msgid "Common tasks (use \"hg help command\" for more details)::"
-msgstr ""
-
-msgid ""
-" prepare repository to work with patches qinit\n"
+msgid "Common tasks (use :hg:`help command` for more details)::"
+msgstr ""
+
+msgid ""
" create new patch qnew\n"
" import existing patch qimport"
msgstr ""
@@ -2945,7 +2943,34 @@
msgid ""
" add known patch to applied stack qpush\n"
" remove patch from applied stack qpop\n"
-" refresh contents of top applied patch qrefresh\n"
+" refresh contents of top applied patch qrefresh"
+msgstr ""
+
+msgid ""
+"By default, mq will automatically use git patches when required to\n"
+"avoid losing file mode changes, copy records, binary files or empty\n"
+"files creations or deletions. This behaviour can be configured with::"
+msgstr ""
+
+msgid ""
+" [mq]\n"
+" git = auto/keep/yes/no"
+msgstr ""
+
+msgid ""
+"If set to 'keep', mq will obey the [diff] section configuration while\n"
+"preserving existing git patches upon qrefresh. If set to 'yes' or\n"
+"'no', mq will override the [diff] section and always generate git or\n"
+"regular patches, possibly losing data in the second case."
+msgstr ""
+
+msgid ""
+"You will by default be managing a patch queue named \"patches\". You can\n"
+"create other, independent patch queues with the :hg:`qqueue` command.\n"
+msgstr ""
+
+#, python-format
+msgid "mq.git option can be auto/keep/yes/no got %s"
msgstr ""
#, python-format
@@ -3027,26 +3052,20 @@
#, python-format
msgid "applying %s\n"
-msgstr ""
+msgstr "æ£åœ¨å¥—用 %s\n"
#, python-format
msgid "unable to read %s\n"
msgstr ""
#, python-format
-msgid "imported patch %s\n"
-msgstr ""
-
-#, python-format
-msgid ""
-"\n"
-"imported patch %s"
-msgstr ""
-
-#, python-format
msgid "patch %s is empty\n"
msgstr ""
+#, fuzzy
+msgid "repository commit failed"
+msgstr "找ä¸åˆ° %s 儲å˜åº«"
+
msgid "patch failed, rejects left in working dir\n"
msgstr ""
@@ -3092,10 +3111,21 @@
msgid "\"%s\" cannot be used as the name of a patch"
msgstr ""
+#, fuzzy, python-format
+msgid "\"%s\" already exists as a directory"
+msgstr "佇列 %s å·²å˜åœ¨"
+
#, python-format
msgid "patch \"%s\" already exists"
msgstr ""
+msgid "cannot manage merge changesets"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "cannot write patch \"%s\": %s"
+msgstr "有缺陷的patch %s %s"
+
#, python-format
msgid "error unlinking %s\n"
msgstr ""
@@ -3139,8 +3169,11 @@
msgid "patch series already fully applied\n"
msgstr ""
+msgid "please specify the patch to move"
+msgstr ""
+
msgid "cleaning up working directory..."
-msgstr ""
+msgstr "æ£åœ¨æ¸…ç†å·¥ä½œç›®éŒ„..."
#, python-format
msgid "errors during apply, please fix and refresh %s\n"
@@ -3174,9 +3207,9 @@
msgid "deletions found between repo revs"
msgstr ""
-#, fuzzy, python-format
+#, python-format
msgid "popping %s\n"
-msgstr "åˆä½µ %s ä¸\n"
+msgstr ""
msgid "patch queue now empty\n"
msgstr ""
@@ -3184,7 +3217,9 @@
msgid "cannot refresh a revision with children"
msgstr ""
-msgid "refresh interrupted while patch was popped! (revert --all, qpush to recover)\n"
+msgid ""
+"refresh interrupted while patch was popped! (revert --all, qpush to "
+"recover)\n"
msgstr ""
msgid "patch queue directory already exists"
@@ -3212,8 +3247,9 @@
msgid "saved queue repository parents: %s %s\n"
msgstr ""
-msgid "queue directory updating\n"
-msgstr ""
+#, fuzzy
+msgid "updating queue directory\n"
+msgstr "更新工作目錄ä¸\n"
msgid "Unable to load queue repository\n"
msgstr ""
@@ -3271,10 +3307,18 @@
msgid "patch %s does not exist"
msgstr ""
+#, python-format
+msgid "renaming %s to %s\n"
+msgstr "%s 改åå—æˆ %s\n"
+
msgid "need --name to import a patch from -"
msgstr ""
#, python-format
+msgid "unable to read file %s"
+msgstr "ä¸èƒ½è®€æª”案 %s"
+
+#, python-format
msgid "adding %s to series file\n"
msgstr ""
@@ -3282,18 +3326,22 @@
msgstr ""
msgid ""
-" The patches must not be applied, and at least one patch is required. With\n"
+" The patches must not be applied, and at least one patch is required. "
+"With\n"
" -k/--keep, the patch files are preserved in the patch directory."
msgstr ""
msgid ""
" To stop managing a patch and move it into permanent history,\n"
-" use the qfinish command."
+" use the :hg:`qfinish` command."
msgstr ""
msgid "print the patches already applied"
msgstr ""
+msgid " Returns 0 on success."
+msgstr ""
+
msgid "only one patch applied\n"
msgstr ""
@@ -3339,11 +3387,21 @@
msgid ""
" To import a patch from standard input, pass - as the patch file.\n"
" When importing from standard input, a patch name must be specified\n"
-" using the --name flag.\n"
+" using the --name flag."
+msgstr ""
+
+msgid " To import an existing patch while renaming it::"
+msgstr ""
+
+msgid " hg qimport -e existing-patch -n new-name"
+msgstr ""
+
+msgid ""
+" Returns 0 if import succeeded.\n"
" "
msgstr ""
-msgid "init a new queue repository"
+msgid "init a new queue repository (DEPRECATED)"
msgstr ""
msgid ""
@@ -3354,6 +3412,11 @@
" qcommit to commit changes to this queue repository."
msgstr ""
+msgid ""
+" This command is deprecated. Without -c, it's implied by other relevant\n"
+" commands. With -c, use :hg:`init --mq` instead."
+msgstr ""
+
msgid "clone main and patch repository at same time"
msgstr ""
@@ -3372,11 +3435,15 @@
msgid ""
" The patch directory must be a nested Mercurial repository, as\n"
-" would be created by qinit -c.\n"
+" would be created by :hg:`init --mq`."
+msgstr ""
+
+msgid ""
+" Return 0 on success.\n"
" "
msgstr ""
-msgid "versioned patch repository not found (see qinit -c)"
+msgid "versioned patch repository not found (see init --mq)"
msgstr ""
msgid "cloning main repository\n"
@@ -3391,7 +3458,10 @@
msgid "updating destination repository\n"
msgstr ""
-msgid "commit changes in the queue repository"
+msgid "commit changes in the queue repository (DEPRECATED)"
+msgstr ""
+
+msgid " This command is deprecated; use :hg:`commit --mq` instead."
msgstr ""
msgid "print the entire series file"
@@ -3411,9 +3481,8 @@
msgid ""
" qnew creates a new patch on top of the currently-applied patch (if\n"
-" any). It will refuse to run if there are any outstanding changes\n"
-" unless -f/--force is specified, in which case the patch will be\n"
-" initialized with them. You may also use -I/--include,\n"
+" any). The patch will be initialized with any outstanding changes\n"
+" in the working directory. You may also use -I/--include,\n"
" -X/--exclude, and/or a list of files after the patch name to add\n"
" only changes to matching files to the new patch, leaving the rest\n"
" as uncommitted modifications."
@@ -3435,7 +3504,11 @@
" Use the -g/--git option to keep the patch in the git extended diff\n"
" format. Read the diffs help topic for more information on why this\n"
" is important for preserving permission changes and copy/rename\n"
-" information.\n"
+" information."
+msgstr ""
+
+msgid ""
+" Returns 0 on successful creation of a new patch.\n"
" "
msgstr ""
@@ -3454,11 +3527,18 @@
msgstr ""
msgid ""
+" If -e/--edit is specified, Mercurial will start your configured editor "
+"for\n"
+" you to enter a message. In case qrefresh fails, you will find a backup "
+"of\n"
+" your message in ``.hg/last-message.txt``."
+msgstr ""
+
+msgid ""
" hg add/remove/copy/rename work as usual, though you might want to\n"
" use git-style patches (-g/--git or [diff] git=1) to track copies\n"
" and renames. See the diffs help topic for more information on the\n"
-" git diff format.\n"
-" "
+" git diff format."
msgstr ""
msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
@@ -3475,11 +3555,10 @@
msgstr ""
msgid ""
-" Use 'hg diff' if you only want to see the changes made since the\n"
-" last qrefresh, or 'hg export qtip' if you want to see changes made\n"
-" by the current patch without including changes made since the\n"
-" qrefresh.\n"
-" "
+" Use :hg:`diff` if you only want to see the changes made since the\n"
+" last qrefresh, or :hg:`export qtip` if you want to see changes\n"
+" made by the current patch without including changes made since the\n"
+" qrefresh."
msgstr ""
msgid "fold the named patches into the current patch"
@@ -3496,17 +3575,14 @@
msgid ""
" The header for each folded patch will be concatenated with the\n"
-" current patch header, separated by a line of '* * *'."
+" current patch header, separated by a line of ``* * *``."
msgstr ""
msgid "qfold requires at least one patch name"
msgstr ""
-msgid "No patches applied"
-msgstr ""
-
-#, python-format
-msgid "Skipping already folded patch %s"
+#, python-format
+msgid "Skipping already folded patch %s\n"
msgstr ""
#, python-format
@@ -3514,7 +3590,7 @@
msgstr ""
#, python-format
-msgid "Error folding patch %s"
+msgid "error folding patch %s"
msgstr ""
msgid "push or pop patches until named patch is at top of stack"
@@ -3526,21 +3602,26 @@
msgid ""
" Guards control whether a patch can be pushed. A patch with no\n"
" guards is always pushed. A patch with a positive guard (\"+foo\") is\n"
-" pushed only if the qselect command has activated it. A patch with\n"
-" a negative guard (\"-foo\") is never pushed if the qselect command\n"
+" pushed only if the :hg:`qselect` command has activated it. A patch with\n"
+" a negative guard (\"-foo\") is never pushed if the :hg:`qselect` "
+"command\n"
" has activated it."
msgstr ""
msgid ""
" With no arguments, print the currently active guards.\n"
-" With arguments, set guards for the named patch.\n"
-" NOTE: Specifying negative guards now requires '--'."
-msgstr ""
-
-msgid ""
-" To set guards on another patch:\n"
-" hg qguard -- other.patch +2.6.17 -stable\n"
-" "
+" With arguments, set guards for the named patch."
+msgstr ""
+
+msgid ""
+" .. note::\n"
+" Specifying negative guards now requires '--'."
+msgstr ""
+
+msgid " To set guards on another patch::"
+msgstr ""
+
+msgid " hg qguard other.patch -- +2.6.17 -stable"
msgstr ""
msgid "cannot mix -l/--list with options or arguments"
@@ -3561,7 +3642,11 @@
msgid ""
" When -f/--force is applied, all local changes in patched files\n"
-" will be lost.\n"
+" will be lost."
+msgstr ""
+
+msgid ""
+" Return 0 on succces.\n"
" "
msgstr ""
@@ -3578,8 +3663,7 @@
msgid ""
" By default, pops off the top of the patch stack. If given a patch\n"
" name, keeps popping off patches until the named patch is at the\n"
-" top of the stack.\n"
-" "
+" top of the stack."
msgstr ""
#, python-format
@@ -3602,10 +3686,13 @@
msgid "A patch named %s already exists in the series file"
msgstr ""
-msgid "restore the queue state saved by a revision"
-msgstr ""
-
-msgid "save current queue state"
+msgid "restore the queue state saved by a revision (DEPRECATED)"
+msgstr ""
+
+msgid " This command is deprecated, use :hg:`rebase` instead."
+msgstr ""
+
+msgid "save current queue state (DEPRECATED)"
msgstr ""
#, python-format
@@ -3620,25 +3707,48 @@
msgid "copy %s to %s\n"
msgstr ""
-msgid "strip a revision and all its descendants from the repository"
-msgstr ""
-
-msgid ""
-" If one of the working directory's parent revisions is stripped, the\n"
-" working directory will be updated to the parent of the stripped\n"
-" revision.\n"
-" "
+msgid "strip changesets and all their descendants from the repository"
+msgstr ""
+
+msgid ""
+" The strip command removes the specified changesets and all their\n"
+" descendants. If the working directory has uncommitted changes,\n"
+" the operation is aborted unless the --force flag is supplied."
+msgstr ""
+
+msgid ""
+" If a parent of the working directory is stripped, then the working\n"
+" directory will automatically be updated to the most recent\n"
+" available ancestor of the stripped parent after the operation\n"
+" completes."
+msgstr ""
+
+msgid ""
+" Any stripped changesets are stored in ``.hg/strip-backup`` as a\n"
+" bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can\n"
+" be restored by running :hg:`unbundle .hg/strip-backup/BUNDLE`,\n"
+" where BUNDLE is the bundle file created by the strip. Note that\n"
+" the local revision numbers will in general be different after the\n"
+" restore."
+msgstr ""
+
+msgid ""
+" Use the --no-backup option to discard the backup bundle once the\n"
+" operation completes."
+msgstr ""
+
+msgid "empty revision set"
msgstr ""
msgid "set or print guarded patches to push"
msgstr ""
msgid ""
-" Use the qguard command to set or print guards on patch, then use\n"
+" Use the :hg:`qguard` command to set or print guards on patch, then use\n"
" qselect to tell mq which guards to use. A patch will be pushed if\n"
" it has no guards or any positive guards match the currently\n"
" selected guard, but will not be pushed if any negative guards\n"
-" match the current guard. For example:"
+" match the current guard. For example::"
msgstr ""
msgid ""
@@ -3725,13 +3835,71 @@
msgid ""
" This can be especially useful if your changes have been applied to\n"
" an upstream repository, or if you are about to push your changes\n"
-" to upstream.\n"
-" "
+" to upstream."
msgstr ""
msgid "no revisions specified"
msgstr ""
+msgid "manage multiple patch queues"
+msgstr ""
+
+msgid ""
+" Supports switching between different patch queues, as well as creating\n"
+" new patch queues and deleting existing ones."
+msgstr ""
+
+msgid ""
+" Omitting a queue name or specifying -l/--list will show you the "
+"registered\n"
+" queues - by default the \"normal\" patches queue is registered. The "
+"currently\n"
+" active queue will be marked with \"(active)\"."
+msgstr ""
+
+msgid ""
+" To create a new queue, use -c/--create. The queue is automatically made\n"
+" active, except in the case where there are applied patches from the\n"
+" currently active queue in the repository. Then the queue will only be\n"
+" created and switching will fail."
+msgstr ""
+
+msgid ""
+" To delete an existing queue, use --delete. You cannot delete the "
+"currently\n"
+" active queue."
+msgstr ""
+
+msgid "patches applied - cannot set new queue active"
+msgstr ""
+
+msgid "cannot delete queue that does not exist"
+msgstr ""
+
+msgid "cannot delete currently active queue"
+msgstr ""
+
+msgid " (active)\n"
+msgstr ""
+
+msgid "invalid queue name, may not contain the characters \":\\/.\""
+msgstr ""
+
+#, python-format
+msgid "queue \"%s\" already exists"
+msgstr "佇列 %s å·²å˜åœ¨"
+
+#, python-format
+msgid "can't rename \"%s\" to its current name"
+msgstr ""
+
+#, python-format
+msgid "non-queue directory \"%s\" already exists"
+msgstr ""
+
+msgid "use --create to create a new queue"
+msgstr ""
+
msgid "cannot commit over an applied mq patch"
msgstr ""
@@ -3749,6 +3917,29 @@
msgid "cannot import over an applied patch"
msgstr ""
+msgid "only a local queue repository may be initialized"
+msgstr ""
+
+msgid "there is no Mercurial repository here (.hg not found)"
+msgstr "這邊沒有Mercurial 儲å˜åº«(找ä¸åˆ° .hg)"
+
+msgid "no queue repository"
+msgstr "沒有佇列儲å˜åº«"
+
+#, python-format
+msgid "%d applied"
+msgstr ""
+
+#, python-format
+msgid "%d unapplied"
+msgstr ""
+
+msgid "mq: (empty queue)\n"
+msgstr ""
+
+msgid "operate on patch repository"
+msgstr ""
+
msgid "print first line of patch header"
msgstr ""
@@ -3767,6 +3958,9 @@
msgid "use uncompressed transfer (fast over LAN)"
msgstr ""
+msgid "REPO"
+msgstr ""
+
msgid "location of source patch repository"
msgstr ""
@@ -3785,7 +3979,7 @@
msgid "stop managing a revision (DEPRECATED)"
msgstr ""
-msgid "hg qdelete [-k] [-r REV]... [PATCH]..."
+msgid "hg qdelete [-k] [PATCH]..."
msgstr ""
msgid "edit patch header"
@@ -3809,7 +4003,7 @@
msgid "drop all guards"
msgstr ""
-msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..."
+msgid "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]"
msgstr ""
msgid "hg qheader [PATCH]"
@@ -3842,22 +4036,25 @@
msgid "hg qinit [-c]"
msgstr ""
-msgid "import uncommitted changes into patch"
+msgid "import uncommitted changes (DEPRECATED)"
msgstr ""
msgid "add \"From: <current user>\" to patch"
msgstr ""
-msgid "add \"From: <given user>\" to patch"
+msgid "USER"
+msgstr ""
+
+msgid "add \"From: <USER>\" to patch"
msgstr ""
msgid "add \"Date: <current date>\" to patch"
msgstr ""
-msgid "add \"Date: <given date>\" to patch"
-msgstr ""
-
-msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
+msgid "add \"Date: <DATE>\" to patch"
+msgstr ""
+
+msgid "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..."
msgstr ""
msgid "hg qnext [-s]"
@@ -3869,16 +4066,16 @@
msgid "pop all patches"
msgstr ""
-msgid "queue name to pop"
+msgid "queue name to pop (DEPRECATED)"
msgstr ""
msgid "forget any local changes to patched files"
msgstr ""
-msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]"
-msgstr ""
-
-msgid "apply if the patch has rejects"
+msgid "hg qpop [-a] [-f] [PATCH | INDEX]"
+msgstr ""
+
+msgid "apply on top of local changes"
msgstr ""
msgid "list patch name in commit text"
@@ -3887,13 +4084,16 @@
msgid "apply all patches"
msgstr ""
-msgid "merge from another queue"
-msgstr ""
-
-msgid "merge queue name"
-msgstr ""
-
-msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]"
+msgid "merge from another queue (DEPRECATED)"
+msgstr ""
+
+msgid "merge queue name (DEPRECATED)"
+msgstr ""
+
+msgid "reorder patch series and apply only the patch"
+msgstr ""
+
+msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]"
msgstr ""
msgid "refresh only files already in the patch and specified files"
@@ -3962,16 +4162,26 @@
msgid "hg qseries [-ms]"
msgstr ""
-msgid "force removal with local changes"
-msgstr ""
-
-msgid "bundle unrelated changesets"
+msgid ""
+"force removal of changesets even if the working directory has uncommitted "
+"changes"
+msgstr ""
+
+msgid ""
+"bundle only changesets with local revision number greater than REV which are "
+"not descendants of REV (DEPRECATED)"
msgstr ""
msgid "no backups"
msgstr ""
-msgid "hg strip [-f] [-b] [-n] REV"
+msgid "no backups (DEPRECATED)"
+msgstr ""
+
+msgid "do not modify working copy during strip"
+msgstr ""
+
+msgid "hg strip [-k] [-f] [-n] REV..."
msgstr ""
msgid "hg qtop [-s]"
@@ -3989,6 +4199,24 @@
msgid "hg qfinish [-a] [REV]..."
msgstr ""
+msgid "list all available queues"
+msgstr ""
+
+msgid "create new queue"
+msgstr ""
+
+msgid "rename active queue"
+msgstr ""
+
+msgid "delete reference to queue"
+msgstr ""
+
+msgid "delete queue, and remove patch dir"
+msgstr ""
+
+msgid "[OPTION] [QUEUE]"
+msgstr ""
+
msgid "hooks for sending email notifications at commit/push time"
msgstr ""
@@ -4040,7 +4268,8 @@
" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
" maxsubject = 67 # truncate subject line longer than this\n"
" diffstat = True # add a diffstat before the diff content\n"
-" sources = serve # notify if source of incoming changes in this list\n"
+" sources = serve # notify if source of incoming changes in this "
+"list\n"
" # (serve == ssh or http, push, pull, bundle)\n"
" merge = False # send notification for merges (default True)\n"
" [email]\n"
@@ -4055,9 +4284,6 @@
"handier for you."
msgstr ""
-msgid "::"
-msgstr ""
-
msgid ""
" [usersubs]\n"
" # key is subscriber email, value is \",\"-separated list of glob patterns\n"
@@ -4110,7 +4336,7 @@
msgid ""
" [pager]\n"
-" pager = LESS='FSRX' less"
+" pager = less -FRSX"
msgstr ""
msgid ""
@@ -4140,20 +4366,34 @@
msgid ""
"You can also enable the pager only for certain commands using\n"
-"pager.attend::"
+"pager.attend. Below is the default list of commands to be paged::"
msgstr ""
msgid ""
" [pager]\n"
-" attend = log"
+" attend = annotate, cat, diff, export, glog, log, qdiff"
+msgstr ""
+
+msgid ""
+"Setting pager.attend to an empty value will cause all commands to be\n"
+"paged."
msgstr ""
msgid "If pager.attend is present, pager.ignore will be ignored."
msgstr ""
msgid ""
-"To ignore global commands like \"hg version\" or \"hg help\", you have to\n"
-"specify them in the global .hgrc\n"
+"To ignore global commands like :hg:`version` or :hg:`help`, you have\n"
+"to specify them in your user configuration file."
+msgstr ""
+
+msgid ""
+"The --pager=... option can also be used to control when the pager is\n"
+"used. Use a boolean value like yes, no, on, off, or use auto for\n"
+"normal behavior.\n"
+msgstr ""
+
+msgid "when to paginate (boolean, always, auto, or never)"
msgstr ""
msgid "interpret suffixes to refer to ancestor revisions"
@@ -4199,7 +4439,7 @@
msgid ""
"- The changeset description.\n"
"- [Optional] The result of running diffstat on the patch.\n"
-"- The patch itself, as generated by \"hg export\"."
+"- The patch itself, as generated by :hg:`export`."
msgstr ""
msgid ""
@@ -4209,12 +4449,6 @@
msgstr ""
msgid ""
-"With the -d/--diffstat option, you will be prompted for each changeset\n"
-"with a diffstat summary and the changeset summary, so you can be sure\n"
-"you are sending the right changes."
-msgstr ""
-
-msgid ""
"To configure other defaults, add a section like this to your hgrc\n"
"file::"
msgstr ""
@@ -4224,45 +4458,18 @@
" from = My Name <my@email>\n"
" to = recipient1, recipient2, ...\n"
" cc = cc1, cc2, ...\n"
-" bcc = bcc1, bcc2, ..."
-msgstr ""
-
-msgid ""
-"Then you can use the \"hg email\" command to mail a series of changesets\n"
-"as a patchbomb."
-msgstr ""
-
-msgid ""
-"To avoid sending patches prematurely, it is a good idea to first run\n"
-"the \"email\" command with the \"-n\" option (test only). You will be\n"
-"prompted for an email recipient address, a subject and an introductory\n"
-"message describing the patches of your patchbomb. Then when all is\n"
-"done, patchbomb messages are displayed. If the PAGER environment\n"
-"variable is set, your pager will be fired up once for each patchbomb\n"
-"message, so you can verify everything is alright."
-msgstr ""
-
-msgid ""
-"The -m/--mbox option is also very useful. Instead of previewing each\n"
-"patchbomb message in a pager or sending the messages directly, it will\n"
-"create a UNIX mailbox file with the patch emails. This mailbox file\n"
-"can be previewed with any mail user agent which supports UNIX mbox\n"
-"files, e.g. with mutt::"
-msgstr ""
-
-msgid " % mutt -R -f mbox"
-msgstr ""
-
-msgid ""
-"When you are previewing the patchbomb messages, you can use ``formail``\n"
-"(a utility that is commonly installed as part of the procmail\n"
-"package), to send each message out::"
-msgstr ""
-
-msgid " % formail -s sendmail -bm -t < mbox"
-msgstr ""
-
-msgid "That should be all. Now your patchbomb is on its way out."
+" bcc = bcc1, bcc2, ...\n"
+" reply-to = address1, address2, ..."
+msgstr ""
+
+msgid ""
+"Use ``[patchbomb]`` as configuration section name if you need to\n"
+"override global ``[email]`` address settings."
+msgstr ""
+
+msgid ""
+"Then you can use the :hg:`email` command to mail a series of\n"
+"changesets as a patchbomb."
msgstr ""
msgid ""
@@ -4274,35 +4481,40 @@
msgstr ""
#, python-format
-msgid "%sPlease enter a valid value"
+msgid "%s Please enter a valid value"
msgstr ""
msgid "Please enter a valid value.\n"
msgstr ""
-msgid "does the diffstat above look okay? "
-msgstr ""
-
-msgid "diffstat rejected"
-msgstr ""
-
msgid "send changesets by email"
msgstr ""
msgid ""
-" By default, diffs are sent in the format generated by hg export,\n"
-" one per message. The series starts with a \"[PATCH 0 of N]\"\n"
-" introduction, which describes the series as a whole."
+" By default, diffs are sent in the format generated by\n"
+" :hg:`export`, one per message. The series starts with a \"[PATCH 0\n"
+" of N]\" introduction, which describes the series as a whole."
msgstr ""
msgid ""
" Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n"
" the first line of the changeset description as the subject text.\n"
" The message contains two or three parts. First, the changeset\n"
-" description. Next, (optionally) if the diffstat program is\n"
-" installed and -d/--diffstat is used, the result of running\n"
-" diffstat on the patch. Finally, the patch itself, as generated by\n"
-" \"hg export\"."
+" description."
+msgstr ""
+
+msgid ""
+" With the -d/--diffstat option, if the diffstat program is\n"
+" installed, the result of running diffstat on the patch is inserted."
+msgstr ""
+
+msgid " Finally, the patch itself, as generated by :hg:`export`."
+msgstr ""
+
+msgid ""
+" With the -d/--diffstat or -c/--confirm options, you will be presented\n"
+" with a final summary of all messages and asked for confirmation before\n"
+" the messages are sent."
msgstr ""
msgid ""
@@ -4325,6 +4537,23 @@
msgstr ""
msgid ""
+" With -m/--mbox, instead of previewing each patchbomb message in a\n"
+" pager or sending the messages directly, it will create a UNIX\n"
+" mailbox file with the patch emails. This mailbox file can be\n"
+" previewed with any mail user agent which supports UNIX mbox\n"
+" files."
+msgstr ""
+
+msgid ""
+" With -n/--test, all steps will run, but mail will not be sent.\n"
+" You will be prompted for an email recipient address, a subject and\n"
+" an introductory message describing the patches of your patchbomb.\n"
+" Then when all is done, patchbomb messages are displayed. If the\n"
+" PAGER environment variable is set, your pager will be fired up once\n"
+" for each patchbomb message, so you can verify everything is alright."
+msgstr ""
+
+msgid ""
" hg email -r 3000 # send patch 3000 only\n"
" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
" hg email -r 3000:3005 # send patches 3000 through 3005\n"
@@ -4341,16 +4570,29 @@
msgid ""
" hg email -b # send bundle of all patches not in default\n"
" hg email -b DEST # send bundle of all patches not in DEST\n"
-" hg email -b -r 3000 # bundle of all ancestors of 3000 not in default\n"
+" hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
+"default\n"
" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST"
msgstr ""
msgid ""
+" hg email -o -m mbox && # generate an mbox file...\n"
+" mutt -R -f mbox # ... and view it with mutt\n"
+" hg email -o -m mbox && # generate an mbox file ...\n"
+" formail -s sendmail \\ # ... and use formail to send from the "
+"mbox\n"
+" -bm -t < mbox # ... using sendmail"
+msgstr ""
+
+msgid ""
" Before using this command, you will need to enable email in your\n"
" hgrc. See the [email] section in hgrc(5) for details.\n"
" "
msgstr ""
+msgid "no changes found\n"
+msgstr "找ä¸åˆ°è®Šæ›´\n"
+
msgid "specify at least one changeset with -r or -o"
msgstr ""
@@ -4370,19 +4612,39 @@
#, python-format
msgid "This patch series consists of %d patches."
-msgstr ""
-
-msgid "Final summary:\n"
+msgstr "這一系列的patch 包å«äº† %d 個patch"
+
+msgid ""
+"\n"
+"Final summary:"
+msgstr ""
+
+msgid "are you sure you want to send (yn)?"
+msgstr ""
+
+msgid "&No"
+msgstr ""
+
+msgid "&Yes"
+msgstr ""
+
+msgid "patchbomb canceled"
msgstr ""
msgid "Displaying "
-msgstr ""
+msgstr "顯示ä¸"
msgid "Writing "
-msgstr ""
+msgstr "寫入ä¸"
+
+msgid "writing"
+msgstr "寫入ä¸"
msgid "Sending "
-msgstr ""
+msgstr "傳é€ä¸"
+
+msgid "sending"
+msgstr "傳é€ä¸"
msgid "send patches as attachments"
msgstr ""
@@ -4396,6 +4658,9 @@
msgid "email addresses of copy recipients"
msgstr ""
+msgid "ask for confirmation before sending"
+msgstr ""
+
msgid "add diffstat output to messages"
msgstr ""
@@ -4414,6 +4679,9 @@
msgid "write messages to mbox file instead of sending them"
msgstr ""
+msgid "email addresses replies should be sent to"
+msgstr ""
+
msgid "subject of first message (intro or single patch)"
msgstr ""
@@ -4453,6 +4721,39 @@
msgid "hg email [OPTION]... [DEST]..."
msgstr ""
+msgid "show progress bars for some actions"
+msgstr ""
+
+msgid ""
+"This extension uses the progress information logged by hg commands\n"
+"to draw progress bars that are as informative as possible. Some progress\n"
+"bars only offer indeterminate information, while others have a definite\n"
+"end point."
+msgstr ""
+
+msgid "The following settings are available::"
+msgstr ""
+
+msgid ""
+" [progress]\n"
+" delay = 3 # number of seconds (float) before showing the progress bar\n"
+" refresh = 0.1 # time in seconds between refreshes of the progress bar\n"
+" format = topic bar number # format of the progress bar\n"
+" width = <none> # if set, the maximum width of the progress information\n"
+" # (that is, min(width, term width) will be used)\n"
+" clear-complete = True # clear the progress bar after it's done\n"
+" disable = False # if true, don't show a progress bar\n"
+" assume-tty = False # if true, ALWAYS show a progress bar, unless\n"
+" # disable is given"
+msgstr ""
+
+msgid ""
+"Valid entries for the format field are topic, bar, number, unit, and\n"
+"item. item defaults to the last 20 characters of the item, but this\n"
+"can be changed by adding either ``-<num>`` which would take the last\n"
+"num characters, or ``+<num>`` for the first num characters.\n"
+msgstr ""
+
msgid "command to delete untracked files from the working directory"
msgstr ""
@@ -4468,7 +4769,7 @@
msgstr ""
msgid ""
-" - Unknown files: files marked with \"?\" by \"hg status\"\n"
+" - Unknown files: files marked with \"?\" by :hg:`status`\n"
" - Empty directories: in fact Mercurial ignores directories unless\n"
" they contain files under source control management"
msgstr ""
@@ -4479,7 +4780,7 @@
msgid ""
" - Modified and unmodified tracked files\n"
" - Ignored files (unless --all is specified)\n"
-" - New files added to the repository (with \"hg add\")"
+" - New files added to the repository (with :hg:`add`)"
msgstr ""
msgid ""
@@ -4544,13 +4845,63 @@
msgid ""
" Rebase uses repeated merging to graft changesets from one part of\n"
-" history onto another. This can be useful for linearizing local\n"
-" changes relative to a master development tree."
+" history (the source) onto another (the destination). This can be\n"
+" useful for linearizing *local* changes relative to a master\n"
+" development tree."
+msgstr ""
+
+msgid ""
+" You should not rebase changesets that have already been shared\n"
+" with others. Doing so will force everybody else to perform the\n"
+" same rebase or they will end up with duplicated changesets after\n"
+" pulling in your rebased changesets."
+msgstr ""
+
+msgid ""
+" If you don't specify a destination changeset (``-d/--dest``),\n"
+" rebase uses the tipmost head of the current named branch as the\n"
+" destination. (The destination changeset is not modified by\n"
+" rebasing, but new changesets are added as its descendants.)"
+msgstr ""
+
+msgid ""
+" You can specify which changesets to rebase in two ways: as a\n"
+" \"source\" changeset or as a \"base\" changeset. Both are shorthand\n"
+" for a topologically related set of changesets (the \"source\n"
+" branch\"). If you specify source (``-s/--source``), rebase will\n"
+" rebase that changeset and all of its descendants onto dest. If you\n"
+" specify base (``-b/--base``), rebase will select ancestors of base\n"
+" back to but not including the common ancestor with dest. Thus,\n"
+" ``-b`` is less precise but more convenient than ``-s``: you can\n"
+" specify any changeset in the source branch, and rebase will select\n"
+" the whole branch. If you specify neither ``-s`` nor ``-b``, rebase\n"
+" uses the parent of the working directory as the base."
+msgstr ""
+
+msgid ""
+" By default, rebase recreates the changesets in the source branch\n"
+" as descendants of dest and then destroys the originals. Use\n"
+" ``--keep`` to preserve the original source changesets. Some\n"
+" changesets in the source branch (e.g. merges from the destination\n"
+" branch) may be dropped if they no longer contribute any change."
+msgstr ""
+
+msgid ""
+" One result of the rules for selecting the destination changeset\n"
+" and source branch is that, unlike ``merge``, rebase will do\n"
+" nothing if you are at the latest (tipmost) head of a named branch\n"
+" with two heads. You need to explicitly specify source and/or\n"
+" destination (or ``update`` to the other head, if it's the head of\n"
+" the intended source branch)."
msgstr ""
msgid ""
" If a rebase is interrupted to manually resolve a merge, it can be\n"
-" continued with --continue/-c or aborted with --abort/-a.\n"
+" continued with --continue/-c or aborted with --abort/-a."
+msgstr ""
+
+msgid ""
+" Returns 0 on success, 1 if nothing to rebase.\n"
" "
msgstr ""
@@ -4560,18 +4911,40 @@
msgid "cannot use collapse with continue or abort"
msgstr ""
+msgid "cannot use detach with continue or abort"
+msgstr ""
+
msgid "abort and continue do not allow specifying revisions"
msgstr ""
msgid "cannot specify both a revision and a base"
msgstr ""
+msgid "detach requires a revision to be specified"
+msgstr ""
+
+msgid "cannot specify a base with detach"
+msgstr ""
+
msgid "nothing to rebase\n"
msgstr ""
msgid "cannot use both keepbranches and extrafn"
msgstr ""
+msgid "rebasing"
+msgstr ""
+
+msgid "changesets"
+msgstr ""
+
+msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
+msgstr ""
+
+#, python-format
+msgid "no changes, revision %d skipped\n"
+msgstr ""
+
msgid "rebase merging completed\n"
msgstr ""
@@ -4585,11 +4958,7 @@
msgid "%d revisions have been skipped\n"
msgstr ""
-msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue"
-msgstr ""
-
-#, python-format
-msgid "no changes, revision %d skipped\n"
+msgid "unable to collapse, there is more than one external parent"
msgstr ""
#, python-format
@@ -4599,11 +4968,11 @@
msgid "no rebase in progress"
msgstr ""
-msgid "warning: new changesets detected on target branch, not stripping\n"
+msgid "warning: new changesets detected on target branch, can't abort\n"
msgstr ""
msgid "rebase aborted\n"
-msgstr ""
+msgstr "rebase ä¸æ¢äº†\n"
msgid "cannot rebase onto an applied mq patch"
msgstr ""
@@ -4614,19 +4983,18 @@
msgid "source is descendant of destination"
msgstr ""
-msgid "unable to collapse, there is more than one external parent"
-msgstr ""
-
msgid "rebase working directory to branch head"
msgstr ""
-msgid "rebase from a given revision"
-msgstr ""
-
-msgid "rebase from the base of a given revision"
-msgstr ""
-
-msgid "rebase onto a given revision"
+msgid "rebase from the specified changeset"
+msgstr ""
+
+msgid ""
+"rebase from the base of the specified changeset (up to greatest common "
+"ancestor of base and dest)"
+msgstr ""
+
+msgid "rebase onto the specified changeset"
msgstr ""
msgid "collapse the rebased changesets"
@@ -4638,13 +5006,18 @@
msgid "keep original branch names"
msgstr ""
+msgid "force detaching of source from its original branch"
+msgstr ""
+
msgid "continue an interrupted rebase"
msgstr ""
msgid "abort an interrupted rebase"
msgstr ""
-msgid "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a]"
+msgid ""
+"hg rebase [-s REV | -b REV] [-d REV] [options]\n"
+"hg rebase {-a|-c}"
msgstr ""
msgid "commands to interactively select changes for commit/qrefresh"
@@ -4654,7 +5027,7 @@
msgstr ""
msgid "this is a binary file\n"
-msgstr ""
+msgstr "這是一個二進ä½æª”\n"
#, python-format
msgid "%d hunks, %d lines changed\n"
@@ -4687,9 +5060,6 @@
msgid "&?"
msgstr ""
-msgid "y - record this change"
-msgstr ""
-
msgid "user quit"
msgstr ""
@@ -4700,9 +5070,6 @@
msgid " and "
msgstr ""
-msgid "y"
-msgstr ""
-
#, python-format
msgid "record this change to %r?"
msgstr ""
@@ -4715,13 +5082,10 @@
msgstr ""
msgid ""
-" If a list of files is omitted, all changes reported by \"hg status\"\n"
+" If a list of files is omitted, all changes reported by :hg:`status`\n"
" will be candidates for recording."
msgstr ""
-msgid " See 'hg help dates' for a list of formats valid for -d/--date."
-msgstr ""
-
msgid ""
" You will be prompted for whether to record changes to each\n"
" modified file, and for files with multiple changes, for each\n"
@@ -4748,29 +5112,172 @@
msgid " ? - display help"
msgstr ""
+msgid " This command is not available when committing a merge."
+msgstr ""
+
msgid "'mq' extension not loaded"
msgstr ""
msgid "running non-interactively, use commit instead"
msgstr ""
+msgid "cannot partially commit a merge (use hg commit instead)"
+msgstr ""
+
msgid "no changes to record\n"
msgstr ""
-msgid "patch failed to apply"
-msgstr ""
-
msgid "hg record [OPTION]... [FILE]..."
msgstr ""
msgid "hg qrecord [OPTION]... PATCH [FILE]..."
msgstr ""
+msgid "recreates hardlinks between repository clones"
+msgstr ""
+
+msgid "recreate hardlinks between two repositories"
+msgstr ""
+
+msgid ""
+" When repositories are cloned locally, their data files will be\n"
+" hardlinked so that they only use the space of a single repository."
+msgstr ""
+
+msgid ""
+" Unfortunately, subsequent pulls into either repository will break\n"
+" hardlinks for any files touched by the new changesets, even if\n"
+" both repositories end up pulling the same changes."
+msgstr ""
+
+msgid ""
+" Similarly, passing --rev to \"hg clone\" will fail to use any\n"
+" hardlinks, falling back to a complete copy of the source\n"
+" repository."
+msgstr ""
+
+msgid ""
+" This command lets you recreate those hardlinks and reclaim that\n"
+" wasted space."
+msgstr ""
+
+msgid ""
+" This repository will be relinked to share space with ORIGIN, which\n"
+" must be on the same local disk. If ORIGIN is omitted, looks for\n"
+" \"default-relink\", then \"default\", in [paths]."
+msgstr ""
+
+msgid ""
+" Do not attempt any read operations on this repository while the\n"
+" command is running. (Both repositories will be locked against\n"
+" writes.)\n"
+" "
+msgstr ""
+
+msgid "hardlinks are not supported on this system"
+msgstr "硬å¼é€£çµä¸è¢«æ”¯æ´"
+
+#, python-format
+msgid "relinking %s to %s\n"
+msgstr "%s é‡æ–°é€£çµåˆ° %s\n"
+
+#, python-format
+msgid "tip has %d files, estimated total number of files: %s\n"
+msgstr ""
+
+msgid "collecting"
+msgstr ""
+
+msgid "files"
+msgstr "檔案"
+
+#, python-format
+msgid "collected %d candidate storage files\n"
+msgstr ""
+
+msgid "source and destination are on different devices"
+msgstr "來æºè·Ÿç›®çš„在ä¸åŒçš„è£ç½®ä¸Š"
+
+#, python-format
+msgid "not linkable: %s\n"
+msgstr ""
+
+msgid "pruning"
+msgstr ""
+
+#, python-format
+msgid "pruned down to %d probably relinkable files\n"
+msgstr ""
+
+msgid "relinking"
+msgstr ""
+
+#, python-format
+msgid "relinked %d files (%d bytes reclaimed)\n"
+msgstr ""
+
+msgid "[ORIGIN]"
+msgstr ""
+
+msgid "extend schemes with shortcuts to repository swarms"
+msgstr ""
+
+msgid ""
+"This extension allows you to specify shortcuts for parent URLs with a\n"
+"lot of repositories to act like a scheme, for example::"
+msgstr ""
+
+msgid ""
+" [schemes]\n"
+" py = http://code.python.org/hg/"
+msgstr ""
+
+msgid "After that you can use it like::"
+msgstr ""
+
+msgid " hg clone py://trunk/"
+msgstr ""
+
+msgid ""
+"Additionally there is support for some more complex schemas, for\n"
+"example used by Google Code::"
+msgstr ""
+
+msgid ""
+" [schemes]\n"
+" gcode = http://{1}.googlecode.com/hg/"
+msgstr ""
+
+msgid ""
+"The syntax is taken from Mercurial templates, and you have unlimited\n"
+"number of variables, starting with ``{1}`` and continuing with\n"
+"``{2}``, ``{3}`` and so on. This variables will receive parts of URL\n"
+"supplied, split by ``/``. Anything not specified as ``{part}`` will be\n"
+"just appended to an URL."
+msgstr ""
+
+msgid "For convenience, the extension adds these schemes by default::"
+msgstr ""
+
+msgid ""
+" [schemes]\n"
+" py = http://hg.python.org/\n"
+" bb = https://bitbucket.org/\n"
+" bb+ssh = ssh://hg@bitbucket.org/\n"
+" gcode = https://{1}.googlecode.com/hg/\n"
+" kiln = https://{1}.kilnhg.com/Repo/"
+msgstr ""
+
+msgid ""
+"You can override a predefined scheme by defining a new scheme with the\n"
+"same name.\n"
+msgstr ""
+
msgid "share a common history between several working directories"
msgstr ""
-msgid "create a new shared repository (experimental)"
-msgstr ""
+msgid "create a new shared repository"
+msgstr "建立新的共享儲å˜åº«"
msgid ""
" Initialize a new repository and working directory that shares its\n"
@@ -4778,8 +5285,16 @@
msgstr ""
msgid ""
-" NOTE: actions that change history such as rollback or moving the\n"
-" source may confuse sharers.\n"
+" .. note::\n"
+" using rollback or extensions that destroy/modify history (mq,\n"
+" rebase, etc.) can cause considerable confusion with shared\n"
+" clones. In particular, if two shared clones are both updated to\n"
+" the same changeset, and one of them destroys that changeset\n"
+" with rollback, the other clone will suddenly stop working: all\n"
+" operations will fail with \"abort: working directory has unknown\n"
+" parent\". The only known workaround is to use debugsetparents on\n"
+" the broken clone to reset it to a changeset that still exists\n"
+" (e.g. tip).\n"
" "
msgstr ""
@@ -4830,7 +5345,7 @@
msgid "%s: empty changeset"
msgstr ""
-msgid "Fix up the merge and run hg transplant --continue"
+msgid "fix up the merge and run hg transplant --continue"
msgstr ""
#, python-format
@@ -4847,9 +5362,22 @@
msgid "commit failed"
msgstr ""
+msgid ""
+"y: transplant this changeset\n"
+"n: skip this changeset\n"
+"m: merge at this changeset\n"
+"p: show patch\n"
+"c: commit selected changesets\n"
+"q: cancel transplant\n"
+"?: show this help\n"
+msgstr ""
+
msgid "apply changeset? [ynmpcq?]:"
msgstr ""
+msgid "no such option\n"
+msgstr ""
+
msgid "transplant changesets from another branch"
msgstr ""
@@ -4878,7 +5406,7 @@
msgstr ""
msgid ""
-" hg transplant --branch REVISION --all will rebase the selected\n"
+" :hg:`transplant --branch REVISION --all` will rebase the selected\n"
" branch (up to the named revision) onto your current working\n"
" directory."
msgstr ""
@@ -4891,14 +5419,14 @@
msgstr ""
msgid ""
-" If no merges or revisions are provided, hg transplant will start\n"
-" an interactive changeset browser."
+" If no merges or revisions are provided, :hg:`transplant` will\n"
+" start an interactive changeset browser."
msgstr ""
msgid ""
" If a changeset application fails, you can fix the merge by hand\n"
-" and then resume where you left off by calling hg transplant\n"
-" --continue/-c.\n"
+" and then resume where you left off by calling :hg:`transplant\n"
+" --continue/-c`.\n"
" "
msgstr ""
@@ -4923,7 +5451,15 @@
msgid "outstanding local changes"
msgstr ""
-msgid "pull patches from REPOSITORY"
+msgid ""
+"``transplanted(set)``\n"
+" Transplanted changesets in set."
+msgstr ""
+
+msgid "pull patches from REPO"
+msgstr ""
+
+msgid "BRANCH"
msgstr ""
msgid "pull patches from branch BRANCH"
@@ -4944,10 +5480,10 @@
msgid "continue last transplant session after repair"
msgstr ""
-msgid "filter changesets through FILTER"
-msgstr ""
-
-msgid "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
+msgid "filter changesets through command"
+msgstr ""
+
+msgid "hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
msgstr ""
msgid "allow the use of MBCS paths with problematic encodings"
@@ -4983,16 +5519,21 @@
msgid "Note that there are some limitations on using this extension:"
msgstr ""
-msgid ""
-"- You should use single encoding in one repository.\n"
-"- You should set same encoding for the repository by locale or\n"
-" HGENCODING."
-msgstr ""
-
-msgid ""
-"Path encoding conversion are done between Unicode and\n"
-"encoding.encoding which is decided by Mercurial from current locale\n"
-"setting or HGENCODING.\n"
+msgid "- You should use single encoding in one repository."
+msgstr ""
+
+msgid ""
+"\n"
+"By default, win32mbcs uses encoding.encoding decided by Mercurial.\n"
+"You can specify the encoding by config option::"
+msgstr ""
+
+msgid ""
+" [win32mbcs]\n"
+" encoding = sjis"
+msgstr ""
+
+msgid "It is useful for the users who want to commit with UTF-8 log message.\n"
msgstr ""
#, python-format
@@ -5005,6 +5546,18 @@
msgid "perform automatic newline conversion"
msgstr ""
+msgid ""
+" Deprecation: The win32text extension requires each user to configure\n"
+" the extension again and again for each clone since the configuration\n"
+" is not copied when cloning."
+msgstr ""
+
+msgid ""
+" We have therefore made the ``eol`` as an alternative. The ``eol``\n"
+" uses a version controlled file for its configuration and each clone\n"
+" will therefore use the right settings from the start."
+msgstr ""
+
msgid "To perform automatic newline conversion, use::"
msgstr ""
@@ -5022,7 +5575,8 @@
" # or ** = macdecode:"
msgstr ""
-msgid "If not doing conversion, to make sure you do not commit CRLF/CR by accident::"
+msgid ""
+"If not doing conversion, to make sure you do not commit CRLF/CR by accident::"
msgstr ""
msgid ""
@@ -5085,18 +5639,23 @@
"** = %sdecode:\n"
msgstr ""
+msgid ""
+"win32text is deprecated: http://mercurial.selenic.com/wiki/"
+"Win32TextExtension\n"
+msgstr ""
+
msgid "discover and advertise repositories on the local network"
msgstr ""
msgid ""
-"Zeroconf enabled repositories will be announced in a network without\n"
+"Zeroconf-enabled repositories will be announced in a network without\n"
"the need to configure a server or a service. They can be discovered\n"
"without knowing their actual IP address."
msgstr ""
msgid ""
-"To allow other people to discover your repository using run \"hg serve\"\n"
-"in your repository::"
+"To allow other people to discover your repository using run\n"
+":hg:`serve` in your repository::"
msgstr ""
msgid ""
@@ -5104,7 +5663,9 @@
" $ hg serve"
msgstr ""
-msgid "You can discover zeroconf enabled repositories by running \"hg paths\"::"
+msgid ""
+"You can discover Zeroconf-enabled repositories by running\n"
+":hg:`paths`::"
msgstr ""
msgid ""
@@ -5132,18 +5693,6 @@
msgid "integrity check failed on %s:%d"
msgstr ""
-#, python-format
-msgid "%s: not a Mercurial bundle file"
-msgstr ""
-
-#, python-format
-msgid "%s: unknown bundle version"
-msgstr ""
-
-#, python-format
-msgid "%s: unknown bundle compression type"
-msgstr ""
-
msgid "cannot create new bundle repository"
msgstr ""
@@ -5151,11 +5700,23 @@
msgid "premature EOF reading chunk (got %d bytes, expected %d)"
msgstr ""
+#, python-format
+msgid "%s: not a Mercurial bundle"
+msgstr "%s ä¸æ˜¯ä¸€å€‹Mercurial bundle"
+
+#, python-format
+msgid "%s: unknown bundle version %s"
+msgstr "%s: 未知的bundle 版本 %s"
+
msgid "empty username"
-msgstr ""
+msgstr "使用者å稱是空白的"
#, python-format
msgid "username %s contains a newline"
+msgstr "使用者å稱 %s 包å«ä¸€å€‹æ›è¡Œå—å…ƒ"
+
+#, python-format
+msgid "the name '%s' is reserved"
msgstr ""
msgid "options --message and --logfile are mutually exclusive"
@@ -5163,7 +5724,7 @@
#, python-format
msgid "can't read commit message '%s': %s"
-msgstr ""
+msgstr "ä¸èƒ½è®€å–æ交訊æ¯'%s': %s"
msgid "limit must be a positive integer"
msgstr ""
@@ -5171,26 +5732,27 @@
msgid "limit must be positive"
msgstr ""
-msgid "too many revisions specified"
-msgstr ""
-
#, python-format
msgid "invalid format spec '%%%s' in output filename"
msgstr ""
#, python-format
msgid "adding %s\n"
-msgstr ""
+msgstr "新增 %s\n"
#, python-format
msgid "removing %s\n"
-msgstr ""
+msgstr "æ£åœ¨åˆªé™¤ %s\n"
#, python-format
msgid "recording removal of %s as rename to %s (%d%% similar)\n"
msgstr ""
#, python-format
+msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
+msgstr ""
+
+#, python-format
msgid "%s: not copying - file is not managed\n"
msgstr ""
@@ -5204,33 +5766,37 @@
#, python-format
msgid "%s: not overwriting - file exists\n"
+msgstr "%s: ä¸èƒ½è“‹å¯« - 檔案å˜åœ¨\n"
+
+#, python-format
+msgid "%s: not recording move - %s does not exist\n"
+msgstr ""
+
+#, python-format
+msgid "%s: not recording copy - %s does not exist\n"
msgstr ""
#, python-format
msgid "%s: deleted in working copy\n"
-msgstr ""
+msgstr "%s:在工作複本裡被刪除了\n"
#, python-format
msgid "%s: cannot copy - %s\n"
-msgstr ""
+msgstr "%s: ä¸èƒ½è¤‡è£½ - %s\n"
#, python-format
msgid "moving %s to %s\n"
-msgstr ""
+msgstr "%s æ¬ç§»åˆ° %s\n"
#, python-format
msgid "copying %s to %s\n"
-msgstr ""
-
-#, python-format
-msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
-msgstr ""
+msgstr "%s 複製到 %s\n"
msgid "no source or destination specified"
-msgstr ""
+msgstr "沒有æ述來æºæˆ–目的"
msgid "no destination specified"
-msgstr ""
+msgstr "沒有æ述目的"
msgid "with multiple sources, destination must be an existing directory"
msgstr ""
@@ -5240,78 +5806,77 @@
msgstr ""
msgid "no files to copy"
-msgstr ""
+msgstr "沒有檔案å¯è¤‡è£½"
msgid "(consider using --after)\n"
msgstr ""
+msgid "child process failed to start"
+msgstr ""
+
#, python-format
msgid "changeset: %d:%s\n"
-msgstr ""
+msgstr "changeset:\t%d:%s\n"
#, python-format
msgid "branch: %s\n"
-msgstr ""
+msgstr "分支:\t\t%s\n"
#, python-format
msgid "tag: %s\n"
-msgstr ""
+msgstr "標記:\t\t%s\n"
#, python-format
msgid "parent: %d:%s\n"
-msgstr ""
+msgstr "æ¯ç³»:\t\t%d:%s\n"
#, python-format
msgid "manifest: %d:%s\n"
-msgstr ""
+msgstr "manifest:\t%d:%s\n"
#, python-format
msgid "user: %s\n"
-msgstr ""
+msgstr "使用者:\t\t%s\n"
#, python-format
msgid "date: %s\n"
-msgstr ""
+msgstr "日期:\t\t%s\n"
msgid "files+:"
-msgstr ""
+msgstr "檔案+:"
msgid "files-:"
-msgstr ""
+msgstr "檔案-:"
msgid "files:"
-msgstr ""
+msgstr "檔案:"
#, python-format
msgid "files: %s\n"
-msgstr ""
+msgstr "檔案:\t\t%s\n"
#, python-format
msgid "copies: %s\n"
-msgstr ""
+msgstr "複製:\t\t%s\n"
#, python-format
msgid "extra: %s=%s\n"
-msgstr ""
+msgstr "é¡å¤–:\t\t%s=%s\n"
msgid "description:\n"
-msgstr ""
+msgstr "æè¿°:\n"
#, python-format
msgid "summary: %s\n"
-msgstr ""
+msgstr "æ交摘è¦:\t%s\n"
#, python-format
msgid "%s: no key named '%s'"
msgstr ""
#, python-format
-msgid "%s: %s"
-msgstr ""
-
-#, python-format
msgid "Found revision %s from %s\n"
-msgstr ""
+msgstr "找到修定版 %s (從 %s 那邊)\n"
msgid "revision matching date not found"
msgstr ""
@@ -5320,29 +5885,29 @@
msgid "cannot follow nonexistent file: \"%s\""
msgstr ""
-#, python-format
-msgid "%s:%s copy source revision cannot be found!\n"
-msgstr ""
-
msgid "can only follow copies/renames for explicit filenames"
msgstr ""
+#, python-format
+msgid "skipping missing subrepository: %s\n"
+msgstr ""
+
msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
-msgstr ""
+msgstr "HG: 輸入æ交訊æ¯.'HG:'é–‹é 的行到時候都會被拿掉"
msgid "HG: Leave message empty to abort commit."
-msgstr ""
+msgstr "HG: 如果想è¦å–消æ交,ä¸è¦è¼¸å…¥ä»»ä½•è¨Šæ¯ç„¶å¾Œé›¢é–‹."
#, python-format
msgid "HG: user: %s"
-msgstr ""
+msgstr "HG: 使用者 : %s"
msgid "HG: branch merge"
msgstr ""
#, python-format
msgid "HG: branch '%s'"
-msgstr ""
+msgstr "HG: 分支 '%s'"
#, python-format
msgid "HG: subrepo %s"
@@ -5350,53 +5915,71 @@
#, python-format
msgid "HG: added %s"
-msgstr ""
+msgstr "HG: 新增 %s"
#, python-format
msgid "HG: changed %s"
-msgstr ""
+msgstr "HG: 更改 %s"
#, python-format
msgid "HG: removed %s"
-msgstr ""
+msgstr "HG: 移除 %s"
msgid "HG: no files changed"
-msgstr ""
+msgstr "HG: 沒有檔案被改變"
msgid "empty commit message"
-msgstr ""
-
-#, fuzzy
+msgstr "空白的æ交訊æ¯"
+
msgid "add the specified files on the next commit"
-msgstr "æ–°å¢žä¸‹æ¬¡è¦ commit 的檔案"
-
-#, fuzzy
+msgstr "新增下次è¦æ交的檔案"
+
msgid ""
" Schedule files to be version controlled and added to the\n"
" repository."
-msgstr " 新增è¦ç´å…¥ç‰ˆæœ¬æŽ§åˆ¶ä¸¦åŠ 到 repository 的檔案。"
-
-#, fuzzy
+msgstr ""
+" 新增è¦ç´å…¥ç‰ˆæœ¬æŽ§åˆ¶ä¸¦åŠ 到儲å˜åº«çš„檔案。\n"
+" "
+
msgid ""
" The files will be added to the repository at the next commit. To\n"
-" undo an add before that, see hg forget."
-msgstr ""
-" 這些檔案將於下次 commit æ™‚è¢«åŠ åˆ° repository。\n"
-" 若想è¦å›žåˆ°æ–°å¢žæª”案å‰çš„狀態，請åƒé–± hg revert 命令。"
-
-#, fuzzy
-msgid ""
-" If no names are given, add all files to the repository.\n"
+" undo an add before that, see :hg:`forget`."
+msgstr ""
+" 這些檔案將於下次æäº¤æ™‚è¢«åŠ åˆ°å„²å˜åº«\n"
+" 若想è¦å›žåˆ°æ–°å¢žæª”案å‰çš„狀態，請åƒé–± :hg:`forget`."
+
+msgid " If no names are given, add all files to the repository."
+msgstr " 如果沒有指定檔案,æ‰€æœ‰çš„æª”æ¡ˆéƒ½å°‡æœƒåŠ åˆ°å„²å˜åº«"
+
+msgid " .. container:: verbose"
+msgstr ""
+
+msgid ""
+" An example showing how new (unknown) files are added\n"
+" automatically by :hg:`add`::"
+msgstr ""
+
+msgid ""
+" $ ls\n"
+" foo.c\n"
+" $ hg status\n"
+" ? foo.c\n"
+" $ hg add\n"
+" adding foo.c\n"
+" $ hg status\n"
+" A foo.c"
+msgstr ""
+
+msgid ""
+" Returns 0 if all files are successfully added.\n"
" "
msgstr ""
-" å¦‚æžœæ²’æœ‰æŒ‡å®šæª”æ¡ˆï¼Œå‰‡æœƒå°‡æ‰€æœ‰çš„æª”æ¡ˆéƒ½æ¨™ç¤ºç‚ºåŠ åˆ° repository。\n"
+" 如果所有檔案新增æˆåŠŸçš„話就返回0\n"
" "
-#, fuzzy
msgid "add all new files, delete all missing files"
msgstr "新增所有未å—版本控制的檔案，並刪除所有消失的檔案。"
-#, fuzzy
msgid ""
" Add all new files and remove all missing files from the\n"
" repository."
@@ -5404,7 +5987,6 @@
" æ–°å¢žæ‰€æœ‰æœªåŠ åˆ° repository çš„æª”æ¡ˆï¼Œä¸¦ç§»é™¤å·²åŠ åˆ° repository\n"
" å»æ¶ˆå¤±çš„檔案。"
-#, fuzzy
msgid ""
" New files are ignored if they match any of the patterns in\n"
" .hgignore. As with add, these changes take effect at the next\n"
@@ -5413,15 +5995,14 @@
" 如果新的檔案ä¸æª”å有符åˆä»»ä¸€å˜åœ¨æ–¼ .hgignore 的樣å¼ï¼Œ\n"
" å‰‡è©²æª”å°‡è¢«å¿½ç•¥ã€‚å¦‚åŒ add 命令，這些變更將於下次æ交時發生效用。"
-#, fuzzy
msgid ""
" Use the -s/--similarity option to detect renamed files. With a\n"
" parameter greater than 0, this compares every removed file with\n"
" every added file and records those similar enough as renames. This\n"
" option takes a percentage between 0 (disabled) and 100 (files must\n"
" be identical) as its parameter. Detecting renamed files this way\n"
-" can be expensive.\n"
-" "
+" can be expensive. After using this option, :hg:`status -C` can be\n"
+" used to check which files were identified as moved or renamed."
msgstr ""
" å¯ä½¿ç”¨ -s/--similarity é¸é …去åµæ¸¬æ›´å的檔案。後é¢æŽ¥è‘—的是一個\n"
" 大於 0 çš„åƒæ•¸ï¼Œå¯ç”¨ä¾†æ¯”å°æ¯å€‹è¢«æ–°å¢žæˆ–移除的檔案，並試圖找出其\n"
@@ -5443,28 +6024,18 @@
" List changes in files, showing the revision id responsible for\n"
" each line"
msgstr ""
-" List changes in files, showing the revision id responsible for\n"
-" each line"
msgid ""
" This command is useful for discovering when a change was made and\n"
" by whom."
msgstr ""
-" This command is useful for discovering when a change was made and\n"
-" by whom."
msgid ""
" Without the -a/--text option, annotate will avoid processing files\n"
" it detects as binary. With -a, annotate will annotate the file\n"
" anyway, although the results will probably be neither useful\n"
-" nor desirable.\n"
-" "
-msgstr ""
-" Without the -a/--text option, annotate will avoid processing files\n"
-" it detects as binary. With -a, annotate will annotate the file\n"
-" anyway, although the results will probably be neither useful\n"
-" nor desirable.\n"
-" "
+" nor desirable."
+msgstr ""
msgid "at least one filename or pattern is required"
msgstr ""
@@ -5476,66 +6047,45 @@
msgid "%s: binary file\n"
msgstr ""
-#, fuzzy
msgid "create an unversioned archive of a repository revision"
msgstr "建立一個沒有版本控制的版本å°å˜"
-#, fuzzy
msgid ""
" By default, the revision used is the parent of the working\n"
" directory; use -r/--rev to specify a different revision."
msgstr ""
-" By default, the revision used is the parent of the working\n"
-" directory; use -r/--rev to specify a different revision."
-
-#, fuzzy
-msgid ""
-" To specify the type of archive to create, use -t/--type. Valid\n"
-" types are::"
-msgstr ""
-" To specify the type of archive to create, use -t/--type. Valid\n"
-" types are:"
-
-#, fuzzy
-msgid ""
-" \"files\" (default): a directory full of files\n"
-" \"tar\": tar archive, uncompressed\n"
-" \"tbz2\": tar archive, compressed using bzip2\n"
-" \"tgz\": tar archive, compressed using gzip\n"
-" \"uzip\": zip archive, uncompressed\n"
-" \"zip\": zip archive, compressed using deflate"
-msgstr ""
-" \"files\" (default): a directory full of files\n"
-" \"tar\": tar archive, uncompressed\n"
-" \"tbz2\": tar archive, compressed using bzip2\n"
-" \"tgz\": tar archive, compressed using gzip\n"
-" \"uzip\": zip archive, uncompressed\n"
-" \"zip\": zip archive, compressed using deflate"
-
-#, fuzzy
+
+msgid ""
+" The archive type is automatically detected based on file\n"
+" extension (or override using -t/--type)."
+msgstr ""
+
+msgid " Valid types are:"
+msgstr ""
+
+msgid ""
+" :``files``: a directory full of files (default)\n"
+" :``tar``: tar archive, uncompressed\n"
+" :``tbz2``: tar archive, compressed using bzip2\n"
+" :``tgz``: tar archive, compressed using gzip\n"
+" :``uzip``: zip archive, uncompressed\n"
+" :``zip``: zip archive, compressed using deflate"
+msgstr ""
+
msgid ""
" The exact name of the destination archive or directory is given\n"
-" using a format string; see 'hg help export' for details."
-msgstr ""
-" The exact name of the destination archive or directory is given\n"
-" using a format string; see 'hg help export' for details."
-
-#, fuzzy
+" using a format string; see :hg:`help export` for details."
+msgstr ""
+
msgid ""
" Each member added to an archive file has a directory prefix\n"
" prepended. Use -p/--prefix to specify a format string for the\n"
" prefix. The default is the basename of the archive, with suffixes\n"
-" removed.\n"
-" "
-msgstr ""
-" Each member added to an archive file has a directory prefix\n"
-" prepended. Use -p/--prefix to specify a format string for the\n"
-" prefix. The default is the basename of the archive, with suffixes\n"
-" removed.\n"
-" "
+" removed."
+msgstr ""
msgid "no working directory: please specify a revision"
-msgstr ""
+msgstr "沒有工作目錄:è«‹æ述一個版次"
msgid "repository root cannot be destination"
msgstr ""
@@ -5547,31 +6097,33 @@
msgstr "å›žå¾©å…ˆå‰ changeset 所作的變更"
msgid ""
-" Commit the backed out changes as a new changeset. The new\n"
-" changeset is a child of the backed out changeset."
-msgstr ""
-" Commit the backed out changes as a new changeset. The new\n"
-" changeset is a child of the backed out changeset."
-
-msgid ""
-" If you backout a changeset other than the tip, a new head is\n"
-" created. This head will be the new tip and you should merge this\n"
-" backout changeset with another head."
-msgstr ""
-" If you backout a changeset other than the tip, a new head is\n"
-" created. This head will be the new tip and you should merge this\n"
-" backout changeset with another head."
-
-msgid ""
+" The backout command merges the reverse effect of the reverted\n"
+" changeset into the working directory."
+msgstr ""
+
+msgid ""
+" With the --merge option, it first commits the reverted changes\n"
+" as a new changeset. This new changeset is a child of the reverted\n"
+" changeset.\n"
" The --merge option remembers the parent of the working directory\n"
" before starting the backout, then merges the new head with that\n"
-" changeset afterwards. This saves you from doing the merge by hand.\n"
-" The result of this merge is not committed, as with a normal merge."
-msgstr ""
-" The --merge option remembers the parent of the working directory\n"
-" before starting the backout, then merges the new head with that\n"
-" changeset afterwards. This saves you from doing the merge by hand.\n"
-" The result of this merge is not committed, as with a normal merge."
+" changeset afterwards.\n"
+" This will result in an explicit merge in the history."
+msgstr ""
+
+msgid ""
+" If you backout a changeset other than the original parent of the\n"
+" working directory, the result of this merge is not committed,\n"
+" as with a normal merge. Otherwise, no merge is needed and the\n"
+" commit is automatic."
+msgstr ""
+
+msgid ""
+" Note that the default behavior (without --merge) has changed in\n"
+" version 1.7. To restore the previous default behavior, use\n"
+" :hg:`backout --merge` and then :hg:`update --clean .` to get rid of\n"
+" the ongoing merge."
+msgstr ""
msgid "please specify just one revision"
msgstr ""
@@ -5603,12 +6155,6 @@
msgid "merging with changeset %s\n"
msgstr ""
-msgid "the backout changeset is a new head - do not forget to merge\n"
-msgstr ""
-
-msgid "(use \"backout --merge\" if you want to auto-merge)\n"
-msgstr ""
-
msgid "subdivision search of changesets"
msgstr "å° changesets 作二分法æœå°‹"
@@ -5622,36 +6168,19 @@
" bad, and bisect will either update to another candidate changeset\n"
" or announce that it has found the bad revision."
msgstr ""
-" This command helps to find changesets which introduce problems. To\n"
-" use, mark the earliest changeset you know exhibits the problem as\n"
-" bad, then mark the latest changeset which is free from the problem\n"
-" as good. Bisect will update your working directory to a revision\n"
-" for testing (unless the -U/--noupdate option is specified). Once\n"
-" you have performed tests, mark the working directory as good or\n"
-" bad, and bisect will either update to another candidate changeset\n"
-" or announce that it has found the bad revision."
msgid ""
" As a shortcut, you can also use the revision argument to mark a\n"
" revision as good or bad without checking it out first."
msgstr ""
-" As a shortcut, you can also use the revision argument to mark a\n"
-" revision as good or bad without checking it out first."
msgid ""
" If you supply a command, it will be used for automatic bisection.\n"
" Its exit status will be used to mark revisions as good or bad:\n"
" status 0 means good, 125 means to skip the revision, 127\n"
" (command not found) will abort the bisection, and any other\n"
-" non-zero exit status means the revision is bad.\n"
-" "
-msgstr ""
-" If you supply a command, it will be used for automatic bisection.\n"
-" Its exit status will be used to mark revisions as good or bad:\n"
-" status 0 means good, 125 means to skip the revision, 127\n"
-" (command not found) will abort the bisection, and any other\n"
-" non-zero exit status means the revision is bad.\n"
-" "
+" non-zero exit status means the revision is bad."
+msgstr ""
msgid "The first good revision is:\n"
msgstr ""
@@ -5659,6 +6188,12 @@
msgid "The first bad revision is:\n"
msgstr ""
+#, python-format
+msgid ""
+"Not all ancestors of this changeset have been checked.\n"
+"To check the other ancestors, start from the common ancestor, %s.\n"
+msgstr ""
+
msgid "Due to skipped revisions, the first good revision could be any of:\n"
msgstr ""
@@ -5693,11 +6228,9 @@
msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
msgstr ""
-#, fuzzy
msgid "set or show the current branch name"
-msgstr "è¨å®šæˆ–顯示目å‰çš„ branch å稱"
-
-#, fuzzy
+msgstr "è¨å®šæˆ–顯示目å‰çš„分支å稱"
+
msgid ""
" With no argument, show the current branch name. With one argument,\n"
" set the working directory branch name (the branch will not exist\n"
@@ -5705,236 +6238,100 @@
" recommends that primary development take place on the 'default'\n"
" branch."
msgstr ""
-" With no argument, show the current branch name. With one argument,\n"
-" set the working directory branch name (the branch will not exist\n"
-" in the repository until the next commit). Standard practice\n"
-" recommends that primary development take place on the 'default'\n"
-" branch."
-
-#, fuzzy
+
msgid ""
" Unless -f/--force is specified, branch will not let you set a\n"
" branch name that already exists, even if it's inactive."
msgstr ""
-" Unless -f/--force is specified, branch will not let you set a\n"
-" branch name that already exists, even if it's inactive."
-
-#, fuzzy
+
msgid ""
" Use -C/--clean to reset the working directory branch to that of\n"
" the parent of the working directory, negating a previous branch\n"
" change."
msgstr ""
-" Use -C/--clean to reset the working directory branch to that of\n"
-" the parent of the working directory, negating a previous branch\n"
-" change."
-
-#, fuzzy
-msgid ""
-" Use the command 'hg update' to switch to an existing branch. Use\n"
-" 'hg commit --close-branch' to mark this branch as closed.\n"
-" "
-msgstr ""
-" Use the command 'hg update' to switch to an existing branch.\n"
-" "
+
+msgid ""
+" Use the command :hg:`update` to switch to an existing branch. Use\n"
+" :hg:`commit --close-branch` to mark this branch as closed."
+msgstr ""
#, python-format
msgid "reset working directory to branch %s\n"
-msgstr ""
-
-msgid "a branch of the same name already exists (use --force to override)"
+msgstr "é‡ç½®å·¥ä½œç›®éŒ„到%s分支\n"
+
+msgid ""
+"a branch of the same name already exists (use 'hg update' to switch to it)"
msgstr ""
#, python-format
msgid "marked working directory as branch %s\n"
-msgstr ""
-
-#, fuzzy
+msgstr "標記工作目錄為%s分支\n"
+
msgid "list repository named branches"
msgstr "顯示 repository 的 named branches"
-#, fuzzy
msgid ""
" List the repository's named branches, indicating which ones are\n"
" inactive. If -c/--closed is specified, also list branches which have\n"
-" been marked closed (see hg commit --close-branch)."
-msgstr ""
-" List the repository's named branches, indicating which ones are\n"
-" inactive. If active is specified, only show active branches."
-
-#, fuzzy
+" been marked closed (see :hg:`commit --close-branch`)."
+msgstr ""
+
msgid ""
" If -a/--active is specified, only show active branches. A branch\n"
" is considered active if it contains repository heads."
-msgstr " A branch is considered active if it contains repository heads."
-
-#, fuzzy
-msgid ""
-" Use the command 'hg update' to switch to an existing branch.\n"
+msgstr ""
+
+msgid " Use the command :hg:`update` to switch to an existing branch."
+msgstr ""
+
+msgid ""
+" Returns 0.\n"
" "
msgstr ""
-" Use the command 'hg update' to switch to an existing branch.\n"
-" "
-
-#, fuzzy
+
+msgid " (closed)"
+msgstr ""
+
+msgid " (inactive)"
+msgstr ""
+
msgid "create a changegroup file"
-msgstr ""
-"建立一個 changegroup 檔案\n"
-"\n"
-" Generate a compressed changegroup file collecting changesets not\n"
-" known to be in another repository.\n"
-"\n"
-" If no destination repository is specified the destination is\n"
-" assumed to have all the nodes specified by one or more --base\n"
-" parameters. To create a bundle containing all changesets, use\n"
-" -a/--all (or --base null). To change the compression method\n"
-" applied, use the -t/--type option (by default, bundles are\n"
-" compressed using bz2).\n"
-"\n"
-" The bundle file can then be transferred using conventional means\n"
-" and applied to another repository with the unbundle or pull\n"
-" command. This is useful when direct push and pull are not\n"
-" available or when exporting an entire repository is undesirable.\n"
-"\n"
-" Applying bundles preserves all changeset contents including\n"
-" permissions, copy/rename information, and revision history.\n"
-" "
-
-#, fuzzy
+msgstr "建立一個 changegroup 檔案"
+
msgid ""
" Generate a compressed changegroup file collecting changesets not\n"
" known to be in another repository."
msgstr ""
-"建立一個 changegroup 檔案\n"
-"\n"
-" Generate a compressed changegroup file collecting changesets not\n"
-" known to be in another repository.\n"
-"\n"
-" If no destination repository is specified the destination is\n"
-" assumed to have all the nodes specified by one or more --base\n"
-" parameters. To create a bundle containing all changesets, use\n"
-" -a/--all (or --base null). To change the compression method\n"
-" applied, use the -t/--type option (by default, bundles are\n"
-" compressed using bz2).\n"
-"\n"
-" The bundle file can then be transferred using conventional means\n"
-" and applied to another repository with the unbundle or pull\n"
-" command. This is useful when direct push and pull are not\n"
-" available or when exporting an entire repository is undesirable.\n"
-"\n"
-" Applying bundles preserves all changeset contents including\n"
-" permissions, copy/rename information, and revision history.\n"
-" "
-
-#, fuzzy
-msgid ""
-" If no destination repository is specified the destination is\n"
-" assumed to have all the nodes specified by one or more --base\n"
+
+msgid ""
+" If you omit the destination repository, then hg assumes the\n"
+" destination will have all the nodes you specify with --base\n"
" parameters. To create a bundle containing all changesets, use\n"
" -a/--all (or --base null)."
msgstr ""
-"建立一個 changegroup 檔案\n"
-"\n"
-" Generate a compressed changegroup file collecting changesets not\n"
-" known to be in another repository.\n"
-"\n"
-" If no destination repository is specified the destination is\n"
-" assumed to have all the nodes specified by one or more --base\n"
-" parameters. To create a bundle containing all changesets, use\n"
-" -a/--all (or --base null). To change the compression method\n"
-" applied, use the -t/--type option (by default, bundles are\n"
-" compressed using bz2).\n"
-"\n"
-" The bundle file can then be transferred using conventional means\n"
-" and applied to another repository with the unbundle or pull\n"
-" command. This is useful when direct push and pull are not\n"
-" available or when exporting an entire repository is undesirable.\n"
-"\n"
-" Applying bundles preserves all changeset contents including\n"
-" permissions, copy/rename information, and revision history.\n"
-" "
-
-#, fuzzy
+
msgid ""
" You can change compression method with the -t/--type option.\n"
" The available compression methods are: none, bzip2, and\n"
" gzip (by default, bundles are compressed using bzip2)."
msgstr ""
-"建立一個 changegroup 檔案\n"
-"\n"
-" Generate a compressed changegroup file collecting changesets not\n"
-" known to be in another repository.\n"
-"\n"
-" If no destination repository is specified the destination is\n"
-" assumed to have all the nodes specified by one or more --base\n"
-" parameters. To create a bundle containing all changesets, use\n"
-" -a/--all (or --base null). To change the compression method\n"
-" applied, use the -t/--type option (by default, bundles are\n"
-" compressed using bz2).\n"
-"\n"
-" The bundle file can then be transferred using conventional means\n"
-" and applied to another repository with the unbundle or pull\n"
-" command. This is useful when direct push and pull are not\n"
-" available or when exporting an entire repository is undesirable.\n"
-"\n"
-" Applying bundles preserves all changeset contents including\n"
-" permissions, copy/rename information, and revision history.\n"
-" "
-
-#, fuzzy
+
msgid ""
" The bundle file can then be transferred using conventional means\n"
" and applied to another repository with the unbundle or pull\n"
" command. This is useful when direct push and pull are not\n"
" available or when exporting an entire repository is undesirable."
msgstr ""
-"建立一個 changegroup 檔案\n"
-"\n"
-" Generate a compressed changegroup file collecting changesets not\n"
-" known to be in another repository.\n"
-"\n"
-" If no destination repository is specified the destination is\n"
-" assumed to have all the nodes specified by one or more --base\n"
-" parameters. To create a bundle containing all changesets, use\n"
-" -a/--all (or --base null). To change the compression method\n"
-" applied, use the -t/--type option (by default, bundles are\n"
-" compressed using bz2).\n"
-"\n"
-" The bundle file can then be transferred using conventional means\n"
-" and applied to another repository with the unbundle or pull\n"
-" command. This is useful when direct push and pull are not\n"
-" available or when exporting an entire repository is undesirable.\n"
-"\n"
-" Applying bundles preserves all changeset contents including\n"
-" permissions, copy/rename information, and revision history.\n"
-" "
-
-#, fuzzy
+
msgid ""
" Applying bundles preserves all changeset contents including\n"
-" permissions, copy/rename information, and revision history.\n"
+" permissions, copy/rename information, and revision history."
+msgstr ""
+
+msgid ""
+" Returns 0 on success, 1 if no changes found.\n"
" "
msgstr ""
-"建立一個 changegroup 檔案\n"
-"\n"
-" Generate a compressed changegroup file collecting changesets not\n"
-" known to be in another repository.\n"
-"\n"
-" If no destination repository is specified the destination is\n"
-" assumed to have all the nodes specified by one or more --base\n"
-" parameters. To create a bundle containing all changesets, use\n"
-" -a/--all (or --base null). To change the compression method\n"
-" applied, use the -t/--type option (by default, bundles are\n"
-" compressed using bz2).\n"
-"\n"
-" The bundle file can then be transferred using conventional means\n"
-" and applied to another repository with the unbundle or pull\n"
-" command. This is useful when direct push and pull are not\n"
-" available or when exporting an entire repository is undesirable.\n"
-"\n"
-" Applying bundles preserves all changeset contents including\n"
-" permissions, copy/rename information, and revision history.\n"
-" "
msgid "--base is incompatible with specifying a destination"
msgstr ""
@@ -5942,704 +6339,148 @@
msgid "unknown bundle type specified with --type"
msgstr ""
-#, fuzzy
msgid "output the current or given revision of files"
-msgstr "輸出目å‰æˆ–是特定 revision 的檔案內容"
-
-#, fuzzy
+msgstr "輸出目å‰æˆ–是特定修定版的檔案內容"
+
msgid ""
" Print the specified files as they were at the given revision. If\n"
" no revision is given, the parent of the working directory is used,\n"
" or tip if no revision is checked out."
msgstr ""
-" Print the specified files as they were at the given revision. If\n"
-" no revision is given, the parent of the working directory is used,\n"
-" or tip if no revision is checked out."
-
-#, fuzzy
-msgid ""
-" Output may be to a file, in which case the name of the file is\n"
-" given using a format string. The formatting rules are the same as\n"
-" for the export command, with the following additions::"
-msgstr ""
+
+msgid ""
" Output may be to a file, in which case the name of the file is\n"
" given using a format string. The formatting rules are the same as\n"
" for the export command, with the following additions:"
-
-#, fuzzy
-msgid ""
-" %s basename of file being printed\n"
-" %d dirname of file being printed, or '.' if in repository root\n"
-" %p root-relative path name of file being printed\n"
-" "
-msgstr ""
-" %s basename of file being printed\n"
-" %d dirname of file being printed, or '.' if in repository root\n"
-" %p root-relative path name of file being printed\n"
-" "
-
-#, fuzzy
+msgstr ""
+
+msgid ""
+" :``%s``: basename of file being printed\n"
+" :``%d``: dirname of file being printed, or '.' if in repository root\n"
+" :``%p``: root-relative path name of file being printed"
+msgstr ""
+
msgid "make a copy of an existing repository"
-msgstr ""
-"å°å·²å˜åœ¨çš„ repository 複製一份\n"
-"\n"
-" Create a copy of an existing repository in a new directory.\n"
-"\n"
-" If no destination directory name is specified, it defaults to the\n"
-" basename of the source.\n"
-"\n"
-" The location of the source is added to the new repository's\n"
-" .hg/hgrc file, as the default to be used for future pulls.\n"
-"\n"
-" If you use the -r/--rev option to clone up to a specific revision,\n"
-" no subsequent revisions (including subsequent tags) will be\n"
-" present in the cloned repository. This option implies --pull, even\n"
-" on local repositories.\n"
-"\n"
-" By default, clone will check out the head of the 'default' branch.\n"
-" If the -U/--noupdate option is used, the new clone will contain\n"
-" only a repository (.hg) and no working copy (the working copy\n"
-" parent is the null revision).\n"
-"\n"
-" See 'hg help urls' for valid source format details.\n"
-"\n"
-" It is possible to specify an ssh:// URL as the destination, but no\n"
-" .hg/hgrc and working directory will be created on the remote side.\n"
-" Please see 'hg help urls' for important details about ssh:// URLs.\n"
-"\n"
-" For efficiency, hardlinks are used for cloning whenever the source\n"
-" and destination are on the same filesystem (note this applies only\n"
-" to the repository data, not to the checked out files). Some\n"
-" filesystems, such as AFS, implement hardlinking incorrectly, but\n"
-" do not report errors. In these cases, use the --pull option to\n"
-" avoid hardlinking.\n"
-"\n"
-" In some cases, you can clone repositories and checked out files\n"
-" using full hardlinks with\n"
-"\n"
-" $ cp -al REPO REPOCLONE\n"
-"\n"
-" This is the fastest way to clone, but it is not always safe. The\n"
-" operation is not atomic (making sure REPO is not modified during\n"
-" the operation is up to you) and you have to make sure your editor\n"
-" breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
-" this is not compatible with certain extensions that place their\n"
-" metadata under the .hg directory, such as mq.\n"
-"\n"
-" "
-
-#, fuzzy
+msgstr "å°å·²å˜åœ¨çš„ repository 複製一份"
+
msgid " Create a copy of an existing repository in a new directory."
msgstr ""
-"å°å·²å˜åœ¨çš„ repository 複製一份\n"
-"\n"
-" Create a copy of an existing repository in a new directory.\n"
-"\n"
-" If no destination directory name is specified, it defaults to the\n"
-" basename of the source.\n"
-"\n"
-" The location of the source is added to the new repository's\n"
-" .hg/hgrc file, as the default to be used for future pulls.\n"
-"\n"
-" If you use the -r/--rev option to clone up to a specific revision,\n"
-" no subsequent revisions (including subsequent tags) will be\n"
-" present in the cloned repository. This option implies --pull, even\n"
-" on local repositories.\n"
-"\n"
-" By default, clone will check out the head of the 'default' branch.\n"
-" If the -U/--noupdate option is used, the new clone will contain\n"
-" only a repository (.hg) and no working copy (the working copy\n"
-" parent is the null revision).\n"
-"\n"
-" See 'hg help urls' for valid source format details.\n"
-"\n"
-" It is possible to specify an ssh:// URL as the destination, but no\n"
-" .hg/hgrc and working directory will be created on the remote side.\n"
-" Please see 'hg help urls' for important details about ssh:// URLs.\n"
-"\n"
-" For efficiency, hardlinks are used for cloning whenever the source\n"
-" and destination are on the same filesystem (note this applies only\n"
-" to the repository data, not to the checked out files). Some\n"
-" filesystems, such as AFS, implement hardlinking incorrectly, but\n"
-" do not report errors. In these cases, use the --pull option to\n"
-" avoid hardlinking.\n"
-"\n"
-" In some cases, you can clone repositories and checked out files\n"
-" using full hardlinks with\n"
-"\n"
-" $ cp -al REPO REPOCLONE\n"
-"\n"
-" This is the fastest way to clone, but it is not always safe. The\n"
-" operation is not atomic (making sure REPO is not modified during\n"
-" the operation is up to you) and you have to make sure your editor\n"
-" breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
-" this is not compatible with certain extensions that place their\n"
-" metadata under the .hg directory, such as mq.\n"
-"\n"
-" "
-
-#, fuzzy
+
msgid ""
" If no destination directory name is specified, it defaults to the\n"
" basename of the source."
msgstr ""
-"å°å·²å˜åœ¨çš„ repository 複製一份\n"
-"\n"
-" Create a copy of an existing repository in a new directory.\n"
-"\n"
-" If no destination directory name is specified, it defaults to the\n"
-" basename of the source.\n"
-"\n"
-" The location of the source is added to the new repository's\n"
-" .hg/hgrc file, as the default to be used for future pulls.\n"
-"\n"
-" If you use the -r/--rev option to clone up to a specific revision,\n"
-" no subsequent revisions (including subsequent tags) will be\n"
-" present in the cloned repository. This option implies --pull, even\n"
-" on local repositories.\n"
-"\n"
-" By default, clone will check out the head of the 'default' branch.\n"
-" If the -U/--noupdate option is used, the new clone will contain\n"
-" only a repository (.hg) and no working copy (the working copy\n"
-" parent is the null revision).\n"
-"\n"
-" See 'hg help urls' for valid source format details.\n"
-"\n"
-" It is possible to specify an ssh:// URL as the destination, but no\n"
-" .hg/hgrc and working directory will be created on the remote side.\n"
-" Please see 'hg help urls' for important details about ssh:// URLs.\n"
-"\n"
-" For efficiency, hardlinks are used for cloning whenever the source\n"
-" and destination are on the same filesystem (note this applies only\n"
-" to the repository data, not to the checked out files). Some\n"
-" filesystems, such as AFS, implement hardlinking incorrectly, but\n"
-" do not report errors. In these cases, use the --pull option to\n"
-" avoid hardlinking.\n"
-"\n"
-" In some cases, you can clone repositories and checked out files\n"
-" using full hardlinks with\n"
-"\n"
-" $ cp -al REPO REPOCLONE\n"
-"\n"
-" This is the fastest way to clone, but it is not always safe. The\n"
-" operation is not atomic (making sure REPO is not modified during\n"
-" the operation is up to you) and you have to make sure your editor\n"
-" breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
-" this is not compatible with certain extensions that place their\n"
-" metadata under the .hg directory, such as mq.\n"
-"\n"
-" "
-
-#, fuzzy
+
msgid ""
" The location of the source is added to the new repository's\n"
" .hg/hgrc file, as the default to be used for future pulls."
msgstr ""
-"å°å·²å˜åœ¨çš„ repository 複製一份\n"
-"\n"
-" Create a copy of an existing repository in a new directory.\n"
-"\n"
-" If no destination directory name is specified, it defaults to the\n"
-" basename of the source.\n"
-"\n"
-" The location of the source is added to the new repository's\n"
-" .hg/hgrc file, as the default to be used for future pulls.\n"
-"\n"
-" If you use the -r/--rev option to clone up to a specific revision,\n"
-" no subsequent revisions (including subsequent tags) will be\n"
-" present in the cloned repository. This option implies --pull, even\n"
-" on local repositories.\n"
-"\n"
-" By default, clone will check out the head of the 'default' branch.\n"
-" If the -U/--noupdate option is used, the new clone will contain\n"
-" only a repository (.hg) and no working copy (the working copy\n"
-" parent is the null revision).\n"
-"\n"
-" See 'hg help urls' for valid source format details.\n"
-"\n"
-" It is possible to specify an ssh:// URL as the destination, but no\n"
-" .hg/hgrc and working directory will be created on the remote side.\n"
-" Please see 'hg help urls' for important details about ssh:// URLs.\n"
-"\n"
-" For efficiency, hardlinks are used for cloning whenever the source\n"
-" and destination are on the same filesystem (note this applies only\n"
-" to the repository data, not to the checked out files). Some\n"
-" filesystems, such as AFS, implement hardlinking incorrectly, but\n"
-" do not report errors. In these cases, use the --pull option to\n"
-" avoid hardlinking.\n"
-"\n"
-" In some cases, you can clone repositories and checked out files\n"
-" using full hardlinks with\n"
-"\n"
-" $ cp -al REPO REPOCLONE\n"
-"\n"
-" This is the fastest way to clone, but it is not always safe. The\n"
-" operation is not atomic (making sure REPO is not modified during\n"
-" the operation is up to you) and you have to make sure your editor\n"
-" breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
-" this is not compatible with certain extensions that place their\n"
-" metadata under the .hg directory, such as mq.\n"
-"\n"
-" "
-
-#, fuzzy
-msgid ""
-" If you use the -r/--rev option to clone up to a specific revision,\n"
-" no subsequent revisions (including subsequent tags) will be\n"
-" present in the cloned repository. This option implies --pull, even\n"
-" on local repositories."
-msgstr ""
-"å°å·²å˜åœ¨çš„ repository 複製一份\n"
-"\n"
-" Create a copy of an existing repository in a new directory.\n"
-"\n"
-" If no destination directory name is specified, it defaults to the\n"
-" basename of the source.\n"
-"\n"
-" The location of the source is added to the new repository's\n"
-" .hg/hgrc file, as the default to be used for future pulls.\n"
-"\n"
-" If you use the -r/--rev option to clone up to a specific revision,\n"
-" no subsequent revisions (including subsequent tags) will be\n"
-" present in the cloned repository. This option implies --pull, even\n"
-" on local repositories.\n"
-"\n"
-" By default, clone will check out the head of the 'default' branch.\n"
-" If the -U/--noupdate option is used, the new clone will contain\n"
-" only a repository (.hg) and no working copy (the working copy\n"
-" parent is the null revision).\n"
-"\n"
-" See 'hg help urls' for valid source format details.\n"
-"\n"
-" It is possible to specify an ssh:// URL as the destination, but no\n"
+
+msgid " See :hg:`help urls` for valid source format details."
+msgstr ""
+
+msgid ""
+" It is possible to specify an ``ssh://`` URL as the destination, but no\n"
" .hg/hgrc and working directory will be created on the remote side.\n"
-" Please see 'hg help urls' for important details about ssh:// URLs.\n"
-"\n"
-" For efficiency, hardlinks are used for cloning whenever the source\n"
-" and destination are on the same filesystem (note this applies only\n"
-" to the repository data, not to the checked out files). Some\n"
-" filesystems, such as AFS, implement hardlinking incorrectly, but\n"
-" do not report errors. In these cases, use the --pull option to\n"
-" avoid hardlinking.\n"
-"\n"
-" In some cases, you can clone repositories and checked out files\n"
-" using full hardlinks with\n"
-"\n"
-" $ cp -al REPO REPOCLONE\n"
-"\n"
-" This is the fastest way to clone, but it is not always safe. The\n"
-" operation is not atomic (making sure REPO is not modified during\n"
-" the operation is up to you) and you have to make sure your editor\n"
-" breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
-" this is not compatible with certain extensions that place their\n"
-" metadata under the .hg directory, such as mq.\n"
-"\n"
-" "
-
-#, fuzzy
-msgid ""
-" By default, clone will check out the head of the 'default' branch.\n"
-" If the -U/--noupdate option is used, the new clone will contain\n"
-" only a repository (.hg) and no working copy (the working copy\n"
-" parent is the null revision)."
-msgstr ""
-"å°å·²å˜åœ¨çš„ repository 複製一份\n"
-"\n"
-" Create a copy of an existing repository in a new directory.\n"
-"\n"
-" If no destination directory name is specified, it defaults to the\n"
-" basename of the source.\n"
-"\n"
-" The location of the source is added to the new repository's\n"
-" .hg/hgrc file, as the default to be used for future pulls.\n"
-"\n"
-" If you use the -r/--rev option to clone up to a specific revision,\n"
-" no subsequent revisions (including subsequent tags) will be\n"
-" present in the cloned repository. This option implies --pull, even\n"
-" on local repositories.\n"
-"\n"
-" By default, clone will check out the head of the 'default' branch.\n"
-" If the -U/--noupdate option is used, the new clone will contain\n"
-" only a repository (.hg) and no working copy (the working copy\n"
-" parent is the null revision).\n"
-"\n"
-" See 'hg help urls' for valid source format details.\n"
-"\n"
-" It is possible to specify an ssh:// URL as the destination, but no\n"
-" .hg/hgrc and working directory will be created on the remote side.\n"
-" Please see 'hg help urls' for important details about ssh:// URLs.\n"
-"\n"
-" For efficiency, hardlinks are used for cloning whenever the source\n"
-" and destination are on the same filesystem (note this applies only\n"
-" to the repository data, not to the checked out files). Some\n"
-" filesystems, such as AFS, implement hardlinking incorrectly, but\n"
-" do not report errors. In these cases, use the --pull option to\n"
-" avoid hardlinking.\n"
-"\n"
-" In some cases, you can clone repositories and checked out files\n"
-" using full hardlinks with\n"
-"\n"
-" $ cp -al REPO REPOCLONE\n"
-"\n"
-" This is the fastest way to clone, but it is not always safe. The\n"
-" operation is not atomic (making sure REPO is not modified during\n"
-" the operation is up to you) and you have to make sure your editor\n"
-" breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
-" this is not compatible with certain extensions that place their\n"
-" metadata under the .hg directory, such as mq.\n"
-"\n"
-" "
-
-#, fuzzy
-msgid " See 'hg help urls' for valid source format details."
-msgstr ""
-"å°å·²å˜åœ¨çš„ repository 複製一份\n"
-"\n"
-" Create a copy of an existing repository in a new directory.\n"
-"\n"
-" If no destination directory name is specified, it defaults to the\n"
-" basename of the source.\n"
-"\n"
-" The location of the source is added to the new repository's\n"
-" .hg/hgrc file, as the default to be used for future pulls.\n"
-"\n"
-" If you use the -r/--rev option to clone up to a specific revision,\n"
-" no subsequent revisions (including subsequent tags) will be\n"
-" present in the cloned repository. This option implies --pull, even\n"
-" on local repositories.\n"
-"\n"
-" By default, clone will check out the head of the 'default' branch.\n"
-" If the -U/--noupdate option is used, the new clone will contain\n"
-" only a repository (.hg) and no working copy (the working copy\n"
-" parent is the null revision).\n"
-"\n"
-" See 'hg help urls' for valid source format details.\n"
-"\n"
-" It is possible to specify an ssh:// URL as the destination, but no\n"
-" .hg/hgrc and working directory will be created on the remote side.\n"
-" Please see 'hg help urls' for important details about ssh:// URLs.\n"
-"\n"
-" For efficiency, hardlinks are used for cloning whenever the source\n"
-" and destination are on the same filesystem (note this applies only\n"
-" to the repository data, not to the checked out files). Some\n"
-" filesystems, such as AFS, implement hardlinking incorrectly, but\n"
-" do not report errors. In these cases, use the --pull option to\n"
-" avoid hardlinking.\n"
-"\n"
-" In some cases, you can clone repositories and checked out files\n"
-" using full hardlinks with\n"
-"\n"
-" $ cp -al REPO REPOCLONE\n"
-"\n"
-" This is the fastest way to clone, but it is not always safe. The\n"
-" operation is not atomic (making sure REPO is not modified during\n"
-" the operation is up to you) and you have to make sure your editor\n"
-" breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
-" this is not compatible with certain extensions that place their\n"
-" metadata under the .hg directory, such as mq.\n"
-"\n"
-" "
-
-#, fuzzy
-msgid ""
-" It is possible to specify an ssh:// URL as the destination, but no\n"
-" .hg/hgrc and working directory will be created on the remote side.\n"
-" Please see 'hg help urls' for important details about ssh:// URLs."
-msgstr ""
-"å°å·²å˜åœ¨çš„ repository 複製一份\n"
-"\n"
-" Create a copy of an existing repository in a new directory.\n"
-"\n"
-" If no destination directory name is specified, it defaults to the\n"
-" basename of the source.\n"
-"\n"
-" The location of the source is added to the new repository's\n"
-" .hg/hgrc file, as the default to be used for future pulls.\n"
-"\n"
-" If you use the -r/--rev option to clone up to a specific revision,\n"
-" no subsequent revisions (including subsequent tags) will be\n"
-" present in the cloned repository. This option implies --pull, even\n"
-" on local repositories.\n"
-"\n"
-" By default, clone will check out the head of the 'default' branch.\n"
-" If the -U/--noupdate option is used, the new clone will contain\n"
-" only a repository (.hg) and no working copy (the working copy\n"
-" parent is the null revision).\n"
-"\n"
-" See 'hg help urls' for valid source format details.\n"
-"\n"
-" It is possible to specify an ssh:// URL as the destination, but no\n"
-" .hg/hgrc and working directory will be created on the remote side.\n"
-" Please see 'hg help urls' for important details about ssh:// URLs.\n"
-"\n"
-" For efficiency, hardlinks are used for cloning whenever the source\n"
-" and destination are on the same filesystem (note this applies only\n"
-" to the repository data, not to the checked out files). Some\n"
-" filesystems, such as AFS, implement hardlinking incorrectly, but\n"
-" do not report errors. In these cases, use the --pull option to\n"
-" avoid hardlinking.\n"
-"\n"
-" In some cases, you can clone repositories and checked out files\n"
-" using full hardlinks with\n"
-"\n"
-" $ cp -al REPO REPOCLONE\n"
-"\n"
-" This is the fastest way to clone, but it is not always safe. The\n"
-" operation is not atomic (making sure REPO is not modified during\n"
-" the operation is up to you) and you have to make sure your editor\n"
-" breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
-" this is not compatible with certain extensions that place their\n"
-" metadata under the .hg directory, such as mq.\n"
-"\n"
-" "
-
-#, fuzzy
+" Please see :hg:`help urls` for important details about ``ssh://`` URLs."
+msgstr ""
+
+msgid ""
+" A set of changesets (tags, or branch names) to pull may be specified\n"
+" by listing each changeset (tag, or branch name) with -r/--rev.\n"
+" If -r/--rev is used, the cloned repository will contain only a subset\n"
+" of the changesets of the source repository. Only the set of changesets\n"
+" defined by all -r/--rev options (including all their ancestors)\n"
+" will be pulled into the destination repository.\n"
+" No subsequent changesets (including subsequent tags) will be present\n"
+" in the destination."
+msgstr ""
+
+msgid ""
+" Using -r/--rev (or 'clone src#rev dest') implies --pull, even for\n"
+" local source repositories."
+msgstr ""
+
msgid ""
" For efficiency, hardlinks are used for cloning whenever the source\n"
" and destination are on the same filesystem (note this applies only\n"
-" to the repository data, not to the checked out files). Some\n"
+" to the repository data, not to the working directory). Some\n"
" filesystems, such as AFS, implement hardlinking incorrectly, but\n"
" do not report errors. In these cases, use the --pull option to\n"
" avoid hardlinking."
msgstr ""
-"å°å·²å˜åœ¨çš„ repository 複製一份\n"
-"\n"
-" Create a copy of an existing repository in a new directory.\n"
-"\n"
-" If no destination directory name is specified, it defaults to the\n"
-" basename of the source.\n"
-"\n"
-" The location of the source is added to the new repository's\n"
-" .hg/hgrc file, as the default to be used for future pulls.\n"
-"\n"
-" If you use the -r/--rev option to clone up to a specific revision,\n"
-" no subsequent revisions (including subsequent tags) will be\n"
-" present in the cloned repository. This option implies --pull, even\n"
-" on local repositories.\n"
-"\n"
-" By default, clone will check out the head of the 'default' branch.\n"
-" If the -U/--noupdate option is used, the new clone will contain\n"
-" only a repository (.hg) and no working copy (the working copy\n"
-" parent is the null revision).\n"
-"\n"
-" See 'hg help urls' for valid source format details.\n"
-"\n"
-" It is possible to specify an ssh:// URL as the destination, but no\n"
-" .hg/hgrc and working directory will be created on the remote side.\n"
-" Please see 'hg help urls' for important details about ssh:// URLs.\n"
-"\n"
-" For efficiency, hardlinks are used for cloning whenever the source\n"
-" and destination are on the same filesystem (note this applies only\n"
-" to the repository data, not to the checked out files). Some\n"
-" filesystems, such as AFS, implement hardlinking incorrectly, but\n"
-" do not report errors. In these cases, use the --pull option to\n"
-" avoid hardlinking.\n"
-"\n"
-" In some cases, you can clone repositories and checked out files\n"
-" using full hardlinks with\n"
-"\n"
-" $ cp -al REPO REPOCLONE\n"
-"\n"
-" This is the fastest way to clone, but it is not always safe. The\n"
-" operation is not atomic (making sure REPO is not modified during\n"
-" the operation is up to you) and you have to make sure your editor\n"
-" breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
-" this is not compatible with certain extensions that place their\n"
-" metadata under the .hg directory, such as mq.\n"
-"\n"
-" "
-
-#, fuzzy
-msgid ""
-" In some cases, you can clone repositories and checked out files\n"
+
+msgid ""
+" In some cases, you can clone repositories and the working directory\n"
" using full hardlinks with ::"
msgstr ""
-"å°å·²å˜åœ¨çš„ repository 複製一份\n"
-"\n"
-" Create a copy of an existing repository in a new directory.\n"
-"\n"
-" If no destination directory name is specified, it defaults to the\n"
-" basename of the source.\n"
-"\n"
-" The location of the source is added to the new repository's\n"
-" .hg/hgrc file, as the default to be used for future pulls.\n"
-"\n"
-" If you use the -r/--rev option to clone up to a specific revision,\n"
-" no subsequent revisions (including subsequent tags) will be\n"
-" present in the cloned repository. This option implies --pull, even\n"
-" on local repositories.\n"
-"\n"
-" By default, clone will check out the head of the 'default' branch.\n"
-" If the -U/--noupdate option is used, the new clone will contain\n"
-" only a repository (.hg) and no working copy (the working copy\n"
-" parent is the null revision).\n"
-"\n"
-" See 'hg help urls' for valid source format details.\n"
-"\n"
-" It is possible to specify an ssh:// URL as the destination, but no\n"
-" .hg/hgrc and working directory will be created on the remote side.\n"
-" Please see 'hg help urls' for important details about ssh:// URLs.\n"
-"\n"
-" For efficiency, hardlinks are used for cloning whenever the source\n"
-" and destination are on the same filesystem (note this applies only\n"
-" to the repository data, not to the checked out files). Some\n"
-" filesystems, such as AFS, implement hardlinking incorrectly, but\n"
-" do not report errors. In these cases, use the --pull option to\n"
-" avoid hardlinking.\n"
-"\n"
-" In some cases, you can clone repositories and checked out files\n"
-" using full hardlinks with\n"
-"\n"
-" $ cp -al REPO REPOCLONE\n"
-"\n"
-" This is the fastest way to clone, but it is not always safe. The\n"
-" operation is not atomic (making sure REPO is not modified during\n"
-" the operation is up to you) and you have to make sure your editor\n"
-" breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
-" this is not compatible with certain extensions that place their\n"
-" metadata under the .hg directory, such as mq.\n"
-"\n"
-" "
-
-#, fuzzy
+
msgid " $ cp -al REPO REPOCLONE"
msgstr ""
-"å°å·²å˜åœ¨çš„ repository 複製一份\n"
-"\n"
-" Create a copy of an existing repository in a new directory.\n"
-"\n"
-" If no destination directory name is specified, it defaults to the\n"
-" basename of the source.\n"
-"\n"
-" The location of the source is added to the new repository's\n"
-" .hg/hgrc file, as the default to be used for future pulls.\n"
-"\n"
-" If you use the -r/--rev option to clone up to a specific revision,\n"
-" no subsequent revisions (including subsequent tags) will be\n"
-" present in the cloned repository. This option implies --pull, even\n"
-" on local repositories.\n"
-"\n"
-" By default, clone will check out the head of the 'default' branch.\n"
-" If the -U/--noupdate option is used, the new clone will contain\n"
-" only a repository (.hg) and no working copy (the working copy\n"
-" parent is the null revision).\n"
-"\n"
-" See 'hg help urls' for valid source format details.\n"
-"\n"
-" It is possible to specify an ssh:// URL as the destination, but no\n"
-" .hg/hgrc and working directory will be created on the remote side.\n"
-" Please see 'hg help urls' for important details about ssh:// URLs.\n"
-"\n"
-" For efficiency, hardlinks are used for cloning whenever the source\n"
-" and destination are on the same filesystem (note this applies only\n"
-" to the repository data, not to the checked out files). Some\n"
-" filesystems, such as AFS, implement hardlinking incorrectly, but\n"
-" do not report errors. In these cases, use the --pull option to\n"
-" avoid hardlinking.\n"
-"\n"
-" In some cases, you can clone repositories and checked out files\n"
-" using full hardlinks with\n"
-"\n"
-" $ cp -al REPO REPOCLONE\n"
-"\n"
-" This is the fastest way to clone, but it is not always safe. The\n"
-" operation is not atomic (making sure REPO is not modified during\n"
-" the operation is up to you) and you have to make sure your editor\n"
-" breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
-" this is not compatible with certain extensions that place their\n"
-" metadata under the .hg directory, such as mq.\n"
-"\n"
-" "
-
-#, fuzzy
+
msgid ""
" This is the fastest way to clone, but it is not always safe. The\n"
" operation is not atomic (making sure REPO is not modified during\n"
" the operation is up to you) and you have to make sure your editor\n"
" breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
" this is not compatible with certain extensions that place their\n"
-" metadata under the .hg directory, such as mq.\n"
-" "
-msgstr ""
-"å°å·²å˜åœ¨çš„ repository 複製一份\n"
-"\n"
-" Create a copy of an existing repository in a new directory.\n"
-"\n"
-" If no destination directory name is specified, it defaults to the\n"
-" basename of the source.\n"
-"\n"
-" The location of the source is added to the new repository's\n"
-" .hg/hgrc file, as the default to be used for future pulls.\n"
-"\n"
-" If you use the -r/--rev option to clone up to a specific revision,\n"
-" no subsequent revisions (including subsequent tags) will be\n"
-" present in the cloned repository. This option implies --pull, even\n"
-" on local repositories.\n"
-"\n"
-" By default, clone will check out the head of the 'default' branch.\n"
-" If the -U/--noupdate option is used, the new clone will contain\n"
-" only a repository (.hg) and no working copy (the working copy\n"
-" parent is the null revision).\n"
-"\n"
-" See 'hg help urls' for valid source format details.\n"
-"\n"
-" It is possible to specify an ssh:// URL as the destination, but no\n"
-" .hg/hgrc and working directory will be created on the remote side.\n"
-" Please see 'hg help urls' for important details about ssh:// URLs.\n"
-"\n"
-" For efficiency, hardlinks are used for cloning whenever the source\n"
-" and destination are on the same filesystem (note this applies only\n"
-" to the repository data, not to the checked out files). Some\n"
-" filesystems, such as AFS, implement hardlinking incorrectly, but\n"
-" do not report errors. In these cases, use the --pull option to\n"
-" avoid hardlinking.\n"
-"\n"
-" In some cases, you can clone repositories and checked out files\n"
-" using full hardlinks with\n"
-"\n"
-" $ cp -al REPO REPOCLONE\n"
-"\n"
-" This is the fastest way to clone, but it is not always safe. The\n"
-" operation is not atomic (making sure REPO is not modified during\n"
-" the operation is up to you) and you have to make sure your editor\n"
-" breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
-" this is not compatible with certain extensions that place their\n"
-" metadata under the .hg directory, such as mq.\n"
-"\n"
-" "
+" metadata under the .hg directory, such as mq."
+msgstr ""
+
+msgid ""
+" Mercurial will update the working directory to the first applicable\n"
+" revision from this list:"
+msgstr ""
+
+msgid ""
+" a) null if -U or the source repository has no changesets\n"
+" b) if -u . and the source repository is local, the first parent of\n"
+" the source repository's working directory\n"
+" c) the changeset specified with -u (if a branch name, this means the\n"
+" latest head of that branch)\n"
+" d) the changeset specified with -r\n"
+" e) the tipmost head specified with -b\n"
+" f) the tipmost head specified with the url#branch source syntax\n"
+" g) the tipmost head of the default branch\n"
+" h) tip"
+msgstr ""
+
+msgid "cannot specify both --noupdate and --updaterev"
+msgstr ""
msgid "commit the specified files or all outstanding changes"
msgstr "將指定的檔案或是目å‰çš„變更 commit"
msgid ""
" Commit changes to the given files into the repository. Unlike a\n"
-" centralized RCS, this operation is a local operation. See hg push\n"
-" for a way to actively distribute your changes."
-msgstr ""
-" Commit changes to the given files into the repository. Unlike a\n"
-" centralized RCS, this operation is a local operation. See hg push\n"
-" for a way to actively distribute your changes."
-
-msgid ""
-" If a list of files is omitted, all changes reported by \"hg status\"\n"
+" centralized RCS, this operation is a local operation. See\n"
+" :hg:`push` for a way to actively distribute your changes."
+msgstr ""
+
+msgid ""
+" If a list of files is omitted, all changes reported by :hg:`status`\n"
" will be committed."
msgstr ""
-" If a list of files is omitted, all changes reported by \"hg status\"\n"
-" will be committed."
msgid ""
" If you are committing the result of a merge, do not provide any\n"
" filenames or -I/-X filters."
msgstr ""
-" If you are committing the result of a merge, do not provide any\n"
-" filenames or -I/-X filters."
-
-msgid ""
-" If no commit message is specified, the configured editor is\n"
-" started to prompt you for a message."
-msgstr ""
-" If no commit message is specified, the configured editor is\n"
-" started to prompt you for a message."
+
+msgid ""
+" If no commit message is specified, Mercurial starts your\n"
+" configured editor where you can enter a message. In case your\n"
+" commit fails, you will find a backup of your message in\n"
+" ``.hg/last-message.txt``."
+msgstr ""
+
+msgid ""
+" Returns 0 on success, 1 if nothing changed.\n"
+" "
+msgstr ""
+
+msgid "can only close branch heads"
+msgstr ""
msgid "nothing changed\n"
msgstr ""
@@ -6648,6 +6489,10 @@
msgstr ""
#, python-format
+msgid "reopening closed branch head %d\n"
+msgstr ""
+
+#, python-format
msgid "committed changeset %d:%s\n"
msgstr ""
@@ -6659,40 +6504,96 @@
" directory, copies are put in that directory. If dest is a file,\n"
" the source must be a single file."
msgstr ""
-" Mark dest as having copies of source files. If dest is a\n"
-" directory, copies are put in that directory. If dest is a file,\n"
-" the source must be a single file."
msgid ""
" By default, this command copies the contents of files as they\n"
" exist in the working directory. If invoked with -A/--after, the\n"
" operation is recorded, but no copying is performed."
msgstr ""
-" By default, this command copies the contents of files as they\n"
-" exist in the working directory. If invoked with -A/--after, the\n"
-" operation is recorded, but no copying is performed."
msgid ""
" This command takes effect with the next commit. To undo a copy\n"
-" before that, see hg revert.\n"
+" before that, see :hg:`revert`."
+msgstr ""
+
+msgid ""
+" Returns 0 on success, 1 if errors are encountered.\n"
" "
msgstr ""
-" This command takes effect with the next commit. To undo a copy\n"
-" before that, see hg revert.\n"
-" "
msgid "find the ancestor revision of two revisions in a given index"
msgstr ""
-msgid "There is no Mercurial repository here (.hg not found)"
-msgstr ""
-
msgid "either two or three arguments required"
msgstr ""
+msgid "builds a repo with a given dag from scratch in the current empty repo"
+msgstr ""
+
+msgid " Elements:"
+msgstr ""
+
+msgid ""
+" - \"+n\" is a linear run of n nodes based on the current default "
+"parent\n"
+" - \".\" is a single node based on the current default parent\n"
+" - \"$\" resets the default parent to null (implied at the start);\n"
+" otherwise the default parent is always the last node created\n"
+" - \"<p\" sets the default parent to the backref p\n"
+" - \"*p\" is a fork at parent p, which is a backref\n"
+" - \"*p1/p2\" is a merge of parents p1 and p2, which are backrefs\n"
+" - \"/p2\" is a merge of the preceding node and p2\n"
+" - \":tag\" defines a local tag for the preceding node\n"
+" - \"@branch\" sets the named branch for subsequent nodes\n"
+" - \"!command\" runs the command using your shell\n"
+" - \"!!my command\\n\" is like \"!\", but to the end of the line\n"
+" - \"#...\\n\" is a comment up to the end of the line"
+msgstr ""
+
+msgid " Whitespace between the above elements is ignored."
+msgstr ""
+
+msgid " A backref is either"
+msgstr ""
+
+msgid ""
+" - a number n, which references the node curr-n, where curr is the "
+"current\n"
+" node, or\n"
+" - the name of a local tag you placed earlier using \":tag\", or\n"
+" - empty to denote the default parent."
+msgstr ""
+
+msgid ""
+" All string valued-elements are either strictly alphanumeric, or must\n"
+" be enclosed in double quotes (\"...\"), with \"\\\" as escape character."
+msgstr ""
+
+msgid ""
+" Note that the --overwritten-file and --appended-file options imply the\n"
+" use of \"HGMERGE=internal:local\" during DAG buildup.\n"
+" "
+msgstr ""
+
+msgid "need at least one of -m, -a, -o, -n"
+msgstr ""
+
+msgid "repository is not empty"
+msgstr "儲å˜åº«ä¸æ˜¯ç©ºç™½çš„"
+
+#, python-format
+msgid "%s command %s"
+msgstr "%s 命令 %s"
+
+msgid "list all available commands and options"
+msgstr ""
+
msgid "returns the completion list associated with the given command"
msgstr ""
+msgid "show information detected about current filesystem"
+msgstr ""
+
msgid "rebuild the dirstate as it would look like for the given revision"
msgstr ""
@@ -6722,41 +6623,51 @@
msgstr "顯示åˆä½µè‡ªæ‰€æœ‰ hgrc 檔案內容的è¨å®šå€¼"
msgid " With no arguments, print names and values of all config items."
-msgstr " With no arguments, print names and values of all config items."
+msgstr ""
msgid ""
" With one argument of the form section.name, print just the value\n"
" of that config item."
msgstr ""
-" With one argument of the form section.name, print just the value\n"
-" of that config item."
msgid ""
" With multiple arguments, print names and values of all config\n"
" items with matching section names."
msgstr ""
-" With multiple arguments, print names and values of all config\n"
-" items with matching section names."
msgid ""
" With --debug, the source (filename and line number) is printed\n"
-" for each config item.\n"
-" "
-msgstr ""
-" With --debug, the source (filename and line number) is printed\n"
-" for each config item.\n"
-" "
+" for each config item."
+msgstr ""
+
+#, python-format
+msgid "read config from: %s\n"
+msgstr ""
msgid "only one config item permitted"
msgstr ""
+msgid "access the pushkey key/value protocol"
+msgstr ""
+
+msgid " With two args, list the keys in the given namespace."
+msgstr ""
+
+msgid ""
+" With five args, set a key to new if it currently is set to old.\n"
+" Reports success or failure.\n"
+" "
+msgstr ""
+
+msgid "parse and apply a revision specification"
+msgstr ""
+
msgid "manually set the parents of the current working directory"
msgstr ""
msgid ""
" This is useful for writing repository conversion tools, but should\n"
-" be used with care.\n"
-" "
+" be used with care."
msgstr ""
msgid "show the contents of the current dirstate"
@@ -6766,6 +6677,22 @@
msgid "copy: %s -> %s\n"
msgstr ""
+msgid "format the changelog or an index DAG as a concise textual description"
+msgstr ""
+
+msgid ""
+" If you pass a revlog index, the revlog's DAG is emitted. If you list\n"
+" revision numbers, they get labelled in the output as rN."
+msgstr ""
+
+msgid ""
+" Otherwise, the changelog DAG of the current repo is emitted.\n"
+" "
+msgstr ""
+
+msgid "need repo for changelog dag"
+msgstr ""
+
msgid "dump the contents of a data file revision"
msgstr ""
@@ -6792,8 +6719,9 @@
msgid " (check that your locale is properly set)\n"
msgstr ""
-msgid "Checking extensions...\n"
-msgstr ""
+#, python-format
+msgid "Checking installed modules (%s)...\n"
+msgstr "æ£åœ¨æª¢æŸ¥å®‰è£çš„模組 (%s)...\n"
msgid " One or more extensions could not be found"
msgstr ""
@@ -6817,183 +6745,152 @@
msgstr ""
msgid " patch test failed!\n"
-msgstr ""
-
-msgid " (Current patch tool may be incompatible with patch, or misconfigured. Please check your .hgrc file)\n"
-msgstr ""
-
-msgid " Internal patcher failure, please report this error to http://mercurial.selenic.com/bts/\n"
+msgstr "路徑測試失敗!\n"
+
+msgid ""
+" (Current patch tool may be incompatible with patch, or misconfigured. "
+"Please check your configuration file)\n"
+msgstr ""
+
+msgid ""
+" Internal patcher failure, please report this error to http://mercurial."
+"selenic.com/wiki/BugTracker\n"
msgstr ""
msgid "Checking commit editor...\n"
-msgstr ""
+msgstr "檢查æ交訊æ¯ç·¨è¼¯å™¨...\n"
msgid " No commit editor set and can't find vi in PATH\n"
-msgstr ""
-
-msgid " (specify a commit editor in your .hgrc file)\n"
-msgstr ""
+msgstr "沒有è¨å®šæ交訊æ¯ç·¨è¼¯å™¨,然後在PATHä¸ä¹Ÿæ²’有vi\n"
+
+msgid " (specify a commit editor in your configuration file)\n"
+msgstr "(åœ¨ä½ çš„è¨å®šæª”指明一個用來編輯æ交訊æ¯çš„編輯器)\n"
#, python-format
msgid " Can't find editor '%s' in PATH\n"
-msgstr ""
+msgstr "在PATHä¸æ‰¾ä¸åˆ°ç·¨è¼¯å™¨ '%s'\n"
msgid "Checking username...\n"
-msgstr ""
-
-msgid " (specify a username in your .hgrc file)\n"
-msgstr ""
+msgstr "檢查使用者å稱...\n"
+
+msgid " (specify a username in your configuration file)\n"
+msgstr "(åœ¨ä½ çš„è¨å®šæª”指明一個使用者å稱)\n"
msgid "No problems detected\n"
-msgstr ""
+msgstr "查ä¸åˆ°å•é¡Œ\n"
#, python-format
msgid "%s problems detected, please check your install!\n"
-msgstr ""
+msgstr "查到%så•é¡Œ,è«‹æª¢æŸ¥ä½ çš„å®‰è£!\n"
msgid "dump rename information"
-msgstr ""
+msgstr "倒出改å資訊"
#, python-format
msgid "%s renamed from %s:%s\n"
-msgstr ""
+msgstr "%s 改åå—從%s:%s\n"
#, python-format
msgid "%s not renamed\n"
-msgstr ""
+msgstr "%s 沒有被改å\n"
msgid "show how files match on given patterns"
msgstr ""
msgid "diff repository (or selected files)"
-msgstr "diff repository (或是所é¸æ“‡çš„檔案)"
+msgstr "diff 儲å˜åº« (或是所é¸æ“‡çš„檔案)"
msgid " Show differences between revisions for the specified files."
-msgstr " Show differences between revisions for the specified files."
+msgstr ""
msgid " Differences between files are shown using the unified diff format."
-msgstr " Differences between files are shown using the unified diff format."
-
-msgid ""
-" NOTE: diff may generate unexpected results for merges, as it will\n"
-" default to comparing against the working directory's first parent\n"
-" changeset if no revisions are specified."
-msgstr ""
-" NOTE: diff may generate unexpected results for merges, as it will\n"
-" default to comparing against the working directory's first parent\n"
-" changeset if no revisions are specified."
+msgstr ""
+
+msgid ""
+" .. note::\n"
+" diff may generate unexpected results for merges, as it will\n"
+" default to comparing against the working directory's first\n"
+" parent changeset if no revisions are specified."
+msgstr ""
+
+msgid ""
+" Alternatively you can specify -c/--change with a revision to see\n"
+" the changes in that changeset relative to its first parent."
+msgstr ""
msgid ""
" Without the -a/--text option, diff will avoid generating diffs of\n"
" files it detects as binary. With -a, diff will generate a diff\n"
" anyway, probably with undesirable results."
msgstr ""
-" Without the -a/--text option, diff will avoid generating diffs of\n"
-" files it detects as binary. With -a, diff will generate a diff\n"
-" anyway, probably with undesirable results."
msgid ""
" Use the -g/--git option to generate diffs in the git extended diff\n"
-" format. For more information, read 'hg help diffs'.\n"
-" "
-msgstr ""
-" Use the -g/--git option to generate diffs in the git extended diff\n"
-" format. For more information, read 'hg help diffs'.\n"
-" "
-
-#, fuzzy
+" format. For more information, read :hg:`help diffs`."
+msgstr ""
+
msgid "dump the header and diffs for one or more changesets"
msgstr "將一或多個 changesets çš„ header ä»¥åŠ diffs dump 出來"
-#, fuzzy
msgid " Print the changeset header and diffs for one or more revisions."
-msgstr " Print the changeset header and diffs for one or more revisions."
-
-#, fuzzy
-msgid ""
-" The information shown in the changeset header is: author,\n"
-" changeset hash, parent(s) and commit comment."
-msgstr ""
-" The information shown in the changeset header is: author,\n"
-" changeset hash, parent(s) and commit comment."
-
-#, fuzzy
-msgid ""
-" NOTE: export may generate unexpected diff output for merge\n"
-" changesets, as it will compare the merge changeset against its\n"
-" first parent only."
-msgstr ""
-" NOTE: export may generate unexpected diff output for merge\n"
-" changesets, as it will compare the merge changeset against its\n"
-" first parent only."
-
-#, fuzzy
+msgstr ""
+
+msgid ""
+" The information shown in the changeset header is: author, date,\n"
+" branch name (if non-default), changeset hash, parent(s) and commit\n"
+" comment."
+msgstr ""
+
+msgid ""
+" .. note::\n"
+" export may generate unexpected diff output for merge\n"
+" changesets, as it will compare the merge changeset against its\n"
+" first parent only."
+msgstr ""
+
msgid ""
" Output may be to a file, in which case the name of the file is\n"
-" given using a format string. The formatting rules are as follows::"
-msgstr ""
-" Output may be to a file, in which case the name of the file is\n"
" given using a format string. The formatting rules are as follows:"
-
-#, fuzzy
-msgid ""
-" %% literal \"%\" character\n"
-" %H changeset hash (40 bytes of hexadecimal)\n"
-" %N number of patches being generated\n"
-" %R changeset revision number\n"
-" %b basename of the exporting repository\n"
-" %h short-form changeset hash (12 bytes of hexadecimal)\n"
-" %n zero-padded sequence number, starting at 1\n"
-" %r zero-padded changeset revision number"
-msgstr ""
-" %% literal \"%\" character\n"
-" %H changeset hash (40 bytes of hexadecimal)\n"
-" %N number of patches being generated\n"
-" %R changeset revision number\n"
-" %b basename of the exporting repository\n"
-" %h short-form changeset hash (12 bytes of hexadecimal)\n"
-" %n zero-padded sequence number, starting at 1\n"
-" %r zero-padded changeset revision number"
-
-#, fuzzy
+msgstr ""
+
+msgid ""
+" :``%%``: literal \"%\" character\n"
+" :``%H``: changeset hash (40 hexadecimal digits)\n"
+" :``%N``: number of patches being generated\n"
+" :``%R``: changeset revision number\n"
+" :``%b``: basename of the exporting repository\n"
+" :``%h``: short-form changeset hash (12 hexadecimal digits)\n"
+" :``%n``: zero-padded sequence number, starting at 1\n"
+" :``%r``: zero-padded changeset revision number"
+msgstr ""
+
msgid ""
" Without the -a/--text option, export will avoid generating diffs\n"
" of files it detects as binary. With -a, export will generate a\n"
" diff anyway, probably with undesirable results."
msgstr ""
-" Without the -a/--text option, export will avoid generating diffs\n"
-" of files it detects as binary. With -a, export will generate a\n"
-" diff anyway, probably with undesirable results."
-
-#, fuzzy
+
msgid ""
" Use the -g/--git option to generate diffs in the git extended diff\n"
-" format. See 'hg help diffs' for more information."
-msgstr ""
-" Use the -g/--git option to generate diffs in the git extended diff\n"
-" format. See 'hg help diffs' for more information."
-
-#, fuzzy
+" format. See :hg:`help diffs` for more information."
+msgstr ""
+
msgid ""
" With the --switch-parent option, the diff will be against the\n"
-" second parent. It can be useful to review a merge.\n"
-" "
-msgstr ""
-" With the --switch-parent option, the diff will be against the\n"
-" second parent. It can be useful to review a merge.\n"
-" "
+" second parent. It can be useful to review a merge."
+msgstr ""
msgid "export requires at least one changeset"
msgstr ""
msgid "exporting patches:\n"
-msgstr ""
+msgstr "匯出路徑(s):\n"
msgid "exporting patch:\n"
-msgstr ""
+msgstr "匯出路徑:\n"
msgid "forget the specified files on the next commit"
-msgstr ""
+msgstr "下次æ交時忘記指定的檔案"
msgid ""
" Mark the specified files so they will no longer be tracked\n"
@@ -7006,9 +6903,7 @@
" working directory."
msgstr ""
-msgid ""
-" To undo a forget before the next commit, see hg add.\n"
-" "
+msgid " To undo a forget before the next commit, see :hg:`add`."
msgstr ""
msgid "no files specified"
@@ -7019,10 +6914,10 @@
msgstr ""
msgid "search for a pattern in specified files and revisions"
-msgstr "從指定的檔案或 revisions æœå°‹æ¨£å¼"
+msgstr "從指定的檔案或修定版æœå°‹æ¨£å¼"
msgid " Search revisions of files for a regular expression."
-msgstr " Search revisions of files for a regular expression."
+msgstr ""
msgid ""
" This command behaves differently than Unix grep. It only accepts\n"
@@ -7030,257 +6925,96 @@
" working directory. It always prints the revision number in which a\n"
" match appears."
msgstr ""
-" This command behaves differently than Unix grep. It only accepts\n"
-" Python/Perl regexps. It searches repository history, not the\n"
-" working directory. It always prints the revision number in which a\n"
-" match appears."
msgid ""
" By default, grep only prints output for the first revision of a\n"
" file in which it finds a match. To get it to print every revision\n"
" that contains a change in match status (\"-\" for a match that\n"
" becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
-" use the --all flag.\n"
+" use the --all flag."
+msgstr ""
+
+msgid ""
+" Returns 0 if a match is found, 1 otherwise.\n"
" "
msgstr ""
-" By default, grep only prints output for the first revision of a\n"
-" file in which it finds a match. To get it to print every revision\n"
-" that contains a change in match status (\"-\" for a match that\n"
-" becomes a non-match, or \"+\" for a non-match that becomes a match),\n"
-" use the --all flag.\n"
-" "
#, python-format
msgid "grep: invalid match pattern: %s\n"
msgstr ""
-#, fuzzy
msgid "show current repository heads or show branch heads"
-msgstr ""
-"顯示目å‰çš„ repository heads 或是 branch heads\n"
-"\n"
-" With no arguments, show all repository head changesets.\n"
-"\n"
-" Repository \"heads\" are changesets that don't have child\n"
-" changesets. They are where development generally takes place and\n"
-" are the usual targets for update and merge operations.\n"
-"\n"
-" If one or more REV is given, the \"branch heads\" will be shown for\n"
-" the named branch associated with that revision. The name of the\n"
-" branch is called the revision's branch tag.\n"
-"\n"
-" Branch heads are revisions on a given named branch that do not have\n"
-" any children on the same branch. A branch head could be a true head\n"
-" or it could be the last changeset on a branch before a new branch\n"
-" was created. If none of the branch heads are true heads, the branch\n"
-" is considered inactive.\n"
-"\n"
-" If STARTREV is specified only those heads (or branch heads) that\n"
-" are descendants of STARTREV will be displayed.\n"
-" "
-
-#, fuzzy
-msgid " With no arguments, show all repository head changesets."
-msgstr ""
-"顯示目å‰çš„ repository heads 或是 branch heads\n"
-"\n"
-" With no arguments, show all repository head changesets.\n"
-"\n"
-" Repository \"heads\" are changesets that don't have child\n"
-" changesets. They are where development generally takes place and\n"
-" are the usual targets for update and merge operations.\n"
-"\n"
-" If one or more REV is given, the \"branch heads\" will be shown for\n"
-" the named branch associated with that revision. The name of the\n"
-" branch is called the revision's branch tag.\n"
-"\n"
-" Branch heads are revisions on a given named branch that do not have\n"
-" any children on the same branch. A branch head could be a true head\n"
-" or it could be the last changeset on a branch before a new branch\n"
-" was created. If none of the branch heads are true heads, the branch\n"
-" is considered inactive.\n"
-"\n"
-" If STARTREV is specified only those heads (or branch heads) that\n"
-" are descendants of STARTREV will be displayed.\n"
-" "
-
-#, fuzzy
+msgstr "顯示目å‰çš„ repository heads 或是 branch heads"
+
+msgid " With no arguments, show all repository branch heads."
+msgstr ""
+
msgid ""
" Repository \"heads\" are changesets with no child changesets. They are\n"
" where development generally takes place and are the usual targets\n"
-" for update and merge operations."
-msgstr ""
-"顯示目å‰çš„ repository heads 或是 branch heads\n"
-"\n"
-" With no arguments, show all repository head changesets.\n"
-"\n"
-" Repository \"heads\" are changesets that don't have child\n"
-" changesets. They are where development generally takes place and\n"
-" are the usual targets for update and merge operations.\n"
-"\n"
-" If one or more REV is given, the \"branch heads\" will be shown for\n"
-" the named branch associated with that revision. The name of the\n"
-" branch is called the revision's branch tag.\n"
-"\n"
-" Branch heads are revisions on a given named branch that do not have\n"
-" any children on the same branch. A branch head could be a true head\n"
-" or it could be the last changeset on a branch before a new branch\n"
-" was created. If none of the branch heads are true heads, the branch\n"
-" is considered inactive.\n"
-"\n"
-" If STARTREV is specified only those heads (or branch heads) that\n"
-" are descendants of STARTREV will be displayed.\n"
-" "
-
-#, fuzzy
-msgid ""
-" If one or more REV is given, the \"branch heads\" will be shown for\n"
-" the named branch associated with the specified changeset(s)."
-msgstr ""
-"顯示目å‰çš„ repository heads 或是 branch heads\n"
-"\n"
-" With no arguments, show all repository head changesets.\n"
-"\n"
-" Repository \"heads\" are changesets that don't have child\n"
-" changesets. They are where development generally takes place and\n"
-" are the usual targets for update and merge operations.\n"
-"\n"
-" If one or more REV is given, the \"branch heads\" will be shown for\n"
-" the named branch associated with that revision. The name of the\n"
-" branch is called the revision's branch tag.\n"
-"\n"
-" Branch heads are revisions on a given named branch that do not have\n"
-" any children on the same branch. A branch head could be a true head\n"
-" or it could be the last changeset on a branch before a new branch\n"
-" was created. If none of the branch heads are true heads, the branch\n"
-" is considered inactive.\n"
-"\n"
-" If STARTREV is specified only those heads (or branch heads) that\n"
-" are descendants of STARTREV will be displayed.\n"
-" "
-
-#, fuzzy
-msgid ""
-" Branch heads are changesets on a named branch with no descendants on\n"
-" the same branch. A branch head could be a \"true\" (repository) head,\n"
-" or it could be the last changeset on that branch before it was\n"
-" merged into another branch, or it could be the last changeset on the\n"
-" branch before a new branch was created. If none of the branch heads\n"
-" are true heads, the branch is considered inactive."
-msgstr ""
-"顯示目å‰çš„ repository heads 或是 branch heads\n"
-"\n"
-" With no arguments, show all repository head changesets.\n"
-"\n"
-" Repository \"heads\" are changesets that don't have child\n"
-" changesets. They are where development generally takes place and\n"
-" are the usual targets for update and merge operations.\n"
-"\n"
-" If one or more REV is given, the \"branch heads\" will be shown for\n"
-" the named branch associated with that revision. The name of the\n"
-" branch is called the revision's branch tag.\n"
-"\n"
-" Branch heads are revisions on a given named branch that do not have\n"
-" any children on the same branch. A branch head could be a true head\n"
-" or it could be the last changeset on a branch before a new branch\n"
-" was created. If none of the branch heads are true heads, the branch\n"
-" is considered inactive.\n"
-"\n"
-" If STARTREV is specified only those heads (or branch heads) that\n"
-" are descendants of STARTREV will be displayed.\n"
-" "
-
-#, fuzzy
+" for update and merge operations. Branch heads are changesets that have\n"
+" no child changeset on the same branch."
+msgstr ""
+
+msgid ""
+" If one or more REVs are given, only branch heads on the branches\n"
+" associated with the specified changesets are shown."
+msgstr ""
+
msgid ""
" If -c/--closed is specified, also show branch heads marked closed\n"
-" (see hg commit --close-branch)."
-msgstr ""
-"顯示目å‰çš„ repository heads 或是 branch heads\n"
-"\n"
-" With no arguments, show all repository head changesets.\n"
-"\n"
-" Repository \"heads\" are changesets that don't have child\n"
-" changesets. They are where development generally takes place and\n"
-" are the usual targets for update and merge operations.\n"
-"\n"
-" If one or more REV is given, the \"branch heads\" will be shown for\n"
-" the named branch associated with that revision. The name of the\n"
-" branch is called the revision's branch tag.\n"
-"\n"
-" Branch heads are revisions on a given named branch that do not have\n"
-" any children on the same branch. A branch head could be a true head\n"
-" or it could be the last changeset on a branch before a new branch\n"
-" was created. If none of the branch heads are true heads, the branch\n"
-" is considered inactive.\n"
-"\n"
-" If STARTREV is specified only those heads (or branch heads) that\n"
-" are descendants of STARTREV will be displayed.\n"
-" "
-
-#, fuzzy
+" (see :hg:`commit --close-branch`)."
+msgstr ""
+
msgid ""
" If STARTREV is specified, only those heads that are descendants of\n"
-" STARTREV will be displayed.\n"
+" STARTREV will be displayed."
+msgstr ""
+
+msgid ""
+" If -t/--topo is specified, named branch mechanics will be ignored and "
+"only\n"
+" changesets without children will be shown."
+msgstr ""
+
+msgid ""
+" Returns 0 if matching heads are found, 1 if not.\n"
" "
msgstr ""
-"顯示目å‰çš„ repository heads 或是 branch heads\n"
-"\n"
-" With no arguments, show all repository head changesets.\n"
-"\n"
-" Repository \"heads\" are changesets that don't have child\n"
-" changesets. They are where development generally takes place and\n"
-" are the usual targets for update and merge operations.\n"
-"\n"
-" If one or more REV is given, the \"branch heads\" will be shown for\n"
-" the named branch associated with that revision. The name of the\n"
-" branch is called the revision's branch tag.\n"
-"\n"
-" Branch heads are revisions on a given named branch that do not have\n"
-" any children on the same branch. A branch head could be a true head\n"
-" or it could be the last changeset on a branch before a new branch\n"
-" was created. If none of the branch heads are true heads, the branch\n"
-" is considered inactive.\n"
-"\n"
-" If STARTREV is specified only those heads (or branch heads) that\n"
-" are descendants of STARTREV will be displayed.\n"
-" "
-
-msgid "you must specify a branch to use --closed"
-msgstr ""
-
-#, python-format
-msgid "no open branch heads on branch %s\n"
-msgstr ""
-
-#, python-format
-msgid "no changes on branch %s containing %s are reachable from %s\n"
-msgstr ""
-
-#, python-format
-msgid "no changes on branch %s are reachable from %s\n"
-msgstr ""
+
+#, python-format
+msgid "no open branch heads found on branches %s"
+msgstr ""
+
+#, python-format
+msgid " (started at %s)"
+msgstr "(開始在: %s)"
msgid "show help for a given topic or a help overview"
msgstr "顯示特定主題的 help 說明或是 help overview"
-msgid " With no arguments, print a list of commands with short help messages."
-msgstr " With no arguments, print a list of commands with short help messages."
+msgid ""
+" With no arguments, print a list of commands with short help messages."
+msgstr ""
msgid ""
" Given a topic, extension, or command name, print help for that\n"
" topic."
msgstr ""
-" Given a topic, extension, or command name, print help for that\n"
-" topic."
+
+msgid ""
+" Returns 0 if successful.\n"
+" "
+msgstr ""
msgid "global options:"
msgstr "全域é¸é …:"
msgid "use \"hg help\" for the full list of commands"
-msgstr ""
+msgstr "使用 'hg help' 列出全部的命令"
msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details"
-msgstr ""
+msgstr "使用 'hg help' 列出全部的命令或 'hg -v'列出詳細資料"
#, python-format
msgid "use \"hg -v help%s\" to show aliases and global options"
@@ -7304,25 +7038,49 @@
msgid "(no help text available)"
msgstr "(沒有å¯ç”¨çš„說明文å—)"
+#, python-format
+msgid "shell alias for::"
+msgstr ""
+
+#, python-format
+msgid " %s"
+msgstr ""
+
+#, python-format
+msgid "alias for: hg %s"
+msgstr "別å: hg %s"
+
+#, python-format
+msgid "%s"
+msgstr ""
+
+#, python-format
+msgid ""
+"\n"
+"use \"hg -v help %s\" to show verbose help\n"
+msgstr ""
+"\n"
+"使用 \"hg -v help %s\" 以顯示全域é¸é …\n"
+
msgid "options:\n"
msgstr "é¸é …:\n"
msgid "no commands defined\n"
msgstr "沒有定義的命令\n"
-#, fuzzy
-msgid "enabled extensions:"
-msgstr ""
-"\n"
-"已啟用的擴充套件:\n"
-"\n"
-
msgid "no help text available"
msgstr "沒有å¯ç”¨çš„說明文å—"
-#, fuzzy, python-format
+#, python-format
msgid "%s extension - %s"
-msgstr "%s 擴充套件 - %s\n"
+msgstr "%s 擴充套件 - %s"
+
+msgid "use \"hg help extensions\" for information on enabling extensions\n"
+msgstr ""
+
+#, python-format
+msgid "'%s' is provided by the following extension:"
+msgstr ""
msgid "Mercurial Distributed SCM\n"
msgstr "Mercurial 分散å¼ç‰ˆæœ¬æŽ§åˆ¶ç³»çµ±\n"
@@ -7330,6 +7088,22 @@
msgid "basic commands:"
msgstr "基本命令:"
+msgid "enabled extensions:"
+msgstr "已啟用的擴充套件:"
+
+msgid "VALUE"
+msgstr ""
+
+msgid "DEPRECATED"
+msgstr ""
+
+msgid ""
+"\n"
+"[+] marked option can be specified multiple times"
+msgstr ""
+"\n"
+"有標記 [+] çš„åƒæ•¸,å¯ä»¥è¡¨è¿°å¤šæ¬¡"
+
msgid ""
"\n"
"additional help topics:"
@@ -7338,52 +7112,38 @@
"é¡å¤–的說明主題:"
msgid "identify the working copy or specified revision"
-msgstr "è˜åˆ¥ working copy 或指定的 revision 完整性"
+msgstr "è˜åˆ¥å·¥ä½œå‰¯æœ¬æˆ–æ述的修定版"
msgid ""
" With no revision, print a summary of the current state of the\n"
" repository."
msgstr ""
-" With no revision, print a summary of the current state of the\n"
-" repository."
msgid ""
" Specifying a path to a repository root or Mercurial bundle will\n"
" cause lookup to operate on that repository/bundle."
msgstr ""
-" Specifying a path to a repository root or Mercurial bundle will\n"
-" cause lookup to operate on that repository/bundle."
msgid ""
" This summary identifies the repository state using one or two\n"
" parent hash identifiers, followed by a \"+\" if there are\n"
" uncommitted changes in the working directory, a list of tags for\n"
-" this revision and a branch name for non-default branches.\n"
-" "
-msgstr ""
-" This summary identifies the repository state using one or two\n"
-" parent hash identifiers, followed by a \"+\" if there are\n"
-" uncommitted changes in the working directory, a list of tags for\n"
-" this revision and a branch name for non-default branches.\n"
-" "
-
-#, fuzzy
+" this revision and a branch name for non-default branches."
+msgstr ""
+
msgid "import an ordered set of patches"
msgstr "import ä¸€çµ„æœ‰é †åºçš„ patches"
-#, fuzzy
-msgid " Import a list of patches and commit them individually."
-msgstr " Import a list of patches and commit them individually."
-
-#, fuzzy
+msgid ""
+" Import a list of patches and commit them individually (unless\n"
+" --no-commit is specified)."
+msgstr ""
+
msgid ""
" If there are outstanding changes in the working directory, import\n"
" will abort unless given the -f/--force flag."
msgstr ""
-" If there are outstanding changes in the working directory, import\n"
-" will abort unless given the -f/--force flag."
-
-#, fuzzy
+
msgid ""
" You can import a patch straight from a mail message. Even patches\n"
" as attachments work (to use the body part, it must have type\n"
@@ -7392,26 +7152,14 @@
" text/plain body parts before first diff are added to commit\n"
" message."
msgstr ""
-" You can import a patch straight from a mail message. Even patches\n"
-" as attachments work (to use the body part, it must have type\n"
-" text/plain or text/x-patch). From and Subject headers of email\n"
-" message are used as default committer and commit message. All\n"
-" text/plain body parts before first diff are added to commit\n"
-" message."
-
-#, fuzzy
-msgid ""
-" If the imported patch was generated by hg export, user and\n"
+
+msgid ""
+" If the imported patch was generated by :hg:`export`, user and\n"
" description from patch override values from message headers and\n"
" body. Values given on command line with -m/--message and -u/--user\n"
" override these."
msgstr ""
-" If the imported patch was generated by hg export, user and\n"
-" description from patch override values from message headers and\n"
-" body. Values given on command line with -m/--message and -u/--user\n"
-" override these."
-
-#, fuzzy
+
msgid ""
" If --exact is specified, import will set the working directory to\n"
" the parent of each patch before applying it, and will abort if the\n"
@@ -7419,36 +7167,20 @@
" the patch. This may happen due to character set problems or other\n"
" deficiencies in the text patch format."
msgstr ""
-" If --exact is specified, import will set the working directory to\n"
-" the parent of each patch before applying it, and will abort if the\n"
-" resulting changeset has a different ID than the one recorded in\n"
-" the patch. This may happen due to character set problems or other\n"
-" deficiencies in the text patch format."
-
-#, fuzzy
+
msgid ""
" With -s/--similarity, hg will attempt to discover renames and\n"
" copies in the patch in the same way as 'addremove'."
msgstr ""
-" With -s/--similarity, hg will attempt to discover renames and\n"
-" copies in the patch in the same way as 'addremove'."
-
-#, fuzzy
+
msgid ""
" To read a patch from standard input, use \"-\" as the patch name. If\n"
" a URL is specified, the patch will be downloaded from it.\n"
-" See 'hg help dates' for a list of formats valid for -d/--date.\n"
-" "
-msgstr ""
-" To read a patch from standard input, use \"-\" as the patch name.\n"
-" See 'hg help dates' for a list of formats valid for -d/--date.\n"
-" "
-
-msgid "applying patch from stdin\n"
-msgstr ""
-
-msgid "no diffs found"
-msgstr ""
+" See :hg:`help dates` for a list of formats valid for -d/--date."
+msgstr ""
+
+msgid "to working directory"
+msgstr "到工作目錄"
msgid "not a Mercurial patch"
msgstr ""
@@ -7456,6 +7188,16 @@
msgid "patch is damaged or loses information"
msgstr ""
+msgid "applying patch from stdin\n"
+msgstr ""
+
+#, python-format
+msgid "applied %s\n"
+msgstr ""
+
+msgid "no diffs found"
+msgstr ""
+
msgid "show new changesets found in source"
msgstr "顯示來æºç«¯æ–°çš„ changesets"
@@ -7464,23 +7206,22 @@
" pull location. These are the changesets that would have been pulled\n"
" if a pull at the time you issued this command."
msgstr ""
-" Show new changesets found in the specified path/URL or the default\n"
-" pull location. These are the changesets that would have been pulled\n"
-" if a pull at the time you issued this command."
msgid ""
" For remote repository, using --bundle avoids downloading the\n"
" changesets twice if the incoming is followed by a pull."
msgstr ""
-" For remote repository, using --bundle avoids downloading the\n"
-" changesets twice if the incoming is followed by a pull."
-
-msgid ""
-" See pull for valid source format details.\n"
+
+msgid " See pull for valid source format details."
+msgstr ""
+
+msgid ""
+" Returns 0 if there are incoming changes, 1 otherwise.\n"
" "
msgstr ""
-" See pull for valid source format details.\n"
-" "
+
+msgid "cannot combine --bundle and --subrepos"
+msgstr ""
msgid "create a new repository in the given directory"
msgstr "於指定的目錄建立新的 repository"
@@ -7489,20 +7230,14 @@
" Initialize a new repository in the given directory. If the given\n"
" directory does not exist, it will be created."
msgstr ""
-" Initialize a new repository in the given directory. If the given\n"
-" directory does not exist, it will be created."
msgid " If no directory is given, the current directory is used."
-msgstr " If no directory is given, the current directory is used."
-
-msgid ""
-" It is possible to specify an ssh:// URL as the destination.\n"
-" See 'hg help urls' for more information.\n"
-" "
-msgstr ""
-" It is possible to specify an ssh:// URL as the destination.\n"
-" See 'hg help urls' for more information.\n"
-" "
+msgstr ""
+
+msgid ""
+" It is possible to specify an ``ssh://`` URL as the destination.\n"
+" See :hg:`help urls` for more information."
+msgstr ""
msgid "locate files matching specific patterns"
msgstr "找出符åˆæŒ‡å®šæ¨£å¼çš„檔案"
@@ -7511,47 +7246,32 @@
" Print files under Mercurial control in the working directory whose\n"
" names match the given patterns."
msgstr ""
-" Print files under Mercurial control in the working directory whose\n"
-" names match the given patterns."
msgid ""
" By default, this command searches all directories in the working\n"
" directory. To search just the current directory and its\n"
" subdirectories, use \"--include .\"."
msgstr ""
-" By default, this command searches all directories in the working\n"
-" directory. To search just the current directory and its\n"
-" subdirectories, use \"--include .\"."
msgid ""
" If no patterns are given to match, this command prints the names\n"
" of all files under Mercurial control in the working directory."
msgstr ""
-" If no patterns are given to match, this command prints the names\n"
-" of all files under Mercurial control in the working directory."
msgid ""
" If you want to feed the output of this command into the \"xargs\"\n"
" command, use the -0 option to both this command and \"xargs\". This\n"
" will avoid the problem of \"xargs\" treating single filenames that\n"
-" contain whitespace as multiple filenames.\n"
-" "
-msgstr ""
-" If you want to feed the output of this command into the \"xargs\"\n"
-" command, use the -0 option to both this command and \"xargs\". This\n"
-" will avoid the problem of \"xargs\" treating single filenames that\n"
-" contain whitespace as multiple filenames.\n"
-" "
+" contain whitespace as multiple filenames."
+msgstr ""
msgid "show revision history of entire repository or files"
-msgstr "顯示整個 repository 或特定檔案的 revision history"
+msgstr ""
msgid ""
" Print the revision history of the specified files or the entire\n"
" project."
msgstr ""
-" Print the revision history of the specified files or the entire\n"
-" project."
msgid ""
" File history is shown without following rename or copy history of\n"
@@ -7560,20 +7280,13 @@
" ancestors or descendants of the starting revision. --follow-first\n"
" only follows the first parent of merge revisions."
msgstr ""
-" File history is shown without following rename or copy history of\n"
-" files. Use -f/--follow with a filename to follow history across\n"
-" renames and copies. --follow without a filename will only show\n"
-" ancestors or descendants of the starting revision. --follow-first\n"
-" only follows the first parent of merge revisions."
-
-msgid ""
-" If no revision range is specified, the default is tip:0 unless\n"
+
+msgid ""
+" If no revision range is specified, the default is ``tip:0`` unless\n"
" --follow is set, in which case the working directory parent is\n"
-" used as the starting revision."
-msgstr ""
-" If no revision range is specified, the default is tip:0 unless\n"
-" --follow is set, in which case the working directory parent is\n"
-" used as the starting revision."
+" used as the starting revision. You can specify a revision set for\n"
+" log, see :hg:`help revsets` for more information."
+msgstr ""
msgid ""
" By default this command prints revision number and changeset id,\n"
@@ -7581,54 +7294,36 @@
" each commit. When the -v/--verbose switch is used, the list of\n"
" changed files and full commit message are shown."
msgstr ""
-" By default this command prints revision number and changeset id,\n"
-" tags, non-trivial parents, user, date and time, and a summary for\n"
-" each commit. When the -v/--verbose switch is used, the list of\n"
-" changed files and full commit message are shown."
-
-msgid ""
-" NOTE: log -p/--patch may generate unexpected diff output for merge\n"
-" changesets, as it will only compare the merge changeset against\n"
-" its first parent. Also, only files different from BOTH parents\n"
-" will appear in files:.\n"
-" "
-msgstr ""
-" NOTE: log -p/--patch may generate unexpected diff output for merge\n"
-" changesets, as it will only compare the merge changeset against\n"
-" its first parent. Also, only files different from BOTH parents\n"
-" will appear in files:.\n"
-" "
+
+msgid ""
+" .. note::\n"
+" log -p/--patch may generate unexpected diff output for merge\n"
+" changesets, as it will only compare the merge changeset against\n"
+" its first parent. Also, only files different from BOTH parents\n"
+" will appear in files:."
+msgstr ""
msgid "output the current or given revision of the project manifest"
-msgstr "輸出 project manifest ç›®å‰æˆ–指定的 revision"
+msgstr ""
msgid ""
" Print a list of version controlled files for the given revision.\n"
" If no revision is given, the first parent of the working directory\n"
" is used, or the null revision if no revision is checked out."
msgstr ""
-" Print a list of version controlled files for the given revision.\n"
-" If no revision is given, the first parent of the working directory\n"
-" is used, or the null revision if no revision is checked out."
msgid ""
" With -v, print file permissions, symlink and executable bits.\n"
-" With --debug, print file revision hashes.\n"
-" "
-msgstr ""
-" With -v, print file permissions, symlink and executable bits.\n"
-" With --debug, print file revision hashes.\n"
-" "
+" With --debug, print file revision hashes."
+msgstr ""
msgid "merge working directory with another revision"
-msgstr "å°‡ working directory 與其他的 revision åˆä½µ"
+msgstr "將工作目錄與其他的修定版åˆä½µ"
msgid ""
" The current working directory is updated with all changes made in\n"
" the requested revision since the last common predecessor revision."
msgstr ""
-" The current working directory is updated with all changes made in\n"
-" the requested revision since the last common predecessor revision."
msgid ""
" Files that changed between either parent are marked as changed for\n"
@@ -7636,30 +7331,44 @@
" updates to the repository are allowed. The next commit will have\n"
" two parents."
msgstr ""
-" Files that changed between either parent are marked as changed for\n"
-" the next commit and a commit must be performed before any further\n"
-" updates to the repository are allowed. The next commit will have\n"
-" two parents."
+
+msgid ""
+" ``--tool`` can be used to specify the merge tool used for file\n"
+" merges. It overrides the HGMERGE environment variable and your\n"
+" configuration files."
+msgstr ""
msgid ""
" If no revision is specified, the working directory's parent is a\n"
" head revision, and the current branch contains exactly one other\n"
" head, the other head is merged with by default. Otherwise, an\n"
-" explicit revision with which to merge with must be provided.\n"
-" "
-msgstr ""
-" If no revision is specified, the working directory's parent is a\n"
-" head revision, and the current branch contains exactly one other\n"
-" head, the other head is merged with by default. Otherwise, an\n"
-" explicit revision with which to merge with must be provided.\n"
+" explicit revision with which to merge with must be provided."
+msgstr ""
+
+msgid " :hg:`resolve` must be used to resolve unresolved files."
+msgstr "hg `resolve`å¿…é ˆä½¿ç”¨åœ¨è§£æ±ºæœªè§£æ±ºçš„æª”æ¡ˆ."
+
+msgid ""
+" To undo an uncommitted merge, use :hg:`update --clean .` which\n"
+" will check out a clean copy of the original merge parent, losing\n"
+" all changes."
+msgstr ""
+
+msgid ""
+" Returns 0 on success, 1 if there are unresolved files.\n"
" "
-
-#, python-format
-msgid "branch '%s' has %d heads - please merge with an explicit rev"
-msgstr ""
-
-#, python-format
-msgid "branch '%s' has one head - please merge with an explicit rev"
+msgstr ""
+
+#, python-format
+msgid ""
+"branch '%s' has %d heads - please merge with an explicit rev\n"
+"(run 'hg heads .' to see heads)"
+msgstr ""
+
+#, python-format
+msgid ""
+"branch '%s' has one head - please merge with an explicit rev\n"
+"(run 'hg heads' to see all heads)"
msgstr ""
msgid "there is nothing to merge"
@@ -7669,45 +7378,38 @@
msgid "%s - use \"hg update\" instead"
msgstr ""
-msgid "working dir not at a head rev - use \"hg update\" or merge with an explicit rev"
-msgstr ""
-
-msgid "show changesets not found in destination"
-msgstr "顯示目的端沒有的 changesets"
+msgid ""
+"working dir not at a head rev - use \"hg update\" or merge with an explicit "
+"rev"
+msgstr ""
+
+msgid "show changesets not found in the destination"
+msgstr ""
msgid ""
" Show changesets not found in the specified destination repository\n"
" or the default push location. These are the changesets that would\n"
" be pushed if a push was requested."
msgstr ""
-" Show changesets not found in the specified destination repository\n"
-" or the default push location. These are the changesets that would\n"
-" be pushed if a push was requested."
-
-msgid ""
-" See pull for valid destination format details.\n"
+
+msgid " See pull for details of valid destination formats."
+msgstr ""
+
+msgid ""
+" Returns 0 if there are outgoing changes, 1 otherwise.\n"
" "
msgstr ""
-" See pull for valid destination format details.\n"
-" "
msgid "show the parents of the working directory or revision"
-msgstr "顯示 working directory 或特定 revision 的 parents"
+msgstr "顯示工作目錄或修定版的æ¯ç³»"
msgid ""
" Print the working directory's parent revisions. If a revision is\n"
" given via -r/--rev, the parent of that revision will be printed.\n"
" If a file argument is given, the revision in which the file was\n"
" last changed (before the working directory revision or the\n"
-" argument to --rev if given) is printed.\n"
-" "
-msgstr ""
-" Print the working directory's parent revisions. If a revision is\n"
-" given via -r/--rev, the parent of that revision will be printed.\n"
-" If a file argument is given, the revision in which the file was\n"
-" last changed (before the working directory revision or the\n"
-" argument to --rev if given) is printed.\n"
-" "
+" argument to --rev if given) is printed."
+msgstr ""
msgid "can only specify an explicit filename"
msgstr ""
@@ -7723,22 +7425,28 @@
" Show definition of symbolic path name NAME. If no name is given,\n"
" show definition of all available names."
msgstr ""
-" Show definition of symbolic path name NAME. If no name is given,\n"
-" show definition of all available names."
-
-msgid ""
-" Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
-" and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too."
-msgstr ""
-" Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
-" and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too."
-
-msgid ""
-" See 'hg help urls' for more information.\n"
-" "
-msgstr ""
-" See 'hg help urls' for more information.\n"
-" "
+
+msgid ""
+" Path names are defined in the [paths] section of your\n"
+" configuration file and in ``/etc/mercurial/hgrc``. If run inside a\n"
+" repository, ``.hg/hgrc`` is used, too."
+msgstr ""
+
+msgid ""
+" The path names ``default`` and ``default-push`` have a special\n"
+" meaning. When performing a push or pull operation, they are used\n"
+" as fallbacks if no location is specified on the command-line.\n"
+" When ``default-push`` is set, it will be used for push and\n"
+" ``default`` will be used for pull; otherwise ``default`` is used\n"
+" as the fallback for both. When cloning a repository, the clone\n"
+" source is written as ``default`` in ``.hg/hgrc``. Note that\n"
+" ``default`` and ``default-push`` apply to all inbound (e.g.\n"
+" :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and\n"
+" :hg:`bundle`) operations."
+msgstr ""
+
+msgid " See :hg:`help urls` for more information."
+msgstr "\tSee 'hg help urls' for more information."
msgid "not found!\n"
msgstr "沒有找到ï¼\n"
@@ -7753,7 +7461,7 @@
msgstr "(執行 'hg update' 來å–å¾— working copy)\n"
msgid "pull changes from the specified source"
-msgstr "pull 指定來æºç«¯çš„ changes"
+msgstr "拉收指定來æºç«¯çš„變更"
msgid " Pull changes from a remote repository to a local one."
msgstr " Pull changes from a remote repository to a local one."
@@ -7764,79 +7472,74 @@
" -R is specified). By default, this does not update the copy of the\n"
" project in the working directory."
msgstr ""
-" This finds all changes from the repository at the specified path\n"
-" or URL and adds them to a local repository (the current one unless\n"
-" -R is specified). By default, this does not update the copy of the\n"
-" project in the working directory."
-
-msgid ""
-" Use hg incoming if you want to see what would have been added by a\n"
-" pull at the time you issued this command. If you then decide to\n"
-" added those changes to the repository, you should use pull -r X\n"
-" where X is the last changeset listed by hg incoming."
-msgstr ""
-" Use hg incoming if you want to see what would have been added by a\n"
-" pull at the time you issued this command. If you then decide to\n"
-" added those changes to the repository, you should use pull -r X\n"
-" where X is the last changeset listed by hg incoming."
+
+msgid ""
+" Use :hg:`incoming` if you want to see what would have been added\n"
+" by a pull at the time you issued this command. If you then decide\n"
+" to add those changes to the repository, you should use :hg:`pull\n"
+" -r X` where ``X`` is the last changeset listed by :hg:`incoming`."
+msgstr ""
msgid ""
" If SOURCE is omitted, the 'default' path will be used.\n"
-" See 'hg help urls' for more information.\n"
+" See :hg:`help urls` for more information."
+msgstr ""
+
+msgid ""
+" Returns 0 on success, 1 if an update had unresolved files.\n"
" "
msgstr ""
-" If SOURCE is omitted, the 'default' path will be used.\n"
-" See 'hg help urls' for more information.\n"
-" "
-
-#, fuzzy
+
+msgid ""
+"other repository doesn't support revision lookup, so a rev cannot be "
+"specified."
+msgstr ""
+
msgid "push changes to the specified destination"
-msgstr "將 changes push 至指定的目的端"
-
-#, fuzzy
-msgid " Push changes from the local repository to the given destination."
-msgstr " Push changes from the local repository to the given destination."
-
-#, fuzzy
-msgid ""
-" This is the symmetrical operation for pull. It moves changes from\n"
-" the current repository to a different one. If the destination is\n"
-" local this is identical to a pull in that directory from the\n"
-" current one."
-msgstr ""
-" This is the symmetrical operation for pull. It moves changes from\n"
-" the current repository to a different one. If the destination is\n"
-" local this is identical to a pull in that directory from the\n"
-" current one."
-
-#, fuzzy
-msgid ""
-" By default, push will refuse to run if it detects the result would\n"
-" increase the number of remote heads. This generally indicates the\n"
-" user forgot to pull and merge before pushing."
-msgstr ""
-" By default, push will refuse to run if it detects the result would\n"
-" increase the number of remote heads. This generally indicates the\n"
-" user forgot to pull and merge before pushing."
-
-#, fuzzy
-msgid ""
-" If -r/--rev is used, the named revision and all its ancestors will\n"
-" be pushed to the remote repository."
-msgstr ""
-" If -r/--rev is used, the named revision and all its ancestors will\n"
-" be pushed to the remote repository."
-
-#, fuzzy
-msgid ""
-" Please see 'hg help urls' for important details about ssh://\n"
-" URLs. If DESTINATION is omitted, a default path will be used.\n"
+msgstr "將變更推é€åˆ°è‡³æŒ‡å®šçš„目的端"
+
+msgid ""
+" Push changesets from the local repository to the specified\n"
+" destination."
+msgstr ""
+
+msgid ""
+" This operation is symmetrical to pull: it is identical to a pull\n"
+" in the destination repository from the current one."
+msgstr ""
+
+msgid ""
+" By default, push will not allow creation of new heads at the\n"
+" destination, since multiple heads would make it unclear which head\n"
+" to use. In this situation, it is recommended to pull and merge\n"
+" before pushing."
+msgstr ""
+
+msgid ""
+" Use --new-branch if you want to allow push to create a new named\n"
+" branch that is not present at the destination. This allows you to\n"
+" only create a new branch without forcing other changes."
+msgstr ""
+
+msgid ""
+" Use -f/--force to override the default behavior and push all\n"
+" changesets on all branches."
+msgstr ""
+
+msgid ""
+" If -r/--rev is used, the specified revision and all its ancestors\n"
+" will be pushed to the remote repository."
+msgstr ""
+
+msgid ""
+" Please see :hg:`help urls` for important details about ``ssh://``\n"
+" URLs. If DESTINATION is omitted, a default path will be used."
+msgstr ""
+
+msgid ""
+" Returns 0 if push was successful, 1 if nothing to push.\n"
" "
msgstr ""
-" Please see 'hg help urls' for important details about ssh://\n"
-" URLs. If DESTINATION is omitted, a default path will be used.\n"
-" See 'hg help urls' for more information.\n"
-" "
#, python-format
msgid "pushing to %s\n"
@@ -7846,28 +7549,25 @@
msgstr "roll back 一個被ä¸æ–·çš„ transaction"
msgid " Recover from an interrupted commit or pull."
-msgstr " Recover from an interrupted commit or pull."
+msgstr ""
msgid ""
" This command tries to fix the repository status after an\n"
" interrupted operation. It should only be necessary when Mercurial\n"
-" suggests it.\n"
+" suggests it."
+msgstr ""
+
+msgid ""
+" Returns 0 if successful, 1 if nothing to recover or verify fails.\n"
" "
msgstr ""
-" This command tries to fix the repository status after an\n"
-" interrupted operation. It should only be necessary when Mercurial\n"
-" suggests it.\n"
-" "
-
-#, fuzzy
+
msgid "remove the specified files on the next commit"
msgstr "ç§»é™¤ä¸‹æ¬¡è¦ commit 的檔案"
-#, fuzzy
msgid " Schedule the indicated files for removal from the repository."
-msgstr " Schedule the indicated files for removal from the repository."
-
-#, fuzzy
+msgstr ""
+
msgid ""
" This only removes files from the current branch, not from the\n"
" entire project history. -A/--after can be used to remove only\n"
@@ -7875,27 +7575,15 @@
" force deletion, and -Af can be used to remove files from the next\n"
" revision without deleting them from the working directory."
msgstr ""
-" This only removes files from the current branch, not from the\n"
-" entire project history. -A/--after can be used to remove only\n"
-" files that have already been deleted, -f/--force can be used to\n"
-" force deletion, and -Af can be used to remove files from the next\n"
-" revision without deleting them from the working directory."
-
-#, fuzzy
+
msgid ""
" The following table details the behavior of remove for different\n"
" file states (columns) and option combinations (rows). The file\n"
" states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n"
-" reported by hg status). The actions are Warn, Remove (from branch)\n"
-" and Delete (from disk)::"
-msgstr ""
-" The following table details the behavior of remove for different\n"
-" file states (columns) and option combinations (rows). The file\n"
-" states are Added [A], Clean [C], Modified [M] and Missing [!]\n"
-" (as reported by hg status). The actions are Warn, Remove (from\n"
-" branch) and Delete (from disk)."
-
-#, fuzzy
+" reported by :hg:`status`). The actions are Warn, Remove (from\n"
+" branch) and Delete (from disk)::"
+msgstr ""
+
msgid ""
" A C M !\n"
" none W RD W R\n"
@@ -7903,37 +7591,32 @@
" -A W W W R\n"
" -Af R R R R"
msgstr ""
-" A C M !\n"
-" none W RD W R\n"
-" -f R RD RD R\n"
-" -A W W W R\n"
-" -Af R R R R"
-
-#, fuzzy
+
msgid ""
" This command schedules the files to be removed at the next commit.\n"
-" To undo a remove before that, see hg revert.\n"
+" To undo a remove before that, see :hg:`revert`."
+msgstr ""
+
+msgid ""
+" Returns 0 on success, 1 if any warnings encountered.\n"
" "
msgstr ""
-" This command schedules the files to be removed at the next commit.\n"
-" To undo a remove before that, see hg revert.\n"
-" "
#, python-format
msgid "not removing %s: file is untracked\n"
msgstr ""
#, python-format
-msgid "not removing %s: file %s (use -f to force removal)\n"
-msgstr ""
-
-msgid "still exists"
-msgstr ""
-
-msgid "is modified"
-msgstr ""
-
-msgid "has been marked for add"
+msgid "not removing %s: file still exists (use -f to force removal)\n"
+msgstr ""
+
+#, python-format
+msgid "not removing %s: file is modified (use -f to force removal)\n"
+msgstr ""
+
+#, python-format
+msgid ""
+"not removing %s: file has been marked for add (use -f to force removal)\n"
msgstr ""
msgid "rename files; equivalent of copy + remove"
@@ -7944,162 +7627,63 @@
" is a directory, copies are put in that directory. If dest is a\n"
" file, there can only be one source."
msgstr ""
-" Mark dest as copies of sources; mark sources for deletion. If dest\n"
-" is a directory, copies are put in that directory. If dest is a\n"
-" file, there can only be one source."
msgid ""
" This command takes effect at the next commit. To undo a rename\n"
-" before that, see hg revert.\n"
-" "
-msgstr ""
-" This command takes effect at the next commit. To undo a rename\n"
-" before that, see hg revert.\n"
-" "
-
-#, fuzzy
-msgid "retry file merges from a merge or update"
-msgstr ""
-"é‡è©¦ç¶“ç”± merge 或 update å‘½ä»¤æ‰€é€ æˆã€å»æœªå®Œæˆçš„åˆä½µ\n"
-"\n"
-" This command will cleanly retry unresolved file merges using file\n"
-" revisions preserved from the last update or merge. To attempt to\n"
-" resolve all unresolved files, use the -a/--all switch.\n"
-"\n"
-" If a conflict is resolved manually, please note that the changes\n"
-" will be overwritten if the merge is retried with resolve. The\n"
-" -m/--mark switch should be used to mark the file as resolved.\n"
-"\n"
-" This command also allows listing resolved files and manually\n"
-" indicating whether or not files are resolved. All files must be\n"
-" marked as resolved before a commit is permitted.\n"
-"\n"
-" The codes used to show the status of files are:\n"
-" U = unresolved\n"
-" R = resolved\n"
-" "
-
-#, fuzzy
-msgid ""
-" This command will cleanly retry unresolved file merges using file\n"
-" revisions preserved from the last update or merge. To attempt to\n"
-" resolve all unresolved files, use the -a/--all switch."
-msgstr ""
-"é‡è©¦ç¶“ç”± merge 或 update å‘½ä»¤æ‰€é€ æˆã€å»æœªå®Œæˆçš„åˆä½µ\n"
-"\n"
-" This command will cleanly retry unresolved file merges using file\n"
-" revisions preserved from the last update or merge. To attempt to\n"
-" resolve all unresolved files, use the -a/--all switch.\n"
-"\n"
-" If a conflict is resolved manually, please note that the changes\n"
-" will be overwritten if the merge is retried with resolve. The\n"
-" -m/--mark switch should be used to mark the file as resolved.\n"
-"\n"
-" This command also allows listing resolved files and manually\n"
-" indicating whether or not files are resolved. All files must be\n"
-" marked as resolved before a commit is permitted.\n"
-"\n"
-" The codes used to show the status of files are:\n"
-" U = unresolved\n"
-" R = resolved\n"
+" before that, see :hg:`revert`."
+msgstr ""
+
+msgid "redo merges or set/view the merge status of files"
+msgstr "redoåˆä½µ 或是 è¨å®š/觀看 檔案的åˆä½µç‹€æ³"
+
+msgid ""
+" Merges with unresolved conflicts are often the result of\n"
+" non-interactive merging using the ``internal:merge`` configuration\n"
+" setting, or a command-line merge tool like ``diff3``. The resolve\n"
+" command is used to manage the files involved in a merge, after\n"
+" :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the\n"
+" working directory must have two parents)."
+msgstr ""
+
+msgid " The resolve command can be used in the following ways:"
+msgstr ""
+
+msgid ""
+" - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the "
+"specified\n"
+" files, discarding any previous merge attempts. Re-merging is not\n"
+" performed for files already marked as resolved. Use ``--all/-a``\n"
+" to selects all unresolved files. ``--tool`` can be used to specify\n"
+" the merge tool used for the given files. It overrides the HGMERGE\n"
+" environment variable and your configuration files."
+msgstr ""
+
+msgid ""
+" - :hg:`resolve -m [FILE]`: mark a file as having been resolved\n"
+" (e.g. after having manually fixed-up the files). The default is\n"
+" to mark all unresolved files."
+msgstr ""
+
+msgid ""
+" - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The\n"
+" default is to mark all resolved files."
+msgstr ""
+
+msgid ""
+" - :hg:`resolve -l`: list files which had or still have conflicts.\n"
+" In the printed list, ``U`` = unresolved and ``R`` = resolved."
+msgstr ""
+
+msgid ""
+" Note that Mercurial will not let you commit files with unresolved\n"
+" merge conflicts. You must use :hg:`resolve -m ...` before you can\n"
+" commit after a conflicting merge."
+msgstr ""
+
+msgid ""
+" Returns 0 on success, 1 if any files fail a resolve attempt.\n"
" "
-
-#, fuzzy
-msgid ""
-" If a conflict is resolved manually, please note that the changes\n"
-" will be overwritten if the merge is retried with resolve. The\n"
-" -m/--mark switch should be used to mark the file as resolved."
-msgstr ""
-"é‡è©¦ç¶“ç”± merge 或 update å‘½ä»¤æ‰€é€ æˆã€å»æœªå®Œæˆçš„åˆä½µ\n"
-"\n"
-" This command will cleanly retry unresolved file merges using file\n"
-" revisions preserved from the last update or merge. To attempt to\n"
-" resolve all unresolved files, use the -a/--all switch.\n"
-"\n"
-" If a conflict is resolved manually, please note that the changes\n"
-" will be overwritten if the merge is retried with resolve. The\n"
-" -m/--mark switch should be used to mark the file as resolved.\n"
-"\n"
-" This command also allows listing resolved files and manually\n"
-" indicating whether or not files are resolved. All files must be\n"
-" marked as resolved before a commit is permitted.\n"
-"\n"
-" The codes used to show the status of files are:\n"
-" U = unresolved\n"
-" R = resolved\n"
-" "
-
-#, fuzzy
-msgid ""
-" This command also allows listing resolved files and manually\n"
-" indicating whether or not files are resolved. All files must be\n"
-" marked as resolved before a commit is permitted."
-msgstr ""
-"é‡è©¦ç¶“ç”± merge 或 update å‘½ä»¤æ‰€é€ æˆã€å»æœªå®Œæˆçš„åˆä½µ\n"
-"\n"
-" This command will cleanly retry unresolved file merges using file\n"
-" revisions preserved from the last update or merge. To attempt to\n"
-" resolve all unresolved files, use the -a/--all switch.\n"
-"\n"
-" If a conflict is resolved manually, please note that the changes\n"
-" will be overwritten if the merge is retried with resolve. The\n"
-" -m/--mark switch should be used to mark the file as resolved.\n"
-"\n"
-" This command also allows listing resolved files and manually\n"
-" indicating whether or not files are resolved. All files must be\n"
-" marked as resolved before a commit is permitted.\n"
-"\n"
-" The codes used to show the status of files are:\n"
-" U = unresolved\n"
-" R = resolved\n"
-" "
-
-#, fuzzy
-msgid " The codes used to show the status of files are::"
-msgstr ""
-"é‡è©¦ç¶“ç”± merge 或 update å‘½ä»¤æ‰€é€ æˆã€å»æœªå®Œæˆçš„åˆä½µ\n"
-"\n"
-" This command will cleanly retry unresolved file merges using file\n"
-" revisions preserved from the last update or merge. To attempt to\n"
-" resolve all unresolved files, use the -a/--all switch.\n"
-"\n"
-" If a conflict is resolved manually, please note that the changes\n"
-" will be overwritten if the merge is retried with resolve. The\n"
-" -m/--mark switch should be used to mark the file as resolved.\n"
-"\n"
-" This command also allows listing resolved files and manually\n"
-" indicating whether or not files are resolved. All files must be\n"
-" marked as resolved before a commit is permitted.\n"
-"\n"
-" The codes used to show the status of files are:\n"
-" U = unresolved\n"
-" R = resolved\n"
-" "
-
-#, fuzzy
-msgid ""
-" U = unresolved\n"
-" R = resolved\n"
-" "
-msgstr ""
-"é‡è©¦ç¶“ç”± merge 或 update å‘½ä»¤æ‰€é€ æˆã€å»æœªå®Œæˆçš„åˆä½µ\n"
-"\n"
-" This command will cleanly retry unresolved file merges using file\n"
-" revisions preserved from the last update or merge. To attempt to\n"
-" resolve all unresolved files, use the -a/--all switch.\n"
-"\n"
-" If a conflict is resolved manually, please note that the changes\n"
-" will be overwritten if the merge is retried with resolve. The\n"
-" -m/--mark switch should be used to mark the file as resolved.\n"
-"\n"
-" This command also allows listing resolved files and manually\n"
-" indicating whether or not files are resolved. All files must be\n"
-" marked as resolved before a commit is permitted.\n"
-"\n"
-" The codes used to show the status of files are:\n"
-" U = unresolved\n"
-" R = resolved\n"
-" "
+msgstr ""
msgid "too many options specified"
msgstr ""
@@ -8114,37 +7698,30 @@
msgstr "將特定的檔案或目錄回復æˆè¼ƒæ—©çš„狀態"
msgid ""
-" (Use update -r to check out earlier revisions, revert does not\n"
-" change the working directory parents.)"
-msgstr ""
-" (Use update -r to check out earlier revisions, revert does not\n"
-" change the working directory parents.)"
+" .. note::\n"
+" This command is most likely not what you are looking for.\n"
+" Revert will partially overwrite content in the working\n"
+" directory without changing the working directory parents. Use\n"
+" :hg:`update -r rev` to check out earlier revisions, or\n"
+" :hg:`update --clean .` to undo a merge which has added another\n"
+" parent."
+msgstr ""
msgid ""
" With no revision specified, revert the named files or directories\n"
" to the contents they had in the parent of the working directory.\n"
" This restores the contents of the affected files to an unmodified\n"
" state and unschedules adds, removes, copies, and renames. If the\n"
-" working directory has two parents, you must explicitly specify the\n"
-" revision to revert to."
-msgstr ""
-" With no revision specified, revert the named files or directories\n"
-" to the contents they had in the parent of the working directory.\n"
-" This restores the contents of the affected files to an unmodified\n"
-" state and unschedules adds, removes, copies, and renames. If the\n"
-" working directory has two parents, you must explicitly specify the\n"
-" revision to revert to."
+" working directory has two parents, you must explicitly specify a\n"
+" revision."
+msgstr ""
msgid ""
" Using the -r/--rev option, revert the given files or directories\n"
" to their contents as of a specific revision. This can be helpful\n"
-" to \"roll back\" some or all of an earlier change. See 'hg help\n"
-" dates' for a list of formats valid for -d/--date."
-msgstr ""
-" Using the -r/--rev option, revert the given files or directories\n"
-" to their contents as of a specific revision. This can be helpful\n"
-" to \"roll back\" some or all of an earlier change. See 'hg help\n"
-" dates' for a list of formats valid for -d/--date."
+" to \"roll back\" some or all of an earlier change. See :hg:`help\n"
+" dates` for a list of formats valid for -d/--date."
+msgstr ""
msgid ""
" Revert modifies the working directory. It does not commit any\n"
@@ -8153,34 +7730,21 @@
" directory, the reverted files will thus appear modified\n"
" afterwards."
msgstr ""
-" Revert modifies the working directory. It does not commit any\n"
-" changes, or change the parent of the working directory. If you\n"
-" revert to a revision other than the parent of the working\n"
-" directory, the reverted files will thus appear modified\n"
-" afterwards."
msgid ""
" If a file has been deleted, it is restored. If the executable mode\n"
" of a file was changed, it is reset."
msgstr ""
-" If a file has been deleted, it is restored. If the executable mode\n"
-" of a file was changed, it is reset."
msgid ""
" If names are given, all files matching the names are reverted.\n"
" If no arguments are given, no files are reverted."
msgstr ""
-" If names are given, all files matching the names are reverted.\n"
-" If no arguments are given, no files are reverted."
msgid ""
" Modified files are saved with a .orig suffix before reverting.\n"
-" To disable these backups, use --no-backup.\n"
-" "
-msgstr ""
-" Modified files are saved with a .orig suffix before reverting.\n"
-" To disable these backups, use --no-backup.\n"
-" "
+" To disable these backups, use --no-backup."
+msgstr ""
msgid "you can't specify a revision and a date"
msgstr ""
@@ -8194,7 +7758,7 @@
#, python-format
msgid "reverting %s\n"
-msgstr ""
+msgstr "æ£åœ¨å¾©åŽŸ %s\n"
#, python-format
msgid "undeleting %s\n"
@@ -8210,13 +7774,11 @@
#, python-format
msgid "no changes needed to %s\n"
-msgstr ""
-
-#, fuzzy
-msgid "roll back the last transaction"
-msgstr "roll back 最後一次的 transaction"
-
-#, fuzzy
+msgstr "沒有變更需è¦åŽ» %s\n"
+
+msgid "roll back the last transaction (dangerous)"
+msgstr "roll back 最後一次的 transaction(å±éšª)"
+
msgid ""
" This command should be used with care. There is only one level of\n"
" rollback, and there is no way to undo a rollback. It will also\n"
@@ -8224,122 +7786,82 @@
" any dirstate changes since that time. This command does not alter\n"
" the working directory."
msgstr ""
-" This command should be used with care. There is only one level of\n"
-" rollback, and there is no way to undo a rollback. It will also\n"
-" restore the dirstate at the time of the last transaction, losing\n"
-" any dirstate changes since that time."
-
-#, fuzzy
-msgid ""
-" Transactions are used to encapsulate the effects of all commands\n"
-" that create new changesets or propagate existing changesets into a\n"
-" repository. For example, the following commands are transactional,\n"
-" and their effects can be rolled back::"
-msgstr ""
+
+msgid ""
" Transactions are used to encapsulate the effects of all commands\n"
" that create new changesets or propagate existing changesets into a\n"
" repository. For example, the following commands are transactional,\n"
" and their effects can be rolled back:"
-
-#, fuzzy
-msgid ""
-" commit\n"
-" import\n"
-" pull\n"
-" push (with this repository as destination)\n"
-" unbundle"
-msgstr ""
-" commit\n"
-" import\n"
-" pull\n"
-" push (with this repository as destination)\n"
-" unbundle"
-
-#, fuzzy
+msgstr ""
+
+msgid ""
+" - commit\n"
+" - import\n"
+" - pull\n"
+" - push (with this repository as the destination)\n"
+" - unbundle"
+msgstr ""
+
msgid ""
" This command is not intended for use on public repositories. Once\n"
" changes are visible for pull by other users, rolling a transaction\n"
" back locally is ineffective (someone else may already have pulled\n"
" the changes). Furthermore, a race is possible with readers of the\n"
" repository; for example an in-progress pull from the repository\n"
-" may fail if a rollback is performed.\n"
+" may fail if a rollback is performed."
+msgstr ""
+
+msgid ""
+" Returns 0 on success, 1 if no rollback data is available.\n"
" "
msgstr ""
-" This command is not intended for use on public repositories. Once\n"
-" changes are visible for pull by other users, rolling a transaction\n"
-" back locally is ineffective (someone else may already have pulled\n"
-" the changes). Furthermore, a race is possible with readers of the\n"
-" repository; for example an in-progress pull from the repository\n"
-" may fail if a rollback is performed.\n"
-" "
msgid "print the root (top) of the current working directory"
-msgstr "é¡¯ç¤ºç›®å‰ working directory çš„ root 目錄"
-
-msgid ""
-" Print the root directory of the current repository.\n"
-" "
-msgstr ""
-" Print the root directory of the current repository.\n"
-" "
-
-msgid "export the repository via HTTP"
-msgstr "將 repository 經由 HTTP 發佈"
-
-msgid " Start a local HTTP repository browser and pull server."
-msgstr " Start a local HTTP repository browser and pull server."
+msgstr "顯示目å‰å·¥ä½œç›®éŒ„çš„ root(top)"
+
+msgid " Print the root directory of the current repository."
+msgstr "顯示目å‰å„²å˜åº«çš„ root 目錄"
+
+msgid "start stand-alone webserver"
+msgstr "啟動常é§web伺æœå™¨"
+
+msgid ""
+" Start a local HTTP repository browser and pull server. You can use\n"
+" this for ad-hoc sharing and browing of repositories. It is\n"
+" recommended to use a real web server to serve a repository for\n"
+" longer periods of time."
+msgstr ""
+
+msgid ""
+" Please note that the server does not implement access control.\n"
+" This means that, by default, anybody can read from the server and\n"
+" nobody can write to it by default. Set the ``web.allow_push``\n"
+" option to ``*`` to allow everybody to push to the server. You\n"
+" should use a real web server if you need to authenticate users."
+msgstr ""
msgid ""
" By default, the server logs accesses to stdout and errors to\n"
" stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
-" files.\n"
-" "
-msgstr ""
-" By default, the server logs accesses to stdout and errors to\n"
-" stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
-" files.\n"
-" "
+" files."
+msgstr ""
+
+msgid ""
+" To have the server choose a free port number to listen on, specify\n"
+" a port number of 0; in this case, the server will print the port\n"
+" number it uses."
+msgstr ""
+
+msgid "There is no Mercurial repository here (.hg not found)"
+msgstr "這邊沒有Mercurial 儲å˜åº«(找ä¸åˆ° .hg)"
#, python-format
msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
msgstr ""
-#, fuzzy
msgid "show changed files in the working directory"
-msgstr ""
-"顯示 working directory ä¸å·²è®Šæ›´çš„檔案\n"
-"\n"
-" Show status of files in the repository. If names are given, only\n"
-" files that match are shown. Files that are clean or ignored or\n"
-" the source of a copy/move operation, are not listed unless\n"
-" -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
-" Unless options described with \"show only ...\" are given, the\n"
-" options -mardu are used.\n"
-"\n"
-" Option -q/--quiet hides untracked (unknown and ignored) files\n"
-" unless explicitly requested with -u/--unknown or -i/--ignored.\n"
-"\n"
-" NOTE: status may appear to disagree with diff if permissions have\n"
-" changed or a merge has occurred. The standard diff format does not\n"
-" report permission changes and diff only reports changes relative\n"
-" to one merge parent.\n"
-"\n"
-" If one revision is given, it is used as the base revision.\n"
-" If two revisions are given, the differences between them are\n"
-" shown.\n"
-"\n"
-" The codes used to show the status of files are:\n"
-" M = modified\n"
-" A = added\n"
-" R = removed\n"
-" C = clean\n"
-" ! = missing (deleted by non-hg command, but still tracked)\n"
-" ? = not tracked\n"
-" I = ignored\n"
-" = origin of the previous file listed as A (added)\n"
-" "
-
-#, fuzzy
+msgstr "顯示工作目錄的狀態"
+
msgid ""
" Show status of files in the repository. If names are given, only\n"
" files that match are shown. Files that are clean or ignored or\n"
@@ -8348,153 +7870,30 @@
" Unless options described with \"show only ...\" are given, the\n"
" options -mardu are used."
msgstr ""
-"顯示 working directory ä¸å·²è®Šæ›´çš„檔案\n"
-"\n"
-" Show status of files in the repository. If names are given, only\n"
-" files that match are shown. Files that are clean or ignored or\n"
-" the source of a copy/move operation, are not listed unless\n"
-" -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
-" Unless options described with \"show only ...\" are given, the\n"
-" options -mardu are used.\n"
-"\n"
-" Option -q/--quiet hides untracked (unknown and ignored) files\n"
-" unless explicitly requested with -u/--unknown or -i/--ignored.\n"
-"\n"
-" NOTE: status may appear to disagree with diff if permissions have\n"
-" changed or a merge has occurred. The standard diff format does not\n"
-" report permission changes and diff only reports changes relative\n"
-" to one merge parent.\n"
-"\n"
-" If one revision is given, it is used as the base revision.\n"
-" If two revisions are given, the differences between them are\n"
-" shown.\n"
-"\n"
-" The codes used to show the status of files are:\n"
-" M = modified\n"
-" A = added\n"
-" R = removed\n"
-" C = clean\n"
-" ! = missing (deleted by non-hg command, but still tracked)\n"
-" ? = not tracked\n"
-" I = ignored\n"
-" = origin of the previous file listed as A (added)\n"
-" "
-
-#, fuzzy
+
msgid ""
" Option -q/--quiet hides untracked (unknown and ignored) files\n"
" unless explicitly requested with -u/--unknown or -i/--ignored."
msgstr ""
-"顯示 working directory ä¸å·²è®Šæ›´çš„檔案\n"
-"\n"
-" Show status of files in the repository. If names are given, only\n"
-" files that match are shown. Files that are clean or ignored or\n"
-" the source of a copy/move operation, are not listed unless\n"
-" -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
-" Unless options described with \"show only ...\" are given, the\n"
-" options -mardu are used.\n"
-"\n"
-" Option -q/--quiet hides untracked (unknown and ignored) files\n"
-" unless explicitly requested with -u/--unknown or -i/--ignored.\n"
-"\n"
-" NOTE: status may appear to disagree with diff if permissions have\n"
-" changed or a merge has occurred. The standard diff format does not\n"
-" report permission changes and diff only reports changes relative\n"
-" to one merge parent.\n"
-"\n"
-" If one revision is given, it is used as the base revision.\n"
-" If two revisions are given, the differences between them are\n"
-" shown.\n"
-"\n"
-" The codes used to show the status of files are:\n"
-" M = modified\n"
-" A = added\n"
-" R = removed\n"
-" C = clean\n"
-" ! = missing (deleted by non-hg command, but still tracked)\n"
-" ? = not tracked\n"
-" I = ignored\n"
-" = origin of the previous file listed as A (added)\n"
-" "
-
-#, fuzzy
-msgid ""
-" NOTE: status may appear to disagree with diff if permissions have\n"
-" changed or a merge has occurred. The standard diff format does not\n"
-" report permission changes and diff only reports changes relative\n"
-" to one merge parent."
-msgstr ""
-"顯示 working directory ä¸å·²è®Šæ›´çš„檔案\n"
-"\n"
-" Show status of files in the repository. If names are given, only\n"
-" files that match are shown. Files that are clean or ignored or\n"
-" the source of a copy/move operation, are not listed unless\n"
-" -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
-" Unless options described with \"show only ...\" are given, the\n"
-" options -mardu are used.\n"
-"\n"
-" Option -q/--quiet hides untracked (unknown and ignored) files\n"
-" unless explicitly requested with -u/--unknown or -i/--ignored.\n"
-"\n"
-" NOTE: status may appear to disagree with diff if permissions have\n"
-" changed or a merge has occurred. The standard diff format does not\n"
-" report permission changes and diff only reports changes relative\n"
-" to one merge parent.\n"
-"\n"
-" If one revision is given, it is used as the base revision.\n"
-" If two revisions are given, the differences between them are\n"
-" shown.\n"
-"\n"
-" The codes used to show the status of files are:\n"
-" M = modified\n"
-" A = added\n"
-" R = removed\n"
-" C = clean\n"
-" ! = missing (deleted by non-hg command, but still tracked)\n"
-" ? = not tracked\n"
-" I = ignored\n"
-" = origin of the previous file listed as A (added)\n"
-" "
-
-#, fuzzy
+
+msgid ""
+" .. note::\n"
+" status may appear to disagree with diff if permissions have\n"
+" changed or a merge has occurred. The standard diff format does\n"
+" not report permission changes and diff only reports changes\n"
+" relative to one merge parent."
+msgstr ""
+
msgid ""
" If one revision is given, it is used as the base revision.\n"
" If two revisions are given, the differences between them are\n"
-" shown."
-msgstr ""
-"顯示 working directory ä¸å·²è®Šæ›´çš„檔案\n"
-"\n"
-" Show status of files in the repository. If names are given, only\n"
-" files that match are shown. Files that are clean or ignored or\n"
-" the source of a copy/move operation, are not listed unless\n"
-" -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
-" Unless options described with \"show only ...\" are given, the\n"
-" options -mardu are used.\n"
-"\n"
-" Option -q/--quiet hides untracked (unknown and ignored) files\n"
-" unless explicitly requested with -u/--unknown or -i/--ignored.\n"
-"\n"
-" NOTE: status may appear to disagree with diff if permissions have\n"
-" changed or a merge has occurred. The standard diff format does not\n"
-" report permission changes and diff only reports changes relative\n"
-" to one merge parent.\n"
-"\n"
-" If one revision is given, it is used as the base revision.\n"
-" If two revisions are given, the differences between them are\n"
-" shown.\n"
-"\n"
-" The codes used to show the status of files are:\n"
-" M = modified\n"
-" A = added\n"
-" R = removed\n"
-" C = clean\n"
-" ! = missing (deleted by non-hg command, but still tracked)\n"
-" ? = not tracked\n"
-" I = ignored\n"
-" = origin of the previous file listed as A (added)\n"
-" "
-
-#, fuzzy
+" shown. The --change option can also be used as a shortcut to list\n"
+" the changed files of a revision from its first parent."
+msgstr ""
+
+msgid " The codes used to show the status of files are::"
+msgstr ""
+
msgid ""
" M = modified\n"
" A = added\n"
@@ -8503,43 +7902,11 @@
" ! = missing (deleted by non-hg command, but still tracked)\n"
" ? = not tracked\n"
" I = ignored\n"
-" = origin of the previous file listed as A (added)\n"
-" "
-msgstr ""
-"顯示 working directory ä¸å·²è®Šæ›´çš„檔案\n"
-"\n"
-" Show status of files in the repository. If names are given, only\n"
-" files that match are shown. Files that are clean or ignored or\n"
-" the source of a copy/move operation, are not listed unless\n"
-" -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
-" Unless options described with \"show only ...\" are given, the\n"
-" options -mardu are used.\n"
-"\n"
-" Option -q/--quiet hides untracked (unknown and ignored) files\n"
-" unless explicitly requested with -u/--unknown or -i/--ignored.\n"
-"\n"
-" NOTE: status may appear to disagree with diff if permissions have\n"
-" changed or a merge has occurred. The standard diff format does not\n"
-" report permission changes and diff only reports changes relative\n"
-" to one merge parent.\n"
-"\n"
-" If one revision is given, it is used as the base revision.\n"
-" If two revisions are given, the differences between them are\n"
-" shown.\n"
-"\n"
-" The codes used to show the status of files are:\n"
-" M = modified\n"
-" A = added\n"
-" R = removed\n"
-" C = clean\n"
-" ! = missing (deleted by non-hg command, but still tracked)\n"
-" ? = not tracked\n"
-" I = ignored\n"
-" = origin of the previous file listed as A (added)\n"
-" "
+" = origin of the previous file listed as A (added)"
+msgstr ""
msgid "summarize working directory state"
-msgstr ""
+msgstr "摘錄工作目錄的狀態"
msgid ""
" This generates a brief summary of the working directory state,\n"
@@ -8548,64 +7915,77 @@
msgid ""
" With the --remote option, this will check the default paths for\n"
-" incoming and outgoing changes. This can be time-consuming.\n"
-" "
-msgstr ""
+" incoming and outgoing changes. This can be time-consuming."
+msgstr ""
+
+#, python-format
+msgid "parent: %d:%s "
+msgstr "æ¯ç³»:\t\t%d:%s"
msgid " (empty repository)"
-msgstr ""
+msgstr "(空白的儲å˜åº«)"
msgid " (no revision checked out)"
msgstr ""
#, python-format
-msgid "parent: %d:%s %s\n"
-msgstr ""
-
-#, fuzzy, python-format
msgid "branch: %s\n"
-msgstr "找ä¸åˆ° branch %s"
-
-#, python-format
-msgid "%d added"
-msgstr ""
+msgstr "分支:\t\t %s\n"
#, python-format
msgid "%d modified"
-msgstr ""
-
-#, fuzzy, python-format
+msgstr "%d 修改"
+
+#, python-format
+msgid "%d added"
+msgstr "%d 新增"
+
+#, python-format
msgid "%d removed"
-msgstr "已移除"
+msgstr "%d 移除"
+
+#, python-format
+msgid "%d renamed"
+msgstr "%d 改åå—"
+
+#, python-format
+msgid "%d copied"
+msgstr "%d 複製"
#, python-format
msgid "%d deleted"
-msgstr ""
+msgstr "%d 刪除"
+
+#, python-format
+msgid "%d unknown"
+msgstr "%d ä¸æ¸…楚"
#, python-format
msgid "%d ignored"
-msgstr ""
-
-#, fuzzy, python-format
-msgid "%d unknown"
-msgstr "未知的 base"
-
-#, fuzzy, python-format
+msgstr "%d 忽略"
+
+#, python-format
msgid "%d unresolved"
-msgstr "已移除"
-
-#, fuzzy
+msgstr "%d 未解決"
+
+#, python-format
+msgid "%d subrepos"
+msgstr ""
+
msgid " (merge)"
-msgstr "å·²åˆä½µ"
+msgstr "(åˆä½µ)"
msgid " (new branch)"
+msgstr "(新分支)"
+
+msgid " (head closed)"
msgstr ""
msgid " (clean)"
msgstr ""
msgid " (new branch head)"
-msgstr ""
+msgstr "(新分支標é )"
#, python-format
msgid "commit: %s\n"
@@ -8629,35 +8009,29 @@
msgid "%d outgoing"
msgstr ""
-#, fuzzy, python-format
+#, python-format
msgid "remote: %s\n"
-msgstr "é 端: "
-
-#, fuzzy
+msgstr "é 端: %s\n"
+
msgid "remote: (synced)\n"
-msgstr "é 端: "
+msgstr ""
msgid "add one or more tags for the current or given revision"
-msgstr "å°ç›®å‰æˆ–是指定的 revision 新增一或多個 tags"
+msgstr "å°ç›®å‰æˆ–æ供的修定版新增一或多個標記"
msgid " Name a particular revision using <name>."
-msgstr " Name a particular revision using <name>."
+msgstr ""
msgid ""
" Tags are used to name particular revisions of the repository and are\n"
" very useful to compare different revisions, to go back to significant\n"
" earlier versions or to mark branch points as releases, etc."
msgstr ""
-" Tags are used to name particular revisions of the repository and are\n"
-" very useful to compare different revisions, to go back to significant\n"
-" earlier versions or to mark branch points as releases, etc."
msgid ""
" If no revision is given, the parent of the working directory is\n"
" used, or tip if no revision is checked out."
msgstr ""
-" If no revision is given, the parent of the working directory is\n"
-" used, or tip if no revision is checked out."
msgid ""
" To facilitate version control, distribution, and merging of tags,\n"
@@ -8666,17 +8040,16 @@
" necessary. The file '.hg/localtags' is used for local tags (not\n"
" shared among repositories)."
msgstr ""
-" To facilitate version control, distribution, and merging of tags,\n"
-" they are stored as a file named \".hgtags\" which is managed\n"
-" similarly to other project files and can be hand-edited if\n"
-" necessary. The file '.hg/localtags' is used for local tags (not\n"
-" shared among repositories)."
+
+msgid ""
+" Since tag names have priority over branch names during revision\n"
+" lookup, using an existing branch name as a tag name is discouraged."
+msgstr ""
msgid "tag names must be unique"
-msgstr ""
-
-#, python-format
-msgid "the name '%s' is reserved"
+msgstr "標記åç¨±å¿…é ˆå”¯ä¸€"
+
+msgid "tag names cannot consist entirely of whitespace"
msgstr ""
msgid "--rev and --remove are incompatible"
@@ -8684,159 +8057,128 @@
#, python-format
msgid "tag '%s' does not exist"
-msgstr ""
+msgstr "標記 '%s' ä¸å˜åœ¨"
#, python-format
msgid "tag '%s' is not a global tag"
-msgstr ""
+msgstr "標記'%s' ä¸æ˜¯ä¸€å€‹å…¨åŸŸæ¨™è¨˜"
#, python-format
msgid "tag '%s' is not a local tag"
-msgstr ""
+msgstr "標記'%s' ä¸æ˜¯ä¸€å€‹æœ¬åœ°ç«¯æ¨™è¨˜"
#, python-format
msgid "tag '%s' already exists (use -f to force)"
-msgstr ""
+msgstr "標記 '%s' 己經有了(使用 -f 去強制)"
msgid "list repository tags"
-msgstr "列出 repository tags"
+msgstr "列出 儲å˜åº« 標記(s)"
msgid ""
" This lists both regular and local tags. When the -v/--verbose\n"
-" switch is used, a third column \"local\" is printed for local tags.\n"
-" "
-msgstr ""
-" This lists both regular and local tags. When the -v/--verbose\n"
-" switch is used, a third column \"local\" is printed for local tags.\n"
-" "
+" switch is used, a third column \"local\" is printed for local tags."
+msgstr ""
msgid "show the tip revision"
-msgstr "顯示 tip revision"
+msgstr "顯示 tip 版本"
msgid ""
" The tip revision (usually just called the tip) is the changeset\n"
" most recently added to the repository (and therefore the most\n"
" recently changed head)."
msgstr ""
-" The tip revision (usually just called the tip) is the changeset\n"
-" most recently added to the repository (and therefore the most\n"
-" recently changed head)."
msgid ""
" If you have just made a commit, that commit will be the tip. If\n"
" you have just pulled changes from another repository, the tip of\n"
" that repository becomes the current tip. The \"tip\" tag is special\n"
-" and cannot be renamed or assigned to a different changeset.\n"
-" "
-msgstr ""
-" If you have just made a commit, that commit will be the tip. If\n"
-" you have just pulled changes from another repository, the tip of\n"
-" that repository becomes the current tip. The \"tip\" tag is special\n"
-" and cannot be renamed or assigned to a different changeset.\n"
-" "
+" and cannot be renamed or assigned to a different changeset."
+msgstr ""
msgid "apply one or more changegroup files"
msgstr "套用一或多個 changegroup 檔案"
msgid ""
" Apply one or more compressed changegroup files generated by the\n"
-" bundle command.\n"
-" "
-msgstr ""
-" Apply one or more compressed changegroup files generated by the\n"
-" bundle command.\n"
+" bundle command."
+msgstr ""
+
+msgid ""
+" Returns 0 on success, 1 if an update has unresolved files.\n"
" "
-
-#, fuzzy
-msgid "update working directory"
-msgstr "æ›´æ–° working directory"
-
-#, fuzzy
+msgstr ""
+
+msgid "update working directory (or switch revisions)"
+msgstr "更新工作目錄(也å¯ä»¥ç”¨ä¾†åˆ‡æ›ç‰ˆæœ¬è™Ÿ)"
+
msgid ""
" Update the repository's working directory to the specified\n"
-" revision, or the tip of the current branch if none is specified.\n"
-" Use null as the revision to remove the working copy (like 'hg\n"
-" clone -U')."
-msgstr ""
-" Update the repository's working directory to the specified\n"
-" revision, or the tip of the current branch if none is specified.\n"
-" Use null as the revision to remove the working copy (like 'hg\n"
-" clone -U')."
-
-#, fuzzy
-msgid ""
-" When the working directory contains no uncommitted changes, it\n"
-" will be replaced by the state of the requested revision from the\n"
-" repository. When the requested revision is on a different branch,\n"
-" the working directory will additionally be switched to that\n"
-" branch."
-msgstr ""
-" When the working directory contains no uncommitted changes, it\n"
-" will be replaced by the state of the requested revision from the\n"
-" repository. When the requested revision is on a different branch,\n"
-" the working directory will additionally be switched to that\n"
-" branch."
-
-#, fuzzy
-msgid ""
-" When there are uncommitted changes, use option -C/--clean to\n"
-" discard them, forcibly replacing the state of the working\n"
-" directory with the requested revision. Alternately, use -c/--check\n"
-" to abort."
-msgstr ""
-" When there are uncommitted changes, use option -C/--clean to\n"
-" discard them, forcibly replacing the state of the working\n"
-" directory with the requested revision."
-
-#, fuzzy
-msgid ""
-" When there are uncommitted changes and option -C/--clean is not\n"
-" used, and the parent revision and requested revision are on the\n"
-" same branch, and one of them is an ancestor of the other, then the\n"
-" new working directory will contain the requested revision merged\n"
-" with the uncommitted changes. Otherwise, the update will fail with\n"
-" a suggestion to use 'merge' or 'update -C' instead."
-msgstr ""
-" When there are uncommitted changes and option -C/--clean is not\n"
-" used, and the parent revision and requested revision are on the\n"
-" same branch, and one of them is an ancestor of the other, then the\n"
-" new working directory will contain the requested revision merged\n"
-" with the uncommitted changes. Otherwise, the update will fail with\n"
-" a suggestion to use 'merge' or 'update -C' instead."
-
-#, fuzzy
-msgid ""
-" If you want to update just one file to an older revision, use\n"
-" revert."
-msgstr ""
-" If you want to update just one file to an older revision, use\n"
-" revert."
+" changeset. If no changeset is specified, update to the tip of the\n"
+" current named branch."
+msgstr ""
+
+msgid ""
+" If the changeset is not a descendant of the working directory's\n"
+" parent, the update is aborted. With the -c/--check option, the\n"
+" working directory is checked for uncommitted changes; if none are\n"
+" found, the working directory is updated to the specified\n"
+" changeset."
+msgstr ""
+
+msgid ""
+" The following rules apply when the working directory contains\n"
+" uncommitted changes:"
+msgstr ""
+
+msgid ""
+" 1. If neither -c/--check nor -C/--clean is specified, and if\n"
+" the requested changeset is an ancestor or descendant of\n"
+" the working directory's parent, the uncommitted changes\n"
+" are merged into the requested changeset and the merged\n"
+" result is left uncommitted. If the requested changeset is\n"
+" not an ancestor or descendant (that is, it is on another\n"
+" branch), the update is aborted and the uncommitted changes\n"
+" are preserved."
+msgstr ""
+
+msgid ""
+" 2. With the -c/--check option, the update is aborted and the\n"
+" uncommitted changes are preserved."
+msgstr ""
+
+msgid ""
+" 3. With the -C/--clean option, uncommitted changes are discarded and\n"
+" the working directory is updated to the requested changeset."
+msgstr ""
+
+msgid ""
+" Use null as the changeset to remove the working directory (like\n"
+" :hg:`clone -U`)."
+msgstr ""
+
+msgid ""
+" If you want to update just one file to an older changeset, use\n"
+" :hg:`revert`."
+msgstr ""
msgid "cannot specify both -c/--check and -C/--clean"
msgstr ""
-#, fuzzy
msgid "uncommitted local changes"
-msgstr "未åŒæ¥çš„變更"
+msgstr ""
msgid "verify the integrity of the repository"
msgstr "é©—è‰ repository 的完整性"
msgid " Verify the integrity of the current repository."
-msgstr " Verify the integrity of the current repository."
+msgstr ""
msgid ""
" This will perform an extensive check of the repository's\n"
" integrity, validating the hashes and checksums of each entry in\n"
" the changelog, manifest, and tracked files, as well as the\n"
-" integrity of their crosslinks and indices.\n"
-" "
-msgstr ""
-" This will perform an extensive check of the repository's\n"
-" integrity, validating the hashes and checksums of each entry in\n"
-" the changelog, manifest, and tracked files, as well as the\n"
-" integrity of their crosslinks and indices.\n"
-" "
+" integrity of their crosslinks and indices."
+msgstr ""
msgid "output version and copyright information"
msgstr "輸出版本以åŠç‰ˆæ¬Šè³‡è¨Š"
@@ -8845,9 +8187,12 @@
msgid "Mercurial Distributed SCM (version %s)\n"
msgstr "mercurial 分散å¼ç‰ˆæœ¬æŽ§åˆ¶ç³»çµ± (版本 %s)\n"
-msgid ""
-"\n"
-"Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
+#, fuzzy
+msgid "(see http://mercurial.selenic.com for more information)"
+msgstr "\tSee 'hg help urls' for more information."
+
+msgid ""
+"Copyright (C) 2005-2010 Matt Mackall and others\n"
"This is free software; see the source for copying conditions. There is NO\n"
"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
msgstr ""
@@ -8855,6 +8200,9 @@
msgid "repository root directory or name of overlay bundle file"
msgstr ""
+msgid "DIR"
+msgstr ""
+
msgid "change working directory"
msgstr ""
@@ -8867,7 +8215,10 @@
msgid "enable additional output"
msgstr ""
-msgid "set/override config option"
+msgid "set/override config option (use 'section.name=value')"
+msgstr ""
+
+msgid "CONFIG"
msgstr ""
msgid "enable debugging output"
@@ -8879,10 +8230,16 @@
msgid "set the charset encoding"
msgstr ""
+msgid "ENCODE"
+msgstr ""
+
+msgid "MODE"
+msgstr ""
+
msgid "set the charset encoding mode"
msgstr ""
-msgid "print traceback on exception"
+msgid "always print a traceback on exception"
msgstr ""
msgid "time how long the command takes"
@@ -8898,7 +8255,7 @@
msgstr ""
msgid "do not perform actions, just print output"
-msgstr ""
+msgstr "ä¸è¦çœŸçš„行動,åªè¦é¡¯ç¤ºè¼¸å‡º"
msgid "specify ssh command to use"
msgstr ""
@@ -8906,16 +8263,19 @@
msgid "specify hg command to run on the remote side"
msgstr ""
+msgid "PATTERN"
+msgstr ""
+
msgid "include names matching the given patterns"
-msgstr ""
+msgstr "å«æ‹¬ç¬¦åˆæª”案表示å¼çš„檔案"
msgid "exclude names matching the given patterns"
-msgstr ""
-
-msgid "use <text> as commit message"
-msgstr ""
-
-msgid "read commit message from <file>"
+msgstr "排除符åˆæª”案表示å¼çš„檔案"
+
+msgid "use text as commit message"
+msgstr ""
+
+msgid "read commit message from file"
msgstr ""
msgid "record datecode as commit date"
@@ -8924,6 +8284,9 @@
msgid "record the specified user as committer"
msgstr ""
+msgid "STYLE"
+msgstr ""
+
msgid "display using template map file"
msgstr ""
@@ -8933,15 +8296,21 @@
msgid "do not show merges"
msgstr ""
+msgid "output diffstat-style summary of changes"
+msgstr ""
+
msgid "treat all files as text"
msgstr ""
-msgid "don't include dates in diff headers"
+msgid "omit dates from diff headers"
msgstr ""
msgid "show which function each change is in"
msgstr ""
+msgid "produce a diff that undoes the changes"
+msgstr ""
+
msgid "ignore white space when comparing lines"
msgstr ""
@@ -8954,21 +8323,33 @@
msgid "number of lines of context to show"
msgstr ""
+msgid "SIMILARITY"
+msgstr ""
+
msgid "guess renamed files by similarity (0<=s<=100)"
msgstr ""
+msgid "recurse into subrepositories"
+msgstr ""
+
msgid "[OPTION]... [FILE]..."
msgstr ""
msgid "annotate the specified revision"
-msgstr ""
-
-msgid "follow file copies and renames"
+msgstr "追溯æ述的版本號"
+
+msgid "follow copies/renames and list the filename (DEPRECATED)"
+msgstr ""
+
+msgid "don't follow copies and renames"
msgstr ""
msgid "list the author (long with -v)"
msgstr ""
+msgid "list the filename"
+msgstr ""
+
msgid "list the date (short with -q)"
msgstr ""
@@ -8987,6 +8368,9 @@
msgid "do not pass files through decoders"
msgstr ""
+msgid "PREFIX"
+msgstr ""
+
msgid "directory prefix for files in archive"
msgstr ""
@@ -9005,6 +8389,9 @@
msgid "parent to choose when backing out merge"
msgstr ""
+msgid "specify merge tool"
+msgstr ""
+
msgid "revision to backout"
msgstr ""
@@ -9029,7 +8416,7 @@
msgid "do not update to target"
msgstr ""
-msgid "[-gbsr] [-c CMD] [REV]"
+msgid "[-gbsr] [-U] [-c CMD] [REV]"
msgstr ""
msgid "set branch name even if it shadows an existing branch"
@@ -9047,16 +8434,19 @@
msgid "show normal and closed branches"
msgstr ""
-msgid "[-a]"
-msgstr ""
-
-msgid "run even when remote repository is unrelated"
-msgstr ""
-
-msgid "a changeset up to which you would like to bundle"
-msgstr ""
-
-msgid "a base changeset to specify instead of a destination"
+msgid "[-ac]"
+msgstr ""
+
+msgid "run even when the destination is unrelated"
+msgstr ""
+
+msgid "a changeset intended to be added to the destination"
+msgstr ""
+
+msgid "a specific branch you would like to bundle"
+msgstr ""
+
+msgid "a base changeset assumed to be available at the destination"
msgstr ""
msgid "bundle all changesets in the repository"
@@ -9065,7 +8455,7 @@
msgid "bundle compression type to use"
msgstr ""
-msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]"
+msgid "[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]"
msgstr ""
msgid "print output to file with formatted name"
@@ -9080,10 +8470,16 @@
msgid "[OPTION]... FILE..."
msgstr ""
-msgid "the clone will only contain a repository (no working copy)"
-msgstr ""
-
-msgid "a changeset you would like to have after cloning"
+msgid "the clone will include an empty working copy (only a repository)"
+msgstr ""
+
+msgid "revision, tag or branch to check out"
+msgstr ""
+
+msgid "include the specified changeset"
+msgstr ""
+
+msgid "clone only the specified branch"
msgstr ""
msgid "[OPTION]... SOURCE [DEST]"
@@ -9107,6 +8503,21 @@
msgid "[INDEX] REV1 REV2"
msgstr ""
+msgid "add single file mergeable changes"
+msgstr ""
+
+msgid "add single file all revs append to"
+msgstr ""
+
+msgid "add single file all revs overwrite"
+msgstr ""
+
+msgid "add new file at each rev"
+msgstr ""
+
+msgid "[OPTION]... TEXT"
+msgstr ""
+
msgid "[COMMAND]"
msgstr ""
@@ -9116,6 +8527,21 @@
msgid "[-o] CMD"
msgstr ""
+msgid "use tags as labels"
+msgstr ""
+
+msgid "annotate with branch names"
+msgstr ""
+
+msgid "use dots for runs"
+msgstr ""
+
+msgid "separate elements by spaces"
+msgstr ""
+
+msgid "[OPTION]... [FILE [REV]...]"
+msgstr ""
+
msgid "try extended date formats"
msgstr ""
@@ -9128,7 +8554,10 @@
msgid "[PATH]"
msgstr ""
-msgid "FILE"
+msgid "revlog format"
+msgstr ""
+
+msgid "REPO NAMESPACE [KEY OLD NEW]"
msgstr ""
msgid "revision to rebuild to"
@@ -9155,12 +8584,15 @@
msgid "revision to check"
msgstr ""
-msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
+msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
msgstr ""
msgid "diff against the second parent"
msgstr ""
+msgid "revisions to export"
+msgstr ""
+
msgid "[OPTION]... [-o OUTFILESPEC] REV..."
msgstr ""
@@ -9182,22 +8614,28 @@
msgid "print matching line numbers"
msgstr ""
-msgid "search in given revision range"
+msgid "only search files changed within revision range"
msgstr ""
msgid "[OPTION]... PATTERN [FILE]..."
msgstr ""
-msgid "show only heads which are descendants of REV"
-msgstr ""
-
-msgid "show only the active branch heads from open branches"
+msgid "show only heads which are descendants of STARTREV"
+msgstr ""
+
+msgid "STARTREV"
+msgstr ""
+
+msgid "show topological heads only"
+msgstr ""
+
+msgid "show active branchheads only (DEPRECATED)"
msgstr ""
msgid "show normal and closed branch heads"
msgstr ""
-msgid "[-r STARTREV] [REV]..."
+msgid "[-ac] [-r STARTREV] [REV]..."
msgstr ""
msgid "[TOPIC]"
@@ -9221,7 +8659,12 @@
msgid "[-nibt] [-r REV] [SOURCE]"
msgstr ""
-msgid "directory strip option for patch. This has the same meaning as the corresponding patch option"
+msgid ""
+"directory strip option for patch. This has the same meaning as the "
+"corresponding patch option"
+msgstr ""
+
+msgid "PATH"
msgstr ""
msgid "base path"
@@ -9242,13 +8685,19 @@
msgid "[OPTION]... PATCH..."
msgstr ""
+msgid "run even if remote repository is unrelated"
+msgstr ""
+
msgid "show newest record first"
msgstr ""
msgid "file to store the bundles into"
msgstr ""
-msgid "a specific revision up to which you would like to pull"
+msgid "a remote changeset intended to be added"
+msgstr ""
+
+msgid "a specific branch you would like to pull"
msgstr ""
msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
@@ -9257,7 +8706,7 @@
msgid "[-e CMD] [--remotecmd CMD] [DEST]"
msgstr ""
-msgid "search the repository as it stood at REV"
+msgid "search the repository as it is in REV"
msgstr ""
msgid "end filenames with NUL, for use with xargs"
@@ -9278,7 +8727,7 @@
msgid "show copied files"
msgstr ""
-msgid "do case-insensitive search for a keyword"
+msgid "do case-insensitive search for a given text"
msgstr ""
msgid "include revisions where files were removed"
@@ -9290,7 +8739,10 @@
msgid "revisions committed by user"
msgstr ""
-msgid "show only changesets within the given named branch"
+msgid "show only changesets within the given named branch (DEPRECATED)"
+msgstr ""
+
+msgid "show changesets within the given named branch"
msgstr ""
msgid "do not display revision or any of its ancestors"
@@ -9314,16 +8766,19 @@
msgid "review revisions to merge (no merge is performed)"
msgstr ""
-msgid "[-f] [[-r] REV]"
-msgstr ""
-
-msgid "a specific revision up to which you would like to push"
+msgid "[-P] [-f] [[-r] REV]"
+msgstr ""
+
+msgid "a changeset intended to be included in the destination"
+msgstr ""
+
+msgid "a specific branch you would like to push"
msgstr ""
msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
msgstr ""
-msgid "show parents from the specified revision"
+msgid "show parents of the specified revision"
msgstr ""
msgid "[-r REV] [FILE]"
@@ -9332,7 +8787,10 @@
msgid "[NAME]"
msgstr ""
-msgid "update to new tip if changesets were pulled"
+msgid "update to new branch head if changesets were pulled"
+msgstr ""
+
+msgid "run even when remote repository is unrelated"
msgstr ""
msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
@@ -9341,6 +8799,9 @@
msgid "force push"
msgstr ""
+msgid "allow pushing a new branch"
+msgstr ""
+
msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
msgstr ""
@@ -9356,7 +8817,7 @@
msgid "[OPTION]... SOURCE... DEST"
msgstr ""
-msgid "remerge all unresolved files"
+msgid "select all unresolved files"
msgstr ""
msgid "list state of files needing merge"
@@ -9365,7 +8826,10 @@
msgid "mark files as resolved"
msgstr ""
-msgid "unmark files as resolved"
+msgid "mark files as unresolved"
+msgstr ""
+
+msgid "hide status prefix"
msgstr ""
msgid "revert all changes when no arguments given"
@@ -9374,7 +8838,7 @@
msgid "tipmost revision matching date"
msgstr ""
-msgid "revision to revert to"
+msgid "revert to the specified revision"
msgstr ""
msgid "do not save backup copies of files"
@@ -9389,9 +8853,15 @@
msgid "name of error log file to write to"
msgstr ""
+msgid "PORT"
+msgstr ""
+
msgid "port to listen on (default: 8000)"
msgstr ""
+msgid "ADDR"
+msgstr ""
+
msgid "address to listen on (default: all interfaces)"
msgstr ""
@@ -9401,7 +8871,10 @@
msgid "name to show in web pages (default: working directory)"
msgstr ""
-msgid "name of the webdir config file (serve more than one repository)"
+msgid "name of the hgweb config file (see \"hg help hgweb\")"
+msgstr ""
+
+msgid "name of the hgweb config file (DEPRECATED)"
msgstr ""
msgid "for remote clients"
@@ -9452,17 +8925,17 @@
msgid "show only ignored files"
msgstr ""
-msgid "hide status prefix"
-msgstr ""
-
msgid "show source of copied files"
msgstr ""
msgid "show difference from revision"
msgstr ""
+msgid "list the changed files of a revision"
+msgstr ""
+
msgid "replace existing tag"
-msgstr ""
+msgstr "覆蓋已å˜åœ¨çš„標記"
msgid "make the tag local"
msgstr ""
@@ -9471,37 +8944,98 @@
msgstr ""
msgid "remove a tag"
-msgstr ""
-
-msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
-msgstr ""
-
-msgid "[-p]"
-msgstr ""
-
-msgid "update to new tip if changesets were unbundled"
+msgstr "移除一個標記"
+
+msgid "use <text> as commit message"
+msgstr ""
+
+msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
+msgstr ""
+
+msgid "[-p] [-g]"
+msgstr ""
+
+msgid "update to new branch head if changesets were unbundled"
msgstr ""
msgid "[-u] FILE..."
msgstr ""
-msgid "overwrite locally modified files (no backup)"
-msgstr ""
-
-msgid "check for uncommitted changes"
-msgstr ""
-
-msgid "[-C] [-d DATE] [[-r] REV]"
-msgstr ""
-
-#, python-format
-msgid "config error at %s:%d: '%s'"
-msgstr ""
+msgid "discard uncommitted changes (no backup)"
+msgstr "å–消沒有æ交的變更(沒有備份)"
+
+msgid "update across branches if no uncommitted changes"
+msgstr ""
+
+msgid "[-c] [-C] [-d DATE] [[-r] REV]"
+msgstr ""
+
+#, python-format
+msgid "cannot include %s (%s)"
+msgstr "ä¸èƒ½å¼•å…¥ %s (%s)"
msgid "not found in manifest"
msgstr ""
+#, python-format
+msgid "no such file in rev %s"
+msgstr ""
+
msgid "branch name not in UTF-8!"
+msgstr "分支å稱ä¸æ˜¯UTF-8編碼!"
+
+#, python-format
+msgid "%s does not exist!\n"
+msgstr "%s ä¸å˜åœ¨å–”!\n"
+
+#, python-format
+msgid ""
+"%s: up to %d MB of RAM may be required to manage this file\n"
+"(use 'hg revert %s' to cancel the pending addition)\n"
+msgstr ""
+
+#, python-format
+msgid "%s not added: only files and symlinks supported currently\n"
+msgstr "%s ä¸èƒ½æ–°å¢ž : ç›®å‰åªæœ‰æ”¯æ´æª”案跟符號連çµæª”\n"
+
+#, python-format
+msgid "%s already tracked!\n"
+msgstr "%s 已經追蹤!\n"
+
+#, python-format
+msgid "%s not added!\n"
+msgstr "%sä¸èƒ½æ–°å¢ž!\n"
+
+#, python-format
+msgid "%s still exists!\n"
+msgstr "%sä»ç„¶å˜åœ¨!\n"
+
+#, python-format
+msgid "%s not tracked!\n"
+msgstr "%s ä¸èƒ½è¿½è¹¤!\n"
+
+#, python-format
+msgid "%s not removed!\n"
+msgstr "%s ä¸èƒ½ç§»é™¤!\n"
+
+#, python-format
+msgid "copy failed: %s is not a file or a symbolic link\n"
+msgstr "複製失敗: %s ä¸æ˜¯æª”案或符號連çµæª”\n"
+
+#, python-format
+msgid "invalid character in dag description: %s..."
+msgstr ""
+
+#, python-format
+msgid "expected id %i, got %i"
+msgstr ""
+
+#, python-format
+msgid "parent id %i is larger than current id %i"
+msgstr "æ¯ç³»id %i 大於目å‰çš„id %i"
+
+#, python-format
+msgid "invalid event type in dag: %s"
msgstr ""
msgid "working directory state appears damaged!"
@@ -9509,7 +9043,7 @@
#, python-format
msgid "'\\n' and '\\r' disallowed in filenames: %r"
-msgstr ""
+msgstr "檔åä¸å‡†æœ‰\\n è·Ÿ \\r: %r"
#, python-format
msgid "directory %r already in dirstate"
@@ -9520,17 +9054,21 @@
msgstr ""
#, python-format
+msgid "setting %r to other parent only allowed in merges"
+msgstr ""
+
+#, python-format
msgid "not in dirstate: %s\n"
msgstr ""
msgid "unknown"
-msgstr ""
+msgstr "ä¸æ¸…楚"
msgid "character device"
-msgstr ""
+msgstr "å—å…ƒè£ç½®"
msgid "block device"
-msgstr ""
+msgstr "å€å¡Šè£ç½®"
msgid "fifo"
msgstr ""
@@ -9539,18 +9077,70 @@
msgstr ""
msgid "directory"
-msgstr ""
+msgstr "目錄"
#, python-format
msgid "unsupported file type (type is %s)"
+msgstr "ä¸æ”¯æ´çš„檔案型態 (型態是 %s)"
+
+msgid "searching for changes\n"
+msgstr "æ£åœ¨æœå°‹è®Šæ›´\n"
+
+msgid "queries"
+msgstr ""
+
+msgid "searching"
+msgstr "æœå°‹ä¸"
+
+msgid "already have changeset "
+msgstr "已經有changeset了"
+
+msgid "warning: repository is unrelated\n"
+msgstr ""
+
+msgid "repository is unrelated"
+msgstr ""
+
+#, python-format
+msgid "push creates new remote branches: %s!"
+msgstr "push 建立新的é 端分支 '%s'!"
+
+msgid "use 'hg push --new-branch' to create new remote branches"
+msgstr "使用 'hg push --new-branch' 建立新的é 端分支"
+
+#, python-format
+msgid "push creates new remote heads on branch '%s'!"
+msgstr "push 在分支 '%s'建立新的é 端標é !"
+
+msgid "push creates new remote heads!"
+msgstr "push 建立新的é 端標é (heads)!"
+
+msgid "you should pull and merge or use push -f to force"
+msgstr ""
+
+msgid "did you forget to merge? use push -f to force"
+msgstr ""
+
+msgid "note: unsynced remote changes!\n"
msgstr ""
#, python-format
msgid "abort: %s\n"
-msgstr ""
-
-#, python-format
-msgid "hg: %s\n"
+msgstr "ä¸æ¢: %s\n"
+
+#, python-format
+msgid "(%s)\n"
+msgstr ""
+
+#, python-format
+msgid "hg: parse error at %s: %s\n"
+msgstr ""
+
+#, python-format
+msgid "hg: parse error: %s\n"
+msgstr ""
+
+msgid "entering debugger - type c to continue starting hg or h for help\n"
msgstr ""
#, python-format
@@ -9569,43 +9159,43 @@
#, python-format
msgid "abort: %s: %s\n"
-msgstr ""
+msgstr "ä¸æ¢: %s: %s\n"
#, python-format
msgid "abort: could not lock %s: %s\n"
-msgstr ""
+msgstr "ä¸æ¢: 我ä¸èƒ½éŽ–ä½ %s: %s\n"
#, python-format
msgid "hg %s: %s\n"
msgstr ""
#, python-format
+msgid "hg: %s\n"
+msgstr ""
+
+#, python-format
msgid "abort: %s!\n"
-msgstr ""
+msgstr "ä¸æ¢: %s!\n"
#, python-format
msgid "abort: %s"
-msgstr ""
+msgstr "ä¸æ¢: %s"
msgid " empty string\n"
-msgstr ""
+msgstr "空å—串\n"
msgid "killed!\n"
msgstr ""
#, python-format
msgid "hg: unknown command '%s'\n"
-msgstr ""
-
-#, python-format
-msgid "abort: could not import module %s!\n"
-msgstr ""
+msgstr "hg: ä¸èªå¾—'%s'命令\n"
msgid "(did you forget to compile extensions?)\n"
-msgstr ""
+msgstr "(ä½ å¿˜è¨˜ç·¨è¯é¡å¤–功能(extensions)?)\n"
msgid "(is your Python install correct?)\n"
-msgstr ""
+msgstr "(python安è£æ£ç¢ºå˜›?)\n"
#, python-format
msgid "abort: error: %s\n"
@@ -9623,15 +9213,16 @@
msgstr ""
msgid "abort: out of memory\n"
-msgstr ""
-
-msgid "** unknown exception encountered, details follow\n"
-msgstr ""
-
-msgid "** report bug details to http://mercurial.selenic.com/bts/\n"
-msgstr ""
-
-msgid "** or mercurial@selenic.com\n"
+msgstr "ä¸æ¢: 記憶體沒了\n"
+
+msgid "** unknown exception encountered, please report by visiting\n"
+msgstr ""
+
+msgid "** http://mercurial.selenic.com/wiki/BugTracker\n"
+msgstr ""
+
+#, python-format
+msgid "** Python %s\n"
msgstr ""
#, python-format
@@ -9640,13 +9231,19 @@
#, python-format
msgid "** Extensions loaded: %s\n"
-msgstr ""
+msgstr "** 載入é¡å¤–套件: %s\n"
#, python-format
msgid "no definition for alias '%s'\n"
msgstr ""
#, python-format
+msgid ""
+"error in definition for alias '%s': %s may only be given on the command "
+"line\n"
+msgstr ""
+
+#, python-format
msgid "alias '%s' resolves to unknown command '%s'\n"
msgstr ""
@@ -9655,20 +9252,26 @@
msgstr ""
#, python-format
-msgid "malformed --config option: %s"
+msgid "malformed --config option: %r (use --config section.name=value)"
+msgstr ""
+
+#, python-format
+msgid "error getting current working directory: %s"
msgstr ""
#, python-format
msgid "extension '%s' overrides commands: %s\n"
msgstr ""
-msgid "Option --config may not be abbreviated!"
-msgstr ""
-
-msgid "Option --cwd may not be abbreviated!"
-msgstr ""
-
-msgid "Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!"
+msgid "option --config may not be abbreviated!"
+msgstr ""
+
+msgid "option --cwd may not be abbreviated!"
+msgstr ""
+
+msgid ""
+"Option -R has to be separated from other options (e.g. not -qR) and --"
+"repository may only be abbreviated as --repo!"
msgstr ""
#, python-format
@@ -9677,25 +9280,30 @@
#, python-format
msgid "repository '%s' is not local"
+msgstr "'%s' 儲å˜åº«ä¸åœ¨æœ¬åœ°ç«¯"
+
+msgid "warning: --repository ignored\n"
msgstr ""
msgid "invalid arguments"
-msgstr ""
+msgstr "無效的åƒæ•¸"
#, python-format
msgid "unrecognized profiling format '%s' - Ignored\n"
msgstr ""
-msgid "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/misc/lsprof/"
+msgid ""
+"lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/"
+"misc/lsprof/"
msgstr ""
#, python-format
msgid "*** failed to import extension %s from %s: %s\n"
-msgstr "*** 匯入擴充套件 %s 失敗，路徑為 %s: %s\n"
+msgstr "*** 匯入é¡å¤–套件 %s 失敗，路徑為 %s: %s\n"
#, python-format
msgid "*** failed to import extension %s: %s\n"
-msgstr ""
+msgstr "*** 匯入é¡å¤–套件 %s 失敗: %s\n"
#, python-format
msgid "couldn't find merge tool %s\n"
@@ -9736,35 +9344,39 @@
msgstr "åˆä½µ %s ä¸\n"
#, python-format
+msgid "%s.premerge not valid ('%s' is neither boolean nor %s)"
+msgstr ""
+
+#, python-format
+msgid "was merge of '%s' successful (yn)?"
+msgstr ""
+
+#, python-format
msgid ""
" output file %s appears unchanged\n"
"was merge successful (yn)?"
msgstr ""
-msgid "&No"
-msgstr ""
-
-msgid "&Yes"
-msgstr ""
-
#, python-format
msgid "merging %s failed!\n"
msgstr "åˆä½µ %s 失敗ï¼\n"
-#, python-format
-msgid "Inconsistent state, %s:%s is good and bad"
+msgid "starting revisions are not directly related"
+msgstr ""
+
+#, python-format
+msgid "inconsistent state, %s:%s is good and bad"
msgstr ""
#, python-format
msgid "unknown bisect kind %s"
msgstr ""
-#, fuzzy
msgid "disabled extensions:"
-msgstr ""
-"\n"
-"已啟用的擴充套件:\n"
-"\n"
+msgstr "ä¸èƒ½ä½¿ç”¨çš„é¡å¤–套件:"
+
+msgid "Configuration Files"
+msgstr "è¨å®šæª”"
msgid "Date Formats"
msgstr "æ—¥æœŸæ ¼å¼"
@@ -9776,31 +9388,1972 @@
msgstr "環境變數"
msgid "Specifying Single Revisions"
-msgstr ""
+msgstr "表述一個版本"
msgid "Specifying Multiple Revisions"
-msgstr ""
+msgstr "表述多個版本"
+
+msgid "Specifying Revision Sets"
+msgstr "表述版本集åˆ"
msgid "Diff Formats"
-msgstr ""
+msgstr "Diff æ ¼å¼"
+
+msgid "Merge Tools"
+msgstr "åˆä½µå·¥å…·"
msgid "Template Usage"
-msgstr ""
+msgstr "樣å¼çš„使用"
msgid "URL Paths"
-msgstr ""
+msgstr "URL路徑"
msgid "Using additional features"
-msgstr ""
+msgstr "使用é¡å¤–功能"
+
+#, fuzzy
+msgid "Subrepositories"
+msgstr "儲å˜åº« %s"
+
+msgid "Configuring hgweb"
+msgstr "è¨å®š hgweb"
+
+msgid "Glossary"
+msgstr ""
+
+msgid ""
+"Mercurial reads configuration data from several files, if they exist.\n"
+"Below we list the most specific file first."
+msgstr ""
+
+msgid "On Windows, these configuration files are read:"
+msgstr ""
+
+msgid ""
+"- ``<repo>\\.hg\\hgrc``\n"
+"- ``%USERPROFILE%\\.hgrc``\n"
+"- ``%USERPROFILE%\\mercurial.ini``\n"
+"- ``%HOME%\\.hgrc``\n"
+"- ``%HOME%\\mercurial.ini``\n"
+"- ``C:\\mercurial\\mercurial.ini`` (unless regkey or hgrc.d\\ or mercurial."
+"ini found)\n"
+"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (unless hgrc.d\\ or mercurial."
+"ini found)\n"
+"- ``<hg.exe-dir>\\hgrc.d\\*.rc`` (unless mercurial.ini found)\n"
+"- ``<hg.exe-dir>\\mercurial.ini``"
+msgstr ""
+
+msgid "On Unix, these files are read:"
+msgstr ""
+
+msgid ""
+"- ``<repo>/.hg/hgrc``\n"
+"- ``$HOME/.hgrc``\n"
+"- ``/etc/mercurial/hgrc``\n"
+"- ``/etc/mercurial/hgrc.d/*.rc``\n"
+"- ``<install-root>/etc/mercurial/hgrc``\n"
+"- ``<install-root>/etc/mercurial/hgrc.d/*.rc``"
+msgstr ""
+
+msgid ""
+"If there is a per-repository configuration file which is not owned by\n"
+"the active user, Mercurial will warn you that the file is skipped::"
+msgstr ""
+
+msgid ""
+" not trusting file <repo>/.hg/hgrc from untrusted user USER, group GROUP"
+msgstr ""
+
+msgid ""
+"If this bothers you, the warning can be silenced (the file would still\n"
+"be ignored) or trust can be established. Use one of the following\n"
+"settings, the syntax is explained below:"
+msgstr ""
+
+msgid ""
+"- ``ui.report_untrusted = False``\n"
+"- ``trusted.users = USER``\n"
+"- ``trusted.groups = GROUP``"
+msgstr ""
+
+msgid ""
+"The configuration files for Mercurial use a simple ini-file format. A\n"
+"configuration file consists of sections, led by a ``[section]`` header\n"
+"and followed by ``name = value`` entries::"
+msgstr ""
+
+msgid ""
+" [ui]\n"
+" username = Firstname Lastname <firstname.lastname@example.net>\n"
+" verbose = True"
+msgstr ""
+
+msgid ""
+"The above entries will be referred to as ``ui.username`` and\n"
+"``ui.verbose``, respectively. Please see the hgrc man page for a full\n"
+"description of the possible configuration values:"
+msgstr ""
+
+msgid ""
+"- on Unix-like systems: ``man hgrc``\n"
+"- online: http://www.selenic.com/mercurial/hgrc.5.html\n"
+msgstr ""
+
+msgid "Some commands allow the user to specify a date, e.g.:"
+msgstr "一些命令å…許使用者表示時間,e.g.:"
+
+msgid ""
+"- backout, commit, import, tag: Specify the commit date.\n"
+"- log, revert, update: Select revision(s) by date."
+msgstr ""
+"- backout, commit, import, tag: æ交的時間.\n"
+"- log, revert, update: 由時間來é¸æ“‡ä¿®å®šç‰ˆ(s)"
+
+msgid "Many date formats are valid. Here are some examples:"
+msgstr "支æ´è¨±å¤šçš„æ™‚é–“æ ¼å¼,這邊有一些範例::"
+
+msgid ""
+"- ``Wed Dec 6 13:18:29 2006`` (local timezone assumed)\n"
+"- ``Dec 6 13:18 -0600`` (year assumed, time offset provided)\n"
+"- ``Dec 6 13:18 UTC`` (UTC and GMT are aliases for +0000)\n"
+"- ``Dec 6`` (midnight)\n"
+"- ``13:18`` (today assumed)\n"
+"- ``3:39`` (3:39AM assumed)\n"
+"- ``3:39pm`` (15:39)\n"
+"- ``2006-12-06 13:18:29`` (ISO 8601 format)\n"
+"- ``2006-12-6 13:18``\n"
+"- ``2006-12-6``\n"
+"- ``12-6``\n"
+"- ``12/6``\n"
+"- ``12/6/6`` (Dec 6 2006)"
+msgstr ""
+
+msgid "Lastly, there is Mercurial's internal format:"
+msgstr "最後,是Mercurial çš„å…§éƒ¨æ ¼å¼::"
+
+msgid "- ``1165432709 0`` (Wed Dec 6 13:18:29 2006 UTC)"
+msgstr ""
+
+msgid ""
+"This is the internal representation format for dates. unixtime is the\n"
+"number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n"
+"the offset of the local timezone, in seconds west of UTC (negative if\n"
+"the timezone is east of UTC)."
+msgstr ""
+
+msgid "The log command also accepts date ranges:"
+msgstr "log 命令也接收 時間å€é–“::"
+
+msgid ""
+"- ``<{datetime}`` - at or before a given date/time\n"
+"- ``>{datetime}`` - on or after a given date/time\n"
+"- ``{datetime} to {datetime}`` - a date range, inclusive\n"
+"- ``-{days}`` - within a given number of days of today\n"
+msgstr ""
+
+msgid ""
+"Mercurial's default format for showing changes between two versions of\n"
+"a file is compatible with the unified format of GNU diff, which can be\n"
+"used by GNU patch and many other standard tools."
+msgstr ""
+
+msgid ""
+"While this standard format is often enough, it does not encode the\n"
+"following information:"
+msgstr ""
+
+msgid ""
+"- executable status and other permission bits\n"
+"- copy or rename information\n"
+"- changes in binary files\n"
+"- creation or deletion of empty files"
+msgstr ""
+
+msgid ""
+"Mercurial also supports the extended diff format from the git VCS\n"
+"which addresses these limitations. The git diff format is not produced\n"
+"by default because a few widespread tools still do not understand this\n"
+"format."
+msgstr ""
+
+msgid ""
+"This means that when generating diffs from a Mercurial repository\n"
+"(e.g. with :hg:`export`), you should be careful about things like file\n"
+"copies and renames or other things mentioned above, because when\n"
+"applying a standard diff to a different repository, this extra\n"
+"information is lost. Mercurial's internal operations (like push and\n"
+"pull) are not affected by this, because they use an internal binary\n"
+"format for communicating changes."
+msgstr ""
+
+msgid ""
+"To make Mercurial produce the git extended diff format, use the --git\n"
+"option available for many commands, or set 'git = True' in the [diff]\n"
+"section of your configuration file. You do not need to set this option\n"
+"when importing diffs in this format or using them in the mq extension.\n"
+msgstr ""
+
+msgid ""
+"HG\n"
+" Path to the 'hg' executable, automatically passed when running\n"
+" hooks, extensions or external tools. If unset or empty, this is\n"
+" the hg executable's name if it's frozen, or an executable named\n"
+" 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
+" Windows) is searched."
+msgstr ""
+
+msgid ""
+"HGEDITOR\n"
+" This is the name of the editor to run when committing. See EDITOR."
+msgstr ""
+
+msgid " (deprecated, use configuration file)"
+msgstr ""
+
+msgid ""
+"HGENCODING\n"
+" This overrides the default locale setting detected by Mercurial.\n"
+" This setting is used to convert data including usernames,\n"
+" changeset descriptions, tag names, and branches. This setting can\n"
+" be overridden with the --encoding command-line option."
+msgstr ""
+
+msgid ""
+"HGENCODINGMODE\n"
+" This sets Mercurial's behavior for handling unknown characters\n"
+" while transcoding user input. The default is \"strict\", which\n"
+" causes Mercurial to abort if it can't map a character. Other\n"
+" settings include \"replace\", which replaces unknown characters, and\n"
+" \"ignore\", which drops them. This setting can be overridden with\n"
+" the --encodingmode command-line option."
+msgstr ""
+
+msgid ""
+"HGENCODINGAMBIGUOUS\n"
+" This sets Mercurial's behavior for handling characters with\n"
+" \"ambiguous\" widths like accented Latin characters with East Asian\n"
+" fonts. By default, Mercurial assumes ambiguous characters are\n"
+" narrow, set this variable to \"wide\" if such characters cause\n"
+" formatting problems."
+msgstr ""
+
+msgid ""
+"HGMERGE\n"
+" An executable to use for resolving merge conflicts. The program\n"
+" will be executed with three arguments: local file, remote file,\n"
+" ancestor file."
+msgstr ""
+
+msgid ""
+"HGRCPATH\n"
+" A list of files or directories to search for configuration\n"
+" files. Item separator is \":\" on Unix, \";\" on Windows. If HGRCPATH\n"
+" is not set, platform default search path is used. If empty, only\n"
+" the .hg/hgrc from the current repository is read."
+msgstr ""
+
+msgid " For each element in HGRCPATH:"
+msgstr ""
+
+msgid ""
+" - if it's a directory, all files ending with .rc are added\n"
+" - otherwise, the file itself will be added"
+msgstr ""
+
+msgid ""
+"HGPLAIN\n"
+" When set, this disables any configuration settings that might\n"
+" change Mercurial's default output. This includes encoding,\n"
+" defaults, verbose mode, debug mode, quiet mode, tracebacks, and\n"
+" localization. This can be useful when scripting against Mercurial\n"
+" in the face of existing user configuration."
+msgstr ""
+
+msgid ""
+" Equivalent options set via command line flags or environment\n"
+" variables are not overridden."
+msgstr ""
+
+msgid ""
+"HGUSER\n"
+" This is the string used as the author of a commit. If not set,\n"
+" available values will be considered in this order:"
+msgstr ""
+
+msgid ""
+" - HGUSER (deprecated)\n"
+" - configuration files from the HGRCPATH\n"
+" - EMAIL\n"
+" - interactive prompt\n"
+" - LOGNAME (with ``@hostname`` appended)"
+msgstr ""
+
+msgid ""
+"EMAIL\n"
+" May be used as the author of a commit; see HGUSER."
+msgstr ""
+
+msgid ""
+"LOGNAME\n"
+" May be used as the author of a commit; see HGUSER."
+msgstr ""
+
+msgid ""
+"VISUAL\n"
+" This is the name of the editor to use when committing. See EDITOR."
+msgstr ""
+
+msgid ""
+"EDITOR\n"
+" Sometimes Mercurial needs to open a text file in an editor for a\n"
+" user to modify, for example when writing commit messages. The\n"
+" editor it uses is determined by looking at the environment\n"
+" variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n"
+" non-empty one is chosen. If all of them are empty, the editor\n"
+" defaults to 'vi'."
+msgstr ""
+
+msgid ""
+"PYTHONPATH\n"
+" This is used by Python to find imported modules and may need to be\n"
+" set appropriately if this Mercurial is not installed system-wide.\n"
+msgstr ""
+
+msgid ""
+"Mercurial has the ability to add new features through the use of\n"
+"extensions. Extensions may add new commands, add options to\n"
+"existing commands, change the default behavior of commands, or\n"
+"implement hooks."
+msgstr ""
+
+msgid ""
+"Extensions are not loaded by default for a variety of reasons:\n"
+"they can increase startup overhead; they may be meant for advanced\n"
+"usage only; they may provide potentially dangerous abilities (such\n"
+"as letting you destroy or modify history); they might not be ready\n"
+"for prime time; or they may alter some usual behaviors of stock\n"
+"Mercurial. It is thus up to the user to activate extensions as\n"
+"needed."
+msgstr ""
+
+msgid ""
+"To enable the \"foo\" extension, either shipped with Mercurial or in the\n"
+"Python search path, create an entry for it in your configuration file,\n"
+"like this::"
+msgstr ""
+
+msgid ""
+" [extensions]\n"
+" foo ="
+msgstr ""
+
+msgid "You may also specify the full path to an extension::"
+msgstr ""
+
+msgid ""
+" [extensions]\n"
+" myfeature = ~/.hgext/myfeature.py"
+msgstr ""
+
+msgid ""
+"To explicitly disable an extension enabled in a configuration file of\n"
+"broader scope, prepend its path with !::"
+msgstr ""
+
+msgid ""
+" [extensions]\n"
+" # disabling extension bar residing in /path/to/extension/bar.py\n"
+" bar = !/path/to/extension/bar.py\n"
+" # ditto, but no path was supplied for extension baz\n"
+" baz = !\n"
+msgstr ""
+
+msgid ""
+"Ancestor\n"
+" Any changeset that can be reached by an unbroken chain of parent\n"
+" changesets from a given changeset. More precisely, the ancestors\n"
+" of a changeset can be defined by two properties: a parent of a\n"
+" changeset is an ancestor, and a parent of an ancestor is an\n"
+" ancestor. See also: 'Descendant'."
+msgstr ""
+
+msgid ""
+"Branch\n"
+" (Noun) A child changeset that has been created from a parent that\n"
+" is not a head. These are known as topological branches, see\n"
+" 'Branch, topological'. If a topological branch is named, it becomes\n"
+" a named branch. If a topological branch is not named, it becomes\n"
+" an anonymous branch. See 'Branch, anonymous' and 'Branch, named'."
+msgstr ""
+
+msgid ""
+" Branches may be created when changes are pulled from or pushed to\n"
+" a remote repository, since new heads may be created by these\n"
+" operations. Note that the term branch can also be used informally\n"
+" to describe a development process in which certain development is\n"
+" done independently of other development. This is sometimes done\n"
+" explicitly with a named branch, but it can also be done locally,\n"
+" using bookmarks or clones and anonymous branches."
+msgstr ""
+
+msgid " Example: \"The experimental branch\"."
+msgstr ""
+
+msgid ""
+" (Verb) The action of creating a child changeset which results in\n"
+" its parent having more than one child."
+msgstr ""
+
+msgid " Example: \"I'm going to branch at X\"."
+msgstr ""
+
+msgid ""
+"Branch, anonymous\n"
+" Every time a new child changeset is created from a parent that is not\n"
+" a head and the name of the branch is not changed, a new anonymous\n"
+" branch is created."
+msgstr ""
+
+msgid ""
+"Branch, closed\n"
+" A named branch whose branch heads have all been closed."
+msgstr ""
+
+msgid ""
+"Branch, default\n"
+" The branch assigned to a changeset when no name has previously been\n"
+" assigned."
+msgstr ""
+
+msgid ""
+"Branch head\n"
+" See 'Head, branch'."
+msgstr ""
+
+msgid ""
+"Branch, inactive\n"
+" If a named branch has no topological heads, it is considered to be\n"
+" inactive. As an example, a feature branch becomes inactive when it\n"
+" is merged into the default branch. The :hg:`branches` command\n"
+" shows inactive branches by default, though they can be hidden with\n"
+" :hg:`branches --active`."
+msgstr ""
+
+msgid ""
+" NOTE: this concept is deprecated because it is too implicit.\n"
+" Branches should now be explicitly closed using :hg:`commit\n"
+" --close-branch` when they are no longer needed."
+msgstr ""
+
+msgid ""
+"Branch, named\n"
+" A collection of changesets which have the same branch name. By\n"
+" default, children of a changeset in a named branch belong to the\n"
+" same named branch. A child can be explicitly assigned to a\n"
+" different branch. See :hg:`help branch`, :hg:`help branches` and\n"
+" :hg:`commit --close-branch` for more information on managing\n"
+" branches."
+msgstr ""
+
+msgid ""
+" Named branches can be thought of as a kind of namespace, dividing\n"
+" the collection of changesets that comprise the repository into a\n"
+" collection of disjoint subsets. A named branch is not necessarily\n"
+" a topological branch. If a new named branch is created from the\n"
+" head of another named branch, or the default branch, but no\n"
+" further changesets are added to that previous branch, then that\n"
+" previous branch will be a branch in name only."
+msgstr ""
+
+msgid ""
+"Branch tip\n"
+" See 'Tip, branch'."
+msgstr ""
+
+msgid ""
+"Branch, topological\n"
+" Every time a new child changeset is created from a parent that is\n"
+" not a head, a new topological branch is created. If a topological\n"
+" branch is named, it becomes a named branch. If a topological\n"
+" branch is not named, it becomes an anonymous branch of the\n"
+" current, possibly default, branch."
+msgstr ""
+
+msgid ""
+"Changelog\n"
+" A record of the changesets in the order in which they were added\n"
+" to the repository. This includes details such as changeset id,\n"
+" author, commit message, date, and list of changed files."
+msgstr ""
+
+msgid ""
+"Changeset\n"
+" A snapshot of the state of the repository used to record a change."
+msgstr ""
+
+msgid ""
+"Changeset, child\n"
+" The converse of parent changeset: if P is a parent of C, then C is\n"
+" a child of P. There is no limit to the number of children that a\n"
+" changeset may have."
+msgstr ""
+
+msgid ""
+"Changeset id\n"
+" A SHA-1 hash that uniquely identifies a changeset. It may be\n"
+" represented as either a \"long\" 40 hexadecimal digit string, or a\n"
+" \"short\" 12 hexadecimal digit string."
+msgstr ""
+
+msgid ""
+"Changeset, merge\n"
+" A changeset with two parents. This occurs when a merge is\n"
+" committed."
+msgstr ""
+
+msgid ""
+"Changeset, parent\n"
+" A revision upon which a child changeset is based. Specifically, a\n"
+" parent changeset of a changeset C is a changeset whose node\n"
+" immediately precedes C in the DAG. Changesets have at most two\n"
+" parents."
+msgstr ""
+
+msgid ""
+"Checkout\n"
+" (Noun) The working directory being updated to a specific\n"
+" revision. This use should probably be avoided where possible, as\n"
+" changeset is much more appropriate than checkout in this context."
+msgstr ""
+
+msgid " Example: \"I'm using checkout X.\""
+msgstr ""
+
+msgid ""
+" (Verb) Updating the working directory to a specific changeset. See\n"
+" :hg:`help update`."
+msgstr ""
+
+msgid " Example: \"I'm going to check out changeset X.\""
+msgstr ""
+
+msgid ""
+"Child changeset\n"
+" See 'Changeset, child'."
+msgstr ""
+
+msgid ""
+"Close changeset\n"
+" See 'Changeset, close'."
+msgstr ""
+
+msgid ""
+"Closed branch\n"
+" See 'Branch, closed'."
+msgstr ""
+
+msgid ""
+"Clone\n"
+" (Noun) An entire or partial copy of a repository. The partial\n"
+" clone must be in the form of a revision and its ancestors."
+msgstr ""
+
+msgid " Example: \"Is your clone up to date?\"."
+msgstr ""
+
+msgid " (Verb) The process of creating a clone, using :hg:`clone`."
+msgstr ""
+
+msgid " Example: \"I'm going to clone the repository\"."
+msgstr ""
+
+msgid ""
+"Closed branch head\n"
+" See 'Head, closed branch'."
+msgstr ""
+
+msgid ""
+"Commit\n"
+" (Noun) A synonym for changeset."
+msgstr ""
+
+msgid " Example: \"Is the bug fixed in your recent commit?\""
+msgstr ""
+
+msgid ""
+" (Verb) The act of recording changes to a repository. When files\n"
+" are committed in a working directory, Mercurial finds the\n"
+" differences between the committed files and their parent\n"
+" changeset, creating a new changeset in the repository."
+msgstr ""
+
+msgid " Example: \"You should commit those changes now.\""
+msgstr ""
+
+msgid ""
+"Cset\n"
+" A common abbreviation of the term changeset."
+msgstr ""
+
+msgid ""
+"DAG\n"
+" The repository of changesets of a distributed version control\n"
+" system (DVCS) can be described as a directed acyclic graph (DAG),\n"
+" consisting of nodes and edges, where nodes correspond to\n"
+" changesets and edges imply a parent -> child relation. This graph\n"
+" can be visualized by graphical tools such as :hg:`glog`\n"
+" (graphlog). In Mercurial, the DAG is limited by the requirement\n"
+" for children to have at most two parents."
+msgstr ""
+
+msgid ""
+"Default branch\n"
+" See 'Branch, default'."
+msgstr ""
+
+msgid ""
+"Descendant\n"
+" Any changeset that can be reached by a chain of child changesets\n"
+" from a given changeset. More precisely, the descendants of a\n"
+" changeset can be defined by two properties: the child of a\n"
+" changeset is a descendant, and the child of a descendant is a\n"
+" descendant. See also: 'Ancestor'."
+msgstr ""
+
+msgid ""
+"Diff\n"
+" (Noun) The difference between the contents and attributes of files\n"
+" in two changesets or a changeset and the current working\n"
+" directory. The difference is usually represented in a standard\n"
+" form called a \"diff\" or \"patch\". The \"git diff\" format is used\n"
+" when the changes include copies, renames, or changes to file\n"
+" attributes, none of which can be represented/handled by classic\n"
+" \"diff\" and \"patch\"."
+msgstr ""
+
+msgid " Example: \"Did you see my correction in the diff?\""
+msgstr ""
+
+msgid ""
+" (Verb) Diffing two changesets is the action of creating a diff or\n"
+" patch."
+msgstr ""
+
+msgid ""
+" Example: \"If you diff with changeset X, you will see what I mean.\""
+msgstr ""
+
+msgid ""
+"Directory, working\n"
+" The working directory represents the state of the files tracked by\n"
+" Mercurial, that will be recorded in the next commit. The working\n"
+" directory initially corresponds to the snapshot at an existing\n"
+" changeset, known as the parent of the working directory. See\n"
+" 'Parent, working directory'. The state may be modified by changes\n"
+" to the files introduced manually or by a merge. The repository\n"
+" metadata exists in the .hg directory inside the working directory."
+msgstr ""
+
+msgid ""
+"Graph\n"
+" See DAG and :hg:`help graphlog`."
+msgstr ""
+
+msgid ""
+"Head\n"
+" The term 'head' may be used to refer to both a branch head or a\n"
+" repository head, depending on the context. See 'Head, branch' and\n"
+" 'Head, repository' for specific definitions."
+msgstr ""
+
+msgid ""
+" Heads are where development generally takes place and are the\n"
+" usual targets for update and merge operations."
+msgstr ""
+
+msgid ""
+"Head, branch\n"
+" A changeset with no descendants on the same named branch."
+msgstr ""
+
+msgid ""
+"Head, closed branch\n"
+" A changeset that marks a head as no longer interesting. The closed\n"
+" head is no longer listed by :hg:`heads`. A branch is considered\n"
+" closed when all its heads are closed and consequently is not\n"
+" listed by :hg:`branches`."
+msgstr ""
+
+msgid ""
+"Head, repository\n"
+" A topological head which has not been closed."
+msgstr ""
+
+msgid ""
+"Head, topological\n"
+" A changeset with no children in the repository."
+msgstr ""
+
+msgid ""
+"History, immutable\n"
+" Once committed, changesets cannot be altered. Extensions which\n"
+" appear to change history actually create new changesets that\n"
+" replace existing ones, and then destroy the old changesets. Doing\n"
+" so in public repositories can result in old changesets being\n"
+" reintroduced to the repository."
+msgstr ""
+
+msgid ""
+"History, rewriting\n"
+" The changesets in a repository are immutable. However, extensions\n"
+" to Mercurial can be used to alter the repository, usually in such\n"
+" a way as to preserve changeset contents."
+msgstr ""
+
+msgid ""
+"Immutable history\n"
+" See 'History, immutable'."
+msgstr ""
+
+msgid ""
+"Merge changeset\n"
+" See 'Changeset, merge'."
+msgstr ""
+
+msgid ""
+"Manifest\n"
+" Each changeset has a manifest, which is the list of files that are\n"
+" tracked by the changeset."
+msgstr ""
+
+msgid ""
+"Merge\n"
+" Used to bring together divergent branches of work. When you update\n"
+" to a changeset and then merge another changeset, you bring the\n"
+" history of the latter changeset into your working directory. Once\n"
+" conflicts are resolved (and marked), this merge may be committed\n"
+" as a merge changeset, bringing two branches together in the DAG."
+msgstr ""
+
+msgid ""
+"Named branch\n"
+" See 'Branch, named'."
+msgstr ""
+
+msgid ""
+"Null changeset\n"
+" The empty changeset. It is the parent state of newly-initialized\n"
+" repositories and repositories with no checked out revision. It is\n"
+" thus the parent of root changesets and the effective ancestor when\n"
+" merging unrelated changesets. Can be specified by the alias 'null'\n"
+" or by the changeset ID '000000000000'."
+msgstr ""
+
+msgid ""
+"Parent\n"
+" See 'Changeset, parent'."
+msgstr ""
+
+msgid ""
+"Parent changeset\n"
+" See 'Changeset, parent'."
+msgstr ""
+
+msgid ""
+"Parent, working directory\n"
+" The working directory parent reflects a virtual revision which is\n"
+" the child of the changeset (or two changesets with an uncommitted\n"
+" merge) shown by :hg:`parents`. This is changed with\n"
+" :hg:`update`. Other commands to see the working directory parent\n"
+" are :hg:`summary` and :hg:`id`. Can be specified by the alias \".\"."
+msgstr ""
+
+msgid ""
+"Patch\n"
+" (Noun) The product of a diff operation."
+msgstr ""
+
+msgid " Example: \"I've sent you my patch.\""
+msgstr ""
+
+msgid ""
+" (Verb) The process of using a patch file to transform one\n"
+" changeset into another."
+msgstr ""
+
+msgid " Example: \"You will need to patch that revision.\""
+msgstr ""
+
+msgid ""
+"Pull\n"
+" An operation in which changesets in a remote repository which are\n"
+" not in the local repository are brought into the local\n"
+" repository. Note that this operation without special arguments\n"
+" only updates the repository, it does not update the files in the\n"
+" working directory. See :hg:`help pull`."
+msgstr ""
+
+msgid ""
+"Push\n"
+" An operation in which changesets in a local repository which are\n"
+" not in a remote repository are sent to the remote repository. Note\n"
+" that this operation only adds changesets which have been committed\n"
+" locally to the remote repository. Uncommitted changes are not\n"
+" sent. See :hg:`help push`."
+msgstr ""
+
+msgid ""
+"Repository\n"
+" The metadata describing all recorded states of a collection of\n"
+" files. Each recorded state is represented by a changeset. A\n"
+" repository is usually (but not always) found in the ``.hg``\n"
+" subdirectory of a working directory. Any recorded state can be\n"
+" recreated by \"updating\" a working directory to a specific\n"
+" changeset."
+msgstr ""
+
+msgid ""
+"Repository head\n"
+" See 'Head, repository'."
+msgstr ""
+
+msgid ""
+"Revision\n"
+" A state of the repository at some point in time. Earlier revisions\n"
+" can be updated to by using :hg:`update`. See also 'Revision\n"
+" number'; See also 'Changeset'."
+msgstr ""
+
+msgid ""
+"Revision number\n"
+" This integer uniquely identifies a changeset in a specific\n"
+" repository. It represents the order in which changesets were added\n"
+" to a repository, starting with revision number 0. Note that the\n"
+" revision number may be different in each clone of a repository. To\n"
+" identify changesets uniquely between different clones, see\n"
+" 'Changeset id'."
+msgstr ""
+
+msgid ""
+"Revlog\n"
+" History storage mechanism used by Mercurial. It is a form of delta\n"
+" encoding, with occasional full revision of data followed by delta\n"
+" of each successive revision. It includes data and an index\n"
+" pointing to the data."
+msgstr ""
+
+msgid ""
+"Rewriting history\n"
+" See 'History, rewriting'."
+msgstr ""
+
+msgid ""
+"Root\n"
+" A changeset that has only the null changeset as its parent. Most\n"
+" repositories have only a single root changeset."
+msgstr ""
+
+msgid ""
+"Tip\n"
+" The changeset with the highest revision number. It is the changeset\n"
+" most recently added in a repository."
+msgstr ""
+
+msgid ""
+"Tip, branch\n"
+" The head of a given branch with the highest revision number. When\n"
+" a branch name is used as a revision identifier, it refers to the\n"
+" branch tip. See also 'Branch, head'. Note that because revision\n"
+" numbers may be different in different repository clones, the\n"
+" branch tip may be different in different cloned repositories."
+msgstr ""
+
+msgid ""
+"Update\n"
+" (Noun) Another synonym of changeset."
+msgstr ""
+
+msgid " Example: \"I've pushed an update\"."
+msgstr ""
+
+msgid ""
+" (Verb) This term is usually used to describe updating the state of\n"
+" the working directory to that of a specific changeset. See\n"
+" :hg:`help update`."
+msgstr ""
+
+msgid " Example: \"You should update\"."
+msgstr ""
+
+msgid ""
+"Working directory\n"
+" See 'Directory, working'."
+msgstr ""
+
+msgid ""
+"Working directory parent\n"
+" See 'Parent, working directory'.\n"
+msgstr ""
+
+msgid ""
+"Mercurial's internal web server, hgweb, can serve either a single\n"
+"repository, or a collection of them. In the latter case, a special\n"
+"configuration file can be used to specify the repository paths to use\n"
+"and global web configuration options."
+msgstr ""
+
+msgid ""
+"This file uses the same syntax as hgrc configuration files, but only\n"
+"the following sections are recognized:"
+msgstr ""
+
+msgid ""
+" - web\n"
+" - paths\n"
+" - collections"
+msgstr ""
+
+msgid ""
+"The ``web`` section can specify all the settings described in the web\n"
+"section of the hgrc documentation."
+msgstr ""
+
+msgid ""
+"The ``paths`` section provides mappings of physical repository\n"
+"paths to virtual ones. For instance::"
+msgstr ""
+
+msgid ""
+" [paths]\n"
+" projects/a = /foo/bar\n"
+" projects/b = /baz/quux\n"
+" web/root = /real/root/*\n"
+" / = /real/root2/*\n"
+" virtual/root2 = /real/root2/**"
+msgstr ""
+
+msgid ""
+"- The first two entries make two repositories in different directories\n"
+" appear under the same directory in the web interface\n"
+"- The third entry maps every Mercurial repository found in '/real/root'\n"
+" into 'web/root'. This format is preferred over the [collections] one,\n"
+" since using absolute paths as configuration keys is not supported on "
+"every\n"
+" platform (especially on Windows).\n"
+"- The fourth entry is a special case mapping all repositories in\n"
+" '/real/root2' in the root of the virtual directory.\n"
+"- The fifth entry recursively finds all repositories under the real\n"
+" root, and maps their relative paths under the virtual root."
+msgstr ""
+
+msgid ""
+"The ``collections`` section provides mappings of trees of physical\n"
+"repositories paths to virtual ones, though the paths syntax is generally\n"
+"preferred. For instance::"
+msgstr ""
+
+msgid ""
+" [collections]\n"
+" /foo = /foo"
+msgstr ""
+
+msgid ""
+"Here, the left side will be stripped off all repositories found in the\n"
+"right side. Thus ``/foo/bar`` and ``foo/quux/baz`` will be listed as\n"
+"``bar`` and ``quux/baz`` respectively.\n"
+msgstr ""
+
+msgid "To merge files Mercurial uses merge tools."
+msgstr ""
+
+msgid ""
+"A merge tool combines two different versions of a file into a merged\n"
+"file. Merge tools are given the two files and the greatest common\n"
+"ancestor of the two file versions, so they can determine the changes\n"
+"made on both branches."
+msgstr ""
+
+msgid ""
+"Merge tools are used both for :hg:`resolve`, :hg:`merge`, :hg:`update`,\n"
+":hg:`backout` and in several extensions."
+msgstr ""
+
+msgid ""
+"Usually, the merge tool tries to automatically reconcile the files by\n"
+"combining all non-overlapping changes that occurred separately in\n"
+"the two different evolutions of the same initial base file. Furthermore, "
+"some\n"
+"interactive merge programs make it easier to manually resolve\n"
+"conflicting merges, either in a graphical way, or by inserting some\n"
+"conflict markers. Mercurial does not include any interactive merge\n"
+"programs but relies on external tools for that."
+msgstr ""
+
+msgid ""
+"Available merge tools\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"External merge tools and their properties are configured in the\n"
+"merge-tools configuration section - see hgrc(5) - but they can often just\n"
+"be named by their executable."
+msgstr ""
+
+msgid ""
+"A merge tool is generally usable if its executable can be found on the\n"
+"system and if it can handle the merge. The executable is found if it\n"
+"is an absolute or relative executable path or the name of an\n"
+"application in the executable search path. The tool is assumed to be\n"
+"able to handle the merge if it can handle symlinks if the file is a\n"
+"symlink, if it can handle binary files if the file is binary, and if a\n"
+"GUI is available if the tool requires a GUI."
+msgstr ""
+
+msgid ""
+"There are some internal merge tools which can be used. The internal\n"
+"merge tools are:"
+msgstr ""
+
+msgid ""
+"``internal:merge``\n"
+" Uses the internal non-interactive simple merge algorithm for merging\n"
+" files. It will fail if there are any conflicts and leave markers in\n"
+" the partially merged file."
+msgstr ""
+
+msgid ""
+"``internal:fail``\n"
+" Rather than attempting to merge files that were modified on both\n"
+" branches, it marks them as unresolved. The resolve command must be\n"
+" used to resolve these conflicts."
+msgstr ""
+
+msgid ""
+"``internal:local``\n"
+" Uses the local version of files as the merged version."
+msgstr ""
+
+msgid ""
+"``internal:other``\n"
+" Uses the other version of files as the merged version."
+msgstr ""
+
+msgid ""
+"``internal:prompt``\n"
+" Asks the user which of the local or the other version to keep as\n"
+" the merged version."
+msgstr ""
+
+msgid ""
+"``internal:dump``\n"
+" Creates three versions of the files to merge, containing the\n"
+" contents of local, other and base. These files can then be used to\n"
+" perform a merge manually. If the file to be merged is named\n"
+" ``a.txt``, these files will accordingly be named ``a.txt.local``,\n"
+" ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n"
+" same directory as ``a.txt``."
+msgstr ""
+
+msgid ""
+"Internal tools are always available and do not require a GUI but will by "
+"default\n"
+"not handle symlinks or binary files."
+msgstr ""
+
+msgid ""
+"Choosing a merge tool\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "Mercurial uses these rules when deciding which merge tool to use:"
+msgstr ""
+
+msgid ""
+"1. If a tool has been specified with the --tool option to merge or resolve, "
+"it\n"
+" is used. If it is the name of a tool in the merge-tools configuration, "
+"its\n"
+" configuration is used. Otherwise the specified tool must be executable "
+"by\n"
+" the shell."
+msgstr ""
+
+msgid ""
+"2. If the ``HGMERGE`` environment variable is present, its value is used "
+"and\n"
+" must be executable by the shell."
+msgstr ""
+
+msgid ""
+"3. If the filename of the file to be merged matches any of the patterns in "
+"the\n"
+" merge-patterns configuration section, the first usable merge tool\n"
+" corresponding to a matching pattern is used. Here, binary capabilities of "
+"the\n"
+" merge tool are not considered."
+msgstr ""
+
+msgid ""
+"4. If ui.merge is set it will be considered next. If the value is not the "
+"name\n"
+" of a configured tool, the specified value is used and must be executable "
+"by\n"
+" the shell. Otherwise the named tool is used if it is usable."
+msgstr ""
+
+msgid ""
+"5. If any usable merge tools are present in the merge-tools configuration\n"
+" section, the one with the highest priority is used."
+msgstr ""
+
+msgid ""
+"6. If a program named ``hgmerge`` can be found on the system, it is used - "
+"but\n"
+" it will by default not be used for symlinks and binary files."
+msgstr ""
+
+msgid ""
+"7. If the file to be merged is not binary and is not a symlink, then\n"
+" ``internal:merge`` is used."
+msgstr ""
+
+msgid "8. The merge of the file fails and must be resolved before commit."
+msgstr ""
+
+msgid ""
+".. note::\n"
+" After selecting a merge program, Mercurial will by default attempt\n"
+" to merge the files using a simple merge algorithm first. Only if it "
+"doesn't\n"
+" succeed because of conflicting changes Mercurial will actually execute "
+"the\n"
+" merge program. Whether to use the simple merge algorithm first can be\n"
+" controlled by the premerge setting of the merge tool. Premerge is enabled "
+"by\n"
+" default unless the file is binary or a symlink."
+msgstr ""
+
+msgid ""
+"See the merge-tools and ui sections of hgrc(5) for details on the\n"
+"configuration of merge tools.\n"
+msgstr ""
+
+msgid ""
+"When Mercurial accepts more than one revision, they may be specified\n"
+"individually, or provided as a topologically continuous range,\n"
+"separated by the \":\" character."
+msgstr ""
+
+msgid ""
+"The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n"
+"revision identifiers. Both BEGIN and END are optional. If BEGIN is not\n"
+"specified, it defaults to revision number 0. If END is not specified,\n"
+"it defaults to the tip. The range \":\" thus means \"all revisions\"."
+msgstr ""
+
+msgid "If BEGIN is greater than END, revisions are treated in reverse order."
+msgstr ""
+
+msgid ""
+"A range acts as a closed interval. This means that a range of 3:5\n"
+"gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n"
+msgstr ""
+
+msgid ""
+"Mercurial accepts several notations for identifying one or more files\n"
+"at a time."
+msgstr ""
+
+msgid ""
+"By default, Mercurial treats filenames as shell-style extended glob\n"
+"patterns."
+msgstr ""
+
+msgid "Alternate pattern notations must be specified explicitly."
+msgstr ""
+
+msgid ""
+"To use a plain path name without any pattern matching, start it with\n"
+"``path:``. These path names must completely match starting at the\n"
+"current repository root."
+msgstr ""
+
+msgid ""
+"To use an extended glob, start a name with ``glob:``. Globs are rooted\n"
+"at the current directory; a glob such as ``*.c`` will only match files\n"
+"in the current directory ending with ``.c``."
+msgstr ""
+
+msgid ""
+"The supported glob syntax extensions are ``**`` to match any string\n"
+"across path separators and ``{a,b}`` to mean \"a or b\"."
+msgstr ""
+
+msgid ""
+"To use a Perl/Python regular expression, start a name with ``re:``.\n"
+"Regexp pattern matching is anchored at the root of the repository."
+msgstr ""
+
+msgid "Plain examples::"
+msgstr ""
+
+msgid ""
+" path:foo/bar a name bar in a directory named foo in the root\n"
+" of the repository\n"
+" path:path:name a file or directory named \"path:name\""
+msgstr ""
+
+msgid "Glob examples::"
+msgstr ""
+
+msgid ""
+" glob:*.c any name ending in \".c\" in the current directory\n"
+" *.c any name ending in \".c\" in the current directory\n"
+" **.c any name ending in \".c\" in any subdirectory of the\n"
+" current directory including itself.\n"
+" foo/*.c any name ending in \".c\" in the directory foo\n"
+" foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
+" including itself."
+msgstr ""
+
+msgid "Regexp examples::"
+msgstr ""
+
+msgid ""
+" re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
+msgstr ""
+
+msgid "Mercurial supports several ways to specify individual revisions."
+msgstr ""
+
+msgid ""
+"A plain integer is treated as a revision number. Negative integers are\n"
+"treated as sequential offsets from the tip, with -1 denoting the tip,\n"
+"-2 denoting the revision prior to the tip, and so forth."
+msgstr ""
+
+msgid ""
+"A 40-digit hexadecimal string is treated as a unique revision\n"
+"identifier."
+msgstr ""
+
+msgid ""
+"A hexadecimal string less than 40 characters long is treated as a\n"
+"unique revision identifier and is referred to as a short-form\n"
+"identifier. A short-form identifier is only valid if it is the prefix\n"
+"of exactly one full-length identifier."
+msgstr ""
+
+msgid ""
+"Any other string is treated as a tag or branch name. A tag name is a\n"
+"symbolic name associated with a revision identifier. A branch name\n"
+"denotes the tipmost revision of that branch. Tag and branch names must\n"
+"not contain the \":\" character."
+msgstr ""
+
+msgid ""
+"The reserved name \"tip\" is a special tag that always identifies the\n"
+"most recent revision."
+msgstr ""
+
+msgid ""
+"The reserved name \"null\" indicates the null revision. This is the\n"
+"revision of an empty repository, and the parent of revision 0."
+msgstr ""
+
+msgid ""
+"The reserved name \".\" indicates the working directory parent. If no\n"
+"working directory is checked out, it is equivalent to null. If an\n"
+"uncommitted merge is in progress, \".\" is the revision of the first\n"
+"parent.\n"
+msgstr ""
+
+msgid ""
+"Mercurial supports a functional language for selecting a set of\n"
+"revisions."
+msgstr ""
+
+msgid ""
+"The language supports a number of predicates which are joined by infix\n"
+"operators. Parenthesis can be used for grouping."
+msgstr ""
+
+msgid ""
+"Identifiers such as branch names must be quoted with single or double\n"
+"quotes if they contain characters outside of\n"
+"``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n"
+"predicates."
+msgstr ""
+
+msgid ""
+"Special characters can be used in quoted identifiers by escaping them,\n"
+"e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n"
+"interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``."
+msgstr ""
+
+msgid "There is a single prefix operator:"
+msgstr ""
+
+msgid ""
+"``not x``\n"
+" Changesets not in x. Short form is ``! x``."
+msgstr ""
+
+msgid "These are the supported infix operators:"
+msgstr ""
+
+msgid ""
+"``x::y``\n"
+" A DAG range, meaning all changesets that are descendants of x and\n"
+" ancestors of y, including x and y themselves. If the first endpoint\n"
+" is left out, this is equivalent to ``ancestors(y)``, if the second\n"
+" is left out it is equivalent to ``descendants(x)``."
+msgstr ""
+
+msgid " An alternative syntax is ``x..y``."
+msgstr ""
+
+msgid ""
+"``x:y``\n"
+" All changesets with revision numbers between x and y, both\n"
+" inclusive. Either endpoint can be left out, they default to 0 and\n"
+" tip."
+msgstr ""
+
+msgid ""
+"``x and y``\n"
+" The intersection of changesets in x and y. Short form is ``x & y``."
+msgstr ""
+
+msgid ""
+"``x or y``\n"
+" The union of changesets in x and y. There are two alternative short\n"
+" forms: ``x | y`` and ``x + y``."
+msgstr ""
+
+msgid ""
+"``x - y``\n"
+" Changesets in x but not in y."
+msgstr ""
+
+msgid "The following predicates are supported:"
+msgstr ""
+
+msgid ".. predicatesmarker"
+msgstr ""
+
+msgid "Command line equivalents for :hg:`log`::"
+msgstr ""
+
+msgid ""
+" -f -> ::.\n"
+" -d x -> date(x)\n"
+" -k x -> keyword(x)\n"
+" -m -> merge()\n"
+" -u x -> user(x)\n"
+" -b x -> branch(x)\n"
+" -P x -> !::x\n"
+" -l x -> limit(expr, x)"
+msgstr ""
+
+msgid "Some sample queries:"
+msgstr ""
+
+msgid "- Changesets on the default branch::"
+msgstr ""
+
+msgid " hg log -r \"branch(default)\""
+msgstr ""
+
+msgid "- Changesets on the default branch since tag 1.5 (excluding merges)::"
+msgstr ""
+
+msgid " hg log -r \"branch(default) and 1.5:: and not merge()\""
+msgstr ""
+
+msgid "- Open branch heads::"
+msgstr ""
+
+msgid " hg log -r \"head() and not closed()\""
+msgstr ""
+
+msgid ""
+"- Changesets between tags 1.3 and 1.5 mentioning \"bug\" that affect\n"
+" ``hgext/*``::"
+msgstr ""
+
+msgid " hg log -r \"1.3::1.5 and keyword(bug) and file('hgext/*')\""
+msgstr ""
+
+msgid "- Changesets in committed May 2008, sorted by user::"
+msgstr ""
+
+msgid " hg log -r \"sort(date('May 2008'), user)\""
+msgstr ""
+
+msgid ""
+"- Changesets mentioning \"bug\" or \"issue\" that are not in a tagged\n"
+" release::"
+msgstr ""
+
+msgid ""
+" hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged"
+"())\"\n"
+msgstr ""
+
+msgid ""
+"Subrepositories let you nest external repositories or projects into a\n"
+"parent Mercurial repository, and make commands operate on them as a\n"
+"group. External Mercurial and Subversion projects are currently\n"
+"supported."
+msgstr ""
+
+msgid "Subrepositories are made of three components:"
+msgstr ""
+
+msgid ""
+"1. Nested repository checkouts. They can appear anywhere in the\n"
+" parent working directory, and are Mercurial clones or Subversion\n"
+" checkouts."
+msgstr ""
+
+msgid ""
+"2. Nested repository references. They are defined in ``.hgsub`` and\n"
+" tell where the subrepository checkouts come from. Mercurial\n"
+" subrepositories are referenced like:"
+msgstr ""
+
+msgid " path/to/nested = https://example.com/nested/repo/path"
+msgstr ""
+
+msgid ""
+" where ``path/to/nested`` is the checkout location relatively to the\n"
+" parent Mercurial root, and ``https://example.com/nested/repo/path``\n"
+" is the source repository path. The source can also reference a\n"
+" filesystem path. Subversion repositories are defined with:"
+msgstr ""
+
+msgid " path/to/nested = [svn]https://example.com/nested/trunk/path"
+msgstr ""
+
+msgid ""
+" Note that ``.hgsub`` does not exist by default in Mercurial\n"
+" repositories, you have to create and add it to the parent\n"
+" repository before using subrepositories."
+msgstr ""
+
+msgid ""
+"3. Nested repository states. They are defined in ``.hgsubstate`` and\n"
+" capture whatever information is required to restore the\n"
+" subrepositories to the state they were committed in a parent\n"
+" repository changeset. Mercurial automatically record the nested\n"
+" repositories states when committing in the parent repository."
+msgstr ""
+
+msgid ""
+" .. note::\n"
+" The ``.hgsubstate`` file should not be edited manually."
+msgstr ""
+
+msgid ""
+"\n"
+"Adding a Subrepository\n"
+"----------------------"
+msgstr ""
+
+msgid ""
+"If ``.hgsub`` does not exist, create it and add it to the parent\n"
+"repository. Clone or checkout the external projects where you want it\n"
+"to live in the parent repository. Edit ``.hgsub`` and add the\n"
+"subrepository entry as described above. At this point, the\n"
+"subrepository is tracked and the next commit will record its state in\n"
+"``.hgsubstate`` and bind it to the committed changeset."
+msgstr ""
+
+msgid ""
+"Synchronizing a Subrepository\n"
+"-----------------------------"
+msgstr ""
+
+msgid ""
+"Subrepos do not automatically track the latest changeset of their\n"
+"sources. Instead, they are updated to the changeset that corresponds\n"
+"with the changeset checked out in the top-level changeset. This is so\n"
+"developers always get a consistent set of compatible code and\n"
+"libraries when they update."
+msgstr ""
+
+msgid ""
+"Thus, updating subrepos is a manual process. Simply check out target\n"
+"subrepo at the desired revision, test in the top-level repo, then\n"
+"commit in the parent repository to record the new combination."
+msgstr ""
+
+msgid ""
+"Deleting a Subrepository\n"
+"------------------------"
+msgstr ""
+
+msgid ""
+"To remove a subrepository from the parent repository, delete its\n"
+"reference from ``.hgsub``, then remove its files."
+msgstr ""
+
+msgid ""
+"Interaction with Mercurial Commands\n"
+"-----------------------------------"
+msgstr ""
+
+msgid ""
+":add: add does not recurse in subrepos unless -S/--subrepos is\n"
+" specified. Subversion subrepositories are currently silently\n"
+" ignored."
+msgstr ""
+
+msgid ""
+":archive: archive does not recurse in subrepositories unless\n"
+" -S/--subrepos is specified."
+msgstr ""
+
+msgid ""
+":commit: commit creates a consistent snapshot of the state of the\n"
+" entire project and its subrepositories. It does this by first\n"
+" attempting to commit all modified subrepositories, then recording\n"
+" their state and finally committing it in the parent repository."
+msgstr ""
+
+msgid ""
+":diff: diff does not recurse in subrepos unless -S/--subrepos is\n"
+" specified. Changes are displayed as usual, on the subrepositories\n"
+" elements. Subversion subrepositories are currently silently\n"
+" ignored."
+msgstr ""
+
+msgid ""
+":incoming: incoming does not recurse in subrepos unless -S/--subrepos\n"
+" is specified. Subversion subrepositories are currently silently\n"
+" ignored."
+msgstr ""
+
+msgid ""
+":outgoing: outgoing does not recurse in subrepos unless -S/--subrepos\n"
+" is specified. Subversion subrepositories are currently silently\n"
+" ignored."
+msgstr ""
+
+msgid ""
+":pull: pull is not recursive since it is not clear what to pull prior\n"
+" to running :hg:`update`. Listing and retrieving all\n"
+" subrepositories changes referenced by the parent repository pulled\n"
+" changesets is expensive at best, impossible in the Subversion\n"
+" case."
+msgstr ""
+
+msgid ""
+":push: Mercurial will automatically push all subrepositories first\n"
+" when the parent repository is being pushed. This ensures new\n"
+" subrepository changes are available when referenced by top-level\n"
+" repositories."
+msgstr ""
+
+msgid ""
+":status: status does not recurse into subrepositories unless\n"
+" -S/--subrepos is specified. Subrepository changes are displayed as\n"
+" regular Mercurial changes on the subrepository\n"
+" elements. Subversion subrepositories are currently silently\n"
+" ignored."
+msgstr ""
+
+msgid ""
+":update: update restores the subrepos in the state they were\n"
+" originally committed in target changeset. If the recorded\n"
+" changeset is not available in the current subrepository, Mercurial\n"
+" will pull it in first before updating. This means that updating\n"
+" can require network access when using subrepositories."
+msgstr ""
+
+msgid ""
+"Remapping Subrepositories Sources\n"
+"---------------------------------"
+msgstr ""
+
+msgid ""
+"A subrepository source location may change during a project life,\n"
+"invalidating references stored in the parent repository history. To\n"
+"fix this, rewriting rules can be defined in parent repository ``hgrc``\n"
+"file or in Mercurial configuration. See the ``[subpaths]`` section in\n"
+"hgrc(5) for more details."
+msgstr ""
+
+msgid ""
+"Mercurial allows you to customize output of commands through\n"
+"templates. You can either pass in a template from the command\n"
+"line, via the --template option, or select an existing\n"
+"template-style (--style)."
+msgstr ""
+
+msgid ""
+"You can customize output for any \"log-like\" command: log,\n"
+"outgoing, incoming, tip, parents, heads and glog."
+msgstr ""
+
+msgid ""
+"Four styles are packaged with Mercurial: default (the style used\n"
+"when no explicit preference is passed), compact, changelog,\n"
+"and xml.\n"
+"Usage::"
+msgstr ""
+
+msgid " $ hg log -r1 --style changelog"
+msgstr ""
+
+msgid ""
+"A template is a piece of text, with markup to invoke variable\n"
+"expansion::"
+msgstr ""
+
+msgid ""
+" $ hg log -r1 --template \"{node}\\n\"\n"
+" b56ce7b07c52de7d5fd79fb89701ea538af65746"
+msgstr ""
+
+msgid ""
+"Strings in curly braces are called keywords. The availability of\n"
+"keywords depends on the exact context of the templater. These\n"
+"keywords are usually available for templating a log-like command:"
+msgstr ""
+
+msgid ":author: String. The unmodified author of the changeset."
+msgstr ""
+
+msgid ""
+":branches: String. The name of the branch on which the changeset was\n"
+" committed. Will be empty if the branch name was default."
+msgstr ""
+
+msgid ":children: List of strings. The children of the changeset."
+msgstr ""
+
+msgid ":date: Date information. The date when the changeset was committed."
+msgstr ""
+
+msgid ":desc: String. The text of the changeset description."
+msgstr ""
+
+msgid ""
+":diffstat: String. Statistics of changes with the following format:\n"
+" \"modified files: +added/-removed lines\""
+msgstr ""
+
+msgid ""
+":files: List of strings. All files modified, added, or removed by this\n"
+" changeset."
+msgstr ""
+
+msgid ":file_adds: List of strings. Files added by this changeset."
+msgstr ""
+
+msgid ""
+":file_copies: List of strings. Files copied in this changeset with\n"
+" their sources."
+msgstr ""
+
+msgid ""
+":file_copies_switch: List of strings. Like \"file_copies\" but displayed\n"
+" only if the --copied switch is set."
+msgstr ""
+
+msgid ":file_mods: List of strings. Files modified by this changeset."
+msgstr ""
+
+msgid ":file_dels: List of strings. Files removed by this changeset."
+msgstr ""
+
+msgid ""
+":node: String. The changeset identification hash, as a 40 hexadecimal\n"
+" digit string."
+msgstr ""
+
+msgid ":parents: List of strings. The parents of the changeset."
+msgstr ""
+
+msgid ":rev: Integer. The repository-local changeset revision number."
+msgstr ""
+
+msgid ":tags: List of strings. Any tags associated with the changeset."
+msgstr ""
+
+msgid ""
+":latesttag: String. Most recent global tag in the ancestors of this\n"
+" changeset."
+msgstr ""
+
+msgid ":latesttagdistance: Integer. Longest path to the latest tag."
+msgstr ""
+
+msgid ""
+"The \"date\" keyword does not produce human-readable output. If you\n"
+"want to use a date in your output, you can use a filter to process\n"
+"it. Filters are functions which return a string based on the input\n"
+"variable. Be sure to use the stringify filter first when you're\n"
+"applying a string-input filter to a list-like input variable.\n"
+"You can also use a chain of filters to get the desired output::"
+msgstr ""
+
+msgid ""
+" $ hg tip --template \"{date|isodate}\\n\"\n"
+" 2008-08-21 18:22 +0000"
+msgstr ""
+
+msgid "List of filters:"
+msgstr ""
+
+msgid ""
+":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
+" every line except the last."
+msgstr ""
+
+msgid ""
+":age: Date. Returns a human-readable date/time difference between the\n"
+" given date/time and the current date/time."
+msgstr ""
+
+msgid ""
+":basename: Any text. Treats the text as a path, and returns the last\n"
+" component of the path after splitting by the path separator\n"
+" (ignoring trailing separators). For example, \"foo/bar/baz\" becomes\n"
+" \"baz\" and \"foo/bar//\" becomes \"bar\"."
+msgstr ""
+
+msgid ""
+":stripdir: Treat the text as path and strip a directory level, if\n"
+" possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\"."
+msgstr ""
+
+msgid ""
+":date: Date. Returns a date in a Unix date format, including the\n"
+" timezone: \"Mon Sep 04 15:13:13 2006 0700\"."
+msgstr ""
+
+msgid ""
+":domain: Any text. Finds the first string that looks like an email\n"
+" address, and extracts just the domain component. Example: ``User\n"
+" <user@example.com>`` becomes ``example.com``."
+msgstr ""
+
+msgid ""
+":email: Any text. Extracts the first string that looks like an email\n"
+" address. Example: ``User <user@example.com>`` becomes\n"
+" ``user@example.com``."
+msgstr ""
+
+msgid ""
+":escape: Any text. Replaces the special XML/XHTML characters \"&\", \"<\"\n"
+" and \">\" with XML entities."
+msgstr ""
+
+msgid ""
+":hex: Any text. Convert a binary Mercurial node identifier into\n"
+" its long hexadecimal representation."
+msgstr ""
+
+msgid ":fill68: Any text. Wraps the text to fit in 68 columns."
+msgstr ""
+
+msgid ":fill76: Any text. Wraps the text to fit in 76 columns."
+msgstr ""
+
+msgid ":firstline: Any text. Returns the first line of text."
+msgstr ""
+
+msgid ":nonempty: Any text. Returns '(none)' if the string is empty."
+msgstr ""
+
+msgid ""
+":hgdate: Date. Returns the date as a pair of numbers: \"1157407993\n"
+" 25200\" (Unix timestamp, timezone offset)."
+msgstr ""
+
+msgid ""
+":isodate: Date. Returns the date in ISO 8601 format: \"2009-08-18 13:00\n"
+" +0200\"."
+msgstr ""
+
+msgid ""
+":isodatesec: Date. Returns the date in ISO 8601 format, including\n"
+" seconds: \"2009-08-18 13:00:13 +0200\". See also the rfc3339date\n"
+" filter."
+msgstr ""
+
+msgid ":localdate: Date. Converts a date to local date."
+msgstr ""
+
+msgid ""
+":obfuscate: Any text. Returns the input text rendered as a sequence of\n"
+" XML entities."
+msgstr ""
+
+msgid ":person: Any text. Returns the text before an email address."
+msgstr ""
+
+msgid ""
+":rfc822date: Date. Returns a date using the same format used in email\n"
+" headers: \"Tue, 18 Aug 2009 13:00:13 +0200\"."
+msgstr ""
+
+msgid ""
+":rfc3339date: Date. Returns a date using the Internet date format\n"
+" specified in RFC 3339: \"2009-08-18T13:00:13+02:00\"."
+msgstr ""
+
+msgid ""
+":short: Changeset hash. Returns the short form of a changeset hash,\n"
+" i.e. a 12 hexadecimal digit string."
+msgstr ""
+
+msgid ":shortdate: Date. Returns a date like \"2006-09-18\"."
+msgstr ""
+
+msgid ""
+":stringify: Any type. Turns the value into text by converting values into\n"
+" text and concatenating them."
+msgstr ""
+
+msgid ":strip: Any text. Strips all leading and trailing whitespace."
+msgstr ""
+
+msgid ""
+":tabindent: Any text. Returns the text, with every line except the\n"
+" first starting with a tab character."
+msgstr ""
+
+msgid ""
+":urlescape: Any text. Escapes all \"special\" characters. For example,\n"
+" \"foo bar\" becomes \"foo%20bar\"."
+msgstr ""
+
+msgid ":user: Any text. Returns the user portion of an email address.\n"
+msgstr ""
+
+msgid "Valid URLs are of the form::"
+msgstr ""
+
+msgid ""
+" local/filesystem/path[#revision]\n"
+" file://local/filesystem/path[#revision]\n"
+" http://[user[:pass]@]host[:port]/[path][#revision]\n"
+" https://[user[:pass]@]host[:port]/[path][#revision]\n"
+" ssh://[user[:pass]@]host[:port]/[path][#revision]"
+msgstr ""
+
+msgid ""
+"Paths in the local filesystem can either point to Mercurial\n"
+"repositories or to bundle files (as created by :hg:`bundle` or :hg:`\n"
+"incoming --bundle`)."
+msgstr ""
+
+msgid ""
+"An optional identifier after # indicates a particular branch, tag, or\n"
+"changeset to use from the remote repository. See also :hg:`help\n"
+"revisions`."
+msgstr ""
+
+msgid ""
+"Some features, such as pushing to http:// and https:// URLs are only\n"
+"possible if the feature is explicitly enabled on the remote Mercurial\n"
+"server."
+msgstr ""
+
+msgid ""
+"Note that the security of HTTPS URLs depends on proper configuration of\n"
+"web.cacerts."
+msgstr ""
+
+msgid "Some notes about using SSH with Mercurial:"
+msgstr ""
+
+msgid ""
+"- SSH requires an accessible shell account on the destination machine\n"
+" and a copy of hg in the remote path or specified with as remotecmd.\n"
+"- path is relative to the remote user's home directory by default. Use\n"
+" an extra slash at the start of a path to specify an absolute path::"
+msgstr ""
+
+msgid " ssh://example.com//tmp/repository"
+msgstr ""
+
+msgid ""
+"- Mercurial doesn't use its own compression via SSH; the right thing\n"
+" to do is to configure it in your ~/.ssh/config, e.g.::"
+msgstr ""
+
+msgid ""
+" Host *.mylocalnetwork.example.com\n"
+" Compression no\n"
+" Host *\n"
+" Compression yes"
+msgstr ""
+
+msgid ""
+" Alternatively specify \"ssh -C\" as your ssh command in your\n"
+" configuration file or with the --ssh command line option."
+msgstr ""
+
+msgid ""
+"These URLs can all be stored in your configuration file with path\n"
+"aliases under the [paths] section like so::"
+msgstr ""
+
+msgid ""
+" [paths]\n"
+" alias1 = URL1\n"
+" alias2 = URL2\n"
+" ..."
+msgstr ""
+
+msgid ""
+"You can then use the alias for any command that uses a URL (for\n"
+"example :hg:`pull alias1` will be treated as :hg:`pull URL1`)."
+msgstr ""
+
+msgid ""
+"Two path aliases are special because they are used as defaults when\n"
+"you do not provide the URL to a command:"
+msgstr ""
+
+msgid ""
+"default:\n"
+" When you create a repository with hg clone, the clone command saves\n"
+" the location of the source repository as the new repository's\n"
+" 'default' path. This is then used when you omit path from push- and\n"
+" pull-like commands (including incoming and outgoing)."
+msgstr ""
+
+msgid ""
+"default-push:\n"
+" The push command will look for a path named 'default-push', and\n"
+" prefer it over 'default' if both are defined.\n"
+msgstr ""
+
+msgid "remote branch lookup not supported"
+msgstr "ä¸æ”¯æ´é 端分支查閱"
+
+msgid "dirstate branch not accessible"
+msgstr ""
+
+#, python-format
+msgid "unknown branch '%s'"
+msgstr "ä¸çŸ¥é“的分支 '%s'"
msgid "can only share local repositories"
-msgstr ""
+msgstr "åªèƒ½åˆ†äº«æœ¬åœ°ç«¯å„²å˜åº«(s)"
msgid "destination already exists"
msgstr "目的端已å˜åœ¨"
msgid "updating working directory\n"
-msgstr "æ›´æ–° working directory ä¸\n"
+msgstr "更新工作目錄ä¸\n"
#, python-format
msgid "destination directory: %s\n"
@@ -9814,35 +11367,44 @@
msgid "destination '%s' is not empty"
msgstr "目的端 '%s' ä¸æ˜¯ç©ºçš„"
-msgid "src repository does not support revision lookup and so doesn't support clone by revision"
+msgid ""
+"src repository does not support revision lookup and so doesn't support clone "
+"by revision"
msgstr ""
msgid "clone from remote to remote not supported"
-msgstr ""
-
-#, fuzzy, python-format
+msgstr "從一個é 端clone到å¦ä¸€å€‹é 端的功能是ä¸æ”¯æ´çš„ "
+
+#, python-format
msgid "updating to branch %s\n"
-msgstr "æ£åœ¨æ–°å¢ž branch\n"
-
-#, python-format
-msgid "%d files updated, %d files merged, %d files removed, %d files unresolved\n"
-msgstr ""
+msgstr "æ£åœ¨æ›´æ–°åˆ°%s分支\n"
+
+#, python-format
+msgid ""
+"%d files updated, %d files merged, %d files removed, %d files unresolved\n"
+msgstr "%d個更新 %d個åˆä½µ %d個移除 %d個未解決\n"
msgid "use 'hg resolve' to retry unresolved file merges\n"
-msgstr ""
-
-msgid "use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon\n"
-msgstr ""
+msgstr "使用'hg resolve'é‡æ–°å˜—試åˆä½µæœªè§£æ±ºçš„檔案\n"
+
+msgid ""
+"use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to "
+"abandon\n"
+msgstr "使用'hg resolve'é‡æ–°å˜—試åˆä½µæœªè§£æ±ºçš„檔案或用 'hg update -C'放棄\n"
msgid "(branch merge, don't forget to commit)\n"
-msgstr ""
+msgstr "(分支已經åˆä½µäº†,別忘了è¦commitå–”)\n"
#, python-format
msgid "error reading %s/.hg/hgrc: %s\n"
+msgstr "! %s/.hg/hgrc 讀å–錯誤:%s\n"
+
+#, python-format
+msgid "error accessing repository at %s\n"
msgstr ""
msgid "SSL support is unavailable"
-msgstr ""
+msgstr "SSL 支æ´ä¸èƒ½ç”¨"
msgid "IPv6 is not available on this system"
msgstr "æ¤ä½œæ¥ç³»çµ±ä¸æ”¯æ´ IPv6"
@@ -9859,6 +11421,12 @@
msgid "%s hook is invalid (\"%s\" not in a module)"
msgstr ""
+msgid "exception from first failed import attempt:\n"
+msgstr ""
+
+msgid "exception from second failed import attempt:\n"
+msgstr ""
+
#, python-format
msgid "%s hook is invalid (import of \"%s\" failed)"
msgstr ""
@@ -9900,27 +11468,31 @@
msgstr ""
msgid "connection ended unexpectedly"
-msgstr ""
+msgstr "連線æ„外的çµæŸäº†"
#, python-format
msgid "unsupported URL component: \"%s\""
-msgstr ""
+msgstr "ä¸æ”¯æ´çš„URL元件:'%s'"
msgid "operation not supported over http"
msgstr ""
msgid "authorization failed"
-msgstr ""
+msgstr "身份èªè‰å¤±æ•—"
msgid "http error, possibly caused by proxy setting"
-msgstr ""
+msgstr "http 錯誤,å¯èƒ½æ˜¯ç”±proxy產生的"
#, python-format
msgid "real URL is %s\n"
-msgstr ""
-
-#, python-format
-msgid "'%s' does not appear to be an hg repository"
+msgstr "真æ£çš„URL是 %s\n"
+
+#, python-format
+msgid ""
+"'%s' does not appear to be an hg repository:\n"
+"---%%<--- (%s)\n"
+"%s\n"
+"---%%<---\n"
msgstr ""
#, python-format
@@ -9929,49 +11501,37 @@
#, python-format
msgid "'%s' uses newer protocol %s"
-msgstr ""
-
-msgid "look up remote revision"
-msgstr ""
-
-msgid "unexpected response:"
-msgstr ""
-
-msgid "look up remote changes"
-msgstr ""
-
-msgid "push failed (unexpected response):"
-msgstr ""
+msgstr "'%s'使用最新的通訊å”定 %s"
#, python-format
msgid "push failed: %s"
-msgstr ""
+msgstr "push 失敗: %s"
msgid "Python support for SSL and HTTPS is not installed"
-msgstr ""
+msgstr "SSL å’ŒHTTPS çš„python support 沒有安è£"
msgid "cannot create new http repository"
-msgstr ""
+msgstr "ä¸èƒ½å»ºç«‹æ–°çš„ http 儲å˜åº«"
#, python-format
msgid "ignoring invalid syntax '%s'"
-msgstr ""
+msgstr "忽略無效的語法 '%s'"
#, python-format
msgid "skipping unreadable ignore file '%s': %s\n"
-msgstr ""
+msgstr "ç•¥éŽä¸èƒ½è®€å–的忽略檔 '%s' : %s\n"
#, python-format
msgid "repository %s not found"
-msgstr ""
+msgstr "找ä¸åˆ° %s 儲å˜åº«"
#, python-format
msgid "repository %s already exists"
-msgstr ""
+msgstr "%s 儲å˜åº«å·²ç¶“在了"
#, python-format
msgid "requirement '%s' not supported"
-msgstr ""
+msgstr "è¦æ±‚ '%s' ä¸è¢«æ”¯æ´"
#, python-format
msgid ".hg/sharedpath points to nonexistent directory %s"
@@ -9979,20 +11539,24 @@
#, python-format
msgid "%r cannot be used in a tag name"
-msgstr ""
+msgstr "%r ä¸èƒ½ç•¶æˆæ¨™è¨˜å稱來用"
+
+#, python-format
+msgid "warning: tag %s conflicts with existing branch name\n"
+msgstr "è¦å‘Š: 標記 %s è·Ÿç¾æœ‰çš„分支å稱è¡çªã€‚\n"
msgid "working copy of .hgtags is changed (please commit .hgtags manually)"
-msgstr ""
+msgstr ".hgtags 的工作複本已經被改變了(請手工æ交 .hgtags)"
#, python-format
msgid "working directory has unknown parent '%s'!"
-msgstr ""
+msgstr "工作目錄有未知的æ¯ç³»'%s'!"
#, python-format
msgid "unknown revision '%s'"
-msgstr ""
-
-msgid "journal already exists - run hg recover"
+msgstr "未知的修定版 '%s'"
+
+msgid "abandoned transaction found - run hg recover"
msgstr ""
msgid "rolling back interrupted transaction\n"
@@ -10001,15 +11565,23 @@
msgid "no interrupted transaction available\n"
msgstr ""
-msgid "rolling back last transaction\n"
+#, python-format
+msgid "rolling back to revision %s (undo %s: %s)\n"
+msgstr ""
+
+#, python-format
+msgid "rolling back to revision %s (undo %s)\n"
+msgstr ""
+
+msgid "rolling back unknown transaction\n"
msgstr ""
#, python-format
msgid "Named branch could not be reset, current branch still is: %s\n"
-msgstr ""
+msgstr "指å的分支ä¸èƒ½è¢«é‡ç½®,ç›®å‰åˆ†æ”¯ä¾ç„¶æ˜¯: %s\n"
msgid "no rollback information available\n"
-msgstr ""
+msgstr "沒有 rollback 資訊å¯ä»¥ç”¨\n"
#, python-format
msgid "waiting for lock on %s held by %r\n"
@@ -10017,126 +11589,91 @@
#, python-format
msgid "repository %s"
-msgstr ""
+msgstr "儲å˜åº« %s"
#, python-format
msgid "working directory of %s"
-msgstr ""
+msgstr "%s 的工作目錄"
msgid "cannot partially commit a merge (do not specify files or patterns)"
msgstr ""
+msgid "can't commit subrepos without .hgsub"
+msgstr ""
+
msgid "file not found!"
-msgstr ""
+msgstr "找ä¸åˆ°æª”案!"
msgid "no match under directory!"
msgstr ""
msgid "file not tracked!"
-msgstr ""
+msgstr "檔案沒有被追蹤!"
msgid "unresolved merge conflicts (see hg resolve)"
-msgstr ""
+msgstr "未解決的åˆä½µè¡çª(詳見 hg resolve)"
#, python-format
msgid "committing subrepository %s\n"
-msgstr ""
+msgstr "æ£åœ¨æ交å儲å˜åº« %s\n"
+
+#, python-format
+msgid "note: commit message saved in %s\n"
+msgstr "注æ„: æ交訊æ¯å˜æ”¾åœ¨%s\n"
#, python-format
msgid "trouble committing %s!\n"
msgstr ""
-#, python-format
-msgid "%s does not exist!\n"
-msgstr ""
-
-#, python-format
-msgid ""
-"%s: files over 10MB may cause memory and performance problems\n"
-"(use 'hg revert %s' to unadd the file)\n"
-msgstr ""
-
-#, python-format
-msgid "%s not added: only files and symlinks supported currently\n"
-msgstr ""
-
-#, python-format
-msgid "%s already tracked!\n"
-msgstr ""
-
-#, python-format
-msgid "%s not added!\n"
-msgstr ""
-
-#, python-format
-msgid "%s still exists!\n"
-msgstr ""
-
-#, python-format
-msgid "%s not tracked!\n"
-msgstr ""
-
-#, python-format
-msgid "%s not removed!\n"
-msgstr ""
-
-#, python-format
-msgid "copy failed: %s is not a file or a symbolic link\n"
-msgstr ""
-
-msgid "searching for changes\n"
-msgstr ""
-
-msgid "already have changeset "
-msgstr ""
-
-msgid "warning: repository is unrelated\n"
-msgstr ""
-
-msgid "repository is unrelated"
-msgstr ""
-
msgid "requesting all changes\n"
-msgstr ""
-
-msgid "Partial pull cannot be done because other repository doesn't support changegroupsubset."
-msgstr ""
-
-#, python-format
-msgid "abort: push creates new remote branch '%s'!\n"
-msgstr ""
-
-msgid "abort: push creates new remote heads!\n"
-msgstr ""
-
-msgid "(did you forget to merge? use push -f to force)\n"
-msgstr ""
-
-msgid "note: unsynced remote changes!\n"
-msgstr ""
+msgstr "æ£åœ¨é‡æ–°è¦æ±‚所有的changes\n"
+
+msgid ""
+"partial pull cannot be done because other repository doesn't support "
+"changegroupsubset."
+msgstr "局部pull ä¸èƒ½å®Œæˆ,å› ç‚ºå…¶ä»–å„²å˜åº«ä¸æ”¯æ´changegroupsubset."
#, python-format
msgid "%d changesets found\n"
+msgstr "找到%d個changesets\n"
+
+msgid "bundling changes"
+msgstr ""
+
+msgid "chunks"
+msgstr ""
+
+msgid "bundling manifests"
msgstr ""
#, python-format
msgid "empty or missing revlog for %s"
msgstr ""
+msgid "bundling files"
+msgstr ""
+
msgid "adding changesets\n"
-msgstr ""
+msgstr "新增changesets\n"
msgid "received changelog group is empty"
-msgstr ""
+msgstr "接收的changelog group是空白的"
msgid "adding manifests\n"
-msgstr ""
+msgstr "新增清單\n"
+
+msgid "manifests"
+msgstr "清單"
msgid "adding file changes\n"
-msgstr ""
+msgstr "新增檔案變更\n"
msgid "received file revlog group is empty"
-msgstr ""
+msgstr "接收的file revlog group是空白的"
+
+#, python-format
+msgid "missing file data for %s:%s - run hg verify"
+msgstr "éºå¤±æª”案資料 for %s:%s - 執行 hg verify"
#, python-format
msgid " (%+d heads)"
@@ -10144,19 +11681,19 @@
#, python-format
msgid "added %d changesets with %d changes to %d files%s\n"
-msgstr ""
+msgstr "å¢žåŠ %d個changesets with %d個變更到%d個檔案%s\n"
msgid "Unexpected response from remote server:"
-msgstr ""
+msgstr "é 端伺æœå™¨å›žå‚³ä¸€å€‹æ„料之外的回應:"
msgid "operation forbidden by server"
msgstr ""
msgid "locking the remote repository failed"
-msgstr ""
+msgstr "鎖ä½é 端儲å˜åº«å¤±æ•—了"
msgid "the server sent an unknown error code"
-msgstr ""
+msgstr "伺æœå™¨å‚³é€äº†ä¸€å€‹æœªçŸ¥çš„錯誤碼"
msgid "streaming all changes\n"
msgstr ""
@@ -10169,56 +11706,65 @@
msgid "transferred %s in %.1f seconds (%s/sec)\n"
msgstr ""
-msgid "no [smtp]host in hgrc - cannot send mail"
-msgstr ""
+msgid "smtp.host not configured - cannot send mail"
+msgstr "smtp.host 沒有è¨å®š - hg沒有辦法寄信"
#, python-format
msgid "sending mail: smtp host %s, port %s\n"
-msgstr ""
+msgstr "æ£åœ¨å¯„mail: smtp host %s,port %s\n"
msgid "can't use TLS: Python SSL support not installed"
-msgstr ""
+msgstr "ä¸èƒ½ç”¨ TLS: python çš„ SSL 支æ´æ²’有安è£(?)"
msgid "(using tls)\n"
-msgstr ""
+msgstr "(使用 TLS)\n"
#, python-format
msgid "(authenticating to mail server as %s)\n"
-msgstr ""
+msgstr "(用 %s èªè¨¼åˆ° mail 伺æœå™¨)\n"
#, python-format
msgid "sending mail: %s\n"
-msgstr ""
+msgstr "æ£åœ¨å¯„mail: %s\n"
msgid "smtp specified as email transport, but no smtp host configured"
-msgstr ""
+msgstr "smtp 被æè¿°æˆæ˜¯ä¸€å€‹email 傳輸器,但是沒有è¨å®š smtp host"
#, python-format
msgid "%r specified as email transport, but not in PATH"
-msgstr ""
+msgstr "æè¿°%r是一個email傳輸器,但是他ä¸åœ¨PATH裡"
#, python-format
msgid "ignoring invalid sendcharset: %s\n"
-msgstr ""
+msgstr "忽略無效的傳é€å—元集: %s\n"
#, python-format
msgid "invalid email address: %s"
-msgstr ""
+msgstr "ä¸èƒ½ç”¨çš„E mail ä½å€: %s"
#, python-format
msgid "invalid local address: %s"
-msgstr ""
+msgstr "ä¸èƒ½ç”¨çš„本地ä½å€: %s"
#, python-format
msgid "failed to remove %s from manifest"
-msgstr ""
+msgstr "從清單移除 %s 失敗了"
+
+#, python-format
+msgid "invalid pattern (%s): %s"
+msgstr "無效的表é”å¼(%s): %s"
+
+msgid "invalid pattern"
+msgstr "無效的表é”å¼"
#, python-format
msgid "diff context lines count must be an integer, not %r"
-msgstr ""
-
-#, python-format
-msgid "untracked file in working directory differs from file in requested revision: '%s'"
+msgstr "\"diff context lines count\" å¿…é ˆæ˜¯ä¸€å€‹æ•´æ•¸,ä¸æ˜¯ %r"
+
+#, python-format
+msgid ""
+"untracked file in working directory differs from file in requested revision: "
+"'%s'"
msgstr ""
#, python-format
@@ -10241,7 +11787,7 @@
msgstr ""
msgid "resolving manifests\n"
-msgstr ""
+msgstr "解決清單ä¸\n"
#, python-format
msgid ""
@@ -10264,6 +11810,9 @@
msgid "&Deleted"
msgstr ""
+msgid "updating"
+msgstr "æ›´æ–°ä¸"
+
#, python-format
msgid "update failed to remove %s: %s!\n"
msgstr ""
@@ -10277,15 +11826,15 @@
msgstr ""
#, python-format
-msgid "warning: detected divergent renames of %s to:\n"
+msgid "note: possible conflict - %s was renamed multiple times to:\n"
msgstr ""
#, python-format
msgid "branch %s not found"
msgstr "找ä¸åˆ° branch %s"
-msgid "can't merge with ancestor"
-msgstr "ä¸èƒ½å’Œ ancestor åˆä½µ"
+msgid "merging with a working directory ancestor has no effect"
+msgstr ""
msgid "nothing to merge (use 'hg update' or check 'hg heads')"
msgstr "沒有å¯åˆä½µçš„變更 (請使用 'hg update' 或 'hg heads' 檢查)"
@@ -10293,14 +11842,38 @@
msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
msgstr "還有未 commit 的變更 (請使用 'hg status' 來列出變更)"
-msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
-msgstr ""
-
-msgid "crosses branches (use 'hg merge' or 'hg update -C')"
-msgstr ""
-
-msgid "crosses named branches (use 'hg update -C' to discard changes)"
-msgstr ""
+msgid "crosses branches (merge branches or use --clean to discard changes)"
+msgstr ""
+
+msgid "crosses branches (merge branches or use --check to force update)"
+msgstr ""
+
+msgid "Attention:"
+msgstr ""
+
+msgid "Caution:"
+msgstr ""
+
+msgid "!Danger!"
+msgstr "!!å±éšª!!"
+
+msgid "Error:"
+msgstr "錯誤:"
+
+msgid "Hint:"
+msgstr ""
+
+msgid "Important:"
+msgstr "é‡è¦:"
+
+msgid "Note:"
+msgstr "備注:"
+
+msgid "Tip:"
+msgstr "æ示:"
+
+msgid "Warning!"
+msgstr "è¦å ±!"
#, python-format
msgid "cannot create %s: destination already exists"
@@ -10331,11 +11904,11 @@
msgstr "檔案 %s å·²å˜åœ¨\n"
#, python-format
-msgid "Hunk #%d succeeded at %d %s(offset %d line).\n"
-msgstr ""
-
-#, python-format
-msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n"
+msgid "Hunk #%d succeeded at %d with fuzz %d (offset %d lines).\n"
+msgstr ""
+
+#, python-format
+msgid "Hunk #%d succeeded at %d (offset %d lines).\n"
msgstr ""
#, python-format
@@ -10358,31 +11931,34 @@
msgstr "binary patch 是 %d bytes，而ä¸æ˜¯ %d"
#, python-format
-msgid "unable to strip away %d dirs from %s"
-msgstr ""
+msgid "unable to strip away %d of %d dirs from %s"
+msgstr "ä¸èƒ½åŽ»é™¤(strip away) %d of %d個目錄從 %s"
msgid "undefined source and destination files"
-msgstr ""
+msgstr "沒有定義來æºè·Ÿç›®æ¨™æª”案"
#, python-format
msgid "malformed patch %s %s"
-msgstr ""
+msgstr "有缺陷的patch %s %s"
#, python-format
msgid "unsupported parser state: %s"
-msgstr ""
+msgstr "ä¸æ”¯æ´çš„解æžå™¨ç‹€æ…‹: %s"
#, python-format
msgid "patch command failed: %s"
msgstr "patch 命令失敗: %s"
#, python-format
-msgid "Unsupported line endings type: %s"
+msgid "unsupported line endings type: %s"
msgstr "ä¸æ”¯æ´çš„行尾çµæŸé¡žåž‹: %s"
+msgid "patch failed to apply"
+msgstr ""
+
#, python-format
msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
-msgstr ""
+msgstr "%d 修改,%d æ’å…¥(+),%d 刪除(-)\n"
#, python-format
msgid "exited with status %d"
@@ -10393,20 +11969,31 @@
msgstr "已被信號 %d 終æ¢"
#, python-format
-msgid "saving bundle to %s\n"
-msgstr "æ£åœ¨å„²å˜ bundle 至 %s\n"
+msgid "saved backup bundle to %s\n"
+msgstr ""
msgid "adding branch\n"
msgstr "æ£åœ¨æ–°å¢ž branch\n"
#, python-format
+msgid "strip failed, full bundle stored in '%s'\n"
+msgstr ""
+
+#, python-format
+msgid "strip failed, partial bundle stored in '%s'\n"
+msgstr ""
+
+#, python-format
msgid "cannot %s; remote repository does not support the %r capability"
-msgstr ""
+msgstr "ä¸èƒ½ %s;é 端儲å˜åº«ä¸æ”¯æ´ %r 功能"
#, python-format
msgid "unknown compression type %r"
msgstr "未知的壓縮類型 %r"
+msgid "index entry flags need RevlogNG"
+msgstr ""
+
#, python-format
msgid "index %s unknown flags %#04x for format v0"
msgstr ""
@@ -10430,21 +12017,370 @@
msgstr "ä¸æ˜Žç¢ºçš„ identifier"
msgid "no match found"
-msgstr ""
+msgstr "找ä¸åˆ°ç¬¦åˆçš„"
#, python-format
msgid "incompatible revision flag %x"
-msgstr ""
+msgstr "ä¸ç›¸å®¹çš„修定版旗標 %x"
#, python-format
msgid "%s not found in the transaction"
msgstr "æ–¼ transaction ä¸æ‰¾ä¸åˆ° %s"
+msgid "consistency error in delta"
+msgstr ""
+
msgid "unknown base"
msgstr "未知的 base"
-msgid "consistency error adding group"
-msgstr ""
+msgid "unterminated string"
+msgstr "沒有çµæŸçš„å—串"
+
+msgid "syntax error"
+msgstr "語法錯誤"
+
+msgid "missing argument"
+msgstr "åƒæ•¸éºå¤±"
+
+#, python-format
+msgid "can't use %s here"
+msgstr "ä¸èƒ½å†é€™è£¡ä½¿ç”¨ %s"
+
+msgid "can't use a list in this context"
+msgstr ""
+
+#, python-format
+msgid "not a function: %s"
+msgstr "%s ä¸æ˜¯å‡½å¼(function)"
+
+msgid ""
+"``id(string)``\n"
+" Revision non-ambiguously specified by the given hex string prefix."
+msgstr ""
+
+#. i18n: "id" is a keyword
+msgid "id requires one argument"
+msgstr "id 需è¦ä¸€å€‹åƒæ•¸"
+
+#. i18n: "id" is a keyword
+msgid "id requires a string"
+msgstr "id 需è¦ä¸€å€‹å—串"
+
+msgid ""
+"``rev(number)``\n"
+" Revision with the given numeric identifier."
+msgstr ""
+
+#. i18n: "rev" is a keyword
+msgid "rev requires one argument"
+msgstr "rev 需è¦ä¸€å€‹åƒæ•¸"
+
+#. i18n: "rev" is a keyword
+msgid "rev requires a number"
+msgstr "rev 需è¦ä¸€å€‹æ•¸å—"
+
+#. i18n: "rev" is a keyword
+msgid "rev expects a number"
+msgstr ""
+
+msgid ""
+"``p1(set)``\n"
+" First parent of changesets in set."
+msgstr ""
+
+msgid ""
+"``p2(set)``\n"
+" Second parent of changesets in set."
+msgstr ""
+
+msgid ""
+"``parents(set)``\n"
+" The set of all parents for all changesets in set."
+msgstr ""
+
+msgid ""
+"``max(set)``\n"
+" Changeset with highest revision number in set."
+msgstr ""
+
+msgid ""
+"``min(set)``\n"
+" Changeset with lowest revision number in set."
+msgstr ""
+
+msgid ""
+"``limit(set, n)``\n"
+" First n members of set."
+msgstr ""
+
+#. i18n: "limit" is a keyword
+msgid "limit requires two arguments"
+msgstr "limit 需è¦å…©å€‹åƒæ•¸"
+
+#. i18n: "limit" is a keyword
+msgid "limit requires a number"
+msgstr "limit 需è¦ä¸€å€‹æ•¸å—"
+
+#. i18n: "limit" is a keyword
+msgid "limit expects a number"
+msgstr ""
+
+msgid ""
+"``children(set)``\n"
+" Child changesets of changesets in set."
+msgstr ""
+
+msgid ""
+"``branch(set)``\n"
+" All changesets belonging to the branches of changesets in set."
+msgstr ""
+
+msgid ""
+"``ancestor(single, single)``\n"
+" Greatest common ancestor of the two changesets."
+msgstr ""
+
+#. i18n: "ancestor" is a keyword
+msgid "ancestor requires two arguments"
+msgstr "ancestor 需è¦å…©å€‹åƒæ•¸"
+
+#. i18n: "ancestor" is a keyword
+msgid "ancestor arguments must be single revisions"
+msgstr "ancestorçš„åƒæ•¸å¿…é ˆæ˜¯å–®å€‹ä¿®è¨‚ç‰ˆ"
+
+msgid ""
+"``ancestors(set)``\n"
+" Changesets that are ancestors of a changeset in set."
+msgstr ""
+
+msgid ""
+"``descendants(set)``\n"
+" Changesets which are descendants of changesets in set."
+msgstr ""
+
+msgid ""
+"``follow()``\n"
+" An alias for ``::.`` (ancestors of the working copy's first parent)."
+msgstr ""
+
+#. i18n: "follow" is a keyword
+msgid "follow takes no arguments"
+msgstr "follow ä¸éœ€è¦åƒæ•¸"
+
+msgid ""
+"``date(interval)``\n"
+" Changesets within the interval, see :hg:`help dates`."
+msgstr ""
+
+#. i18n: "date" is a keyword
+msgid "date requires a string"
+msgstr "date 需è¦ä¸€å€‹å—串"
+
+msgid ""
+"``keyword(string)``\n"
+" Search commit message, user name, and names of changed files for\n"
+" string."
+msgstr ""
+
+#. i18n: "keyword" is a keyword
+msgid "keyword requires a string"
+msgstr "keyword 需è¦ä¸€å€‹å—串"
+
+msgid ""
+"``grep(regex)``\n"
+" Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``\n"
+" to ensure special escape characters are handled correctly."
+msgstr ""
+
+#. i18n: "grep" is a keyword
+msgid "grep requires a string"
+msgstr "grep 需è¦ä¸€å€‹å—串"
+
+#, python-format
+msgid "invalid match pattern: %s"
+msgstr "無效的符åˆè¡¨é”å¼: %s"
+
+msgid ""
+"``author(string)``\n"
+" Alias for ``user(string)``."
+msgstr ""
+
+#. i18n: "author" is a keyword
+msgid "author requires a string"
+msgstr "author 需è¦ä¸€å€‹å—串"
+
+msgid ""
+"``user(string)``\n"
+" User name is string."
+msgstr ""
+
+msgid ""
+"``file(pattern)``\n"
+" Changesets affecting files matched by pattern."
+msgstr ""
+
+#. i18n: "file" is a keyword
+msgid "file requires a pattern"
+msgstr "file 需è¦ä¸€å€‹æª”å表é”å¼"
+
+msgid ""
+"``contains(pattern)``\n"
+" Revision contains pattern."
+msgstr ""
+
+#. i18n: "contains" is a keyword
+msgid "contains requires a pattern"
+msgstr "contains 需è¦ä¸€å€‹è¡¨ç¤ºå¼"
+
+msgid ""
+"``modifies(pattern)``\n"
+" Changesets modifying files matched by pattern."
+msgstr ""
+
+#. i18n: "modifies" is a keyword
+msgid "modifies requires a pattern"
+msgstr "modifies 需è¦ä¸€å€‹æª”å表é”å¼"
+
+msgid ""
+"``adds(pattern)``\n"
+" Changesets that add a file matching pattern."
+msgstr ""
+
+#. i18n: "adds" is a keyword
+msgid "adds requires a pattern"
+msgstr "adds 需è¦ä¸€å€‹æª”å表é”å¼"
+
+msgid ""
+"``removes(pattern)``\n"
+" Changesets which remove files matching pattern."
+msgstr ""
+
+#. i18n: "removes" is a keyword
+msgid "removes requires a pattern"
+msgstr "removes 需è¦ä¸€å€‹æª”å表é”å¼"
+
+msgid ""
+"``merge()``\n"
+" Changeset is a merge changeset."
+msgstr ""
+
+#. i18n: "merge" is a keyword
+msgid "merge takes no arguments"
+msgstr "merge ä¸éœ€è¦åƒæ•¸"
+
+msgid ""
+"``closed()``\n"
+" Changeset is closed."
+msgstr ""
+
+#. i18n: "closed" is a keyword
+msgid "closed takes no arguments"
+msgstr "closed ä¸éœ€è¦åƒæ•¸"
+
+msgid ""
+"``head()``\n"
+" Changeset is a named branch head."
+msgstr ""
+
+#. i18n: "head" is a keyword
+msgid "head takes no arguments"
+msgstr "head ä¸éœ€è¦åƒæ•¸"
+
+msgid ""
+"``reverse(set)``\n"
+" Reverse order of set."
+msgstr ""
+
+msgid ""
+"``present(set)``\n"
+" An empty set, if any revision in set isn't found; otherwise,\n"
+" all revisions in set."
+msgstr ""
+
+msgid ""
+"``sort(set[, [-]key...])``\n"
+" Sort set by keys. The default sort order is ascending, specify a key\n"
+" as ``-key`` to sort in descending order."
+msgstr ""
+
+msgid " The keys can be:"
+msgstr ""
+
+msgid ""
+" - ``rev`` for the revision number,\n"
+" - ``branch`` for the branch name,\n"
+" - ``desc`` for the commit message (description),\n"
+" - ``user`` for user name (``author`` can be used as an alias),\n"
+" - ``date`` for the commit date"
+msgstr ""
+
+#. i18n: "sort" is a keyword
+msgid "sort requires one or two arguments"
+msgstr "sort 需è¦1個或2個åƒæ•¸"
+
+msgid "sort spec must be a string"
+msgstr "排åºæè¿°å¿…é ˆæ˜¯ä¸€å€‹å—串"
+
+#, python-format
+msgid "unknown sort key %r"
+msgstr "未知的排åºéµå€¼ %r"
+
+msgid ""
+"``all()``\n"
+" All changesets, the same as ``0:tip``."
+msgstr ""
+
+#. i18n: "all" is a keyword
+msgid "all takes no arguments"
+msgstr "all ä¸éœ€è¦åƒæ•¸"
+
+msgid ""
+"``heads(set)``\n"
+" Members of set with no children in set."
+msgstr ""
+
+msgid ""
+"``roots(set)``\n"
+" Changesets with no parent changeset in set."
+msgstr ""
+
+msgid ""
+"``outgoing([path])``\n"
+" Changesets not found in the specified destination repository, or the\n"
+" default push location."
+msgstr ""
+
+#. i18n: "outgoing" is a keyword
+msgid "outgoing requires a repository path"
+msgstr "outgoing需è¦ä¸€å€‹å„²å˜åº«è·¯å¾‘"
+
+msgid ""
+"``tag(name)``\n"
+" The specified tag by name, or all tagged revisions if no name is given."
+msgstr ""
+
+#. i18n: "tag" is a keyword
+msgid "tag takes one or no arguments"
+msgstr "tag 需è¦ä¸€å€‹åƒæ•¸æˆ–ä¸éœ€è¦åƒæ•¸"
+
+#. i18n: "tag" is a keyword
+msgid "the argument to tag must be a string"
+msgstr "tagçš„åƒæ•¸å¿…é ˆæ˜¯ä¸€å€‹å—串"
+
+msgid "can't negate that"
+msgstr "ä¸èƒ½å¦å®šé‚£å€‹"
+
+msgid "not a symbol"
+msgstr "ä¸æ˜¯ä¸€å€‹ç¬¦è™Ÿ"
+
+msgid "empty query"
+msgstr "空白的查詢"
+
+msgid "searching for exact renames"
+msgstr ""
+
+msgid "searching for similar files"
+msgstr "æœå°‹é¡žä¼¼çš„檔案"
#, python-format
msgid "%s looks like a binary file."
@@ -10464,17 +12400,21 @@
msgstr "無法建立é 端 repo"
msgid "no suitable response from remote hg"
-msgstr ""
+msgstr "é 端hg沒有é©ç•¶çš„回應"
msgid "remote: "
msgstr "é 端: "
+msgid "unexpected response:"
+msgstr "æ„料之外的回應:"
+
#, python-format
msgid "push refused: %s"
msgstr "push 被拒絕: %s"
-msgid "unsynced changes"
-msgstr "未åŒæ¥çš„變更"
+#, python-format
+msgid "'%s' does not appear to be an hg repository"
+msgstr ""
msgid "cannot lock static-http repository"
msgstr "無法鎖定 static-http repository"
@@ -10487,6 +12427,17 @@
msgstr ""
#, python-format
+msgid "subrepo spec file %s not found"
+msgstr "å儲å˜åº«æ述檔 %s 找ä¸åˆ°"
+
+msgid "missing ] in subrepo source"
+msgstr ""
+
+#, python-format
+msgid "bad subrepository pattern in %s: %s"
+msgstr ""
+
+#, python-format
msgid ""
" subrepository sources for %s differ\n"
"use (l)ocal source (%s) or (r)emote source (%s)?"
@@ -10508,16 +12459,35 @@
msgstr ""
#, python-format
+msgid "default path for subrepository %s not found"
+msgstr ""
+
+#, python-format
+msgid "unknown subrepo type %s"
+msgstr "未知的å儲å˜åº«é¡žåž‹ %s"
+
+#, python-format
+msgid "warning: error \"%s\" in subrepository \"%s\"\n"
+msgstr ""
+
+#, python-format
msgid "removing subrepo %s\n"
-msgstr ""
-
-#, python-format
-msgid "pulling subrepo %s\n"
-msgstr ""
-
-#, python-format
-msgid "pushing subrepo %s\n"
-msgstr ""
+msgstr "移除å儲å˜åº« %s\n"
+
+#, python-format
+msgid "pulling subrepo %s from %s\n"
+msgstr "拉收å儲å˜åº« %s 從 %s\n"
+
+#, python-format
+msgid "pushing subrepo %s to %s\n"
+msgstr "推é€å儲å˜åº« %s 到 %s\n"
+
+msgid "cannot commit svn externals"
+msgstr "ä¸èƒ½æ交 svn externals"
+
+#, python-format
+msgid "not removing repo %s because it has changes.\n"
+msgstr "ä¸èƒ½ç§»é™¤å„²å˜åº« %s å› ç‚ºä»–å·²ç¶“æ”¹è®Šäº†.\n"
#, python-format
msgid "%s, line %s: %s\n"
@@ -10530,111 +12500,139 @@
msgid "node '%s' is not well formed"
msgstr ""
+msgid ".hg/tags.cache is corrupt, rebuilding it\n"
+msgstr ""
+
msgid "unmatched quotes"
-msgstr ""
+msgstr "沒有é…å°çš„引號"
#, python-format
msgid "error expanding '%s%%%s'"
-msgstr ""
+msgstr "'%s%%%s'展開失敗"
#, python-format
msgid "unknown filter '%s'"
-msgstr ""
+msgstr "未知的éŽæ¿¾å™¨ '%s'"
#, python-format
msgid "style not found: %s"
-msgstr ""
+msgstr "找ä¸åˆ°style: %s"
#, python-format
msgid "template file %s: %s"
-msgstr ""
+msgstr "ä½”å˜æª” %s: %s"
msgid "cannot use transaction when it is already committed/aborted"
msgstr ""
#, python-format
msgid "failed to truncate %s\n"
-msgstr ""
+msgstr "ä¸èƒ½æ¸…除(truncate) %s\n"
msgid "transaction abort!\n"
msgstr ""
msgid "rollback completed\n"
-msgstr ""
+msgstr "rollback 完æˆäº†\n"
msgid "rollback failed - please run hg recover\n"
-msgstr ""
+msgstr "rollback 失敗 - 請執行 hg recover 命令\n"
#, python-format
msgid "Not trusting file %s from untrusted user %s, group %s\n"
-msgstr ""
+msgstr "ä¸å—信任的檔案 %s 從ä¸å—信任的使用者 %s,群組 %s\n"
#, python-format
msgid "Ignored: %s\n"
+msgstr "忽略: %s\n"
+
+#, python-format
+msgid "(deprecated '%%' in path %s=%s from %s)\n"
msgstr ""
#, python-format
msgid "ignoring untrusted configuration option %s.%s = %s\n"
-msgstr ""
+msgstr "忽略未å—信任的è¨å®šé¸é … %s.%s=%s\n"
#, python-format
msgid "%s.%s not a boolean ('%s')"
msgstr ""
msgid "enter a commit username:"
-msgstr ""
+msgstr "請輸入一個æ交的使用者å稱:"
#, python-format
msgid "No username found, using '%s' instead\n"
-msgstr ""
-
-msgid "Please specify a username."
-msgstr ""
+msgstr "找ä¸åˆ°åå—,用 '%s'代替\n"
+
+msgid "no username supplied (see \"hg help config\")"
+msgstr "沒有æ供使用者å稱(查閱 'hg help config')"
#, python-format
msgid "username %s contains a newline\n"
-msgstr ""
+msgstr "使用者å稱 '%s' è£é¢æœ‰æ›è¡Œå—å…ƒ\n"
msgid "response expected"
-msgstr ""
+msgstr "é 期之ä¸çš„回應"
msgid "unrecognized response\n"
-msgstr ""
+msgstr "辨èªä¸å‡ºä¾†çš„回應\n"
msgid "password: "
-msgstr ""
+msgstr "密碼:"
msgid "edit failed"
-msgstr ""
+msgstr "編輯失敗"
msgid "http authorization required"
-msgstr ""
+msgstr "http 需è¦èªè¨¼"
msgid "http authorization required\n"
-msgstr ""
+msgstr "http 需è¦èªè¨¼\n"
#, python-format
msgid "realm: %s\n"
-msgstr ""
+msgstr "é ˜åŸŸ: %s\n"
#, python-format
msgid "user: %s\n"
-msgstr ""
+msgstr "使用者: %s\n"
msgid "user:"
-msgstr ""
+msgstr "使用者:"
#, python-format
msgid "http auth: user %s, password %s\n"
-msgstr ""
+msgstr "http èªè¨¼: 使用者 %s , 密碼 %s\n"
+
+#, python-format
+msgid "ignoring invalid [auth] key '%s'\n"
+msgstr "忽略無效的[èªè¨¼]éµç¢¼ '%s' \n"
+
+msgid "certificate checking requires Python 2.6"
+msgstr "憑è‰æª¢é©—需è¦Python 2.6版"
+
+msgid "no certificate received"
+msgstr ""
+
+#, python-format
+msgid "certificate is for %s"
+msgstr "憑è‰æ˜¯for %s"
+
+msgid "no commonName found in certificate"
+msgstr ""
+
+#, python-format
+msgid "%s certificate error: %s"
+msgstr "%s 憑è‰éŒ¯èª¤: %s"
#, python-format
msgid "command '%s' failed: %s"
-msgstr ""
+msgstr "命令 '%s' 失敗了: %s"
#, python-format
msgid "path contains illegal component: %s"
-msgstr ""
+msgstr "path 包å«äº†éžæ³•çš„組æˆå…ƒä»¶: %s"
#, python-format
msgid "path %r is inside repo %r"
@@ -10645,19 +12643,19 @@
msgstr ""
msgid "Hardlinks not supported"
-msgstr ""
+msgstr "硬å¼é€£çµä¸è¢«æ”¯æ´"
#, python-format
msgid "could not symlink to %r: %s"
-msgstr ""
-
-#, python-format
-msgid "invalid date: %r "
-msgstr ""
+msgstr "ä¸èƒ½ç”¢ç”Ÿç¬¦è™Ÿé€£çµåˆ° %r: %s"
+
+#, python-format
+msgid "invalid date: %r"
+msgstr "%r 是無效的日期"
#, python-format
msgid "date exceeds 32 bits: %d"
-msgstr ""
+msgstr "日期超出 32ä½å…ƒ(s) 了 : %d"
#, python-format
msgid "impossible time zone offset: %d"
@@ -10665,7 +12663,7 @@
#, python-format
msgid "invalid day spec: %s"
-msgstr ""
+msgstr "無效的時間: %s"
#, python-format
msgid "%.0f GB"
@@ -10707,15 +12705,19 @@
msgid "%.0f bytes"
msgstr ""
+#, python-format
+msgid "no port number associated with service '%s'"
+msgstr ""
+
msgid "cannot verify bundle or remote repos"
-msgstr ""
+msgstr "ä¸èƒ½ verify bundle 或 é 端儲å˜åº«"
msgid "interrupted"
-msgstr ""
+msgstr "ä¸æ–·"
#, python-format
msgid "empty or missing %s"
-msgstr ""
+msgstr "空白的或éºå¤± %s"
#, python-format
msgid "data length off by %d bytes"
@@ -10723,23 +12725,23 @@
#, python-format
msgid "index contains %d extra bytes"
-msgstr ""
+msgstr "index åŒ…å« %d個é¡å¤–çš„ä½å…ƒçµ„"
#, python-format
msgid "warning: `%s' uses revlog format 1"
-msgstr ""
+msgstr "è¦å ±:`%s' 使用 revlog æ ¼å¼ 1"
#, python-format
msgid "warning: `%s' uses revlog format 0"
-msgstr ""
+msgstr "è¦å ±:`%s' 使用 revlog æ ¼å¼ 0"
#, python-format
msgid "rev %d points to nonexistent changeset %d"
-msgstr ""
+msgstr "rev %d 指到ä¸å˜åœ¨çš„ changeset %d"
#, python-format
msgid "rev %d points to unexpected changeset %d"
-msgstr ""
+msgstr "rev %d 指到æ„料之外的changeset %d"
#, python-format
msgid " (expected %s)"
@@ -10747,75 +12749,84 @@
#, python-format
msgid "unknown parent 1 %s of %s"
-msgstr ""
+msgstr "未知的æ¯ç³» 1 %s of %s"
#, python-format
msgid "unknown parent 2 %s of %s"
-msgstr ""
+msgstr "未知的æ¯ç³» 2 %s of %s"
#, python-format
msgid "checking parents of %s"
-msgstr ""
+msgstr "æ£åœ¨æª¢æŸ¥ %s çš„ parents"
#, python-format
msgid "duplicate revision %d (%d)"
+msgstr "é‡è¤‡çš„修定版 %d (%d)"
+
+msgid "abandoned transaction found - run hg recover\n"
msgstr ""
#, python-format
msgid "repository uses revlog format %d\n"
-msgstr ""
+msgstr "儲å˜åº«ä½¿ç”¨ revlog æ ¼å¼ %d\n"
msgid "checking changesets\n"
-msgstr ""
+msgstr "檢查changesetä¸...\n"
+
+msgid "checking"
+msgstr "檢查ä¸..."
#, python-format
msgid "unpacking changeset %s"
-msgstr ""
+msgstr "解包(unpacking)changeset %s"
msgid "checking manifests\n"
-msgstr ""
+msgstr "檢查清單ä¸...\n"
#, python-format
msgid "%s not in changesets"
-msgstr ""
+msgstr "%s ä¸åœ¨changesets裡"
msgid "file without name in manifest"
msgstr ""
#, python-format
msgid "reading manifest delta %s"
-msgstr ""
+msgstr "讀å–manifest delta %s"
msgid "crosschecking files in changesets and manifests\n"
-msgstr ""
+msgstr "在 changesets å’Œ manifests裡交å‰æª¢æŸ¥\n"
+
+msgid "crosschecking"
+msgstr "交å‰æª¢æŸ¥ä¸"
#, python-format
msgid "changeset refers to unknown manifest %s"
-msgstr ""
+msgstr "changeset åƒè€ƒåˆ°æœªçŸ¥çš„清單 %s"
msgid "in changeset but not in manifest"
-msgstr ""
+msgstr "在changeset 但ä¸åœ¨æ¸…單裡"
msgid "in manifest but not in changeset"
-msgstr ""
+msgstr "在清單裡但ä¸åœ¨changeset"
msgid "checking files\n"
-msgstr ""
+msgstr "檢查檔案ä¸...\n"
#, python-format
msgid "cannot decode filename '%s'"
-msgstr ""
+msgstr "檔å '%s' ä¸èƒ½è¢«è§£ç¢¼"
#, python-format
msgid "broken revlog! (%s)"
msgstr ""
msgid "missing revlog!"
-msgstr ""
+msgstr "éºå¤± revlog!"
#, python-format
msgid "%s not in manifests"
-msgstr ""
+msgstr "%s ä¸åœ¨æ¸…單裡é¢"
#, python-format
msgid "unpacked size is %s, %s expected"
@@ -10823,11 +12834,11 @@
#, python-format
msgid "unpacking %s"
-msgstr ""
+msgstr "%s 拆包ä¸(unpacking)"
#, python-format
msgid "warning: copy source of '%s' not in parents of %s"
-msgstr ""
+msgstr "è¦å ±: '%s'的複製來æºä¸åœ¨ %s çš„æ¯ç³»"
#, python-format
msgid "empty or missing copy source revlog %s:%s"
@@ -10839,31 +12850,81 @@
#, python-format
msgid "checking rename of %s"
-msgstr ""
+msgstr "æ£åœ¨æª¢æŸ¥ %s çš„æ›´å"
#, python-format
msgid "%s in manifests not found"
-msgstr ""
+msgstr "%s 在清單找ä¸åˆ°"
#, python-format
msgid "warning: orphan revlog '%s'"
-msgstr ""
+msgstr "è¦å‘Š: '%s' 是單ç¨çš„revlog"
#, python-format
msgid "%d files, %d changesets, %d total revisions\n"
-msgstr ""
+msgstr "%d個檔案,%d個changesets,%d個總修訂版\n"
#, python-format
msgid "%d warnings encountered!\n"
-msgstr ""
+msgstr "é‡åˆ°äº† %d 個è¦å‘Š\n"
#, python-format
msgid "%d integrity errors encountered!\n"
-msgstr ""
+msgstr "é‡åˆ°äº† %d 個完整性錯誤\n"
#, python-format
msgid "(first damaged changeset appears to be %d)\n"
-msgstr ""
+msgstr "(第一個å±éšªçš„changeset 出ç¾åœ¨%d)\n"
msgid "user name not available - set USERNAME environment variable"
-msgstr ""
+msgstr "使用者åå—(user name)ä¸èƒ½ç”¨è€¶,è¨ä¸€ä¸‹ USERNAME å§"
+
+msgid "look up remote revision"
+msgstr "查看é 端修訂版"
+
+msgid "look up remote changes"
+msgstr "查看é 端changes"
+
+msgid "push failed:"
+msgstr "push 失敗:"
+
+msgid "push failed (unexpected response):"
+msgstr "push 失敗(æ„料之外的回應):"
+
+#~ msgid ""
+#~ "%s: files over 10MB may cause memory and performance problems\n"
+#~ "(use 'hg revert %s' to unadd the file)\n"
+#~ msgstr ""
+#~ "%s: 檔案超éŽ10Må¯èƒ½ç”¢ç”Ÿè¨˜æ†¶é«”跟效能å•é¡Œ\n"
+#~ "(使用 'hg revert %s'來å–消新增)\n"
+
+#~ msgid "journal already exists - run hg recover"
+#~ msgstr "日誌已經å˜åœ¨ - 執行 hg recover"
+
+#~ msgid "abort: could not import module %s!\n"
+#~ msgstr "ä¸æ¢: ä¸èƒ½åŒ¯å…¥ %s 模組!\n"
+
+#~ msgid "overwrite locally modified files (no backup)"
+#~ msgstr "è“‹éŽåŽ»æœ¬åœ°ç«¯ä¿®æ”¹æª”案(沒有備份)"
+
+#~ msgid "export the repository via HTTP"
+#~ msgstr "將 repository 經由 HTTP 發佈"
+
+#, fuzzy
+#~ msgid "retry file merges from a merge or update"
+#~ msgstr "é‡è©¦ç¶“ç”± merge 或 update å‘½ä»¤æ‰€é€ æˆã€å»æœªå®Œæˆçš„åˆä½µ"
+
+#~ msgid "COMMANDS"
+#~ msgstr "命令"
+
+#~ msgid "certificate not valid before %s"
+#~ msgstr "在%s 之å‰æ†‘è‰ä¸æ˜¯æœ‰æ•ˆçš„"
+
+#~ msgid "unsynced changes"
+#~ msgstr "未åŒæ¥çš„變更"
+
+#~ msgid " files"
+#~ msgstr "檔案"
+
+#~ msgid " options:"
+#~ msgstr "\té¸é …:"
--- a/mercurial/cmdutil.py Wed Oct 20 23:48:33 2010 +0200
+++ b/mercurial/cmdutil.py Tue Nov 02 09:47:47 2010 +0100
@@ -348,7 +348,7 @@
wctx = repo[None]
for src, dst in copies:
- wctx.copy(src, dst)
+ dirstatecopy(ui, repo, wctx, src, dst, cwd=cwd)
if (not similarity) and removes:
wctx.remove(sorted(removes), True)
@@ -367,6 +367,25 @@
files.extend([r for r in removes if r not in files])
return sorted(files)
+def dirstatecopy(ui, repo, wctx, src, dst, dryrun=False, cwd=None):
+ """Update the dirstate to reflect the intent of copying src to dst. For
+ different reasons it might not end with dst being marked as copied from src.
+ """
+ origsrc = repo.dirstate.copied(src) or src
+ if dst == origsrc: # copying back a copy?
+ if repo.dirstate[dst] not in 'mn' and not dryrun:
+ repo.dirstate.normallookup(dst)
+ else:
+ if repo.dirstate[origsrc] == 'a' and origsrc == src:
+ if not ui.quiet:
+ ui.warn(_("%s has not been committed yet, so no copy "
+ "data will be stored for %s.\n")
+ % (repo.pathto(origsrc, cwd), repo.pathto(dst, cwd)))
+ if repo.dirstate[dst] in '?r' and not dryrun:
+ wctx.add([dst])
+ elif not dryrun:
+ wctx.copy(origsrc, dst)
+
def copy(ui, repo, pats, opts, rename=False):
# called with the repo lock held
#
@@ -458,21 +477,7 @@
targets[abstarget] = abssrc
# fix up dirstate
- origsrc = repo.dirstate.copied(abssrc) or abssrc
- if abstarget == origsrc: # copying back a copy?
- if state not in 'mn' and not dryrun:
- repo.dirstate.normallookup(abstarget)
- else:
- if repo.dirstate[origsrc] == 'a' and origsrc == abssrc:
- if not ui.quiet:
- ui.warn(_("%s has not been committed yet, so no copy "
- "data will be stored for %s.\n")
- % (repo.pathto(origsrc, cwd), reltarget))
- if repo.dirstate[abstarget] in '?r' and not dryrun:
- wctx.add([abstarget])
- elif not dryrun:
- wctx.copy(origsrc, abstarget)
-
+ dirstatecopy(ui, repo, wctx, abssrc, abstarget, dryrun=dryrun, cwd=cwd)
if rename and not dryrun:
wctx.remove([abssrc], not after)
@@ -1351,7 +1356,7 @@
olddir = os.getcwd()
os.chdir(repo.root)
text = repo.ui.edit("\n".join(edittext), ctx.user())
- text = re.sub("(?m)^HG:.*\n", "", text)
+ text = re.sub("(?m)^HG:.*(\n|$)", "", text)
os.chdir(olddir)
if not text.strip():
--- a/mercurial/commands.py Wed Oct 20 23:48:33 2010 +0200
+++ b/mercurial/commands.py Tue Nov 02 09:47:47 2010 +0100
@@ -278,7 +278,11 @@
revert_opts['no_backup'] = None
revert(ui, repo, **revert_opts)
if not opts.get('merge') and op1 != node:
- return hg.update(repo, op1)
+ try:
+ ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
+ return hg.update(repo, op1)
+ finally:
+ ui.setconfig('ui', 'forcemerge', '')
commit_opts = opts.copy()
commit_opts['addremove'] = False
@@ -295,7 +299,11 @@
hg.clean(repo, op1, show_stats=False)
ui.status(_('merging with changeset %s\n')
% nice(repo.changelog.tip()))
- return hg.merge(repo, hex(repo.changelog.tip()))
+ try:
+ ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
+ return hg.merge(repo, hex(repo.changelog.tip()))
+ finally:
+ ui.setconfig('ui', 'forcemerge', '')
return 0
def bisect(ui, repo, rev=None, extra=None, command=None,
@@ -1252,26 +1260,43 @@
m = util.matchdate(range)
ui.write("match: %s\n" % m(d[0]))
-def debugindex(ui, repo, file_):
+def debugindex(ui, repo, file_, **opts):
"""dump the contents of an index file"""
r = None
if repo:
filelog = repo.file(file_)
if len(filelog):
r = filelog
+
+ format = opts.get('format', 0)
+ if format not in (0, 1):
+ raise util.abort("unknown format %d" % format)
+
if not r:
r = revlog.revlog(util.opener(os.getcwd(), audit=False), file_)
- ui.write(" rev offset length base linkrev"
- " nodeid p1 p2\n")
+
+ if format == 0:
+ ui.write(" rev offset length base linkrev"
+ " nodeid p1 p2\n")
+ elif format == 1:
+ ui.write(" rev flag offset length"
+ " size base link p1 p2 nodeid\n")
+
for i in r:
node = r.node(i)
- try:
- pp = r.parents(node)
- except:
- pp = [nullid, nullid]
- ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
- i, r.start(i), r.length(i), r.base(i), r.linkrev(i),
- short(node), short(pp[0]), short(pp[1])))
+ if format == 0:
+ try:
+ pp = r.parents(node)
+ except:
+ pp = [nullid, nullid]
+ ui.write("% 6d % 9d % 7d % 6d % 7d %s %s %s\n" % (
+ i, r.start(i), r.length(i), r.base(i), r.linkrev(i),
+ short(node), short(pp[0]), short(pp[1])))
+ elif format == 1:
+ pr = r.parentrevs(i)
+ ui.write("% 6d %04x % 8d % 8d % 8d % 6d % 6d % 6d % 6d %s\n" % (
+ i, r.flags(i), r.start(i), r.length(i), r.rawsize(i),
+ r.base(i), r.linkrev(i), pr[0], pr[1], short(node)))
def debugindexdot(ui, repo, file_):
"""dump an index DAG as a graphviz dot file"""
@@ -1369,7 +1394,7 @@
" file)\n"))
else:
ui.write(_(" Internal patcher failure, please report this error"
- " to http://mercurial.selenic.com/bts/\n"))
+ " to http://mercurial.selenic.com/wiki/BugTracker\n"))
problems += patchproblems
os.unlink(fa)
@@ -2021,6 +2046,8 @@
ui.write(_('use "hg help extensions" for information on enabling '
'extensions\n'))
+ help.addtopichook('revsets', revset.makedoc)
+
if name and name != 'shortlist':
i = None
if unknowncmd:
@@ -2438,7 +2465,7 @@
ancestors or descendants of the starting revision. --follow-first
only follows the first parent of merge revisions.
- If no revision range is specified, the default is tip:0 unless
+ If no revision range is specified, the default is ``tip:0`` unless
--follow is set, in which case the working directory parent is
used as the starting revision. You can specify a revision set for
log, see :hg:`help revsets` for more information.
@@ -2487,7 +2514,8 @@
return
if df and not df(ctx.date()[0]):
return
- if opts['user'] and not [k for k in opts['user'] if k in ctx.user()]:
+ if opts['user'] and not [k for k in opts['user']
+ if k.lower() in ctx.user().lower()]:
return
if opts.get('keyword'):
for k in [kw.lower() for kw in opts['keyword']]:
@@ -2774,7 +2802,11 @@
modheads = repo.pull(other, heads=revs, force=opts.get('force'))
if checkout:
checkout = str(repo.changelog.rev(other.lookup(checkout)))
- return postincoming(ui, repo, modheads, opts.get('update'), checkout)
+ repo._subtoppath = source
+ try:
+ return postincoming(ui, repo, modheads, opts.get('update'), checkout)
+ finally:
+ del repo._subtoppath
def push(ui, repo, dest=None, **opts):
"""push changes to the specified destination
@@ -2813,13 +2845,16 @@
if revs:
revs = [repo.lookup(rev) for rev in revs]
- # push subrepos depth-first for coherent ordering
- c = repo['']
- subs = c.substate # only repos that are committed
- for s in sorted(subs):
- if not c.sub(s).push(opts.get('force')):
- return False
-
+ repo._subtoppath = dest
+ try:
+ # push subrepos depth-first for coherent ordering
+ c = repo['']
+ subs = c.substate # only repos that are committed
+ for s in sorted(subs):
+ if not c.sub(s).push(opts.get('force')):
+ return False
+ finally:
+ del repo._subtoppath
r = repo.push(other, opts.get('force'), revs=revs,
newbranch=opts.get('new_branch'))
return r == 0
@@ -2943,7 +2978,7 @@
The resolve command can be used in the following ways:
- - :hg:`resolve [--tool] FILE...`: attempt to re-merge the specified
+ - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
files, discarding any previous merge attempts. Re-merging is not
performed for files already marked as resolved. Use ``--all/-a``
to selects all unresolved files. ``--tool`` can be used to specify
@@ -3854,7 +3889,8 @@
ui.write(_("Mercurial Distributed SCM (version %s)\n")
% util.version())
ui.status(_(
- "\nCopyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others\n"
+ "(see http://mercurial.selenic.com for more information)\n"
+ "\nCopyright (C) 2005-2010 Matt Mackall and others\n"
"This is free software; see the source for copying conditions. "
"There is NO\nwarranty; "
"not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
@@ -4005,6 +4041,8 @@
_('merge with old dirstate parent after backout')),
('', 'parent', '',
_('parent to choose when backing out merge'), _('REV')),
+ ('t', 'tool', '',
+ _('specify merge tool')),
('r', 'rev', '',
_('revision to backout'), _('REV')),
] + walkopts + commitopts + commitopts2,
@@ -4118,7 +4156,9 @@
_('[-e] DATE [RANGE]')),
"debugdata": (debugdata, [], _('FILE REV')),
"debugfsinfo": (debugfsinfo, [], _('[PATH]')),
- "debugindex": (debugindex, [], _('FILE')),
+ "debugindex": (debugindex,
+ [('f', 'format', 0, _('revlog format'), _('FORMAT'))],
+ _('FILE')),
"debugindexdot": (debugindexdot, [], _('FILE')),
"debuginstall": (debuginstall, [], ''),
"debugpushkey": (debugpushkey, [], _('REPO NAMESPACE [KEY OLD NEW]')),
--- a/mercurial/demandimport.py Wed Oct 20 23:48:33 2010 +0200
+++ b/mercurial/demandimport.py Tue Nov 02 09:47:47 2010 +0100
@@ -29,35 +29,29 @@
class _demandmod(object):
"""module demand-loader and proxy"""
- def __init__(self, name, globals, locals, level):
+ def __init__(self, name, globals, locals):
if '.' in name:
head, rest = name.split('.', 1)
after = [rest]
else:
head = name
after = []
- object.__setattr__(self, "_data", (head, globals, locals, after, level))
+ object.__setattr__(self, "_data", (head, globals, locals, after))
object.__setattr__(self, "_module", None)
def _extend(self, name):
"""add to the list of submodules to load"""
self._data[3].append(name)
def _load(self):
if not self._module:
- head, globals, locals, after, level = self._data
- if level is not None:
- mod = _origimport(head, globals, locals, level=level)
- else:
- mod = _origimport(head, globals, locals)
+ head, globals, locals, after = self._data
+ mod = _origimport(head, globals, locals)
# load submodules
def subload(mod, p):
h, t = p, None
if '.' in p:
h, t = p.split('.', 1)
if not hasattr(mod, h):
- # TODO: should we adjust the level here?
- submod = _demandmod(p, mod.__dict__, mod.__dict__,
- level=level)
- setattr(mod, h, submod)
+ setattr(mod, h, _demandmod(p, mod.__dict__, mod.__dict__))
elif t:
subload(getattr(mod, h), t)
@@ -97,36 +91,28 @@
base, rest = name.split('.', 1)
# email.__init__ loading email.mime
if globals and globals.get('__name__', None) == base:
- if level is not None:
- return _origimport(name, globals, locals, fromlist, level)
- else:
- return _origimport(name, globals, locals, fromlist)
+ return _origimport(name, globals, locals, fromlist)
# if a is already demand-loaded, add b to its submodule list
if base in locals:
if isinstance(locals[base], _demandmod):
locals[base]._extend(rest)
return locals[base]
- return _demandmod(name, globals, locals, level=level)
+ return _demandmod(name, globals, locals)
else:
- # from a import b,c,d
if level is not None:
- mod = _origimport(name, globals, locals, level=level)
- else:
- mod = _origimport(name, globals, locals)
+ # from . import b,c,d or from .a import b,c,d
+ return _origimport(name, globals, locals, fromlist, level)
+ # from a import b,c,d
+ mod = _origimport(name, globals, locals)
# recurse down the module chain
for comp in name.split('.')[1:]:
if not hasattr(mod, comp):
- # TODO: should we adjust the level here?
- submod = _demandmod(comp, mod.__dict__, mod.__dict__,
- level=level)
- setattr(mod, comp, submod)
+ setattr(mod, comp, _demandmod(comp, mod.__dict__, mod.__dict__))
mod = getattr(mod, comp)
for x in fromlist:
# set requested submodules for demand load
if not(hasattr(mod, x)):
- # TODO: should we adjust the level here?
- submod = _demandmod(x, mod.__dict__, locals, level=level)
- setattr(mod, x, submod)
+ setattr(mod, x, _demandmod(x, mod.__dict__, locals))
return mod
ignore = [
--- a/mercurial/dirstate.py Wed Oct 20 23:48:33 2010 +0200
+++ b/mercurial/dirstate.py Tue Nov 02 09:47:47 2010 +0100
@@ -485,11 +485,6 @@
work = []
wadd = work.append
- if self._checkcase:
- normalize = self._normalize
- else:
- normalize = lambda x, y: x
-
exact = skipstep3 = False
if matchfn == match.exact: # match.exact
exact = True
@@ -497,6 +492,12 @@
elif match.files() and not match.anypats(): # match.match, no patterns
skipstep3 = True
+ if self._checkcase:
+ normalize = self._normalize
+ skipstep3 = False
+ else:
+ normalize = lambda x, y: x
+
files = sorted(match.files())
subrepos.sort()
i, j = 0, 0
--- a/mercurial/dispatch.py Wed Oct 20 23:48:33 2010 +0200
+++ b/mercurial/dispatch.py Tue Nov 02 09:47:47 2010 +0100
@@ -24,7 +24,7 @@
except util.Abort, inst:
sys.stderr.write(_("abort: %s\n") % inst)
if inst.hint:
- sys.stderr.write("(%s)\n" % inst.hint)
+ sys.stderr.write(_("(%s)\n") % inst.hint)
return -1
except error.ParseError, inst:
if len(inst.args) > 1:
@@ -169,10 +169,9 @@
except socket.error, inst:
ui.warn(_("abort: %s\n") % inst.args[-1])
except:
- ui.warn(_("** unknown exception encountered, details follow\n"))
- ui.warn(_("** report bug details to "
- "http://mercurial.selenic.com/bts/\n"))
- ui.warn(_("** or mercurial@selenic.com\n"))
+ ui.warn(_("** unknown exception encountered,"
+ " please report by visiting\n"))
+ ui.warn(_("** http://mercurial.selenic.com/wiki/BugTracker\n"))
ui.warn(_("** Python %s\n") % sys.version.replace('\n', ''))
ui.warn(_("** Mercurial Distributed SCM (version %s)\n")
% util.version())
--- a/mercurial/encoding.py Wed Oct 20 23:48:33 2010 +0200
+++ b/mercurial/encoding.py Tue Nov 02 09:47:47 2010 +0100
@@ -87,11 +87,17 @@
except LookupError, k:
raise error.Abort("%s, please check your locale settings" % k)
+# How to treat ambiguous-width characters. Set to 'wide' to treat as wide.
+ambiguous = os.environ.get("HGENCODINGAMBIGUOUS", "narrow")
+
def colwidth(s):
"Find the column width of a UTF-8 string for display"
d = s.decode(encoding, 'replace')
if hasattr(unicodedata, 'east_asian_width'):
+ wide = "WF"
+ if ambiguous == "wide":
+ wide = "WFA"
w = unicodedata.east_asian_width
- return sum([w(c) in 'WFA' and 2 or 1 for c in d])
+ return sum([w(c) in wide and 2 or 1 for c in d])
return len(d)
--- a/mercurial/help.py Wed Oct 20 23:48:33 2010 +0200
+++ b/mercurial/help.py Tue Nov 02 09:47:47 2010 +0100
@@ -79,7 +79,11 @@
break
path = os.path.join(docdir, topic + ".txt")
- return gettext(open(path).read())
+ doc = gettext(open(path).read())
+ for rewriter in helphooks.get(topic, []):
+ doc = rewriter(topic, doc)
+ return doc
+
return loader
helptable = [
@@ -92,13 +96,22 @@
loaddoc('revisions')),
(['mrevs', 'multirevs'], _('Specifying Multiple Revisions'),
loaddoc('multirevs')),
- (['revsets'], _("Specifying Revision Sets"), loaddoc('revsets')),
+ (['revset', 'revsets'], _("Specifying Revision Sets"), loaddoc('revsets')),
(['diffs'], _('Diff Formats'), loaddoc('diffs')),
(['merge-tools'], _('Merge Tools'), loaddoc('merge-tools')),
(['templating', 'templates'], _('Template Usage'),
loaddoc('templates')),
(['urls'], _('URL Paths'), loaddoc('urls')),
(["extensions"], _("Using additional features"), extshelp),
+ (["subrepo", "subrepos"], _("Subrepositories"), loaddoc('subrepos')),
(["hgweb"], _("Configuring hgweb"), loaddoc('hgweb')),
(["glossary"], _("Glossary"), loaddoc('glossary')),
]
+
+# Map topics to lists of callable taking the current topic help and
+# returning the updated version
+helphooks = {
+}
+
+def addtopichook(topic, rewriter):
+ helphooks.setdefault(topic, []).append(rewriter)
--- a/mercurial/help/environment.txt Wed Oct 20 23:48:33 2010 +0200
+++ b/mercurial/help/environment.txt Tue Nov 02 09:47:47 2010 +0100
@@ -24,6 +24,13 @@
"ignore", which drops them. This setting can be overridden with
the --encodingmode command-line option.
+HGENCODINGAMBIGUOUS
+ This sets Mercurial's behavior for handling characters with
+ "ambiguous" widths like accented Latin characters with East Asian
+ fonts. By default, Mercurial assumes ambiguous characters are
+ narrow, set this variable to "wide" if such characters cause
+ formatting problems.
+
HGMERGE
An executable to use for resolving merge conflicts. The program
will be executed with three arguments: local file, remote file,
--- a/mercurial/help/merge-tools.txt Wed Oct 20 23:48:33 2010 +0200
+++ b/mercurial/help/merge-tools.txt Tue Nov 02 09:47:47 2010 +0100
@@ -5,34 +5,50 @@
ancestor of the two file versions, so they can determine the changes
made on both branches.
-The merge tools are used both for :hg:`resolve` and :hg:`merge`.
+Merge tools are used both for :hg:`resolve`, :hg:`merge`, :hg:`update`,
+:hg:`backout` and in several extensions.
-Usually, the merge tool tries to automatically, by combining all the
-non-overlapping changes that occurred separately in the two different
-evolutions of the same initial base file. Furthermore, some
+Usually, the merge tool tries to automatically reconcile the files by
+combining all non-overlapping changes that occurred separately in
+the two different evolutions of the same initial base file. Furthermore, some
interactive merge programs make it easier to manually resolve
conflicting merges, either in a graphical way, or by inserting some
conflict markers. Mercurial does not include any interactive merge
-programs but relies on external tools for that. External merge tools
-and their properties and usage is configured in merge-tools section -
-see hgrc(5).
+programs but relies on external tools for that.
+
+Available merge tools
+"""""""""""""""""""""
+
+External merge tools and their properties are configured in the
+merge-tools configuration section - see hgrc(5) - but they can often just
+be named by their executable.
-There are a some internal merge tools which can be used. The internal
+A merge tool is generally usable if its executable can be found on the
+system and if it can handle the merge. The executable is found if it
+is an absolute or relative executable path or the name of an
+application in the executable search path. The tool is assumed to be
+able to handle the merge if it can handle symlinks if the file is a
+symlink, if it can handle binary files if the file is binary, and if a
+GUI is available if the tool requires a GUI.
+
+There are some internal merge tools which can be used. The internal
merge tools are:
``internal:merge``
- Uses the internal non-interactive merge tool for merging files.
+ Uses the internal non-interactive simple merge algorithm for merging
+ files. It will fail if there are any conflicts and leave markers in
+ the partially merged file.
``internal:fail``
Rather than attempting to merge files that were modified on both
- branches, it marks these files as unresolved. Then the resolve
- command must be used to mark files resolved.
+ branches, it marks them as unresolved. The resolve command must be
+ used to resolve these conflicts.
``internal:local``
Uses the local version of files as the merged version.
``internal:other``
- Uses the remote version of files as the merged version.
+ Uses the other version of files as the merged version.
``internal:prompt``
Asks the user which of the local or the other version to keep as
@@ -41,45 +57,54 @@
``internal:dump``
Creates three versions of the files to merge, containing the
contents of local, other and base. These files can then be used to
- perform a merge manually. If the file merged is name ``a.txt``,
- these files will accordingly be named ``a.txt.local``,
+ perform a merge manually. If the file to be merged is named
+ ``a.txt``, these files will accordingly be named ``a.txt.local``,
``a.txt.other`` and ``a.txt.base`` and they will be placed in the
- same directory as the file to merge.
+ same directory as ``a.txt``.
+
+Internal tools are always available and do not require a GUI but will by default
+not handle symlinks or binary files.
-How Mercurial decides which merge program to use
+Choosing a merge tool
+"""""""""""""""""""""
+
+Mercurial uses these rules when deciding which merge tool to use:
-1. If the ``HGMERGE`` environment variable is present, it is used. If
- specified it must be either an executable path or the name of an
- application in your executable search path.
+1. If a tool has been specified with the --tool option to merge or resolve, it
+ is used. If it is the name of a tool in the merge-tools configuration, its
+ configuration is used. Otherwise the specified tool must be executable by
+ the shell.
-2. If the filename of the file to be merged matches any of the
- patterns in the merge-patterns configuration section, then the
- corresponding merge tool is used, unless the file to be merged is a
- symlink. Here binary capabilities of the merge tool are not
- considered.
+2. If the ``HGMERGE`` environment variable is present, its value is used and
+ must be executable by the shell.
-3. If ui.merge is set, it is used.
+3. If the filename of the file to be merged matches any of the patterns in the
+ merge-patterns configuration section, the first usable merge tool
+ corresponding to a matching pattern is used. Here, binary capabilities of the
+ merge tool are not considered.
-4. If any merge tools are present in the merge-tools configuration
- section, and any of the tools can be found on the system, the
- priority settings are used to determine which one to use. Binary,
- symlink and GUI capabilities do also have to match.
+4. If ui.merge is set it will be considered next. If the value is not the name
+ of a configured tool, the specified value is used and must be executable by
+ the shell. Otherwise the named tool is used if it is usable.
-5. If a program named ``hgmerge`` exists on the system, it is used.
+5. If any usable merge tools are present in the merge-tools configuration
+ section, the one with the highest priority is used.
-6. If the file to be merged is not binary and is not a symlink, then
+6. If a program named ``hgmerge`` can be found on the system, it is used - but
+ it will by default not be used for symlinks and binary files.
+
+7. If the file to be merged is not binary and is not a symlink, then
``internal:merge`` is used.
-7. The merge fails.
+8. The merge of the file fails and must be resolved before commit.
.. note::
After selecting a merge program, Mercurial will by default attempt
- to merge the files using a simple merge algorithm first, to see if
- they can be merged without conflicts. Only if there are conflicting
- changes Mercurial will actually execute the merge program. Whether
- to use the simple merge algorithm first can be controlled be the
- premerge setting of the merge tool, which is enabled by default
- unless the file is binary or symlink.
+ to merge the files using a simple merge algorithm first. Only if it doesn't
+ succeed because of conflicting changes Mercurial will actually execute the
+ merge program. Whether to use the simple merge algorithm first can be
+ controlled by the premerge setting of the merge tool. Premerge is enabled by
+ default unless the file is binary or a symlink.
-See the merge-tools and ui sections of hgrc(5) for details on
+See the merge-tools and ui sections of hgrc(5) for details on the
configuration of merge tools.
--- a/mercurial/help/revsets.txt Wed Oct 20 23:48:33 2010 +0200
+++ b/mercurial/help/revsets.txt Tue Nov 02 09:47:47 2010 +0100
@@ -45,123 +45,7 @@
The following predicates are supported:
-``adds(pattern)``
- Changesets that add a file matching pattern.
-
-``all()``
- All changesets, the same as ``0:tip``.
-
-``ancestor(single, single)``
- Greatest common ancestor of the two changesets.
-
-``ancestors(set)``
- Changesets that are ancestors of a changeset in set.
-
-``author(string)``
- Alias for ``user(string)``.
-
-``branch(set)``
- All changesets belonging to the branches of changesets in set.
-
-``children(set)``
- Child changesets of changesets in set.
-
-``closed()``
- Changeset is closed.
-
-``contains(pattern)``
- Revision contains pattern.
-
-``date(interval)``
- Changesets within the interval, see :hg:`help dates`.
-
-``descendants(set)``
- Changesets which are descendants of changesets in set.
-
-``file(pattern)``
- Changesets affecting files matched by pattern.
-
-``follow()``
- An alias for ``::.`` (ancestors of the working copy's first parent).
-
-``grep(regex)``
- Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``
- to ensure special escape characters are handled correctly.
-
-``head()``
- Changeset is a named branch head.
-
-``heads(set)``
- Members of set with no children in set.
-
-``id(string)``
- Revision non-ambiguously specified by the given hex string prefix
-
-``keyword(string)``
- Search commit message, user name, and names of changed files for
- string.
-
-``limit(set, n)``
- First n members of set.
-
-``max(set)``
- Changeset with highest revision number in set.
-
-``min(set)``
- Changeset with lowest revision number in set.
-
-``merge()``
- Changeset is a merge changeset.
-
-``modifies(pattern)``
- Changesets modifying files matched by pattern.
-
-``outgoing([path])``
- Changesets not found in the specified destination repository, or the
- default push location.
-
-``p1(set)``
- First parent of changesets in set.
-
-``p2(set)``
- Second parent of changesets in set.
-
-``parents(set)``
- The set of all parents for all changesets in set.
-
-``present(set)``
- An empty set, if any revision in set isn't found; otherwise,
- all revisions in set.
-
-``removes(pattern)``
- Changesets which remove files matching pattern.
-
-``rev(number)``
- Revision with the given numeric identifier.
-
-``reverse(set)``
- Reverse order of set.
-
-``roots(set)``
- Changesets with no parent changeset in set.
-
-``sort(set[, [-]key...])``
- Sort set by keys. The default sort order is ascending, specify a key
- as ``-key`` to sort in descending order.
-
- The keys can be:
-
- - ``rev`` for the revision number,
- - ``branch`` for the branch name,
- - ``desc`` for the commit message (description),
- - ``user`` for user name (``author`` can be used as an alias),
- - ``date`` for the commit date
-
-``tag(name)``
- The specified tag by name, or all tagged revisions if no name is given.
-
-``user(string)``
- User name is string.
+.. predicatesmarker
Command line equivalents for :hg:`log`::
@@ -178,26 +62,26 @@
- Changesets on the default branch::
- hg log -r 'branch(default)'
+ hg log -r "branch(default)"
- Changesets on the default branch since tag 1.5 (excluding merges)::
- hg log -r 'branch(default) and 1.5:: and not merge()'
+ hg log -r "branch(default) and 1.5:: and not merge()"
- Open branch heads::
- hg log -r 'head() and not closed()'
+ hg log -r "head() and not closed()"
- Changesets between tags 1.3 and 1.5 mentioning "bug" that affect
``hgext/*``::
- hg log -r '1.3::1.5 and keyword(bug) and file("hgext/*")'
+ hg log -r "1.3::1.5 and keyword(bug) and file('hgext/*')"
- Changesets in committed May 2008, sorted by user::
- hg log -r 'sort(date("May 2008"), user)'
+ hg log -r "sort(date('May 2008'), user)"
- Changesets mentioning "bug" or "issue" that are not in a tagged
release::
- hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'
+ hg log -r "(keyword(bug) or keyword(issue)) and not ancestors(tagged())"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial/help/subrepos.txt Tue Nov 02 09:47:47 2010 +0100
@@ -0,0 +1,127 @@
+Subrepositories let you nest external repositories or projects into a
+parent Mercurial repository, and make commands operate on them as a
+group. External Mercurial and Subversion projects are currently
+supported.
+
+Subrepositories are made of three components:
+
+1. Nested repository checkouts. They can appear anywhere in the
+ parent working directory, and are Mercurial clones or Subversion
+ checkouts.
+
+2. Nested repository references. They are defined in ``.hgsub`` and
+ tell where the subrepository checkouts come from. Mercurial
+ subrepositories are referenced like:
+
+ path/to/nested = https://example.com/nested/repo/path
+
+ where ``path/to/nested`` is the checkout location relatively to the
+ parent Mercurial root, and ``https://example.com/nested/repo/path``
+ is the source repository path. The source can also reference a
+ filesystem path. Subversion repositories are defined with:
+
+ path/to/nested = [svn]https://example.com/nested/trunk/path
+
+ Note that ``.hgsub`` does not exist by default in Mercurial
+ repositories, you have to create and add it to the parent
+ repository before using subrepositories.
+
+3. Nested repository states. They are defined in ``.hgsubstate`` and
+ capture whatever information is required to restore the
+ subrepositories to the state they were committed in a parent
+ repository changeset. Mercurial automatically record the nested
+ repositories states when committing in the parent repository.
+
+ .. note::
+ The ``.hgsubstate`` file should not be edited manually.
+
+
+Adding a Subrepository
+----------------------
+
+If ``.hgsub`` does not exist, create it and add it to the parent
+repository. Clone or checkout the external projects where you want it
+to live in the parent repository. Edit ``.hgsub`` and add the
+subrepository entry as described above. At this point, the
+subrepository is tracked and the next commit will record its state in
+``.hgsubstate`` and bind it to the committed changeset.
+
+Synchronizing a Subrepository
+-----------------------------
+
+Subrepos do not automatically track the latest changeset of their
+sources. Instead, they are updated to the changeset that corresponds
+with the changeset checked out in the top-level changeset. This is so
+developers always get a consistent set of compatible code and
+libraries when they update.
+
+Thus, updating subrepos is a manual process. Simply check out target
+subrepo at the desired revision, test in the top-level repo, then
+commit in the parent repository to record the new combination.
+
+Deleting a Subrepository
+------------------------
+
+To remove a subrepository from the parent repository, delete its
+reference from ``.hgsub``, then remove its files.
+
+Interaction with Mercurial Commands
+-----------------------------------
+
+:add: add does not recurse in subrepos unless -S/--subrepos is
+ specified. Subversion subrepositories are currently silently
+ ignored.
+
+:archive: archive does not recurse in subrepositories unless
+ -S/--subrepos is specified.
+
+:commit: commit creates a consistent snapshot of the state of the
+ entire project and its subrepositories. It does this by first
+ attempting to commit all modified subrepositories, then recording
+ their state and finally committing it in the parent repository.
+
+:diff: diff does not recurse in subrepos unless -S/--subrepos is
+ specified. Changes are displayed as usual, on the subrepositories
+ elements. Subversion subrepositories are currently silently
+ ignored.
+
+:incoming: incoming does not recurse in subrepos unless -S/--subrepos
+ is specified. Subversion subrepositories are currently silently
+ ignored.
+
+:outgoing: outgoing does not recurse in subrepos unless -S/--subrepos
+ is specified. Subversion subrepositories are currently silently
+ ignored.
+
+:pull: pull is not recursive since it is not clear what to pull prior
+ to running :hg:`update`. Listing and retrieving all
+ subrepositories changes referenced by the parent repository pulled
+ changesets is expensive at best, impossible in the Subversion
+ case.
+
+:push: Mercurial will automatically push all subrepositories first
+ when the parent repository is being pushed. This ensures new
+ subrepository changes are available when referenced by top-level
+ repositories.
+
+:status: status does not recurse into subrepositories unless
+ -S/--subrepos is specified. Subrepository changes are displayed as
+ regular Mercurial changes on the subrepository
+ elements. Subversion subrepositories are currently silently
+ ignored.
+
+:update: update restores the subrepos in the state they were
+ originally committed in target changeset. If the recorded
+ changeset is not available in the current subrepository, Mercurial
+ will pull it in first before updating. This means that updating
+ can require network access when using subrepositories.
+
+Remapping Subrepositories Sources
+---------------------------------
+
+A subrepository source location may change during a project life,
+invalidating references stored in the parent repository history. To
+fix this, rewriting rules can be defined in parent repository ``hgrc``
+file or in Mercurial configuration. See the ``[subpaths]`` section in
+hgrc(5) for more details.
+
--- a/mercurial/hgweb/server.py Wed Oct 20 23:48:33 2010 +0200
+++ b/mercurial/hgweb/server.py Tue Nov 02 09:47:47 2010 +0100
@@ -227,7 +227,7 @@
except ImportError:
raise util.Abort(_("SSL support is unavailable"))
httpserver.socket = ssl.wrap_socket(httpserver.socket, server_side=True,
- certfile=ssl_cert, ssl_version=ssl.PROTOCOL_SSLv3)
+ certfile=ssl_cert, ssl_version=ssl.PROTOCOL_SSLv23)
def setup(self):
self.connection = self.request
--- a/mercurial/localrepo.py Wed Oct 20 23:48:33 2010 +0200
+++ b/mercurial/localrepo.py Tue Nov 02 09:47:47 2010 +0100
@@ -981,7 +981,7 @@
"""
tr = lock = None
- removed = ctx.removed()
+ removed = list(ctx.removed())
p1, p2 = ctx.p1(), ctx.p2()
m1 = p1.manifest().copy()
m2 = p2.manifest()
@@ -1272,7 +1272,7 @@
self.ui.status(_("no changes found\n"))
return 0
- if fetch == [nullid]:
+ if heads is None and fetch == [nullid]:
self.ui.status(_("requesting all changes\n"))
elif heads is None and remote.capable('changegroupsubset'):
# issue1320, avoid a race if remote changed after discovery
--- a/mercurial/lsprof.py Wed Oct 20 23:48:33 2010 +0200
+++ b/mercurial/lsprof.py Tue Nov 02 09:47:47 2010 +0100
@@ -1,5 +1,3 @@
-#! /usr/bin/env python
-
import sys
from _lsprof import Profiler, profiler_entry
--- a/mercurial/minirst.py Wed Oct 20 23:48:33 2010 +0200
+++ b/mercurial/minirst.py Tue Nov 02 09:47:47 2010 +0100
@@ -248,7 +248,7 @@
# +------------------------------+
if (block['type'] == 'paragraph' and
len(block['lines']) == 2 and
- len(block['lines'][0]) == len(block['lines'][1]) and
+ encoding.colwidth(block['lines'][0]) == len(block['lines'][1]) and
_sectionre.match(block['lines'][1])):
block['underline'] = block['lines'][1][0]
block['type'] = 'section'
@@ -292,6 +292,17 @@
i += 2
return blocks
+def prunecomments(blocks):
+ """Remove comments."""
+ i = 0
+ while i < len(blocks):
+ b = blocks[i]
+ if b['type'] == 'paragraph' and b['lines'][0].startswith('.. '):
+ del blocks[i]
+ else:
+ i += 1
+ return blocks
+
_admonitionre = re.compile(r"\.\. (admonition|attention|caution|danger|"
r"error|hint|important|note|tip|warning)::",
flags=re.IGNORECASE)
@@ -347,7 +358,7 @@
indent += ' '
return indent + ('\n' + indent).join(block['lines'])
if block['type'] == 'section':
- underline = len(block['lines'][0]) * block['underline']
+ underline = encoding.colwidth(block['lines'][0]) * block['underline']
return "%s%s\n%s%s" % (indent, block['lines'][0],indent, underline)
if block['type'] == 'definition':
term = indent + block['lines'][0]
@@ -405,6 +416,7 @@
blocks = hgrole(blocks)
blocks = splitparagraphs(blocks)
blocks = updatefieldlists(blocks)
+ blocks = prunecomments(blocks)
blocks = addmargins(blocks)
blocks = findadmonitions(blocks)
text = '\n'.join(formatblock(b, width) for b in blocks)
@@ -432,6 +444,7 @@
blocks = debug(splitparagraphs, blocks)
blocks = debug(updatefieldlists, blocks)
blocks = debug(findsections, blocks)
+ blocks = debug(prunecomments, blocks)
blocks = debug(addmargins, blocks)
blocks = debug(findadmonitions, blocks)
print '\n'.join(formatblock(b, 30) for b in blocks)
--- a/mercurial/patch.py Wed Oct 20 23:48:33 2010 +0200
+++ b/mercurial/patch.py Tue Nov 02 09:47:47 2010 +0100
@@ -686,6 +686,7 @@
for x in xrange(self.lena):
l = lr.readline()
if l.startswith('---'):
+ # lines addition, old block is empty
lr.push(l)
break
s = l[2:]
@@ -719,11 +720,15 @@
for x in xrange(self.lenb):
l = lr.readline()
if l.startswith('\ '):
+ # XXX: the only way to hit this is with an invalid line range.
+ # The no-eol marker is not counted in the line range, but I
+ # guess there are diff(1) out there which behave differently.
s = self.b[-1][:-1]
self.b[-1] = s
self.hunk[hunki - 1] = s
continue
if not l:
+ # line deletions, new block is empty and we hit EOF
lr.push(l)
break
s = l[2:]
@@ -732,7 +737,7 @@
elif l.startswith(' '):
u = ' ' + s
elif len(self.b) == 0:
- # this can happen when the hunk does not add any lines
+ # line deletions, new block is empty
lr.push(l)
break
else:
--- a/mercurial/revlog.py Wed Oct 20 23:48:33 2010 +0200
+++ b/mercurial/revlog.py Tue Nov 02 09:47:47 2010 +0100
@@ -1157,19 +1157,34 @@
def _addrevision(self, node, text, transaction, link, p1, p2,
cachedelta, ifh, dfh):
- def buildtext(cachedelta):
- if text is not None:
- return text
+ btext = [text]
+ def buildtext():
+ if btext[0] is not None:
+ return btext[0]
# flush any pending writes here so we can read it in revision
if dfh:
dfh.flush()
ifh.flush()
basetext = self.revision(self.node(cachedelta[0]))
- patchedtext = mdiff.patch(basetext, cachedelta[1])
- chk = hash(patchedtext, p1, p2)
+ btext[0] = mdiff.patch(basetext, cachedelta[1])
+ chk = hash(btext[0], p1, p2)
if chk != node:
raise RevlogError(_("consistency error in delta"))
- return patchedtext
+ return btext[0]
+
+ def builddelta(rev):
+ # can we use the cached delta?
+ if cachedelta and cachedelta[0] == rev:
+ delta = cachedelta[1]
+ else:
+ t = buildtext()
+ ptext = self.revision(self.node(rev))
+ delta = mdiff.textdiff(ptext, t)
+ data = compress(delta)
+ l = len(data[1]) + len(data[0])
+ base = self.base(rev)
+ dist = l + offset - self.start(base)
+ return dist, l, data, base
curr = len(self)
prev = curr - 1
@@ -1177,28 +1192,17 @@
offset = self.end(prev)
flags = 0
d = None
-
- if self._parentdelta:
- deltarev, deltanode = self.rev(p1), p1
- flags = REVIDX_PARENTDELTA
- else:
- deltarev, deltanode = prev, self.node(prev)
+ p1r, p2r = self.rev(p1), self.rev(p2)
# should we try to build a delta?
- if deltarev != nullrev:
- # can we use the cached delta?
- if cachedelta:
- cacherev, d = cachedelta
- if cacherev != deltarev:
- text = buildtext(cachedelta)
- d = None
- if d is None:
- ptext = self.revision(deltanode)
- d = mdiff.textdiff(ptext, text)
- data = compress(d)
- l = len(data[1]) + len(data[0])
- base = self.base(deltarev)
- dist = l + offset - self.start(base)
+ if prev != nullrev:
+ d = builddelta(prev)
+ if self._parentdelta and prev != p1r:
+ d2 = builddelta(p1r)
+ if d2 < d:
+ d = d2
+ flags = REVIDX_PARENTDELTA
+ dist, l, data, base = d
# full versions are inserted when the needed deltas
# become comparable to the uncompressed text
@@ -1210,13 +1214,13 @@
textlen = len(text)
if (d is None or dist > textlen * 2 or
(self.flags(base) & REVIDX_PUNCHED_FLAG)):
- text = buildtext(cachedelta)
+ text = buildtext()
data = compress(text)
l = len(data[1]) + len(data[0])
base = curr
e = (offset_type(offset, flags), l, textlen,
- base, link, self.rev(p1), self.rev(p2), node)
+ base, link, p1r, p2r, node)
self.index.insert(-1, e)
self.nodemap[node] = curr
--- a/mercurial/revset.py Wed Oct 20 23:48:33 2010 +0200
+++ b/mercurial/revset.py Tue Nov 02 09:47:47 2010 +0100
@@ -8,7 +8,7 @@
import re
import parser, util, error, discovery
import match as matchmod
-from i18n import _
+from i18n import _, gettext
elements = {
"(": (20, ("group", 1, ")"), ("func", 1, ")")),
@@ -174,7 +174,12 @@
# functions
def node(repo, subset, x):
+ """``id(string)``
+ Revision non-ambiguously specified by the given hex string prefix.
+ """
+ # i18n: "id" is a keyword
l = getargs(x, 1, 1, _("id requires one argument"))
+ # i18n: "id" is a keyword
n = getstring(l[0], _("id requires a string"))
if len(n) == 40:
rn = repo[n].rev()
@@ -183,14 +188,23 @@
return [r for r in subset if r == rn]
def rev(repo, subset, x):
+ """``rev(number)``
+ Revision with the given numeric identifier.
+ """
+ # i18n: "rev" is a keyword
l = getargs(x, 1, 1, _("rev requires one argument"))
try:
+ # i18n: "rev" is a keyword
l = int(getstring(l[0], _("rev requires a number")))
except ValueError:
+ # i18n: "rev" is a keyword
raise error.ParseError(_("rev expects a number"))
return [r for r in subset if r == l]
def p1(repo, subset, x):
+ """``p1(set)``
+ First parent of changesets in set.
+ """
ps = set()
cl = repo.changelog
for r in getset(repo, range(len(repo)), x):
@@ -198,6 +212,9 @@
return [r for r in subset if r in ps]
def p2(repo, subset, x):
+ """``p2(set)``
+ Second parent of changesets in set.
+ """
ps = set()
cl = repo.changelog
for r in getset(repo, range(len(repo)), x):
@@ -205,6 +222,9 @@
return [r for r in subset if r in ps]
def parents(repo, subset, x):
+ """``parents(set)``
+ The set of all parents for all changesets in set.
+ """
ps = set()
cl = repo.changelog
for r in getset(repo, range(len(repo)), x):
@@ -212,6 +232,9 @@
return [r for r in subset if r in ps]
def maxrev(repo, subset, x):
+ """``max(set)``
+ Changeset with highest revision number in set.
+ """
s = getset(repo, subset, x)
if s:
m = max(s)
@@ -220,6 +243,9 @@
return []
def minrev(repo, subset, x):
+ """``min(set)``
+ Changeset with lowest revision number in set.
+ """
s = getset(repo, subset, x)
if s:
m = min(s)
@@ -228,14 +254,23 @@
return []
def limit(repo, subset, x):
+ """``limit(set, n)``
+ First n members of set.
+ """
+ # i18n: "limit" is a keyword
l = getargs(x, 2, 2, _("limit requires two arguments"))
try:
+ # i18n: "limit" is a keyword
lim = int(getstring(l[1], _("limit requires a number")))
except ValueError:
+ # i18n: "limit" is a keyword
raise error.ParseError(_("limit expects a number"))
return getset(repo, subset, l[0])[:lim]
def children(repo, subset, x):
+ """``children(set)``
+ Child changesets of changesets in set.
+ """
cs = set()
cl = repo.changelog
s = set(getset(repo, range(len(repo)), x))
@@ -246,6 +281,9 @@
return [r for r in subset if r in cs]
def branch(repo, subset, x):
+ """``branch(set)``
+ All changesets belonging to the branches of changesets in set.
+ """
s = getset(repo, range(len(repo)), x)
b = set()
for r in s:
@@ -254,17 +292,25 @@
return [r for r in subset if r in s or repo[r].branch() in b]
def ancestor(repo, subset, x):
+ """``ancestor(single, single)``
+ Greatest common ancestor of the two changesets.
+ """
+ # i18n: "ancestor" is a keyword
l = getargs(x, 2, 2, _("ancestor requires two arguments"))
r = range(len(repo))
a = getset(repo, r, l[0])
b = getset(repo, r, l[1])
if len(a) != 1 or len(b) != 1:
+ # i18n: "ancestor" is a keyword
raise error.ParseError(_("ancestor arguments must be single revisions"))
an = [repo[a[0]].ancestor(repo[b[0]]).rev()]
return [r for r in an if r in subset]
def ancestors(repo, subset, x):
+ """``ancestors(set)``
+ Changesets that are ancestors of a changeset in set.
+ """
args = getset(repo, range(len(repo)), x)
if not args:
return []
@@ -272,6 +318,9 @@
return [r for r in subset if r in s]
def descendants(repo, subset, x):
+ """``descendants(set)``
+ Changesets which are descendants of changesets in set.
+ """
args = getset(repo, range(len(repo)), x)
if not args:
return []
@@ -279,17 +328,30 @@
return [r for r in subset if r in s]
def follow(repo, subset, x):
+ """``follow()``
+ An alias for ``::.`` (ancestors of the working copy's first parent).
+ """
+ # i18n: "follow" is a keyword
getargs(x, 0, 0, _("follow takes no arguments"))
p = repo['.'].rev()
s = set(repo.changelog.ancestors(p)) | set([p])
return [r for r in subset if r in s]
def date(repo, subset, x):
+ """``date(interval)``
+ Changesets within the interval, see :hg:`help dates`.
+ """
+ # i18n: "date" is a keyword
ds = getstring(x, _("date requires a string"))
dm = util.matchdate(ds)
return [r for r in subset if dm(repo[r].date()[0])]
def keyword(repo, subset, x):
+ """``keyword(string)``
+ Search commit message, user name, and names of changed files for
+ string.
+ """
+ # i18n: "keyword" is a keyword
kw = getstring(x, _("keyword requires a string")).lower()
l = []
for r in subset:
@@ -300,7 +362,12 @@
return l
def grep(repo, subset, x):
+ """``grep(regex)``
+ Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``
+ to ensure special escape characters are handled correctly.
+ """
try:
+ # i18n: "grep" is a keyword
gr = re.compile(getstring(x, _("grep requires a string")))
except re.error, e:
raise error.ParseError(_('invalid match pattern: %s') % e)
@@ -314,10 +381,24 @@
return l
def author(repo, subset, x):
+ """``author(string)``
+ Alias for ``user(string)``.
+ """
+ # i18n: "author" is a keyword
n = getstring(x, _("author requires a string")).lower()
return [r for r in subset if n in repo[r].user().lower()]
+def user(repo, subset, x):
+ """``user(string)``
+ User name is string.
+ """
+ return author(repo, subset, x)
+
def hasfile(repo, subset, x):
+ """``file(pattern)``
+ Changesets affecting files matched by pattern.
+ """
+ # i18n: "file" is a keyword
pat = getstring(x, _("file requires a pattern"))
m = matchmod.match(repo.root, repo.getcwd(), [pat])
s = []
@@ -329,6 +410,10 @@
return s
def contains(repo, subset, x):
+ """``contains(pattern)``
+ Revision contains pattern.
+ """
+ # i18n: "contains" is a keyword
pat = getstring(x, _("contains requires a pattern"))
m = matchmod.match(repo.root, repo.getcwd(), [pat])
s = []
@@ -373,27 +458,51 @@
return s
def modifies(repo, subset, x):
+ """``modifies(pattern)``
+ Changesets modifying files matched by pattern.
+ """
+ # i18n: "modifies" is a keyword
pat = getstring(x, _("modifies requires a pattern"))
return checkstatus(repo, subset, pat, 0)
def adds(repo, subset, x):
+ """``adds(pattern)``
+ Changesets that add a file matching pattern.
+ """
+ # i18n: "adds" is a keyword
pat = getstring(x, _("adds requires a pattern"))
return checkstatus(repo, subset, pat, 1)
def removes(repo, subset, x):
+ """``removes(pattern)``
+ Changesets which remove files matching pattern.
+ """
+ # i18n: "removes" is a keyword
pat = getstring(x, _("removes requires a pattern"))
return checkstatus(repo, subset, pat, 2)
def merge(repo, subset, x):
+ """``merge()``
+ Changeset is a merge changeset.
+ """
+ # i18n: "merge" is a keyword
getargs(x, 0, 0, _("merge takes no arguments"))
cl = repo.changelog
return [r for r in subset if cl.parentrevs(r)[1] != -1]
def closed(repo, subset, x):
+ """``closed()``
+ Changeset is closed.
+ """
+ # i18n: "closed" is a keyword
getargs(x, 0, 0, _("closed takes no arguments"))
return [r for r in subset if repo[r].extra().get('close')]
def head(repo, subset, x):
+ """``head()``
+ Changeset is a named branch head.
+ """
+ # i18n: "head" is a keyword
getargs(x, 0, 0, _("head takes no arguments"))
hs = set()
for b, ls in repo.branchmap().iteritems():
@@ -401,17 +510,37 @@
return [r for r in subset if r in hs]
def reverse(repo, subset, x):
+ """``reverse(set)``
+ Reverse order of set.
+ """
l = getset(repo, subset, x)
l.reverse()
return l
def present(repo, subset, x):
+ """``present(set)``
+ An empty set, if any revision in set isn't found; otherwise,
+ all revisions in set.
+ """
try:
return getset(repo, subset, x)
except error.RepoLookupError:
return []
def sort(repo, subset, x):
+ """``sort(set[, [-]key...])``
+ Sort set by keys. The default sort order is ascending, specify a key
+ as ``-key`` to sort in descending order.
+
+ The keys can be:
+
+ - ``rev`` for the revision number,
+ - ``branch`` for the branch name,
+ - ``desc`` for the commit message (description),
+ - ``user`` for user name (``author`` can be used as an alias),
+ - ``date`` for the commit date
+ """
+ # i18n: "sort" is a keyword
l = getargs(x, 1, 2, _("sort requires one or two arguments"))
keys = "rev"
if len(l) == 2:
@@ -454,22 +583,38 @@
return [e[-1] for e in l]
def getall(repo, subset, x):
+ """``all()``
+ All changesets, the same as ``0:tip``.
+ """
+ # i18n: "all" is a keyword
getargs(x, 0, 0, _("all takes no arguments"))
return subset
def heads(repo, subset, x):
+ """``heads(set)``
+ Members of set with no children in set.
+ """
s = getset(repo, subset, x)
ps = set(parents(repo, subset, x))
return [r for r in s if r not in ps]
def roots(repo, subset, x):
+ """``roots(set)``
+ Changesets with no parent changeset in set.
+ """
s = getset(repo, subset, x)
cs = set(children(repo, subset, x))
return [r for r in s if r not in cs]
def outgoing(repo, subset, x):
+ """``outgoing([path])``
+ Changesets not found in the specified destination repository, or the
+ default push location.
+ """
import hg # avoid start-up nasties
+ # i18n: "outgoing" is a keyword
l = getargs(x, 0, 1, _("outgoing requires a repository path"))
+ # i18n: "outgoing" is a keyword
dest = l and getstring(l[0], _("outgoing requires a repository path")) or ''
dest = repo.ui.expandpath(dest or 'default-push', dest or 'default')
dest, branches = hg.parseurl(dest)
@@ -485,16 +630,24 @@
return [r for r in subset if r in o]
def tag(repo, subset, x):
+ """``tag(name)``
+ The specified tag by name, or all tagged revisions if no name is given.
+ """
+ # i18n: "tag" is a keyword
args = getargs(x, 0, 1, _("tag takes one or no arguments"))
cl = repo.changelog
if args:
tn = getstring(args[0],
+ # i18n: "tag" is a keyword
_('the argument to tag must be a string'))
s = set([cl.rev(n) for t, n in repo.tagslist() if t == tn])
else:
s = set([cl.rev(n) for t, n in repo.tagslist() if t != 'tip'])
return [r for r in subset if r in s]
+def tagged(repo, subset, x):
+ return tag(repo, subset, x)
+
symbols = {
"adds": adds,
"all": getall,
@@ -530,8 +683,8 @@
"roots": roots,
"sort": sort,
"tag": tag,
- "tagged": tag,
- "user": author,
+ "tagged": tagged,
+ "user": user,
}
methods = {
@@ -624,3 +777,21 @@
def mfunc(repo, subset):
return getset(repo, subset, tree)
return mfunc
+
+def makedoc(topic, doc):
+ """Generate and include predicates help in revsets topic."""
+ predicates = []
+ for name in sorted(symbols):
+ text = symbols[name].__doc__
+ if not text:
+ continue
+ text = gettext(text.rstrip())
+ lines = text.splitlines()
+ lines[1:] = [(' ' + l.strip()) for l in lines[1:]]
+ predicates.append('\n'.join(lines))
+ predicates = '\n\n'.join(predicates)
+ doc = doc.replace('.. predicatesmarker', predicates)
+ return doc
+
+# tell hggettext to extract docstrings from these functions:
+i18nfunctions = symbols.values()
--- a/mercurial/subrepo.py Wed Oct 20 23:48:33 2010 +0200
+++ b/mercurial/subrepo.py Tue Nov 02 09:47:47 2010 +0100
@@ -187,6 +187,8 @@
else: # plain file system path
return posixpath.normpath(os.path.join(parent, repo._subsource))
else: # recursion reached top repo
+ if hasattr(repo, '_subtoppath'):
+ return repo._subtoppath
if push and repo.ui.config('paths', 'default-push'):
return repo.ui.config('paths', 'default-push')
if repo.ui.config('paths', 'default'):
@@ -490,8 +492,8 @@
doc = xml.dom.minidom.parseString(output)
entries = doc.getElementsByTagName('entry')
if not entries:
- return 0
- return int(entries[0].getAttribute('revision') or 0)
+ return '0'
+ return str(entries[0].getAttribute('revision')) or '0'
def _wcchanged(self):
"""Return (changes, extchanges) where changes is True
--- a/mercurial/templates/paper/branches.tmpl Wed Oct 20 23:48:33 2010 +0200
+++ b/mercurial/templates/paper/branches.tmpl Tue Nov 02 09:47:47 2010 +0100
@@ -19,6 +19,9 @@
<li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
<li class="active">branches</li>
</ul>
+<ul>
+ <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
+</ul>
</div>
<div class="main">
--- a/mercurial/templates/paper/manifest.tmpl Wed Oct 20 23:48:33 2010 +0200
+++ b/mercurial/templates/paper/manifest.tmpl Tue Nov 02 09:47:47 2010 +0100
@@ -25,9 +25,6 @@
<ul>
<li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
</ul>
-<ul>
-<li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
-</ul>
</div>
<div class="main">
--- a/mercurial/templates/spartan/branches.tmpl Wed Oct 20 23:48:33 2010 +0200
+++ b/mercurial/templates/spartan/branches.tmpl Tue Nov 02 09:47:47 2010 +0100
@@ -13,6 +13,7 @@
<a href="{url}graph{sessionvars%urlparameter}">graph</a>
<a href="{url}tags{sessionvars%urlparameter}">tags</a>
<a href="{url}file/{node|short}/{sessionvars%urlparameter}">files</a>
+<a href="{url}help{sessionvars%urlparameter}">help</a>
<a type="application/rss+xml" href="{url}rss-branches">rss</a>
<a type="application/atom+xml" href="{url}atom-branches">atom</a>
</div>
--- a/mercurial/url.py Wed Oct 20 23:48:33 2010 +0200
+++ b/mercurial/url.py Tue Nov 02 09:47:47 2010 +0100
@@ -131,9 +131,9 @@
raise util.Abort(_('http authorization required'))
self.ui.write(_("http authorization required\n"))
- self.ui.status(_("realm: %s\n") % realm)
+ self.ui.write(_("realm: %s\n") % realm)
if user:
- self.ui.status(_("user: %s\n") % user)
+ self.ui.write(_("user: %s\n") % user)
else:
user = self.ui.prompt(_("user:"), default=None)
@@ -540,8 +540,8 @@
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.sock.connect((self.host, self.port))
if _generic_proxytunnel(self):
- self.sock = _ssl_wrap_socket(self.sock, self.cert_file,
- self.key_file)
+ self.sock = _ssl_wrap_socket(self.sock, self.key_file,
+ self.cert_file)
else:
BetterHTTPS.connect(self)
--- a/mercurial/util.py Wed Oct 20 23:48:33 2010 +0200
+++ b/mercurial/util.py Tue Nov 02 09:47:47 2010 +0100
@@ -863,9 +863,11 @@
nlink = nlinks(f)
except OSError:
nlink = 0
- d = os.path.dirname(f)
- if not os.path.isdir(d):
- makedirs(d, self.createmode)
+ dirname, basename = os.path.split(f)
+ # Avoid calling makedirs when the path points to a
+ # directory -- the open will raise IOError below.
+ if basename and not os.path.isdir(dirname):
+ makedirs(dirname, self.createmode)
if atomictemp:
return atomictempfile(f, mode, self.createmode)
if nlink > 1:
--- a/setup.py Wed Oct 20 23:48:33 2010 +0200
+++ b/setup.py Tue Nov 02 09:47:47 2010 +0100
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
#
# This is the mercurial setup script.
#
--- a/tests/run-tests.py Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/run-tests.py Tue Nov 02 09:47:47 2010 +0100
@@ -604,7 +604,7 @@
raise
for s, r in replacements:
- output = output.replace(s, r)
+ output = re.sub(s, r, output)
return ret, splitnewlines(output)
def runone(options, test, skips, fails):
@@ -677,10 +677,10 @@
signal.alarm(options.timeout)
ret, out = runner(testpath, options, [
- (testtmp, '$TESTTMP'),
- (':%s' % options.port, ':$HGPORT'),
- (':%s' % (options.port + 1), ':$HGPORT1'),
- (':%s' % (options.port + 2), ':$HGPORT2'),
+ (re.escape(testtmp), '$TESTTMP'),
+ (r':%s\b' % options.port, ':$HGPORT'),
+ (r':%s\b' % (options.port + 1), ':$HGPORT1'),
+ (r':%s\b' % (options.port + 2), ':$HGPORT2'),
])
vlog("# Ret was:", ret)
--- a/tests/test-acl.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-acl.t Tue Nov 02 09:47:47 2010 +0100
@@ -63,7 +63,6 @@
$ cd ..
$ hg clone -r 0 a b
- requesting all changes
adding changesets
adding manifests
adding file changes
--- a/tests/test-backout.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-backout.t Tue Nov 02 09:47:47 2010 +0100
@@ -1,5 +1,3 @@
- $ HGMERGE=true; export HGMERGE
-
$ hg init basic
$ cd basic
@@ -20,7 +18,7 @@
$ echo b >> a
$ hg commit -d '1 0' -m b
- $ hg backout -d '2 0' tip
+ $ hg backout -d '2 0' tip --tool=true
reverting a
changeset 2:2929462c3dff backs out changeset 1:a820f4f40a57
$ cat a
@@ -39,7 +37,7 @@
$ hg rm a
$ hg commit -d '1 0' -m b
- $ hg backout -d '2 0' tip
+ $ hg backout -d '2 0' tip --tool=true
adding a
changeset 2:de31bdc76c0d backs out changeset 1:76862dcce372
$ cat a
@@ -47,7 +45,7 @@
backout of backout is as if nothing happened
- $ hg backout -d '3 0' --merge tip
+ $ hg backout -d '3 0' --merge tip --tool=true
removing a
changeset 3:7f6d0f120113 backs out changeset 2:de31bdc76c0d
$ cat a 2>/dev/null || echo cat: a: No such file or directory
@@ -102,7 +100,7 @@
$ echo line 3 >> a
$ hg commit -d '2 0' -m c
- $ hg backout --merge -d '3 0' 1
+ $ hg backout --merge -d '3 0' 1 --tool=true
reverting a
created new head
changeset 3:26b8ccb9ad91 backs out changeset 1:5a50a024c182
@@ -133,7 +131,7 @@
adding b
without --merge
- $ hg backout -d '3 0' 1
+ $ hg backout -d '3 0' 1 --tool=true
reverting a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg locate b
@@ -144,7 +142,7 @@
b
with --merge
- $ hg backout --merge -d '3 0' 1
+ $ hg backout --merge -d '3 0' 1 --tool=true
reverting a
created new head
changeset 3:3202beb76721 backs out changeset 1:22bca4c721e5
@@ -201,7 +199,7 @@
backout with valid parent should be ok
- $ hg backout -d '5 0' --parent 2 4
+ $ hg backout -d '5 0' --parent 2 4 --tool=true
removing d
changeset 5:10e5328c8435 backs out changeset 4:b2f3bb92043e
@@ -210,7 +208,7 @@
$ hg update -C
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ hg backout -d '6 0' --parent 3 4
+ $ hg backout -d '6 0' --parent 3 4 --tool=true
removing c
changeset 5:033590168430 backs out changeset 4:b2f3bb92043e
@@ -236,7 +234,7 @@
adding file2
without --merge
- $ hg backout -r 1
+ $ hg backout -r 1 --tool=true
removing file1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg branch
@@ -248,7 +246,7 @@
with --merge
$ hg update -qC
- $ hg backout --merge -d '3 0' -r 1 -m 'backout on branch1'
+ $ hg backout --merge -d '3 0' -r 1 -m 'backout on branch1' --tool=true
removing file1
created new head
changeset 3:d4e8f6db59fb backs out changeset 1:bf1602f437f3
--- a/tests/test-bdiff.py Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-bdiff.py Tue Nov 02 09:47:47 2010 +0100
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
import struct
from mercurial import bdiff, mpatch
--- a/tests/test-bookmarks.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-bookmarks.t Tue Nov 02 09:47:47 2010 +0100
@@ -83,6 +83,8 @@
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1
+ $ hg help revsets | grep 'bookmark('
+ "bookmark([name])"
bookmarks X and X2 moved to rev 1, Y at rev -1
--- a/tests/test-branch-option.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-branch-option.t Tue Nov 02 09:47:47 2010 +0100
@@ -18,7 +18,6 @@
$ hg tag -l z
$ cd ..
$ hg clone -r 0 branch branch2
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -97,7 +96,6 @@
$ cd ..
$ hg clone branch2#b branch3
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -114,7 +112,6 @@
clone rev a branch b
$ hg clone -r a branch2#b branch3
- requesting all changes
adding changesets
adding manifests
adding file changes
--- a/tests/test-bundle-vs-outgoing.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-bundle-vs-outgoing.t Tue Nov 02 09:47:47 2010 +0100
@@ -105,7 +105,6 @@
sanity check of outgoing: expect revs 4 5 6 7 8
$ hg clone -r3 . ../repo2
- requesting all changes
adding changesets
adding manifests
adding file changes
--- a/tests/test-bundle.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-bundle.t Tue Nov 02 09:47:47 2010 +0100
@@ -236,7 +236,6 @@
$ rm -r empty
$ hg init empty
$ hg clone -r 3 test partial
- requesting all changes
adding changesets
adding manifests
adding file changes
--- a/tests/test-clone-r.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-clone-r.t Tue Nov 02 09:47:47 2010 +0100
@@ -37,12 +37,12 @@
$ hg mv afile anotherfile
$ hg commit -m "0.3m"
- $ hg debugindex .hg/store/data/afile.i
- rev offset length base linkrev nodeid p1 p2
- 0 0 3 0 0 362fef284ce2 000000000000 000000000000
- 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000
- 2 8 7 2 2 4c982badb186 125144f7e028 000000000000
- 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000
+ $ hg debugindex -f 1 .hg/store/data/afile.i
+ rev flag offset length size base link p1 p2 nodeid
+ 0 0000 0 3 2 0 0 -1 -1 362fef284ce2
+ 1 0000 3 5 4 1 1 0 -1 125144f7e028
+ 2 0000 8 7 6 2 2 1 -1 4c982badb186
+ 3 0000 15 9 8 3 3 2 -1 19b1fc555737
$ hg debugindex .hg/store/data/adifferentfile.i
rev offset length base linkrev nodeid p1 p2
@@ -85,7 +85,6 @@
> done
---- hg clone -r 0 test test-0
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -99,7 +98,6 @@
1 files, 1 changesets, 1 total revisions
---- hg clone -r 1 test test-1
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -113,7 +111,6 @@
1 files, 2 changesets, 2 total revisions
---- hg clone -r 2 test test-2
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -127,7 +124,6 @@
1 files, 3 changesets, 3 total revisions
---- hg clone -r 3 test test-3
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -141,7 +137,6 @@
1 files, 4 changesets, 4 total revisions
---- hg clone -r 4 test test-4
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -155,7 +150,6 @@
1 files, 2 changesets, 2 total revisions
---- hg clone -r 5 test test-5
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -169,7 +163,6 @@
1 files, 3 changesets, 3 total revisions
---- hg clone -r 6 test test-6
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -183,7 +176,6 @@
2 files, 4 changesets, 5 total revisions
---- hg clone -r 7 test test-7
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -197,7 +189,6 @@
3 files, 5 changesets, 6 total revisions
---- hg clone -r 8 test test-8
- requesting all changes
adding changesets
adding manifests
adding file changes
--- a/tests/test-clone-update-order.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-clone-update-order.t Tue Nov 02 09:47:47 2010 +0100
@@ -24,7 +24,6 @@
[255]
$ hg clone -U .#other ../b -r 0 -r 1 -r 2 -b other
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -32,7 +31,6 @@
$ rm -rf ../b
$ hg clone -u . .#other ../b -r 0 -r 1 -r 2 -b other
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -42,7 +40,6 @@
$ rm -rf ../b
$ hg clone -u 0 .#other ../b -r 0 -r 1 -r 2 -b other
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -52,7 +49,6 @@
$ rm -rf ../b
$ hg clone -u 1 .#other ../b -r 0 -r 1 -r 2 -b other
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -62,7 +58,6 @@
$ rm -rf ../b
$ hg clone -u 2 .#other ../b -r 0 -r 1 -r 2 -b other
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -74,7 +69,6 @@
Test -r mine ... mine is ignored:
$ hg clone -u 2 .#other ../b -r mine -r 0 -r 1 -r 2 -b other
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -84,7 +78,6 @@
$ rm -rf ../b
$ hg clone .#other ../b -b default -b mine
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -94,7 +87,6 @@
$ rm -rf ../b
$ hg clone .#other ../b
- requesting all changes
adding changesets
adding manifests
adding file changes
--- a/tests/test-clone.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-clone.t Tue Nov 02 09:47:47 2010 +0100
@@ -306,7 +306,6 @@
Testing #<branch>:
$ hg clone -u . a#stable ua
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -343,7 +342,6 @@
Testing -u -r <branch>:
$ hg clone -u . -r stable a ua
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -380,7 +378,6 @@
Testing -r <branch>:
$ hg clone -r stable a ua
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -442,7 +439,6 @@
> EOF
$ python branchclone.py
- requesting all changes
adding changesets
adding manifests
adding file changes
--- a/tests/test-debugcomplete.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-debugcomplete.t Tue Nov 02 09:47:47 2010 +0100
@@ -196,7 +196,7 @@
update: clean, check, date, rev
addremove: similarity, include, exclude, dry-run
archive: no-decode, prefix, rev, type, subrepos, include, exclude
- backout: merge, parent, rev, include, exclude, message, logfile, date, user
+ backout: merge, parent, tool, rev, include, exclude, message, logfile, date, user
bisect: reset, good, bad, skip, command, noupdate
branch: force, clean
branches: active, closed
@@ -212,7 +212,7 @@
debugdata:
debugdate: extended
debugfsinfo:
- debugindex:
+ debugindex: format
debugindexdot:
debuginstall:
debugpushkey:
--- a/tests/test-demandimport.py Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-demandimport.py Tue Nov 02 09:47:47 2010 +0100
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
from mercurial import demandimport
demandimport.enable()
--- a/tests/test-empty-group.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-empty-group.t Tue Nov 02 09:47:47 2010 +0100
@@ -49,7 +49,6 @@
$ cd ..
$ hg clone -r 3 a b
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -58,7 +57,6 @@
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg clone -r 4 a c
- requesting all changes
adding changesets
adding manifests
adding file changes
--- a/tests/test-encoding.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-encoding.t Tue Nov 02 09:47:47 2010 +0100
@@ -166,13 +166,13 @@
$ HGENCODING=latin-1 hg tags
tip 5:093c6077d1c8
- é 3:ca661e7520de
+ é 3:ca661e7520de
hg tags (utf-8)
$ HGENCODING=utf-8 hg tags
tip 5:093c6077d1c8
- é 3:ca661e7520de
+ é 3:ca661e7520de
hg branches (ascii)
@@ -183,13 +183,13 @@
hg branches (latin-1)
$ HGENCODING=latin-1 hg branches
- é 5:093c6077d1c8
+ é 5:093c6077d1c8
default 4:94db611b4196 (inactive)
hg branches (utf-8)
$ HGENCODING=utf-8 hg branches
- é 5:093c6077d1c8
+ é 5:093c6077d1c8
default 4:94db611b4196 (inactive)
$ echo '[ui]' >> .hg/hgrc
$ echo 'fallbackencoding = koi8-r' >> .hg/hgrc
--- a/tests/test-eol-clone.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-eol-clone.t Tue Nov 02 09:47:47 2010 +0100
@@ -60,7 +60,6 @@
$ cd ..
$ hg clone -r 0 repo repo-4
- requesting all changes
adding changesets
adding manifests
adding file changes
--- a/tests/test-git-import.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-git-import.t Tue Nov 02 09:47:47 2010 +0100
@@ -361,4 +361,25 @@
A binary2
text2
R text2
+ $ cd ..
+Consecutive import with renames (issue2459)
+
+ $ hg init issue2459
+ $ cd issue2459
+ $ hg import --no-commit --force - <<EOF
+ > diff --git a/a b/a
+ > new file mode 100644
+ > EOF
+ applying patch from stdin
+ $ hg import --no-commit --force - <<EOF
+ > diff --git a/a b/b
+ > rename from a
+ > rename to b
+ > EOF
+ applying patch from stdin
+ a has not been committed yet, so no copy data will be stored for b.
+ $ hg debugstate
+ a 0 -1 unset b
+ $ hg ci -m done
+ $ cd ..
--- a/tests/test-globalopts.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-globalopts.t Tue Nov 02 09:47:47 2010 +0100
@@ -343,6 +343,7 @@
templating Template Usage
urls URL Paths
extensions Using additional features
+ subrepos Subrepositories
hgweb Configuring hgweb
glossary Glossary
@@ -418,6 +419,7 @@
templating Template Usage
urls URL Paths
extensions Using additional features
+ subrepos Subrepositories
hgweb Configuring hgweb
glossary Glossary
--- a/tests/test-glog.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-glog.t Tue Nov 02 09:47:47 2010 +0100
@@ -756,7 +756,6 @@
Incoming and outgoing:
$ hg clone -U -r31 repo repo2
- requesting all changes
adding changesets
adding manifests
adding file changes
--- a/tests/test-help.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-help.t Tue Nov 02 09:47:47 2010 +0100
@@ -114,6 +114,7 @@
templating Template Usage
urls URL Paths
extensions Using additional features
+ subrepos Subrepositories
hgweb Configuring hgweb
glossary Glossary
@@ -185,6 +186,7 @@
templating Template Usage
urls URL Paths
extensions Using additional features
+ subrepos Subrepositories
hgweb Configuring hgweb
glossary Glossary
@@ -192,8 +194,9 @@
$ hg -v help shortlist
Mercurial Distributed SCM (version *) (glob)
+ (see http://mercurial.selenic.com for more information)
- Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others
+ Copyright (C) 2005-2010 Matt Mackall and others
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -344,8 +347,9 @@
$ hg add -h --version
Mercurial Distributed SCM (version *) (glob)
+ (see http://mercurial.selenic.com for more information)
- Copyright (C) 2005-2010 Matt Mackall <mpm@selenic.com> and others
+ Copyright (C) 2005-2010 Matt Mackall and others
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -708,6 +712,7 @@
templating Template Usage
urls URL Paths
extensions Using additional features
+ subrepos Subrepositories
hgweb Configuring hgweb
glossary Glossary
@@ -756,3 +761,30 @@
The reserved name "." indicates the working directory parent. If no
working directory is checked out, it is equivalent to null. If an
uncommitted merge is in progress, "." is the revision of the first parent.
+
+Test help hooks
+
+ $ cat > helphook1.py <<EOF
+ > from mercurial import help
+ >
+ > def rewrite(topic, doc):
+ > return doc + '\nhelphook1\n'
+ >
+ > def extsetup(ui):
+ > help.addtopichook('revsets', rewrite)
+ > EOF
+ $ cat > helphook2.py <<EOF
+ > from mercurial import help
+ >
+ > def rewrite(topic, doc):
+ > return doc + '\nhelphook2\n'
+ >
+ > def extsetup(ui):
+ > help.addtopichook('revsets', rewrite)
+ > EOF
+ $ echo '[extensions]' >> $HGRCPATH
+ $ echo "helphook1 = `pwd`/helphook1.py" >> $HGRCPATH
+ $ echo "helphook2 = `pwd`/helphook2.py" >> $HGRCPATH
+ $ hg help revsets | grep helphook
+ helphook1
+ helphook2
--- a/tests/test-hg-parseurl.py Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-hg-parseurl.py Tue Nov 02 09:47:47 2010 +0100
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
from mercurial.hg import parseurl
def testparse(url, branch=[]):
--- a/tests/test-hgweb-descend-empties.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-hgweb-descend-empties.t Tue Nov 02 09:47:47 2010 +0100
@@ -63,9 +63,6 @@
<ul>
<li><a href="/help">help</a></li>
</ul>
- <ul>
- <li><a href="/help">help</a></li>
- </ul>
</div>
<div class="main">
--- a/tests/test-hgweb-diffs.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-hgweb-diffs.t Tue Nov 02 09:47:47 2010 +0100
@@ -471,7 +471,6 @@
test import rev as raw-rev
$ hg clone -r0 test test1
- requesting all changes
adding changesets
adding manifests
adding file changes
--- a/tests/test-hgweb-empty.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-hgweb-empty.t Tue Nov 02 09:47:47 2010 +0100
@@ -352,9 +352,6 @@
<ul>
<li><a href="/help">help</a></li>
</ul>
- <ul>
- <li><a href="/help">help</a></li>
- </ul>
</div>
<div class="main">
--- a/tests/test-hgweb.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-hgweb.t Tue Nov 02 09:47:47 2010 +0100
@@ -226,9 +226,6 @@
<ul>
<li><a href="/help">help</a></li>
</ul>
- <ul>
- <li><a href="/help">help</a></li>
- </ul>
</div>
<div class="main">
--- a/tests/test-http-clone-r.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-http-clone-r.t Tue Nov 02 09:47:47 2010 +0100
@@ -92,7 +92,6 @@
> cd ..
> fi
> done
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -104,7 +103,6 @@
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -116,7 +114,6 @@
crosschecking files in changesets and manifests
checking files
1 files, 2 changesets, 2 total revisions
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -128,7 +125,6 @@
crosschecking files in changesets and manifests
checking files
1 files, 3 changesets, 3 total revisions
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -140,7 +136,6 @@
crosschecking files in changesets and manifests
checking files
1 files, 4 changesets, 4 total revisions
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -152,7 +147,6 @@
crosschecking files in changesets and manifests
checking files
1 files, 2 changesets, 2 total revisions
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -164,7 +158,6 @@
crosschecking files in changesets and manifests
checking files
1 files, 3 changesets, 3 total revisions
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -176,7 +169,6 @@
crosschecking files in changesets and manifests
checking files
2 files, 4 changesets, 5 total revisions
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -188,7 +180,6 @@
crosschecking files in changesets and manifests
checking files
3 files, 5 changesets, 6 total revisions
- requesting all changes
adding changesets
adding manifests
adding file changes
--- a/tests/test-hybridencode.py Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-hybridencode.py Tue Nov 02 09:47:47 2010 +0100
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
from mercurial import store
auxencode = lambda f: store._auxencode(f, True)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-import-context.t Tue Nov 02 09:47:47 2010 +0100
@@ -0,0 +1,125 @@
+Test applying context diffs
+
+ $ cat > writepatterns.py <<EOF
+ > import sys
+ >
+ > path = sys.argv[1]
+ > lasteol = sys.argv[2] == '1'
+ > patterns = sys.argv[3:]
+ >
+ > fp = file(path, 'wb')
+ > for i, pattern in enumerate(patterns):
+ > count = int(pattern[0:-1])
+ > char = pattern[-1] + '\n'
+ > if not lasteol and i == len(patterns) - 1:
+ > fp.write((char*count)[:-1])
+ > else:
+ > fp.write(char*count)
+ > fp.close()
+ > EOF
+ $ cat > cat.py <<EOF
+ > import sys
+ > sys.stdout.write(repr(file(sys.argv[1], 'rb').read()) + '\n')
+ > EOF
+
+Initialize the test repository
+
+ $ hg init repo
+ $ cd repo
+ $ python ../writepatterns.py a 0 5A 1B 5C 1D
+ $ python ../writepatterns.py b 1 1A 1B
+ $ python ../writepatterns.py c 1 5A
+ $ python ../writepatterns.py d 1 5A 1B
+ $ hg add
+ adding a
+ adding b
+ adding c
+ adding d
+ $ hg ci -m addfiles
+
+Add file, missing a last end of line
+
+ $ hg import --no-commit - <<EOF
+ > *** /dev/null 2010-10-16 18:05:49.000000000 +0200
+ > --- b/newnoeol 2010-10-16 18:23:26.000000000 +0200
+ > ***************
+ > *** 0 ****
+ > --- 1,2 ----
+ > + a
+ > + b
+ > \ No newline at end of file
+ > *** a/a Sat Oct 16 16:35:51 2010
+ > --- b/a Sat Oct 16 16:35:51 2010
+ > ***************
+ > *** 3,12 ****
+ > A
+ > A
+ > A
+ > ! B
+ > C
+ > C
+ > C
+ > C
+ > C
+ > ! D
+ > \ No newline at end of file
+ > --- 3,13 ----
+ > A
+ > A
+ > A
+ > ! E
+ > C
+ > C
+ > C
+ > C
+ > C
+ > ! F
+ > ! F
+ >
+ > *** a/b 2010-10-16 18:40:38.000000000 +0200
+ > --- /dev/null 2010-10-16 18:05:49.000000000 +0200
+ > ***************
+ > *** 1,2 ****
+ > - A
+ > - B
+ > --- 0 ----
+ > *** a/c Sat Oct 16 21:34:26 2010
+ > --- b/c Sat Oct 16 21:34:27 2010
+ > ***************
+ > *** 3,5 ****
+ > --- 3,7 ----
+ > A
+ > A
+ > A
+ > + B
+ > + B
+ > *** a/d Sat Oct 16 21:47:20 2010
+ > --- b/d Sat Oct 16 21:47:22 2010
+ > ***************
+ > *** 2,6 ****
+ > A
+ > A
+ > A
+ > - A
+ > - B
+ > --- 2,4 ----
+ > EOF
+ applying patch from stdin
+ $ hg st
+ M a
+ M c
+ M d
+ A newnoeol
+ R b
+
+What's in a
+
+ $ python ../cat.py a
+ 'A\nA\nA\nA\nA\nE\nC\nC\nC\nC\nC\nF\nF\n'
+ $ python ../cat.py newnoeol
+ 'a\nb'
+ $ python ../cat.py c
+ 'A\nA\nA\nA\nA\nB\nB\n'
+ $ python ../cat.py d
+ 'A\nA\nA\nA\n'
+
--- a/tests/test-import.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-import.t Tue Nov 02 09:47:47 2010 +0100
@@ -14,7 +14,6 @@
import exported patch
$ hg clone -r0 a b
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -45,7 +44,6 @@
> EOF
$ chmod +x dummypatch.py
$ hg clone -r0 a b
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -63,7 +61,6 @@
import of plain diff should fail without message
$ hg clone -r0 a b
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -81,7 +78,6 @@
import of plain diff should be ok with message
$ hg clone -r0 a b
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -97,7 +93,6 @@
import of plain diff with specific date and user
$ hg clone -r0 a b
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -130,7 +125,6 @@
import of plain diff should be ok with --no-commit
$ hg clone -r0 a b
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -153,7 +147,6 @@
import of malformed plain diff should fail
$ hg clone -r0 a b
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -175,7 +168,6 @@
$ mkdir dir
$ hg clone -r0 a dir/b
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -193,7 +185,6 @@
import from stdin
$ hg clone -r0 a b
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -221,7 +212,6 @@
override commit message
$ hg clone -r0 a b
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -247,7 +237,6 @@
plain diff in email, subject, message body
$ hg clone -r0 a b
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -267,7 +256,6 @@
plain diff in email, no subject, message body
$ hg clone -r0 a b
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -282,7 +270,6 @@
plain diff in email, subject, no message body
$ hg clone -r0 a b
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -297,7 +284,6 @@
plain diff in email, no subject, no message body, should fail
$ hg clone -r0 a b
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -314,7 +300,6 @@
hg export in email, should use patch header
$ hg clone -r0 a b
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -345,7 +330,6 @@
plain diff in email, [PATCH] subject, message body with subject
$ hg clone -r0 a b
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -394,7 +378,6 @@
hg import in a subdirectory
$ hg clone -r0 a b
- requesting all changes
adding changesets
adding manifests
adding file changes
--- a/tests/test-issue1306.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-issue1306.t Tue Nov 02 09:47:47 2010 +0100
@@ -42,7 +42,6 @@
Try cloning -r branch:
$ hg clone -rbr remote local1
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -62,7 +61,6 @@
Try cloning -rother clone#branch:
$ hg clone -r0 remote#br local2
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -80,7 +78,6 @@
Try cloning -r1 clone#branch:
$ hg clone -r1 remote#br local3
- requesting all changes
adding changesets
adding manifests
adding file changes
--- a/tests/test-keyword.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-keyword.t Tue Nov 02 09:47:47 2010 +0100
@@ -440,6 +440,24 @@
$ hg update -C
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+record added keyword ignored file
+
+ $ echo '$Id$' > i
+ $ hg add i
+ $ hg --verbose record -d '1 13' -m recignored<<EOF
+ > y
+ > EOF
+ diff --git a/i b/i
+ new file mode 100644
+ examine changes to 'i'? [Ynsfdaq?]
+ i
+ committed changeset 3:5f40fe93bbdc
+ $ cat i
+ $Id$
+ $ hg -q rollback
+ $ hg forget i
+ $ rm i
+
Test patch queue repo
$ hg init --mq
@@ -726,7 +744,6 @@
Clone to test incoming
$ hg clone -r1 Test Test-a
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -775,8 +792,12 @@
$ mkdir x
$ hg copy a x/a
+ $ hg --verbose kwshrink a
+ overwriting a shrinking keywords
+ $ hg status a
$ hg --verbose kwexpand a
overwriting a expanding keywords
+ $ hg status a
kwexpand x/a should abort
--- a/tests/test-merge-commit.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-merge-commit.t Tue Nov 02 09:47:47 2010 +0100
@@ -100,7 +100,6 @@
$ cd ..
$ hg clone -U -r 1 -r 2 a b
- requesting all changes
adding changesets
adding manifests
adding file changes
--- a/tests/test-minirst.py Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-minirst.py Tue Nov 02 09:47:47 2010 +0100
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
from pprint import pprint
from mercurial import minirst
@@ -214,3 +212,15 @@
"""
debugformat('admonitions', admonitions, 30)
+
+comments = """
+Some text.
+
+.. A comment
+
+ .. An indented comment
+
+ Some indented text.
+"""
+
+debugformat('comments', comments, 30)
--- a/tests/test-minirst.py.out Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-minirst.py.out Tue Nov 02 09:47:47 2010 +0100
@@ -334,3 +334,10 @@
This is danger
----------------------------------------------------------------------
+comments formatted to fit within 30 characters:
+----------------------------------------------------------------------
+Some text.
+
+ Some indented text.
+----------------------------------------------------------------------
+
--- a/tests/test-mq-qnew.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-mq-qnew.t Tue Nov 02 09:47:47 2010 +0100
@@ -23,7 +23,9 @@
> hg qinit -c
>
> echo '% qnew with name containing slash'
+ > hg qnew foo/
> hg qnew foo/bar.patch
+ > hg qnew foo
> hg qseries
> hg qpop
> hg qdelete foo/bar.patch
@@ -105,6 +107,8 @@
abort: "foo#bar" cannot be used as the name of a patch
abort: "foo:bar" cannot be used as the name of a patch
% qnew with name containing slash
+ abort: cannot write patch "foo/": Is a directory
+ abort: "foo" already exists as a directory
foo/bar.patch
popping foo/bar.patch
patch queue now empty
@@ -168,6 +172,8 @@
abort: "foo#bar" cannot be used as the name of a patch
abort: "foo:bar" cannot be used as the name of a patch
% qnew with name containing slash
+ abort: cannot write patch "foo/": Is a directory
+ abort: "foo" already exists as a directory
foo/bar.patch
popping foo/bar.patch
patch queue now empty
--- a/tests/test-mq-qrename.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-mq-qrename.t Tue Nov 02 09:47:47 2010 +0100
@@ -81,3 +81,16 @@
A patchc
R patcha
$ cd ..
+
+Test renames with mq repo (issue2097)
+
+ $ hg init issue2097
+ $ cd issue2097
+ $ hg qnew p0
+ $ (cd .hg/patches && hg init)
+ $ hg qren p0 p1
+ $ hg debugstate --mq
+ $ hg ci --mq -mq0
+ nothing changed
+ [1]
+ $ cd ..
--- a/tests/test-mq-safety.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-mq-safety.t Tue Nov 02 09:47:47 2010 +0100
@@ -131,7 +131,6 @@
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg --cwd .. clone -r 0 forcepush forcepush2
- requesting all changes
adding changesets
adding manifests
adding file changes
--- a/tests/test-patch.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-patch.t Tue Nov 02 09:47:47 2010 +0100
@@ -27,7 +27,6 @@
$ hg --cwd a export -o ../a.diff tip
$ hg clone -r 0 a b
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -64,7 +63,6 @@
Clone and apply patch:
$ hg clone -r 0 c d
- requesting all changes
adding changesets
adding manifests
adding file changes
--- a/tests/test-patchbomb.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-patchbomb.t Tue Nov 02 09:47:47 2010 +0100
@@ -145,8 +145,10 @@
+b
- $ hg email -m test.mbox -f quux -t foo -c bar -s test 0:tip
- This patch series consists of 2 patches.
+ $ hg email -m test.mbox -f quux -t foo -c bar -s test 0:tip \
+ > --config extensions.progress= --config progress.assume-tty=1 \
+ > --config progress.delay=0 --config progress.refresh=0
+ \rwriting [ ] 0/3\rwriting [ ] 0/3\r \r\r \r\rwriting [====================> ] 1/3\rwriting [====================> ] 1/3\r \r\r \r\rwriting [==========================================> ] 2/3\rwriting [==========================================> ] 2/3\r \rThis patch series consists of 2 patches.
Write the introductory message for the patch series.
--- a/tests/test-pull-pull-corruption.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-pull-pull-corruption.t Tue Nov 02 09:47:47 2010 +0100
@@ -14,7 +14,6 @@
create one repo with a shorter history
$ hg clone -r 0 source1 source2
- requesting all changes
adding changesets
adding manifests
adding file changes
--- a/tests/test-rebase-abort.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-rebase-abort.t Tue Nov 02 09:47:47 2010 +0100
@@ -50,7 +50,7 @@
merging common
warning: conflicts during merge.
merging common failed!
- abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+ abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
Abort:
@@ -118,7 +118,7 @@
merging c
warning: conflicts during merge.
merging c failed!
- abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+ abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
$ hg tglog
--- a/tests/test-rebase-check-restore.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-rebase-check-restore.t Tue Nov 02 09:47:47 2010 +0100
@@ -64,7 +64,7 @@
merging A
warning: conflicts during merge.
merging A failed!
- abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+ abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
Solve the conflict and go on:
@@ -116,7 +116,7 @@
merging A
warning: conflicts during merge.
merging A failed!
- abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+ abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
Solve the conflict and go on:
--- a/tests/test-rebase-conflicts.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-rebase-conflicts.t Tue Nov 02 09:47:47 2010 +0100
@@ -59,7 +59,7 @@
merging common
warning: conflicts during merge.
merging common failed!
- abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+ abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
Try to continue without solving the conflict:
--- a/tests/test-rebase-interruptions.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-rebase-interruptions.t Tue Nov 02 09:47:47 2010 +0100
@@ -57,7 +57,7 @@
merging A
warning: conflicts during merge.
merging A failed!
- abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+ abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
Force a commit on C during the interruption:
@@ -89,7 +89,7 @@
merging A
warning: conflicts during merge.
merging A failed!
- abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+ abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
Solve the conflict and go on:
@@ -143,7 +143,7 @@
merging A
warning: conflicts during merge.
merging A failed!
- abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+ abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
Force a commit on B' during the interruption:
--- a/tests/test-rebase-mq-skip.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-rebase-mq-skip.t Tue Nov 02 09:47:47 2010 +0100
@@ -105,7 +105,7 @@
$ hg up -q qtip
$ HGMERGE=internal:fail hg rebase
- abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+ abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
$ HGMERGE=internal:local hg resolve --all
--- a/tests/test-rebase-mq.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-rebase-mq.t Tue Nov 02 09:47:47 2010 +0100
@@ -63,7 +63,7 @@
merging f
warning: conflicts during merge.
merging f failed!
- abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+ abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
Fix the 1st conflict:
@@ -74,7 +74,7 @@
merging f
warning: conflicts during merge.
merging f failed!
- abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
+ abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
[255]
Fix the 2nd conflict:
--- a/tests/test-record.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-record.t Tue Nov 02 09:47:47 2010 +0100
@@ -900,6 +900,11 @@
$ echo '[patch]' >> .hg/hgrc
$ echo 'eol = crlf' >> .hg/hgrc
+Ignore win32text deprecation warning for now:
+
+ $ echo '[win32text]' >> .hg/hgrc
+ $ echo 'warn = no' >> .hg/hgrc
+
$ echo d >> subdir/f1
$ hg record -d '23 0' -mw1 <<EOF
> y
--- a/tests/test-relink.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-relink.t Tue Nov 02 09:47:47 2010 +0100
@@ -40,7 +40,6 @@
clone and pull to break links
$ hg clone --pull -r0 repo clone
- requesting all changes
adding changesets
adding manifests
adding file changes
--- a/tests/test-rename.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-rename.t Tue Nov 02 09:47:47 2010 +0100
@@ -25,6 +25,17 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm d2/c
+rename a single file using absolute paths
+
+ $ hg rename `pwd`/d1/d11/a1 `pwd`/d2/c
+ $ hg status -C
+ A d2/c
+ d1/d11/a1
+ R d1/d11/a1
+ $ hg update -C
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ rm d2/c
+
rename --after a single file
$ mv d1/d11/a1 d2/c
@@ -418,7 +429,7 @@
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf d3
-move a whole subtree with \"hg rename .\"
+move a whole subtree with "hg rename ."
$ mkdir d3
$ (cd d1; hg rename . ../d3)
@@ -443,7 +454,7 @@
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf d3
-move a whole subtree with \"hg rename --after .\"
+move a whole subtree with "hg rename --after ."
$ mkdir d3
$ mv d1/* d3
@@ -469,7 +480,7 @@
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf d3
-move the parent tree with \"hg rename ..\"
+move the parent tree with "hg rename .."
$ (cd d1/d11; hg rename .. ../../d3)
moving ../a to ../../d3/a
--- a/tests/test-ssh-clone-r.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-ssh-clone-r.t Tue Nov 02 09:47:47 2010 +0100
@@ -110,7 +110,6 @@
> cd ..
> fi
> done
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -122,7 +121,6 @@
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -134,7 +132,6 @@
crosschecking files in changesets and manifests
checking files
1 files, 2 changesets, 2 total revisions
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -146,7 +143,6 @@
crosschecking files in changesets and manifests
checking files
1 files, 3 changesets, 3 total revisions
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -158,7 +154,6 @@
crosschecking files in changesets and manifests
checking files
1 files, 4 changesets, 4 total revisions
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -170,7 +165,6 @@
crosschecking files in changesets and manifests
checking files
1 files, 2 changesets, 2 total revisions
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -182,7 +176,6 @@
crosschecking files in changesets and manifests
checking files
1 files, 3 changesets, 3 total revisions
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -194,7 +187,6 @@
crosschecking files in changesets and manifests
checking files
2 files, 4 changesets, 5 total revisions
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -206,7 +198,6 @@
crosschecking files in changesets and manifests
checking files
3 files, 5 changesets, 6 total revisions
- requesting all changes
adding changesets
adding manifests
adding file changes
--- a/tests/test-static-http.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-static-http.t Tue Nov 02 09:47:47 2010 +0100
@@ -93,7 +93,6 @@
abort: unknown revision 'donotexist'!
[255]
$ hg clone -r 0 static-http://localhost:$HGPORT/remote local0
- requesting all changes
adding changesets
adding manifests
adding file changes
--- a/tests/test-subrepo-svn.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-subrepo-svn.t Tue Nov 02 09:47:47 2010 +0100
@@ -69,6 +69,18 @@
$ hg ci -m1
committing subrepository s
+make sure we avoid empty commits (issue2445)
+
+ $ hg sum
+ parent: 1:* tip (glob)
+ 1
+ branch: default
+ commit: (clean)
+ update: (current)
+ $ hg ci -moops
+ nothing changed
+ [1]
+
debugsub
$ hg debugsub
@@ -80,6 +92,12 @@
$ echo a >> a
$ echo alpha >> s/alpha
+ $ hg sum
+ parent: 1:* tip (glob)
+ 1
+ branch: default
+ commit: 1 modified, 1 subrepos
+ update: (current)
$ hg commit -m 'Message!'
committing subrepository s
Sending*s/alpha (glob)
--- a/tests/test-subrepo.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-subrepo.t Tue Nov 02 09:47:47 2010 +0100
@@ -632,17 +632,27 @@
$ hg init issue1852c
$ hg -R issue1852c pull -r0 -u issue1852a
pulling from issue1852a
- requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
- abort: default path for subrepository sub/repo not found
- [255]
+ pulling subrepo sub/repo from issue1852a/sub/repo
+ requesting all changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 2 changesets with 2 changes to 1 files
+ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Try to push from the other side
- $ hg -R issue1852a push issue1852c
- pushing to issue1852c
- abort: default path for subrepository sub/repo not found
- [255]
+ $ hg -R issue1852a push `pwd`/issue1852c
+ pushing to $TESTTMP/sub/issue1852c
+ pushing subrepo sub/repo to $TESTTMP/sub/issue1852c/sub/repo
+ searching for changes
+ no changes found
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 1 changesets with 1 changes to 1 files
--- a/tests/test-transplant.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-transplant.t Tue Nov 02 09:47:47 2010 +0100
@@ -59,6 +59,15 @@
1 r2
0 r1
+test transplanted revset
+
+ $ hg log -r 'transplanted()' --template '{rev} {parents} {desc}\n'
+ 5 1:d11e3596cc1a b1
+ 6 b2
+ 7 b3
+ $ hg help revsets | grep transplanted
+ "transplanted(set)"
+
$ hg clone ../t ../prune
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -87,7 +96,6 @@
remote transplant
$ hg clone -r 1 ../t ../remote
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -145,7 +153,6 @@
$ cat ../t.pid >> $DAEMON_PIDS
$ hg clone -r 0 ../t ../rp
- requesting all changes
adding changesets
adding manifests
adding file changes
@@ -265,7 +272,6 @@
$ hg init empty
$ cd empty
$ hg transplant -s ../t -b tip -a
- requesting all changes
adding changesets
adding manifests
adding file changes
--- a/tests/test-ui-color.py Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-ui-color.py Tue Nov 02 09:47:47 2010 +0100
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
from hgext import color
# ensure errors aren't buffered
--- a/tests/test-ui-config.py Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-ui-config.py Tue Nov 02 09:47:47 2010 +0100
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
from mercurial import ui, dispatch, error
testui = ui.ui()
--- a/tests/test-ui-verbosity.py Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-ui-verbosity.py Tue Nov 02 09:47:47 2010 +0100
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
import os
from mercurial import ui
--- a/tests/test-url-rev.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-url-rev.t Tue Nov 02 09:47:47 2010 +0100
@@ -11,7 +11,6 @@
$ cd ..
$ hg clone 'repo#foo' clone
- requesting all changes
adding changesets
adding manifests
adding file changes
--- a/tests/test-url.py Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-url.py Tue Nov 02 09:47:47 2010 +0100
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
import sys
def check(a, b):
--- a/tests/test-win32text.t Wed Oct 20 23:48:33 2010 +0200
+++ b/tests/test-win32text.t Tue Nov 02 09:47:47 2010 +0100
@@ -390,8 +390,20 @@
** = cleverdecode:
[encode]
** = cleverencode:
- $ echo
-
+
+Trigger deprecation warning:
+
+ $ hg id -t
+ win32text is deprecated: http://mercurial.selenic.com/wiki/Win32TextExtension
+ tip
+
+Disable warning:
+
+ $ echo '[win32text]' >> .hg/hgrc
+ $ echo 'warn = no' >> .hg/hgrc
+ $ hg id -t
+ tip
+
$ rm f3 f4.bat bin
$ hg co -C 2>&1 | python -c 'import sys, os; sys.stdout.write(sys.stdin.read().replace(os.getcwd(), "...."))'
WARNING: f4.bat already has CRLF line endings