Mercurial > hg
changeset 9009:196d40e7c885 1.3
Merge with i18n
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 01 Jul 2009 13:57:01 -0500 |
| parents | 70f5d3be5917 (current diff) edd6bdee9798 (diff) |
| children | 475a02734d84 |
| files | |
| diffstat | 4 files changed, 1196 insertions(+), 849 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/da.po Wed Jul 01 13:55:24 2009 -0500 +++ b/i18n/da.po Wed Jul 01 13:57:01 2009 -0500 @@ -7,7 +7,7 @@ # changeset ændring # commit deponere # merge sammenføje -# patch rettelse +# patch lap # repo(sitory) depot # revision revision # tag mærkat @@ -17,14 +17,13 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2009-06-24 17:38+0200\n" -"PO-Revision-Date: 2009-06-27 13:35+0200\n" +"POT-Creation-Date: 2009-06-30 23:18+0200\n" +"PO-Revision-Date: 2009-06-30 23:28+0200\n" "Last-Translator: <mg@lazybytes.net>\n" "Language-Team: Danish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: pygettext.py 1.5\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #, python-format @@ -49,7 +48,7 @@ "\n" msgid "" -"control access to a repository using simple hooks\n" +"hooks for controlling repository access\n" "\n" "This hook makes it possible to allow or deny write access to portions\n" "of a repository when receiving incoming changesets.\n" @@ -202,7 +201,7 @@ msgstr "hg bookmarks [-f] [-d] [-m NAVN] [-r REV] [NAVN]" msgid "" -"integrate Mercurial with a Bugzilla bug tracker\n" +"hooks for integrating with the 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" @@ -386,8 +385,8 @@ msgid "database error: %s" msgstr "databasefejl: %s" -msgid "display children changesets" -msgstr "vis børne-ændringer" +msgid "command to display child changesets" +msgstr "kommando til at vise børne-ændringer" msgid "" "show the children of the given or working directory revision\n" @@ -414,8 +413,8 @@ msgid "hg children [-r REV] [FILE]" msgstr "hg children [-r REV] [FIL]" -msgid "display statistics about repository history" -msgstr "vis statistikker om revisionshistorikken" +msgid "command to display statistics about repository history" +msgstr "kommando til at vise statistikker om depotets historie" #, python-format msgid "Revision %d is a merge, ignoring...\n" @@ -576,8 +575,12 @@ msgid "don't colorize output" msgstr "farvelæg ikke output" -msgid "import from foreign VCS repositories into Mercurial" -msgstr "importer fra fremmede VCS depoter ind i Mercurial" +#, python-format +msgid "ignoring unknown color/effect %r (configured in color.%s)\n" +msgstr "" + +msgid "import revisions from foreign VCS repositories into Mercurial" +msgstr "importer revisioner fra fremmede VCS depoter ind i Mercurial" msgid "" "convert a foreign SCM repository to a Mercurial one.\n" @@ -907,12 +910,8 @@ msgstr "%s fejl:\n" #, python-format -msgid "%s %s" -msgstr "" - -#, python-format msgid "syntax error in %s(%d): key/value pair expected" -msgstr "" +msgstr "syntaksfejl i %s(%d): nøgle/værdi-par forventet" #, python-format msgid "could not open map file %r: %s" @@ -982,7 +981,7 @@ msgstr "mere end end sorteringsmetode angivet" msgid "--sourcesort is not supported by this data source" -msgstr "" +msgstr "--sourcesort er ikke supporteret at denne datakilde" msgid "" "warning: support for external cvsps is deprecated and will be removed in " @@ -1006,7 +1005,7 @@ msgstr "CVS pserver godkendelse fejlede" msgid "server sucks" -msgstr "" +msgstr "serveren sutter" #, python-format msgid "%d bytes missing from remote file" @@ -1078,6 +1077,8 @@ "warning: CVS commit message references non-existent branch %r:\n" "%s\n" msgstr "" +"advarsel: CVS deponeringsbesked refererer en ikke-eksisterende gren %r:\n" +"%s\n" #, python-format msgid "%d changeset entries\n" @@ -1325,7 +1326,7 @@ msgstr "" msgid "" -"allow external programs to compare revisions\n" +"command to 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" @@ -1445,6 +1446,8 @@ msgid "" "working dir not at branch tip (use \"hg update\" to check out branch tip)" msgstr "" +"arbejdskataloget er ikke ved gren-spidsen (brug \"hg update\" for at hente " +"gren-spidsen)" msgid "outstanding uncommitted merge" msgstr "udestående udeponeret sammenføjning" @@ -1475,6 +1478,8 @@ "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge" "\" to merge them)\n" msgstr "" +"sammenføjer ikke med %d andre nye gren-hoveder (brug \"hg heads .\" og \"hg " +"merge\" for at sammenføje dem)\n" #, python-format msgid "updating to %d:%s\n" @@ -1493,13 +1498,13 @@ msgstr "ny ændring %d:%s fletter fjernændringer sammen med lokale\n" msgid "a specific revision you would like to pull" -msgstr "" +msgstr "en bestemt revision som du gerne vil hive ned" msgid "edit commit message" msgstr "rediger deponeringsbesked" msgid "edit commit message (DEPRECATED)" -msgstr "" +msgstr "rediger deponeringsbesked (FORÆLDET)" msgid "switch parents when merging" msgstr "ombyt forældre ved sammenføjning" @@ -1507,8 +1512,8 @@ msgid "hg fetch [SOURCE]" msgstr "hg fetch [KILDE]" -msgid "sign and verify changesets" -msgstr "underskriv og verificer ændringer" +msgid "commands to sign and verify changesets" +msgstr "kommandoer til at underskrive og verificere ændringer" msgid "error while verifying signature" msgstr "fejl ved verifikation af underskrift" @@ -1559,6 +1564,8 @@ "working copy of .hgsigs is changed (please commit .hgsigs manually or use --" "force)" msgstr "" +"arbejdskopien af .hgsigs er ændret (deponer venligst .hgsigs manuelt eller " +"brug --force)" #, python-format msgid "Added signature for changeset %s" @@ -1571,10 +1578,10 @@ msgstr "lav underskriften lokal" msgid "sign even if the sigfile is modified" -msgstr "" +msgstr "underskriv selv hvis signaturfilen er ændret" msgid "do not commit the sigfile after signing" -msgstr "" +msgstr "deponer ikke signaturfilen efter underskrivning" msgid "the key id to sign with" msgstr "nøgle ID der skal underskrives med" @@ -1592,7 +1599,7 @@ msgstr "hg sigs" msgid "" -"show revision graphs in terminals\n" +"command to view revision graphs from a shell\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" @@ -1622,7 +1629,7 @@ msgstr "fandt ingen ændringer\n" msgid "show the revision DAG" -msgstr "" +msgstr "vis revisionsgrafen" msgid "limit number of changes displayed" msgstr "begræns antaln viste ændringer" @@ -1637,7 +1644,7 @@ msgstr "hg glog [TILVALG]... [FIL]" msgid "" -"integrate Mercurial with a CIA notification service\n" +"hooks for integrating with the CIA.vc 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" @@ -1720,10 +1727,10 @@ msgstr "" msgid "output common ancestor information" -msgstr "" +msgstr "udskriv information om fælles forfar" msgid "cat a specific revision" -msgstr "" +msgstr "udskriv en bestemt revision" msgid "cat-file: type or revision not supplied\n" msgstr "" @@ -1735,31 +1742,31 @@ msgstr "" msgid "print revisions" -msgstr "" +msgstr "udskriv revisioner" msgid "print extension options" -msgstr "" +msgstr "udskriv udvidelses valgmuligheder" msgid "start interactive history viewer" -msgstr "" +msgstr "start interaktiv historievisning" msgid "hg view [-l LIMIT] [REVRANGE]" msgstr "hg view [-l GRÆNSE] [REV-INTERVAL]" msgid "generate patch" -msgstr "" +msgstr "generer lap" msgid "recursive" -msgstr "" +msgstr "rekursiv" msgid "pretty" -msgstr "" +msgstr "pæn" msgid "stdin" -msgstr "" +msgstr "standardinddata" msgid "detect copies" -msgstr "" +msgstr "detekter kopier" msgid "search" msgstr "søg" @@ -1773,8 +1780,8 @@ msgid "hg debug-config" msgstr "hg debug-config" -msgid "hg debug-merge-base node node" -msgstr "hg debug-merge-base knude knude" +msgid "hg debug-merge-base REV REV" +msgstr "hg debug-merge-base REV REV" msgid "ignored" msgstr "Ignoreret" @@ -1786,19 +1793,19 @@ msgstr "" msgid "topo-order" -msgstr "" +msgstr "topologisk ordning" msgid "parents" -msgstr "" +msgstr "forældre" msgid "max-count" msgstr "" -msgid "hg debug-rev-list [options] revs" -msgstr "hg debug-rev-list [tilvalg] revisioner" - -msgid "" -"syntax highlighting for hgweb\n" +msgid "hg debug-rev-list [OPTION]... REV..." +msgstr "hg debug-rev-list [TILVALG]... REV..." + +msgid "" +"syntax highlighting for hgweb (requires Pygments)\n" "\n" "It depends on the Pygments syntax highlighting library:\n" "http://pygments.org/\n" @@ -1809,12 +1816,10 @@ "pygments_style = <style>\n" "\n" "The default is 'colorful'.\n" -"\n" -"-- Adam Hupp <adam@hupp.org>\n" -msgstr "" - -msgid "accelerate status report using system level services" -msgstr "accelerer statusreporter ved hjælp af systemservices" +msgstr "" + +msgid "accelerate status report using Linux's inotify service" +msgstr "accelerer statusreporter ved brug af Linux's inotify service" msgid "start an inotify server for this repository" msgstr "start en inotify server for dette depot" @@ -1836,12 +1841,12 @@ msgstr "brugt internt i daemon mode" msgid "minutes to sit idle before exiting" -msgstr "" +msgstr "antal minutter der skal ventes i tomgang før afslutning" msgid "name of file to write process ID to" msgstr "navn på fil at skrive process ID til" -msgid "hg inserve [OPT]..." +msgid "hg inserve [OPTION]..." msgstr "hg inserve [TILVALG]..." msgid "(found dead inotify server socket; removing it)\n" @@ -2070,10 +2075,10 @@ msgstr "" msgid "[keyword] patterns cannot match" -msgstr "" +msgstr "[keyword] mønstre kan ikke matche" msgid "no [keyword] patterns configured" -msgstr "" +msgstr "ingen [keyword] mønstre konfigureret" msgid "" "print [keywordmaps] configuration and an expansion example\n" @@ -2089,18 +2094,18 @@ msgstr "" #, python-format -msgid "" -"\n" -"\t%s\n" -msgstr "" - -#, python-format msgid "creating temporary repository at %s\n" msgstr "opretter midlertidigt depot ved %s\n" #, python-format msgid "" "\n" +"\tconfig using %s keyword template maps\n" +msgstr "" + +#, python-format +msgid "" +"\n" "%s keywords written to %s:\n" msgstr "" @@ -2110,6 +2115,12 @@ #, python-format msgid "" "\n" +"\t%s keywords expanded%s\n" +msgstr "" + +#, python-format +msgid "" +"\n" "removing temporary repository %s\n" msgstr "" "\n" @@ -2125,11 +2136,26 @@ msgstr "" msgid "" -"print files currently configured for keyword expansion\n" -"\n" -" Crosscheck which files in working directory are potential targets\n" -" for keyword expansion. That is, files matched by [keyword] config\n" -" patterns but not symlinks.\n" +"show files configured for keyword expansion\n" +"\n" +" List which files in the working directory are matched by the\n" +" [keyword] configuration patterns.\n" +"\n" +" Useful to prevent inadvertent keyword expansion and to speed up\n" +" execution by including only files that are actual candidates\n" +" for expansion.\n" +"\n" +" See \"hg help keyword\" on how to construct patterns both for\n" +" inclusion and exclusion of files.\n" +"\n" +" Use -u/--untracked to list untracked files as well.\n" +"\n" +" With -a/--all and -v/--verbose the codes used to show the status\n" +" of files are:\n" +" K = keyword expansion candidate\n" +" k = keyword expansion candidate (untracked)\n" +" I = ignored\n" +" i = ignored (untracked)\n" " " msgstr "" @@ -2144,7 +2170,7 @@ msgstr "" msgid "show default keyword template maps" -msgstr "" +msgstr "vis standard keyword skabelon-afbildninger" msgid "read maps from rcfile" msgstr "" @@ -2156,13 +2182,13 @@ msgstr "hg kwexpand [TILVALG]... [FIL]..." msgid "show keyword status flags of all files" -msgstr "" +msgstr "vis keyword status for alle filer" msgid "show files excluded from expansion" -msgstr "" +msgstr "vis filer ekskluderet fra ekspansion" msgid "additionally show untracked files" -msgstr "" +msgstr "vis også ikke-fulgte filer" msgid "hg kwfiles [OPTION]... [FILE]..." msgstr "hg kwfiles [TILVALG]... [FIL]..." @@ -2171,7 +2197,7 @@ msgstr "hg kwshrink [TILVALG]... [FIL]..." msgid "" -"work with a stack of patches\n" +"manage 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" @@ -2194,29 +2220,29 @@ "remove patch from applied stack qpop\n" "refresh contents of top applied patch qrefresh\n" msgstr "" -"arbejd med en stak af lapper\n" +"håndter 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" -"Kendte patches er repræsenteret som patch-filer i .hg/patches\n" -"biblioteket. Anvendte patches er både patch-filer og Mercurial\n" +"Mercurial repository. Den håndterer to stakke af lapper - alle kendte\n" +"lapper og alle anvendte lapper (en delmængde af de kendte lapper).\n" +"\n" +"Kendte lapper er repræsenteret som lap-filer i .hg/patches\n" +"biblioteket. Anvendte lapper er både lap-filer og Mercurial\n" "ændringer.\n" "\n" "Almindelige opgaver (brug \"hg help kommado\" for flere detaljer):\n" "\n" -"forbered repository til at arbejde med patches qinit\n" -"opret ny patch qnew\n" -"importer eksisterende patch qimport\n" -"\n" -"list patch-serien qseries\n" -"list anvendte patches qapplied\n" -"list navnet på den øverste patch qtop\n" -"\n" -"anvend og put patch på stakken qpush\n" -"fjern patch fra stakken qpop\n" -"genopfrisk indholdet af den øverste patch qrefresh\n" +"forbered repository til at arbejde med lapper qinit\n" +"opret ny lap qnew\n" +"importer eksisterende lap qimport\n" +"\n" +"list lap-serien qseries\n" +"list anvendte lapper qapplied\n" +"list navnet på den øverste lap qtop\n" +"\n" +"anvend og put lap på stakken qpush\n" +"fjern lap fra stakken qpop\n" +"genopfrisk indholdet af den øverste lap qrefresh\n" #, python-format msgid "%s appears more than once in %s" @@ -2271,18 +2297,18 @@ #, python-format msgid "apply failed for patch %s" -msgstr "" +msgstr "lap %s kunne ikke anvendes" #, python-format msgid "patch didn't work out, merging %s\n" -msgstr "" +msgstr "lap virkede ikke, sammenføjer %s\n" #, python-format msgid "update returned %d" -msgstr "" +msgstr "opdatering returnerede %d" msgid "repo commit failed" -msgstr "" +msgstr "deponering fejlede" #, python-format msgid "unable to read %s" @@ -2290,14 +2316,14 @@ #, python-format msgid "patch %s does not exist\n" -msgstr "rettelsen %s findes ikke\n" +msgstr "lappen %s findes ikke\n" #, python-format msgid "patch %s is not applied\n" -msgstr "rettelsen %s er ikke anvendt\n" +msgstr "lappen %s er ikke anvendt\n" msgid "patch failed, unable to continue (try -v)\n" -msgstr "" +msgstr "lapning fejlede, kan ikke fortsætte (prøv -v)\n" #, python-format msgid "applying %s\n" @@ -2309,7 +2335,7 @@ #, python-format msgid "imported patch %s\n" -msgstr "importeret rettelse %s\n" +msgstr "importeret lap %s\n" #, python-format msgid "" @@ -2317,14 +2343,14 @@ "imported patch %s" msgstr "" "\n" -"importeret rettelse %s" +"importeret lap %s" #, python-format msgid "patch %s is empty\n" -msgstr "rettelse %s er tom\n" +msgstr "lappen %s er tom\n" msgid "patch failed, rejects left in working dir\n" -msgstr "" +msgstr "lapning fejlede, afvisninger efter efterladt i arbejdskataloget\n" msgid "fuzz found when applying patch, stopping\n" msgstr "" @@ -2335,28 +2361,28 @@ #, python-format msgid "cannot delete revision %d above applied patches" -msgstr "kan ikke slette revision %d ovenover anvendte rettelser" +msgstr "kan ikke slette revision %d ovenover anvendte lapper" #, python-format msgid "patch %s finalized without changeset message\n" -msgstr "" +msgstr "lappen %s er færdiggjort uden en ændringsbesked\n" msgid "qdelete requires at least one revision or patch name" -msgstr "" +msgstr "qdelete kræver mindst en revision eller navnet på en lap" #, python-format msgid "cannot delete applied patch %s" -msgstr "kan ikke slette den anvendte rettelse %s" +msgstr "kan ikke slette den anvendte lap %s" #, python-format msgid "patch %s not in series file" -msgstr "rettelse %s er ikke i series filen" +msgstr "lappen %s er ikke i series filen" msgid "no patches applied" -msgstr "ingen rettelser anvendt" +msgstr "ingen lapper anvendt" msgid "working directory revision is not qtip" -msgstr "" +msgstr "arbejdskatalogets revision er ikke qtip" msgid "local changes found, refresh first" msgstr "lokale ændringer fundet, genopfrisk først" @@ -2366,11 +2392,11 @@ #, python-format msgid "\"%s\" cannot be used as the name of a patch" -msgstr "\"%s\" kan ikke bruges som navnet på en rettelse" +msgstr "\"%s\" kan ikke bruges som navnet på en lap" #, python-format msgid "patch \"%s\" already exists" -msgstr "rettelsen \"%s\" findes allerede" +msgstr "lappen \"%s\" findes allerede" #, python-format msgid "error unlinking %s\n" @@ -2378,7 +2404,7 @@ #, python-format msgid "patch name \"%s\" is ambiguous:\n" -msgstr "rettelsen \"%s\" er tvetydigt:\n" +msgstr "lappen \"%s\" er tvetydigt:\n" #, python-format msgid "patch %s not in series" @@ -2410,7 +2436,7 @@ msgstr "kan ikke skubbe '%s' - %s\n" msgid "all patches are currently applied\n" -msgstr "alle rettelser er i øjeblikket anvendt\n" +msgstr "alle lapper er i øjeblikket anvendt\n" msgid "patch series already fully applied\n" msgstr "" @@ -2428,10 +2454,10 @@ #, python-format msgid "patch %s is not applied" -msgstr "rettelse %s er ikke anvendt" +msgstr "lappen %s er ikke anvendt" msgid "no patches applied\n" -msgstr "ingen rettelser anvendt\n" +msgstr "ingen lapper anvendt\n" #, python-format msgid "qpop: %s is already at the top\n" @@ -2451,7 +2477,7 @@ msgstr "" msgid "patch queue now empty\n" -msgstr "rettelseskøen er nu tom\n" +msgstr "køen af lapper er nu tom\n" msgid "cannot refresh a revision with children" msgstr "" @@ -2466,7 +2492,7 @@ #, python-format msgid "patch %s is not in series file" -msgstr "rettelse %s er ikke i series filen" +msgstr "lappen %s er ikke i series filen" msgid "No saved patch data found\n" msgstr "" @@ -2543,7 +2569,7 @@ #, python-format msgid "patch %s does not exist" -msgstr "rettelse %s eksisterer ikke" +msgstr "lappen %s eksisterer ikke" msgid "need --name to import a patch from -" msgstr "har brug for --name for at importere lap fra -" @@ -2555,21 +2581,19 @@ msgid "" "remove patches from queue\n" "\n" -" The patches must not be applied, and at least one patch is\n" -" required.\n" -"\n" -" With -k/--keep, the patch files are preserved in the patch\n" -" directory.\n" +" The patches must not be applied, and at least one patch is required. " +"With\n" +" -k/--keep, the patch files are preserved in the patch directory.\n" "\n" " To stop managing a patch and move it into permanent history,\n" " use the qfinish command." msgstr "" msgid "print the patches already applied" -msgstr "udskriver rettelserne som allerede er anvendt" +msgstr "udskriver lapperne som allerede er anvendt" msgid "print the patches not yet applied" -msgstr "udskriver rettelserne som ikke er anvendt endnu" +msgstr "udskriver lapperne som ikke er anvendt endnu" msgid "" "import a patch\n" @@ -2661,13 +2685,13 @@ msgstr "" msgid "versioned patch repository not found (see qinit -c)" -msgstr "versionsstyret depot til rettelser blev ikke fundet (se qinit -c)" +msgstr "versionsstyret depot til lapper blev ikke fundet (se qinit -c)" msgid "cloning main repository\n" msgstr "kloner hoveddepot\n" msgid "cloning patch repository\n" -msgstr "kloner rettelsesdepot\n" +msgstr "kloner depotet til lapper\n" msgid "stripping applied patches from destination repository\n" msgstr "" @@ -2682,19 +2706,19 @@ msgstr "udskriver hele series filen" msgid "print the name of the current patch" -msgstr "udskriver navnet på den nuværende rettelse" +msgstr "udskriver navnet på den nuværende lap" msgid "print the name of the next patch" -msgstr "udskriver navnet på den næste rettelse" +msgstr "udskriver navnet på den næste lap" msgid "all patches applied\n" -msgstr "alle rettelser er anvendt\n" +msgstr "alle lapper er anvendt\n" msgid "print the name of the previous patch" -msgstr "udskriver navnet på den forgående rettelse" +msgstr "udskriver navnet på den forgående lap" msgid "only one patch applied\n" -msgstr "kun én rettelse er anvendt\n" +msgstr "kun én lap er anvendt\n" msgid "" "create a new patch\n" @@ -2801,7 +2825,7 @@ msgstr "" msgid "No patches applied" -msgstr "Ingen rettelser anvendt" +msgstr "Der er ikke anvendt nogen lapper" #, python-format msgid "Skipping already folded patch %s" @@ -2911,15 +2935,15 @@ #, python-format msgid "destination %s exists and is not a directory" -msgstr "" +msgstr "målet %s eksisterer og er ikke et katalog" #, python-format msgid "destination %s exists, use -f to force" -msgstr "" +msgstr "målet %s eksisterer, brug -f for at gennemtvinge" #, python-format msgid "copy %s to %s\n" -msgstr "" +msgstr "kopier %s til %s\n" msgid "" "strip a revision and all its descendants from the repository\n" @@ -3104,7 +3128,7 @@ msgstr "" msgid "name of patch file" -msgstr "navn på rettelsesfil" +msgstr "navn på lap" msgid "overwrite existing files" msgstr "" @@ -3268,11 +3292,11 @@ msgid "finish all applied changesets" msgstr "afslut alle anvendte ændringer" -msgid "hg qfinish [-a] [REV...]" -msgstr "hg qfinish [-a] [REV...]" - -msgid "" -"send e-mail notifications for commits/pushes\n" +msgid "hg qfinish [-a] [REV]..." +msgstr "hg qfinish [-a] [REV]..." + +msgid "" +"hooks for sending email notifications at commit/push time\n" "\n" "Subscriptions can be managed through hgrc. Default mode is to print\n" "messages to stdout, for testing and configuring.\n" @@ -3359,11 +3383,11 @@ #, python-format msgid "notify: no subscribers to repository %s\n" -msgstr "" +msgstr "notify: ingen abonnementer til depot %s\n" #, python-format msgid "notify: changes have source \"%s\" - skipping\n" -msgstr "" +msgstr "notify: ændringer har kilde \"%s\" - springer over\n" msgid "" "browse command output with an external pager\n" @@ -3421,7 +3445,7 @@ msgstr "" msgid "" -"send Mercurial changesets as a series of patch e-mails\n" +"command to send changesets as (a series of) patch emails\n" "\n" "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n" "describes the series as a whole.\n" @@ -3649,8 +3673,8 @@ msgid "hg email [OPTION]... [DEST]..." msgstr "hg email [TILVALG]... [MÅL]..." -msgid "delete files not tracked from the working directory" -msgstr "" +msgid "command to delete untracked files from the working directory" +msgstr "kommando til at slette filer fra arbejdskataloget som ikke følges" msgid "" "removes files not tracked by Mercurial\n" @@ -3679,7 +3703,7 @@ #, python-format msgid "%s cannot be removed" -msgstr "" +msgstr "%s kan ikke slettes" #, python-format msgid "warning: %s\n" @@ -3694,28 +3718,28 @@ msgstr "Fjerner katalog %s\n" msgid "abort if an error occurs" -msgstr "" +msgstr "afbryd hvis der opstår en fejl" msgid "purge ignored files too" -msgstr "" +msgstr "udrens også ignorerede filer" msgid "print filenames instead of deleting them" -msgstr "" +msgstr "udskriv filnavne i stedet for at slette dem" msgid "end filenames with NUL, for use with xargs (implies -p/--print)" -msgstr "" +msgstr "afslut filnavne med NUL, for brug med xargs (medfører -p/--print)" msgid "hg purge [OPTION]... [DIR]..." msgstr "hg purge [TILVALG]... [KATALOG]..." msgid "" -"move sets of revisions to a different ancestor\n" +"command to move sets of revisions to a different ancestor\n" "\n" "This extension lets you rebase changesets in an existing Mercurial\n" "repository.\n" "\n" "For more information:\n" -"http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n" +"http://mercurial.selenic.com/wiki/RebaseProject\n" msgstr "" msgid "first revision, do not change ancestor\n" @@ -3886,7 +3910,7 @@ "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] " "| [-c] | [-a]" -msgid "interactively select which sets of changes to commit/qrefresh" +msgid "commands to interactively select changes for commit/qrefresh" msgstr "" msgid "this modifies a binary file (all or nothing)\n" @@ -3955,18 +3979,18 @@ #, python-format msgid "examine changes to %s?" -msgstr "" +msgstr "undersøg ændringer i %s?" msgid " and " msgstr " og " #, python-format msgid "record this change to %r?" -msgstr "" +msgstr "optag denne ændring i %r?" #, python-format msgid "record change %d/%d to %r?" -msgstr "" +msgstr "optag ændring %d/%d i %r?" msgid "" "interactively select changes to commit\n" @@ -4044,7 +4068,7 @@ msgstr "" msgid "" -"transplant changesets from another branch\n" +"command to transplant changesets from another branch\n" "\n" "This extension allows you to transplant patches from another branch.\n" "\n" @@ -4066,7 +4090,7 @@ #, python-format msgid "%s transplanted to %s\n" -msgstr "" +msgstr "%s transplanteret til %s\n" #, python-format msgid "filtering %s\n" @@ -4190,7 +4214,7 @@ msgstr "hg transplant [-s DEPOT] [-b GREN [-a]] [-p REV] [-m REV] [REV]..." msgid "" -"allow the use of MBCS paths with problematic encoding\n" +"allow the use of MBCS paths with problematic encodings\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" @@ -4418,11 +4442,11 @@ #, python-format msgid "moving %s to %s\n" -msgstr "" +msgstr "flytter %s til %s\n" #, python-format msgid "copying %s to %s\n" -msgstr "" +msgstr "kopierer %s til %s\n" #, python-format msgid "%s has not been committed yet, so no copy data will be stored for %s.\n" @@ -4485,7 +4509,7 @@ msgstr "filer-:" msgid "files:" -msgstr "" +msgstr "filer:" #, python-format msgid "files: %s\n" @@ -4537,14 +4561,14 @@ "HG: Skriv deponeringsbesked. Linier som starter med 'HG:' bliver fjernet." msgid "HG: Leave message empty to abort commit." -msgstr "" +msgstr "HG: Efterlad beskeden tom for at afbryde deponeringen." #, python-format msgid "HG: user: %s" msgstr "HG: bruger: %s" msgid "HG: branch merge" -msgstr "" +msgstr "HG: gren-sammenføjning" #, python-format msgid "HG: branch '%s'" @@ -4653,7 +4677,7 @@ #, python-format msgid "%s: binary file\n" -msgstr "" +msgstr "%s: binær fil\n" msgid "" "create an unversioned archive of a repository revision\n" @@ -4682,7 +4706,7 @@ msgstr "" msgid "no working directory: please specify a revision" -msgstr "" +msgstr "intet arbejdskatalog: angive venligst en revision" msgid "repository root cannot be destination" msgstr "" @@ -4731,7 +4755,7 @@ msgstr "angiv venligst kun en revision" msgid "please specify a revision to backout" -msgstr "" +msgstr "angiv venligst en revision der skal omgøres" msgid "cannot backout change on a different branch" msgstr "kan ikke omgøre en ændring på en anden gren" @@ -4759,7 +4783,7 @@ #, python-format msgid "merging with changeset %s\n" -msgstr "" +msgstr "sammenføjer med ændring %s\n" msgid "the backout changeset is a new head - do not forget to merge\n" msgstr "" @@ -4798,9 +4822,13 @@ msgid "Due to skipped revisions, the first good revision could be any of:\n" msgstr "" +"På grund af oversprungne revisioner kan den første gode revision være en " +"hvilken som helst af:\n" msgid "Due to skipped revisions, the first bad revision could be any of:\n" msgstr "" +"På grund af oversprungne revisioner kan den første dårlige revision være en " +"hvilken som helst af:\n" msgid "cannot bisect (no known good revisions)" msgstr "" @@ -4812,7 +4840,7 @@ msgstr "" msgid "incompatible arguments" -msgstr "" +msgstr "inkompatible argumenter" #, python-format msgid "cannot find executable: %s" @@ -4832,7 +4860,7 @@ #, python-format msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n" -msgstr "" +msgstr "Tester ændring %s:%s (%s ændringer tilbage, ~%s test)\n" msgid "" "set or show the current branch name\n" @@ -4860,16 +4888,17 @@ msgid "a branch of the same name already exists (use --force to override)" msgstr "" +"en gren ved samme navn eksisterer allerede (brug --force for at gennemtvinge)" #, python-format msgid "marked working directory as branch %s\n" -msgstr "" +msgstr "markerede arbejdskataloget som gren %s\n" msgid "" "list repository named branches\n" "\n" " List the repository's named branches, indicating which ones are\n" -" inactive. If active is specified, only show active branches.\n" +" inactive. If -a/--active is specified, only show active branches.\n" "\n" " A branch is considered active if it contains repository heads.\n" "\n" @@ -4879,7 +4908,7 @@ "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" +" inaktive. Hvis -a/--active angivet, da vises kun aktive grene.\n" "\n" " En gren er anses for at være aktiv hvis den indeholder\n" " depothoveder.\n" @@ -4899,8 +4928,8 @@ " parameters. To create a bundle containing all changesets, use\n" " -a/--all (or --base null).\n" "\n" -" To change the compression method applied, use the -t/--type\n" -" option. The available compression methods are: none, bzip2, and\n" +" You can change compression method with the -t/--type option.\n" +" The available compression methods are: none, bzip2, and\n" " gzip (by default, bundles are compressed using bzip2).\n" "\n" " The bundle file can then be transferred using conventional means\n" @@ -5074,7 +5103,7 @@ #, python-format msgid "committed changeset %d:%s\n" -msgstr "" +msgstr "deponerede ændring %d:%s\n" msgid "" "mark files as copied for the next commit\n" @@ -5180,7 +5209,7 @@ msgstr "" msgid "test Mercurial installation" -msgstr "" +msgstr "test Mercurial installationen" #, python-format msgid "Checking encoding (%s)...\n" @@ -5222,8 +5251,8 @@ msgstr "" msgid "" -" Internal patcher failure, please report this error to http://www.selenic." -"com/mercurial/bts\n" +" Internal patcher failure, please report this error to http://mercurial." +"selenic.com/bts/\n" msgstr "" msgid "Checking commit editor...\n" @@ -5421,7 +5450,7 @@ " " msgid "no files specified" -msgstr "" +msgstr "ingen filer angivet" #, python-format msgid "not removing %s: file is already untracked\n" @@ -5447,7 +5476,7 @@ #, python-format msgid "grep: invalid match pattern: %s\n" -msgstr "" +msgstr "grep: ugyldigt søgemønster: %s\n" msgid "" "show current repository heads or show branch heads\n" @@ -5463,7 +5492,7 @@ " branch is called the revision's branch tag.\n" "\n" " Branch heads are revisions on a given named branch that do not have\n" -" any children on the same branch. A branch head could be a true head\n" +" any descendants on the same branch. A branch head could be a true head\n" " or it could be the last changeset on a branch before a new branch\n" " was created. If none of the branch heads are true heads, the branch\n" " is considered inactive.\n" @@ -5479,11 +5508,11 @@ #, python-format msgid "no changes on branch %s containing %s are reachable from %s\n" -msgstr "" +msgstr "ingen ændringer på gren %s som indeholder %s kan nås fra %s\n" #, python-format msgid "no changes on branch %s are reachable from %s\n" -msgstr "" +msgstr "ingen ændringer på gren %s kan nås fra %s\n" msgid "" "show help for a given topic or a help overview\n" @@ -5611,16 +5640,17 @@ " With -s/--similarity, hg will attempt to discover renames and\n" " copies in the patch in the same way as 'addremove'.\n" "\n" -" To read a patch from standard input, use \"-\" as the patch name.\n" +" To read a patch from standard input, use \"-\" as the patch name. If\n" +" a URL is specified, the patch will be downloaded from it.\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" msgid "applying patch from stdin\n" -msgstr "" +msgstr "anvender lap fra standardinddata\n" msgid "no diffs found" -msgstr "" +msgstr "fandt ingen ændringer" #, python-format msgid "" @@ -5634,7 +5664,7 @@ msgstr "ikke en Mercurial patch" msgid "patch is damaged or loses information" -msgstr "" +msgstr "lappen er beskadiget eller mister information" msgid "" "show new changesets found in source\n" @@ -5799,13 +5829,14 @@ #, python-format msgid "branch '%s' has %d heads - please merge with an explicit rev" msgstr "" +"gren '%s' har %d hoveder - sammenføj venligst med en eksplicit revision" #, python-format msgid "branch '%s' has one head - please merge with an explicit rev" -msgstr "" +msgstr "gren '%s' har et hoved - sammenføj venligst med en eksplicit revision" msgid "there is nothing to merge" -msgstr "" +msgstr "der er ikke noget at sammenføje" #, python-format msgid "%s - use \"hg update\" instead" @@ -5815,6 +5846,8 @@ "working dir not at a head rev - use \"hg update\" or merge with an explicit " "rev" msgstr "" +"arbejdskataloget er ikke ved en hovedrevision - brug \"hg update\" eller " +"sammenføj med en eksplicit revision" msgid "" "show changesets not found in destination\n" @@ -5851,7 +5884,7 @@ #, python-format msgid "'%s' not found in manifest!" -msgstr "" +msgstr "'%s' ikke fundet i manifest!" msgid "" "show aliases for remote repositories\n" @@ -6080,10 +6113,10 @@ msgstr "" msgid "too many options specified" -msgstr "" +msgstr "der er angivet for mange tilvalg" msgid "can't specify --all and patterns" -msgstr "" +msgstr "kan ikke angive --all og mønstre" msgid "no files or directories specified; use --all to remerge all files" msgstr "" @@ -6143,7 +6176,7 @@ #, python-format msgid "undeleting %s\n" -msgstr "" +msgstr "usletter %s\n" #, python-format msgid "saving current version of %s as %s\n" @@ -6151,11 +6184,11 @@ #, python-format msgid "file not managed: %s\n" -msgstr "" +msgstr "filen er ikke håndteret: %s\n" #, python-format msgid "no changes needed to %s\n" -msgstr "" +msgstr "%s behøver ingen ændringer\n" msgid "" "roll back the last transaction\n" @@ -6305,26 +6338,26 @@ msgstr "" msgid "tag names must be unique" -msgstr "" +msgstr "mærkatnavne skal være unikke" #, python-format msgid "the name '%s' is reserved" -msgstr "" +msgstr "navnet '%s' er reserveret" msgid "--rev and --remove are incompatible" -msgstr "" +msgstr "--rev og --remove er inkompatible" #, python-format msgid "tag '%s' does not exist" -msgstr "" +msgstr "mærkaten '%s' eksisterer ikke" #, python-format msgid "tag '%s' is not a global tag" -msgstr "" +msgstr "mærkaten '%s' er ikke en global mærkat" #, python-format msgid "tag '%s' is not a local tag" -msgstr "" +msgstr "mærkaten '%s' er ikke en lokal mærkat" #, python-format msgid "Removed tag %s" @@ -6332,7 +6365,7 @@ #, python-format msgid "tag '%s' already exists (use -f to force)" -msgstr "" +msgstr "mærkaten '%s' eksisterer allerede (brug -f for at gennemtvinge)" #, python-format msgid "Added tag %s for changeset %s" @@ -6436,7 +6469,7 @@ " " msgid "uncommitted local changes" -msgstr "" +msgstr "udeponerede lokale ændringer" msgid "" "verify the integrity of the repository\n" @@ -6451,11 +6484,11 @@ msgstr "" msgid "output version and copyright information" -msgstr "" +msgstr "udskriv version- og copyrightinformation" #, python-format msgid "Mercurial Distributed SCM (version %s)\n" -msgstr "Mercurial Distributed SCM (version %s)\n" +msgstr "Mercurial Distribueret SCM (version %s)\n" msgid "" "\n" @@ -6480,34 +6513,34 @@ msgstr "aktiver yderlig output" msgid "set/override config option" -msgstr "" +msgstr "sæt/overskriv konfigurationopsætning" msgid "enable debugging output" -msgstr "" +msgstr "aktiver fejlsøgningsinformation" msgid "start debugger" -msgstr "start debugger" +msgstr "start fejlsøgningsprogram" msgid "set the charset encoding" -msgstr "" +msgstr "angiv tegnkodningen" msgid "set the charset encoding mode" -msgstr "" +msgstr "angiv tegnkodningstilstand" msgid "print traceback on exception" -msgstr "" +msgstr "udskriv traceback ved exception" msgid "time how long the command takes" -msgstr "" +msgstr "tag tid på hvor lang tid kommandoen tager" msgid "print command execution profile" msgstr "" msgid "output version information and exit" -msgstr "" +msgstr "udskriv versionsinformation og afslut" msgid "display help and exit" -msgstr "vis hjælp og exit" +msgstr "vis hjælp og afslut" msgid "do not perform actions, just print output" msgstr "udfør ingen handlinger, udskriv kun outputttet" @@ -6516,7 +6549,7 @@ msgstr "specificer ssh kommandoen som skal bruges" msgid "specify hg command to run on the remote side" -msgstr "" +msgstr "angiv hg kommando som skal udføres på fjernsystemet" msgid "include names matching the given patterns" msgstr "inkluder navne som matcher det givne mønster" @@ -6537,40 +6570,40 @@ msgstr "" msgid "display using template map file" -msgstr "" +msgstr "vis med skabelon-fil" msgid "display with template" -msgstr "" +msgstr "vis med skabelon" msgid "do not show merges" -msgstr "" +msgstr "vis ikke sammenføjninger" msgid "treat all files as text" msgstr "behandl alle filer som tekst" msgid "don't include dates in diff headers" -msgstr "" +msgstr "inkluder ikke datoer i diff-hoveder" msgid "show which function each change is in" -msgstr "" +msgstr "vis hvilken funktion hver ændring er i" msgid "ignore white space when comparing lines" -msgstr "" +msgstr "ignorer blanktegn når linier sammenlignes" msgid "ignore changes in the amount of white space" -msgstr "" +msgstr "ignorer ændringer i mængden af blanktegn" msgid "ignore changes whose lines are all blank" -msgstr "" +msgstr "ignorer ændringer hvis linier alle er blanke" msgid "number of lines of context to show" -msgstr "" +msgstr "antal linier kontekst der skal vises" msgid "guess renamed files by similarity (0<=s<=100)" -msgstr "" +msgstr "gæt omdøbte filer ud fra enshed (0<=s<=100)" msgid "[OPTION]... [FILE]..." -msgstr "" +msgstr "[TILVALG]... [FIL]..." msgid "annotate the specified revision" msgstr "annotér den angivne revision" @@ -6594,22 +6627,22 @@ msgstr "vil linienummeret for den første forekomst" msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..." -msgstr "" +msgstr "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FIL..." msgid "do not pass files through decoders" -msgstr "" +msgstr "kør ikke filerne igennem dekodere" msgid "directory prefix for files in archive" -msgstr "" +msgstr "katalogpræfiks for filerne i arkivet" msgid "revision to distribute" -msgstr "" +msgstr "revision som skal distribueres" msgid "type of distribution to create" -msgstr "" +msgstr "distributionstype der skal oprettes" msgid "[OPTION]... DEST" -msgstr "" +msgstr "[TILVALG]... MÅL" msgid "merge with old dirstate parent after backout" msgstr "" @@ -6621,7 +6654,7 @@ msgstr "revision som skal bakkes ud" msgid "[OPTION]... [-r] REV" -msgstr "" +msgstr "[TILVALG]... [-r] REV" msgid "reset bisect state" msgstr "nulstil bisect" @@ -6633,7 +6666,7 @@ msgstr "marker ændring som dårlig" msgid "skip testing changeset" -msgstr "" +msgstr "spring testen af denne ændring over" msgid "use command to check changeset state" msgstr "brug kommando for at kontrollere tilstanden af ændringen" @@ -6642,7 +6675,7 @@ msgstr "undlad at opdatere til målet" msgid "[-gbsr] [-c CMD] [REV]" -msgstr "" +msgstr "[-gbsr] [-c KOMMANDO] [REV]" msgid "set branch name even if it shadows an existing branch" msgstr "" @@ -6651,13 +6684,13 @@ msgstr "" msgid "[-fC] [NAME]" -msgstr "" +msgstr "[-fC] [NAVN]" msgid "show only branches that have unmerged heads" -msgstr "" +msgstr "vil kun grene som har usammenføjne hoveder" msgid "[-a]" -msgstr "" +msgstr "[-a]" msgid "run even when remote repository is unrelated" msgstr "kør selv hvis fjerndepotet er urelateret" @@ -6675,34 +6708,34 @@ msgstr "" msgid "[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]" -msgstr "" +msgstr "[-f] [-a] [-r REV]... [--base REV]... FIL [MÅL]" msgid "print output to file with formatted name" msgstr "" msgid "print the given revision" -msgstr "" +msgstr "udskriv den angivne revision" msgid "apply any matching decode filter" msgstr "" msgid "[OPTION]... FILE..." -msgstr "" +msgstr "[TILVALG]... FIL..." msgid "the clone will only contain a repository (no working copy)" -msgstr "" +msgstr "klonen vil kun indeholde et depot (intet arbejdsbibliotek)" msgid "a changeset you would like to have after cloning" -msgstr "" +msgstr "en ændringer du gerne vil have efter kloningen" msgid "[OPTION]... SOURCE [DEST]" -msgstr "" +msgstr "[TILVALG]... KILDE [MÅL]" msgid "mark new/missing files as added/removed before committing" -msgstr "" +msgstr "marker nye/manglende filer som tilføjede/fjernede før deponering" msgid "mark a branch as closed, hiding it from the branch list" -msgstr "" +msgstr "marker en gren som lukket, skuler den fra listen af grene" msgid "record a copy that has already occurred" msgstr "" @@ -6711,10 +6744,10 @@ msgstr "" msgid "[OPTION]... [SOURCE]... DEST" -msgstr "" +msgstr "[TILVALG]... [KILDE]... MÅL" msgid "[INDEX] REV1 REV2" -msgstr "" +msgstr "[INDEKS] REV1 REV2" msgid "[COMMAND]" msgstr "[KOMMANDO]" @@ -6726,58 +6759,58 @@ msgstr "[-o] KOMMANDO" msgid "try extended date formats" -msgstr "" +msgstr "prøv udvidede datoformater" msgid "[-e] DATE [RANGE]" -msgstr "" +msgstr "[-e] DATO [INTERVAL]" msgid "FILE REV" -msgstr "" +msgstr "FIL REV" msgid "[PATH]" -msgstr "" +msgstr "[STI]" msgid "FILE" -msgstr "" +msgstr "FIL" msgid "revision to rebuild to" -msgstr "" +msgstr "revision til hvilken der skal gendannes til" msgid "[-r REV] [REV]" -msgstr "" +msgstr "[-r REV] [REV]" msgid "revision to debug" -msgstr "" +msgstr "revision der skal fejlsøges" msgid "[-r REV] FILE" -msgstr "" +msgstr "[-r REV] FIL" msgid "REV1 [REV2]" -msgstr "" +msgstr "REV1 [REV2]" msgid "do not display the saved mtime" -msgstr "" +msgstr "vis ikke den gemte mtime" msgid "[OPTION]..." -msgstr "" +msgstr "[TILVALG]..." msgid "revision to check" msgstr "revision som skal undersøges" msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..." -msgstr "" +msgstr "[TILVALG]... [-r REV1 [-r REV2]] [FIL]..." msgid "diff against the second parent" msgstr "" msgid "[OPTION]... [-o OUTFILESPEC] REV..." -msgstr "" +msgstr "[TILVALG]... [-o UDFILSPECIFIKATION] REV..." msgid "end fields with NUL" -msgstr "" +msgstr "afslut felter med NUL" msgid "print all revisions that match" -msgstr "" +msgstr "udskriv alle revisioner som matcher" msgid "follow changeset history, or file history across copies and renames" msgstr "" @@ -6786,49 +6819,49 @@ msgstr "" msgid "print only filenames and revisions that match" -msgstr "" +msgstr "udskriv kun filnavne og revisioner som matcher" msgid "print matching line numbers" -msgstr "" +msgstr "udskriv matchende linienumre" msgid "search in given revision range" -msgstr "" +msgstr "søg i det angivne interval" msgid "[OPTION]... PATTERN [FILE]..." -msgstr "" +msgstr "[TILVALG]... MØNSTER [FIL]..." msgid "show only heads which are descendants of REV" -msgstr "" +msgstr "vis kun hoveder som er efterkommere af REV" msgid "show only the active heads from open branches" -msgstr "" +msgstr "vis kun aktive hoveder fra åbne grene" msgid "show normal and closed heads" msgstr "vis normale og lukkede hoveder" msgid "[-r STARTREV] [REV]..." -msgstr "" +msgstr "[-r STARTREV] [REV]..." msgid "[TOPIC]" -msgstr "" +msgstr "[EMNE]" msgid "identify the specified revision" -msgstr "" +msgstr "identificer den angivne revision" msgid "show local revision number" -msgstr "" +msgstr "vis lokalt revisionsnummer" msgid "show global revision id" -msgstr "" +msgstr "vis globalt revisionsnummer" msgid "show branch" -msgstr "" +msgstr "vis gren" msgid "show tags" msgstr "vis mærkater" msgid "[-nibt] [-r REV] [SOURCE]" -msgstr "" +msgstr "[-nibt] [-r REV] [KILDE]" msgid "" "directory strip option for patch. This has the same meaning as the " @@ -6839,160 +6872,160 @@ msgstr "" msgid "skip check for outstanding uncommitted changes" -msgstr "" +msgstr "spring kontrollen for udeponerede ændringer over" msgid "don't commit, just update the working directory" -msgstr "" +msgstr "deponer ikke, opdater blot arbejdskataloget" msgid "apply patch to the nodes from which it was generated" -msgstr "" +msgstr "anvend lap på den knude hvorfra den var genereret" msgid "use any branch information in patch (implied by --exact)" msgstr "" msgid "[OPTION]... PATCH..." -msgstr "" +msgstr "[TILVALG]... LAP..." msgid "show newest record first" -msgstr "" +msgstr "vis nyeste postering først" msgid "file to store the bundles into" -msgstr "" +msgstr "fil hvor bundterne skal gemmes" msgid "a specific revision up to which you would like to pull" -msgstr "" +msgstr "en specifik revision hvortil du gerne vil trække" msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]" -msgstr "" +msgstr "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILNAVN] [KILDE]" msgid "[-e CMD] [--remotecmd CMD] [DEST]" -msgstr "" +msgstr "[-e KOMMANDO] [--remotecmd KOMMANDO] [MÅL]" msgid "search the repository as it stood at REV" msgstr "" msgid "end filenames with NUL, for use with xargs" -msgstr "" +msgstr "afslut filnavne med NUL, til brug med xargs" msgid "print complete paths from the filesystem root" -msgstr "" +msgstr "udskriv fulde stier fra filsystemets rod" msgid "[OPTION]... [PATTERN]..." -msgstr "" +msgstr "[TILVALG]... [MØNSTER]..." msgid "only follow the first parent of merge changesets" -msgstr "" +msgstr "følg kun den første forælder for sammenføjningsændringer" msgid "show revisions matching date spec" -msgstr "" +msgstr "vis revisioner som matcher datoangivelsen" msgid "show copied files" -msgstr "" +msgstr "vis kopierede filer" msgid "do case-insensitive search for a keyword" -msgstr "" +msgstr "lav søgning efter nøgleord uden forskel på små/store bogstaver" msgid "include revisions where files were removed" -msgstr "" +msgstr "inkluder revisioner hvor filer blev slettet" msgid "show only merges" -msgstr "" +msgstr "vis kun sammenføjninger" msgid "revisions committed by user" -msgstr "" +msgstr "revisioner deponeret af bruger" msgid "show only changesets within the given named branch" -msgstr "" +msgstr "vis kun ændringer på den angivne navngivne gren" msgid "do not display revision or any of its ancestors" -msgstr "" +msgstr "vis ikke revision eller nogen af den forfædre" msgid "[OPTION]... [FILE]" -msgstr "" +msgstr "[TILVALG]... [FIL]" msgid "revision to display" -msgstr "" +msgstr "revision der skal vises" msgid "[-r REV]" -msgstr "" +msgstr "[-r REV]" msgid "force a merge with outstanding changes" msgstr "" msgid "revision to merge" -msgstr "" +msgstr "revision der skal sammenføjes" msgid "review revisions to merge (no merge is performed)" msgstr "" msgid "[-f] [[-r] REV]" -msgstr "" +msgstr "[-f] [[-r] REV]" msgid "a specific revision up to which you would like to push" msgstr "" msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" -msgstr "" +msgstr "[-M] [-p] [-n] [-f] [-r REV]... [MÅL]" msgid "show parents from the specified revision" -msgstr "" +msgstr "vis forældre for den angivne revision" msgid "[-r REV] [FILE]" -msgstr "" +msgstr "[-r REV] [FIL]" msgid "[NAME]" -msgstr "" +msgstr "[NAVN]" msgid "update to new tip if changesets were pulled" -msgstr "" +msgstr "opdater til den nye spids hvis ændringer blev trukket ned" msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" -msgstr "" +msgstr "[-u] [-f] [-r REV]... [-e KOMMANDO] [--remotecmd KOMMANDO] [KILDE]" msgid "force push" -msgstr "" +msgstr "gennemtving skubning" msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]" -msgstr "" +msgstr "[-f] [-r REV]... [-e KOMMANDO] [--remotecmd KOMMANDO] [MÅL]" msgid "record delete for missing files" msgstr "" msgid "remove (and delete) file even if added or modified" -msgstr "" +msgstr "fjern (og slet) fil selv hvis tilføjet eller ændret" msgid "record a rename that has already occurred" msgstr "" msgid "[OPTION]... SOURCE... DEST" -msgstr "" +msgstr "[TILVALG]... KILDE... MÅL" msgid "remerge all unresolved files" -msgstr "" +msgstr "gen-sammenføj alle uløste filer" msgid "list state of files needing merge" -msgstr "" +msgstr "vis tilstand af filer som har brug for sammenføjning" msgid "mark files as resolved" -msgstr "" +msgstr "marker filer som løste" msgid "unmark files as resolved" -msgstr "" +msgstr "marker filer som uløste" msgid "revert all changes when no arguments given" -msgstr "" +msgstr "før alle ændringer tilbage når inget argument angives" msgid "tipmost revision matching date" msgstr "" msgid "revision to revert to" -msgstr "" +msgstr "revision der skal føres tilbage til" msgid "do not save backup copies of files" -msgstr "" +msgstr "gem ikke sikkerhedskopier af filer" msgid "[OPTION]... [-r REV] [NAME]..." -msgstr "" +msgstr "[TILVALG]... [-r REV] [NAVN]..." msgid "name of access log file to write to" msgstr "navn på adgangslogfilen der skrives til" @@ -7001,19 +7034,19 @@ msgstr "navn på fejlllog fil der skrives til" msgid "port to listen on (default: 8000)" -msgstr "" +msgstr "port der skal lyttes på (standard: 8000)" msgid "address to listen on (default: all interfaces)" -msgstr "" +msgstr "adresse der skal lyttes til (standard: alle grænseflader)" msgid "prefix path to serve from (default: server root)" msgstr "prefiks sti at udstille fra (default: server-rod)" msgid "name to show in web pages (default: working directory)" -msgstr "" +msgstr "navn der skal vises på websider (standard: arbejdskatalog)" msgid "name of the webdir config file (serve more than one repository)" -msgstr "" +msgstr "navn på webdir konfigurationsfil (serve mere end et depot)" msgid "for remote clients" msgstr "for fjernklienter" @@ -7031,10 +7064,10 @@ msgstr "SSL certifikatfil" msgid "show untrusted configuration options" -msgstr "" +msgstr "vis ikke-betroede konfigurationsværdier" msgid "[-u] [NAME]..." -msgstr "" +msgstr "[-u] [NAVN]..." msgid "show status of all files" msgstr "vis status på alle filer" @@ -7082,7 +7115,7 @@ msgstr "fjern en mærkat" msgid "[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." -msgstr "" +msgstr "[-l] [-m TEKST] [-d DATO] [-u BRUGER] [-r REV] NAVN..." msgid "[-p]" msgstr "[-p]" @@ -7097,7 +7130,7 @@ msgstr "overskrev lokalt modificerede filer (uden sikkerhedskopi)" msgid "check for uncommitted changes" -msgstr "" +msgstr "kontroller for udeponerede ændringer" msgid "[-C] [-d DATE] [[-r] REV]" msgstr "[-C] [-d DATO] [[-r] REV]" @@ -7132,15 +7165,15 @@ msgstr "" msgid " checking for directory renames\n" -msgstr "" +msgstr " undersøger katalogomdøbninger\n" #, python-format msgid " dir %s -> %s\n" -msgstr "" +msgstr " katalog %s -> %s\n" #, python-format msgid " file %s -> %s\n" -msgstr "" +msgstr " fil %s -> %s\n" msgid "working directory state appears damaged!" msgstr "arbejdskatalogtilstand virker beskadiget!" @@ -7165,23 +7198,23 @@ msgstr "ukendt" msgid "character device" -msgstr "" +msgstr "tegn-specialfil" msgid "block device" -msgstr "" +msgstr "blok-specialfil" msgid "fifo" -msgstr "" +msgstr "fifo" msgid "socket" -msgstr "" +msgstr "sokkel" msgid "directory" -msgstr "" +msgstr "katalog" #, python-format msgid "unsupported file type (type is %s)" -msgstr "" +msgstr "usupporteret filtype (typen er %s)" #, python-format msgid "abort: %s\n" @@ -7201,7 +7234,7 @@ #, python-format msgid "timed out waiting for lock held by %s" -msgstr "" +msgstr "tiden løb ud ved vent på lås holdt af %s" #, python-format msgid "lock held by %s" @@ -7270,8 +7303,8 @@ msgid "** unknown exception encountered, details follow\n" msgstr "** der opstod en ukendt fejl, detaljer følger\n" -msgid "** report bug details to http://www.selenic.com/mercurial/bts\n" -msgstr "** angiv fejldetaljer på http://www.selenic.com/mercurial/bts\n" +msgid "** report bug details to http://mercurial.selenic.com/bts/\n" +msgstr "** angiv fejldetaljer på http://mercurial.selenic.com/bts/\n" msgid "** or mercurial@selenic.com\n" msgstr "** eller mercurial@selenic.com\n" @@ -7302,7 +7335,7 @@ #, python-format msgid "malformed --config option: %s" -msgstr "" +msgstr "misdannet --config tilvalg: %s" #, python-format msgid "extension '%s' overrides commands: %s\n" @@ -7334,7 +7367,7 @@ #, python-format msgid "unrecognized profiling format '%s' - Ignored\n" -msgstr "" +msgstr "profileringsformat '%s' ikke genkendt - Ignoreret\n" msgid "" "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/" @@ -7396,7 +7429,7 @@ #, python-format msgid "my %s other %s ancestor %s\n" -msgstr "" +msgstr "min %s anden %s forfar %s\n" msgid " premerge successful\n" msgstr "præ-sammenføjning succesfuld\n" @@ -7418,7 +7451,7 @@ #, python-format msgid "merging %s failed!\n" -msgstr "" +msgstr "sammenføjning af %s fejlede!\n" #, python-format msgid "Inconsistent state, %s:%s is good and bad" @@ -7550,7 +7583,7 @@ " " msgid "File Name Patterns" -msgstr "" +msgstr "Mønstre for filnavne" msgid "" "\n" @@ -7783,7 +7816,7 @@ msgstr "" msgid "Template Usage" -msgstr "" +msgstr "Brug af skabeloner" msgid "" "\n" @@ -7956,7 +7989,7 @@ msgstr "Brug af yderligere funktioner" msgid "can only share local repositories" -msgstr "" +msgstr "kan kun dele lokale depoter" msgid "destination already exists" msgstr "destinationen eksisterer allerede" @@ -7966,15 +7999,15 @@ #, python-format msgid "destination directory: %s\n" -msgstr "" +msgstr "målkatalog: %s\n" #, python-format msgid "destination '%s' already exists" -msgstr "" +msgstr "målet '%s' eksisterer allerede" #, python-format msgid "destination '%s' is not empty" -msgstr "" +msgstr "målet '%s' er ikke tomt" msgid "" "src repository does not support revision lookup and so doesn't support clone " @@ -7982,7 +8015,7 @@ msgstr "" msgid "clone from remote to remote not supported" -msgstr "" +msgstr "kloning fra fjerndepot til fjerndepot er ikke understøttet" msgid "updated" msgstr "opdateret" @@ -8001,19 +8034,21 @@ msgstr "%d filer %s" msgid "use 'hg resolve' to retry unresolved file merges\n" -msgstr "" +msgstr "brug 'hg resolve' for at prøve at sammenføje uløste filer igen\n" msgid "" "use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to " "abandon\n" msgstr "" +"brug 'hg resolve' for at prøve at sammenføje uløste filer igen eller 'hg up " +"--clean' for at opgive\n" msgid "(branch merge, don't forget to commit)\n" -msgstr "" +msgstr "(grensammenføjning, glem ikke at deponere)\n" #, python-format msgid "error reading %s/.hg/hgrc: %s\n" -msgstr "" +msgstr "fejl ved læsning af %s/.hg/hgrc: %s\n" msgid "SSL support is unavailable" msgstr "understøttelse for SSL er ikke tilstede" @@ -8104,10 +8139,10 @@ #, python-format msgid "http error while sending %s command\n" -msgstr "" +msgstr "http-fejl mens %s kommandoen blev sendt\n" msgid "http error, possibly caused by proxy setting" -msgstr "" +msgstr "http-fejl, skyldes muligvis proxy-indstillinger" #, python-format msgid "real URL is %s\n" @@ -8119,11 +8154,11 @@ #, python-format msgid "'%s' does not appear to be an hg repository" -msgstr "" +msgstr "'%s' ser ikke ud til at være et hg depot" #, python-format msgid "'%s' sent a broken Content-Type header (%s)" -msgstr "" +msgstr "'%s' sendte ødelagt Content-Type header (%s)" #, python-format msgid "'%s' uses newer protocol %s" @@ -8133,20 +8168,20 @@ msgstr "" msgid "unexpected response:" -msgstr "" +msgstr "uventet svar:" msgid "look up remote changes" msgstr "" msgid "push failed (unexpected response):" -msgstr "" +msgstr "skub fejlede (uventet svar):" #, python-format msgid "push failed: %s" msgstr "skub fejlede: %s" msgid "Python support for SSL and HTTPS is not installed" -msgstr "" +msgstr "Python support for SSL og HTTPS er ikke installeret" msgid "cannot create new http repository" msgstr "kan ikke lave nyt http depot" @@ -8157,7 +8192,7 @@ #, python-format msgid "skipping unreadable ignore file '%s': %s\n" -msgstr "" +msgstr "springer ulæselig ignorefil '%s' over: %s\n" #, python-format msgid "repository %s not found" @@ -8180,7 +8215,7 @@ msgstr "%r kan ikke bruges i et mærkatnavnet" msgid "working copy of .hgtags is changed (please commit .hgtags manually)" -msgstr "" +msgstr "arbejdskopien af .hgtags er ændret (deponer venligst .hgtags manuelt)" #, python-format msgid "%s, line %s: %s\n" @@ -8191,7 +8226,7 @@ #, python-format msgid "node '%s' is not well formed" -msgstr "" +msgstr "knude '%s' er ikke korrekt formet" #, python-format msgid "working directory has unknown parent '%s'!" @@ -8220,13 +8255,14 @@ #, python-format msgid "Named branch could not be reset, current branch still is: %s\n" msgstr "" +"Navngiven gren kunne ikke nulstilles, den nuværende gren er stadig: %s\n" msgid "no rollback information available\n" msgstr "ingen tilbagerulningsinformation til stede\n" #, python-format msgid "waiting for lock on %s held by %r\n" -msgstr "" +msgstr "venter på lås af %s holdt af %r\n" #, python-format msgid "repository %s" @@ -8260,7 +8296,7 @@ msgstr "ingen ændringer\n" msgid "unresolved merge conflicts (see hg resolve)" -msgstr "" +msgstr "uløste sammenføjningskonflikter (se hg resolve)" #, python-format msgid "committing subrepository %s\n" @@ -8283,6 +8319,7 @@ #, python-format msgid "%s not added: only files and symlinks supported currently\n" msgstr "" +"%s ikke tilføjet: i øjeblikket understøttes kun filer og symbolske lænker\n" #, python-format msgid "%s already tracked!\n" @@ -8388,14 +8425,14 @@ #, python-format msgid "%d changesets found\n" -msgstr "" +msgstr "fandt %d ændringer\n" msgid "list of changesets:\n" -msgstr "" +msgstr "liste af ændringer:\n" #, python-format msgid "empty or missing revlog for %s" -msgstr "" +msgstr "tom eller manglende revlog for %s" #, python-format msgid "add changeset %s\n" @@ -8405,7 +8442,7 @@ msgstr "tilføjer ændringer\n" msgid "received changelog group is empty" -msgstr "" +msgstr "modtagen changelog-gruppe er tom" msgid "adding manifests\n" msgstr "tilføjer manifester\n" @@ -8432,13 +8469,13 @@ msgstr "" msgid "Unexpected response from remote server:" -msgstr "" +msgstr "Uventet svar fra fjernserver:" msgid "operation forbidden by server" -msgstr "" +msgstr "operationen er forbudt af serveren" msgid "locking the remote repository failed" -msgstr "" +msgstr "låsning af fjerndepotet fejlede" msgid "the server sent an unknown error code" msgstr "" @@ -8448,7 +8485,7 @@ #, python-format msgid "%d files to transfer, %s of data\n" -msgstr "" +msgstr "%d filer at overføre, %s data\n" #, python-format msgid "adding %s (%s)\n" @@ -8456,7 +8493,7 @@ #, python-format msgid "transferred %s in %.1f seconds (%s/sec)\n" -msgstr "" +msgstr "overførte %s i %.1f sekunder (%s/sek)\n" msgid "no [smtp]host in hgrc - cannot send mail" msgstr "" @@ -8466,18 +8503,18 @@ msgstr "" msgid "can't use TLS: Python SSL support not installed" -msgstr "" +msgstr "kan ikke bruge TLS: Python SSL support er ikke installeret" msgid "(using tls)\n" -msgstr "" +msgstr "(bruger tsl)\n" #, python-format msgid "(authenticating to mail server as %s)\n" -msgstr "" +msgstr "(autentificerer til mailserver som %s)\n" #, python-format msgid "sending mail: %s\n" -msgstr "" +msgstr "sender post: %s\n" msgid "smtp specified as email transport, but no smtp host configured" msgstr "" @@ -8492,15 +8529,15 @@ #, python-format msgid "invalid email address: %s" -msgstr "" +msgstr "ugyldig e-post-adresse: %s" #, python-format msgid "invalid local address: %s" -msgstr "" +msgstr "ugyldig lokal adresse: %s" #, python-format msgid "failed to remove %s from manifest" -msgstr "" +msgstr "kunne ikke fjerne %s fra manifest" #, python-format msgid "diff context lines count must be an integer, not %r" @@ -8532,7 +8569,7 @@ msgstr "" msgid "resolving manifests\n" -msgstr "" +msgstr "løser manifester\n" #, python-format msgid " overwrite %s partial %s\n" @@ -8572,7 +8609,7 @@ #, python-format msgid "update failed to remove %s: %s!\n" -msgstr "" +msgstr "opdatering kunne ikke fjerne %s: %s!\n" #, python-format msgid "getting %s\n" @@ -8625,11 +8662,11 @@ msgstr "" msgid "patch generated by hg export\n" -msgstr "" +msgstr "lap genereret af hg export\n" #, python-format msgid "unable to find '%s' for patching\n" -msgstr "" +msgstr "kan ikke finde '%s' til lapning\n" #, python-format msgid "patching file %s\n" @@ -8672,11 +8709,11 @@ #, python-format msgid "binary patch is %d bytes, not %d" -msgstr "" +msgstr "binær lap er %d byte, ikke %d" #, python-format msgid "unable to strip away %d dirs from %s" -msgstr "" +msgstr "kan ikke strippe %d kataloger fra %s" msgid "undefined source and destination files" msgstr "" @@ -8691,7 +8728,7 @@ #, python-format msgid "patch command failed: %s" -msgstr "" +msgstr "patch kommando fejlede: %s" #, python-format msgid "Unsupported line endings type: %s" @@ -8718,30 +8755,30 @@ #, python-format msgid "saving bundle to %s\n" -msgstr "" +msgstr "gemmer bundt i %s\n" msgid "adding branch\n" msgstr "tilføjer gren\n" #, python-format msgid "cannot %s; remote repository does not support the %r capability" -msgstr "" +msgstr "kan ikke %s: fjerdepotet understøtter ikke %r egenskaben" #, python-format msgid "unknown compression type %r" -msgstr "" +msgstr "ukendt kompressionstype %r" #, python-format msgid "index %s unknown flags %#04x for format v0" -msgstr "" +msgstr "indeks %s ukendt flag %#04x for format v0" #, python-format msgid "index %s unknown flags %#04x for revlogng" -msgstr "" +msgstr "indeks %s ukendt flag %#04x for revlogng" #, python-format msgid "index %s unknown format %d" -msgstr "" +msgstr "indeks %s ukendt format %d" #, python-format msgid "index %s is corrupted" @@ -8762,64 +8799,64 @@ #, python-format msgid "%s not found in the transaction" -msgstr "" +msgstr "%s ikke fundet i transaktionen" msgid "unknown base" msgstr "" msgid "consistency error adding group" -msgstr "" +msgstr "konsistensfejl ved tilføjelse af gruppe" #, python-format msgid "%s looks like a binary file." -msgstr "" +msgstr "%s ser ud som en binær fil." msgid "can only specify two labels." msgstr "" msgid "warning: conflicts during merge.\n" -msgstr "" +msgstr "advarsel: konflikter ved sammenføjning.\n" #, python-format msgid "couldn't parse location %s" msgstr "" msgid "could not create remote repo" -msgstr "" +msgstr "kunne ikke oprette fjerndepot" msgid "remote: " msgstr "fjernsystem: " msgid "no suitable response from remote hg" -msgstr "" +msgstr "intet brugbart svar fra fjernsystemets hg" #, python-format msgid "push refused: %s" -msgstr "" +msgstr "skub afvist: %s" msgid "unsynced changes" msgstr "" msgid "cannot lock static-http repository" -msgstr "" +msgstr "kan ikke låse static-http depot" msgid "cannot create new static-http repository" -msgstr "" +msgstr "kan ikke oprette nyt static-http depot" #, python-format msgid "invalid entry in fncache, line %s" msgstr "" msgid "scanning\n" -msgstr "" +msgstr "skanner\n" #, python-format msgid "%d files, %d bytes to transfer\n" -msgstr "%d filer, skal overføre %d bytes\n" +msgstr "%d filer, skal overføre %d byte\n" #, python-format msgid "sending %s (%d bytes)\n" -msgstr "" +msgstr "sender %s (%d byte)\n" #, python-format msgid "" @@ -8874,7 +8911,7 @@ #, python-format msgid "template file %s: %s" -msgstr "" +msgstr "skabelon-fil %s: %s" msgid "cannot use transaction when it is already committed/aborted" msgstr "" @@ -8996,7 +9033,7 @@ #, python-format msgid "invalid day spec: %s" -msgstr "" +msgstr "ugyldig datospecifikation: %s" #, python-format msgid "%.0f GB" @@ -9050,11 +9087,11 @@ #, python-format msgid "data length off by %d bytes" -msgstr "datalænge er %d bytes forkert" +msgstr "datalænge er %d byte forkert" #, python-format msgid "index contains %d extra bytes" -msgstr "indekset indeholder %d ekstra bytes" +msgstr "indekset indeholder %d ekstra byte" #, python-format msgid "warning: `%s' uses revlog format 1"
--- a/i18n/fr.po Wed Jul 01 13:55:24 2009 -0500 +++ b/i18n/fr.po Wed Jul 01 13:57:01 2009 -0500 @@ -86,7 +86,7 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2009-06-28 20:09+0200\n" +"POT-Creation-Date: 2009-07-01 08:41+0200\n" "PO-Revision-Date: 2009-05-14 13:06+0200\n" "Last-Translator: Cedric Duval <cedricduval@free.fr>\n" "Language-Team: French\n" @@ -115,7 +115,7 @@ msgstr "" msgid "" -"control access to a repository using simple hooks\n" +"hooks for controlling repository access\n" "\n" "This hook makes it possible to allow or deny write access to portions\n" "of a repository when receiving incoming changesets.\n" @@ -267,7 +267,7 @@ msgstr "" msgid "" -"integrate Mercurial with a Bugzilla bug tracker\n" +"hooks for integrating with the 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" @@ -415,7 +415,7 @@ msgstr "" msgid "done\n" -msgstr "" +msgstr "effectué\n" #, python-format msgid "looking up user %s\n" @@ -451,7 +451,7 @@ msgid "database error: %s" msgstr "" -msgid "display children changesets" +msgid "command to display child changesets" msgstr "" msgid "" @@ -471,7 +471,7 @@ msgid "hg children [-r REV] [FILE]" msgstr "" -msgid "display statistics about repository history" +msgid "command to display statistics about repository history" msgstr "" #, python-format @@ -599,7 +599,11 @@ msgid "don't colorize output" msgstr "" -msgid "import from foreign VCS repositories into Mercurial" +#, python-format +msgid "ignoring unknown color/effect %r (configured in color.%s)\n" +msgstr "" + +msgid "import revisions from foreign VCS repositories into Mercurial" msgstr "" msgid "" @@ -1342,7 +1346,7 @@ msgstr "" msgid "" -"allow external programs to compare revisions\n" +"command to 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" @@ -1522,7 +1526,7 @@ msgid "hg fetch [SOURCE]" msgstr "" -msgid "sign and verify changesets" +msgid "commands to sign and verify changesets" msgstr "" msgid "error while verifying signature" @@ -1607,7 +1611,7 @@ msgstr "" msgid "" -"show revision graphs in terminals\n" +"command to view revision graphs from a shell\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" @@ -1652,7 +1656,7 @@ msgstr "" msgid "" -"integrate Mercurial with a CIA notification service\n" +"hooks for integrating with the CIA.vc 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" @@ -1788,7 +1792,7 @@ msgid "hg debug-config" msgstr "" -msgid "hg debug-merge-base node node" +msgid "hg debug-merge-base REV REV" msgstr "" msgid "ignored" @@ -1809,11 +1813,11 @@ msgid "max-count" msgstr "" -msgid "hg debug-rev-list [options] revs" -msgstr "" - -msgid "" -"syntax highlighting for hgweb\n" +msgid "hg debug-rev-list [OPTION]... REV..." +msgstr "hg debug-rev-list [OPTION]... REV..." + +msgid "" +"syntax highlighting for hgweb (requires Pygments)\n" "\n" "It depends on the Pygments syntax highlighting library:\n" "http://pygments.org/\n" @@ -1824,11 +1828,9 @@ "pygments_style = <style>\n" "\n" "The default is 'colorful'.\n" -"\n" -"-- Adam Hupp <adam@hupp.org>\n" -msgstr "" - -msgid "accelerate status report using system level services" +msgstr "" + +msgid "accelerate status report using Linux's inotify service" msgstr "" msgid "start an inotify server for this repository" @@ -1856,8 +1858,8 @@ msgid "name of file to write process ID to" msgstr "" -msgid "hg inserve [OPT]..." -msgstr "" +msgid "hg inserve [OPTION]..." +msgstr "hg inserve [OPTION]..." msgid "(found dead inotify server socket; removing it)\n" msgstr "" @@ -2104,18 +2106,18 @@ msgstr "" #, python-format -msgid "" -"\n" -"\t%s\n" -msgstr "" - -#, python-format msgid "creating temporary repository at %s\n" msgstr "" #, python-format msgid "" "\n" +"\tconfig using %s keyword template maps\n" +msgstr "" + +#, python-format +msgid "" +"\n" "%s keywords written to %s:\n" msgstr "" @@ -2125,6 +2127,12 @@ #, python-format msgid "" "\n" +"\t%s keywords expanded%s\n" +msgstr "" + +#, python-format +msgid "" +"\n" "removing temporary repository %s\n" msgstr "" @@ -2138,11 +2146,26 @@ msgstr "" msgid "" -"print files currently configured for keyword expansion\n" -"\n" -" Crosscheck which files in working directory are potential targets\n" -" for keyword expansion. That is, files matched by [keyword] config\n" -" patterns but not symlinks.\n" +"show files configured for keyword expansion\n" +"\n" +" List which files in the working directory are matched by the\n" +" [keyword] configuration patterns.\n" +"\n" +" Useful to prevent inadvertent keyword expansion and to speed up\n" +" execution by including only files that are actual candidates\n" +" for expansion.\n" +"\n" +" See \"hg help keyword\" on how to construct patterns both for\n" +" inclusion and exclusion of files.\n" +"\n" +" Use -u/--untracked to list untracked files as well.\n" +"\n" +" With -a/--all and -v/--verbose the codes used to show the status\n" +" of files are:\n" +" K = keyword expansion candidate\n" +" k = keyword expansion candidate (untracked)\n" +" I = ignored\n" +" i = ignored (untracked)\n" " " msgstr "" @@ -2184,7 +2207,7 @@ msgstr "" msgid "" -"work with a stack of patches\n" +"manage 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" @@ -2207,10 +2230,35 @@ "remove patch from applied stack qpop\n" "refresh contents of top applied patch qrefresh\n" msgstr "" +"gestion et utilisation d'une pile de patchs\n" +"\n" +"Cette extension permet de travailler avec une pile de patchs au\n" +"dessus d'un dépôt Mercurial. Deux piles de patchs sont gérées :\n" +"l'ensemble des patchs référencés, et le sous-ensemble des patchs\n" +"qui ont été appliqués.\n" +"\n" +"Les patchs référencés sont stockés en tant que fichiers au format\n" +"patch au sein du répertoire .hg/patches, tandis que les patchs\n" +"appliqués sont présents à la fois sous forme de fichier et de\n" +"\"changesets\".\n" +"\n" +"Tâches usuelles (utiliser \"hg help commande\" pour plus de détails):\n" +"\n" +"préparer un dépôt pour utilisation avec des patchs qinit\n" +"créer un nouveau patch qnew\n" +"importer un patch existant qimport\n" +"\n" +"afficher la série de patchs complète qseries\n" +"afficher les patchs appliqués qapplied\n" +"afficher le nom du dernier patch appliqué qtop\n" +"\n" +"empiler/appliquer un patch référencé sur la pile qpush\n" +"dépiler/ôter un patch de la pile qpop\n" +"rafraîchir le contenu du dernier patch appliqué qrefresh\n" #, python-format msgid "%s appears more than once in %s" -msgstr "" +msgstr "%s apparaît plus d'une fois dans %s" msgid "guard cannot be an empty string" msgstr "" @@ -2261,11 +2309,11 @@ #, python-format msgid "apply failed for patch %s" -msgstr "" +msgstr "l'application du patch %s a échoué" #, python-format msgid "patch didn't work out, merging %s\n" -msgstr "" +msgstr "l'application simple du patch a échoué, fusion de %s\n" #, python-format msgid "update returned %d" @@ -2276,40 +2324,43 @@ #, python-format msgid "unable to read %s" -msgstr "" +msgstr "impossible de lire %s" #, python-format msgid "patch %s does not exist\n" -msgstr "" +msgstr "le patch %s n'existe pas\n" #, python-format msgid "patch %s is not applied\n" -msgstr "" +msgstr "le patch %s n'est pas appliqué\n" msgid "patch failed, unable to continue (try -v)\n" msgstr "" +"l'application du patch a échoué, impossible de continuer (essayez avec -v)\n" #, python-format msgid "applying %s\n" -msgstr "" +msgstr "application de %s\n" #, python-format msgid "unable to read %s\n" -msgstr "" +msgstr "impossible de lire %s\n" #, python-format msgid "imported patch %s\n" -msgstr "" +msgstr "le patch %s a été importé\n" #, python-format msgid "" "\n" "imported patch %s" msgstr "" +"\n" +"le patch %s a été importé" #, python-format msgid "patch %s is empty\n" -msgstr "" +msgstr "le patch %s est vide\n" msgid "patch failed, rejects left in working dir\n" msgstr "" @@ -2319,72 +2370,73 @@ #, python-format msgid "revision %d is not managed" -msgstr "" +msgstr "la révision %d n'est pas gérée" #, python-format msgid "cannot delete revision %d above applied patches" -msgstr "" +msgstr "impossible de supprimer la révision %d au-dessus de patchs appliqués" #, python-format msgid "patch %s finalized without changeset message\n" msgstr "" msgid "qdelete requires at least one revision or patch name" -msgstr "" +msgstr "qdelete requiert au moins une révision ou le nom d'un patch" #, python-format msgid "cannot delete applied patch %s" -msgstr "" +msgstr "impossible de supprimer le patch appliqué %s" #, python-format msgid "patch %s not in series file" -msgstr "" +msgstr "le patch %s n'est pas listé (fichier \"series\")" msgid "no patches applied" -msgstr "" +msgstr "pas de patchs appliqués" msgid "working directory revision is not qtip" -msgstr "" +msgstr "le répertoire de travail n'est pas à la révision qtip" msgid "local changes found, refresh first" -msgstr "" +msgstr "modifications locales trouvées, veuillez d'abord rafraîchir le patch" msgid "local changes found" -msgstr "" +msgstr "modifications locales trouvées" #, python-format msgid "\"%s\" cannot be used as the name of a patch" -msgstr "" +msgstr "\"%s\" ne peut être utilisé comme nom de patch" #, python-format msgid "patch \"%s\" already exists" -msgstr "" +msgstr "le patch \"%s\" existe déjà" #, python-format msgid "error unlinking %s\n" -msgstr "" +msgstr "erreur lors de la suppression de %s\n" #, python-format msgid "patch name \"%s\" is ambiguous:\n" -msgstr "" +msgstr "\"%s\" est un nom de patch ambigu :\n" #, python-format msgid "patch %s not in series" -msgstr "" - +msgstr "le patch %s ne figure pas dans la série" + +#, fuzzy msgid "(working directory not at a head)\n" -msgstr "" +msgstr "(le répertoire de travail est à une révision différente de tip)\n" msgid "no patches in series\n" -msgstr "" +msgstr "pas de patchs dans la série\n" #, python-format msgid "cannot push to a previous patch: %s" -msgstr "" +msgstr "impossible d'empiler un patch déjà appliqué : %s" #, python-format msgid "qpush: %s is already at the top\n" -msgstr "" +msgstr "qpush: %s est déjà le dernier patch appliqué\n" #, python-format msgid "guarded by %r" @@ -2395,73 +2447,80 @@ #, python-format msgid "cannot push '%s' - %s\n" -msgstr "" +msgstr "impossible d'empiler '%s' - %s\n" msgid "all patches are currently applied\n" -msgstr "" +msgstr "tous les patchs sont actuellement appliqués\n" msgid "patch series already fully applied\n" -msgstr "" +msgstr "la série de patchs est déjà complètement appliquée\n" msgid "cleaning up working directory..." -msgstr "" +msgstr "nettoyage du répertoire de travail..." #, python-format msgid "errors during apply, please fix and refresh %s\n" msgstr "" +"des erreurs se sont produites durant l'application, veuillez corriger puis " +"rafraîchir %s\n" #, python-format msgid "now at: %s\n" -msgstr "" +msgstr "actuellement à : %s\n" #, python-format msgid "patch %s is not applied" -msgstr "" +msgstr "le patch %s n'est pas appliqué" msgid "no patches applied\n" -msgstr "" +msgstr "aucun patch appliqué\n" #, python-format msgid "qpop: %s is already at the top\n" -msgstr "" +msgstr "qpop: %s est déjà le dernier patch appliqué\n" msgid "qpop: forcing dirstate update\n" msgstr "" +"qpop: mise à jour de l'état du répertoire de travail (dirstate) forcée\n" #, python-format msgid "trying to pop unknown node %s" -msgstr "" +msgstr "tentative de dépilement d'un nœud inconnu : %s" msgid "popping would remove a revision not managed by this patch queue" msgstr "" +"le dépilement enlèverait une révision non gérée par cette pile de patchs" msgid "deletions found between repo revs" -msgstr "" +msgstr "suppressions trouvées entre des révisions du dépôt" msgid "patch queue now empty\n" -msgstr "" +msgstr "la pile de patchs est maintenant vide\n" msgid "cannot refresh a revision with children" -msgstr "" - +msgstr "impossible de rafraîchir une révision possédant des révisions filles" + +# restaurer/récupérer ? pas satisfait... msgid "" "refresh interrupted while patch was popped! (revert --all, qpush to " "recover)\n" msgstr "" +"rafraîchissement interrompu alors qu'un patch était en cours de dépilement " +"(utiliser revert --all, ou qpush pour restaurer l'état)\n" msgid "patch queue directory already exists" -msgstr "" +msgstr "la pile de patchs existe déjà" #, python-format msgid "patch %s is not in series file" -msgstr "" +msgstr "le patch %s n'est pas dans la liste (fichier \"series\")" msgid "No saved patch data found\n" msgstr "" #, python-format msgid "restoring status: %s\n" -msgstr "" +msgstr "rétablissement de l'état : %s\n" msgid "save entry has children, leaving it alone\n" msgstr "" @@ -2475,16 +2534,16 @@ msgstr "" msgid "queue directory updating\n" -msgstr "" +msgstr "mise à jour du répertoire de patchs\n" msgid "Unable to load queue repository\n" -msgstr "" +msgstr "Impossible de charger le dépôt de patchs\n" msgid "save: no patches applied, exiting\n" msgstr "" msgid "status is already saved\n" -msgstr "" +msgstr "l'état a déjà été sauvegardé\n" msgid "hg patches saved state" msgstr "" @@ -2494,70 +2553,83 @@ #, python-format msgid "patch %s is already in the series file" -msgstr "" +msgstr "le patch %s est déjà dans la liste (fichier \"series\")" msgid "option \"-r\" not valid when importing files" -msgstr "" +msgstr "l'option \"-r\" n'est pas utilisable lors de l'importation de fichiers" msgid "option \"-n\" not valid when importing multiple patches" msgstr "" - +"l'option \"-n\" n'est pas utilisable lors de l'importation de plusieurs " +"patchs" + +# origine/base/racine ? #, python-format msgid "revision %d is the root of more than one branch" -msgstr "" +msgstr "la révision %d est à l'origine de plus d'une branche" #, python-format msgid "revision %d is already managed" -msgstr "" +msgstr "la révision %d est déjà gérée" #, python-format msgid "revision %d is not the parent of the queue" -msgstr "" +msgstr "la révision %d n'est pas parente de la pile" #, python-format msgid "revision %d has unmanaged children" -msgstr "" +msgstr "la révision %d possède des révisions filles non gérées" #, python-format msgid "cannot import merge revision %d" -msgstr "" +msgstr "impossible d'importer la révision fusionnée %d" #, python-format msgid "revision %d is not the parent of %d" -msgstr "" +msgstr "%d n'est pas la révision parente de %d" msgid "-e is incompatible with import from -" -msgstr "" +msgstr "-e n'est pas compatible avec l'importation depuis -" #, python-format msgid "patch %s does not exist" -msgstr "" +msgstr "le patch %s n'existe pas" msgid "need --name to import a patch from -" -msgstr "" +msgstr "il est nécessaire d'utiliser --name pour importer un patch depuis -" #, python-format msgid "adding %s to series file\n" -msgstr "" +msgstr "ajout de %s à la liste de patchs (fichier \"series\")\n" msgid "" "remove patches from queue\n" "\n" -" The patches must not be applied, and at least one patch is\n" -" required.\n" -"\n" -" With -k/--keep, the patch files are preserved in the patch\n" -" directory.\n" +" The patches must not be applied, and at least one patch is required. " +"With\n" +" -k/--keep, the patch files are preserved in the patch directory.\n" "\n" " To stop managing a patch and move it into permanent history,\n" " use the qfinish command." -msgstr "" + +msgstr "" +"supprime des patchs de la pile\n" +"\n" +" Les patchs ne doivent pas avoir été appliqués, et il est\n" +" nécessaire de fournir au moins un patch.\n" +"\n" +" Avec -k/--keep, les fichiers sont préservés au sein du répertoire\n" +" de patchs.\n" +"\n" +" Pour arrêter de gérer un patch et le déplacer de manière\n" +" permanente vers l'historique du dépôt, utilisez la commande\n" +" qfinish." msgid "print the patches already applied" -msgstr "" +msgstr "affiche les patchs déjà appliqués" msgid "print the patches not yet applied" -msgstr "" +msgstr "affiche les patchs non encore appliqués" msgid "" "import a patch\n" @@ -2587,6 +2659,33 @@ " using the --name flag.\n" " " msgstr "" +"importe un patch\n" +"\n" +" Le patch est inséré dans la série à la suite du dernier patch\n" +" appliqué. Si aucun patch n'a encore été appliqué, le patch sera\n" +" ajouté en tête de série.\n" +"\n" +" Le patch portera le même nom que le fichier dont il provient,\n" +" à moins qu'un autre nom ne soit spécifié à l'aide de -n/--name.\n" +"\n" +" Vous pouvez enregistrer un patch déjà présent dans le répertoire\n" +" de patchs à l'aide de l'option -e/--existing.\n" +"\n" +" Avec -f/--force, un patch déjà présent du même nom sera écrasé.\n" +"\n" +" Un \"changeset\" existant peut-être placé sous le contrôle de mq\n" +" à l'aide de -r/--rev (par exemple qimport --rev tip -n patch\n" +" placera la révision tip sous le contrôle de mq).\n" +" Avec -g/--git, les patchs importés à l'aide de --rev seront\n" +" enregistrés au format \"git diff\". La section \"diffs\" de\n" +" l'aide explique l'importance de cette option pour la\n" +" préservation des informations de copie/renommage et des\n" +" modifications de permissions.\n" +"\n" +" Pour importer un patch depuis l'entrée standard, utilisez -\n" +" comme nom de fichier. Il sera alors nécessaire de nommer le\n" +" patch à l'aide de l'option --name.\n" +" " msgid "" "init a new queue repository\n" @@ -2614,42 +2713,59 @@ " would be created by qinit -c.\n" " " msgstr "" +"clône simultanément le dépôt principal et le dépôt des patchs\n" +"\n" +" Si la source est locale, aucun patch ne sera appliqué sur la\n" +" cible. En revanche, si la source est distante, cette commande\n" +" n'est pas en mesure de vérifier si des patchs y ont été\n" +" empilés, et par conséquent ne peut garantir qu'aucun patch\n" +" ne sera appliqué au dessus de la cible. Autrement dit, si vous\n" +" clônez un dépôt distant, assurez-vous auparavant qu'il n'ait\n" +" aucun patch d'appliqué.\n" +"\n" +" Le dépôt de patchs est recherché dans <src>/.hg/patches par\n" +" défaut, à moins que -p <url> ne soit utilisé pour spécifier\n" +" un chemin différent.\n" +"\n" +" Le répertoire de patchs doit être contenu dans le dépôt\n" +" principal, tel que créé par qinit -c.\n" +" " msgid "versioned patch repository not found (see qinit -c)" -msgstr "" +msgstr "aucun dépôt de patch trouvé (voir qinit -c)" msgid "cloning main repository\n" -msgstr "" +msgstr "clônage du dépôt principal\n" msgid "cloning patch repository\n" -msgstr "" +msgstr "clônage du dépôt des patchs\n" msgid "stripping applied patches from destination repository\n" -msgstr "" +msgstr "enlèvement des patchs appliqués du dépôt cible\n" msgid "updating destination repository\n" -msgstr "" +msgstr "mise à jour du dépôt cible\n" msgid "commit changes in the queue repository" msgstr "" msgid "print the entire series file" -msgstr "" +msgstr "afficher la liste complète de patchs (fichier \"series\")" msgid "print the name of the current patch" -msgstr "" +msgstr "affiche le nom du dernier patch appliqué" msgid "print the name of the next patch" -msgstr "" +msgstr "affiche le nom du prochain patch" msgid "all patches applied\n" -msgstr "" +msgstr "tous les patchs ont été appliqués\n" msgid "print the name of the previous patch" -msgstr "" +msgstr "affiche le nom du patch précédent" msgid "only one patch applied\n" -msgstr "" +msgstr "un seul patch d'appliqué\n" msgid "" "create a new patch\n" @@ -2676,6 +2792,35 @@ " information.\n" " " msgstr "" +"crée un nouveau patch\n" +"\n" +" qnew crée un nouveau patch au-dessus du dernier patch\n" +" actuellement appliqué, le cas échéant. Si le répertoire\n" +" de travail comporte des modifications non enregistrées,\n" +" la création du patch sera refusée, à moins d'utiliser\n" +" -f/--force auquel cas le contenu du nouveau patch sera\n" +" initialisé avec ces modifications. Il est également\n" +" possible d'utiliser -I/--include, -X/--exclude ou une liste\n" +" de noms de fichiers après le nom du patch, afin de n'inclure\n" +" que les changements des fichiers concernés, et laisser le\n" +" reste dans le répertoire de travail en tant que modifications\n" +" non enregistrées.\n" +"\n" +" Le nom d'utilisateur et la date peuvent être spécifiés à\n" +" l'aide de -u/--user et -d/--date respectivement.\n" +" -U/--currentuser et -D/--currentdate positionnent le nom\n" +" d'utilisateur et la date à leur valeur actuelle.\n" +"\n" +" L'en-tête du patch et le message de \"commit\" peuvent être\n" +" spécifiés à l'aide de -e/--edit, -m/--message ou -l/--logfile.\n" +" Si aucune de ces options n'est utilisée, l'en-tête restera\n" +" vierge et le message de \"commit\" sera '[mq]: PATCH'.\n" +"\n" +" Utilisez -g/--git pour garder le patch au format étendu de\n" +" \"git\". La section \"diffs\" de l'aide explique l'importance\n" +" de cette option pour la préservation des informations de\n" +" copie/renommage et des modifications de permissions.\n" +" " msgid "" "update the current patch\n" @@ -2695,7 +2840,7 @@ msgstr "" msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" -msgstr "" +msgstr "l'option \"-e\" est incompatible avec \"-m\" ou \"-l\"" msgid "" "diff of the current patch and subsequent modifications\n" @@ -2727,10 +2872,10 @@ msgstr "" msgid "qfold requires at least one patch name" -msgstr "" +msgstr "qfold a besoin au minimum du nom d'un patch" msgid "No patches applied" -msgstr "" +msgstr "Aucun patch d'appliqué" #, python-format msgid "Skipping already folded patch %s" @@ -2745,7 +2890,7 @@ msgstr "" msgid "push or pop patches until named patch is at top of stack" -msgstr "" +msgstr "empile ou dépile les patchs jusqu'à arriver au patch indiqué" msgid "" "set or print guards for a patch\n" @@ -2766,17 +2911,17 @@ msgstr "" msgid "cannot mix -l/--list with options or arguments" -msgstr "" +msgstr "impossible d'utiliser -l/--list avec d'autres options ou paramètres" msgid "no patch to work with" -msgstr "" +msgstr "aucun patch avec lequel travailler" #, python-format msgid "no patch named %s" -msgstr "" +msgstr "aucun patch du nom de %s" msgid "print the header of the topmost or specified patch" -msgstr "" +msgstr "affiche l'en-tête du dernier patch appliqué" msgid "" "push the next patch onto the stack\n" @@ -2785,13 +2930,18 @@ " will be lost.\n" " " msgstr "" +"applique le patch suivant sur la pile\n" +"\n" +" Si -f/--force est utilisé, tout changement local dans les\n" +" fichiers concernés par le patch seront perdus.\n" +" " msgid "no saved queues found, please use -n\n" -msgstr "" +msgstr "aucune ssauvegarde de pile de patchs trouvée, veuillez utiliser -n\n" #, python-format msgid "merging with queue at: %s\n" -msgstr "" +msgstr "fusion avec la pile située à %s\n" msgid "" "pop the current patch off the stack\n" @@ -2801,10 +2951,16 @@ " top of the stack.\n" " " msgstr "" +"dépile le dernier patch appliqué\n" +"\n" +" Par défaut, le dernier patch appliqué est ôté de la pile. Si\n" +" un nom de patch est fourni, les patchs seront dépilés en\n" +" séquence jusqu'à arriver au patch demandé.\n" +" " #, python-format msgid "using patch queue: %s\n" -msgstr "" +msgstr "utilisation de la pile de patchs %s\n" msgid "" "rename a patch\n" @@ -2812,32 +2968,36 @@ " With one argument, renames the current patch to PATCH1.\n" " With two arguments, renames PATCH1 to PATCH2." msgstr "" +"renomme un patch\n" +"\n" +" Avec un seul argument, le patch actuel est renommé PATCH1.\n" +" Avec deux arguments, PATCH1 devient PATCH2." #, python-format msgid "%s already exists" -msgstr "" +msgstr "%s existe déjà" #, python-format msgid "A patch named %s already exists in the series file" -msgstr "" +msgstr "Il existe déjà un patch du nom de %s (dans le fichier \"series\")" msgid "restore the queue state saved by a revision" -msgstr "" +msgstr "rétablissement d'un état sauvegardé de la pile" msgid "save current queue state" -msgstr "" +msgstr "sauvegarde de l'étatt de la pile de patchs" #, python-format msgid "destination %s exists and is not a directory" -msgstr "" +msgstr "%s: la cible existe et n'est pas un répertoire" #, python-format msgid "destination %s exists, use -f to force" -msgstr "" +msgstr "%s: la cible existe, utilisez -f pour forcer l'action" #, python-format msgid "copy %s to %s\n" -msgstr "" +msgstr "copie de %s vers %s\n" msgid "" "strip a revision and all its descendants from the repository\n" @@ -2928,9 +3088,25 @@ " to upstream.\n" " " msgstr "" +"déplacement des patchs vers l'historique du dépôt\n" +"\n" +" Achève le développement des révisions spécifiées (qui doivent\n" +" correspondre à des patch appliqués) en les retirant du contrôle\n" +" de mq, pour les transformer en \"changeset\" ordinaires dans\n" +" l'historique du dépôt.\n" +"\n" +" Il est possible d'utiliser l'option -a/--applied, ou de fournir\n" +" une plage de révisions. Avec --applied, tous les patchs\n" +" appliqués seront retirés du contrôle de mq. Autrement, les\n" +" révisions fournies doivent être situées à la base de la pile de\n" +" patchs appliqués.\n" +"\n" +" Ceci est utile en particulier si vos changements ont été adoptés\n" +" dans un dépôt amont, ou si vous vous apprêtez à les y envoyer.\n" +" " msgid "no revisions specified" -msgstr "" +msgstr "aucune révision spécifiée" msgid "cannot commit over an applied mq patch" msgstr "" @@ -2940,65 +3116,65 @@ #, python-format msgid "mq status file refers to unknown node %s\n" -msgstr "" +msgstr "le fichier d'état de mq fait référence à un nœud inconnu : %s\n" #, python-format msgid "Tag %s overrides mq patch of the same name\n" msgstr "" msgid "cannot import over an applied patch" -msgstr "" +msgstr "impossible d'importer au-dessus d'un patch appliqué" msgid "print first line of patch header" -msgstr "" +msgstr "affiche la première ligne de l'en-tête d'un patch" msgid "hg qapplied [-s] [PATCH]" -msgstr "" +msgstr "hg qapplied [-s] [PATCH]" msgid "use pull protocol to copy metadata" msgstr "" msgid "do not update the new working directories" -msgstr "" +msgstr "ne pas mettre à jour le répertoire de travail" msgid "use uncompressed transfer (fast over LAN)" -msgstr "" +msgstr "transférer sans compression (rapide sur un réseau local)" msgid "location of source patch repository" -msgstr "" +msgstr "emplacement du dépôt de patchs" msgid "hg qclone [OPTION]... SOURCE [DEST]" -msgstr "" +msgstr "hg qclone [OPTION]... SOURCE [DEST]" msgid "hg qcommit [OPTION]... [FILE]..." -msgstr "" +msgstr "hg qcommit [OPTION]... [FICHIER]..." msgid "hg qdiff [OPTION]... [FILE]..." -msgstr "" +msgstr "hg qdiff [OPTION]... [FICHIER]..." msgid "keep patch file" -msgstr "" +msgstr "garder le fichier du patch" msgid "stop managing a revision (DEPRECATED)" -msgstr "" +msgstr "arrêter de gérer une révision" msgid "hg qdelete [-k] [-r REV]... [PATCH]..." -msgstr "" +msgstr "hg qdelete [-k] [-r REV]... [PATCH]..." msgid "edit patch header" -msgstr "" +msgstr "éditer l'en-tête du patch" msgid "keep folded patch files" msgstr "" msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..." -msgstr "" +msgstr "hg qfold [-e] [-k] [-m TEXTE] [-l FICHIER] PATCH..." msgid "overwrite any local changes" -msgstr "" +msgstr "écraser tout modification locale" msgid "hg qgoto [OPTION]... PATCH" -msgstr "" +msgstr "hg qgoto [OPTION]... PATCH" msgid "list all patches and guards" msgstr "" @@ -3010,70 +3186,70 @@ msgstr "" msgid "hg qheader [PATCH]" -msgstr "" +msgstr "hg qheader [PATCH]" msgid "import file in patch directory" -msgstr "" +msgstr "importer un fichier résidant dans le répertoire de patchs" msgid "name of patch file" -msgstr "" +msgstr "nom du fichier de patch" msgid "overwrite existing files" -msgstr "" +msgstr "écraser les fichiers existant" msgid "place existing revisions under mq control" -msgstr "" +msgstr "placer des révisions existantes sous le contrôle de mq" msgid "use git extended diff format" msgstr "utiliser le format de patch étendu de git" msgid "qpush after importing" -msgstr "" +msgstr "qpush après l'importation" msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..." -msgstr "" +msgstr "hg qimport [-e] [-n NOM] [-f] [-g] [-P] [-r REV]... FICHIER..." msgid "create queue repository" -msgstr "" +msgstr "crée un dépôt de patchs" msgid "hg qinit [-c]" -msgstr "" +msgstr "hg qinit [-c]" msgid "import uncommitted changes into patch" -msgstr "" +msgstr "importer les modifications locales dans le patch" msgid "add \"From: <current user>\" to patch" -msgstr "" +msgstr "ajout de \"From: <utilisateur actuel>\" au patch" msgid "add \"From: <given user>\" to patch" -msgstr "" +msgstr "ajout de \"From: <utilisateur spécifié>\" au patch" msgid "add \"Date: <current date>\" to patch" -msgstr "" +msgstr "ajout de \"Date: <date actuelle>\" au patch" msgid "add \"Date: <given date>\" to patch" -msgstr "" +msgstr "ajout de \"Date: <date spécifiée>\" au patch" msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..." -msgstr "" +msgstr "hg qnew [-e] [-m TEXTE] [-l FICHIER] [-f] PATCH [FICHIER]..." msgid "hg qnext [-s]" -msgstr "" +msgstr "hg qnext [-s]" msgid "hg qprev [-s]" -msgstr "" +msgstr "hg qprev [-s]" msgid "pop all patches" -msgstr "" +msgstr "dépiler tous les patchs" msgid "queue name to pop" -msgstr "" +msgstr "nom de la pile à dépiler" msgid "forget any local changes" -msgstr "" +msgstr "oublier toute modification locale" msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" -msgstr "" +msgstr "hg qpop [-a] [-n NOM] [-f] [PATCH | INDEX]" msgid "apply if the patch has rejects" msgstr "" @@ -3082,37 +3258,39 @@ msgstr "" msgid "apply all patches" -msgstr "" +msgstr "appliquer tous les patchs" msgid "merge from another queue" -msgstr "" +msgstr "fusionner avec une autre pile de patchs" msgid "merge queue name" -msgstr "" +msgstr "nom de la pile à fusionner" msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]" -msgstr "" +msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NOM] [PATCH | INDEX]" msgid "refresh only files already in the patch and specified files" msgstr "" +"ne rafraîchir que les fichiers déjà présent dans le patch et ceux " +"explicitement spécifiés" msgid "add/update \"From: <current user>\" in patch" -msgstr "" +msgstr "ajouter/mettre à jour \"From: <utilisateur actuel>\" dans le patch" msgid "add/update \"From: <given user>\" in patch" -msgstr "" +msgstr "ajouter/mettre à jour \"From: <utilisateur spécifié>\" dans le patch" msgid "update \"Date: <current date>\" in patch (if present)" -msgstr "" +msgstr "mettre à jour \"Date: <date actuelle>\" dans le patch (si présente)" msgid "update \"Date: <given date>\" in patch (if present)" -msgstr "" +msgstr "mettre à jour \"Date: <date spécifiée>\" dans le patch (si présente)" msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..." -msgstr "" +msgstr "hg qrefresh [-I] [-X] [-e] [-m TEXTE] [-l FICHIER] [-s] [FICHIER]..." msgid "hg qrename PATCH1 [PATCH2]" -msgstr "" +msgstr "hg qrename PATCH1 [PATCH2]" msgid "delete save entry" msgstr "" @@ -3136,7 +3314,7 @@ msgstr "" msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]" -msgstr "" +msgstr "hg qsave [-m TEXT] [-l FILE] [-c] [-n NOM] [-e] [-f]" msgid "disable all guards" msgstr "" @@ -3148,19 +3326,19 @@ msgstr "" msgid "pop, then reapply patches" -msgstr "" +msgstr "dépiler, puis appliquer à nouveau les patchs" msgid "hg qselect [OPTION]... [GUARD]..." msgstr "" msgid "print patches not in series" -msgstr "" +msgstr "afficher les patchs absents de la série" msgid "hg qseries [-ms]" -msgstr "" +msgstr "hg qseries [-ms]" msgid "force removal with local changes" -msgstr "" +msgstr "forcer la suppression malgré les modifications locales" msgid "bundle unrelated changesets" msgstr "" @@ -3169,22 +3347,22 @@ msgstr "" msgid "hg strip [-f] [-b] [-n] REV" -msgstr "" +msgstr "hg strip [-f] [-b] [-n] REV" msgid "hg qtop [-s]" -msgstr "" +msgstr "hg qtop [-s]" msgid "hg qunapplied [-s] [PATCH]" -msgstr "" +msgstr "hg qunapplied [-s] [PATCH]" msgid "finish all applied changesets" msgstr "" -msgid "hg qfinish [-a] [REV...]" -msgstr "" - -msgid "" -"send e-mail notifications for commits/pushes\n" +msgid "hg qfinish [-a] [REV]..." +msgstr "hg qfinish [-a] [REV]..." + +msgid "" +"hooks for sending email notifications at commit/push time\n" "\n" "Subscriptions can be managed through hgrc. Default mode is to print\n" "messages to stdout, for testing and configuring.\n" @@ -3312,6 +3490,8 @@ "specify them in the global .hgrc\n" msgstr "" +# première ligne trop longue -> traduction abrégée (à retraduire quand hg +# sera capable de replier automatiquement la première ligne d'aide) msgid "" "interpret suffixes to refer to ancestor revisions\n" "\n" @@ -3331,11 +3511,28 @@ " foo~1 = foo^1 = foo^ = first parent of foo\n" " foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n" msgstr "" - -# cédric: première ligne trop longue (utilisée pour la liste d'extensions -# activée, une par ligne) -> traduction abrégée -msgid "" -"send Mercurial changesets as a series of patch e-mails\n" +"suffixes faisant référence à des révisions antérieures\n" +"\n" +"Cette extension permet d'utiliser des suffixes à la mode git pour\n" +"faire référence aux ancêtres d'une révision donnée.\n" +"\n" +"Par exemple, si \"foo\" désigne une révision, alors :\n" +"\n" +"- foo^N = Nième parent de foo\n" +" foo^0 = foo\n" +" foo^1 = premier parent de foo\n" +" foo^2 = second parent de foo\n" +" foo^ = foo^1\n" +"\n" +"- foo~N = Nième premier grand-parent de foo\n" +" foo~0 = foo\n" +" foo~1 = foo^1 = foo^ = premier parent de foo\n" +" foo~2 = foo^1^1 = foo^^ = premier parent du premier parent de foo\n" + +# première ligne trop longue -> traduction abrégée (à retraduire quand hg +# sera capable de replier automatiquement la première ligne d'aide) +msgid "" +"command to send changesets as (a series of) patch emails\n" "\n" "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n" "describes the series as a whole.\n" @@ -3700,7 +3897,7 @@ msgid "hg email [OPTION]... [DEST]..." msgstr "hg email [OPTION]... [DEST]..." -msgid "delete files not tracked from the working directory" +msgid "command to delete untracked files from the working directory" msgstr "" msgid "" @@ -3727,46 +3924,74 @@ " option.\n" " " msgstr "" +"retire les fichiers non suivis par Mercurial\n" +"\n" +" Supprime les fichiers non connus de Mercurial, ce qui peut être\n" +" utile pour tester des changements locaux non enregistrés à\n" +" l'intérieur d'une arborescence de sources propre.\n" +"\n" +" Ainsi, purge effacera :\n" +" - les fichiers inconnus : fichiers que \"hg status\" indique\n" +" par un point d'interrogation\n" +" - les répertoires vides : en fait Mercurial ignore complètement\n" +" les répertoires, à moins qu'ils ne contiennent des fichiers\n" +" sous son contrôle\n" +" Seront par contre laissés intacts :\n" +" - Les fichiers placés sous contrôle, qu'ils aient été modifiés\n" +" ou non\n" +" - Les fichiers ignorés (sauf si --all est utilisé)\n" +" - Les fichiers nouvellement ajoutés au dépôt (avec \"hg add\")\n" +"\n" +" Si des répertoires sont spécifiés sur la ligne de commande,\n" +" seuls les fichiers qu'ils contiennent seront considérés.\n" +"\n" +" Soyez prudent en utilisant purge, si vous avez oublié d'ajouter\n" +" des fichiers au dépôt, ils seront perdus irrémédiablement.\n" +" Si vous souhaitez seulement afficher la liste des fichiers qui\n" +" seraient effacés par purge, utilisez l'option --print.\n" +" " #, python-format msgid "%s cannot be removed" -msgstr "" +msgstr "%s ne peut être supprimé" #, python-format msgid "warning: %s\n" -msgstr "" +msgstr "attention: %s\n" #, python-format msgid "Removing file %s\n" -msgstr "" +msgstr "Suppression du fichier %s\n" #, python-format msgid "Removing directory %s\n" -msgstr "" +msgstr "Suppression du répertoire %s\n" msgid "abort if an error occurs" -msgstr "" +msgstr "abandonner en cas d'erreur" msgid "purge ignored files too" -msgstr "" +msgstr "supprimer également les fichiers ignorés" msgid "print filenames instead of deleting them" -msgstr "" +msgstr "afficher les nom des fichiers au lieu de les supprimer" msgid "end filenames with NUL, for use with xargs (implies -p/--print)" msgstr "" +"terminer les noms de fichiers par un caractère nul, pour utilisation avec " +"xargs (implique -p/--print)" msgid "hg purge [OPTION]... [DIR]..." -msgstr "" - -msgid "" -"move sets of revisions to a different ancestor\n" +msgstr "hg purge [OPTION]... [RÉPERTOIRE]..." + +msgid "" +"command to move sets of revisions to a different ancestor\n" "\n" "This extension lets you rebase changesets in an existing Mercurial\n" "repository.\n" "\n" "For more information:\n" -"http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n" +"http://mercurial.selenic.com/wiki/RebaseProject\n" msgstr "" msgid "first revision, do not change ancestor\n" @@ -3935,7 +4160,7 @@ "| [-c] | [-a]" msgstr "" -msgid "interactively select which sets of changes to commit/qrefresh" +msgid "commands to interactively select changes for commit/qrefresh" msgstr "" msgid "this modifies a binary file (all or nothing)\n" @@ -4093,7 +4318,7 @@ msgstr "" msgid "" -"transplant changesets from another branch\n" +"command to transplant changesets from another branch\n" "\n" "This extension allows you to transplant patches from another branch.\n" "\n" @@ -4239,7 +4464,7 @@ msgstr "" msgid "" -"allow the use of MBCS paths with problematic encoding\n" +"allow the use of MBCS paths with problematic encodings\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" @@ -4362,6 +4587,24 @@ " $ hg paths\n" " zc-test = http://example.com:8000/test\n" msgstr "" +"découverte et annonce de dépôts sur le réseau local\n" +"\n" +"Les dépôts utilisant zeroconf seront visibles sur le réseau sans\n" +"qu'il n'y ait besoin de configurer un serveur ou service\n" +"particuliers, et ils peuvent être accédés simplement, sans\n" +"connaissance de leur adresse IP.\n" +"\n" +"Pour permettre à d'autres personnes de découvrir votre dépôt,\n" +"lancez-y la commande \"hg serve\" :\n" +"\n" +" $ cd test\n" +" $ hg serve\n" +"\n" +"Vous pouvez découvrir les dépôts utilisant zeroconf en utilisant\n" +"la commande \"hg paths\", par exemple :\n" +"\n" +" $ hg paths\n" +" zc-test = http://example.com:8000/test\n" msgid "archive prefix contains illegal components" msgstr "" @@ -4873,7 +5116,7 @@ "list repository named branches\n" "\n" " List the repository's named branches, indicating which ones are\n" -" inactive. If active is specified, only show active branches.\n" +" inactive. If -a/--active is specified, only show active branches.\n" "\n" " A branch is considered active if it contains repository heads.\n" "\n" @@ -4892,8 +5135,8 @@ " parameters. To create a bundle containing all changesets, use\n" " -a/--all (or --base null).\n" "\n" -" To change the compression method applied, use the -t/--type\n" -" option. The available compression methods are: none, bzip2, and\n" +" You can change compression method with the -t/--type option.\n" +" The available compression methods are: none, bzip2, and\n" " gzip (by default, bundles are compressed using bzip2).\n" "\n" " The bundle file can then be transferred using conventional means\n" @@ -5151,8 +5394,8 @@ msgstr "" msgid "" -" Internal patcher failure, please report this error to http://www.selenic." -"com/mercurial/bts\n" +" Internal patcher failure, please report this error to http://mercurial." +"selenic.com/bts/\n" msgstr "" msgid "Checking commit editor...\n" @@ -5323,7 +5566,7 @@ " branch is called the revision's branch tag.\n" "\n" " Branch heads are revisions on a given named branch that do not have\n" -" any children on the same branch. A branch head could be a true head\n" +" any descendants on the same branch. A branch head could be a true head\n" " or it could be the last changeset on a branch before a new branch\n" " was created. If none of the branch heads are true heads, the branch\n" " is considered inactive.\n" @@ -5473,7 +5716,8 @@ " With -s/--similarity, hg will attempt to discover renames and\n" " copies in the patch in the same way as 'addremove'.\n" "\n" -" To read a patch from standard input, use \"-\" as the patch name.\n" +" To read a patch from standard input, use \"-\" as the patch name. If\n" +" a URL is specified, the patch will be downloaded from it.\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" @@ -6925,7 +7169,7 @@ msgid "** unknown exception encountered, details follow\n" msgstr "" -msgid "** report bug details to http://www.selenic.com/mercurial/bts\n" +msgid "** report bug details to http://mercurial.selenic.com/bts/\n" msgstr "" msgid "** or mercurial@selenic.com\n"
--- a/i18n/ja.po Wed Jul 01 13:55:24 2009 -0500 +++ b/i18n/ja.po Wed Jul 01 13:57:01 2009 -0500 @@ -97,8 +97,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2009-06-27 00:28+0900\n" -"PO-Revision-Date: 2009-06-28 22:00+0900\n" +"POT-Creation-Date: 2009-07-01 11:25+0900\n" +"PO-Revision-Date: 2009-07-01 18:00+0900\n" "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" "Language-Team: Japanese\n" "MIME-Version: 1.0\n" @@ -129,7 +129,7 @@ "\n" msgid "" -"control access to a repository using simple hooks\n" +"hooks for controlling repository access\n" "\n" "This hook makes it possible to allow or deny write access to portions\n" "of a repository when receiving incoming changesets.\n" @@ -281,7 +281,7 @@ msgstr "" msgid "" -"integrate Mercurial with a Bugzilla bug tracker\n" +"hooks for integrating with the 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" @@ -465,8 +465,8 @@ msgid "database error: %s" msgstr "データベースエラー: %s" -msgid "display children changesets" -msgstr "子チェンジセットの表示" +msgid "command to display child changesets" +msgstr "子チェンジセット表示のコマンド" msgid "" "show the children of the given or working directory revision\n" @@ -493,8 +493,8 @@ msgid "hg children [-r REV] [FILE]" msgstr "hg children [-r REV] [FILE]" -msgid "display statistics about repository history" -msgstr "変更履歴の統計情報の表示コマンド" +msgid "command to display statistics about repository history" +msgstr "変更履歴の統計情報表示のコマンド" #, python-format msgid "Revision %d is a merge, ignoring...\n" @@ -655,8 +655,12 @@ msgid "don't colorize output" msgstr "出力を色づけ市内" -msgid "import from foreign VCS repositories into Mercurial" -msgstr "外部 VCS リポジトリから Mercurial への取り込み" +#, python-format +msgid "ignoring unknown color/effect %r (configured in color.%s)\n" +msgstr "" + +msgid "import revisions from foreign VCS repositories into Mercurial" +msgstr "他の構成管理ツールから Mercurial への履歴取り込み" msgid "" "convert a foreign SCM repository to a Mercurial one.\n" @@ -994,10 +998,6 @@ msgstr "%s エラー:\n" #, python-format -msgid "%s %s" -msgstr "%s %s" - -#, python-format msgid "syntax error in %s(%d): key/value pair expected" msgstr "%s(%d) での文法エラー: key/value の組が必要です" @@ -1412,7 +1412,7 @@ msgstr "XXX タグ付けはまだ実装されていません\n" msgid "" -"allow external programs to compare revisions\n" +"command to 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" @@ -1592,8 +1592,8 @@ msgid "hg fetch [SOURCE]" msgstr "" -msgid "sign and verify changesets" -msgstr "チェンジセットの署名および検証" +msgid "commands to sign and verify changesets" +msgstr "チェンジセットの署名および検証のコマンド" msgid "error while verifying signature" msgstr "" @@ -1677,13 +1677,13 @@ msgstr "hg sigs" msgid "" -"show revision graphs in terminals\n" +"command to view revision graphs from a shell\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 "" -"端末でのリビジョングラフの表示\n" +"端末でのリビジョングラフ表示のコマンド\n" "\n" "本エクステンションは、incoming, outgoing および log コマンドに --graph\n" "オプションを付与します。このオプションが指定された場合、ASCII 文字による\n" @@ -1733,7 +1733,7 @@ msgstr "hg glog [OPTION]... [FILE]" msgid "" -"integrate Mercurial with a CIA notification service\n" +"hooks for integrating with the CIA.vc 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" @@ -1869,8 +1869,8 @@ msgid "hg debug-config" msgstr "hg debug-config" -msgid "hg debug-merge-base node node" -msgstr "hg debug-merge-base node node" +msgid "hg debug-merge-base REV REV" +msgstr "hg debug-merge-base REV REV" msgid "ignored" msgstr "無視しました" @@ -1890,11 +1890,11 @@ msgid "max-count" msgstr "" -msgid "hg debug-rev-list [options] revs" -msgstr "hg debug-rev-list [options] revs" - -msgid "" -"syntax highlighting for hgweb\n" +msgid "hg debug-rev-list [OPTION]... REV..." +msgstr "hg debug-rev-list [OPTION]... REV..." + +msgid "" +"syntax highlighting for hgweb (requires Pygments)\n" "\n" "It depends on the Pygments syntax highlighting library:\n" "http://pygments.org/\n" @@ -1905,12 +1905,10 @@ "pygments_style = <style>\n" "\n" "The default is 'colorful'.\n" -"\n" -"-- Adam Hupp <adam@hupp.org>\n" -msgstr "" - -msgid "accelerate status report using system level services" -msgstr "システム固有の機能による状態報告の高速化" +msgstr "" + +msgid "accelerate status report using Linux's inotify service" +msgstr "Linux の inoitfy サービスによる状態報告の高速化" msgid "start an inotify server for this repository" msgstr "リポジトリに対する inotify サーバの起動" @@ -1941,8 +1939,8 @@ msgid "name of file to write process ID to" msgstr "プロセスIDの書き出し先ファイル" -msgid "hg inserve [OPT]..." -msgstr "hg inserve [OPT]..." +msgid "hg inserve [OPTION]..." +msgstr "hg inserve [OPTION]..." msgid "(found dead inotify server socket; removing it)\n" msgstr "(終了した inotify サーバのソケットを検出したので削除します)\n" @@ -2256,20 +2254,20 @@ " " #, python-format -msgid "" -"\n" -"\t%s\n" -msgstr "" -"\n" -"\t%s\n" - -#, python-format msgid "creating temporary repository at %s\n" msgstr "一時リポジトリ %s の作成中\n" #, python-format msgid "" "\n" +"\tconfig using %s keyword template maps\n" +msgstr "" +"\n" +"\t%s をキーワードのテンプレートマップとして使用\n" + +#, python-format +msgid "" +"\n" "%s keywords written to %s:\n" msgstr "" "\n" @@ -2281,6 +2279,14 @@ #, python-format msgid "" "\n" +"\t%s keywords expanded%s\n" +msgstr "" +"\n" +"%s キーワードを展開: %s\n" + +#, python-format +msgid "" +"\n" "removing temporary repository %s\n" msgstr "" "\n" @@ -2302,18 +2308,48 @@ " " msgid "" -"print files currently configured for keyword expansion\n" -"\n" -" Crosscheck which files in working directory are potential targets\n" -" for keyword expansion. That is, files matched by [keyword] config\n" -" patterns but not symlinks.\n" +"show files configured for keyword expansion\n" +"\n" +" List which files in the working directory are matched by the\n" +" [keyword] configuration patterns.\n" +"\n" +" Useful to prevent inadvertent keyword expansion and to speed up\n" +" execution by including only files that are actual candidates\n" +" for expansion.\n" +"\n" +" See \"hg help keyword\" on how to construct patterns both for\n" +" inclusion and exclusion of files.\n" +"\n" +" Use -u/--untracked to list untracked files as well.\n" +"\n" +" With -a/--all and -v/--verbose the codes used to show the status\n" +" of files are:\n" +" K = keyword expansion candidate\n" +" k = keyword expansion candidate (untracked)\n" +" I = ignored\n" +" i = ignored (untracked)\n" " " msgstr "" "キーワード展開設定のあるファイルの表示\n" "\n" -" 作業領域中のファイルで、潜在的にキーワード展開の対象と成り得るものを\n" -" 確認します。対象となるのは、[keyword] 設定でのパターンに合致し、且つ\n" -" シンボリックリンクでないファイルです。\n" +" 作業領域中のファイルで、[keyword] 設定でのパターンに合致する\n" +" ファイルの一覧を表示します。\n" +"\n" +" 予期せぬキーワード展開の防止と、実行性能向上のために、実際の\n" +" 埋め込み対象となるファイルのみを設定することをお勧めします。\n" +"\n" +" パターン合致に関する詳細は、'hg help keyword' を参照してください。\n" +"\n" +" -u/--untracked 指定のある場合、構成管理対象外のファイルも列挙\n" +" されます。\n" +"\n" +" -a/--all および -v/--verbose 指定のある場合、各ファイルの状況は\n" +" 以下の記号で表現されます。\n" +"\n" +" K = キーワード展開候補\n" +" k = キーワード展開候補(構成管理対象外)\n" +" I = 無視\n" +" i = 無視(構成管理対象外)\n" " " msgid "" @@ -2361,7 +2397,7 @@ msgstr "hg kwshrink [OPTION]... [FILE]..." msgid "" -"work with a stack of patches\n" +"manage 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" @@ -2384,16 +2420,16 @@ "remove patch from applied stack qpop\n" "refresh contents of top applied patch qrefresh\n" msgstr "" -"パッチの管理および作成\n" +"パッチ併用の管理\n" "\n" "本エクステンションは、Mercurial リポジトリの作業領域において、パッチを\n" -"使用した作業を可能にします。本拡張では、「既知のパッチ」と「適用中の\n" -"パッチ」(「既知のパッチ」の部分集合)の2つの集合を、スタックとして管理\n" -"します。\n" +"併用した作業を可能にします。本エクステンションでは、「既知のパッチ」と\n" +"「適用中のパッチ」(「既知のパッチ」の部分集合)の2つの集合を、スタック\n" +"を用いて管理します。\n" "\n" "「既知のパッチ」は、.hg/patches ディレクトリ配下に置かれたパッチファイル\n" "に相当します。「適用中のパッチ」は、「既知のパッチ」のうち、対応する\n" -"リビジョンがリポジトリの履歴中に(一時的に)記録されているものを指します。\n" +"リビジョンがリポジトリの履歴に(一時的に)記録されているものを指します。\n" "\n" "良く使用される機能(詳細は \"hg help コマンド名\" を参照):\n" "\n" @@ -2746,24 +2782,20 @@ msgid "" "remove patches from queue\n" "\n" -" The patches must not be applied, and at least one patch is\n" -" required.\n" -"\n" -" With -k/--keep, the patch files are preserved in the patch\n" -" directory.\n" +" The patches must not be applied, and at least one patch is required. " +"With\n" +" -k/--keep, the patch files are preserved in the patch directory.\n" "\n" " To stop managing a patch and move it into permanent history,\n" " use the qfinish command." msgstr "" "管理対象からのパッチ除外\n" "\n" -" 対象となるパッチは未適用でなければならず、最低1つのパッチ名、\n" -" 又はリビジョンの指定が必要です。\n" -"\n" -" --keep を指定した場合、パッチファイルそのものはパッチ管理領域に\n" -" 残されたままとなります。\n" -"\n" -" 管理対象外となったリビジョンを通常リビジョン化するには qfinish を\n" +" 対象パッチは未適用でなければならず、最低1つのパッチ名の指定が\n" +" 必要です。-k/--keep を指定した場合、パッチファイルそのものは\n" +" 管理領域に残されたままとなります。\n" +"\n" +" 管理対象外となったパッチを通常リビジョン化する場合は qfinish を\n" " 使用してください。" msgid "print the patches already applied" @@ -3575,11 +3607,11 @@ msgid "finish all applied changesets" msgstr "全ての適用中パッチを通常リビジョン化" -msgid "hg qfinish [-a] [REV...]" -msgstr "hg qfinish [-a] [REV...]" - -msgid "" -"send e-mail notifications for commits/pushes\n" +msgid "hg qfinish [-a] [REV]..." +msgstr "hg qfinish [-a] [REV]..." + +msgid "" +"hooks for sending email notifications at commit/push time\n" "\n" "Subscriptions can be managed through hgrc. Default mode is to print\n" "messages to stdout, for testing and configuring.\n" @@ -3728,7 +3760,7 @@ msgstr "" msgid "" -"send Mercurial changesets as a series of patch e-mails\n" +"command to send changesets as (a series of) patch emails\n" "\n" "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n" "describes the series as a whole.\n" @@ -3793,7 +3825,7 @@ "directly from the commandline. See the [email] and [smtp] sections in\n" "hgrc(5) for details." msgstr "" -"電子メールによる変更内容のパッチ送付\n" +"電子メールによる変更内容パッチ送付のコマンド\n" "\n" "一連のメールは、\"[PATCH 0 of N]\" を Subject ヘッダに持つ、説明メール\n" "から始まります。\n" @@ -4070,8 +4102,8 @@ msgid "hg email [OPTION]... [DEST]..." msgstr "hg email [OPTION]... [DEST]...\"" -msgid "delete files not tracked from the working directory" -msgstr "作業領域中の未登録ファイルの削除" +msgid "command to delete untracked files from the working directory" +msgstr "作業領域中の未登録ファイルを削除するコマンド" msgid "" "removes files not tracked by Mercurial\n" @@ -4130,15 +4162,15 @@ msgstr "hg purge [OPTION]... [DIR]...\"" msgid "" -"move sets of revisions to a different ancestor\n" +"command to move sets of revisions to a different ancestor\n" "\n" "This extension lets you rebase changesets in an existing Mercurial\n" "repository.\n" "\n" "For more information:\n" -"http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n" -msgstr "" -"異なる祖先の元への一連のリビジョンの移動\n" +"http://mercurial.selenic.com/wiki/RebaseProject\n" +msgstr "" +"一連のリビジョンを異なる履歴ツリー上の位置に移動させるコマンド\n" "\n" "本エクステンションは、既存の Mercurial リポジトリにおけるリビジョンの\n" "リベースを可能にします。\n" @@ -4324,8 +4356,8 @@ "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] " "| [-c] | [-a]" -msgid "interactively select which sets of changes to commit/qrefresh" -msgstr "commit または qrefresh コマンド実行時の対話的な変更の選択" +msgid "commands to interactively select changes for commit/qrefresh" +msgstr "commit または qrefresh 実行時に対話的な変更選択を行うコマンド" msgid "this modifies a binary file (all or nothing)\n" msgstr "これはバイナリファイルに対する変更です(部分的な選択は不可能)\n" @@ -4503,14 +4535,14 @@ msgstr "[-U] SOURCE [DEST]" msgid "" -"transplant changesets from another branch\n" +"command to transplant changesets from another branch\n" "\n" "This extension allows you to transplant patches from another branch.\n" "\n" "Transplanted patches are recorded in .hg/transplant/transplants, as a\n" "map from a changeset hash to its hash in the source repository.\n" msgstr "" -"別ブランチからのパッチ移植\n" +"別ブランチからパッチを移植するコマンド\n" "\n" "本エクステンションは、別ブランチからのパッチの移植を可能にします。\n" "\n" @@ -4689,7 +4721,7 @@ "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." msgid "" -"allow the use of MBCS paths with problematic encoding\n" +"allow the use of MBCS paths with problematic encodings\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" @@ -4717,20 +4749,20 @@ "encoding.encoding which is decided by Mercurial from current locale\n" "setting or HGENCODING.\n" msgstr "" -"問題文字コードでの多バイト符号化文字を使用したパス名の有効化\n" +"問題のある文字コードでの多バイト符号化文字を使用したパス名の有効化\n" "\n" "パス名の取り扱い(例: パス要素の分割、文字大小変換等)上、不適切な文字を\n" "含む多バイト符号化文字セット(MBCS)が存在します。ここではそのような文字\n" "セット(例: shift_jis および big5)を「問題文字コード」と呼びます。\n" "本エクステンションは、パス操作の実施前に unicode 文字列化する処理を\n" -"被せることで、問題文字コードによって発生する障害を防ぎます。\n" +"割り込ませることで、問題文字コードによって発生する障害を防ぎます。\n" "\n" "このエクステンションは以下の場合に有用です:\n" "\n" " * shift_jis 文字コードを使用する日本語 Windows のユーザ\n" " * big5 文字コードを使用する中国語 Windows のユーザ\n" -" * 文字大小を区別できないファイルシステムで問題となる問題文字コード上で\n" -" リポジトリを運用するユーザ\n" +" * 文字大小を区別できないファイルシステム上で、問題文字コードを\n" +" 使用したリポジトリを運用するユーザ\n" "\n" "このエクステンションは以下の場合には不要です:\n" "\n" @@ -4745,7 +4777,6 @@ "\n" "パス名の文字コード変換は、unicode と、ロケール設定ないし HGENCODING\n" "環境変数によって Mercurial が決定する文字コードとの間で行なわれます。\n" -"\n" #, python-format msgid "[win32mbcs] filename conversion fail with %s encoding\n" @@ -5507,7 +5538,7 @@ "list repository named branches\n" "\n" " List the repository's named branches, indicating which ones are\n" -" inactive. If active is specified, only show active branches.\n" +" inactive. If -a/--active is specified, only show active branches.\n" "\n" " A branch is considered active if it contains repository heads.\n" "\n" @@ -5516,8 +5547,9 @@ msgstr "" "リポジトリ中の名前付きブランチの一覧\n" "\n" -" リポジトリ中の名前付きブランチを、非活性(inactive)のものも含め\n" -" 一覧表示します。--active 指定時には、活性のもののみ表示されます。\n" +" リポジトリ中の名前付きブランチを、非活性(inactive)か否かと共に\n" +" 一覧表示します。-a/--active 指定時には、活性のもののみが表示さ\n" +" れます。\n" "\n" " リポジトリ中にヘッドを持つブランチは活性とみなされます。\n" "\n" @@ -5536,8 +5568,8 @@ " parameters. To create a bundle containing all changesets, use\n" " -a/--all (or --base null).\n" "\n" -" To change the compression method applied, use the -t/--type\n" -" option. The available compression methods are: none, bzip2, and\n" +" You can change compression method with the -t/--type option.\n" +" The available compression methods are: none, bzip2, and\n" " gzip (by default, bundles are compressed using bzip2).\n" "\n" " The bundle file can then be transferred using conventional means\n" @@ -5560,7 +5592,7 @@ " 指定します。\n" "\n" " 圧縮方式を変更する場合は -t/--type を使用します。利用可能な圧縮\n" -" 形式は none(無圧縮), bzip2, gzip です(無指定時は bz2 圧縮)。\n" +" 形式は none(無圧縮), bzip2, gzip です(無指定時は bzip2 圧縮)。\n" "\n" " 任意の方法で転送したバンドルファイルは、他のリポジトリ上で\n" " 'hg unbundle' ないし 'hg pull' により適用可能です。バンドルによる\n" @@ -5924,11 +5956,11 @@ msgstr " (ツールが未対応なパッチ形式か、設定ミスです。設定確認が必要です)\n" msgid "" -" Internal patcher failure, please report this error to http://www.selenic." -"com/mercurial/bts\n" +" Internal patcher failure, please report this error to http://mercurial." +"selenic.com/bts/\n" msgstr "" " 内部パッチツールが機能しません。\n" -"http://www.selenic.com/mercurial/bts へのエラー報告にご協力ください\n" +"http://mercurial.selenic.com/bts へのエラー報告にご協力ください\n" msgid "Checking commit editor...\n" msgstr "メッセージ入力用エディタの検証中...\n" @@ -6174,7 +6206,7 @@ " branch is called the revision's branch tag.\n" "\n" " Branch heads are revisions on a given named branch that do not have\n" -" any children on the same branch. A branch head could be a true head\n" +" any descendants on the same branch. A branch head could be a true head\n" " or it could be the last changeset on a branch before a new branch\n" " was created. If none of the branch heads are true heads, the branch\n" " is considered inactive.\n" @@ -6359,7 +6391,8 @@ " With -s/--similarity, hg will attempt to discover renames and\n" " copies in the patch in the same way as 'addremove'.\n" "\n" -" To read a patch from standard input, use \"-\" as the patch name.\n" +" To read a patch from standard input, use \"-\" as the patch name. If\n" +" a URL is specified, the patch will be downloaded from it.\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" @@ -6392,6 +6425,7 @@ " パッチによる変更内容から、改名や複製を検出します。\n" "\n" " 標準入力からパッチを取り込むには、パッチ名に \"-\" を指定します。\n" +" URL が指定された場合、パッチを当該 URL からダウンロードします。\n" " -d/--date への指定に関しては、'hg help dates' を参照してください。\n" " " @@ -8250,8 +8284,8 @@ msgid "** unknown exception encountered, details follow\n" msgstr "** 予期せぬ例外が浮揚されました\n" -msgid "** report bug details to http://www.selenic.com/mercurial/bts\n" -msgstr "** 障害の詳細を http://www.selenic.com/mercurial/bts\n" +msgid "** report bug details to http://mercurial.selenic.com/bts/\n" +msgstr "** 障害詳細を http://mercurial.selenic.com/bts に報告してください\n" msgid "** or mercurial@selenic.com\n" msgstr "** ないし mercurial@selenic.com に報告してください\n"
--- a/i18n/pt_BR.po Wed Jul 01 13:55:24 2009 -0500 +++ b/i18n/pt_BR.po Wed Jul 01 13:57:01 2009 -0500 @@ -66,7 +66,7 @@ "\n" msgid "" -"control access to a repository using simple hooks\n" +"hooks for controlling repository access\n" "\n" "This hook makes it possible to allow or deny write access to portions\n" "of a repository when receiving incoming changesets.\n" @@ -112,7 +112,7 @@ " glob pattern = user4, user5\n" " ** = user6\n" msgstr "" -"controla o acesso a um repositório usando ganchos simples\n" +"ganchos para controlar o acesso a um repositório\n" "\n" "Este gancho possibilita permitir ou recusar acesso de escrita a\n" "porções de um repositório ao receber changesets.\n" @@ -302,7 +302,7 @@ msgstr "hg bookmarks [-f] [-d] [-m NOME] [-r REV] [NOME]" msgid "" -"integrate Mercurial with a Bugzilla bug tracker\n" +"hooks for integrating with the 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" @@ -414,7 +414,7 @@ "\n" " Changeset commit comment. Bug 1234.\n" msgstr "" -"integra o Mercurial com um bug tracker Bugzilla\n" +"ganchos para integração com um bug tracker Bugzilla\n" "\n" "Essa extensão adiciona comentários a bugs do Bugzilla quando\n" "forem encontrados changesets que se refiram a esses bugs pelo ID.\n" @@ -610,8 +610,8 @@ msgid "database error: %s" msgstr "erro de banco de dados: %s" -msgid "display children changesets" -msgstr "exibe os changesets filhos" +msgid "command to display child changesets" +msgstr "comando para exibir changesets filhos" msgid "" "show the children of the given or working directory revision\n" @@ -638,8 +638,8 @@ msgid "hg children [-r REV] [FILE]" msgstr "hg children [-r REV] [ARQUIVO]" -msgid "display statistics about repository history" -msgstr "mostra estatísticas sobre o histórico de revisões" +msgid "command to display statistics about repository history" +msgstr "comando para mostrar estatísticas do histórico do repositório" #, python-format msgid "Revision %d is a merge, ignoring...\n" @@ -843,8 +843,12 @@ msgid "don't colorize output" msgstr "não colore a saída" -msgid "import from foreign VCS repositories into Mercurial" -msgstr "importação de repositórios de outros VCSs para o Mercurial" +#, python-format +msgid "ignoring unknown color/effect %r (configured in color.%s)\n" +msgstr "ignorando cor/efeito desconhecido %r (configurado em color.%s)\n" + +msgid "import revisions from foreign VCS repositories into Mercurial" +msgstr "importa revisões de repositórios de outros sistemas para o Mercurial" msgid "" "convert a foreign SCM repository to a Mercurial one.\n" @@ -1828,7 +1832,7 @@ msgstr "XXX TAGS AINDA NÃO IMPLEMENTADAS\n" msgid "" -"allow external programs to compare revisions\n" +"command to 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" @@ -1864,7 +1868,7 @@ "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 "" -"fornece comparação de revisões usando programas externos\n" +"comando que usa programas externos para comparar revisões\n" "\n" "A extensão `extdiff' do Mercurial permite o uso de programas externos\n" "para comparar revisões ou revisões e a cópia local. Os programas de\n" @@ -2088,8 +2092,8 @@ msgid "hg fetch [SOURCE]" msgstr "hg fetch [ORIGEM]" -msgid "sign and verify changesets" -msgstr "assina e verifica changesets" +msgid "commands to sign and verify changesets" +msgstr "comando para assinar e verificar changesets" msgid "error while verifying signature" msgstr "erro verificando assinatura" @@ -2186,13 +2190,13 @@ msgstr "hg sigs" msgid "" -"show revision graphs in terminals\n" +"command to view revision graphs from a shell\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 "" -"exibe grafos de revisão em terminais modo texto\n" +"comando para exibir grafos de revisão em terminais modo texto\n" "\n" "Esta extensão adiciona uma opção --graph aos comandos incoming,\n" "outgoing e log. Quando esta opção for passada, também será mostrada\n" @@ -2244,7 +2248,7 @@ msgstr "hg glog [OPÇÃO]... [ARQUIVO]" msgid "" -"integrate Mercurial with a CIA notification service\n" +"hooks for integrating with the CIA.vc 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" @@ -2279,7 +2283,7 @@ "# If you want hyperlinks (optional)\n" "baseurl = http://server/path/to/repo\n" msgstr "" -"integra o Mercurial com um serviço de notificação CIA\n" +"ganchos para integração com o serviço de notificação CIA.vc\n" "\n" "Isto deve ser executado como um gancho changegroup ou incoming.\n" "Para configurá-lo, defina as seguintes opções em seu hgrc:\n" @@ -2442,8 +2446,8 @@ msgid "hg debug-config" msgstr "hg debug-config" -msgid "hg debug-merge-base node node" -msgstr "hg debug-merge-base nó nó" +msgid "hg debug-merge-base REV REV" +msgstr "hg debug-merge-base REV REV" msgid "ignored" msgstr "ignorado" @@ -2463,11 +2467,11 @@ msgid "max-count" msgstr "número máximo" -msgid "hg debug-rev-list [options] revs" -msgstr "hg debug-rev-list [OPÇÕES] REVISÕES" - -msgid "" -"syntax highlighting for hgweb\n" +msgid "hg debug-rev-list [OPTION]... REV..." +msgstr "hg debug-rev-list [OPÇÃO]... REV..." + +msgid "" +"syntax highlighting for hgweb (requires Pygments)\n" "\n" "It depends on the Pygments syntax highlighting library:\n" "http://pygments.org/\n" @@ -2478,10 +2482,8 @@ "pygments_style = <style>\n" "\n" "The default is 'colorful'.\n" -"\n" -"-- Adam Hupp <adam@hupp.org>\n" -msgstr "" -"realce de sintaxe para o hgweb\n" +msgstr "" +"realce de sintaxe para o hgweb (requer Pygments)\n" "\n" "Esta extensão depende da biblioteca Pygments de realce de sintaxe:\n" "http://pygments.org/\n" @@ -2492,11 +2494,9 @@ "pygments_style = <estilo>\n" "\n" "O padrão é 'colorful'.\n" -"\n" -"-- Adam Hupp <adam@hupp.org>\n" - -msgid "accelerate status report using system level services" -msgstr "acelera informações de status usando serviços de sistema" + +msgid "accelerate status report using Linux's inotify service" +msgstr "acelera informações de status usando o serviço inotify do Linux" msgid "start an inotify server for this repository" msgstr "inicia um servidor inotify para este repositório" @@ -2527,8 +2527,8 @@ msgid "name of file to write process ID to" msgstr "nome do arquivo no qual escrever o ID do processo" -msgid "hg inserve [OPT]..." -msgstr "hg inserve [OPÇÕES]..." +msgid "hg inserve [OPTION]..." +msgstr "hg inserve [OPÇÃO]..." msgid "(found dead inotify server socket; removing it)\n" msgstr "(encontrado socket de um servidor inotify morto; removendo-o)\n" @@ -2857,20 +2857,18 @@ " " #, python-format -msgid "" -"\n" -"\t%s\n" -msgstr "" -"\n" -"\t%s\n" - -#, python-format msgid "creating temporary repository at %s\n" msgstr "criando repositório temporário em %s\n" #, python-format msgid "" "\n" +"\tconfig using %s keyword template maps\n" +msgstr "" + +#, python-format +msgid "" +"\n" "%s keywords written to %s:\n" msgstr "" "\n" @@ -2882,6 +2880,12 @@ #, python-format msgid "" "\n" +"\t%s keywords expanded%s\n" +msgstr "" + +#, python-format +msgid "" +"\n" "removing temporary repository %s\n" msgstr "" "\n" @@ -2904,19 +2908,48 @@ " " msgid "" -"print files currently configured for keyword expansion\n" -"\n" -" Crosscheck which files in working directory are potential targets\n" -" for keyword expansion. That is, files matched by [keyword] config\n" -" patterns but not symlinks.\n" -" " -msgstr "" -"imprime arquivos configurados para expansão de palavras chave\n" -"\n" -" Verifica quais arquivos do diretório de trabalho são alvos em\n" -" potencial para expansão de palavras chave. Ou seja, arquivos que\n" -" casarem com padrões configurados em [keyword], mas não links\n" -" simbólicos.\n" +"show files configured for keyword expansion\n" +"\n" +" List which files in the working directory are matched by the\n" +" [keyword] configuration patterns.\n" +"\n" +" Useful to prevent inadvertent keyword expansion and to speed up\n" +" execution by including only files that are actual candidates\n" +" for expansion.\n" +"\n" +" See \"hg help keyword\" on how to construct patterns both for\n" +" inclusion and exclusion of files.\n" +"\n" +" Use -u/--untracked to list untracked files as well.\n" +"\n" +" With -a/--all and -v/--verbose the codes used to show the status\n" +" of files are:\n" +" K = keyword expansion candidate\n" +" k = keyword expansion candidate (untracked)\n" +" I = ignored\n" +" i = ignored (untracked)\n" +" " +msgstr "" +"mostra arquivos configurados para expansão de palavras chave\n" +"\n" +" Lista quais arquivos no diretório de trabalho correspondem a\n" +" padrões de configuração em [keyword].\n" +"\n" +" Útil para prevenir expansão indesejada de palavras chave e para\n" +" acelerar a execução examinando apenas arquivos candidatos à\n" +" expansão.\n" +"\n" +" Veja \"hg help keyword\" para saber como construir padrões tanto\n" +" para inclusão como para exclusão de arquivos.\n" +"\n" +" Use -u/--untracked para listar também arquivos não rastreados.\n" +"\n" +" Com -a/--all e -v/--verbose os códigos usados para mostrar o\n" +" status dos arquivos são:\n" +" K = candidato à expansão de palavras chave\n" +" k = candidato à expansão de palavras chave (não rastreado)\n" +" I = ignorado\n" +" i = ignorado (não rastreado)\n" " " msgid "" @@ -2965,7 +2998,7 @@ msgstr "hg kwshrink [OPÇÃO]... [ARQUIVO]..." msgid "" -"work with a stack of patches\n" +"manage 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" @@ -2988,7 +3021,7 @@ "remove patch from applied stack qpop\n" "refresh contents of top applied patch qrefresh\n" msgstr "" -"trabalho com uma pilha de patches\n" +"gerencia uma pilha de patches\n" "\n" "Esta extensão lhe permite trabalhar com uma pilha de patches em um\n" "repositório do Mercurial. Ela gerencia duas pilhas de patches - todos\n" @@ -3352,11 +3385,9 @@ msgid "" "remove patches from queue\n" "\n" -" The patches must not be applied, and at least one patch is\n" -" required.\n" -"\n" -" With -k/--keep, the patch files are preserved in the patch\n" -" directory.\n" +" The patches must not be applied, and at least one patch is required. " +"With\n" +" -k/--keep, the patch files are preserved in the patch directory.\n" "\n" " To stop managing a patch and move it into permanent history,\n" " use the qfinish command." @@ -3364,10 +3395,8 @@ "remove patches da fila\n" "\n" " Os patches não devem estar aplicados, e ao menos um patch deve\n" -" ser passado.\n" -"\n" -" Com -k/--keep, os arquivos de patch serão preservados no\n" -" diretório de patches.\n" +" ser passado. Com -k/--keep, os arquivos de patch serão\n" +" preservados no diretório de patches.\n" "\n" " Para parar de gerenciar um patch e movê-lo para o histórico\n" " permanente, use o comando qfinish." @@ -4198,11 +4227,11 @@ msgid "finish all applied changesets" msgstr "encerra todos os changesets aplicados" -msgid "hg qfinish [-a] [REV...]" -msgstr "hg qfinish [-a] [REV...]" - -msgid "" -"send e-mail notifications for commits/pushes\n" +msgid "hg qfinish [-a] [REV]..." +msgstr "hg qfinish [-a] [REV]..." + +msgid "" +"hooks for sending email notifications at commit/push time\n" "\n" "Subscriptions can be managed through hgrc. Default mode is to print\n" "messages to stdout, for testing and configuring.\n" @@ -4264,7 +4293,7 @@ " if you like, you can put notify config file in repository that users\n" " can push changes to, they can manage their own subscriptions." msgstr "" -"envia notificações por e-mail em commit/push\n" +"gancho para enviar notificações por e-mail em commit/push\n" "\n" "Assinantes podem ser gerenciados através de hgrc. O modo padrão é\n" "imprimir as mensagens para stdout, para testes e configuração.\n" @@ -4473,7 +4502,7 @@ " foo~2 = foo^1^1 = foo^^ = primeiro pai do primeiro pai de foo\n" msgid "" -"send Mercurial changesets as a series of patch e-mails\n" +"command to send changesets as (a series of) patch emails\n" "\n" "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n" "describes the series as a whole.\n" @@ -4538,7 +4567,7 @@ "directly from the commandline. See the [email] and [smtp] sections in\n" "hgrc(5) for details." msgstr "" -"envia changesets do Mercurial como uma série de e-mails de patch\n" +"comando para enviar changesets como uma série de e-mails de patch\n" "\n" "A série é iniciada por uma introdução \"[PATCH 0 of N]\", que\n" "descreve a série como um todo.\n" @@ -4830,8 +4859,8 @@ msgid "hg email [OPTION]... [DEST]..." msgstr "hg email [OPÇÃO]... [DEST]..." -msgid "delete files not tracked from the working directory" -msgstr "apaga do diretório de trabalho arquivos não rastreados" +msgid "command to delete untracked files from the working directory" +msgstr "comando para apagar do diretório de trabalho arquivos não rastreados" msgid "" "removes files not tracked by Mercurial\n" @@ -4914,21 +4943,21 @@ msgstr "hg purge [OPÇÃO]... [DIR]..." msgid "" -"move sets of revisions to a different ancestor\n" +"command to move sets of revisions to a different ancestor\n" "\n" "This extension lets you rebase changesets in an existing Mercurial\n" "repository.\n" "\n" "For more information:\n" -"http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n" -msgstr "" -"move conjuntos de revisões para um ancestral diferente\n" +"http://mercurial.selenic.com/wiki/RebaseProject\n" +msgstr "" +"comando para mover conjuntos de revisões para um ancestral diferente\n" "\n" "Esta extensão lhe permite rebasear changesets em um repositório\n" "existente do Mercurial.\n" "\n" "Para mais informações:\n" -"http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject\n" +"http://mercurial.selenic.com/wiki/RebaseProject\n" msgid "first revision, do not change ancestor\n" msgstr "primeira revisão, não mude o ancestral\n" @@ -5110,8 +5139,8 @@ "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] " "| [-c] | [-a]" -msgid "interactively select which sets of changes to commit/qrefresh" -msgstr "seleciona interativamente mudanças em um commit ou qrefresh" +msgid "commands to interactively select changes for commit/qrefresh" +msgstr "comandos para selecionar interativamente mudanças em um commit ou qrefresh" msgid "this modifies a binary file (all or nothing)\n" msgstr "isto modifica um arquivo binário (tudo ou nada)\n" @@ -5300,14 +5329,14 @@ msgstr "[-U] ORIGEM [DEST]" msgid "" -"transplant changesets from another branch\n" +"command to transplant changesets from another branch\n" "\n" "This extension allows you to transplant patches from another branch.\n" "\n" "Transplanted patches are recorded in .hg/transplant/transplants, as a\n" "map from a changeset hash to its hash in the source repository.\n" msgstr "" -"transplanta changesets de um outro ramo\n" +"comando para transplantar changesets de um outro ramo\n" "\n" "Esta extensão lhe permite transplantar patches de outro ramo.\n" "\n" @@ -5489,7 +5518,7 @@ msgstr "hg transplant [-s REPOSITÓRIO] [-b RAMO [-a]] [-p REV] [-m REV] [REV]..." msgid "" -"allow the use of MBCS paths with problematic encoding\n" +"allow the use of MBCS paths with problematic encodings\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" @@ -6348,7 +6377,7 @@ "list repository named branches\n" "\n" " List the repository's named branches, indicating which ones are\n" -" inactive. If active is specified, only show active branches.\n" +" inactive. If -a/--active is specified, only show active branches.\n" "\n" " A branch is considered active if it contains repository heads.\n" "\n" @@ -6358,7 +6387,8 @@ "lista os ramos nomeados do repositório\n" "\n" " Lista os ramos nomeados do repositório, indicando quais são\n" -" inativos. Se -a for especificado, exibe apenas ramos ativos.\n" +" inativos. Se -a/--active for especificado, exibe apenas ramos\n" +" ativos.\n" "\n" " Um ramo é considerado ativo se contém cabeças de repositório.\n" "\n" @@ -6376,8 +6406,8 @@ " parameters. To create a bundle containing all changesets, use\n" " -a/--all (or --base null).\n" "\n" -" To change the compression method applied, use the -t/--type\n" -" option. The available compression methods are: none, bzip2, and\n" +" You can change compression method with the -t/--type option.\n" +" The available compression methods are: none, bzip2, and\n" " gzip (by default, bundles are compressed using bzip2).\n" "\n" " The bundle file can then be transferred using conventional means\n" @@ -6399,7 +6429,7 @@ " --base. Para criar um bundle contendo todos os changesets, use\n" " -a/--all (ou --base null).\n" "\n" -" Para mudar o método de compressão aplicado, use a opção\n" +" Você pode mudar o método de compressão aplicado com a opção\n" " -t/--type. Os métodos de compressão disponíveis são: none\n" " (nenhum), bzip2 e gzip (por padrão, bundles são comprimidos\n" " usando bzip2).\n" @@ -6779,11 +6809,11 @@ "estar configurado incorretamente. Por favor verifique seu arquivo .hgrc)\n" msgid "" -" Internal patcher failure, please report this error to http://www.selenic." -"com/mercurial/bts\n" -msgstr "" -" Falha do sistema interno de patches, por favor informe esse erro em http://" -"www.selenic.com/mercurial/bts\n" +" Internal patcher failure, please report this error to http://mercurial." +"selenic.com/bts/\n" +msgstr "" +" Falha do sistema interno de patches, por favor informe esse erro em http://mercurial." +"selenic.com/bts/\n" msgid "Checking commit editor...\n" msgstr "Verificando editor para consolidação...\n" @@ -7041,7 +7071,7 @@ " branch is called the revision's branch tag.\n" "\n" " Branch heads are revisions on a given named branch that do not have\n" -" any children on the same branch. A branch head could be a true head\n" +" any descendants on the same branch. A branch head could be a true head\n" " or it could be the last changeset on a branch before a new branch\n" " was created. If none of the branch heads are true heads, the branch\n" " is considered inactive.\n" @@ -7065,7 +7095,7 @@ " revisão.\n" "\n" " Cabeças de ramo são revisões em um determinado ramo nomeado que\n" -" não têm nenhuma revisão filha nesse mesmo ramo. Uma cabeça de\n" +" não têm nenhum descendente nesse mesmo ramo. Uma cabeça de\n" " ramo pode ser uma cabeça verdadeira ou pode ser o último\n" " changeset em um ramo antes que um novo ramo nomeado fosse criado.\n" " Se nenhuma das cabeças de ramo forem cabeças verdadeiras, o ramo\n" @@ -7232,7 +7262,8 @@ " With -s/--similarity, hg will attempt to discover renames and\n" " copies in the patch in the same way as 'addremove'.\n" "\n" -" To read a patch from standard input, use \"-\" as the patch name.\n" +" To read a patch from standard input, use \"-\" as the patch name. If\n" +" a URL is specified, the patch will be downloaded from it.\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" @@ -7266,7 +7297,8 @@ " cópias no patch do mesmo modo que o comando 'addremove'.\n" "\n" " Para ler um patch da entrada padrão, use \"-\" como nome do\n" -" patch. Veja 'hg help dates' para uma lista de formatos válidos\n" +" patch. Se uma URL for especificada, o patch será obtido a partir\n" +" dela. Veja 'hg help dates' para uma lista de formatos válidos\n" " para -d/--date.\n" " " @@ -9175,8 +9207,8 @@ msgid "** unknown exception encountered, details follow\n" msgstr "** exceção desconhecida encontrada, segue detalhes\n" -msgid "** report bug details to http://www.selenic.com/mercurial/bts\n" -msgstr "** reporte detalhes de problemas para http://www.selenic.com/mercurial/bts\n" +msgid "** report bug details to http://mercurial.selenic.com/bts/\n" +msgstr "** reporte detalhes de problemas para http://mercurial.selenic.com/bts/\n" msgid "** or mercurial@selenic.com\n" msgstr "** ou mercurial@selenic.com\n"