diff --git a/hgext/convert/common.py b/hgext/convert/common.py --- a/hgext/convert/common.py +++ b/hgext/convert/common.py @@ -289,7 +289,7 @@ class commandline(object): 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) diff --git a/i18n/da.po b/i18n/da.po --- a/i18n/da.po +++ b/i18n/da.po @@ -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 @@ msgid "" msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: \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: \n" "Language-Team: Danish\n" "MIME-Version: 1.0\n" @@ -32,13 +32,13 @@ msgid " (default: %s)" 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 @@ msgstr "" "\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 @@ msgid "" " 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 @@ msgid "acl: allowing changeset %s\n" 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 @@ msgid "a bookmark cannot have the name o 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 @@ msgid "rename a given bookmark" 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 @@ msgstr "" 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 @@ msgid "show children of the specified re 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 @@ msgstr "" #, 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 @@ msgid "show progress" 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 @@ msgid "" 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 @@ msgid "source repository type" 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 @@ msgid "preserve source changesets order" 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 @@ msgid "set commit time fuzz in seconds" msgstr "" msgid "specify cvsroot" -msgstr "" +msgstr "angiv cvsroot" msgid "show parent changesets" msgstr "vis forældre-ændringer" @@ -862,10 +869,10 @@ msgid "show current changeset in ancesto 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 @@ msgid "" 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 @@ msgstr "kører: %s\n" #, python-format msgid "%s error:\n" -msgstr "" +msgstr "%s fejl:\n" #, python-format msgid "%s %s" @@ -909,19 +916,19 @@ msgstr "" #, 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 @@ msgstr "ukendt sortering: %s" #, 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 @@ msgid "" "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 @@ msgstr "samler CVS rlog\n" #, 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 @@ msgstr "kører %s\n" #, 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 @@ msgstr "revision skal efterfølges af datolinje" #, 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 @@ msgid "%d changeset entries\n" 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 @@ msgstr "fejl i filafbildning" #, 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 @@ msgstr "" #, 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 @@ msgstr "analyserer revision %s...\n" #, 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 @@ msgstr "" #, 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 @@ msgstr "" #, 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 @@ msgstr "" #, 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 @@ msgstr "" #, 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 @@ msgstr "laver øjebliksbillede af %d filer fra rev %s\n" #, 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 @@ msgid "pass option to comparison program 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 @@ msgid "" 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 @@ msgstr "arbejdskataloget mangler nogle f 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 @@ msgstr "sammenføjer med %d:%s\n" #, 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 @@ msgid "a specific revision you would lik 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 @@ msgid "" 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 @@ msgstr "" #, 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 @@ msgid "do not commit the sigfile after s 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 @@ msgstr "" #, 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 @@ msgid "limit number of changes displayed 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 @@ msgstr "" #, 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 @@ msgid "cia: no project specified" 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 @@ msgid "start interactive history viewer" msgstr "" msgid "hg view [-l LIMIT] [REVRANGE]" -msgstr "" +msgstr "hg view [-l GRÆNSE] [REV-INTERVAL]" msgid "generate patch" msgstr "" @@ -1769,22 +1765,22 @@ msgid "search" 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 @@ msgid "max-count" 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 @@ msgid "" "-- Adam Hupp \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 @@ msgid "" 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 @@ msgid "name of file to write process ID 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 @@ msgid "*** this limit is too low to watc 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 @@ msgstr "" #, 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 @@ msgid "%s end dirstate reload\n" 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 @@ msgstr "" #, 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 @@ msgid "interhg: invalid regexp for %s: % 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 @@ msgstr "" #, python-format msgid "creating temporary repository at %s\n" -msgstr "" +msgstr "opretter midlertidigt depot ved %s\n" #, python-format msgid "" @@ -2116,6 +2112,8 @@ msgid "" "\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 @@ msgid "hg kwdemo [-d] [-f RCFILE] [TEMPL 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 @@ msgid "additionally show untracked files 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 @@ msgid "" "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 @@ msgstr "ingen rettelser anvendt\n" #, 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 @@ msgstr "" #, 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 @@ msgstr "" #, 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 @@ msgstr "tilføjer %s til series filen\n" 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 @@ msgid "" " 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 @@ msgid "" " 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 @@ msgid "" 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 @@ msgid "" " 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 @@ msgid "" " 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 @@ msgid "" " 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 @@ msgid "" " 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 @@ msgid "" " 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 @@ msgid "print first line of patch header" 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 @@ msgid "location of source patch reposito 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 @@ msgid "keep folded patch files" 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 @@ msgid "drop all guards" 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 @@ msgid "qpush after importing" 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 @@ msgid "add \"Date: \" to pat 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 @@ msgid "forget any local changes" 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 @@ msgid "merge queue name" 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 @@ msgid "update \"Date: \" in 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 @@ msgid "update queue working directory" msgstr "" msgid "hg qrestore [-d] [-u] REV" -msgstr "" +msgstr "hg qrestore [-d] [-u] REV" msgid "copy patch directory" msgstr "" @@ -3152,7 +3224,7 @@ msgid "force copy" 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 @@ msgid "pop, then reapply patches" 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 @@ msgid "no backups" 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 @@ msgid "hg qfinish [-a] [REV...]" 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 @@ msgid "notify: changes have source \"%s\ 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 @@ msgid "" 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 @@ msgid "" 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 @@ msgid "" 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 @@ msgid "Final summary:\n" 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 @@ msgid "a revision to send" 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 @@ msgid "send an introduction email for a 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 @@ msgstr "" #, 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 @@ msgid "end filenames with NUL, for use w 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 @@ msgid "" "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 @@ msgid "restoring %r to %r\n" 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 @@ msgid "[-U] SOURCE [DEST]" 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 @@ msgstr "" #, 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 @@ msgstr "" #, 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 @@ msgid "working dir not at transplant par msgstr "" msgid "commit failed" -msgstr "" +msgstr "deponering fejlede" msgid "apply changeset? [ynmpcq?]:" msgstr "" @@ -4067,7 +4141,7 @@ msgid "" 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 @@ msgid "--all requires a branch revision" 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 @@ msgid "continue last transplant session 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 @@ msgid "" "Path encoding conversion are done between Unicode and\n" "encoding.encoding which is decided by Mercurial from current locale\n" "setting or HGENCODING.\n" -"\n" msgstr "" #, python-format @@ -4158,7 +4231,7 @@ msgid "[win32mbcs] activated with encodi 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 @@ msgid "" 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 @@ msgid "" 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 @@ msgstr "" #, 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 @@ msgstr "" 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 @@ msgid "HG: no files changed" 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 @@ msgid "" " 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 @@ msgid "" 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 @@ msgstr "" " Med --merge tilvalget vil forælderen til arbejdskataloget blive\n" " husket og det nye hoved vil blive sammenføjet med denne ændring\n" " bagefter. Dette sparer dig for at lave sammenføjningen selv.\n" -" Resultatet af denne sammenføjning er ikke 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 @@ msgid "" " 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 @@ msgid "" " 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 @@ msgid "" "\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 @@ msgstr "" "\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 @@ msgid "" " 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 @@ msgid "" " 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 @@ msgstr "" " 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 @@ msgstr "" " %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 @@ 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 "" +"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 @@ msgid "" " 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 @@ msgid "" " 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 @@ msgstr "" " 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 @@ msgid "" 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 @@ msgid "" 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 @@ msgstr "" " 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 @@ msgid "" " 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 @@ msgstr "" " -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 @@ msgid "" " 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 @@ msgid "" 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 @@ msgid "" " 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 @@ msgid "" 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 @@ msgid "exclude names matching the given msgstr "ekskluder navne som matcher det givne mønster" msgid "use as commit message" -msgstr "brug som arkiveringsbesked" +msgstr "brug som deponeringsbesked" msgid "read commit message from " -msgstr "læs arkiveringsbeskeden fra " +msgstr "læs deponeringsbeskeden fra " msgid "record datecode as commit date" msgstr "noter dato som integrationsdato" @@ -6518,7 +6660,7 @@ msgid "[-a]" 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 @@ msgstr "" #, 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 @@ msgstr "" 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 @@ msgid "" " 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 @@ msgid "Python support for SSL and HTTPS 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 @@ msgstr "" #, 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 @@ msgstr "" #, python-format msgid "repository %s" -msgstr "arkiv %s" +msgstr "depot %s" #, python-format msgid "working directory of %s" @@ -8120,11 +8264,11 @@ msgstr "" #, 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 @@ msgid "already have changeset " 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 @@ msgstr "" #, 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 @@ msgstr "intet at sammenføje (brug 'hg update' eller kontroller 'hg heads')" 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 @@ msgid "" "use (l)ocal source (%s) or (r)emote source (%s)?" msgstr "" -#, fuzzy msgid "&Remote" -msgstr "fjernsystem: " +msgstr "" msgid "r" msgstr "" @@ -8704,15 +8847,15 @@ msgstr "" #, 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 @@ msgid "%s.%s not a boolean ('%s')" 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 @@ msgstr "duplikeret revision %d (%d)" #, 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" diff --git a/i18n/fr.po b/i18n/fr.po new file mode 100644 --- /dev/null +++ b/i18n/fr.po @@ -0,0 +1,8846 @@ +# French translations for Mercurial +# Traductions françaises de Mercurial +# Copyright (C) 2009 Matt Mackall 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: \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 \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" +" \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 isn't given, it will be put in a default location\n" +" (/.hg/shamap by default). The is a simple text file\n" +" that maps each source commit ID to the destination ID for that\n" +" revision, like so:\n" +" \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 =