Mercurial > hg
changeset 8979:09c6735e3880
Merge with i18n
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 30 Jun 2009 12:32:30 -0500 |
| parents | 119d1f664eae (current diff) 2656a5b40c7b (diff) |
| children | 080612b80c95 59bb11a97fe5 |
| files | |
| diffstat | 6 files changed, 15980 insertions(+), 6338 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/common.py Mon Jun 29 19:28:54 2009 +0200 +++ b/hgext/convert/common.py Tue Jun 30 12:32:30 2009 -0500 @@ -289,7 +289,7 @@ self.ui.warn(_('%s error:\n') % self.command) self.ui.warn(output) msg = util.explain_exit(status)[0] - raise util.Abort(_('%s %s') % (self.command, msg)) + raise util.Abort('%s %s' % (self.command, msg)) def run0(self, cmd, *args, **kwargs): output, status = self.run(cmd, *args, **kwargs)
--- a/i18n/da.po Mon Jun 29 19:28:54 2009 +0200 +++ b/i18n/da.po Tue Jun 30 12:32:30 2009 -0500 @@ -5,10 +5,10 @@ # Translation dictionary: # # changeset ændring -# commit arkivering +# commit deponere # merge sammenføje # patch rettelse -# repo(sitory) arkiv +# repo(sitory) depot # revision revision # tag mærkat # working directory arbejdskatalog @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2009-06-21 19:16+0200\n" -"PO-Revision-Date: 2009-06-21 19:26+0200\n" +"POT-Creation-Date: 2009-06-24 17:38+0200\n" +"PO-Revision-Date: 2009-06-27 13:35+0200\n" "Last-Translator: <mg@lazybytes.net>\n" "Language-Team: Danish\n" "MIME-Version: 1.0\n" @@ -32,13 +32,13 @@ msgstr " (standard: %s)" msgid "OPTIONS" -msgstr "" +msgstr "TILVALG" msgid "COMMANDS" msgstr "KOMMANDOER" msgid " options:\n" -msgstr "" +msgstr " tilvalg:\n" #, python-format msgid "" @@ -49,19 +49,23 @@ "\n" msgid "" -"provide simple hooks for access control\n" -"\n" -"Authorization is against local user name on system where hook is run, not\n" -"committer of original changeset (since that is easy to spoof).\n" -"\n" -"The acl hook is best to use if you use hgsh to set up restricted shells for\n" -"authenticated users to only push to / pull from. It's not safe if user has\n" -"interactive shell access, because they can disable the hook. It's also not\n" -"safe if remote users share one local account, because then there's no way " -"to\n" -"tell remote users apart.\n" -"\n" -"To use, configure the acl extension in hgrc like this:\n" +"control access to a repository using simple hooks\n" +"\n" +"This hook makes it possible to allow or deny write access to portions\n" +"of a repository when receiving incoming changesets.\n" +"\n" +"The authorization is matched based on the local user name on the\n" +"system where the hook runs, and not the committer of the original\n" +"changeset (since the latter is merely informative).\n" +"\n" +"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.\n" +"\n" +"To use this hook, configure the acl extension in your hgrc like this:\n" "\n" " [extensions]\n" " hgext.acl =\n" @@ -70,23 +74,24 @@ " pretxnchangegroup.acl = python:hgext.acl.hook\n" "\n" " [acl]\n" -" sources = serve # check if source of incoming changes in this list\n" -" # (\"serve\" == ssh or http, \"push\", \"pull\", " -"\"bundle\")\n" -"\n" -"Allow and deny lists have a subtree pattern (default syntax is glob) on the\n" -"left and user names on right. The deny list is checked before the allow " -"list.\n" +" # Check whether the source of incoming changes is in this list\n" +" # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n" +" sources = serve\n" +"\n" +"The allow and deny sections take a subtree pattern as key (with a\n" +"glob syntax by default), and a comma separated list of users as\n" +"the corresponding value. The deny list is checked before the allow\n" +"list is.\n" "\n" " [acl.allow]\n" -" # if acl.allow not present, all users allowed by default\n" -" # empty acl.allow = no users allowed\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\n" "\n" " [acl.deny]\n" -" # if acl.deny not present, no users denied by default\n" -" # empty acl.deny = all users allowed\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 "" @@ -125,32 +130,34 @@ msgstr "acl: tillader ændring %s\n" msgid "" -"Mercurial bookmarks\n" -"\n" -"Mercurial bookmarks are local moveable pointers to changesets. Every\n" -"bookmark points to a changeset identified by its hash. If you commit a\n" -"changeset that is based on a changeset that has a bookmark on it, the\n" -"bookmark is forwarded to the new changeset.\n" -"\n" -"It is possible to use bookmark names in every revision lookup (e.g. hg\n" -"merge, hg update).\n" -"\n" -"The bookmark extension offers the possiblity to have a more git-like\n" -"experience by adding the following configuration option to your .hgrc:\n" -"\n" -"[bookmarks]\n" -"track.current = True\n" -"\n" -"This will cause bookmarks to track the bookmark that you are currently\n" -"on, and just updates it. This is similar to git's approach to\n" +"track a line of development with movable markers\n" +"\n" +"Bookmarks are local movable markers to changesets. Every bookmark\n" +"points to a changeset identified by its hash. If you commit a\n" +"changeset that is based on a changeset that has a bookmark on it,\n" +"the bookmark shifts to the new changeset.\n" +"\n" +"It is possible to use bookmark names in every revision lookup\n" +"(e.g. hg merge, hg update).\n" +"\n" +"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:\n" +"\n" +" [bookmarks]\n" +" track.current = True\n" +"\n" +"This will cause Mercurial to track the bookmark that you are currently\n" +"using, and only update it. This is similar to git's approach to\n" "branching.\n" msgstr "" msgid "" -"Mercurial bookmarks\n" +"track a line of development with movable markers\n" "\n" " Bookmarks are pointers to certain commits that move when\n" -" commiting. Bookmarks are local. They can be renamed, copied and\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.\n" "\n" @@ -180,10 +187,10 @@ msgstr "et bogmærke kan ikke hedde det samme som en eksisterende gren" msgid "force" -msgstr "" +msgstr "gennemtving" msgid "revision" -msgstr "" +msgstr "revision" msgid "delete a given bookmark" msgstr "slet et givent bogmærke" @@ -192,10 +199,10 @@ msgstr "omdøb et givet bogmærke" msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]" -msgstr "" - -msgid "" -"Bugzilla integration\n" +msgstr "hg bookmarks [-f] [-d] [-m NAVN] [-r REV] [NAVN]" + +msgid "" +"integrate Mercurial with a Bugzilla bug tracker\n" "\n" "This hook extension adds comments on bugs in Bugzilla when changesets\n" "that refer to bugs by Bugzilla ID are seen. The hook does not change\n" @@ -379,8 +386,8 @@ msgid "database error: %s" msgstr "databasefejl: %s" -msgid "provides children command to show children changesets" -msgstr "" +msgid "display children changesets" +msgstr "vis børne-ændringer" msgid "" "show the children of the given or working directory revision\n" @@ -405,10 +412,10 @@ msgstr "vis børn af den givne revision" msgid "hg children [-r REV] [FILE]" -msgstr "" - -msgid "command to show certain statistics about revision history" -msgstr "kommando til at vise statestikker om revisionshistorikken" +msgstr "hg children [-r REV] [FIL]" + +msgid "display statistics about repository history" +msgstr "vis statistikker om revisionshistorikken" #, python-format msgid "Revision %d is a merge, ignoring...\n" @@ -491,7 +498,7 @@ #, python-format msgid "assuming %i character terminal\n" -msgstr "" +msgstr "antager %i-tegn terminal\n" msgid "count rate for the specified revision or range" msgstr "lav statistik for de specificerede revisioner" @@ -518,10 +525,10 @@ msgstr "vis fremskridt" msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]" -msgstr "hg churn [-d DATO] [-r REVISIONER] [--aliases FIL] [--progress] [FIL]" - -msgid "" -"add color output to status, qseries, and diff-related commands\n" +msgstr "hg churn [-d DATO] [-r REV] [--aliases FIL] [--progress] [FIL]" + +msgid "" +"colorize output from some commands\n" "\n" "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" @@ -564,13 +571,13 @@ msgstr "" msgid "when to colorize (always, auto, or never)" -msgstr "" +msgstr "hvornår der skal farvelægges (altid, automatisk eller aldrig)" msgid "don't colorize output" -msgstr "" - -msgid "converting foreign VCS repositories to Mercurial" -msgstr "" +msgstr "farvelæg ikke output" + +msgid "import from foreign VCS repositories into Mercurial" +msgstr "importer fra fremmede VCS depoter ind i Mercurial" msgid "" "convert a foreign SCM repository to a Mercurial one.\n" @@ -817,7 +824,7 @@ msgstr "kildedepotstype" msgid "splice synthesized history into place" -msgstr "" +msgstr "ind-splejs syntetisk historie" msgid "change branch names while converting" msgstr "omdøb grene under konverteringen" @@ -832,7 +839,7 @@ msgstr "bevar kildeændringerne ordning" msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]" -msgstr "" +msgstr "hg convert [TILVALG]... KILDE [MÅL [REV-AFBILDNING]]" msgid "only return changes on specified branches" msgstr "returner kun ændringer på givne grene" @@ -853,7 +860,7 @@ msgstr "" msgid "specify cvsroot" -msgstr "" +msgstr "angiv cvsroot" msgid "show parent changesets" msgstr "vis forældre-ændringer" @@ -862,10 +869,10 @@ msgstr "" msgid "ignored for compatibility" -msgstr "" +msgstr "ignoreret af kompatibilitetsgrunde" msgid "hg debugcvsps [OPTION]... [PATH]..." -msgstr "" +msgstr "hg debugcvsps [TILVALG]... [STI]..." msgid "" "warning: lightweight checkouts may cause conversion failures, try with a " @@ -873,23 +880,23 @@ msgstr "" msgid "bzr source type could not be determined\n" -msgstr "" +msgstr "bzr kildetype kunne ikke bestemmes\n" #, python-format msgid "%s is not a valid revision in current branch" -msgstr "" +msgstr "%s er ikke en gyldig revision i den nuværende gren" #, python-format msgid "%s is not available in %s anymore" -msgstr "" +msgstr "%s er ikke længere tilgængelig i %s" #, python-format msgid "%s.%s symlink has no target" -msgstr "" +msgstr "%s.%s symbolsk lænke er ikke noget mål" #, python-format msgid "cannot find required \"%s\" tool" -msgstr "" +msgstr "kan ikke finde påkrævet værktøj \"%s\"" #, python-format msgid "running: %s\n" @@ -897,7 +904,7 @@ #, python-format msgid "%s error:\n" -msgstr "" +msgstr "%s fejl:\n" #, python-format msgid "%s %s" @@ -909,19 +916,19 @@ #, python-format msgid "could not open map file %r: %s" -msgstr "" +msgstr "kunne ikke åbne afbildningsfil %r: %s" #, python-format msgid "%s: missing or unsupported repository" -msgstr "" +msgstr "%s: manglende eller usupporteret depot" #, python-format msgid "convert: %s\n" -msgstr "" +msgstr "convert: %s\n" #, python-format msgid "%s: unknown repository type" -msgstr "%s: ukendt arkivtype" +msgstr "%s: ukendt depottype" #, python-format msgid "unknown sort mode: %s" @@ -929,50 +936,50 @@ #, python-format msgid "cycle detected between %s and %s" -msgstr "" +msgstr "cyklus opdaget mellem %s og %s" msgid "not all revisions were sorted" -msgstr "" +msgstr "ikke alle revisioner blev sorteret" #, python-format msgid "Writing author map file %s\n" -msgstr "" +msgstr "Skriver forfatter-afbildningsfil %s\n" #, python-format msgid "Ignoring bad line in author map file %s: %s\n" -msgstr "" +msgstr "Ignorerer dårlig linie i forfatter-afbildningsfil %s: %s\n" #, python-format msgid "mapping author %s to %s\n" -msgstr "" +msgstr "afbilder forfatter %s til %s\n" #, python-format msgid "overriding mapping for author %s, was %s, will be %s\n" -msgstr "" +msgstr "tilsidesætter afbildning for forfatter %s, var %s, vil blive %s\n" #, python-format msgid "spliced in %s as parents of %s\n" -msgstr "" +msgstr "splejsede %s ind som forældre til %s\n" msgid "scanning source...\n" -msgstr "" +msgstr "skanner kilde...\n" msgid "sorting...\n" -msgstr "" +msgstr "sorterer...\n" msgid "converting...\n" -msgstr "" +msgstr "konverterer...\n" #, python-format msgid "source: %s\n" -msgstr "" +msgstr "kilde: %s\n" #, python-format msgid "assuming destination %s\n" -msgstr "" +msgstr "antager mål %s\n" msgid "more than one sort mode specified" -msgstr "" +msgstr "mere end end sorteringsmetode angivet" msgid "--sourcesort is not supported by this data source" msgstr "" @@ -981,17 +988,19 @@ "warning: support for external cvsps is deprecated and will be removed in " "Mercurial 1.4\n" msgstr "" +"advarsel: support for ekstern cvsps er forældet og vil blive fjernet i " +"Mercurial 1.4\n" #, python-format msgid "revision %s is not a patchset number or date" msgstr "" msgid "using builtin cvsps\n" -msgstr "" +msgstr "bruger indbygget cvsps\n" #, python-format msgid "connecting to %s\n" -msgstr "" +msgstr "forbinder til %s\n" msgid "CVS pserver authentication failed" msgstr "CVS pserver godkendelse fejlede" @@ -1016,15 +1025,15 @@ #, python-format msgid "reading cvs log cache %s\n" -msgstr "" +msgstr "læser cvs log-mellemlager %s\n" #, python-format msgid "cache has %d log entries\n" -msgstr "" +msgstr "mellemlager har %d lagerindgange\n" #, python-format msgid "error reading cache: %r\n" -msgstr "" +msgstr "fejl ved læsning af mellemlager: %r\n" #, python-format msgid "running %s\n" @@ -1032,13 +1041,13 @@ #, python-format msgid "prefix=%r directory=%r root=%r\n" -msgstr "" +msgstr "præfiks=%r katalog=%r rod=%r\n" msgid "RCS file must be followed by working file" -msgstr "" +msgstr "RCS-fil skal efterfølges af en arbejdsfil" msgid "must have at least some revisions" -msgstr "" +msgstr "kan have mindst nogle revisioner" msgid "expected revision number" msgstr "forventede et revisionsnummer" @@ -1048,15 +1057,15 @@ #, python-format msgid "found synthetic revision in %s: %r\n" -msgstr "" +msgstr "fandt syntetisk revision i %s: %r\n" #, python-format msgid "writing cvs log cache %s\n" -msgstr "" +msgstr "skriver cvs log-mellemlager %s\n" #, python-format msgid "%d log entries\n" -msgstr "" +msgstr "%d lagerindgange\n" msgid "creating changesets\n" msgstr "opretter ændringer\n" @@ -1075,7 +1084,7 @@ msgstr "%d ændringer\n" msgid "Python ElementTree module is not available" -msgstr "" +msgstr "Python ElementTree modulet er ikke tilstede" #, python-format msgid "cleaning up %s\n" @@ -1089,25 +1098,25 @@ #, python-format msgid "%s:%d: %r already in %s list\n" -msgstr "" +msgstr "%s:%d: %r er allerede i %s listen\n" #, python-format msgid "%s:%d: unknown directive %r\n" -msgstr "" +msgstr "%s:%d: ukendt direktiv %r\n" msgid "source repository doesn't support --filemap" -msgstr "" +msgstr "kildedepot understøtter ikke --filemap" #, python-format msgid "%s does not look like a GNU Arch repo" -msgstr "" +msgstr "%s ser ikke ud som et GNU Arch depot" msgid "cannot find a GNU Arch tool" msgstr "kan ikke finde GNU Arch" #, python-format msgid "analyzing tree version %s...\n" -msgstr "" +msgstr "analyserer træ version %s...\n" #, python-format msgid "" @@ -1116,7 +1125,7 @@ #, python-format msgid "applying revision %s...\n" -msgstr "" +msgstr "anvender revision %s...\n" #, python-format msgid "computing changeset between %s and %s...\n" @@ -1132,15 +1141,15 @@ #, python-format msgid "could not parse cat-log of %s" -msgstr "" +msgstr "kan ikke parse cat-log af %s" #, python-format msgid "%s is not a local Mercurial repo" -msgstr "" +msgstr "%s er ikke et lokalt Mercurial depot" #, python-format msgid "initializing destination %s repository\n" -msgstr "" +msgstr "initialiserer mål %s depot\n" msgid "run hg sink pre-conversion action\n" msgstr "" @@ -1150,17 +1159,17 @@ #, python-format msgid "pulling from %s into %s\n" -msgstr "" +msgstr "hiver fra %s ind i %s\n" msgid "filtering out empty revision\n" -msgstr "" +msgstr "bortfiltrerer tom revision\n" msgid "updating tags\n" -msgstr "" +msgstr "opdaterer mærkater\n" #, python-format msgid "%s is not a valid start revision" -msgstr "" +msgstr "%s er ikke en gyldig startrevision" #, python-format msgid "ignoring: %s\n" @@ -1174,78 +1183,78 @@ #, python-format msgid "%s does not look like a monotone repo" -msgstr "" +msgstr "%s ser ikke ud som et monotone depot" #, python-format msgid "copying file in renamed directory from '%s' to '%s'" -msgstr "" +msgstr "kopierer fil i omdøbt katalog fra '%s' til '%s'" msgid "reading p4 views\n" -msgstr "" +msgstr "læser p4 views\n" msgid "collecting p4 changelists\n" -msgstr "" +msgstr "samler p4 changelists\n" msgid "Subversion python bindings could not be loaded" -msgstr "" +msgstr "Subversion python bindingerne kunne ikke indlæses" #, python-format msgid "Subversion python bindings %d.%d found, 1.4 or later required" -msgstr "" +msgstr "fandt Subversion python bindinger %d.%d, 1.4 eller senere er påkrævet" msgid "Subversion python bindings are too old, 1.4 or later required" -msgstr "" +msgstr "Subversion python bindinger er for gamle, 1.4 eller senere er påkrævet" #, python-format msgid "svn: revision %s is not an integer" -msgstr "" +msgstr "svn: revision %s er ikke et heltal" #, python-format msgid "svn: start revision %s is not an integer" -msgstr "" +msgstr "svn: startrevision %s er ikke et heltal" #, python-format msgid "no revision found in module %s" -msgstr "" +msgstr "ingen revision fundet i modul %s" #, python-format msgid "expected %s to be at %r, but not found" -msgstr "" +msgstr "forventede at %s ville være ved %r, men fandt det ikke" #, python-format msgid "found %s at %r\n" -msgstr "" +msgstr "fandt %s ved %r\n" #, python-format msgid "ignoring empty branch %s\n" -msgstr "" +msgstr "ignorerer tom gren %s\n" #, python-format msgid "found branch %s at %d\n" -msgstr "" +msgstr "fandt gren %s ved %d\n" msgid "svn: start revision is not supported with more than one branch" -msgstr "" +msgstr "svn: startrevision er ikke understøttet ved mere end en gren" #, python-format msgid "svn: no revision found after start revision %d" -msgstr "" +msgstr "svn: fandt ingen revisioner efter startrevision %d" #, python-format msgid "no tags found at revision %d\n" -msgstr "" +msgstr "ingen mærkater fundet ved revision %d\n" #, python-format msgid "ignoring foreign branch %r\n" -msgstr "" +msgstr "ignorerer fremmed gren %r\n" #, python-format msgid "%s not found up to revision %d" -msgstr "" +msgstr "%s blev ikke fundet op til revision %d" #, python-format msgid "branch renamed from %s to %s at %d\n" -msgstr "" +msgstr "gren omdøbt fra %s til %s ved %d\n" #, python-format msgid "reparent to %s\n" @@ -1253,30 +1262,19 @@ #, python-format msgid "copied to %s from %s@%s\n" -msgstr "" +msgstr "kopieret til %s fra %s@%s\n" #, python-format msgid "gone from %s\n" -msgstr "" - -#, python-format -msgid "found parent directory %s\n" -msgstr "" - -#, python-format -msgid "base, entry %s %s\n" -msgstr "" - -msgid "munge-o-matic\n" -msgstr "" - -#, python-format -msgid "info: %s %s %s %s\n" +msgstr "væk fra %s\n" + +#, python-format +msgid "entry %s\n" msgstr "" #, python-format msgid "unknown path in revision %d: %s\n" -msgstr "" +msgstr "ukendt sti i revision %d: %s\n" #, python-format msgid "mark %s came from %s:%d\n" @@ -1284,48 +1282,44 @@ #, python-format msgid "parsing revision %d (%d changes)\n" -msgstr "" +msgstr "parser revision %d (%d ændringer)\n" #, python-format msgid "found parent of branch %s at %d: %s\n" -msgstr "" +msgstr "fandt forælder til gren %s ved %d: %s\n" msgid "no copyfrom path, don't know what to do.\n" msgstr "" #, python-format msgid "fetching revision log for \"%s\" from %d to %d\n" -msgstr "" - -#, python-format -msgid "skipping blacklisted revision %d\n" -msgstr "" +msgstr "henter revisionslog for \"%s\" fra %d til %d\n" #, python-format msgid "revision %d has no entries\n" -msgstr "" +msgstr "revision %d har ikke nogen indgange\n" #, python-format msgid "svn: branch has no revision %s" -msgstr "" +msgstr "svn: gren har ikke nogen revision %s" #, python-format msgid "%r is not under %r, ignoring\n" -msgstr "" +msgstr "%r ikke under %r, ignorerer\n" #, python-format msgid "initializing svn repo %r\n" -msgstr "" +msgstr "initialiserer svn depot %r\n" #, python-format msgid "initializing svn wc %r\n" -msgstr "" +msgstr "initialiserer svn arbejdskatalog %r\n" msgid "unexpected svn output:\n" -msgstr "" +msgstr "uventet svn output:\n" msgid "unable to cope with svn output" -msgstr "" +msgstr "kan ikke håndtere svn output" msgid "XXX TAGS NOT IMPLEMENTED YET\n" msgstr "" @@ -1374,21 +1368,21 @@ #, python-format msgid "making snapshot of %d files from working directory\n" -msgstr "" +msgstr "laver øjebliksbillede af %d filer fra arbejdskataloget\n" msgid "cannot specify --rev and --change at the same time" -msgstr "" +msgstr "kan ikke angive --rev og --change på samme tid" #, python-format msgid "running %r in %s\n" -msgstr "" +msgstr "kører %r i %s\n" #, python-format msgid "file changed while diffing. Overwriting: %s (src: %s)\n" msgstr "" msgid "cleaning up temp directory\n" -msgstr "" +msgstr "rydder midlertidigt katalog op\n" msgid "" "use external program to diff repository (or selected files)\n" @@ -1416,17 +1410,17 @@ msgstr "videregiv argument til sammenligningsprogram" msgid "change made by revision" -msgstr "" +msgstr "ændring lavet i revision" msgid "hg extdiff [OPT]... [FILE]..." -msgstr "" +msgstr "hg extdiff [TILVALG]... [FIL]..." #, python-format msgid "hg %s [OPTION]... [FILE]..." -msgstr "" - -msgid "pulling, updating and merging in one command" -msgstr "" +msgstr "hg %s [TILVALG]... [FIL]..." + +msgid "pull, update and merge in one command" +msgstr "træk, opdater og sammenføj i en kommando" msgid "" "pull changes from a remote repository, merge new changes if needed.\n" @@ -1453,10 +1447,10 @@ msgstr "" msgid "outstanding uncommitted merge" -msgstr "" +msgstr "udestående udeponeret sammenføjning" msgid "outstanding uncommitted changes" -msgstr "" +msgstr "udestående udeponeret ændringer" msgid "working directory is missing some files" msgstr "arbejdskataloget mangler nogle filer" @@ -1464,6 +1458,8 @@ msgid "" "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" msgstr "" +"flere hoveder i denne gren (brug \"hg heads .\" og \"hg merge\" for at " +"sammenføje)" #, python-format msgid "pulling from %s\n" @@ -1490,7 +1486,7 @@ #, python-format msgid "Automated merge with %s" -msgstr "" +msgstr "Automatisk sammenføjning med %s" #, python-format msgid "new changeset %d:%s merges remote changes with local\n" @@ -1500,34 +1496,34 @@ msgstr "" msgid "edit commit message" -msgstr "" +msgstr "rediger deponeringsbesked" msgid "edit commit message (DEPRECATED)" msgstr "" msgid "switch parents when merging" -msgstr "" +msgstr "ombyt forældre ved sammenføjning" msgid "hg fetch [SOURCE]" -msgstr "" - -msgid "GnuPG signing extension for Mercurial" -msgstr "" +msgstr "hg fetch [KILDE]" + +msgid "sign and verify changesets" +msgstr "underskriv og verificer ændringer" msgid "error while verifying signature" -msgstr "" +msgstr "fejl ved verifikation af underskrift" #, python-format msgid "%s Bad signature from \"%s\"\n" -msgstr "" +msgstr "%s Dårlig underskrift fra \"%s\"\n" #, python-format msgid "%s Note: Signature has expired (signed by: \"%s\")\n" -msgstr "" +msgstr "%s Bemærk: underskriften er udløbet (underskrevet af \"%s\")\n" #, python-format msgid "%s Note: This key has expired (signed by: \"%s\")\n" -msgstr "" +msgstr "%s Bemærk: denne nøgle er udløbet (underskrevet af \"%s\")\n" msgid "list signed changesets" msgstr "vis underskrevne ændringer" @@ -1554,7 +1550,7 @@ msgstr "" msgid "uncommitted merge - please provide a specific revision" -msgstr "" +msgstr "udeponeret sammenføjning - angiv venligst en specifik revision" msgid "Error while signing" msgstr "Fejl ved underskrivning" @@ -1566,13 +1562,13 @@ #, python-format msgid "Added signature for changeset %s" -msgstr "" +msgstr "Tilføjede underskrift af ændring %s" msgid "unknown signature version" -msgstr "" +msgstr "ukendt underskrift-version" msgid "make the signature local" -msgstr "" +msgstr "lav underskriften lokal" msgid "sign even if the sigfile is modified" msgstr "" @@ -1581,22 +1577,22 @@ msgstr "" msgid "the key id to sign with" -msgstr "" +msgstr "nøgle ID der skal underskrives med" msgid "commit message" -msgstr "" +msgstr "deponeringsbesked" msgid "hg sign [OPTION]... [REVISION]..." -msgstr "" +msgstr "hg sign [TILVALG]... [REVISION]..." msgid "hg sigcheck REVISION" -msgstr "" +msgstr "hg sigcheck REVISION" msgid "hg sigs" -msgstr "" - -msgid "" -"show revision graphs in terminal windows\n" +msgstr "hg sigs" + +msgid "" +"show revision graphs in terminals\n" "\n" "This extension adds a --graph option to the incoming, outgoing and log\n" "commands. When this options is given, an ASCII representation of the\n" @@ -1605,7 +1601,7 @@ #, python-format msgid "--graph option is incompatible with --%s" -msgstr "" +msgstr "--graph tilvalget er ikke kompatibelt med --%s" msgid "" "show revision history alongside an ASCII revision graph\n" @@ -1632,16 +1628,16 @@ msgstr "begræns antaln viste ændringer" msgid "show patch" -msgstr "" +msgstr "vis lap" msgid "show the specified revision or range" -msgstr "" +msgstr "vis den angivne revision eller interval" msgid "hg glog [OPTION]... [FILE]" -msgstr "" - -msgid "" -"CIA notification\n" +msgstr "hg glog [TILVALG]... [FIL]" + +msgid "" +"integrate Mercurial with a CIA notification service\n" "\n" "This is meant to be run as a changegroup or incoming hook.\n" "To configure it, set the following options in your hgrc:\n" @@ -1679,10 +1675,10 @@ #, python-format msgid "hgcia: sending update to %s\n" -msgstr "" +msgstr "hgcia: sender opdatering til %s\n" msgid "email.from must be defined when sending by email" -msgstr "" +msgstr "email.from skal være defineret ved afsendelse af email" msgid "cia: no user specified" msgstr "cia: ingen bruger angivet" @@ -1691,7 +1687,7 @@ msgstr "cia: intet project angivet" msgid "" -"browsing the repository in a graphical way\n" +"browse the repository in a graphical way\n" "\n" "The hgk extension allows browsing the history of a repository in a\n" "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n" @@ -1748,7 +1744,7 @@ msgstr "" msgid "hg view [-l LIMIT] [REVRANGE]" -msgstr "" +msgstr "hg view [-l GRÆNSE] [REV-INTERVAL]" msgid "generate patch" msgstr "" @@ -1769,22 +1765,22 @@ msgstr "søg" msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..." -msgstr "" +msgstr "hg git-diff-tree [TILVALG]... KNUDE1 KNUDE2 [FIL]..." msgid "hg debug-cat-file [OPTION]... TYPE FILE" -msgstr "" +msgstr "hg debug-cat-file [TILVALG ]... TYPE FIL" msgid "hg debug-config" -msgstr "" +msgstr "hg debug-config" msgid "hg debug-merge-base node node" -msgstr "" +msgstr "hg debug-merge-base knude knude" msgid "ignored" msgstr "Ignoreret" msgid "hg debug-rev-parse REV" -msgstr "" +msgstr "hg debug-rev-parse REV" msgid "header" msgstr "" @@ -1799,10 +1795,10 @@ msgstr "" msgid "hg debug-rev-list [options] revs" -msgstr "" - -msgid "" -"syntax highlighting in hgweb, based on Pygments\n" +msgstr "hg debug-rev-list [tilvalg] revisioner" + +msgid "" +"syntax highlighting for hgweb\n" "\n" "It depends on the Pygments syntax highlighting library:\n" "http://pygments.org/\n" @@ -1817,11 +1813,11 @@ "-- Adam Hupp <adam@hupp.org>\n" msgstr "" -msgid "inotify-based status acceleration for Linux systems\n" -msgstr "" +msgid "accelerate status report using system level services" +msgstr "accelerer statusreporter ved hjælp af systemservices" msgid "start an inotify server for this repository" -msgstr "" +msgstr "start en inotify server for dette depot" msgid "" "debugging information for inotify extension\n" @@ -1831,7 +1827,7 @@ msgstr "" msgid "directories being watched:\n" -msgstr "" +msgstr "kataloger som bliver overvåget:\n" msgid "run server in background" msgstr "kører serveren i baggrunden" @@ -1846,42 +1842,42 @@ msgstr "navn på fil at skrive process ID til" msgid "hg inserve [OPT]..." -msgstr "" +msgstr "hg inserve [TILVALG]..." msgid "(found dead inotify server socket; removing it)\n" -msgstr "" +msgstr "(fandt død inotify server sokkel; fjerner den)\n" msgid "(starting inotify server)\n" -msgstr "" +msgstr "(starter inotify server)\n" #, python-format msgid "could not start inotify server: %s\n" -msgstr "" +msgstr "kunne ikke starte inotify server: %s\n" #, python-format msgid "could not talk to new inotify server: %s\n" -msgstr "" +msgstr "kunne ikke snakke med ny inotify server: %s\n" msgid "(inotify server not running)\n" -msgstr "" +msgstr "(inotify server kører ikke)\n" #, python-format msgid "failed to contact inotify server: %s\n" -msgstr "" +msgstr "kontakt med inotify server miskykkedes: %s\n" msgid "received empty answer from inotify server" -msgstr "" +msgstr "modtog tomt svar fra inotify server" #, python-format msgid "(inotify: received response from incompatible server version %d)\n" -msgstr "" +msgstr "(inotify: modtog svar fra inkompatibel server version %d)\n" #, python-format msgid "(inotify: received '%s' response when expecting '%s')\n" -msgstr "" +msgstr "(inotify: modtog '%s' svar når '%s' blev forventet)\n" msgid "this system does not seem to support inotify" -msgstr "" +msgstr "dette system ser ikke ud til at understøtte inotify" #, python-format msgid "*** the current per-user limit on the number of inotify watches is %s\n" @@ -1891,11 +1887,11 @@ msgstr "" msgid "*** counting directories: " -msgstr "" +msgstr "*** tæller kataloger: " #, python-format msgid "found %d\n" -msgstr "" +msgstr "fandt %d\n" #, python-format msgid "*** to raise the limit from %d to %d (run as root):\n" @@ -1915,11 +1911,11 @@ #, python-format msgid "watching %r\n" -msgstr "" +msgstr "overvåget %r\n" #, python-format msgid "watching directories under %r\n" -msgstr "" +msgstr "overvåger kataloger under %r\n" #, python-format msgid "status: %r dir(%d) -> %s\n" @@ -1938,23 +1934,23 @@ msgstr "" msgid "rescanning due to .hgignore change\n" -msgstr "" +msgstr "genskanner på grund af .hgignore ændring\n" #, python-format msgid "%s event: created %s\n" -msgstr "" +msgstr "%s hændelse: oprettede %s\n" #, python-format msgid "%s event: deleted %s\n" -msgstr "" +msgstr "%s hændelse: slettede %s\n" #, python-format msgid "%s event: modified %s\n" -msgstr "" +msgstr "%s hændelse: ændrede %s\n" #, python-format msgid "filesystem containing %s was unmounted\n" -msgstr "" +msgstr "filsystem indeholdende %s blev afmonteret\n" #, python-format msgid "%s readable: %d bytes\n" @@ -1974,22 +1970,22 @@ #, python-format msgid "could not start server: %s" -msgstr "" +msgstr "kunne ikke starte server: %s" #, python-format msgid "answering query for %r\n" -msgstr "" +msgstr "svarer forespørgsel for %r\n" #, python-format msgid "received query from incompatible client version %d\n" -msgstr "" +msgstr "modtog forespørgsel fra inkompatibel klient version %d\n" #, python-format msgid "unrecognized query type: %s\n" -msgstr "" +msgstr "genkendte ikke forespørgselstype: %s\n" msgid "finished setup\n" -msgstr "" +msgstr "afsluttede opsætning\n" msgid "" "expand expressions into changelog and summaries\n" @@ -2017,7 +2013,7 @@ msgstr "" msgid "" -"keyword expansion in tracked files\n" +"expand keywords in tracked files\n" "\n" "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n" "tracked text files selected by your configuration.\n" @@ -2100,7 +2096,7 @@ #, python-format msgid "creating temporary repository at %s\n" -msgstr "" +msgstr "opretter midlertidigt depot ved %s\n" #, python-format msgid "" @@ -2116,6 +2112,8 @@ "\n" "removing temporary repository %s\n" msgstr "" +"\n" +"fjerner midlertidigt depot %s\n" msgid "" "expand keywords in the working directory\n" @@ -2155,7 +2153,7 @@ msgstr "" msgid "hg kwexpand [OPTION]... [FILE]..." -msgstr "" +msgstr "hg kwexpand [TILVALG]... [FIL]..." msgid "show keyword status flags of all files" msgstr "" @@ -2167,13 +2165,13 @@ msgstr "" msgid "hg kwfiles [OPTION]... [FILE]..." -msgstr "" +msgstr "hg kwfiles [TILVALG]... [FIL]..." msgid "hg kwshrink [OPTION]... [FILE]..." -msgstr "" - -msgid "" -"patch management and development\n" +msgstr "hg kwshrink [TILVALG]... [FIL]..." + +msgid "" +"work with a stack of patches\n" "\n" "This extension lets you work with a stack of patches in a Mercurial\n" "repository. It manages two stacks of patches - all known patches, and\n" @@ -2196,9 +2194,9 @@ "remove patch from applied stack qpop\n" "refresh contents of top applied patch qrefresh\n" msgstr "" -"udvikling og håndtering af patches\n" -"\n" -"Denne udvidelse lader dig arbejde med en stak af patches i et\n" +"arbejd med en stak af lapper\n" +"\n" +"Denne udvidelse lader dig arbejde med en stak af lapper (patches) i et\n" "Mercurial repository. Den håndterer to stakke af patches - alle kendte\n" "patches og alle anvendte patches (en delmængde af de kendte patches).\n" "\n" @@ -2437,7 +2435,7 @@ #, python-format msgid "qpop: %s is already at the top\n" -msgstr "" +msgstr "qpop: %s er allerede ved toppen\n" msgid "qpop: forcing dirstate update\n" msgstr "" @@ -2508,21 +2506,21 @@ #, python-format msgid "patch %s is already in the series file" -msgstr "" +msgstr "lap %s er allerede i series-filen" msgid "option \"-r\" not valid when importing files" -msgstr "" +msgstr "tilvalg \"-r\" er ikke gyldigt når filer bliver importeret" msgid "option \"-n\" not valid when importing multiple patches" -msgstr "" +msgstr "tilvalg \"-n\" er ikke gyldigt når flere lapper bliver importeret" #, python-format msgid "revision %d is the root of more than one branch" -msgstr "" +msgstr "revision %d er roden for mere end en gren" #, python-format msgid "revision %d is already managed" -msgstr "" +msgstr "revision %d er allerede håndteret" #, python-format msgid "revision %d is not the parent of the queue" @@ -2534,21 +2532,21 @@ #, python-format msgid "cannot import merge revision %d" -msgstr "" +msgstr "kan ikke importere sammenføjningsrevision %d" #, python-format msgid "revision %d is not the parent of %d" msgstr "" msgid "-e is incompatible with import from -" -msgstr "" +msgstr "-e er ikke kompatibelt med importering fra -" #, python-format msgid "patch %s does not exist" msgstr "rettelse %s eksisterer ikke" msgid "need --name to import a patch from -" -msgstr "" +msgstr "har brug for --name for at importere lap fra -" #, python-format msgid "adding %s to series file\n" @@ -2557,16 +2555,14 @@ msgid "" "remove patches from queue\n" "\n" -" The patches must not be applied, unless they are arguments to the\n" -" -r/--rev parameter. At least one patch or revision is required.\n" -"\n" -" With --rev, mq will stop managing the named revisions (converting\n" -" them to regular Mercurial changesets). The qfinish command should\n" -" be used as an alternative for qdelete -r, as the latter option is\n" -" deprecated.\n" +" The patches must not be applied, and at least one patch is\n" +" required.\n" "\n" " With -k/--keep, the patch files are preserved in the patch\n" -" directory." +" directory.\n" +"\n" +" To stop managing a patch and move it into permanent history,\n" +" use the qfinish command." msgstr "" msgid "print the patches already applied" @@ -2603,6 +2599,32 @@ " using the --name flag.\n" " " msgstr "" +"importer en patch\n" +"\n" +" Patchen sættes ind i serien efter den sidste anvendte patch. Hvis\n" +" der ikker er anvendt nogen patches, indsætter qimport patches\n" +" først i serien.\n" +"\n" +" Patchen vil have samme navn som dens kildefil, med mindre du\n" +" angiver et nyt med -n/--name.\n" +"\n" +" Du kan registrere en eksisterende patch inden i patch kataloget\n" +" med -e/--existing tilvalget.\n" +"\n" +" Med -f/--force vil en allerede eksisterende patch med samme navn\n" +" blive overskrevet.\n" +"\n" +" En eksisterende ændrin kan blive sat under mq kontrol med -r/--rev\n" +" (e.g. qimport --rev tip -n patch vil sætte tip under mq kontrol).\n" +" Med -g/--git vil patches importeret med --rev bruge git diff\n" +" formatet. Se 'hg help diffs' for mere information om hvorfor dette\n" +" er vigtigt for at bevare omdøbnings/kopierings-information og\n" +" ændriner i rettigheder.\n" +"\n" +" Brug - som patch filnavn for at importere en patch fra standard\n" +" indput. Når der importeres fra standard indput skal der angivet et\n" +" patchnavn med --name tilvalget.\n" +" " msgid "" "init a new queue repository\n" @@ -2613,6 +2635,13 @@ " an unversioned patch repository into a versioned one). You can use\n" " qcommit to commit changes to this queue repository." msgstr "" +"opret et nyt kø-depot\n" +"\n" +" Kø-depotet er uversioneret som standard. Hvis -c/--create-repo\n" +" bruges, så vil qinit oprettet et separat indlejret depot til\n" +" patches (qinit -c kan også bruges senere for at konvertere et\n" +" uversioneret patch depot til et versioneret et). Du kan bruge\n" +" qcommit for at deponere ændringer i dette kø-depot." msgid "" "clone main and patch repository at same time\n" @@ -2632,13 +2661,13 @@ msgstr "" msgid "versioned patch repository not found (see qinit -c)" -msgstr "versionsstyret arkiv til rettelser blev ikke fundet (se qinit -c)" +msgstr "versionsstyret depot til rettelser blev ikke fundet (se qinit -c)" msgid "cloning main repository\n" -msgstr "kloner hovedarkiv\n" +msgstr "kloner hoveddepot\n" msgid "cloning patch repository\n" -msgstr "kloner rettelsesarkiv\n" +msgstr "kloner rettelsesdepot\n" msgid "stripping applied patches from destination repository\n" msgstr "" @@ -2709,9 +2738,23 @@ " git diff format.\n" " " msgstr "" +"opdater den aktuelle patch\n" +"\n" +" Hvis der angives filer, så vil den opdaterede patch kun indeholde\n" +" modifikationer som matcher disse filer; de andre ændringer vil\n" +" forblive i arbejdskataloget.\n" +"\n" +" Hvis -s/--short angivet, så vil filer som allerede er i patches\n" +" blive opdateret ligesom matchede filer og forblive i patchen.\n" +"\n" +" 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" +" " msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" -msgstr "" +msgstr "tilvalg \"-e\" er inkompatibelt med \"-m\" eller \"-l\"" msgid "" "diff of the current patch and subsequent modifications\n" @@ -2727,6 +2770,18 @@ " qrefresh.\n" " " msgstr "" +"forskelle mellem den nuværende patch og efterfølgende modifikationer\n" +"\n" +" Viser forskelle fra den nuværende patch og eventuelle\n" +" efterfølgende ændringer i arbejdskataloget siden sidste refresh\n" +" (dermed ser man hvad den nuværende patch vil blive efter en\n" +" qrefresh)\n" +"\n" +" Brug 'hg diff' hvis du kun vil se ændringer lavet siden den sidste\n" +" qrefresh, eller 'hg export qtip' hvis du vil se ændringer lavet af\n" +" den nuværende patch uden at inkludere ændringer lavet siden\n" +" qrefresh.\n" +" " msgid "" "fold the named patches into the current patch\n" @@ -2801,6 +2856,11 @@ " will be lost.\n" " " msgstr "" +"skub den næste patch på stakken\n" +"\n" +" Når -f/--force er angivet, så vil alle lokale ændringer i de\n" +" patchede filer gå tabt.\n" +" " msgid "no saved queues found, please use -n\n" msgstr "" @@ -2817,6 +2877,12 @@ " top of the stack.\n" " " msgstr "" +"fjern den aktuelle patch fra stakken\n" +"\n" +" Som standard fjernes toppen af stakken. Hvis der angives en patch,\n" +" så vil der blive fjernet patches indtil den angivne patch er på\n" +" toppen af stakken.\n" +" " #, python-format msgid "using patch queue: %s\n" @@ -2863,6 +2929,12 @@ " revision.\n" " " msgstr "" +"strip en revision og alle dens efterkommere fra depotet\n" +"\n" +" Hvis en af arbejdskatalogets forælder-revisioner bliver strippet,\n" +" så vil arbejdskataloget blive opdateret til forældren af den\n" +" strippede revision.\n" +" " msgid "" "set or print guarded patches to push\n" @@ -2969,7 +3041,7 @@ msgstr "" msgid "hg qapplied [-s] [PATCH]" -msgstr "" +msgstr "hg qapplied [-s] [LAP]" msgid "use pull protocol to copy metadata" msgstr "brug træk-protokol til at kopiere metadata" @@ -2984,22 +3056,22 @@ msgstr "" msgid "hg qclone [OPTION]... SOURCE [DEST]" -msgstr "" +msgstr "hg qclone [TILVALG]... KILDE [MÅL]" msgid "hg qcommit [OPTION]... [FILE]..." -msgstr "" +msgstr "hg qcommit [TILVALG]... [FIL]..." msgid "hg qdiff [OPTION]... [FILE]..." -msgstr "" +msgstr "hg qdiff [TILVALG]... [FIL]..." msgid "keep patch file" msgstr "" -msgid "stop managing a revision" +msgid "stop managing a revision (DEPRECATED)" msgstr "" msgid "hg qdelete [-k] [-r REV]... [PATCH]..." -msgstr "" +msgstr "hg qdelete [-k] [-r REV]... [LAP]..." msgid "edit patch header" msgstr "" @@ -3008,13 +3080,13 @@ msgstr "" msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..." -msgstr "" +msgstr "hg qfold [-e] [-k] [-m TEKST] [-l FIL] LAP..." msgid "overwrite any local changes" msgstr "" msgid "hg qgoto [OPTION]... PATCH" -msgstr "" +msgstr "hg qgoto [TILVALG]... LAP" msgid "list all patches and guards" msgstr "" @@ -3023,10 +3095,10 @@ msgstr "" msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..." -msgstr "" +msgstr "hg qguard [-l] [-n] -- [LAP] [+VAGT]... [-VAGT]..." msgid "hg qheader [PATCH]" -msgstr "" +msgstr "hg qheader [LAP]" msgid "import file in patch directory" msgstr "" @@ -3047,13 +3119,13 @@ msgstr "" msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..." -msgstr "" +msgstr "hg qimport [-e] [-n NAVN] [-f] [-g] [-P] [-r REV]... FIL..." msgid "create queue repository" msgstr "opret kø-repository" msgid "hg qinit [-c]" -msgstr "" +msgstr "hg qinit [-c]" msgid "import uncommitted changes into patch" msgstr "" @@ -3071,13 +3143,13 @@ msgstr "" msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..." -msgstr "" +msgstr "hg qnew [-e] [-m TEKST] [-l FIL] [-f] LAP [FIL]..." msgid "hg qnext [-s]" -msgstr "" +msgstr "hg qnext [-s]" msgid "hg qprev [-s]" -msgstr "" +msgstr "hg qprev [-s]" msgid "pop all patches" msgstr "" @@ -3089,7 +3161,7 @@ msgstr "" msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" -msgstr "" +msgstr "hg qpop [-a] [-n NAVN] [-f] [LAP | INDEKS]" msgid "apply if the patch has rejects" msgstr "" @@ -3107,7 +3179,7 @@ msgstr "" msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]" -msgstr "" +msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NAVN] [LAP | INDEKS]" msgid "refresh only files already in the patch and specified files" msgstr "" @@ -3125,10 +3197,10 @@ msgstr "" msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..." -msgstr "" +msgstr "hg qrefresh [-I] [-X] [-e] [-m TEKST] [-l FIL] [-s] [FIL]..." msgid "hg qrename PATCH1 [PATCH2]" -msgstr "" +msgstr "hg qrename LAP1 [LAP2]" msgid "delete save entry" msgstr "" @@ -3137,7 +3209,7 @@ msgstr "" msgid "hg qrestore [-d] [-u] REV" -msgstr "" +msgstr "hg qrestore [-d] [-u] REV" msgid "copy patch directory" msgstr "" @@ -3152,7 +3224,7 @@ msgstr "" msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]" -msgstr "" +msgstr "hg qsave [-m TEKST] [-l FIL] [-c] [-n NAVN] [-e] [-f]" msgid "disable all guards" msgstr "" @@ -3167,13 +3239,13 @@ msgstr "" msgid "hg qselect [OPTION]... [GUARD]..." -msgstr "" +msgstr "hg qselect [TILVALG]... [VAGT]..." msgid "print patches not in series" msgstr "" msgid "hg qseries [-ms]" -msgstr "" +msgstr "hg qseries [-ms]" msgid "force removal with local changes" msgstr "" @@ -3185,13 +3257,13 @@ msgstr "" msgid "hg strip [-f] [-b] [-n] REV" -msgstr "" +msgstr "hg strip [-f] [-b] [-n] REV" msgid "hg qtop [-s]" -msgstr "" +msgstr "hg qtop [-s]" msgid "hg qunapplied [-s] [PATCH]" -msgstr "" +msgstr "hg qunapplied [-s] [LAP]" msgid "finish all applied changesets" msgstr "afslut alle anvendte ændringer" @@ -3200,7 +3272,7 @@ msgstr "hg qfinish [-a] [REV...]" msgid "" -"hook extension to email notifications on commits/pushes\n" +"send e-mail notifications for commits/pushes\n" "\n" "Subscriptions can be managed through hgrc. Default mode is to print\n" "messages to stdout, for testing and configuring.\n" @@ -3294,7 +3366,7 @@ msgstr "" msgid "" -"browse command output with external pager\n" +"browse command output with an external pager\n" "\n" "To set the pager that should be used, set the application variable:\n" "\n" @@ -3329,7 +3401,7 @@ msgstr "" msgid "" -"use suffixes to refer to ancestor revisions\n" +"interpret suffixes to refer to ancestor revisions\n" "\n" "This extension allows you to use git-style suffixes to refer to the\n" "ancestors of a specific revision.\n" @@ -3349,7 +3421,7 @@ msgstr "" msgid "" -"sending Mercurial changesets as a series of patch emails\n" +"send Mercurial changesets as a series of patch e-mails\n" "\n" "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n" "describes the series as a whole.\n" @@ -3416,7 +3488,7 @@ msgstr "" msgid "Please enter a valid value.\n" -msgstr "" +msgstr "Angiv venligst en gyldig værdi.\n" msgid "does the diffstat above look okay? " msgstr "" @@ -3503,13 +3575,13 @@ msgstr "" msgid "Displaying " -msgstr "" +msgstr "Viser " msgid "Writing " -msgstr "" +msgstr "Skriver " msgid "Sending " -msgstr "" +msgstr "Sender " msgid "send patches as attachments" msgstr "send lapper som vedhæftede filer" @@ -3566,7 +3638,7 @@ msgstr "" msgid "run even when remote repository is unrelated (with -b/--bundle)" -msgstr "kør selv hvis fjernarkivet er urelateret (med -b/--bundle)" +msgstr "kør selv hvis fjerndepotet er urelateret (med -b/--bundle)" msgid "a base changeset to specify instead of a destination (with -b/--bundle)" msgstr "" @@ -3575,9 +3647,9 @@ msgstr "" msgid "hg email [OPTION]... [DEST]..." -msgstr "" - -msgid "enable removing untracked files only" +msgstr "hg email [TILVALG]... [MÅL]..." + +msgid "delete files not tracked from the working directory" msgstr "" msgid "" @@ -3611,15 +3683,15 @@ #, python-format msgid "warning: %s\n" -msgstr "" +msgstr "advarsel: %s\n" #, python-format msgid "Removing file %s\n" -msgstr "" +msgstr "Fjerner fil %s\n" #, python-format msgid "Removing directory %s\n" -msgstr "" +msgstr "Fjerner katalog %s\n" msgid "abort if an error occurs" msgstr "" @@ -3634,7 +3706,7 @@ msgstr "" msgid "hg purge [OPTION]... [DIR]..." -msgstr "" +msgstr "hg purge [TILVALG]... [KATALOG]..." msgid "" "move sets of revisions to a different ancestor\n" @@ -3811,8 +3883,10 @@ "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] " "| [-c] | [-a]" msgstr "" - -msgid "interactive change selection during commit or qrefresh" +"hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] " +"| [-c] | [-a]" + +msgid "interactively select which sets of changes to commit/qrefresh" msgstr "" msgid "this modifies a binary file (all or nothing)\n" @@ -3944,12 +4018,12 @@ msgstr "gendanner %r som %r\n" msgid "hg record [OPTION]... [FILE]..." -msgstr "" +msgstr "hg record [TILVALG]... [FIL]..." msgid "hg qrecord [OPTION]... PATCH [FILE]..." -msgstr "" - -msgid "provides the hg share command" +msgstr "hg qrecord [TILVALG]... LAP [FIL]..." + +msgid "share a common history between several working directories" msgstr "" msgid "" @@ -3970,7 +4044,7 @@ msgstr "" msgid "" -"patch transplanting tool\n" +"transplant changesets from another branch\n" "\n" "This extension allows you to transplant patches from another branch.\n" "\n" @@ -3996,10 +4070,10 @@ #, python-format msgid "filtering %s\n" -msgstr "" +msgstr "filtrerer %s\n" msgid "filter failed" -msgstr "" +msgstr "filter fejlede" msgid "can only omit patchfile if merging" msgstr "" @@ -4013,7 +4087,7 @@ #, python-format msgid "%s transplanted as %s\n" -msgstr "" +msgstr "%s transplanteret som %s\n" msgid "transplant log file is corrupt" msgstr "" @@ -4023,7 +4097,7 @@ msgstr "" msgid "commit failed" -msgstr "" +msgstr "deponering fejlede" msgid "apply changeset? [ynmpcq?]:" msgstr "" @@ -4067,7 +4141,7 @@ msgstr "" msgid "--continue is incompatible with branch, all or merge" -msgstr "" +msgstr "--continue er inkompatibelt med branch, all eller merge" msgid "no source URL, branch tag or revision list provided" msgstr "" @@ -4076,31 +4150,31 @@ msgstr "" msgid "--all is incompatible with a revision list" -msgstr "" +msgstr "--all er inkompatibelt med en revisionsliste" msgid "no revision checked out" msgstr "" msgid "outstanding uncommitted merges" -msgstr "" +msgstr "udestående udeponeret sammenføjning" msgid "outstanding local changes" -msgstr "" +msgstr "udestående lokale ændringer" msgid "pull patches from REPOSITORY" -msgstr "" +msgstr "hiv lapper fra DEPOT" msgid "pull patches from branch BRANCH" -msgstr "" +msgstr "hiv lapper fra gren GREN" msgid "pull all changesets up to BRANCH" -msgstr "" +msgstr "his alle ændringer indtil GREN" msgid "skip over REV" msgstr "spring over REV" msgid "merge at REV" -msgstr "" +msgstr "sammenføj ved REV" msgid "append transplant info to log message" msgstr "" @@ -4109,14 +4183,14 @@ msgstr "" msgid "filter changesets through FILTER" -msgstr "" +msgstr "filtrer ændringer igennem FILTER" msgid "" "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." -msgstr "" - -msgid "" -"allow to use MBCS path with problematic encoding.\n" +msgstr "hg transplant [-s DEPOT] [-b GREN [-a]] [-p REV] [-m REV] [REV]..." + +msgid "" +"allow the use of MBCS paths with problematic encoding\n" "\n" "Some MBCS encodings are not good for some path operations (i.e.\n" "splitting path, case conversion, etc.) with its encoded bytes. We call\n" @@ -4143,7 +4217,6 @@ "Path encoding conversion are done between Unicode and\n" "encoding.encoding which is decided by Mercurial from current locale\n" "setting or HGENCODING.\n" -"\n" msgstr "" #, python-format @@ -4158,7 +4231,7 @@ msgstr "" msgid "" -"LF <-> CRLF/CR translation utilities\n" +"perform automatic newline conversion\n" "\n" "To perform automatic newline conversion, use:\n" "\n" @@ -4223,7 +4296,7 @@ msgstr "" msgid "" -"zeroconf support for Mercurial repositories\n" +"discover and advertise repositories on the local network\n" "\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" @@ -4242,14 +4315,14 @@ msgstr "" msgid "archive prefix contains illegal components" -msgstr "arkivpræfix indeholder ugyldige komponenter" +msgstr "depotpræfix indeholder ugyldige komponenter" msgid "cannot give prefix when archiving to files" msgstr "kan ikke give præfix ved arkivering til filer" #, python-format msgid "unknown archive type '%s'" -msgstr "ukendt arkivtype '%s'" +msgstr "ukendt depottype '%s'" msgid "invalid changegroup" msgstr "" @@ -4292,7 +4365,7 @@ #, python-format msgid "can't read commit message '%s': %s" -msgstr "Kan ikke læse arkiveringsbesked '%s': %s" +msgstr "kan ikke læse deponeringsbesked '%s': %s" msgid "limit must be a positive integer" msgstr "" @@ -4461,7 +4534,7 @@ msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." msgstr "" -"HG: Skriv arkiveringsbesked. Linier som starter med 'HG:' bliver fjernet." +"HG: Skriv deponeringsbesked. Linier som starter med 'HG:' bliver fjernet." msgid "HG: Leave message empty to abort commit." msgstr "" @@ -4493,7 +4566,7 @@ msgstr "HG: ingen filændringer" msgid "empty commit message" -msgstr "tom arkiveringsbesked" +msgstr "tom deponeringsbesked" msgid "" "add the specified files on the next commit\n" @@ -4502,20 +4575,20 @@ " repository.\n" "\n" " The files will be added to the repository at the next commit. To\n" -" undo an add before that, see hg revert.\n" +" undo an add before that, see hg forget.\n" "\n" " If no names are given, add all files to the repository.\n" " " msgstr "" -"tilføj de angivne filer ved næste arkivering\n" -"\n" -" Opskriv filer til at blive versionsstyret og tilføjet til arkivet.\n" -"\n" -" Filerne vil bliver tilføjet til arkivet ved næste arkivering. For\n" -" at omgøre en tilføjelse før det, se hg revert.\n" +"tilføj de angivne filer ved næste deponering\n" +"\n" +" Opskriv filer til at blive versionsstyret og tilføjet til depotet.\n" +"\n" +" Filerne vil bliver tilføjet til depotet ved næste deponering. For\n" +" at omgøre en tilføjelse før det, se hg forget.\n" "\n" " Hvis der ikke er angivet nogen navne tilføjes alle filer til\n" -" arkivet.\n" +" depotet.\n" " " msgid "" @@ -4637,7 +4710,7 @@ msgstr "" "omgør effekten af tidligere ændringer\n" "\n" -" Arkiverer de omgjorte ændringer som en ny ændring. Den nye ændring\n" +" Deponerer de omgjorte ændringer som en ny ændring. Den nye ændring\n" " er et barn af den omgjorte ændring.\n" "\n" " Hvis du omgør en ændring som ikke er spidsen, så vil et der blive\n" @@ -4648,7 +4721,7 @@ " 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 arkiveret, som ved en\n" +" Resultatet af denne sammenføjning er ikke lagt i depot, som ved en\n" " normal sammenføjning.\n" "\n" " Se 'hg help dates' for en liste af gyldige formater til -d/--date.\n" @@ -4803,6 +4876,17 @@ " Use the command 'hg update' to switch to an existing branch.\n" " " msgstr "" +"vis navngivne grene i depotet\n" +"\n" +" Viser depotets navngivne grene og indikerer hvilke der er\n" +" inaktive. Hvis active angivet, da vises kun aktive grene\n" +"\n" +" En gren er anses for at være aktiv hvis den indeholder\n" +" depothoveder.\n" +"\n" +" Brug kommandoen 'hg update' for at skifte til en eksisterende\n" +" gren.\n" +" " msgid "" "create a changegroup file\n" @@ -4813,9 +4897,11 @@ " 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" +" -a/--all (or --base null).\n" +"\n" +" To change the compression method applied, use the -t/--type\n" +" option. The available compression methods are: none, bzip2, and\n" +" gzip (by default, bundles are compressed using bzip2).\n" "\n" " The bundle file can then be transferred using conventional means\n" " and applied to another repository with the unbundle or pull\n" @@ -4898,24 +4984,24 @@ "\n" " " msgstr "" -"lav en kopi af et eksisterende arkiv\n" -"\n" -" Lav en kopi af et eksisterende arkiv i en ny mappe.\n" +"lav en kopi af et eksisterende depot\n" +"\n" +" Lav en kopi af et eksisterende depot i en ny mappe.\n" "\n" " Hvis der ikke angivet et navn til destinationen, så bruges\n" " grundnavnet for kilden.\n" "\n" -" Placeringen af kilden tilføjes til det nye arkivs .hg/hgrc fil som\n" +" Placeringen af kilden tilføjes til det nye depots .hg/hgrc fil som\n" " den nye standard for fremtidige kald til 'hg pull'.\n" "\n" " Hvis du bruger -r/--rev tilvalget for at klone op til en specifik\n" " revision, så vil ingen efterfølgende revisioner (inklusiv\n" -" efterfølgende mærkater) findes i det klonede arkiv. Denne\n" -" valgmulighed medfører --pull, selv ved lokale arkiver.\n" +" efterfølgende mærkater) findes i det klonede depot. Denne\n" +" valgmulighed medfører --pull, selv ved lokale depoter.\n" "\n" " Som udgangspunkt vil clone hente hovedet af 'default' grenen. Hvis\n" " -U/--noupdate tilvalget bruges vil den nye klon kun indeholde et\n" -" arkiv (.hg) og intet arbejdskatalog (arbejdskatalogets forælder er\n" +" depot (.hg) og intet arbejdskatalog (arbejdskatalogets forælder er\n" " sat til nul revisionen).\n" "\n" " Se 'hg help urls' for detaljer om gyldige formatter for kilden.\n" @@ -4927,18 +5013,18 @@ "\n" " Af effektivitetsgrunde bruges hårde lænker ved kloning når kilden\n" " og destinationen er på det samme filsystem (bemærk at dette kun\n" -" gælder for arkivdata og ikke for de udhentede filer). Nogle\n" +" gælder for depotdata og ikke for de udhentede filer). Nogle\n" " filsystemer, såsom AFS, implementerer ikke hårde lænker korrekt,\n" " men rapporterer ingen fejl. I disse tilfælde skal --pull bruges\n" " for at undgå hårde lænker.\n" "\n" -" I nogle tilfælde kan man klone arkiver og udhentede filer med\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" +" I nogle tilfælde kan man klone depoter og udhentede filer med\n" +"\n" +" $ cp -al DEPOT DEPOTKLON\n" "\n" " Dette er den hurtigste måde at klone på, men det er ikke altid\n" " sikkert. Operationen er ikke atomisk (det er op til dig at sikre\n" -" at ARKIV ikke bliver modificeret undervejs) og du skal selv sørge\n" +" at DEPOT ikke bliver modificeret undervejs) og du skal selv sørge\n" " for at din tekstbehandler bryder hårde lænker (Emacs og de fleste\n" " Linux Kernel værktøjer gør det). Dette er desuden ikke kompatibelt\n" " med visse udvidelser som placerer deres metadata under .hg mappen,\n" @@ -4965,19 +5051,19 @@ " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" -"arkiver de specificerede filer eller alle udestående ændringer\n" -"\n" -" Arkiver ændringer i de angivne filer ind i arkivet. Dette er en\n" +"lægger de specificerede filer eller alle udestående ændringer i depot\n" +"\n" +" Deponerer ændringer i de angivne filer ind i depotet. Dette er en\n" " lokal operation, i modsætning til et centraliseret RCS. Se hg push\n" " for en måde til aktivt distribuere dine ændringer.\n" "\n" " Hvis en liste af filer udelades vil alle ændringer rapporteret af\n" -" \"hg status\" blive arkiveret.\n" -"\n" -" Hvis du arkiverer resultatet af en sammenføjning, undlad da at\n" +" \"hg status\" blive deponeret.\n" +"\n" +" Hvis du deponerer resultatet af en sammenføjning, undlad da at\n" " angive filnavne eller -I/-X filtre.\n" "\n" -" Hvis der ikke angives en arkiveringsbesked, så starten den\n" +" Hvis der ikke angives en deponeringsbesked, så starten den\n" " konfigurerede editor for at bede dig om en besked.\n" "\n" " Se 'hg help dates' for en liste af gyldige formater til -d/--date.\n" @@ -5205,7 +5291,7 @@ " format. For more information, read 'hg help diffs'.\n" " " msgstr "" -"find ændringer i hele arkivet (eller udvalgte filer)\n" +"find ændringer i hele depotet (eller udvalgte filer)\n" "\n" " Vis ændringer mellem revisioner for de udvalgte filer.\n" "\n" @@ -5270,7 +5356,7 @@ " revisioner.\n" "\n" " Informationen som vises i ændrings-hovedet er: forfatter,\n" -" ændringshash, forældrene og arkiveringsbeskeden.\n" +" ændringshash, forældrene og deponeringsbeskeden.\n" "\n" " BEMÆRK: export kan generere uventet diff uddata for\n" " sammenføjningsændringer idet den kun vil sammenligne\n" @@ -5283,7 +5369,7 @@ " %H ændringshash (40 byte heksadecimal)\n" " %N antallet af rettelser som bliver genereret\n" " %R revisionnummer for ændringen\n" -" %b grundnavn for det eksporterede arkiv\n" +" %b grundnavn for det eksporterede depot\n" " %h kortform ændringshash (12 byte heksadecimal)\n" " %n nul-fyldt sekvensnummer, startende ved 1\n" " %r nul-fyldt revisionsnummer for ændringen\n" @@ -5310,6 +5396,38 @@ msgstr "" msgid "" +"forget the specified files on the next commit\n" +"\n" +" Mark the specified files so they will no longer be tracked\n" +" after the next commit.\n" +"\n" +" This only removes files from the current branch, not from the\n" +" entire project history, and it does not delete them from the\n" +" working directory.\n" +"\n" +" To undo a forget before the next commit, see hg add.\n" +" " +msgstr "" +"glem de angivne filer ved næste deponering\n" +"\n" +" Marker de angivne filer sådan at de ikke længere vil fulgt ved\n" +" næste deponering.\n" +"\n" +" Dette fjerner kun filerne fra den aktuelle gren, ikke fra hele\n" +" projektets historie, og det sletter dem heller ikke fra\n" +" arbejdskataloget.\n" +"\n" +" For at omgøre forget før næste deponering, se hg add.\n" +" " + +msgid "no files specified" +msgstr "" + +#, python-format +msgid "not removing %s: file is already untracked\n" +msgstr "fjerner ikke %s: filen følges ikke\n" + +msgid "" "search for a pattern in specified files and revisions\n" "\n" " Search revisions of files for a regular expression.\n" @@ -5544,9 +5662,9 @@ " See 'hg help urls' for more information.\n" " " msgstr "" -"opret et nyt arkiv i det givne katalog\n" -"\n" -" Initialiser et nyt arkiv i det givne katalog. Hvis det givne\n" +"opret et nyt depot i det givne katalog\n" +"\n" +" Initialiser et nyt depot i det givne katalog. Hvis det givne\n" " katalog ikke findes vil det blive oprettet.\n" "\n" " Hvis intet katalog er angivet vil det nuværende katalog bliver\n" @@ -5605,6 +5723,33 @@ " will appear in files:.\n" " " msgstr "" +"vis revisionhistorik for hele depotet eller udvalgte filer\n" +"\n" +" Viser revisionshistorikken for de angivne filer eller hele\n" +" projektet.\n" +"\n" +" Filhistorik vises uden at følge omdøbninger eller kopieringer.\n" +" Brug -f/--follow med et filnavn for at følge historien hen over\n" +" omdøbninger og kopieringer. --follow uden et filnavn vil kun vise\n" +" forfædre eller efterkommere af startrevisionen. --follow-first\n" +" følger kun den første forældre for sammenføjningsrevisioner.\n" +"\n" +" Hvis der ikke angives et revisionsinterval, da bruges tip:0 som\n" +" standard, med mindre --follow er brugt, i hvilket tilfælde\n" +" arbejdskatalogets forælder bruges som startrevision.\n" +"\n" +" Se 'hg help dates' for en liste af gyldige formater til -d/--date.\n" +"\n" +" Som standard udskriver denne kommando revisionsnummer og ændrings\n" +" ID, mærkater, ikke-trivielle forældre, bruger, dato og tid, og et\n" +" uddrag for hver ændring. Når -v/--verbose tilvalget bruges vises\n" +" listen af ændrede filer og den fulde deponeringsbesked.\n" +"\n" +" 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:.\n" +" " msgid "" "output the current or given revision of the project manifest\n" @@ -5641,9 +5786,9 @@ " den ønskede revision siden den sidste fælles foregående revision.\n" "\n" " Filer som ændrede sig i forhold til en af forældrene bliver\n" -" markeret som ændret med hensyn til næste arkivering, og en\n" -" arkivering skal laves før yderligere opdateringer er tilladt. Den\n" -" næste arkiverede ændring får to forældre.\n" +" markeret som ændret med hensyn til næste deponering, og en\n" +" deponering skal laves før yderligere opdateringer er tilladt. Den\n" +" næste deponerede ændring får to forældre.\n" "\n" " Hvis ingen revision angives og arbejdskatalogets forælder er en\n" " hovedrevision og den nuværende gren indeholder præcis et andet\n" @@ -5754,16 +5899,16 @@ msgstr "" "hent ændringer fra den angivne kilde\n" "\n" -" Hiver ændringer fra et fjert arkiv til et lokalt.\n" -"\n" -" Dette finder alle ændringer fra arkivet på den specificerede sti\n" -" eller URL og tilføjer dem til et lokalt arkiv (det nuværende arkiv\n" +" Hiver ændringer fra et fjert depot til et lokalt.\n" +"\n" +" Dette finder alle ændringer fra depotet på den specificerede sti\n" +" eller URL og tilføjer dem til et lokalt depot (det nuværende depot\n" " med mindre -R er angivet). Som standard opdateres arbejdskataloget\n" " ikke.\n" "\n" " Brug hg incoming for at se hvad der ville være blevet tilføjet på\n" " det tidspunkt du udførte kommandoen. Hvis du derefter beslutter at\n" -" tilføje disse ændringer til arkivet, så bør du bruge pull -r X\n" +" tilføje disse ændringer til depotet, så bør du bruge pull -r X\n" " hvor X er den sidste ændring nævnt af hg incoming.\n" "\n" " Hvis KILDE udelades, så bruges 'default' stien.\n" @@ -5793,12 +5938,12 @@ msgstr "" "skub ændringer til den angivne destination\n" "\n" -" Skubber ændringer fra det lokale arkiv til den givne destination.\n" +" Skubber ændringer fra det lokale depot til den givne destination.\n" "\n" " Dette er den symmetriske operation for pull. Den flytter ændringer\n" -" fra det nuværende arkiv til et andet. Hvis destinationen er lokal,\n" +" fra det nuværende depot til et andet. Hvis destinationen er lokal,\n" " så er dette identisk til et pull i destinationen af det nuværende\n" -" arkiv.\n" +" depot.\n" "\n" " Som standard vil push nægte af køre hvis den detekterer at den vil\n" " øge antallet af hoveder i destinationen. Dette indikerer normalt\n" @@ -5806,7 +5951,7 @@ " skubningen.\n" "\n" " Hvis -r/--rev bruges, så vil den navngivne revision og alle dets\n" -" forfædre bliver skubbet til det andet arkiv.\n" +" forfædre bliver skubbet til det andet depot.\n" "\n" " Se venligst 'hg help urls' for vigtige detaljer om ssh:// URL'er.\n" " Hvis DESTINATION udelades vil en standard sti blive brugt.\n" @@ -5854,9 +5999,9 @@ " To undo a remove before that, see hg revert.\n" " " msgstr "" -"fjern de angivne filer ved næste arkivering\n" -"\n" -" Planlæg de angivne filer til sletning fra arkivet.\n" +"fjern de angivne filer ved næste deponering\n" +"\n" +" Planlæg de angivne filer til sletning fra depotet.\n" "\n" " Dette fjerner kun filerne fra den nuværende gren, ikke fra hele\n" " projektets historie. -A/--after kan bruges til kun at fjerne filer\n" @@ -5877,11 +6022,8 @@ " -Af R R R R\n" "\n" " Denne kommando planlægger filerne til at blive fjernet ved næste\n" -" arkivering. For at omgøre en fjernelse før det, se hg revert.\n" -" " - -msgid "no files specified" -msgstr "" +" deponering. For at omgøre en fjernelse før det, se hg revert.\n" +" " #, python-format msgid "not removing %s: file is untracked\n" @@ -6061,9 +6203,9 @@ " files.\n" " " msgstr "" -"eksporter arkivet via HTTP\n" -"\n" -" Start en lokal HTTP arkivbrowser og pull-server.\n" +"eksporter depotet via HTTP\n" +"\n" +" Start en lokal HTTP depotbrowser og pull-server.\n" "\n" " Som standard logger serveren forespørgsler til stdout og fejl til\n" " stderr. Brug -A/--accesslog og -E/--errorlog tilvalgene for at\n" @@ -6109,7 +6251,7 @@ msgstr "" "vis ændrede filer i arbejdskataloget\n" "\n" -" Vis status for filer i arkivet. Hvis der angivet navne, så vil kun\n" +" Vis status for filer i depotet. Hvis der angivet navne, så vil kun\n" " disse filer blive vist. Filer som er rene eller ignorerede eller\n" " kilden i en kopierings/flytnings operation vises ikke med mindre\n" " -c/--clear, -i/--ignored, -C/--copies eller -A/--all er angivet.\n" @@ -6203,7 +6345,7 @@ " switch is used, a third column \"local\" is printed for local tags.\n" " " msgstr "" -"vis arkivmærkater\n" +"vis depotmærkater\n" "\n" " Viser både normale og lokale mærkater. Når -v/--verbose flaget\n" " bruges, udskrives en tredje kolonne \"local\" for lokale mærkater.\n" @@ -6265,27 +6407,27 @@ msgstr "" "opdater arbejdskataloget\n" "\n" -" Opdater arkivets arbejdskatalog til den angivne revision, eller\n" +" Opdater depotets arbejdskatalog til den angivne revision, eller\n" " spidsen af den nuværende gren hvis ingen revision er angivet. Brug\n" " null som revision for at fjerne arbejdskataloget (ligesom 'hg\n" " clone -U').\n" "\n" -" Hvis arbejdskataloget ikke indeholder nogen uarkiverede ændringer,\n" -" da vil det blive erstattet af den ønskede revision fra arkivet.\n" -" Hvis den ønskede revision er på en anden gren, så vil\n" +" Hvis arbejdskataloget ikke indeholder nogen ikke-deponerede\n" +" ændringer, da vil det blive erstattet af den ønskede revision fra\n" +" depotet. Hvis den ønskede revision er på en anden gren, så vil\n" " arbejdskataloget yderligere blive skiftet til denne gren.\n" "\n" -" Hvis der er uarkiverede ændringer kan -C/--clean tilvalget bruges\n" -" for at kassere dem og sætte tilstanden af arbejdskataloget lig\n" -" tilstanden i den ønskede revision. Alternativt, brug -c/--check\n" -" for at afbryde.\n" -"\n" -" Hvis der er uarkiverede ændringer, og -C/--clean tilvalget ikke\n" -" bruges, og forældrerevisionen og den ønskede revision begge er på\n" -" samme gren, og en af dem er en forfar til den anden, så vil det\n" -" nye arbejdskatalog indeholde den ønskede revision sammenføjet med\n" -" de uarkiverede ændringer. Ellers vil opdateringen fejle med et\n" -" forslag til at bruge 'merge' eller 'update -C' i stedet.\n" +" Hvis der er ikke-deponerede ændringer kan -C/--clean tilvalget\n" +" bruges for at kassere dem og sætte tilstanden af arbejdskataloget\n" +" lig tilstanden i den ønskede revision. Alternativt, brug\n" +" -c/--check for at afbryde.\n" +"\n" +" Hvis der er ikke-deponerede ændringer, og -C/--clean tilvalget\n" +" ikke bruges, og forældrerevisionen og den ønskede revision begge\n" +" er på samme gren, og en af dem er en forfar til den anden, så vil\n" +" det nye arbejdskatalog indeholde den ønskede revision sammenføjet\n" +" med de ikke-deponerede ændringer. Ellers vil opdateringen fejle\n" +" med et forslag til at bruge 'merge' eller 'update -C' i stedet.\n" "\n" " Hvis du vil opdatere blot en enkelt fil til en ældre revision,\n" " brug da revert.\n" @@ -6383,10 +6525,10 @@ msgstr "ekskluder navne som matcher det givne mønster" msgid "use <text> as commit message" -msgstr "brug <tekst> som arkiveringsbesked" +msgstr "brug <tekst> som deponeringsbesked" msgid "read commit message from <file>" -msgstr "læs arkiveringsbeskeden fra <fil>" +msgstr "læs deponeringsbeskeden fra <fil>" msgid "record datecode as commit date" msgstr "noter dato som integrationsdato" @@ -6518,7 +6660,7 @@ msgstr "" msgid "run even when remote repository is unrelated" -msgstr "kør selv hvis fjernarkivet er urelateret" +msgstr "kør selv hvis fjerndepotet er urelateret" msgid "a changeset up to which you would like to bundle" msgstr "" @@ -7185,7 +7327,7 @@ #, python-format msgid "repository '%s' is not local" -msgstr "arkiv '%s' er ikke lokalt" +msgstr "depot '%s' er ikke lokalt" msgid "invalid arguments" msgstr "ugyldige parametre" @@ -7288,16 +7430,18 @@ msgid "" "\n" -" Mercurial has a mechanism for adding new features through the\n" -" use of extensions. Extensions may bring new commands, or new\n" -" hooks, or change Mercurial's behavior.\n" -"\n" -" Extensions are not loaded by default for a variety of reasons,\n" -" they may be meant for advanced users or provide potentially\n" -" dangerous commands (e.g. mq and rebase allow history to be\n" -" rewritten), they might not be ready for prime-time yet, or\n" -" they may alter Mercurial's behavior. It is thus up to the user\n" -" to activate extensions as desired.\n" +" 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.\n" +"\n" +" Extensions are not loaded by default for a variety of reasons:\n" +" they can increase startup overhead; they may be meant for\n" +" advanced usage only; they may provide potentially dangerous\n" +" abilities (such as letting you destroy or modify history); they\n" +" might not be ready for prime time; or they may alter some\n" +" usual behaviors of stock Mercurial. It is thus up to the user to\n" +" activate extensions as needed.\n" "\n" " To enable the \"foo\" extension, either shipped with Mercurial\n" " or in the Python search path, create an entry for it in your\n" @@ -7315,7 +7459,7 @@ " scope, prepend its path with !:\n" "\n" " [extensions]\n" -" # disabling extension bar residing in /ext/path\n" +" # disabling extension bar residing in /path/to/extension/bar.py\n" " hgext.bar = !/path/to/extension/bar.py\n" " # ditto, but no path was supplied for extension baz\n" " hgext.baz = !\n" @@ -8005,7 +8149,7 @@ msgstr "" msgid "cannot create new http repository" -msgstr "kan ikke lave nyt http arkiv" +msgstr "kan ikke lave nyt http depot" #, python-format msgid "%s: ignoring invalid syntax '%s'\n" @@ -8017,11 +8161,11 @@ #, python-format msgid "repository %s not found" -msgstr "arkivet %s blev ikke fundet" +msgstr "depotet %s blev ikke fundet" #, python-format msgid "repository %s already exists" -msgstr "arkivet %s eksisterer allerede" +msgstr "depotet %s eksisterer allerede" #, python-format msgid "requirement '%s' not supported" @@ -8086,7 +8230,7 @@ #, python-format msgid "repository %s" -msgstr "arkiv %s" +msgstr "depot %s" #, python-format msgid "working directory of %s" @@ -8120,11 +8264,11 @@ #, python-format msgid "committing subrepository %s\n" -msgstr "arkiverer underarkiv %s\n" +msgstr "deponerer underdepot %s\n" #, python-format msgid "trouble committing %s!\n" -msgstr "problem ved arkivering %s!\n" +msgstr "problem ved deponering %s!\n" #, python-format msgid "%s does not exist!\n" @@ -8206,10 +8350,10 @@ msgstr "har allerede ændringen " msgid "warning: repository is unrelated\n" -msgstr "advarsel: arkivet er urelateret\n" +msgstr "advarsel: depotet er urelateret\n" msgid "repository is unrelated" -msgstr "arkivet er urelateret" +msgstr "depotet er urelateret" msgid "found new changesets starting at " msgstr "fandt nye ændringer startende ved " @@ -8231,7 +8375,7 @@ #, python-format msgid "abort: push creates new remote branch '%s'!\n" -msgstr "afbrudt: skub laver ny gren '%s' i fjernarkivet!\n" +msgstr "afbrudt: skub laver ny gren '%s' i fjerndepotet!\n" msgid "abort: push creates new remote heads!\n" msgstr "afbrudt: skub laver nye fjern-hoveder!\n" @@ -8454,7 +8598,7 @@ msgid "outstanding uncommitted changes (use 'hg status' to list changes)" msgstr "" -"udestående uarkiverede ændringer (brug 'hg status' for at se ændringer)" +"udestående ikke-deponerede ændringer (brug 'hg status' for at se ændringer)" msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)" msgstr "" @@ -8683,9 +8827,8 @@ "use (l)ocal source (%s) or (r)emote source (%s)?" msgstr "" -#, fuzzy msgid "&Remote" -msgstr "fjernsystem: " +msgstr "" msgid "r" msgstr "" @@ -8704,15 +8847,15 @@ #, python-format msgid "removing subrepo %s\n" -msgstr "fjerner underarkiv %s\n" +msgstr "fjerner underdepot %s\n" #, python-format msgid "pulling subrepo %s\n" -msgstr "hiver fra underarkiv %s\n" +msgstr "hiver fra underdepot %s\n" #, python-format msgid "pushing subrepo %s\n" -msgstr "skubber til underarkiv %s\n" +msgstr "skubber til underdepot %s\n" msgid "unmatched quotes" msgstr "" @@ -8766,7 +8909,7 @@ msgstr "%s.%s er ikke en sandhedsværdi ('%s')" msgid "enter a commit username:" -msgstr "angiv et arkiveringsbrugernavn:" +msgstr "angiv et deponeringsbrugernavn:" #, python-format msgid "No username found, using '%s' instead\n" @@ -8951,7 +9094,7 @@ #, python-format msgid "repository uses revlog format %d\n" -msgstr "arkivet bruger revlog format %d\n" +msgstr "depotet bruger revlog format %d\n" msgid "checking changesets\n" msgstr "kontrollerer ændringer\n"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/i18n/fr.po Tue Jun 30 12:32:30 2009 -0500 @@ -0,0 +1,8846 @@ +# French translations for Mercurial +# Traductions françaises de Mercurial +# Copyright (C) 2009 Matt Mackall <mpm@selenic.com> and others +# +# Quelques règles : +# - dans l'aide d'une commande, la première ligne descriptive +# commence par un verbe au présent sans majuscule +# - dans l'aide d'une commande, la description des options +# utilise un verbe à l'infinitif +# +# Note : la terminologie ci-dessous est loin d'être complète, figée ou +# parfaite. À compléter et à améliorer, particulièrement les +# termes comportant un point d'interrogation... +# +# Dictionnaire de termes courants : +# - to apply a patch appliquer un patch +# - a branch une branche +# - to check out extraire (terminologie utilisée par svn) +# - children des rejetons ? des descendants ? +# - to clone clôner +# - a conflict un conflit +# - an extension une extension (au sens de module Mercurial) +# - to fold patches agréger des patchs (replier des patch ?? bof) +# - an integrity check une vérification d'intégrité (ou de cohérence ?) +# - a mail un courriel, un courrier électronique +# - a merge une fusion +# - to merge fusionner +# - a node un nœud ? +# - a patch queue/stack une pile de patchs (mq) +# - à l'utilisation c'est vraiment une _pile_ +# (on y empile et dépile des patchs) +# - l'unique cas où _file_ conviendrait est dans le +# contexte de la commande qfinish +# => terme unique de pile pour plus de cohérence +# - the patch series la série (complète) de patchs (suite ?) +# - rejects des rejets ? (à propos de l'application d'un +# patch) +# - a repository un dépôt +# - to revert annuler des modifications (ou défaire ?) +# - a revision une révision +# - the topmost patch le dernier patch appliqué +# - a tree une arborescence +# - an unrelated repository un dépôt non apparenté +# - unversioned +# unmanaged +# untracked non suivi, non géré, pas sous contrôle du dépôt, +# hors révision ? +# - the working directory le répertoire de travail +# +# Termes très courants repris de l'anglais - à utiliser sans guillemets +# pour ne pas alourdir inutilement la traduction : +# - a diff un diff ? (ou également un patch ? synonymes...) +# - a hook un hook +# - a patch un patch +# - a tag un tag +# - to tag taguer +# +# Termes anglais avec une signification très spécifique, difficile à +# paraphraser sans alourdir ou perdre le sens - à utiliser avec guillemets : +# - a bundle un \"bundle\" +# - to bundle créer un \"bundle\" ? +# - a changeset un \"changeset\" +# - a changegroup un \"changegroup\" +# - the tip la révision \"tip\" +# +# Termes dont le classement / la traduction sont à déterminer : +# - a commit un commit, un \"commit\" +# - to commit \"committer\" ? (beuark, même dit tous les jours) +# - a guard une \"garde\" ? (une protection ?) +# - to guard a patch \"garder\" un patch ? +# - to pull rapatrier des \"changesets\" ? effectuer une +# opération de \"pull\" ? \"puller\" ?? (argh !) +# - to push propager ? (utilisé par svn pour commit) +# publier ? pousser ?? envoyer ?? +# - the series file (mq) ? +# +# Notes : +# - (cédric) je verrais bien l'ajout d'une rubrique générale dans l'aide +# (par exemple 'hg help glossary') librement remplissable par chaque équipe +# de traduction, qui introduirait succintement à l'utilisateur les termes +# qui vont être rencontrés dans mercurial - et en particulier permettrait +# de faire le lien avec des termes franglisants parfois utilisés +# (par ex. fusionner = "merger", etc.) ... ? +# +msgid "" +msgstr "" +"Project-Id-Version: Mercurial\n" +"Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" +"POT-Creation-Date: 2009-06-28 20:09+0200\n" +"PO-Revision-Date: 2009-05-14 13:06+0200\n" +"Last-Translator: Cedric Duval <cedricduval@free.fr>\n" +"Language-Team: French\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#, python-format +msgid " (default: %s)" +msgstr " (défaut: %s)" + +msgid "OPTIONS" +msgstr "" + +msgid "COMMANDS" +msgstr "" + +msgid " options:\n" +msgstr "" + +#, python-format +msgid "" +" aliases: %s\n" +"\n" +msgstr "" + +msgid "" +"control access to a repository using simple hooks\n" +"\n" +"This hook makes it possible to allow or deny write access to portions\n" +"of a repository when receiving incoming changesets.\n" +"\n" +"The authorization is matched based on the local user name on the\n" +"system where the hook runs, and not the committer of the original\n" +"changeset (since the latter is merely informative).\n" +"\n" +"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.\n" +"\n" +"To use this hook, configure the acl extension in your hgrc like this:\n" +"\n" +" [extensions]\n" +" hgext.acl =\n" +"\n" +" [hooks]\n" +" pretxnchangegroup.acl = python:hgext.acl.hook\n" +"\n" +" [acl]\n" +" # Check whether the source of incoming changes is in this list\n" +" # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n" +" sources = serve\n" +"\n" +"The allow and deny sections take a subtree pattern as key (with a\n" +"glob syntax by default), and a comma separated list of users as\n" +"the corresponding value. The deny list is checked before the allow\n" +"list is.\n" +"\n" +" [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\n" +"\n" +" [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 "acl: %s not enabled\n" +msgstr "" + +#, python-format +msgid "acl: %s enabled, %d entries for user %s\n" +msgstr "" + +#, python-format +msgid "config error - hook type \"%s\" cannot stop incoming changesets" +msgstr "" + +#, python-format +msgid "acl: changes have source \"%s\" - skipping\n" +msgstr "" + +#, python-format +msgid "acl: user %s denied on %s\n" +msgstr "" + +#, python-format +msgid "acl: access denied for changeset %s" +msgstr "" + +#, python-format +msgid "acl: user %s not allowed on %s\n" +msgstr "" + +#, python-format +msgid "acl: allowing changeset %s\n" +msgstr "" + +msgid "" +"track a line of development with movable markers\n" +"\n" +"Bookmarks are local movable markers to changesets. Every bookmark\n" +"points to a changeset identified by its hash. If you commit a\n" +"changeset that is based on a changeset that has a bookmark on it,\n" +"the bookmark shifts to the new changeset.\n" +"\n" +"It is possible to use bookmark names in every revision lookup\n" +"(e.g. hg merge, hg update).\n" +"\n" +"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:\n" +"\n" +" [bookmarks]\n" +" track.current = True\n" +"\n" +"This will cause Mercurial to track the bookmark that you are currently\n" +"using, and only update it. This is similar to git's approach to\n" +"branching.\n" +msgstr "" + +msgid "" +"track a line of development with movable markers\n" +"\n" +" 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.\n" +"\n" +" 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" +" " +msgstr "" + +msgid "a bookmark of this name does not exist" +msgstr "" + +msgid "a bookmark of the same name already exists" +msgstr "" + +msgid "new bookmark name required" +msgstr "" + +msgid "bookmark name required" +msgstr "" + +msgid "bookmark name cannot contain newlines" +msgstr "" + +msgid "a bookmark cannot have the name of an existing branch" +msgstr "" + +msgid "force" +msgstr "" + +msgid "revision" +msgstr "" + +msgid "delete a given bookmark" +msgstr "" + +msgid "rename a given bookmark" +msgstr "" + +msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]" +msgstr "" + +msgid "" +"integrate Mercurial with a Bugzilla bug tracker\n" +"\n" +"This hook extension adds comments on bugs in Bugzilla when changesets\n" +"that refer to bugs by Bugzilla ID are seen. The hook does not change\n" +"bug status.\n" +"\n" +"The hook updates the Bugzilla database directly. Only Bugzilla\n" +"installations using MySQL are supported.\n" +"\n" +"The hook relies on a Bugzilla script to send bug change notification\n" +"emails. That script changes between Bugzilla versions; the\n" +"'processmail' script used prior to 2.18 is replaced in 2.18 and\n" +"subsequent versions by 'config/sendbugmail.pl'. Note that these will\n" +"be run by Mercurial as the user pushing the change; you will need to\n" +"ensure the Bugzilla install file permissions are set appropriately.\n" +"\n" +"Configuring the extension:\n" +"\n" +" [bugzilla]\n" +"\n" +" host Hostname of the MySQL server holding the Bugzilla\n" +" database.\n" +" db Name of the Bugzilla database in MySQL. Default 'bugs'.\n" +" user Username to use to access MySQL server. Default 'bugs'.\n" +" password Password to use to access MySQL server.\n" +" timeout Database connection timeout (seconds). Default 5.\n" +" version Bugzilla version. Specify '3.0' for Bugzilla versions\n" +" 3.0 and later, '2.18' for Bugzilla versions from 2.18\n" +" and '2.16' for versions prior to 2.18.\n" +" bzuser Fallback Bugzilla user name to record comments with, if\n" +" changeset committer cannot be found as a Bugzilla user.\n" +" bzdir Bugzilla install directory. Used by default notify.\n" +" Default '/var/www/html/bugzilla'.\n" +" notify The command to run to get Bugzilla to send bug change\n" +" notification emails. Substitutes from a map with 3\n" +" keys, 'bzdir', 'id' (bug id) and 'user' (committer\n" +" bugzilla email). Default depends on version; from 2.18\n" +" it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n" +" %(id)s %(user)s\".\n" +" regexp Regular expression to match bug IDs in changeset commit\n" +" message. Must contain one \"()\" group. The default\n" +" expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n" +" number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n" +" variations thereof. Matching is case insensitive.\n" +" style The style file to use when formatting comments.\n" +" template Template to use when formatting comments. Overrides\n" +" style if specified. In addition to the usual Mercurial\n" +" keywords, the extension specifies:\n" +" {bug} The Bugzilla bug ID.\n" +" {root} The full pathname of the Mercurial\n" +" repository.\n" +" {webroot} Stripped pathname of the Mercurial\n" +" repository.\n" +" {hgweb} Base URL for browsing Mercurial\n" +" repositories.\n" +" Default 'changeset {node|short} in repo {root} refers '\n" +" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n" +" strip The number of slashes to strip from the front of {root}\n" +" to produce {webroot}. Default 0.\n" +" usermap Path of file containing Mercurial committer ID to\n" +" Bugzilla user ID mappings. If specified, the file\n" +" should contain one mapping per line,\n" +" \"committer\"=\"Bugzilla user\". See also the [usermap]\n" +" section.\n" +"\n" +" [usermap]\n" +" Any entries in this section specify mappings of Mercurial\n" +" committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n" +" \"committer\"=\"Bugzilla user\"\n" +"\n" +" [web]\n" +" baseurl Base URL for browsing Mercurial repositories. Reference\n" +" from templates as {hgweb}.\n" +"\n" +"Activating the extension:\n" +"\n" +" [extensions]\n" +" hgext.bugzilla =\n" +"\n" +" [hooks]\n" +" # run bugzilla hook on every change pulled or pushed in here\n" +" incoming.bugzilla = python:hgext.bugzilla.hook\n" +"\n" +"Example configuration:\n" +"\n" +"This example configuration is for a collection of Mercurial\n" +"repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n" +"installation in /opt/bugzilla-3.2.\n" +"\n" +" [bugzilla]\n" +" host=localhost\n" +" password=XYZZY\n" +" version=3.0\n" +" bzuser=unknown@domain.com\n" +" bzdir=/opt/bugzilla-3.2\n" +" template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/" +"rev/{node|short}\\n\\n{desc}\\n\n" +" strip=5\n" +"\n" +" [web]\n" +" baseurl=http://dev.domain.com/hg\n" +"\n" +" [usermap]\n" +" user@emaildomain.com=user.name@bugzilladomain.com\n" +"\n" +"Commits add a comment to the Bugzilla bug record of the form:\n" +"\n" +" Changeset 3b16791d6642 in repository-name.\n" +" http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n" +"\n" +" Changeset commit comment. Bug 1234.\n" +msgstr "" + +#, python-format +msgid "connecting to %s:%s as %s, password %s\n" +msgstr "" + +#, python-format +msgid "query: %s %s\n" +msgstr "" + +#, python-format +msgid "failed query: %s %s\n" +msgstr "" + +msgid "unknown database schema" +msgstr "" + +#, python-format +msgid "bug %d already knows about changeset %s\n" +msgstr "" + +msgid "telling bugzilla to send mail:\n" +msgstr "" + +#, python-format +msgid " bug %s\n" +msgstr "" + +#, python-format +msgid "running notify command %s\n" +msgstr "" + +#, python-format +msgid "bugzilla notify command %s" +msgstr "" + +msgid "done\n" +msgstr "" + +#, python-format +msgid "looking up user %s\n" +msgstr "" + +#, python-format +msgid "cannot find bugzilla user id for %s" +msgstr "" + +#, python-format +msgid "cannot find bugzilla user id for %s or %s" +msgstr "" + +#, python-format +msgid "bugzilla version %s not supported" +msgstr "" + +msgid "" +"changeset {node|short} in repo {root} refers to bug {bug}.\n" +"details:\n" +"\t{desc|tabindent}" +msgstr "" + +#, python-format +msgid "python mysql support not available: %s" +msgstr "" + +#, python-format +msgid "hook type %s does not pass a changeset id" +msgstr "" + +#, python-format +msgid "database error: %s" +msgstr "" + +msgid "display children changesets" +msgstr "" + +msgid "" +"show the children of the given or working directory revision\n" +"\n" +" Print the children of the working directory's revisions. If a\n" +" revision is given via -r/--rev, the children of that revision will\n" +" be printed. If a file argument is given, revision in which the\n" +" file was last changed (after the working directory revision or the\n" +" argument to --rev if given) is printed.\n" +" " +msgstr "" + +msgid "show children of the specified revision" +msgstr "" + +msgid "hg children [-r REV] [FILE]" +msgstr "" + +msgid "display statistics about repository history" +msgstr "" + +#, python-format +msgid "Revision %d is a merge, ignoring...\n" +msgstr "" + +#, python-format +msgid "generating stats: %d%%" +msgstr "" + +msgid "" +"histogram of changes to the repository\n" +"\n" +" This command will display a histogram representing the number\n" +" of changed lines or revisions, grouped according to the given\n" +" template. The default template will group changes by author.\n" +" The --dateformat option may be used to group the results by\n" +" date instead.\n" +"\n" +" Statistics are based on the number of changed lines, or\n" +" alternatively the number of matching revisions if the\n" +" --changesets option is specified.\n" +"\n" +" Examples:\n" +"\n" +" # display count of changed lines for every committer\n" +" hg churn -t '{author|email}'\n" +"\n" +" # display daily activity graph\n" +" hg churn -f '%H' -s -c\n" +"\n" +" # display activity of developers by month\n" +" hg churn -f '%Y-%m' -s -c\n" +"\n" +" # display count of lines changed in every year\n" +" hg churn -f '%Y' -s\n" +"\n" +" It is possible to map alternate email addresses to a main address\n" +" by providing a file using the following format:\n" +"\n" +" <alias email> <actual email>\n" +"\n" +" Such a file may be specified with the --aliases option, otherwise a\n" +" .hgchurn file will be looked for in the working directory root.\n" +" " +msgstr "" + +#, python-format +msgid "assuming %i character terminal\n" +msgstr "" + +msgid "count rate for the specified revision or range" +msgstr "" + +msgid "count rate for revisions matching date spec" +msgstr "" + +msgid "template to group changesets" +msgstr "" + +msgid "strftime-compatible format for grouping by date" +msgstr "" + +msgid "count rate by number of changesets" +msgstr "" + +msgid "sort by key (default: sort by count)" +msgstr "" + +msgid "file with email aliases" +msgstr "" + +msgid "show progress" +msgstr "" + +msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]" +msgstr "" + +msgid "" +"colorize output from some commands\n" +"\n" +"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" +"patch status (applied, unapplied, missing), and to diff-related\n" +"commands to highlight additions, removals, diff headers, and trailing\n" +"whitespace.\n" +"\n" +"Other effects in addition to color, like bold and underlined text, are\n" +"also available. Effects are rendered with the ECMA-48 SGR control\n" +"function (aka ANSI escape codes). This module also provides the\n" +"render_text function, which can be used to add effects to any text.\n" +"\n" +"Default effects may be overridden from the .hgrc file:\n" +"\n" +"[color]\n" +"status.modified = blue bold underline red_background\n" +"status.added = green bold\n" +"status.removed = red bold blue_background\n" +"status.deleted = cyan bold underline\n" +"status.unknown = magenta bold underline\n" +"status.ignored = black bold\n" +"\n" +"# 'none' turns off all effects\n" +"status.clean = none\n" +"status.copied = none\n" +"\n" +"qseries.applied = blue bold underline\n" +"qseries.unapplied = black bold\n" +"qseries.missing = red bold\n" +"\n" +"diff.diffline = bold\n" +"diff.extended = cyan bold\n" +"diff.file_a = red bold\n" +"diff.file_b = green bold\n" +"diff.hunk = magenta\n" +"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" +msgstr "" + +msgid "import from foreign VCS repositories into Mercurial" +msgstr "" + +msgid "" +"convert a foreign SCM repository to a Mercurial one.\n" +"\n" +" Accepted source formats [identifiers]:\n" +" - Mercurial [hg]\n" +" - CVS [cvs]\n" +" - Darcs [darcs]\n" +" - git [git]\n" +" - Subversion [svn]\n" +" - Monotone [mtn]\n" +" - GNU Arch [gnuarch]\n" +" - Bazaar [bzr]\n" +" - Perforce [p4]\n" +"\n" +" Accepted destination formats [identifiers]:\n" +" - Mercurial [hg]\n" +" - Subversion [svn] (history on branches is not preserved)\n" +"\n" +" If no revision is given, all revisions will be converted.\n" +" Otherwise, convert will only import up to the named revision\n" +" (given in a format understood by the source).\n" +"\n" +" If no destination directory name is specified, it defaults to the\n" +" basename of the source with '-hg' appended. If the destination\n" +" repository doesn't exist, it will be created.\n" +"\n" +" By default, all sources except Mercurial will use\n" +" --branchsort. Mercurial uses --sourcesort to preserve original\n" +" revision numbers order. Sort modes have the following effects:\n" +" --branchsort: convert from parent to child revision when\n" +" possible, which means branches are usually converted one after\n" +" the other. It generates more compact repositories.\n" +" --datesort: sort revisions by date. Converted repositories have\n" +" good-looking changelogs but are often an order of magnitude\n" +" larger than the same ones generated by --branchsort.\n" +" --sourcesort: try to preserve source revisions order, only\n" +" supported by Mercurial sources.\n" +"\n" +" If <REVMAP> isn't given, it will be put in a default location\n" +" (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n" +" that maps each source commit ID to the destination ID for that\n" +" revision, like so:\n" +" <source ID> <destination ID>\n" +"\n" +" 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" +" and can be run repeatedly to copy new commits.\n" +"\n" +" 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\n" +"\n" +" 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:\n" +"\n" +" include path/to/file\n" +"\n" +" exclude path/to/file\n" +"\n" +" rename from/file to/file\n" +"\n" +" 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 included.\n" +" The 'exclude' directive causes files or directories to be omitted.\n" +" The 'rename' directive renames a file or directory. To rename from\n" +" a subdirectory into the root of the repository, use '.' as the\n" +" path to rename to.\n" +"\n" +" The splicemap is a file that allows insertion of synthetic\n" +" history, letting you specify the parents of a revision. This is\n" +" 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" +" 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.\n" +"\n" +" The branchmap is a file that allows you to rename a branch when it is\n" +" being brought in from whatever external repository. When used in\n" +" 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.\n" +"\n" +" Mercurial Source\n" +" -----------------\n" +"\n" +" --config convert.hg.ignoreerrors=False (boolean)\n" +" ignore integrity errors when reading. Use it to fix Mercurial\n" +" repositories with missing revlogs, by converting from and to\n" +" Mercurial.\n" +" --config convert.hg.saverev=False (boolean)\n" +" store original revision ID in changeset (forces target IDs to\n" +" change)\n" +" --config convert.hg.startrev=0 (hg revision identifier)\n" +" convert start revision and its descendants\n" +"\n" +" CVS Source\n" +" ----------\n" +"\n" +" CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" +" to indicate the starting point of what will be converted. Direct\n" +" access to the repository files is not needed, unless of course the\n" +" repository is :local:. The conversion uses the top level directory\n" +" in the sandbox to find the CVS repository, and then uses CVS rlog\n" +" commands to find files to convert. This means that unless a\n" +" filemap is given, all files under the starting directory will be\n" +" converted, and that any directory reorganization in the CVS\n" +" sandbox is ignored.\n" +"\n" +" Because CVS does not have changesets, it is necessary to collect\n" +" individual commits to CVS and merge them into changesets. CVS\n" +" source uses its internal changeset merging code by default but can\n" +" be configured to call the external 'cvsps' program by setting:\n" +" --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n" +" This option is deprecated and will be removed in Mercurial 1.4.\n" +"\n" +" The options shown are the defaults.\n" +"\n" +" Internal cvsps is selected by setting\n" +" --config convert.cvsps=builtin\n" +" and has a few more configurable options:\n" +" --config convert.cvsps.cache=True (boolean)\n" +" Set to False to disable remote log caching, for testing and\n" +" debugging purposes.\n" +" --config convert.cvsps.fuzz=60 (integer)\n" +" Specify the maximum time (in seconds) that is allowed\n" +" between commits with identical user and log message in a\n" +" single changeset. When very large files were checked in as\n" +" part of a changeset then the default may not be long\n" +" enough.\n" +" --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" +" Specify a regular expression to which commit log messages\n" +" are matched. If a match occurs, then the conversion\n" +" process will insert a dummy revision merging the branch on\n" +" which this log message occurs to the branch indicated in\n" +" the regex.\n" +" --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" +" Specify a regular expression to which commit log messages\n" +" are matched. If a match occurs, then the conversion\n" +" process will add the most recent revision on the branch\n" +" indicated in the regex as the second parent of the\n" +" changeset.\n" +"\n" +" The hgext/convert/cvsps wrapper script allows the builtin\n" +" changeset merging code to be run without doing a conversion. Its\n" +" parameters and output are similar to that of cvsps 2.1.\n" +"\n" +" Subversion Source\n" +" -----------------\n" +"\n" +" Subversion source detects classical trunk/branches/tags layouts.\n" +" By default, the supplied \"svn://repo/path/\" source URL is\n" +" converted as a single branch. If \"svn://repo/path/trunk\" exists it\n" +" replaces the default branch. If \"svn://repo/path/branches\" exists,\n" +" its subdirectories are listed as possible branches. If\n" +" \"svn://repo/path/tags\" exists, it is looked for tags referencing\n" +" converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n" +" can be overridden with following options. Set them to paths\n" +" relative to the source URL, or leave them blank to disable auto\n" +" detection.\n" +"\n" +" --config convert.svn.branches=branches (directory name)\n" +" specify the directory containing branches\n" +" --config convert.svn.tags=tags (directory name)\n" +" specify the directory containing tags\n" +" --config convert.svn.trunk=trunk (directory name)\n" +" specify the name of the trunk branch\n" +"\n" +" Source history can be retrieved starting at a specific revision,\n" +" instead of being integrally converted. Only single branch\n" +" conversions are supported.\n" +"\n" +" --config convert.svn.startrev=0 (svn revision number)\n" +" specify start Subversion revision.\n" +"\n" +" Perforce Source\n" +" ---------------\n" +"\n" +" The Perforce (P4) importer can be given a p4 depot path or a\n" +" client specification as source. It will convert all files in the\n" +" source to a flat Mercurial repository, ignoring labels, branches\n" +" and integrations. Note that when a depot path is given you then\n" +" usually should specify a target directory, because otherwise the\n" +" target may be named ...-hg.\n" +"\n" +" It is possible to limit the amount of source history to be\n" +" converted by specifying an initial Perforce revision.\n" +"\n" +" --config convert.p4.startrev=0 (perforce changelist number)\n" +" specify initial Perforce revision.\n" +"\n" +"\n" +" Mercurial Destination\n" +" ---------------------\n" +"\n" +" --config convert.hg.clonebranches=False (boolean)\n" +" dispatch source branches in separate clones.\n" +" --config convert.hg.tagsbranch=default (branch name)\n" +" tag revisions branch name\n" +" --config convert.hg.usebranchnames=True (boolean)\n" +" preserve branch names\n" +"\n" +" " +msgstr "" + +msgid "" +"create changeset information from CVS\n" +"\n" +" This command is intended as a debugging tool for the CVS to\n" +" Mercurial converter, and can be used as a direct replacement for\n" +" cvsps.\n" +"\n" +" Hg debugcvsps reads the CVS rlog for current directory (or any\n" +" named directory) in the CVS repository, and converts the log to a\n" +" series of changesets based on matching commit log entries and\n" +" dates." +msgstr "" + +msgid "username mapping filename" +msgstr "" + +msgid "destination repository type" +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 "" + +msgid "change branch names while converting" +msgstr "" + +msgid "try to sort changesets by branches" +msgstr "" + +msgid "try to sort changesets by date" +msgstr "" + +msgid "preserve source changesets order" +msgstr "" + +msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]" +msgstr "" + +msgid "only return changes on specified branches" +msgstr "" + +msgid "prefix to remove from file names" +msgstr "" + +msgid "only return changes after or between specified tags" +msgstr "" + +msgid "update cvs log cache" +msgstr "" + +msgid "create new cvs log cache" +msgstr "" + +msgid "set commit time fuzz in seconds" +msgstr "" + +msgid "specify cvsroot" +msgstr "" + +msgid "show parent changesets" +msgstr "" + +msgid "show current changeset in ancestor branches" +msgstr "" + +msgid "ignored for compatibility" +msgstr "" + +msgid "hg debugcvsps [OPTION]... [PATH]..." +msgstr "" + +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 "" + +#, python-format +msgid "%s is not a valid revision in current branch" +msgstr "" + +#, python-format +msgid "%s is not available in %s anymore" +msgstr "" + +#, python-format +msgid "%s.%s symlink has no target" +msgstr "" + +#, python-format +msgid "cannot find required \"%s\" tool" +msgstr "" + +#, python-format +msgid "running: %s\n" +msgstr "" + +#, python-format +msgid "%s error:\n" +msgstr "" + +#, python-format +msgid "syntax error in %s(%d): key/value pair expected" +msgstr "" + +#, python-format +msgid "could not open map file %r: %s" +msgstr "" + +#, python-format +msgid "%s: missing or unsupported repository" +msgstr "" + +#, python-format +msgid "convert: %s\n" +msgstr "" + +#, python-format +msgid "%s: unknown repository type" +msgstr "" + +#, python-format +msgid "unknown sort mode: %s" +msgstr "" + +#, python-format +msgid "cycle detected between %s and %s" +msgstr "" + +msgid "not all revisions were sorted" +msgstr "" + +#, python-format +msgid "Writing author map file %s\n" +msgstr "" + +#, python-format +msgid "Ignoring bad line in author map file %s: %s\n" +msgstr "" + +#, python-format +msgid "mapping author %s to %s\n" +msgstr "" + +#, python-format +msgid "overriding mapping for author %s, was %s, will be %s\n" +msgstr "" + +#, python-format +msgid "spliced in %s as parents of %s\n" +msgstr "" + +msgid "scanning source...\n" +msgstr "" + +msgid "sorting...\n" +msgstr "" + +msgid "converting...\n" +msgstr "" + +#, python-format +msgid "source: %s\n" +msgstr "" + +#, python-format +msgid "assuming destination %s\n" +msgstr "" + +msgid "more than one sort mode specified" +msgstr "" + +msgid "--sourcesort is not supported by this data source" +msgstr "" + +msgid "" +"warning: support for external cvsps is deprecated and will be removed in " +"Mercurial 1.4\n" +msgstr "" + +#, python-format +msgid "revision %s is not a patchset number or date" +msgstr "" + +msgid "using builtin cvsps\n" +msgstr "" + +#, python-format +msgid "connecting to %s\n" +msgstr "" + +msgid "CVS pserver authentication failed" +msgstr "" + +msgid "server sucks" +msgstr "" + +#, python-format +msgid "%d bytes missing from remote file" +msgstr "" + +#, python-format +msgid "cvs server: %s\n" +msgstr "" + +#, python-format +msgid "unknown CVS response: %s" +msgstr "" + +msgid "collecting CVS rlog\n" +msgstr "" + +#, python-format +msgid "reading cvs log cache %s\n" +msgstr "" + +#, python-format +msgid "cache has %d log entries\n" +msgstr "" + +#, python-format +msgid "error reading cache: %r\n" +msgstr "" + +#, python-format +msgid "running %s\n" +msgstr "" + +#, python-format +msgid "prefix=%r directory=%r root=%r\n" +msgstr "" + +msgid "RCS file must be followed by working file" +msgstr "" + +msgid "must have at least some revisions" +msgstr "" + +msgid "expected revision number" +msgstr "" + +msgid "revision must be followed by date line" +msgstr "" + +#, python-format +msgid "found synthetic revision in %s: %r\n" +msgstr "" + +#, python-format +msgid "writing cvs log cache %s\n" +msgstr "" + +#, python-format +msgid "%d log entries\n" +msgstr "" + +msgid "creating changesets\n" +msgstr "" + +msgid "synthetic changeset cannot have multiple parents" +msgstr "" + +#, python-format +msgid "" +"warning: CVS commit message references non-existent branch %r:\n" +"%s\n" +msgstr "" + +#, python-format +msgid "%d changeset entries\n" +msgstr "" + +msgid "Python ElementTree module is not available" +msgstr "" + +#, python-format +msgid "cleaning up %s\n" +msgstr "" + +msgid "internal calling inconsistency" +msgstr "" + +msgid "errors in filemap" +msgstr "" + +#, python-format +msgid "%s:%d: %r already in %s list\n" +msgstr "" + +#, python-format +msgid "%s:%d: unknown directive %r\n" +msgstr "" + +msgid "source repository doesn't support --filemap" +msgstr "" + +#, python-format +msgid "%s does not look like a GNU Arch repo" +msgstr "" + +msgid "cannot find a GNU Arch tool" +msgstr "" + +#, python-format +msgid "analyzing tree version %s...\n" +msgstr "" + +#, python-format +msgid "" +"tree analysis stopped because it points to an unregistered archive %s...\n" +msgstr "" + +#, python-format +msgid "applying revision %s...\n" +msgstr "" + +#, python-format +msgid "computing changeset between %s and %s...\n" +msgstr "" + +#, python-format +msgid "obtaining revision %s...\n" +msgstr "" + +#, python-format +msgid "analyzing revision %s...\n" +msgstr "" + +#, python-format +msgid "could not parse cat-log of %s" +msgstr "" + +#, python-format +msgid "%s is not a local Mercurial repo" +msgstr "" + +#, python-format +msgid "initializing destination %s repository\n" +msgstr "" + +msgid "run hg sink pre-conversion action\n" +msgstr "" + +msgid "run hg sink post-conversion action\n" +msgstr "" + +#, python-format +msgid "pulling from %s into %s\n" +msgstr "" + +msgid "filtering out empty revision\n" +msgstr "" + +msgid "updating tags\n" +msgstr "" + +#, python-format +msgid "%s is not a valid start revision" +msgstr "" + +#, python-format +msgid "ignoring: %s\n" +msgstr "" + +msgid "run hg source pre-conversion action\n" +msgstr "" + +msgid "run hg source post-conversion action\n" +msgstr "" + +#, python-format +msgid "%s does not look like a monotone repo" +msgstr "" + +#, python-format +msgid "copying file in renamed directory from '%s' to '%s'" +msgstr "" + +msgid "reading p4 views\n" +msgstr "" + +msgid "collecting p4 changelists\n" +msgstr "" + +msgid "Subversion python bindings could not be loaded" +msgstr "" + +#, python-format +msgid "Subversion python bindings %d.%d found, 1.4 or later required" +msgstr "" + +msgid "Subversion python bindings are too old, 1.4 or later required" +msgstr "" + +#, python-format +msgid "svn: revision %s is not an integer" +msgstr "" + +#, python-format +msgid "svn: start revision %s is not an integer" +msgstr "" + +#, python-format +msgid "no revision found in module %s" +msgstr "" + +#, python-format +msgid "expected %s to be at %r, but not found" +msgstr "" + +#, python-format +msgid "found %s at %r\n" +msgstr "" + +#, python-format +msgid "ignoring empty branch %s\n" +msgstr "" + +#, python-format +msgid "found branch %s at %d\n" +msgstr "" + +msgid "svn: start revision is not supported with more than one branch" +msgstr "" + +#, python-format +msgid "svn: no revision found after start revision %d" +msgstr "" + +#, python-format +msgid "no tags found at revision %d\n" +msgstr "" + +#, python-format +msgid "ignoring foreign branch %r\n" +msgstr "" + +#, python-format +msgid "%s not found up to revision %d" +msgstr "" + +#, python-format +msgid "branch renamed from %s to %s at %d\n" +msgstr "" + +#, python-format +msgid "reparent to %s\n" +msgstr "" + +#, python-format +msgid "copied to %s from %s@%s\n" +msgstr "" + +#, python-format +msgid "gone from %s\n" +msgstr "" + +#, python-format +msgid "entry %s\n" +msgstr "" + +#, python-format +msgid "unknown path in revision %d: %s\n" +msgstr "" + +#, python-format +msgid "mark %s came from %s:%d\n" +msgstr "" + +#, python-format +msgid "parsing revision %d (%d changes)\n" +msgstr "" + +#, python-format +msgid "found parent of branch %s at %d: %s\n" +msgstr "" + +msgid "no copyfrom path, don't know what to do.\n" +msgstr "" + +#, python-format +msgid "fetching revision log for \"%s\" from %d to %d\n" +msgstr "" + +#, python-format +msgid "revision %d has no entries\n" +msgstr "" + +#, python-format +msgid "svn: branch has no revision %s" +msgstr "" + +#, python-format +msgid "%r is not under %r, ignoring\n" +msgstr "" + +#, python-format +msgid "initializing svn repo %r\n" +msgstr "" + +#, python-format +msgid "initializing svn wc %r\n" +msgstr "" + +msgid "unexpected svn output:\n" +msgstr "" + +msgid "unable to cope with svn output" +msgstr "" + +msgid "XXX TAGS NOT IMPLEMENTED YET\n" +msgstr "" + +msgid "" +"allow external programs to compare revisions\n" +"\n" +"The `extdiff' Mercurial extension allows you to use external programs\n" +"to compare revisions, or revision with working directory. The external diff\n" +"programs are called with a configurable set of options and two\n" +"non-option arguments: paths to directories containing snapshots of\n" +"files to compare.\n" +"\n" +"The `extdiff' extension also allows to configure new diff commands, so\n" +"you do not need to type \"hg extdiff -p kdiff3\" always.\n" +"\n" +" [extdiff]\n" +" # add new command that runs GNU diff(1) in 'context diff' mode\n" +" cdiff = gdiff -Nprc5\n" +" ## or the old way:\n" +" #cmd.cdiff = gdiff\n" +" #opts.cdiff = -Nprc5\n" +"\n" +" # add new command called vdiff, runs kdiff3\n" +" vdiff = kdiff3\n" +"\n" +" # add new command called meld, runs meld (no need to name twice)\n" +" meld =\n" +"\n" +" # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n" +" # (see http://www.vim.org/scripts/script.php?script_id=102)\n" +" # Non English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" " +"in\n" +" # your .vimrc\n" +" vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n" +"\n" +"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" +msgstr "" + +#, python-format +msgid "making snapshot of %d files from rev %s\n" +msgstr "" + +#, python-format +msgid "making snapshot of %d files from working directory\n" +msgstr "" + +msgid "cannot specify --rev and --change at the same time" +msgstr "" + +#, python-format +msgid "running %r in %s\n" +msgstr "" + +#, python-format +msgid "file changed while diffing. Overwriting: %s (src: %s)\n" +msgstr "" + +msgid "cleaning up temp directory\n" +msgstr "" + +msgid "" +"use external program to diff repository (or selected files)\n" +"\n" +" Show differences between revisions for the specified files, using\n" +" an external program. The default program used is diff, with\n" +" default options \"-Npru\".\n" +"\n" +" To select a different program, use the -p/--program option. The\n" +" program will be passed the names of two directories to compare. To\n" +" pass additional options to the program, use -o/--option. These\n" +" will be passed before the names of the directories to compare.\n" +"\n" +" When two revision arguments are given, then changes are shown\n" +" between those revisions. If only one revision is specified then\n" +" that revision is compared to the working directory, and, when no\n" +" revisions are specified, the working directory files are compared\n" +" to its parent." +msgstr "" + +msgid "comparison program to run" +msgstr "" + +msgid "pass option to comparison program" +msgstr "" + +msgid "change made by revision" +msgstr "" + +msgid "hg extdiff [OPT]... [FILE]..." +msgstr "" + +#, python-format +msgid "hg %s [OPTION]... [FILE]..." +msgstr "" + +msgid "pull, update and merge in one command" +msgstr "" + +msgid "" +"pull changes from a remote repository, merge new changes if needed.\n" +"\n" +" This finds all changes from the repository at the specified path\n" +" or URL and adds them to the local repository.\n" +"\n" +" If the pulled changes add a new branch head, the head is\n" +" automatically merged, and the result of the merge is committed.\n" +" Otherwise, the working directory is updated to include the new\n" +" changes.\n" +"\n" +" When a merge occurs, the newly pulled changes are assumed to be\n" +" \"authoritative\". The head of the new changes is used as the first\n" +" parent, with local changes as the second. To switch the merge\n" +" order, use --switch-parent.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" + +msgid "" +"working dir not at branch tip (use \"hg update\" to check out branch tip)" +msgstr "" + +msgid "outstanding uncommitted merge" +msgstr "" + +msgid "outstanding uncommitted changes" +msgstr "" + +msgid "working directory is missing some files" +msgstr "" + +msgid "" +"multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" +msgstr "" + +#, 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 "" + +#, python-format +msgid "updating to %d:%s\n" +msgstr "" + +#, python-format +msgid "merging with %d:%s\n" +msgstr "" + +#, python-format +msgid "Automated merge with %s" +msgstr "" + +#, python-format +msgid "new changeset %d:%s merges remote changes with local\n" +msgstr "" + +msgid "a specific revision you would like to pull" +msgstr "" + +msgid "edit commit message" +msgstr "" + +msgid "edit commit message (DEPRECATED)" +msgstr "" + +msgid "switch parents when merging" +msgstr "" + +msgid "hg fetch [SOURCE]" +msgstr "" + +msgid "sign and verify changesets" +msgstr "" + +msgid "error while verifying signature" +msgstr "" + +#, python-format +msgid "%s Bad signature from \"%s\"\n" +msgstr "" + +#, python-format +msgid "%s Note: Signature has expired (signed by: \"%s\")\n" +msgstr "" + +#, python-format +msgid "%s Note: This key has expired (signed by: \"%s\")\n" +msgstr "" + +msgid "list signed changesets" +msgstr "" + +#, python-format +msgid "%s:%d node does not exist\n" +msgstr "" + +msgid "verify all the signatures there may be for a particular revision" +msgstr "" + +#, python-format +msgid "No valid signature for %s\n" +msgstr "" + +msgid "" +"add a signature for the current or given revision\n" +"\n" +" If no revision is given, the parent of the working directory is used,\n" +" or tip if no revision is checked out.\n" +"\n" +" 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)" +msgstr "" + +#, python-format +msgid "Added signature for changeset %s" +msgstr "" + +msgid "unknown signature version" +msgstr "" + +msgid "make the signature local" +msgstr "" + +msgid "sign even if the sigfile is modified" +msgstr "" + +msgid "do not commit the sigfile after signing" +msgstr "" + +msgid "the key id to sign with" +msgstr "" + +msgid "commit message" +msgstr "" + +msgid "hg sign [OPTION]... [REVISION]..." +msgstr "" + +msgid "hg sigcheck REVISION" +msgstr "" + +msgid "hg sigs" +msgstr "" + +msgid "" +"show revision graphs in terminals\n" +"\n" +"This extension adds a --graph option to the incoming, outgoing and log\n" +"commands. When this options is given, an ASCII representation of the\n" +"revision graph is also shown.\n" +msgstr "" + +#, python-format +msgid "--graph option is incompatible with --%s" +msgstr "" + +msgid "" +"show revision history alongside an ASCII revision graph\n" +"\n" +" Print a revision history alongside a revision graph drawn with\n" +" ASCII characters.\n" +"\n" +" Nodes printed as an @ character are parents of the working\n" +" directory.\n" +" " +msgstr "" + +#, python-format +msgid "comparing with %s\n" +msgstr "comparaison avec %s\n" + +msgid "no changes found\n" +msgstr "aucun changement trouvé\n" + +msgid "show the revision DAG" +msgstr "" + +msgid "limit number of changes displayed" +msgstr "" + +msgid "show patch" +msgstr "" + +msgid "show the specified revision or range" +msgstr "" + +msgid "hg glog [OPTION]... [FILE]" +msgstr "" + +msgid "" +"integrate Mercurial with a CIA notification service\n" +"\n" +"This is meant to be run as a changegroup or incoming hook.\n" +"To configure it, set the following options in your hgrc:\n" +"\n" +"[cia]\n" +"# your registered CIA user name\n" +"user = foo\n" +"# the name of the project in CIA\n" +"project = foo\n" +"# the module (subproject) (optional)\n" +"#module = foo\n" +"# Append a diffstat to the log message (optional)\n" +"#diffstat = False\n" +"# Template to use for log messages (optional)\n" +"#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n" +"# Style to use (optional)\n" +"#style = foo\n" +"# The URL of the CIA notification service (optional)\n" +"# You can use mailto: URLs to send by email, eg\n" +"# mailto:cia@cia.vc\n" +"# Make sure to set email.from if you do this.\n" +"#url = http://cia.vc/\n" +"# print message instead of sending it (optional)\n" +"#test = False\n" +"\n" +"[hooks]\n" +"# one of these:\n" +"changegroup.cia = python:hgcia.hook\n" +"#incoming.cia = python:hgcia.hook\n" +"\n" +"[web]\n" +"# If you want hyperlinks (optional)\n" +"baseurl = http://server/path/to/repo\n" +msgstr "" + +#, python-format +msgid "hgcia: sending update to %s\n" +msgstr "" + +msgid "email.from must be defined when sending by email" +msgstr "" + +msgid "cia: no user specified" +msgstr "" + +msgid "cia: no project specified" +msgstr "" + +msgid "" +"browse the repository in a graphical way\n" +"\n" +"The hgk extension allows browsing the history of a repository in a\n" +"graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n" +"distributed with Mercurial.)\n" +"\n" +"hgk consists of two parts: a Tcl script that does the displaying and\n" +"querying of information, and an extension to Mercurial named hgk.py,\n" +"which provides hooks for hgk to get information. hgk can be found in\n" +"the contrib directory, and the extension is shipped in the hgext\n" +"repository, and needs to be enabled.\n" +"\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:\n" +"\n" +" [hgk]\n" +" path=/location/of/hgk\n" +"\n" +"hgk can make use of the extdiff extension to visualize revisions.\n" +"Assuming you had already configured extdiff vdiff command, just add:\n" +"\n" +" [hgk]\n" +" vdiff=vdiff\n" +"\n" +"Revisions context menu will now display additional entries to fire\n" +"vdiff on hovered and selected revisions." +msgstr "" + +msgid "diff trees from two commits" +msgstr "" + +msgid "output common ancestor information" +msgstr "" + +msgid "cat a specific revision" +msgstr "" + +msgid "cat-file: type or revision not supplied\n" +msgstr "" + +msgid "aborting hg cat-file only understands commits\n" +msgstr "" + +msgid "parse given revisions" +msgstr "" + +msgid "print revisions" +msgstr "" + +msgid "print extension options" +msgstr "" + +msgid "start interactive history viewer" +msgstr "" + +msgid "hg view [-l LIMIT] [REVRANGE]" +msgstr "" + +msgid "generate patch" +msgstr "" + +msgid "recursive" +msgstr "" + +msgid "pretty" +msgstr "" + +msgid "stdin" +msgstr "" + +msgid "detect copies" +msgstr "" + +msgid "search" +msgstr "" + +msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..." +msgstr "" + +msgid "hg debug-cat-file [OPTION]... TYPE FILE" +msgstr "" + +msgid "hg debug-config" +msgstr "" + +msgid "hg debug-merge-base node node" +msgstr "" + +msgid "ignored" +msgstr "" + +msgid "hg debug-rev-parse REV" +msgstr "" + +msgid "header" +msgstr "" + +msgid "topo-order" +msgstr "" + +msgid "parents" +msgstr "" + +msgid "max-count" +msgstr "" + +msgid "hg debug-rev-list [options] revs" +msgstr "" + +msgid "" +"syntax highlighting for hgweb\n" +"\n" +"It depends on the Pygments syntax highlighting library:\n" +"http://pygments.org/\n" +"\n" +"There is a single configuration option:\n" +"\n" +"[web]\n" +"pygments_style = <style>\n" +"\n" +"The default is 'colorful'.\n" +"\n" +"-- Adam Hupp <adam@hupp.org>\n" +msgstr "" + +msgid "accelerate status report using system level services" +msgstr "" + +msgid "start an inotify server for this repository" +msgstr "" + +msgid "" +"debugging information for inotify extension\n" +"\n" +" Prints the list of directories being watched by the inotify server.\n" +" " +msgstr "" + +msgid "directories being watched:\n" +msgstr "" + +msgid "run server in background" +msgstr "" + +msgid "used internally by daemon mode" +msgstr "" + +msgid "minutes to sit idle before exiting" +msgstr "" + +msgid "name of file to write process ID to" +msgstr "" + +msgid "hg inserve [OPT]..." +msgstr "" + +msgid "(found dead inotify server socket; removing it)\n" +msgstr "" + +msgid "(starting inotify server)\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 "" + +msgid "(inotify server not running)\n" +msgstr "" + +#, python-format +msgid "failed to contact inotify server: %s\n" +msgstr "" + +msgid "received empty answer from inotify server" +msgstr "" + +#, python-format +msgid "(inotify: received response from incompatible server version %d)\n" +msgstr "" + +#, python-format +msgid "(inotify: received '%s' response when expecting '%s')\n" +msgstr "" + +msgid "this system does not seem to support inotify" +msgstr "" + +#, python-format +msgid "*** the current per-user limit on the number of inotify watches is %s\n" +msgstr "" + +msgid "*** this limit is too low to watch every directory in this repository\n" +msgstr "" + +msgid "*** counting directories: " +msgstr "" + +#, python-format +msgid "found %d\n" +msgstr "" + +#, python-format +msgid "*** to raise the limit from %d to %d (run as root):\n" +msgstr "" + +#, python-format +msgid "*** echo %d > %s\n" +msgstr "" + +#, python-format +msgid "cannot watch %s until inotify watch limit is raised" +msgstr "" + +#, python-format +msgid "inotify service not available: %s" +msgstr "" + +#, python-format +msgid "watching %r\n" +msgstr "" + +#, python-format +msgid "watching directories under %r\n" +msgstr "" + +#, python-format +msgid "status: %r dir(%d) -> %s\n" +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 "" + +#, python-format +msgid "%s event: deleted %s\n" +msgstr "" + +#, python-format +msgid "%s event: modified %s\n" +msgstr "" + +#, python-format +msgid "filesystem containing %s was unmounted\n" +msgstr "" + +#, python-format +msgid "%s readable: %d bytes\n" +msgstr "" + +#, python-format +msgid "%s below threshold - unhooking\n" +msgstr "" + +#, python-format +msgid "%s reading %d events\n" +msgstr "" + +#, python-format +msgid "%s hooking back up with %d bytes readable\n" +msgstr "" + +#, python-format +msgid "could not start server: %s" +msgstr "" + +#, python-format +msgid "answering query for %r\n" +msgstr "" + +#, python-format +msgid "received query from incompatible client version %d\n" +msgstr "" + +#, python-format +msgid "unrecognized query type: %s\n" +msgstr "" + +msgid "finished setup\n" +msgstr "" + +msgid "" +"expand expressions into changelog and summaries\n" +"\n" +"This extension allows the use of a special syntax in summaries,\n" +"which will be automatically expanded into links or any other\n" +"arbitrary expression, much like InterWiki does.\n" +"\n" +"A few example patterns (link to bug tracking, etc.) that may\n" +"be used in your hgrc:\n" +"\n" +" [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" +" boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n" +msgstr "" + +#, python-format +msgid "interhg: invalid pattern for %s: %s\n" +msgstr "" + +#, python-format +msgid "interhg: invalid regexp for %s: %s\n" +msgstr "" + +msgid "" +"expand keywords in tracked files\n" +"\n" +"This extension expands RCS/CVS-like or self-customized $Keywords$ in\n" +"tracked text files selected by your configuration.\n" +"\n" +"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.\n" +"\n" +"Configuration is done in the [keyword] and [keywordmaps] sections of\n" +"hgrc files.\n" +"\n" +"Example:\n" +"\n" +" [keyword]\n" +" # expand keywords in every python file except those matching \"x*\"\n" +" **.py =\n" +" x* = ignore\n" +"\n" +"Note: the more specific you are in your filename patterns\n" +" the less you lose speed in huge repositories.\n" +"\n" +"For [keywordmaps] template mapping and expansion demonstration and\n" +"control run \"hg kwdemo\".\n" +"\n" +"An additional date template filter {date|utcdate} is provided.\n" +"\n" +"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.\n" +"\n" +"Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n" +"the risk of inadvertently storing expanded keywords in the change\n" +"history.\n" +"\n" +"To force expansion after enabling it, or a configuration change, run\n" +"\"hg kwexpand\".\n" +"\n" +"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.\n" +"\n" +"Expansions spanning more than one line and incremental expansions,\n" +"like CVS' $Log$, are not supported. A keyword template map\n" +"\"Log = {desc}\" expands to the first line of the changeset description.\n" +msgstr "" + +#, python-format +msgid "overwriting %s expanding keywords\n" +msgstr "" + +#, python-format +msgid "overwriting %s shrinking keywords\n" +msgstr "" + +msgid "[keyword] patterns cannot match" +msgstr "" + +msgid "no [keyword] patterns configured" +msgstr "" + +msgid "" +"print [keywordmaps] configuration and an expansion example\n" +"\n" +" Show current, custom, or default keyword template maps and their\n" +" expansions.\n" +"\n" +" Extend current configuration by specifying maps as arguments and\n" +" optionally by reading from an additional hgrc file.\n" +"\n" +" Override current keyword template maps with \"default\" option.\n" +" " +msgstr "" + +#, python-format +msgid "" +"\n" +"\t%s\n" +msgstr "" + +#, python-format +msgid "creating temporary repository at %s\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"%s keywords written to %s:\n" +msgstr "" + +msgid "unhooked all commit hooks\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"removing temporary repository %s\n" +msgstr "" + +msgid "" +"expand keywords in the working directory\n" +"\n" +" Run after (re)enabling keyword expansion.\n" +"\n" +" kwexpand refuses to run if given files contain local changes.\n" +" " +msgstr "" + +msgid "" +"print files currently configured for keyword expansion\n" +"\n" +" Crosscheck which files in working directory are potential targets\n" +" for keyword expansion. That is, files matched by [keyword] config\n" +" patterns but not symlinks.\n" +" " +msgstr "" + +msgid "" +"revert expanded keywords in the working directory\n" +"\n" +" Run before changing/disabling active keywords or if you experience\n" +" problems with \"hg import\" or \"hg merge\".\n" +"\n" +" kwshrink refuses to run if given files contain local changes.\n" +" " +msgstr "" + +msgid "show default keyword template maps" +msgstr "" + +msgid "read maps from rcfile" +msgstr "" + +msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..." +msgstr "" + +msgid "hg kwexpand [OPTION]... [FILE]..." +msgstr "" + +msgid "show keyword status flags of all files" +msgstr "" + +msgid "show files excluded from expansion" +msgstr "" + +msgid "additionally show untracked files" +msgstr "" + +msgid "hg kwfiles [OPTION]... [FILE]..." +msgstr "" + +msgid "hg kwshrink [OPTION]... [FILE]..." +msgstr "" + +msgid "" +"work with a stack of patches\n" +"\n" +"This extension lets you work with a stack of patches in a Mercurial\n" +"repository. It manages two stacks of patches - all known patches, and\n" +"applied patches (subset of known patches).\n" +"\n" +"Known patches are represented as patch files in the .hg/patches\n" +"directory. Applied patches are both patch files and changesets.\n" +"\n" +"Common tasks (use \"hg help command\" for more details):\n" +"\n" +"prepare repository to work with patches qinit\n" +"create new patch qnew\n" +"import existing patch qimport\n" +"\n" +"print patch series qseries\n" +"print applied patches qapplied\n" +"print name of top applied patch qtop\n" +"\n" +"add known patch to applied stack qpush\n" +"remove patch from applied stack qpop\n" +"refresh contents of top applied patch qrefresh\n" +msgstr "" + +#, python-format +msgid "%s appears more than once in %s" +msgstr "" + +msgid "guard cannot be an empty string" +msgstr "" + +#, python-format +msgid "guard %r starts with invalid character: %r" +msgstr "" + +#, python-format +msgid "invalid character in guard %r: %r" +msgstr "" + +#, python-format +msgid "active guards: %s\n" +msgstr "" + +#, python-format +msgid "guard %r too short" +msgstr "" + +#, python-format +msgid "guard %r starts with invalid char" +msgstr "" + +#, python-format +msgid "allowing %s - no guards in effect\n" +msgstr "" + +#, python-format +msgid "allowing %s - no matching negative guards\n" +msgstr "" + +#, python-format +msgid "allowing %s - guarded by %r\n" +msgstr "" + +#, python-format +msgid "skipping %s - guarded by %r\n" +msgstr "" + +#, python-format +msgid "skipping %s - no matching guards\n" +msgstr "" + +#, python-format +msgid "error removing undo: %s\n" +msgstr "" + +#, python-format +msgid "apply failed for patch %s" +msgstr "" + +#, python-format +msgid "patch didn't work out, merging %s\n" +msgstr "" + +#, python-format +msgid "update returned %d" +msgstr "" + +msgid "repo commit failed" +msgstr "" + +#, python-format +msgid "unable to read %s" +msgstr "" + +#, python-format +msgid "patch %s does not exist\n" +msgstr "" + +#, python-format +msgid "patch %s is not applied\n" +msgstr "" + +msgid "patch failed, unable to continue (try -v)\n" +msgstr "" + +#, python-format +msgid "applying %s\n" +msgstr "" + +#, 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 "" + +msgid "patch failed, rejects left in working dir\n" +msgstr "" + +msgid "fuzz found when applying patch, stopping\n" +msgstr "" + +#, python-format +msgid "revision %d is not managed" +msgstr "" + +#, python-format +msgid "cannot delete revision %d above applied patches" +msgstr "" + +#, python-format +msgid "patch %s finalized without changeset message\n" +msgstr "" + +msgid "qdelete requires at least one revision or patch name" +msgstr "" + +#, python-format +msgid "cannot delete applied patch %s" +msgstr "" + +#, python-format +msgid "patch %s not in series file" +msgstr "" + +msgid "no patches applied" +msgstr "" + +msgid "working directory revision is not qtip" +msgstr "" + +msgid "local changes found, refresh first" +msgstr "" + +msgid "local changes found" +msgstr "" + +#, python-format +msgid "\"%s\" cannot be used as the name of a patch" +msgstr "" + +#, python-format +msgid "patch \"%s\" already exists" +msgstr "" + +#, python-format +msgid "error unlinking %s\n" +msgstr "" + +#, python-format +msgid "patch name \"%s\" is ambiguous:\n" +msgstr "" + +#, python-format +msgid "patch %s not in series" +msgstr "" + +msgid "(working directory not at a head)\n" +msgstr "" + +msgid "no patches in series\n" +msgstr "" + +#, python-format +msgid "cannot push to a previous patch: %s" +msgstr "" + +#, python-format +msgid "qpush: %s is already at the top\n" +msgstr "" + +#, python-format +msgid "guarded by %r" +msgstr "" + +msgid "no matching guards" +msgstr "" + +#, python-format +msgid "cannot push '%s' - %s\n" +msgstr "" + +msgid "all patches are currently applied\n" +msgstr "" + +msgid "patch series already fully applied\n" +msgstr "" + +msgid "cleaning up working directory..." +msgstr "" + +#, python-format +msgid "errors during apply, please fix and refresh %s\n" +msgstr "" + +#, python-format +msgid "now at: %s\n" +msgstr "" + +#, python-format +msgid "patch %s is not applied" +msgstr "" + +msgid "no patches applied\n" +msgstr "" + +#, python-format +msgid "qpop: %s is already at the top\n" +msgstr "" + +msgid "qpop: forcing dirstate update\n" +msgstr "" + +#, python-format +msgid "trying to pop unknown node %s" +msgstr "" + +msgid "popping would remove a revision not managed by this patch queue" +msgstr "" + +msgid "deletions found between repo revs" +msgstr "" + +msgid "patch queue now empty\n" +msgstr "" + +msgid "cannot refresh a revision with children" +msgstr "" + +msgid "" +"refresh interrupted while patch was popped! (revert --all, qpush to " +"recover)\n" +msgstr "" + +msgid "patch queue directory already exists" +msgstr "" + +#, python-format +msgid "patch %s is not in series file" +msgstr "" + +msgid "No saved patch data found\n" +msgstr "" + +#, python-format +msgid "restoring status: %s\n" +msgstr "" + +msgid "save entry has children, leaving it alone\n" +msgstr "" + +#, python-format +msgid "removing save entry %s\n" +msgstr "" + +#, python-format +msgid "saved queue repository parents: %s %s\n" +msgstr "" + +msgid "queue directory updating\n" +msgstr "" + +msgid "Unable to load queue repository\n" +msgstr "" + +msgid "save: no patches applied, exiting\n" +msgstr "" + +msgid "status is already saved\n" +msgstr "" + +msgid "hg patches saved state" +msgstr "" + +msgid "repo commit failed\n" +msgstr "" + +#, python-format +msgid "patch %s is already in the series file" +msgstr "" + +msgid "option \"-r\" not valid when importing files" +msgstr "" + +msgid "option \"-n\" not valid when importing multiple patches" +msgstr "" + +#, python-format +msgid "revision %d is the root of more than one branch" +msgstr "" + +#, python-format +msgid "revision %d is already managed" +msgstr "" + +#, python-format +msgid "revision %d is not the parent of the queue" +msgstr "" + +#, python-format +msgid "revision %d has unmanaged children" +msgstr "" + +#, python-format +msgid "cannot import merge revision %d" +msgstr "" + +#, python-format +msgid "revision %d is not the parent of %d" +msgstr "" + +msgid "-e is incompatible with import from -" +msgstr "" + +#, python-format +msgid "patch %s does not exist" +msgstr "" + +msgid "need --name to import a patch from -" +msgstr "" + +#, python-format +msgid "adding %s to series file\n" +msgstr "" + +msgid "" +"remove patches from queue\n" +"\n" +" The patches must not be applied, and at least one patch is\n" +" required.\n" +"\n" +" With -k/--keep, the patch files are preserved in the patch\n" +" directory.\n" +"\n" +" To stop managing a patch and move it into permanent history,\n" +" use the qfinish command." +msgstr "" + +msgid "print the patches already applied" +msgstr "" + +msgid "print the patches not yet applied" +msgstr "" + +msgid "" +"import a patch\n" +"\n" +" The patch is inserted into the series after the last applied\n" +" patch. If no patches have been applied, qimport prepends the patch\n" +" to the series.\n" +"\n" +" The patch will have the same name as its source file unless you\n" +" give it a new one with -n/--name.\n" +"\n" +" You can register an existing patch inside the patch directory with\n" +" the -e/--existing flag.\n" +"\n" +" With -f/--force, an existing patch of the same name will be\n" +" overwritten.\n" +"\n" +" An existing changeset may be placed under mq control with -r/--rev\n" +" (e.g. qimport --rev tip -n patch will place tip under mq control).\n" +" With -g/--git, patches imported with --rev will use the git diff\n" +" format. See the diffs help topic for information on why this is\n" +" important for preserving rename/copy information and permission\n" +" changes.\n" +"\n" +" 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 "" + +msgid "" +"init a new queue repository\n" +"\n" +" The queue repository is unversioned by default. If\n" +" -c/--create-repo is specified, qinit will create a separate nested\n" +" repository for patches (qinit -c may also be run later to convert\n" +" an unversioned patch repository into a versioned one). You can use\n" +" qcommit to commit changes to this queue repository." +msgstr "" + +msgid "" +"clone main and patch repository at same time\n" +"\n" +" If source is local, destination will have no patches applied. If\n" +" source is remote, this command can not check if patches are\n" +" applied in source, so cannot guarantee that patches are not\n" +" applied in destination. If you clone remote repository, be sure\n" +" before that it has no patches applied.\n" +"\n" +" Source patch repository is looked for in <src>/.hg/patches by\n" +" default. Use -p <url> to change.\n" +"\n" +" The patch directory must be a nested Mercurial repository, as\n" +" would be created by qinit -c.\n" +" " +msgstr "" + +msgid "versioned patch repository not found (see qinit -c)" +msgstr "" + +msgid "cloning main repository\n" +msgstr "" + +msgid "cloning patch repository\n" +msgstr "" + +msgid "stripping applied patches from destination repository\n" +msgstr "" + +msgid "updating destination repository\n" +msgstr "" + +msgid "commit changes in the queue repository" +msgstr "" + +msgid "print the entire series file" +msgstr "" + +msgid "print the name of the current patch" +msgstr "" + +msgid "print the name of the next patch" +msgstr "" + +msgid "all patches applied\n" +msgstr "" + +msgid "print the name of the previous patch" +msgstr "" + +msgid "only one patch applied\n" +msgstr "" + +msgid "" +"create a new patch\n" +"\n" +" 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" +" -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.\n" +"\n" +" -u/--user and -d/--date can be used to set the (given) user and\n" +" date, respectively. -U/--currentuser and -D/--currentdate set user\n" +" to current user and date to current date.\n" +"\n" +" -e/--edit, -m/--message or -l/--logfile set the patch header as\n" +" well as the commit message. If none is specified, the header is\n" +" empty and the commit message is '[mq]: PATCH'.\n" +"\n" +" 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 "" + +msgid "" +"update the current patch\n" +"\n" +" If any file patterns are provided, the refreshed patch will\n" +" contain only the modifications that match those patterns; the\n" +" remaining modifications will remain in the working directory.\n" +"\n" +" If -s/--short is specified, files currently included in the patch\n" +" will be refreshed just like matched files and remain in the patch.\n" +"\n" +" 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" +" " +msgstr "" + +msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" +msgstr "" + +msgid "" +"diff of the current patch and subsequent modifications\n" +"\n" +" Shows a diff which includes the current patch as well as any\n" +" changes which have been made in the working directory since the\n" +" last refresh (thus showing what the current patch would become\n" +" after a qrefresh).\n" +"\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 made\n" +" by the current patch without including changes made since the\n" +" qrefresh.\n" +" " +msgstr "" + +msgid "" +"fold the named patches into the current patch\n" +"\n" +" Patches must not yet be applied. Each patch will be successively\n" +" applied to the current patch in the order given. If all the\n" +" patches apply successfully, the current patch will be refreshed\n" +" with the new cumulative patch, and the folded patches will be\n" +" deleted. With -k/--keep, the folded patch files will not be\n" +" removed afterwards.\n" +"\n" +" The header for each folded patch will be concatenated with the\n" +" 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 "qfold cannot fold already applied patch %s" +msgstr "" + +#, python-format +msgid "Error folding patch %s" +msgstr "" + +msgid "push or pop patches until named patch is at top of stack" +msgstr "" + +msgid "" +"set or print guards for a patch\n" +"\n" +" 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" +" has activated it.\n" +"\n" +" With no arguments, print the currently active guards.\n" +" With arguments, set guards for the named patch.\n" +" NOTE: Specifying negative guards now requires '--'.\n" +"\n" +" To set guards on another patch:\n" +" hg qguard -- other.patch +2.6.17 -stable\n" +" " +msgstr "" + +msgid "cannot mix -l/--list with options or arguments" +msgstr "" + +msgid "no patch to work with" +msgstr "" + +#, python-format +msgid "no patch named %s" +msgstr "" + +msgid "print the header of the topmost or specified patch" +msgstr "" + +msgid "" +"push the next patch onto the stack\n" +"\n" +" When -f/--force is applied, all local changes in patched files\n" +" will be lost.\n" +" " +msgstr "" + +msgid "no saved queues found, please use -n\n" +msgstr "" + +#, python-format +msgid "merging with queue at: %s\n" +msgstr "" + +msgid "" +"pop the current patch off the stack\n" +"\n" +" 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 "" + +#, python-format +msgid "using patch queue: %s\n" +msgstr "" + +msgid "" +"rename a patch\n" +"\n" +" With one argument, renames the current patch to PATCH1.\n" +" With two arguments, renames PATCH1 to PATCH2." +msgstr "" + +#, python-format +msgid "%s already exists" +msgstr "" + +#, python-format +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" +msgstr "" + +#, python-format +msgid "destination %s exists and is not a directory" +msgstr "" + +#, python-format +msgid "destination %s exists, use -f to force" +msgstr "" + +#, python-format +msgid "copy %s to %s\n" +msgstr "" + +msgid "" +"strip a revision and all its descendants from the repository\n" +"\n" +" 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" +" " +msgstr "" + +msgid "" +"set or print guarded patches to push\n" +"\n" +" Use the 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:\n" +"\n" +" qguard foo.patch -stable (negative guard)\n" +" qguard bar.patch +stable (positive guard)\n" +" qselect stable\n" +"\n" +" This activates the \"stable\" guard. mq will skip foo.patch (because\n" +" it has a negative match) but push bar.patch (because it has a\n" +" positive match).\n" +"\n" +" With no arguments, prints the currently active guards.\n" +" With one argument, sets the active guard.\n" +"\n" +" 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.\n" +"\n" +" qselect can change the guards on applied patches. It does not pop\n" +" guarded patches by default. Use --pop to pop back to the last\n" +" applied patch that is not guarded. Use --reapply (which implies\n" +" --pop) to push back to the current patch afterwards, but skip\n" +" guarded patches.\n" +"\n" +" 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 "" + +msgid "guards deactivated\n" +msgstr "" + +#, python-format +msgid "number of unguarded, unapplied patches has changed from %d to %d\n" +msgstr "" + +#, python-format +msgid "number of guarded, applied patches has changed from %d to %d\n" +msgstr "" + +msgid "guards in series file:\n" +msgstr "" + +msgid "no guards in series file\n" +msgstr "" + +msgid "active guards:\n" +msgstr "" + +msgid "no active guards\n" +msgstr "" + +msgid "popping guarded patches\n" +msgstr "" + +msgid "reapplying unguarded patches\n" +msgstr "" + +msgid "" +"move applied patches into repository history\n" +"\n" +" Finishes the specified revisions (corresponding to applied\n" +" patches) by moving them out of mq control into regular repository\n" +" history.\n" +"\n" +" Accepts a revision range or the -a/--applied option. If --applied\n" +" is specified, all applied mq revisions are removed from mq\n" +" control. Otherwise, the given revisions must be at the base of the\n" +" stack of applied patches.\n" +"\n" +" 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 "" + +msgid "no revisions specified" +msgstr "" + +msgid "cannot commit over an applied mq patch" +msgstr "" + +msgid "source has mq patches applied" +msgstr "" + +#, python-format +msgid "mq status file refers to unknown node %s\n" +msgstr "" + +#, python-format +msgid "Tag %s overrides mq patch of the same name\n" +msgstr "" + +msgid "cannot import over an applied patch" +msgstr "" + +msgid "print first line of patch header" +msgstr "" + +msgid "hg qapplied [-s] [PATCH]" +msgstr "" + +msgid "use pull protocol to copy metadata" +msgstr "" + +msgid "do not update the new working directories" +msgstr "" + +msgid "use uncompressed transfer (fast over LAN)" +msgstr "" + +msgid "location of source patch repository" +msgstr "" + +msgid "hg qclone [OPTION]... SOURCE [DEST]" +msgstr "" + +msgid "hg qcommit [OPTION]... [FILE]..." +msgstr "" + +msgid "hg qdiff [OPTION]... [FILE]..." +msgstr "" + +msgid "keep patch file" +msgstr "" + +msgid "stop managing a revision (DEPRECATED)" +msgstr "" + +msgid "hg qdelete [-k] [-r REV]... [PATCH]..." +msgstr "" + +msgid "edit patch header" +msgstr "" + +msgid "keep folded patch files" +msgstr "" + +msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..." +msgstr "" + +msgid "overwrite any local changes" +msgstr "" + +msgid "hg qgoto [OPTION]... PATCH" +msgstr "" + +msgid "list all patches and guards" +msgstr "" + +msgid "drop all guards" +msgstr "" + +msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..." +msgstr "" + +msgid "hg qheader [PATCH]" +msgstr "" + +msgid "import file in patch directory" +msgstr "" + +msgid "name of patch file" +msgstr "" + +msgid "overwrite existing files" +msgstr "" + +msgid "place existing revisions under mq control" +msgstr "" + +msgid "use git extended diff format" +msgstr "utiliser le format de patch étendu de git" + +msgid "qpush after importing" +msgstr "" + +msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..." +msgstr "" + +msgid "create queue repository" +msgstr "" + +msgid "hg qinit [-c]" +msgstr "" + +msgid "import uncommitted changes into patch" +msgstr "" + +msgid "add \"From: <current user>\" to patch" +msgstr "" + +msgid "add \"From: <given 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]..." +msgstr "" + +msgid "hg qnext [-s]" +msgstr "" + +msgid "hg qprev [-s]" +msgstr "" + +msgid "pop all patches" +msgstr "" + +msgid "queue name to pop" +msgstr "" + +msgid "forget any local changes" +msgstr "" + +msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" +msgstr "" + +msgid "apply if the patch has rejects" +msgstr "" + +msgid "list patch name in commit text" +msgstr "" + +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]" +msgstr "" + +msgid "refresh only files already in the patch and specified files" +msgstr "" + +msgid "add/update \"From: <current user>\" in patch" +msgstr "" + +msgid "add/update \"From: <given user>\" in patch" +msgstr "" + +msgid "update \"Date: <current date>\" in patch (if present)" +msgstr "" + +msgid "update \"Date: <given date>\" in patch (if present)" +msgstr "" + +msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..." +msgstr "" + +msgid "hg qrename PATCH1 [PATCH2]" +msgstr "" + +msgid "delete save entry" +msgstr "" + +msgid "update queue working directory" +msgstr "" + +msgid "hg qrestore [-d] [-u] REV" +msgstr "" + +msgid "copy patch directory" +msgstr "" + +msgid "copy directory name" +msgstr "" + +msgid "clear queue status file" +msgstr "" + +msgid "force copy" +msgstr "" + +msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]" +msgstr "" + +msgid "disable all guards" +msgstr "" + +msgid "list all guards in series file" +msgstr "" + +msgid "pop to before first guarded applied patch" +msgstr "" + +msgid "pop, then reapply patches" +msgstr "" + +msgid "hg qselect [OPTION]... [GUARD]..." +msgstr "" + +msgid "print patches not in series" +msgstr "" + +msgid "hg qseries [-ms]" +msgstr "" + +msgid "force removal with local changes" +msgstr "" + +msgid "bundle unrelated changesets" +msgstr "" + +msgid "no backups" +msgstr "" + +msgid "hg strip [-f] [-b] [-n] REV" +msgstr "" + +msgid "hg qtop [-s]" +msgstr "" + +msgid "hg qunapplied [-s] [PATCH]" +msgstr "" + +msgid "finish all applied changesets" +msgstr "" + +msgid "hg qfinish [-a] [REV...]" +msgstr "" + +msgid "" +"send e-mail notifications for commits/pushes\n" +"\n" +"Subscriptions can be managed through hgrc. Default mode is to print\n" +"messages to stdout, for testing and configuring.\n" +"\n" +"To use, configure notify extension and enable in hgrc like this:\n" +"\n" +" [extensions]\n" +" hgext.notify =\n" +"\n" +" [hooks]\n" +" # one email for each incoming changeset\n" +" incoming.notify = python:hgext.notify.hook\n" +" # batch emails when many changesets incoming at one time\n" +" changegroup.notify = python:hgext.notify.hook\n" +"\n" +" [notify]\n" +" # config items go in here\n" +"\n" +" config items:\n" +"\n" +" REQUIRED:\n" +" config = /path/to/file # file containing subscriptions\n" +"\n" +" OPTIONAL:\n" +" test = True # print messages to stdout for testing\n" +" strip = 3 # number of slashes to strip for url paths\n" +" domain = example.com # domain to use if committer missing domain\n" +" style = ... # style file to use when formatting email\n" +" template = ... # template to use when formatting email\n" +" incoming = ... # template to use when run as incoming hook\n" +" changegroup = ... # template when run as changegroup hook\n" +" 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" +" # (serve == ssh or http, push, pull, bundle)\n" +" [email]\n" +" from = user@host.com # email address to send as if none given\n" +" [web]\n" +" baseurl = http://hgserver/... # root of hg web site for browsing commits\n" +"\n" +" notify config file has same format as regular hgrc. it has two\n" +" sections so you can express subscriptions in whatever way is handier\n" +" for you.\n" +"\n" +" [usersubs]\n" +" # key is subscriber email, value is \",\"-separated list of glob " +"patterns\n" +" user@host = pattern\n" +"\n" +" [reposubs]\n" +" # key is glob pattern, value is \",\"-separated list of subscriber " +"emails\n" +" pattern = user@host\n" +"\n" +" glob patterns are matched against path to repository root.\n" +"\n" +" if you like, you can put notify config file in repository that users\n" +" can push changes to, they can manage their own subscriptions." +msgstr "" + +#, python-format +msgid "%s: %d new changesets" +msgstr "" + +#, python-format +msgid "notify: sending %d subscribers %d changes\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"diffs (truncated from %d to %d lines):\n" +"\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"diffs (%d lines):\n" +"\n" +msgstr "" + +#, python-format +msgid "notify: no subscribers to repository %s\n" +msgstr "" + +#, python-format +msgid "notify: changes have source \"%s\" - skipping\n" +msgstr "" + +msgid "" +"browse command output with an external pager\n" +"\n" +"To set the pager that should be used, set the application variable:\n" +"\n" +" [pager]\n" +" pager = LESS='FSRX' less\n" +"\n" +"If no pager is set, the pager extensions uses the environment variable\n" +"$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n" +"\n" +"If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" +"setting:\n" +"\n" +" [pager]\n" +" quiet = True\n" +"\n" +"You can disable the pager for certain commands by adding them to the\n" +"pager.ignore list:\n" +"\n" +" [pager]\n" +" ignore = version, help, update\n" +"\n" +"You can also enable the pager only for certain commands using\n" +"pager.attend:\n" +"\n" +" [pager]\n" +" attend = log\n" +"\n" +"If pager.attend is present, pager.ignore will be ignored.\n" +"\n" +"To ignore global commands like \"hg version\" or \"hg help\", you have to\n" +"specify them in the global .hgrc\n" +msgstr "" + +msgid "" +"interpret suffixes to refer to ancestor revisions\n" +"\n" +"This extension allows you to use git-style suffixes to refer to the\n" +"ancestors of a specific revision.\n" +"\n" +"For example, if you can refer to a revision as \"foo\", then:\n" +"\n" +"- foo^N = Nth parent of foo\n" +" foo^0 = foo\n" +" foo^1 = first parent of foo\n" +" foo^2 = second parent of foo\n" +" foo^ = foo^1\n" +"\n" +"- foo~N = Nth first grandparent of foo\n" +" foo~0 = foo\n" +" foo~1 = foo^1 = foo^ = first parent of foo\n" +" foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n" +msgstr "" + +# cédric: première ligne trop longue (utilisée pour la liste d'extensions +# activée, une par ligne) -> traduction abrégée +msgid "" +"send Mercurial changesets as a series of patch e-mails\n" +"\n" +"The series is started off with a \"[PATCH 0 of N]\" introduction, which\n" +"describes the series as a whole.\n" +"\n" +"Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n" +"first line of the changeset description as the subject text. The\n" +"message contains two or three body parts:\n" +"\n" +" The changeset description.\n" +"\n" +" [Optional] The result of running diffstat on the patch.\n" +"\n" +" The patch itself, as generated by \"hg export\".\n" +"\n" +"Each message refers to the first in the series using the In-Reply-To\n" +"and References headers, so they will show up as a sequence in threaded\n" +"mail and news readers, and in mail archives.\n" +"\n" +"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.\n" +"\n" +"To configure other defaults, add a section like this to your hgrc\n" +"file:\n" +"\n" +" [email]\n" +" from = My Name <my@email>\n" +" to = recipient1, recipient2, ...\n" +" cc = cc1, cc2, ...\n" +" bcc = bcc1, bcc2, ...\n" +"\n" +"Then you can use the \"hg email\" command to mail a series of changesets\n" +"as a patchbomb.\n" +"\n" +"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.\n" +"\n" +"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:\n" +"\n" +" % mutt -R -f mbox\n" +"\n" +"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:\n" +"\n" +" % formail -s sendmail -bm -t < mbox\n" +"\n" +"That should be all. Now your patchbomb is on its way out.\n" +"\n" +"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." +msgstr "" +"envoi d'une série de \"changesets\" par courrier électronique\n" +"\n" +"La série débute par un message d'introduction \"[PATCH 0 of N]\" la\n" +"décrivant dans son ensemble.\n" +"\n" +"Ensuite, pour chaque patch est créé un courriel dont le sujet est\n" +"la première ligne du commentaire du \"changeset\", préfixée par\n" +"\"[PATCH M of N] \". Le corps du message comporte deux ou trois\n" +"parties :\n" +"\n" +" La description du \"changeset\".\n" +"\n" +" Optionnellement, un résumé des modifications généré par le\n" +" programme diffstat.\n" +"\n" +" Le patch proprement dit, tel que généré par \"hg export\".\n" +"\n" +"Chaque message fait référence au premier de la série (à l'aide\n" +"des en-têtes de message In-Reply-To et References) de manière à\n" +"apparaître comme un fil de discussion dans les lecteurs de courrier\n" +"électronique et de nouvelles, ainsi que dans les archives de\n" +"messagerie.\n" +"\n" +"Avec l'option -d/--diffstat, il vous sera demandé pour chaque\n" +"\"changeset\" d'en confirmer l'envoi après avoir vu un résumé des\n" +"modifications (par diffstat) et le commentaire associé ; ceci afin\n" +"d'être certain de bien envoyer les bonnes modifications.\n" +"\n" +"Pour configurer les valeurs par défaut d'autres options d'envoi,\n" +"ajoutez à votre fichier hgrc une section telle ci-dessous :\n" +"\n" +" [email]\n" +" from = Mon Nom <mon@adresse_de_courriel>\n" +" to = destinataire1, destinataire2, ...\n" +" cc = cc1, cc2, ...\n" +" bcc = bcc1, bcc2, ...\n" +"\n" +"Après cela il vous sera possible d'utiliser la commande \"hg email\"\n" +"pour envoyer par courrier électronique une série de \"changesets\".\n" +"\n" +"Pour éviter d'envoyer des patchs prématurément, utiliser tout d'abord\n" +"l'option \"-n\" (simple test) s'avère être une bonne idée. Il vous\n" +"sera demandé l'adresse du destinataire ainsi qu'un sujet et un\n" +"message d'introduction pour la série de patchs. Lorsque tout est\n" +"prêt, les messages seront affichés. Si la variable d'environnement\n" +"PAGER a été définie, le programme qu'elle indique sera utilisé pour\n" +"l'affichage chaque message, permettant de vérifier que tout est\n" +"correct.\n" +"\n" +"L'option -m/--mbox est également très utile : au lieu que les\n" +"messages soient affichés ou envoyés directement, ils seront écrits\n" +"dans un fichier (au format de boîte aux lettres UNIX). Cette boîte\n" +"aux lettres peut alors être consultée pour vérification par n'importe\n" +"quel lecteur de courrier électronique comprenant le format UNIX mbox,\n" +"comme par exemple mutt :\n" +"\n" +" % mutt -R -f mbox\n" +"\n" +"Lors de votre vérification, vous pouvez envoyer chaque message en\n" +"utilisant formail (un outil généralement installé en même temps que\n" +"procmail) :\n" +"\n" +" % formail -s sendmail -bm -t < mbox\n" +"\n" +"Et voilà, vos patchs sont en route vers leur destination.\n" +"\n" +"Vous pouvez aussi configurer l'option \"method\" de la section\n" +"[email] pour utiliser un programme compatible avec sendmail, ou\n" +"alors remplir la section [smtp] de telle sorte que l'extension\n" +"patchbomb puisse automatiquement envoyer les messages depuis la\n" +"ligne de commande. Consulter les sections [email] et [smtp] dans la\n" +"page de manuel hgrc(5) pour plus de détails." + +msgid "Please enter a valid value.\n" +msgstr "Veuillez fournir une valeur valide.\n" + +msgid "does the diffstat above look okay? " +msgstr "le résumé des modifications ci-dessus semble-t-il correct ?" + +msgid "diffstat rejected" +msgstr "résumé des modifications rejeté" + +msgid "" +"send changesets by email\n" +"\n" +" 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.\n" +"\n" +" 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\".\n" +"\n" +" By default the patch is included as text in the email body for\n" +" easy reviewing. Using the -a/--attach option will instead create\n" +" an attachment for the patch. With -i/--inline an inline attachment\n" +" will be created.\n" +"\n" +" 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)\n" +"\n" +" With -b/--bundle, changesets are selected as for --outgoing, but a\n" +" single email containing a binary Mercurial bundle as an attachment\n" +" will be sent.\n" +"\n" +" Examples:\n" +"\n" +" 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" +" hg email 3000 # send patch 3000 (deprecated)\n" +"\n" +" hg email -o # send all patches not in default\n" +" hg email -o DEST # send all patches not in DEST\n" +" hg email -o -r 3000 # send all ancestors of 3000 not in default\n" +" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n" +"\n" +" 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 DEST # bundle of all ancestors of 3000 not in DEST\n" +"\n" +" 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 "" +"envoi de \"changesets\" par courrier électronique\n" +"\n" +" Par défaut, les modifications sont envoyées au format généré par\n" +" \"hg export\", une par message. La série débute par un message\n" +" la décrivant dans son ensemble, intitulé \"[PATCH 0 of N]\".\n" +"\n" +" Chaque courriel a pour sujet un résumé des modifications\n" +" apportées par le patch (pris en première ligne de la description\n" +" du \"changeset\"), préfixé par \"[PATCH M of N] \".\n" +" Le message est constitué de deux ou trois parties. D'abord,\n" +" le texte décrivant le \"changeset\". Puis, (optionnellement)\n" +" un résumé des modifications généré par le programme diffstat si\n" +" celui-ci est installé et que l'option -d/--diffstat a été\n" +" spécifiée. Et enfin le patch, tel que généré par \"hg export\".\n" +"\n" +" Par défaut le patch est inclus textuellement dans le corps du\n" +" message afin de faciliter les relectures et commentaires.\n" +" Cela peut être changé avec l'option -a/--attach qui crée une\n" +" pièce jointe séparée pour le patch, ou avec -i/--inline qui\n" +" insère celle-ci dans le corps.\n" +"\n" +" Avec -o/--outgoing, des courriels seront générés pour chaque\n" +" révision non trouvée dans le dépôt cible (ou seulement pour les\n" +" ancêtres des révisions spécifiées, le cas échéant).\n" +"\n" +" Avec -b/--bundle, les \"changesets\" sont sélectionnés de la\n" +" même manière que pour --outgoing, mais il seront envoyés via\n" +" un unique courriel dans un \"bundle\" Mercurial binaire joint.\n" +"\n" +" Exemples :\n" +"\n" +" hg email -r 3000 # envoyer uniquement le patch 3000\n" +" hg email -r 3000 -r 3001 # envoyer les patchs 3000 et 3001\n" +" hg email -r 3000:3005 # envoyer les patchs 3000 à 3005\n" +" hg email 3000 # envoyer le patch 3000 (déprécié)\n" +"\n" +" hg email -o # envoyer les patchs absents de la\n" +" destination par défaut\n" +" hg email -o DEST # envoyer les patchs absents de DEST\n" +" hg email -o -r 3000 # envoyer les ancêtres de 3000 absents\n" +" de la destination par défaut\n" +" hg email -o -r 3000 DEST # envoyer les ancêtres de 3000 absents\n" +" de DEST\n" +"\n" +" Afin de pouvoir utiliser cette commande, il est nécessaire\n" +" d'activer préalablement l'envoi de courriel dans le fichier\n" +" de configuration (hgrc). Consulter hgrc(5) à la section\n" +" [email] pour plus de détails.\n" +" " + +msgid "specify at least one changeset with -r or -o" +msgstr "veuillez spécifier au minimum un \"changeset\", à l'aide de -r ou -o" + +msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing" +msgstr "" +"ne pas spécifier --outgoing, qui est systématiquement activé lorsque --" +"bundle est utilisé" + +msgid "too many destinations" +msgstr "trop de destinations" + +msgid "use only one form to specify the revision" +msgstr "veuillez ne spécifier les révisions que d'une seule manière" + +msgid "" +"\n" +"Write the introductory message for the patch series.\n" +"\n" +msgstr "" +"\n" +"Veuillez écrire le message d'introduction de la série de patchs.\n" +"\n" + +#, python-format +msgid "" +"This patch series consists of %d patches.\n" +"\n" +msgstr "" +"Cette série comporte %d patchs.\n" +"\n" + +# diffstat sur l'ensemble des patchs +msgid "Final summary:\n" +msgstr "Résumé complet des modifications :\n" + +# mode --test +msgid "Displaying " +msgstr "Affichage de " + +# mode --mbox +msgid "Writing " +msgstr "Écriture de " + +# mode d'envoi par défaut +msgid "Sending " +msgstr "Envoi de " + +msgid "send patches as attachments" +msgstr "envoyer les patchs en tant que pièces jointes" + +msgid "send patches as inline attachments" +msgstr "envoyer les patchs comme pièces insérées dans le corps du message" + +msgid "email addresses of blind carbon copy recipients" +msgstr "adresses électroniques des destinataires en copie carbone invisible" + +msgid "email addresses of copy recipients" +msgstr "adresses électroniques des destinataires en copie carbone" + +msgid "add diffstat output to messages" +msgstr "ajouter un résumé des modifications avec diffstat dans les messages" + +msgid "use the given date as the sending date" +msgstr "utiliser la date fournie comme date d'envoi" + +msgid "use the given file as the series description" +msgstr "lire le message d'introduction à la série dans le fichier fourni" + +msgid "email address of sender" +msgstr "adresse électronique de l'expéditeur" + +msgid "print messages that would be sent" +msgstr "afficher les messages tels qu'ils seraient envoyés" + +msgid "write messages to mbox file instead of sending them" +msgstr "" +"écrire les messages dans un fichier au format \"mbox\" au lieu de les envoyer" + +msgid "subject of first message (intro or single patch)" +msgstr "sujet du premier message (intro ou patch unique)" + +msgid "message identifier to reply to" +msgstr "identifiant du message auquel répondre" + +msgid "email addresses of recipients" +msgstr "adresses électroniques des destinataires" + +msgid "omit hg patch header" +msgstr "omettre l'en-tête de patch spécifique à Mercurial" + +msgid "send changes not found in the target repository" +msgstr "envoyer les modifications non présentes dans le dépôt cible" + +msgid "send changes not in target as a binary bundle" +msgstr "" +"envoyer les modifications non présentes dans le dépôt cible sous forme de " +"\"bundle\" binaire" + +msgid "name of the bundle attachment file" +msgstr "nom à donner au fichier \"bundle\" envoyé" + +msgid "a revision to send" +msgstr "une révision à envoyer" + +msgid "run even when remote repository is unrelated (with -b/--bundle)" +msgstr "procéder même si le dépôt cible n'est pas apparenté (avec -b/--bundle)" + +msgid "a base changeset to specify instead of a destination (with -b/--bundle)" +msgstr "" +"un \"changeset\" à utiliser comme point de départ, au lieu d'une destination " +"(avec -b/--bundle)" + +msgid "send an introduction email for a single patch" +msgstr "envoyer un courriel d'introduction pour un patch seul" + +msgid "hg email [OPTION]... [DEST]..." +msgstr "hg email [OPTION]... [DEST]..." + +msgid "delete files not tracked from the working directory" +msgstr "" + +msgid "" +"removes files not tracked by Mercurial\n" +"\n" +" Delete files not known to Mercurial. This is useful to test local\n" +" and uncommitted changes in an otherwise-clean source tree.\n" +"\n" +" This means that purge will delete:\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\n" +" But it will leave untouched:\n" +" - Modified and unmodified tracked files\n" +" - Ignored files (unless --all is specified)\n" +" - New files added to the repository (with \"hg add\")\n" +"\n" +" If directories are given on the command line, only files in these\n" +" directories are considered.\n" +"\n" +" Be careful with purge, as you could irreversibly delete some files\n" +" you forgot to add to the repository. If you only want to print the\n" +" list of files that this program would delete, use the --print\n" +" option.\n" +" " +msgstr "" + +#, python-format +msgid "%s cannot be removed" +msgstr "" + +#, python-format +msgid "warning: %s\n" +msgstr "" + +#, python-format +msgid "Removing file %s\n" +msgstr "" + +#, python-format +msgid "Removing directory %s\n" +msgstr "" + +msgid "abort if an error occurs" +msgstr "" + +msgid "purge ignored files too" +msgstr "" + +msgid "print filenames instead of deleting them" +msgstr "" + +msgid "end filenames with NUL, for use with xargs (implies -p/--print)" +msgstr "" + +msgid "hg purge [OPTION]... [DIR]..." +msgstr "" + +msgid "" +"move sets of revisions to a different ancestor\n" +"\n" +"This extension lets you rebase changesets in an existing Mercurial\n" +"repository.\n" +"\n" +"For more information:\n" +"http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n" +msgstr "" + +msgid "first revision, do not change ancestor\n" +msgstr "" + +msgid "" +"move changeset (and descendants) to a different branch\n" +"\n" +" 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.\n" +"\n" +" If a rebase is interrupted to manually resolve a merge, it can be\n" +" continued with --continue/-c or aborted with --abort/-a.\n" +" " +msgstr "" + +msgid "cannot use both abort and continue" +msgstr "" + +msgid "cannot use collapse 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 "nothing to rebase\n" +msgstr "" + +msgid "cannot use both keepbranches and extrafn" +msgstr "" + +msgid "rebase merging completed\n" +msgstr "" + +msgid "warning: new changesets detected on source branch, not stripping\n" +msgstr "" + +msgid "rebase completed\n" +msgstr "" + +#, python-format +msgid "%d revisions have been skipped\n" +msgstr "" + +msgid " set parents\n" +msgstr "" + +#, python-format +msgid "rebasing %d:%s\n" +msgstr "" + +#, python-format +msgid " future parents are %d and %d\n" +msgstr "" + +#, python-format +msgid " update to %d:%s\n" +msgstr "" + +msgid " already in target\n" +msgstr "" + +#, python-format +msgid " merge against %d:%s\n" +msgstr "" + +msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" +msgstr "" + +msgid "resuming interrupted rebase\n" +msgstr "" + +#, python-format +msgid "no changes, revision %d skipped\n" +msgstr "" + +#, python-format +msgid "next revision set to %s\n" +msgstr "" + +#, python-format +msgid "cannot use revision %d as base, result would have 3 parents" +msgstr "" + +#, python-format +msgid "revision %d is an mq patch (%s), finalize it.\n" +msgstr "" + +#, python-format +msgid "import mq patch %d (%s)\n" +msgstr "" + +msgid "rebase status stored\n" +msgstr "" + +msgid "rebase status resumed\n" +msgstr "" + +msgid "no rebase in progress" +msgstr "" + +msgid "warning: new changesets detected on target branch, not stripping\n" +msgstr "" + +msgid "rebase aborted\n" +msgstr "" + +msgid "cannot rebase onto an applied mq patch" +msgstr "" + +msgid "cannot rebase an ancestor" +msgstr "" + +msgid "cannot rebase a descendant" +msgstr "" + +msgid "already working on current\n" +msgstr "" + +msgid "already working on the current branch\n" +msgstr "" + +#, python-format +msgid "rebase onto %d starting from %d\n" +msgstr "" + +msgid "unable to collapse, there is more than one external parent" +msgstr "" + +msgid "--update and --rebase are not compatible, ignoring the update flag\n" +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" +msgstr "" + +msgid "collapse the rebased revisions" +msgstr "" + +msgid "keep original revisions" +msgstr "" + +msgid "keep original branches" +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]" +msgstr "" + +msgid "interactively select which sets of changes to commit/qrefresh" +msgstr "" + +msgid "this modifies a binary file (all or nothing)\n" +msgstr "" + +msgid "this is a binary file\n" +msgstr "" + +#, python-format +msgid "%d hunks, %d lines changed\n" +msgstr "" + +msgid "[Ynsfdaq?]" +msgstr "" + +msgid "&Yes, record this change" +msgstr "" + +msgid "&No, skip this change" +msgstr "" + +msgid "&Skip remaining changes to this file" +msgstr "" + +msgid "Record remaining changes to this &file" +msgstr "" + +msgid "&Done, skip remaining changes and files" +msgstr "" + +msgid "Record &all changes to all remaining files" +msgstr "" + +msgid "&Quit, recording no changes" +msgstr "" + +msgid "&?" +msgstr "" + +msgid "y" +msgstr "" + +msgid "?" +msgstr "" + +msgid "y - record this change" +msgstr "" + +msgid "s" +msgstr "" + +msgid "f" +msgstr "" + +msgid "d" +msgstr "" + +msgid "a" +msgstr "" + +msgid "q" +msgstr "" + +msgid "user quit" +msgstr "" + +#, python-format +msgid "examine changes to %s?" +msgstr "" + +msgid " and " +msgstr "" + +#, python-format +msgid "record this change to %r?" +msgstr "" + +#, python-format +msgid "record change %d/%d to %r?" +msgstr "" + +msgid "" +"interactively select changes to commit\n" +"\n" +" If a list of files is omitted, all changes reported by \"hg status\"\n" +" will be candidates for recording.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +"\n" +" You will be prompted for whether to record changes to each\n" +" modified file, and for files with multiple changes, for each\n" +" change to use. For each query, the following responses are\n" +" possible:\n" +"\n" +" y - record this change\n" +" n - skip this change\n" +"\n" +" s - skip remaining changes to this file\n" +" f - record remaining changes to this file\n" +"\n" +" d - done, skip remaining changes and files\n" +" a - record all changes to all remaining files\n" +" q - quit, recording no changes\n" +"\n" +" ? - display help" +msgstr "" + +msgid "'mq' extension not loaded" +msgstr "" + +msgid "running non-interactively, use commit instead" +msgstr "" + +msgid "no changes to record\n" +msgstr "" + +#, python-format +msgid "backup %r as %r\n" +msgstr "" + +msgid "applying patch\n" +msgstr "" + +msgid "patch failed to apply" +msgstr "" + +#, python-format +msgid "restoring %r to %r\n" +msgstr "" + +msgid "hg record [OPTION]... [FILE]..." +msgstr "" + +msgid "hg qrecord [OPTION]... PATCH [FILE]..." +msgstr "" + +msgid "share a common history between several working directories" +msgstr "" + +msgid "" +"create a new shared repository (experimental)\n" +"\n" +" Initialize a new repository and working directory that shares its\n" +" history with another repository.\n" +"\n" +" NOTE: actions that change history such as rollback or moving the\n" +" source may confuse sharers.\n" +" " +msgstr "" + +msgid "do not create a working copy" +msgstr "" + +msgid "[-U] SOURCE [DEST]" +msgstr "" + +msgid "" +"transplant changesets from another branch\n" +"\n" +"This extension allows you to transplant patches from another branch.\n" +"\n" +"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 "" + +#, python-format +msgid "skipping already applied revision %s\n" +msgstr "" + +#, python-format +msgid "skipping merge changeset %s:%s\n" +msgstr "" + +#, python-format +msgid "%s merged at %s\n" +msgstr "" + +#, python-format +msgid "%s transplanted to %s\n" +msgstr "" + +#, python-format +msgid "filtering %s\n" +msgstr "" + +msgid "filter failed" +msgstr "" + +msgid "can only omit patchfile if merging" +msgstr "" + +#, python-format +msgid "%s: empty changeset" +msgstr "" + +msgid "Fix up the merge and run hg transplant --continue" +msgstr "" + +#, python-format +msgid "%s transplanted as %s\n" +msgstr "" + +msgid "transplant log file is corrupt" +msgstr "" + +#, python-format +msgid "working dir not at transplant parent %s" +msgstr "" + +msgid "commit failed" +msgstr "" + +msgid "apply changeset? [ynmpcq?]:" +msgstr "" + +msgid "" +"transplant changesets from another branch\n" +"\n" +" Selected changesets will be applied on top of the current working\n" +" directory with the log of the original changeset. If --log is\n" +" specified, log messages will have a comment appended of the form:\n" +"\n" +" (transplanted from CHANGESETHASH)\n" +"\n" +" You can rewrite the changelog message with the --filter option.\n" +" Its argument will be invoked with the current changelog message as\n" +" $1 and the patch as $2.\n" +"\n" +" If --source/-s is specified, selects changesets from the named\n" +" repository. If --branch/-b is specified, selects changesets from\n" +" the branch holding the named revision, up to that revision. If\n" +" --all/-a is specified, all changesets on the branch will be\n" +" transplanted, otherwise you will be prompted to select the\n" +" changesets you want.\n" +"\n" +" hg transplant --branch REVISION --all will rebase the selected\n" +" branch (up to the named revision) onto your current working\n" +" directory.\n" +"\n" +" You can optionally mark selected transplanted changesets as merge\n" +" changesets. You will not be prompted to transplant any ancestors\n" +" of a merged transplant, and you can merge descendants of them\n" +" normally instead of transplanting them.\n" +"\n" +" If no merges or revisions are provided, hg transplant will start\n" +" an interactive changeset browser.\n" +"\n" +" 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" +" " +msgstr "" + +msgid "--continue is incompatible with branch, all or merge" +msgstr "" + +msgid "no source URL, branch tag or revision list provided" +msgstr "" + +msgid "--all requires a branch revision" +msgstr "" + +msgid "--all is incompatible with a revision list" +msgstr "" + +msgid "no revision checked out" +msgstr "" + +msgid "outstanding uncommitted merges" +msgstr "" + +msgid "outstanding local changes" +msgstr "" + +msgid "pull patches from REPOSITORY" +msgstr "" + +msgid "pull patches from branch BRANCH" +msgstr "" + +msgid "pull all changesets up to BRANCH" +msgstr "" + +msgid "skip over REV" +msgstr "" + +msgid "merge at REV" +msgstr "" + +msgid "append transplant info to log message" +msgstr "" + +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]..." +msgstr "" + +msgid "" +"allow the use of MBCS paths with problematic encoding\n" +"\n" +"Some MBCS encodings are not good for some path operations (i.e.\n" +"splitting path, case conversion, etc.) with its encoded bytes. We call\n" +"such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n" +"This extension can be used to fix the issue with those encodings by\n" +"wrapping some functions to convert to Unicode string before path\n" +"operation.\n" +"\n" +"This extension is useful for:\n" +" * Japanese Windows users using shift_jis encoding.\n" +" * Chinese Windows users using big5 encoding.\n" +" * All users who use a repository with one of problematic encodings on\n" +" case-insensitive file system.\n" +"\n" +"This extension is not needed for:\n" +" * Any user who use only ASCII chars in path.\n" +" * Any user who do not use any of problematic encodings.\n" +"\n" +"Note that there are some limitations on using this extension:\n" +" * You should use single encoding in one repository.\n" +" * You should set same encoding for the repository by locale or\n" +" HGENCODING.\n" +"\n" +"Path encoding conversion are done between Unicode and\n" +"encoding.encoding which is decided by Mercurial from current locale\n" +"setting or HGENCODING.\n" +msgstr "" + +#, python-format +msgid "[win32mbcs] filename conversion fail with %s encoding\n" +msgstr "" + +msgid "[win32mbcs] cannot activate on this platform.\n" +msgstr "" + +#, python-format +msgid "[win32mbcs] activated with encoding: %s\n" +msgstr "" + +msgid "" +"perform automatic newline conversion\n" +"\n" +"To perform automatic newline conversion, use:\n" +"\n" +"[extensions]\n" +"hgext.win32text =\n" +"[encode]\n" +"** = cleverencode:\n" +"# or ** = macencode:\n" +"\n" +"[decode]\n" +"** = cleverdecode:\n" +"# or ** = macdecode:\n" +"\n" +"If not doing conversion, to make sure you do not commit CRLF/CR by " +"accident:\n" +"\n" +"[hooks]\n" +"pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n" +"# or pretxncommit.cr = python:hgext.win32text.forbidcr\n" +"\n" +"To do the same check on a server to prevent CRLF/CR from being\n" +"pushed or pulled:\n" +"\n" +"[hooks]\n" +"pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n" +"# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n" +msgstr "" + +#, python-format +msgid "" +"WARNING: %s already has %s line endings\n" +"and does not need EOL conversion by the win32text plugin.\n" +"Before your next commit, please reconsider your encode/decode settings in \n" +"Mercurial.ini or %s.\n" +msgstr "" + +#, python-format +msgid "Attempt to commit or push text file(s) using %s line endings\n" +msgstr "" + +#, python-format +msgid "in %s: %s\n" +msgstr "" + +#, python-format +msgid "" +"\n" +"To prevent this mistake in your local repository,\n" +"add to Mercurial.ini or .hg/hgrc:\n" +"\n" +"[hooks]\n" +"pretxncommit.%s = python:hgext.win32text.forbid%s\n" +"\n" +"and also consider adding:\n" +"\n" +"[extensions]\n" +"hgext.win32text =\n" +"[encode]\n" +"** = %sencode:\n" +"[decode]\n" +"** = %sdecode:\n" +msgstr "" + +msgid "" +"discover and advertise repositories on the local network\n" +"\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.\n" +"\n" +"To allow other people to discover your repository using run \"hg serve\"\n" +"in your repository.\n" +"\n" +" $ cd test\n" +" $ hg serve\n" +"\n" +"You can discover zeroconf enabled repositories by running \"hg paths\".\n" +"\n" +" $ hg paths\n" +" zc-test = http://example.com:8000/test\n" +msgstr "" + +msgid "archive prefix contains illegal components" +msgstr "" + +msgid "cannot give prefix when archiving to files" +msgstr "" + +#, python-format +msgid "unknown archive type '%s'" +msgstr "" + +msgid "invalid changegroup" +msgstr "" + +msgid "unknown parent" +msgstr "" + +#, python-format +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 "" + +#, python-format +msgid "premature EOF reading chunk (got %d bytes, expected %d)" +msgstr "" + +msgid "empty username" +msgstr "" + +#, python-format +msgid "username %s contains a newline" +msgstr "" + +msgid "options --message and --logfile are mutually exclusive" +msgstr "" + +#, python-format +msgid "can't read commit message '%s': %s" +msgstr "" + +msgid "limit must be a positive integer" +msgstr "" + +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 "" + +#, python-format +msgid "removing %s\n" +msgstr "" + +#, python-format +msgid "recording removal of %s as rename to %s (%d%% similar)\n" +msgstr "" + +#, python-format +msgid "%s: not copying - file is not managed\n" +msgstr "" + +#, python-format +msgid "%s: not copying - file has been marked for remove\n" +msgstr "" + +#, python-format +msgid "%s: not overwriting - %s collides with %s\n" +msgstr "" + +#, python-format +msgid "%s: not overwriting - file exists\n" +msgstr "" + +#, python-format +msgid "%s: deleted in working copy\n" +msgstr "" + +#, python-format +msgid "%s: cannot copy - %s\n" +msgstr "" + +#, python-format +msgid "moving %s to %s\n" +msgstr "" + +#, 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 "" + +msgid "no source or destination specified" +msgstr "" + +msgid "no destination specified" +msgstr "" + +msgid "with multiple sources, destination must be an existing directory" +msgstr "" + +#, python-format +msgid "destination %s is not a directory" +msgstr "" + +msgid "no files to copy" +msgstr "" + +msgid "(consider using --after)\n" +msgstr "" + +#, python-format +msgid "changeset: %d:%s\n" +msgstr "" + +#, python-format +msgid "branch: %s\n" +msgstr "" + +#, python-format +msgid "tag: %s\n" +msgstr "" + +#, python-format +msgid "parent: %d:%s\n" +msgstr "" + +#, python-format +msgid "manifest: %d:%s\n" +msgstr "" + +#, python-format +msgid "user: %s\n" +msgstr "" + +#, python-format +msgid "date: %s\n" +msgstr "" + +msgid "files+:" +msgstr "" + +msgid "files-:" +msgstr "" + +msgid "files:" +msgstr "" + +#, python-format +msgid "files: %s\n" +msgstr "" + +#, python-format +msgid "copies: %s\n" +msgstr "" + +#, python-format +msgid "extra: %s=%s\n" +msgstr "" + +msgid "description:\n" +msgstr "" + +#, python-format +msgid "summary: %s\n" +msgstr "" + +#, 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 "" + +msgid "revision matching date not found" +msgstr "" + +#, python-format +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 "" + +msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." +msgstr "" + +msgid "HG: Leave message empty to abort commit." +msgstr "" + +#, python-format +msgid "HG: user: %s" +msgstr "" + +msgid "HG: branch merge" +msgstr "" + +#, python-format +msgid "HG: branch '%s'" +msgstr "" + +#, python-format +msgid "HG: added %s" +msgstr "" + +#, python-format +msgid "HG: changed %s" +msgstr "" + +#, python-format +msgid "HG: removed %s" +msgstr "" + +msgid "HG: no files changed" +msgstr "" + +msgid "empty commit message" +msgstr "" + +msgid "" +"add the specified files on the next commit\n" +"\n" +" Schedule files to be version controlled and added to the\n" +" repository.\n" +"\n" +" The files will be added to the repository at the next commit. To\n" +" undo an add before that, see hg forget.\n" +"\n" +" If no names are given, add all files to the repository.\n" +" " +msgstr "" + +msgid "" +"add all new files, delete all missing files\n" +"\n" +" Add all new files and remove all missing files from the\n" +" repository.\n" +"\n" +" 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" +" commit.\n" +"\n" +" Use the -s/--similarity option to detect renamed files. With a\n" +" parameter > 0, this compares every removed file with every added\n" +" file and records those similar enough as renames. This option\n" +" takes a percentage between 0 (disabled) and 100 (files must be\n" +" identical) as its parameter. Detecting renamed files this way can\n" +" be expensive.\n" +" " +msgstr "" + +msgid "similarity must be a number" +msgstr "" + +msgid "similarity must be between 0 and 100" +msgstr "" + +msgid "" +"show changeset information by line for each file\n" +"\n" +" List changes in files, showing the revision id responsible for\n" +" each line\n" +"\n" +" This command is useful for discovering when a change was made and\n" +" by whom.\n" +"\n" +" 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 "" + +msgid "at least one filename or pattern is required" +msgstr "" + +msgid "at least one of -n/-c is required for -l" +msgstr "" + +#, python-format +msgid "%s: binary file\n" +msgstr "" + +msgid "" +"create an unversioned archive of a repository revision\n" +"\n" +" By default, the revision used is the parent of the working\n" +" directory; use -r/--rev to specify a different revision.\n" +"\n" +" To specify the type of archive to create, use -t/--type. Valid\n" +" types are:\n" +"\n" +" \"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\n" +"\n" +" The exact name of the destination archive or directory is given\n" +" using a format string; see 'hg help export' for details.\n" +"\n" +" 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 "" + +msgid "no working directory: please specify a revision" +msgstr "" + +msgid "repository root cannot be destination" +msgstr "" + +msgid "cannot archive plain files to stdout" +msgstr "" + +msgid "" +"reverse effect of earlier changeset\n" +"\n" +" Commit the backed out changes as a new changeset. The new\n" +" changeset is a child of the backed out changeset.\n" +"\n" +" 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.\n" +"\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.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" + +msgid "please specify just one revision" +msgstr "" + +msgid "please specify a revision to backout" +msgstr "" + +msgid "cannot backout change on a different branch" +msgstr "" + +msgid "cannot backout a change with no parents" +msgstr "" + +msgid "cannot backout a merge changeset without --parent" +msgstr "" + +#, python-format +msgid "%s is not a parent of %s" +msgstr "" + +msgid "cannot use --parent on non-merge changeset" +msgstr "" + +#, python-format +msgid "Backed out changeset %s" +msgstr "" + +#, python-format +msgid "changeset %s backs out changeset %s\n" +msgstr "" + +#, python-format +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\n" +"\n" +" 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.\n" +"\n" +" As a shortcut, you can also use the revision argument to mark a\n" +" revision as good or bad without checking it out first.\n" +"\n" +" 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 "" + +msgid "The first good revision is:\n" +msgstr "" + +msgid "The first bad revision is:\n" +msgstr "" + +msgid "Due to skipped revisions, the first good revision could be any of:\n" +msgstr "" + +msgid "Due to skipped revisions, the first bad revision could be any of:\n" +msgstr "" + +msgid "cannot bisect (no known good revisions)" +msgstr "" + +msgid "cannot bisect (no known bad revisions)" +msgstr "" + +msgid "(use of 'hg bisect <cmd>' is deprecated)\n" +msgstr "" + +msgid "incompatible arguments" +msgstr "" + +#, python-format +msgid "cannot find executable: %s" +msgstr "" + +#, python-format +msgid "failed to execute %s" +msgstr "" + +#, python-format +msgid "%s killed" +msgstr "" + +#, python-format +msgid "Changeset %d:%s: %s\n" +msgstr "" + +#, python-format +msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n" +msgstr "" + +msgid "" +"set or show the current branch name\n" +"\n" +" 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.\n" +"\n" +" Unless -f/--force is specified, branch will not let you set a\n" +" branch name that already exists, even if it's inactive.\n" +"\n" +" 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.\n" +"\n" +" Use the command 'hg update' to switch to an existing branch.\n" +" " +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 "" + +#, python-format +msgid "marked working directory as branch %s\n" +msgstr "" + +msgid "" +"list repository named branches\n" +"\n" +" List the repository's named branches, indicating which ones are\n" +" inactive. If active is specified, only show active branches.\n" +"\n" +" A branch is considered active if it contains repository heads.\n" +"\n" +" Use the command 'hg update' to switch to an existing branch.\n" +" " +msgstr "" + +msgid "" +"create a changegroup file\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).\n" +"\n" +" To change the compression method applied, use the -t/--type\n" +" option. The available compression methods are: none, bzip2, and\n" +" gzip (by default, bundles are compressed using bzip2).\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" +" " +msgstr "" + +msgid "--base is incompatible with specifying a destination" +msgstr "" + +msgid "unknown bundle type specified with --type" +msgstr "" + +msgid "" +"output the current or given revision of files\n" +"\n" +" 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.\n" +"\n" +" 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:\n" +"\n" +" %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 "" + +msgid "" +"make a copy of an existing 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" +" " +msgstr "" + +msgid "" +"commit the specified files or all outstanding changes\n" +"\n" +" 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.\n" +"\n" +" If a list of files is omitted, all changes reported by \"hg status\"\n" +" will be committed.\n" +"\n" +" If you are committing the result of a merge, do not provide any\n" +" filenames or -I/-X filters.\n" +"\n" +" If no commit message is specified, the configured editor is\n" +" started to prompt you for a message.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" + +msgid "created new head\n" +msgstr "" + +#, python-format +msgid "committed changeset %d:%s\n" +msgstr "" + +msgid "" +"mark files as copied for the next commit\n" +"\n" +" 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.\n" +"\n" +" 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.\n" +"\n" +" This command takes effect with the next commit. To undo a copy\n" +" before that, see hg revert.\n" +" " +msgstr "" + +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 "returns the completion list associated with the given command" +msgstr "" + +msgid "rebuild the dirstate as it would look like for the given revision" +msgstr "" + +msgid "validate the correctness of the current dirstate" +msgstr "" + +#, python-format +msgid "%s in state %s, but not in manifest1\n" +msgstr "" + +#, python-format +msgid "%s in state %s, but also in manifest1\n" +msgstr "" + +#, python-format +msgid "%s in state %s, but not in either manifest\n" +msgstr "" + +#, python-format +msgid "%s in manifest1, but listed as state %s" +msgstr "" + +msgid ".hg/dirstate inconsistent with current parent's manifest" +msgstr "" + +msgid "" +"show combined config settings from all hgrc files\n" +"\n" +" With no arguments, print names and values of all config items.\n" +"\n" +" With one argument of the form section.name, print just the value\n" +" of that config item.\n" +"\n" +" With multiple arguments, print names and values of all config\n" +" items with matching section names.\n" +"\n" +" With --debug, the source (filename and line number) is printed\n" +" for each config item.\n" +" " +msgstr "" + +msgid "only one config item permitted" +msgstr "" + +msgid "" +"manually set the parents of the current working directory\n" +"\n" +" This is useful for writing repository conversion tools, but should\n" +" be used with care.\n" +" " +msgstr "" + +msgid "show the contents of the current dirstate" +msgstr "" + +#, python-format +msgid "copy: %s -> %s\n" +msgstr "" + +msgid "dump the contents of a data file revision" +msgstr "" + +#, python-format +msgid "invalid revision identifier %s" +msgstr "" + +msgid "parse and display a date" +msgstr "" + +msgid "dump the contents of an index file" +msgstr "" + +msgid "dump an index DAG as a graphviz dot file" +msgstr "" + +msgid "test Mercurial installation" +msgstr "" + +#, python-format +msgid "Checking encoding (%s)...\n" +msgstr "" + +msgid " (check that your locale is properly set)\n" +msgstr "" + +msgid "Checking extensions...\n" +msgstr "" + +msgid " One or more extensions could not be found" +msgstr "" + +msgid " (check that you compiled the extensions)\n" +msgstr "" + +msgid "Checking templates...\n" +msgstr "" + +msgid " (templates seem to have been installed incorrectly)\n" +msgstr "" + +msgid "Checking patch...\n" +msgstr "" + +msgid " patch call failed:\n" +msgstr "" + +msgid " unexpected patch output!\n" +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://www.selenic." +"com/mercurial/bts\n" +msgstr "" + +msgid "Checking commit editor...\n" +msgstr "" + +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 "" + +#, python-format +msgid " Can't find editor '%s' in PATH\n" +msgstr "" + +msgid "Checking username...\n" +msgstr "" + +msgid " (specify a username in your .hgrc file)\n" +msgstr "" + +msgid "No problems detected\n" +msgstr "" + +#, python-format +msgid "%s problems detected, please check your install!\n" +msgstr "" + +msgid "dump rename information" +msgstr "" + +#, python-format +msgid "%s renamed from %s:%s\n" +msgstr "" + +#, python-format +msgid "%s not renamed\n" +msgstr "" + +msgid "show how files match on given patterns" +msgstr "" + +msgid "" +"diff repository (or selected files)\n" +"\n" +" Show differences between revisions for the specified files.\n" +"\n" +" Differences between files are shown using the unified diff format.\n" +"\n" +" 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.\n" +"\n" +" When two revision arguments are given, then changes are shown\n" +" between those revisions. If only one revision is specified then\n" +" that revision is compared to the working directory, and, when no\n" +" revisions are specified, the working directory files are compared\n" +" to its parent.\n" +"\n" +" 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.\n" +"\n" +" Use the -g/--git option to generate diffs in the git extended diff\n" +" format. For more information, read 'hg help diffs'.\n" +" " +msgstr "" + +msgid "" +"dump the header and diffs for one or more changesets\n" +"\n" +" Print the changeset header and diffs for one or more revisions.\n" +"\n" +" The information shown in the changeset header is: author,\n" +" changeset hash, parent(s) and commit comment.\n" +"\n" +" NOTE: export may generate unexpected diff output for merge\n" +" changesets, as it will compare the merge changeset against its\n" +" first parent only.\n" +"\n" +" 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:\n" +"\n" +" %% 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\n" +"\n" +" 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.\n" +"\n" +" Use the -g/--git option to generate diffs in the git extended diff\n" +" format. See 'hg help diffs' for more information.\n" +"\n" +" With the --switch-parent option, the diff will be against the\n" +" second parent. It can be useful to review a merge.\n" +" " +msgstr "" + +msgid "export requires at least one changeset" +msgstr "" + +msgid "exporting patches:\n" +msgstr "" + +msgid "exporting patch:\n" +msgstr "" + +msgid "" +"forget the specified files on the next commit\n" +"\n" +" Mark the specified files so they will no longer be tracked\n" +" after the next commit.\n" +"\n" +" This only removes files from the current branch, not from the\n" +" entire project history, and it does not delete them from the\n" +" working directory.\n" +"\n" +" To undo a forget before the next commit, see hg add.\n" +" " +msgstr "" + +msgid "no files specified" +msgstr "" + +#, python-format +msgid "not removing %s: file is already untracked\n" +msgstr "" + +msgid "" +"search for a pattern in specified files and revisions\n" +"\n" +" Search revisions of files for a regular expression.\n" +"\n" +" 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.\n" +"\n" +" 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" +" " +msgstr "" + +#, python-format +msgid "grep: invalid match pattern: %s\n" +msgstr "" + +msgid "" +"show current repository heads or show 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" +" " +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 "" + +msgid "" +"show help for a given topic or a help overview\n" +"\n" +" With no arguments, print a list of commands with short help messages.\n" +"\n" +" Given a topic, extension, or command name, print help for that\n" +" topic." +msgstr "" + +msgid "global options:" +msgstr "options globales :" + +msgid "use \"hg help\" for the full list of commands" +msgstr "utiliser \"hg help\" pour la liste complète des commandes" + +msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details" +msgstr "" +"utiliser \"hg help\" pour la liste complète des commandes ou \"hg -v\" pour " +"plus de détails" + +# la chaîne passée est préfixée par un espace +#, python-format +msgid "use \"hg -v help%s\" to show aliases and global options" +msgstr "" +"utiliser \"hg -v help%s\" pour afficher les alias et les options globales" + +#, python-format +msgid "use \"hg -v help %s\" to show global options" +msgstr "utiliser \"hg -v help %s\" pour afficher les options globales" + +msgid "" +"list of commands:\n" +"\n" +msgstr "" +"liste des commandes :\n" +"\n" + +#, python-format +msgid "" +"\n" +"aliases: %s\n" +msgstr "" +"\n" +"alias : %s\n" + +msgid "(no help text available)" +msgstr "(pas d'aide disponible)" + +msgid "options:\n" +msgstr "options :\n" + +msgid "no commands defined\n" +msgstr "pas de commandes définies\n" + +msgid "enabled extensions:" +msgstr "extensions activées :" + +msgid "no help text available" +msgstr "pas d'aide disponible" + +#, python-format +msgid "%s extension - %s\n" +msgstr "extension %s - %s\n" + +msgid "Mercurial Distributed SCM\n" +msgstr "Mercurial, système de gestion de sources distribué\n" + +msgid "" +"basic commands:\n" +"\n" +msgstr "" +"commandes de base :\n" +"\n" + +msgid "" +"\n" +"additional help topics:\n" +"\n" +msgstr "" +"\n" +"sujets d'aide supplémentaires :\n" +"\n" + +msgid "" +"identify the working copy or specified revision\n" +"\n" +" With no revision, print a summary of the current state of the\n" +" repository.\n" +"\n" +" Specifying a path to a repository root or Mercurial bundle will\n" +" cause lookup to operate on that repository/bundle.\n" +"\n" +" 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 "" + +msgid "" +"import an ordered set of patches\n" +"\n" +" Import a list of patches and commit them individually.\n" +"\n" +" If there are outstanding changes in the working directory, import\n" +" will abort unless given the -f/--force flag.\n" +"\n" +" 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.\n" +"\n" +" 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.\n" +"\n" +" 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.\n" +"\n" +" With -s/--similarity, hg will attempt to discover renames and\n" +" copies in the patch in the same way as 'addremove'.\n" +"\n" +" 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" +" " +msgstr "" + +msgid "applying patch from stdin\n" +msgstr "" + +msgid "no diffs found" +msgstr "" + +#, python-format +msgid "" +"message:\n" +"%s\n" +msgstr "" + +msgid "not a Mercurial patch" +msgstr "" + +msgid "patch is damaged or loses information" +msgstr "" + +msgid "" +"show new changesets found in source\n" +"\n" +" 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.\n" +"\n" +" For remote repository, using --bundle avoids downloading the\n" +" changesets twice if the incoming is followed by a pull.\n" +"\n" +" See pull for valid source format details.\n" +" " +msgstr "" + +msgid "" +"create a new repository in the given directory\n" +"\n" +" Initialize a new repository in the given directory. If the given\n" +" directory does not exist, it will be created.\n" +"\n" +" If no directory is given, the current directory is used.\n" +"\n" +" It is possible to specify an ssh:// URL as the destination.\n" +" See 'hg help urls' for more information.\n" +" " +msgstr "" + +msgid "" +"locate files matching specific patterns\n" +"\n" +" Print files under Mercurial control in the working directory whose\n" +" names match the given patterns.\n" +"\n" +" By default, this command searches all directories in the working\n" +" directory. To search just the current directory and its\n" +" subdirectories, use \"--include .\".\n" +"\n" +" If no patterns are given to match, this command prints the names\n" +" of all files under Mercurial control in the working directory.\n" +"\n" +" 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 "" + +msgid "" +"show revision history of entire repository or files\n" +"\n" +" Print the revision history of the specified files or the entire\n" +" project.\n" +"\n" +" 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.\n" +"\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.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +"\n" +" 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.\n" +"\n" +" 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 "" + +msgid "" +"output the current or given revision of the project manifest\n" +"\n" +" 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.\n" +"\n" +" With -v, print file permissions, symlink and executable bits.\n" +" With --debug, print file revision hashes.\n" +" " +msgstr "" + +msgid "" +"merge working directory with another revision\n" +"\n" +" The current working directory is updated with all changes made in\n" +" the requested revision since the last common predecessor revision.\n" +"\n" +" 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.\n" +"\n" +" 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 "" + +#, 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 "" + +msgid "there is nothing to merge" +msgstr "" + +#, python-format +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\n" +"\n" +" 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.\n" +"\n" +" See pull for valid destination format details.\n" +" " +msgstr "" + +msgid "" +"show the parents of the working directory or revision\n" +"\n" +" 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 "" + +msgid "can only specify an explicit filename" +msgstr "" + +#, python-format +msgid "'%s' not found in manifest!" +msgstr "" + +msgid "" +"show aliases for remote repositories\n" +"\n" +" Show definition of symbolic path name NAME. If no name is given,\n" +" show definition of all available names.\n" +"\n" +" 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.\n" +"\n" +" See 'hg help urls' for more information.\n" +" " +msgstr "" + +msgid "not found!\n" +msgstr "" + +msgid "not updating, since new heads added\n" +msgstr "" + +msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n" +msgstr "" + +msgid "(run 'hg update' to get a working copy)\n" +msgstr "" + +msgid "" +"pull changes from the specified source\n" +"\n" +" Pull changes from a remote repository to a local one.\n" +"\n" +" 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.\n" +"\n" +" 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.\n" +"\n" +" If SOURCE is omitted, the 'default' path will be used.\n" +" See 'hg help urls' for more information.\n" +" " +msgstr "" + +msgid "" +"push changes to the specified destination\n" +"\n" +" Push changes from the local repository to the given destination.\n" +"\n" +" 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.\n" +"\n" +" 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.\n" +"\n" +" If -r/--rev is used, the named revision and all its ancestors will\n" +" be pushed to the remote repository.\n" +"\n" +" Please see 'hg help urls' for important details about ssh://\n" +" URLs. If DESTINATION is omitted, a default path will be used.\n" +" " +msgstr "" + +#, python-format +msgid "pushing to %s\n" +msgstr "" + +msgid "" +"roll back an interrupted transaction\n" +"\n" +" Recover from an interrupted commit or pull.\n" +"\n" +" This command tries to fix the repository status after an\n" +" interrupted operation. It should only be necessary when Mercurial\n" +" suggests it.\n" +" " +msgstr "" + +msgid "" +"remove the specified files on the next commit\n" +"\n" +" Schedule the indicated files for removal from the repository.\n" +"\n" +" 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.\n" +"\n" +" 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).\n" +"\n" +" 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\n" +"\n" +" This command schedules the files to be removed at the next commit.\n" +" To undo a remove before that, see hg revert.\n" +" " +msgstr "" + +#, 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" +msgstr "" + +msgid "" +"rename files; equivalent of copy + remove\n" +"\n" +" 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.\n" +"\n" +" 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.\n" +"\n" +" This command takes effect at the next commit. To undo a rename\n" +" before that, see hg revert.\n" +" " +msgstr "" + +msgid "" +"retry file merges from a merge or 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 "" + +msgid "can't specify --all and patterns" +msgstr "" + +msgid "no files or directories specified; use --all to remerge all files" +msgstr "" + +msgid "" +"restore individual files or directories to an earlier state\n" +"\n" +" (Use update -r to check out earlier revisions, revert does not\n" +" change the working directory parents.)\n" +"\n" +" 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.\n" +"\n" +" 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.\n" +"\n" +" 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.\n" +"\n" +" If a file has been deleted, it is restored. If the executable mode\n" +" of a file was changed, it is reset.\n" +"\n" +" If names are given, all files matching the names are reverted.\n" +" If no arguments are given, no files are reverted.\n" +"\n" +" Modified files are saved with a .orig suffix before reverting.\n" +" To disable these backups, use --no-backup.\n" +" " +msgstr "" + +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 "" + +#, python-format +msgid "forgetting %s\n" +msgstr "" + +#, python-format +msgid "reverting %s\n" +msgstr "" + +#, python-format +msgid "undeleting %s\n" +msgstr "" + +#, python-format +msgid "saving current version of %s as %s\n" +msgstr "" + +#, python-format +msgid "file not managed: %s\n" +msgstr "" + +#, python-format +msgid "no changes needed to %s\n" +msgstr "" + +msgid "" +"roll back the last transaction\n" +"\n" +" 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. This command does not alter\n" +" the working directory.\n" +"\n" +" 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:\n" +"\n" +" commit\n" +" import\n" +" pull\n" +" push (with this repository as destination)\n" +" unbundle\n" +"\n" +" 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" +" " +msgstr "" + +msgid "" +"print the root (top) of the current working directory\n" +"\n" +" Print the root directory of the current repository.\n" +" " +msgstr "" + +msgid "" +"export the repository via HTTP\n" +"\n" +" Start a local HTTP repository browser and pull server.\n" +"\n" +" 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 "" + +#, python-format +msgid "listening at http://%s%s/%s (bound to %s:%d)\n" +msgstr "" + +msgid "" +"show changed files in the 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" +" " +msgstr "" + +msgid "" +"add one or more tags for the current or given revision\n" +"\n" +" Name a particular revision using <name>.\n" +"\n" +" 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.\n" +"\n" +" If no revision is given, the parent of the working directory is\n" +" used, or tip if no revision is checked out.\n" +"\n" +" 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).\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" + +msgid "tag names must be unique" +msgstr "" + +#, python-format +msgid "the name '%s' is reserved" +msgstr "" + +msgid "--rev and --remove are incompatible" +msgstr "" + +#, python-format +msgid "tag '%s' does not exist" +msgstr "" + +#, python-format +msgid "tag '%s' is not a global tag" +msgstr "" + +#, python-format +msgid "tag '%s' is not a local tag" +msgstr "" + +#, python-format +msgid "Removed tag %s" +msgstr "" + +#, python-format +msgid "tag '%s' already exists (use -f to force)" +msgstr "" + +#, python-format +msgid "Added tag %s for changeset %s" +msgstr "" + +msgid "" +"list repository tags\n" +"\n" +" 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 "" + +msgid "" +"show the tip revision\n" +"\n" +" 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).\n" +"\n" +" 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 "" + +msgid "" +"apply one or more changegroup files\n" +"\n" +" Apply one or more compressed changegroup files generated by the\n" +" bundle command.\n" +" " +msgstr "" + +msgid "" +"update working directory\n" +"\n" +" 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').\n" +"\n" +" 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.\n" +"\n" +" 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.\n" +"\n" +" 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.\n" +"\n" +" If you want to update just one file to an older revision, use\n" +" revert.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" " +msgstr "" + +msgid "uncommitted local changes" +msgstr "" + +msgid "" +"verify the integrity of the repository\n" +"\n" +" Verify the integrity of the current repository.\n" +"\n" +" 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 "" + +msgid "output version and copyright information" +msgstr "" + +#, python-format +msgid "Mercurial Distributed SCM (version %s)\n" +msgstr "" + +msgid "" +"\n" +"Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> 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 "" + +msgid "repository root directory or symbolic path name" +msgstr "" + +msgid "change working directory" +msgstr "" + +msgid "do not prompt, assume 'yes' for any required answers" +msgstr "" + +msgid "suppress output" +msgstr "" + +msgid "enable additional output" +msgstr "" + +msgid "set/override config option" +msgstr "" + +msgid "enable debugging output" +msgstr "" + +msgid "start debugger" +msgstr "" + +msgid "set the charset encoding" +msgstr "" + +msgid "set the charset encoding mode" +msgstr "" + +msgid "print traceback on exception" +msgstr "" + +msgid "time how long the command takes" +msgstr "" + +msgid "print command execution profile" +msgstr "" + +msgid "output version information and exit" +msgstr "" + +msgid "display help and exit" +msgstr "" + +msgid "do not perform actions, just print output" +msgstr "" + +msgid "specify ssh command to use" +msgstr "" + +msgid "specify hg command to run on the remote side" +msgstr "" + +msgid "include names matching the given patterns" +msgstr "" + +msgid "exclude names matching the given patterns" +msgstr "" + +msgid "use <text> as commit message" +msgstr "" + +msgid "read commit message from <file>" +msgstr "" + +msgid "record datecode as commit date" +msgstr "" + +msgid "record the specified user as committer" +msgstr "" + +msgid "display using template map file" +msgstr "" + +msgid "display with template" +msgstr "" + +msgid "do not show merges" +msgstr "" + +msgid "treat all files as text" +msgstr "" + +msgid "don't include dates in diff headers" +msgstr "" + +msgid "show which function each change is in" +msgstr "" + +msgid "ignore white space when comparing lines" +msgstr "" + +msgid "ignore changes in the amount of white space" +msgstr "" + +msgid "ignore changes whose lines are all blank" +msgstr "" + +msgid "number of lines of context to show" +msgstr "" + +msgid "guess renamed files by similarity (0<=s<=100)" +msgstr "" + +msgid "[OPTION]... [FILE]..." +msgstr "" + +msgid "annotate the specified revision" +msgstr "" + +msgid "follow file copies and renames" +msgstr "" + +msgid "list the author (long with -v)" +msgstr "" + +msgid "list the date (short with -q)" +msgstr "" + +msgid "list the revision number (default)" +msgstr "" + +msgid "list the changeset" +msgstr "" + +msgid "show line number at the first appearance" +msgstr "" + +msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..." +msgstr "" + +msgid "do not pass files through decoders" +msgstr "" + +msgid "directory prefix for files in archive" +msgstr "" + +msgid "revision to distribute" +msgstr "" + +msgid "type of distribution to create" +msgstr "" + +msgid "[OPTION]... DEST" +msgstr "" + +msgid "merge with old dirstate parent after backout" +msgstr "" + +msgid "parent to choose when backing out merge" +msgstr "" + +msgid "revision to backout" +msgstr "" + +msgid "[OPTION]... [-r] REV" +msgstr "" + +msgid "reset bisect state" +msgstr "" + +msgid "mark changeset good" +msgstr "" + +msgid "mark changeset bad" +msgstr "" + +msgid "skip testing changeset" +msgstr "" + +msgid "use command to check changeset state" +msgstr "" + +msgid "do not update to target" +msgstr "" + +msgid "[-gbsr] [-c CMD] [REV]" +msgstr "" + +msgid "set branch name even if it shadows an existing branch" +msgstr "" + +msgid "reset branch name to parent branch name" +msgstr "" + +msgid "[-fC] [NAME]" +msgstr "" + +msgid "show only branches that have unmerged heads" +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" +msgstr "" + +msgid "bundle all changesets in the repository" +msgstr "" + +msgid "bundle compression type to use" +msgstr "" + +msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]" +msgstr "" + +msgid "print output to file with formatted name" +msgstr "" + +msgid "print the given revision" +msgstr "" + +msgid "apply any matching decode filter" +msgstr "" + +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" +msgstr "" + +msgid "[OPTION]... SOURCE [DEST]" +msgstr "" + +msgid "mark new/missing files as added/removed before committing" +msgstr "" + +msgid "mark a branch as closed, hiding it from the branch list" +msgstr "" + +msgid "record a copy that has already occurred" +msgstr "" + +msgid "forcibly copy over an existing managed file" +msgstr "" + +msgid "[OPTION]... [SOURCE]... DEST" +msgstr "" + +msgid "[INDEX] REV1 REV2" +msgstr "" + +msgid "[COMMAND]" +msgstr "" + +msgid "show the command options" +msgstr "" + +msgid "[-o] CMD" +msgstr "" + +msgid "try extended date formats" +msgstr "" + +msgid "[-e] DATE [RANGE]" +msgstr "" + +msgid "FILE REV" +msgstr "" + +msgid "[PATH]" +msgstr "" + +msgid "FILE" +msgstr "" + +msgid "revision to rebuild to" +msgstr "" + +msgid "[-r REV] [REV]" +msgstr "" + +msgid "revision to debug" +msgstr "" + +msgid "[-r REV] FILE" +msgstr "" + +msgid "REV1 [REV2]" +msgstr "" + +msgid "do not display the saved mtime" +msgstr "" + +msgid "[OPTION]..." +msgstr "" + +msgid "revision to check" +msgstr "" + +msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..." +msgstr "" + +msgid "diff against the second parent" +msgstr "" + +msgid "[OPTION]... [-o OUTFILESPEC] REV..." +msgstr "" + +msgid "end fields with NUL" +msgstr "" + +msgid "print all revisions that match" +msgstr "" + +msgid "follow changeset history, or file history across copies and renames" +msgstr "" + +msgid "ignore case when matching" +msgstr "" + +msgid "print only filenames and revisions that match" +msgstr "" + +msgid "print matching line numbers" +msgstr "" + +msgid "search in given revision range" +msgstr "" + +msgid "[OPTION]... PATTERN [FILE]..." +msgstr "" + +msgid "show only heads which are descendants of REV" +msgstr "" + +msgid "show only the active heads from open branches" +msgstr "" + +msgid "show normal and closed heads" +msgstr "" + +msgid "[-r STARTREV] [REV]..." +msgstr "" + +msgid "[TOPIC]" +msgstr "" + +msgid "identify the specified revision" +msgstr "" + +msgid "show local revision number" +msgstr "" + +msgid "show global revision id" +msgstr "" + +msgid "show branch" +msgstr "" + +msgid "show tags" +msgstr "" + +msgid "[-nibt] [-r REV] [SOURCE]" +msgstr "" + +msgid "" +"directory strip option for patch. This has the same meaning as the " +"corresponding patch option" +msgstr "" + +msgid "base path" +msgstr "" + +msgid "skip check for outstanding uncommitted changes" +msgstr "" + +msgid "don't commit, just update the working directory" +msgstr "" + +msgid "apply patch to the nodes from which it was generated" +msgstr "" + +msgid "use any branch information in patch (implied by --exact)" +msgstr "" + +msgid "[OPTION]... PATCH..." +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" +msgstr "" + +msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]" +msgstr "" + +msgid "[-e CMD] [--remotecmd CMD] [DEST]" +msgstr "" + +msgid "search the repository as it stood at REV" +msgstr "" + +msgid "end filenames with NUL, for use with xargs" +msgstr "" + +msgid "print complete paths from the filesystem root" +msgstr "" + +msgid "[OPTION]... [PATTERN]..." +msgstr "" + +msgid "only follow the first parent of merge changesets" +msgstr "" + +msgid "show revisions matching date spec" +msgstr "" + +msgid "show copied files" +msgstr "" + +msgid "do case-insensitive search for a keyword" +msgstr "" + +msgid "include revisions where files were removed" +msgstr "" + +msgid "show only merges" +msgstr "" + +msgid "revisions committed by user" +msgstr "" + +msgid "show only changesets within the given named branch" +msgstr "" + +msgid "do not display revision or any of its ancestors" +msgstr "" + +msgid "[OPTION]... [FILE]" +msgstr "" + +msgid "revision to display" +msgstr "" + +msgid "[-r REV]" +msgstr "" + +msgid "force a merge with outstanding changes" +msgstr "" + +msgid "revision to merge" +msgstr "" + +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" +msgstr "" + +msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" +msgstr "" + +msgid "show parents from the specified revision" +msgstr "" + +msgid "[-r REV] [FILE]" +msgstr "" + +msgid "[NAME]" +msgstr "" + +msgid "update to new tip if changesets were pulled" +msgstr "" + +msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" +msgstr "" + +msgid "force push" +msgstr "" + +msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]" +msgstr "" + +msgid "record delete for missing files" +msgstr "" + +msgid "remove (and delete) file even if added or modified" +msgstr "" + +msgid "record a rename that has already occurred" +msgstr "" + +msgid "[OPTION]... SOURCE... DEST" +msgstr "" + +msgid "remerge all unresolved files" +msgstr "" + +msgid "list state of files needing merge" +msgstr "" + +msgid "mark files as resolved" +msgstr "" + +msgid "unmark files as resolved" +msgstr "" + +msgid "revert all changes when no arguments given" +msgstr "" + +msgid "tipmost revision matching date" +msgstr "" + +msgid "revision to revert to" +msgstr "" + +msgid "do not save backup copies of files" +msgstr "" + +msgid "[OPTION]... [-r REV] [NAME]..." +msgstr "" + +msgid "name of access log file to write to" +msgstr "" + +msgid "name of error log file to write to" +msgstr "" + +msgid "port to listen on (default: 8000)" +msgstr "" + +msgid "address to listen on (default: all interfaces)" +msgstr "" + +msgid "prefix path to serve from (default: server root)" +msgstr "" + +msgid "name to show in web pages (default: working directory)" +msgstr "" + +msgid "name of the webdir config file (serve more than one repository)" +msgstr "" + +msgid "for remote clients" +msgstr "" + +msgid "web templates to use" +msgstr "" + +msgid "template style to use" +msgstr "" + +msgid "use IPv6 in addition to IPv4" +msgstr "" + +msgid "SSL certificate file" +msgstr "" + +msgid "show untrusted configuration options" +msgstr "" + +msgid "[-u] [NAME]..." +msgstr "" + +msgid "show status of all files" +msgstr "" + +msgid "show only modified files" +msgstr "" + +msgid "show only added files" +msgstr "" + +msgid "show only removed files" +msgstr "" + +msgid "show only deleted (but tracked) files" +msgstr "" + +msgid "show only files without changes" +msgstr "" + +msgid "show only unknown (not tracked) files" +msgstr "" + +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 "replace existing tag" +msgstr "" + +msgid "make the tag local" +msgstr "" + +msgid "revision to tag" +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 "[-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 "not found in manifest" +msgstr "" + +msgid "branch name not in UTF-8!" +msgstr "" + +#, python-format +msgid " searching for copies back to rev %d\n" +msgstr "" + +#, python-format +msgid "" +" unmatched files in local:\n" +" %s\n" +msgstr "" + +#, python-format +msgid "" +" unmatched files in other:\n" +" %s\n" +msgstr "" + +msgid " all copies found (* = to merge, ! = divergent):\n" +msgstr "" + +msgid " checking for directory renames\n" +msgstr "" + +#, python-format +msgid " dir %s -> %s\n" +msgstr "" + +#, python-format +msgid " file %s -> %s\n" +msgstr "" + +msgid "working directory state appears damaged!" +msgstr "" + +#, python-format +msgid "'\\n' and '\\r' disallowed in filenames: %r" +msgstr "" + +#, python-format +msgid "directory %r already in dirstate" +msgstr "" + +#, python-format +msgid "file %r in dirstate clashes with %r" +msgstr "" + +#, python-format +msgid "not in dirstate: %s\n" +msgstr "" + +msgid "unknown" +msgstr "" + +msgid "character device" +msgstr "" + +msgid "block device" +msgstr "" + +msgid "fifo" +msgstr "" + +msgid "socket" +msgstr "" + +msgid "directory" +msgstr "" + +#, python-format +msgid "unsupported file type (type is %s)" +msgstr "" + +#, python-format +msgid "abort: %s\n" +msgstr "" + +#, python-format +msgid "" +"hg: command '%s' is ambiguous:\n" +" %s\n" +msgstr "" + +#, python-format +msgid "hg: %s\n" +msgstr "" + +#, python-format +msgid "timed out waiting for lock held by %s" +msgstr "" + +#, python-format +msgid "lock held by %s" +msgstr "" + +#, python-format +msgid "abort: %s: %s\n" +msgstr "" + +#, python-format +msgid "abort: could not lock %s: %s\n" +msgstr "" + +#, python-format +msgid "hg %s: %s\n" +msgstr "" + +#, python-format +msgid "abort: %s!\n" +msgstr "" + +#, python-format +msgid "abort: %s" +msgstr "" + +msgid " empty string\n" +msgstr "" + +msgid "killed!\n" +msgstr "" + +#, python-format +msgid "hg: unknown command '%s'\n" +msgstr "" + +#, python-format +msgid "abort: could not import module %s!\n" +msgstr "" + +msgid "(did you forget to compile extensions?)\n" +msgstr "" + +msgid "(is your Python install correct?)\n" +msgstr "" + +#, python-format +msgid "abort: error: %s\n" +msgstr "" + +msgid "broken pipe\n" +msgstr "" + +msgid "interrupted!\n" +msgstr "" + +msgid "" +"\n" +"broken pipe\n" +msgstr "" + +msgid "abort: out of memory\n" +msgstr "" + +msgid "** unknown exception encountered, details follow\n" +msgstr "" + +msgid "** report bug details to http://www.selenic.com/mercurial/bts\n" +msgstr "" + +msgid "** or mercurial@selenic.com\n" +msgstr "" + +#, python-format +msgid "** Mercurial Distributed SCM (version %s)\n" +msgstr "" + +#, python-format +msgid "** Extensions loaded: %s\n" +msgstr "" + +#, python-format +msgid "no definition for alias '%s'\n" +msgstr "" + +#, python-format +msgid "alias '%s' resolves to unknown command '%s'\n" +msgstr "" + +#, python-format +msgid "alias '%s' resolves to ambiguous command '%s'\n" +msgstr "" + +#, python-format +msgid "alias '%s' shadows command\n" +msgstr "" + +#, python-format +msgid "malformed --config option: %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!" +msgstr "" + +#, python-format +msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n" +msgstr "" + +#, python-format +msgid "repository '%s' is not local" +msgstr "" + +msgid "invalid arguments" +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/" +msgstr "" + +#, python-format +msgid "*** failed to import extension %s from %s: %s\n" +msgstr "" + +#, python-format +msgid "*** failed to import extension %s: %s\n" +msgstr "" + +#, python-format +msgid "couldn't find merge tool %s\n" +msgstr "" + +#, python-format +msgid "tool %s can't handle symlinks\n" +msgstr "" + +#, python-format +msgid "tool %s can't handle binary\n" +msgstr "" + +#, python-format +msgid "tool %s requires a GUI\n" +msgstr "" + +#, python-format +msgid "picked tool '%s' for %s (binary %s symlink %s)\n" +msgstr "" + +#, python-format +msgid "" +" no tool found to merge %s\n" +"keep (l)ocal or take (o)ther?" +msgstr "" + +msgid "&Local" +msgstr "" + +msgid "&Other" +msgstr "" + +msgid "l" +msgstr "" + +#, python-format +msgid "merging %s and %s to %s\n" +msgstr "" + +#, python-format +msgid "merging %s\n" +msgstr "" + +#, python-format +msgid "my %s other %s ancestor %s\n" +msgstr "" + +msgid " premerge successful\n" +msgstr "" + +#, python-format +msgid "" +" output file %s appears unchanged\n" +"was merge successful (yn)?" +msgstr "" + +msgid "&No" +msgstr "" + +msgid "&Yes" +msgstr "" + +msgid "n" +msgstr "" + +#, python-format +msgid "merging %s failed!\n" +msgstr "" + +#, python-format +msgid "Inconsistent state, %s:%s is good and bad" +msgstr "" + +#, python-format +msgid "unknown bisect kind %s" +msgstr "" + +msgid "" +"\n" +" 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.\n" +"\n" +" Extensions are not loaded by default for a variety of reasons:\n" +" they can increase startup overhead; they may be meant for\n" +" advanced usage only; they may provide potentially dangerous\n" +" abilities (such as letting you destroy or modify history); they\n" +" might not be ready for prime time; or they may alter some\n" +" usual behaviors of stock Mercurial. It is thus up to the user to\n" +" activate extensions as needed.\n" +"\n" +" To enable the \"foo\" extension, either shipped with Mercurial\n" +" or in the Python search path, create an entry for it in your\n" +" hgrc, like this:\n" +"\n" +" [extensions]\n" +" foo =\n" +"\n" +" You may also specify the full path to an extension:\n" +"\n" +" [extensions]\n" +" myfeature = ~/.hgext/myfeature.py\n" +"\n" +" To explicitly disable an extension enabled in an hgrc of broader\n" +" scope, prepend its path with !:\n" +"\n" +" [extensions]\n" +" # disabling extension bar residing in /path/to/extension/bar.py\n" +" hgext.bar = !/path/to/extension/bar.py\n" +" # ditto, but no path was supplied for extension baz\n" +" hgext.baz = !\n" +" " +msgstr "" +"\n" +" Mercurial a la capacité de s'enrichir de nouvelles\n" +" fonctionnalités par le biais d'extensions. Les extensions\n" +" permettent d'ajouter des nouvelles commandes, de changer le\n" +" comportement de commandes existantes ou leur ajouter des\n" +" options, ou encore d'implémenter de nouveaux \"hooks\".\n" +"\n" +" Les extensions ne sont pas chargées automatiquement par défaut\n" +" pour diverses raisons : elles peuvent accroître la latence\n" +" de lancement de Mercurial ; elle peuvent n'être destinées qu'à\n" +" une utilisation avancée ; elle peuvent fournir des\n" +" fonctionnalités potentiellement dangereuses, comme de vous\n" +" permettre de modifier ou détruire l'historique du dépôt ; elles\n" +" peuvent ne pas être encore prêtes à être utilisées par le plus\n" +" grand nombre ; ou encore elles peuvent modifier certains des\n" +" comportements habituels de Mercurial.\n" +" Il appartient donc à l'utilisateur de les activer en fonction\n" +" de ses besoins.\n" +"\n" +" Pour activer l'extension \"truc\" fournie avec Mercurial ou\n" +" présente dans le chemin de recherche de Python, déclarez-la\n" +" dans votre fichier de configuration hgrc comme suit :\n" +"\n" +" [extensions]\n" +" truc =\n" +"\n" +" Vous pouvez aussi indiquer l'endroit où elle se trouve :\n" +"\n" +" [extensions]\n" +" monbidule = ~/.hgext/monbidule.py\n" +"\n" +" Pour forcer la désactivation d'une extension activée par un\n" +" autre hgrc, précédez son chemin d'un point d'exclamation :\n" +"\n" +" [extensions]\n" +" # désactivation de machin qui se trouve dans /vers/machin.py\n" +" hgext.bar = !/vers/machin.py\n" +" # idem, mais aucun chemin n'avait été donné pour chose \n" +" hgext.chose = !\n" +" " + +msgid "disabled extensions:" +msgstr "extensions désactivées :" + +msgid "Date Formats" +msgstr "" + +msgid "" +"\n" +" Some commands allow the user to specify a date, e.g.:\n" +" * backout, commit, import, tag: Specify the commit date.\n" +" * log, revert, update: Select revision(s) by date.\n" +"\n" +" Many date formats are valid. Here are some examples:\n" +"\n" +" \"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)\n" +"\n" +" Lastly, there is Mercurial's internal format:\n" +"\n" +" \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" +"\n" +" This is the internal representation format for dates. unixtime is\n" +" the number of seconds since the epoch (1970-01-01 00:00 UTC).\n" +" offset is the offset of the local timezone, in seconds west of UTC\n" +" (negative if the timezone is east of UTC).\n" +"\n" +" The log command also accepts date ranges:\n" +"\n" +" \"<{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 "File Name Patterns" +msgstr "" + +msgid "" +"\n" +" Mercurial accepts several notations for identifying one or more\n" +" files at a time.\n" +"\n" +" By default, Mercurial treats filenames as shell-style extended\n" +" glob patterns.\n" +"\n" +" Alternate pattern notations must be specified explicitly.\n" +"\n" +" To use a plain path name without any pattern matching, start it\n" +" with \"path:\". These path names must completely match starting at\n" +" the current repository root.\n" +"\n" +" To use an extended glob, start a name with \"glob:\". Globs are\n" +" rooted at the current directory; a glob such as \"*.c\" will only\n" +" match files in the current directory ending with \".c\".\n" +"\n" +" The supported glob syntax extensions are \"**\" to match any string\n" +" across path separators and \"{a,b}\" to mean \"a or b\".\n" +"\n" +" To use a Perl/Python regular expression, start a name with \"re:\".\n" +" Regexp pattern matching is anchored at the root of the repository.\n" +"\n" +" Plain examples:\n" +"\n" +" path:foo/bar a name bar in a directory named foo in the root of\n" +" the repository\n" +" path:path:name a file or directory named \"path:name\"\n" +"\n" +" Glob examples:\n" +"\n" +" 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.\n" +"\n" +" Regexp examples:\n" +"\n" +" re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" +"\n" +" " +msgstr "" + +msgid "Environment Variables" +msgstr "" + +msgid "" +"\n" +"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.\n" +"\n" +"HGEDITOR::\n" +" This is the name of the editor to run when committing. See EDITOR.\n" +"\n" +" (deprecated, use .hgrc)\n" +"\n" +"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.\n" +"\n" +"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.\n" +"\n" +"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.\n" +"\n" +" (deprecated, use .hgrc)\n" +"\n" +"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.\n" +"\n" +" For each element in HGRCPATH:\n" +" * if it's a directory, all files ending with .rc are added\n" +" * otherwise, the file itself will be added\n" +"\n" +"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:\n" +"\n" +" * HGUSER (deprecated)\n" +" * hgrc files from the HGRCPATH\n" +" * EMAIL\n" +" * interactive prompt\n" +" * LOGNAME (with '@hostname' appended)\n" +"\n" +" (deprecated, use .hgrc)\n" +"\n" +"EMAIL::\n" +" May be used as the author of a commit; see HGUSER.\n" +"\n" +"LOGNAME::\n" +" May be used as the author of a commit; see HGUSER.\n" +"\n" +"VISUAL::\n" +" This is the name of the editor to use when committing. See EDITOR.\n" +"\n" +"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'.\n" +"\n" +"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 "Specifying Single Revisions" +msgstr "" + +msgid "" +"\n" +" Mercurial supports several ways to specify individual revisions.\n" +"\n" +" A plain integer is treated as a revision number. Negative integers\n" +" are treated as topological offsets from the tip, with -1 denoting\n" +" the tip. As such, negative numbers are only useful if you've\n" +" memorized your local tree numbers and want to save typing a single\n" +" digit. This editor suggests copy and paste.\n" +"\n" +" A 40-digit hexadecimal string is treated as a unique revision\n" +" identifier.\n" +"\n" +" A hexadecimal string less than 40 characters long is treated as a\n" +" unique revision identifier, and referred to as a short-form\n" +" identifier. A short-form identifier is only valid if it is the\n" +" prefix of exactly one full-length identifier.\n" +"\n" +" Any other string is treated as a tag name, which is a symbolic\n" +" name associated with a revision identifier. Tag names may not\n" +" contain the \":\" character.\n" +"\n" +" The reserved name \"tip\" is a special tag that always identifies\n" +" the most recent revision.\n" +"\n" +" The reserved name \"null\" indicates the null revision. This is the\n" +" revision of an empty repository, and the parent of revision 0.\n" +"\n" +" The reserved name \".\" indicates the working directory parent. If\n" +" no working directory is checked out, it is equivalent to null. If\n" +" an uncommitted merge is in progress, \".\" is the revision of the\n" +" first parent.\n" +" " +msgstr "" + +msgid "Specifying Multiple Revisions" +msgstr "" + +msgid "" +"\n" +" When Mercurial accepts more than one revision, they may be\n" +" specified individually, or provided as a topologically continuous\n" +" range, separated by the \":\" character.\n" +"\n" +" The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n" +" are revision identifiers. Both BEGIN and END are optional. If\n" +" BEGIN is not specified, it defaults to revision number 0. If END\n" +" is not specified, it defaults to the tip. The range \":\" thus means\n" +" \"all revisions\".\n" +"\n" +" If BEGIN is greater than END, revisions are treated in reverse\n" +" order.\n" +"\n" +" 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 "Diff Formats" +msgstr "" + +msgid "" +"\n" +" Mercurial's default format for showing changes between two\n" +" versions of a file is compatible with the unified format of GNU\n" +" diff, which can be used by GNU patch and many other standard\n" +" tools.\n" +"\n" +" While this standard format is often enough, it does not encode the\n" +" following information:\n" +"\n" +" - executable status and other permission bits\n" +" - copy or rename information\n" +" - changes in binary files\n" +" - creation or deletion of empty files\n" +"\n" +" Mercurial also supports the extended diff format from the git VCS\n" +" which addresses these limitations. The git diff format is not\n" +" produced by default because a few widespread tools still do not\n" +" understand this format.\n" +"\n" +" This means that when generating diffs from a Mercurial repository\n" +" (e.g. with \"hg export\"), you should be careful about things like\n" +" file copies and renames or other things mentioned above, because\n" +" when applying a standard diff to a different repository, this\n" +" extra information is lost. Mercurial's internal operations (like\n" +" push and pull) are not affected by this, because they use an\n" +" internal binary format for communicating changes.\n" +"\n" +" To make Mercurial produce the git extended diff format, use the\n" +" --git option available for many commands, or set 'git = True' in\n" +" the [diff] section of your hgrc. You do not need to set this\n" +" option when importing diffs in this format or using them in the mq\n" +" extension.\n" +" " +msgstr "" + +msgid "Template Usage" +msgstr "" + +msgid "" +"\n" +" 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).\n" +"\n" +" You can customize output for any \"log-like\" command: log,\n" +" outgoing, incoming, tip, parents, heads and glog.\n" +"\n" +" Three styles are packaged with Mercurial: default (the style used\n" +" when no explicit preference is passed), compact and changelog.\n" +" Usage:\n" +"\n" +" $ hg log -r1 --style changelog\n" +"\n" +" A template is a piece of text, with markup to invoke variable\n" +" expansion:\n" +"\n" +" $ hg log -r1 --template \"{node}\\n\"\n" +" b56ce7b07c52de7d5fd79fb89701ea538af65746\n" +"\n" +" 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:\n" +"\n" +" - 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 default.\n" +" - date: Date information. The date when the changeset was 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 by\n" +" 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 number.\n" +" - tags: List of strings. Any tags associated with the changeset.\n" +"\n" +" 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:\n" +"\n" +" $ hg tip --template \"{date|isodate}\\n\"\n" +" 2008-08-21 18:22 +0000\n" +"\n" +" List of filters:\n" +"\n" +" - 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 between\n" +" the given date/time and the current 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 path\n" +" separator (ignoring trailing separators). For example,\n" +" \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar" +"\".\n" +" - stripdir: Treat the text as path and strip a directory level, if\n" +" possible. For example, \"foo\" and \"foo/bar\" becomes \"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 component.\n" +" Example: 'User <user@example.com>' becomes 'example.com'.\n" +" - email: Any text. Extracts the first string that looks like an\n" +" email address. Example: 'User <user@example.com>' becomes\n" +" '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" +" - 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\n" +" in email headers.\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 address.\n" +" " +msgstr "" + +msgid "URL Paths" +msgstr "" + +msgid "" +"\n" +" Valid URLs are of the form:\n" +"\n" +" local/filesystem/path (or file://local/filesystem/path)\n" +" http://[user[:pass]@]host[:port]/[path]\n" +" https://[user[:pass]@]host[:port]/[path]\n" +" ssh://[user[:pass]@]host[:port]/[path]\n" +"\n" +" Paths in the local filesystem can either point to Mercurial\n" +" repositories or to bundle files (as created by 'hg bundle' or\n" +" 'hg incoming --bundle').\n" +"\n" +" An optional identifier after # indicates a particular branch, tag,\n" +" or changeset to use from the remote repository.\n" +"\n" +" Some features, such as pushing to http:// and https:// URLs are\n" +" only possible if the feature is explicitly enabled on the remote\n" +" Mercurial server.\n" +"\n" +" Some notes about using SSH with Mercurial:\n" +" - SSH requires an accessible shell account on the destination\n" +" machine and a copy of hg in the remote path or specified with as\n" +" remotecmd.\n" +" - path is relative to the remote user's home directory by default.\n" +" Use an extra slash at the start of a path to specify an absolute " +"path:\n" +" ssh://example.com//tmp/repository\n" +" - Mercurial doesn't use its own compression via SSH; the right\n" +" thing to do is to configure it in your ~/.ssh/config, e.g.:\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +" Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n" +" or with the --ssh command line option.\n" +"\n" +" These URLs can all be stored in your hgrc with path aliases under\n" +" the [paths] section like so:\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +" 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).\n" +"\n" +" Two path aliases are special because they are used as defaults\n" +" when you do not provide the URL to a command:\n" +"\n" +" default:\n" +" When you create a repository with hg clone, the clone command\n" +" saves the location of the source repository as the new\n" +" repository's 'default' path. This is then used when you omit\n" +" path from push- and pull-like commands (including incoming and\n" +" outgoing).\n" +"\n" +" 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 "Using additional features" +msgstr "" + +msgid "can only share local repositories" +msgstr "" + +msgid "destination already exists" +msgstr "" + +msgid "updating working directory\n" +msgstr "" + +#, python-format +msgid "destination directory: %s\n" +msgstr "" + +#, python-format +msgid "destination '%s' already exists" +msgstr "" + +#, python-format +msgid "destination '%s' is not empty" +msgstr "" + +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 "" + +msgid "updated" +msgstr "" + +msgid "merged" +msgstr "" + +msgid "removed" +msgstr "" + +msgid "unresolved" +msgstr "" + +#, python-format +msgid "%d files %s" +msgstr "" + +msgid "use 'hg resolve' to retry unresolved file merges\n" +msgstr "" + +msgid "" +"use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to " +"abandon\n" +msgstr "" + +msgid "(branch merge, don't forget to commit)\n" +msgstr "" + +#, python-format +msgid "error reading %s/.hg/hgrc: %s\n" +msgstr "" + +msgid "SSL support is unavailable" +msgstr "" + +msgid "IPv6 is not available on this system" +msgstr "" + +#, python-format +msgid "cannot start server at '%s:%d': %s" +msgstr "" + +#, python-format +msgid "calling hook %s: %s\n" +msgstr "" + +#, python-format +msgid "%s hook is invalid (\"%s\" not in a module)" +msgstr "" + +#, python-format +msgid "%s hook is invalid (import of \"%s\" failed)" +msgstr "" + +#, python-format +msgid "%s hook is invalid (\"%s\" is not defined)" +msgstr "" + +#, python-format +msgid "%s hook is invalid (\"%s\" is not callable)" +msgstr "" + +#, python-format +msgid "error: %s hook failed: %s\n" +msgstr "" + +#, python-format +msgid "error: %s hook raised an exception: %s\n" +msgstr "" + +#, python-format +msgid "%s hook failed" +msgstr "" + +#, python-format +msgid "warning: %s hook failed\n" +msgstr "" + +#, python-format +msgid "running hook %s: %s\n" +msgstr "" + +#, python-format +msgid "%s hook %s" +msgstr "" + +#, python-format +msgid "warning: %s hook %s\n" +msgstr "" + +msgid "connection ended unexpectedly" +msgstr "" + +#, python-format +msgid "unsupported URL component: \"%s\"" +msgstr "" + +#, python-format +msgid "using %s\n" +msgstr "" + +#, python-format +msgid "capabilities: %s\n" +msgstr "" + +msgid "operation not supported over http" +msgstr "" + +#, python-format +msgid "sending %s command\n" +msgstr "" + +#, python-format +msgid "sending %s bytes\n" +msgstr "" + +msgid "authorization failed" +msgstr "" + +#, python-format +msgid "http error while sending %s command\n" +msgstr "" + +msgid "http error, possibly caused by proxy setting" +msgstr "" + +#, python-format +msgid "real URL is %s\n" +msgstr "" + +#, python-format +msgid "requested URL: '%s'\n" +msgstr "" + +#, python-format +msgid "'%s' does not appear to be an hg repository" +msgstr "" + +#, python-format +msgid "'%s' sent a broken Content-Type header (%s)" +msgstr "" + +#, 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 "" + +#, python-format +msgid "push failed: %s" +msgstr "" + +msgid "Python support for SSL and HTTPS is not installed" +msgstr "" + +msgid "cannot create new http repository" +msgstr "" + +#, python-format +msgid "%s: ignoring invalid syntax '%s'\n" +msgstr "" + +#, python-format +msgid "skipping unreadable ignore file '%s': %s\n" +msgstr "" + +#, python-format +msgid "repository %s not found" +msgstr "" + +#, python-format +msgid "repository %s already exists" +msgstr "" + +#, python-format +msgid "requirement '%s' not supported" +msgstr "" + +#, python-format +msgid ".hg/sharedpath points to nonexistent directory %s" +msgstr "" + +#, python-format +msgid "%r cannot be used in a tag name" +msgstr "" + +msgid "working copy of .hgtags is changed (please commit .hgtags manually)" +msgstr "" + +#, python-format +msgid "%s, line %s: %s\n" +msgstr "" + +msgid "cannot parse entry" +msgstr "" + +#, python-format +msgid "node '%s' is not well formed" +msgstr "" + +#, python-format +msgid "working directory has unknown parent '%s'!" +msgstr "" + +#, python-format +msgid "unknown revision '%s'" +msgstr "" + +#, python-format +msgid "filtering %s through %s\n" +msgstr "" + +msgid "journal already exists - run hg recover" +msgstr "" + +msgid "rolling back interrupted transaction\n" +msgstr "" + +msgid "no interrupted transaction available\n" +msgstr "" + +msgid "rolling back last transaction\n" +msgstr "" + +#, python-format +msgid "Named branch could not be reset, current branch still is: %s\n" +msgstr "" + +msgid "no rollback information available\n" +msgstr "" + +#, python-format +msgid "waiting for lock on %s held by %r\n" +msgstr "" + +#, python-format +msgid "repository %s" +msgstr "" + +#, python-format +msgid "working directory of %s" +msgstr "" + +#, python-format +msgid " %s: searching for copy revision for %s\n" +msgstr "" + +#, python-format +msgid " %s: copy %s:%s\n" +msgstr "" + +msgid "cannot partially commit a merge (do not specify files or patterns)" +msgstr "" + +msgid "file not found!" +msgstr "" + +msgid "no match under directory!" +msgstr "" + +msgid "file not tracked!" +msgstr "" + +msgid "nothing changed\n" +msgstr "" + +msgid "unresolved merge conflicts (see hg resolve)" +msgstr "" + +#, python-format +msgid "committing subrepository %s\n" +msgstr "" + +#, 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 "" + +#, python-format +msgid "examining %s:%s\n" +msgstr "" + +msgid "branch already found\n" +msgstr "" + +#, python-format +msgid "found incomplete branch %s:%s\n" +msgstr "" + +#, python-format +msgid "found new changeset %s\n" +msgstr "" + +#, python-format +msgid "request %d: %s\n" +msgstr "" + +#, python-format +msgid "received %s:%s\n" +msgstr "" + +#, python-format +msgid "narrowing %d:%d %s\n" +msgstr "" + +#, python-format +msgid "found new branch changeset %s\n" +msgstr "" + +#, python-format +msgid "narrowed branch search to %s:%s\n" +msgstr "" + +msgid "already have changeset " +msgstr "" + +msgid "warning: repository is unrelated\n" +msgstr "" + +msgid "repository is unrelated" +msgstr "" + +msgid "found new changesets starting at " +msgstr "" + +#, python-format +msgid "%d total queries\n" +msgstr "" + +msgid "common changesets up to " +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 "" + +#, python-format +msgid "%d changesets found\n" +msgstr "" + +msgid "list of changesets:\n" +msgstr "" + +#, python-format +msgid "empty or missing revlog for %s" +msgstr "" + +#, python-format +msgid "add changeset %s\n" +msgstr "" + +msgid "adding changesets\n" +msgstr "" + +msgid "received changelog group is empty" +msgstr "" + +msgid "adding manifests\n" +msgstr "" + +msgid "adding file changes\n" +msgstr "" + +#, python-format +msgid "adding %s revisions\n" +msgstr "" + +msgid "received file revlog group is empty" +msgstr "" + +#, python-format +msgid " (%+d heads)" +msgstr "" + +#, python-format +msgid "added %d changesets with %d changes to %d files%s\n" +msgstr "" + +msgid "updating the branch cache\n" +msgstr "" + +msgid "Unexpected response from remote server:" +msgstr "" + +msgid "operation forbidden by server" +msgstr "" + +msgid "locking the remote repository failed" +msgstr "" + +msgid "the server sent an unknown error code" +msgstr "" + +msgid "streaming all changes\n" +msgstr "" + +#, python-format +msgid "%d files to transfer, %s of data\n" +msgstr "" + +#, python-format +msgid "adding %s (%s)\n" +msgstr "" + +#, python-format +msgid "transferred %s in %.1f seconds (%s/sec)\n" +msgstr "" + +msgid "no [smtp]host in hgrc - cannot send mail" +msgstr "" + +#, python-format +msgid "sending mail: smtp host %s, port %s\n" +msgstr "" + +msgid "can't use TLS: Python SSL support not installed" +msgstr "" + +msgid "(using tls)\n" +msgstr "" + +#, python-format +msgid "(authenticating to mail server as %s)\n" +msgstr "" + +#, python-format +msgid "sending mail: %s\n" +msgstr "" + +msgid "smtp specified as email transport, but no smtp host configured" +msgstr "" + +#, python-format +msgid "%r specified as email transport, but not in PATH" +msgstr "" + +#, python-format +msgid "ignoring invalid sendcharset: %s\n" +msgstr "" + +#, python-format +msgid "invalid email address: %s" +msgstr "" + +#, python-format +msgid "invalid local address: %s" +msgstr "" + +#, python-format +msgid "failed to remove %s from manifest" +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 "" + +#, python-format +msgid "case-folding collision between %s and %s" +msgstr "" + +#, python-format +msgid "" +" conflicting flags for %s\n" +"(n)one, e(x)ec or sym(l)ink?" +msgstr "" + +msgid "&None" +msgstr "" + +msgid "E&xec" +msgstr "" + +msgid "Sym&link" +msgstr "" + +msgid "resolving manifests\n" +msgstr "" + +#, python-format +msgid " overwrite %s partial %s\n" +msgstr "" + +#, python-format +msgid " ancestor %s local %s remote %s\n" +msgstr "" + +#, python-format +msgid "" +" local changed %s which remote deleted\n" +"use (c)hanged version or (d)elete?" +msgstr "" + +msgid "&Changed" +msgstr "" + +msgid "&Delete" +msgstr "" + +msgid "c" +msgstr "" + +#, python-format +msgid "" +"remote changed %s which local deleted\n" +"use (c)hanged version or leave (d)eleted?" +msgstr "" + +msgid "&Deleted" +msgstr "" + +#, python-format +msgid "preserving %s for resolve of %s\n" +msgstr "" + +#, python-format +msgid "update failed to remove %s: %s!\n" +msgstr "" + +#, python-format +msgid "getting %s\n" +msgstr "" + +#, python-format +msgid "getting %s to %s\n" +msgstr "" + +#, python-format +msgid "warning: detected divergent renames of %s to:\n" +msgstr "" + +#, python-format +msgid "branch %s not found" +msgstr "" + +msgid "can't merge with ancestor" +msgstr "" + +msgid "nothing to merge (use 'hg update' or check 'hg heads')" +msgstr "" + +msgid "outstanding uncommitted changes (use 'hg status' to list changes)" +msgstr "" + +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 "" + +#, python-format +msgid "cannot create %s: destination already exists" +msgstr "" + +#, python-format +msgid "cannot create %s: unable to create destination directory" +msgstr "" + +#, python-format +msgid "found patch at byte %d\n" +msgstr "" + +msgid "patch generated by hg export\n" +msgstr "" + +#, python-format +msgid "unable to find '%s' for patching\n" +msgstr "" + +#, python-format +msgid "patching file %s\n" +msgstr "" + +#, python-format +msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n" +msgstr "" + +#, python-format +msgid "bad hunk #%d %s (%d %d %d %d)" +msgstr "" + +#, python-format +msgid "file %s already exists\n" +msgstr "" + +#, 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" +msgstr "" + +#, python-format +msgid "Hunk #%d FAILED at %d\n" +msgstr "" + +#, python-format +msgid "bad hunk #%d" +msgstr "" + +#, python-format +msgid "bad hunk #%d old text line %d" +msgstr "" + +msgid "could not extract binary patch" +msgstr "" + +#, python-format +msgid "binary patch is %d bytes, not %d" +msgstr "" + +#, python-format +msgid "unable to strip away %d dirs from %s" +msgstr "" + +msgid "undefined source and destination files" +msgstr "" + +#, python-format +msgid "malformed patch %s %s" +msgstr "" + +#, python-format +msgid "unsupported parser state: %s" +msgstr "" + +#, python-format +msgid "patch command failed: %s" +msgstr "" + +#, python-format +msgid "Unsupported line endings type: %s" +msgstr "" + +#, python-format +msgid "no valid hunks found; trying with %r instead\n" +msgstr "" + +#, python-format +msgid "exited with status %d" +msgstr "" + +#, python-format +msgid "killed by signal %d" +msgstr "" + +#, python-format +msgid "stopped by signal %d" +msgstr "" + +msgid "invalid exit code" +msgstr "" + +#, python-format +msgid "saving bundle to %s\n" +msgstr "" + +msgid "adding branch\n" +msgstr "" + +#, python-format +msgid "cannot %s; remote repository does not support the %r capability" +msgstr "" + +#, python-format +msgid "unknown compression type %r" +msgstr "" + +#, python-format +msgid "index %s unknown flags %#04x for format v0" +msgstr "" + +#, python-format +msgid "index %s unknown flags %#04x for revlogng" +msgstr "" + +#, python-format +msgid "index %s unknown format %d" +msgstr "" + +#, python-format +msgid "index %s is corrupted" +msgstr "" + +msgid "no node" +msgstr "" + +msgid "ambiguous identifier" +msgstr "" + +msgid "no match found" +msgstr "" + +#, python-format +msgid "incompatible revision flag %x" +msgstr "" + +#, python-format +msgid "%s not found in the transaction" +msgstr "" + +msgid "unknown base" +msgstr "" + +msgid "consistency error adding group" +msgstr "" + +#, python-format +msgid "%s looks like a binary file." +msgstr "" + +msgid "can only specify two labels." +msgstr "" + +msgid "warning: conflicts during merge.\n" +msgstr "" + +#, python-format +msgid "couldn't parse location %s" +msgstr "" + +msgid "could not create remote repo" +msgstr "" + +msgid "remote: " +msgstr "" + +msgid "no suitable response from remote hg" +msgstr "" + +#, python-format +msgid "push refused: %s" +msgstr "" + +msgid "unsynced changes" +msgstr "" + +msgid "cannot lock static-http repository" +msgstr "" + +msgid "cannot create new static-http repository" +msgstr "" + +#, python-format +msgid "invalid entry in fncache, line %s" +msgstr "" + +msgid "scanning\n" +msgstr "" + +#, python-format +msgid "%d files, %d bytes to transfer\n" +msgstr "" + +#, python-format +msgid "sending %s (%d bytes)\n" +msgstr "" + +#, python-format +msgid "" +" subrepository sources for %s differ\n" +"use (l)ocal source (%s) or (r)emote source (%s)?" +msgstr "" + +msgid "&Remote" +msgstr "" + +msgid "r" +msgstr "" + +#, python-format +msgid "" +" local changed subrepository %s which remote removed\n" +"use (c)hanged version or (d)elete?" +msgstr "" + +#, python-format +msgid "" +" remote changed subrepository %s which local removed\n" +"use (c)hanged version or (d)elete?" +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 "" + +msgid "unmatched quotes" +msgstr "" + +#, python-format +msgid "error expanding '%s%%%s'" +msgstr "" + +#, python-format +msgid "unknown filter '%s'" +msgstr "" + +#, python-format +msgid "style not found: %s" +msgstr "" + +#, python-format +msgid "template file %s: %s" +msgstr "" + +msgid "cannot use transaction when it is already committed/aborted" +msgstr "" + +#, python-format +msgid "failed to truncate %s\n" +msgstr "" + +msgid "transaction abort!\n" +msgstr "" + +msgid "rollback completed\n" +msgstr "" + +msgid "rollback failed - please run hg recover\n" +msgstr "" + +#, python-format +msgid "Not trusting file %s from untrusted user %s, group %s\n" +msgstr "" + +#, python-format +msgid "Ignored: %s\n" +msgstr "" + +#, python-format +msgid "ignoring untrusted configuration option %s.%s = %s\n" +msgstr "" + +#, python-format +msgid "%s.%s not a boolean ('%s')" +msgstr "" + +msgid "enter a commit username:" +msgstr "" + +#, python-format +msgid "No username found, using '%s' instead\n" +msgstr "" + +msgid "Please specify a username." +msgstr "" + +#, python-format +msgid "username %s contains a newline\n" +msgstr "" + +msgid "unrecognized response\n" +msgstr "" + +msgid "response expected" +msgstr "" + +msgid "password: " +msgstr "" + +msgid "edit failed" +msgstr "" + +msgid "http authorization required" +msgstr "" + +msgid "http authorization required\n" +msgstr "" + +#, python-format +msgid "realm: %s\n" +msgstr "" + +#, python-format +msgid "user: %s\n" +msgstr "" + +msgid "user:" +msgstr "" + +#, python-format +msgid "http auth: user %s, password %s\n" +msgstr "" + +#, python-format +msgid "proxying through http://%s:%s\n" +msgstr "" + +#, python-format +msgid "command '%s' failed: %s" +msgstr "" + +#, python-format +msgid "path contains illegal component: %s" +msgstr "" + +#, python-format +msgid "path %r is inside repo %r" +msgstr "" + +#, python-format +msgid "path %r traverses symbolic link %r" +msgstr "" + +msgid "Hardlinks not supported" +msgstr "" + +#, python-format +msgid "could not symlink to %r: %s" +msgstr "" + +#, python-format +msgid "invalid date: %r " +msgstr "" + +#, python-format +msgid "date exceeds 32 bits: %d" +msgstr "" + +#, python-format +msgid "impossible time zone offset: %d" +msgstr "" + +#, python-format +msgid "invalid day spec: %s" +msgstr "" + +#, python-format +msgid "%.0f GB" +msgstr "" + +#, python-format +msgid "%.1f GB" +msgstr "" + +#, python-format +msgid "%.2f GB" +msgstr "" + +#, python-format +msgid "%.0f MB" +msgstr "" + +#, python-format +msgid "%.1f MB" +msgstr "" + +#, python-format +msgid "%.2f MB" +msgstr "" + +#, python-format +msgid "%.0f KB" +msgstr "" + +#, python-format +msgid "%.1f KB" +msgstr "" + +#, python-format +msgid "%.2f KB" +msgstr "" + +#, python-format +msgid "%.0f bytes" +msgstr "" + +msgid "cannot verify bundle or remote repos" +msgstr "" + +msgid "interrupted" +msgstr "" + +#, python-format +msgid "empty or missing %s" +msgstr "" + +#, python-format +msgid "data length off by %d bytes" +msgstr "" + +#, python-format +msgid "index contains %d extra bytes" +msgstr "" + +#, python-format +msgid "warning: `%s' uses revlog format 1" +msgstr "" + +#, python-format +msgid "warning: `%s' uses revlog format 0" +msgstr "" + +#, python-format +msgid "rev %d points to nonexistent changeset %d" +msgstr "" + +#, python-format +msgid "rev %d points to unexpected changeset %d" +msgstr "" + +#, python-format +msgid " (expected %s)" +msgstr "" + +#, python-format +msgid "unknown parent 1 %s of %s" +msgstr "" + +#, python-format +msgid "unknown parent 2 %s of %s" +msgstr "" + +#, python-format +msgid "checking parents of %s" +msgstr "" + +#, python-format +msgid "duplicate revision %d (%d)" +msgstr "" + +#, python-format +msgid "repository uses revlog format %d\n" +msgstr "" + +msgid "checking changesets\n" +msgstr "" + +#, python-format +msgid "unpacking changeset %s" +msgstr "" + +msgid "checking manifests\n" +msgstr "" + +#, python-format +msgid "%s not in changesets" +msgstr "" + +msgid "file without name in manifest" +msgstr "" + +#, python-format +msgid "reading manifest delta %s" +msgstr "" + +msgid "crosschecking files in changesets and manifests\n" +msgstr "" + +#, python-format +msgid "changeset refers to unknown manifest %s" +msgstr "" + +msgid "in changeset but not in manifest" +msgstr "" + +msgid "in manifest but not in changeset" +msgstr "" + +msgid "checking files\n" +msgstr "" + +#, python-format +msgid "cannot decode filename '%s'" +msgstr "" + +#, python-format +msgid "broken revlog! (%s)" +msgstr "" + +msgid "missing revlog!" +msgstr "" + +#, python-format +msgid "%s not in manifests" +msgstr "" + +#, python-format +msgid "unpacked size is %s, %s expected" +msgstr "" + +#, python-format +msgid "unpacking %s" +msgstr "" + +#, python-format +msgid "empty or missing copy source revlog %s:%s" +msgstr "" + +#, python-format +msgid "warning: %s@%s: copy source revision is nullid %s:%s" +msgstr "" + +#, python-format +msgid "checking rename of %s" +msgstr "" + +#, python-format +msgid "%s in manifests not found" +msgstr "" + +#, python-format +msgid "warning: orphan revlog '%s'" +msgstr "" + +#, python-format +msgid "%d files, %d changesets, %d total revisions\n" +msgstr "" + +#, python-format +msgid "%d warnings encountered!\n" +msgstr "" + +#, python-format +msgid "%d integrity errors encountered!\n" +msgstr "" + +#, python-format +msgid "(first damaged changeset appears to be %d)\n" +msgstr "" + +msgid "user name not available - set USERNAME environment variable" +msgstr ""
--- a/i18n/ja.po Mon Jun 29 19:28:54 2009 +0200 +++ b/i18n/ja.po Tue Jun 30 12:32:30 2009 -0500 @@ -4,83 +4,102 @@ # Copyright (C) 2009 the Mercurial team # # ======================================== -# 【翻訳作業手順】 +# 【翻訳用語集】 # -# ※ 必要に応じて crew リポジトリから最新成果を取得 & hg update -# # メッセージ DB の更新 -# $ make update-pot -# # '#: filename:line' 情報を残す場合は --no-location を省略 -# $ msgmerge --update --no-location i18n/ja.po i18n/hg.pot -# -# ※ 翻訳作業実施(i18n/ja.po の変更) +# 言い回し: # -# # 形式確認(置換指定の間違い等) -# $ msgfmt --check i18n/ja.po -# # '#: filename:line' 情報が残っている場合は取り除く -# $ msgcat --no-location -o i18n/ja.po i18n/ja.po +# no XXXX avairable XXXX がありません +# XXXX found XXXX が存在します +# XXXX exists XXXX が存在します +# do not XXXX XXXX できません ※ 「XXXX してはいけない」の意 +# XXXX failed XXXX が(or に)失敗 +# error XXXX-ing XXXX が(or に)失敗 +# error while XXXX XXXX が(or に)失敗 +# XXXX-ing YYYY YYYY を XXXX 中 ※ メッセージ冒頭から始まる場合 +# YYYY を XXXX ※ 「以後の処理は YYYY を XXXX とする」 +# というニュアンスﾝ場合 +# --XXXX option --XXXX ※ 「オプション」であることが自明なので +# option --XXXX --XXXX ※ 「オプション」であることが自明なので +# invalid XXXX XXXX が不正です or 不正な XXXX +# malformed XXXX XXXX が不正です or 不正な XXXX # -# ※ 翻訳成果の公開 -# -# ======================================== -# 【翻訳用語集】 +# 単語: # # Distributed SCM 分散構成管理ツール # +# abort 中断 # add (構成管理への)追加登録 # apply 適用 # archive アーカイブ -# (with no)argument(s) 引数(指定が無い場合) +# argument(, with no) 引数(指定が無い場合) # author 作成者 # backout 打ち消し # basename ベース名 +# binary バイナリ # branch ブランチ # bundle( file) バンドルファイル +# change チェンジセット/差分 # changegroup( file) バンドルファイル -# change(set) チェンジセット +# changeset チェンジセット # changeset hash ハッシュ値 # changeset header ヘッダ情報 # checkout/update (作業領域の)更新 -# (this)command (本)コマンド +# command(, this) (本)コマンド # commit コミット # commit comment コミットログ -# (by)default 指定が無い場合/通常は +# default(, by) 指定が無い場合/通常は # delete/remove (構成管理からの)登録除外 # diff 差分 +# directory ディレクトリ # dirstate dirstate +# entry エントリ # extend(ed) 拡張 -# extensiohn (Mercurialの)エクステンション +# extension (Mercurialの)エクステンション # hash identifier(s) ハッシュ値 # head ヘッド # head changeset(s) ヘッド -# (revision)history 変更履歴 -# import 取り込み +# header ヘッダ +# history(, revision) 変更履歴 +# import 取り込み(patch 系)/読み込み(module/extension) +# interrupt 中断 # list of .... 列挙された..../.... の一覧 -# manifest マニフェスト +# local (repo) 手元(のリポジトリ) +# manifest マニフェスト or 管理対象(一覧) # merge マージ +# node リビジョン # note 備考 # patch パッチ # platform 稼働環境 +# pop(patch) (パッチの)適用解除 # pull (追加リビジョンの)取り込み # push (追加リビジョンの)反映 +# push(patch) (パッチの)適用 # remote(repo) 連携先(リポジトリ) # rename 改名 -# repo(sitory) リポジトリ +# repo(sitory) リポジトリ/(.hg を指す場合は)管理領域 +# resolve/unresolve (衝突)解消/(衝突)未解消 # revert/undo 取り消し # revision リビジョン # schedule (add/remove の)予約 # search 探索 +# server サーバ # summary 要約(情報) # tag タグ +# tracked xxxx 構成管理対象の xxxx +# xxxxx type xxxx 種別 +# user ユーザ +# unknown xxxx 未知の xxxx +# working copy(of xxx) 作業領域(中の xxx) # working directory 作業領域 # ======================================== # msgid "" msgstr "" "Project-Id-Version: Mercurial\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-07 21:22+0900\n" -"PO-Revision-Date: 2009-03-07 23:30+0900\n" -"Last-Translator: FUJIWARA Katsunori <foozy@lares.dti.ne.jp>\n" +"Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" +"POT-Creation-Date: 2009-06-27 00:28+0900\n" +"PO-Revision-Date: 2009-06-28 22:00+0900\n" +"Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" "Language-Team: Japanese\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -90,7 +109,7 @@ #, python-format msgid " (default: %s)" -msgstr " (規定値: %s)" +msgstr " (既定値: %s)" msgid "OPTIONS" msgstr "" @@ -106,8 +125,55 @@ " aliases: %s\n" "\n" msgstr "" - -msgid "return tuple of (match function, list enabled)." +" 別名: %s\n" +"\n" + +msgid "" +"control access to a repository using simple hooks\n" +"\n" +"This hook makes it possible to allow or deny write access to portions\n" +"of a repository when receiving incoming changesets.\n" +"\n" +"The authorization is matched based on the local user name on the\n" +"system where the hook runs, and not the committer of the original\n" +"changeset (since the latter is merely informative).\n" +"\n" +"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.\n" +"\n" +"To use this hook, configure the acl extension in your hgrc like this:\n" +"\n" +" [extensions]\n" +" hgext.acl =\n" +"\n" +" [hooks]\n" +" pretxnchangegroup.acl = python:hgext.acl.hook\n" +"\n" +" [acl]\n" +" # Check whether the source of incoming changes is in this list\n" +" # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n" +" sources = serve\n" +"\n" +"The allow and deny sections take a subtree pattern as key (with a\n" +"glob syntax by default), and a comma separated list of users as\n" +"the corresponding value. The deny list is checked before the allow\n" +"list is.\n" +"\n" +" [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\n" +"\n" +" [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 @@ -128,167 +194,77 @@ #, python-format msgid "acl: user %s denied on %s\n" -msgstr "" +msgstr "acl: ユーザ %s は %s に拒否されました\n" #, python-format msgid "acl: access denied for changeset %s" -msgstr "" +msgstr "acl: チェンジセット %s のアクセスは拒否されました" #, python-format msgid "acl: user %s not allowed on %s\n" -msgstr "" +msgstr "acl: ユーザ %s は %s で許可されていません\n" #, python-format msgid "acl: allowing changeset %s\n" -msgstr "" - -msgid "" -"allow user-defined command aliases\n" -"\n" -"To use, create entries in your hgrc of the form\n" -"\n" -"[alias]\n" -"mycmd = cmd --args\n" -msgstr "" - -msgid "" -"defer command lookup until needed, so that extensions loaded\n" -" after alias can be aliased" -msgstr "" - -#, python-format -msgid "*** [alias] %s: command %s is unknown" -msgstr "" - -#, python-format -msgid "*** [alias] %s: command %s is ambiguous" -msgstr "" - -#, python-format -msgid "*** [alias] %s: circular dependency on %s" -msgstr "" - -#, python-format -msgid "*** [alias] %s: no definition\n" -msgstr "" - -msgid "" -"mercurial bookmarks\n" -"\n" -"Mercurial bookmarks are local moveable pointers to changesets. Every\n" -"bookmark points to a changeset identified by its hash. If you commit a\n" -"changeset that is based on a changeset that has a bookmark on it, the\n" -"bookmark is forwarded to the new changeset.\n" -"\n" -"It is possible to use bookmark names in every revision lookup (e.g. hg\n" -"merge, hg update).\n" -"\n" -"The bookmark extension offers the possiblity to have a more git-like " -"experience\n" -"by adding the following configuration option to your .hgrc:\n" -"\n" -"[bookmarks]\n" -"track.current = True\n" -"\n" -"This will cause bookmarks to track the bookmark that you are currently on, " -"and\n" -"just updates it. This is similar to git's approach of branching.\n" -msgstr "" - -msgid "" -"Parse .hg/bookmarks file and return a dictionary\n" -"\n" -" Bookmarks are stored as {HASH}\\s{NAME}\\n (localtags format) values\n" -" in the .hg/bookmarks file. They are read by the parse() method and\n" -" returned as a dictionary with name => hash values.\n" -"\n" -" The parsed dictionary is cached until a write() operation is done.\n" -" " -msgstr "" - -msgid "" -"Write bookmarks\n" -"\n" -" Write the given bookmark => hash dictionary to the .hg/bookmarks file\n" -" in a format equal to those of localtags.\n" -"\n" -" We also store a backup of the previous state in undo.bookmarks that\n" -" can be copied back on rollback.\n" -" " -msgstr "" - -msgid "" -"Get the current bookmark\n" -"\n" -" If we use gittishsh branches we have a current bookmark that\n" -" we are on. This function returns the name of the bookmark. It\n" -" is stored in .hg/bookmarks.current\n" -" " -msgstr "" - -msgid "" -"Set the name of the bookmark that we are currently on\n" -"\n" -" Set the name of the bookmark that we are on (hg update <bookmark>).\n" -" The name is recoreded in .hg/bookmarks.current\n" -" " -msgstr "" - -msgid "" -"mercurial bookmarks\n" +msgstr "acl: 許可済みのチェンジセット %s\n" + +msgid "" +"track a line of development with movable markers\n" +"\n" +"Bookmarks are local movable markers to changesets. Every bookmark\n" +"points to a changeset identified by its hash. If you commit a\n" +"changeset that is based on a changeset that has a bookmark on it,\n" +"the bookmark shifts to the new changeset.\n" +"\n" +"It is possible to use bookmark names in every revision lookup\n" +"(e.g. hg merge, hg update).\n" +"\n" +"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:\n" +"\n" +" [bookmarks]\n" +" track.current = True\n" +"\n" +"This will cause Mercurial to track the bookmark that you are currently\n" +"using, and only update it. This is similar to git's approach to\n" +"branching.\n" +msgstr "" + +msgid "" +"track a line of development with movable markers\n" "\n" " Bookmarks are pointers to certain commits that move when\n" -" commiting. Bookmarks are local. They can be renamed, copied and\n" -" deleted. It is possible to use bookmark names in 'hg merge' and 'hg\n" -" update' to update to a given bookmark.\n" -"\n" -" You can use 'hg bookmark NAME' to set a bookmark on the current\n" -" tip with the given name. If you specify a revision using -r REV\n" -" (where REV may be an existing bookmark), the bookmark is set to\n" -" that revision.\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.\n" +"\n" +" 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" " " 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 "" +msgstr "ブックマーク名に改行を含めません" msgid "a bookmark cannot have the name of an existing branch" msgstr "" -msgid "" -"Strip bookmarks if revisions are stripped using\n" -" the mercurial.strip method. This usually happens during\n" -" qpush and qpop" -msgstr "" - -msgid "" -"Add a revision to the repository and\n" -" move the bookmark" -msgstr "" - -msgid "Merge bookmarks with normal tags" -msgstr "" - -msgid "" -"Set the current bookmark\n" -"\n" -" If the user updates to a bookmark we update the .hg/bookmarks.current\n" -" file.\n" -" " -msgstr "" - msgid "force" msgstr "" @@ -305,87 +281,79 @@ msgstr "" msgid "" -"Bugzilla integration\n" +"integrate Mercurial with a Bugzilla bug tracker\n" "\n" "This hook extension adds comments on bugs in Bugzilla when changesets\n" -"that refer to bugs by Bugzilla ID are seen. The hook does not change bug\n" -"status.\n" -"\n" -"The hook updates the Bugzilla database directly. Only Bugzilla " -"installations\n" -"using MySQL are supported.\n" -"\n" -"The hook relies on a Bugzilla script to send bug change notification " -"emails.\n" -"That script changes between Bugzilla versions; the 'processmail' script " -"used\n" -"prior to 2.18 is replaced in 2.18 and subsequent versions by\n" -"'config/sendbugmail.pl'. Note that these will be run by Mercurial as the " -"user\n" -"pushing the change; you will need to ensure the Bugzilla install file\n" -"permissions are set appropriately.\n" +"that refer to bugs by Bugzilla ID are seen. The hook does not change\n" +"bug status.\n" +"\n" +"The hook updates the Bugzilla database directly. Only Bugzilla\n" +"installations using MySQL are supported.\n" +"\n" +"The hook relies on a Bugzilla script to send bug change notification\n" +"emails. That script changes between Bugzilla versions; the\n" +"'processmail' script used prior to 2.18 is replaced in 2.18 and\n" +"subsequent versions by 'config/sendbugmail.pl'. Note that these will\n" +"be run by Mercurial as the user pushing the change; you will need to\n" +"ensure the Bugzilla install file permissions are set appropriately.\n" "\n" "Configuring the extension:\n" "\n" " [bugzilla]\n" -" host Hostname of the MySQL server holding the Bugzilla database.\n" +"\n" +" host Hostname of the MySQL server holding the Bugzilla\n" +" database.\n" " db Name of the Bugzilla database in MySQL. Default 'bugs'.\n" " user Username to use to access MySQL server. Default 'bugs'.\n" " password Password to use to access MySQL server.\n" " timeout Database connection timeout (seconds). Default 5.\n" -" version Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 " -"and\n" -" later, '2.18' for Bugzilla versions from 2.18 and '2.16' for\n" -" versions prior to 2.18.\n" +" version Bugzilla version. Specify '3.0' for Bugzilla versions\n" +" 3.0 and later, '2.18' for Bugzilla versions from 2.18\n" +" and '2.16' for versions prior to 2.18.\n" " bzuser Fallback Bugzilla user name to record comments with, if\n" " changeset committer cannot be found as a Bugzilla user.\n" " bzdir Bugzilla install directory. Used by default notify.\n" " Default '/var/www/html/bugzilla'.\n" " notify The command to run to get Bugzilla to send bug change\n" -" notification emails. Substitutes from a map with 3 keys,\n" -" 'bzdir', 'id' (bug id) and 'user' (committer bugzilla " -"email).\n" -" Default depends on version; from 2.18 it is\n" -" \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl %(id)s %" -"(user)s\".\n" -" regexp Regular expression to match bug IDs in changeset commit " -"message.\n" -" Must contain one \"()\" group. The default expression " -"matches\n" -" 'Bug 1234', 'Bug no. 1234', 'Bug number 1234',\n" -" 'Bugs 1234,5678', 'Bug 1234 and 5678' and variations " -"thereof.\n" -" Matching is case insensitive.\n" +" notification emails. Substitutes from a map with 3\n" +" keys, 'bzdir', 'id' (bug id) and 'user' (committer\n" +" bugzilla email). Default depends on version; from 2.18\n" +" it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n" +" %(id)s %(user)s\".\n" +" regexp Regular expression to match bug IDs in changeset commit\n" +" message. Must contain one \"()\" group. The default\n" +" expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n" +" number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n" +" variations thereof. Matching is case insensitive.\n" " style The style file to use when formatting comments.\n" " template Template to use when formatting comments. Overrides\n" " style if specified. In addition to the usual Mercurial\n" " keywords, the extension specifies:\n" " {bug} The Bugzilla bug ID.\n" -" {root} The full pathname of the Mercurial " -"repository.\n" -" {webroot} Stripped pathname of the Mercurial " -"repository.\n" -" {hgweb} Base URL for browsing Mercurial " -"repositories.\n" +" {root} The full pathname of the Mercurial\n" +" repository.\n" +" {webroot} Stripped pathname of the Mercurial\n" +" repository.\n" +" {hgweb} Base URL for browsing Mercurial\n" +" repositories.\n" " Default 'changeset {node|short} in repo {root} refers '\n" " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n" " strip The number of slashes to strip from the front of {root}\n" " to produce {webroot}. Default 0.\n" -" usermap Path of file containing Mercurial committer ID to Bugzilla " -"user\n" -" ID mappings. If specified, the file should contain one " -"mapping\n" -" per line, \"committer\"=\"Bugzilla user\". See also the\n" -" [usermap] section.\n" +" usermap Path of file containing Mercurial committer ID to\n" +" Bugzilla user ID mappings. If specified, the file\n" +" should contain one mapping per line,\n" +" \"committer\"=\"Bugzilla user\". See also the [usermap]\n" +" section.\n" "\n" " [usermap]\n" -" Any entries in this section specify mappings of Mercurial committer ID\n" -" to Bugzilla user ID. See also [bugzilla].usermap.\n" +" Any entries in this section specify mappings of Mercurial\n" +" committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n" " \"committer\"=\"Bugzilla user\"\n" "\n" " [web]\n" -" baseurl Base URL for browsing Mercurial repositories. Reference from\n" -" templates as {hgweb}.\n" +" baseurl Base URL for browsing Mercurial repositories. Reference\n" +" from templates as {hgweb}.\n" "\n" "Activating the extension:\n" "\n" @@ -398,9 +366,9 @@ "\n" "Example configuration:\n" "\n" -"This example configuration is for a collection of Mercurial repositories\n" -"in /var/local/hg/repos/ used with a local Bugzilla 3.2 installation in\n" -"/opt/bugzilla-3.2.\n" +"This example configuration is for a collection of Mercurial\n" +"repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n" +"installation in /opt/bugzilla-3.2.\n" "\n" " [bugzilla]\n" " host=localhost\n" @@ -426,118 +394,58 @@ " Changeset commit comment. Bug 1234.\n" msgstr "" -msgid "support for bugzilla version 2.16." -msgstr "" - #, python-format msgid "connecting to %s:%s as %s, password %s\n" -msgstr "" - -msgid "run a query." -msgstr "" +msgstr "%s:%s に %s として接続しています (パスワード:%s)\n" #, python-format msgid "query: %s %s\n" -msgstr "" +msgstr "問い合わせ: %s %s\n" #, python-format msgid "failed query: %s %s\n" -msgstr "" - -msgid "get identity of longdesc field" -msgstr "" +msgstr "問い合わせに失敗: %s %s\n" msgid "unknown database schema" -msgstr "" - -msgid "filter not-existing bug ids from list." -msgstr "" - -msgid "filter bug ids from list that already refer to this changeset." -msgstr "" +msgstr "未知のデータベーススキーマ" #, python-format msgid "bug %d already knows about changeset %s\n" msgstr "" -msgid "tell bugzilla to send mail." -msgstr "" - msgid "telling bugzilla to send mail:\n" msgstr "" #, python-format msgid " bug %s\n" -msgstr "" +msgstr " バグ %s\n" #, python-format msgid "running notify command %s\n" -msgstr "" +msgstr "通知コマンド %s 実行中\n" #, python-format msgid "bugzilla notify command %s" msgstr "" msgid "done\n" -msgstr "" - -msgid "look up numeric bugzilla user id." -msgstr "" +msgstr "完了\n" #, python-format msgid "looking up user %s\n" -msgstr "" - -msgid "map name of committer to bugzilla user name." -msgstr "" - -msgid "" -"see if committer is a registered bugzilla user. Return\n" -" bugzilla username and userid if so. If not, return default\n" -" bugzilla username and userid." -msgstr "" +msgstr "ユーザ %s を検索しています\n" #, python-format msgid "cannot find bugzilla user id for %s" -msgstr "" +msgstr "%s の buzilla ユーザ ID を見つけることができません" #, python-format msgid "cannot find bugzilla user id for %s or %s" -msgstr "" - -msgid "" -"add comment to bug. try adding comment as committer of\n" -" changeset, otherwise as default bugzilla user." -msgstr "" - -msgid "support for bugzilla 2.18 series." -msgstr "" - -msgid "support for bugzilla 3.0 series." -msgstr "" - -msgid "" -"return object that knows how to talk to bugzilla version in\n" -" use." -msgstr "" +msgstr "%s か %s の buzilla ユーザ ID を見つけることができません" #, python-format msgid "bugzilla version %s not supported" -msgstr "" - -msgid "" -"find valid bug ids that are referred to in changeset\n" -" comments and that do not already have references to this\n" -" changeset." -msgstr "" - -msgid "update bugzilla bug with reference to changeset." -msgstr "" - -msgid "" -"strip leading prefix of repo root and turn into\n" -" url-safe path." -msgstr "" +msgstr "bugzilla のバージョン %s をサポートしていません" msgid "" "changeset {node|short} in repo {root} refers to bug {bug}.\n" @@ -545,15 +453,9 @@ "\t{desc|tabindent}" msgstr "" -msgid "" -"add comment to bugzilla for each changeset that refers to a\n" -" bugzilla bug id. only add a comment once per bug, so same change\n" -" seen multiple times does not fill bug with duplicate data." -msgstr "" - #, python-format msgid "python mysql support not available: %s" -msgstr "" +msgstr "python mysql のサポートが利用できません: %s" #, python-format msgid "hook type %s does not pass a changeset id" @@ -561,48 +463,59 @@ #, python-format msgid "database error: %s" -msgstr "" - -msgid "" -"show the children of the given or working dir revision\n" -"\n" -" Print the children of the working directory's revisions.\n" -" If a revision is given via --rev, the children of that revision\n" -" will be printed. If a file argument is given, revision in\n" -" which the file was last changed (after the working directory\n" -" revision or the argument to --rev if given) is printed.\n" -" " -msgstr "" - -msgid "show children of the specified rev" -msgstr "" +msgstr "データベースエラー: %s" + +msgid "display children changesets" +msgstr "子チェンジセットの表示" + +msgid "" +"show the children of the given or working directory revision\n" +"\n" +" Print the children of the working directory's revisions. If a\n" +" revision is given via -r/--rev, the children of that revision will\n" +" be printed. If a file argument is given, revision in which the\n" +" file was last changed (after the working directory revision or the\n" +" argument to --rev if given) is printed.\n" +" " +msgstr "" +"指定リビジョンの子リビジョンの表示\n" +"\n" +" 作業領域の子リビジョンを表示します。-r/--rev によるリビジョン指定が\n" +" ある場合は、指定リビジョンの子リビジョンを表示します。引数として\n" +" ファイルが指定された場合、ファイルが(作業領域のリビジョンないし\n" +" --rev で指定されたリビジョンの後で)最後に変更されたリビジョンを表示\n" +" します。\n" +" " + +msgid "show children of the specified revision" +msgstr "指定リビジョンの子リビジョンの表示" msgid "hg children [-r REV] [FILE]" -msgstr "" - -msgid "command to show certain statistics about revision history" -msgstr "" - -msgid "Calculate stats" -msgstr "" +msgstr "hg children [-r REV] [FILE]" + +msgid "display statistics about repository history" +msgstr "変更履歴の統計情報の表示コマンド" #, python-format msgid "Revision %d is a merge, ignoring...\n" -msgstr "" - -#, python-format -msgid "\rgenerating stats: %d%%" -msgstr "" - -msgid "" -"graph count of revisions grouped by template\n" -"\n" -" Will graph count of changed lines or revisions grouped by template or\n" -" alternatively by date, if dateformat is used. In this case it will " -"override\n" -" template.\n" -"\n" -" By default statistics are counted for number of changed lines.\n" +msgstr "マージ実施リビジョン %d を無視...\n" + +#, python-format +msgid "generating stats: %d%%" +msgstr "統計作業中: %d%%" + +msgid "" +"histogram of changes to the repository\n" +"\n" +" This command will display a histogram representing the number\n" +" of changed lines or revisions, grouped according to the given\n" +" template. The default template will group changes by author.\n" +" The --dateformat option may be used to group the results by\n" +" date instead.\n" +"\n" +" Statistics are based on the number of changed lines, or\n" +" alternatively the number of matching revisions if the\n" +" --changesets option is specified.\n" "\n" " Examples:\n" "\n" @@ -618,61 +531,96 @@ " # display count of lines changed in every year\n" " hg churn -f '%Y' -s\n" "\n" -" The map file format used to specify aliases is fairly simple:\n" -"\n" -" <alias email> <actual email>" -msgstr "" +" It is possible to map alternate email addresses to a main address\n" +" by providing a file using the following format:\n" +"\n" +" <alias email> <actual email>\n" +"\n" +" Such a file may be specified with the --aliases option, otherwise a\n" +" .hgchurn file will be looked for in the working directory root.\n" +" " +msgstr "" +"リポジトリにおける変更の統計分布表示\n" +"\n" +" 本コマンドは、変更行数ないしリビジョン数の度数分布を、テンプレート\n" +" 指定ないし日時によってグループ化したものをグラフ表示します。特に\n" +" 指定の無い場合、リビジョン作成者毎に変更行数をグループ化します。\n" +" --dateformat が指定された場合、度数分布は日時でグループ化されます。\n" +"\n" +" 特に指定の無い場合、度数分布の統計対象は変更行数となりますが、\n" +" --changesets が指定された場合は、対象リビジョンの数が統計対象と\n" +" なります。\n" +"\n" +" 例:\n" +"\n" +" # ユーザ毎の変更行数の表示\n" +" hg churn -t '{author|email}'\n" +"\n" +" # 日毎の活発度(コミット実施数)を表示\n" +" hg churn -f '%H' -s -c\n" +"\n" +" # 月毎の活発度を表示\n" +" hg churn -f '%Y-%m' -s -c\n" +"\n" +" # 年毎の変更行数を表示\n" +" hg churn -f '%Y' -s\n" +"\n" +" 以下の形式のファイルを指定することで、リビジョンに記録された電子\n" +" メールアドレスを別のものに変換することが可能です:\n" +"\n" +" <別名> <実名>\n" +"\n" +" 上記形式のファイルは、--aliases が指定された場合は指定された\n" +" ファイルが読み込まれますが、特に指定が無い場合、リポジトリのルート\n" +" 直下に .hgchurn というファイルがあれば、これが使用されます。\n" +" " #, python-format msgid "assuming %i character terminal\n" -msgstr "" +msgstr "画面の横幅を %i 文字と仮定\n" msgid "count rate for the specified revision or range" -msgstr "" - -msgid "count rate for revs matching date spec" -msgstr "" +msgstr "処理対象とする特定リビジョン／範囲の指定" + +msgid "count rate for revisions matching date spec" +msgstr "指定日時と一致したリビジョンを処理対象とする" msgid "template to group changesets" -msgstr "" +msgstr "表示をグループ化するためのテンプレート" msgid "strftime-compatible format for grouping by date" -msgstr "" +msgstr "日時グループ化のための strftime 互換形式フォーマット" msgid "count rate by number of changesets" -msgstr "" +msgstr "チェンジセット数で統計" msgid "sort by key (default: sort by count)" -msgstr "" +msgstr "キーによる整列(無指定時: 統計量で整列)" msgid "file with email aliases" -msgstr "" +msgstr "ユーザ名変換用ファイル" msgid "show progress" -msgstr "" +msgstr "進捗状況の表示" msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]" -msgstr "" - -msgid "" -"add color output to status, qseries, and diff-related commands\n" -"\n" -"This extension modifies the status command to add color to its output to\n" -"reflect file status, the qseries command to add color to reflect patch " -"status\n" -"(applied, unapplied, missing), and to diff-related commands to highlight\n" -"additions, removals, diff headers, and trailing whitespace.\n" -"\n" -"Other effects in addition to color, like bold and underlined text, are also\n" -"available. Effects are rendered with the ECMA-48 SGR control function (aka\n" -"ANSI escape codes). This module also provides the render_text function,\n" -"which can be used to add effects to any text.\n" -"\n" -"To enable this extension, add this to your .hgrc file:\n" -"[extensions]\n" -"color =\n" -"\n" -"Default effects my be overriden from the .hgrc file:\n" +msgstr "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]" + +msgid "" +"colorize output from some commands\n" +"\n" +"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" +"patch status (applied, unapplied, missing), and to diff-related\n" +"commands to highlight additions, removals, diff headers, and trailing\n" +"whitespace.\n" +"\n" +"Other effects in addition to color, like bold and underlined text, are\n" +"also available. Effects are rendered with the ECMA-48 SGR control\n" +"function (aka ANSI escape codes). This module also provides the\n" +"render_text function, which can be used to add effects to any text.\n" +"\n" +"Default effects may be overridden from the .hgrc file:\n" "\n" "[color]\n" "status.modified = blue bold underline red_background\n" @@ -701,38 +649,14 @@ "diff.trailingwhitespace = bold red_background\n" msgstr "" -msgid "Wrap text in commands to turn on each effect." -msgstr "" - -msgid "run the status command with colored output" -msgstr "" - -msgid "run the qseries command with colored output" -msgstr "" - -msgid "wrap ui.write for colored diff output" -msgstr "" - -msgid "wrap cmdutil.changeset_printer.showpatch with colored output" -msgstr "" - -msgid "run the diff command with colored output" -msgstr "" - -msgid "Initialize the extension." -msgstr "" - -msgid "patch in command to command table and load effect map" -msgstr "" - msgid "when to colorize (always, auto, or never)" msgstr "" msgid "don't colorize output" -msgstr "" - -msgid "converting foreign VCS repositories to Mercurial" -msgstr "" +msgstr "出力を色づけ市内" + +msgid "import from foreign VCS repositories into Mercurial" +msgstr "外部 VCS リポジトリから Mercurial への取り込み" msgid "" "convert a foreign SCM repository to a Mercurial one.\n" @@ -752,33 +676,44 @@ " - Mercurial [hg]\n" " - Subversion [svn] (history on branches is not preserved)\n" "\n" -" If no revision is given, all revisions will be converted. Otherwise,\n" -" convert will only import up to the named revision (given in a format\n" -" understood by the source).\n" +" If no revision is given, all revisions will be converted.\n" +" Otherwise, convert will only import up to the named revision\n" +" (given in a format understood by the source).\n" "\n" " 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.\n" "\n" +" By default, all sources except Mercurial will use\n" +" --branchsort. Mercurial uses --sourcesort to preserve original\n" +" revision numbers order. Sort modes have the following effects:\n" +" --branchsort: convert from parent to child revision when\n" +" possible, which means branches are usually converted one after\n" +" the other. It generates more compact repositories.\n" +" --datesort: sort revisions by date. Converted repositories have\n" +" good-looking changelogs but are often an order of magnitude\n" +" larger than the same ones generated by --branchsort.\n" +" --sourcesort: try to preserve source revisions order, only\n" +" supported by Mercurial sources.\n" +"\n" " If <REVMAP> isn't given, it will be put in a default location\n" -" (<dest>/.hg/shamap by default). The <REVMAP> is a simple text\n" -" file that maps each source commit ID to the destination ID for\n" -" that revision, like so:\n" +" (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n" +" that maps each source commit ID to the destination ID for that\n" +" revision, like so:\n" " <source ID> <destination ID>\n" "\n" -" If the file doesn't exist, it's automatically created. It's updated\n" -" on each commit copied, so convert-repo can be interrupted and can\n" -" be run repeatedly to copy new commits.\n" -"\n" -" The [username mapping] file is a simple text file that maps each source\n" -" commit 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 author\n" -" mapping and the line format is:\n" +" 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" +" and can be run repeatedly to copy new commits.\n" +"\n" +" 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\n" "\n" " The filemap is a file that allows filtering and remapping of files\n" -" and directories. Comment lines start with '#'. Each line can\n" +" and directories. Comment lines start with '#'. Each line can\n" " contain one of the following directives:\n" "\n" " include path/to/file\n" @@ -789,33 +724,44 @@ "\n" " 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 dirs not explicitely included.\n" +" exclusion of all other files and directories not explicitly included.\n" " The 'exclude' directive causes files or directories to be omitted.\n" -" The 'rename' directive renames a file or directory. To rename from a\n" -" subdirectory into the root of the repository, use '.' as the path to\n" -" rename to.\n" +" The 'rename' directive renames a file or directory. To rename from\n" +" a subdirectory into the root of the repository, use '.' as the\n" +" path to rename to.\n" "\n" " The splicemap is a file that allows insertion of synthetic\n" -" history, letting you specify the parents of a revision. This is\n" +" history, letting you specify the parents of a revision. This is\n" " 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" +" graft two disconnected series of history together. Each entry\n" " contains a key, followed by a space, followed by one or two\n" -" values, separated by spaces. The key is the revision ID in the\n" -" source revision control system whose parents should be modified\n" -" (same format as a key in .hg/shamap). The values are the revision\n" -" IDs (in either the source or destination revision control system)\n" -" that should be used as the new parents for that node.\n" +" comma-separated values. 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.\n" +"\n" +" The branchmap is a file that allows you to rename a branch when it is\n" +" being brought in from whatever external repository. When used in\n" +" 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.\n" "\n" " Mercurial Source\n" " -----------------\n" "\n" -" --config convert.hg.ignoreerrors=False (boolean)\n" +" --config convert.hg.ignoreerrors=False (boolean)\n" " ignore integrity errors when reading. Use it to fix Mercurial\n" " repositories with missing revlogs, by converting from and to\n" " Mercurial.\n" -" --config convert.hg.saverev=False (boolean)\n" -" store original revision ID in changeset (forces target IDs to " -"change)\n" +" --config convert.hg.saverev=False (boolean)\n" +" store original revision ID in changeset (forces target IDs to\n" +" change)\n" " --config convert.hg.startrev=0 (hg revision identifier)\n" " convert start revision and its descendants\n" "\n" @@ -824,12 +770,12 @@ "\n" " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" " to indicate the starting point of what will be converted. Direct\n" -" access to the repository files is not needed, unless of course\n" -" the repository is :local:. The conversion uses the top level\n" -" directory in the sandbox to find the CVS repository, and then uses\n" -" CVS rlog commands to find files to convert. This means that unless\n" -" a filemap is given, all files under the starting directory will be\n" -" converted, and that any directory reorganisation in the CVS\n" +" access to the repository files is not needed, unless of course the\n" +" repository is :local:. The conversion uses the top level directory\n" +" in the sandbox to find the CVS repository, and then uses CVS rlog\n" +" commands to find files to convert. This means that unless a\n" +" filemap is given, all files under the starting directory will be\n" +" converted, and that any directory reorganization in the CVS\n" " sandbox is ignored.\n" "\n" " Because CVS does not have changesets, it is necessary to collect\n" @@ -837,46 +783,52 @@ " source uses its internal changeset merging code by default but can\n" " be configured to call the external 'cvsps' program by setting:\n" " --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n" -" This is a legacy option and may be removed in future.\n" +" This option is deprecated and will be removed in Mercurial 1.4.\n" "\n" " The options shown are the defaults.\n" "\n" " Internal cvsps is selected by setting\n" " --config convert.cvsps=builtin\n" " and has a few more configurable options:\n" -" --config convert.cvsps.fuzz=60 (integer)\n" -" Specify the maximum time (in seconds) that is allowed between\n" -" commits with identical user and log message in a single\n" -" changeset. When very large files were checked in as part\n" -" of a changeset then the default may not be long enough.\n" +" --config convert.cvsps.cache=True (boolean)\n" +" Set to False to disable remote log caching, for testing and\n" +" debugging purposes.\n" +" --config convert.cvsps.fuzz=60 (integer)\n" +" Specify the maximum time (in seconds) that is allowed\n" +" between commits with identical user and log message in a\n" +" single changeset. When very large files were checked in as\n" +" part of a changeset then the default may not be long\n" +" enough.\n" " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" -" Specify a regular expression to which commit log messages are\n" -" matched. If a match occurs, then the conversion process will\n" -" insert a dummy revision merging the branch on which this log\n" -" message occurs to the branch indicated in the regex.\n" +" Specify a regular expression to which commit log messages\n" +" are matched. If a match occurs, then the conversion\n" +" process will insert a dummy revision merging the branch on\n" +" which this log message occurs to the branch indicated in\n" +" the regex.\n" " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" -" 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.\n" -"\n" -" The hgext/convert/cvsps wrapper script allows the builtin changeset\n" -" merging code to be run without doing a conversion. Its parameters and\n" -" output are similar to that of cvsps 2.1.\n" +" Specify a regular expression to which commit log messages\n" +" are matched. If a match occurs, then the conversion\n" +" process will add the most recent revision on the branch\n" +" indicated in the regex as the second parent of the\n" +" changeset.\n" +"\n" +" The hgext/convert/cvsps wrapper script allows the builtin\n" +" changeset merging code to be run without doing a conversion. Its\n" +" parameters and output are similar to that of cvsps 2.1.\n" "\n" " Subversion Source\n" " -----------------\n" "\n" " Subversion source detects classical trunk/branches/tags layouts.\n" " By default, the supplied \"svn://repo/path/\" source URL is\n" -" converted as a single branch. If \"svn://repo/path/trunk\" exists\n" -" it replaces the default branch. If \"svn://repo/path/branches\"\n" -" exists, its subdirectories are listed as possible branches. If\n" +" converted as a single branch. If \"svn://repo/path/trunk\" exists it\n" +" replaces the default branch. If \"svn://repo/path/branches\" exists,\n" +" its subdirectories are listed as possible branches. If\n" " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n" " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n" -" can be overriden with following options. Set them to paths\n" -" relative to the source URL, or leave them blank to disable\n" -" autodetection.\n" +" can be overridden with following options. Set them to paths\n" +" relative to the source URL, or leave them blank to disable auto\n" +" detection.\n" "\n" " --config convert.svn.branches=branches (directory name)\n" " specify the directory containing branches\n" @@ -895,17 +847,17 @@ " Perforce Source\n" " ---------------\n" "\n" -" The Perforce (P4) importer can be given a p4 depot path or a client\n" -" specification as source. It will convert all files in the source to\n" -" a flat Mercurial repository, ignoring labels, branches and " -"integrations.\n" -" Note that when a depot path is given you then usually should specify a\n" -" target directory, because otherwise the target may be named ...-hg.\n" -"\n" -" It is possible to limit the amount of source history to be converted\n" -" by specifying an initial Perforce revision.\n" -"\n" -" --config convert.p4.startrev=0 (perforce changelist number)\n" +" The Perforce (P4) importer can be given a p4 depot path or a\n" +" client specification as source. It will convert all files in the\n" +" source to a flat Mercurial repository, ignoring labels, branches\n" +" and integrations. Note that when a depot path is given you then\n" +" usually should specify a target directory, because otherwise the\n" +" target may be named ...-hg.\n" +"\n" +" It is possible to limit the amount of source history to be\n" +" converted by specifying an initial Perforce revision.\n" +"\n" +" --config convert.p4.startrev=0 (perforce changelist number)\n" " specify initial Perforce revision.\n" "\n" "\n" @@ -925,500 +877,549 @@ msgid "" "create changeset information from CVS\n" "\n" -" This command is intended as a debugging tool for the CVS to Mercurial\n" -" converter, and can be used as a direct replacement for cvsps.\n" -"\n" -" Hg debugcvsps reads the CVS rlog for current directory (or any named\n" -" directory) in the CVS repository, and converts the log to a series of\n" -" changesets based on matching commit log entries and dates." -msgstr "" +" This command is intended as a debugging tool for the CVS to\n" +" Mercurial converter, and can be used as a direct replacement for\n" +" cvsps.\n" +"\n" +" Hg debugcvsps reads the CVS rlog for current directory (or any\n" +" named directory) in the CVS repository, and converts the log to a\n" +" series of changesets based on matching commit log entries and\n" +" dates." +msgstr "" +"CVS からのチェンジセット情報作成\n" +"\n" +" 本コマンドの位置付けは、CVS から Mercurial への変換におけるデバッグ\n" +" ツールであり、cvsps の代替ツールとして使用可能です。\n" +"\n" +" 本コマンドは、現ディレクトリ(ないし指定ディレクトリ)中の CVS rlog を\n" +" 読み込み、コミットログの内容と日付を元に推測されるチェンジセットへと\n" +" 変換します。" msgid "username mapping filename" -msgstr "" +msgstr "ユーザ名対応付けファイルの指定" msgid "destination repository type" -msgstr "" +msgstr "変換先のリポジトリ種別" msgid "remap file names using contents of file" -msgstr "" +msgstr "変換時のファイル名変換用ファイル" msgid "import up to target revision REV" -msgstr "" +msgstr "指定リビジョンまでの取り込み" msgid "source repository type" -msgstr "" +msgstr "変換元リポジトリ種別" msgid "splice synthesized history into place" -msgstr "" +msgstr "履歴の合成" + +msgid "change branch names while converting" +msgstr "変換時のブランチ名変換用ファイル" + +msgid "try to sort changesets by branches" +msgstr "ブランチによるチェンジセットの並び替えを試す" msgid "try to sort changesets by date" -msgstr "" +msgstr "日付によるチェンジセットの並び替えを試す" + +msgid "preserve source changesets order" +msgstr "元リポジトリでのチェンジセット並び順を尊重" msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]" -msgstr "" +msgstr "hg convert [OPTION]... SOURCE [DEST [REVMAP]]" msgid "only return changes on specified branches" -msgstr "" +msgstr "指定ブランチのみの変換" msgid "prefix to remove from file names" -msgstr "" +msgstr "ファイル名から除外する接頭辞" msgid "only return changes after or between specified tags" -msgstr "" +msgstr "指定リビジョンのみの変換" msgid "update cvs log cache" -msgstr "" +msgstr "cvs ログキャッシュの更新" msgid "create new cvs log cache" -msgstr "" +msgstr "cvs ログキャッシュの新規作成" msgid "set commit time fuzz in seconds" -msgstr "" +msgstr "秒の位が不明な日時に設定する秒値" msgid "specify cvsroot" -msgstr "" +msgstr "cvsroot の指定" msgid "show parent changesets" -msgstr "" +msgstr "親チェンジセットの表示" msgid "show current changeset in ancestor branches" -msgstr "" +msgstr "祖先のブランチにおける現行チェンジセットの表示" msgid "ignored for compatibility" -msgstr "" +msgstr "※ 後方互換性のためのオプション" msgid "hg debugcvsps [OPTION]... [PATH]..." -msgstr "" +msgstr "hg debugcvsps [OPTION]... [PATH]..." + +msgid "" +"warning: lightweight checkouts may cause conversion failures, try with a " +"regular branch instead.\n" +msgstr "警告: 簡易チェックアウトは失敗要因となるため通常ブランチを使います\n" + +msgid "bzr source type could not be determined\n" +msgstr "変換元の種別が bzr であると特定できません\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" -msgstr "" +msgstr "%s は %s において存在しません" + +#, python-format +msgid "%s.%s symlink has no target" +msgstr "%s.%s はシンボリックリンク先がありません" #, python-format msgid "cannot find required \"%s\" tool" -msgstr "" +msgstr "要求されたツール '%s' を見つけることができません" #, python-format msgid "running: %s\n" -msgstr "" +msgstr "実行しています: %s\n" #, python-format msgid "%s error:\n" -msgstr "" +msgstr "%s エラー:\n" #, python-format msgid "%s %s" -msgstr "" +msgstr "%s %s" + +#, python-format +msgid "syntax error in %s(%d): key/value pair expected" +msgstr "%s(%d) での文法エラー: key/value の組が必要です" #, python-format msgid "could not open map file %r: %s" -msgstr "" +msgstr "変換ファイル %r を開くことができません: %s" #, python-format msgid "%s: missing or unsupported repository" -msgstr "" +msgstr "%s: リポジトリが見つからないか、サポートされていない形式です" #, python-format msgid "convert: %s\n" -msgstr "" +msgstr "変換: %s\n" #, python-format msgid "%s: unknown repository type" -msgstr "" +msgstr "%s: 未知のリポジトリ形式" + +#, python-format +msgid "unknown sort mode: %s" +msgstr "未知の整列方式 %s" #, python-format msgid "cycle detected between %s and %s" -msgstr "" +msgstr "%s と %s の間で巡回を検出しました" msgid "not all revisions were sorted" -msgstr "" +msgstr "格納されていないリビジョンがあります" #, python-format msgid "Writing author map file %s\n" -msgstr "" - -#, python-format -msgid "Overriding mapping for author %s, was %s, will be %s\n" -msgstr "" +msgstr "作成者名変換ファイル %s への書き込み中\n" + +#, python-format +msgid "Ignoring bad line in author map file %s: %s\n" +msgstr "作成者名変換ファイル %s の不正な行を無視: %s\n" #, python-format msgid "mapping author %s to %s\n" -msgstr "" - -#, python-format -msgid "Ignoring bad line in author map file %s: %s\n" -msgstr "" +msgstr "作成者 %s を %s に変換\n" + +#, python-format +msgid "overriding mapping for author %s, was %s, will be %s\n" +msgstr "作成者 %s の %s への変換を、%s への変換で上書きします\n" #, python-format msgid "spliced in %s as parents of %s\n" -msgstr "" +msgstr "%s を %s の親として合成\n" msgid "scanning source...\n" -msgstr "" +msgstr "変換元リポジトリの走査中...\n" msgid "sorting...\n" -msgstr "" +msgstr "並べ替え中...\n" msgid "converting...\n" -msgstr "" +msgstr "変換中...\n" #, python-format msgid "source: %s\n" -msgstr "" +msgstr "変換元: %s\n" #, python-format msgid "assuming destination %s\n" -msgstr "" +msgstr "変換先として %s を想定\n" + +msgid "more than one sort mode specified" +msgstr "整列オプションの指定が過剰です" + +msgid "--sourcesort is not supported by this data source" +msgstr "指定の変換元では --sourcesort を指定できません" + +msgid "" +"warning: support for external cvsps is deprecated and will be removed in " +"Mercurial 1.4\n" +msgstr "警告: 外部 cvsps は Mercurial 1.4 でサポート打ち切り予定です\n" #, python-format msgid "revision %s is not a patchset number or date" -msgstr "" +msgstr "%s はリビジョン名でも日付でもありません" msgid "using builtin cvsps\n" -msgstr "" +msgstr "組み込み cvsps を使用します\n" #, python-format msgid "connecting to %s\n" -msgstr "" +msgstr "%s へ接続中\n" msgid "CVS pserver authentication failed" -msgstr "" +msgstr "CVS pserver の認証に失敗" msgid "server sucks" -msgstr "" +msgstr "サーバ応答が不正です" #, python-format msgid "%d bytes missing from remote file" -msgstr "" +msgstr "リモートファイルと %d バイト違います" #, 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" #, python-format msgid "reading cvs log cache %s\n" -msgstr "" +msgstr "CVS ログキャッシュ %s 読み込み中\n" #, python-format msgid "cache has %d log entries\n" -msgstr "" +msgstr "キャッシュには %d 件のログエントリがあります\n" #, python-format msgid "error reading cache: %r\n" -msgstr "" +msgstr "キャッシュ読み込みの失敗: %r\n" #, python-format msgid "running %s\n" -msgstr "" +msgstr "%s の実行中\n" #, python-format msgid "prefix=%r directory=%r root=%r\n" -msgstr "" +msgstr "接頭辞=%r ディレクトリ=%r ルート=%r\n" msgid "RCS file must be followed by working file" -msgstr "" +msgstr "RCS ファイルはワーキングファイル情報を伴う筈です" msgid "must have at least some revisions" -msgstr "" +msgstr "リビジョン指定が足りません" msgid "expected revision number" -msgstr "" +msgstr "リビジョン番号がありません" msgid "revision must be followed by date line" -msgstr "" +msgstr "リビジョン情報は日付情報を伴う筈です" + +#, python-format +msgid "found synthetic revision in %s: %r\n" +msgstr "%s で合成リビジョン %r を検出\n" #, python-format msgid "writing cvs log cache %s\n" -msgstr "" +msgstr "cvs ログキャッシュ %s の書き込み中\n" #, python-format msgid "%d log entries\n" -msgstr "" +msgstr "%d 件のログエントリ\n" msgid "creating changesets\n" -msgstr "" +msgstr "チェンジセット作成中\n" + +msgid "synthetic changeset cannot have multiple parents" +msgstr "合成チェンジセットは複数の親をもてません" + +#, python-format +msgid "" +"warning: CVS commit message references non-existent branch %r:\n" +"%s\n" +msgstr "" +"警告: CVS コミットメッセージが未知のブランチ %r を参照しています:\n" +"%s\n" #, python-format msgid "%d changeset entries\n" -msgstr "" +msgstr "%d 件のチェンジセットエントリ\n" msgid "Python ElementTree module is not available" -msgstr "" +msgstr "Python の ElementTree モジュールが利用できません" #, python-format msgid "cleaning up %s\n" -msgstr "" +msgstr "%s を整理中\n" msgid "internal calling inconsistency" -msgstr "" +msgstr "内部不整合" msgid "errors in filemap" -msgstr "" +msgstr "ファイルマップでの解析エラー" #, python-format msgid "%s:%d: %r already in %s list\n" -msgstr "" +msgstr "%s:%d: %r は既に %s 中にあります\n" #, python-format msgid "%s:%d: unknown directive %r\n" -msgstr "" +msgstr "%s:%d: %r は未知のディレクティブです\n" msgid "source repository doesn't support --filemap" -msgstr "" +msgstr "変換元リポジトリは --filemap をサポートしていません" #, python-format msgid "%s does not look like a GNU Arch repo" -msgstr "" +msgstr "%s は GNU Arch 形式ではないと思われます" msgid "cannot find a GNU Arch tool" -msgstr "" +msgstr "GNU Arch ツールを見つけることができません" #, python-format msgid "analyzing tree version %s...\n" -msgstr "" +msgstr "ツリーバージョン %s の解析中...\n" #, python-format msgid "" "tree analysis stopped because it points to an unregistered archive %s...\n" -msgstr "" +msgstr "未登録アーカイブ %s の参照によりツリー解析を中断...\n" #, python-format msgid "applying revision %s...\n" -msgstr "" +msgstr "リビジョン %s の適用中...\n" #, python-format msgid "computing changeset between %s and %s...\n" -msgstr "" +msgstr "%s と %s との間のチェンジセットを算出中...\n" #, python-format msgid "obtaining revision %s...\n" -msgstr "" - -#, python-format -msgid "analysing revision %s...\n" -msgstr "" +msgstr "リビジョン %s の取得中...\n" + +#, python-format +msgid "analyzing revision %s...\n" +msgstr "リビジョン %s の解析中...\n" #, python-format msgid "could not parse cat-log of %s" -msgstr "" +msgstr "リビジョン %s の cat-log の解析に失敗" #, python-format msgid "%s is not a local Mercurial repo" -msgstr "" +msgstr "%s はローカルの Mercurial リポジトリではありません" #, python-format msgid "initializing destination %s repository\n" -msgstr "" +msgstr "変換先リポジトリ %s の初期化中\n" msgid "run hg sink pre-conversion action\n" -msgstr "" +msgstr "変換先での前処理を実施\n" msgid "run hg sink post-conversion action\n" -msgstr "" +msgstr "変換先での後処理を実施\n" #, python-format msgid "pulling from %s into %s\n" -msgstr "" +msgstr "%s から %s に取り込み中\n" + +msgid "filtering out empty revision\n" +msgstr "空リビジョンの除外中\n" 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 "" +msgstr "例外を無視します: %s\n" msgid "run hg source pre-conversion action\n" -msgstr "" +msgstr "変換元での前処理を実施\n" msgid "run hg source post-conversion action\n" -msgstr "" +msgstr "変換元での後処理を実施\n" #, python-format msgid "%s does not look like a monotone repo" -msgstr "" - -#, python-format -msgid "copying file in renamed dir from '%s' to '%s'" -msgstr "" +msgstr "%s は monotone のリポジトリとは思われません" + +#, python-format +msgid "copying file in renamed directory from '%s' to '%s'" +msgstr "改名先ディレクトリの '%s' から '%s' へファイルを複製中" msgid "reading p4 views\n" -msgstr "" +msgstr "p4 ビューの読み込み中\n" msgid "collecting p4 changelists\n" -msgstr "" +msgstr "p4 チェンジリストの収集中\n" msgid "Subversion python bindings could not be loaded" -msgstr "" +msgstr "Subversion python バインディングが読み込めません" #, python-format msgid "Subversion python bindings %d.%d found, 1.4 or later required" -msgstr "" +msgstr "Subversion python バインディングは 1.4 以上が必要です(%d.%d を検出)" msgid "Subversion python bindings are too old, 1.4 or later required" -msgstr "" +msgstr "Subversion python バインディングは 1.4 以上が必要です" #, 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" -msgstr "" +msgstr "%s が %r にありません" #, 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 "" - -msgid "svn: start revision is not supported with with more than one branch" -msgstr "" +msgstr "ブランチ %s を %d で見つけました\n" + +msgid "svn: start revision is not supported with more than one branch" +msgstr "svn: 複数ブランチに対する開始リビジョンは未サポートです" #, python-format msgid "svn: no revision found after start revision %d" -msgstr "" +msgstr "svn: 開始リビジョン %d 以降にリビジョンはありません" #, python-format msgid "no tags found at revision %d\n" -msgstr "" +msgstr "リビジョン %d にタグはありません\n" #, python-format msgid "ignoring foreign branch %r\n" -msgstr "" +msgstr "外部ブランチ %r を無視します\n" #, python-format msgid "%s not found up to revision %d" -msgstr "" +msgstr "リビジョン %s は %d までのりビジョンに見当たりません" #, python-format msgid "branch renamed from %s to %s at %d\n" -msgstr "" +msgstr "ブランチ %s から %s への %d における改名\n" #, python-format msgid "reparent to %s\n" -msgstr "" +msgstr "%s へのリペアレント\n" #, python-format msgid "copied to %s from %s@%s\n" -msgstr "" +msgstr "%s に %s@%s から複製\n" #, python-format msgid "gone from %s\n" -msgstr "" - -#, python-format -msgid "found parent directory %s\n" -msgstr "" - -#, python-format -msgid "base, entry %s %s\n" -msgstr "" - -msgid "munge-o-matic\n" -msgstr "" - -#, python-format -msgid "info: %s %s %s %s\n" -msgstr "" +msgstr "%s を去ります\n" + +#, python-format +msgid "entry %s\n" +msgstr "エントリ=%s\n" #, python-format msgid "unknown path in revision %d: %s\n" -msgstr "" +msgstr "リビジョン %d に未知のパス: %s\n" #, python-format msgid "mark %s came from %s:%d\n" -msgstr "" +msgstr "%s を %s:%d 由来とみなす\n" #, python-format msgid "parsing revision %d (%d changes)\n" -msgstr "" +msgstr "リビジョン %d の解析中(%d 件の変更)\n" #, python-format msgid "found parent of branch %s at %d: %s\n" -msgstr "" +msgstr "ブランチ %s の親を %d:%s で検出\n" msgid "no copyfrom path, don't know what to do.\n" -msgstr "" +msgstr "複製元パスが不明なため、対処不能\n" #, python-format msgid "fetching revision log for \"%s\" from %d to %d\n" -msgstr "" - -#, python-format -msgid "skipping blacklisted revision %d\n" -msgstr "" +msgstr "\"%s\" の変更履歴(%d から %d)の先読み中\n" #, python-format msgid "revision %d has no entries\n" -msgstr "" +msgstr "リビジョン %d はエントリを持っていません\n" #, python-format msgid "svn: branch has no revision %s" -msgstr "" +msgstr "svn: ブランチにはリビジョン %s がありません" #, python-format msgid "%r is not under %r, ignoring\n" -msgstr "" +msgstr "%r は %r 配下にないため無視します\n" #, python-format msgid "initializing svn repo %r\n" -msgstr "" +msgstr "svn リポジトリ %r の初期化中\n" #, python-format msgid "initializing svn wc %r\n" -msgstr "" +msgstr "svn ワーキングコピー %r を初期化しています\n" msgid "unexpected svn output:\n" -msgstr "" +msgstr "予期せぬ svn の出力:\n" msgid "unable to cope with svn output" -msgstr "" +msgstr "予期せぬ svn 出力のため継続できません" msgid "XXX TAGS NOT IMPLEMENTED YET\n" -msgstr "" - -msgid "" +msgstr "XXX タグ付けはまだ実装されていません\n" + +msgid "" +"allow external programs to compare revisions\n" "\n" "The `extdiff' Mercurial extension allows you to use external programs\n" -"to compare revisions, or revision with working dir. The external diff\n" +"to compare revisions, or revision with working directory. The external diff\n" "programs are called with a configurable set of options and two\n" "non-option arguments: paths to directories containing snapshots of\n" "files to compare.\n" "\n" -"To enable this extension:\n" -"\n" -" [extensions]\n" -" hgext.extdiff =\n" -"\n" "The `extdiff' extension also allows to configure new diff commands, so\n" "you do not need to type \"hg extdiff -p kdiff3\" always.\n" "\n" @@ -1436,47 +1437,28 @@ " meld =\n" "\n" " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n" -" #(see http://www.vim.org/scripts/script.php?script_id=102)\n" -" # Non english user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" " +" # (see http://www.vim.org/scripts/script.php?script_id=102)\n" +" # Non English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" " "in\n" " # your .vimrc\n" " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n" "\n" -"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 "" - -msgid "snapshot files as of some revision" +"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" msgstr "" #, python-format msgid "making snapshot of %d files from rev %s\n" msgstr "" -msgid "" -"snapshot files from working directory.\n" -" if not using snapshot, -I/-X does not work and recursive diff\n" -" in tools like kdiff3 and meld displays too many files." -msgstr "" - -#, python-format -msgid "making snapshot of %d files from working dir\n" -msgstr "" - -msgid "" -"Do the actuall diff:\n" -"\n" -" - copy to a temp structure if diffing 2 internal revisions\n" -" - copy to a temp structure if diffing working revision with\n" -" another one and more than 1 file is changed\n" -" - just invoke the diff for a single file in the working dir\n" -" " +#, python-format +msgid "making snapshot of %d files from working directory\n" msgstr "" msgid "cannot specify --rev and --change at the same time" -msgstr "" +msgstr "--rev と --change は同時には指定出来ません" #, python-format msgid "running %r in %s\n" @@ -1487,25 +1469,25 @@ msgstr "" msgid "cleaning up temp directory\n" -msgstr "" +msgstr "一時ディレクトリの整理をしています\n" msgid "" "use external program to diff repository (or selected files)\n" "\n" " Show differences between revisions for the specified files, using\n" -" an external program. The default program used is diff, with\n" +" an external program. The default program used is diff, with\n" " default options \"-Npru\".\n" "\n" -" To select a different program, use the -p option. The program\n" -" will be passed the names of two directories to compare. To pass\n" -" additional options to the program, use the -o option. These will\n" -" be passed before the names of the directories to compare.\n" -"\n" -" When two revision arguments are given, then changes are\n" -" shown between those revisions. If only one revision is\n" -" specified then that revision is compared to the working\n" -" directory, and, when no revisions are specified, the\n" -" working directory files are compared to its parent." +" To select a different program, use the -p/--program option. The\n" +" program will be passed the names of two directories to compare. To\n" +" pass additional options to the program, use -o/--option. These\n" +" will be passed before the names of the directories to compare.\n" +"\n" +" When two revision arguments are given, then changes are shown\n" +" between those revisions. If only one revision is specified then\n" +" that revision is compared to the working directory, and, when no\n" +" revisions are specified, the working directory files are compared\n" +" to its parent." msgstr "" msgid "comparison program to run" @@ -1515,19 +1497,16 @@ msgstr "" msgid "change made by revision" -msgstr "" +msgstr "当該リビジョンにおける変更内容の表示" msgid "hg extdiff [OPT]... [FILE]..." msgstr "" -msgid "use closure to save diff command to use" -msgstr "" - #, python-format msgid "hg %s [OPTION]... [FILE]..." msgstr "" -msgid "pulling, updating and merging in one command" +msgid "pull, update and merge in one command" msgstr "" msgid "" @@ -1536,13 +1515,14 @@ " This finds all changes from the repository at the specified path\n" " or URL and adds them to the local repository.\n" "\n" -" If the pulled changes add a new branch head, the head is automatically\n" -" merged, and the result of the merge is committed. Otherwise, the\n" -" working directory is updated to include the new changes.\n" +" If the pulled changes add a new branch head, the head is\n" +" automatically merged, and the result of the merge is committed.\n" +" Otherwise, the working directory is updated to include the new\n" +" changes.\n" "\n" " When a merge occurs, the newly pulled changes are assumed to be\n" -" \"authoritative\". The head of the new changes is used as the first\n" -" parent, with local changes as the second. To switch the merge\n" +" \"authoritative\". The head of the new changes is used as the first\n" +" parent, with local changes as the second. To switch the merge\n" " order, use --switch-parent.\n" "\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" @@ -1554,13 +1534,13 @@ msgstr "" msgid "outstanding uncommitted merge" -msgstr "" +msgstr "マージが未コミットです" msgid "outstanding uncommitted changes" -msgstr "" +msgstr "未コミットの変更があります" msgid "working directory is missing some files" -msgstr "" +msgstr "作業領域に存在しないファイルがあります" msgid "" "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" @@ -1570,8 +1550,10 @@ msgid "pulling from %s\n" msgstr "%s から取り込み中\n" -msgid "fetch -r doesn't work for remote repositories yet" -msgstr "" +msgid "" +"Other repository doesn't support revision lookup, so a rev cannot be " +"specified." +msgstr "連携先でリビジョンが特定出来ないため、リビジョンは指定できません" #, python-format msgid "" @@ -1581,11 +1563,11 @@ #, 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 "Automated merge with %s" @@ -1599,7 +1581,7 @@ msgstr "" msgid "edit commit message" -msgstr "" +msgstr "コミットメッセージの編集" msgid "edit commit message (DEPRECATED)" msgstr "" @@ -1610,25 +1592,12 @@ msgid "hg fetch [SOURCE]" msgstr "" -msgid " returns of the good and bad signatures" -msgstr "" +msgid "sign and verify changesets" +msgstr "チェンジセットの署名および検証" msgid "error while verifying signature" msgstr "" -msgid "create a new gpg instance" -msgstr "" - -msgid "" -"\n" -" walk over every sigs, yields a couple\n" -" ((node, version, sig), (filename, linenumber))\n" -" " -msgstr "" - -msgid "get the keys who signed a data" -msgstr "" - #, python-format msgid "%s Bad signature from \"%s\"\n" msgstr "" @@ -1642,21 +1611,18 @@ msgstr "" msgid "list signed changesets" -msgstr "" +msgstr "署名済みリビジョンの一覧表示" #, 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 "" #, python-format msgid "No valid signature for %s\n" -msgstr "" - -msgid "associate a string to a key (username, comment)" -msgstr "" +msgstr "%s の正しい署名ではありません\n" msgid "" "add a signature for the current or given revision\n" @@ -1669,10 +1635,10 @@ msgstr "" msgid "uncommitted merge - please provide a specific revision" -msgstr "マージが未コミットです - リビジョンを指定してください" +msgstr "マージが未コミットです - 対象リビジョンを指定してください" msgid "Error while signing" -msgstr "" +msgstr "署名処理の失敗" msgid "" "working copy of .hgsigs is changed (please commit .hgsigs manually or use --" @@ -1681,13 +1647,10 @@ #, python-format msgid "Added signature for changeset %s" -msgstr "" - -msgid "map a manifest into some text" -msgstr "" +msgstr "チェンジセット %s の署名を追加しました" msgid "unknown signature version" -msgstr "" +msgstr "未知の署名バージョン" msgid "make the signature local" msgstr "" @@ -1702,75 +1665,33 @@ msgstr "" msgid "commit message" -msgstr "" +msgstr "コミットメッセージ" msgid "hg sign [OPTION]... [REVISION]..." -msgstr "" +msgstr "hg sign [OPTION]... [REVISION]..." msgid "hg sigcheck REVISION" -msgstr "" +msgstr "hg sigcheck REVISION" msgid "hg sigs" -msgstr "" - -msgid "" -"show revision graphs in terminal windows\n" +msgstr "hg sigs" + +msgid "" +"show revision graphs in terminals\n" "\n" "This extension adds a --graph option to the incoming, outgoing and log\n" -"commands. When this options is given, an ascii representation of the\n" +"commands. When this options is given, an ASCII representation of the\n" "revision graph is also shown.\n" msgstr "" - -msgid "" -"cset DAG generator yielding (rev, node, [parents]) tuples\n" -"\n" -" This generator function walks through the revision history from " -"revision\n" -" start to revision stop (which must be less than or equal to start).\n" -" " -msgstr "" - -msgid "" -"file cset DAG generator yielding (rev, node, [parents]) tuples\n" -"\n" -" This generator function walks through the revision history of a single\n" -" file from revision start to revision stop (which must be less than or\n" -" equal to start).\n" -" " -msgstr "" - -msgid "" -"grapher for asciigraph on a list of nodes and their parents\n" -"\n" -" nodes must generate tuples (node, parents, char, lines) where\n" -" - parents must generate the parents of node, in sorted order,\n" -" and max length 2,\n" -" - char is the char to print as the node symbol, and\n" -" - lines are the lines to display next to the node.\n" -" " -msgstr "" - -msgid "" -"prints an ASCII graph of the DAG returned by the grapher\n" -"\n" -" grapher is a generator that emits tuples with the following elements:\n" -"\n" -" - Character to use as node's symbol.\n" -" - List of lines to display as the node's text.\n" -" - Column of the current node in the set of ongoing edges.\n" -" - Edges; a list of (col, next_col) indicating the edges between\n" -" the current node and its parents.\n" -" - Number of columns (ongoing edges) in the current revision.\n" -" - The difference between the number of columns (ongoing edges)\n" -" in the next revision and the number of columns (ongoing edges)\n" -" in the current revision. That is: -1 means one column removed;\n" -" 0 means no columns added or removed; 1 means one column added.\n" -" " -msgstr "" +"端末でのリビジョングラフの表示\n" +"\n" +"本エクステンションは、incoming, outgoing および log コマンドに --graph\n" +"オプションを付与します。このオプションが指定された場合、ASCII 文字による\n" +"リビジョングラフが表示されます。\n" #, python-format msgid "--graph option is incompatible with --%s" -msgstr "" +msgstr "--graph と --%s は非互換です" msgid "" "show revision history alongside an ASCII revision graph\n" @@ -1782,56 +1703,37 @@ " directory.\n" " " msgstr "" - -msgid "" -"show the outgoing changesets alongside an ASCII revision graph\n" -"\n" -" Print the outgoing changesets alongside a revision graph drawn with\n" -" ASCII characters.\n" -"\n" -" Nodes printed as an @ character are parents of the working\n" -" directory.\n" -" " -msgstr "" +"ASCII 文字によるリビジョングラフ表示を持つ履歴表示\n" +"\n" +" ASCII 文字によるリビジョングラフ表示を伴った変更履歴を表示します。\n" +"\n" +" @ 文字で表示されるリビジョンは、作業領域の親リビジョンです。\n" +" " #, python-format msgid "comparing with %s\n" msgstr "%s と比較中\n" msgid "no changes found\n" -msgstr "新たなチェンジセットはありません\n" - -msgid "" -"show the incoming changesets alongside an ASCII revision graph\n" -"\n" -" Print the incoming changesets alongside a revision graph drawn with\n" -" ASCII characters.\n" -"\n" -" Nodes printed as an @ character are parents of the working\n" -" directory.\n" -" " -msgstr "" - -msgid "wrap the command" -msgstr "" +msgstr "差分はありません\n" msgid "show the revision DAG" -msgstr "" +msgstr "リビジョングラフの表示" msgid "limit number of changes displayed" -msgstr "チェンジセット表示数の制限" +msgstr "最大表示リビジョン数" msgid "show patch" msgstr "パッチ形式での表示" msgid "show the specified revision or range" -msgstr "指定された単一ないし範囲内のリビジョンの表示" +msgstr "指定された単一、ないしリビジョン区間の表示" msgid "hg glog [OPTION]... [FILE]" -msgstr "" - -msgid "" -"CIA notification\n" +msgstr "hg glog [OPTION]... [FILE]" + +msgid "" +"integrate Mercurial with a CIA notification service\n" "\n" "This is meant to be run as a changegroup or incoming hook.\n" "To configure it, set the following options in your hgrc:\n" @@ -1846,8 +1748,7 @@ "# Append a diffstat to the log message (optional)\n" "#diffstat = False\n" "# Template to use for log messages (optional)\n" -"#template = {desc}\n" -"{baseurl}/rev/{node}-- {diffstat}\n" +"#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n" "# Style to use (optional)\n" "#style = foo\n" "# The URL of the CIA notification service (optional)\n" @@ -1868,56 +1769,35 @@ "baseurl = http://server/path/to/repo\n" msgstr "" -msgid " A CIA message " -msgstr "" - -msgid " CIA notification class " -msgstr "" - #, python-format msgid "hgcia: sending update to %s\n" -msgstr "" - -msgid " send CIA notification " -msgstr "" +msgstr "hgcia: %s に更新を送信しています\n" msgid "email.from must be defined when sending by email" msgstr "" msgid "cia: no user specified" -msgstr "" +msgstr "cia: ユーザが指定されていません" msgid "cia: no project specified" -msgstr "" - -msgid "" -"browsing the repository in a graphical way\n" +msgstr "cia: プロジェクトが指定されていません" + +msgid "" +"browse the repository in a graphical way\n" "\n" "The hgk extension allows browsing the history of a repository in a\n" -"graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is\n" -"not distributed with Mercurial.)\n" +"graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n" +"distributed with Mercurial.)\n" "\n" "hgk consists of two parts: a Tcl script that does the displaying and\n" -"querying of information, and an extension to mercurial named hgk.py,\n" +"querying of information, and an extension to Mercurial named hgk.py,\n" "which provides hooks for hgk to get information. hgk can be found in\n" -"the contrib directory, and hgk.py can be found in the hgext directory.\n" -"\n" -"To load the hgext.py extension, add it to your .hgrc file (you have\n" -"to use your global $HOME/.hgrc file, not one in a repository). You\n" -"can specify an absolute path:\n" -"\n" -" [extensions]\n" -" hgk=/usr/local/lib/hgk.py\n" -"\n" -"Mercurial can also scan the default python library path for a file\n" -"named 'hgk.py' if you set hgk empty:\n" -"\n" -" [extensions]\n" -" hgk=\n" +"the contrib directory, and the extension is shipped in the hgext\n" +"repository, and needs to be enabled.\n" "\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\n" -"specify the path to hgk in your .hgrc file:\n" +"to work, hgk must be in your search path. Alternately, you can specify\n" +"the path to hgk in your .hgrc file:\n" "\n" " [hgk]\n" " path=/location/of/hgk\n" @@ -1936,10 +1816,10 @@ msgstr "" msgid "output common ancestor information" -msgstr "" +msgstr "共通の先祖リビジョンの情報表示" msgid "cat a specific revision" -msgstr "" +msgstr "指定リビジョン時点の内容表示" msgid "cat-file: type or revision not supplied\n" msgstr "" @@ -1948,82 +1828,77 @@ msgstr "" msgid "parse given revisions" -msgstr "" +msgstr "指定リビジョンの解析" msgid "print revisions" -msgstr "" +msgstr "リビジョンの表示" msgid "print extension options" -msgstr "" +msgstr "エクステンション設定の表示" msgid "start interactive history viewer" msgstr "" msgid "hg view [-l LIMIT] [REVRANGE]" -msgstr "" +msgstr "hg view [-l LIMIT] [REVRANGE]" msgid "generate patch" -msgstr "" +msgstr "パッチの生成" msgid "recursive" -msgstr "" +msgstr "再起" msgid "pretty" msgstr "" msgid "stdin" -msgstr "" +msgstr "標準入力" msgid "detect copies" -msgstr "" +msgstr "コピーの検出" msgid "search" msgstr "" msgid "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..." -msgstr "" +msgstr "hg git-diff-tree [OPTION]... NODE1 NODE2 [FILE]..." msgid "hg debug-cat-file [OPTION]... TYPE FILE" -msgstr "" +msgstr "hg debug-cat-file [OPTION]... TYPE FILE" msgid "hg debug-config" -msgstr "" +msgstr "hg debug-config" msgid "hg debug-merge-base node node" -msgstr "" +msgstr "hg debug-merge-base node node" msgid "ignored" -msgstr "" +msgstr "無視しました" msgid "hg debug-rev-parse REV" -msgstr "" +msgstr "hg debug-rev-parse REV" msgid "header" -msgstr "" +msgstr "ヘッダ" msgid "topo-order" msgstr "" msgid "parents" -msgstr "" +msgstr "親" msgid "max-count" msgstr "" msgid "hg debug-rev-list [options] revs" -msgstr "" - -msgid "" -"syntax highlighting in hgweb, based on Pygments\n" -"\n" -"It depends on the pygments syntax highlighting library:\n" +msgstr "hg debug-rev-list [options] revs" + +msgid "" +"syntax highlighting for hgweb\n" +"\n" +"It depends on the Pygments syntax highlighting library:\n" "http://pygments.org/\n" "\n" -"To enable the extension add this to hgrc:\n" -"\n" -"[extensions]\n" -"hgext.highlight =\n" -"\n" "There is a single configuration option:\n" "\n" "[web]\n" @@ -2034,190 +1909,234 @@ "-- Adam Hupp <adam@hupp.org>\n" msgstr "" -msgid "inotify-based status acceleration for Linux systems\n" -msgstr "" +msgid "accelerate status report using system level services" +msgstr "システム固有の機能による状態報告の高速化" msgid "start an inotify server for this repository" -msgstr "" - -msgid "(found dead inotify server socket; removing it)\n" -msgstr "" - -msgid "(starting inotify server)\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 "" - -msgid "(inotify server not running)\n" -msgstr "" - -#, python-format -msgid "failed to contact inotify server: %s\n" -msgstr "" +msgstr "リポジトリに対する inotify サーバの起動" + +msgid "" +"debugging information for inotify extension\n" +"\n" +" Prints the list of directories being watched by the inotify server.\n" +" " +msgstr "" +"inotify エクステンション向けデバッグ情報\n" +"\n" +" inotify サーバの監視対象ディレクトリを一覧表示します。\n" +" " + +msgid "directories being watched:\n" +msgstr "監視対象ディレクトリ:\n" msgid "run server in background" msgstr "バックグラウンドでのサーバ実行" msgid "used internally by daemon mode" -msgstr "バックグラウンド実行時での内部用途向け" +msgstr "(バックグラウンド実行時での内部用途向け)" msgid "minutes to sit idle before exiting" -msgstr "" +msgstr "終了前のアイドリング待機時間(単位:分)" msgid "name of file to write process ID to" -msgstr "プロセスID書き出し先ファイル名" +msgstr "プロセスIDの書き出し先ファイル" msgid "hg inserve [OPT]..." -msgstr "" +msgstr "hg inserve [OPT]..." + +msgid "(found dead inotify server socket; removing it)\n" +msgstr "(終了した inotify サーバのソケットを検出したので削除します)\n" + +msgid "(starting inotify server)\n" +msgstr "(inotify サーバの起動中)\n" + +#, python-format +msgid "could not start inotify server: %s\n" +msgstr "inotify サーバの起動に失敗: %s\n" + +#, python-format +msgid "could not talk to new inotify server: %s\n" +msgstr "inotify サーバとの連携に失敗: %s\n" + +msgid "(inotify server not running)\n" +msgstr "(inotify サーバは起動されていません)\n" + +#, python-format +msgid "failed to contact inotify server: %s\n" +msgstr "inotify サーバとの連携に失敗: %s\n" + +msgid "received empty answer from inotify server" +msgstr "inotify サーバからの空応答 " #, python-format msgid "(inotify: received response from incompatible server version %d)\n" -msgstr "" +msgstr "(inotify: 互換性の無いバージョン %d のサーバ応答を受理)\n" + +#, python-format +msgid "(inotify: received '%s' response when expecting '%s')\n" +msgstr "(inotify: 想定外の '%s' 応答を受理。想定応答は '%s')\n" msgid "this system does not seem to support inotify" -msgstr "" +msgstr "このシステムでは inotify は利用できないように見えます" #, python-format msgid "*** the current per-user limit on the number of inotify watches is %s\n" -msgstr "" +msgstr "*** inotify のユーザ毎監視対象上限数は %s\n" msgid "*** this limit is too low to watch every directory in this repository\n" -msgstr "" +msgstr "*** この上限は作業領域の全ディレクトリの監視には少なすぎます\n" msgid "*** counting directories: " -msgstr "" +msgstr "*** ディレクトリの計上中: " #, 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" -msgstr "" +msgstr "*** 上限を %d から %d に上げてください(root 権限が必要):\n" #, python-format msgid "*** echo %d > %s\n" -msgstr "" +msgstr "*** echo %d > %s\n" #, python-format msgid "cannot watch %s until inotify watch limit is raised" -msgstr "" +msgstr "inotify の監視対象上限が上がるまでは %s を監視できません" #, python-format msgid "inotify service not available: %s" -msgstr "" +msgstr "inotify サービスが使用できません: %s" #, python-format msgid "watching %r\n" -msgstr "" +msgstr "%r を監視\n" #, python-format msgid "watching directories under %r\n" -msgstr "" +msgstr "%r 配下のディレクトリを監視\n" #, python-format msgid "status: %r dir(%d) -> %s\n" -msgstr "" +msgstr "status: %r dir(%d) -> %s\n" #, python-format msgid "status: %r %s -> %s\n" -msgstr "" +msgstr "status: %r %s -> %s\n" #, python-format msgid "%s dirstate reload\n" -msgstr "" +msgstr "%s: dirstate 再読み込み中\n" #, python-format msgid "%s end dirstate reload\n" -msgstr "" +msgstr "%s: dirstate 再読み込み完了\n" msgid "rescanning due to .hgignore change\n" -msgstr "" +msgstr ".hgignore 変更に付き再走査中\n" #, python-format msgid "%s event: created %s\n" -msgstr "" +msgstr "%s: %s を作成\n" #, python-format msgid "%s event: deleted %s\n" -msgstr "" +msgstr "%s: %s を削除\n" #, python-format msgid "%s event: modified %s\n" -msgstr "" +msgstr "%s: %s を変更\n" #, python-format msgid "filesystem containing %s was unmounted\n" -msgstr "" +msgstr "%s を含むファイルシステムが未マウントです\n" #, python-format msgid "%s readable: %d bytes\n" -msgstr "" +msgstr "%s: 読み込み可能: %d バイト\n" #, python-format msgid "%s below threshold - unhooking\n" -msgstr "" +msgstr "%s: 閾値未満 - ロック解放\n" #, python-format msgid "%s reading %d events\n" -msgstr "" +msgstr "%s: %d 個のイベント読み込み中\n" #, python-format msgid "%s hooking back up with %d bytes readable\n" -msgstr "" - -#, python-format -msgid "%s processing %d deferred events as %d\n" -msgstr "" +msgstr "%s: 読み込み可能な %d バイトのバックアップをフック\n" #, python-format msgid "could not start server: %s" -msgstr "" - -#, python-format -msgid "received query from incompatible client version %d\n" -msgstr "" +msgstr "サーバ起動が失敗: %s" #, python-format msgid "answering query for %r\n" -msgstr "" +msgstr "%r への問い合わせに返答中\n" + +#, python-format +msgid "received query from incompatible client version %d\n" +msgstr "互換性の無いクライアントバージョン %d からの問い合わせを受信\n" + +#, python-format +msgid "unrecognized query type: %s\n" +msgstr "未知の問い合わせ種別: %s\n" msgid "finished setup\n" -msgstr "" - -msgid "polling: no timeout\n" -msgstr "" - -#, python-format -msgid "polling: %sms timeout\n" -msgstr "" +msgstr "セットアップを終了しました\n" + +msgid "" +"expand expressions into changelog and summaries\n" +"\n" +"This extension allows the use of a special syntax in summaries,\n" +"which will be automatically expanded into links or any other\n" +"arbitrary expression, much like InterWiki does.\n" +"\n" +"A few example patterns (link to bug tracking, etc.) that may\n" +"be used in your hgrc:\n" +"\n" +" [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" +" boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n" +msgstr "" +"コミットログ中の記述の展開\n" +"\n" +"本エクステンションは、リンクなり任意の式の形式へと自動的に変換される\n" +"InterWiki のような特別な書式を用いたコミットログの記述を可能にします。\n" +"\n" +"バグ管理システムで使用されるようなパターンを設定ファイルで記述する例を\n" +"以下に示します。\n" +"\n" +" [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" +" boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n" #, python-format msgid "interhg: invalid pattern for %s: %s\n" -msgstr "" +msgstr "interhg: %s のパターンが不正です: %s\n" #, python-format msgid "interhg: invalid regexp for %s: %s\n" -msgstr "" - -msgid "" -"keyword expansion in local repositories\n" -"\n" -"This extension expands RCS/CVS-like or self-customized $Keywords$\n" -"in tracked text files selected by your configuration.\n" -"\n" -"Keywords are only expanded in local repositories and not stored in\n" -"the change history. The mechanism can be regarded as a convenience\n" -"for the current user or for archive distribution.\n" -"\n" -"Configuration is done in the [keyword] and [keywordmaps] sections\n" -"of hgrc files.\n" +msgstr "interhg: %s の正規表現が不正です: %s\n" + +msgid "" +"expand keywords in tracked files\n" +"\n" +"This extension expands RCS/CVS-like or self-customized $Keywords$ in\n" +"tracked text files selected by your configuration.\n" +"\n" +"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.\n" +"\n" +"Configuration is done in the [keyword] and [keywordmaps] sections of\n" +"hgrc files.\n" "\n" "Example:\n" "\n" @@ -2227,239 +2146,229 @@ " x* = ignore\n" "\n" "Note: the more specific you are in your filename patterns\n" -" the less you lose speed in huge repos.\n" +" the less you lose speed in huge repositories.\n" "\n" "For [keywordmaps] template mapping and expansion demonstration and\n" "control run \"hg kwdemo\".\n" "\n" "An additional date template filter {date|utcdate} is provided.\n" "\n" -"The default template mappings (view with \"hg kwdemo -d\") can be replaced\n" -"with customized keywords and templates.\n" -"Again, run \"hg kwdemo\" to control the results of your config changes.\n" +"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.\n" "\n" "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n" -"the risk of inadvertedly storing expanded keywords in the change history.\n" +"the risk of inadvertently storing expanded keywords in the change\n" +"history.\n" "\n" "To force expansion after enabling it, or a configuration change, run\n" "\"hg kwexpand\".\n" "\n" -"Also, when committing with the record extension or using mq's qrecord, be " -"aware\n" -"that keywords cannot be updated. Again, run \"hg kwexpand\" on the files in\n" -"question to update keyword expansions after all changes have been checked " -"in.\n" +"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.\n" "\n" "Expansions spanning more than one line and incremental expansions,\n" "like CVS' $Log$, are not supported. A keyword template map\n" "\"Log = {desc}\" expands to the first line of the changeset description.\n" msgstr "" - -msgid "Returns hgdate in cvs-like UTC format." -msgstr "" - -msgid "" -"\n" -" Sets up keyword templates, corresponding keyword regex, and\n" -" provides keyword substitution functions.\n" -" " -msgstr "" - -msgid "Replaces keywords in data with expanded template." -msgstr "" - -msgid "Returns data with keywords expanded." -msgstr "" - -msgid "" -"Returns true if path matches [keyword] pattern\n" -" and is not a symbolic link.\n" -" Caveat: localrepository._link fails on Windows." -msgstr "" - -msgid "Overwrites selected files expanding/shrinking keywords." -msgstr "" - -#, python-format -msgid "overwriting %s %s keywords\n" -msgstr "" - -msgid "Unconditionally removes all keyword substitutions from text." -msgstr "" - -msgid "Returns text with all keyword substitutions removed." -msgstr "" - -msgid "Returns lines with keyword substitutions removed." -msgstr "" - -msgid "" -"If in restricted mode returns data read from wdir with\n" -" keyword substitutions removed." -msgstr "" - -msgid "" -"\n" -" Subclass of filelog to hook into its read, add, cmp methods.\n" -" Keywords are \"stored\" unexpanded, and processed on reading.\n" -" " -msgstr "" - -msgid "Expands keywords when reading filelog." -msgstr "" - -msgid "Removes keyword substitutions when adding to filelog." -msgstr "" - -msgid "Removes keyword substitutions for comparison." -msgstr "" - -msgid "" -"Bails out if [keyword] configuration is not active.\n" -" Returns status of working directory." -msgstr "" +"構成管理対象ファイル中のキーワード展開\n" +"\n" +"本エクステンションは、構成管理対象ファイル中の RCS/CVS 的(カスタマイズ\n" +"可能)な $Keywords$ を、設定ファイルでの記述に従い展開します。\n" +"\n" +"キーワード展開は作業領域でのみ行われ、履歴には残りません。この仕組みは\n" +"現行ユーザやアーカイブ配布者に配慮しています。\n" +"\n" +"設定は、設定ファイル中の [keyword] および [keywordmaps] セクションに\n" +"記述します。\n" +"\n" +"記述例:\n" +"\n" +" [keyword]\n" +" # \"x*\" に合致「しない」 python ファイルでのみキーワード展開\n" +" **.py =\n" +" x* = ignore\n" +"\n" +"備考: ファイル名パターンが更に特殊になる場合、\n" +" リポジトリサイズ次第では性能劣化が生じ得ます。\n" +"\n" +"[keywordmaps] でのテンプレート設定の展開を実演するには、'hg kwdemo' を\n" +"実行します。\n" +"\n" +"日付テンプレート用フィルタとして {date|utcdate} も使用可能です。\n" +"\n" +"無指定時のテンプレート設定('hg kwdemo -d' で閲覧可能)は、キーワード及び\n" +"テンプレートのカスタマイズで置き換えることが可能です。繰り返しますが\n" +"設定変更の確認は 'hg kwdemo' で行うことができます。\n" +"\n" +"展開済みキーワードが意図せず履歴に記録されてしまうことを防ぐために、\n" +"キーワードの設定変更/無効化の前には 'hg kwshrink' を実行してください。\n" +"\n" +"キーワードの設定変更/有効化後に、強制的に展開する場合は 'hg kwexpand'\n" +"を実行してください。\n" +"\n" +"record エクステンション併用時に qrecord コマンドを使用してコミットする\n" +"場合、キーワードは更新されない点に注意してください。全ての変更内容を\n" +"確認した上で、当該ファイルに対して 'hg kwexpand' を実行することで\n" +"キーワード展開を行ってください。\n" +"\n" +"複数行に渡る展開や、CVS の $Log$ のような増加する内容の展開はサポート\n" +"していません。キーワードテンプレート設定 \"Log = {desc}\" は、\n" +"コミットメッセージの最初の一行を埋め込みます。\n" + +#, python-format +msgid "overwriting %s expanding keywords\n" +msgstr "キーワード置換で %s を上書き\n" + +#, python-format +msgid "overwriting %s shrinking keywords\n" +msgstr "キーワード置換で %s を上書き\n" msgid "[keyword] patterns cannot match" -msgstr "" +msgstr "[keyword] パターンが合致しません" msgid "no [keyword] patterns configured" -msgstr "" - -msgid "Selects files and passes them to kwtemplater.overwrite." -msgstr "" +msgstr "[keyword] でのパターン設定がありません" msgid "" "print [keywordmaps] configuration and an expansion example\n" "\n" -" Show current, custom, or default keyword template maps\n" -" and their expansion.\n" -"\n" -" Extend current configuration by specifying maps as arguments\n" -" and optionally by reading from an additional hgrc file.\n" +" Show current, custom, or default keyword template maps and their\n" +" expansions.\n" +"\n" +" Extend current configuration by specifying maps as arguments and\n" +" optionally by reading from an additional hgrc file.\n" "\n" " Override current keyword template maps with \"default\" option.\n" " " msgstr "" +"[keywordmaps] での設定内容および展開例の表示\n" +"\n" +" 現時点のキーワードテンプレートの設定内容および展開例を表示します。\n" +"\n" +" 引数でのマップ指定や、設定ファイルからの付加的な読み込みにより、\n" +" 現時点での設定を拡張することができます。\n" +"\n" +" --default 指定により、現時点のキーワードテンプレート設定を\n" +" デフォルトのもので一時的に置き換えることもできます。\n" +" " #, python-format msgid "" "\n" "\t%s\n" msgstr "" - -#, python-format -msgid "creating temporary repo at %s\n" -msgstr "" +"\n" +"\t%s\n" + +#, python-format +msgid "creating temporary repository at %s\n" +msgstr "一時リポジトリ %s の作成中\n" #, python-format msgid "" "\n" "%s keywords written to %s:\n" msgstr "" +"\n" +"%sキーワードを %s に書き込みました:\n" msgid "unhooked all commit hooks\n" -msgstr "" - -#, python-format -msgid "" -"\n" -"removing temporary repo %s\n" -msgstr "" - -msgid "" -"expand keywords in working directory\n" +msgstr "全ての commit フックを無効化\n" + +#, python-format +msgid "" +"\n" +"removing temporary repository %s\n" +msgstr "" +"\n" +"一時リポジトリ %s の削除中\n" + +msgid "" +"expand keywords in the working directory\n" "\n" " Run after (re)enabling keyword expansion.\n" "\n" " kwexpand refuses to run if given files contain local changes.\n" " " msgstr "" +"作業領域におけるキーワードの展開\n" +"\n" +" キーワード埋め込みが(再)有効化されてから実行してください。\n" +"\n" +" 指定されたファイルに未コミット変更がある場合、実行は中断されます。\n" +" " msgid "" "print files currently configured for keyword expansion\n" "\n" -" Crosscheck which files in working directory are potential targets for\n" -" keyword expansion.\n" -" That is, files matched by [keyword] config patterns but not symlinks.\n" -" " -msgstr "" - -msgid "" -"revert expanded keywords in working directory\n" -"\n" -" Run before changing/disabling active keywords\n" -" or if you experience problems with \"hg import\" or \"hg merge\".\n" +" Crosscheck which files in working directory are potential targets\n" +" for keyword expansion. That is, files matched by [keyword] config\n" +" patterns but not symlinks.\n" +" " +msgstr "" +"キーワード展開設定のあるファイルの表示\n" +"\n" +" 作業領域中のファイルで、潜在的にキーワード展開の対象と成り得るものを\n" +" 確認します。対象となるのは、[keyword] 設定でのパターンに合致し、且つ\n" +" シンボリックリンクでないファイルです。\n" +" " + +msgid "" +"revert expanded keywords in the working directory\n" +"\n" +" Run before changing/disabling active keywords or if you experience\n" +" problems with \"hg import\" or \"hg merge\".\n" "\n" " kwshrink refuses to run if given files contain local changes.\n" " " msgstr "" - -msgid "" -"Collects [keyword] config in kwtools.\n" -" Monkeypatches dispatch._parse if needed." -msgstr "" - -msgid "Monkeypatch dispatch._parse to obtain running hg command." -msgstr "" - -msgid "" -"Sets up repo as kwrepo for keyword substitution.\n" -" Overrides file method to return kwfilelog instead of filelog\n" -" if file matches user configuration.\n" -" Wraps commit to overwrite configured files with updated\n" -" keyword substitutions.\n" -" Monkeypatches patch and webcommands." -msgstr "" - -msgid "" -"Monkeypatch/wrap patch.patchfile.__init__ to avoid\n" -" rejects or conflicts due to expanded keywords in working dir." -msgstr "" - -msgid "" -"Monkeypatch patch.diff to avoid expansion except when\n" -" comparing against working dir." -msgstr "" - -msgid "Wraps webcommands.x turning off keyword expansion." -msgstr "" +"作業領域中のキーワード展開の取り消し\n" +"\n" +" キーワード設定の変更前や、'hg import' ないし 'hg merge' で問題が\n" +" 発生した経験がある場合に実行してください。\n" +"\n" +" 指定されたファイルに未コミット変更がある場合、実行は中断されます。\n" +" " msgid "show default keyword template maps" -msgstr "" +msgstr "デフォルトのテンプレートマップで表示" msgid "read maps from rcfile" -msgstr "" +msgstr "設定ファイルからのマップ設定の読み込み" msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..." -msgstr "" +msgstr "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..." msgid "hg kwexpand [OPTION]... [FILE]..." -msgstr "" +msgstr "hg kwexpand [OPTION]... [FILE]..." msgid "show keyword status flags of all files" -msgstr "" +msgstr "全ファイルのキーワード展開設定を表示" msgid "show files excluded from expansion" -msgstr "" +msgstr "キーワード展開対象外のファイルを表示" msgid "additionally show untracked files" -msgstr "" +msgstr "未登録ファイルの表示" msgid "hg kwfiles [OPTION]... [FILE]..." -msgstr "" +msgstr "hg kwfiles [OPTION]... [FILE]..." msgid "hg kwshrink [OPTION]... [FILE]..." -msgstr "" - -msgid "" -"patch management and development\n" +msgstr "hg kwshrink [OPTION]... [FILE]..." + +msgid "" +"work with a stack of patches\n" "\n" "This extension lets you work with a stack of patches in a Mercurial\n" -"repository. It manages two stacks of patches - all known patches, and\n" +"repository. It manages two stacks of patches - all known patches, and\n" "applied patches (subset of known patches).\n" "\n" "Known patches are represented as patch files in the .hg/patches\n" -"directory. Applied patches are both patch files and changesets.\n" +"directory. Applied patches are both patch files and changesets.\n" "\n" "Common tasks (use \"hg help command\" for more details):\n" "\n" @@ -2475,534 +2384,637 @@ "remove patch from applied stack qpop\n" "refresh contents of top applied patch qrefresh\n" msgstr "" - -msgid "" -"Update all references to a field in the patch header.\n" -" If none found, add it email style." -msgstr "" - -msgid "" -"Remove existing message, keeping the rest of the comments fields.\n" -" If comments contains 'subject: ', message will prepend\n" -" the field and a blank line." -msgstr "" +"パッチの管理および作成\n" +"\n" +"本エクステンションは、Mercurial リポジトリの作業領域において、パッチを\n" +"使用した作業を可能にします。本拡張では、「既知のパッチ」と「適用中の\n" +"パッチ」(「既知のパッチ」の部分集合)の2つの集合を、スタックとして管理\n" +"します。\n" +"\n" +"「既知のパッチ」は、.hg/patches ディレクトリ配下に置かれたパッチファイル\n" +"に相当します。「適用中のパッチ」は、「既知のパッチ」のうち、対応する\n" +"リビジョンがリポジトリの履歴中に(一時的に)記録されているものを指します。\n" +"\n" +"良く使用される機能(詳細は \"hg help コマンド名\" を参照):\n" +"\n" +" パッチ管理領域の初期化 qinit\n" +" 新規パッチの作成 qnew\n" +" 外部からのパッチファイルの取り込み qimport\n" +"\n" +" 既知のパッチ一覧の表示 qseries\n" +" 適用中のパッチ一覧の表示 qapplied\n" +" 適用中の最上位パッチ名の表示 qtop\n" +"\n" +" 既知のパッチの適用 qpush\n" +" パッチ適用の解除 qpop\n" +" 適用中の最上位パッチの内容更新 qrefresh\n" #, python-format msgid "%s appears more than once in %s" -msgstr "" +msgstr "%s は %s 中に複数回登場しています" msgid "guard cannot be an empty string" -msgstr "" +msgstr "ガードに空文字列を指定することはできません" #, python-format msgid "guard %r starts with invalid character: %r" -msgstr "" +msgstr "ガード %r の冒頭文字は不適切な文字です: %r" #, python-format msgid "invalid character in guard %r: %r" -msgstr "" +msgstr "ガード %r 中に不適切な文字があります: %r" #, python-format msgid "active guards: %s\n" -msgstr "" +msgstr "有効なガード: %s\n" #, python-format msgid "guard %r too short" -msgstr "" +msgstr "ガード名 %r は短過ぎます" #, python-format msgid "guard %r starts with invalid char" -msgstr "" +msgstr "ガード %r の冒頭文字は不適切な文字です" #, python-format msgid "allowing %s - no guards in effect\n" -msgstr "" +msgstr "%s を適用 - 合致するガードはありません\n" #, python-format msgid "allowing %s - no matching negative guards\n" -msgstr "" +msgstr "%s を適用 - 合致するネガティブガードはありません\n" #, python-format msgid "allowing %s - guarded by %r\n" -msgstr "" +msgstr "%s を適用 - ガード %r が適用されました\n" #, python-format msgid "skipping %s - guarded by %r\n" -msgstr "" +msgstr "%s を抑止 - ガード %r が適用されました\n" #, python-format msgid "skipping %s - no matching guards\n" -msgstr "" +msgstr "%s を抑止 - 合致するガードはありません\n" #, python-format msgid "error removing undo: %s\n" -msgstr "" +msgstr "取り消し情報の破棄に失敗: %s\n" #, python-format msgid "apply failed for patch %s" -msgstr "" +msgstr "パッチ %s の適用に失敗" #, python-format msgid "patch didn't work out, merging %s\n" -msgstr "" +msgstr "パッチ %s が適用できないのでマージ実施中\n" #, python-format msgid "update returned %d" -msgstr "" +msgstr "作業領域の更新がエラー %d で終了しました" msgid "repo commit failed" -msgstr "" +msgstr "リポジトリのコミット操作に失敗" #, python-format msgid "unable to read %s" -msgstr "" +msgstr "ファイル %s が読み込めません" #, python-format msgid "patch %s does not exist\n" -msgstr "" +msgstr "パッチ %s は存在しません\n" #, python-format msgid "patch %s is not applied\n" -msgstr "" - -msgid "" -"Apply patchfile to the working directory.\n" -" patchfile: file name of patch" -msgstr "" +msgstr "パッチ %s は未適用です\n" msgid "patch failed, unable to continue (try -v)\n" -msgstr "" +msgstr "パッチ適用の失敗のため処理が継続できません(-v 付き実行で詳細表示)\n" #, python-format msgid "applying %s\n" msgstr "%s を適用中\n" #, python-format -msgid "Unable to read %s\n" -msgstr "" +msgid "unable to read %s\n" +msgstr "ファイル %s が読み込めません\n" #, python-format msgid "imported patch %s\n" -msgstr "" +msgstr "パッチ %s の取り込み\n" #, python-format msgid "" "\n" "imported patch %s" msgstr "" +"\n" +"パッチ %s の取り込み" #, python-format msgid "patch %s is empty\n" -msgstr "" +msgstr "パッチ %s は空です\n" msgid "patch failed, rejects left in working dir\n" -msgstr "" +msgstr "パッチ適用が失敗し、却下差分は作業領域に残されています\n" msgid "fuzz found when applying patch, stopping\n" -msgstr "" +msgstr "パッチが曖昧なため、適用を中止\n" #, python-format msgid "revision %d is not managed" -msgstr "" +msgstr "リビジョン %d は MQ 管理下にありません" #, python-format msgid "cannot delete revision %d above applied patches" -msgstr "" +msgstr "適用中の最下位パッチから連続していないリビジョン %d は削除できません" + +#, python-format +msgid "patch %s finalized without changeset message\n" +msgstr "パッチ %s をメッセージ無しで通常リビジョン化しました\n" msgid "qdelete requires at least one revision or patch name" -msgstr "" +msgstr "qdelete には最低1つのリビジョン(又はパッチ名)指定が必要です" #, python-format msgid "cannot delete applied patch %s" -msgstr "" +msgstr "適用中のパッチ %s は削除できません" #, python-format msgid "patch %s not in series file" -msgstr "" +msgstr "パッチ %s は未知のパッチです" msgid "no patches applied" -msgstr "" +msgstr "適用中のパッチはありません" msgid "working directory revision is not qtip" -msgstr "" +msgstr "作業領域の親リビジョンは qtip ではありません" msgid "local changes found, refresh first" -msgstr "" +msgstr "作業領域の内容は変更されていますので qrefresh を実施してください" msgid "local changes found" -msgstr "" +msgstr "作業領域の内容は変更されています" #, python-format msgid "\"%s\" cannot be used as the name of a patch" -msgstr "" - -msgid "" -"options:\n" -" msg: a string or a no-argument function returning a string\n" -" " -msgstr "" +msgstr "\"%s\" はパッチ名として使用できません" #, python-format msgid "patch \"%s\" already exists" -msgstr "" +msgstr "パッチ \"%s\" は既に存在します" #, python-format msgid "error unlinking %s\n" -msgstr "" - -msgid "returns (index, rev, patch)" -msgstr "" +msgstr "%s の unlink に失敗\n" #, python-format msgid "patch name \"%s\" is ambiguous:\n" -msgstr "" +msgstr "パッチ名 \"%s\" は曖昧です:\n" #, python-format msgid "patch %s not in series" -msgstr "" - -msgid "(working directory not at tip)\n" -msgstr "" +msgstr "パッチ %s は未知のパッチです" + +msgid "(working directory not at a head)\n" +msgstr "(作業領域の親リビジョンはヘッドではありません)\n" msgid "no patches in series\n" -msgstr "" +msgstr "既知のパッチはありません\n" #, python-format msgid "cannot push to a previous patch: %s" -msgstr "" +msgstr "適用中のパッチ %s の再適用はできません" #, python-format msgid "qpush: %s is already at the top\n" -msgstr "" +msgstr "qpush: パッチ %s は既に適用中の最上位パッチです\n" #, python-format msgid "guarded by %r" -msgstr "" +msgstr "ガード %r が適用されました" msgid "no matching guards" -msgstr "" +msgstr "合致するガードはありません" #, python-format msgid "cannot push '%s' - %s\n" -msgstr "" +msgstr "パッチ '%s' は適用できませんでした - %s\n" msgid "all patches are currently applied\n" -msgstr "" +msgstr "全てのパッチが適用中です\n" msgid "patch series already fully applied\n" -msgstr "" +msgstr "全てのパッチが適用中です\n" msgid "cleaning up working directory..." -msgstr "" +msgstr "作業領域の整理中..." #, python-format msgid "errors during apply, please fix and refresh %s\n" -msgstr "" +msgstr "適用が失敗したため、対処後に %s への qrefresh を実施してください\n" #, python-format msgid "now at: %s\n" -msgstr "" +msgstr "適用中の最上位パッチは %s です\n" #, python-format msgid "patch %s is not applied" -msgstr "" +msgstr "パッチ %s は未適用です" msgid "no patches applied\n" -msgstr "" +msgstr "適用中のパッチはありません\n" #, python-format msgid "qpop: %s is already at the top\n" -msgstr "" +msgstr "qpop: パッチ %s は既に適用中の最上位パッチです\n" msgid "qpop: forcing dirstate update\n" -msgstr "" +msgstr "qpop: 作業領域状態の更新を強行します\n" #, python-format msgid "trying to pop unknown node %s" -msgstr "" +msgstr "未知のリビジョン %s が解除対象に指定されました" msgid "popping would remove a revision not managed by this patch queue" -msgstr "" +msgstr "管理対象外のリビジョンが解除対象に指定されました" msgid "deletions found between repo revs" -msgstr "" +msgstr "リビジョン間で削除が検出されました" msgid "patch queue now empty\n" -msgstr "" +msgstr "全てのパッチの適用が解除されました\n" msgid "cannot refresh a revision with children" -msgstr "" +msgstr "ヘッド以外は qrefresh の対象に指定できません" msgid "" "refresh interrupted while patch was popped! (revert --all, qpush to " "recover)\n" -msgstr "" +msgstr "パッチ解除中に中断されました!(revert --all および qpush で復旧)\n" msgid "patch queue directory already exists" -msgstr "" +msgstr "パッチ管理領域は既に存在します" #, python-format msgid "patch %s is not in series file" -msgstr "" +msgstr "パッチ %s は未知のパッチです" msgid "No saved patch data found\n" -msgstr "" +msgstr "保存されたパッチ状態データが見つかりません\n" #, python-format msgid "restoring status: %s\n" -msgstr "" +msgstr "パッチ状態 %s の復旧中\n" msgid "save entry has children, leaving it alone\n" -msgstr "" +msgstr "パッチ状態保存リビジョンはヘッドでないので削除できません\n" #, python-format msgid "removing save entry %s\n" -msgstr "" +msgstr "パッチ状態保存リビジョン %s の削除中\n" #, python-format msgid "saved queue repository parents: %s %s\n" -msgstr "" +msgstr "パッチ状態保存リビジョンの親: %s %s\n" msgid "queue directory updating\n" -msgstr "" +msgstr "パッチ管理領域の更新中\n" msgid "Unable to load queue repository\n" -msgstr "" +msgstr "パッチ管理領域を読み込めません\n" msgid "save: no patches applied, exiting\n" -msgstr "" +msgstr "save: 適用中のパッチが無いため終了します\n" msgid "status is already saved\n" -msgstr "" +msgstr "パッチ状態は保存済みです\n" msgid "hg patches saved state" -msgstr "" +msgstr "パッチ状態保存用リビジョン" msgid "repo commit failed\n" -msgstr "" - -msgid "" -"If all_patches is False, return the index of the next pushable patch\n" -" in the series, or the series length. If all_patches is True, return " -"the\n" -" index of the first patch past the last applied one.\n" -" " -msgstr "" +msgstr "リポジトリのコミット操作に失敗\n" #, python-format msgid "patch %s is already in the series file" -msgstr "" +msgstr "同名のパッチ %s が既に存在します" msgid "option \"-r\" not valid when importing files" -msgstr "" +msgstr "ファイル取り込みの際の \"-r\" 指定は不適切です" msgid "option \"-n\" not valid when importing multiple patches" -msgstr "" +msgstr "複数パッチ取り込みの際の \"-n\" 指定は不適切です" #, python-format msgid "revision %d is the root of more than one branch" -msgstr "" +msgstr "リビジョン %d は1つ以上のブランチの分岐点です" #, python-format msgid "revision %d is already managed" -msgstr "" +msgstr "リビジョン %d は既に MQ 管理下にあります" #, python-format msgid "revision %d is not the parent of the queue" -msgstr "" +msgstr "リビジョン %d はパッチ適用の起点ではありません" #, python-format msgid "revision %d has unmanaged children" -msgstr "" +msgstr "リビジョン %d には MQ 管理下に無い子リビジョンがあります" #, python-format msgid "cannot import merge revision %d" -msgstr "" +msgstr "マージ実施リビジョン %d は取り込めません" #, python-format msgid "revision %d is not the parent of %d" -msgstr "" +msgstr "リビジョン %d は、%d の親リビジョンではありません" msgid "-e is incompatible with import from -" -msgstr "" +msgstr "標準入力(-)からの取り込みの際の -e 指定は不適切です" #, python-format msgid "patch %s does not exist" -msgstr "" +msgstr "パッチ %s は存在しません" msgid "need --name to import a patch from -" -msgstr "" +msgstr "標準入力(-)からの取り込みの際には --name 指定が必要です" #, python-format msgid "adding %s to series file\n" -msgstr "" +msgstr "パッチ %s を追加中\n" msgid "" "remove patches from queue\n" "\n" -" The patches must not be applied, unless they are arguments to\n" -" the --rev parameter. At least one patch or revision is required.\n" -"\n" -" With --rev, mq will stop managing the named revisions (converting\n" -" them to regular mercurial changesets). The qfinish command should be\n" -" used as an alternative for qdel -r, as the latter option is deprecated.\n" -"\n" -" With --keep, the patch files are preserved in the patch directory." -msgstr "" +" The patches must not be applied, and at least one patch is\n" +" required.\n" +"\n" +" With -k/--keep, the patch files are preserved in the patch\n" +" directory.\n" +"\n" +" To stop managing a patch and move it into permanent history,\n" +" use the qfinish command." +msgstr "" +"管理対象からのパッチ除外\n" +"\n" +" 対象となるパッチは未適用でなければならず、最低1つのパッチ名、\n" +" 又はリビジョンの指定が必要です。\n" +"\n" +" --keep を指定した場合、パッチファイルそのものはパッチ管理領域に\n" +" 残されたままとなります。\n" +"\n" +" 管理対象外となったリビジョンを通常リビジョン化するには qfinish を\n" +" 使用してください。" msgid "print the patches already applied" -msgstr "" +msgstr "適用中のパッチ一覧の表示" msgid "print the patches not yet applied" -msgstr "" +msgstr "未適用のパッチ一覧の表示" msgid "" "import a patch\n" "\n" -" The patch is inserted into the series after the last applied patch.\n" -" If no patches have been applied, qimport prepends the patch\n" +" The patch is inserted into the series after the last applied\n" +" patch. If no patches have been applied, qimport prepends the patch\n" " to the series.\n" "\n" " The patch will have the same name as its source file unless you\n" -" give it a new one with --name.\n" -"\n" -" You can register an existing patch inside the patch directory\n" -" with the --existing flag.\n" -"\n" -" With --force, an existing patch of the same name will be overwritten.\n" -"\n" -" An existing changeset may be placed under mq control with --rev\n" +" give it a new one with -n/--name.\n" +"\n" +" You can register an existing patch inside the patch directory with\n" +" the -e/--existing flag.\n" +"\n" +" With -f/--force, an existing patch of the same name will be\n" +" overwritten.\n" +"\n" +" An existing changeset may be placed under mq control with -r/--rev\n" " (e.g. qimport --rev tip -n patch will place tip under mq control).\n" -" With --git, patches imported with --rev will use the git diff\n" +" With -g/--git, patches imported with --rev will use the git diff\n" " format. See the diffs help topic for information on why this is\n" -" important for preserving rename/copy information and permission " -"changes.\n" -" " -msgstr "" +" important for preserving rename/copy information and permission\n" +" changes.\n" +"\n" +" 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" +"\n" +" 取り込まれたパッチの適用順序は、現在適用中の最上位パッチの次に\n" +" なります。適用中のパッチが無い場合、取り込まれたパッチの適用順序は\n" +" 一番最初になります。\n" +"\n" +" -n/--name による名前の指定が無い場合、取り込み対象のファイル名が\n" +" そのままパッチ名となります。\n" +"\n" +" -e/--existing を指定することで、パッチ管理領域中の既存ファイルを\n" +" 取り込み対象とすることができます。\n" +"\n" +" -f/--force が指定された場合、同名の既存パッチを上書きします。\n" +"\n" +" -r/--rev を指定することで、既存の通常リビジョンを MQ 管理下に置く\n" +" ことができます(例: 'qimport --rev tip -n patch' は、tip を MQ 管理\n" +" 下に置きます)。-g/--git 指定は、--rev 指定による取り込みの際に git\n" +" 差分形式を使用します。改名／複製情報や、権限設定の情報保持にとっての\n" +" git 差分形式の有用性に関しては、'help diffs' を参照してください。\n" +"\n" +" 標準入力からパッチを取り込む場合、ファイル名に '-' を指定します。\n" +" 標準入力からの取り込みの際には、--name でのパッチ名指定が必須です。\n" +" " msgid "" "init a new queue repository\n" "\n" -" The queue repository is unversioned by default. If -c is\n" -" specified, qinit will create a separate nested repository\n" -" for patches (qinit -c may also be run later to convert\n" -" an unversioned patch repository into a versioned one).\n" -" You can use qcommit to commit changes to this queue repository." -msgstr "" +" The queue repository is unversioned by default. If\n" +" -c/--create-repo is specified, qinit will create a separate nested\n" +" repository for patches (qinit -c may also be run later to convert\n" +" an unversioned patch repository into a versioned one). You can use\n" +" qcommit to commit changes to this queue repository." +msgstr "" +"パッチ管理領域の初期化\n" +"\n" +" 特に指定が無い場合、パッチ管理領域は構成管理されません。\n" +" -c/--create-repo が指定された場合、本コマンドはパッチ管理領域自体を\n" +" Mercurial のリポジトリとして作成します(既存のパッチ管理領域を後から\n" +" Mercurial リポジトリ化するのにも使用できます)。管理領域の変更内容は\n" +" qcommit によってコミットすることができます。" msgid "" "clone main and patch repository at same time\n" "\n" -" If source is local, destination will have no patches applied. If\n" +" If source is local, destination will have no patches applied. If\n" " source is remote, this command can not check if patches are\n" " applied in source, so cannot guarantee that patches are not\n" -" applied in destination. If you clone remote repository, be sure\n" +" applied in destination. If you clone remote repository, be sure\n" " before that it has no patches applied.\n" "\n" " Source patch repository is looked for in <src>/.hg/patches by\n" -" default. Use -p <url> to change.\n" -"\n" -" The patch directory must be a nested mercurial repository, as\n" +" default. Use -p <url> to change.\n" +"\n" +" The patch directory must be a nested Mercurial repository, as\n" " would be created by qinit -c.\n" " " msgstr "" +"リポジトリとパッチ管理領域の同時複製\n" +"\n" +" 複製元が同一ホスト上にある場合、複製先リポジトリでは、全てのパッチが\n" +" 未適用な状態となります。複製元が遠隔ホストにある場合、複製元での\n" +" パッチ適用状況が不明なので、複製先でのパッチ適用状況は未保証です。\n" +" 遠隔ホスト上のリポジトリを複製する場合、パッチが未適用であることを\n" +" 確認してください。\n" +"\n" +" 特に指定が無い場合、パッチ管理領域は <src>/.hg/patches から複製され\n" +" ます。変更する場合は -p <url> を使用します。\n" +"\n" +" パッチ管理領域は、'qinit -c' によって生成された、入れ子になった\n" +" Mercurial リポジトリでなければなりません。\n" +" " msgid "versioned patch repository not found (see qinit -c)" -msgstr "" - -msgid "cloning main repo\n" -msgstr "" - -msgid "cloning patch repo\n" -msgstr "" - -msgid "stripping applied patches from destination repo\n" -msgstr "" - -msgid "updating destination repo\n" -msgstr "" +msgstr "構成管理されたパッチ領域が見つかりません(qinit -c 参照)" + +msgid "cloning main repository\n" +msgstr "主リポジトリを複製中\n" + +msgid "cloning patch repository\n" +msgstr "パッチ管理リポジトリを複製中\n" + +msgid "stripping applied patches from destination repository\n" +msgstr "複製先リポジトリにおいてパッチ適用を解除中\n" + +msgid "updating destination repository\n" +msgstr "複製先の作業領域を更新中\n" msgid "commit changes in the queue repository" -msgstr "" +msgstr "パッチ管理領域の変更をコミット" msgid "print the entire series file" -msgstr "" +msgstr "既知のパッチ一覧の表示" msgid "print the name of the current patch" -msgstr "" +msgstr "現行パッチの名前表示" msgid "print the name of the next patch" -msgstr "" +msgstr "現行パッチの「次」の既知のパッチの名前表示" msgid "all patches applied\n" -msgstr "" +msgstr "全てのパッチが適用中です\n" msgid "print the name of the previous patch" -msgstr "" +msgstr "現行パッチの「前」の既知のパッチの名前表示" msgid "only one patch applied\n" -msgstr "" +msgstr "単一のパッチだけが適用中です\n" msgid "" "create a new patch\n" "\n" -" qnew creates a new patch on top of the currently-applied patch (if " -"any).\n" -" It will refuse to run if there are any outstanding changes unless -f is\n" -" specified, in which case the patch will be initialized with them. You\n" -" may also use -I, -X, 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 as\n" -" uncommitted modifications.\n" -"\n" -" -u and -d can be used to set the (given) user and date, respectively.\n" -" -U and -D set user to current user and date to current date.\n" -"\n" -" -e, -m or -l set the patch header as well as the commit message. If " -"none\n" -" is specified, the header is empty and the commit message is '[mq]: " -"PATCH'.\n" -"\n" -" Use the --git option to keep the patch in the git extended diff\n" +" 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" +" -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.\n" +"\n" +" -u/--user and -d/--date can be used to set the (given) user and\n" +" date, respectively. -U/--currentuser and -D/--currentdate set user\n" +" to current user and date to current date.\n" +"\n" +" -e/--edit, -m/--message or -l/--logfile set the patch header as\n" +" well as the commit message. If none is specified, the header is\n" +" empty and the commit message is '[mq]: PATCH'.\n" +"\n" +" 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 "" +"新規パッチの作成\n" +"\n" +" 本コマンドは、(パッチ適用中の場合は)適用中パッチの最上位の位置に\n" +" 新規パッチを作成します。作業領域に変更がある場合、本コマンドは実行を\n" +" 中断しますが、-f/--force が指定された場合、作業領域中の変更を取り\n" +" 込んで新規パッチが作成されます。-I/--include、-X/--exclude および\n" +" ファイル名指定の組み合わせによって、変更を新規パッチに取り込む\n" +" ファイルが限定され、それ以外のファイルに対する変更は未コミットな\n" +" 変更のままとなります。\n" +"\n" +" -u/--user および -d/--date は、それぞれ指定のユーザ名／日時の記録に\n" +" 使用できます。 -U/--currentuser および -D/--currendate は、それぞれ\n" +" 現ユーザ名／現在日時を記録します。\n" +"\n" +" -e/--edit, -m/--message ないし -l/--logfile は、コミットメッセージと\n" +" 同様に、パッチのヘッダに記録する情報を指定します。指定が無い場合は、\n" +" ヘッダは空のまま、コミットメッセージが '[mq]: パッチ名' となります。\n" +"\n" +" git 拡張差分形式を使用する場合は、-g/--git を指定します。改名／複製\n" +" 情報や、権限設定の情報保持にとっての git 差分形式の有用性に関しては、\n" +" 'help diffs' を参照してください。\n" +" " msgid "" "update the current patch\n" "\n" -" If any file patterns are provided, the refreshed patch will contain " -"only\n" -" the modifications that match those patterns; the remaining " -"modifications\n" -" will remain in the working directory.\n" -"\n" -" If --short is specified, files currently included in the patch will\n" -" be refreshed just like matched files and remain in the patch.\n" -"\n" -" hg add/remove/copy/rename work as usual, though you might want to use\n" -" git-style patches (--git or [diff] git=1) to track copies and renames.\n" -" See the diffs help topic for more information on the git diff format.\n" -" " -msgstr "" +" If any file patterns are provided, the refreshed patch will\n" +" contain only the modifications that match those patterns; the\n" +" remaining modifications will remain in the working directory.\n" +"\n" +" If -s/--short is specified, files currently included in the patch\n" +" will be refreshed just like matched files and remain in the patch.\n" +"\n" +" 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" +" " +msgstr "" +"現行パッチの更新\n" +"\n" +" 何らかのパターンが指定された場合、更新後のパッチは当該パターンに\n" +" 合致するファイルの変更内容だけを含み、他のファイルの変更内容は作業\n" +" 領域に残ったままとなります。\n" +"\n" +" -s/--short が指定された場合、現行パッチが変更を保持するファイルのみが\n" +" パッチ内容更新の対象となって、パッチにとどまり続けます。\n" +"\n" +" 複製／改名に関する履歴保存のために git 差分形式を使用(-g/--git 指定や\n" +" 設定ファイルでの [diff] git=1 記述)するのであれば、\n" +" add/remove/copy/rename といった hg のコマンドによる履歴記録も、\n" +" 通常と変わりなく機能します。git 差分形式の詳細に関しては、\n" +" 'help diffs' を参照してください。\n" +" " msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" -msgstr "" +msgstr "\"-e\" は、\"-m\" ないし \"-l\" と併用できません" msgid "" "diff of the current patch and subsequent modifications\n" "\n" -" Shows a diff which includes the current patch as well as any changes " -"which\n" -" have been made in the working directory since the last refresh (thus\n" -" showing what the current patch would become after a qrefresh).\n" -"\n" -" Use 'hg diff' if you only want to see the changes made since the last\n" -" qrefresh, or 'hg export qtip' if you want to see changes made by the\n" -" current patch without including changes made since the qrefresh.\n" -" " -msgstr "" +" Shows a diff which includes the current patch as well as any\n" +" changes which have been made in the working directory since the\n" +" last refresh (thus showing what the current patch would become\n" +" after a qrefresh).\n" +"\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 made\n" +" by the current patch without including changes made since the\n" +" qrefresh.\n" +" " +msgstr "" +"現行パッチと作業領域変更の結合結果の表示\n" +"\n" +" 現行パッチの変更内容と、前回の qrefresh 実施以後の作業領域における\n" +" 変更内容を合わせた差分(＝ 現時点での qrefresh 実施によるパッチ内容の\n" +" 更新結果)を表示します。\n" +"\n" +" 前回の qrefresh 実施以後の作業領域における変更内容を見たい場合は\n" +" 'hg diff' を、作業領域の変更内容を含まない現行パッチの内容のみを\n" +" 見たい場合は 'hg export qtip' を使用してください。\n" +" " msgid "" "fold the named patches into the current patch\n" @@ -3010,34 +3022,44 @@ " Patches must not yet be applied. Each patch will be successively\n" " applied to the current patch in the order given. If all the\n" " patches apply successfully, the current patch will be refreshed\n" -" with the new cumulative patch, and the folded patches will\n" -" be deleted. With -k/--keep, the folded patch files will not\n" -" be removed afterwards.\n" -"\n" -" The header for each folded patch will be concatenated with\n" -" the current patch header, separated by a line of '* * *'." -msgstr "" +" with the new cumulative patch, and the folded patches will be\n" +" deleted. With -k/--keep, the folded patch files will not be\n" +" removed afterwards.\n" +"\n" +" The header for each folded patch will be concatenated with the\n" +" current patch header, separated by a line of '* * *'." +msgstr "" +"指定パッチの現行パッチへの統合\n" +"\n" +" 対象パッチは未適用でなければなりません。それぞれのパッチは指定された\n" +" 順序で連続的に現行パッチに適用されます。全ての適用が成功した場合は、\n" +" 現行パッチが全てのパッチの累積として更新され、統合されたパッチは削除\n" +" されます。-k/--keep が指定された場合は、統合実施後も統合されｔパッチの\n" +" ファイルは残されます。\n" +"\n" +" 統合対象パッチのヘッダ情報は、'* * *' 行を区切り記号として、現行の\n" +" パッチに追加されます。" msgid "qfold requires at least one patch name" -msgstr "" +msgstr "統合実施には最低1つのパッチ名指定が必要です" msgid "No patches applied" -msgstr "" +msgstr "適用中のパッチはありません" #, python-format msgid "Skipping already folded patch %s" -msgstr "" +msgstr "既に統合済みのパッチ %s は無視します" #, python-format msgid "qfold cannot fold already applied patch %s" -msgstr "" +msgstr "パッチ %s は適用中なので統合できません" #, python-format msgid "Error folding patch %s" -msgstr "" +msgstr "パッチ %s の統合に失敗" msgid "push or pop patches until named patch is at top of stack" -msgstr "" +msgstr "指定パッチを適用パッチの最上位にする qpush/qpop の実施" msgid "" "set or print guards for a patch\n" @@ -3056,47 +3078,73 @@ " hg qguard -- other.patch +2.6.17 -stable\n" " " msgstr "" +"パッチのガード設定ないし表示\n" +"\n" +" 「ガード」はパッチ適用の可否を制御します。ガードが設定されていない\n" +" パッチは常に適用されます。「正」のガード(例: \"+foo\")が設定された\n" +" パッチは、qselect によって当該ガードが設定されている場合にのみ適用\n" +" されます。「負」のガード(例: \"-foo\")が設定されているパッチは、\n" +" qselect によって当該ガードが設定されている場合には適用されません。\n" +"\n" +" 本コマンドが引数無しで実行された場合、現行のガード設定を表示します。\n" +" 引数有りで実行された場合、指定のパッチに対するガード設定を行います。\n" +" 備考: 負のガードの設定には '--' が必要です。\n" +"\n" +" 現行パッチ以外にガードを設定するには:\n" +" hg qguard -- 対象パッチ名 +2.6.17 -stable\n" +" " msgid "cannot mix -l/--list with options or arguments" -msgstr "" +msgstr "-l/--list は、他のオプションや引数と同時に指定できません" msgid "no patch to work with" -msgstr "" +msgstr "対象とすべきパッチがありません" #, python-format msgid "no patch named %s" -msgstr "" +msgstr "パッチ %s は未知のパッチです" msgid "print the header of the topmost or specified patch" -msgstr "" +msgstr "現行パッチないし指定パッチのヘッダ表示" msgid "" "push the next patch onto the stack\n" "\n" -" When --force is applied, all local changes in patched files will be " -"lost.\n" -" " -msgstr "" +" When -f/--force is applied, all local changes in patched files\n" +" will be lost.\n" +" " +msgstr "" +"次のパッチの適用\n" +"\n" +" -f/--force が指定された場合、パッチ適用対象ファイルの、作業領域に\n" +" おける変更内容は破棄されます。\n" +" " msgid "no saved queues found, please use -n\n" -msgstr "" +msgstr "保存されたパッチ管理領域がありません。-n を使用してください\n" #, python-format msgid "merging with queue at: %s\n" -msgstr "" +msgstr "パッチ管理領域 %s とマージ中\n" msgid "" "pop the current patch off the stack\n" "\n" -" By default, pops off the top of the patch stack. If given a patch name,\n" -" keeps popping off patches until the named patch is at the top of the " -"stack.\n" -" " -msgstr "" +" 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" +" された場合、当該パッチが適用中の最上位パッチになるまで、他のパッチの\n" +" 適用解除を行います。\n" +" " #, python-format msgid "using patch queue: %s\n" -msgstr "" +msgstr "パッチ管理領域 %s を使用中\n" msgid "" "rename a patch\n" @@ -3104,374 +3152,434 @@ " With one argument, renames the current patch to PATCH1.\n" " With two arguments, renames PATCH1 to PATCH2." msgstr "" +"パッチの改名\n" +"\n" +" 引数が1つの場合、現行パッチを指定された名前に改名します。\n" +" 引数が2つの場合、1つ目のパッチの名前を2つ目に改名します。" #, python-format msgid "%s already exists" -msgstr "" +msgstr "ファイル %s は既に存在します" #, python-format msgid "A patch named %s already exists in the series file" -msgstr "" - -msgid "restore the queue state saved by a rev" -msgstr "" +msgstr "同名のパッチ %s が既に存在します" + +msgid "restore the queue state saved by a revision" +msgstr "指定リビジョンによって保存されたパッチ管理状態の復旧" msgid "save current queue state" -msgstr "" +msgstr "パッチ管理状態の保存" #, python-format msgid "destination %s exists and is not a directory" -msgstr "" +msgstr "保存先 %s は既存のファイルです" #, python-format msgid "destination %s exists, use -f to force" -msgstr "" +msgstr "保存先 %s が存在します。実施する場合は -f を指定してください" #, python-format msgid "copy %s to %s\n" -msgstr "" +msgstr "%s から %s に複製します\n" msgid "" "strip a revision and all its descendants from the repository\n" "\n" -" If one of the working dir's parent revisions is stripped, the working\n" -" directory will be updated to the parent of the stripped revision.\n" -" " -msgstr "" +" 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" +" " +msgstr "" +"リポジトリからの、特定リビジョンおよびその子孫の除外\n" +"\n" +" 作業領域の親リビジョンが除外対象になった場合、作業領域は除外対象の\n" +" 親リビジョンの内容で更新されます。\n" +" " msgid "" "set or print guarded patches to push\n" "\n" " Use the 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 it\n" -" has no guards or any positive guards match the currently selected " -"guard,\n" -" but will not be pushed if any negative guards match the current guard.\n" -" For example:\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:\n" "\n" " qguard foo.patch -stable (negative guard)\n" " qguard bar.patch +stable (positive guard)\n" " qselect stable\n" "\n" " This activates the \"stable\" guard. mq will skip foo.patch (because\n" -" it has a negative match) but push bar.patch (because it\n" -" has a positive match).\n" +" it has a negative match) but push bar.patch (because it has a\n" +" positive match).\n" "\n" " With no arguments, prints the currently active guards.\n" " With one argument, sets the active guard.\n" "\n" " Use -n/--none to deactivate guards (no other arguments needed).\n" -" When no guards are active, patches with positive guards are skipped\n" -" and patches with negative guards are pushed.\n" +" When no guards are active, patches with positive guards are\n" +" skipped and patches with negative guards are pushed.\n" "\n" " qselect can change the guards on applied patches. It does not pop\n" -" guarded patches by default. Use --pop to pop back to the last applied\n" -" patch that is not guarded. Use --reapply (which implies --pop) to push\n" -" back to the current patch afterwards, but skip guarded patches.\n" -"\n" -" Use -s/--series to print a list of all guards in the series file (no\n" -" other arguments needed). Use -v for more information." -msgstr "" +" guarded patches by default. Use --pop to pop back to the last\n" +" applied patch that is not guarded. Use --reapply (which implies\n" +" --pop) to push back to the current patch afterwards, but skip\n" +" guarded patches.\n" +"\n" +" 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 "" +"作業領域におけるガード選択の設定ないし表示\n" +"\n" +" パッチ毎のガード設定ないし表示には qguard を使用しますが、作業領域に\n" +" おけるガード選択ないし表示には qselect を使用します。ガードが設定\n" +" されていないか、いずれかの「正」のガードがガード選択に合致する場合、\n" +" パッチは適用されますが、いずれかの「負」のガードがガード選択に合致\n" +" する場合、パッチは適用されません。例えば:\n" +"\n" +" qguard foo.patch -stable (「負」のガード)\n" +" qguard bar.patch +stable (「正」のガード)\n" +" qselect stable\n" +"\n" +" 上記の qselect 実行により、\"stable\" ガードが選択されます。MQ は\n" +" foo.patch の適用を(「負」のガードに合致するため)見送りますが、\n" +" bar.patch の適用は(「正」のガードに合致するため)実施します。\n" +"\n" +" 本コマンドが引数無しで実行された場合、現在のガード選択状況を表示\n" +" します。引数が指定された場合、ガード選択を設定します。\n" +"\n" +" -n/--none を指定することで、ガード選択を無効化します(他の引数は必要\n" +" ありません)。いずれのガードも選択されていない場合、「正」のガードが\n" +" 設定されたパッチの適用は見送られますが、「負」のガードが設定された\n" +" パッチは適用されます。\n" +"\n" +" 本コマンドの実行により、適用中のパッチの適用可否も変化し得ます。特に\n" +" 指定が無い場合、ガードが有効なパッチの適用解除は行われません。 \n" +" --pop が指定された場合、適用可否が変わる最初のパッチまでのパッチが\n" +" 適用解除されます。--reapply が指定された場合、--pop 相当の処理後に、\n" +" ガードが有効なパッチの適用を見送りつつ、現行パッチに至るまでパッチを\n" +" 再適用します。\n" +"\n" +" -s/--series が指定された場合、パッチに設定されたガードを一覧化して\n" +" 表示します(他の引数は不要)。詳細表示には -v を指定してください。" msgid "guards deactivated\n" -msgstr "" +msgstr "ガード設定を無効化します\n" #, python-format msgid "number of unguarded, unapplied patches has changed from %d to %d\n" -msgstr "" +msgstr "ガード設定の変更により、適用除外パッチ数が %d から %d になりました\n" #, python-format msgid "number of guarded, applied patches has changed from %d to %d\n" -msgstr "" +msgstr "ガード設定の変更により、適用対象パッチ数が %d から %d になりました\n" msgid "guards in series file:\n" -msgstr "" +msgstr "パッチに設定されているガードの一覧:\n" msgid "no guards in series file\n" -msgstr "" +msgstr "ガードが設定されたパッチはありません\n" msgid "active guards:\n" -msgstr "" +msgstr "有効なガード:\n" msgid "no active guards\n" -msgstr "" +msgstr "有効なガードはありません\n" msgid "popping guarded patches\n" -msgstr "" +msgstr "ガードが有効なパッチを解除中\n" msgid "reapplying unguarded patches\n" -msgstr "" +msgstr "ガードが無効なパッチを再適用中\n" msgid "" "move applied patches into repository history\n" "\n" -" Finishes the specified revisions (corresponding to applied patches) by\n" -" moving them out of mq control into regular repository history.\n" -"\n" -" Accepts a revision range or the --applied option. If --applied is\n" -" specified, all applied mq revisions are removed from mq control.\n" -" Otherwise, the given revisions must be at the base of the stack of\n" -" applied patches.\n" -"\n" -" This can be especially useful if your changes have been applied to an\n" -" upstream repository, or if you are about to push your changes to " -"upstream.\n" -" " -msgstr "" +" Finishes the specified revisions (corresponding to applied\n" +" patches) by moving them out of mq control into regular repository\n" +" history.\n" +"\n" +" Accepts a revision range or the -a/--applied option. If --applied\n" +" is specified, all applied mq revisions are removed from mq\n" +" control. Otherwise, the given revisions must be at the base of the\n" +" stack of applied patches.\n" +"\n" +" 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" +" 指定されたリビジョン(適用中パッチに相当)を、MQ 管理下から除外し、\n" +" 通常のリビジョンとしてリポジトリに記録します。\n" +"\n" +" リビジョン範囲指定や、-a/--applied が指定可能です。--applied が指定\n" +" された場合、全ての適用中パッチが MQ 管理下から除外されます。それ\n" +" 以外の場合、指定されたリビジョンは、適用中スタックの最下位からの\n" +" 一連のリビジョンでなければなりません。\n" +"\n" +" この機能は、上流のリポジトリでパッチが受理された場合や、パッチ内容を\n" +" 上流リポジトリに反映しようとしている場合などに有用です。\n" +" " msgid "no revisions specified" -msgstr "" +msgstr "リビジョン指定がありません" msgid "cannot commit over an applied mq patch" -msgstr "" +msgstr "MQ パッチ適用中はコミットを実施できません" msgid "source has mq patches applied" -msgstr "" +msgstr "元リポジトリでは MQ パッチが適用中です" #, python-format msgid "mq status file refers to unknown node %s\n" -msgstr "" +msgstr "MQ の状態管理ファイルが未知のリビジョン %s を参照しています\n" #, python-format msgid "Tag %s overrides mq patch of the same name\n" -msgstr "" +msgstr "タグ %s は MQ パッチの同名タグを上書きします\n" msgid "cannot import over an applied patch" -msgstr "" +msgstr "パッチ適用中の import による取り込みはできません" msgid "print first line of patch header" -msgstr "" +msgstr "パッチヘッダの最初の行を表示" msgid "hg qapplied [-s] [PATCH]" -msgstr "" +msgstr "hg qapplied [-s] [PATCH]" msgid "use pull protocol to copy metadata" msgstr "メタデータ複製に pull プロトコルを使用" msgid "do not update the new working directories" -msgstr "" +msgstr "新規作業領域の更新を抑止" msgid "use uncompressed transfer (fast over LAN)" msgstr "非圧縮での転送(LAN での高速転送用)" -msgid "location of source patch repo" -msgstr "" +msgid "location of source patch repository" +msgstr "複製元パッチ管理領域位置" msgid "hg qclone [OPTION]... SOURCE [DEST]" -msgstr "" +msgstr "hg qclone [OPTION]... SOURCE [DEST]" msgid "hg qcommit [OPTION]... [FILE]..." -msgstr "" +msgstr "hg qcommit [OPTION]... [FILE]..." msgid "hg qdiff [OPTION]... [FILE]..." -msgstr "" +msgstr "hg qdiff [OPTION]... [FILE]..." msgid "keep patch file" -msgstr "" - -msgid "stop managing a revision" -msgstr "" +msgstr "パッチファイルの削除を抑止" + +msgid "stop managing a revision (DEPRECATED)" +msgstr "指定リビジョンを管理対象から除外(非推奨)" msgid "hg qdelete [-k] [-r REV]... [PATCH]..." -msgstr "" +msgstr "hg qdelete [-k] [-r REV]... [PATCH]..." msgid "edit patch header" -msgstr "" +msgstr "パッチヘッダ内容の編集" msgid "keep folded patch files" -msgstr "" +msgstr "結合対象パッチのパッチファイル削除を抑止" msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..." -msgstr "" +msgstr "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..." msgid "overwrite any local changes" -msgstr "" +msgstr "作業領域中の変更を上書き" msgid "hg qgoto [OPTION]... PATCH" -msgstr "" +msgstr "hg qgoto [OPTION]... PATCH" msgid "list all patches and guards" -msgstr "" +msgstr "全てのパッチのガード状況を一覧表示" msgid "drop all guards" -msgstr "" +msgstr "全てのガード設定を破棄" msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..." -msgstr "" +msgstr "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..." msgid "hg qheader [PATCH]" -msgstr "" - -msgid "import file in patch dir" -msgstr "" - -msgid "patch file name" -msgstr "" +msgstr "hg qheader [PATCH]" + +msgid "import file in patch directory" +msgstr "パッチ管理領域中のファイルから取り込み" + +msgid "name of patch file" +msgstr "パッチファイル名" msgid "overwrite existing files" -msgstr "" +msgstr "既存ファイルの上書き" msgid "place existing revisions under mq control" -msgstr "" +msgstr "既存リビジョンを MQ 管理下に移行" msgid "use git extended diff format" -msgstr "git 拡張差分形式を使用" - -msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-r REV]... FILE..." -msgstr "" +msgstr "git 拡張差分形式の使用" + +msgid "qpush after importing" +msgstr "パッチ取り込み後にパッチ適用(qpush)を実施" + +msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..." +msgstr "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..." msgid "create queue repository" -msgstr "" +msgstr "パッチ管理自身を Mercurial で構成管理" msgid "hg qinit [-c]" -msgstr "" +msgstr "hg qinit [-c]" msgid "import uncommitted changes into patch" -msgstr "" +msgstr "作業領域の変更内容のパッチへの取り込み" msgid "add \"From: <current user>\" to patch" -msgstr "" +msgstr "\"From: <現ユーザ名>\" をパッチに追加" msgid "add \"From: <given user>\" to patch" -msgstr "" +msgstr "\"From: <指定ユーザ名>\" をパッチに追加" msgid "add \"Date: <current date>\" to patch" -msgstr "" +msgstr "\"Date: <現在時刻>\" をパッチに追加" msgid "add \"Date: <given date>\" to patch" -msgstr "" +msgstr "\"Date: <指定日時>\" をパッチに追加" msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..." -msgstr "" +msgstr "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..." msgid "hg qnext [-s]" -msgstr "" +msgstr "hg qnext [-s]" msgid "hg qprev [-s]" -msgstr "" +msgstr "hg qprev [-s]" msgid "pop all patches" -msgstr "" +msgstr "全てのパッチの適用を解除" msgid "queue name to pop" -msgstr "" +msgstr "パッチ解除先のパッチ管理領域名" msgid "forget any local changes" -msgstr "" +msgstr "作業領域中の変更を破棄" msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" -msgstr "" +msgstr "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" msgid "apply if the patch has rejects" -msgstr "" +msgstr "パッチ適用が拒否されても続行" msgid "list patch name in commit text" -msgstr "" +msgstr "コミットメッセージとしてパッチ名を列挙" msgid "apply all patches" -msgstr "" +msgstr "全てのパッチを適用" msgid "merge from another queue" -msgstr "" +msgstr "他のパッチ管理領域とのマージ" msgid "merge queue name" -msgstr "" +msgstr "マージ対象のパッチ管理領域名" msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]" -msgstr "" +msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]" msgid "refresh only files already in the patch and specified files" -msgstr "" +msgstr "パッチ対象か、明示指定のあったファイルのみを処理対象にする" msgid "add/update \"From: <current user>\" in patch" -msgstr "" +msgstr "パッチ中の \"From:\" を「現行ユーザ」で更新(ないし追加)" msgid "add/update \"From: <given user>\" in patch" -msgstr "" +msgstr "パッチ中の \"From:\" を指定ユーザで更新(ないし追加)" msgid "update \"Date: <current date>\" in patch (if present)" -msgstr "" +msgstr "パッチ中の \"Date:\" を現在日時で更新" msgid "update \"Date: <given date>\" in patch (if present)" -msgstr "" +msgstr "パッチ中の \"Date:\" を指定日時で更新" msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..." -msgstr "" +msgstr "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..." msgid "hg qrename PATCH1 [PATCH2]" -msgstr "" +msgstr "hg qrename PATCH1 [PATCH2]" msgid "delete save entry" -msgstr "" - -msgid "update queue working dir" -msgstr "" +msgstr "保存エントリの破棄" + +msgid "update queue working directory" +msgstr "パッチ管理領域の更新" msgid "hg qrestore [-d] [-u] REV" -msgstr "" +msgstr "hg qrestore [-d] [-u] REV" msgid "copy patch directory" -msgstr "" +msgstr "パッチ管理領域の複製" msgid "copy directory name" -msgstr "" +msgstr "複製先ディレクトリ名" msgid "clear queue status file" -msgstr "" +msgstr "パッチ状態ファイル(status)のクリア" msgid "force copy" -msgstr "" +msgstr "複製の強行" msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]" -msgstr "" +msgstr "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]" msgid "disable all guards" -msgstr "" +msgstr "全てのガード設定を破棄" msgid "list all guards in series file" -msgstr "" +msgstr "各パッチに設定されたガードを一覧化" msgid "pop to before first guarded applied patch" -msgstr "" +msgstr "適用可否が変化するパッチの適用を解除" msgid "pop, then reapply patches" -msgstr "" +msgstr "qpop 実施後に再度パッチを適用" msgid "hg qselect [OPTION]... [GUARD]..." -msgstr "" +msgstr "hg qselect [OPTION]... [GUARD]..." msgid "print patches not in series" -msgstr "" +msgstr "パッチ管理領域中の未知のパッチファイルを表示" msgid "hg qseries [-ms]" -msgstr "" +msgstr "hg qseries [-ms]" msgid "force removal with local changes" -msgstr "" +msgstr "作業領域に変更があっても削除を強行" msgid "bundle unrelated changesets" -msgstr "" +msgstr "無関係のリビジョンをバンドル化" msgid "no backups" -msgstr "" +msgstr "バックアップ作成の抑止" msgid "hg strip [-f] [-b] [-n] REV" -msgstr "" +msgstr "hg strip [-f] [-b] [-n] REV" msgid "hg qtop [-s]" -msgstr "" +msgstr "hg qtop [-s]" msgid "hg qunapplied [-s] [PATCH]" -msgstr "" +msgstr "hg qunapplied [-s] [PATCH]" msgid "finish all applied changesets" -msgstr "" +msgstr "全ての適用中パッチを通常リビジョン化" msgid "hg qfinish [-a] [REV...]" -msgstr "" - -msgid "" -"hook extension to email notifications on commits/pushes\n" +msgstr "hg qfinish [-a] [REV...]" + +msgid "" +"send e-mail notifications for commits/pushes\n" "\n" "Subscriptions can be managed through hgrc. Default mode is to print\n" "messages to stdout, for testing and configuring.\n" @@ -3528,36 +3636,15 @@ "emails\n" " pattern = user@host\n" "\n" -" glob patterns are matched against path to repo root.\n" -"\n" -" if you like, you can put notify config file in repo that users can\n" -" push changes to, they can manage their own subscriptions." -msgstr "" - -msgid "email notification class." -msgstr "" - -msgid "strip leading slashes from local path, turn into web-safe path." -msgstr "" - -msgid "try to clean up email addresses." -msgstr "" - -msgid "return list of email addresses of subscribers to this repo." -msgstr "" - -msgid "format one changeset." -msgstr "" - -msgid "true if incoming changes from this source should be skipped." -msgstr "" - -msgid "send message." +" glob patterns are matched against path to repository root.\n" +"\n" +" if you like, you can put notify config file in repository that users\n" +" can push changes to, they can manage their own subscriptions." msgstr "" #, python-format msgid "%s: %d new changesets" -msgstr "" +msgstr "%s: %d 件の新しいチェンジセット" #, python-format msgid "notify: sending %d subscribers %d changes\n" @@ -3577,15 +3664,8 @@ "\n" msgstr "" -msgid "" -"send email notifications to interested subscribers.\n" -"\n" -" if used as changegroup hook, send one email for all changesets in\n" -" changegroup. else send one email per changeset." -msgstr "" - -#, python-format -msgid "notify: no subscribers to repo %s\n" +#, python-format +msgid "notify: no subscribers to repository %s\n" msgstr "" #, python-format @@ -3593,19 +3673,18 @@ msgstr "" msgid "" -"browse command output with external pager\n" +"browse command output with an external pager\n" "\n" "To set the pager that should be used, set the application variable:\n" "\n" " [pager]\n" " pager = LESS='FSRX' less\n" "\n" -"If no pager is set, the pager extensions uses the environment\n" -"variable $PAGER. If neither pager.pager, nor $PAGER is set, no pager\n" -"is used.\n" -"\n" -"If you notice \"BROKEN PIPE\" error messages, you can disable them\n" -"by setting:\n" +"If no pager is set, the pager extensions uses the environment variable\n" +"$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n" +"\n" +"If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" +"setting:\n" "\n" " [pager]\n" " quiet = True\n" @@ -3616,27 +3695,27 @@ " [pager]\n" " ignore = version, help, update\n" "\n" -"You can also enable the pager only for certain commands using pager.attend:\n" +"You can also enable the pager only for certain commands using\n" +"pager.attend:\n" "\n" " [pager]\n" " attend = log\n" "\n" "If pager.attend is present, pager.ignore will be ignored.\n" "\n" -"To ignore global commands like \"hg version\" or \"hg help\", you have to " -"specify\n" -"them in the global .hgrc\n" -msgstr "" - -msgid "" -"use suffixes to refer to ancestor revisions\n" -"\n" -"This extension allows you to use git-style suffixes to refer to\n" -"the ancestors of a specific revision.\n" +"To ignore global commands like \"hg version\" or \"hg help\", you have to\n" +"specify them in the global .hgrc\n" +msgstr "" + +msgid "" +"interpret suffixes to refer to ancestor revisions\n" +"\n" +"This extension allows you to use git-style suffixes to refer to the\n" +"ancestors of a specific revision.\n" "\n" "For example, if you can refer to a revision as \"foo\", then:\n" "\n" -"- foo^N = Nth parent of foo:\n" +"- foo^N = Nth parent of foo\n" " foo^0 = foo\n" " foo^1 = first parent of foo\n" " foo^2 = second parent of foo\n" @@ -3649,35 +3728,31 @@ msgstr "" msgid "" -"sending Mercurial changesets as a series of patch emails\n" -"\n" -"The series is started off with a \"[PATCH 0 of N]\" introduction,\n" -"which describes the series as a whole.\n" -"\n" -"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 body parts:\n" -"\n" -" The remainder of the changeset description.\n" +"send Mercurial changesets as a series of patch e-mails\n" +"\n" +"The series is started off with a \"[PATCH 0 of N]\" introduction, which\n" +"describes the series as a whole.\n" +"\n" +"Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n" +"first line of the changeset description as the subject text. The\n" +"message contains two or three body parts:\n" +"\n" +" The changeset description.\n" "\n" " [Optional] The result of running diffstat on the patch.\n" "\n" " The patch itself, as generated by \"hg export\".\n" "\n" -"Each message refers to all of its predecessors using the In-Reply-To\n" -"and References headers, so they will show up as a sequence in\n" -"threaded mail and news readers, and in mail archives.\n" -"\n" -"For each changeset, you will be prompted with a diffstat summary and\n" -"the changeset summary, so you can be sure you are sending the right " -"changes.\n" -"\n" -"To enable this extension:\n" -"\n" -" [extensions]\n" -" hgext.patchbomb =\n" -"\n" -"To configure other defaults, add a section like this to your hgrc file:\n" +"Each message refers to the first in the series using the In-Reply-To\n" +"and References headers, so they will show up as a sequence in threaded\n" +"mail and news readers, and in mail archives.\n" +"\n" +"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.\n" +"\n" +"To configure other defaults, add a section like this to your hgrc\n" +"file:\n" "\n" " [email]\n" " from = My Name <my@email>\n" @@ -3689,66 +3764,134 @@ "as a patchbomb.\n" "\n" "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 an an introductory\n" -"message describing the patches of your patchbomb. Then when all is\n" -"done, patchbomb messages are displayed. If PAGER environment variable\n" -"is set, your pager will be fired up once for each patchbomb message, so\n" -"you can verify everything is alright.\n" -"\n" -"The \"-m\" (mbox) option is also very useful. Instead of previewing\n" -"each patchbomb message in a pager or sending the messages directly,\n" -"it will create a UNIX mailbox file with the patch emails. This\n" -"mailbox file can be previewed with any mail user agent which supports\n" -"UNIX mbox files, e.g. with mutt:\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.\n" +"\n" +"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:\n" "\n" " % mutt -R -f mbox\n" "\n" "When you are previewing the patchbomb messages, you can use `formail'\n" -"(a utility that is commonly installed as part of the procmail package),\n" -"to send each message out:\n" +"(a utility that is commonly installed as part of the procmail\n" +"package), to send each message out:\n" "\n" " % formail -s sendmail -bm -t < mbox\n" "\n" "That should be all. Now your patchbomb is on its way out.\n" "\n" "You can also either configure the method option in the email section\n" -"to be a sendmail compatable mailer or fill out the [smtp] section so\n" -"that the patchbomb extension can automatically send patchbombs directly\n" -"from the commandline. See the [email] and [smtp] sections in hgrc(5)\n" -"for details." -msgstr "" +"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." +msgstr "" +"電子メールによる変更内容のパッチ送付\n" +"\n" +"一連のメールは、\"[PATCH 0 of N]\" を Subject ヘッダに持つ、説明メール\n" +"から始まります。\n" +"\n" +"個々のメールの Subject ヘッダは、\"[PATCH M of N]\" で始まり、対応する\n" +"リビジョンのコミットメッセージの最初の行の内容が記載されます。メールの\n" +"本文は、以下の様な2ないし3の部位から構成されます:\n" +"\n" +" - コミットメッセージ\n" +"\n" +" - パッチの差分統計(diffstat)結果 [省略可能]\n" +"\n" +" - \"hg export\" 形式と同様のパッチ内容\n" +"\n" +"個々のメールは、In-Reply-To および References ヘッダを使用して、1通目の\n" +"メールを参照しますので、メールリーダーやニュースリーダーでの参照時や、\n" +"メールアーカイブにおいては、一連のスレッドとして扱われます。\n" +"\n" +"-d/--diffstat を指定した場合、差分統計結果やコミットメッセージを伴って\n" +"送信の有無の問い合わせがありますので、確認しながら送信できます。\n" +"\n" +"以下の様な記述を設定ファイルに追加することで、無指定時の設定を変更でき\n" +"ます:\n" +"\n" +" [email]\n" +" from = My Name <my@email>\n" +" to = recipient1, recipient2, ...\n" +" cc = cc1, cc2, ...\n" +" bcc = bcc1, bcc2, ...\n" +"\n" +"ここまで設定できたなら、\"hg email\" コマンドを使用して、一連の\n" +"リビジョンをパッチ爆弾(patchbomb)としてメール送信することができます。\n" +"\n" +"不完全なパッチの送信を防ぐ上で、まずは \"-n\"(＝「表示のみ」)指定付きで\n" +"\"email\" コマンドを実行するのがお勧めです。これを指定した実行の際には、\n" +"送信先アドレスや、一連のパッチから成るパッチ爆弾の説明文等の入力が促され\n" +"ます。必要な入力が完了すると、送信されるメールの内容が表示されます。\n" +"PAGER 環境変数が設定されている場合、パッチ爆弾を構成するメールごとに、\n" +"環境変数に設定されたプログラムが起動されますので、内容を確認することが\n" +"出来ます。\n" +"\n" +"-m/--mbox も有用です。PAGER での表示やメール送信の代わりに、パッチの\n" +"メールを格納した UNIX mailbox 形式のファイルを作成します。このファイルは\n" +"UNIX mailbox 形式ファイルに対応している任意のツールで閲覧することができ\n" +"ます。例えば mutt というツールの場合:\n" +"\n" +" % mutt -R -f mbox\n" +"\n" +"パッチ爆弾の内容を閲覧中に、`formail'(procmail パッケージの一部として\n" +"大抵のシステムにインストールされているユーティリティです)を使用して\n" +"メールを送信することができます:\n" +"\n" +" % formail -s sendmail -bm -t < mbox\n" +"\n" +"以上で完了です。これでパッチ爆弾が送信されました。\n" +"\n" +"設定ファイルの [email] セクションで method 指定を行うことで、sendmail\n" +"互換のメール送信プログラムを指定することもできれば、[smtp] セクションに\n" +"必要な情報を記述することで、外部プログラムの助けを借りずに Mercurial から\n" +"直接パッチ爆弾を送信することも可能です。これらのセクションに関する詳細は\n" +"設定ファイルに関するドキュメント(hgrc(5))を参照してください。" msgid "Please enter a valid value.\n" -msgstr "" +msgstr "適切な値を入力してください。\n" msgid "does the diffstat above look okay? " -msgstr "" +msgstr "上記の差分統計で間違いありませんか？ " msgid "diffstat rejected" -msgstr "" +msgstr "差分統計が却下されました" msgid "" "send changesets by email\n" "\n" " 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" +" one per message. The series starts with a \"[PATCH 0 of N]\"\n" " introduction, which describes the series as a whole.\n" "\n" " 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 body parts. First, the rest of\n" -" the changeset description. Next, (optionally) if the diffstat\n" -" program is installed, the result of running diffstat on the patch.\n" -" Finally, the patch itself, as generated by \"hg export\".\n" -"\n" -" With --outgoing, emails will be generated for patches not\n" -" found in the destination repository (or only those which are\n" -" ancestors of the specified revisions if any are provided)\n" -"\n" -" With --bundle, changesets are selected as for --outgoing,\n" -" but a single email containing a binary Mercurial bundle as an\n" -" attachment will be sent.\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\".\n" +"\n" +" By default the patch is included as text in the email body for\n" +" easy reviewing. Using the -a/--attach option will instead create\n" +" an attachment for the patch. With -i/--inline an inline attachment\n" +" will be created.\n" +"\n" +" 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)\n" +"\n" +" With -b/--bundle, changesets are selected as for --outgoing, but a\n" +" single email containing a binary Mercurial bundle as an attachment\n" +" will be sent.\n" "\n" " Examples:\n" "\n" @@ -3768,120 +3911,178 @@ "default\n" " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n" "\n" -" Before using this command, you will need to enable email in your hgrc.\n" -" See the [email] section in hgrc(5) for details.\n" -" " -msgstr "" - -msgid "Return the revisions present locally but not in dest" -msgstr "" +" 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" +"\n" +" 特に指定の無い場合、'hg export' の生成する差分形式で、リビジョン毎に\n" +" メールが送信されます。一連のメールは、\"[PATCH 0 of N]\" を Subject\n" +" ヘッダに持つ、説明メールから始まります。\n" +"\n" +" 個々のメールの Subject ヘッダは、\"[PATCH M of N]\" で始まり、対応\n" +" するリビジョンのコミットメッセージの最初の行の内容が記載されます。\n" +" メール本文は、2ないし3の部位から構成されます。最初の部位にはコミット\n" +" メッセージの続きが配置されます。次の部位には、diffstat コマンドが\n" +" 利用可能で且つ -d/--diffstat が指定された場合に、パッチの差分統計が\n" +" 配置されます。最後の部位には、'hg export' の生成する差分による\n" +" パッチが配置されます。\n" +"\n" +" 特に指定の無い場合、パッチはメール本文中に通常テキストとして埋め込ま\n" +" れます。-a/--attach 指定により、パッチが添付ファイル化されます。\n" +" -i/--inline 指定により、インライン添付ファイルとなります。\n" +"\n" +" -o/--outgoing 指定がある場合、連携対象リポジトリに存在しない\n" +" (あるいは、指定リビジョンの子孫となる)リビジョンのためのパッチのみが\n" +" メールで送信されます。\n" +"\n" +" -b/--bundle 指定がある場合、対象リビジョンの選択は --outgoing 指定\n" +" 時と同様に行われますが、Mercurial のバンドル形式ファイルを添付\n" +" ファイルとする単一のメールとして送信されます。\n" +"\n" +" 実行例:\n" +"\n" +" hg email -r 3000 # リビジョン 3000 \n" +" hg email -r 3000 -r 3001 # リビジョン 3000 および 3001\n" +" hg email -r 3000:3005 # リビジョン 3000 から 3005 まで\n" +" hg email 3000 # リビジョン 3000 (非推奨形式)\n" +"\n" +" hg email -o # default に無いリビジョン\n" +" hg email -o DEST # DEST に無いリビジョン\n" +" hg email -o -r 3000 # default に無い 3000 以後\n" +" hg email -o -r 3000 DEST # DEST に無い 3000 以後\n" +"\n" +" hg email -b # default に無いものを bundle 形式で\n" +" hg email -b DEST # DEST に無いものを bundle 形式で\n" +" hg email -b -r 3000 # default に無い 3000 以後を bundle 形式で\n" +" hg email -b -r 3000 DEST # DEST に無い 3000 以後を bundle 形式で\n" +"\n" +" 本コマンドを使用する前に、設定ファイルに電子メール関連設定を記述する\n" +" 必要があります。設定ファイルに関するドキュメント(hgrc(5))を参照して\n" +" ください。\n" +" " msgid "specify at least one changeset with -r or -o" -msgstr "" +msgstr "-r 又は -o を使用してリビジョンを指定してください" msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing" -msgstr "" +msgstr "--bundle 指定で暗黙に有効となりますので --outgoing 指定は不要です" msgid "too many destinations" -msgstr "" +msgstr "対象指定が多過ぎです" msgid "use only one form to specify the revision" -msgstr "" +msgstr "リビジョン指定は単一の形式で行ってください" msgid "" "\n" "Write the introductory message for the patch series.\n" "\n" msgstr "" +"\n" +"一連のパッチのための説明文を記述してください。\n" +"\n" #, python-format msgid "" "This patch series consists of %d patches.\n" "\n" msgstr "" +"一連のパッチは %d 個のパッチから構成されています。\n" +"\n" msgid "Final summary:\n" -msgstr "" +msgstr "統計結果:\n" msgid "Displaying " -msgstr "" +msgstr "表示中 " msgid "Writing " -msgstr "" +msgstr "書き出し中 " msgid "Sending " -msgstr "" +msgstr "送信中 " msgid "send patches as attachments" -msgstr "" +msgstr "添付ファイルとしてパッチを送信" msgid "send patches as inline attachments" -msgstr "" +msgstr "インライン添付ファイルとしてパッチを送信" msgid "email addresses of blind carbon copy recipients" -msgstr "" +msgstr "BCC 宛先のメールアドレス" msgid "email addresses of copy recipients" -msgstr "" +msgstr "CC 宛先のメールアドレス" msgid "add diffstat output to messages" -msgstr "" +msgstr "差分統計を出力に追加" msgid "use the given date as the sending date" -msgstr "" +msgstr "メールの Date ヘッダ値に指定日時を設定" msgid "use the given file as the series description" -msgstr "" +msgstr "指定ファイルの内容を説明文として使用" msgid "email address of sender" -msgstr "" +msgstr "メールの From ヘッダ値" msgid "print messages that would be sent" -msgstr "" +msgstr "送信予定のメールの内容を表示" msgid "write messages to mbox file instead of sending them" -msgstr "" +msgstr "メール送信の代わりに、mbox ファイルに書き出す" msgid "subject of first message (intro or single patch)" -msgstr "" +msgstr "説明文ないし単一パッチ送信メールの Subject ヘッダ値" + +msgid "message identifier to reply to" +msgstr "返信対象のメッセージID" msgid "email addresses of recipients" -msgstr "" +msgstr "TO 宛先のメールアドレス" msgid "omit hg patch header" -msgstr "" +msgstr "Mercurial 固有のパッチヘッダを省略" msgid "send changes not found in the target repository" -msgstr "" +msgstr "対象リポジトリに無いリビジョンをパッチ形式で送信" msgid "send changes not in target as a binary bundle" -msgstr "" +msgstr "対象リポジトリに無いリビジョンをバンドル形式で送信" + +msgid "name of the bundle attachment file" +msgstr "バンドル形式添付ファイルのファイル名" msgid "a revision to send" -msgstr "" - -msgid "run even when remote repository is unrelated (with -b)" -msgstr "" - -msgid "a base changeset to specify instead of a destination (with -b)" -msgstr "" +msgstr "送信するリビジョン" + +msgid "run even when remote repository is unrelated (with -b/--bundle)" +msgstr "連携先が無関係なリポジトリでも送信(-b/--bundle 指定時)" + +msgid "a base changeset to specify instead of a destination (with -b/--bundle)" +msgstr "連携先指定の代わりとなる基底リビジョン(-b/--bundle 指定時)" msgid "send an introduction email for a single patch" -msgstr "" +msgstr "説明文を独立したメールで送信" msgid "hg email [OPTION]... [DEST]..." -msgstr "" +msgstr "hg email [OPTION]... [DEST]...\"" + +msgid "delete files not tracked from the working directory" +msgstr "作業領域中の未登録ファイルの削除" msgid "" "removes files not tracked by Mercurial\n" "\n" -" Delete files not known to Mercurial. This is useful to test local and\n" -" uncommitted changes in an otherwise-clean source tree.\n" +" Delete files not known to Mercurial. This is useful to test local\n" +" and uncommitted changes in an otherwise-clean source tree.\n" "\n" " This means that purge will delete:\n" " - Unknown files: files marked with \"?\" by \"hg status\"\n" -" - Empty directories: in fact Mercurial ignores directories unless they\n" -" contain files under source control managment\n" +" - Empty directories: in fact Mercurial ignores directories unless\n" +" they contain files under source control management\n" " But it will leave untouched:\n" " - Modified and unmodified tracked files\n" " - Ignored files (unless --all is specified)\n" @@ -3890,370 +4091,320 @@ " If directories are given on the command line, only files in these\n" " directories are considered.\n" "\n" -" Be careful with purge, as you could irreversibly delete some files you\n" -" forgot to add to the repository. If you only want to print the list of\n" -" files that this program would delete, use the --print option.\n" +" Be careful with purge, as you could irreversibly delete some files\n" +" you forgot to add to the repository. If you only want to print the\n" +" list of files that this program would delete, use the --print\n" +" option.\n" " " msgstr "" #, python-format msgid "%s cannot be removed" -msgstr "" +msgstr "%s を削除できませんでした" #, python-format msgid "warning: %s\n" -msgstr "" +msgstr "警告: %s\n" #, python-format msgid "Removing file %s\n" -msgstr "" +msgstr "ファイル %s を削除しています\n" #, python-format msgid "Removing directory %s\n" -msgstr "" +msgstr "ディレクトリ %s を削除しています\n" msgid "abort if an error occurs" -msgstr "" +msgstr "エラーが発生した場合、中断する" msgid "purge ignored files too" -msgstr "" - -msgid "print the file names instead of deleting them" -msgstr "" - -msgid "end filenames with NUL, for use with xargs (implies -p)" -msgstr "" +msgstr "無視したファイルも削除する" + +msgid "print filenames instead of deleting them" +msgstr "ファイル削除の変わりにファイル名表示を実施" + +msgid "end filenames with NUL, for use with xargs (implies -p/--print)" +msgstr "ファイル名をNUL文字(0x00)で終端(xargs -p/--print との併用向け)" msgid "hg purge [OPTION]... [DIR]..." -msgstr "" +msgstr "hg purge [OPTION]... [DIR]...\"" msgid "" "move sets of revisions to a different ancestor\n" "\n" -"This extension lets you rebase changesets in an existing Mercurial " +"This extension lets you rebase changesets in an existing Mercurial\n" "repository.\n" "\n" "For more information:\n" "http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n" msgstr "" - -msgid "return the correct ancestor" -msgstr "" +"異なる祖先の元への一連のリビジョンの移動\n" +"\n" +"本エクステンションは、既存の Mercurial リポジトリにおけるリビジョンの\n" +"リベースを可能にします。\n" +"\n" +"詳細は以下を参照してください:\n" +"http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n" msgid "first revision, do not change ancestor\n" -msgstr "" +msgstr "初期リビジョンのため、祖先を変更しません\n" msgid "" "move changeset (and descendants) to a different branch\n" "\n" -" Rebase uses repeated merging to graft changesets from one part of " -"history\n" -" onto another. This can be useful for linearizing local changes relative " -"to\n" -" a master development tree.\n" -"\n" -" If a rebase is interrupted to manually resolve a merge, it can be " -"continued\n" -" with --continue or aborted with --abort.\n" -" " -msgstr "" - -msgid "cannot use both keepbranches and extrafn" -msgstr "" +" 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.\n" +"\n" +" If a rebase is interrupted to manually resolve a merge, it can be\n" +" continued with --continue/-c or aborted with --abort/-a.\n" +" " +msgstr "" +"別な履歴位置へのリビジョン(およびその子孫)の移動\n" +"\n" +" ある履歴位置から別な位置へとリビジョンを移植するため、本コマンドは\n" +" 反復的なマージを行ないます。この機能は、作業領域における成果を開発\n" +" 用のマスターリポジトリに反映する際に、枝分かれの無い状態にするような\n" +" 場合に有用です。\n" +"\n" +" 手動マージによる衝突解消の必要から中断された場合、--continue/-c で\n" +" 処理を継続したり、--abort/-a で処理を終了させたりできます。\n" +" " msgid "cannot use both abort and continue" -msgstr "" +msgstr "--abort と --continue は併用できません" msgid "cannot use collapse with continue or abort" -msgstr "" +msgstr "--collapse は --abort や --continue と併用できません" msgid "abort and continue do not allow specifying revisions" -msgstr "" +msgstr "--abort や --continue は、りビジョン指定と併用できません" msgid "cannot specify both a revision and a base" -msgstr "" +msgstr "--soruce と --base は併用できません" msgid "nothing to rebase\n" -msgstr "" +msgstr "リベースの必要はありません\n" + +msgid "cannot use both keepbranches and extrafn" +msgstr "--keepbranches と --extrafn は併用できません" msgid "rebase merging completed\n" -msgstr "" +msgstr "リベースのマージ処理が完了\n" msgid "warning: new changesets detected on source branch, not stripping\n" -msgstr "" +msgstr "警告: リベース元に新規リビジョンを検出したので、破棄しません\n" msgid "rebase completed\n" -msgstr "" +msgstr "リベース完了\n" #, python-format msgid "%d revisions have been skipped\n" -msgstr "" - -msgid "" -"Skip commit if collapsing has been required and rev is not the last\n" -" revision, commit otherwise\n" -" " -msgstr "" +msgstr "%d 個のリビジョンをスキップ\n" msgid " set parents\n" -msgstr "" - -msgid "Rebase a single revision" -msgstr "" +msgstr " 親リビジョンの設定\n" #, python-format msgid "rebasing %d:%s\n" -msgstr "" +msgstr " %d:%s のリベース中\n" #, python-format msgid " future parents are %d and %d\n" -msgstr "" +msgstr " リベース後の親リビジョンは %d と %d\n" #, python-format msgid " update to %d:%s\n" -msgstr "" +msgstr " %d:%s へと更新\n" msgid " already in target\n" -msgstr "" +msgstr " 既に対象内\n" #, python-format msgid " merge against %d:%s\n" -msgstr "" +msgstr " %d:%s に対してマージ\n" msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" -msgstr "" +msgstr " 'hg resolve' で衝突解消してから 'hg rebase --continue' してください" msgid "resuming interrupted rebase\n" -msgstr "" +msgstr "中断されたリベースの再開中\n" #, python-format msgid "no changes, revision %d skipped\n" -msgstr "" +msgstr "変更がないので、リビジョン %d をスキップ\n" #, python-format msgid "next revision set to %s\n" -msgstr "" - -msgid "Return the new parent relationship of the revision that will be rebased" -msgstr "" +msgstr "次のリビジョンを %s に設定\n" #, python-format msgid "cannot use revision %d as base, result would have 3 parents" -msgstr "" - -msgid "Update rebased mq patches - finalize and then import them" -msgstr "" +msgstr "親リビジョンが 3 つになるので、リビジョン %d をベースにできません" #, python-format msgid "revision %d is an mq patch (%s), finalize it.\n" -msgstr "" +msgstr "リビジョン %d は MQ パッチ(%s)なので、通常リビジョン化\n" #, python-format msgid "import mq patch %d (%s)\n" -msgstr "" - -msgid "Store the current status to allow recovery" -msgstr "" +msgstr "MQ パッチ %d(%s) の取り込み\n" msgid "rebase status stored\n" -msgstr "" - -msgid "Remove the status files" -msgstr "" - -msgid "Restore a previously stored status" -msgstr "" +msgstr "リベース状態が保存されました\n" msgid "rebase status resumed\n" -msgstr "" +msgstr "リベース状態を復旧しました\n" msgid "no rebase in progress" -msgstr "" - -msgid "Restore the repository to its original state" -msgstr "" +msgstr "進行中のリベース状態はありません" msgid "warning: new changesets detected on target branch, not stripping\n" -msgstr "" +msgstr "警告: 新規リビジョンが対象ブランチに検出されたので、破棄しません\n" msgid "rebase aborted\n" -msgstr "" - -msgid "Define which revisions are going to be rebased and where" -msgstr "" +msgstr "リベースが中断されました\n" msgid "cannot rebase onto an applied mq patch" -msgstr "" +msgstr "MQ パッチ上へのリベースはできません" msgid "cannot rebase an ancestor" -msgstr "" +msgstr "先祖へのリベースはできません" msgid "cannot rebase a descendant" -msgstr "" +msgstr "子孫へのリベースはできません" msgid "already working on current\n" -msgstr "" +msgstr "既に現行位置で作業中\n" msgid "already working on the current branch\n" -msgstr "" +msgstr "既に現行ブランチで作業中\n" #, python-format msgid "rebase onto %d starting from %d\n" -msgstr "" +msgstr "%d へのリベースを %d から開始\n" msgid "unable to collapse, there is more than one external parent" -msgstr "" - -msgid "Call rebase after pull if the latter has been invoked with --rebase" -msgstr "" +msgstr "複数の親との関係から、--collapse は指定できません" msgid "--update and --rebase are not compatible, ignoring the update flag\n" -msgstr "" - -msgid "Replace pull with a decorator to provide --rebase option" -msgstr "" +msgstr "--update と --rebase は非互換のため、--update は無視します\n" msgid "rebase working directory to branch head" -msgstr "" - -msgid "keep original revisions" -msgstr "" - -msgid "keep original branches" -msgstr "" +msgstr "作業領域をブランチヘッドにリベース" msgid "rebase from a given revision" -msgstr "" +msgstr "指定リビジョンをリベース" msgid "rebase from the base of a given revision" -msgstr "" +msgstr "指定リビジョンから先をリベース" msgid "rebase onto a given revision" -msgstr "" +msgstr "リベース先リビジョンの指定" msgid "collapse the rebased revisions" -msgstr "" +msgstr "リベース後にリビジョンを一体化" + +msgid "keep original revisions" +msgstr "元リビジョンの維持" + +msgid "keep original branches" +msgstr "元ブランチの維持" msgid "continue an interrupted rebase" -msgstr "" +msgstr "中断されたリベースを再開" msgid "abort an interrupted rebase" -msgstr "" - -msgid "" -"hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]" -msgstr "" - -msgid "interactive change selection during commit or qrefresh" -msgstr "" - -msgid "" -"like patch.iterhunks, but yield different events\n" -"\n" -" - ('file', [header_lines + fromfile + tofile])\n" -" - ('context', [context_lines])\n" -" - ('hunk', [hunk_lines])\n" -" - ('range', (-start,len, +start,len, diffp))\n" -" " -msgstr "" - -msgid "scan lr while predicate holds" -msgstr "" - -msgid "" -"patch header\n" -"\n" -" XXX shoudn't we move this to mercurial/patch.py ?\n" -" " -msgstr "" +msgstr "中断されたリベースを中止" + +msgid "" +"hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] " +"| [-c] | [-a]" +msgstr "" +"hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] " +"| [-c] | [-a]" + +msgid "interactively select which sets of changes to commit/qrefresh" +msgstr "commit または qrefresh コマンド実行時の対話的な変更の選択" msgid "this modifies a binary file (all or nothing)\n" -msgstr "" +msgstr "これはバイナリファイルに対する変更です(部分的な選択は不可能)\n" msgid "this is a binary file\n" -msgstr "" +msgstr "これはバイナリファイルです\n" #, python-format msgid "%d hunks, %d lines changed\n" -msgstr "" - -msgid "hunk -> (n+,n-)" -msgstr "" - -msgid "" -"patch hunk\n" -"\n" -" XXX shouldn't we merge this with patch.hunk ?\n" -" " -msgstr "" - -msgid "patch -> [] of hunks " -msgstr "" - -msgid "patch parsing state machine" -msgstr "" - -msgid "Interactively filter patch chunks into applied-only chunks" -msgstr "" - -msgid "" -"fetch next portion from chunks until a 'header' is seen\n" -" NB: header == new-file mark\n" -" " -msgstr "" - -msgid "" -"prompt query, and process base inputs\n" -"\n" -" - y/n for the rest of file\n" -" - y/n for the rest\n" -" - ? (help)\n" -" - q (quit)\n" -"\n" -" else, input is returned to the caller.\n" -" " -msgstr "" +msgstr "%d 個のハンク、%d 行の変更\n" msgid "[Ynsfdaq?]" -msgstr "" +msgstr "[Ynsfdaq?]" + +msgid "&Yes, record this change" +msgstr "&Yes - この変更を記録します" + +msgid "&No, skip this change" +msgstr "&No - この変更をスキップします" + +msgid "&Skip remaining changes to this file" +msgstr "&Skip - このファイルの残りの変更を全てスキップします" + +msgid "Record remaining changes to this &file" +msgstr "&File - このファイルの残りの変更を全て記録します" + +msgid "&Done, skip remaining changes and files" +msgstr "&Done - 残りの変更およびファイルを全てスキップして終了します" + +msgid "Record &all changes to all remaining files" +msgstr "&All - 残りの変更およびファイルを全て記録します" + +msgid "&Quit, recording no changes" +msgstr "&Quit - 変更を記録しないで終了します" + +msgid "&?" +msgstr "&?" msgid "y" -msgstr "" +msgstr "y" msgid "?" -msgstr "" +msgstr "?" msgid "y - record this change" -msgstr "" +msgstr "y - この変更を記録します" msgid "s" -msgstr "" +msgstr "s" msgid "f" -msgstr "" +msgstr "f" msgid "d" -msgstr "" +msgstr "d" msgid "a" -msgstr "" +msgstr "a" msgid "q" -msgstr "" +msgstr "q" msgid "user quit" -msgstr "" +msgstr "ユーザの指示により終了します" #, python-format msgid "examine changes to %s?" -msgstr "" +msgstr "%s の変更点を調べますか?" msgid " and " -msgstr "" +msgstr " と " #, python-format msgid "record this change to %r?" -msgstr "" +msgstr "この変更を %r に記録しますか?" + +#, python-format +msgid "record change %d/%d to %r?" +msgstr "この変更 (%d 件目 / %d 件中) を %r に記録しますか?" msgid "" "interactively select changes to commit\n" @@ -4265,7 +4416,7 @@ "\n" " You will be prompted for whether to record changes to each\n" " modified file, and for files with multiple changes, for each\n" -" change to use. For each query, the following responses are\n" +" change to use. For each query, the following responses are\n" " possible:\n" "\n" " y - record this change\n" @@ -4280,147 +4431,142 @@ "\n" " ? - display help" msgstr "" - -msgid "" -"interactively record a new patch\n" -"\n" -" see 'hg help qnew' & 'hg help record' for more information and usage\n" -" " -msgstr "" +"コミットする内容を対話的に選択します\n" +"\n" +" ファイル一覧が指定されなかった場合は \"hg status\" で表示される\n" +" 全てのファイルが記録の対象となります。\n" +"\n" +" -d/--date で使用する日時表記は 'he help dates' を参照してください。\n" +"\n" +" 変更されたファイルの変更箇所ごとに記録するかどうか質問されます。\n" +" それに対して以下の操作が可能です：\n" +"\n" +" y - この変更を記録します\n" +" n - この変更をスキップします\n" +"\n" +" s - このファイルの残りの変更を全てスキップします\n" +" f - このファイルの残りの変更を全て記録します\n" +"\n" +" d - 残りの変更およびファイルをスキップして終了します\n" +" a - 残り全てのファイルの変更を記録します\n" +" q - 変更を記録しないで終了します\n" +"\n" +" ? - ヘルプを表示します" msgid "'mq' extension not loaded" -msgstr "" +msgstr "'mq' エクステンションが読み込まれていません" msgid "running non-interactively, use commit instead" -msgstr "" - -msgid "" -"This is generic record driver.\n" -"\n" -" It's job is to interactively filter local changes, and accordingly\n" -" prepare working dir into a state, where the job can be delegated to\n" -" non-interactive commit command such as 'commit' or 'qrefresh'.\n" -"\n" -" After the actual job is done by non-interactive command, working " -"dir\n" -" state is restored to original.\n" -"\n" -" In the end we'll record intresting changes, and everything else will " -"be\n" -" left in place, so the user can continue his work.\n" -" " -msgstr "" +msgstr "非対話的に実行する場合は commit を使用してください" msgid "no changes to record\n" -msgstr "" +msgstr "記録可能な変更がありません\n" #, python-format msgid "backup %r as %r\n" -msgstr "" +msgstr "%r を %r としてバックアップします\n" msgid "applying patch\n" -msgstr "" +msgstr "パッチを適用中\n" msgid "patch failed to apply" -msgstr "" +msgstr "パッチの適用に失敗" #, python-format msgid "restoring %r to %r\n" -msgstr "" +msgstr "%r から %r に復元中\n" msgid "hg record [OPTION]... [FILE]..." -msgstr "" +msgstr "hg record [OPTION]... [FILE]..." msgid "hg qrecord [OPTION]... PATCH [FILE]..." -msgstr "" - -msgid "" -"patch transplanting tool\n" +msgstr "hg qrecord [OPTION]... PATCH [FILE]..." + +msgid "share a common history between several working directories" +msgstr "" + +msgid "" +"create a new shared repository (experimental)\n" +"\n" +" Initialize a new repository and working directory that shares its\n" +" history with another repository.\n" +"\n" +" NOTE: actions that change history such as rollback or moving the\n" +" source may confuse sharers.\n" +" " +msgstr "" + +msgid "do not create a working copy" +msgstr "作業領域の更新を抑止します" + +msgid "[-U] SOURCE [DEST]" +msgstr "[-U] SOURCE [DEST]" + +msgid "" +"transplant changesets from another branch\n" "\n" "This extension allows you to transplant patches from another branch.\n" "\n" -"Transplanted patches are recorded in .hg/transplant/transplants, as a map\n" -"from a changeset hash to its hash in the source repository.\n" -msgstr "" - -msgid "" -"returns True if a node is already an ancestor of parent\n" -" or has already been transplanted" -msgstr "" - -msgid "apply the revisions in revmap one by one in revision order" -msgstr "" +"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" +"\n" +"本エクステンションは、別ブランチからのパッチの移植を可能にします。\n" +"\n" +"移植されたパッチの情報は、移植先リビジョンのハッシュ値から、移植元\n" +"リポジトリにおけるハッシュ値への変換として、.hg/transplant/transplants\n" +"に記録されます。\n" #, python-format msgid "skipping already applied revision %s\n" -msgstr "" +msgstr "すでに適用したりビジョン %s を飛ばしています\n" #, python-format msgid "skipping merge changeset %s:%s\n" -msgstr "" +msgstr "チェンジセット %s:%s のマージを飛ばしています\n" #, python-format msgid "%s merged at %s\n" -msgstr "" +msgstr "%s を %s にマージ\n" #, python-format msgid "%s transplanted to %s\n" -msgstr "" - -msgid "arbitrarily rewrite changeset before applying it" -msgstr "" +msgstr "%s を %s に移植\n" #, python-format msgid "filtering %s\n" -msgstr "" +msgstr "%s をフィルタリング中\n" msgid "filter failed" -msgstr "" - -msgid "apply the patch in patchfile to the repository as a transplant" -msgstr "" +msgstr "フィルターに失敗" msgid "can only omit patchfile if merging" -msgstr "" +msgstr "マージの場合のみパッチファイルを省略可能" #, python-format msgid "%s: empty changeset" -msgstr "" +msgstr "%s: 空のチェンジセット" msgid "Fix up the merge and run hg transplant --continue" -msgstr "" - -msgid "recover last transaction and apply remaining changesets" -msgstr "" +msgstr "衝突解消後に 'hg transplant --continue' してください" #, python-format msgid "%s transplanted as %s\n" -msgstr "" - -msgid "commit working directory using journal metadata" -msgstr "" +msgstr "%s が %s として移植されました\n" msgid "transplant log file is corrupt" -msgstr "" +msgstr "移植ログファイルが破損しています" #, python-format msgid "working dir not at transplant parent %s" -msgstr "" +msgstr "作業領域が移植親 %s ではありません" msgid "commit failed" -msgstr "" - -msgid "journal changelog metadata for later recover" -msgstr "" - -msgid "remove changelog journal" -msgstr "" - -msgid "interactively transplant changesets" -msgstr "" +msgstr "コミットに失敗" msgid "apply changeset? [ynmpcq?]:" -msgstr "" +msgstr "チェンジセットを適用しますか? [ynmpcq?]:" msgid "" "transplant changesets from another branch\n" @@ -4432,124 +4578,240 @@ " (transplanted from CHANGESETHASH)\n" "\n" " You can rewrite the changelog message with the --filter option.\n" -" Its argument will be invoked with the current changelog message\n" -" as $1 and the patch as $2.\n" -"\n" -" If --source is specified, selects changesets from the named\n" -" repository. If --branch is specified, selects changesets from the\n" -" branch holding the named revision, up to that revision. If --all\n" -" is specified, all changesets on the branch will be transplanted,\n" -" otherwise you will be prompted to select the changesets you want.\n" -"\n" -" hg transplant --branch REVISION --all will rebase the selected branch\n" -" (up to the named revision) onto your current working directory.\n" -"\n" -" You can optionally mark selected transplanted changesets as\n" -" merge changesets. You will not be prompted to transplant any\n" -" ancestors of a merged transplant, and you can merge descendants\n" -" of them normally instead of transplanting them.\n" +" Its argument will be invoked with the current changelog message as\n" +" $1 and the patch as $2.\n" +"\n" +" If --source/-s is specified, selects changesets from the named\n" +" repository. If --branch/-b is specified, selects changesets from\n" +" the branch holding the named revision, up to that revision. If\n" +" --all/-a is specified, all changesets on the branch will be\n" +" transplanted, otherwise you will be prompted to select the\n" +" changesets you want.\n" +"\n" +" hg transplant --branch REVISION --all will rebase the selected\n" +" branch (up to the named revision) onto your current working\n" +" directory.\n" +"\n" +" You can optionally mark selected transplanted changesets as merge\n" +" changesets. You will not be prompted to transplant any ancestors\n" +" of a merged transplant, and you can merge descendants of them\n" +" normally instead of transplanting them.\n" "\n" " If no merges or revisions are provided, hg transplant will start\n" " an interactive changeset browser.\n" "\n" -" If a changeset application fails, you can fix the merge by hand and\n" -" then resume where you left off by calling hg transplant --continue.\n" -" " -msgstr "" +" 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" +" " +msgstr "" +"別のブランチへのチェンジセットの移植\n" +"\n" +" 選択されたチェンジセットは、元チェンジセットのコミットログと一緒に\n" +" 現在の作業領域上に適用されます。--log 指定がある場合、以下の形式の\n" +" メッセージが追加されます:\n" +"\n" +" (transplanted from CHANGESETHASH)\n" +"\n" +" --filter によりコミットログを改変することができます。指定された値は\n" +" コマンド起動に使用され、第1引数にはコミットメッセージ、第2引数には\n" +" パッチが指定されます。\n" +"\n" +" --source/-s が指定された場合、指定のリポジトリから移植されます。\n" +" --branch/-b が指定された場合、指定の名前を持つブランチから移植\n" +" されます。--all/-a が指定された場合、指定されたブランチ中の全ての\n" +" チェンジセットが移植対処となり、それ以外の場合は移植対象とする\n" +" チェンジセットの問い合わせがあります。\n" +"\n" +" hg transplant --branch REVISION --all 形式での起動の場合、指定された\n" +" REVISION の属するブランチ中の全てのチェンジセットが、現在の作業領域\n" +" 上に移植されます。\n" +"\n" +" 選択した対象チェンジセットの移植を、マージ実施とみなすことも可能\n" +" です。移植の際にマージ対象リビジョンに関する問い合わせは無く、移植\n" +" 後の移植元の子孫に対しては、移植ではなく通常のマージが可能です。\n" +"\n" +" マージ対象もリビジョン指定もない場合、本コマンドは対話的に移植を\n" +" 行ないます。\n" +"\n" +" 移植に失敗した場合、手動での衝突解消後に --continue/-c を指定して\n" +" 本コマンドを再実行することで、中断された移植を再開可能ですす。\n" +" " msgid "--continue is incompatible with branch, all or merge" -msgstr "" +msgstr "--continue は --branch、--all、--merge と併用できません" msgid "no source URL, branch tag or revision list provided" -msgstr "" +msgstr "元 URL、ブランチタグ、リビジョン指定のいずれも指定されていません" msgid "--all requires a branch revision" -msgstr "" +msgstr "--all 指定にはブランチリビジョンが必要です" msgid "--all is incompatible with a revision list" -msgstr "" +msgstr "--all とリビジョン指定は併用できません" msgid "no revision checked out" -msgstr "" +msgstr "作業領域が未更新です" msgid "outstanding uncommitted merges" -msgstr "" +msgstr "マージが未コミットです" msgid "outstanding local changes" -msgstr "" +msgstr "未コミットの変更があります" msgid "pull patches from REPOSITORY" -msgstr "" +msgstr "パッチ取り込み元リポジトリの指定" msgid "pull patches from branch BRANCH" -msgstr "" +msgstr "パッチ取り込み元ブランチの指定" msgid "pull all changesets up to BRANCH" -msgstr "" +msgstr "指定ブランチの全てを取り込む" msgid "skip over REV" -msgstr "" +msgstr "指定リビジョンのスキップ" msgid "merge at REV" -msgstr "" +msgstr "指定リビジョンにおけるマージ" msgid "append transplant info to log message" -msgstr "" +msgstr "コミットログへの移植情報の付与" msgid "continue last transplant session after repair" -msgstr "" +msgstr "中断された直前の移植作業の再開" msgid "filter changesets through FILTER" -msgstr "" +msgstr "チェンジセットのフィルタ指定" msgid "" "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." msgstr "" - -msgid "" -"allow to use MBCS path with problematic encoding.\n" -"\n" -"Some MBCS encodings are not good for some path operations\n" -"(i.e. splitting path, case conversion, etc.) with its encoded bytes.\n" -"We call such a encoding (i.e. shift_jis and big5) as \"problematic\n" -"encoding\". This extension can be used to fix the issue with those\n" -"encodings by wrapping some functions to convert to unicode string\n" -"before path operation.\n" -"\n" -"This extension is usefull for:\n" +"hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." + +msgid "" +"allow the use of MBCS paths with problematic encoding\n" +"\n" +"Some MBCS encodings are not good for some path operations (i.e.\n" +"splitting path, case conversion, etc.) with its encoded bytes. We call\n" +"such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n" +"This extension can be used to fix the issue with those encodings by\n" +"wrapping some functions to convert to Unicode string before path\n" +"operation.\n" +"\n" +"This extension is useful for:\n" " * Japanese Windows users using shift_jis encoding.\n" " * Chinese Windows users using big5 encoding.\n" -" * All users who use a repository with one of problematic encodings\n" -" on case-insensitive file system.\n" +" * All users who use a repository with one of problematic encodings on\n" +" case-insensitive file system.\n" "\n" "This extension is not needed for:\n" -" * Any user who use only ascii chars in path.\n" +" * Any user who use only ASCII chars in path.\n" " * Any user who do not use any of problematic encodings.\n" "\n" "Note that there are some limitations on using this extension:\n" " * You should use single encoding in one repository.\n" -" * You should set same encoding for the repository by locale or HGENCODING.\n" -"\n" -"To use this extension, enable the extension in .hg/hgrc or ~/.hgrc:\n" -"\n" -" [extensions]\n" -" hgext.win32mbcs =\n" -"\n" -"Path encoding conversion are done between unicode and util._encoding\n" -"which is decided by mercurial from current locale setting or HGENCODING.\n" -"\n" -msgstr "" +" * You should set same encoding for the repository by locale or\n" +" HGENCODING.\n" +"\n" +"Path encoding conversion are done between Unicode and\n" +"encoding.encoding which is decided by Mercurial from current locale\n" +"setting or HGENCODING.\n" +msgstr "" +"問題文字コードでの多バイト符号化文字を使用したパス名の有効化\n" +"\n" +"パス名の取り扱い(例: パス要素の分割、文字大小変換等)上、不適切な文字を\n" +"含む多バイト符号化文字セット(MBCS)が存在します。ここではそのような文字\n" +"セット(例: shift_jis および big5)を「問題文字コード」と呼びます。\n" +"本エクステンションは、パス操作の実施前に unicode 文字列化する処理を\n" +"被せることで、問題文字コードによって発生する障害を防ぎます。\n" +"\n" +"このエクステンションは以下の場合に有用です:\n" +"\n" +" * shift_jis 文字コードを使用する日本語 Windows のユーザ\n" +" * big5 文字コードを使用する中国語 Windows のユーザ\n" +" * 文字大小を区別できないファイルシステムで問題となる問題文字コード上で\n" +" リポジトリを運用するユーザ\n" +"\n" +"このエクステンションは以下の場合には不要です:\n" +"\n" +" * パス名に ascii 文字しか使用しないユーザ\n" +" * 問題文字コードを使用しないユーザ\n" +"\n" +"このエクステンションの利用には幾つかの制限があります:\n" +"\n" +" * リポジトリ内では単一の文字コードを使用してください\n" +" * ロケール設定なり HGENCODING 環境変数なりの設定を、リポジトリで\n" +" 使用する文字コードと同じものにしてください\n" +"\n" +"パス名の文字コード変換は、unicode と、ロケール設定ないし HGENCODING\n" +"環境変数によって Mercurial が決定する文字コードとの間で行なわれます。\n" +"\n" #, python-format msgid "[win32mbcs] filename conversion fail with %s encoding\n" -msgstr "" +msgstr "[win32mbcs] 文字コード '%s' との間での変換に失敗\n" msgid "[win32mbcs] cannot activate on this platform.\n" -msgstr "" +msgstr "[win32mbcs] このプラットフォームでは実行できません。\n" #, python-format msgid "[win32mbcs] activated with encoding: %s\n" -msgstr "" +msgstr "[win32mbcs] 文字コード %s との間での変換を有効化\n" + +msgid "" +"perform automatic newline conversion\n" +"\n" +"To perform automatic newline conversion, use:\n" +"\n" +"[extensions]\n" +"hgext.win32text =\n" +"[encode]\n" +"** = cleverencode:\n" +"# or ** = macencode:\n" +"\n" +"[decode]\n" +"** = cleverdecode:\n" +"# or ** = macdecode:\n" +"\n" +"If not doing conversion, to make sure you do not commit CRLF/CR by " +"accident:\n" +"\n" +"[hooks]\n" +"pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n" +"# or pretxncommit.cr = python:hgext.win32text.forbidcr\n" +"\n" +"To do the same check on a server to prevent CRLF/CR from being\n" +"pushed or pulled:\n" +"\n" +"[hooks]\n" +"pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n" +"# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n" +msgstr "" +"改行形式の自動変換\n" +"\n" +"改行形式の自動変換を行う場合、以下のように設定します:\n" +"\n" +"[extensions]\n" +"hgext.win32text =\n" +"[encode]\n" +"** = cleverencode:\n" +"# ないし ** = macencode:\n" +"\n" +"[decode]\n" +"** = cleverdecode:\n" +"# ないし ** = macdecode:\n" +"\n" +"変換はしないものの、間違った改行形式でのコミットを防止したい場合は:\n" +"\n" +"[hooks]\n" +"pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n" +"# ないし pretxncommit.cr = python:hgext.win32text.forbidcr\n" +"\n" +"意図せぬ履歴反映の防止のために、サーバ側で同様の確認を行いたい場合は:\n" +"\n" +"[hooks]\n" +"pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n" +"# ないし pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n" #, python-format msgid "" @@ -4558,14 +4820,18 @@ "Before your next commit, please reconsider your encode/decode settings in \n" "Mercurial.ini or %s.\n" msgstr "" +"警告: %s は既に行末が %s 形式です\n" +"そのため win32text による行末形式変換は不要です。\n" +"次回の commit までに、Mercurial.ini なり %s における encode/decode 設定を\n" +"見直すことをお勧めします。\n" #, python-format msgid "Attempt to commit or push text file(s) using %s line endings\n" -msgstr "" +msgstr "テキストファイルの行末形式 %s による commit ないし履歴反映を実施\n" #, python-format msgid "in %s: %s\n" -msgstr "" +msgstr "リビジョン %s: %s\n" #, python-format msgid "" @@ -4585,23 +4851,31 @@ "[decode]\n" "** = %sdecode:\n" msgstr "" - -msgid "" -"zeroconf support for mercurial repositories\n" -"\n" -"Zeroconf enabled repositories will be announced in a network without the " -"need\n" -"to configure a server or a service. They can be discovered without knowing\n" -"their actual IP address.\n" -"\n" -"To use the zeroconf extension add the following entry to your hgrc file:\n" +"\n" +"同様の間違いを防ぐには、以下の設定を Mercurial.ini ないし .hg/hgrc に\n" +"以下の記述を追加してください:\n" +"\n" +"[hooks]\n" +"pretxncommit.%s = python:hgext.win32text.forbid%s\n" +"\n" +"必要であれば以下の記述も追加してください:\n" "\n" "[extensions]\n" -"hgext.zeroconf =\n" -"\n" -"To allow other people to discover your repository using run \"hg serve\" in " -"your\n" -"repository.\n" +"hgext.win32text =\n" +"[encode]\n" +"** = %sencode:\n" +"[decode]\n" +"** = %sdecode:\n" + +msgid "" +"discover and advertise repositories on the local network\n" +"\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.\n" +"\n" +"To allow other people to discover your repository using run \"hg serve\"\n" +"in your repository.\n" "\n" " $ cd test\n" " $ hg serve\n" @@ -4613,67 +4887,70 @@ msgstr "" msgid "archive prefix contains illegal components" -msgstr "" +msgstr "アーカイブの接頭辞が不正なコンポーネントを含みます" msgid "cannot give prefix when archiving to files" -msgstr "" +msgstr "アーカイブにファイルを追加するときは接頭辞を指定できません" #, python-format msgid "unknown archive type '%s'" -msgstr "" +msgstr "未知のアーカイブ種別 '%s'" msgid "invalid changegroup" -msgstr "" +msgstr "チェンジグループが不正です" msgid "unknown parent" -msgstr "" +msgstr "未知の親" #, python-format msgid "integrity check failed on %s:%d" -msgstr "" +msgstr "%s:%d の一貫性チェックに失敗" #, python-format msgid "%s: not a Mercurial bundle file" -msgstr "" +msgstr "%s: Mercurial にバンドルされたファイルではありません" #, python-format msgid "%s: unknown bundle version" -msgstr "" +msgstr "%s: 未知のバンドルバージョン" #, python-format msgid "%s: unknown bundle compression type" -msgstr "" +msgstr "%s: 未知のバンドル圧縮方法" msgid "cannot create new bundle repository" -msgstr "" +msgstr "バンドルリポジトリの新規作成はできません" #, python-format msgid "premature EOF reading chunk (got %d bytes, expected %d)" -msgstr "" +msgstr "予期しない EOF (%d バイトのみ読込済、本当は %d バイト)" + +msgid "empty username" +msgstr "ユーザ名が空です" #, python-format msgid "username %s contains a newline" -msgstr "" +msgstr "ユーザ名 %s が改行を含んでいます" msgid "options --message and --logfile are mutually exclusive" -msgstr "" +msgstr "--message と --logfile は同時に指定できません" #, python-format msgid "can't read commit message '%s': %s" -msgstr "" +msgstr "コミットメッセージ '%s' を読み込むことができません: %s" msgid "limit must be a positive integer" -msgstr "" +msgstr "制限は正数でなければなりません" msgid "limit must be positive" -msgstr "" +msgstr "制限は正数でなければなりません" msgid "too many revisions specified" -msgstr "" - -#, python-format -msgid "invalid format spec '%%%s' in output file name" -msgstr "" +msgstr "リビジョンの指定が多すぎます" + +#, python-format +msgid "invalid format spec '%%%s' in output filename" +msgstr "出力ファイル名に不正なフォーマット '%%%s' 指定" #, python-format msgid "adding %s\n" @@ -4681,196 +4958,225 @@ #, python-format msgid "removing %s\n" -msgstr "%s を登録解除中\n" +msgstr "%s を登録除外中\n" #, python-format msgid "recording removal of %s as rename to %s (%d%% similar)\n" -msgstr "" +msgstr "%s の削除を %s へのファイル名変更として記録中 (類似度 %d%%)\n" #, python-format msgid "%s: not copying - file is not managed\n" -msgstr "" +msgstr "%s: コピー失敗 - ファイルは登録されていません\n" #, python-format msgid "%s: not copying - file has been marked for remove\n" -msgstr "" +msgstr "%s: コピー失敗 - 削除予定のファイルです\n" #, python-format msgid "%s: not overwriting - %s collides with %s\n" -msgstr "" +msgstr "%s: 上書き失敗 - %s は %s と衝突\n" #, python-format msgid "%s: not overwriting - file exists\n" -msgstr "" +msgstr "%s: 上書きしません - ファイルが存在します\n" #, python-format msgid "%s: deleted in working copy\n" -msgstr "" +msgstr "%s: 作業コピーから削除しました\n" #, python-format msgid "%s: cannot copy - %s\n" -msgstr "" - -#, python-format -msgid "%s %s to %s\n" -msgstr "" +msgstr "%s: コピー失敗 - %s\n" + +#, python-format +msgid "moving %s to %s\n" +msgstr "%s を %s に移動中\n" + +#, python-format +msgid "copying %s to %s\n" +msgstr "%s を %s にコピー中\n" #, 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 "" +msgstr "複数の作業元の場合、作業先は存在するディレクトリでなければなりません" #, python-format msgid "destination %s is not a directory" -msgstr "" +msgstr "作業先 %s はディレクトリではありません" msgid "no files to copy" -msgstr "" +msgstr "コピーするファイルがありません" msgid "(consider using --after)\n" -msgstr "" +msgstr "( --after を使ってみては? )\n" #, python-format msgid "changeset: %d:%s\n" -msgstr "" +msgstr "チェンジセット: %d:%s\n" #, python-format msgid "branch: %s\n" -msgstr "" +msgstr "ブランチ: %s\n" #, python-format msgid "tag: %s\n" -msgstr "" +msgstr "タグ: %s\n" #, python-format msgid "parent: %d:%s\n" -msgstr "" +msgstr "親: %d:%s\n" #, python-format msgid "manifest: %d:%s\n" -msgstr "" +msgstr "管理ファイル一覧: %d:%s\n" #, python-format msgid "user: %s\n" -msgstr "" +msgstr "ユーザ: %s\n" #, python-format msgid "date: %s\n" -msgstr "" +msgstr "日付: %s\n" msgid "files+:" -msgstr "" +msgstr "ファイル追加:" msgid "files-:" -msgstr "" +msgstr "ファイル削除:" msgid "files:" -msgstr "" +msgstr "ファイル:" #, python-format msgid "files: %s\n" -msgstr "" +msgstr "ファイル: %s\n" #, python-format msgid "copies: %s\n" -msgstr "" +msgstr "コピー %s\n" #, python-format msgid "extra: %s=%s\n" -msgstr "" +msgstr "その他: %s=%s\n" msgid "description:\n" -msgstr "" +msgstr "説明:\n" #, python-format msgid "summary: %s\n" -msgstr "" +msgstr "要約: %s\n" #, python-format msgid "%s: no key named '%s'" -msgstr "" +msgstr "%s: '%s' というキーはありません" #, python-format msgid "%s: %s" -msgstr "" +msgstr "%s: %s" #, python-format msgid "Found revision %s from %s\n" -msgstr "" +msgstr "リビジョン %s を %s で見つけました\n" msgid "revision matching date not found" -msgstr "" +msgstr "リビジョンに一致する日付がありません" #, python-format msgid "cannot follow nonexistent file: \"%s\"" -msgstr "" +msgstr "存在しないファイルを追跡できません: \"%s\"" #, python-format msgid "%s:%s copy source revision cannot be found!\n" -msgstr "" - -msgid "can only follow copies/renames for explicit file names" -msgstr "" - -#, python-format -msgid "file %s not found!" -msgstr "" - -#, python-format -msgid "no match under directory %s!" -msgstr "" - -#, python-format -msgid "can't commit %s: unsupported file type!" -msgstr "" - -#, python-format -msgid "file %s not tracked!" -msgstr "" +msgstr "%s:%s コピー元のリビジョンがありません!\n" + +msgid "can only follow copies/renames for explicit filenames" +msgstr "ファイル名が明示された場合のみ複製/改名を追跡可能です" + +msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." +msgstr "" +"HG: コミットメッセージを入力してください。 HG: で始まる行は無視されます。" + +msgid "HG: Leave message empty to abort commit." +msgstr "HG: メッセージが空だとコミットできません。" + +#, python-format +msgid "HG: user: %s" +msgstr "HG: ユーザ: %s" + +msgid "HG: branch merge" +msgstr "HG: ブランチのマージ" + +#, python-format +msgid "HG: branch '%s'" +msgstr "HG: ブランチ '%s'" + +#, python-format +msgid "HG: added %s" +msgstr "HG: %s を追加" + +#, python-format +msgid "HG: changed %s" +msgstr "HG: %s を変更" + +#, python-format +msgid "HG: removed %s" +msgstr "HG: %s を削除" + +# +msgid "HG: no files changed" +msgstr "HG: ファイル変更なし" + +msgid "empty commit message" +msgstr "コミットメッセージがありません" msgid "" "add the specified files on the next commit\n" "\n" -" Schedule files to be version controlled and added to the repository.\n" +" Schedule files to be version controlled and added to the\n" +" repository.\n" "\n" " The files will be added to the repository at the next commit. To\n" -" undo an add before that, see hg revert.\n" +" undo an add before that, see hg forget.\n" "\n" " If no names are given, add all files to the repository.\n" " " msgstr "" -"指定されたファイルを次回コミットから構成管理に追加登録\n" +"指定ファイルの追加登録予約\n" "\n" " 構成管理へのファイルの追加登録を予約します。\n" "\n" -" 指定されたファイルは次回のコミットの際にリポジトリに追加されます。\n" -" コミット前に追加登録を取り消す方法は、hg revert を参照してください。\n" -"\n" -" ファイル名指定が無い場合、作業領域中の全てのファイルを追加登録します。\n" +" 指定されたファイルは次回のコミットから構成管理対象となります。\n" +" コミット前の追加登録の取り消しは、'hg help revert' を参照して\n" +" ください。\n" +"\n" +" ファイル名指定が無い場合、作業領域中の全ファイルが対象となります。\n" " " msgid "" "add all new files, delete all missing files\n" "\n" -" Add all new files and remove all missing files from the repository.\n" -"\n" -" New files are ignored if they match any of the patterns in .hgignore. " -"As\n" -" with add, these changes take effect at the next commit.\n" -"\n" -" Use the -s option to detect renamed files. With a parameter > 0,\n" -" this compares every removed file with every added file and records\n" -" those similar enough as renames. This option takes a percentage\n" -" between 0 (disabled) and 100 (files must be identical) as its\n" -" parameter. Detecting renamed files this way can be expensive.\n" +" Add all new files and remove all missing files from the\n" +" repository.\n" +"\n" +" 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" +" commit.\n" +"\n" +" Use the -s/--similarity option to detect renamed files. With a\n" +" parameter > 0, this compares every removed file with every added\n" +" file and records those similar enough as renames. This option\n" +" takes a percentage between 0 (disabled) and 100 (files must be\n" +" identical) as its parameter. Detecting renamed files this way can\n" +" be expensive.\n" " " msgstr "" "新規ファイルの追加登録、および不在ファイルの登録除外\n" @@ -4879,14 +5185,13 @@ " 行ないます。\n" "\n" " .hgignore に記述されたパターンに合致する新規ファイルは無視されます。\n" -" hg add コマンドと同様に、このコマンドの実行が効果を発揮するのは、\n" -" 次回のコミット実施後です。\n" -"\n" -" ファイルの改名を検知するには -s オプションを使用します。\n" -" 0 より大きな値が指定された場合、追加・除外ファイルの全てが比較され、\n" -" 改名とみなせるか否かが判定されます。このオプションには、0(改名比較無効)\n" -" から 100 (完全一致)までの範囲でパーセンテージを指定します。\n" -" 改名判定には実行時間を要する可能性があります。\n" +" 'hg add' と同様に、実行効果が発揮されるのは次回コミット時点です。\n" +"\n" +" ファイルの改名を検知するには -s/--similarity を使用します。0 より\n" +" 大きな値が指定された場合、追加・除外ファイルの全てが比較され、改名と\n" +" みなせるか否かが判定されます。このオプションには、0(改名比較無効)\n" +" から 100 (完全一致)までの範囲でパーセンテージを指定します。改名判定\n" +" には実行時間を要する可能性があります。\n" " " msgid "similarity must be a number" @@ -4896,32 +5201,32 @@ msgstr "類似度は0から100の間でなければなりません" msgid "" -"show changeset information per file line\n" -"\n" -" List changes in files, showing the revision id responsible for each " -"line\n" -"\n" -" This command is useful to discover who did a change or when a change " -"took\n" -" place.\n" -"\n" -" Without the -a option, annotate will avoid processing files it\n" -" detects as binary. With -a, annotate will generate an annotation\n" -" anyway, probably with undesirable results.\n" -" " -msgstr "" -"ファイル行毎のチェンジセット情報表示\n" +"show changeset information by line for each file\n" +"\n" +" List changes in files, showing the revision id responsible for\n" +" each line\n" +"\n" +" This command is useful for discovering when a change was made and\n" +" by whom.\n" +"\n" +" 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 "" +"ファイル行毎のリビジョン情報表示\n" "\n" " ファイルの各行毎に、その内容が由来するリビジョンIDを表示します。\n" "\n" -" 本コマンドは、変更の実施者ないし実施次期を特定するのに有用です。\n" -"\n" -" -a オプション指定が無い場合、バイナリと思しきファイルは処理対象から\n" -" 除外します。-a オプション指定が有る場合、想定外の結果になろうとも、\n" -" 全てのファイルに処理を実施します。\n" -" " - -msgid "at least one file name or pattern required" +" 本コマンドは、変更の実施者ないし実施時期を特定するのに有用です。\n" +"\n" +" -a/--text 指定が無い場合、バイナリと思しきファイルは処理対象から\n" +" 除外されます。-a 指定が有る場合、結果に関わらず全てのファイルが\n" +" 処理対象となります。\n" +" " + +msgid "at least one filename or pattern is required" msgstr "ファイル名ないしパターンを最低1つ指定してください" msgid "at least one of -n/-c is required for -l" @@ -4932,12 +5237,12 @@ msgstr "%s: バイナリファイルです\n" msgid "" -"create unversioned archive of a repository revision\n" +"create an unversioned archive of a repository revision\n" "\n" " By default, the revision used is the parent of the working\n" -" directory; use \"-r\" to specify a different revision.\n" -"\n" -" To specify the type of archive to create, use \"-t\". Valid\n" +" directory; use -r/--rev to specify a different revision.\n" +"\n" +" To specify the type of archive to create, use -t/--type. Valid\n" " types are:\n" "\n" " \"files\" (default): a directory full of files\n" @@ -4948,46 +5253,46 @@ " \"zip\": zip archive, compressed using deflate\n" "\n" " The exact name of the destination archive or directory is given\n" -" using a format string; see \"hg help export\" for details.\n" +" using a format string; see 'hg help export' for details.\n" "\n" " Each member added to an archive file has a directory prefix\n" -" prepended. Use \"-p\" to specify a format string for the prefix.\n" -" The default is the basename of the archive, with suffixes removed.\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 "" "リポジトリ外へのアーカイブの生成\n" "\n" -" 指定が無い場合、作業領域の親リビジョンが使用されます。\n" -" 他のリビジョンを指定する場合は \"-r\" を使用します。\n" -"\n" -" 生成するアーカイブの種別を指定する場合は、\"-t\" を使用します。\n" +" 特に指定が無い場合、作業領域の親リビジョンが使用されます。\n" +" 他のリビジョンを指定する場合は -r/--rev を使用します。\n" +"\n" +" 生成するアーカイブの種別を指定する場合は、-t/--type を使用します。\n" " 使用可能な種別は:\n" "\n" -" \"files\" (無指定時): a directory full of files\n" -" \"tar\": 非圧縮の tar アーカイブ形式\n" -" \"tbz2\": bzip2 圧縮の tar アーカイブ形式\n" -" \"tgz\": gzip 圧縮の tar アーカイブ形式\n" -" \"uzip\": 非圧縮の zip アーカイブ形式\n" -" \"zip\": 圧縮有り zip アーカイブ形式\n" -"\n" -" 最終的なアーカイブ生成先となるファイル名ないしディレクトリ名は、\n" -" 置換指定を使用して指定することができます。\n" -" 置換指定に関する詳細は \"hg help export\" を参照してください。\n" -"\n" -" アーカイブに包含されるファイルには、展開時格納先を指定するための\n" -" ディレクトリ前置詞が付与されます。 \"-p\" により前置詞を指定可能です。\n" -" ディレクトリ前置詞が無指定の時は、アーカイブファイルのファイル名から\n" -" 接尾辞を除いたものが使用されます。\n" +" \"files\": 展開済みアーカイブのイメージ(無指定時)\n" +" \"tar\" : 非圧縮の tar アーカイブ形式\n" +" \"tbz2\" : bzip2 圧縮の tar アーカイブ形式\n" +" \"tgz\" : gzip 圧縮の tar アーカイブ形式\n" +" \"uzip\" : 非圧縮の zip アーカイブ形式\n" +" \"zip\" : deflate 圧縮の zip アーカイブ形式\n" +"\n" +" アーカイブ生成先となるファイル名ないしディレクトリ名の指定には\n" +" 置換指定を使用することができます。置換指定に関する詳細は \n" +" 'hg help export' を参照してください。\n" +"\n" +" アーカイブ生成の際には、展開時の格納先ディレクトリ名が記録されます。\n" +" -p/--prefix によりディレクトリ名を指定できます(置換指定可能)。特に\n" +" 指定が無い場合は、アーカイブ名から拡張子を除いたものが記録されます。\n" " " msgid "no working directory: please specify a revision" -msgstr "作業領域からリビジョンを特定できません。リビジョンを指定してください。" +msgstr "作業領域による暗黙指定ができませんのでリビジョンを明示してください" msgid "repository root cannot be destination" -msgstr "リポジトリのルートを作成先に指定することはできません。" +msgstr "リポジトリのルートを作成先に指定することはできません" msgid "cannot archive plain files to stdout" -msgstr "通常ファイルのアーカイブを標準出力に出力することはできません。" +msgstr "通常ファイルのアーカイブ先に標準出力を指定することはできません" msgid "" "reverse effect of earlier changeset\n" @@ -4995,31 +5300,30 @@ " Commit the backed out changes as a new changeset. The new\n" " changeset is a child of the backed out changeset.\n" "\n" -" If you back out a changeset other than the tip, a new head is\n" +" 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 (current one by default).\n" +" backout changeset with another head.\n" "\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\n" -" hand. The result of this merge is not committed, as with a normal\n" -" merge.\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.\n" "\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" -"以前のチェンジセットの効果の打ち消し\n" +"以前のチェンジセットにおける変更の打ち消し\n" "\n" " 打ち消し用チェンジセットを新規チェンジセットとしてコミットします。\n" -" 新規チェンジセットは、打消し対象チェンジセットの子チェンジセットとして\n" -" 作成されます。\n" +" 新規チェンジセットは、打消し対象チェンジセットの子チェンジセット\n" +" として作成されます。\n" "\n" " tip 以外のチェンジセットを打ち消す場合、新規ヘッドが生成されます。\n" " このヘッドは新規 tip となりますので、この打ち消しチェンジセットと\n" " 他のヘッド(通常は打ち消し実施前のヘッド)をマージしてください。\n" "\n" -" --merge オプション指定時は、実施前に作業領域の親チェンジセットが\n" -" 記録され、実施後に新たなヘッドとそのチェンジセットがマージされます。\n" +" --merge 指定時は、処理実施前に作業領域の親チェンジセットが記録され、\n" +" 処理実施後に新たなヘッドとそのチェンジセットがマージされます。\n" " これにより手動マージの手間が省けます。通常の merge と同様に、\n" " このマージ結果は自動的には commit されません。\n" "\n" @@ -5032,147 +5336,157 @@ msgid "please specify a revision to backout" msgstr "打ち消し対象リビジョンを指定してください" -msgid "cannot back out change on a different branch" -msgstr "異なるブランチのチェンジセットを打ち消すことはできません" - -msgid "cannot back out a change with no parents" -msgstr "親の無いチェンジセットを打ち消すことはできません" - -msgid "cannot back out a merge changeset without --parent" -msgstr "--parent 指定が無いとマージチェンジセットは打ち消せません" +msgid "cannot backout change on a different branch" +msgstr "異なるブランチに属するリビジョンを打ち消すことはできません" + +msgid "cannot backout a change with no parents" +msgstr "親の無いリビジョンを打ち消すことはできません" + +msgid "cannot backout a merge changeset without --parent" +msgstr "マージリビジョンの打消しには --parent 指定が必要です" #, python-format msgid "%s is not a parent of %s" -msgstr "%s は %s の親チェンジセットではありません" +msgstr "%s は %s の親リビジョンではありません" msgid "cannot use --parent on non-merge changeset" -msgstr "非マージチェンジセットには --parent を指定できません" +msgstr "非マージリビジョンには --parent を指定できません" #, python-format msgid "Backed out changeset %s" -msgstr "チェンジセット %s の打ち消し" +msgstr "リビジョン %s の打ち消し" #, python-format msgid "changeset %s backs out changeset %s\n" -msgstr "チェンジセット %s はチェンジセット %s を打ち消します\n" +msgstr "リビジョン %s はリビジョン %s を打ち消します\n" #, python-format msgid "merging with changeset %s\n" -msgstr "チェンジセット %s とマージ中\n" +msgstr "リビジョン %s とマージ中\n" msgid "the backout changeset is a new head - do not forget to merge\n" -msgstr "打ち消しチェンジセットによりヘッドが増えます - マージを忘れずに\n" +msgstr "打ち消しリビジョンによりヘッドが増えます - マージを忘れずに\n" msgid "(use \"backout --merge\" if you want to auto-merge)\n" -msgstr "(自動的にマージしたい場合は \"backout --merge\")\n" +msgstr "(自動的にマージする場合は \"backout --merge\" してください)\n" msgid "" "subdivision search of changesets\n" "\n" -" This command helps to find changesets which introduce problems.\n" -" To use, mark the earliest changeset you know exhibits the problem\n" -" as bad, then mark the latest changeset which is free from the\n" -" problem as good. Bisect will update your working directory to a\n" -" revision for testing (unless the --noupdate option is specified).\n" -" Once you have performed tests, mark the working directory as bad\n" -" or good and bisect will either update to another candidate changeset\n" +" 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.\n" "\n" " As a shortcut, you can also use the revision argument to mark a\n" " revision as good or bad without checking it out first.\n" "\n" -" If you supply a command it will be used for automatic bisection. Its " -"exit\n" -" status will be used as flag to mark revision as bad or good. In case " -"exit\n" -" status is 0 the revision is marked as good, 125 - skipped, 127 (command " -"not\n" -" found) - bisection will be aborted; any other status bigger than 0 will\n" -" mark revision as bad.\n" -" " -msgstr "" -"チェンジセットの分割探索\n" -"\n" -" 問題発生契機となるチェンジセットの特定を補助します。\n" -" 使用開始の際には、問題が発生するのが既知の最古のチェンジセットを\n" -" bad とマークし、問題の発生しない最も新しいチェンジセットを\n" -" good とマークします。bisect コマンドは作業領域を検証対象チェンジセット\n" -" へと更新します(--noupdate 指定時除く)。\n" -" 当該チェンジセットを検証したなら、作業領域(のチェンジセット)を bad \n" -" あるいは good でマークしてください。bisect は作業領域を次の検証候補\n" -" チェンジセットで更新するか、bad リビジョンを特定できた旨を出力します。\n" -"\n" -" 手短には、リビジョン指定を使用して、作業領域の更新無しでリビジョンを\n" -" good ないし bad にマークすることもできます。\n" -"\n" -" コマンドを指定した場合は、自動的な分割探索に使用されます。\n" +" 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 "" +"リビジョンの分割探索\n" +"\n" +" 問題発生契機となるリビジョンの特定を補助します。使用開始の際には、\n" +" 問題が発生する既知のリビジョンのうち、最古のものを bad とマークし、\n" +" 問題が発生しない既知のリビジョンのうち、最新のものを good とマーク\n" +" します。本コマンドは、検証対象リビジョンで作業領域を更新します(-U/\n" +" --noupdate 指定時除く)。当該リビジョンを検証したなら、bad あるいは\n" +" good でマークしてください。本コマンドは、次の検証候補リビジョンで\n" +" 作業領域を更新するか、問題契機リビジョンを特定できた旨を出力します。\n" +"\n" +" てみじかな手順としては、作業領域を更新せずに、リビジョン指定を使用\n" +" してリビジョンを good ないし bad にマークすることもできます。\n" +"\n" +" コマンドが指定された場合、自動的なリビジョン検証に使用されます。\n" " コマンドの終了コードはリビジョンに対する bad ないし good のマーク付け\n" " に使用されます。終了コード 0 は good、125 はスキップ、127(コマンドが\n" -" 見つからない場合)は分割検索中断、それ以外の 0 より大きい終了コードは\n" +" 見つからない場合)は分割探索中断、それ以外の 0 より大きい終了コードは\n" " bad のマーク付けとみなされます。\n" " " -#, python-format -msgid "The first %s revision is:\n" -msgstr "" - -#, python-format -msgid "Due to skipped revisions, the first %s revision could be any of:\n" -msgstr "" +msgid "The first good revision is:\n" +msgstr "最初の good なリビジョンは:\n" + +msgid "The first bad revision is:\n" +msgstr "最初の bad なリビジョンは:\n" + +msgid "Due to skipped revisions, the first good revision could be any of:\n" +msgstr "検証省略により、最初の good なリビジョンは以下から選択可能です:\n" + +msgid "Due to skipped revisions, the first bad revision could be any of:\n" +msgstr "検証省略により、最初の bad なリビジョンは以下から選択可能です:\n" msgid "cannot bisect (no known good revisions)" -msgstr "" +msgstr "分割探索出来ません(good リビジョンが未指定です)" msgid "cannot bisect (no known bad revisions)" -msgstr "" +msgstr "分割探索出来ません(bad リビジョンが未指定です)" msgid "(use of 'hg bisect <cmd>' is deprecated)\n" -msgstr "" +msgstr "('hg bisect <cmd>' 形式の実行は推奨されません)\n" msgid "incompatible arguments" -msgstr "" +msgstr "不正な引数の組み合わせです" + +#, python-format +msgid "cannot find executable: %s" +msgstr "実行可能ファイル '%s' が見つかりません" #, python-format msgid "failed to execute %s" -msgstr "" +msgstr "%s の実行に失敗" #, python-format msgid "%s killed" -msgstr "" - -#, python-format -msgid "Changeset %s: %s\n" -msgstr "" +msgstr "%s プロセスは中断されました" + +#, python-format +msgid "Changeset %d:%s: %s\n" +msgstr "リビジョン %d:%s: %s\n" #, python-format msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n" -msgstr "" +msgstr "リビジョン %s:%s を検証中(検証残 %s、検証済み %s)\n" msgid "" "set or show the current branch name\n" "\n" " With no argument, show the current branch name. With one argument,\n" -" set the working directory branch name (the branch does not exist in\n" -" the repository until the next commit).\n" -"\n" -" Unless --force is specified, branch will not let you set a\n" -" branch name that shadows an existing branch.\n" -"\n" -" Use --clean to reset the working directory branch to that of the\n" -" parent of the working directory, negating a previous branch change.\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.\n" +"\n" +" Unless -f/--force is specified, branch will not let you set a\n" +" branch name that already exists, even if it's inactive.\n" +"\n" +" 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.\n" "\n" " Use the command 'hg update' to switch to an existing branch.\n" " " msgstr "" -"現ブランチ名の設定ないし表示\n" -"\n" -" 引数無しの場合、現ブランチ名を表示します。引数有りの場合、\n" -" 作業領域のブランチ名を設定します(ブランチ生成は次回コミット時)。\n" -"\n" -" --force 指定が無い場合、既存ブランチを隠すブランチ名は設定できません。\n" -"\n" -" --clean 指定により、以前のブランチ名設定を無効にして、作業領域の\n" -" 親リビジョンのブランチ名に戻します。\n" +"ブランチ名の設定、ないし現ブランチ名の表示\n" +"\n" +" 引数無しの場合、現ブランチ名を表示します。引数が１つ指定された場合、\n" +" 作業領域のブランチ名を設定します(次回コミット時まで、ブランチは生成\n" +" されません)。作業時に基本とするブランチには、'default' ブランチを\n" +" 使用することをお勧めします。\n" +"\n" +" -f/--force 指定が無い場合、例えそれが非アクティブなものであっても、\n" +" 既存ブランチと同じ名前は設定できません。\n" +"\n" +" -C/--clean を指定することで、以前のブランチ名設定を無効にして、作業\n" +" 領域の親リビジョンのブランチ名に戻します。\n" "\n" " 作業領域の内容を既存ブランチのもので更新する場合は 'hg update' を\n" " 使用してください。\n" @@ -5180,14 +5494,14 @@ #, python-format msgid "reset working directory to branch %s\n" -msgstr "" +msgstr "作業領域のブランチを %s にリセット\n" msgid "a branch of the same name already exists (use --force to override)" -msgstr "" +msgstr "同名のブランチが存在します(強行する場合は --force 指定が必要です)" #, python-format msgid "marked working directory as branch %s\n" -msgstr "" +msgstr "作業領域をブランチ %s に設定\n" msgid "" "list repository named branches\n" @@ -5220,13 +5534,16 @@ " 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" -" --all (or --base null). To change the compression method applied,\n" -" use the -t option (by default, bundles are compressed using bz2).\n" -"\n" -" The bundle file can then be transferred using conventional means and\n" -" applied to another repository with the unbundle or pull command.\n" -" This is useful when direct push and pull are not available or when\n" -" exporting an entire repository is undesirable.\n" +" -a/--all (or --base null).\n" +"\n" +" To change the compression method applied, use the -t/--type\n" +" option. The available compression methods are: none, bzip2, and\n" +" gzip (by default, bundles are compressed using bzip2).\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" @@ -5234,35 +5551,37 @@ msgstr "" "バンドルファイルの生成\n" "\n" -" 比較対象リポジトリに存在しないチェンジセットの情報をまとめた、圧縮付き\n" -" バンドルファイルを生成します。\n" -"\n" -" 比較対象リポジトリが指定されない場合、1つ以上の --base で指定された\n" -" 全てのチェンジセットを持つリポジトリが想定されます。\n" -" 全てのチェンジセットを含むバンドルファイルを生成するには、--all \n" -" (ないし \"--base null\") を指定してください。圧縮方式を変更する場合は\n" -" -t オプションを使用します(無指定時は bz2 圧縮)。\n" -"\n" -" 生成されたバンドルファイルは、任意の方法で転送し、他のリポジトリ上で\n" -" unbundle ないし pull コマンドにより適用可能です。\n" -" push/pull による直接転送ができない場合や、リポジトリ全体の公開が\n" -" 望ましく無い場合に、バンドルファイルは有用です。\n" -"\n" -" バンドルの適用により、権限設定、複製／改名、変更履歴といった情報を含む\n" -" 全ての更新内容が取り込まれます。\n" -" " - -msgid "--base is incompatible with specifiying a destination" -msgstr "" +" 連携対象リポジトリに存在しないリビジョンの情報をまとめて、圧縮\n" +" 付きバンドルファイルを生成します。\n" +"\n" +" 連携対象リポジトリが指定されない場合、1つ以上の --base で指定\n" +" されたリビジョンを持つリポジトリが想定されます。全てのリビジョンを\n" +" 含むバンドルファイルを生成するには、-a/--all (ないし --base null)を\n" +" 指定します。\n" +"\n" +" 圧縮方式を変更する場合は -t/--type を使用します。利用可能な圧縮\n" +" 形式は none(無圧縮), bzip2, gzip です(無指定時は bz2 圧縮)。\n" +"\n" +" 任意の方法で転送したバンドルファイルは、他のリポジトリ上で\n" +" 'hg unbundle' ないし 'hg pull' により適用可能です。バンドルによる\n" +" 伝播は、 'hg push/pull' による直接転送ができない場合や、リポジトリ\n" +" 全体の公開が望ましく無い場合に有用です。\n" +"\n" +" バンドルの適用では、権限設定、複製／改名、変更履歴といった情報を\n" +" 含む全ての更新内容が取り込まれます。\n" +" " + +msgid "--base is incompatible with specifying a destination" +msgstr "--base と連携対象は同時には指定できません" msgid "unknown bundle type specified with --type" -msgstr "" +msgstr "--type に未知のバンドル種別が指定されました" msgid "" "output the current or given revision of files\n" "\n" -" Print the specified files as they were at the given revision.\n" -" If no revision is given, the parent of the working directory is used,\n" +" 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.\n" "\n" " Output may be to a file, in which case the name of the file is\n" @@ -5270,19 +5589,19 @@ " for the export command, with the following additions:\n" "\n" " %s basename of file being printed\n" -" %d dirname of file being printed, or '.' if in repo root\n" +" %d dirname of file being printed, or '.' if in repository root\n" " %p root-relative path name of file being printed\n" " " msgstr "" -"指定されたリビジョンのファイル内容の出力\n" -"\n" -" 特定のファイルの指定されたリビジョンにおける内容を出力します。\n" -" リビジョン指定が無い場合、作業領域の親リビジョンか、\n" -" 作業領域の更新前なら tip が使用されます。\n" -"\n" -" (置換指定可能な)出力先指定がある場合、出力はファイルに保存されます。\n" -" 置換指定は export コマンドで指定可能なものに加え、\n" -" 以下のものが指定可能です。\n" +"指定されたリビジョン時点のファイル内容の出力\n" +"\n" +" 指定されたリビジョンにおける、ファイル内容を出力します。リビジョン\n" +" 指定が無い場合は作業領域の親リビジョンが、作業領域の更新前なら tip\n" +" が使用されます。\n" +"\n" +" 出力先指定(置換指定可能)がある場合、出力はファイルに保存されます。\n" +" 置換指定には 'hg export' で可能な指定と、以下のものを指定できます。\n" +" \n" "\n" " %s 対象ファイルのベース名\n" " %d 対象ファイルの格納ディレクトリ、ないし '.'\n" @@ -5300,6 +5619,22 @@ " 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" @@ -5312,96 +5647,92 @@ "\n" " $ cp -al REPO REPOCLONE\n" "\n" -" This is the fastest way to clone, but it is not always safe. The\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" +" 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" -" If you use the -r option to clone up to a specific revision, no\n" -" subsequent revisions will be present in the cloned repository.\n" -" This option implies --pull, even on local repositories.\n" -"\n" -" If the -U option is used, the new clone will contain only a repository\n" -" (.hg) and no working copy (the working copy 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" -" Look at the help text for urls for important details about ssh:// URLs.\n" " " msgstr "" "既存リポジトリの複製\n" "\n" " 既存リポジトリを、新規ディレクトリに複製します。\n" "\n" -" 複製先ディレクトリが指定されない場合、複製元のベース名を使用します。\n" -"\n" -" 複製元リポジトリ位置は、複製先リポジトリの .hg/hgrc ファイルに対して\n" -" 将来的な pull 実施に備えて default 名義で記録されます。\n" +" 複製先ディレクトリが指定されない場合、複製元のベース名(パス名の\n" +" 末尾要素)を使用します。\n" +"\n" +" 将来的な 'hg pull' 実施に備えて、複製先リポジトリの .hg/hgrc \n" +" ファイルには、複製元リポジトリ位置が default 名義で記録されます。\n" +"\n" +" -r/--rev によるリビジョン指定複製を行なう場合、複製先リポジトリには\n" +" 指定リビジョン以後のリビジョン(タグ付けリビジョン含む)は複製されま\n" +" せん。リビジョン指定複製の場合は、同一ファイルシステム上での複製で\n" +" あっても、暗黙的に --pull 指定を伴います。\n" +"\n" +" 特に指定の無い場合、本コマンドは 'default' ブランチのヘッドで作業\n" +" 領域を更新します。-U/--noupdate が指定された場合、新規複製先は、\n" +" 管理領域(.hg)のみを保持し、作業領域の更新は行われません(作業領域の\n" +" 親リビジョンは null リビジョンとなります)。\n" +"\n" +" 有効な複製元指定形式は 'hg help urls' を参照してください。\n" +"\n" +" 複製先として ssh:// URL 形式を指定することも可能ですが、遠隔ホスト\n" +" では、.hg/hgrc の作成も、作業領域の更新も行われません。ssh:// URL\n" +" 形式の詳細に関しては、'hg help urls' を参照してください。\n" "\n" " 効率上の理由から、複製元／複製先が同一ファイルシステム上にある場合、\n" " (リポジトリの内部データに対してのみ)ハードリンクが使用されます。\n" " AFS を含む幾つかのファイルシステムは、ハードリンク実装が不適切である\n" -" にも関わらず、エラー通知がありません。このような場合にハードリンクを\n" -" 抑止するには --pull オプションを使用します。\n" -"\n" -" リポジトリの内部データと作業領域中のファイル全てに対して、ハードリンク\n" -" による複製を作成するには、以下の方法が使えるかも知れません。\n" +" にも関わらず、エラー通知がありません。このような場合には --pull を\n" +" 指定することで、ハードリンクを抑止します。\n" +"\n" +" リポジトリの内部データと作業領域中のファイル全てに対して、ハード\n" +" リンクによる複製を作成するには、以下の方法が使えるかも知れません。\n" "\n" " $ cp -al REPO REPOCLONE\n" "\n" " この方法は最速の複製方法かもしれませんが、常に安全とは限りません。\n" -" 操作の単一性は保障されません(REPO の複製中改変の防止は利用者の責務)し、\n" -" 利用するエディタに改変時のハードリンク破棄をさせる必要があります\n" -" (Emacs および多くの Linux Kernel ツールはそのように振舞います)。\n" -" この制約は、.hg ディレクトリ配下にメタデータを配置する、MQ のような\n" +" 操作の単一性は保障されません(REPO の複製中改変の防止は利用者責務)し、\n" +" 利用するエディタが、改変時にハードリンクを破棄する必要があります\n" +" (Emacs および多くの Linux 系ツールはそのように振舞います)。この制約は\n" +" .hg ディレクトリ配下にメタデータを配置する、MQ のような\n" " エクステンションとは相容れないものです。\n" "\n" -" -r オプションによるリビジョン指定複製を行なう場合、複製先リポジトリには\n" -" 指定リビジョン以後のリビジョンは存在しません。\n" -" このオプションは、同一ファイルシステム上での複製であっても、暗黙的に\n" -" --pull 指定を伴います。\n" -"\n" -" -U オプション指定時は、管理領域(.hg)の複製は行なわれますが、\n" -" 複製後の作業領域更新は行なわれません(親リビジョンが無い状態)。\n" -"\n" -" 有効な複製元指定形式は 'hg help urls' を参照してください。\n" -"\n" -" 複製先として ssh:// URL 形式を指定することも可能ですが、\n" -" .hg/hgrc および作業領域は遠隔ホストに作成されます。\n" -" ssh:// URL 形式の詳細に関しては、'hg help urls' を参照してください。\n" " " msgid "" "commit the specified files or all outstanding changes\n" "\n" -" Commit changes to the given files into the repository.\n" +" 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.\n" "\n" " If a list of files is omitted, all changes reported by \"hg status\"\n" " will be committed.\n" "\n" " If you are committing the result of a merge, do not provide any\n" -" file names or -I/-X filters.\n" -"\n" -" If no commit message is specified, the configured editor is started to\n" -" prompt you for a message.\n" +" filenames or -I/-X filters.\n" +"\n" +" If no commit message is specified, the configured editor is\n" +" started to prompt you for a message.\n" "\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" -"変更内容のリポジトリへの記録(コミット)\n" -"\n" -" 指定されたファイルの変更内容をリポジトリに記録(コミット)します。\n" -"\n" -" ファイル指定が省略された場合、\"hg status\" により検出される全ての\n" +"指定ファイルないし全ての変更内容のリポジトリへの記録\n" +"\n" +" 指定されたファイルの変更内容を管理領域に記録(コミット)します。\n" +" RCS のような中央集権的なツールと異なり、この操作は手元の管理領域に\n" +" 対する記録しか行いません。変更を能動的に公開する方法に関しては\n" +" 'hg help push' を参照してください。\n" +"\n" +" ファイル指定が省略された場合、'hg status' により検出される全ての\n" " 変更内容がコミットされます。\n" "\n" -" \"hg merge\" 結果のコミットの場合、ファイル名ないし -I/-X オプションの\n" -" いずれも指定しないでください。\n" +" 'hg merge' 結果をコミットする場合、ファイル名ないし -I/-X のいずれも\n" +" 指定しないでください。\n" "\n" " コミットメッセージが指定されない場合、設定に従ってメッセージ入力用の\n" " プログラムが起動されます。\n" @@ -5410,11 +5741,11 @@ " " msgid "created new head\n" -msgstr "" +msgstr "新規ヘッドが増えました\n" #, python-format msgid "committed changeset %d:%s\n" -msgstr "" +msgstr "コミット対象リビジョン %d:%s\n" msgid "" "mark files as copied for the next commit\n" @@ -5424,7 +5755,7 @@ " the source must be a single file.\n" "\n" " By default, this command copies the contents of files as they\n" -" stand in the working directory. If invoked with --after, the\n" +" exist in the working directory. If invoked with -A/--after, the\n" " operation is recorded, but no copying is performed.\n" "\n" " This command takes effect with the next commit. To undo a copy\n" @@ -5433,78 +5764,86 @@ msgstr "" "指定されたファイルの複製\n" "\n" -" 対象ファイルが複製元の複製であることを記録します。複製先指定が\n" -" ディレクトリの場合、ディレクトリ内に複製が作成されます。\n" -" 複製先指定がファイルの場合、複製元は1つしか指定できません。\n" -"\n" -" 特に指定が無い場合本コマンドは、複製元ファイルの内容で作業領域に\n" -" 指定された名前のファイルを作成します。--after 指定がある場合、「複製」\n" -" 操作は記録されますが、ファイルの複製は行われません。\n" -"\n" -" 本コマンドの実行結果は次回のコミットの際にリポジトリに記録されます。\n" -" コミット前に複製操作を取り消す方法は hg revert を参照してください。\n" +" 対象ファイルが複製元からの複製であることを記録します。複製先指定が\n" +" ディレクトリの場合、ディレクトリ内に複製が作成されます。複製先指定が\n" +" ファイルの場合、複製元は1つしか指定できません。\n" +"\n" +" 特に指定が無い場合、複製元ファイルの内容を持つ複製先ファイルを作業\n" +" 領域に作成します。-A/--after 指定がある場合、「複製」操作は記録され\n" +" ますが、ファイルの複製は行われません。\n" +"\n" +" 本コマンドの実行結果は次回のコミットの際に効果を発揮します。コミット\n" +" 前に複製操作を取り消す方法は 'hg help revert' を参照してください。\n" " " msgid "find the ancestor revision of two revisions in a given index" -msgstr "" +msgstr "指定範囲における2つのリビジョンの祖先リビジョンの検索" msgid "There is no Mercurial repository here (.hg not found)" -msgstr "" +msgstr "Mercurial リポジトリが見つかりません(.hg が不在です)" msgid "either two or three arguments required" -msgstr "" +msgstr "2ないし3の引数が必要です" msgid "returns the completion list associated with the given command" -msgstr "" +msgstr "指定コマンドの補完リストの作成" msgid "rebuild the dirstate as it would look like for the given revision" -msgstr "" +msgstr "指定リビジョン時点相当の dirstate の再構築" msgid "validate the correctness of the current dirstate" -msgstr "" +msgstr "現時点の dirstate の整合性検証" #, python-format msgid "%s in state %s, but not in manifest1\n" -msgstr "" +msgstr "%s の状態は %s ですが、管理対象ではありません\n" #, python-format msgid "%s in state %s, but also in manifest1\n" -msgstr "" +msgstr "%s の状態は %s ですが、既に管理対象になっています\n" #, python-format msgid "%s in state %s, but not in either manifest\n" -msgstr "" +msgstr "%s の状態は %s ですが、管理対象ではありません\n" #, python-format msgid "%s in manifest1, but listed as state %s" -msgstr "" +msgstr "%s は管理対象ですが、状態 %s です" msgid ".hg/dirstate inconsistent with current parent's manifest" -msgstr "" +msgstr "親リビジョンの管理情報と .hg/dirstate の間に不整合があります" msgid "" "show combined config settings from all hgrc files\n" "\n" -" With no args, print names and values of all config items.\n" -"\n" -" With one arg of the form section.name, print just the value of\n" -" that config item.\n" -"\n" -" With multiple args, print names and values of all config items\n" -" with matching section names." +" With no arguments, print names and values of all config items.\n" +"\n" +" With one argument of the form section.name, print just the value\n" +" of that config item.\n" +"\n" +" With multiple arguments, print names and values of all config\n" +" items with matching section names.\n" +"\n" +" With --debug, the source (filename and line number) is printed\n" +" for each config item.\n" +" " msgstr "" "全設定ファイルによる最終的な設定内容の表示\n" "\n" " 引数指定が無い場合、全ての設定項目に対して、名前と値を表示します。\n" "\n" -" section.name 形式に合致する引数を1つだけ指定した場合、その設定項目の\n" +" 'section.name' 形式に合致する引数を1つだけ指定した場合、その設定項目\n" " 値のみを表示します。\n" "\n" " 複数の引数が指定された場合、それらをセクション名とみなし、該当する\n" -" セクションの設定項目を全て表示します。" +" セクションの設定項目を全て表示します。\n" +"\n" +" --debug 指定がある場合、設定項目毎に記述位置(ファイル名と行番号)が\n" +" 表示されます。\n" +" " msgid "only one config item permitted" -msgstr "" +msgstr "複数の設定項目指定は無効です" msgid "" "manually set the parents of the current working directory\n" @@ -5513,116 +5852,123 @@ " be used with care.\n" " " msgstr "" +"作業領域の親リビジョンの手動設定\n" +"\n" +" 本コマンドはリポジトリ変換ツールの作成に有用ですが、利用には注意が\n" +" 必要です。\n" +" " msgid "show the contents of the current dirstate" -msgstr "" +msgstr "現時点の dirstate 内容の表示" #, python-format msgid "copy: %s -> %s\n" -msgstr "" +msgstr "%s から %s に複製\n" msgid "dump the contents of a data file revision" -msgstr "" +msgstr "データファイルリビジョンの内容表示" #, python-format msgid "invalid revision identifier %s" -msgstr "" +msgstr "リビジョン指定 %s は不正です" msgid "parse and display a date" -msgstr "" +msgstr "日付の解析および表示" msgid "dump the contents of an index file" -msgstr "" - -msgid "dump an index DAG as a .dot file" -msgstr "" +msgstr "インデックスファイルの内容表示" + +msgid "dump an index DAG as a graphviz dot file" +msgstr "インデックス DAG の graphviz 向け .dot ファイルを生成" msgid "test Mercurial installation" -msgstr "" +msgstr "Mercurial インストールの検証" #, python-format msgid "Checking encoding (%s)...\n" -msgstr "" +msgstr "文字コード %s の検証中...\n" msgid " (check that your locale is properly set)\n" -msgstr "" +msgstr " (ロケール設定の妥当性を確認してください)\n" msgid "Checking extensions...\n" -msgstr "" +msgstr "エクステンションの検証中...\n" msgid " One or more extensions could not be found" -msgstr "" +msgstr " 見つからないエクステンションがあります" msgid " (check that you compiled the extensions)\n" -msgstr "" +msgstr " (エクステンションのコンパイル状況を確認してください)\n" msgid "Checking templates...\n" -msgstr "" +msgstr "テンプレートの検証中...\n" msgid " (templates seem to have been installed incorrectly)\n" -msgstr "" +msgstr " (テンプレートのインストールが不適切なようです)\n" msgid "Checking patch...\n" -msgstr "" +msgstr "パッチの検証中...\n" msgid " patch call failed:\n" -msgstr "" +msgstr " パッチ適用が失敗\n" msgid " unexpected patch output!\n" -msgstr "" +msgstr " 想定と異なるパッチ出力です\n" msgid " patch test failed!\n" -msgstr "" +msgstr " パッチ適用試験が失敗\n" msgid "" " (Current patch tool may be incompatible with patch, or misconfigured. " "Please check your .hgrc file)\n" -msgstr "" +msgstr " (ツールが未対応なパッチ形式か、設定ミスです。設定確認が必要です)\n" msgid "" " Internal patcher failure, please report this error to http://www.selenic." "com/mercurial/bts\n" msgstr "" +" 内部パッチツールが機能しません。\n" +"http://www.selenic.com/mercurial/bts へのエラー報告にご協力ください\n" msgid "Checking commit editor...\n" -msgstr "" +msgstr "メッセージ入力用エディタの検証中...\n" msgid " No commit editor set and can't find vi in PATH\n" -msgstr "" +msgstr " エディタが起動できません(vi にも PATH が通っていません)\n" msgid " (specify a commit editor in your .hgrc file)\n" -msgstr "" +msgstr " (コミットメッセージ用エディタを設定ファイルで設定してください)\n" #, python-format msgid " Can't find editor '%s' in PATH\n" -msgstr "" +msgstr " エディタ '%s' に PATH が通っていません\n" msgid "Checking username...\n" -msgstr "" +msgstr "ユーザ名の検証中...\n" msgid " (specify a username in your .hgrc file)\n" -msgstr "" +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 "" +msgstr "指定パターンへのファイル合致状況の表示" msgid "" "diff repository (or selected files)\n" @@ -5641,12 +5987,12 @@ " revisions are specified, the working directory files are compared\n" " to its parent.\n" "\n" -" Without the -a option, diff will avoid generating diffs of files\n" -" it detects as binary. With -a, diff will generate a diff anyway,\n" -" probably with undesirable results.\n" -"\n" -" Use the --git option to generate diffs in the git extended diff\n" -" format. For more information, read hg help diffs.\n" +" 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.\n" +"\n" +" Use the -g/--git option to generate diffs in the git extended diff\n" +" format. For more information, read 'hg help diffs'.\n" " " msgstr "" "作業領域全体(ないし指定ファイル)の差分抽出\n" @@ -5655,20 +6001,20 @@ "\n" " 差分は unified diff 形式で表示されます。\n" "\n" -" 備考: マージに対する差分表示が期待と異なる場合があるのは、\n" -" 無指定時に比較対象となるのが作業領域の第1親リビジョンであるためです。\n" +" 備考: マージに対する差分表示が期待と異なる場合があるのは、無指定時に\n" +" 比較対象となるのが、作業領域の第1親であるためです。\n" "\n" " リビジョンが2つ指定された場合、両リビジョン間の差分が表示されます。\n" " リビジョンが1つ指定された場合、当該リビジョンと作業領域の内容が比較\n" " され、リビジョンが1つも指定されない場合は、作業領域の内容と\n" " 親リビジョンとが比較されます。\n" "\n" -" -a オプション指定が無い場合、バイナリと思しきファイルは処理対象から\n" -" 除外します。-a オプション指定が有る場合、想定外の結果になろうとも、\n" -" 全てのファイルに処理を実施します。\n" -"\n" -" git 拡張差分形式で表示するには --git オプションを指定します。\n" -" 詳細は \"hg help diffs\" を参照してください。\n" +" -a/--text 指定が無い場合、バイナリと思しきファイルは処理対象から\n" +" 除外されます。-a 指定が有る場合、結果に関わらず全てのファイルが\n" +" 処理対象となります。\n" +"\n" +" git 拡張差分形式で表示するには -g/--git を指定します。詳細は\n" +" 'hg help diffs' を参照してください。\n" " " msgid "" @@ -5679,8 +6025,9 @@ " The information shown in the changeset header is: author,\n" " changeset hash, parent(s) and commit comment.\n" "\n" -" NOTE: export may generate unexpected diff output for merge changesets,\n" -" as it will compare the merge changeset against its first parent only.\n" +" NOTE: export may generate unexpected diff output for merge\n" +" changesets, as it will compare the merge changeset against its\n" +" first parent only.\n" "\n" " 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:\n" @@ -5694,28 +6041,28 @@ " %n zero-padded sequence number, starting at 1\n" " %r zero-padded changeset revision number\n" "\n" -" Without the -a option, export will avoid generating diffs of files\n" -" it detects as binary. With -a, export will generate a diff anyway,\n" -" probably with undesirable results.\n" -"\n" -" Use the --git option to generate diffs in the git extended diff\n" -" format. Read the diffs help topic for more information.\n" -"\n" -" With the --switch-parent option, the diff will be against the second\n" -" parent. It can be useful to review a merge.\n" -" " -msgstr "" -"1つ以上のチェンジセットに対するヘッダおよび変更内容の出力\n" +" 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.\n" +"\n" +" Use the -g/--git option to generate diffs in the git extended diff\n" +" format. See 'hg help diffs' for more information.\n" +"\n" +" With the --switch-parent option, the diff will be against the\n" +" second parent. It can be useful to review a merge.\n" +" " +msgstr "" +"1つ以上のリビジョンに対するヘッダおよび変更内容の出力\n" "\n" " 1つ以上のリビジョンに対して、ヘッダ情報および変更内容を表示します。\n" "\n" " ヘッダ情報には以下の情報が含まれます: \n" -" 作成者/ハッシュ値/親リビジョン/コミットログ\n" -"\n" -" 備考: 本コマンドがマージ実施チェンジセットに対して、期待と異なる差分を\n" +" 作成者/ハッシュ値/親リビジョン/コミットログ\n" +"\n" +" 備考: 本コマンドがマージ実施リビジョンに対して、期待と異なる差分を\n" " 出力するのは、第1親との差分のみを出力するためです。\n" "\n" -" (置換指定可能な)出力先指定がある場合、出力はファイルに保存されます。\n" +" 出力先指定(置換指定可能)がある場合、出力はファイルに保存されます。\n" " 置換指定として以下のものが使用可能です:\n" "\n" " %% \"%\" 文字そのもの\n" @@ -5727,25 +6074,55 @@ " %n 1から始まるゼロ詰めの通し番号\n" " %r ゼロ詰めのリビジョン番号\n" "\n" -" -a オプション指定が無い場合、バイナリと思しきファイルは処理対象から\n" -" 除外します。-a オプション指定が有る場合、想定外の結果になろうとも、\n" -" 全てのファイルに処理を実施します。\n" -"\n" -" git 拡張差分形式で表示するには --git オプションを指定します。\n" -" 詳細は \"hg help diffs\" を参照してください。\n" -"\n" -" --switch-parent オプションを指定することで、比較対象が第2親になります。\n" +" -a/--text 指定が無い場合、バイナリと思しきファイルは処理対象から\n" +" 除外されます。-a 指定が有る場合、結果に関わらず全てのファイルが\n" +" 処理対象となります。\n" +"\n" +" git 拡張差分形式で出力するには -g/--git を指定します。詳細は\n" +" 'hg help diffs' を参照してください。\n" +"\n" +" --switch-parent を指定することで、比較対象が第2親になります。\n" " これはマージのレビューの際などに有効です。\n" " " msgid "export requires at least one changeset" -msgstr "" +msgstr "最低1つのリビジョン指定が必要です" msgid "exporting patches:\n" -msgstr "" +msgstr "パッチの作成中:\n" msgid "exporting patch:\n" -msgstr "" +msgstr "パッチの作成中:\n" + +msgid "" +"forget the specified files on the next commit\n" +"\n" +" Mark the specified files so they will no longer be tracked\n" +" after the next commit.\n" +"\n" +" This only removes files from the current branch, not from the\n" +" entire project history, and it does not delete them from the\n" +" working directory.\n" +"\n" +" To undo a forget before the next commit, see hg add.\n" +" " +msgstr "" +"次回コミットにおける指定ファイルの登録除外\n" +"\n" +" 指定ファイルの次回コミットにおける登録除外を予約します。\n" +"\n" +" 本コマンドでの登録除外は、現ブランチにおける登録除外のみを意味し、\n" +" 履歴そのものは保持され続けますし、作業領域からも削除されません。\n" +"\n" +" コミット前の登録除外の取り消しは 'hg help add' を参照してください。\n" +" " + +msgid "no files specified" +msgstr "ファイル名指定がありません" + +#, python-format +msgid "not removing %s: file is already untracked\n" +msgstr "%s は削除されません: 既に構成管理対象ではありません\n" msgid "" "search for a pattern in specified files and revisions\n" @@ -5754,8 +6131,8 @@ "\n" " 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\n" -" a match appears.\n" +" working directory. It always prints the revision number in which a\n" +" match appears.\n" "\n" " 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" @@ -5775,64 +6152,79 @@ "\n" " 指定が無い場合本コマンドは、パターンに合致する内容が最小に現れた\n" " リビジョンを各ファイル毎に表示します。パターンに合致する変更のあった\n" -" 全てのリビジョンを表示する場合、--all オプションを指定します\n" -" (パターン合致部分の削除は \"-\"、登場は \"+\" を表示することで区別)。\n" +" 全てのリビジョンを表示する場合、--all を指定します(パターン合致部分に\n" +" 対する削除は \"-\"、追加は \"+\" を検索結果に表示することで区別)。\n" " " #, python-format msgid "grep: invalid match pattern: %s\n" -msgstr "" +msgstr "grep: '%s' は不正なパターンです\n" msgid "" "show current repository heads or show branch heads\n" "\n" " With no arguments, show all repository head changesets.\n" "\n" -" If branch or revisions names are given this will show the heads of\n" -" the specified branches or the branches those revisions are tagged\n" -" with.\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" -" Branch heads are changesets that have a given branch tag, but have\n" -" no child changesets with that tag. They are usually where\n" -" development on the given branch takes place.\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" " " msgstr "" "現時点でのリポジトリ(ないしブランチ)のヘッド表示\n" "\n" " 引数指定が無い場合、リポジトリ中の全てのヘッドを表示します。\n" "\n" -" ブランチないしリビジョンが指定された場合本コマンドは、指定された\n" -" ブランチ、ないし指定リビジョンが属するブランチのヘッドを表示します。\n" -"\n" -" リポジトリの「ヘッド」とは、子チェンジセットを持たないチェンジセットの\n" +" リポジトリの「ヘッド」とは、子リビジョンを持たないリビジョンの\n" " ことを指します。改変作業の実施や、update/merge コマンド実施の際には\n" -" このチェンジセットを対象とするのが一般的です。\n" -"\n" -" ブランチのヘッドは、当該ブランチに属しつつ、そのブランチに属する\n" -" 子チェンジセットを持たないチェンジセットのことを指します。\n" -" 当該ブランチでの作業はこのチェンジセットを対象とするのが一般的です。\n" -" " +" このリビジョンを対象とするのが一般的です。\n" +"\n" +" 1つ以上のリビジョンが指定された場合、本コマンドは指定リビジョンの属\n" +" する名前付きブランチの「ブランチヘッド」を表示します。\n" +"\n" +" ブランチのヘッドとは、当該ブランチに属しつつ、そのブランチに属する\n" +" 子リビジョンを持たないリビジョンのことを指します。ブランチヘッドは\n" +" 真のヘッドである場合と、新たな枝分かれやマージの直前のリビジョンで\n" +" ある場合のいずれかです。いずれのヘッドも真のヘッドで無い場合、その\n" +" ブランチは非アクティブとみなされます。\n" +"\n" +" 開始リビジョンが指定された場合、指定リビジョンの子孫となるヘッド\n" +" のみが表示されます。\n" +" " + +#, python-format +msgid "no open branch heads on branch %s\n" +msgstr "ブランチ %s にはオープンなヘッドがありません\n" #, python-format msgid "no changes on branch %s containing %s are reachable from %s\n" -msgstr "" +msgstr "ブランチ %s のリビジョンは(%s も含めて) %s から到達できません\n" #, python-format msgid "no changes on branch %s are reachable from %s\n" -msgstr "" +msgstr "ブランチ %s のリビジョンは %s から到達できません\n" msgid "" "show help for a given topic or a help overview\n" "\n" -" With no arguments, print a list of commands and short help.\n" -"\n" -" Given a topic, extension, or command name, print help for that topic." -msgstr "" -"指定されたトピックのヘルプやヘルプ概要の表示\n" +" With no arguments, print a list of commands with short help messages.\n" +"\n" +" Given a topic, extension, or command name, print help for that\n" +" topic." +msgstr "" +"指定されたトピックのヘルプや、ヘルプ概要の表示\n" "\n" " 引数指定が無い場合、コマンドの一覧と概要を表示します。\n" "\n" @@ -5872,33 +6264,23 @@ "別名: %s\n" msgid "(no help text available)" -msgstr "" +msgstr "(ヘルプはありません)" msgid "options:\n" msgstr "オプション:\n" msgid "no commands defined\n" -msgstr "" - -msgid "" -"\n" -"enabled extensions:\n" -"\n" -msgstr "" -"\n" -"利用可能な拡張機能:\n" -"\n" - -#, python-format -msgid " %s %s\n" -msgstr "" +msgstr "コマンドが定義されていません\n" + +msgid "enabled extensions:" +msgstr "有効化されているエクステンション:" msgid "no help text available" -msgstr "" +msgstr "ヘルプはありません" #, python-format msgid "%s extension - %s\n" -msgstr "" +msgstr "%s エクステンション - %s\n" msgid "Mercurial Distributed SCM\n" msgstr "Mercurial - 分散構成管理ツール\n" @@ -5922,26 +6304,30 @@ msgid "" "identify the working copy or specified revision\n" "\n" -" With no revision, print a summary of the current state of the repo.\n" -"\n" -" With a path, do a lookup in another repository.\n" -"\n" -" This summary identifies the repository state using one or two parent\n" -" hash identifiers, followed by a \"+\" if there are uncommitted changes\n" -" in the working directory, a list of tags for this revision and a branch\n" -" name for non-default branches.\n" +" With no revision, print a summary of the current state of the\n" +" repository.\n" +"\n" +" Specifying a path to a repository root or Mercurial bundle will\n" +" cause lookup to operate on that repository/bundle.\n" +"\n" +" 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 "" "作業領域ないし特定リビジョンの識別情報表示\n" "\n" -" リビジョン指定無しの起動では、作業領域の状態を表示します。\n" -"\n" -" パス指定有りでの起動の場合は、他のリポジトリを参照します。\n" -"\n" -" 本コマンドの出力する要約情報は、1つないし2つの親リビジョンハッシュ値を\n" -" 使用して、作業領域の状態を識別します。ハッシュ値の後ろには、作業領域に\n" -" 未コミットの変更がある場合は \"+\"、当該リビジョンに付いているタグの\n" -" 一覧、default 以外のブランチの場合にはブランチ名が続きます。\n" +" リビジョン指定無しの起動の際には、作業領域の状態を表示します。\n" +"\n" +" パス指定有りでの起動の際には、他のリポジトリないしバンドルファイルの\n" +" 状態を表示します。\n" +"\n" +" 本コマンドの出力する要約情報は、1つないし2つの親リビジョンのハッシュ\n" +" 値を使用して、作業領域の状態を識別します。作業領域に未コミットの\n" +" 変更がある場合は \"+\"、当該リビジョンにタグが付いている場合はタグの\n" +" 一覧、default 以外のブランチの場合にはブランチ名が、ハッシュ値の後に\n" +" 続きます。\n" " " msgid "" @@ -5950,29 +6336,30 @@ " Import a list of patches and commit them individually.\n" "\n" " If there are outstanding changes in the working directory, import\n" -" will abort unless given the -f flag.\n" +" will abort unless given the -f/--force flag.\n" "\n" " You can import a patch straight from a mail message. Even patches\n" -" as attachments work (body part must be type text/plain or\n" -" text/x-patch to be used). From and Subject headers of email\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.\n" "\n" -" If the imported patch was generated by hg export, user and description\n" -" from patch override values from message headers and body. Values\n" -" given on command line with -m and -u override these.\n" -"\n" -" If --exact is specified, import will set the working directory\n" -" to the parent of each patch before applying it, and will abort\n" -" if the resulting changeset has a different ID than the one\n" -" recorded in the patch. This may happen due to character set\n" -" problems or other deficiencies in the text patch format.\n" -"\n" -" With --similarity, hg will attempt to discover renames and copies\n" -" in the patch in the same way as 'addremove'.\n" -"\n" -" To read a patch from standard input, use patch name \"-\".\n" +" 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.\n" +"\n" +" 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.\n" +"\n" +" With -s/--similarity, hg will attempt to discover renames and\n" +" copies in the patch in the same way as 'addremove'.\n" +"\n" +" 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" " " msgstr "" @@ -5980,81 +6367,84 @@ "\n" " 列挙されたパッチの取り込みおよびコミットを個別に行います。\n" "\n" -" 作業領域に未コミットの変更がある場合、-f フラグが指定されない限り\n" -" 取り込みは中断されます。\n" -"\n" -" 電子メールから直接パッチを取り込むことも可能です。添付ファイル形式の\n" -" パッチであっても取り込み可能です(text/plain ないし text/x-patch 型\n" -" でなければなりません)。電子メールの From および Subject ヘッダは\n" -" 無指定時の作成者およびコミットログとして使用されます。\n" -" 最初のパッチデータよりも前の text/plain 型ボディの内容は、\n" -" コミットログに対して追加されます。\n" -"\n" -" hg export により生成されたパッチを取り込む場合、電子メールのヘッダや\n" -" ボディ部分の情報よりも、パッチに含まれる情報の方が優先します。\n" -" コマンドラインでの -m ないし -u 指定は、これらよりも優先します。\n" -"\n" -" --exact が指定された際には、作業領域をそれぞれのパッチの親リビジョンで\n" -" 更新してからパッチの適用を実施しますが、作成されたチェンジセットのIDが\n" -" パッチに記録された ID と異なる場合、パッチの適用を中断します。\n" -" この中断は、利用する文字符号化の問題や、パッチのテキスト部分の不足\n" -" といったことが原因で発生する可能性もあります。\n" -"\n" -" --similarity が指定された際には、パッチによる変更における改名や複製を\n" -" hg addremove と同様な方針で特定します。\n" -"\n" -" 標準入力からパッチを取り込むには、パッチ名に \"-\" を指定してください。\n" +" 作業領域に未コミットの変更がある場合、-f/--force が指定されない限り\n" +" 取り込みは実施されません。\n" +"\n" +" 電子メールから直接パッチを取り込むことも可能です。添付ファイル\n" +" 形式のパッチであっても取り込み可能です(text/plain ないし \n" +" text/x-patch 型でなければなりません)。作成者およびコミットログが無い\n" +" 場合、電子メールの From および Subject ヘッダ値が使用されます。\n" +" 最初のパッチデータに先立つ text/plain ボディは、コミットログに追記\n" +" されます。\n" +"\n" +" 'hg export' により生成されたパッチを取り込む場合、電子メールの\n" +" ヘッダやボディの情報よりも、パッチに含まれる情報の方が優先します。\n" +" コマンドラインでの -m/--message ないし -u/--user 指定はこれらよりも\n" +" 優先します。\n" +"\n" +" --exact が指定された場合、作業領域をパッチの親リビジョンに更新して\n" +" からパッチを適用しますが、作成されたリビジョンのハッシュ値が、パッチ\n" +" に記録された値と異なる場合、取り込みは実施されません。この現象は、\n" +" 利用する文字符号化の問題や、パッチのテキスト部分の不足などが原因で\n" +" 発生する可能性があります。\n" +"\n" +" -s/--similarity が指定された場合、'hg addremove' と同様な方針で、\n" +" パッチによる変更内容から、改名や複製を検出します。\n" +"\n" +" 標準入力からパッチを取り込むには、パッチ名に \"-\" を指定します。\n" " -d/--date への指定に関しては、'hg help dates' を参照してください。\n" " " msgid "applying patch from stdin\n" -msgstr "" +msgstr "標準入力からのパッチを適用中\n" msgid "no diffs found" -msgstr "" +msgstr "差分がありません" #, python-format msgid "" "message:\n" "%s\n" msgstr "" - -msgid "not a mercurial patch" -msgstr "" +"メッセージ:\n" +"%s\n" + +msgid "not a Mercurial patch" +msgstr "Mercurial 向けのパッチではありません" msgid "patch is damaged or loses information" -msgstr "" +msgstr "パッチには破損ないし情報の欠落があります" msgid "" "show new changesets found in source\n" "\n" " Show new changesets found in the specified path/URL or the default\n" -" pull location. These are the changesets that would be pulled if a pull\n" -" was requested.\n" -"\n" -" For remote repository, using --bundle avoids downloading the changesets\n" -" twice if the incoming is followed by a pull.\n" +" pull location. These are the changesets that would have been pulled\n" +" if a pull at the time you issued this command.\n" +"\n" +" For remote repository, using --bundle avoids downloading the\n" +" changesets twice if the incoming is followed by a pull.\n" "\n" " See pull for valid source format details.\n" " " msgstr "" -"指定リポジトリ中の未取り込みチェンジセットの検索\n" -"\n" -" ファイルパスや URL、hg pull の default 取り込み対象により指定される\n" -" リポジトリ中の、未取り込みチェンジセットを検索します。\n" -" これらは、hg pull を実行した際に取り込まれる予定のチェンジセットです。\n" +"指定リポジトリ中の未取り込みリビジョンの検索\n" +"\n" +" ファイルパスや URL、'hg pull' の default 取り込み対象により指定\n" +" されるリポジトリ中の、未取り込みリビジョンを検索します。\n" +" これらは、'hg pull' を実行した際の取り込み対象リビジョンです。\n" "\n" " 遠隔ホストのリポジトリの場合、--bundle を使用することで、本コマンド\n" -" 実行後の hg pull 実施の際に、再度のチェンジセット検索を抑止できます。\n" -"\n" -" 対象リポジトリの指定形式の詳細は hg pull のヘルプを参照してください。\n" +" 実行後の 'hg pull' 実施の際に、再度のリビジョン検索を抑止できます。\n" +"\n" +" 対象リポジトリの指定形式は 'hg help pull' を参照してください。\n" " " msgid "" "create a new repository in the given directory\n" "\n" " Initialize a new repository in the given directory. If the given\n" -" directory does not exist, it is created.\n" +" directory does not exist, it will be created.\n" "\n" " If no directory is given, the current directory is used.\n" "\n" @@ -6064,7 +6454,7 @@ msgstr "" "指定されたディレクトリでの新規リポジトリの作成\n" "\n" -" 指定されたリポジトリを新規リポジトリとして初期化します。指定された\n" +" 指定されたディレクトリに新規リポジトリを作成します。指定された\n" " ディレクトリが存在しない場合には、ディレクトリを作成します。\n" "\n" " ディレクトリが指定されない場合、現ディレクトリが初期化されます。\n" @@ -6076,37 +6466,38 @@ msgid "" "locate files matching specific patterns\n" "\n" -" Print all files under Mercurial control whose names match the\n" -" given patterns.\n" -"\n" -" This command searches the entire repository by default. To search\n" -" just the current directory and its subdirectories, use\n" -" \"--include .\".\n" -"\n" -" If no patterns are given to match, this command prints all file\n" -" names.\n" +" Print files under Mercurial control in the working directory whose\n" +" names match the given patterns.\n" +"\n" +" By default, this command searches all directories in the working\n" +" directory. To search just the current directory and its\n" +" subdirectories, use \"--include .\".\n" +"\n" +" If no patterns are given to match, this command prints the names\n" +" of all files under Mercurial control in the working directory.\n" "\n" " 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\".\n" -" This will avoid the problem of \"xargs\" treating single filenames\n" -" that contain white space as multiple filenames.\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 "" "指定されたパターンに合致する名前を持つファイルの特定\n" "\n" -" 構成管理対象となるファイルの中から、指定されたパターンに合致する名前を\n" -" 持つファイルを特定します。\n" +" 構成管理対象となるファイルの中から、指定されたパターンに合致する\n" +" 名前のファイルを特定します。\n" "\n" " 特に指定が無い場合、本コマンドは構成管理対象となる作業領域中の\n" -" 全ファイルを検索対象とします。現ディレクトリとサブディレクトリのみを\n" -" 検索対象とするには、\"--include .\" を使用してください。\n" -"\n" -" パターン指定が無い場合、本コマンドは全てのファイル名を表示します。\n" +" 全ディレクトリを検索対象とします。現ディレクトリとその配下のみを検索\n" +" 対象とする場合は \"--include .\" を指定します。\n" +"\n" +" パターン指定が無い場合、本コマンドは構成管理対象下にある作業領域中の\n" +" 全てのファイル名を表示します。\n" "\n" " 本コマンドの出力を \"xargs\" コマンドへと渡す場合、本コマンドと\n" -" \"xargs\" コマンドの両方への \"-0\" オプション指定をお勧めします。\n" -" 空白文字を含む単一のファイル名が、複数のファイル名に解釈されてしまう\n" -" \"xargs\" の問題は、このオプションにより解決することができます。\n" +" \"xargs\" コマンドの両方に \"-0\" を指定することをお勧めします。\n" +" 空白文字を含む単一のファイル名を、\"xargs\" が複数のファイル名に解釈\n" +" してしまう問題は、このオプションにより解消されます。\n" " " msgid "" @@ -6116,8 +6507,8 @@ " project.\n" "\n" " File history is shown without following rename or copy history of\n" -" files. Use -f/--follow with a file name to follow history across\n" -" renames and copies. --follow without a file name will only show\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.\n" "\n" @@ -6127,102 +6518,96 @@ "\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" "\n" -" By default this command outputs: changeset id and hash, tags,\n" -" non-trivial parents, user, date and time, and a summary for each\n" -" commit. When the -v/--verbose switch is used, the list of changed\n" -" files and full commit message is shown.\n" -"\n" -" NOTE: log -p may generate unexpected diff output for merge\n" +" 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.\n" +"\n" +" 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, the files: list will only reflect files\n" -" that are different from BOTH parents.\n" -"\n" +" its first parent. Also, only files different from BOTH parents\n" +" will appear in files:.\n" " " msgstr "" "リポジトリ全体ないしファイルの変更履歴の表示\n" "\n" " 特定のファイルないしリポジトリ全体の変更履歴を表示します。\n" "\n" -" ファイルの履歴表示では、改名や複製における元ファイルにまでさかのぼった\n" -" 履歴は表示しません。元ファイルの履歴までさかのぼる場合は、ファイル名と\n" -" 一緒に -f/--follow オプションを指定してください。--follow 指定の際に\n" -" ファイル名を指定しない場合は、開始リビジョンの先祖ないし子孫リビジョン\n" -" のみを表示します。--follow-first 指定は、マージリビジョンにおいて\n" -" 第1親の履歴のみをさかのぼります。\n" -"\n" -" 対象リビジョンの範囲が指定されない場合、対象となるリビジョンの範囲は\n" -" tip:0 とみなされますが、--follow が指定された場合は、作業領域の\n" -" 親リビジョンが開始リビジョンとみなされます。\n" +" ファイルの履歴表示では、改名／複製時の元ファイルにまでさかのぼった\n" +" 履歴は表示しません。元ファイルの履歴をさかのぼる場合は、ファイル\n" +" 名と一緒に -f/--follow を使用します。--follow 指定の際にファイル\n" +" 名が指定されない場合は、開始リビジョンに連なるリビジョンのみを表示\n" +" します。--follow-first 指定は、マージリビジョンにおいて第1親の履歴\n" +" のみをさかのぼります。\n" +"\n" +" 特に指定されない場合、対象となるリビジョンの範囲はtip:0 とみなされ\n" +" ますが、--follow が指定された場合は、作業領域の親リビジョンが開始\n" +" リビジョンとみなされます。\n" "\n" " -d/--date への指定に関しては、'hg help dates' を参照してください。\n" "\n" " 特に指定が無い場合、本コマンドは以下の情報を出力します:\n" -" リビジョン番号、ハッシュID、タグ、(リビジョン番号の離れた),\n" -" 親リビジョン、作成者、作成日時およびコミットログの1行目。\n" -" -v/--verbose が指定された場合、変更対象ファイル一覧と、コミットログの\n" -" 全文が表示されます。\n" -"\n" -" 備考: -p オプションがマージチェンジセットに対して予期せぬ差分を出力\n" -" するのは、常に第1親との差分を表示するためです。ファイル一覧が予期せぬ\n" -" 内容となるのは、両方の親と異なるファイルのみが列挙されるためです。\n" -"\n" -" " - -msgid "" -"looks up all renames for a file (up to endrev) the first\n" -" time the file is given. It indexes on the changerev and only\n" -" parses the manifest if linkrev != changerev.\n" -" Returns rename info for fn at changerev rev." -msgstr "" +"\n" +" リビジョン番号、ハッシュ値、タグ、(リビジョン番号の離れた)\n" +" 親リビジョン、作成者、作成日時およびコミットログの1行目\n" +"\n" +" -v/--verbose が指定された場合、変更対象ファイル一覧と、コミット\n" +" ログの全文も表示されます。\n" +"\n" +" 備考: マージ実施リビジョンに対する -p/--patch が予期せぬ出力を生成\n" +" するのは、常に第1親との差分を表示するためです。ファイル一覧が予期\n" +" せぬ内容となるのは、両方の親と異なるファイルが列挙されるためです。\n" +" " msgid "" "output the current or given revision of the project manifest\n" "\n" " Print a list of version controlled files for the given revision.\n" -" If no revision is given, the parent of the working directory is used,\n" -" or tip if no revision is checked out.\n" -"\n" -" The manifest is the list of files being version controlled. If no " -"revision\n" -" is given then the first parent of the working directory is used.\n" -"\n" -" With -v flag, print file permissions, symlink and executable bits. With\n" -" --debug flag, print file revision hashes.\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.\n" +"\n" +" With -v, print file permissions, symlink and executable bits.\n" +" With --debug, print file revision hashes.\n" " " msgstr "" "現時点ないし指定時点でのリポジトリマニフェストの出力\n" "\n" -" 指定リビジョンでの構成管理対象ファイルの一覧を表示します。\n" +" 指定リビジョンにおける構成管理対象ファイルの一覧を表示します。\n" " リビジョン指定が無い場合、作業領域の(第1)親リビジョンか、\n" -" 作業領域の更新前なら tip が使用されます。\n" -"\n" -" 「マニフェスト」とは、構成管理対象ファイルの一覧を指します。\n" +" 作業領域の更新前なら null が使用されます。\n" "\n" " -v が指定された場合、ファイルアクセス権やシンボリックリンク、\n" " 実行可能ビットといったものも表示されます。\n" -" --debug が指定された場合、リビジョンのハッシュ値が表示されます。\n" +" --debug が指定された場合、各ファイルのリビジョンのハッシュ値が\n" +" 表示されます。\n" " " msgid "" "merge working directory with another revision\n" "\n" -" Merge the contents of the current working directory and the\n" -" requested revision. Files that changed between either parent are\n" -" marked as changed for the next commit and a commit must be\n" -" performed before any further updates are allowed.\n" +" The current working directory is updated with all changes made in\n" +" the requested revision since the last common predecessor revision.\n" +"\n" +" 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.\n" "\n" " If no revision is specified, the working directory's parent is a\n" -" head revision, and the current branch contains exactly one other head,\n" -" the other head is merged with by default. Otherwise, an explicit\n" -" revision to merge with must be provided.\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 "" "作業領域の内容と他のリビジョンのマージ\n" "\n" -" 現時点での作業領域の内容を、指定されたリビジョンとマージします。\n" -" 両方の親リビジョンに対して変更のあるファイルは、次回コミットの際には\n" -" 更新として記録されますので、それ以上の変更が実施される前に\n" -" コミットを実施してください。\n" +" 現時点での作業領域の内容を、指定されたリビジョンへと至るまでの\n" +" 共通の親リビジョンからの変更内容とマージします。\n" +"\n" +" 両方の親リビジョンに対して差分のあるファイルは、次回コミットの際には\n" +" 変更されたものとして記録されますので、必要以上の変更が実施される前に\n" +" コミットを実施してください。このコミット時に生成されるリビジョンは、\n" +" 親リビジョンを2つ持つリビジョンとなります。\n" "\n" " マージ対象リビジョンの指定が無く、作業領域の親リビジョンがヘッドで、\n" " 且つ現行ブランチがもう1つだけヘッドを持つ場合、そのヘッドがマージ対象\n" @@ -6231,31 +6616,33 @@ #, python-format msgid "branch '%s' has %d heads - please merge with an explicit rev" -msgstr "" +msgstr "ブランチ '%s' にはヘッドが %d あります - マージ対象を明示してください" #, python-format msgid "branch '%s' has one head - please merge with an explicit rev" msgstr "" +"ブランチ '%s' にはヘッドが1しかありません - マージ対象を明示してください" msgid "there is nothing to merge" -msgstr "" +msgstr "マージの必要がありません" #, python-format msgid "%s - use \"hg update\" instead" -msgstr "" +msgstr "%s - \"hg update\" を使用してください" msgid "" "working dir not at a head rev - use \"hg update\" or merge with an explicit " "rev" msgstr "" +"作業領域の親リビジョンはヘッドではありません。\n" +"リビジョンを明示しての \"hg update\" ないしマージを実施してください。" msgid "" "show changesets not found in destination\n" "\n" -" Show changesets not found in the specified destination repository or\n" -" the default push location. These are the changesets that would be " -"pushed\n" -" if a push was requested.\n" +" 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.\n" "\n" " See pull for valid destination format details.\n" " " @@ -6270,35 +6657,35 @@ " " msgid "" -"show the parents of the working dir or revision\n" -"\n" -" Print the working directory's parent revisions. If a\n" -" revision is given via --rev, the parent of that revision\n" -" will be printed. If a file argument is given, revision in\n" -" which the file was last changed (before the working directory\n" -" revision or the argument to --rev if given) is printed.\n" +"show the parents of the working directory or revision\n" +"\n" +" 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 "" "作業領域(ないし指定リビジョン)の親リビジョンの表示\n" "\n" -" 作業領域の親リビジョンを表示します。--rev でのリビジョン指定がある場合\n" -" 指定リビジョンの親リビジョンを表示します。ファイルが指定された場合、\n" -" (作業領域の親リビジョン、ないし --rev による指定リビジョン以前のもので)\n" -" そのファイルを最後に更新したリビジョンを表示します。\n" -" " - -msgid "can only specify an explicit file name" -msgstr "" +" 作業領域の親リビジョンを表示します。-r/--rev でのリビジョン指定が\n" +" ある場合、指定リビジョンの親リビジョンを表示します。ファイルが指定\n" +" された場合、(作業領域の親リビジョン、ないし --rev 指定のリビジョン\n" +" 以前のもので)そのファイルを最後に更新したリビジョンを表示します。\n" +" " + +msgid "can only specify an explicit filename" +msgstr "明示的なファイル名以外は指定できません" #, python-format msgid "'%s' not found in manifest!" -msgstr "" +msgstr "'%s' は管理対象ではありません" msgid "" "show aliases for remote repositories\n" "\n" -" Show definition of symbolic path name NAME. If no name is given, show\n" -" definition of available names.\n" +" Show definition of symbolic path name NAME. If no name is given,\n" +" show definition of all available names.\n" "\n" " 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.\n" @@ -6319,16 +6706,16 @@ " " msgid "not found!\n" -msgstr "" +msgstr "指定シンボルは不明です\n" msgid "not updating, since new heads added\n" -msgstr "" +msgstr "新規ヘッドが追加されたため、作業領域は更新しません\n" msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n" -msgstr "" +msgstr "(ヘッド一覧表示は 'hg heads'、マージ実施は 'hg merge')\n" msgid "(run 'hg update' to get a working copy)\n" -msgstr "" +msgstr "(作業領域の更新は 'hg update')\n" msgid "" "pull changes from the specified source\n" @@ -6336,101 +6723,90 @@ " Pull changes from a remote repository to a local one.\n" "\n" " This finds all changes from the repository at the specified path\n" -" or URL and adds them to the local repository. By default, this\n" -" does not update the copy of the project in the working directory.\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.\n" +"\n" +" 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.\n" "\n" " If SOURCE is omitted, the 'default' path will be used.\n" " See 'hg help urls' for more information.\n" " " msgstr "" -"指定されたリポジトリからのチェンジセット取り込み\n" -"\n" -" 連携先リポジトリからローカルリポジトリにチェンジセットを取り込みます。\n" -"\n" -" パスや URL で指定される連携先リポジトリ中の、全てのチェンジセットが\n" -" 取り込み対象となります。指定が無い場合、このコマンドを実行しても\n" -" 作業領域の内容は更新されません。\n" +"指定リポジトリからの変更履歴の取り込み\n" +"\n" +" 連携先リポジトリから手元のリポジトリに変更履歴を取り込みます。\n" +"\n" +" パスや URL で指定される連携先リポジトリ中の、全てのリビジョンが\n" +" (-R 指定が無い場合は現在の)リポジトリへの取り込み対象となります。\n" +" 特に指定が無い場合、このコマンドを実行しても、作業領域の内容は更新\n" +" されません。\n" +"\n" +" 'hg incoming' を使用することで、実際の取り込みをせずに、'hg pull' に\n" +" よる取り込み対象を確認することができます。表示された内容の取り込みを\n" +" 決断したならば、先に表示された最後のリビジョンを '-r' の引数にして\n" +" 'hg pull' を実行しましょう。\n" "\n" " 連携先が省略された場合、'default' パスが連携先として使用されます。\n" " 詳細は 'hg help urls' を参照してください。\n" " " msgid "" -"Other repository doesn't support revision lookup, so a rev cannot be " -"specified." -msgstr "" - -msgid "" "push changes to the specified destination\n" "\n" " Push changes from the local repository to the given destination.\n" "\n" -" This is the symmetrical operation for pull. It helps to move\n" -" changes from the current repository to a different one. If the\n" -" destination is local this is identical to a pull in that directory\n" -" from the current one.\n" +" 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.\n" "\n" " 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" -" the client has forgotten to pull and merge before pushing.\n" -"\n" -" If -r is used, the named changeset and all its ancestors will be pushed\n" -" to the remote repository.\n" -"\n" -" Look at the help text for urls for important details about ssh:// URLs.\n" -" If DESTINATION is omitted, a default path will be used.\n" -" See 'hg help urls' for more information.\n" -" " -msgstr "" -"指定されたリポジトリへのチェンジセット反映\n" -"\n" -" ローカルリポジトリから連携先リポジトリへとチェンジセットを反映します。\n" -"\n" -" これは hg pull と対称的な操作です。現在のリポジトリから連携先へと、\n" -" チェンジセットを簡単に移動させることができます。連携先リポジトリが\n" -" 同一ホスト上にある場合は、現リポジトリに対する連携先リポジトリでの\n" -" hg pull 実行と同一の効果を持ちます。\n" -"\n" -" 通常は、連携先リポジトリにヘッドが増える実行は拒絶されます。\n" -" このような場合、大概は hg push 前の hg pull および hg merge 実行を\n" -" 忘れていることが殆どです。\n" -"\n" -" -r が指定された場合、指定されたチェンジセットとその祖先が連携先\n" -" リポジトリへと反映されます。\n" +" user forgot to pull and merge before pushing.\n" +"\n" +" If -r/--rev is used, the named revision and all its ancestors will\n" +" be pushed to the remote repository.\n" +"\n" +" Please see 'hg help urls' for important details about ssh://\n" +" URLs. If DESTINATION is omitted, a default path will be used.\n" +" " +msgstr "" +"指定リポジトリへの変更履歴の反映\n" +"\n" +" 手元のリポジトリから連携先リポジトリに変更履歴を反映します。\n" +"\n" +" これは 'hg pull' と対称的な操作です。現在のリポジトリから連携先へと\n" +" 変更履歴を反映させることができます。連携先が同一ホスト上のリポジトリ\n" +" であれば、連携先リポジトリにおいて、現リポジトリに対する 'hg pull'\n" +" を行った場合と同一の効果を持ちます。\n" +"\n" +" 連携先リポジトリにヘッドが増える実行は、通常は拒絶されます。\n" +" このような場合、大概は 'hg push' 前の 'hg pull' および 'hg merge'\n" +" 実行を忘れていることが殆どです。\n" +"\n" +" -r/--rev が指定された場合、指定されたものと、その祖先となる\n" +" リビジョンが連携先リポジトリへと反映されます。\n" "\n" " ssh:// URL 形式の詳細に関しては、'hg help urls' を参照してください。\n" " 連携先が省略された場合、'default' パスが連携先として使用されます。\n" -" 詳細に関しては、'hg help urls' を参照してください。\n" " " #, python-format msgid "pushing to %s\n" -msgstr "" - -msgid "" -"raw commit interface (DEPRECATED)\n" -"\n" -" (DEPRECATED)\n" -" Lowlevel commit, for use in helper scripts.\n" -"\n" -" This command is not intended to be used by normal users, as it is\n" -" primarily useful for importing from other SCMs.\n" -"\n" -" This command is now deprecated and will be removed in a future\n" -" release, please use debugsetparents and commit instead.\n" -" " -msgstr "" - -msgid "(the rawcommit command is deprecated)\n" -msgstr "" +msgstr "%s への反映中\n" msgid "" "roll back an interrupted transaction\n" "\n" " Recover from an interrupted commit or pull.\n" "\n" -" This command tries to fix the repository status after an interrupted\n" -" operation. It should only be necessary when Mercurial suggests it.\n" +" This command tries to fix the repository status after an\n" +" interrupted operation. It should only be necessary when Mercurial\n" +" suggests it.\n" " " msgstr "" "中断されたトランザクションの取り消し\n" @@ -6446,15 +6822,17 @@ "\n" " Schedule the indicated files for removal from the repository.\n" "\n" -" This only removes files from the current branch, not from the entire\n" -" project history. -A can be used to remove only files that have already\n" -" been deleted, -f can be used to force deletion, and -Af can be used\n" -" to remove files from the next revision without deleting them.\n" -"\n" -" The following table details the behavior of remove for different file\n" -" states (columns) and option combinations (rows). The file states are\n" -" Added, Clean, Modified and Missing (as reported by hg status). The\n" -" actions are Warn, Remove (from branch) and Delete (from disk).\n" +" 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.\n" +"\n" +" 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).\n" "\n" " A C M !\n" " none W RD W R\n" @@ -6466,20 +6844,20 @@ " To undo a remove before that, see hg revert.\n" " " msgstr "" -"次回コミットにおける指定されたファイルの登録除外\n" -"\n" -" 構成管理対象からの除外を予約します。\n" -"\n" -" この操作による登録除外の対称は現行ブランチのみで、他ブランチにおいては\n" -" ファイルは存続し続けます。手動で削除したファイルの登録除外には -A、\n" -" 強制的な登録除外には -f、作業領域中のファイルを削除することなく登録解除\n" -" するには -Af 指定が有効です。\n" -"\n" -" ファイルの状態(横)とオプション指定(縦)の組み合わせにおける挙動の一覧を\n" -" 以下に示します。ファイルの状態は、hg status が表示する A(Add:追加)、\n" -" C(Clean:改変無し)、M(Modified:改変有り)および !(不明)で表します。\n" -" 挙動は W(Warn:警告)、R(Remove:構成管理からの登録除外)および\n" -" D(Delete:作業領域からの削除)で表します。\n" +"次回コミットにおける指定ファイルの登録除外\n" +"\n" +" 構成管理対象からの指定ファイルの登録除外を予約します。\n" +"\n" +" 登録除外は現行ブランチのみが対象となるため、他のブランチにおいては\n" +" ファイルは存続し続けます。手動で削除したファイルを登録除外するには\n" +" -A/--after を、強制的に登録除外するには -f/--force を、作業領域中の\n" +" ファイルを削除することなく登録除外するには -Af を指定します。\n" +"\n" +" ファイルの状態(横)とオプション指定(縦)の組み合わせにおける挙動は、\n" +" 以下の一覧を参照してください。ファイルの状態は、'hg status' が表示\n" +" する A(Add:追加登録)、C(Clean:改変無し)、M(Modified:改変有り)および\n" +" !(不明)で表します。挙動は W(Warn:警告)、R(Remove:構成管理からの登録\n" +" 除外)および D(Delete:作業領域からの削除)で表します。\n" "\n" " A C M !\n" " 無指定 W RD W R\n" @@ -6487,35 +6865,38 @@ " -A W W W R\n" " -Af R R R R\n" "\n" -" 指定されたファイルは次回のコミットの際に登録が除外されます。\n" -" コミット前に登録解除を取り消す方法は、hg revert を参照してください。\n" -" " - -msgid "no files specified" -msgstr "" +" 指定ファイルは、次回のコミットの際に登録除外されます。コミット前に\n" +" 登録除外を取り消す方法は 'hg help revert' を参照してください。\n" +" " + +#, python-format +msgid "not removing %s: file is untracked\n" +msgstr "%s は削除されません: 構成管理対象ではありません\n" #, python-format msgid "not removing %s: file %s (use -f to force removal)\n" msgstr "" +"ファイル %s は削除されません。\n" +"%s (強行する場合は -f を指定してください)XXXX\n" msgid "still exists" -msgstr "" +msgstr "まだファイルが存在しています" msgid "is modified" -msgstr "" +msgstr "ファイルが変更されています" msgid "has been marked for add" -msgstr "" +msgstr "追加登録対象です" msgid "" "rename files; equivalent of copy + remove\n" "\n" -" Mark dest as copies of sources; mark sources for deletion. If\n" -" dest is a directory, copies are put in that directory. If dest is\n" -" a file, there can only be one source.\n" +" 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.\n" "\n" " By default, this command copies the contents of files as they\n" -" exist in the working directory. If invoked with --after, the\n" +" exist in the working directory. If invoked with -A/--after, the\n" " operation is recorded, but no copying is performed.\n" "\n" " This command takes effect at the next commit. To undo a rename\n" @@ -6524,16 +6905,16 @@ msgstr "" "ファイルの改名(copy + remove と等価)\n" "\n" -" 複製先ファイルを、複製元の複製であると記録し、複製元を登録解除します。\n" -" 複製先指定がディレクトリの場合、ディレクトリ内に複製が作成されます。\n" -" 複製先指定がファイルの場合、複製元は1つしか指定できません。\n" -"\n" -" 特に指定が無い場合本コマンドは、複製元ファイルの内容で作業領域に\n" -" 指定された名前のファイルを作成します。--after 指定がある場合、「複製」\n" -" 操作は記録されますが、ファイルの複製は行われません。\n" -"\n" -" 本コマンドの実行結果は次回のコミットの際にリポジトリに記録されます。\n" -" コミット前に改名操作を取り消す方法は hg revert を参照してください。\n" +" 改名元の複製として改名先を追加登録し、改名元を登録除外します。\n" +" 改名先がディレクトリの場合、ディレクトリ内に複製が作成されます。\n" +" 改名先がファイルの場合、改名元は1つしか指定できません。\n" +"\n" +" 特に指定が無い場合、改名元ファイルの内容を持つ改名先ファイルを\n" +" 作業領域に作成します。-A/--after 指定がある場合、「改名」操作は\n" +" 記録されますが、ファイルの複製は行われません。\n" +"\n" +" 本コマンドの実行結果は次回のコミットの際に効果を発揮します。コミット\n" +" 前に改名操作を取り消す方法は 'hg help revert' を参照してください。\n" " " msgid "" @@ -6541,45 +6922,56 @@ "\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 switch.\n" -"\n" -" This command will also allow listing resolved files and manually\n" -" marking and unmarking files as resolved.\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 "" -"hg merge や hg update におけるファイルマージの再実施\n" -"\n" -" 直前の hg merge や hg update の際に保存されたファイルの内容を用いた\n" -" 綺麗な状態でのマージを、衝突未解消のファイルに対して実施します。\n" -" 全ての衝突未解消ファイルを実施対象にする場合は、-a オプションを指定\n" -" してください。\n" -"\n" -" 本コマンドは、ファイルの衝突解消状態の一覧表示や、解消済み・未解消の\n" -" 状態区分の手動指定をすることもできます。\n" +"merge や update におけるファイルマージの再実施\n" +"\n" +" 衝突が「未解消」のファイルに対し、直前の 'hg merge' や 'hg update'\n" +" 時点におけるファイルの内容を用いて、綺麗な状態からのマージ処理を実施\n" +" します。衝突が「未解消」な全てのファイルを実施対象にする場合は、\n" +" -a/--all を指定します。\n" +"\n" +" 衝突を手動で解消した場合、本コマンドでマージ処理が再実行されると、\n" +" 手動で変更した解消内容が上書きされてしまいます。手動で衝突を解消した\n" +" 場合、-m/--mark を指定して本コマンドを実行することで、ファイルの衝突\n" +" 解消状態を「解消済み」にしてください。\n" +"\n" +" 本コマンドは、ファイルの衝突解消状態の一覧表示や、「解消済み」／\n" +" 「未解消」といった衝突解消状態の手動変更もできます。全てのファイルの\n" +" 衝突解消状態が「解消済み」になるまでは、コミットができません。\n" "\n" " ファイルの衝突解消状態表示には以下の記号が使用されます:\n" -" U = 未解消\n" -" R = 解消済み\n" +" U = 未解消(Unresolved)\n" +" R = 解消済み(Resolved)\n" " " msgid "too many options specified" -msgstr "" +msgstr "オプション指定が過剰です" msgid "can't specify --all and patterns" -msgstr "" +msgstr "--all とパターンは同時に指定出来ません" msgid "no files or directories specified; use --all to remerge all files" -msgstr "" - -msgid "" -"restore individual files or dirs to an earlier state\n" -"\n" -" (use update -r to check out earlier revisions, revert does not\n" -" change the working dir parents)\n" +msgstr "再マージには、ファイル／ディレクトリか、--all を指定してください" + +msgid "" +"restore individual files or directories to an earlier state\n" +"\n" +" (Use update -r to check out earlier revisions, revert does not\n" +" change the working directory parents.)\n" "\n" " With no revision specified, revert the named files or directories\n" " to the contents they had in the parent of the working directory.\n" @@ -6588,10 +6980,10 @@ " working directory has two parents, you must explicitly specify the\n" " revision to revert to.\n" "\n" -" Using the -r option, revert the given files or directories to their\n" -" contents as of a specific revision. This can be helpful to \"roll\n" -" back\" some or all of an earlier change.\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" 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.\n" "\n" " Revert modifies the working directory. It does not commit any\n" " changes, or change the parent of the working directory. If you\n" @@ -6599,8 +6991,8 @@ " directory, the reverted files will thus appear modified\n" " afterwards.\n" "\n" -" If a file has been deleted, it is restored. If the executable\n" -" mode of a file was changed, it is reset.\n" +" If a file has been deleted, it is restored. If the executable mode\n" +" of a file was changed, it is reset.\n" "\n" " If names are given, all files matching the names are reverted.\n" " If no arguments are given, no files are reverted.\n" @@ -6609,68 +7001,67 @@ " To disable these backups, use --no-backup.\n" " " msgstr "" -"各ファイル／ディレクトリ状態の復旧\n" -"\n" -" (hg revert は作業領域の親リビジョンを変更しないので、作業領域の状態を\n" -" 以前の版に戻す場合は、hg update を使用してください)\n" -"\n" -" リビジョン指定が無い場合、指定されたファイル／ディレクトリを作業領域の\n" -" 親リビジョン時点の内容へと復旧します。\n" -" 本コマンドは対象となるファイルに対して、状態を「改変無し」とし、\n" -" add/remove/copy/rename による次回コミット向けの操作予約を取り消します。\n" -" 作業領域の親リビジョンが2つある場合、どちらの内容で復旧するのかを\n" -" 明示的に指定する必要があります。\n" -"\n" -" -r オプションが指定された場合、指定されたファイル／ディレクトリを、\n" -" 指定されたリビジョン時点の内容へと復旧します。以前の変更内容の一部、\n" -" ないし全部を取り消す用途にも使用できます。\n" -" -d/--date への指定に関しては、'hg help dates' を参照してください。\n" -"\n" -" 本コマンドは作業領域の内容を変更しますが、変更のコミットや、作業領域の\n" -" 親リビジョンの変更は行いません。そのため、作業領域の親リビジョン以外の\n" -" リビジョンを指定して復旧した場合、復旧後のファイルの状態は「改変有り」\n" -" となります。\n" -"\n" -" ファイルが削除されていた場合、ファイルは復旧されます。実行権限ビットが\n" -" 変更されていた場合、変更前の状態に復旧されます。\n" -"\n" -" 復旧対象が指定された場合、指定された名前に合致する全てのファイルが復旧\n" -" 対象となります。復旧対象が指定されなかった場合は、いずれのファイルも\n" -" 復旧されません。\n" -"\n" -" 改変されたファイルの復旧の際には、復旧前の内容が .orig 拡張子が付いた\n" -" ファイルに保存されます。この保存は --no-backup 指定で無効化可能です。\n" +"ファイル／ディレクトリ状態の復旧\n" +"\n" +" ('hg revert' は作業領域の親リビジョンを変更しないので、作業領域の\n" +" 状態を以前の版に戻す場合は、'hg update' を使用してください)\n" +"\n" +" リビジョン指定が無い場合、指定されたファイル／ディレクトリを作業\n" +" 領域の親リビジョン時点の内容へと復旧します。本コマンドは対象\n" +" ファイルに対して、状態を「改変無し」とし、add/remove/copy/rename\n" +" 実行の効果を打ち消します。作業領域の親リビジョンが2つある場合は、\n" +" どちらの内容で復旧するのかを明示的に指定する必要があります。\n" +"\n" +" -r/--rev が指定された場合、指定されたファイル／ディレクトリを、\n" +" 指定されたリビジョン時点の内容へと復旧します。以前の変更内容の一部\n" +" ないし全部を取り消す用途にも使用できます。-d/--date の指定に関しては\n" +" 'hg help dates' を参照してください。\n" +"\n" +" 本コマンドは作業領域の内容は変更しますが、変更のコミットや、作業\n" +" 領域の親リビジョンは変更しません。そのため、作業領域の親リビジョン\n" +" 以外のリビジョンを指定して復旧した場合、復旧後のファイルの状態は\n" +" 「改変有り」として扱われます。\n" +"\n" +" ファイルが削除されていた場合、ファイルは復旧されます。実行権限が変更\n" +" されていた場合、変更前の状態に復旧されます。\n" +"\n" +" 復旧対象が指定された場合、指定された名前に合致する全てのファイルが\n" +" 復旧対象となります。復旧対象が指定されなかった場合は、いずれの\n" +" ファイルも復旧されません。\n" +"\n" +" 改変されたファイルの復旧では、復旧前の内容が .orig 拡張子を付けた\n" +" ファイルに保存されます。この保存は --no-backup で無効化されます。\n" " " msgid "you can't specify a revision and a date" -msgstr "" +msgstr "リビジョンと日時は同時には指定出来ません" msgid "no files or directories specified; use --all to revert the whole repo" -msgstr "" +msgstr "復旧には、ファイル／ディレクトリか、--all を指定してください" #, python-format msgid "forgetting %s\n" -msgstr "" +msgstr "%s の追加登録を取り消し中\n" #, python-format msgid "reverting %s\n" -msgstr "" +msgstr "%s の復旧中\n" #, python-format msgid "undeleting %s\n" -msgstr "" +msgstr "%s の復旧中\n" #, python-format msgid "saving current version of %s as %s\n" -msgstr "" +msgstr "現行版の %s を %s に保存中\n" #, python-format msgid "file not managed: %s\n" -msgstr "" +msgstr "ファイル %s は管理対象ではありません\n" #, python-format msgid "no changes needed to %s\n" -msgstr "" +msgstr "%s には改変の必要がありません\n" msgid "" "roll back the last transaction\n" @@ -6678,7 +7069,8 @@ " 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.\n" +" any dirstate changes since that time. This command does not alter\n" +" the working directory.\n" "\n" " Transactions are used to encapsulate the effects of all commands\n" " that create new changesets or propagate existing changesets into a\n" @@ -6701,15 +7093,15 @@ msgstr "" "直前のトランザクションの巻き戻し\n" "\n" -" 本コマンドの使用に当たっては注意が必要です。巻き戻しは１段階限りで、\n" -" 巻き戻したトランザクションの再実施はできません。本コマンドは、\n" -" 直前のトランザクション実施時点の dirstate を復元し、その時点以後の\n" -" 変更は全て失われます。\n" -"\n" -" トランザクションとは、新規チェンジセットの作成、ないし外部からの既存\n" -" チェンジセットの取り込みに要するコマンドの効果を一括化するものです。\n" +" 本コマンドの使用には注意が必要です。巻き戻しは１段階限りで、巻き\n" +" 戻したトランザクションの再実施はできません。本コマンドは、直前の\n" +" トランザクション実施時点の dirstate を復元し、その時点以後の変更は\n" +" 全て失われます。\n" +"\n" +" トランザクションとは、新規リビジョンの作成、ないし外部からの既存\n" +" リビジョンの取り込みに要するコマンドの効果を一括化するものです。\n" " 例えば、以下のコマンドはいずれもトランザクションを形成するもので、\n" -" その効果は巻き戻し可能です。\n" +" その効果は本コマンドにより巻き戻し可能です。\n" "\n" " commit\n" " import\n" @@ -6717,17 +7109,16 @@ " push (rollback 可能なのは反映先リポジトリ側)\n" " unbundle\n" "\n" -" 本コマンドは、公開リポジトリでの実行を想定していません。\n" -" 他のユーザに対して一旦 pull 可能な状態になってしまったなら、\n" -" 公開リポジトリでの rollback は(既に他のユーザによって取り込まれている\n" -" 可能性があるので)効果を持ちません。\n" -" その上、リポジトリからの情報読み取りに際して、競合が発生し得ます。\n" -" 例えば、巻き戻し操作によって、進行中のリポジトリからの取り込みが\n" -" 失敗してしまう可能性があります。\n" -" " - -msgid "" -"print the root (top) of the current working dir\n" +" 本コマンドは、公開リポジトリでの実行を想定していません。他のユーザ\n" +" から 'hg pull' 可能な状態になってしまったなら、公開リポジトリでの\n" +" rollback は(既に他のユーザによって複製されている可能性があるので)\n" +" 効果を持ちません。その上、リポジトリからの情報読み取りに際して、\n" +" 競合が発生し得ます。例えば、進行中のリポジトリからの取り込みが、\n" +" 巻き戻しによって失敗してしまう可能性があります。\n" +" " + +msgid "" +"print the root (top) of the current working directory\n" "\n" " Print the root directory of the current repository.\n" " " @@ -6743,33 +7134,35 @@ " Start a local HTTP repository browser and pull server.\n" "\n" " By default, the server logs accesses to stdout and errors to\n" -" stderr. Use the \"-A\" and \"-E\" options to log to files.\n" +" stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n" +" files.\n" " " msgstr "" "HTTP 経由でのリポジトリの公開\n" "\n" -" HTTP 経由でのリポジトリ参照と hg pull を可能にするサーバを起動します。\n" -"\n" -" 特に指定が無い場合、サーバはアクセスログを標準出力へ、エラーは標準\n" -" エラー出力に出力します。ログをファイルに記録する場合は、\"-A\" や \n" -" \"-E\" オプションを使用してください。\n" +" リポジトリ参照と 'hg pull' のための HTTP サーバを起動します。\n" +"\n" +" 特に指定が無い場合、サーバはアクセスログを標準出力に、エラーを\n" +" 標準エラー出力に表示します。ログをファイルに記録する場合は、\n" +" -A/--accesslog や -E/--errorlog で指定します。\n" " " #, python-format msgid "listening at http://%s%s/%s (bound to %s:%d)\n" -msgstr "" +msgstr "http://%s%s/%s で待ち受け開始(バインド先は %s:%d)\n" msgid "" "show changed files in the 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" -" source of a copy/move operation, are not listed unless -c (clean),\n" -" -i (ignored), -C (copies) or -A is given. Unless options described\n" -" with \"show only ...\" are given, the options -mardu are used.\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" +" 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" @@ -6777,49 +7170,49 @@ " 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 difference between them is shown.\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" -" ! = deleted, but still tracked\n" +" ! = missing (deleted by non-hg command, but still tracked)\n" " ? = not tracked\n" " I = ignored\n" -" = the previous added file was copied from here\n" +" = origin of the previous file listed as A (added)\n" " " msgstr "" "作業領域のファイル操作状況の表示\n" "\n" -" 作業領域のファイル状態を表示します。名前(パターン)が指定された場合、\n" -" その名前に合致するファイルのみが表示されます。改変無し(clean)、\n" +" 作業領域のファイル状態を表示します。名前(パターン)指定のある場合、\n" +" その名前に合致するファイルのみが表示されます。変更無し(clean)、\n" " 無視(ignored)ないし複製(copy)・改名(rename)の元ファイルに関しては、\n" -" それぞれ -c (clean)、-i (ignored) ないし -C (copy) が指定されるか、\n" -" -A(all) が指定されない限り表示されません。表示対象選択のオプションが\n" -" 何も指定されない場合、-m -a -r -d -u が指定されたものとして動作します。\n" -"\n" -" -q/--quiet オプション指定がある場合、明示的に -u/--unknown ないし\n" -" -i/-ignored が指定されない限り、構成管理対象外(unknown と ignored)\n" -" のファイルを表示対象外とします。\n" -"\n" -" 備考:権限設定の変更やマージが行われた場合、差分表示から期待される結果\n" -" とは異なる状態が表示される可能性があります。標準的な差分出力形式は、\n" -" 権限変更の情報を含みませんし、マージにおける一方の親リビジョンとの\n" +" それぞれ -c/--clean、-i/--ignored ないし -C/--copy が指定されるか、\n" +" -A/--all が指定されない限り表示されません。表示対象選択オプションが\n" +" 何も指定されない場合、-m -a -r -d -u が指定されたものとみなします。\n" +"\n" +" -q/--quiet 指定がある場合、-u/--unknown ないし -i/-ignored が明示\n" +" 的に指定されない限り、構成管理対象外のファイルは表示されません。\n" +"\n" +" 備考:権限設定の変更やマージが行われた場合、差分表示から期待される\n" +" 結果とは異なる状態が表示される可能性があります。標準的な差分形式は\n" +" 権限変更の情報を含みませんし、マージの際には一方の親リビジョンとの\n" " 差分しか表示しません。\n" "\n" " 1つのリビジョンが指定された場合、比較元リビジョンとして扱われます。\n" -" 2つのリビジョンが指定された場合、両リビジョンの間で状態が比較されます。\n" +" 2つのリビジョンが指定された場合、両リビジョン間で状態比較されます。\n" "\n" " ファイルの状態を表す記号は以下の通り:\n" -" M = 改変有り(modified)\n" -" A = 新規登録(added)\n" -" R = 登録解除(removed)\n" -" C = 改変無し(clean)\n" -" ! = 作業領域にファイルが無い(missing)\n" +" M = 改変有り(Modified)\n" +" A = 追加登録予定(Added)\n" +" R = 登録除外予定(Removed)\n" +" C = 変更無し(Clean)\n" +" ! = 構成管理対象にも関わらず作業領域にファイルが無い(missing)\n" " ? = 構成管理対象外(unknown)\n" -" I = 無視(ignored)\n" -" = 直前に表示される新規登録ファイルの複製元\n" +" I = 無視(Ignored)\n" +" = 直前に表示される新規登録予定ファイルの複製元\n" " " msgid "" @@ -6831,8 +7224,8 @@ " very useful to compare different revisions, to go back to significant\n" " earlier versions or to mark branch points as releases, etc.\n" "\n" -" If no revision is given, the parent of the working directory is used,\n" -" or tip if no revision is checked out.\n" +" If no revision is given, the parent of the working directory is\n" +" used, or tip if no revision is checked out.\n" "\n" " To facilitate version control, distribution, and merging of tags,\n" " they are stored as a file named \".hgtags\" which is managed\n" @@ -6863,55 +7256,59 @@ " " msgid "tag names must be unique" -msgstr "" +msgstr "タグ名が重複しています" #, python-format msgid "the name '%s' is reserved" -msgstr "" +msgstr "タグ名 '%s' はシステムで予約されています" msgid "--rev and --remove are incompatible" -msgstr "" +msgstr "--rev と --remove は同時に使用できません" #, python-format msgid "tag '%s' does not exist" -msgstr "" - -#, python-format -msgid "tag '%s' is not a %s tag" -msgstr "" +msgstr "タグ '%s' は存在しません" + +#, python-format +msgid "tag '%s' is not a global tag" +msgstr "タグ '%s' はグローバルなタグではありません" + +#, python-format +msgid "tag '%s' is not a local tag" +msgstr "タグ '%s' はローカルなタグではありません" #, python-format msgid "Removed tag %s" -msgstr "" +msgstr "タグ %s の削除" #, python-format msgid "tag '%s' already exists (use -f to force)" -msgstr "" +msgstr "タグ '%s' は存在します(強行する場合は -f を指定してください)" #, python-format msgid "Added tag %s for changeset %s" -msgstr "" +msgstr "リビジョン %s へタグ %s を付与" msgid "" "list repository tags\n" "\n" -" This lists both regular and local tags. When the -v/--verbose switch\n" -" is used, a third column \"local\" is printed for local tags.\n" +" 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 "" "リポジトリ中のタグ一覧の表示\n" "\n" " 本コマンドは、通常のタグおよびローカルタグの両方を一覧表示します。\n" -" -v/--verbose オプションが指定された場合、ローカルタグの識別情報用に、\n" -" \"local\" カラムが追加表示されます。\n" +" -v/--verbose が指定された場合、ローカルタグの識別情報用に \"local\"\n" +" カラムが追加表示されます。\n" " " msgid "" "show the tip revision\n" "\n" -" The tip revision (usually just called the tip) is the most\n" -" recently added changeset in the repository, the most recently\n" -" changed head.\n" +" 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).\n" "\n" " 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" @@ -6921,13 +7318,13 @@ msgstr "" "tip リビジョンの表示\n" "\n" -" tip リビジョン(一般に tip と表記)とは、リポジトリおいて最も新しく追加\n" -" されたチェンジセットによるリビジョンであると同時に、最も新しく変更\n" -" されたヘッドのことでもあります。\n" -"\n" -" コミットした直後であれば、生成されたチェンジセットが tip となります。\n" -" 他のリポジトリからチェンジセットの取り込みをした直後であれば、取り込み\n" -" 対象リポジトリでの tip が現リポジトリの tip となります。\"tip\" タグは\n" +" tip リビジョン(一般には単に tip と表記)とは、リポジトリおいて最も\n" +" 新しく追加されたリビジョンであると同時に、最も新しく変更されたヘッド\n" +" のことでもあります。\n" +"\n" +" コミットした直後であれば、生成されたリビジョンが tip となります。\n" +" 他のリポジトリから変更履歴の取り込みをした直後であれば、連携先\n" +" リポジトリでの tip が現リポジトリの tip となります。\"tip\" タグは\n" " 特別なタグで、改名や、他のリビジョンへの付け替えはできません。\n" " " @@ -6946,57 +7343,65 @@ msgid "" "update working directory\n" "\n" -" Update the repository's working directory to the specified revision,\n" -" or the tip of the current branch if none is specified. Use null as\n" -" the revision to remove the working copy (like 'hg clone -U').\n" -"\n" -" When the working dir contains no uncommitted changes, it will be\n" -" replaced by the state of the requested revision from the repo. When\n" -" the requested revision is on a different branch, the working dir\n" -" will additionally be switched to that branch.\n" -"\n" -" When there are uncommitted changes, use option -C to discard them,\n" -" forcibly replacing the state of the working dir with the requested\n" -" revision.\n" -"\n" -" When there are uncommitted changes and option -C is not used, and\n" -" the parent revision and requested revision are on the same branch,\n" -" and one of them is an ancestor of the other, then the new working\n" -" directory will contain the requested revision merged with the\n" -" uncommitted changes. Otherwise, the update will fail with a\n" -" suggestion to use 'merge' or 'update -C' instead.\n" -"\n" -" If you want to update just one file to an older revision, use revert.\n" -"\n" -" See 'hg help dates' for a list of formats valid for --date.\n" +" 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').\n" +"\n" +" 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.\n" +"\n" +" 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.\n" +"\n" +" 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.\n" +"\n" +" If you want to update just one file to an older revision, use\n" +" revert.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" "作業領域の更新\n" "\n" -" 指定されたリビジョン時点の内容で、作業領域を更新します。\n" -" リビジョン指定が無い場合は、現ブランチの最新リビジョンで更新します。\n" -" 作業領域中のファイルを削除する場合は、リビジョンに null を指定します\n" -" ('hg clone -U' と同様の状態になります)。\n" -"\n" -" 作業領域中に未コミットの変更が無い場合は、リポジトリに記録されている\n" -" 指定リビジョン時点の内容で、作業領域が更新されます。指定リビジョンが\n" -" 作業領域の親リビジョンと異なるブランチのものである場合、作業領域は\n" +" 指定されたリビジョン(指定が無い場合は現ブランチの最新リビジョン)\n" +" 時点の内容で、作業領域を更新します。作業領域中のファイルを削除する\n" +" 場合は、リビジョンに null を指定します('hg clone -U' と同等)。\n" +"\n" +" 作業領域中に未コミットの変更が無い場合は、リポジトリに記録されて\n" +" いる指定リビジョン時点の内容で、作業領域が更新されます。指定リビジョン\n" +" が作業領域の親リビジョンと異なるブランチのものである場合、作業領域は\n" " 別ブランチへと移行します。\n" "\n" -" 未コミットの変更が有る場合、-C オプションを指定することで、変更内容を\n" -" 破棄し、指定リビジョン時点の内容で作業領域を強制的に更新します。\n" -"\n" -" 未コミットの変更が有り、且つ -C オプションが指定されなかった場合は、\n" -" 親リビジョンと指定リビジョンが同一ブランチに属し、且つお互いが直系の\n" -" 関係にある時に限り、未コミットの変更内容と指定リビジョンをマージした\n" -" 結果で作業領域が更新されます。それ以外の場合は、'merge' ないし \n" -" 'update -C' の使用を促した上で、コマンド実行は中断されます。\n" -"\n" -" 1つのファイルだけを以前の状態に戻す場合は revert を使用してください。\n" +" 未コミットの変更が有る場合、-C/--clean を指定することで、変更内容を\n" +" 破棄し、指定リビジョン時点の内容で作業領域を強制的に更新することが\n" +" できます。\n" +"\n" +" 未コミットの変更が有り、且つ -C/--clean が指定されなかった場合は、\n" +" 作業領域の親リビジョンと指定リビジョンが同一ブランチに属し、且つ\n" +" 両方の履歴が直系にあたる関係である時に限り、未コミットの変更内容と\n" +" 指定リビジョンをマージした結果で作業領域が更新されます。それ以外の\n" +" 場合は 'hg merge' ないし 'hg update -C' の使用を促した上でコマンド\n" +" 実行は失敗します。\n" +"\n" +" 特定のファイルを以前の状態に戻す場合は 'hg revert' を使用します。\n" "\n" " -d/--date への指定に関しては、'hg help dates' を参照してください。\n" " " +msgid "uncommitted local changes" +msgstr "作業領域に未コミットの変更があります" + msgid "" "verify the integrity of the repository\n" "\n" @@ -7030,802 +7435,826 @@ "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-2009 Matt Mackall <mpm@selenic.com> 他\n" +"本製品はフリーソフトウェアです。頒布／改変の際はライセンス条項をお読み\n" +"ください。市場適合性や特定用途への可否を含め、本製品は無保証です。\n" msgid "repository root directory or symbolic path name" -msgstr "" +msgstr "リポジトリのルート位置、ないしパス定義名" msgid "change working directory" -msgstr "" +msgstr "作業領域の変更" msgid "do not prompt, assume 'yes' for any required answers" -msgstr "" +msgstr "問い合わせをせず、確認事項は全て 'yes' とみなす" msgid "suppress output" -msgstr "" +msgstr "出力を抑止" msgid "enable additional output" -msgstr "" +msgstr "付加的な出力を有効化" msgid "set/override config option" -msgstr "" +msgstr "オプション設定を指定／上書き" msgid "enable debugging output" -msgstr "" +msgstr "デバッグ出力を有効化" msgid "start debugger" -msgstr "" +msgstr "デバッガを開始" msgid "set the charset encoding" -msgstr "" +msgstr "文字エンコーディング" msgid "set the charset encoding mode" -msgstr "" - -msgid "print improved command execution profile" -msgstr "" +msgstr "文字エンコーディングモード" msgid "print traceback on exception" -msgstr "" +msgstr "例外浮揚の際にトレースバックを表示" msgid "time how long the command takes" -msgstr "" +msgstr "コマンド実行の所要時間を計測" msgid "print command execution profile" -msgstr "" +msgstr "コマンド実行のプロファイルを表示" msgid "output version information and exit" -msgstr "" +msgstr "バージョン情報を表示して終了" msgid "display help and exit" -msgstr "" +msgstr "ヘルプ情報を表示して終了" msgid "do not perform actions, just print output" -msgstr "" +msgstr "実施予定の処理内容の表示のみで処理実施は抑止" msgid "specify ssh command to use" -msgstr "" +msgstr "SSH 連携で使用する ssh コマンド" msgid "specify hg command to run on the remote side" -msgstr "" +msgstr "遠隔ホスト側で実行される hg コマンド" msgid "include names matching the given patterns" -msgstr "" +msgstr "パターンに合致したファイルを処理対象に追加" msgid "exclude names matching the given patterns" -msgstr "" +msgstr "パターンに合致したファイルを処理対象から除外" msgid "use <text> as commit message" -msgstr "" +msgstr "コミットメッセージ" msgid "read commit message from <file>" -msgstr "" +msgstr "コミットメッセージをファイルから読み込み" msgid "record datecode as commit date" -msgstr "" - -msgid "record user as committer" -msgstr "" +msgstr "記録される日時情報" + +msgid "record the specified user as committer" +msgstr "記録される作成者情報" msgid "display using template map file" -msgstr "" +msgstr "当該スタイルで表示をカスタマイズ" msgid "display with template" -msgstr "" +msgstr "当該テンプレートで表示をカスタマイズ" msgid "do not show merges" -msgstr "" +msgstr "マージ実施リビジョンの表示抑止" msgid "treat all files as text" -msgstr "" +msgstr "全ファイルをテキストファイルと仮定" msgid "don't include dates in diff headers" -msgstr "" +msgstr "差分表示の際に日付情報を抑止" msgid "show which function each change is in" -msgstr "" +msgstr "差分表示の際に関数名情報を表示" msgid "ignore white space when comparing lines" -msgstr "" +msgstr "差分判定の際に空白文字を無視" msgid "ignore changes in the amount of white space" -msgstr "" +msgstr "差分判定の際に空白文字の数を無視" msgid "ignore changes whose lines are all blank" -msgstr "" +msgstr "差分判定の際に空白行を無視" msgid "number of lines of context to show" -msgstr "" +msgstr "差分コンテキストの行数" msgid "guess renamed files by similarity (0<=s<=100)" -msgstr "" +msgstr "ファイル改名推定の際の類似度(0 以上 100 以下)" msgid "[OPTION]... [FILE]..." -msgstr "" +msgstr "[OPTION]... [FILE]..." msgid "annotate the specified revision" -msgstr "" +msgstr "当該リビジョン時点での由来情報を表示" msgid "follow file copies and renames" -msgstr "" +msgstr "複製／改名元ファイルの履歴も追跡" msgid "list the author (long with -v)" -msgstr "" +msgstr "ユーザ名を表示(-v 指定時は詳細表示)" msgid "list the date (short with -q)" -msgstr "" +msgstr "日付を表示(-q 指定時は簡略表示)" msgid "list the revision number (default)" -msgstr "" +msgstr "リビジョン番号を表示(既定動作)" msgid "list the changeset" -msgstr "" +msgstr "ハッシュ値を表示" msgid "show line number at the first appearance" -msgstr "" +msgstr "由来リビジョンでの初出時の行番号を表示" msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..." -msgstr "" +msgstr "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..." msgid "do not pass files through decoders" -msgstr "" +msgstr "デコード処理を回避" msgid "directory prefix for files in archive" -msgstr "" +msgstr "アーカイブファイルのディレクトリ前置詞" msgid "revision to distribute" -msgstr "" +msgstr "アーカイブ対象リビジョン" msgid "type of distribution to create" -msgstr "" +msgstr "アーカイブ種別" msgid "[OPTION]... DEST" -msgstr "" +msgstr "[OPTION]... DEST" msgid "merge with old dirstate parent after backout" -msgstr "" +msgstr "打ち消しリビジョンを現親リビジョンとマージ" msgid "parent to choose when backing out merge" -msgstr "" +msgstr "打ち消しリビジョンとのマージ対象" msgid "revision to backout" -msgstr "" +msgstr "打ち消し対象リビジョン" msgid "[OPTION]... [-r] REV" -msgstr "" +msgstr "[OPTION]... [-r] REV" msgid "reset bisect state" -msgstr "" +msgstr "探索状態のリセット" msgid "mark changeset good" -msgstr "" +msgstr "対象リビジョンの探索状態を good 化" msgid "mark changeset bad" -msgstr "" +msgstr "対象リビジョンの探索状態を bad 化" msgid "skip testing changeset" -msgstr "" +msgstr "対象リビジョンの判定作業を省略" msgid "use command to check changeset state" -msgstr "" +msgstr "good/bad 判定用コマンド" msgid "do not update to target" -msgstr "" +msgstr "対象リビジョンによる作業領域内容の更新を抑止" msgid "[-gbsr] [-c CMD] [REV]" -msgstr "" +msgstr "[-gbsr] [-c CMD] [REV]" msgid "set branch name even if it shadows an existing branch" -msgstr "" +msgstr "同名既存ブランチが存在する場合でもブランチ作成を実施" msgid "reset branch name to parent branch name" -msgstr "" +msgstr "ブランチ名設定を解消し、親リビジョンのブランチに戻る" msgid "[-fC] [NAME]" -msgstr "" +msgstr "[-fC] [NAME]" msgid "show only branches that have unmerged heads" -msgstr "" +msgstr "未マージなヘッドを持つブランチのみを表示" msgid "[-a]" -msgstr "" +msgstr "[-a]" msgid "run even when remote repository is unrelated" -msgstr "" +msgstr "連携先が無関係なリポジトリでも実行" msgid "a changeset up to which you would like to bundle" -msgstr "" +msgstr "バンドルファイルに含める上限のリビジョン" msgid "a base changeset to specify instead of a destination" -msgstr "" +msgstr "連携先指定の代わりとなる基底リビジョン" msgid "bundle all changesets in the repository" -msgstr "" +msgstr "リポジトリ中の全リビジョンをバンドルに含める" msgid "bundle compression type to use" -msgstr "" +msgstr "バンドルファイルの圧縮形式" msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]" -msgstr "" +msgstr "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]" msgid "print output to file with formatted name" -msgstr "" +msgstr "ファイル内容の保存先" msgid "print the given revision" -msgstr "" +msgstr "出力対象リビジョン" msgid "apply any matching decode filter" -msgstr "" +msgstr "デコード処理を実施" msgid "[OPTION]... FILE..." -msgstr "" +msgstr "[OPTION]... FILE..." msgid "the clone will only contain a repository (no working copy)" -msgstr "" +msgstr "管理領域のみの複製(作業領域の更新無し)" msgid "a changeset you would like to have after cloning" -msgstr "" +msgstr "複製における上限のリビジョン" msgid "[OPTION]... SOURCE [DEST]" -msgstr "" +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 "" +msgstr "同名の登録済みファイルが存在しても複製を実施" msgid "[OPTION]... [SOURCE]... DEST" -msgstr "" +msgstr "[OPTION]... [SOURCE]... DEST" msgid "[INDEX] REV1 REV2" -msgstr "" +msgstr "[INDEX] REV1 REV2" + +msgid "[COMMAND]" +msgstr "[COMMAND]" msgid "show the command options" -msgstr "" +msgstr "当該コマンドのオプション一覧の表示" msgid "[-o] CMD" -msgstr "" +msgstr "[-o] CMD" msgid "try extended date formats" -msgstr "" +msgstr "拡張日時形式の使用" msgid "[-e] DATE [RANGE]" -msgstr "" +msgstr "[-e] DATE [RANGE]" msgid "FILE REV" -msgstr "" +msgstr "FILE REV" msgid "[PATH]" -msgstr "" +msgstr "[PATH]" msgid "FILE" -msgstr "" - -msgid "parent" -msgstr "" - -msgid "file list" -msgstr "" +msgstr "FILE" msgid "revision to rebuild to" -msgstr "" +msgstr "再構築対象リビジョン" msgid "[-r REV] [REV]" -msgstr "" +msgstr "[-r REV] [REV]" msgid "revision to debug" -msgstr "" +msgstr "デバッグ対象リビジョン" msgid "[-r REV] FILE" -msgstr "" +msgstr "[-r REV] FILE" msgid "REV1 [REV2]" -msgstr "" +msgstr "REV1 [REV2]" msgid "do not display the saved mtime" -msgstr "" +msgstr "記録された mtime 情報の表示抑止" msgid "[OPTION]..." -msgstr "" +msgstr "[OPTION]..." + +msgid "revision to check" +msgstr "確認対象リビジョン" msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..." -msgstr "" +msgstr "[OPTION]... [-r REV1 [-r REV2]] [FILE]..." msgid "diff against the second parent" -msgstr "" +msgstr "第2親との差分を使用" msgid "[OPTION]... [-o OUTFILESPEC] REV..." -msgstr "" +msgstr "[OPTION]... [-o OUTFILESPEC] REV..." msgid "end fields with NUL" -msgstr "" +msgstr "各フィールドの区切りにNUL文字(0x00)を使用" msgid "print all revisions that match" -msgstr "" +msgstr "合致するリビジョンを全て表示" msgid "follow changeset history, or file history across copies and renames" -msgstr "" +msgstr "複製元や改名元の履歴も遡る" msgid "ignore case when matching" -msgstr "" - -msgid "print only filenames and revs that match" -msgstr "" +msgstr "大文字小文字を無視して検索" + +msgid "print only filenames and revisions that match" +msgstr "合致の際にファイル名とリビジョンのみを表示" msgid "print matching line numbers" -msgstr "" +msgstr "合致した行番号を表示" msgid "search in given revision range" -msgstr "" +msgstr "当該リビジョン範囲を検索" msgid "[OPTION]... PATTERN [FILE]..." -msgstr "" - -msgid "show only heads which are descendants of rev" -msgstr "" +msgstr "[OPTION]... PATTERN [FILE]..." + +msgid "show only heads which are descendants of REV" +msgstr "当該リビジョンの子孫となるヘッドのみを表示" msgid "show only the active heads from open branches" -msgstr "" - -msgid "[-r REV] [REV]..." -msgstr "" +msgstr "アクティブなブランチのヘッドのみを表示" + +msgid "show normal and closed heads" +msgstr "通常の閉じたヘッドを表示" + +msgid "[-r STARTREV] [REV]..." +msgstr "[-r STARTREV] [REV]..." msgid "[TOPIC]" -msgstr "" - -msgid "identify the specified rev" -msgstr "" +msgstr "[TOPIC]" + +msgid "identify the specified revision" +msgstr "当該リビジョンの識別情報を表示" msgid "show local revision number" -msgstr "" +msgstr "リビジョン番号を表示" msgid "show global revision id" -msgstr "" +msgstr "ハッシュ値を表示" msgid "show branch" -msgstr "" +msgstr "ブランチ名を表示" msgid "show tags" -msgstr "" +msgstr "タグを表示" msgid "[-nibt] [-r REV] [SOURCE]" -msgstr "" - -msgid "" -"directory strip option for patch. This has the same\n" -"meaning as the corresponding patch option" -msgstr "" +msgstr "[-nibt] [-r REV] [SOURCE]" + +msgid "" +"directory strip option for patch. This has the same meaning as the " +"corresponding patch option" +msgstr "パス要素除去数(patch コマンドの同名オプションと同機能)" msgid "base path" -msgstr "" +msgstr "基底パス" msgid "skip check for outstanding uncommitted changes" -msgstr "" +msgstr "作業領域中の未コミット変更の確認を省略" msgid "don't commit, just update the working directory" -msgstr "" +msgstr "作業領域の更新のみで、コミット実施を抑止" msgid "apply patch to the nodes from which it was generated" -msgstr "" - -msgid "Use any branch information in patch (implied by --exact)" -msgstr "" +msgstr "パッチ作成時と同じ親リビジョンに対して適用" + +msgid "use any branch information in patch (implied by --exact)" +msgstr "パッチ中のブランチ情報を利用(--exact 指定時は自動適用)" msgid "[OPTION]... PATCH..." -msgstr "" +msgstr "[OPTION]... PATCH..." msgid "show newest record first" -msgstr "" +msgstr "新しいリビジョンから先に表示" msgid "file to store the bundles into" -msgstr "" +msgstr "バンドルファイルの書き出し先" msgid "a specific revision up to which you would like to pull" -msgstr "" +msgstr "取り込み対象とする上限のリビジョン" msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]" -msgstr "" +msgstr "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]" msgid "[-e CMD] [--remotecmd CMD] [DEST]" -msgstr "" - -msgid "search the repository as it stood at rev" -msgstr "" +msgstr "[-e CMD] [--remotecmd CMD] [DEST]" + +msgid "search the repository as it stood at REV" +msgstr "当該リビジョン時点のファイル一覧から検索" msgid "end filenames with NUL, for use with xargs" -msgstr "" +msgstr "ファイル名をNUL文字(0x00)で終端(xargs との併用向け)" msgid "print complete paths from the filesystem root" -msgstr "" +msgstr "ファイルシステムのルートからの絶対パスで表示" msgid "[OPTION]... [PATTERN]..." -msgstr "" +msgstr "[OPTION]... [PATTERN]..." msgid "only follow the first parent of merge changesets" -msgstr "" - -msgid "show revs matching date spec" -msgstr "" +msgstr "マージの際には第1親のみを遡る" + +msgid "show revisions matching date spec" +msgstr "指定日時に合致するリビジョンを表示" msgid "show copied files" -msgstr "" +msgstr "複製されたファイルを表示" msgid "do case-insensitive search for a keyword" -msgstr "" - -msgid "include revs where files were removed" -msgstr "" +msgstr "キーワードによる検索(大文字小文字は無視)" + +msgid "include revisions where files were removed" +msgstr "ファイルが登録除外されたリビジョンを含める" msgid "show only merges" -msgstr "" - -msgid "revs committed by user" -msgstr "" +msgstr "マージ実施リビジョンのみを表示" + +msgid "revisions committed by user" +msgstr "当該ユーザによってコミットされたリビジョンを表示" msgid "show only changesets within the given named branch" -msgstr "" +msgstr "当該名前付きブランチに属するリビジョンを表示" msgid "do not display revision or any of its ancestors" -msgstr "" +msgstr "当該リビジョンとその祖先の表示を抑止" msgid "[OPTION]... [FILE]" -msgstr "" +msgstr "[OPTION]... [FILE]" msgid "revision to display" -msgstr "" +msgstr "表示対象リビジョン" msgid "[-r REV]" -msgstr "" +msgstr "[-r REV]" msgid "force a merge with outstanding changes" -msgstr "" +msgstr "作業領域中の未コミット変更ごとマージを実施" msgid "revision to merge" -msgstr "" +msgstr "マージ対象リビジョン" + +msgid "review revisions to merge (no merge is performed)" +msgstr "マージ対象リビジョンの確認(マージ処理は未実施)" msgid "[-f] [[-r] REV]" -msgstr "" +msgstr "[-f] [[-r] REV]" msgid "a specific revision up to which you would like to push" -msgstr "" +msgstr "反映対象とする上限のリビジョン" msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" -msgstr "" - -msgid "show parents from the specified rev" -msgstr "" - -msgid "hg parents [-r REV] [FILE]" -msgstr "" +msgstr "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" + +msgid "show parents from the specified revision" +msgstr "当該リビジョンの親リビジョンを表示" + +msgid "[-r REV] [FILE]" +msgstr "[-r REV] [FILE]" msgid "[NAME]" -msgstr "" +msgstr "[NAME]" msgid "update to new tip if changesets were pulled" -msgstr "" +msgstr "新規取り込みの際には作業領域を tip で更新" msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" -msgstr "" +msgstr "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" msgid "force push" -msgstr "" +msgstr "反映先にヘッドが増える場合でも実施" msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]" -msgstr "" +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 "" +msgstr "追加登録／変更対象であっても登録除外(ファイルは削除)" msgid "record a rename that has already occurred" -msgstr "" +msgstr "手動で改名済みのファイルに対して、改名の旨を記録" msgid "[OPTION]... SOURCE... DEST" -msgstr "" +msgstr "[OPTION]... SOURCE... DEST" msgid "remerge all unresolved files" -msgstr "" +msgstr "衝突未解消の全ファイルを再マージ" msgid "list state of files needing merge" -msgstr "" +msgstr "マージの必要なファイルの解消状態一覧" msgid "mark files as resolved" -msgstr "" +msgstr "当該ファイルを衝突解消済み状態に設定" msgid "unmark files as resolved" -msgstr "" +msgstr "当該ファイルを衝突未解消状態に設定" msgid "revert all changes when no arguments given" -msgstr "" +msgstr "引数指定が無い場合に、全ファイルの内容を復旧" msgid "tipmost revision matching date" -msgstr "" +msgstr "当該日時の最新リビジョンを使用" msgid "revision to revert to" -msgstr "" +msgstr "当該リビジョンの内容で復旧" msgid "do not save backup copies of files" -msgstr "" +msgstr "取り消し実施前内容のバックアップを抑止" msgid "[OPTION]... [-r REV] [NAME]..." -msgstr "" +msgstr "[OPTION]... [-r REV] [NAME]..." msgid "name of access log file to write to" -msgstr "" +msgstr "アクセスログの書き出し先ファイル" msgid "name of error log file to write to" -msgstr "" +msgstr "エラーログの書き出し先ファイル" msgid "port to listen on (default: 8000)" -msgstr "" +msgstr "要求受け付けポート番号(既定値: 8000)" msgid "address to listen on (default: all interfaces)" -msgstr "" +msgstr "要求受け付けアドレス(既定値: 全インタフェース)" msgid "prefix path to serve from (default: server root)" -msgstr "" - -msgid "name to show in web pages (default: working dir)" -msgstr "" - -msgid "name of the webdir config file (serve more than one repo)" -msgstr "" +msgstr "公開パス前置詞(既定値: ルート)" + +msgid "name to show in web pages (default: working directory)" +msgstr "表示名(既定値: 作業領域のパス)" + +msgid "name of the webdir config file (serve more than one repository)" +msgstr "webdir 設定ファイル位置(複数リポジトリの公開)" msgid "for remote clients" -msgstr "" +msgstr "(ホスト間連携での内部用途向け)" msgid "web templates to use" -msgstr "" +msgstr "当該テンプレートで表示をカスタマイズ" msgid "template style to use" -msgstr "" +msgstr "当該スタイルで表示をカスタマイズ" msgid "use IPv6 in addition to IPv4" -msgstr "" +msgstr "IPv4 に加えて IPv6 を使用" msgid "SSL certificate file" -msgstr "" +msgstr "SSL 証明書ファイル" msgid "show untrusted configuration options" -msgstr "" +msgstr "信頼できない設定項目も表示" msgid "[-u] [NAME]..." -msgstr "" +msgstr "[-u] [NAME]..." msgid "show status of all files" -msgstr "" +msgstr "全ての状態を表示" msgid "show only modified files" -msgstr "" +msgstr "変更されたファイルを表示" msgid "show only added files" -msgstr "" +msgstr "追加登録されたファイルを表示" msgid "show only removed files" -msgstr "" +msgstr "登録除外されたファイルを表示" msgid "show only deleted (but tracked) files" -msgstr "" +msgstr "削除されたファイル(登録除外は未実施)を表示" msgid "show only files without changes" -msgstr "" +msgstr "変更の無いファイルを表示" msgid "show only unknown (not tracked) files" -msgstr "" +msgstr "構成管理対象外のファイルを表示" msgid "show only ignored files" -msgstr "" +msgstr "無視対象のファイルを表示" msgid "hide status prefix" -msgstr "" +msgstr "状態記号の表示を抑止" msgid "show source of copied files" -msgstr "" +msgstr "複製元ファイルを表示" msgid "show difference from revision" -msgstr "" +msgstr "当該リビジョンとの差分で状態を判定" msgid "replace existing tag" -msgstr "" +msgstr "既存のタグを置き換え" msgid "make the tag local" -msgstr "" +msgstr "ローカルタグとして作成" msgid "revision to tag" -msgstr "" +msgstr "タグ付け対象リビジョン" msgid "remove a tag" -msgstr "" +msgstr "タグの削除" msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." -msgstr "" +msgstr "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." msgid "[-p]" -msgstr "" +msgstr "[-p]" msgid "update to new tip if changesets were unbundled" -msgstr "" +msgstr "新規取り込みの際には作業領域を tip で更新" msgid "[-u] FILE..." -msgstr "" +msgstr "[-u] FILE..." msgid "overwrite locally modified files (no backup)" -msgstr "" +msgstr "作業領域中の内容を上書き(バックアップ作成無し)" + +msgid "check for uncommitted changes" +msgstr "未コミット変更を確認" msgid "[-C] [-d DATE] [[-r] REV]" -msgstr "" +msgstr "[-C] [-d DATE] [[-r] REV]" + +#, python-format +msgid "config error at %s:%d: '%s'" +msgstr "%s:%d:設定エラー:%s" msgid "not found in manifest" -msgstr "" +msgstr "マニフェストにありません" msgid "branch name not in UTF-8!" -msgstr "" +msgstr "ブランチ名が UTF-8 ではありません!" #, python-format msgid " searching for copies back to rev %d\n" -msgstr "" +msgstr "リビジョン %d まで遡ってコピーを探索中\n" #, python-format msgid "" " unmatched files in local:\n" " %s\n" msgstr "" +" ローカルで照合に失敗したファイル:\n" +" %s\n" #, python-format msgid "" " unmatched files in other:\n" " %s\n" msgstr "" +" 連携先で照合に失敗したファイル:\n" +" %s\n" msgid " all copies found (* = to merge, ! = divergent):\n" -msgstr "" - -#, python-format -msgid " %s -> %s %s\n" -msgstr "" +msgstr " 全コピー発見 (* = マージ, ! = 分岐):\n" msgid " checking for directory renames\n" -msgstr "" +msgstr " ディレクトリ名の変更を確認しています\n" #, python-format msgid " dir %s -> %s\n" -msgstr "" +msgstr " ディレクトリ %s -> %s\n" #, python-format msgid " file %s -> %s\n" -msgstr "" +msgstr " ファイル %s -> %s\n" + +msgid "working directory state appears damaged!" +msgstr "作業領域の状態管理に問題があります!" #, python-format msgid "'\\n' and '\\r' disallowed in filenames: %r" -msgstr "" +msgstr "'\\n' と '\\r' はファイル名で使用しないでください: %r" #, python-format msgid "directory %r already in dirstate" -msgstr "" +msgstr "ディレクトリ %r は既に管理対象に含まれています" #, python-format msgid "file %r in dirstate clashes with %r" -msgstr "" +msgstr "管理情報中のファイル %r は %r によって破壊されます" #, python-format msgid "not in dirstate: %s\n" -msgstr "" +msgstr "%s は管理情報中にありません\n" + +msgid "unknown" +msgstr "未知" msgid "character device" -msgstr "" +msgstr "キャラクタデバイス" msgid "block device" -msgstr "" +msgstr "ブロックデバイス" msgid "fifo" -msgstr "" +msgstr "FIFO(パイプ)" msgid "socket" -msgstr "" +msgstr "ソケット" msgid "directory" -msgstr "" - -#, python-format -msgid "%s: unsupported file type (type is %s)\n" -msgstr "" +msgstr "ディレクトリ" + +#, python-format +msgid "unsupported file type (type is %s)" +msgstr "未サポートのファイル種別(%s)" #, python-format msgid "abort: %s\n" -msgstr "" +msgstr "中止: %s\n" #, python-format msgid "" "hg: command '%s' is ambiguous:\n" " %s\n" msgstr "" +"hg: コマンド指定 '%s' は曖昧です:\n" +" %s\n" + +#, python-format +msgid "hg: %s\n" +msgstr "hg: %s\n" #, python-format msgid "timed out waiting for lock held by %s" -msgstr "" +msgstr "%s のロック解放待ちを断念" #, python-format msgid "lock held by %s" -msgstr "" +msgstr "%s によるロック保持" #, 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 "" +msgstr "hg %s: %s\n" #, 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 "" +msgstr "強制終了されました!\n" #, python-format msgid "hg: unknown command '%s'\n" -msgstr "" +msgstr "hg: 未知のコマンド '%s'\n" #, python-format msgid "abort: could not import module %s!\n" -msgstr "" +msgstr "中断: モジュール %s の読み込みに失敗!\n" msgid "(did you forget to compile extensions?)\n" -msgstr "" +msgstr "(エクステンションのコンパイルを忘れていませんか?)\n" msgid "(is your Python install correct?)\n" -msgstr "" +msgstr "(Python は正しくインストールされていますか?)\n" #, python-format msgid "abort: error: %s\n" -msgstr "" +msgstr "中止: エラー: %s\n" msgid "broken pipe\n" -msgstr "" +msgstr "パイプ破壊(EPIPE)\n" msgid "interrupted!\n" -msgstr "" +msgstr "中断されました!\n" msgid "" "\n" "broken pipe\n" msgstr "" +"\n" +"パイプ破壊(EPIPE)\n" msgid "abort: out of memory\n" -msgstr "" +msgstr "中断: メモリ不足\n" msgid "** unknown exception encountered, details follow\n" -msgstr "" +msgstr "** 予期せぬ例外が浮揚されました\n" msgid "** report bug details to http://www.selenic.com/mercurial/bts\n" -msgstr "" +msgstr "** 障害の詳細を http://www.selenic.com/mercurial/bts\n" msgid "** or mercurial@selenic.com\n" -msgstr "" +msgstr "** ないし mercurial@selenic.com に報告してください\n" #, python-format msgid "** Mercurial Distributed SCM (version %s)\n" @@ -7833,124 +8262,228 @@ #, python-format msgid "** Extensions loaded: %s\n" -msgstr "" +msgstr "** 読み込み済みエクステンション: %s\n" + +#, python-format +msgid "no definition for alias '%s'\n" +msgstr "'%s' を別名に持つコマンドはありません\n" + +#, python-format +msgid "alias '%s' resolves to unknown command '%s'\n" +msgstr "'%s' が未知のコマンド '%s' の別名とみなされました\n" + +#, python-format +msgid "alias '%s' resolves to ambiguous command '%s'\n" +msgstr "'%s' が曖昧なコマンド '%s' の別名とみなされました\n" + +#, python-format +msgid "alias '%s' shadows command\n" +msgstr "別名 '%s' は既存のコマンドを隠します\n" #, python-format msgid "malformed --config option: %s" -msgstr "" +msgstr "不正な --config 指定: %s" #, python-format msgid "extension '%s' overrides commands: %s\n" -msgstr "" +msgstr "エクステンション '%s' がコマンドを上書きします: %s\n" msgid "Option --config may not be abbreviated!" -msgstr "" +msgstr "--config 指定値が未解析の可能性があります!" msgid "Option --cwd may not be abbreviated!" -msgstr "" - -msgid "" -"Option -R has to be separated from other options (i.e. not -qR) and --" +msgstr "--cwd 指定値が未解析の可能性があります!" + +msgid "" +"Option -R has to be separated from other options (e.g. not -qR) and --" "repository may only be abbreviated as --repo!" -msgstr "" +msgstr "-R は独立記述(例: '-dR' は不可)、--repository の略記は --repo のみ" #, python-format msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n" -msgstr "" +msgstr "所要時間: 実時間 %.3f 秒 (ユーザ %.3f+%.3f システム %.3f+%.3f)\n" #, python-format msgid "repository '%s' is not local" -msgstr "" +msgstr "リポジトリ '%s' はローカルリポジトリではありません" msgid "invalid arguments" -msgstr "" - -msgid "exception raised - generating profile anyway\n" -msgstr "" +msgstr "引数が不正です" + +#, python-format +msgid "unrecognized profiling format '%s' - Ignored\n" +msgstr "不正なプロファイル形式 '%s' を無視します\n" msgid "" "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/" "misc/lsprof/" msgstr "" +"lsprof が利用できません - http://codespeak.net/svn/user/arigo/hack/misc/" +"lsprof/ からインストールしてください" #, python-format msgid "*** failed to import extension %s from %s: %s\n" -msgstr "" +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" -msgstr "" +msgstr "マージツール %s が見つかりません\n" #, python-format msgid "tool %s can't handle symlinks\n" -msgstr "" +msgstr "ツール %s はシンボリックリンクを扱えません\n" #, python-format msgid "tool %s can't handle binary\n" -msgstr "" +msgstr "ツール %s はバイナリを扱えません\n" #, python-format msgid "tool %s requires a GUI\n" -msgstr "" +msgstr "ツール %s は GUI が必要です\n" #, python-format msgid "picked tool '%s' for %s (binary %s symlink %s)\n" -msgstr "" +msgstr "%s のマージ用に '%s' が選択(バイナリ %s シンボリックリンク %s)\n" #, python-format msgid "" " no tool found to merge %s\n" "keep (l)ocal or take (o)ther?" msgstr "" - -msgid "[lo]" -msgstr "" +" %s のマージに適切なツールが見つかりません\n" +"どうしますか? 作業領域の内容:(l)ocal、マージ対象の内容:(o)ther" + +msgid "&Local" +msgstr "&Local" + +msgid "&Other" +msgstr "&Other" msgid "l" -msgstr "" +msgstr "l" #, python-format msgid "merging %s and %s to %s\n" -msgstr "" +msgstr "%s と %s を %s にマージ中\n" #, python-format msgid "merging %s\n" -msgstr "" +msgstr "%s をマージ中\n" #, python-format msgid "my %s other %s ancestor %s\n" -msgstr "" +msgstr "作業領域 %s マージ対象 %s 共通祖先 %s\n" msgid " premerge successful\n" -msgstr "" +msgstr " 事前マージ成功\n" #, python-format msgid "" " output file %s appears unchanged\n" "was merge successful (yn)?" msgstr "" - -msgid "[yn]" -msgstr "" +" マージ結果ファイル %s は未変更に見えます\n" +"マージ成功とみなしますか? (yn)" + +msgid "&No" +msgstr "&No" + +msgid "&Yes" +msgstr "&Yes" msgid "n" -msgstr "" +msgstr "n" #, python-format msgid "merging %s failed!\n" -msgstr "" +msgstr "%s のマージに失敗!\n" #, python-format msgid "Inconsistent state, %s:%s is good and bad" -msgstr "" +msgstr "状態が矛盾 - %s:%s は判定不能" #, python-format msgid "unknown bisect kind %s" -msgstr "" +msgstr "未知の分岐種類 %s" + +msgid "" +"\n" +" 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.\n" +"\n" +" Extensions are not loaded by default for a variety of reasons:\n" +" they can increase startup overhead; they may be meant for\n" +" advanced usage only; they may provide potentially dangerous\n" +" abilities (such as letting you destroy or modify history); they\n" +" might not be ready for prime time; or they may alter some\n" +" usual behaviors of stock Mercurial. It is thus up to the user to\n" +" activate extensions as needed.\n" +"\n" +" To enable the \"foo\" extension, either shipped with Mercurial\n" +" or in the Python search path, create an entry for it in your\n" +" hgrc, like this:\n" +"\n" +" [extensions]\n" +" foo =\n" +"\n" +" You may also specify the full path to an extension:\n" +"\n" +" [extensions]\n" +" myfeature = ~/.hgext/myfeature.py\n" +"\n" +" To explicitly disable an extension enabled in an hgrc of broader\n" +" scope, prepend its path with !:\n" +"\n" +" [extensions]\n" +" # disabling extension bar residing in /path/to/extension/bar.py\n" +" hgext.bar = !/path/to/extension/bar.py\n" +" # ditto, but no path was supplied for extension baz\n" +" hgext.baz = !\n" +" " +msgstr "" +"\n" +" Mercurial には、新規機能を「エクステンション」という機構を用いて\n" +" 追加する仕組みが備わっています。エクステンションでは、コマンドの\n" +" 新規追加、既存コマンドへのオプションの追加、コマンドの挙動の変更、\n" +" フックの実装といったことが可能です。\n" +"\n" +" 様々な事情から、特に指定の無い場合にはエクステンションは読み込まれ\n" +" ません。付加的な読み込みは、起動時間の増加を意味します。上級用途\n" +" 限定のものもあります。(履歴の破壊や改変などの)潜在的な危険性を持つ\n" +" 場合もあります。実験的なものであるかもしれません。これまでの\n" +" Mercurial の振る舞いを変えてしまうかもしれません。エクステンションを\n" +" 必要に応じて有効化するのは利用者の責務です。\n" +"\n" +" \"foo\" というエクステンションを有効化するには、Mercurial 同梱の\n" +" ものであろうと、Python の検索パス中のものであろうと、設定ファイル\n" +" において以下のような記述が必要です。\n" +"\n" +" [extensions]\n" +" foo =\n" +"\n" +" エクステンションへのフルパスを記述することも可能です。\n" +"\n" +" [extensions]\n" +" myfeature = ~/.hgext/myfeature.py\n" +"\n" +" 明示的にエクステンションを無効化する場合、適切な設定ファイルにおいて\n" +" パス指定の冒頭に '!' を付与します。\n" +"\n" +" [extensions]\n" +" # /path/to/extension/bar.py にあるエクステンション bar の無効化\n" +" hgext.bar = !/path/to/extension/bar.py\n" +" # こちらはパス指定無しでの baz エクステンションの無効化\n" +" hgext.baz = !\n" +" " + +msgid "disabled extensions:" +msgstr "無効化されているエクステンション:" msgid "Date Formats" msgstr "日時表記" @@ -7982,9 +8515,9 @@ " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" "\n" " This is the internal representation format for dates. unixtime is\n" -" the number of seconds since the epoch (1970-01-01 00:00 UTC). offset\n" -" is the offset of the local timezone, in seconds west of UTC (negative\n" -" if the timezone is east of UTC).\n" +" the number of seconds since the epoch (1970-01-01 00:00 UTC).\n" +" offset is the offset of the local timezone, in seconds west of UTC\n" +" (negative if the timezone is east of UTC).\n" "\n" " The log command also accepts date ranges:\n" "\n" @@ -8131,10 +8664,10 @@ msgid "" "\n" "HG::\n" -" Path to the 'hg' executable, automatically passed when running hooks,\n" -" extensions or external tools. If unset or empty, this is the hg\n" -" executable's name if it's frozen, or an executable named 'hg'\n" -" (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\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.\n" "\n" "HGEDITOR::\n" @@ -8170,8 +8703,8 @@ " from the current repository is read.\n" "\n" " For each element in HGRCPATH:\n" -" * if it's a directory, all directories ending with .rc are added\n" -" * otherwise, the directory itself will be added\n" +" * if it's a directory, all files ending with .rc are added\n" +" * otherwise, the file itself will be added\n" "\n" "HGUSER::\n" " This is the string used as the author of a commit. If not set,\n" @@ -8195,16 +8728,16 @@ " This is the name of the editor to use when committing. See EDITOR.\n" "\n" "EDITOR::\n" -" Sometimes Mercurial needs to open a text file in an editor\n" -" for a user to modify, for example when writing commit messages.\n" -" The editor it uses is determined by looking at the environment\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'.\n" "\n" "PYTHONPATH::\n" -" This is used by Python to find imported modules and may need to be set\n" -" appropriately if this Mercurial is not installed system-wide.\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 "" "\n" @@ -8225,7 +8758,7 @@ " Mercurial によるロケール自動検出の上書き。この設定は、ユーザ名、\n" " コミットメッセージ、タグ名およびブランチ名を内部データ形式に変換する\n" " 際に使用されます。この環境変数設定は、コマンドラインでの --encoding\n" -" オプションの使用により、更に上書きすることが出来ます。\n" +" 使用により、更に上書きすることが出来ます。\n" "\n" "HGENCODINGMODE::\n" " ユーザからの指定値を内部データ形式に変換する際に、指定の符号化と\n" @@ -8234,7 +8767,7 @@ " されたものとみなします。他には、「未知の文字の置き換え」を意味する\n" " \"replace\" と、「未知の文字の切り捨て」を意味する \"ignore\" が指定\n" " 出来ます。この環境変数設定は、コマンドラインでの --encodingmode\n" -" オプションの使用により、更に上書きすることが出来ます。\n" +" 使用により、更に上書きすることが出来ます。\n" "\n" "HGMERGE::\n" " マージの際の衝突解消に使用するコマンド。指定されたコマンドの起動には、\n" @@ -8287,7 +8820,7 @@ "\n" "PYTHONPATH::\n" " Mercurial が当該システムの共有領域にインストールされていない場合、\n" -" Python が必要なモジュールを読み込むためには、この変数変数の設定が\n" +" Python が必要なモジュールを読み込むためには、この環境変数の設定が\n" " 必要です。\n" " " @@ -8296,14 +8829,13 @@ msgid "" "\n" -" Mercurial supports several ways to specify individual\n" -" revisions.\n" -"\n" -" A plain integer is treated as a revision number. Negative\n" -" integers are treated as toplogical offsets from the tip, with\n" -" -1 denoting the tip. As such, negative numbers are only useful\n" -" if you've memorized your local tree numbers and want to save\n" -" typing a single digit. This editor suggests copy and paste.\n" +" Mercurial supports several ways to specify individual revisions.\n" +"\n" +" A plain integer is treated as a revision number. Negative integers\n" +" are treated as topological offsets from the tip, with -1 denoting\n" +" the tip. As such, negative numbers are only useful if you've\n" +" memorized your local tree numbers and want to save typing a single\n" +" digit. This editor suggests copy and paste.\n" "\n" " A 40-digit hexadecimal string is treated as a unique revision\n" " identifier.\n" @@ -8324,9 +8856,9 @@ " revision of an empty repository, and the parent of revision 0.\n" "\n" " The reserved name \".\" indicates the working directory parent. If\n" -" no working directory is checked out, it is equivalent to null.\n" -" If an uncommitted merge is in progress, \".\" is the revision of\n" -" the first parent.\n" +" no working directory is checked out, it is equivalent to null. If\n" +" an uncommitted merge is in progress, \".\" is the revision of the\n" +" first parent.\n" " " msgstr "" "\n" @@ -8369,8 +8901,8 @@ " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n" " are revision identifiers. Both BEGIN and END are optional. If\n" " BEGIN is not specified, it defaults to revision number 0. If END\n" -" is not specified, it defaults to the tip. The range \":\" thus\n" -" means \"all revisions\".\n" +" is not specified, it defaults to the tip. The range \":\" thus means\n" +" \"all revisions\".\n" "\n" " If BEGIN is greater than END, revisions are treated in reverse\n" " order.\n" @@ -8404,9 +8936,10 @@ msgid "" "\n" -" Mercurial's default format for showing changes between two versions\n" -" of a file is compatible with the unified format of GNU diff, which\n" -" can be used by GNU patch and many other standard tools.\n" +" Mercurial's default format for showing changes between two\n" +" versions of a file is compatible with the unified format of GNU\n" +" diff, which can be used by GNU patch and many other standard\n" +" tools.\n" "\n" " While this standard format is often enough, it does not encode the\n" " following information:\n" @@ -8424,15 +8957,16 @@ " This means that when generating diffs from a Mercurial repository\n" " (e.g. with \"hg export\"), you should be careful about things like\n" " file copies and renames or other things mentioned above, because\n" -" when 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.\n" +" when applying a standard diff to a different repository, this\n" +" extra information is lost. Mercurial's internal operations (like\n" +" push and pull) are not affected by this, because they use an\n" +" internal binary format for communicating changes.\n" "\n" " To make Mercurial produce the git extended diff format, use the\n" -" --git option available for many commands, or set 'git = True' in the\n" -" [diff] 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" +" --git option available for many commands, or set 'git = True' in\n" +" the [diff] section of your hgrc. You do not need to set this\n" +" option when importing diffs in this format or using them in the mq\n" +" extension.\n" " " msgstr "" "\n" @@ -8460,7 +8994,7 @@ " ことから、情報の欠落に関しては心配する必要はありません。\n" "\n" " Mercurial から git 拡張差分形式の出力を得るには、受理可能なコマンドに\n" -" 対して --git オプションを指定するか、設定ファイルの [diff] セクションに\n" +" 対して --git を指定するか、設定ファイルの [diff] セクションに\n" " 'git = True' 記述を追加してください。hg import や mq エクステンションを\n" " 使用する場合は、この指定は不要です。\n" " " @@ -8471,49 +9005,52 @@ msgid "" "\n" " Mercurial allows you to customize output of commands through\n" -" templates. You can either pass in a template from the command line,\n" -" via the --template option, or select an existing template-style (--" -"style).\n" -"\n" -" You can customize output for any \"log-like\" command: log, outgoing,\n" -" incoming, tip, parents, heads and glog.\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).\n" +"\n" +" You can customize output for any \"log-like\" command: log,\n" +" outgoing, incoming, tip, parents, heads and glog.\n" "\n" " Three styles are packaged with Mercurial: default (the style used\n" -" when no explicit preference is passed), compact and changelog. Usage:\n" +" when no explicit preference is passed), compact and changelog.\n" +" Usage:\n" "\n" " $ hg log -r1 --style changelog\n" "\n" -" A template is a piece of text, with markup to invoke variable " -"expansion:\n" +" A template is a piece of text, with markup to invoke variable\n" +" expansion:\n" "\n" " $ hg log -r1 --template \"{node}\\n\"\n" " b56ce7b07c52de7d5fd79fb89701ea538af65746\n" "\n" " Strings in curly braces are called keywords. The availability of\n" -" keywords depends on the exact context of the templater. These keywords\n" -" are usually available for templating a log-like command:\n" +" keywords depends on the exact context of the templater. These\n" +" keywords are usually available for templating a log-like command:\n" "\n" " - 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 default.\n" " - date: Date information. The date when the changeset was 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 by\n" " 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 40-character\n" -" hexadecimal string.\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 number.\n" " - tags: List of strings. Any tags associated with the changeset.\n" "\n" " 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 it.\n" -" Filters are functions which return a string based on the input " -"variable.\n" -" You can also use a chain of filters to get the desired output:\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:\n" "\n" " $ hg tip --template \"{date|isodate}\\n\"\n" " 2008-08-21 18:22 +0000\n" @@ -8526,43 +9063,136 @@ " the given date/time and the current 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 path\n" -" separator (ignoring trailing seprators). For example,\n" +" separator (ignoring trailing separators). For example,\n" " \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar" "\".\n" +" - stripdir: Treat the text as path and strip a directory level, if\n" +" possible. For example, \"foo\" and \"foo/bar\" becomes \"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 email\n" -" address, and extracts just the domain component.\n" +" - domain: Any text. Finds the first string that looks like an\n" +" email address, and extracts just the domain component.\n" " Example: 'User <user@example.com>' becomes 'example.com'.\n" -" - email: Any text. Extracts the first string that looks like an email\n" -" address. Example: 'User <user@example.com>' becomes\n" +" - email: Any text. Extracts the first string that looks like an\n" +" email address. Example: 'User <user@example.com>' becomes\n" " '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" -" - obfuscate: Any text. Returns the input text rendered as a sequence\n" -" of XML entities.\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\n" " in email headers.\n" -" - short: Changeset hash. Returns the short form of a changeset hash,\n" -" i.e. a 12-byte hexadecimal string.\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 the\n" -" first starting with a tab character.\n" -" - urlescape: Any text. Escapes all \"special\" characters. For example,\n" -" \"foo bar\" becomes \"foo%20bar\".\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 address.\n" " " msgstr "" - -msgid "Url Paths" +"\n" +" Mercurial では、テンプレート機能によってコマンドの出力をカスタマイズ\n" +" することができます。コマンドラインからの指定では、--template による\n" +" テンプレート指定と、--style によるスタイル指定の両方が使用できます。\n" +"\n" +" 「log 的」な出力を行う以下のコマンドの出力をカスタマイズ可能です:\n" +" log, outgoing, incoming, tip, parents, heads, glog\n" +"\n" +" Mercurial には(明示的な指定が無い場合に使用される)default、compact\n" +" および changelog の3つのスタイル設定が同梱されています。利用方法は:\n" +"\n" +" $ hg log -r1 --style changelog\n" +"\n" +" テンプレートとは、変数展開マークアップ機能を備えたテキストです。\n" +"\n" +" $ hg log -r1 --template \"{node}\\n\"\n" +" b56ce7b07c52de7d5fd79fb89701ea538af65746\n" +"\n" +" 波括弧で囲まれた部分は「キーワード」と呼ばれます。キーワード利用の\n" +" 可否は、テンプレートの利用される状況に依存します。以下のキーワードは\n" +" log 的なコマンドでのテンプレート利用の際には常に使用可能です。\n" +"\n" +" - author: 文字列。リビジョンの作者名(記録情報そのまま)。\n" +" - branches: 文字列。リビジョンの属するブランチ名。所属ブランチが\n" +" default の場合は空文字列。\n" +" - date: 日時情報。リビジョンが記録された日時。\n" +" - desc: 文字列。リビジョンのコミットメッセージ。\n" +" - diffstat: 文字列。以下の形式での変更概要。\n" +" \"変更対象ファイル: +追加行数/-削除行数\"\n" +" - files: 文字列列挙。当該リビジョンでの、変更／追加登録ないし\n" +" 登録除外ファイルの一覧。\n" +" - file_adds: 文字列列挙。当該リビジョンでの追加ファイル一覧。\n" +" - file_mods: 文字列列挙。当該リビジョンでの変更ファイル一覧。\n" +" - file_dels: 文字列列挙。当該リビジョンでの登録除外ファイル一覧。\n" +" - node: 文字列。リビジョン識別用の 40 桁 16 進数ハッシュ値。\n" +" - parents: 文字列列挙。リビジョンの親。\n" +" - rev: 整数。各リポジトリ固有のリビジョン番号。\n" +" - tags: 文字列列挙。当該リビジョンに付与されたタグの一覧。\n" +"\n" +" \"date\" キーワードの出力は可読形式ではありません。出力に日時情報を\n" +" 含めたい場合、可読化するために「フィルター」を使用します。\n" +" 「フィルター」とは、指定値に基づいて文字列を生成する機能です。複数の\n" +" フィルターを連ねることで、様々な出力を得ることができます。\n" +"\n" +" $ hg tip --template \"{date|isodate}\\n\"\n" +" 2008-08-21 18:22 +0000\n" +"\n" +" フィルター一覧(入力と、それに対する出力):\n" +"\n" +" - addbreaks: 文字列。最終行を除く各行の行末に XHTML の \n" +" \"<br />\" タグを追加します。\n" +" - age: 日時情報。与えられた日時と、現在日時との差分を表す\n" +" 可読形式の文字列を生成します。\n" +" - basename: 文字列。与えられた文字列をパスとみなし、パス区切りで\n" +" 区切られた最後の要素だけを取り出します(末尾パス\n" +" 区切りは無視されます)。例えば、\"foo/bar/baz\" は\n" +" \"baz\" に、\"foo/bar//\" は \"bar\" になります。\n" +" - stripdir: 文字列。与えられた文字列をパスとみなし、ディレクトリ\n" +" 要素があればそれを取り除きます。例えば、\"foo\"\n" +" および \"foo/bar\" は \"foo\" となります。\n" +" - date: 日時情報。タイムゾーンを含んだ、Unix の date コマンド\n" +" 形式で可読化します: \"Mon Sep 04 15:13:13 2006 0700\"\n" +" - domain: 文字列。メールアドレスと思しき最初の文字列部分から\n" +" ドメイン部分だけを取り出します。例えば、\n" +" 'User <user@example.com>' は 'example.com' です。\n" +" - email: 文字列。メールアドレスと思しき最初の部分を取り出します。\n" +" 例えば 'User <user@example.com>' は\n" +" 'user@example.com' となります。\n" +" - escape: 文字列。XML/XHTML の特殊文字である \"&\"、\"<\" および\n" +" \">\" を XML のエンティティ形式に変換します。\n" +" - fill68: 文字列。68 桁に収まるように文字列を折り返します。\n" +" - fill76: 文字列。76 桁に収まるように文字列を折り返します。\n" +" - firstline: 文字列。最初の行のみを取り出します。\n" +" - nonempty: 文字列。与えられた文字列が空の場合 '(none)'となります。\n" +" - hgdate: 日時情報。Unix タイムスタンプとタイムゾーンオフセット\n" +" による数値対形式で可読化します: \"1157407993 25200\"\n" +" - isodate: 日時情報。ISO 8601 形式で可読化します。\n" +" - localdate: 日時情報。ローカル日時で可読化します。\n" +" - obfuscate: 文字列。全ての文字を XML エンティティ形式に変換します。\n" +" - person: 文字列。メールアドレス直前の部分だけを取り出します。\n" +" - rfc822date:日時情報。メールのヘッダと同形式で可読化します。\n" +" - short: リビジョンハッシュ 値。12 桁程度の短縮形式にします。\n" +" - shortdate: 日時情報。\"2006-09-18\" 形式で可読化します。\n" +" - strip: 文字列。先頭／末尾の空白文字を取り除きます。\n" +" - tabindent: 文字列。先頭行以外をタブ文字で字下げします。\n" +" - urlescape: 文字列。全ての「特殊」文字を変換します。\n" +" 例えば \"foo bar\" は \"foo%20bar\" となります。\n" +" - user: 文字列。メールアドレスのユーザ名部分を取り出します。\n" +" " + +msgid "URL Paths" msgstr "URLのパス指定" msgid "" @@ -8582,43 +9212,45 @@ " or changeset to use from the remote repository.\n" "\n" " Some features, such as pushing to http:// and https:// URLs are\n" -" only possible if the feature is explicitly enabled on the\n" -" remote Mercurial server.\n" +" only possible if the feature is explicitly enabled on the remote\n" +" Mercurial server.\n" "\n" " Some notes about using SSH with Mercurial:\n" -" - 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" +" - SSH requires an accessible shell account on the destination\n" +" machine and a copy of hg in the remote path or specified with as\n" +" remotecmd.\n" " - path is relative to the remote user's home directory by default.\n" " Use an extra slash at the start of a path to specify an absolute " "path:\n" " ssh://example.com//tmp/repository\n" -" - 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.:\n" +" - Mercurial doesn't use its own compression via SSH; the right\n" +" thing to do is to configure it in your ~/.ssh/config, e.g.:\n" " Host *.mylocalnetwork.example.com\n" " Compression no\n" " Host *\n" " Compression yes\n" -" Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n" -" with the --ssh command line option.\n" -"\n" -" These urls can all be stored in your hgrc with path aliases under the\n" -" [paths] section like so:\n" +" Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n" +" or with the --ssh command line option.\n" +"\n" +" These URLs can all be stored in your hgrc with path aliases under\n" +" the [paths] section like so:\n" " [paths]\n" " alias1 = URL1\n" " alias2 = URL2\n" " ...\n" "\n" -" You can then use the alias for any command that uses a url (for example\n" -" 'hg pull alias1' would pull from the 'alias1' path).\n" +" 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).\n" "\n" " Two path aliases are special because they are used as defaults\n" -" when you do not provide the url to a command:\n" +" when you do not provide the URL to a command:\n" "\n" " 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-\n" -" and pull-like commands (including in and out).\n" +" When you create a repository with hg clone, the clone command\n" +" saves the location of the source repository as the new\n" +" repository's 'default' path. This is then used when you omit\n" +" path from push- and pull-like commands (including incoming and\n" +" outgoing).\n" "\n" " default-push:\n" " The push command will look for a path named 'default-push', and\n" @@ -8648,7 +9280,7 @@ " Mercurial と SSH を併用する場合の注意点:\n" " - SSH アクセス先ホスト上に、shell アカウントと hg コマンドが必要です。\n" " hg コマンドがアクセス先ホストの PATH 設定で利用可能になっていない\n" -" 場合は、--remotecmd オプションで明示的に指定してください。\n" +" 場合は、--remotecmd で明示的に指定してください。\n" " - URL 中のパス指定は、アクセス先ホスト上のユーザのホームディレクトリ\n" " からの相対パスとみなされます。絶対パスを指定する場合は、パスの先頭に\n" " 更にスラッシュ('/')を付与してください。\n" @@ -8660,7 +9292,7 @@ " Host *\n" " Compression yes\n" " あるいは、設定ファイルにおける ssh コマンド指定や、コマンドラインでの\n" -" --ssh オプションに対して、'ssh -C' を指定する方法もあります。\n" +" --ssh に対して、'ssh -C' を指定する方法もあります。\n" "\n" " 連携先 URL は、設定ファイルの [paths] セクションで、別名を付けて記述\n" " することが出来ます。\n" @@ -8687,1164 +9319,1253 @@ " こちらが優先されます。\n" " " +msgid "Using additional features" +msgstr "付加機能の使用" + +msgid "can only share local repositories" +msgstr "共有可能なのはローカルリポジトリのみです" + +msgid "destination already exists" +msgstr "複製先 '%s' は既に存在します" + +msgid "updating working directory\n" +msgstr "作業領域の更新中\n" + #, python-format msgid "destination directory: %s\n" -msgstr "" +msgstr "複製先ディレクトリ: %s\n" #, python-format msgid "destination '%s' already exists" -msgstr "" +msgstr "複製先 '%s' は既に存在します" + +#, python-format +msgid "destination '%s' is not empty" +msgstr "複製先 '%s' は空ではありません" 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 "" - -msgid "updating working directory\n" -msgstr "" +msgstr "リモートからリモートの複製はサポートしていません" msgid "updated" -msgstr "" +msgstr "更新" msgid "merged" -msgstr "" +msgstr "マージ" msgid "removed" -msgstr "" +msgstr "削除" msgid "unresolved" -msgstr "" +msgstr "衝突未解決" #, python-format msgid "%d files %s" -msgstr "" +msgstr "%d 個のファイルが%s" msgid "use 'hg resolve' to retry unresolved file merges\n" -msgstr "" +msgstr "'hg resolve' でマージの衝突を解消してください\n" msgid "" "use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to " "abandon\n" -msgstr "" +msgstr "'hg resolve' で再度衝突解消するか、'hg up --clean' で変更破棄を。\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 "" +msgstr "%s/.hg/hgrc の読み込みに失敗: %s\n" msgid "SSL support is unavailable" -msgstr "" - -msgid "IPv6 not available on this system" -msgstr "" +msgstr "SSL サポートが利用できません" + +msgid "IPv6 is not available on this system" +msgstr "このシステムでは IPv6 を利用できません" #, python-format msgid "cannot start server at '%s:%d': %s" -msgstr "" +msgstr "'%s:%d' でのサーバ起動に失敗: %s" #, python-format msgid "calling hook %s: %s\n" -msgstr "" +msgstr "フック %s:%s 呼び出し中\n" #, python-format msgid "%s hook is invalid (\"%s\" not in a module)" -msgstr "" +msgstr "フック %s は不正です(モジュール中に \"%s\" がありません)" #, python-format msgid "%s hook is invalid (import of \"%s\" failed)" -msgstr "" +msgstr "フック %s は不正です(\"%s\" の読み込みに失敗)" #, python-format msgid "%s hook is invalid (\"%s\" is not defined)" -msgstr "" +msgstr "フック %s は不正です(\"%s\" は未定義です)" #, python-format msgid "%s hook is invalid (\"%s\" is not callable)" -msgstr "" +msgstr "フック %s は不正です(\"%s\" は呼び出し可能ではありません)" #, python-format msgid "error: %s hook failed: %s\n" -msgstr "" +msgstr "エラー: フック %s の失敗: %s\n" #, python-format msgid "error: %s hook raised an exception: %s\n" -msgstr "" +msgstr "エラー: フック %s による例外浮揚: %s\n" #, python-format msgid "%s hook failed" -msgstr "" +msgstr "フック %s の失敗" #, python-format msgid "warning: %s hook failed\n" -msgstr "" +msgstr "警告: フック %s の失敗\n" #, python-format msgid "running hook %s: %s\n" -msgstr "" +msgstr "フック %s: %s の実行中\n" #, python-format msgid "%s hook %s" -msgstr "" +msgstr "%s フック %s" #, python-format msgid "warning: %s hook %s\n" -msgstr "" +msgstr "警告: %s フック %s\n" msgid "connection ended unexpectedly" -msgstr "" +msgstr "予期せぬ接続終了" #, python-format msgid "unsupported URL component: \"%s\"" -msgstr "" +msgstr "URL 要素 \"%s\" はサポートされていません" #, python-format msgid "using %s\n" -msgstr "" +msgstr "%s を用います\n" #, python-format msgid "capabilities: %s\n" -msgstr "" +msgstr "機能: %s\n" msgid "operation not supported over http" -msgstr "" +msgstr "http リポジトリでは使用できない機能を必要としています" #, python-format msgid "sending %s command\n" -msgstr "" +msgstr "コマンド %s 送信中\n" #, python-format msgid "sending %s bytes\n" -msgstr "" +msgstr "%s バイトのデータ送信中\n" msgid "authorization failed" -msgstr "" +msgstr "認証に失敗" #, python-format msgid "http error while sending %s command\n" -msgstr "" +msgstr "コマンド %s 送信中の HTTP エラー\n" msgid "http error, possibly caused by proxy setting" -msgstr "" +msgstr "HTTP エラー(おそらくプロキシー設定に起因)" #, python-format msgid "real URL is %s\n" -msgstr "" - -#, python-format -msgid "Requested URL: '%s'\n" -msgstr "" +msgstr "実際の URL: %s\n" + +#, python-format +msgid "requested URL: '%s'\n" +msgstr "要求 URL: '%s'\n" #, python-format msgid "'%s' does not appear to be an hg repository" -msgstr "" +msgstr "'%s' は Mercurial リポジトリ形式とは思われません" #, python-format msgid "'%s' sent a broken Content-Type header (%s)" -msgstr "" +msgstr "'%s' は壊れた Content-Type ヘッダ(%s)を送信しました" #, python-format msgid "'%s' uses newer protocol %s" -msgstr "" +msgstr "'%s' は新しいプロトコル %s を使います" msgid "look up remote revision" -msgstr "" +msgstr "連携先でのリビジョンの検索" msgid "unexpected response:" -msgstr "" +msgstr "未知の応答:" msgid "look up remote changes" -msgstr "" +msgstr "連携先での変更の検索" msgid "push failed (unexpected response):" -msgstr "" +msgstr "履歴反映に失敗(未知のレスポンス):" #, python-format msgid "push failed: %s" -msgstr "" +msgstr "履歴反映に失敗: %s" msgid "Python support for SSL and HTTPS is not installed" -msgstr "" +msgstr "SSL と HTTPS をサポートした Python がインストールされていません" msgid "cannot create new http repository" -msgstr "" +msgstr "http リポジトリの新規作成はできません" #, python-format msgid "%s: ignoring invalid syntax '%s'\n" -msgstr "" +msgstr "%s: 文法不正の '%s' を無視します\n" #, python-format msgid "skipping unreadable ignore file '%s': %s\n" -msgstr "" +msgstr "読込不可の ignore ファイル '%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" +msgstr ".hg/sharedpath の参照先 %s は存在しません" #, python-format msgid "%r cannot be used in a tag name" -msgstr "" +msgstr "%r はタグ名に使用できません" msgid "working copy of .hgtags is changed (please commit .hgtags manually)" -msgstr "" +msgstr "作業領域の .hgtags が変更されています（手動でコミットしてください）" #, python-format msgid "%s, line %s: %s\n" -msgstr "" +msgstr "%s %s行目: %s\n" msgid "cannot parse entry" -msgstr "" +msgstr "エントリを読み込めません" #, python-format msgid "node '%s' is not well formed" -msgstr "" - -#, python-format -msgid "tag '%s' refers to unknown node" -msgstr "" +msgstr "'%s' というノードはフォーマットが不適切です" + +#, python-format +msgid "working directory has unknown parent '%s'!" +msgstr "作業領域の親 '%s' が未知のディレクトリです!" #, python-format msgid "unknown revision '%s'" -msgstr "" +msgstr "'%s' は未知のリビジョンです" #, python-format msgid "filtering %s through %s\n" -msgstr "" +msgstr "%s を %s で処理中\n" msgid "journal already exists - run hg recover" -msgstr "" +msgstr "ジャーナルが既に存在しています。 hg recoverを実行してください" msgid "rolling back interrupted transaction\n" -msgstr "" +msgstr "中断されたトランザクションをロールバックしています\n" msgid "no interrupted transaction available\n" -msgstr "" +msgstr "中断されたトランザクションはありません\n" msgid "rolling back last transaction\n" -msgstr "" +msgstr "最新のトランザクションをロールバックしています\n" #, 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 "利用可能なロールバック情報がありません\n" #, python-format msgid "waiting for lock on %s held by %r\n" -msgstr "" +msgstr "%s のロック (%rが保持) の解放を待っています\n" #, python-format msgid "repository %s" -msgstr "" +msgstr "リポジトリ '%s'" #, python-format msgid "working directory of %s" -msgstr "" +msgstr "%s の作業領域" #, python-format msgid " %s: searching for copy revision for %s\n" -msgstr "" +msgstr "%s: コピー時点の %s を検索中\n" #, python-format msgid " %s: copy %s:%s\n" -msgstr "" +msgstr "%s: コピー %s:%s\n" msgid "cannot partially commit a merge (do not specify files or patterns)" -msgstr "" - -#, python-format -msgid "%s not tracked!\n" -msgstr "" +msgstr "マージの部分コミットはできません(ファイル名／パターンは指定できません)" + +msgid "file not found!" +msgstr "ファイルが見つかりません!" + +msgid "no match under directory!" +msgstr "ディレクト配下に一致するものがありません!" + +msgid "file not tracked!" +msgstr "ファイルは未登録です!" + +msgid "nothing changed\n" +msgstr "変更なし\n" msgid "unresolved merge conflicts (see hg resolve)" -msgstr "" - -msgid "nothing changed\n" -msgstr "" +msgstr "未解決の衝突が残っています （hg resolveを参照してください）" + +#, python-format +msgid "committing subrepository %s\n" +msgstr "副リポジトリ %s でのコミット中\n" #, python-format msgid "trouble committing %s!\n" -msgstr "" - -msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." -msgstr "" - -msgid "empty commit message" -msgstr "" +msgstr "%s のコミットに失敗しました!\n" #, python-format msgid "%s does not exist!\n" -msgstr "" +msgstr "%s はありません!\n" #, python-format msgid "" "%s: files over 10MB may cause memory and performance problems\n" "(use 'hg revert %s' to unadd the file)\n" msgstr "" +"%s: 10MBを超えるファイルはメモリや性能の問題要因となり得ます\n" +"(ファイルの登録を解除するには 'hg revert %s')\n" #, python-format msgid "%s not added: only files and symlinks supported currently\n" -msgstr "" +msgstr "%s は追加登録されません: ファイルとシンボリックリンクのみ登録可能\n" #, python-format msgid "%s already tracked!\n" -msgstr "" +msgstr "%s は登録済です!\n" #, python-format msgid "%s not added!\n" -msgstr "" +msgstr "%s は追加登録されません\n" #, python-format msgid "%s still exists!\n" -msgstr "" +msgstr "%s の削除に失敗しました!\n" + +#, python-format +msgid "%s not tracked!\n" +msgstr "%s は管理されていません!\n" #, python-format msgid "%s not removed!\n" -msgstr "" +msgstr "%s は削除されませんでした!\n" #, python-format msgid "copy failed: %s is not a file or a symbolic link\n" -msgstr "" +msgstr "コピー失敗: %s はファイルでもシンボリックリンクでもありません\n" msgid "searching for changes\n" -msgstr "" +msgstr "変更点を探索中\n" #, python-format msgid "examining %s:%s\n" -msgstr "" +msgstr "%s:%s をチェックしています\n" msgid "branch already found\n" -msgstr "" +msgstr "ブランチはすでに見つかっています\n" #, python-format msgid "found incomplete branch %s:%s\n" -msgstr "" +msgstr "不完全なブランチ: %s:%s\n" #, python-format msgid "found new changeset %s\n" -msgstr "" +msgstr "新しいチェンジセット '%s' を発見\n" #, python-format msgid "request %d: %s\n" -msgstr "" +msgstr "リクエスト %d: %s\n" #, python-format msgid "received %s:%s\n" -msgstr "" +msgstr "%s:%s を受信\n" #, python-format msgid "narrowing %d:%d %s\n" -msgstr "" +msgstr "%d:%d %s を探索中\n" #, python-format msgid "found new branch changeset %s\n" -msgstr "" +msgstr "新しいブランチのチェンジセット %s を発見\n" #, python-format msgid "narrowed branch search to %s:%s\n" -msgstr "" +msgstr "ブランチの探索を %s:%s へ絞りました\n" msgid "already have changeset " -msgstr "" +msgstr "既にチェンジセットがあります " msgid "warning: repository is unrelated\n" -msgstr "" +msgstr "警告: 無関係なリポジトリです\n" msgid "repository is unrelated" -msgstr "" +msgstr "無関係なリポジトリです" msgid "found new changesets starting at " -msgstr "" +msgstr "以下を起点とする新規変更の検出: " #, python-format msgid "%d total queries\n" -msgstr "" +msgstr "合計 %d のクエリ\n" msgid "common changesets up to " -msgstr "" +msgstr "以下を終点とする共通履歴: " msgid "requesting all changes\n" -msgstr "" +msgstr "全チェンジセットを取得中\n" msgid "" "Partial pull cannot be done because other repository doesn't support " "changegroupsubset." -msgstr "" +msgstr "連携先の changegroupsubset 機能未対応により、部分取り込みできません。" + +#, python-format +msgid "abort: push creates new remote branch '%s'!\n" +msgstr "中断: 反映によって連携先に新しいブランチ '%s' が作成されます!\n" msgid "abort: push creates new remote heads!\n" -msgstr "" +msgstr "中断: 反映によって連携先に新しいヘッドが作成されます!\n" msgid "(did you forget to merge? use push -f to force)\n" -msgstr "" +msgstr "(マージは済んでいますか? push -f で強制実行できます)\n" msgid "note: unsynced remote changes!\n" -msgstr "" +msgstr "注意: 連携先での変更点が取り込まれていません!\n" #, python-format msgid "%d changesets found\n" -msgstr "" +msgstr "%d 個のチェンジセット\n" msgid "list of changesets:\n" -msgstr "" +msgstr "チェンジセット一覧：\n" #, python-format msgid "empty or missing revlog for %s" -msgstr "" +msgstr "%s に対するリビジョンログが空ないし不在です" #, python-format msgid "add changeset %s\n" -msgstr "" +msgstr "チェンジセット %s を追加\n" msgid "adding changesets\n" -msgstr "" +msgstr "チェンジセットを追加中\n" msgid "received changelog group is empty" -msgstr "" +msgstr "受信した変更履歴は空です" msgid "adding manifests\n" -msgstr "" +msgstr "マニフェストを追加中\n" msgid "adding file changes\n" -msgstr "" +msgstr "ファイルの変更を追加中\n" #, python-format msgid "adding %s revisions\n" -msgstr "" +msgstr "%s 個のリビジョンを追加中\n" msgid "received file revlog group is empty" -msgstr "" +msgstr "ファイルのリビジョンログが空です" #, python-format msgid " (%+d heads)" -msgstr "" +msgstr "（%+d個のヘッド）" #, python-format msgid "added %d changesets with %d changes to %d files%s\n" -msgstr "" +msgstr "%d のチェンジセット(%d の変更を %d ファイルに適用)を追加%s\n" msgid "updating the branch cache\n" -msgstr "" +msgstr "ブランチのキャッシュを更新中\n" msgid "Unexpected response from remote server:" -msgstr "" +msgstr "連携先のサーバから予期しない返信: " msgid "operation forbidden by server" -msgstr "" +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 "" +msgstr "チェンジセットを転送中\n" #, python-format msgid "%d files to transfer, %s of data\n" -msgstr "" +msgstr "%d 個のファイル転送(データ量 %s)\n" #, python-format msgid "adding %s (%s)\n" -msgstr "" +msgstr "%s を追加しています（%s）\n" #, python-format msgid "transferred %s in %.1f seconds (%s/sec)\n" -msgstr "" +msgstr "%s を %.1f 秒で送信しました（%s/秒）\n" msgid "no [smtp]host in hgrc - cannot send mail" -msgstr "" +msgstr "設定ファイルに [smtp] host 指定がありません - メール送信に失敗" #, python-format msgid "sending mail: smtp host %s, port %s\n" -msgstr "" +msgstr "メール送信中: SMTP ホスト %s、ポート番号 %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 としてメールサーバの認証中)\n" #, python-format msgid "sending mail: %s\n" -msgstr "" +msgstr "メール送信中: %s\n" msgid "smtp specified as email transport, but no smtp host configured" -msgstr "" +msgstr "メール転送方式の 'smtp' 指定にも関わらず、SMTP ホストが未設定です" #, python-format msgid "%r specified as email transport, but not in PATH" -msgstr "" +msgstr "メール転送コマンドで指定されたプログラム %r が見つかりません" #, python-format msgid "ignoring invalid sendcharset: %s\n" -msgstr "" +msgstr "不正な文字セットを無視します: %s\n" #, python-format msgid "invalid email address: %s" -msgstr "" +msgstr "不正なメールアドレス: %s" #, python-format msgid "invalid local address: %s" -msgstr "" - -msgid "'\\n' and '\\r' disallowed in filenames" -msgstr "" +msgstr "不正なローカルアドレス: %s" #, python-format msgid "failed to remove %s from manifest" -msgstr "" +msgstr "マニフェストから %s を削除できませんでした" #, python-format msgid "diff context lines count must be an integer, not %r" -msgstr "" +msgstr "差分コンテキストでの行数指定が不正です: %r" #, python-format msgid "" "untracked file in working directory differs from file in requested revision: " "'%s'" -msgstr "" +msgstr "未登録ファイル %s は指定リビジョンでの記録内容と異なります" #, python-format msgid "case-folding collision between %s and %s" -msgstr "" - -msgid "resolving manifests\n" -msgstr "" - -#, python-format -msgid " overwrite %s partial %s\n" -msgstr "" - -#, python-format -msgid " ancestor %s local %s remote %s\n" -msgstr "" +msgstr "ファイル名の文字大小の問題で %s と %s が衝突します" #, python-format msgid "" " conflicting flags for %s\n" "(n)one, e(x)ec or sym(l)ink?" msgstr "" +"ファイル %s のビット設定に衝突があります\n" +"どの設定にしますか？無効:(n)one, 実行可能:e(x)ec, リンク:sym(l)ink" + +msgid "&None" +msgstr "なし (&N)" + +msgid "E&xec" +msgstr "実行 (&X)" + +msgid "Sym&link" +msgstr "シンボリックリンク (&L)" + +msgid "resolving manifests\n" +msgstr "管理ファイル一覧を解決しています\n" + +#, python-format +msgid " overwrite %s partial %s\n" +msgstr " 上書き:%s, 対象限定:%s\n" + +#, python-format +msgid " ancestor %s local %s remote %s\n" +msgstr " 祖先 %s ローカル %s リモート %s\n" #, python-format msgid "" " local changed %s which remote deleted\n" "use (c)hanged version or (d)elete?" msgstr "" - -msgid "[cd]" -msgstr "" +"変更したファイル %s は別リビジョンで登録除外されています\n" +"どちらを採用しますか？変更:(c)hange, 登録除外:(d)elete" + +msgid "&Changed" +msgstr "&Changed" + +msgid "&Delete" +msgstr "&Delete" msgid "c" -msgstr "" +msgstr "c" #, python-format msgid "" "remote changed %s which local deleted\n" "use (c)hanged version or leave (d)eleted?" msgstr "" +"リモートで変更された %s はローカルで削除されています\n" +"変更されたもの(c)hangedを使用しますか?それとも削除(d)eleteしますか?" + +msgid "&Deleted" +msgstr "&Deleted" #, python-format msgid "preserving %s for resolve of %s\n" -msgstr "" +msgstr "%s の保存中(%s の衝突解消用)\n" #, python-format msgid "update failed to remove %s: %s!\n" -msgstr "" +msgstr "%s の削除に失敗: %s!\n" #, python-format msgid "getting %s\n" -msgstr "" - -#, python-format -msgid "moving %s to %s\n" -msgstr "" +msgstr "%s を取得しています\n" #, python-format msgid "getting %s to %s\n" -msgstr "" +msgstr "%s から %s に複製中\n" #, python-format msgid "warning: detected divergent renames of %s to:\n" -msgstr "" +msgstr "警告: %s の改名先が異なります:\n" #, python-format msgid "branch %s not found" -msgstr "" +msgstr "ブランチ %s が見つかりません" msgid "can't merge with ancestor" -msgstr "" +msgstr "祖先とマージできません" msgid "nothing to merge (use 'hg update' or check 'hg heads')" -msgstr "" +msgstr "マージは不要です('hg update' か 'hg heads' を使用してください)" + +msgid "outstanding uncommitted changes (use 'hg status' to list changes)" +msgstr "未コミット変更があります('hg status' で変更一覧表示可能)" msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)" -msgstr "" +msgstr "ブランチの横断(マージするか、'hg update -C' で変更を破棄できます)" msgid "crosses branches (use 'hg merge' or 'hg update -C')" -msgstr "" +msgstr "ブランチの横断(マージするか、'hg update -C' で変更を破棄できます)" msgid "crosses named branches (use 'hg update -C' to discard changes)" -msgstr "" +msgstr "名前付きブランチの横断('hg update -C' で変更を破棄できます)" #, python-format msgid "cannot create %s: destination already exists" -msgstr "" +msgstr "%s を作成できません: 作業先にすでに存在します" #, python-format msgid "cannot create %s: unable to create destination directory" -msgstr "" +msgstr "%s を作成できません: ディレクトリを作成できません" #, python-format msgid "found patch at byte %d\n" -msgstr "" +msgstr "%d バイト目にパッチが見つかりました\n" msgid "patch generated by hg export\n" -msgstr "" +msgstr "hg export にてパッチを生成しました\n" #, python-format msgid "unable to find '%s' for patching\n" -msgstr "" +msgstr "パッチ適用対象の '%s' が不在です\n" #, python-format msgid "patching file %s\n" -msgstr "" +msgstr "ファイル %s をパッチ適用しています\n" #, python-format msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n" -msgstr "" +msgstr "%d 個のハンク(総数 %d)が適用失敗 -- 失敗ハンクは %s に保存\n" #, python-format msgid "bad hunk #%d %s (%d %d %d %d)" -msgstr "" +msgstr "不正なハンク: #%d %s (%d %d %d %d)" #, python-format msgid "file %s already exists\n" -msgstr "" - -#, python-format -msgid "Hunk #%d succeeded at %d %s(offset %d %s).\n" -msgstr "" +msgstr "ファイル %s は既に存在します\n" + +#, python-format +msgid "Hunk #%d succeeded at %d %s(offset %d line).\n" +msgstr "ハンク #%d の適用成功:%d 行目 %s 補正行数 %d\n" + +#, python-format +msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n" +msgstr "ハンク #%d の適用成功:%d 行目 %s 補正行数 %d\n" #, python-format msgid "Hunk #%d FAILED at %d\n" -msgstr "" +msgstr "ハンク #%d の適用失敗:%d 行目\n" #, python-format msgid "bad hunk #%d" -msgstr "" +msgstr "不正なハンク: #%d" #, python-format msgid "bad hunk #%d old text line %d" -msgstr "" +msgstr "不正なハンク: #%d 元テキスト %d 行目" msgid "could not extract binary patch" -msgstr "" +msgstr "バイナリパッチの適用に失敗" #, python-format msgid "binary patch is %d bytes, not %d" -msgstr "" +msgstr "バイナリパッチのサイズ不正: 実サイズ %d, 想定サイズ %d" #, python-format msgid "unable to strip away %d dirs from %s" -msgstr "" +msgstr "%d 個のパス要素除外に失敗:%s" msgid "undefined source and destination files" -msgstr "" +msgstr "パッチ対象のファイル名が指定されていません" #, python-format msgid "malformed patch %s %s" -msgstr "" +msgstr "不正なパッチ: %s %s" #, python-format msgid "unsupported parser state: %s" -msgstr "" +msgstr "サポートしていないパーサの状態です: %s" #, python-format msgid "patch command failed: %s" -msgstr "" +msgstr "patch コマンドが失敗: %s" + +#, python-format +msgid "Unsupported line endings type: %s" +msgstr "未サポートの行末種別: %s" #, python-format msgid "no valid hunks found; trying with %r instead\n" -msgstr "" +msgstr "有効なハンクがありません: %r で再試行中\n" + +#, python-format +msgid "exited with status %d" +msgstr "終了コード %d で終了しました" + +#, python-format +msgid "killed by signal %d" +msgstr "%d のシグナルで強制終了しました" + +#, python-format +msgid "stopped by signal %d" +msgstr "%d のシグナルで停止しました" + +msgid "invalid exit code" +msgstr "終了コードが不正です" #, python-format msgid "saving bundle to %s\n" -msgstr "" +msgstr "バンドルを %s に保存中\n" msgid "adding branch\n" -msgstr "" +msgstr "ブランチを追加中\n" #, python-format msgid "cannot %s; remote repository does not support the %r capability" -msgstr "" +msgstr "%s できません。機能 %s はリモートリポジトリでは未サポートです" #, python-format msgid "unknown compression type %r" -msgstr "" +msgstr "%r は未知の圧縮形式です" #, python-format msgid "index %s unknown flags %#04x for format v0" -msgstr "" +msgstr "インデックス %s: %#04x は未知のフラグです(フォーマット v0)" #, python-format msgid "index %s unknown flags %#04x for revlogng" -msgstr "" +msgstr "インデックス %s: %#04x は未知のフラグです(revlogng)" #, python-format msgid "index %s unknown format %d" -msgstr "" +msgstr "インデックス %s: %d は未知のフォーマットです" + +#, python-format +msgid "index %s is corrupted" +msgstr "インデックス %s は破損しています" msgid "no node" -msgstr "" +msgstr "ノードがありません" msgid "ambiguous identifier" -msgstr "" +msgstr "曖昧な識別子です" msgid "no match found" -msgstr "" +msgstr "該当する ID はありませんでした" #, python-format msgid "incompatible revision flag %x" -msgstr "" +msgstr "%x は互換性のないリビジョンフラグです" #, python-format msgid "%s not found in the transaction" -msgstr "" +msgstr "トランザクション中に %s は見つかりませんでした" msgid "unknown base" -msgstr "" +msgstr "未知のベースリビジョン" msgid "consistency error adding group" -msgstr "" +msgstr "グループの追加に失敗" #, python-format msgid "%s looks like a binary file." -msgstr "" +msgstr "%s はバイナリファイルのようです。" msgid "can only specify two labels." -msgstr "" +msgstr "ラベルは二つのみ指定可。" msgid "warning: conflicts during merge.\n" -msgstr "" +msgstr "警告: マージ中に衝突を発見。\n" #, python-format msgid "couldn't parse location %s" -msgstr "" +msgstr "URL %s の解析に失敗" msgid "could not create remote repo" -msgstr "" +msgstr "遠隔ホストとの連携に失敗" msgid "remote: " -msgstr "" +msgstr "遠隔ホスト: " msgid "no suitable response from remote hg" -msgstr "" +msgstr "遠隔ホストの応答が不適切" #, python-format msgid "push refused: %s" -msgstr "" +msgstr "履歴反映が拒否されました: %s" msgid "unsynced changes" -msgstr "" +msgstr "未取り込みの変更があります" msgid "cannot lock static-http repository" -msgstr "" +msgstr "static-http リポジトリはロックできません" msgid "cannot create new static-http repository" -msgstr "" +msgstr "static-http リポジトリの新規作成はできません" #, python-format msgid "invalid entry in fncache, line %s" -msgstr "" +msgstr "ファイル名キャッシュに不正なエントリ: %s 行目" msgid "scanning\n" -msgstr "" +msgstr "走査中\n" #, python-format msgid "%d files, %d bytes to transfer\n" -msgstr "" +msgstr "%d 個のファイル、%d バイトの送信\n" #, python-format msgid "sending %s (%d bytes)\n" -msgstr "" +msgstr "%s の送信中(%d バイト)\n" + +#, python-format +msgid "" +" subrepository sources for %s differ\n" +"use (l)ocal source (%s) or (r)emote source (%s)?" +msgstr "" + +msgid "&Remote" +msgstr "&Remote" + +msgid "r" +msgstr "" + +#, python-format +msgid "" +" local changed subrepository %s which remote removed\n" +"use (c)hanged version or (d)elete?" +msgstr "" +"ローカル副リポジトリで変更したファイル %s は他方で登録除外されています\n" +"どちらを採用しますか？変更:(c)hange, 登録除外:(d)elete" + +#, python-format +msgid "" +" remote changed subrepository %s which local removed\n" +"use (c)hanged version or (d)elete?" +msgstr "" +"ローカル副リポジトリで登録除外されたファイル %s は他方で変更されています\n" +"どちらを採用しますか？変更:(c)hange, 登録除外:(d)elete" + +#, python-format +msgid "removing subrepo %s\n" +msgstr "副リポジトリの %s を登録除外中\n" + +#, python-format +msgid "pulling subrepo %s\n" +msgstr "副リポジトリに %s から取り込み中\n" + +#, python-format +msgid "pushing subrepo %s\n" +msgstr "副リポジトリを %s へ反映中\n" msgid "unmatched quotes" -msgstr "" +msgstr "引用符の対応関係が不正です" + +#, python-format +msgid "error expanding '%s%%%s'" +msgstr "'%s%%%s' 展開の失敗" + +#, python-format +msgid "unknown filter '%s'" +msgstr "'%s' は未知のフィルタです" #, python-format msgid "style not found: %s" -msgstr "" - -#, python-format -msgid "%s:%s: parse error" -msgstr "" +msgstr "スタイルが見つかりません: %s" #, python-format msgid "template file %s: %s" -msgstr "" - -#, python-format -msgid "Error expanding '%s%%%s'" -msgstr "" - -msgid "transaction abort!\n" -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 "%s の切り詰めに失敗\n" + +msgid "transaction abort!\n" +msgstr "トランザクションを中断します!\n" msgid "rollback completed\n" -msgstr "" +msgstr "ロールバックを完了しました\n" + +msgid "rollback failed - please run hg recover\n" +msgstr "ロールバックに失敗しました - 'hg recover' してください\n" #, python-format msgid "Not trusting file %s from untrusted user %s, group %s\n" -msgstr "" - -#, python-format -msgid "" -"Failed to parse %s\n" -"%s" -msgstr "" +msgstr "信頼できないファイル %s (信頼できないユーザ %s, グループ %s)\n" #, python-format msgid "Ignored: %s\n" -msgstr "" - -#, python-format -msgid "unable to open %s: %s" -msgstr "" - -#, python-format -msgid "" -"failed to parse %s\n" -"%s" -msgstr "" - -#, python-format -msgid "" -"Error in configuration section [%s] parameter '%s':\n" -"%s" -msgstr "" - -#, python-format -msgid "Ignoring untrusted configuration option %s.%s = %s\n" -msgstr "" - -#, python-format -msgid "" -"Error in configuration section [%s]:\n" -"%s" -msgstr "" +msgstr "無視しました: %s\n" + +#, python-format +msgid "ignoring untrusted configuration option %s.%s = %s\n" +msgstr "信頼できない設定ファイル中の '%s.%s = %s' 設定を無視\n" + +#, python-format +msgid "%s.%s not a boolean ('%s')" +msgstr "%s.%s の値 '%s' は真偽値ではありません" msgid "enter a commit username:" -msgstr "" +msgstr "コミットするユーザ名を入力してください:" #, python-format msgid "No username found, using '%s' instead\n" -msgstr "" +msgstr "ユーザ名が不明のため、'%s' を使用\n" msgid "Please specify a username." -msgstr "" +msgstr "ユーザ名を指定してください。" #, python-format msgid "username %s contains a newline\n" -msgstr "" +msgstr "ユーザ名 %s は改行を含んでいます\n" msgid "unrecognized response\n" -msgstr "" +msgstr "認識できないレスポンス\n" msgid "response expected" -msgstr "" +msgstr "レスポンスがありません" 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 "" - -#, python-format -msgid "proxying through http://%s:%s\n" -msgstr "" +msgstr "ユーザ:" #, python-format msgid "http auth: user %s, password %s\n" -msgstr "" - -#, python-format -msgid "%s, please check your locale settings" -msgstr "" +msgstr "HTTP 認証: ユーザ名 %s, パスワード %s\n" + +#, python-format +msgid "proxying through http://%s:%s\n" +msgstr "プロキシ 'http://%s:%s' を経由しています\n" #, python-format msgid "command '%s' failed: %s" -msgstr "" +msgstr "コマンド '%s' 失敗: %s" #, python-format msgid "path contains illegal component: %s" -msgstr "" +msgstr "パスに不正なコンポーネントがあります: %s" #, python-format msgid "path %r is inside repo %r" -msgstr "" +msgstr "パス %r はリポジトリ %r 内にあります" #, python-format msgid "path %r traverses symbolic link %r" -msgstr "" +msgstr "パス %r はシンボリックリンク '%r' が含まれています" msgid "Hardlinks not supported" -msgstr "" - -msgid "user name not available - set USERNAME environment variable" -msgstr "" - -#, python-format -msgid "exited with status %d" -msgstr "" - -#, python-format -msgid "killed by signal %d" -msgstr "" - -#, python-format -msgid "stopped by signal %d" -msgstr "" - -msgid "invalid exit code" -msgstr "" +msgstr "ハードリンクはサポートしていません" #, python-format msgid "could not symlink to %r: %s" -msgstr "" +msgstr "%r へシンボリックリンクできません: %s" #, python-format msgid "invalid date: %r " -msgstr "" +msgstr "不正な日付: %r " #, python-format msgid "date exceeds 32 bits: %d" -msgstr "" +msgstr "日付が32ビットを超えています: %d" #, python-format msgid "impossible time zone offset: %d" -msgstr "" +msgstr "あり得ないタイムゾーン: %d" #, python-format msgid "invalid day spec: %s" -msgstr "" +msgstr "不正な日付の指定です: %s" #, python-format msgid "%.0f GB" -msgstr "" +msgstr "%.0f GB" #, python-format msgid "%.1f GB" -msgstr "" +msgstr "%.1f GB" #, python-format msgid "%.2f GB" -msgstr "" +msgstr "%.2f GB" #, python-format msgid "%.0f MB" -msgstr "" +msgstr "%.0f MB" #, python-format msgid "%.1f MB" -msgstr "" +msgstr "%.1f MB" #, python-format msgid "%.2f MB" -msgstr "" +msgstr "%.2f MB" #, python-format msgid "%.0f KB" -msgstr "" +msgstr "%.0f KB" #, python-format msgid "%.1f KB" -msgstr "" +msgstr "%.1f KB" #, python-format msgid "%.2f KB" -msgstr "" +msgstr "%.2f KB" #, python-format msgid "%.0f bytes" -msgstr "" +msgstr "%.0f バイト" msgid "cannot verify bundle or remote repos" -msgstr "" +msgstr "ローカルリポジトリ以外は検証できません" msgid "interrupted" -msgstr "" +msgstr "中断されました" #, python-format msgid "empty or missing %s" -msgstr "" +msgstr "%s は、空か見つかりません" #, python-format msgid "data length off by %d bytes" -msgstr "" +msgstr "データ長: %d バイト" #, python-format msgid "index contains %d extra bytes" -msgstr "" +msgstr "インデックスの拡張データ: %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 "" - -#, python-format -msgid "rev %d point to %s changeset %d" -msgstr "" +msgstr "警告: `%s' は revlog 形式 0 です" + +#, python-format +msgid "rev %d points to nonexistent changeset %d" +msgstr "リビジョン %d は未知のリビジョン %d を参照しています" + +#, python-format +msgid "rev %d points to unexpected changeset %d" +msgstr "リビジョン %d は想定外のリビジョン %d を参照しています" #, python-format msgid " (expected %s)" -msgstr "" +msgstr " (想定対象 %s)" #, python-format msgid "unknown parent 1 %s of %s" -msgstr "" +msgstr "未知の第1親 %s を持つ %s" #, python-format msgid "unknown parent 2 %s of %s" -msgstr "" +msgstr "未知の第2親 %s を持つ %s" #, python-format msgid "checking parents of %s" -msgstr "" +msgstr "%s の親を検証中" #, python-format msgid "duplicate revision %d (%d)" -msgstr "" +msgstr "%d と重複するリビジョン %d があります" #, python-format msgid "repository uses revlog format %d\n" -msgstr "" +msgstr "リポジトリは revlog 形式 %d です\n" msgid "checking changesets\n" -msgstr "" +msgstr "チェンジセットの確認中\n" #, python-format msgid "unpacking changeset %s" -msgstr "" +msgstr "リビジョン %s の展開中" msgid "checking manifests\n" -msgstr "" +msgstr "管理ファイル一覧の確認中\n" + +#, python-format +msgid "%s not in changesets" +msgstr "リビジョン %s は未知のリビジョンです" msgid "file without name in manifest" -msgstr "" +msgstr "名前を持たないファイルがあります" #, python-format msgid "reading manifest delta %s" -msgstr "" +msgstr "管理対象一覧の差分 %s の読み込み中" msgid "crosschecking files in changesets and manifests\n" -msgstr "" +msgstr "チェンジセットとマニフェストによるファイルのクロスチェック中\n" #, python-format msgid "changeset refers to unknown manifest %s" -msgstr "" +msgstr "未知のマニフェスト %s が参照されています" msgid "in changeset but not in manifest" -msgstr "" +msgstr "マニフェストから参照されていないファイル" msgid "in manifest but not in changeset" -msgstr "" +msgstr "チェンジセットから参照されていないファイル" msgid "checking files\n" -msgstr "" +msgstr "ファイルの確認中\n" #, python-format msgid "cannot decode filename '%s'" -msgstr "" +msgstr "ファイル名 '%s' のデコードに失敗" + +#, python-format +msgid "broken revlog! (%s)" +msgstr "不正な revlog! (%s)" 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" -msgstr "" +msgstr "展開後サイズ %s は想定外です(期待値:%s)" #, python-format msgid "unpacking %s" -msgstr "" +msgstr "%s の展開中" #, python-format msgid "empty or missing copy source revlog %s:%s" -msgstr "" +msgstr "複製元 revlog %s:%s は、空か見つかりません" #, python-format msgid "warning: %s@%s: copy source revision is nullid %s:%s" -msgstr "" +msgstr "警告: %s@%s: 複製元リビジョンが nullid %s:%s" #, 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 "警告: revlog '%s' はどこからも参照されていません" #, python-format msgid "%d files, %d changesets, %d total revisions\n" -msgstr "" +msgstr "%d 個のファイル、%d 件のチェンジセット、合計 %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 "(最初の不整合は %d の模様)\n" + +msgid "user name not available - set USERNAME environment variable" +msgstr "ユーザ名が利用できません - 環境変数 USERNAME を設定してください"
--- a/i18n/pt_BR.po Mon Jun 29 19:28:54 2009 +0200 +++ b/i18n/pt_BR.po Tue Jun 30 12:32:30 2009 -0500 @@ -1407,10 +1407,6 @@ msgstr "erro no comando %s:\n" #, python-format -msgid "%s %s" -msgstr "%s %s" - -#, python-format msgid "syntax error in %s(%d): key/value pair expected" msgstr "erro de sintaxe em %s(%d): esperado par chave/valor" @@ -3356,30 +3352,25 @@ msgid "" "remove patches from queue\n" "\n" -" The patches must not be applied, unless they are arguments to the\n" -" -r/--rev parameter. At least one patch or revision is required.\n" -"\n" -" With --rev, mq will stop managing the named revisions (converting\n" -" them to regular Mercurial changesets). The qfinish command should\n" -" be used as an alternative for qdelete -r, as the latter option is\n" -" deprecated.\n" +" The patches must not be applied, and at least one patch is\n" +" required.\n" "\n" " With -k/--keep, the patch files are preserved in the patch\n" -" directory." +" directory.\n" +"\n" +" To stop managing a patch and move it into permanent history,\n" +" use the qfinish command." msgstr "" "remove patches da fila\n" "\n" -" Os patches não devem estar aplicados, a não ser que sejam\n" -" argumentos do parâmetro -r/--rev. Ao menos um patch ou revisão\n" -" é necessário.\n" -"\n" -" Com --rev, a mq irá deixar de gerenciar as revisões pedidas\n" -" (convertendo-as em changesets comuns do Mercurial). O comando\n" -" qfinish deve ser usado como alternativa a qdelete -r, pois este\n" -" última é obsoleto.\n" -"\n" -" Com -k/--keep, os arquivos de patch são preservados no diretório\n" -" de patches." +" Os patches não devem estar aplicados, e ao menos um patch deve\n" +" ser passado.\n" +"\n" +" Com -k/--keep, os arquivos de patch serão preservados no\n" +" diretório de patches.\n" +"\n" +" Para parar de gerenciar um patch e movê-lo para o histórico\n" +" permanente, use o comando qfinish." msgid "print the patches already applied" msgstr "imprime os patches já aplicados" @@ -4006,8 +3997,8 @@ msgid "keep patch file" msgstr "mantém o arquivo de patch" -msgid "stop managing a revision" -msgstr "deixa de gerenciar uma revisão" +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]..." @@ -5979,7 +5970,7 @@ " repository.\n" "\n" " The files will be added to the repository at the next commit. To\n" -" undo an add before that, see hg revert.\n" +" undo an add before that, see hg forget.\n" "\n" " If no names are given, add all files to the repository.\n" " " @@ -5991,7 +5982,7 @@ "\n" " Os arquivos serão adicionados ao repositório na próxima\n" " consolidação. Para desfazer uma adição antes disso, veja\n" -" hg revert.\n" +" hg forget.\n" "\n" " Se nomes não forem dados, adiciona todos os arquivos ao\n" " repositório.\n" @@ -6383,9 +6374,11 @@ " 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" +" -a/--all (or --base null).\n" +"\n" +" To change the compression method applied, use the -t/--type\n" +" option. The available compression methods are: none, bzip2, and\n" +" gzip (by default, bundles are compressed using bzip2).\n" "\n" " The bundle file can then be transferred using conventional means\n" " and applied to another repository with the unbundle or pull\n" @@ -6404,9 +6397,12 @@ " Se um repositório de destino não for especificado, assume que o\n" " destino tem todos os nós especificados por um ou mais parâmetros\n" " --base. Para criar um bundle contendo todos os changesets, use\n" -" -a/--all (ou --base null). Para mudar o método de compressão\n" -" aplicado, use a opção -t/--type (por padrão, bundles são\n" -" comprimidos usando bz2).\n" +" -a/--all (ou --base null).\n" +"\n" +" Para mudar o método de compressão aplicado, use a opção\n" +" -t/--type. Os métodos de compressão disponíveis são: none\n" +" (nenhum), bzip2 e gzip (por padrão, bundles são comprimidos\n" +" usando bzip2).\n" "\n" " O arquivo bundle pode então ser transferido usando métodos\n" " convencionais e aplicado a outro repositório com os comandos\n" @@ -6962,6 +6958,38 @@ msgstr "exportando patch:\n" msgid "" +"forget the specified files on the next commit\n" +"\n" +" Mark the specified files so they will no longer be tracked\n" +" after the next commit.\n" +"\n" +" This only removes files from the current branch, not from the\n" +" entire project history, and it does not delete them from the\n" +" working directory.\n" +"\n" +" To undo a forget before the next commit, see hg add.\n" +" " +msgstr "" +"esquece os arquivos especificados na próxima consolidação\n" +"\n" +" Marca os arquivos especificados de modo que não serão mais\n" +" rastreados após a próxima consolidação.\n" +"\n" +" Isto remove arquivos apenas do ramo atual,e não de todo o\n" +" histórico do projeto, nem os apaga do diretório de trabalho.\n" +"\n" +" Para desfazer um forget antes da próxima consolidação, veja\n" +" hg add.\n" +" " + +msgid "no files specified" +msgstr "nenhum arquivo especificado" + +#, python-format +msgid "not removing %s: file is already untracked\n" +msgstr "%s não removido: arquivo já não é rastreado\n" + +msgid "" "search for a pattern in specified files and revisions\n" "\n" " Search revisions of files for a regular expression.\n" @@ -7733,9 +7761,6 @@ " hg revert.\n" " " -msgid "no files specified" -msgstr "nenhum arquivo especificado" - #, python-format msgid "not removing %s: file is untracked\n" msgstr "arquivo %s não removido: arquivo não rastreado\n"
--- a/i18n/zh_CN.po Mon Jun 29 19:28:54 2009 +0200 +++ b/i18n/zh_CN.po Tue Jun 30 12:32:30 2009 -0500 @@ -5,7 +5,7 @@ # Copyright (C) 2009 the Mercurial team # Dongsheng Song <dongsheng.song@gmail.com>, 2009 # -# $Id: zh.po 1217 2009-03-11 09:20:30Z dongsheng.song@gmail.com $ +# $Id: zh_CN.po 1313 2009-06-24 02:08:02Z songdongsheng@live.cn $ # # Update with pot file: # msgmerge --update zh_CN.po hg.pot @@ -48,9 +48,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Mercurial 1.2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-20 14:26+0800\n" +"Project-Id-Version: Mercurial 1.3\n" +"Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" +"POT-Creation-Date: 2009-06-24 10:03+0800\n" "PO-Revision-Date: 2009-03-31 20:38+0200\n" "Last-Translator: Dongsheng Song <dongsheng.song@gmail.com>\n" "Language-Team: Chinese translation team <i18n-zh@googlegroups.com>\n" @@ -82,8 +82,53 @@ " 别名: %s\n" "\n" -msgid "return tuple of (match function, list enabled)." -msgstr "返回 tuple (匹配函数，启用列表)" +msgid "" +"control access to a repository using simple hooks\n" +"\n" +"This hook makes it possible to allow or deny write access to portions\n" +"of a repository when receiving incoming changesets.\n" +"\n" +"The authorization is matched based on the local user name on the\n" +"system where the hook runs, and not the committer of the original\n" +"changeset (since the latter is merely informative).\n" +"\n" +"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.\n" +"\n" +"To use this hook, configure the acl extension in your hgrc like this:\n" +"\n" +" [extensions]\n" +" hgext.acl =\n" +"\n" +" [hooks]\n" +" pretxnchangegroup.acl = python:hgext.acl.hook\n" +"\n" +" [acl]\n" +" # Check whether the source of incoming changes is in this list\n" +" # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n" +" sources = serve\n" +"\n" +"The allow and deny sections take a subtree pattern as key (with a\n" +"glob syntax by default), and a comma separated list of users as\n" +"the corresponding value. The deny list is checked before the allow\n" +"list is.\n" +"\n" +" [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\n" +"\n" +" [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 "acl: %s not enabled\n" @@ -118,115 +163,41 @@ msgstr "acl: 允许修改集 %s\n" msgid "" -"allow user-defined command aliases\n" -"\n" -"To use, create entries in your hgrc of the form\n" -"\n" -"[alias]\n" -"mycmd = cmd --args\n" -msgstr "" -"允许用户自定义命令的别名\n" -"\n" -"要使用别名，在你的 hgrc 中创建如下格式的条目:\n" -"\n" -"[alias]\n" -"mycmd = cmd --args\n" - -msgid "" -"defer command lookup until needed, so that extensions loaded\n" -" after alias can be aliased" -msgstr "查找命令会推迟到需要时，所以可以在定义别名后加载模块" - -#, python-format -msgid "*** [alias] %s: command %s is unknown" -msgstr "*** [alias] %s: 未知命令 %s" - -#, python-format -msgid "*** [alias] %s: command %s is ambiguous" -msgstr "*** [alias] %s: 不明确的命令 %s" - -#, python-format -msgid "*** [alias] %s: circular dependency on %s" -msgstr "*** [alias] %s: 循环依赖于 %s" - -#, python-format -msgid "*** [alias] %s: no definition\n" -msgstr "*** [alias] %s: 无定义\n" - -msgid "" -"mercurial bookmarks\n" -"\n" -"Mercurial bookmarks are local moveable pointers to changesets. Every\n" -"bookmark points to a changeset identified by its hash. If you commit a\n" -"changeset that is based on a changeset that has a bookmark on it, the\n" -"bookmark is forwarded to the new changeset.\n" -"\n" -"It is possible to use bookmark names in every revision lookup (e.g. hg\n" -"merge, hg update).\n" -"\n" -"The bookmark extension offers the possiblity to have a more git-like " -"experience\n" -"by adding the following configuration option to your .hgrc:\n" -"\n" -"[bookmarks]\n" -"track.current = True\n" -"\n" -"This will cause bookmarks to track the bookmark that you are currently on, " -"and\n" -"just updates it. This is similar to git's approach of branching.\n" -msgstr "" - -msgid "" -"Parse .hg/bookmarks file and return a dictionary\n" -"\n" -" Bookmarks are stored as {HASH}\\s{NAME}\\n (localtags format) values\n" -" in the .hg/bookmarks file. They are read by the parse() method and\n" -" returned as a dictionary with name => hash values.\n" -"\n" -" The parsed dictionary is cached until a write() operation is done.\n" -" " -msgstr "" - -msgid "" -"Write bookmarks\n" -"\n" -" Write the given bookmark => hash dictionary to the .hg/bookmarks file\n" -" in a format equal to those of localtags.\n" -"\n" -" We also store a backup of the previous state in undo.bookmarks that\n" -" can be copied back on rollback.\n" -" " -msgstr "" - -msgid "" -"Get the current bookmark\n" -"\n" -" If we use gittishsh branches we have a current bookmark that\n" -" we are on. This function returns the name of the bookmark. It\n" -" is stored in .hg/bookmarks.current\n" -" " -msgstr "" - -msgid "" -"Set the name of the bookmark that we are currently on\n" -"\n" -" Set the name of the bookmark that we are on (hg update <bookmark>).\n" -" The name is recoreded in .hg/bookmarks.current\n" -" " -msgstr "" - -msgid "" -"mercurial bookmarks\n" +"track a line of development with movable markers\n" +"\n" +"Bookmarks are local movable markers to changesets. Every bookmark\n" +"points to a changeset identified by its hash. If you commit a\n" +"changeset that is based on a changeset that has a bookmark on it,\n" +"the bookmark shifts to the new changeset.\n" +"\n" +"It is possible to use bookmark names in every revision lookup\n" +"(e.g. hg merge, hg update).\n" +"\n" +"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:\n" +"\n" +" [bookmarks]\n" +" track.current = True\n" +"\n" +"This will cause Mercurial to track the bookmark that you are currently\n" +"using, and only update it. This is similar to git's approach to\n" +"branching.\n" +msgstr "" + +msgid "" +"track a line of development with movable markers\n" "\n" " Bookmarks are pointers to certain commits that move when\n" -" commiting. Bookmarks are local. They can be renamed, copied and\n" -" deleted. It is possible to use bookmark names in 'hg merge' and 'hg\n" -" update' to update to a given bookmark.\n" -"\n" -" You can use 'hg bookmark NAME' to set a bookmark on the current\n" -" tip with the given name. If you specify a revision using -r REV\n" -" (where REV may be an existing bookmark), the bookmark is set to\n" -" that revision.\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.\n" +"\n" +" 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" " " msgstr "" @@ -248,28 +219,6 @@ msgid "a bookmark cannot have the name of an existing branch" msgstr "" -msgid "" -"Strip bookmarks if revisions are stripped using\n" -" the mercurial.strip method. This usually happens during\n" -" qpush and qpop" -msgstr "" - -msgid "" -"Add a revision to the repository and\n" -" move the bookmark" -msgstr "" - -msgid "Merge bookmarks with normal tags" -msgstr "" - -msgid "" -"Set the current bookmark\n" -"\n" -" If the user updates to a bookmark we update the .hg/bookmarks.current\n" -" file.\n" -" " -msgstr "" - msgid "force" msgstr "强制" @@ -286,79 +235,79 @@ msgstr "" msgid "" -"Bugzilla integration\n" +"integrate Mercurial with a Bugzilla bug tracker\n" "\n" "This hook extension adds comments on bugs in Bugzilla when changesets\n" -"that refer to bugs by Bugzilla ID are seen. The hook does not change bug\n" -"status.\n" -"\n" -"The hook updates the Bugzilla database directly. Only Bugzilla installations\n" -"using MySQL are supported.\n" -"\n" -"The hook relies on a Bugzilla script to send bug change notification emails.\n" -"That script changes between Bugzilla versions; the 'processmail' script used\n" -"prior to 2.18 is replaced in 2.18 and subsequent versions by\n" -"'config/sendbugmail.pl'. Note that these will be run by Mercurial as the " -"user\n" -"pushing the change; you will need to ensure the Bugzilla install file\n" -"permissions are set appropriately.\n" +"that refer to bugs by Bugzilla ID are seen. The hook does not change\n" +"bug status.\n" +"\n" +"The hook updates the Bugzilla database directly. Only Bugzilla\n" +"installations using MySQL are supported.\n" +"\n" +"The hook relies on a Bugzilla script to send bug change notification\n" +"emails. That script changes between Bugzilla versions; the\n" +"'processmail' script used prior to 2.18 is replaced in 2.18 and\n" +"subsequent versions by 'config/sendbugmail.pl'. Note that these will\n" +"be run by Mercurial as the user pushing the change; you will need to\n" +"ensure the Bugzilla install file permissions are set appropriately.\n" "\n" "Configuring the extension:\n" "\n" " [bugzilla]\n" -" host Hostname of the MySQL server holding the Bugzilla database.\n" +"\n" +" host Hostname of the MySQL server holding the Bugzilla\n" +" database.\n" " db Name of the Bugzilla database in MySQL. Default 'bugs'.\n" " user Username to use to access MySQL server. Default 'bugs'.\n" " password Password to use to access MySQL server.\n" " timeout Database connection timeout (seconds). Default 5.\n" -" version Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and\n" -" later, '2.18' for Bugzilla versions from 2.18 and '2.16' for\n" -" versions prior to 2.18.\n" +" version Bugzilla version. Specify '3.0' for Bugzilla versions\n" +" 3.0 and later, '2.18' for Bugzilla versions from 2.18\n" +" and '2.16' for versions prior to 2.18.\n" " bzuser Fallback Bugzilla user name to record comments with, if\n" " changeset committer cannot be found as a Bugzilla user.\n" " bzdir Bugzilla install directory. Used by default notify.\n" " Default '/var/www/html/bugzilla'.\n" " notify The command to run to get Bugzilla to send bug change\n" -" notification emails. Substitutes from a map with 3 keys,\n" -" 'bzdir', 'id' (bug id) and 'user' (committer bugzilla email).\n" -" Default depends on version; from 2.18 it is\n" -" \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl %(id)s %(user)" -"s\".\n" -" regexp Regular expression to match bug IDs in changeset commit " -"message.\n" -" Must contain one \"()\" group. The default expression matches\n" -" 'Bug 1234', 'Bug no. 1234', 'Bug number 1234',\n" -" 'Bugs 1234,5678', 'Bug 1234 and 5678' and variations thereof.\n" -" Matching is case insensitive.\n" +" notification emails. Substitutes from a map with 3\n" +" keys, 'bzdir', 'id' (bug id) and 'user' (committer\n" +" bugzilla email). Default depends on version; from 2.18\n" +" it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n" +" %(id)s %(user)s\".\n" +" regexp Regular expression to match bug IDs in changeset commit\n" +" message. Must contain one \"()\" group. The default\n" +" expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n" +" number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n" +" variations thereof. Matching is case insensitive.\n" " style The style file to use when formatting comments.\n" " template Template to use when formatting comments. Overrides\n" " style if specified. In addition to the usual Mercurial\n" " keywords, the extension specifies:\n" " {bug} The Bugzilla bug ID.\n" -" {root} The full pathname of the Mercurial " -"repository.\n" -" {webroot} Stripped pathname of the Mercurial " -"repository.\n" -" {hgweb} Base URL for browsing Mercurial repositories.\n" +" {root} The full pathname of the Mercurial\n" +" repository.\n" +" {webroot} Stripped pathname of the Mercurial\n" +" repository.\n" +" {hgweb} Base URL for browsing Mercurial\n" +" repositories.\n" " Default 'changeset {node|short} in repo {root} refers '\n" " 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n" " strip The number of slashes to strip from the front of {root}\n" " to produce {webroot}. Default 0.\n" -" usermap Path of file containing Mercurial committer ID to Bugzilla " -"user\n" -" ID mappings. If specified, the file should contain one " -"mapping\n" -" per line, \"committer\"=\"Bugzilla user\". See also the\n" -" [usermap] section.\n" +" usermap Path of file containing Mercurial committer ID to\n" +" Bugzilla user ID mappings. If specified, the file\n" +" should contain one mapping per line,\n" +" \"committer\"=\"Bugzilla user\". See also the [usermap]\n" +" section.\n" "\n" " [usermap]\n" -" Any entries in this section specify mappings of Mercurial committer ID\n" -" to Bugzilla user ID. See also [bugzilla].usermap.\n" +" Any entries in this section specify mappings of Mercurial\n" +" committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n" " \"committer\"=\"Bugzilla user\"\n" "\n" " [web]\n" -" baseurl Base URL for browsing Mercurial repositories. Reference from\n" -" templates as {hgweb}.\n" +" baseurl Base URL for browsing Mercurial repositories. Reference\n" +" from templates as {hgweb}.\n" "\n" "Activating the extension:\n" "\n" @@ -371,9 +320,9 @@ "\n" "Example configuration:\n" "\n" -"This example configuration is for a collection of Mercurial repositories\n" -"in /var/local/hg/repos/ used with a local Bugzilla 3.2 installation in\n" -"/opt/bugzilla-3.2.\n" +"This example configuration is for a collection of Mercurial\n" +"repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n" +"installation in /opt/bugzilla-3.2.\n" "\n" " [bugzilla]\n" " host=localhost\n" @@ -399,16 +348,10 @@ " Changeset commit comment. Bug 1234.\n" msgstr "" -msgid "support for bugzilla version 2.16." -msgstr "支持 bugzilla 2.16。" - #, python-format msgid "connecting to %s:%s as %s, password %s\n" msgstr "连接到 %s:%s as %s，密码 %s\n" -msgid "run a query." -msgstr "运行查询。" - #, python-format msgid "query: %s %s\n" msgstr "查询: %s %s\n" @@ -417,25 +360,13 @@ msgid "failed query: %s %s\n" msgstr "查询失败: %s %s\n" -msgid "get identity of longdesc field" -msgstr "" - msgid "unknown database schema" msgstr "未知的数据库方案" -msgid "filter not-existing bug ids from list." -msgstr "从列表中过滤不存在的问题标识。" - -msgid "filter bug ids from list that already refer to this changeset." -msgstr "" - #, python-format msgid "bug %d already knows about changeset %s\n" msgstr "" -msgid "tell bugzilla to send mail." -msgstr "" - msgid "telling bugzilla to send mail:\n" msgstr "" @@ -454,22 +385,10 @@ msgid "done\n" msgstr "完成\n" -msgid "look up numeric bugzilla user id." -msgstr "" - #, python-format msgid "looking up user %s\n" msgstr "" -msgid "map name of committer to bugzilla user name." -msgstr "" - -msgid "" -"see if committer is a registered bugzilla user. Return\n" -" bugzilla username and userid if so. If not, return default\n" -" bugzilla username and userid." -msgstr "" - #, python-format msgid "cannot find bugzilla user id for %s" msgstr "" @@ -478,52 +397,16 @@ msgid "cannot find bugzilla user id for %s or %s" msgstr "" -msgid "" -"add comment to bug. try adding comment as committer of\n" -" changeset, otherwise as default bugzilla user." -msgstr "" - -msgid "support for bugzilla 2.18 series." -msgstr "" - -msgid "support for bugzilla 3.0 series." -msgstr "" - -msgid "" -"return object that knows how to talk to bugzilla version in\n" -" use." -msgstr "" - #, python-format msgid "bugzilla version %s not supported" msgstr "" msgid "" -"find valid bug ids that are referred to in changeset\n" -" comments and that do not already have references to this\n" -" changeset." -msgstr "" - -msgid "update bugzilla bug with reference to changeset." -msgstr "" - -msgid "" -"strip leading prefix of repo root and turn into\n" -" url-safe path." -msgstr "" - -msgid "" "changeset {node|short} in repo {root} refers to bug {bug}.\n" "details:\n" "\t{desc|tabindent}" msgstr "" -msgid "" -"add comment to bugzilla for each changeset that refers to a\n" -" bugzilla bug id. only add a comment once per bug, so same change\n" -" seen multiple times does not fill bug with duplicate data." -msgstr "" - #, python-format msgid "python mysql support not available: %s" msgstr "" @@ -536,27 +419,36 @@ msgid "database error: %s" msgstr "" -msgid "" -"show the children of the given or working dir revision\n" -"\n" -" Print the children of the working directory's revisions.\n" -" If a revision is given via --rev, the children of that revision\n" -" will be printed. If a file argument is given, revision in\n" -" which the file was last changed (after the working directory\n" -" revision or the argument to --rev if given) is printed.\n" -" " -msgstr "" - -msgid "show children of the specified rev" -msgstr "" +#, fuzzy +msgid "display children changesets" +msgstr "列出修改集" + +#, fuzzy +msgid "" +"show the children of the given or working directory revision\n" +"\n" +" Print the children of the working directory's revisions. If a\n" +" revision is given via -r/--rev, the children of that revision will\n" +" be printed. If a file argument is given, revision in which the\n" +" file was last changed (after the working directory revision or the\n" +" argument to --rev if given) is printed.\n" +" " +msgstr "" +"显示工作目录或指定版本的父亲\n" +"\n" +" 显示工作目录的父亲版本。如果使用 '--rev' 指定版本，就显示此版本的\n" +" 父亲。如果指定了文件，那么使用此文件最后修改的版本(工作目录的起源\n" +" 版本，或 '--rev' 指定的版本)。\n" +" " + +#, fuzzy +msgid "show children of the specified revision" +msgstr "从指定的版本显示父亲" msgid "hg children [-r REV] [FILE]" msgstr "" -msgid "command to show certain statistics about revision history" -msgstr "" - -msgid "Calculate stats" +msgid "display statistics about repository history" msgstr "" #, python-format @@ -564,18 +456,21 @@ msgstr "" #, python-format -msgid "\rgenerating stats: %d%%" -msgstr "" - -msgid "" -"graph count of revisions grouped by template\n" -"\n" -" Will graph count of changed lines or revisions grouped by template or\n" -" alternatively by date, if dateformat is used. In this case it will " -"override\n" -" template.\n" -"\n" -" By default statistics are counted for number of changed lines.\n" +msgid "generating stats: %d%%" +msgstr "" + +msgid "" +"histogram of changes to the repository\n" +"\n" +" This command will display a histogram representing the number\n" +" of changed lines or revisions, grouped according to the given\n" +" template. The default template will group changes by author.\n" +" The --dateformat option may be used to group the results by\n" +" date instead.\n" +"\n" +" Statistics are based on the number of changed lines, or\n" +" alternatively the number of matching revisions if the\n" +" --changesets option is specified.\n" "\n" " Examples:\n" "\n" @@ -591,9 +486,14 @@ " # display count of lines changed in every year\n" " hg churn -f '%Y' -s\n" "\n" -" The map file format used to specify aliases is fairly simple:\n" -"\n" -" <alias email> <actual email>" +" It is possible to map alternate email addresses to a main address\n" +" by providing a file using the following format:\n" +"\n" +" <alias email> <actual email>\n" +"\n" +" Such a file may be specified with the --aliases option, otherwise a\n" +" .hgchurn file will be looked for in the working directory root.\n" +" " msgstr "" #, python-format @@ -603,8 +503,9 @@ msgid "count rate for the specified revision or range" msgstr "" -msgid "count rate for revs matching date spec" -msgstr "" +#, fuzzy +msgid "count rate for revisions matching date spec" +msgstr "显示匹配日期的版本" msgid "template to group changesets" msgstr "" @@ -628,24 +529,20 @@ msgstr "" msgid "" -"add color output to status, qseries, and diff-related commands\n" -"\n" -"This extension modifies the status command to add color to its output to\n" -"reflect file status, the qseries command to add color to reflect patch " -"status\n" -"(applied, unapplied, missing), and to diff-related commands to highlight\n" -"additions, removals, diff headers, and trailing whitespace.\n" -"\n" -"Other effects in addition to color, like bold and underlined text, are also\n" -"available. Effects are rendered with the ECMA-48 SGR control function (aka\n" -"ANSI escape codes). This module also provides the render_text function,\n" -"which can be used to add effects to any text.\n" -"\n" -"To enable this extension, add this to your .hgrc file:\n" -"[extensions]\n" -"color =\n" -"\n" -"Default effects my be overriden from the .hgrc file:\n" +"colorize output from some commands\n" +"\n" +"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" +"patch status (applied, unapplied, missing), and to diff-related\n" +"commands to highlight additions, removals, diff headers, and trailing\n" +"whitespace.\n" +"\n" +"Other effects in addition to color, like bold and underlined text, are\n" +"also available. Effects are rendered with the ECMA-48 SGR control\n" +"function (aka ANSI escape codes). This module also provides the\n" +"render_text function, which can be used to add effects to any text.\n" +"\n" +"Default effects may be overridden from the .hgrc file:\n" "\n" "[color]\n" "status.modified = blue bold underline red_background\n" @@ -674,37 +571,13 @@ "diff.trailingwhitespace = bold red_background\n" msgstr "" -msgid "Wrap text in commands to turn on each effect." -msgstr "" - -msgid "run the status command with colored output" -msgstr "" - -msgid "run the qseries command with colored output" -msgstr "" - -msgid "wrap ui.write for colored diff output" -msgstr "" - -msgid "wrap cmdutil.changeset_printer.showpatch with colored output" -msgstr "" - -msgid "run the diff command with colored output" -msgstr "" - -msgid "Initialize the extension." -msgstr "" - -msgid "patch in command to command table and load effect map" -msgstr "" - msgid "when to colorize (always, auto, or never)" msgstr "" msgid "don't colorize output" msgstr "" -msgid "converting foreign VCS repositories to Mercurial" +msgid "import from foreign VCS repositories into Mercurial" msgstr "" msgid "" @@ -725,33 +598,44 @@ " - Mercurial [hg]\n" " - Subversion [svn] (history on branches is not preserved)\n" "\n" -" If no revision is given, all revisions will be converted. Otherwise,\n" -" convert will only import up to the named revision (given in a format\n" -" understood by the source).\n" +" If no revision is given, all revisions will be converted.\n" +" Otherwise, convert will only import up to the named revision\n" +" (given in a format understood by the source).\n" "\n" " 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.\n" "\n" +" By default, all sources except Mercurial will use\n" +" --branchsort. Mercurial uses --sourcesort to preserve original\n" +" revision numbers order. Sort modes have the following effects:\n" +" --branchsort: convert from parent to child revision when\n" +" possible, which means branches are usually converted one after\n" +" the other. It generates more compact repositories.\n" +" --datesort: sort revisions by date. Converted repositories have\n" +" good-looking changelogs but are often an order of magnitude\n" +" larger than the same ones generated by --branchsort.\n" +" --sourcesort: try to preserve source revisions order, only\n" +" supported by Mercurial sources.\n" +"\n" " If <REVMAP> isn't given, it will be put in a default location\n" -" (<dest>/.hg/shamap by default). The <REVMAP> is a simple text\n" -" file that maps each source commit ID to the destination ID for\n" -" that revision, like so:\n" +" (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n" +" that maps each source commit ID to the destination ID for that\n" +" revision, like so:\n" " <source ID> <destination ID>\n" "\n" -" If the file doesn't exist, it's automatically created. It's updated\n" -" on each commit copied, so convert-repo can be interrupted and can\n" -" be run repeatedly to copy new commits.\n" -"\n" -" The [username mapping] file is a simple text file that maps each source\n" -" commit 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 author\n" -" mapping and the line format is:\n" +" 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" +" and can be run repeatedly to copy new commits.\n" +"\n" +" 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\n" "\n" " The filemap is a file that allows filtering and remapping of files\n" -" and directories. Comment lines start with '#'. Each line can\n" +" and directories. Comment lines start with '#'. Each line can\n" " contain one of the following directives:\n" "\n" " include path/to/file\n" @@ -762,33 +646,44 @@ "\n" " 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 dirs not explicitely included.\n" +" exclusion of all other files and directories not explicitly included.\n" " The 'exclude' directive causes files or directories to be omitted.\n" -" The 'rename' directive renames a file or directory. To rename from a\n" -" subdirectory into the root of the repository, use '.' as the path to\n" -" rename to.\n" +" The 'rename' directive renames a file or directory. To rename from\n" +" a subdirectory into the root of the repository, use '.' as the\n" +" path to rename to.\n" "\n" " The splicemap is a file that allows insertion of synthetic\n" -" history, letting you specify the parents of a revision. This is\n" +" history, letting you specify the parents of a revision. This is\n" " 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" +" graft two disconnected series of history together. Each entry\n" " contains a key, followed by a space, followed by one or two\n" -" values, separated by spaces. The key is the revision ID in the\n" -" source revision control system whose parents should be modified\n" -" (same format as a key in .hg/shamap). The values are the revision\n" -" IDs (in either the source or destination revision control system)\n" -" that should be used as the new parents for that node.\n" +" comma-separated values. 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.\n" +"\n" +" The branchmap is a file that allows you to rename a branch when it is\n" +" being brought in from whatever external repository. When used in\n" +" 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.\n" "\n" " Mercurial Source\n" " -----------------\n" "\n" -" --config convert.hg.ignoreerrors=False (boolean)\n" +" --config convert.hg.ignoreerrors=False (boolean)\n" " ignore integrity errors when reading. Use it to fix Mercurial\n" " repositories with missing revlogs, by converting from and to\n" " Mercurial.\n" -" --config convert.hg.saverev=False (boolean)\n" -" store original revision ID in changeset (forces target IDs to " -"change)\n" +" --config convert.hg.saverev=False (boolean)\n" +" store original revision ID in changeset (forces target IDs to\n" +" change)\n" " --config convert.hg.startrev=0 (hg revision identifier)\n" " convert start revision and its descendants\n" "\n" @@ -797,12 +692,12 @@ "\n" " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" " to indicate the starting point of what will be converted. Direct\n" -" access to the repository files is not needed, unless of course\n" -" the repository is :local:. The conversion uses the top level\n" -" directory in the sandbox to find the CVS repository, and then uses\n" -" CVS rlog commands to find files to convert. This means that unless\n" -" a filemap is given, all files under the starting directory will be\n" -" converted, and that any directory reorganisation in the CVS\n" +" access to the repository files is not needed, unless of course the\n" +" repository is :local:. The conversion uses the top level directory\n" +" in the sandbox to find the CVS repository, and then uses CVS rlog\n" +" commands to find files to convert. This means that unless a\n" +" filemap is given, all files under the starting directory will be\n" +" converted, and that any directory reorganization in the CVS\n" " sandbox is ignored.\n" "\n" " Because CVS does not have changesets, it is necessary to collect\n" @@ -810,46 +705,52 @@ " source uses its internal changeset merging code by default but can\n" " be configured to call the external 'cvsps' program by setting:\n" " --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n" -" This is a legacy option and may be removed in future.\n" +" This option is deprecated and will be removed in Mercurial 1.4.\n" "\n" " The options shown are the defaults.\n" "\n" " Internal cvsps is selected by setting\n" " --config convert.cvsps=builtin\n" " and has a few more configurable options:\n" -" --config convert.cvsps.fuzz=60 (integer)\n" -" Specify the maximum time (in seconds) that is allowed between\n" -" commits with identical user and log message in a single\n" -" changeset. When very large files were checked in as part\n" -" of a changeset then the default may not be long enough.\n" +" --config convert.cvsps.cache=True (boolean)\n" +" Set to False to disable remote log caching, for testing and\n" +" debugging purposes.\n" +" --config convert.cvsps.fuzz=60 (integer)\n" +" Specify the maximum time (in seconds) that is allowed\n" +" between commits with identical user and log message in a\n" +" single changeset. When very large files were checked in as\n" +" part of a changeset then the default may not be long\n" +" enough.\n" " --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n" -" Specify a regular expression to which commit log messages are\n" -" matched. If a match occurs, then the conversion process will\n" -" insert a dummy revision merging the branch on which this log\n" -" message occurs to the branch indicated in the regex.\n" +" Specify a regular expression to which commit log messages\n" +" are matched. If a match occurs, then the conversion\n" +" process will insert a dummy revision merging the branch on\n" +" which this log message occurs to the branch indicated in\n" +" the regex.\n" " --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n" -" 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.\n" -"\n" -" The hgext/convert/cvsps wrapper script allows the builtin changeset\n" -" merging code to be run without doing a conversion. Its parameters and\n" -" output are similar to that of cvsps 2.1.\n" +" Specify a regular expression to which commit log messages\n" +" are matched. If a match occurs, then the conversion\n" +" process will add the most recent revision on the branch\n" +" indicated in the regex as the second parent of the\n" +" changeset.\n" +"\n" +" The hgext/convert/cvsps wrapper script allows the builtin\n" +" changeset merging code to be run without doing a conversion. Its\n" +" parameters and output are similar to that of cvsps 2.1.\n" "\n" " Subversion Source\n" " -----------------\n" "\n" " Subversion source detects classical trunk/branches/tags layouts.\n" " By default, the supplied \"svn://repo/path/\" source URL is\n" -" converted as a single branch. If \"svn://repo/path/trunk\" exists\n" -" it replaces the default branch. If \"svn://repo/path/branches\"\n" -" exists, its subdirectories are listed as possible branches. If\n" +" converted as a single branch. If \"svn://repo/path/trunk\" exists it\n" +" replaces the default branch. If \"svn://repo/path/branches\" exists,\n" +" its subdirectories are listed as possible branches. If\n" " \"svn://repo/path/tags\" exists, it is looked for tags referencing\n" " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n" -" can be overriden with following options. Set them to paths\n" -" relative to the source URL, or leave them blank to disable\n" -" autodetection.\n" +" can be overridden with following options. Set them to paths\n" +" relative to the source URL, or leave them blank to disable auto\n" +" detection.\n" "\n" " --config convert.svn.branches=branches (directory name)\n" " specify the directory containing branches\n" @@ -868,16 +769,17 @@ " Perforce Source\n" " ---------------\n" "\n" -" The Perforce (P4) importer can be given a p4 depot path or a client\n" -" specification as source. It will convert all files in the source to\n" -" a flat Mercurial repository, ignoring labels, branches and integrations.\n" -" Note that when a depot path is given you then usually should specify a\n" -" target directory, because otherwise the target may be named ...-hg.\n" -"\n" -" It is possible to limit the amount of source history to be converted\n" -" by specifying an initial Perforce revision.\n" -"\n" -" --config convert.p4.startrev=0 (perforce changelist number)\n" +" The Perforce (P4) importer can be given a p4 depot path or a\n" +" client specification as source. It will convert all files in the\n" +" source to a flat Mercurial repository, ignoring labels, branches\n" +" and integrations. Note that when a depot path is given you then\n" +" usually should specify a target directory, because otherwise the\n" +" target may be named ...-hg.\n" +"\n" +" It is possible to limit the amount of source history to be\n" +" converted by specifying an initial Perforce revision.\n" +"\n" +" --config convert.p4.startrev=0 (perforce changelist number)\n" " specify initial Perforce revision.\n" "\n" "\n" @@ -897,12 +799,14 @@ msgid "" "create changeset information from CVS\n" "\n" -" This command is intended as a debugging tool for the CVS to Mercurial\n" -" converter, and can be used as a direct replacement for cvsps.\n" -"\n" -" Hg debugcvsps reads the CVS rlog for current directory (or any named\n" -" directory) in the CVS repository, and converts the log to a series of\n" -" changesets based on matching commit log entries and dates." +" This command is intended as a debugging tool for the CVS to\n" +" Mercurial converter, and can be used as a direct replacement for\n" +" cvsps.\n" +"\n" +" Hg debugcvsps reads the CVS rlog for current directory (or any\n" +" named directory) in the CVS repository, and converts the log to a\n" +" series of changesets based on matching commit log entries and\n" +" dates." msgstr "" msgid "username mapping filename" @@ -923,9 +827,18 @@ msgid "splice synthesized history into place" msgstr "" +msgid "change branch names while converting" +msgstr "" + +msgid "try to sort changesets by branches" +msgstr "" + msgid "try to sort changesets by date" msgstr "" +msgid "preserve source changesets order" +msgstr "" + msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]" msgstr "" @@ -962,6 +875,14 @@ msgid "hg debugcvsps [OPTION]... [PATH]..." msgstr "" +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 "" + #, python-format msgid "%s is not a valid revision in current branch" msgstr "" @@ -971,6 +892,10 @@ msgstr "" #, python-format +msgid "%s.%s symlink has no target" +msgstr "" + +#, python-format msgid "cannot find required \"%s\" tool" msgstr "" @@ -987,6 +912,10 @@ msgstr "" #, python-format +msgid "syntax error in %s(%d): key/value pair expected" +msgstr "" + +#, python-format msgid "could not open map file %r: %s" msgstr "" @@ -1002,6 +931,10 @@ msgid "%s: unknown repository type" msgstr "" +#, fuzzy, python-format +msgid "unknown sort mode: %s" +msgstr "hg: 未知命令 '%s'\n" + #, python-format msgid "cycle detected between %s and %s" msgstr "" @@ -1014,7 +947,7 @@ msgstr "" #, python-format -msgid "Overriding mapping for author %s, was %s, will be %s\n" +msgid "Ignoring bad line in author map file %s: %s\n" msgstr "" #, python-format @@ -1022,7 +955,7 @@ msgstr "" #, python-format -msgid "Ignoring bad line in author map file %s: %s\n" +msgid "overriding mapping for author %s, was %s, will be %s\n" msgstr "" #, python-format @@ -1046,6 +979,17 @@ msgid "assuming destination %s\n" msgstr "" +msgid "more than one sort mode specified" +msgstr "" + +msgid "--sourcesort is not supported by this data source" +msgstr "" + +msgid "" +"warning: support for external cvsps is deprecated and will be removed in " +"Mercurial 1.4\n" +msgstr "" + #, python-format msgid "revision %s is not a patchset number or date" msgstr "" @@ -1110,6 +1054,10 @@ msgid "revision must be followed by date line" msgstr "" +#, fuzzy, python-format +msgid "found synthetic revision in %s: %r\n" +msgstr "版本 %d 有未知路径: %s\n" + #, python-format msgid "writing cvs log cache %s\n" msgstr "" @@ -1121,6 +1069,15 @@ msgid "creating changesets\n" msgstr "" +msgid "synthetic changeset cannot have multiple parents" +msgstr "" + +#, python-format +msgid "" +"warning: CVS commit message references non-existent branch %r:\n" +"%s\n" +msgstr "" + #, python-format msgid "%d changeset entries\n" msgstr "" @@ -1178,7 +1135,7 @@ msgstr "" #, python-format -msgid "analysing revision %s...\n" +msgid "analyzing revision %s...\n" msgstr "" #, python-format @@ -1203,6 +1160,9 @@ msgid "pulling from %s into %s\n" msgstr "自 %s 拉到 %s\n" +msgid "filtering out empty revision\n" +msgstr "" + msgid "updating tags\n" msgstr "正在更新标签\n" @@ -1224,8 +1184,8 @@ msgid "%s does not look like a monotone repo" msgstr "%s 不像是单纯的 monotone 版本库" -#, python-format -msgid "copying file in renamed dir from '%s' to '%s'" +#, fuzzy, python-format +msgid "copying file in renamed directory from '%s' to '%s'" msgstr "从已改名的目录 '%s' 复制文件到 '%s'" msgid "reading p4 views\n" @@ -1272,7 +1232,8 @@ msgid "found branch %s at %d\n" msgstr "发现分支 %s 位于 %d\n" -msgid "svn: start revision is not supported with with more than one branch" +#, fuzzy +msgid "svn: start revision is not supported with more than one branch" msgstr "svn: 在给出多于一个分支时不支持开始版本" #, python-format @@ -1307,21 +1268,10 @@ msgid "gone from %s\n" msgstr "离开 %s\n" -#, python-format -msgid "found parent directory %s\n" -msgstr "发现父目录 %s\n" - -#, python-format -msgid "base, entry %s %s\n" +#, fuzzy, python-format +msgid "entry %s\n" msgstr "基本，入口 %s %s\n" -msgid "munge-o-matic\n" -msgstr "" - -#, python-format -msgid "info: %s %s %s %s\n" -msgstr "信息: %s %s %s %s\n" - #, python-format msgid "unknown path in revision %d: %s\n" msgstr "版本 %d 有未知路径: %s\n" @@ -1346,10 +1296,6 @@ msgstr "为 \"%s\" 获取版本日志，自 %d 到 %d\n" #, python-format -msgid "skipping blacklisted revision %d\n" -msgstr "忽略黑名单版本 %d\n" - -#, python-format msgid "revision %d has no entries\n" msgstr "版本 %d 没有入口\n" @@ -1379,18 +1325,14 @@ msgstr "" msgid "" +"allow external programs to compare revisions\n" "\n" "The `extdiff' Mercurial extension allows you to use external programs\n" -"to compare revisions, or revision with working dir. The external diff\n" +"to compare revisions, or revision with working directory. The external diff\n" "programs are called with a configurable set of options and two\n" "non-option arguments: paths to directories containing snapshots of\n" "files to compare.\n" "\n" -"To enable this extension:\n" -"\n" -" [extensions]\n" -" hgext.extdiff =\n" -"\n" "The `extdiff' extension also allows to configure new diff commands, so\n" "you do not need to type \"hg extdiff -p kdiff3\" always.\n" "\n" @@ -1408,42 +1350,23 @@ " meld =\n" "\n" " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n" -" #(see http://www.vim.org/scripts/script.php?script_id=102)\n" -" # Non english user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n" +" # (see http://www.vim.org/scripts/script.php?script_id=102)\n" +" # Non English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n" " # your .vimrc\n" " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n" "\n" -"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 "" - -msgid "snapshot files as of some revision" +"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" msgstr "" #, python-format msgid "making snapshot of %d files from rev %s\n" msgstr "" -msgid "" -"snapshot files from working directory.\n" -" if not using snapshot, -I/-X does not work and recursive diff\n" -" in tools like kdiff3 and meld displays too many files." -msgstr "" - -#, python-format -msgid "making snapshot of %d files from working dir\n" -msgstr "" - -msgid "" -"Do the actuall diff:\n" -"\n" -" - copy to a temp structure if diffing 2 internal revisions\n" -" - copy to a temp structure if diffing working revision with\n" -" another one and more than 1 file is changed\n" -" - just invoke the diff for a single file in the working dir\n" -" " +#, python-format +msgid "making snapshot of %d files from working directory\n" msgstr "" msgid "cannot specify --rev and --change at the same time" @@ -1464,19 +1387,19 @@ "use external program to diff repository (or selected files)\n" "\n" " Show differences between revisions for the specified files, using\n" -" an external program. The default program used is diff, with\n" +" an external program. The default program used is diff, with\n" " default options \"-Npru\".\n" "\n" -" To select a different program, use the -p option. The program\n" -" will be passed the names of two directories to compare. To pass\n" -" additional options to the program, use the -o option. These will\n" -" be passed before the names of the directories to compare.\n" -"\n" -" When two revision arguments are given, then changes are\n" -" shown between those revisions. If only one revision is\n" -" specified then that revision is compared to the working\n" -" directory, and, when no revisions are specified, the\n" -" working directory files are compared to its parent." +" To select a different program, use the -p/--program option. The\n" +" program will be passed the names of two directories to compare. To\n" +" pass additional options to the program, use -o/--option. These\n" +" will be passed before the names of the directories to compare.\n" +"\n" +" When two revision arguments are given, then changes are shown\n" +" between those revisions. If only one revision is specified then\n" +" that revision is compared to the working directory, and, when no\n" +" revisions are specified, the working directory files are compared\n" +" to its parent." msgstr "" msgid "comparison program to run" @@ -1491,14 +1414,11 @@ msgid "hg extdiff [OPT]... [FILE]..." msgstr "" -msgid "use closure to save diff command to use" -msgstr "" - #, python-format msgid "hg %s [OPTION]... [FILE]..." msgstr "" -msgid "pulling, updating and merging in one command" +msgid "pull, update and merge in one command" msgstr "" msgid "" @@ -1507,13 +1427,14 @@ " This finds all changes from the repository at the specified path\n" " or URL and adds them to the local repository.\n" "\n" -" If the pulled changes add a new branch head, the head is automatically\n" -" merged, and the result of the merge is committed. Otherwise, the\n" -" working directory is updated to include the new changes.\n" +" If the pulled changes add a new branch head, the head is\n" +" automatically merged, and the result of the merge is committed.\n" +" Otherwise, the working directory is updated to include the new\n" +" changes.\n" "\n" " When a merge occurs, the newly pulled changes are assumed to be\n" -" \"authoritative\". The head of the new changes is used as the first\n" -" parent, with local changes as the second. To switch the merge\n" +" \"authoritative\". The head of the new changes is used as the first\n" +" parent, with local changes as the second. To switch the merge\n" " order, use --switch-parent.\n" "\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" @@ -1541,7 +1462,9 @@ msgid "pulling from %s\n" msgstr "正在拉自 %s\n" -msgid "fetch -r doesn't work for remote repositories yet" +msgid "" +"Other repository doesn't support revision lookup, so a rev cannot be " +"specified." msgstr "" #, python-format @@ -1581,25 +1504,13 @@ msgid "hg fetch [SOURCE]" msgstr "" -msgid " returns of the good and bad signatures" -msgstr "" +#, fuzzy +msgid "sign and verify changesets" +msgstr "正在增加修改集\n" msgid "error while verifying signature" msgstr "" -msgid "create a new gpg instance" -msgstr "" - -msgid "" -"\n" -" walk over every sigs, yields a couple\n" -" ((node, version, sig), (filename, linenumber))\n" -" " -msgstr "" - -msgid "get the keys who signed a data" -msgstr "" - #, python-format msgid "%s Bad signature from \"%s\"\n" msgstr "" @@ -1626,9 +1537,6 @@ msgid "No valid signature for %s\n" msgstr "" -msgid "associate a string to a key (username, comment)" -msgstr "" - msgid "" "add a signature for the current or given revision\n" "\n" @@ -1654,9 +1562,6 @@ msgid "Added signature for changeset %s" msgstr "" -msgid "map a manifest into some text" -msgstr "" - msgid "unknown signature version" msgstr "" @@ -1685,59 +1590,13 @@ msgstr "" msgid "" -"show revision graphs in terminal windows\n" +"show revision graphs in terminals\n" "\n" "This extension adds a --graph option to the incoming, outgoing and log\n" -"commands. When this options is given, an ascii representation of the\n" +"commands. When this options is given, an ASCII representation of the\n" "revision graph is also shown.\n" msgstr "" -msgid "" -"cset DAG generator yielding (rev, node, [parents]) tuples\n" -"\n" -" This generator function walks through the revision history from revision\n" -" start to revision stop (which must be less than or equal to start).\n" -" " -msgstr "" - -msgid "" -"file cset DAG generator yielding (rev, node, [parents]) tuples\n" -"\n" -" This generator function walks through the revision history of a single\n" -" file from revision start to revision stop (which must be less than or\n" -" equal to start).\n" -" " -msgstr "" - -msgid "" -"grapher for asciigraph on a list of nodes and their parents\n" -"\n" -" nodes must generate tuples (node, parents, char, lines) where\n" -" - parents must generate the parents of node, in sorted order,\n" -" and max length 2,\n" -" - char is the char to print as the node symbol, and\n" -" - lines are the lines to display next to the node.\n" -" " -msgstr "" - -msgid "" -"prints an ASCII graph of the DAG returned by the grapher\n" -"\n" -" grapher is a generator that emits tuples with the following elements:\n" -"\n" -" - Character to use as node's symbol.\n" -" - List of lines to display as the node's text.\n" -" - Column of the current node in the set of ongoing edges.\n" -" - Edges; a list of (col, next_col) indicating the edges between\n" -" the current node and its parents.\n" -" - Number of columns (ongoing edges) in the current revision.\n" -" - The difference between the number of columns (ongoing edges)\n" -" in the next revision and the number of columns (ongoing edges)\n" -" in the current revision. That is: -1 means one column removed;\n" -" 0 means no columns added or removed; 1 means one column added.\n" -" " -msgstr "" - #, python-format msgid "--graph option is incompatible with --%s" msgstr "" @@ -1753,17 +1612,6 @@ " " msgstr "" -msgid "" -"show the outgoing changesets alongside an ASCII revision graph\n" -"\n" -" Print the outgoing changesets alongside a revision graph drawn with\n" -" ASCII characters.\n" -"\n" -" Nodes printed as an @ character are parents of the working\n" -" directory.\n" -" " -msgstr "" - #, python-format msgid "comparing with %s\n" msgstr "" @@ -1771,20 +1619,6 @@ msgid "no changes found\n" msgstr "没有发现修改\n" -msgid "" -"show the incoming changesets alongside an ASCII revision graph\n" -"\n" -" Print the incoming changesets alongside a revision graph drawn with\n" -" ASCII characters.\n" -"\n" -" Nodes printed as an @ character are parents of the working\n" -" directory.\n" -" " -msgstr "" - -msgid "wrap the command" -msgstr "" - msgid "show the revision DAG" msgstr "显示版本分支图" @@ -1801,7 +1635,7 @@ msgstr "" msgid "" -"CIA notification\n" +"integrate Mercurial with a CIA notification service\n" "\n" "This is meant to be run as a changegroup or incoming hook.\n" "To configure it, set the following options in your hgrc:\n" @@ -1816,8 +1650,7 @@ "# Append a diffstat to the log message (optional)\n" "#diffstat = False\n" "# Template to use for log messages (optional)\n" -"#template = {desc}\n" -"{baseurl}/rev/{node}-- {diffstat}\n" +"#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n" "# Style to use (optional)\n" "#style = foo\n" "# The URL of the CIA notification service (optional)\n" @@ -1838,19 +1671,10 @@ "baseurl = http://server/path/to/repo\n" msgstr "" -msgid " A CIA message " -msgstr "" - -msgid " CIA notification class " -msgstr "" - #, python-format msgid "hgcia: sending update to %s\n" msgstr "" -msgid " send CIA notification " -msgstr "" - msgid "email.from must be defined when sending by email" msgstr "" @@ -1861,33 +1685,21 @@ msgstr "" msgid "" -"browsing the repository in a graphical way\n" +"browse the repository in a graphical way\n" "\n" "The hgk extension allows browsing the history of a repository in a\n" -"graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is\n" -"not distributed with Mercurial.)\n" +"graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n" +"distributed with Mercurial.)\n" "\n" "hgk consists of two parts: a Tcl script that does the displaying and\n" -"querying of information, and an extension to mercurial named hgk.py,\n" +"querying of information, and an extension to Mercurial named hgk.py,\n" "which provides hooks for hgk to get information. hgk can be found in\n" -"the contrib directory, and hgk.py can be found in the hgext directory.\n" -"\n" -"To load the hgext.py extension, add it to your .hgrc file (you have\n" -"to use your global $HOME/.hgrc file, not one in a repository). You\n" -"can specify an absolute path:\n" -"\n" -" [extensions]\n" -" hgk=/usr/local/lib/hgk.py\n" -"\n" -"Mercurial can also scan the default python library path for a file\n" -"named 'hgk.py' if you set hgk empty:\n" -"\n" -" [extensions]\n" -" hgk=\n" +"the contrib directory, and the extension is shipped in the hgext\n" +"repository, and needs to be enabled.\n" "\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\n" -"specify the path to hgk in your .hgrc file:\n" +"to work, hgk must be in your search path. Alternately, you can specify\n" +"the path to hgk in your .hgrc file:\n" "\n" " [hgk]\n" " path=/location/of/hgk\n" @@ -1984,16 +1796,11 @@ msgstr "" msgid "" -"syntax highlighting in hgweb, based on Pygments\n" -"\n" -"It depends on the pygments syntax highlighting library:\n" +"syntax highlighting for hgweb\n" +"\n" +"It depends on the Pygments syntax highlighting library:\n" "http://pygments.org/\n" "\n" -"To enable the extension add this to hgrc:\n" -"\n" -"[extensions]\n" -"hgext.highlight =\n" -"\n" "There is a single configuration option:\n" "\n" "[web]\n" @@ -2004,12 +1811,37 @@ "-- Adam Hupp <adam@hupp.org>\n" msgstr "" -msgid "inotify-based status acceleration for Linux systems\n" +msgid "accelerate status report using system level services" msgstr "" msgid "start an inotify server for this repository" msgstr "为此版本库启动服务 'inotify'" +msgid "" +"debugging information for inotify extension\n" +"\n" +" Prints the list of directories being watched by the inotify server.\n" +" " +msgstr "" + +msgid "directories being watched:\n" +msgstr "" + +msgid "run server in background" +msgstr "在后台运行服务" + +msgid "used internally by daemon mode" +msgstr "在后台服务模式内部使用" + +msgid "minutes to sit idle before exiting" +msgstr "空闲几分钟后退出" + +msgid "name of file to write process ID to" +msgstr "写入进程标识符的文件名称" + +msgid "hg inserve [OPT]..." +msgstr "" + msgid "(found dead inotify server socket; removing it)\n" msgstr "" @@ -2031,25 +1863,17 @@ msgid "failed to contact inotify server: %s\n" msgstr "" -msgid "run server in background" -msgstr "在后台运行服务" - -msgid "used internally by daemon mode" -msgstr "在后台服务模式内部使用" - -msgid "minutes to sit idle before exiting" -msgstr "空闲几分钟后退出" - -msgid "name of file to write process ID to" -msgstr "写入进程标识符的文件名称" - -msgid "hg inserve [OPT]..." +msgid "received empty answer from inotify server" msgstr "" #, python-format msgid "(inotify: received response from incompatible server version %d)\n" msgstr "" +#, python-format +msgid "(inotify: received '%s' response when expecting '%s')\n" +msgstr "" + msgid "this system does not seem to support inotify" msgstr "" @@ -2143,29 +1967,39 @@ msgstr "" #, python-format -msgid "%s processing %d deferred events as %d\n" -msgstr "" - -#, python-format msgid "could not start server: %s" msgstr "" #, python-format +msgid "answering query for %r\n" +msgstr "" + +#, python-format msgid "received query from incompatible client version %d\n" msgstr "" #, python-format -msgid "answering query for %r\n" +msgid "unrecognized query type: %s\n" msgstr "" msgid "finished setup\n" msgstr "" -msgid "polling: no timeout\n" -msgstr "" - -#, python-format -msgid "polling: %sms timeout\n" +msgid "" +"expand expressions into changelog and summaries\n" +"\n" +"This extension allows the use of a special syntax in summaries,\n" +"which will be automatically expanded into links or any other\n" +"arbitrary expression, much like InterWiki does.\n" +"\n" +"A few example patterns (link to bug tracking, etc.) that may\n" +"be used in your hgrc:\n" +"\n" +" [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" +" boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n" msgstr "" #, python-format @@ -2177,17 +2011,17 @@ msgstr "" msgid "" -"keyword expansion in local repositories\n" -"\n" -"This extension expands RCS/CVS-like or self-customized $Keywords$\n" -"in tracked text files selected by your configuration.\n" -"\n" -"Keywords are only expanded in local repositories and not stored in\n" -"the change history. The mechanism can be regarded as a convenience\n" -"for the current user or for archive distribution.\n" -"\n" -"Configuration is done in the [keyword] and [keywordmaps] sections\n" -"of hgrc files.\n" +"expand keywords in tracked files\n" +"\n" +"This extension expands RCS/CVS-like or self-customized $Keywords$ in\n" +"tracked text files selected by your configuration.\n" +"\n" +"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.\n" +"\n" +"Configuration is done in the [keyword] and [keywordmaps] sections of\n" +"hgrc files.\n" "\n" "Example:\n" "\n" @@ -2197,96 +2031,40 @@ " x* = ignore\n" "\n" "Note: the more specific you are in your filename patterns\n" -" the less you lose speed in huge repos.\n" +" the less you lose speed in huge repositories.\n" "\n" "For [keywordmaps] template mapping and expansion demonstration and\n" "control run \"hg kwdemo\".\n" "\n" "An additional date template filter {date|utcdate} is provided.\n" "\n" -"The default template mappings (view with \"hg kwdemo -d\") can be replaced\n" -"with customized keywords and templates.\n" -"Again, run \"hg kwdemo\" to control the results of your config changes.\n" +"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.\n" "\n" "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n" -"the risk of inadvertedly storing expanded keywords in the change history.\n" +"the risk of inadvertently storing expanded keywords in the change\n" +"history.\n" "\n" "To force expansion after enabling it, or a configuration change, run\n" "\"hg kwexpand\".\n" "\n" -"Also, when committing with the record extension or using mq's qrecord, be " -"aware\n" -"that keywords cannot be updated. Again, run \"hg kwexpand\" on the files in\n" -"question to update keyword expansions after all changes have been checked " -"in.\n" +"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.\n" "\n" "Expansions spanning more than one line and incremental expansions,\n" "like CVS' $Log$, are not supported. A keyword template map\n" "\"Log = {desc}\" expands to the first line of the changeset description.\n" msgstr "" -msgid "Returns hgdate in cvs-like UTC format." -msgstr "" - -msgid "" -"\n" -" Sets up keyword templates, corresponding keyword regex, and\n" -" provides keyword substitution functions.\n" -" " -msgstr "" - -msgid "Replaces keywords in data with expanded template." -msgstr "" - -msgid "Returns data with keywords expanded." -msgstr "" - -msgid "" -"Returns true if path matches [keyword] pattern\n" -" and is not a symbolic link.\n" -" Caveat: localrepository._link fails on Windows." -msgstr "" - -msgid "Overwrites selected files expanding/shrinking keywords." -msgstr "" - -#, python-format -msgid "overwriting %s %s keywords\n" -msgstr "" - -msgid "Unconditionally removes all keyword substitutions from text." -msgstr "" - -msgid "Returns text with all keyword substitutions removed." -msgstr "" - -msgid "Returns lines with keyword substitutions removed." -msgstr "" - -msgid "" -"If in restricted mode returns data read from wdir with\n" -" keyword substitutions removed." -msgstr "" - -msgid "" -"\n" -" Subclass of filelog to hook into its read, add, cmp methods.\n" -" Keywords are \"stored\" unexpanded, and processed on reading.\n" -" " -msgstr "" - -msgid "Expands keywords when reading filelog." -msgstr "" - -msgid "Removes keyword substitutions when adding to filelog." -msgstr "" - -msgid "Removes keyword substitutions for comparison." -msgstr "" - -msgid "" -"Bails out if [keyword] configuration is not active.\n" -" Returns status of working directory." +#, python-format +msgid "overwriting %s expanding keywords\n" +msgstr "" + +#, python-format +msgid "overwriting %s shrinking keywords\n" msgstr "" msgid "[keyword] patterns cannot match" @@ -2295,17 +2073,14 @@ msgid "no [keyword] patterns configured" msgstr "" -msgid "Selects files and passes them to kwtemplater.overwrite." -msgstr "" - msgid "" "print [keywordmaps] configuration and an expansion example\n" "\n" -" Show current, custom, or default keyword template maps\n" -" and their expansion.\n" -"\n" -" Extend current configuration by specifying maps as arguments\n" -" and optionally by reading from an additional hgrc file.\n" +" Show current, custom, or default keyword template maps and their\n" +" expansions.\n" +"\n" +" Extend current configuration by specifying maps as arguments and\n" +" optionally by reading from an additional hgrc file.\n" "\n" " Override current keyword template maps with \"default\" option.\n" " " @@ -2317,9 +2092,11 @@ "\t%s\n" msgstr "" -#, python-format -msgid "creating temporary repo at %s\n" -msgstr "" +#, fuzzy, python-format +msgid "creating temporary repository at %s\n" +msgstr "" +"\n" +"正在删除临时版本库 %s\n" #, python-format msgid "" @@ -2330,16 +2107,16 @@ msgid "unhooked all commit hooks\n" msgstr "" -#, python-format -msgid "" -"\n" -"removing temporary repo %s\n" +#, fuzzy, python-format +msgid "" +"\n" +"removing temporary repository %s\n" msgstr "" "\n" "正在删除临时版本库 %s\n" msgid "" -"expand keywords in working directory\n" +"expand keywords in the working directory\n" "\n" " Run after (re)enabling keyword expansion.\n" "\n" @@ -2350,52 +2127,22 @@ msgid "" "print files currently configured for keyword expansion\n" "\n" -" Crosscheck which files in working directory are potential targets for\n" -" keyword expansion.\n" -" That is, files matched by [keyword] config patterns but not symlinks.\n" -" " -msgstr "" - -msgid "" -"revert expanded keywords in working directory\n" -"\n" -" Run before changing/disabling active keywords\n" -" or if you experience problems with \"hg import\" or \"hg merge\".\n" +" Crosscheck which files in working directory are potential targets\n" +" for keyword expansion. That is, files matched by [keyword] config\n" +" patterns but not symlinks.\n" +" " +msgstr "" + +msgid "" +"revert expanded keywords in the working directory\n" +"\n" +" Run before changing/disabling active keywords or if you experience\n" +" problems with \"hg import\" or \"hg merge\".\n" "\n" " kwshrink refuses to run if given files contain local changes.\n" " " msgstr "" -msgid "" -"Collects [keyword] config in kwtools.\n" -" Monkeypatches dispatch._parse if needed." -msgstr "" - -msgid "Monkeypatch dispatch._parse to obtain running hg command." -msgstr "" - -msgid "" -"Sets up repo as kwrepo for keyword substitution.\n" -" Overrides file method to return kwfilelog instead of filelog\n" -" if file matches user configuration.\n" -" Wraps commit to overwrite configured files with updated\n" -" keyword substitutions.\n" -" Monkeypatches patch and webcommands." -msgstr "" - -msgid "" -"Monkeypatch/wrap patch.patchfile.__init__ to avoid\n" -" rejects or conflicts due to expanded keywords in working dir." -msgstr "" - -msgid "" -"Monkeypatch patch.diff to avoid expansion except when\n" -" comparing against working dir." -msgstr "" - -msgid "Wraps webcommands.x turning off keyword expansion." -msgstr "" - msgid "show default keyword template maps" msgstr "" @@ -2424,14 +2171,14 @@ msgstr "" msgid "" -"patch management and development\n" +"work with a stack of patches\n" "\n" "This extension lets you work with a stack of patches in a Mercurial\n" -"repository. It manages two stacks of patches - all known patches, and\n" +"repository. It manages two stacks of patches - all known patches, and\n" "applied patches (subset of known patches).\n" "\n" "Known patches are represented as patch files in the .hg/patches\n" -"directory. Applied patches are both patch files and changesets.\n" +"directory. Applied patches are both patch files and changesets.\n" "\n" "Common tasks (use \"hg help command\" for more details):\n" "\n" @@ -2448,17 +2195,6 @@ "refresh contents of top applied patch qrefresh\n" msgstr "" -msgid "" -"Update all references to a field in the patch header.\n" -" If none found, add it email style." -msgstr "" - -msgid "" -"Remove existing message, keeping the rest of the comments fields.\n" -" If comments contains 'subject: ', message will prepend\n" -" the field and a blank line." -msgstr "" - #, python-format msgid "%s appears more than once in %s" msgstr "" @@ -2537,11 +2273,6 @@ msgid "patch %s is not applied\n" msgstr "" -msgid "" -"Apply patchfile to the working directory.\n" -" patchfile: file name of patch" -msgstr "" - msgid "patch failed, unable to continue (try -v)\n" msgstr "" @@ -2549,9 +2280,11 @@ msgid "applying %s\n" msgstr "" -#, python-format -msgid "Unable to read %s\n" -msgstr "" +#, fuzzy, python-format +msgid "unable to read %s\n" +msgstr "" +"解析 '%s' 失败\n" +"%s" #, python-format msgid "imported patch %s\n" @@ -2581,6 +2314,10 @@ msgid "cannot delete revision %d above applied patches" msgstr "" +#, fuzzy, python-format +msgid "patch %s finalized without changeset message\n" +msgstr "只显示无改动文件的状态" + msgid "qdelete requires at least one revision or patch name" msgstr "" @@ -2608,12 +2345,6 @@ msgid "\"%s\" cannot be used as the name of a patch" msgstr "" -msgid "" -"options:\n" -" msg: a string or a no-argument function returning a string\n" -" " -msgstr "" - #, python-format msgid "patch \"%s\" already exists" msgstr "" @@ -2622,9 +2353,6 @@ msgid "error unlinking %s\n" msgstr "" -msgid "returns (index, rev, patch)" -msgstr "" - #, python-format msgid "patch name \"%s\" is ambiguous:\n" msgstr "" @@ -2633,7 +2361,7 @@ msgid "patch %s not in series" msgstr "" -msgid "(working directory not at tip)\n" +msgid "(working directory not at a head)\n" msgstr "" msgid "no patches in series\n" @@ -2752,14 +2480,6 @@ msgid "repo commit failed\n" msgstr "" -msgid "" -"If all_patches is False, return the index of the next pushable patch\n" -" in the series, or the series length. If all_patches is True, return " -"the\n" -" index of the first patch past the last applied one.\n" -" " -msgstr "" - #, python-format msgid "patch %s is already in the series file" msgstr "" @@ -2811,14 +2531,14 @@ msgid "" "remove patches from queue\n" "\n" -" The patches must not be applied, unless they are arguments to\n" -" the --rev parameter. At least one patch or revision is required.\n" -"\n" -" With --rev, mq will stop managing the named revisions (converting\n" -" them to regular mercurial changesets). The qfinish command should be\n" -" used as an alternative for qdel -r, as the latter option is deprecated.\n" -"\n" -" With --keep, the patch files are preserved in the patch directory." +" The patches must not be applied, and at least one patch is\n" +" required.\n" +"\n" +" With -k/--keep, the patch files are preserved in the patch\n" +" directory.\n" +"\n" +" To stop managing a patch and move it into permanent history,\n" +" use the qfinish command." msgstr "" msgid "print the patches already applied" @@ -2827,26 +2547,33 @@ msgid "print the patches not yet applied" msgstr "" +#, fuzzy msgid "" "import a patch\n" "\n" -" The patch is inserted into the series after the last applied patch.\n" -" If no patches have been applied, qimport prepends the patch\n" +" The patch is inserted into the series after the last applied\n" +" patch. If no patches have been applied, qimport prepends the patch\n" " to the series.\n" "\n" " The patch will have the same name as its source file unless you\n" -" give it a new one with --name.\n" -"\n" -" You can register an existing patch inside the patch directory\n" -" with the --existing flag.\n" -"\n" -" With --force, an existing patch of the same name will be overwritten.\n" -"\n" -" An existing changeset may be placed under mq control with --rev\n" +" give it a new one with -n/--name.\n" +"\n" +" You can register an existing patch inside the patch directory with\n" +" the -e/--existing flag.\n" +"\n" +" With -f/--force, an existing patch of the same name will be\n" +" overwritten.\n" +"\n" +" An existing changeset may be placed under mq control with -r/--rev\n" " (e.g. qimport --rev tip -n patch will place tip under mq control).\n" -" With --git, patches imported with --rev will use the git diff\n" +" With -g/--git, patches imported with --rev will use the git diff\n" " format. See the diffs help topic for information on why this is\n" -" important for preserving rename/copy information and permission changes.\n" +" important for preserving rename/copy information and permission\n" +" changes.\n" +"\n" +" 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" @@ -2866,14 +2593,15 @@ " 为什么这对于保留改名/复制信息和权限修改很重要。\n" " " +#, fuzzy msgid "" "init a new queue repository\n" "\n" -" The queue repository is unversioned by default. If -c is\n" -" specified, qinit will create a separate nested repository\n" -" for patches (qinit -c may also be run later to convert\n" -" an unversioned patch repository into a versioned one).\n" -" You can use qcommit to commit changes to this queue repository." +" The queue repository is unversioned by default. If\n" +" -c/--create-repo is specified, qinit will create a separate nested\n" +" repository for patches (qinit -c may also be run later to convert\n" +" an unversioned patch repository into a versioned one). You can use\n" +" qcommit to commit changes to this queue repository." msgstr "" "初始化队列仓库\n" "\n" @@ -2884,16 +2612,16 @@ msgid "" "clone main and patch repository at same time\n" "\n" -" If source is local, destination will have no patches applied. If\n" +" If source is local, destination will have no patches applied. If\n" " source is remote, this command can not check if patches are\n" " applied in source, so cannot guarantee that patches are not\n" -" applied in destination. If you clone remote repository, be sure\n" +" applied in destination. If you clone remote repository, be sure\n" " before that it has no patches applied.\n" "\n" " Source patch repository is looked for in <src>/.hg/patches by\n" -" default. Use -p <url> to change.\n" -"\n" -" The patch directory must be a nested mercurial repository, as\n" +" default. Use -p <url> to change.\n" +"\n" +" The patch directory must be a nested Mercurial repository, as\n" " would be created by qinit -c.\n" " " msgstr "" @@ -2901,17 +2629,20 @@ msgid "versioned patch repository not found (see qinit -c)" msgstr "" -msgid "cloning main repo\n" -msgstr "" - -msgid "cloning patch repo\n" -msgstr "" - -msgid "stripping applied patches from destination repo\n" -msgstr "" - -msgid "updating destination repo\n" -msgstr "" +#, fuzzy +msgid "cloning main repository\n" +msgstr "初始化目标版本库 %s\n" + +msgid "cloning patch repository\n" +msgstr "" + +#, fuzzy +msgid "stripping applied patches from destination repository\n" +msgstr "初始化目标版本库 %s\n" + +#, fuzzy +msgid "updating destination repository\n" +msgstr "初始化目标版本库 %s\n" msgid "commit changes in the queue repository" msgstr "" @@ -2937,40 +2668,44 @@ msgid "" "create a new patch\n" "\n" -" qnew creates a new patch on top of the currently-applied patch (if any).\n" -" It will refuse to run if there are any outstanding changes unless -f is\n" -" specified, in which case the patch will be initialized with them. You\n" -" may also use -I, -X, 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 as\n" -" uncommitted modifications.\n" -"\n" -" -u and -d can be used to set the (given) user and date, respectively.\n" -" -U and -D set user to current user and date to current date.\n" -"\n" -" -e, -m or -l set the patch header as well as the commit message. If none\n" -" is specified, the header is empty and the commit message is '[mq]: " -"PATCH'.\n" -"\n" -" Use the --git option to keep the patch in the git extended diff\n" +" 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" +" -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.\n" +"\n" +" -u/--user and -d/--date can be used to set the (given) user and\n" +" date, respectively. -U/--currentuser and -D/--currentdate set user\n" +" to current user and date to current date.\n" +"\n" +" -e/--edit, -m/--message or -l/--logfile set the patch header as\n" +" well as the commit message. If none is specified, the header is\n" +" empty and the commit message is '[mq]: PATCH'.\n" +"\n" +" 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 "" +#, fuzzy msgid "" "update the current patch\n" "\n" -" If any file patterns are provided, the refreshed patch will contain only\n" -" the modifications that match those patterns; the remaining modifications\n" -" will remain in the working directory.\n" -"\n" -" If --short is specified, files currently included in the patch will\n" -" be refreshed just like matched files and remain in the patch.\n" -"\n" -" hg add/remove/copy/rename work as usual, though you might want to use\n" -" git-style patches (--git or [diff] git=1) to track copies and renames.\n" -" See the diffs help topic for more information on the git diff format.\n" +" If any file patterns are provided, the refreshed patch will\n" +" contain only the modifications that match those patterns; the\n" +" remaining modifications will remain in the working directory.\n" +"\n" +" If -s/--short is specified, files currently included in the patch\n" +" will be refreshed just like matched files and remain in the patch.\n" +"\n" +" 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" " " msgstr "" "更新当前补丁\n" @@ -2988,17 +2723,19 @@ msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" msgstr "" +#, fuzzy msgid "" "diff of the current patch and subsequent modifications\n" "\n" -" Shows a diff which includes the current patch as well as any changes " -"which\n" -" have been made in the working directory since the last refresh (thus\n" -" showing what the current patch would become after a qrefresh).\n" -"\n" -" Use 'hg diff' if you only want to see the changes made since the last\n" -" qrefresh, or 'hg export qtip' if you want to see changes made by the\n" -" current patch without including changes made since the qrefresh.\n" +" Shows a diff which includes the current patch as well as any\n" +" changes which have been made in the working directory since the\n" +" last refresh (thus showing what the current patch would become\n" +" after a qrefresh).\n" +"\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 made\n" +" by the current patch without including changes made since the\n" +" qrefresh.\n" " " msgstr "" "显式当前的补丁和后续的修改\n" @@ -3016,12 +2753,12 @@ " Patches must not yet be applied. Each patch will be successively\n" " applied to the current patch in the order given. If all the\n" " patches apply successfully, the current patch will be refreshed\n" -" with the new cumulative patch, and the folded patches will\n" -" be deleted. With -k/--keep, the folded patch files will not\n" -" be removed afterwards.\n" -"\n" -" The header for each folded patch will be concatenated with\n" -" the current patch header, separated by a line of '* * *'." +" with the new cumulative patch, and the folded patches will be\n" +" deleted. With -k/--keep, the folded patch files will not be\n" +" removed afterwards.\n" +"\n" +" The header for each folded patch will be concatenated with the\n" +" current patch header, separated by a line of '* * *'." msgstr "" msgid "qfold requires at least one patch name" @@ -3076,11 +2813,12 @@ msgid "print the header of the topmost or specified patch" msgstr "" +#, fuzzy msgid "" "push the next patch onto the stack\n" "\n" -" When --force is applied, all local changes in patched files will be " -"lost.\n" +" When -f/--force is applied, all local changes in patched files\n" +" will be lost.\n" " " msgstr "" "将下个补丁压入堆栈\n" @@ -3095,12 +2833,13 @@ msgid "merging with queue at: %s\n" msgstr "" +#, fuzzy msgid "" "pop the current patch off the stack\n" "\n" -" By default, pops off the top of the patch stack. If given a patch name,\n" -" keeps popping off patches until the named patch is at the top of the " -"stack.\n" +" 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" @@ -3128,7 +2867,7 @@ msgid "A patch named %s already exists in the series file" msgstr "" -msgid "restore the queue state saved by a rev" +msgid "restore the queue state saved by a revision" msgstr "" msgid "save current queue state" @@ -3146,11 +2885,13 @@ msgid "copy %s to %s\n" msgstr "" +#, fuzzy msgid "" "strip a revision and all its descendants from the repository\n" "\n" -" If one of the working dir's parent revisions is stripped, the working\n" -" directory will be updated to the parent of the stripped revision.\n" +" 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" " " msgstr "" "从版本库删除一个版本以及它的子孙\n" @@ -3162,33 +2903,34 @@ "set or print guarded patches to push\n" "\n" " Use the 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 it\n" -" has no guards or any positive guards match the currently selected guard,\n" -" but will not be pushed if any negative guards match the current guard.\n" -" For example:\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:\n" "\n" " qguard foo.patch -stable (negative guard)\n" " qguard bar.patch +stable (positive guard)\n" " qselect stable\n" "\n" " This activates the \"stable\" guard. mq will skip foo.patch (because\n" -" it has a negative match) but push bar.patch (because it\n" -" has a positive match).\n" +" it has a negative match) but push bar.patch (because it has a\n" +" positive match).\n" "\n" " With no arguments, prints the currently active guards.\n" " With one argument, sets the active guard.\n" "\n" " Use -n/--none to deactivate guards (no other arguments needed).\n" -" When no guards are active, patches with positive guards are skipped\n" -" and patches with negative guards are pushed.\n" +" When no guards are active, patches with positive guards are\n" +" skipped and patches with negative guards are pushed.\n" "\n" " qselect can change the guards on applied patches. It does not pop\n" -" guarded patches by default. Use --pop to pop back to the last applied\n" -" patch that is not guarded. Use --reapply (which implies --pop) to push\n" -" back to the current patch afterwards, but skip guarded patches.\n" -"\n" -" Use -s/--series to print a list of all guards in the series file (no\n" -" other arguments needed). Use -v for more information." +" guarded patches by default. Use --pop to pop back to the last\n" +" applied patch that is not guarded. Use --reapply (which implies\n" +" --pop) to push back to the current patch afterwards, but skip\n" +" guarded patches.\n" +"\n" +" 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 "" msgid "guards deactivated\n" @@ -3223,17 +2965,18 @@ msgid "" "move applied patches into repository history\n" "\n" -" Finishes the specified revisions (corresponding to applied patches) by\n" -" moving them out of mq control into regular repository history.\n" -"\n" -" Accepts a revision range or the --applied option. If --applied is\n" -" specified, all applied mq revisions are removed from mq control.\n" -" Otherwise, the given revisions must be at the base of the stack of\n" -" applied patches.\n" -"\n" -" This can be especially useful if your changes have been applied to an\n" -" upstream repository, or if you are about to push your changes to " -"upstream.\n" +" Finishes the specified revisions (corresponding to applied\n" +" patches) by moving them out of mq control into regular repository\n" +" history.\n" +"\n" +" Accepts a revision range or the -a/--applied option. If --applied\n" +" is specified, all applied mq revisions are removed from mq\n" +" control. Otherwise, the given revisions must be at the base of the\n" +" stack of applied patches.\n" +"\n" +" 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 "" @@ -3272,8 +3015,9 @@ msgid "use uncompressed transfer (fast over LAN)" msgstr "使用不压缩的传输(在局域网更快)" -msgid "location of source patch repo" -msgstr "" +#, fuzzy +msgid "location of source patch repository" +msgstr "为此版本库启动服务 'inotify'" msgid "hg qclone [OPTION]... SOURCE [DEST]" msgstr "" @@ -3287,7 +3031,7 @@ msgid "keep patch file" msgstr "" -msgid "stop managing a revision" +msgid "stop managing a revision (DEPRECATED)" msgstr "" msgid "hg qdelete [-k] [-r REV]... [PATCH]..." @@ -3320,10 +3064,12 @@ msgid "hg qheader [PATCH]" msgstr "" -msgid "import file in patch dir" +#, fuzzy +msgid "import file in patch directory" msgstr "从补丁目录导入文件" -msgid "patch file name" +#, fuzzy +msgid "name of patch file" msgstr "补丁文件名称" msgid "overwrite existing files" @@ -3335,7 +3081,10 @@ msgid "use git extended diff format" msgstr "使用 git 扩展差异格式" -msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-r REV]... FILE..." +msgid "qpush after importing" +msgstr "" + +msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..." msgstr "" msgid "create queue repository" @@ -3422,8 +3171,9 @@ msgid "delete save entry" msgstr "" -msgid "update queue working dir" -msgstr "" +#, fuzzy +msgid "update queue working directory" +msgstr "正在更新工作目录\n" msgid "hg qrestore [-d] [-u] REV" msgstr "" @@ -3489,7 +3239,7 @@ msgstr "" msgid "" -"hook extension to email notifications on commits/pushes\n" +"send e-mail notifications for commits/pushes\n" "\n" "Subscriptions can be managed through hgrc. Default mode is to print\n" "messages to stdout, for testing and configuring.\n" @@ -3544,31 +3294,10 @@ " # key is glob pattern, value is \",\"-separated list of subscriber emails\n" " pattern = user@host\n" "\n" -" glob patterns are matched against path to repo root.\n" -"\n" -" if you like, you can put notify config file in repo that users can\n" -" push changes to, they can manage their own subscriptions." -msgstr "" - -msgid "email notification class." -msgstr "" - -msgid "strip leading slashes from local path, turn into web-safe path." -msgstr "" - -msgid "try to clean up email addresses." -msgstr "" - -msgid "return list of email addresses of subscribers to this repo." -msgstr "" - -msgid "format one changeset." -msgstr "" - -msgid "true if incoming changes from this source should be skipped." -msgstr "" - -msgid "send message." +" glob patterns are matched against path to repository root.\n" +"\n" +" if you like, you can put notify config file in repository that users\n" +" can push changes to, they can manage their own subscriptions." msgstr "" #, python-format @@ -3593,15 +3322,8 @@ "\n" msgstr "" -msgid "" -"send email notifications to interested subscribers.\n" -"\n" -" if used as changegroup hook, send one email for all changesets in\n" -" changegroup. else send one email per changeset." -msgstr "" - -#, python-format -msgid "notify: no subscribers to repo %s\n" +#, python-format +msgid "notify: no subscribers to repository %s\n" msgstr "" #, python-format @@ -3609,19 +3331,18 @@ msgstr "" msgid "" -"browse command output with external pager\n" +"browse command output with an external pager\n" "\n" "To set the pager that should be used, set the application variable:\n" "\n" " [pager]\n" " pager = LESS='FSRX' less\n" "\n" -"If no pager is set, the pager extensions uses the environment\n" -"variable $PAGER. If neither pager.pager, nor $PAGER is set, no pager\n" -"is used.\n" -"\n" -"If you notice \"BROKEN PIPE\" error messages, you can disable them\n" -"by setting:\n" +"If no pager is set, the pager extensions uses the environment variable\n" +"$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n" +"\n" +"If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" +"setting:\n" "\n" " [pager]\n" " quiet = True\n" @@ -3632,27 +3353,27 @@ " [pager]\n" " ignore = version, help, update\n" "\n" -"You can also enable the pager only for certain commands using pager.attend:\n" +"You can also enable the pager only for certain commands using\n" +"pager.attend:\n" "\n" " [pager]\n" " attend = log\n" "\n" "If pager.attend is present, pager.ignore will be ignored.\n" "\n" -"To ignore global commands like \"hg version\" or \"hg help\", you have to " -"specify\n" -"them in the global .hgrc\n" -msgstr "" - -msgid "" -"use suffixes to refer to ancestor revisions\n" -"\n" -"This extension allows you to use git-style suffixes to refer to\n" -"the ancestors of a specific revision.\n" +"To ignore global commands like \"hg version\" or \"hg help\", you have to\n" +"specify them in the global .hgrc\n" +msgstr "" + +msgid "" +"interpret suffixes to refer to ancestor revisions\n" +"\n" +"This extension allows you to use git-style suffixes to refer to the\n" +"ancestors of a specific revision.\n" "\n" "For example, if you can refer to a revision as \"foo\", then:\n" "\n" -"- foo^N = Nth parent of foo:\n" +"- foo^N = Nth parent of foo\n" " foo^0 = foo\n" " foo^1 = first parent of foo\n" " foo^2 = second parent of foo\n" @@ -3665,34 +3386,31 @@ msgstr "" msgid "" -"sending Mercurial changesets as a series of patch emails\n" -"\n" -"The series is started off with a \"[PATCH 0 of N]\" introduction,\n" -"which describes the series as a whole.\n" -"\n" -"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 body parts:\n" -"\n" -" The remainder of the changeset description.\n" +"send Mercurial changesets as a series of patch e-mails\n" +"\n" +"The series is started off with a \"[PATCH 0 of N]\" introduction, which\n" +"describes the series as a whole.\n" +"\n" +"Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n" +"first line of the changeset description as the subject text. The\n" +"message contains two or three body parts:\n" +"\n" +" The changeset description.\n" "\n" " [Optional] The result of running diffstat on the patch.\n" "\n" " The patch itself, as generated by \"hg export\".\n" "\n" -"Each message refers to all of its predecessors using the In-Reply-To\n" -"and References headers, so they will show up as a sequence in\n" -"threaded mail and news readers, and in mail archives.\n" -"\n" -"For each changeset, you will be prompted with a diffstat summary and\n" -"the changeset summary, so you can be sure you are sending the right changes.\n" -"\n" -"To enable this extension:\n" -"\n" -" [extensions]\n" -" hgext.patchbomb =\n" -"\n" -"To configure other defaults, add a section like this to your hgrc file:\n" +"Each message refers to the first in the series using the In-Reply-To\n" +"and References headers, so they will show up as a sequence in threaded\n" +"mail and news readers, and in mail archives.\n" +"\n" +"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.\n" +"\n" +"To configure other defaults, add a section like this to your hgrc\n" +"file:\n" "\n" " [email]\n" " from = My Name <my@email>\n" @@ -3704,34 +3422,34 @@ "as a patchbomb.\n" "\n" "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 an an introductory\n" -"message describing the patches of your patchbomb. Then when all is\n" -"done, patchbomb messages are displayed. If PAGER environment variable\n" -"is set, your pager will be fired up once for each patchbomb message, so\n" -"you can verify everything is alright.\n" -"\n" -"The \"-m\" (mbox) option is also very useful. Instead of previewing\n" -"each patchbomb message in a pager or sending the messages directly,\n" -"it will create a UNIX mailbox file with the patch emails. This\n" -"mailbox file can be previewed with any mail user agent which supports\n" -"UNIX mbox files, e.g. with mutt:\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.\n" +"\n" +"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:\n" "\n" " % mutt -R -f mbox\n" "\n" "When you are previewing the patchbomb messages, you can use `formail'\n" -"(a utility that is commonly installed as part of the procmail package),\n" -"to send each message out:\n" +"(a utility that is commonly installed as part of the procmail\n" +"package), to send each message out:\n" "\n" " % formail -s sendmail -bm -t < mbox\n" "\n" "That should be all. Now your patchbomb is on its way out.\n" "\n" "You can also either configure the method option in the email section\n" -"to be a sendmail compatable mailer or fill out the [smtp] section so\n" -"that the patchbomb extension can automatically send patchbombs directly\n" -"from the commandline. See the [email] and [smtp] sections in hgrc(5)\n" -"for details." +"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." msgstr "" msgid "Please enter a valid value.\n" @@ -3747,23 +3465,29 @@ "send changesets by email\n" "\n" " 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" +" one per message. The series starts with a \"[PATCH 0 of N]\"\n" " introduction, which describes the series as a whole.\n" "\n" " 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 body parts. First, the rest of\n" -" the changeset description. Next, (optionally) if the diffstat\n" -" program is installed, the result of running diffstat on the patch.\n" -" Finally, the patch itself, as generated by \"hg export\".\n" -"\n" -" With --outgoing, emails will be generated for patches not\n" -" found in the destination repository (or only those which are\n" -" ancestors of the specified revisions if any are provided)\n" -"\n" -" With --bundle, changesets are selected as for --outgoing,\n" -" but a single email containing a binary Mercurial bundle as an\n" -" attachment will be sent.\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\".\n" +"\n" +" By default the patch is included as text in the email body for\n" +" easy reviewing. Using the -a/--attach option will instead create\n" +" an attachment for the patch. With -i/--inline an inline attachment\n" +" will be created.\n" +"\n" +" 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)\n" +"\n" +" With -b/--bundle, changesets are selected as for --outgoing, but a\n" +" single email containing a binary Mercurial bundle as an attachment\n" +" will be sent.\n" "\n" " Examples:\n" "\n" @@ -3783,12 +3507,9 @@ "default\n" " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n" "\n" -" Before using this command, you will need to enable email in your hgrc.\n" -" See the [email] section in hgrc(5) for details.\n" -" " -msgstr "" - -msgid "Return the revisions present locally but not in dest" +" 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 "specify at least one changeset with -r or -o" @@ -3860,6 +3581,9 @@ msgid "subject of first message (intro or single patch)" msgstr "" +msgid "message identifier to reply to" +msgstr "" + msgid "email addresses of recipients" msgstr "" @@ -3872,13 +3596,17 @@ msgid "send changes not in target as a binary bundle" msgstr "" +msgid "name of the bundle attachment file" +msgstr "" + msgid "a revision to send" msgstr "" -msgid "run even when remote repository is unrelated (with -b)" -msgstr "" - -msgid "a base changeset to specify instead of a destination (with -b)" +#, fuzzy +msgid "run even when remote repository is unrelated (with -b/--bundle)" +msgstr "纵然远程版本库是无关的也要执行" + +msgid "a base changeset to specify instead of a destination (with -b/--bundle)" msgstr "" msgid "send an introduction email for a single patch" @@ -3887,16 +3615,19 @@ msgid "hg email [OPTION]... [DEST]..." msgstr "" +msgid "delete files not tracked from the working directory" +msgstr "" + msgid "" "removes files not tracked by Mercurial\n" "\n" -" Delete files not known to Mercurial. This is useful to test local and\n" -" uncommitted changes in an otherwise-clean source tree.\n" +" Delete files not known to Mercurial. This is useful to test local\n" +" and uncommitted changes in an otherwise-clean source tree.\n" "\n" " This means that purge will delete:\n" " - Unknown files: files marked with \"?\" by \"hg status\"\n" -" - Empty directories: in fact Mercurial ignores directories unless they\n" -" contain files under source control managment\n" +" - Empty directories: in fact Mercurial ignores directories unless\n" +" they contain files under source control management\n" " But it will leave untouched:\n" " - Modified and unmodified tracked files\n" " - Ignored files (unless --all is specified)\n" @@ -3905,9 +3636,10 @@ " If directories are given on the command line, only files in these\n" " directories are considered.\n" "\n" -" Be careful with purge, as you could irreversibly delete some files you\n" -" forgot to add to the repository. If you only want to print the list of\n" -" files that this program would delete, use the --print option.\n" +" Be careful with purge, as you could irreversibly delete some files\n" +" you forgot to add to the repository. If you only want to print the\n" +" list of files that this program would delete, use the --print\n" +" option.\n" " " msgstr "" @@ -3933,11 +3665,12 @@ msgid "purge ignored files too" msgstr "" -msgid "print the file names instead of deleting them" -msgstr "" - -msgid "end filenames with NUL, for use with xargs (implies -p)" -msgstr "" +msgid "print filenames instead of deleting them" +msgstr "" + +#, fuzzy +msgid "end filenames with NUL, for use with xargs (implies -p/--print)" +msgstr "在文件名称结尾增加 NUL，用于 xargs" msgid "hg purge [OPTION]... [DIR]..." msgstr "" @@ -3945,35 +3678,26 @@ msgid "" "move sets of revisions to a different ancestor\n" "\n" -"This extension lets you rebase changesets in an existing Mercurial " +"This extension lets you rebase changesets in an existing Mercurial\n" "repository.\n" "\n" "For more information:\n" "http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n" msgstr "" -msgid "return the correct ancestor" -msgstr "" - msgid "first revision, do not change ancestor\n" msgstr "" msgid "" "move changeset (and descendants) to a different branch\n" "\n" -" Rebase uses repeated merging to graft changesets from one part of " -"history\n" -" onto another. This can be useful for linearizing local changes relative " -"to\n" -" a master development tree.\n" -"\n" -" If a rebase is interrupted to manually resolve a merge, it can be " -"continued\n" -" with --continue or aborted with --abort.\n" -" " -msgstr "" - -msgid "cannot use both keepbranches and extrafn" +" 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.\n" +"\n" +" If a rebase is interrupted to manually resolve a merge, it can be\n" +" continued with --continue/-c or aborted with --abort/-a.\n" +" " msgstr "" msgid "cannot use both abort and continue" @@ -3991,6 +3715,9 @@ msgid "nothing to rebase\n" msgstr "" +msgid "cannot use both keepbranches and extrafn" +msgstr "" + msgid "rebase merging completed\n" msgstr "" @@ -4004,18 +3731,9 @@ msgid "%d revisions have been skipped\n" msgstr "" -msgid "" -"Skip commit if collapsing has been required and rev is not the last\n" -" revision, commit otherwise\n" -" " -msgstr "" - msgid " set parents\n" msgstr "" -msgid "Rebase a single revision" -msgstr "" - #, python-format msgid "rebasing %d:%s\n" msgstr "" @@ -4049,16 +3767,10 @@ msgid "next revision set to %s\n" msgstr "" -msgid "Return the new parent relationship of the revision that will be rebased" -msgstr "" - #, python-format msgid "cannot use revision %d as base, result would have 3 parents" msgstr "" -msgid "Update rebased mq patches - finalize and then import them" -msgstr "" - #, python-format msgid "revision %d is an mq patch (%s), finalize it.\n" msgstr "" @@ -4067,36 +3779,21 @@ msgid "import mq patch %d (%s)\n" msgstr "" -msgid "Store the current status to allow recovery" -msgstr "" - msgid "rebase status stored\n" msgstr "" -msgid "Remove the status files" -msgstr "" - -msgid "Restore a previously stored status" -msgstr "" - msgid "rebase status resumed\n" msgstr "" msgid "no rebase in progress" msgstr "" -msgid "Restore the repository to its original state" -msgstr "" - msgid "warning: new changesets detected on target branch, not stripping\n" msgstr "" msgid "rebase aborted\n" msgstr "" -msgid "Define which revisions are going to be rebased and where" -msgstr "" - msgid "cannot rebase onto an applied mq patch" msgstr "" @@ -4119,24 +3816,12 @@ msgid "unable to collapse, there is more than one external parent" msgstr "" -msgid "Call rebase after pull if the latter has been invoked with --rebase" -msgstr "" - msgid "--update and --rebase are not compatible, ignoring the update flag\n" msgstr "" -msgid "Replace pull with a decorator to provide --rebase option" -msgstr "" - msgid "rebase working directory to branch head" msgstr "" -msgid "keep original revisions" -msgstr "" - -msgid "keep original branches" -msgstr "" - msgid "rebase from a given revision" msgstr "" @@ -4149,6 +3834,12 @@ msgid "collapse the rebased revisions" msgstr "" +msgid "keep original revisions" +msgstr "" + +msgid "keep original branches" +msgstr "" + msgid "continue an interrupted rebase" msgstr "" @@ -4156,30 +3847,11 @@ msgstr "" msgid "" -"hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]" -msgstr "" - -msgid "interactive change selection during commit or qrefresh" -msgstr "" - -msgid "" -"like patch.iterhunks, but yield different events\n" -"\n" -" - ('file', [header_lines + fromfile + tofile])\n" -" - ('context', [context_lines])\n" -" - ('hunk', [hunk_lines])\n" -" - ('range', (-start,len, +start,len, diffp))\n" -" " -msgstr "" - -msgid "scan lr while predicate holds" -msgstr "" - -msgid "" -"patch header\n" -"\n" -" XXX shoudn't we move this to mercurial/patch.py ?\n" -" " +"hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | " +"[-c] | [-a]" +msgstr "" + +msgid "interactively select which sets of changes to commit/qrefresh" msgstr "" msgid "this modifies a binary file (all or nothing)\n" @@ -4192,46 +3864,35 @@ msgid "%d hunks, %d lines changed\n" msgstr "" -msgid "hunk -> (n+,n-)" -msgstr "" - -msgid "" -"patch hunk\n" -"\n" -" XXX shouldn't we merge this with patch.hunk ?\n" -" " -msgstr "" - -msgid "patch -> [] of hunks " -msgstr "" - -msgid "patch parsing state machine" -msgstr "" - -msgid "Interactively filter patch chunks into applied-only chunks" -msgstr "" - -msgid "" -"fetch next portion from chunks until a 'header' is seen\n" -" NB: header == new-file mark\n" -" " -msgstr "" - -msgid "" -"prompt query, and process base inputs\n" -"\n" -" - y/n for the rest of file\n" -" - y/n for the rest\n" -" - ? (help)\n" -" - q (quit)\n" -"\n" -" else, input is returned to the caller.\n" -" " -msgstr "" - msgid "[Ynsfdaq?]" msgstr "" +msgid "&Yes, record this change" +msgstr "" + +msgid "&No, skip this change" +msgstr "" + +msgid "&Skip remaining changes to this file" +msgstr "" + +msgid "Record remaining changes to this &file" +msgstr "" + +msgid "&Done, skip remaining changes and files" +msgstr "" + +#, fuzzy +msgid "Record &all changes to all remaining files" +msgstr "将丢失的文件视为删除" + +#, fuzzy +msgid "&Quit, recording no changes" +msgstr "正在搜索修改\n" + +msgid "&?" +msgstr "" + msgid "y" msgstr "" @@ -4270,6 +3931,10 @@ msgid "record this change to %r?" msgstr "" +#, fuzzy, python-format +msgid "record change %d/%d to %r?" +msgstr "不需要改变 %s\n" + msgid "" "interactively select changes to commit\n" "\n" @@ -4280,7 +3945,7 @@ "\n" " You will be prompted for whether to record changes to each\n" " modified file, and for files with multiple changes, for each\n" -" change to use. For each query, the following responses are\n" +" change to use. For each query, the following responses are\n" " possible:\n" "\n" " y - record this change\n" @@ -4296,35 +3961,12 @@ " ? - display help" msgstr "" -msgid "" -"interactively record a new patch\n" -"\n" -" see 'hg help qnew' & 'hg help record' for more information and usage\n" -" " -msgstr "" - msgid "'mq' extension not loaded" msgstr "" msgid "running non-interactively, use commit instead" msgstr "" -msgid "" -"This is generic record driver.\n" -"\n" -" It's job is to interactively filter local changes, and accordingly\n" -" prepare working dir into a state, where the job can be delegated to\n" -" non-interactive commit command such as 'commit' or 'qrefresh'.\n" -"\n" -" After the actual job is done by non-interactive command, working dir\n" -" state is restored to original.\n" -"\n" -" In the end we'll record intresting changes, and everything else will " -"be\n" -" left in place, so the user can continue his work.\n" -" " -msgstr "" - msgid "no changes to record\n" msgstr "" @@ -4348,21 +3990,33 @@ msgid "hg qrecord [OPTION]... PATCH [FILE]..." msgstr "" -msgid "" -"patch transplanting tool\n" +msgid "share a common history between several working directories" +msgstr "" + +msgid "" +"create a new shared repository (experimental)\n" +"\n" +" Initialize a new repository and working directory that shares its\n" +" history with another repository.\n" +"\n" +" NOTE: actions that change history such as rollback or moving the\n" +" source may confuse sharers.\n" +" " +msgstr "" + +msgid "do not create a working copy" +msgstr "" + +msgid "[-U] SOURCE [DEST]" +msgstr "" + +msgid "" +"transplant changesets from another branch\n" "\n" "This extension allows you to transplant patches from another branch.\n" "\n" -"Transplanted patches are recorded in .hg/transplant/transplants, as a map\n" -"from a changeset hash to its hash in the source repository.\n" -msgstr "" - -msgid "" -"returns True if a node is already an ancestor of parent\n" -" or has already been transplanted" -msgstr "" - -msgid "apply the revisions in revmap one by one in revision order" +"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 "" #, python-format @@ -4381,9 +4035,6 @@ msgid "%s transplanted to %s\n" msgstr "" -msgid "arbitrarily rewrite changeset before applying it" -msgstr "" - #, python-format msgid "filtering %s\n" msgstr "" @@ -4391,9 +4042,6 @@ msgid "filter failed" msgstr "" -msgid "apply the patch in patchfile to the repository as a transplant" -msgstr "" - msgid "can only omit patchfile if merging" msgstr "" @@ -4404,16 +4052,10 @@ msgid "Fix up the merge and run hg transplant --continue" msgstr "" -msgid "recover last transaction and apply remaining changesets" -msgstr "" - #, python-format msgid "%s transplanted as %s\n" msgstr "" -msgid "commit working directory using journal metadata" -msgstr "" - msgid "transplant log file is corrupt" msgstr "" @@ -4424,15 +4066,6 @@ msgid "commit failed" msgstr "" -msgid "journal changelog metadata for later recover" -msgstr "" - -msgid "remove changelog journal" -msgstr "" - -msgid "interactively transplant changesets" -msgstr "" - msgid "apply changeset? [ynmpcq?]:" msgstr "" @@ -4446,28 +4079,31 @@ " (transplanted from CHANGESETHASH)\n" "\n" " You can rewrite the changelog message with the --filter option.\n" -" Its argument will be invoked with the current changelog message\n" -" as $1 and the patch as $2.\n" -"\n" -" If --source is specified, selects changesets from the named\n" -" repository. If --branch is specified, selects changesets from the\n" -" branch holding the named revision, up to that revision. If --all\n" -" is specified, all changesets on the branch will be transplanted,\n" -" otherwise you will be prompted to select the changesets you want.\n" -"\n" -" hg transplant --branch REVISION --all will rebase the selected branch\n" -" (up to the named revision) onto your current working directory.\n" -"\n" -" You can optionally mark selected transplanted changesets as\n" -" merge changesets. You will not be prompted to transplant any\n" -" ancestors of a merged transplant, and you can merge descendants\n" -" of them normally instead of transplanting them.\n" +" Its argument will be invoked with the current changelog message as\n" +" $1 and the patch as $2.\n" +"\n" +" If --source/-s is specified, selects changesets from the named\n" +" repository. If --branch/-b is specified, selects changesets from\n" +" the branch holding the named revision, up to that revision. If\n" +" --all/-a is specified, all changesets on the branch will be\n" +" transplanted, otherwise you will be prompted to select the\n" +" changesets you want.\n" +"\n" +" hg transplant --branch REVISION --all will rebase the selected\n" +" branch (up to the named revision) onto your current working\n" +" directory.\n" +"\n" +" You can optionally mark selected transplanted changesets as merge\n" +" changesets. You will not be prompted to transplant any ancestors\n" +" of a merged transplant, and you can merge descendants of them\n" +" normally instead of transplanting them.\n" "\n" " If no merges or revisions are provided, hg transplant will start\n" " an interactive changeset browser.\n" "\n" -" If a changeset application fails, you can fix the merge by hand and\n" -" then resume where you left off by calling hg transplant --continue.\n" +" 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" " " msgstr "" @@ -4521,37 +4157,33 @@ msgstr "" msgid "" -"allow to use MBCS path with problematic encoding.\n" -"\n" -"Some MBCS encodings are not good for some path operations\n" -"(i.e. splitting path, case conversion, etc.) with its encoded bytes.\n" -"We call such a encoding (i.e. shift_jis and big5) as \"problematic\n" -"encoding\". This extension can be used to fix the issue with those\n" -"encodings by wrapping some functions to convert to unicode string\n" -"before path operation.\n" -"\n" -"This extension is usefull for:\n" +"allow the use of MBCS paths with problematic encoding\n" +"\n" +"Some MBCS encodings are not good for some path operations (i.e.\n" +"splitting path, case conversion, etc.) with its encoded bytes. We call\n" +"such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n" +"This extension can be used to fix the issue with those encodings by\n" +"wrapping some functions to convert to Unicode string before path\n" +"operation.\n" +"\n" +"This extension is useful for:\n" " * Japanese Windows users using shift_jis encoding.\n" " * Chinese Windows users using big5 encoding.\n" -" * All users who use a repository with one of problematic encodings\n" -" on case-insensitive file system.\n" +" * All users who use a repository with one of problematic encodings on\n" +" case-insensitive file system.\n" "\n" "This extension is not needed for:\n" -" * Any user who use only ascii chars in path.\n" +" * Any user who use only ASCII chars in path.\n" " * Any user who do not use any of problematic encodings.\n" "\n" "Note that there are some limitations on using this extension:\n" " * You should use single encoding in one repository.\n" -" * You should set same encoding for the repository by locale or HGENCODING.\n" -"\n" -"To use this extension, enable the extension in .hg/hgrc or ~/.hgrc:\n" -"\n" -" [extensions]\n" -" hgext.win32mbcs =\n" -"\n" -"Path encoding conversion are done between unicode and util._encoding\n" -"which is decided by mercurial from current locale setting or HGENCODING.\n" -"\n" +" * You should set same encoding for the repository by locale or\n" +" HGENCODING.\n" +"\n" +"Path encoding conversion are done between Unicode and\n" +"encoding.encoding which is decided by Mercurial from current locale\n" +"setting or HGENCODING.\n" msgstr "" #, python-format @@ -4565,6 +4197,35 @@ msgid "[win32mbcs] activated with encoding: %s\n" msgstr "" +msgid "" +"perform automatic newline conversion\n" +"\n" +"To perform automatic newline conversion, use:\n" +"\n" +"[extensions]\n" +"hgext.win32text =\n" +"[encode]\n" +"** = cleverencode:\n" +"# or ** = macencode:\n" +"\n" +"[decode]\n" +"** = cleverdecode:\n" +"# or ** = macdecode:\n" +"\n" +"If not doing conversion, to make sure you do not commit CRLF/CR by accident:\n" +"\n" +"[hooks]\n" +"pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n" +"# or pretxncommit.cr = python:hgext.win32text.forbidcr\n" +"\n" +"To do the same check on a server to prevent CRLF/CR from being\n" +"pushed or pulled:\n" +"\n" +"[hooks]\n" +"pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n" +"# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n" +msgstr "" + #, python-format msgid "" "WARNING: %s already has %s line endings\n" @@ -4601,21 +4262,14 @@ msgstr "" msgid "" -"zeroconf support for mercurial repositories\n" -"\n" -"Zeroconf enabled repositories will be announced in a network without the " -"need\n" -"to configure a server or a service. They can be discovered without knowing\n" -"their actual IP address.\n" -"\n" -"To use the zeroconf extension add the following entry to your hgrc file:\n" -"\n" -"[extensions]\n" -"hgext.zeroconf =\n" -"\n" -"To allow other people to discover your repository using run \"hg serve\" in " -"your\n" -"repository.\n" +"discover and advertise repositories on the local network\n" +"\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.\n" +"\n" +"To allow other people to discover your repository using run \"hg serve\"\n" +"in your repository.\n" "\n" " $ cd test\n" " $ hg serve\n" @@ -4665,6 +4319,9 @@ msgid "premature EOF reading chunk (got %d bytes, expected %d)" msgstr "" +msgid "empty username" +msgstr "" + #, python-format msgid "username %s contains a newline" msgstr "" @@ -4686,7 +4343,7 @@ msgstr "" #, python-format -msgid "invalid format spec '%%%s' in output file name" +msgid "invalid format spec '%%%s' in output filename" msgstr "" #, python-format @@ -4726,8 +4383,12 @@ msgstr "" #, python-format -msgid "%s %s to %s\n" -msgstr "" +msgid "moving %s to %s\n" +msgstr "" + +#, fuzzy, python-format +msgid "copying %s to %s\n" +msgstr "正在推到 %s\n" #, python-format msgid "%s has not been committed yet, so no copy data will be stored for %s.\n" @@ -4831,32 +4492,54 @@ msgid "%s:%s copy source revision cannot be found!\n" msgstr "" -msgid "can only follow copies/renames for explicit file names" -msgstr "" - -#, python-format -msgid "file %s not found!" -msgstr "" - -#, python-format -msgid "no match under directory %s!" -msgstr "" - -#, python-format -msgid "can't commit %s: unsupported file type!" -msgstr "" - -#, python-format -msgid "file %s not tracked!" -msgstr "" - +msgid "can only follow copies/renames for explicit filenames" +msgstr "" + +msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." +msgstr "HG: 请输入提交日志。以 'HG:' 开始的行会被删除。" + +msgid "HG: Leave message empty to abort commit." +msgstr "" + +#, fuzzy, python-format +msgid "HG: user: %s" +msgstr "用户: %s\n" + +msgid "HG: branch merge" +msgstr "" + +#, python-format +msgid "HG: branch '%s'" +msgstr "" + +#, python-format +msgid "HG: added %s" +msgstr "" + +#, python-format +msgid "HG: changed %s" +msgstr "" + +#, fuzzy, python-format +msgid "HG: removed %s" +msgstr "已删除" + +#, fuzzy +msgid "HG: no files changed" +msgstr "正在增加文件改变\n" + +msgid "empty commit message" +msgstr "空的提交日志" + +#, fuzzy msgid "" "add the specified files on the next commit\n" "\n" -" Schedule files to be version controlled and added to the repository.\n" +" Schedule files to be version controlled and added to the\n" +" repository.\n" "\n" " The files will be added to the repository at the next commit. To\n" -" undo an add before that, see hg revert.\n" +" undo an add before that, see hg forget.\n" "\n" " If no names are given, add all files to the repository.\n" " " @@ -4874,16 +4557,19 @@ msgid "" "add all new files, delete all missing files\n" "\n" -" Add all new files and remove all missing files from the repository.\n" -"\n" -" New files are ignored if they match any of the patterns in .hgignore. As\n" -" with add, these changes take effect at the next commit.\n" -"\n" -" Use the -s option to detect renamed files. With a parameter > 0,\n" -" this compares every removed file with every added file and records\n" -" those similar enough as renames. This option takes a percentage\n" -" between 0 (disabled) and 100 (files must be identical) as its\n" -" parameter. Detecting renamed files this way can be expensive.\n" +" Add all new files and remove all missing files from the\n" +" repository.\n" +"\n" +" 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" +" commit.\n" +"\n" +" Use the -s/--similarity option to detect renamed files. With a\n" +" parameter > 0, this compares every removed file with every added\n" +" file and records those similar enough as renames. This option\n" +" takes a percentage between 0 (disabled) and 100 (files must be\n" +" identical) as its parameter. Detecting renamed files this way can\n" +" be expensive.\n" " " msgstr "" @@ -4893,18 +4579,20 @@ msgid "similarity must be between 0 and 100" msgstr "" -msgid "" -"show changeset information per file line\n" -"\n" -" List changes in files, showing the revision id responsible for each line\n" -"\n" -" This command is useful to discover who did a change or when a change " -"took\n" -" place.\n" -"\n" -" Without the -a option, annotate will avoid processing files it\n" -" detects as binary. With -a, annotate will generate an annotation\n" -" anyway, probably with undesirable results.\n" +#, fuzzy +msgid "" +"show changeset information by line for each file\n" +"\n" +" List changes in files, showing the revision id responsible for\n" +" each line\n" +"\n" +" This command is useful for discovering when a change was made and\n" +" by whom.\n" +"\n" +" 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 "" "显示指定文件每行的修改集信息\n" @@ -4917,7 +4605,7 @@ " 当使用选项 '-a' 时，annotate 会直接产生追溯，可能会有不合需要的结果\n" " " -msgid "at least one file name or pattern required" +msgid "at least one filename or pattern is required" msgstr "" msgid "at least one of -n/-c is required for -l" @@ -4928,12 +4616,12 @@ msgstr "" msgid "" -"create unversioned archive of a repository revision\n" +"create an unversioned archive of a repository revision\n" "\n" " By default, the revision used is the parent of the working\n" -" directory; use \"-r\" to specify a different revision.\n" -"\n" -" To specify the type of archive to create, use \"-t\". Valid\n" +" directory; use -r/--rev to specify a different revision.\n" +"\n" +" To specify the type of archive to create, use -t/--type. Valid\n" " types are:\n" "\n" " \"files\" (default): a directory full of files\n" @@ -4944,11 +4632,12 @@ " \"zip\": zip archive, compressed using deflate\n" "\n" " The exact name of the destination archive or directory is given\n" -" using a format string; see \"hg help export\" for details.\n" +" using a format string; see 'hg help export' for details.\n" "\n" " Each member added to an archive file has a directory prefix\n" -" prepended. Use \"-p\" to specify a format string for the prefix.\n" -" The default is the basename of the archive, with suffixes removed.\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 "" @@ -4967,15 +4656,14 @@ " Commit the backed out changes as a new changeset. The new\n" " changeset is a child of the backed out changeset.\n" "\n" -" If you back out a changeset other than the tip, a new head is\n" +" 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 (current one by default).\n" +" backout changeset with another head.\n" "\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\n" -" hand. The result of this merge is not committed, as with a normal\n" -" merge.\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.\n" "\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " @@ -4987,13 +4675,13 @@ msgid "please specify a revision to backout" msgstr "" -msgid "cannot back out change on a different branch" -msgstr "" - -msgid "cannot back out a change with no parents" -msgstr "" - -msgid "cannot back out a merge changeset without --parent" +msgid "cannot backout change on a different branch" +msgstr "" + +msgid "cannot backout a change with no parents" +msgstr "" + +msgid "cannot backout a merge changeset without --parent" msgstr "" #, python-format @@ -5024,35 +4712,36 @@ msgid "" "subdivision search of changesets\n" "\n" -" This command helps to find changesets which introduce problems.\n" -" To use, mark the earliest changeset you know exhibits the problem\n" -" as bad, then mark the latest changeset which is free from the\n" -" problem as good. Bisect will update your working directory to a\n" -" revision for testing (unless the --noupdate option is specified).\n" -" Once you have performed tests, mark the working directory as bad\n" -" or good and bisect will either update to another candidate changeset\n" +" 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.\n" "\n" " As a shortcut, you can also use the revision argument to mark a\n" " revision as good or bad without checking it out first.\n" "\n" -" If you supply a command it will be used for automatic bisection. Its " -"exit\n" -" status will be used as flag to mark revision as bad or good. In case " -"exit\n" -" status is 0 the revision is marked as good, 125 - skipped, 127 (command " -"not\n" -" found) - bisection will be aborted; any other status bigger than 0 will\n" -" mark revision as bad.\n" -" " -msgstr "" - -#, python-format -msgid "The first %s revision is:\n" -msgstr "" - -#, python-format -msgid "Due to skipped revisions, the first %s revision could be any of:\n" +" 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 "" + +msgid "The first good revision is:\n" +msgstr "" + +msgid "The first bad revision is:\n" +msgstr "" + +msgid "Due to skipped revisions, the first good revision could be any of:\n" +msgstr "" + +msgid "Due to skipped revisions, the first bad revision could be any of:\n" msgstr "" msgid "cannot bisect (no known good revisions)" @@ -5068,6 +4757,10 @@ msgstr "" #, python-format +msgid "cannot find executable: %s" +msgstr "" + +#, python-format msgid "failed to execute %s" msgstr "" @@ -5075,9 +4768,9 @@ msgid "%s killed" msgstr "" -#, python-format -msgid "Changeset %s: %s\n" -msgstr "" +#, fuzzy, python-format +msgid "Changeset %d:%s: %s\n" +msgstr "修改集: %d:%s\n" #, python-format msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n" @@ -5087,14 +4780,17 @@ "set or show the current branch name\n" "\n" " With no argument, show the current branch name. With one argument,\n" -" set the working directory branch name (the branch does not exist in\n" -" the repository until the next commit).\n" -"\n" -" Unless --force is specified, branch will not let you set a\n" -" branch name that shadows an existing branch.\n" -"\n" -" Use --clean to reset the working directory branch to that of the\n" -" parent of the working directory, negating a previous branch change.\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.\n" +"\n" +" Unless -f/--force is specified, branch will not let you set a\n" +" branch name that already exists, even if it's inactive.\n" +"\n" +" 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.\n" "\n" " Use the command 'hg update' to switch to an existing branch.\n" " " @@ -5132,20 +4828,23 @@ " 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" -" --all (or --base null). To change the compression method applied,\n" -" use the -t option (by default, bundles are compressed using bz2).\n" -"\n" -" The bundle file can then be transferred using conventional means and\n" -" applied to another repository with the unbundle or pull command.\n" -" This is useful when direct push and pull are not available or when\n" -" exporting an entire repository is undesirable.\n" +" -a/--all (or --base null).\n" +"\n" +" To change the compression method applied, use the -t/--type\n" +" option. The available compression methods are: none, bzip2, and\n" +" gzip (by default, bundles are compressed using bzip2).\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" " " msgstr "" -msgid "--base is incompatible with specifiying a destination" +msgid "--base is incompatible with specifying a destination" msgstr "" msgid "unknown bundle type specified with --type" @@ -5154,8 +4853,8 @@ msgid "" "output the current or given revision of files\n" "\n" -" Print the specified files as they were at the given revision.\n" -" If no revision is given, the parent of the working directory is used,\n" +" 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.\n" "\n" " Output may be to a file, in which case the name of the file is\n" @@ -5163,7 +4862,7 @@ " for the export command, with the following additions:\n" "\n" " %s basename of file being printed\n" -" %d dirname of file being printed, or '.' if in repo root\n" +" %d dirname of file being printed, or '.' if in repository root\n" " %p root-relative path name of file being printed\n" " " msgstr "" @@ -5179,6 +4878,22 @@ " 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" @@ -5191,75 +4906,32 @@ "\n" " $ cp -al REPO REPOCLONE\n" "\n" -" This is the fastest way to clone, but it is not always safe. The\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" +" 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" -" If you use the -r option to clone up to a specific revision, no\n" -" subsequent revisions will be present in the cloned repository.\n" -" This option implies --pull, even on local repositories.\n" -"\n" -" If the -U option is used, the new clone will contain only a repository\n" -" (.hg) and no working copy (the working copy 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" -" Look at the help text for urls for important details about ssh:// URLs.\n" -" " -msgstr "" -"复制现有版本库\n" -"\n" -" 在新目录创建现有版本库的副本。\n" -"\n" -" 如果没有指定目标目录，默认使用源版本库的基本名称。\n" -"\n" -" 源版本库的位置增加到新版本库的文件 .hg/hgrc 中，作为未来更新时的默认\n" -" 位置。\n" -"\n" -" 为了效率，在复制时，只要源版本库和目标版本库位于同一文件系统，就会使\n" -" 用硬链接(注意这只适用于版本库中的数据，不适用于检出的文件)。某些文件\n" -" 系统，例如 AFS，没有正确实现硬链接，还不报告错误。在这些情况下，请使\n" -" 用选项 '--pull'来避免硬链接。\n" -"\n" -" 在某些情况下，你可以通过下述命令用硬链接复制且检出文件:\n" -"\n" -" $ cp -al REPO REPOCLONE\n" -"\n" -" 这是最快速的复制方法，但是不见得总是安全。此操作不是原子的(请确认在你\n" -" 操作期间版本库未修改)，还要确认你的编辑器会破坏硬链接。还有，它与将元\n" -" 数据放到目录 .hg 中的某些扩展不兼容，例如 mq。\n" -"\n" -" 如果你使用选项 '-r' 复制指定版本，那么后来的版本不会在新版本库中出现。\n" -" 此选项暗示 '--pull'，纵然是操作本地版本库。\n" -"\n" -" 如果你使用了选项 '-U'，那么新仓库只包含版本库(.hg)，没有工作副本。\n" -"\n" -" 参见 'hg help urls' 以了解有效源格式的详情。\n" -"\n" -" 也可以指定位置 'ssh://' 作为目标，但是不会创建文件 .hg/hgrc，并且工作\n" -" 副本将会创建在远程。参见主题 'urls' 的帮助信息，以了解位置 'ssh://'\n" -" 的重要详情。\n" -" " - +" " +msgstr "" + +#, fuzzy msgid "" "commit the specified files or all outstanding changes\n" "\n" -" Commit changes to the given files into the repository.\n" +" 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.\n" "\n" " If a list of files is omitted, all changes reported by \"hg status\"\n" " will be committed.\n" "\n" " If you are committing the result of a merge, do not provide any\n" -" file names or -I/-X filters.\n" -"\n" -" If no commit message is specified, the configured editor is started to\n" -" prompt you for a message.\n" +" filenames or -I/-X filters.\n" +"\n" +" If no commit message is specified, the configured editor is\n" +" started to prompt you for a message.\n" "\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " @@ -5292,7 +4964,7 @@ " the source must be a single file.\n" "\n" " By default, this command copies the contents of files as they\n" -" stand in the working directory. If invoked with --after, the\n" +" exist in the working directory. If invoked with -A/--after, the\n" " operation is recorded, but no copying is performed.\n" "\n" " This command takes effect with the next commit. To undo a copy\n" @@ -5340,13 +5012,17 @@ msgid "" "show combined config settings from all hgrc files\n" "\n" -" With no args, print names and values of all config items.\n" -"\n" -" With one arg of the form section.name, print just the value of\n" -" that config item.\n" -"\n" -" With multiple args, print names and values of all config items\n" -" with matching section names." +" With no arguments, print names and values of all config items.\n" +"\n" +" With one argument of the form section.name, print just the value\n" +" of that config item.\n" +"\n" +" With multiple arguments, print names and values of all config\n" +" items with matching section names.\n" +"\n" +" With --debug, the source (filename and line number) is printed\n" +" for each config item.\n" +" " msgstr "" msgid "only one config item permitted" @@ -5380,7 +5056,7 @@ msgid "dump the contents of an index file" msgstr "" -msgid "dump an index DAG as a .dot file" +msgid "dump an index DAG as a graphviz dot file" msgstr "" msgid "test Mercurial installation" @@ -5470,6 +5146,7 @@ msgid "show how files match on given patterns" msgstr "" +#, fuzzy msgid "" "diff repository (or selected files)\n" "\n" @@ -5487,12 +5164,12 @@ " revisions are specified, the working directory files are compared\n" " to its parent.\n" "\n" -" Without the -a option, diff will avoid generating diffs of files\n" -" it detects as binary. With -a, diff will generate a diff anyway,\n" -" probably with undesirable results.\n" -"\n" -" Use the --git option to generate diffs in the git extended diff\n" -" format. For more information, read hg help diffs.\n" +" 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.\n" +"\n" +" Use the -g/--git option to generate diffs in the git extended diff\n" +" format. For more information, read 'hg help diffs'.\n" " " msgstr "" "在版本库中比较(指定的文件)\n" @@ -5515,6 +5192,7 @@ " 了解更多信息。\n" " " +#, fuzzy msgid "" "dump the header and diffs for one or more changesets\n" "\n" @@ -5523,8 +5201,9 @@ " The information shown in the changeset header is: author,\n" " changeset hash, parent(s) and commit comment.\n" "\n" -" NOTE: export may generate unexpected diff output for merge changesets,\n" -" as it will compare the merge changeset against its first parent only.\n" +" NOTE: export may generate unexpected diff output for merge\n" +" changesets, as it will compare the merge changeset against its\n" +" first parent only.\n" "\n" " 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:\n" @@ -5538,15 +5217,15 @@ " %n zero-padded sequence number, starting at 1\n" " %r zero-padded changeset revision number\n" "\n" -" Without the -a option, export will avoid generating diffs of files\n" -" it detects as binary. With -a, export will generate a diff anyway,\n" -" probably with undesirable results.\n" -"\n" -" Use the --git option to generate diffs in the git extended diff\n" -" format. Read the diffs help topic for more information.\n" -"\n" -" With the --switch-parent option, the diff will be against the second\n" -" parent. It can be useful to review a merge.\n" +" 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.\n" +"\n" +" Use the -g/--git option to generate diffs in the git extended diff\n" +" format. See 'hg help diffs' for more information.\n" +"\n" +" With the --switch-parent option, the diff will be against the\n" +" second parent. It can be useful to review a merge.\n" " " msgstr "" "为一个或多个修改集输出标题和差异\n" @@ -5589,14 +5268,35 @@ msgstr "" msgid "" +"forget the specified files on the next commit\n" +"\n" +" Mark the specified files so they will no longer be tracked\n" +" after the next commit.\n" +"\n" +" This only removes files from the current branch, not from the\n" +" entire project history, and it does not delete them from the\n" +" working directory.\n" +"\n" +" To undo a forget before the next commit, see hg add.\n" +" " +msgstr "" + +msgid "no files specified" +msgstr "" + +#, python-format +msgid "not removing %s: file is already untracked\n" +msgstr "" + +msgid "" "search for a pattern in specified files and revisions\n" "\n" " Search revisions of files for a regular expression.\n" "\n" " 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\n" -" a match appears.\n" +" working directory. It always prints the revision number in which a\n" +" match appears.\n" "\n" " 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" @@ -5615,19 +5315,28 @@ "\n" " With no arguments, show all repository head changesets.\n" "\n" -" If branch or revisions names are given this will show the heads of\n" -" the specified branches or the branches those revisions are tagged\n" -" with.\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" -" Branch heads are changesets that have a given branch tag, but have\n" -" no child changesets with that tag. They are usually where\n" -" development on the given branch takes place.\n" -" " -msgstr "" +" 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" +" " +msgstr "" + +#, fuzzy, python-format +msgid "no open branch heads on branch %s\n" +msgstr "svn: 分支没有版本 %s" #, python-format msgid "no changes on branch %s containing %s are reachable from %s\n" @@ -5640,9 +5349,10 @@ msgid "" "show help for a given topic or a help overview\n" "\n" -" With no arguments, print a list of commands and short help.\n" -"\n" -" Given a topic, extension, or command name, print help for that topic." +" With no arguments, print a list of commands with short help messages.\n" +"\n" +" Given a topic, extension, or command name, print help for that\n" +" topic." msgstr "" msgid "global options:" @@ -5686,19 +5396,13 @@ msgid "no commands defined\n" msgstr "" -msgid "" -"\n" -"enabled extensions:\n" -"\n" +#, fuzzy +msgid "enabled extensions:" msgstr "" "\n" "启用的扩展:\n" "\n" -#, python-format -msgid " %s %s\n" -msgstr "" - msgid "no help text available" msgstr "没有可用的帮助信息" @@ -5728,14 +5432,16 @@ msgid "" "identify the working copy or specified revision\n" "\n" -" With no revision, print a summary of the current state of the repo.\n" -"\n" -" With a path, do a lookup in another repository.\n" -"\n" -" This summary identifies the repository state using one or two parent\n" -" hash identifiers, followed by a \"+\" if there are uncommitted changes\n" -" in the working directory, a list of tags for this revision and a branch\n" -" name for non-default branches.\n" +" With no revision, print a summary of the current state of the\n" +" repository.\n" +"\n" +" Specifying a path to a repository root or Mercurial bundle will\n" +" cause lookup to operate on that repository/bundle.\n" +"\n" +" 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 "" @@ -5745,29 +5451,30 @@ " Import a list of patches and commit them individually.\n" "\n" " If there are outstanding changes in the working directory, import\n" -" will abort unless given the -f flag.\n" +" will abort unless given the -f/--force flag.\n" "\n" " You can import a patch straight from a mail message. Even patches\n" -" as attachments work (body part must be type text/plain or\n" -" text/x-patch to be used). From and Subject headers of email\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.\n" "\n" -" If the imported patch was generated by hg export, user and description\n" -" from patch override values from message headers and body. Values\n" -" given on command line with -m and -u override these.\n" -"\n" -" If --exact is specified, import will set the working directory\n" -" to the parent of each patch before applying it, and will abort\n" -" if the resulting changeset has a different ID than the one\n" -" recorded in the patch. This may happen due to character set\n" -" problems or other deficiencies in the text patch format.\n" -"\n" -" With --similarity, hg will attempt to discover renames and copies\n" -" in the patch in the same way as 'addremove'.\n" -"\n" -" To read a patch from standard input, use patch name \"-\".\n" +" 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.\n" +"\n" +" 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.\n" +"\n" +" With -s/--similarity, hg will attempt to discover renames and\n" +" copies in the patch in the same way as 'addremove'.\n" +"\n" +" 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" " " msgstr "" @@ -5784,8 +5491,9 @@ "%s\n" msgstr "" -msgid "not a mercurial patch" -msgstr "" +#, fuzzy +msgid "not a Mercurial patch" +msgstr "%s 不是本地的水银版本库" msgid "patch is damaged or loses information" msgstr "" @@ -5794,21 +5502,22 @@ "show new changesets found in source\n" "\n" " Show new changesets found in the specified path/URL or the default\n" -" pull location. These are the changesets that would be pulled if a pull\n" -" was requested.\n" -"\n" -" For remote repository, using --bundle avoids downloading the changesets\n" -" twice if the incoming is followed by a pull.\n" +" pull location. These are the changesets that would have been pulled\n" +" if a pull at the time you issued this command.\n" +"\n" +" For remote repository, using --bundle avoids downloading the\n" +" changesets twice if the incoming is followed by a pull.\n" "\n" " See pull for valid source format details.\n" " " msgstr "" +#, fuzzy msgid "" "create a new repository in the given directory\n" "\n" " Initialize a new repository in the given directory. If the given\n" -" directory does not exist, it is created.\n" +" directory does not exist, it will be created.\n" "\n" " If no directory is given, the current directory is used.\n" "\n" @@ -5829,23 +5538,24 @@ msgid "" "locate files matching specific patterns\n" "\n" -" Print all files under Mercurial control whose names match the\n" -" given patterns.\n" -"\n" -" This command searches the entire repository by default. To search\n" -" just the current directory and its subdirectories, use\n" -" \"--include .\".\n" -"\n" -" If no patterns are given to match, this command prints all file\n" -" names.\n" +" Print files under Mercurial control in the working directory whose\n" +" names match the given patterns.\n" +"\n" +" By default, this command searches all directories in the working\n" +" directory. To search just the current directory and its\n" +" subdirectories, use \"--include .\".\n" +"\n" +" If no patterns are given to match, this command prints the names\n" +" of all files under Mercurial control in the working directory.\n" "\n" " 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\".\n" -" This will avoid the problem of \"xargs\" treating single filenames\n" -" that contain white space as multiple filenames.\n" -" " -msgstr "" - +" 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 "" + +#, fuzzy msgid "" "show revision history of entire repository or files\n" "\n" @@ -5853,8 +5563,8 @@ " project.\n" "\n" " File history is shown without following rename or copy history of\n" -" files. Use -f/--follow with a file name to follow history across\n" -" renames and copies. --follow without a file name will only show\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.\n" "\n" @@ -5864,16 +5574,15 @@ "\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" "\n" -" By default this command outputs: changeset id and hash, tags,\n" -" non-trivial parents, user, date and time, and a summary for each\n" -" commit. When the -v/--verbose switch is used, the list of changed\n" -" files and full commit message is shown.\n" -"\n" -" NOTE: log -p may generate unexpected diff output for merge\n" +" 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.\n" +"\n" +" 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, the files: list will only reflect files\n" -" that are different from BOTH parents.\n" -"\n" +" its first parent. Also, only files different from BOTH parents\n" +" will appear in files:.\n" " " msgstr "" "显示全部版本库或指定文件的版本历史\n" @@ -5901,40 +5610,33 @@ " " msgid "" -"looks up all renames for a file (up to endrev) the first\n" -" time the file is given. It indexes on the changerev and only\n" -" parses the manifest if linkrev != changerev.\n" -" Returns rename info for fn at changerev rev." -msgstr "" - -msgid "" "output the current or given revision of the project manifest\n" "\n" " Print a list of version controlled files for the given revision.\n" -" If no revision is given, the parent of the working directory is used,\n" -" or tip if no revision is checked out.\n" -"\n" -" The manifest is the list of files being version controlled. If no " -"revision\n" -" is given then the first parent of the working directory is used.\n" -"\n" -" With -v flag, print file permissions, symlink and executable bits. With\n" -" --debug flag, print file revision hashes.\n" -" " -msgstr "" - +" 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.\n" +"\n" +" With -v, print file permissions, symlink and executable bits.\n" +" With --debug, print file revision hashes.\n" +" " +msgstr "" + +#, fuzzy msgid "" "merge working directory with another revision\n" "\n" -" Merge the contents of the current working directory and the\n" -" requested revision. Files that changed between either parent are\n" -" marked as changed for the next commit and a commit must be\n" -" performed before any further updates are allowed.\n" +" The current working directory is updated with all changes made in\n" +" the requested revision since the last common predecessor revision.\n" +"\n" +" 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.\n" "\n" " If no revision is specified, the working directory's parent is a\n" -" head revision, and the current branch contains exactly one other head,\n" -" the other head is merged with by default. Otherwise, an explicit\n" -" revision to merge with must be provided.\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 "" "将工作目录与其它版本合并\n" @@ -5969,22 +5671,23 @@ msgid "" "show changesets not found in destination\n" "\n" -" Show changesets not found in the specified destination repository or\n" -" the default push location. These are the changesets that would be pushed\n" -" if a push was requested.\n" +" 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.\n" "\n" " See pull for valid destination format details.\n" " " msgstr "" -msgid "" -"show the parents of the working dir or revision\n" -"\n" -" Print the working directory's parent revisions. If a\n" -" revision is given via --rev, the parent of that revision\n" -" will be printed. If a file argument is given, revision in\n" -" which the file was last changed (before the working directory\n" -" revision or the argument to --rev if given) is printed.\n" +#, fuzzy +msgid "" +"show the parents of the working directory or revision\n" +"\n" +" 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 "" "显示工作目录或指定版本的父亲\n" @@ -5994,7 +5697,7 @@ " 版本，或 '--rev' 指定的版本)。\n" " " -msgid "can only specify an explicit file name" +msgid "can only specify an explicit filename" msgstr "" #, python-format @@ -6004,8 +5707,8 @@ msgid "" "show aliases for remote repositories\n" "\n" -" Show definition of symbolic path name NAME. If no name is given, show\n" -" definition of available names.\n" +" Show definition of symbolic path name NAME. If no name is given,\n" +" show definition of all available names.\n" "\n" " 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.\n" @@ -6026,14 +5729,21 @@ msgid "(run 'hg update' to get a working copy)\n" msgstr "" +#, fuzzy msgid "" "pull changes from the specified source\n" "\n" " Pull changes from a remote repository to a local one.\n" "\n" " This finds all changes from the repository at the specified path\n" -" or URL and adds them to the local repository. By default, this\n" -" does not update the copy of the project in the working directory.\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.\n" +"\n" +" 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.\n" "\n" " If SOURCE is omitted, the 'default' path will be used.\n" " See 'hg help urls' for more information.\n" @@ -6050,31 +5760,26 @@ " 更多信息。\n" " " -msgid "" -"Other repository doesn't support revision lookup, so a rev cannot be " -"specified." -msgstr "" - +#, fuzzy msgid "" "push changes to the specified destination\n" "\n" " Push changes from the local repository to the given destination.\n" "\n" -" This is the symmetrical operation for pull. It helps to move\n" -" changes from the current repository to a different one. If the\n" -" destination is local this is identical to a pull in that directory\n" -" from the current one.\n" +" 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.\n" "\n" " 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" -" the client has forgotten to pull and merge before pushing.\n" -"\n" -" If -r is used, the named changeset and all its ancestors will be pushed\n" -" to the remote repository.\n" -"\n" -" Look at the help text for urls for important details about ssh:// URLs.\n" -" If DESTINATION is omitted, a default path will be used.\n" -" See 'hg help urls' for more information.\n" +" user forgot to pull and merge before pushing.\n" +"\n" +" If -r/--rev is used, the named revision and all its ancestors will\n" +" be pushed to the remote repository.\n" +"\n" +" Please see 'hg help urls' for important details about ssh://\n" +" URLs. If DESTINATION is omitted, a default path will be used.\n" " " msgstr "" "推送改变到指定位置\n" @@ -6100,46 +5805,33 @@ msgstr "正在推到 %s\n" msgid "" -"raw commit interface (DEPRECATED)\n" -"\n" -" (DEPRECATED)\n" -" Lowlevel commit, for use in helper scripts.\n" -"\n" -" This command is not intended to be used by normal users, as it is\n" -" primarily useful for importing from other SCMs.\n" -"\n" -" This command is now deprecated and will be removed in a future\n" -" release, please use debugsetparents and commit instead.\n" -" " -msgstr "" - -msgid "(the rawcommit command is deprecated)\n" -msgstr "" - -msgid "" "roll back an interrupted transaction\n" "\n" " Recover from an interrupted commit or pull.\n" "\n" -" This command tries to fix the repository status after an interrupted\n" -" operation. It should only be necessary when Mercurial suggests it.\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" +" " +msgstr "" + +#, fuzzy msgid "" "remove the specified files on the next commit\n" "\n" " Schedule the indicated files for removal from the repository.\n" "\n" -" This only removes files from the current branch, not from the entire\n" -" project history. -A can be used to remove only files that have already\n" -" been deleted, -f can be used to force deletion, and -Af can be used\n" -" to remove files from the next revision without deleting them.\n" -"\n" -" The following table details the behavior of remove for different file\n" -" states (columns) and option combinations (rows). The file states are\n" -" Added, Clean, Modified and Missing (as reported by hg status). The\n" -" actions are Warn, Remove (from branch) and Delete (from disk).\n" +" 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.\n" +"\n" +" 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).\n" "\n" " A C M !\n" " none W RD W R\n" @@ -6173,7 +5865,8 @@ " 要在此之前撤销删除，请参见 'hg revert'。\n" " " -msgid "no files specified" +#, python-format +msgid "not removing %s: file is untracked\n" msgstr "" #, python-format @@ -6192,12 +5885,12 @@ msgid "" "rename files; equivalent of copy + remove\n" "\n" -" Mark dest as copies of sources; mark sources for deletion. If\n" -" dest is a directory, copies are put in that directory. If dest is\n" -" a file, there can only be one source.\n" +" 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.\n" "\n" " By default, this command copies the contents of files as they\n" -" exist in the working directory. If invoked with --after, the\n" +" exist in the working directory. If invoked with -A/--after, the\n" " operation is recorded, but no copying is performed.\n" "\n" " This command takes effect at the next commit. To undo a rename\n" @@ -6210,10 +5903,15 @@ "\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 switch.\n" -"\n" -" This command will also allow listing resolved files and manually\n" -" marking and unmarking files as resolved.\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" @@ -6231,10 +5929,10 @@ msgstr "" msgid "" -"restore individual files or dirs to an earlier state\n" -"\n" -" (use update -r to check out earlier revisions, revert does not\n" -" change the working dir parents)\n" +"restore individual files or directories to an earlier state\n" +"\n" +" (Use update -r to check out earlier revisions, revert does not\n" +" change the working directory parents.)\n" "\n" " With no revision specified, revert the named files or directories\n" " to the contents they had in the parent of the working directory.\n" @@ -6243,10 +5941,10 @@ " working directory has two parents, you must explicitly specify the\n" " revision to revert to.\n" "\n" -" Using the -r option, revert the given files or directories to their\n" -" contents as of a specific revision. This can be helpful to \"roll\n" -" back\" some or all of an earlier change.\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" 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.\n" "\n" " Revert modifies the working directory. It does not commit any\n" " changes, or change the parent of the working directory. If you\n" @@ -6254,8 +5952,8 @@ " directory, the reverted files will thus appear modified\n" " afterwards.\n" "\n" -" If a file has been deleted, it is restored. If the executable\n" -" mode of a file was changed, it is reset.\n" +" If a file has been deleted, it is restored. If the executable mode\n" +" of a file was changed, it is reset.\n" "\n" " If names are given, all files matching the names are reverted.\n" " If no arguments are given, no files are reverted.\n" @@ -6301,7 +5999,8 @@ " 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.\n" +" any dirstate changes since that time. This command does not alter\n" +" the working directory.\n" "\n" " Transactions are used to encapsulate the effects of all commands\n" " that create new changesets or propagate existing changesets into a\n" @@ -6324,19 +6023,21 @@ msgstr "" msgid "" -"print the root (top) of the current working dir\n" +"print the root (top) of the current working directory\n" "\n" " Print the root directory of the current repository.\n" " " msgstr "" +#, fuzzy msgid "" "export the repository via HTTP\n" "\n" " Start a local HTTP repository browser and pull server.\n" "\n" " By default, the server logs accesses to stdout and errors to\n" -" stderr. Use the \"-A\" and \"-E\" options to log to files.\n" +" stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n" +" files.\n" " " msgstr "" "通过 HTTP 发布版本库\n" @@ -6351,17 +6052,19 @@ msgid "listening at http://%s%s/%s (bound to %s:%d)\n" msgstr "" +#, fuzzy msgid "" "show changed files in the 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" -" source of a copy/move operation, are not listed unless -c (clean),\n" -" -i (ignored), -C (copies) or -A is given. Unless options described\n" -" with \"show only ...\" are given, the options -mardu are used.\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" +" 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" @@ -6369,17 +6072,18 @@ " 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 difference between them is shown.\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" -" ! = deleted, but still tracked\n" +" ! = missing (deleted by non-hg command, but still tracked)\n" " ? = not tracked\n" " I = ignored\n" -" = the previous added file was copied from here\n" +" = origin of the previous file listed as A (added)\n" " " msgstr "" "显示工作目录中已改变的文件\n" @@ -6418,8 +6122,8 @@ " very useful to compare different revisions, to go back to significant\n" " earlier versions or to mark branch points as releases, etc.\n" "\n" -" If no revision is given, the parent of the working directory is used,\n" -" or tip if no revision is checked out.\n" +" If no revision is given, the parent of the working directory is\n" +" used, or tip if no revision is checked out.\n" "\n" " To facilitate version control, distribution, and merging of tags,\n" " they are stored as a file named \".hgtags\" which is managed\n" @@ -6445,9 +6149,13 @@ msgid "tag '%s' does not exist" msgstr "" -#, python-format -msgid "tag '%s' is not a %s tag" -msgstr "" +#, fuzzy, python-format +msgid "tag '%s' is not a global tag" +msgstr "非本地版本库 '%s'" + +#, fuzzy, python-format +msgid "tag '%s' is not a local tag" +msgstr "非本地版本库 '%s'" #, python-format msgid "Removed tag %s" @@ -6464,17 +6172,17 @@ msgid "" "list repository tags\n" "\n" -" This lists both regular and local tags. When the -v/--verbose switch\n" -" is used, a third column \"local\" is printed for local tags.\n" +" 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 "" msgid "" "show the tip revision\n" "\n" -" The tip revision (usually just called the tip) is the most\n" -" recently added changeset in the repository, the most recently\n" -" changed head.\n" +" 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).\n" "\n" " 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" @@ -6491,32 +6199,37 @@ " " msgstr "" +#, fuzzy msgid "" "update working directory\n" "\n" -" Update the repository's working directory to the specified revision,\n" -" or the tip of the current branch if none is specified. Use null as\n" -" the revision to remove the working copy (like 'hg clone -U').\n" -"\n" -" When the working dir contains no uncommitted changes, it will be\n" -" replaced by the state of the requested revision from the repo. When\n" -" the requested revision is on a different branch, the working dir\n" -" will additionally be switched to that branch.\n" -"\n" -" When there are uncommitted changes, use option -C to discard them,\n" -" forcibly replacing the state of the working dir with the requested\n" -" revision.\n" -"\n" -" When there are uncommitted changes and option -C is not used, and\n" -" the parent revision and requested revision are on the same branch,\n" -" and one of them is an ancestor of the other, then the new working\n" -" directory will contain the requested revision merged with the\n" -" uncommitted changes. Otherwise, the update will fail with a\n" -" suggestion to use 'merge' or 'update -C' instead.\n" -"\n" -" If you want to update just one file to an older revision, use revert.\n" -"\n" -" See 'hg help dates' for a list of formats valid for --date.\n" +" 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').\n" +"\n" +" 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.\n" +"\n" +" 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.\n" +"\n" +" 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.\n" +"\n" +" If you want to update just one file to an older revision, use\n" +" revert.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" "更新工作目录\n" @@ -6539,6 +6252,10 @@ " 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n" " " +#, fuzzy +msgid "uncommitted local changes" +msgstr "提交修改集 %d:%s\n" + msgid "" "verify the integrity of the repository\n" "\n" @@ -6599,9 +6316,6 @@ msgid "set the charset encoding mode" msgstr "设置字符集编码模式" -msgid "print improved command execution profile" -msgstr "显示改良的命令执行剖析" - msgid "print traceback on exception" msgstr "显示异常的跟踪" @@ -6641,7 +6355,8 @@ msgid "record datecode as commit date" msgstr "将提供的日期作为提交日期" -msgid "record user as committer" +#, fuzzy +msgid "record the specified user as committer" msgstr "将提供的用户作为提交者" msgid "display using template map file" @@ -6824,6 +6539,10 @@ msgid "[INDEX] REV1 REV2" msgstr "" +#, fuzzy +msgid "[COMMAND]" +msgstr "命令" + msgid "show the command options" msgstr "" @@ -6845,12 +6564,6 @@ msgid "FILE" msgstr "" -msgid "parent" -msgstr "" - -msgid "file list" -msgstr "" - msgid "revision to rebuild to" msgstr "" @@ -6872,6 +6585,10 @@ msgid "[OPTION]..." msgstr "" +#, fuzzy +msgid "revision to check" +msgstr "要合并的版本" + msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..." msgstr "" @@ -6893,7 +6610,7 @@ msgid "ignore case when matching" msgstr "" -msgid "print only filenames and revs that match" +msgid "print only filenames and revisions that match" msgstr "" msgid "print matching line numbers" @@ -6905,20 +6622,25 @@ msgid "[OPTION]... PATTERN [FILE]..." msgstr "" -msgid "show only heads which are descendants of rev" +msgid "show only heads which are descendants of REV" msgstr "" msgid "show only the active heads from open branches" msgstr "" -msgid "[-r REV] [REV]..." +#, fuzzy +msgid "show normal and closed heads" +msgstr "只显示已增加文件的状态" + +msgid "[-r STARTREV] [REV]..." msgstr "" msgid "[TOPIC]" msgstr "" -msgid "identify the specified rev" -msgstr "" +#, fuzzy +msgid "identify the specified revision" +msgstr "追溯指定版本" msgid "show local revision number" msgstr "" @@ -6936,8 +6658,8 @@ msgstr "" msgid "" -"directory strip option for patch. This has the same\n" -"meaning as the corresponding patch option" +"directory strip option for patch. This has the same meaning as the " +"corresponding patch option" msgstr "" msgid "base path" @@ -6952,7 +6674,7 @@ msgid "apply patch to the nodes from which it was generated" msgstr "" -msgid "Use any branch information in patch (implied by --exact)" +msgid "use any branch information in patch (implied by --exact)" msgstr "" msgid "[OPTION]... PATCH..." @@ -6973,7 +6695,7 @@ msgid "[-e CMD] [--remotecmd CMD] [DEST]" msgstr "" -msgid "search the repository as it stood at rev" +msgid "search the repository as it stood at REV" msgstr "" msgid "end filenames with NUL, for use with xargs" @@ -6988,7 +6710,8 @@ msgid "only follow the first parent of merge changesets" msgstr "只跟踪修改集的第一个父亲" -msgid "show revs matching date spec" +#, fuzzy +msgid "show revisions matching date spec" msgstr "显示匹配日期的版本" msgid "show copied files" @@ -6997,13 +6720,15 @@ msgid "do case-insensitive search for a keyword" msgstr "对关键字执行不区分大小写的搜索" -msgid "include revs where files were removed" +#, fuzzy +msgid "include revisions where files were removed" msgstr "包含删除文件的版本" msgid "show only merges" msgstr "只显示合并" -msgid "revs committed by user" +#, fuzzy +msgid "revisions committed by user" msgstr "指定用户提交的版本" msgid "show only changesets within the given named branch" @@ -7027,6 +6752,9 @@ msgid "revision to merge" msgstr "要合并的版本" +msgid "review revisions to merge (no merge is performed)" +msgstr "" + msgid "[-f] [[-r] REV]" msgstr "" @@ -7036,10 +6764,11 @@ msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" msgstr "" -msgid "show parents from the specified rev" +#, fuzzy +msgid "show parents from the specified revision" msgstr "从指定的版本显示父亲" -msgid "hg parents [-r REV] [FILE]" +msgid "[-r REV] [FILE]" msgstr "" msgid "[NAME]" @@ -7111,10 +6840,12 @@ msgid "prefix path to serve from (default: server root)" msgstr "服务路径前缀(默认: 服务器根)" -msgid "name to show in web pages (default: working dir)" +#, fuzzy +msgid "name to show in web pages (default: working directory)" msgstr "在 WEB 页面中显示的名称(默认: 工作目录)" -msgid "name of the webdir config file (serve more than one repo)" +#, fuzzy +msgid "name of the webdir config file (serve more than one repository)" msgstr "webdir 配置文件的名称(发布多个版本库)" msgid "for remote clients" @@ -7198,9 +6929,17 @@ msgid "overwrite locally modified files (no backup)" msgstr "覆盖本地修改的文件(不备份)" +#, fuzzy +msgid "check for uncommitted changes" +msgstr "提交修改集 %d:%s\n" + msgid "[-C] [-d DATE] [[-r] REV]" msgstr "" +#, python-format +msgid "config error at %s:%d: '%s'" +msgstr "" + msgid "not found in manifest" msgstr "" @@ -7226,10 +6965,6 @@ msgid " all copies found (* = to merge, ! = divergent):\n" msgstr "" -#, python-format -msgid " %s -> %s %s\n" -msgstr "" - msgid " checking for directory renames\n" msgstr "" @@ -7241,6 +6976,9 @@ msgid " file %s -> %s\n" msgstr "" +msgid "working directory state appears damaged!" +msgstr "" + #, python-format msgid "'\\n' and '\\r' disallowed in filenames: %r" msgstr "" @@ -7257,6 +6995,9 @@ msgid "not in dirstate: %s\n" msgstr "" +msgid "unknown" +msgstr "" + msgid "character device" msgstr "" @@ -7273,7 +7014,7 @@ msgstr "" #, python-format -msgid "%s: unsupported file type (type is %s)\n" +msgid "unsupported file type (type is %s)" msgstr "" #, python-format @@ -7287,6 +7028,10 @@ msgstr "" #, python-format +msgid "hg: %s\n" +msgstr "" + +#, python-format msgid "timed out waiting for lock held by %s" msgstr "" @@ -7307,10 +7052,6 @@ msgstr "" #, python-format -msgid "hg: %s\n" -msgstr "" - -#, python-format msgid "abort: %s!\n" msgstr "中止: %s!\n" @@ -7376,6 +7117,24 @@ msgstr "** 已加载的扩展: %s\n" #, python-format +msgid "no definition for alias '%s'\n" +msgstr "" + +#, fuzzy, python-format +msgid "alias '%s' resolves to unknown command '%s'\n" +msgstr "hg: 未知命令 '%s'\n" + +#, python-format +msgid "alias '%s' resolves to ambiguous command '%s'\n" +msgstr "" + +#, fuzzy, python-format +msgid "alias '%s' shadows command\n" +msgstr "" +"命令列表:\n" +"\n" + +#, python-format msgid "malformed --config option: %s" msgstr "非法 '--config' 选项: %s" @@ -7389,8 +7148,9 @@ msgid "Option --cwd may not be abbreviated!" msgstr "选项 '--cwd' 不能简短!" -msgid "" -"Option -R has to be separated from other options (i.e. not -qR) and --" +#, fuzzy +msgid "" +"Option -R has to be separated from other options (e.g. not -qR) and --" "repository may only be abbreviated as --repo!" msgstr "" "选项 -R 必须隔离使用(也就是不能 -qR)，并且 --repository 只能简短为 --repo!" @@ -7406,7 +7166,8 @@ msgid "invalid arguments" msgstr "非法参数" -msgid "exception raised - generating profile anyway\n" +#, python-format +msgid "unrecognized profiling format '%s' - Ignored\n" msgstr "" msgid "" @@ -7451,7 +7212,10 @@ " 没有找到工具合并 %s\n" "使用本地(l)或者他人(o)的内容?" -msgid "[lo]" +msgid "&Local" +msgstr "" + +msgid "&Other" msgstr "" msgid "l" @@ -7478,7 +7242,10 @@ "was merge successful (yn)?" msgstr "" -msgid "[yn]" +msgid "&No" +msgstr "" + +msgid "&Yes" msgstr "" msgid "n" @@ -7496,6 +7263,51 @@ msgid "unknown bisect kind %s" msgstr "" +msgid "" +"\n" +" 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.\n" +"\n" +" Extensions are not loaded by default for a variety of reasons:\n" +" they can increase startup overhead; they may be meant for\n" +" advanced usage only; they may provide potentially dangerous\n" +" abilities (such as letting you destroy or modify history); they\n" +" might not be ready for prime time; or they may alter some\n" +" usual behaviors of stock Mercurial. It is thus up to the user to\n" +" activate extensions as needed.\n" +"\n" +" To enable the \"foo\" extension, either shipped with Mercurial\n" +" or in the Python search path, create an entry for it in your\n" +" hgrc, like this:\n" +"\n" +" [extensions]\n" +" foo =\n" +"\n" +" You may also specify the full path to an extension:\n" +"\n" +" [extensions]\n" +" myfeature = ~/.hgext/myfeature.py\n" +"\n" +" To explicitly disable an extension enabled in an hgrc of broader\n" +" scope, prepend its path with !:\n" +"\n" +" [extensions]\n" +" # disabling extension bar residing in /path/to/extension/bar.py\n" +" hgext.bar = !/path/to/extension/bar.py\n" +" # ditto, but no path was supplied for extension baz\n" +" hgext.baz = !\n" +" " +msgstr "" + +#, fuzzy +msgid "disabled extensions:" +msgstr "" +"\n" +"启用的扩展:\n" +"\n" + msgid "Date Formats" msgstr "" @@ -7526,9 +7338,9 @@ " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" "\n" " This is the internal representation format for dates. unixtime is\n" -" the number of seconds since the epoch (1970-01-01 00:00 UTC). offset\n" -" is the offset of the local timezone, in seconds west of UTC (negative\n" -" if the timezone is east of UTC).\n" +" the number of seconds since the epoch (1970-01-01 00:00 UTC).\n" +" offset is the offset of the local timezone, in seconds west of UTC\n" +" (negative if the timezone is east of UTC).\n" "\n" " The log command also accepts date ranges:\n" "\n" @@ -7595,10 +7407,10 @@ msgid "" "\n" "HG::\n" -" Path to the 'hg' executable, automatically passed when running hooks,\n" -" extensions or external tools. If unset or empty, this is the hg\n" -" executable's name if it's frozen, or an executable named 'hg'\n" -" (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\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.\n" "\n" "HGEDITOR::\n" @@ -7634,8 +7446,8 @@ " from the current repository is read.\n" "\n" " For each element in HGRCPATH:\n" -" * if it's a directory, all directories ending with .rc are added\n" -" * otherwise, the directory itself will be added\n" +" * if it's a directory, all files ending with .rc are added\n" +" * otherwise, the file itself will be added\n" "\n" "HGUSER::\n" " This is the string used as the author of a commit. If not set,\n" @@ -7659,16 +7471,16 @@ " This is the name of the editor to use when committing. See EDITOR.\n" "\n" "EDITOR::\n" -" Sometimes Mercurial needs to open a text file in an editor\n" -" for a user to modify, for example when writing commit messages.\n" -" The editor it uses is determined by looking at the environment\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'.\n" "\n" "PYTHONPATH::\n" -" This is used by Python to find imported modules and may need to be set\n" -" appropriately if this Mercurial is not installed system-wide.\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 "" @@ -7677,14 +7489,13 @@ msgid "" "\n" -" Mercurial supports several ways to specify individual\n" -" revisions.\n" -"\n" -" A plain integer is treated as a revision number. Negative\n" -" integers are treated as toplogical offsets from the tip, with\n" -" -1 denoting the tip. As such, negative numbers are only useful\n" -" if you've memorized your local tree numbers and want to save\n" -" typing a single digit. This editor suggests copy and paste.\n" +" Mercurial supports several ways to specify individual revisions.\n" +"\n" +" A plain integer is treated as a revision number. Negative integers\n" +" are treated as topological offsets from the tip, with -1 denoting\n" +" the tip. As such, negative numbers are only useful if you've\n" +" memorized your local tree numbers and want to save typing a single\n" +" digit. This editor suggests copy and paste.\n" "\n" " A 40-digit hexadecimal string is treated as a unique revision\n" " identifier.\n" @@ -7705,15 +7516,16 @@ " revision of an empty repository, and the parent of revision 0.\n" "\n" " The reserved name \".\" indicates the working directory parent. If\n" -" no working directory is checked out, it is equivalent to null.\n" -" If an uncommitted merge is in progress, \".\" is the revision of\n" -" the first parent.\n" +" no working directory is checked out, it is equivalent to null. If\n" +" an uncommitted merge is in progress, \".\" is the revision of the\n" +" first parent.\n" " " msgstr "" msgid "Specifying Multiple Revisions" msgstr "指定多个版本" +#, fuzzy msgid "" "\n" " When Mercurial accepts more than one revision, they may be\n" @@ -7723,8 +7535,8 @@ " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n" " are revision identifiers. Both BEGIN and END are optional. If\n" " BEGIN is not specified, it defaults to revision number 0. If END\n" -" is not specified, it defaults to the tip. The range \":\" thus\n" -" means \"all revisions\".\n" +" is not specified, it defaults to the tip. The range \":\" thus means\n" +" \"all revisions\".\n" "\n" " If BEGIN is greater than END, revisions are treated in reverse\n" " order.\n" @@ -7751,11 +7563,13 @@ msgid "Diff Formats" msgstr "差异格式" -msgid "" -"\n" -" Mercurial's default format for showing changes between two versions\n" -" of a file is compatible with the unified format of GNU diff, which\n" -" can be used by GNU patch and many other standard tools.\n" +#, fuzzy +msgid "" +"\n" +" Mercurial's default format for showing changes between two\n" +" versions of a file is compatible with the unified format of GNU\n" +" diff, which can be used by GNU patch and many other standard\n" +" tools.\n" "\n" " While this standard format is often enough, it does not encode the\n" " following information:\n" @@ -7773,15 +7587,16 @@ " This means that when generating diffs from a Mercurial repository\n" " (e.g. with \"hg export\"), you should be careful about things like\n" " file copies and renames or other things mentioned above, because\n" -" when 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.\n" +" when applying a standard diff to a different repository, this\n" +" extra information is lost. Mercurial's internal operations (like\n" +" push and pull) are not affected by this, because they use an\n" +" internal binary format for communicating changes.\n" "\n" " To make Mercurial produce the git extended diff format, use the\n" -" --git option available for many commands, or set 'git = True' in the\n" -" [diff] 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" +" --git option available for many commands, or set 'git = True' in\n" +" the [diff] section of your hgrc. You do not need to set this\n" +" option when importing diffs in this format or using them in the mq\n" +" extension.\n" " " msgstr "" "\n" @@ -7811,50 +7626,56 @@ msgid "Template Usage" msgstr "模版用法" +#, fuzzy msgid "" "\n" " Mercurial allows you to customize output of commands through\n" -" templates. You can either pass in a template from the command line,\n" -" via the --template option, or select an existing template-style (--" -"style).\n" -"\n" -" You can customize output for any \"log-like\" command: log, outgoing,\n" -" incoming, tip, parents, heads and glog.\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).\n" +"\n" +" You can customize output for any \"log-like\" command: log,\n" +" outgoing, incoming, tip, parents, heads and glog.\n" "\n" " Three styles are packaged with Mercurial: default (the style used\n" -" when no explicit preference is passed), compact and changelog. Usage:\n" +" when no explicit preference is passed), compact and changelog.\n" +" Usage:\n" "\n" " $ hg log -r1 --style changelog\n" "\n" -" A template is a piece of text, with markup to invoke variable expansion:\n" +" A template is a piece of text, with markup to invoke variable\n" +" expansion:\n" "\n" " $ hg log -r1 --template \"{node}\\n\"\n" " b56ce7b07c52de7d5fd79fb89701ea538af65746\n" "\n" " Strings in curly braces are called keywords. The availability of\n" -" keywords depends on the exact context of the templater. These keywords\n" -" are usually available for templating a log-like command:\n" +" keywords depends on the exact context of the templater. These\n" +" keywords are usually available for templating a log-like command:\n" "\n" " - 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 default.\n" " - date: Date information. The date when the changeset was 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 by\n" " 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 40-character\n" -" hexadecimal string.\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 number.\n" " - tags: List of strings. Any tags associated with the changeset.\n" "\n" " 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 it.\n" -" Filters are functions which return a string based on the input variable.\n" -" You can also use a chain of filters to get the desired output:\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:\n" "\n" " $ hg tip --template \"{date|isodate}\\n\"\n" " 2008-08-21 18:22 +0000\n" @@ -7867,37 +7688,41 @@ " the given date/time and the current 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 path\n" -" separator (ignoring trailing seprators). For example,\n" +" separator (ignoring trailing separators). For example,\n" " \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar\".\n" +" - stripdir: Treat the text as path and strip a directory level, if\n" +" possible. For example, \"foo\" and \"foo/bar\" becomes \"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 email\n" -" address, and extracts just the domain component.\n" +" - domain: Any text. Finds the first string that looks like an\n" +" email address, and extracts just the domain component.\n" " Example: 'User <user@example.com>' becomes 'example.com'.\n" -" - email: Any text. Extracts the first string that looks like an email\n" -" address. Example: 'User <user@example.com>' becomes\n" +" - email: Any text. Extracts the first string that looks like an\n" +" email address. Example: 'User <user@example.com>' becomes\n" " '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" -" - obfuscate: Any text. Returns the input text rendered as a sequence\n" -" of XML entities.\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\n" " in email headers.\n" -" - short: Changeset hash. Returns the short form of a changeset hash,\n" -" i.e. a 12-byte hexadecimal string.\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 the\n" -" first starting with a tab character.\n" -" - urlescape: Any text. Escapes all \"special\" characters. For example,\n" -" \"foo bar\" becomes \"foo%20bar\".\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 address.\n" " " msgstr "" @@ -7976,9 +7801,11 @@ " - user: 输入任意文本。返回 email 地址中的用户名称部分。\n" " " -msgid "Url Paths" +#, fuzzy +msgid "URL Paths" msgstr "统一资源定位路径" +#, fuzzy msgid "" "\n" " Valid URLs are of the form:\n" @@ -7996,42 +7823,44 @@ " or changeset to use from the remote repository.\n" "\n" " Some features, such as pushing to http:// and https:// URLs are\n" -" only possible if the feature is explicitly enabled on the\n" -" remote Mercurial server.\n" +" only possible if the feature is explicitly enabled on the remote\n" +" Mercurial server.\n" "\n" " Some notes about using SSH with Mercurial:\n" -" - 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" +" - SSH requires an accessible shell account on the destination\n" +" machine and a copy of hg in the remote path or specified with as\n" +" remotecmd.\n" " - path is relative to the remote user's home directory by default.\n" " Use an extra slash at the start of a path to specify an absolute path:\n" " ssh://example.com//tmp/repository\n" -" - 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.:\n" +" - Mercurial doesn't use its own compression via SSH; the right\n" +" thing to do is to configure it in your ~/.ssh/config, e.g.:\n" " Host *.mylocalnetwork.example.com\n" " Compression no\n" " Host *\n" " Compression yes\n" -" Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n" -" with the --ssh command line option.\n" -"\n" -" These urls can all be stored in your hgrc with path aliases under the\n" -" [paths] section like so:\n" +" Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n" +" or with the --ssh command line option.\n" +"\n" +" These URLs can all be stored in your hgrc with path aliases under\n" +" the [paths] section like so:\n" " [paths]\n" " alias1 = URL1\n" " alias2 = URL2\n" " ...\n" "\n" -" You can then use the alias for any command that uses a url (for example\n" -" 'hg pull alias1' would pull from the 'alias1' path).\n" +" 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).\n" "\n" " Two path aliases are special because they are used as defaults\n" -" when you do not provide the url to a command:\n" +" when you do not provide the URL to a command:\n" "\n" " 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-\n" -" and pull-like commands (including in and out).\n" +" When you create a repository with hg clone, the clone command\n" +" saves the location of the source repository as the new\n" +" repository's 'default' path. This is then used when you omit\n" +" path from push- and pull-like commands (including incoming and\n" +" outgoing).\n" "\n" " default-push:\n" " The push command will look for a path named 'default-push', and\n" @@ -8089,6 +7918,21 @@ " 命令 'push' 会查找别名是 'default-push' 的路径，它覆盖定义 'default'。\n" " " +#, fuzzy +msgid "Using additional features" +msgstr "启用额外的输出" + +#, fuzzy +msgid "can only share local repositories" +msgstr "为此版本库启动服务 'inotify'" + +#, fuzzy +msgid "destination already exists" +msgstr "版本库 %s 已存在" + +msgid "updating working directory\n" +msgstr "正在更新工作目录\n" + #, python-format msgid "destination directory: %s\n" msgstr "目标目录: %s\n" @@ -8097,6 +7941,10 @@ msgid "destination '%s' already exists" msgstr "" +#, fuzzy, python-format +msgid "destination '%s' is not empty" +msgstr "非本地版本库 '%s'" + msgid "" "src repository does not support revision lookup and so doesn't support clone " "by revision" @@ -8105,9 +7953,6 @@ msgid "clone from remote to remote not supported" msgstr "" -msgid "updating working directory\n" -msgstr "正在更新工作目录\n" - msgid "updated" msgstr "已更新" @@ -8142,7 +7987,7 @@ msgid "SSL support is unavailable" msgstr "" -msgid "IPv6 not available on this system" +msgid "IPv6 is not available on this system" msgstr "" #, python-format @@ -8237,8 +8082,8 @@ msgid "real URL is %s\n" msgstr "实际 URL 是 '%s'\n" -#, python-format -msgid "Requested URL: '%s'\n" +#, fuzzy, python-format +msgid "requested URL: '%s'\n" msgstr "请求的 URL: '%s'\n" #, python-format @@ -8296,6 +8141,10 @@ msgstr "" #, python-format +msgid ".hg/sharedpath points to nonexistent directory %s" +msgstr "" + +#, python-format msgid "%r cannot be used in a tag name" msgstr "" @@ -8314,7 +8163,7 @@ msgstr "" #, python-format -msgid "tag '%s' refers to unknown node" +msgid "working directory has unknown parent '%s'!" msgstr "" #, python-format @@ -8367,26 +8216,32 @@ msgid "cannot partially commit a merge (do not specify files or patterns)" msgstr "" -#, python-format -msgid "%s not tracked!\n" +#, fuzzy +msgid "file not found!" +msgstr "没有找到样式: %s" + +#, fuzzy +msgid "no match under directory!" +msgstr "改变工作目录" + +#, fuzzy +msgid "file not tracked!" msgstr "%s 没有被跟踪!\n" +msgid "nothing changed\n" +msgstr "没有改变\n" + msgid "unresolved merge conflicts (see hg resolve)" msgstr "未解决的合并冲突(参见 'hg resolve')" -msgid "nothing changed\n" -msgstr "没有改变\n" +#, fuzzy, python-format +msgid "committing subrepository %s\n" +msgstr "初始化目标版本库 %s\n" #, python-format msgid "trouble committing %s!\n" msgstr "提交 '%s' 出错!\n" -msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." -msgstr "HG: 请输入提交日志。以 'HG:' 开始的行会被删除。" - -msgid "empty commit message" -msgstr "空的提交日志" - #, python-format msgid "%s does not exist!\n" msgstr "%s 不存在!\n" @@ -8414,6 +8269,10 @@ msgstr "" #, python-format +msgid "%s not tracked!\n" +msgstr "%s 没有被跟踪!\n" + +#, python-format msgid "%s not removed!\n" msgstr "" @@ -8486,6 +8345,10 @@ "changegroupsubset." msgstr "" +#, python-format +msgid "abort: push creates new remote branch '%s'!\n" +msgstr "" + msgid "abort: push creates new remote heads!\n" msgstr "" @@ -8607,9 +8470,6 @@ msgid "invalid local address: %s" msgstr "" -msgid "'\\n' and '\\r' disallowed in filenames" -msgstr "" - #, python-format msgid "failed to remove %s from manifest" msgstr "" @@ -8628,6 +8488,22 @@ msgid "case-folding collision between %s and %s" msgstr "" +#, python-format +msgid "" +" conflicting flags for %s\n" +"(n)one, e(x)ec or sym(l)ink?" +msgstr "" + +#, fuzzy +msgid "&None" +msgstr "完成\n" + +msgid "E&xec" +msgstr "" + +msgid "Sym&link" +msgstr "" + msgid "resolving manifests\n" msgstr "正在解析清单\n" @@ -8641,17 +8517,14 @@ #, python-format msgid "" -" conflicting flags for %s\n" -"(n)one, e(x)ec or sym(l)ink?" -msgstr "" - -#, python-format -msgid "" " local changed %s which remote deleted\n" "use (c)hanged version or (d)elete?" msgstr "" -msgid "[cd]" +msgid "&Changed" +msgstr "" + +msgid "&Delete" msgstr "" msgid "c" @@ -8663,6 +8536,9 @@ "use (c)hanged version or leave (d)eleted?" msgstr "" +msgid "&Deleted" +msgstr "" + #, python-format msgid "preserving %s for resolve of %s\n" msgstr "" @@ -8676,10 +8552,6 @@ msgstr "正在检出 %s\n" #, python-format -msgid "moving %s to %s\n" -msgstr "" - -#, python-format msgid "getting %s to %s\n" msgstr "" @@ -8697,6 +8569,9 @@ msgid "nothing to merge (use 'hg update' or check 'hg heads')" msgstr "" +msgid "outstanding uncommitted changes (use 'hg status' to list changes)" +msgstr "" + msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)" msgstr "" @@ -8742,7 +8617,11 @@ msgstr "" #, python-format -msgid "Hunk #%d succeeded at %d %s(offset %d %s).\n" +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" msgstr "" #, python-format @@ -8784,10 +8663,29 @@ msgstr "" #, python-format +msgid "Unsupported line endings type: %s" +msgstr "" + +#, python-format msgid "no valid hunks found; trying with %r instead\n" msgstr "" #, python-format +msgid "exited with status %d" +msgstr "" + +#, python-format +msgid "killed by signal %d" +msgstr "" + +#, python-format +msgid "stopped by signal %d" +msgstr "" + +msgid "invalid exit code" +msgstr "" + +#, python-format msgid "saving bundle to %s\n" msgstr "" @@ -8814,6 +8712,10 @@ msgid "index %s unknown format %d" msgstr "" +#, python-format +msgid "index %s is corrupted" +msgstr "" + msgid "no node" msgstr "" @@ -8888,75 +8790,91 @@ msgid "sending %s (%d bytes)\n" msgstr "正在发送 %s (%d 字节)\n" +#, python-format +msgid "" +" subrepository sources for %s differ\n" +"use (l)ocal source (%s) or (r)emote source (%s)?" +msgstr "" + +msgid "&Remote" +msgstr "" + +msgid "r" +msgstr "" + +#, python-format +msgid "" +" local changed subrepository %s which remote removed\n" +"use (c)hanged version or (d)elete?" +msgstr "" + +#, python-format +msgid "" +" remote changed subrepository %s which local removed\n" +"use (c)hanged version or (d)elete?" +msgstr "" + +#, fuzzy, python-format +msgid "removing subrepo %s\n" +msgstr "正在删除 %s\n" + +#, fuzzy, python-format +msgid "pulling subrepo %s\n" +msgstr "正在拉自 %s\n" + +#, fuzzy, python-format +msgid "pushing subrepo %s\n" +msgstr "正在推到 %s\n" + msgid "unmatched quotes" msgstr "不匹配的引号" #, python-format +msgid "error expanding '%s%%%s'" +msgstr "" + +#, python-format +msgid "unknown filter '%s'" +msgstr "" + +#, python-format msgid "style not found: %s" msgstr "没有找到样式: %s" #, python-format -msgid "%s:%s: parse error" -msgstr "%s:%s: 解析出错" - -#, python-format msgid "template file %s: %s" msgstr "模版文件 %s: %s" -#, python-format -msgid "Error expanding '%s%%%s'" -msgstr "" - -msgid "transaction abort!\n" -msgstr "事务中止!\n" +msgid "cannot use transaction when it is already committed/aborted" +msgstr "" #, python-format msgid "failed to truncate %s\n" msgstr "截断 '%s' 失败\n" +msgid "transaction abort!\n" +msgstr "事务中止!\n" + msgid "rollback completed\n" msgstr "完成回滚\n" +msgid "rollback failed - please run hg recover\n" +msgstr "" + #, python-format msgid "Not trusting file %s from untrusted user %s, group %s\n" msgstr "" #, python-format -msgid "" -"Failed to parse %s\n" -"%s" -msgstr "" -"解析 '%s' 失败\n" -"%s" - -#, python-format msgid "Ignored: %s\n" msgstr "" -#, python-format -msgid "unable to open %s: %s" -msgstr "" - -#, python-format -msgid "" -"failed to parse %s\n" -"%s" -msgstr "" - -#, python-format -msgid "" -"Error in configuration section [%s] parameter '%s':\n" -"%s" -msgstr "" - -#, python-format -msgid "Ignoring untrusted configuration option %s.%s = %s\n" -msgstr "" - -#, python-format -msgid "" -"Error in configuration section [%s]:\n" -"%s" +#, fuzzy, python-format +msgid "ignoring untrusted configuration option %s.%s = %s\n" +msgstr "显示不能信赖的配置选项" + +#, python-format +msgid "%s.%s not a boolean ('%s')" msgstr "" msgid "enter a commit username:" @@ -9003,18 +8921,14 @@ msgstr "用户:" #, python-format +msgid "http auth: user %s, password %s\n" +msgstr "" + +#, python-format msgid "proxying through http://%s:%s\n" msgstr "" #, python-format -msgid "http auth: user %s, password %s\n" -msgstr "" - -#, python-format -msgid "%s, please check your locale settings" -msgstr "" - -#, python-format msgid "command '%s' failed: %s" msgstr "" @@ -9033,24 +8947,6 @@ msgid "Hardlinks not supported" msgstr "" -msgid "user name not available - set USERNAME environment variable" -msgstr "" - -#, python-format -msgid "exited with status %d" -msgstr "" - -#, python-format -msgid "killed by signal %d" -msgstr "" - -#, python-format -msgid "stopped by signal %d" -msgstr "" - -msgid "invalid exit code" -msgstr "" - #, python-format msgid "could not symlink to %r: %s" msgstr "" @@ -9138,7 +9034,11 @@ msgstr "" #, python-format -msgid "rev %d point to %s changeset %d" +msgid "rev %d points to nonexistent changeset %d" +msgstr "" + +#, python-format +msgid "rev %d points to unexpected changeset %d" msgstr "" #, python-format @@ -9175,6 +9075,10 @@ msgid "checking manifests\n" msgstr "" +#, fuzzy, python-format +msgid "%s not in changesets" +msgstr "列出修改集" + msgid "file without name in manifest" msgstr "" @@ -9256,3 +9160,6 @@ #, python-format msgid "(first damaged changeset appears to be %d)\n" msgstr "" + +msgid "user name not available - set USERNAME environment variable" +msgstr ""