Mercurial > hg
changeset 9233:d8244ebcedc2
Merge with i18n
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 23 Jul 2009 15:25:47 -0500 |
| parents | 2250b5f1ab76 (current diff) 7ee61afc655f (diff) |
| children | 65719472bfa2 b6cb3af61582 |
| files | |
| diffstat | 4 files changed, 426 insertions(+), 285 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/da.po Thu Jul 23 12:58:15 2009 -0500 +++ b/i18n/da.po Thu Jul 23 15:25:47 2009 -0500 @@ -7,7 +7,7 @@ # changeset ændring # commit deponere # merge sammenføje -# patch lap +# patch rettelse # repo(sitory) depot # revision revision # tag mærkat @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2009-06-30 23:18+0200\n" -"PO-Revision-Date: 2009-06-30 23:28+0200\n" +"POT-Creation-Date: 2009-07-20 23:05+0200\n" +"PO-Revision-Date: 2009-07-21 00:18+0200\n" "Last-Translator: <mg@lazybytes.net>\n" "Language-Team: Danish\n" "MIME-Version: 1.0\n" @@ -1004,8 +1004,10 @@ msgid "CVS pserver authentication failed" msgstr "CVS pserver godkendelse fejlede" -msgid "server sucks" -msgstr "serveren sutter" +#, python-format +msgid "" +"unexpected response from CVS server (expected \"Valid-requests\", but got %r)" +msgstr "uventet svar fra CVS serveren (forventede \"Valid-requests\", men fik %r)" #, python-format msgid "%d bytes missing from remote file" @@ -1553,6 +1555,13 @@ " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" +"tilføj en underskrift til den aktuelle eller en given revision\n" +"\n" +" Hvis der ikke angives en revision, så bruges forældren til\n" +" arbejdskataloget, eller tip, hvis der ikke er hentet en revision.\n" +"\n" +" Se 'hg help dates' for en liste af gyldige formater til -d/--date.\n" +" " msgid "uncommitted merge - please provide a specific revision" msgstr "udeponeret sammenføjning - angiv venligst en specifik revision" @@ -1635,7 +1644,7 @@ msgstr "begræns antaln viste ændringer" msgid "show patch" -msgstr "vis lap" +msgstr "vis rettelse" msgid "show the specified revision or range" msgstr "vis den angivne revision eller interval" @@ -1754,7 +1763,7 @@ msgstr "hg view [-l GRÆNSE] [REV-INTERVAL]" msgid "generate patch" -msgstr "generer lap" +msgstr "generer rettelse" msgid "recursive" msgstr "rekursiv" @@ -1817,6 +1826,18 @@ "\n" "The default is 'colorful'.\n" msgstr "" +"syntaksfarvelægning til hgweb (kræver Pygments)\n" +"\n" +"Det afhænger af Pygments biblioteket til syntaksfarvelægning:\n" +"http://pygments.org/\n" +"\n" +"Der er en enkelt konfigurationsmulighed:\n" +"\n" +"[web]\n" +"pygments_style = <stil>\n" +"\n" +"Standardstilen er 'colorful'.\n" +"\n" msgid "accelerate status report using Linux's inotify service" msgstr "accelerer statusreporter ved brug af Linux's inotify service" @@ -1830,6 +1851,11 @@ " Prints the list of directories being watched by the inotify server.\n" " " msgstr "" +"fejlsøgningsinformation til inotify udvidelsen\n" +"\n" +" Udskriver listen af kataloger som bliver overvåget af inotify\n" +" serveren.\n" +" " msgid "directories being watched:\n" msgstr "kataloger som bliver overvåget:\n" @@ -2011,11 +2037,11 @@ #, python-format msgid "interhg: invalid pattern for %s: %s\n" -msgstr "" +msgstr "interhg: ugyldigt mønster for %s: %s\n" #, python-format msgid "interhg: invalid regexp for %s: %s\n" -msgstr "" +msgstr "interhg: ugyldig regexp for %s: %s\n" msgid "" "expand keywords in tracked files\n" @@ -2068,11 +2094,11 @@ #, python-format msgid "overwriting %s expanding keywords\n" -msgstr "" +msgstr "overskriver %s og udvider nøgleord\n" #, python-format msgid "overwriting %s shrinking keywords\n" -msgstr "" +msgstr "overskriver %s og formindsker nøgleord\n" msgid "[keyword] patterns cannot match" msgstr "[keyword] mønstre kan ikke matche" @@ -2107,7 +2133,7 @@ msgid "" "\n" "%s keywords written to %s:\n" -msgstr "" +msgstr "\n%s nøgleord skrevet til %s:\n" msgid "unhooked all commit hooks\n" msgstr "" @@ -2220,29 +2246,30 @@ "remove patch from applied stack qpop\n" "refresh contents of top applied patch qrefresh\n" msgstr "" -"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 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" +"håndter en stak af rettelser\n" +"\n" +"Denne udvidelse lader dig arbejde med en stak af rettelser (patches) i\n" +"et Mercurial repository. Den håndterer to stakke af rettelser - alle\n" +"kendte rettelser og alle anvendte rettelser (en delmængde af de kendte\n" +"rettelser).\n" +"\n" +"Kendte rettelser er repræsenteret som rettelse-filer i .hg/patches\n" +"biblioteket. Anvendte rettelser er både rettelse-filer og Mercurial\n" "ændringer.\n" "\n" "Almindelige opgaver (brug \"hg help kommado\" for flere detaljer):\n" "\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" +"forbered repository til at arbejde med rettelser qinit\n" +"opret ny rettelse qnew\n" +"importer eksisterende rettelse qimport\n" +"\n" +"list rettelse-serien qseries\n" +"list anvendte rettelser qapplied\n" +"list navnet på den øverste rettelse qtop\n" +"\n" +"anvend og put rettelse på stakken qpush\n" +"fjern rettelse fra stakken qpop\n" +"genopfrisk indholdet af den øverste rettelse qrefresh\n" #, python-format msgid "%s appears more than once in %s" @@ -2297,11 +2324,11 @@ #, python-format msgid "apply failed for patch %s" -msgstr "lap %s kunne ikke anvendes" +msgstr "rettelsen %s kunne ikke anvendes" #, python-format msgid "patch didn't work out, merging %s\n" -msgstr "lap virkede ikke, sammenføjer %s\n" +msgstr "rettelsen virkede ikke, sammenføjer %s\n" #, python-format msgid "update returned %d" @@ -2316,14 +2343,14 @@ #, python-format msgid "patch %s does not exist\n" -msgstr "lappen %s findes ikke\n" +msgstr "rettelsen %s findes ikke\n" #, python-format msgid "patch %s is not applied\n" -msgstr "lappen %s er ikke anvendt\n" +msgstr "rettelsen %s er ikke anvendt\n" msgid "patch failed, unable to continue (try -v)\n" -msgstr "lapning fejlede, kan ikke fortsætte (prøv -v)\n" +msgstr "rettelse fejlede, kan ikke fortsætte (prøv -v)\n" #, python-format msgid "applying %s\n" @@ -2335,7 +2362,7 @@ #, python-format msgid "imported patch %s\n" -msgstr "importeret lap %s\n" +msgstr "importeret rettelse %s\n" #, python-format msgid "" @@ -2343,14 +2370,14 @@ "imported patch %s" msgstr "" "\n" -"importeret lap %s" +"importeret rettelse %s" #, python-format msgid "patch %s is empty\n" -msgstr "lappen %s er tom\n" +msgstr "rettelsen %s er tom\n" msgid "patch failed, rejects left in working dir\n" -msgstr "lapning fejlede, afvisninger efter efterladt i arbejdskataloget\n" +msgstr "rettelse fejlede, afvisninger efter efterladt i arbejdskataloget\n" msgid "fuzz found when applying patch, stopping\n" msgstr "" @@ -2361,25 +2388,25 @@ #, python-format msgid "cannot delete revision %d above applied patches" -msgstr "kan ikke slette revision %d ovenover anvendte lapper" +msgstr "kan ikke slette revision %d ovenover anvendte rettelser" #, python-format msgid "patch %s finalized without changeset message\n" -msgstr "lappen %s er færdiggjort uden en ændringsbesked\n" +msgstr "rettelsen %s er færdiggjort uden en ændringsbesked\n" msgid "qdelete requires at least one revision or patch name" -msgstr "qdelete kræver mindst en revision eller navnet på en lap" +msgstr "qdelete kræver mindst en revision eller navnet på en rettelse" #, python-format msgid "cannot delete applied patch %s" -msgstr "kan ikke slette den anvendte lap %s" +msgstr "kan ikke slette den anvendte rettelse %s" #, python-format msgid "patch %s not in series file" -msgstr "lappen %s er ikke i series filen" +msgstr "rettelsen %s er ikke i series filen" msgid "no patches applied" -msgstr "ingen lapper anvendt" +msgstr "ingen rettelser anvendt" msgid "working directory revision is not qtip" msgstr "arbejdskatalogets revision er ikke qtip" @@ -2392,11 +2419,11 @@ #, python-format msgid "\"%s\" cannot be used as the name of a patch" -msgstr "\"%s\" kan ikke bruges som navnet på en lap" +msgstr "\"%s\" kan ikke bruges som navnet på en rettelse" #, python-format msgid "patch \"%s\" already exists" -msgstr "lappen \"%s\" findes allerede" +msgstr "rettelsen \"%s\" findes allerede" #, python-format msgid "error unlinking %s\n" @@ -2404,7 +2431,7 @@ #, python-format msgid "patch name \"%s\" is ambiguous:\n" -msgstr "lappen \"%s\" er tvetydigt:\n" +msgstr "rettelsen \"%s\" er tvetydigt:\n" #, python-format msgid "patch %s not in series" @@ -2436,10 +2463,10 @@ msgstr "kan ikke skubbe '%s' - %s\n" msgid "all patches are currently applied\n" -msgstr "alle lapper er i øjeblikket anvendt\n" +msgstr "alle rettelser er i øjeblikket anvendt\n" msgid "patch series already fully applied\n" -msgstr "" +msgstr "serien af rettelser er allerede anvendt fuldt ud\n" msgid "cleaning up working directory..." msgstr "rydder op i arbejdskataloget..." @@ -2454,10 +2481,10 @@ #, python-format msgid "patch %s is not applied" -msgstr "lappen %s er ikke anvendt" +msgstr "rettelsen %s er ikke anvendt" msgid "no patches applied\n" -msgstr "ingen lapper anvendt\n" +msgstr "ingen rettelser anvendt\n" #, python-format msgid "qpop: %s is already at the top\n" @@ -2477,7 +2504,7 @@ msgstr "" msgid "patch queue now empty\n" -msgstr "køen af lapper er nu tom\n" +msgstr "køen af rettelser er nu tom\n" msgid "cannot refresh a revision with children" msgstr "" @@ -2492,7 +2519,7 @@ #, python-format msgid "patch %s is not in series file" -msgstr "lappen %s er ikke i series filen" +msgstr "rettelsen %s er ikke i series filen" msgid "No saved patch data found\n" msgstr "" @@ -2532,13 +2559,13 @@ #, python-format msgid "patch %s is already in the series file" -msgstr "lap %s er allerede i series-filen" +msgstr "rettelse %s er allerede i series-filen" msgid "option \"-r\" not valid when importing files" msgstr "tilvalg \"-r\" er ikke gyldigt når filer bliver importeret" msgid "option \"-n\" not valid when importing multiple patches" -msgstr "tilvalg \"-n\" er ikke gyldigt når flere lapper bliver importeret" +msgstr "tilvalg \"-n\" er ikke gyldigt når flere rettelser bliver importeret" #, python-format msgid "revision %d is the root of more than one branch" @@ -2569,10 +2596,10 @@ #, python-format msgid "patch %s does not exist" -msgstr "lappen %s eksisterer ikke" +msgstr "rettelsen %s eksisterer ikke" msgid "need --name to import a patch from -" -msgstr "har brug for --name for at importere lap fra -" +msgstr "har brug for --name for at importere rettelse fra -" #, python-format msgid "adding %s to series file\n" @@ -2590,10 +2617,10 @@ msgstr "" msgid "print the patches already applied" -msgstr "udskriver lapperne som allerede er anvendt" +msgstr "udskriver rettelserne som allerede er anvendt" msgid "print the patches not yet applied" -msgstr "udskriver lapperne som ikke er anvendt endnu" +msgstr "udskriver rettelserne som ikke er anvendt endnu" msgid "" "import a patch\n" @@ -2685,13 +2712,13 @@ msgstr "" msgid "versioned patch repository not found (see qinit -c)" -msgstr "versionsstyret depot til lapper blev ikke fundet (se qinit -c)" +msgstr "versionsstyret depot til rettelser blev ikke fundet (se qinit -c)" msgid "cloning main repository\n" msgstr "kloner hoveddepot\n" msgid "cloning patch repository\n" -msgstr "kloner depotet til lapper\n" +msgstr "kloner depotet til rettelser\n" msgid "stripping applied patches from destination repository\n" msgstr "" @@ -2706,19 +2733,19 @@ msgstr "udskriver hele series filen" msgid "print the name of the current patch" -msgstr "udskriver navnet på den nuværende lap" +msgstr "udskriver navnet på den nuværende rettelse" msgid "print the name of the next patch" -msgstr "udskriver navnet på den næste lap" +msgstr "udskriver navnet på den næste rettelse" msgid "all patches applied\n" -msgstr "alle lapper er anvendt\n" +msgstr "alle rettelser er anvendt\n" msgid "print the name of the previous patch" -msgstr "udskriver navnet på den forgående lap" +msgstr "udskriver navnet på den forgående rettelse" msgid "only one patch applied\n" -msgstr "kun én lap er anvendt\n" +msgstr "kun én rettelse er anvendt\n" msgid "" "create a new patch\n" @@ -2822,10 +2849,10 @@ msgstr "" msgid "qfold requires at least one patch name" -msgstr "" +msgstr "qfold kræver navnet på mindst én rettelse" msgid "No patches applied" -msgstr "Der er ikke anvendt nogen lapper" +msgstr "Der er ikke anvendt nogen rettelser" #, python-format msgid "Skipping already folded patch %s" @@ -2861,10 +2888,10 @@ msgstr "" msgid "cannot mix -l/--list with options or arguments" -msgstr "" +msgstr "kan ikke blande -l/--list med tilvalg eller argumenter" msgid "no patch to work with" -msgstr "" +msgstr "ingen rettelse at arbejde med" #, python-format msgid "no patch named %s" @@ -2880,18 +2907,18 @@ " will be lost.\n" " " msgstr "" -"skub den næste patch på stakken\n" +"skub den næste rettelse på stakken\n" "\n" " Når -f/--force er angivet, så vil alle lokale ændringer i de\n" -" patchede filer gå tabt.\n" +" rettede filer gå tabt.\n" " " msgid "no saved queues found, please use -n\n" -msgstr "" +msgstr "fandt ingen gemte køer, brug venligst -r\n" #, python-format msgid "merging with queue at: %s\n" -msgstr "" +msgstr "sammenføjer med kø ved: %s\n" msgid "" "pop the current patch off the stack\n" @@ -2901,16 +2928,16 @@ " top of the stack.\n" " " msgstr "" -"fjern den aktuelle patch fra stakken\n" -"\n" -" Som standard fjernes toppen af stakken. Hvis der angives en patch,\n" -" så vil der blive fjernet patches indtil den angivne patch er på\n" -" toppen af stakken.\n" +"fjern den aktuelle rettelse fra stakken\n" +"\n" +" Som standard fjernes toppen af stakken. Hvis der angives en\n" +" rettelse, så vil der blive fjernet rettelser indtil den angivne\n" +" rettelse er på toppen af stakken.\n" " " #, python-format msgid "using patch queue: %s\n" -msgstr "" +msgstr "bruger rettelse-kø: %s\n" msgid "" "rename a patch\n" @@ -2918,6 +2945,10 @@ " With one argument, renames the current patch to PATCH1.\n" " With two arguments, renames PATCH1 to PATCH2." msgstr "" +"omdøb en rettelse\n" +"\n" +" Med et argument omdøbes den nuværende rettelse til RETTELSE1. Med\n" +" to argumenter omdøbes RETTELSE1 til RETTELSE2." #, python-format msgid "%s already exists" @@ -2925,13 +2956,13 @@ #, python-format msgid "A patch named %s already exists in the series file" -msgstr "" +msgstr "En rettelse ved navn %s eksisterer allerede i serien" msgid "restore the queue state saved by a revision" msgstr "" msgid "save current queue state" -msgstr "" +msgstr "gem tilstanden for den nuværende kø" #, python-format msgid "destination %s exists and is not a directory" @@ -3042,13 +3073,13 @@ msgstr "" msgid "no revisions specified" -msgstr "" +msgstr "ingen revisioner specificeret" msgid "cannot commit over an applied mq patch" -msgstr "" +msgstr "kan ikke deponere henover en anvendt mq rettelse" msgid "source has mq patches applied" -msgstr "" +msgstr "målet har mq rettelser anvendt" #, python-format msgid "mq status file refers to unknown node %s\n" @@ -3056,28 +3087,28 @@ #, python-format msgid "Tag %s overrides mq patch of the same name\n" -msgstr "" +msgstr "Mærkaten %s overstyrer mq rettelse med samme navn\n" msgid "cannot import over an applied patch" -msgstr "" +msgstr "kan ikke importere henover en anvendt rettelse" msgid "print first line of patch header" msgstr "" msgid "hg qapplied [-s] [PATCH]" -msgstr "hg qapplied [-s] [LAP]" +msgstr "hg qapplied [-s] [RETTELSE]" msgid "use pull protocol to copy metadata" msgstr "brug træk-protokol til at kopiere metadata" msgid "do not update the new working directories" -msgstr "" +msgstr "undlad at opdatere det nye arbejdskatalog" msgid "use uncompressed transfer (fast over LAN)" -msgstr "" +msgstr "brug ukomprimeret overførsel (hurtig over LAN)" msgid "location of source patch repository" -msgstr "" +msgstr "placering af kilde rettelse-depotet" msgid "hg qclone [OPTION]... SOURCE [DEST]" msgstr "hg qclone [TILVALG]... KILDE [MÅL]" @@ -3095,7 +3126,7 @@ msgstr "" msgid "hg qdelete [-k] [-r REV]... [PATCH]..." -msgstr "hg qdelete [-k] [-r REV]... [LAP]..." +msgstr "hg qdelete [-k] [-r REV]... [RETTELSE]..." msgid "edit patch header" msgstr "" @@ -3104,13 +3135,13 @@ msgstr "" msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..." -msgstr "hg qfold [-e] [-k] [-m TEKST] [-l FIL] LAP..." +msgstr "hg qfold [-e] [-k] [-m TEKST] [-l FIL] RETTELSE..." msgid "overwrite any local changes" -msgstr "" +msgstr "overskrive eventuelle lokale ændringer" msgid "hg qgoto [OPTION]... PATCH" -msgstr "hg qgoto [TILVALG]... LAP" +msgstr "hg qgoto [TILVALG]... RETTELSE" msgid "list all patches and guards" msgstr "" @@ -3119,28 +3150,28 @@ msgstr "" msgid "hg qguard [-l] [-n] -- [PATCH] [+GUARD]... [-GUARD]..." -msgstr "hg qguard [-l] [-n] -- [LAP] [+VAGT]... [-VAGT]..." +msgstr "hg qguard [-l] [-n] -- [RETTELSE] [+VAGT]... [-VAGT]..." msgid "hg qheader [PATCH]" -msgstr "hg qheader [LAP]" +msgstr "hg qheader [RETTELSE]" msgid "import file in patch directory" msgstr "" msgid "name of patch file" -msgstr "navn på lap" +msgstr "navn på rettelse" msgid "overwrite existing files" -msgstr "" +msgstr "overskriv eksisterende filer" msgid "place existing revisions under mq control" -msgstr "" +msgstr "placer eksisterende revisioner under mq-kontrol" msgid "use git extended diff format" -msgstr "" +msgstr "brug git udvidet diff-format" msgid "qpush after importing" -msgstr "" +msgstr "qpush efter import" msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..." msgstr "hg qimport [-e] [-n NAVN] [-f] [-g] [-P] [-r REV]... FIL..." @@ -3155,19 +3186,19 @@ msgstr "" msgid "add \"From: <current user>\" to patch" -msgstr "" +msgstr "tilføj \"From: <aktuel bruger>\" til rettelsen" msgid "add \"From: <given user>\" to patch" -msgstr "" +msgstr "tilføj \"From: <given bruger>\" til rettelsen" msgid "add \"Date: <current date>\" to patch" -msgstr "" +msgstr "tilføj \"Date: <aktuel dato>\" til rettelsen" msgid "add \"Date: <given date>\" to patch" -msgstr "" +msgstr "tilføj \"Date: <given dato>\" til rettelsen" msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..." -msgstr "hg qnew [-e] [-m TEKST] [-l FIL] [-f] LAP [FIL]..." +msgstr "hg qnew [-e] [-m TEKST] [-l FIL] [-f] RETTELSE [FIL]..." msgid "hg qnext [-s]" msgstr "hg qnext [-s]" @@ -3176,16 +3207,16 @@ msgstr "hg qprev [-s]" msgid "pop all patches" -msgstr "" +msgstr "fjern alle rettelser" msgid "queue name to pop" msgstr "" msgid "forget any local changes" -msgstr "" +msgstr "glem eventuelle lokale ændringer" msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" -msgstr "hg qpop [-a] [-n NAVN] [-f] [LAP | INDEKS]" +msgstr "hg qpop [-a] [-n NAVN] [-f] [RETTELSE | INDEKS]" msgid "apply if the patch has rejects" msgstr "" @@ -3194,7 +3225,7 @@ msgstr "" msgid "apply all patches" -msgstr "" +msgstr "anvend alle rettelser" msgid "merge from another queue" msgstr "" @@ -3203,28 +3234,28 @@ msgstr "" msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]" -msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NAVN] [LAP | INDEKS]" +msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NAVN] [RETTELSE | INDEKS]" msgid "refresh only files already in the patch and specified files" msgstr "" msgid "add/update \"From: <current user>\" in patch" -msgstr "" +msgstr "tilføj/opdater \"From: <aktuel bruger>\" i rettelsen" msgid "add/update \"From: <given user>\" in patch" -msgstr "" +msgstr "tilføj/opdater \"From: <given bruger>\" i rettelsen" msgid "update \"Date: <current date>\" in patch (if present)" -msgstr "" +msgstr "opdater \"Date: <aktuel dato>\" i rettelsen (hvis tilstede)" msgid "update \"Date: <given date>\" in patch (if present)" -msgstr "" +msgstr "opdater \"Date: <given dato>\" i rettelsen (hvis tilstede)" msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..." msgstr "hg qrefresh [-I] [-X] [-e] [-m TEKST] [-l FIL] [-s] [FIL]..." msgid "hg qrename PATCH1 [PATCH2]" -msgstr "hg qrename LAP1 [LAP2]" +msgstr "hg qrename RETTELSE1 [RETTELSE2]" msgid "delete save entry" msgstr "" @@ -3278,7 +3309,7 @@ msgstr "" msgid "no backups" -msgstr "" +msgstr "ingen backupper" msgid "hg strip [-f] [-b] [-n] REV" msgstr "hg strip [-f] [-b] [-n] REV" @@ -3287,7 +3318,7 @@ msgstr "hg qtop [-s]" msgid "hg qunapplied [-s] [PATCH]" -msgstr "hg qunapplied [-s] [LAP]" +msgstr "hg qunapplied [-s] [RETTELSE]" msgid "finish all applied changesets" msgstr "afslut alle anvendte ændringer" @@ -3608,10 +3639,10 @@ msgstr "Sender " msgid "send patches as attachments" -msgstr "send lapper som vedhæftede filer" +msgstr "send rettelser som vedhæftede filer" msgid "send patches as inline attachments" -msgstr "send lapper som integreret tekst" +msgstr "send rettelser som integreret tekst" msgid "email addresses of blind carbon copy recipients" msgstr "" @@ -4032,10 +4063,10 @@ msgstr "sikkerhedskopier %r som %r\n" msgid "applying patch\n" -msgstr "tilføjer lap\n" +msgstr "tilføjer rettelse\n" msgid "patch failed to apply" -msgstr "lap kunne ikke tilføjes" +msgstr "rettelse kunne ikke tilføjes" #, python-format msgid "restoring %r to %r\n" @@ -4045,7 +4076,7 @@ msgstr "hg record [TILVALG]... [FIL]..." msgid "hg qrecord [OPTION]... PATCH [FILE]..." -msgstr "hg qrecord [TILVALG]... LAP [FIL]..." +msgstr "hg qrecord [TILVALG]... RETTELSE [FIL]..." msgid "share a common history between several working directories" msgstr "" @@ -4186,10 +4217,10 @@ msgstr "udestående lokale ændringer" msgid "pull patches from REPOSITORY" -msgstr "hiv lapper fra DEPOT" +msgstr "hiv rettelser fra DEPOT" msgid "pull patches from branch BRANCH" -msgstr "hiv lapper fra gren GREN" +msgstr "hiv rettelser fra gren GREN" msgid "pull all changesets up to BRANCH" msgstr "his alle ændringer indtil GREN" @@ -4575,6 +4606,10 @@ msgstr "HG: gren '%s'" #, python-format +msgid "HG: subrepo %s" +msgstr "HG: underdepot %s" + +#, python-format msgid "HG: added %s" msgstr "HG: tilføjet %s" @@ -4878,7 +4913,8 @@ " the parent of the working directory, negating a previous branch\n" " change.\n" "\n" -" Use the command 'hg update' to switch to an existing branch.\n" +" Use the command 'hg update' to switch to an existing branch. Use\n" +" 'hg commit --close-branch' to mark this branch as closed.\n" " " msgstr "" @@ -4898,9 +4934,11 @@ "list repository named branches\n" "\n" " List the repository's named branches, indicating which ones are\n" -" inactive. If -a/--active is specified, only show active branches.\n" -"\n" -" A branch is considered active if it contains repository heads.\n" +" inactive. If -c/--closed is specified, also list branches which have\n" +" been marked closed (see hg commit --close-branch).\n" +"\n" +" If -a/--active is specified, only show active branches. A branch\n" +" is considered active if it contains repository heads.\n" "\n" " Use the command 'hg update' to switch to an existing branch.\n" " " @@ -4908,10 +4946,11 @@ "vis navngivne grene i depotet\n" "\n" " Viser depotets navngivne grene og indikerer hvilke der er\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" +" inaktive. Hvis -c/--closed er angivet, så vises lukkede grene også\n" +" (se hg commit --close-branch).\n" +"\n" +" Hvis -a/--active er angivet, da vises kun aktive grene. En gren er\n" +" anses for at være aktiv hvis den indeholder depothoveder.\n" "\n" " Brug kommandoen 'hg update' for at skifte til en eksisterende\n" " gren.\n" @@ -5098,6 +5137,9 @@ " Se 'hg help dates' for en liste af gyldige formater til -d/--date.\n" " " +msgid "nothing changed\n" +msgstr "ingen ændringer\n" + msgid "created new head\n" msgstr "lavede et nyt hoved\n" @@ -5495,7 +5537,8 @@ " 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" +" is considered inactive. If -c/--closed is specified, also show branch\n" +" heads marked closed (see hg commit --close-branch).\n" "\n" " If STARTREV is specified only those heads (or branch heads) that\n" " are descendants of STARTREV will be displayed.\n" @@ -5647,7 +5690,7 @@ msgstr "" msgid "applying patch from stdin\n" -msgstr "anvender lap fra standardinddata\n" +msgstr "anvender rettelse fra standardinddata\n" msgid "no diffs found" msgstr "fandt ingen ændringer" @@ -5664,7 +5707,7 @@ msgstr "ikke en Mercurial patch" msgid "patch is damaged or loses information" -msgstr "lappen er beskadiget eller mister information" +msgstr "rettelsen er beskadiget eller mister information" msgid "" "show new changesets found in source\n" @@ -6689,6 +6732,9 @@ msgid "show only branches that have unmerged heads" msgstr "vil kun grene som har usammenføjne hoveder" +msgid "show normal and closed heads" +msgstr "vis normale og lukkede hoveder" + msgid "[-a]" msgstr "[-a]" @@ -6836,9 +6882,6 @@ msgid "show only the active heads from open branches" 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 "[-r STARTREV] [REV]..." @@ -6878,13 +6921,13 @@ msgstr "deponer ikke, opdater blot arbejdskataloget" msgid "apply patch to the nodes from which it was generated" -msgstr "anvend lap på den knude hvorfra den var genereret" +msgstr "anvend rettelse på den knude hvorfra den var genereret" msgid "use any branch information in patch (implied by --exact)" msgstr "" msgid "[OPTION]... PATCH..." -msgstr "[TILVALG]... LAP..." +msgstr "[TILVALG]... RETTELSE..." msgid "show newest record first" msgstr "vis nyeste postering først" @@ -7926,17 +7969,19 @@ "\n" " Valid URLs are of the form:\n" "\n" -" local/filesystem/path (or file://local/filesystem/path)\n" -" http://[user[:pass]@]host[:port]/[path]\n" -" https://[user[:pass]@]host[:port]/[path]\n" -" ssh://[user[:pass]@]host[:port]/[path]\n" +" local/filesystem/path[#revision]\n" +" file://local/filesystem/path[#revision]\n" +" http://[user[:pass]@]host[:port]/[path][#revision]\n" +" https://[user[:pass]@]host[:port]/[path][#revision]\n" +" ssh://[user[:pass]@]host[:port]/[path][#revision]\n" "\n" " Paths in the local filesystem can either point to Mercurial\n" " repositories or to bundle files (as created by 'hg bundle' or\n" " 'hg incoming --bundle').\n" "\n" " An optional identifier after # indicates a particular branch, tag,\n" -" or changeset to use from the remote repository.\n" +" or changeset to use from the remote repository. See also 'hg help\n" +" revisions'.\n" "\n" " Some features, such as pushing to http:// and https:// URLs are\n" " only possible if the feature is explicitly enabled on the remote\n" @@ -8292,9 +8337,6 @@ msgid "file not tracked!" msgstr "filen følges ikke!" -msgid "nothing changed\n" -msgstr "ingen ændringer\n" - msgid "unresolved merge conflicts (see hg resolve)" msgstr "uløste sammenføjningskonflikter (se hg resolve)" @@ -8662,11 +8704,11 @@ msgstr "" msgid "patch generated by hg export\n" -msgstr "lap genereret af hg export\n" +msgstr "rettelse genereret af hg export\n" #, python-format msgid "unable to find '%s' for patching\n" -msgstr "kan ikke finde '%s' til lapning\n" +msgstr "kan ikke finde '%s' til retning\n" #, python-format msgid "patching file %s\n" @@ -8709,7 +8751,7 @@ #, python-format msgid "binary patch is %d bytes, not %d" -msgstr "binær lap er %d byte, ikke %d" +msgstr "binær rettelse er %d byte, ikke %d" #, python-format msgid "unable to strip away %d dirs from %s" @@ -9198,7 +9240,7 @@ msgstr "" #, python-format -msgid "warning: %s@%s: copy source revision is nullid %s:%s" +msgid "warning: %s@%s: copy source revision is nullid %s:%s\n" msgstr "" #, python-format
--- a/i18n/de.po Thu Jul 23 12:58:15 2009 -0500 +++ b/i18n/de.po Thu Jul 23 15:25:47 2009 -0500 @@ -4359,7 +4359,7 @@ #, python-format msgid "branch: %s\n" -msgstr "Zweig : %s\n" +msgstr "Zweig: %s\n" #, python-format msgid "tag: %s\n"
--- a/i18n/fr.po Thu Jul 23 12:58:15 2009 -0500 +++ b/i18n/fr.po Thu Jul 23 15:25:47 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-07-01 08:41+0200\n" +"POT-Creation-Date: 2009-07-18 22:46+0200\n" "PO-Revision-Date: 2009-05-14 13:06+0200\n" "Last-Translator: Cedric Duval <cedricduval@free.fr>\n" "Language-Team: French\n" @@ -1026,7 +1026,9 @@ msgid "CVS pserver authentication failed" msgstr "" -msgid "server sucks" +#, python-format +msgid "" +"unexpected response from CVS server (expected \"Valid-requests\", but got %r)" msgstr "" #, python-format @@ -2611,7 +2613,6 @@ "\n" " To stop managing a patch and move it into permanent history,\n" " use the qfinish command." - msgstr "" "supprime des patchs de la pile\n" "\n" @@ -4607,14 +4608,16 @@ " zc-test = http://example.com:8000/test\n" msgid "archive prefix contains illegal components" -msgstr "" +msgstr "le préfixe donné pour l'archive contient des composants non autorisés" msgid "cannot give prefix when archiving to files" msgstr "" +"impossible de donner un préfixe pour une création d'archive vers un " +"répertoire (de type \"files\")" #, python-format msgid "unknown archive type '%s'" -msgstr "" +msgstr "type d'archive inconnu : '%s'" msgid "invalid changegroup" msgstr "" @@ -4646,75 +4649,78 @@ msgstr "" msgid "empty username" -msgstr "" +msgstr "le nom d'utilisateur est vide" #, python-format msgid "username %s contains a newline" -msgstr "" +msgstr "le nom d'utilisateur %s contient un saut de ligne" msgid "options --message and --logfile are mutually exclusive" -msgstr "" +msgstr "les options --message et --logfile s'excluent mutuellement" #, python-format msgid "can't read commit message '%s': %s" msgstr "" msgid "limit must be a positive integer" -msgstr "" +msgstr "la limite spécifiée doit être un entier positif" msgid "limit must be positive" -msgstr "" +msgstr "la limite doit être positive" msgid "too many revisions specified" -msgstr "" +msgstr "trop de révisions spécifiées" #, python-format msgid "invalid format spec '%%%s' in output filename" msgstr "" +"'%%%s'spécification de format invalide dans le nom du fichier de sortie" #, python-format msgid "adding %s\n" -msgstr "" +msgstr "ajout de %s\n" #, python-format msgid "removing %s\n" -msgstr "" +msgstr "suppression de %s\n" #, python-format msgid "recording removal of %s as rename to %s (%d%% similar)\n" msgstr "" +"suppression de %s plannifiée, en tant que renommage de %s (similaire à %d%" +"%)\n" #, python-format msgid "%s: not copying - file is not managed\n" -msgstr "" +msgstr "%s: le fichier n'est pas suivi, pas de copie\n" #, python-format msgid "%s: not copying - file has been marked for remove\n" -msgstr "" +msgstr "%s: le fichier a été marqué pour suppression, pas de copie\n" #, python-format msgid "%s: not overwriting - %s collides with %s\n" -msgstr "" +msgstr "%s: %s entre en collision avec %s, pas d'écrasement\n" #, python-format msgid "%s: not overwriting - file exists\n" -msgstr "" +msgstr "%s: le fichier existe, pas d'écrasement\n" #, python-format msgid "%s: deleted in working copy\n" -msgstr "" +msgstr "%s: supprimé dans la copie de travail\n" #, python-format msgid "%s: cannot copy - %s\n" -msgstr "" +msgstr "%s: impossible de copier - %s\n" #, python-format msgid "moving %s to %s\n" -msgstr "" +msgstr "déplacement de %s vers %s\n" #, python-format msgid "copying %s to %s\n" -msgstr "" +msgstr "copie de %s vers %s\n" #, python-format msgid "%s has not been committed yet, so no copy data will be stored for %s.\n" @@ -4839,6 +4845,10 @@ msgstr "" #, python-format +msgid "HG: subrepo %s" +msgstr "" + +#, python-format msgid "HG: added %s" msgstr "" @@ -4945,15 +4955,41 @@ " removed.\n" " " msgstr "" +"crée une archive du dépôt à une révision donnée, sans conserver " +"l'historique\n" +"\n" +" Par défaut l'archive est créée à partir de la révision parente\n" +" du répertoire de travail. Une autre révision peut être spécifiée\n" +" à l'aide de -r/--rev.\n" +"\n" +" -t/--type permet de spécifier le type d'archive à créer, parmi :\n" +"\n" +" \"files\" (par défaut) : un répertoire rempli de fichiers\n" +" \"tar\" : une archive tar non compressée\n" +" \"tbz2\" : une archive tar compressée avec bzip2\n" +" \"tgz\" : une archive tar compressée avec gzip\n" +" \"uzip\" : une archive zip non compressée\n" +" \"zip\" : une archive zip compressée avec l'algorithme deflate\n" +"\n" +" Le nom exact de l'archive ou du répertoire de destination est\n" +" donné à l'aide d'une chaîne de format. Consulter 'hg help export'\n" +" pour plus de détails.\n" +"\n" +" Un chemin relatif est ajouté devant chaque membre de l'archive,\n" +" par défaut le nom du fichier d'archive (sans répertoires ni\n" +" suffixes). Un préfixe différent peut être spécifié avec\n" +" -p/--prefix.\n" +" " msgid "no working directory: please specify a revision" -msgstr "" +msgstr "pas de répertoire de travail, veuillez spécifier une révision" msgid "repository root cannot be destination" -msgstr "" +msgstr "le répertoire racine ne peut servir de destination" msgid "cannot archive plain files to stdout" msgstr "" +"impossible d'envoyer une archive de simples fichiers vers la sortie standard" msgid "" "reverse effect of earlier changeset\n" @@ -5036,50 +5072,79 @@ " non-zero exit status means the revision is bad.\n" " " msgstr "" +"recherche de \"changesets\" par dichotomie\n" +"\n" +" Cette commande aide à trouver les \"changesets\" étant à\n" +" l'origine de problèmes. Pour l'utiliser, marquez comme étant\n" +" mauvaise la première révision pour laquelle vous avez relevé les\n" +" symptômes, puis comme bonne la dernière révision connue pour\n" +" être exempte du problème. Bisect va alors mettre à jour votre\n" +" répertoire de travail à une révision à tester (à moins que\n" +" -U/--noupdate n'ait été spécifié). Une fois vos tests réalisés,\n" +" indiquez si le problème était présent ou non. Bisect\n" +" recommencera alors pour une autre révision candidate jusqu'à\n" +" être en mesure d'annoncer la révision fautive.\n" +"\n" +" Vous pouvez aussi passer une révision en argument lors du\n" +" marquage afin d'éviter l'étape manuelle de mise à jour du\n" +" répertoire de travail à cette révision.\n" +"\n" +" Vous pouvez fournir une commande pour automatiser la recherche\n" +" par dichotomie. Son code de retour sera utilisé pour marquer les\n" +" révisions : 0 indique une révision sans problème, 125 qu'il ne\n" +" faut pas prendre cette révision en compte, 127 (commande\n" +" introuvable) cause l'abandon du processus de recherche, et tout\n" +" autre code de retour non nul désigne une révision affectée par\n" +" le problème.\n" +" " msgid "The first good revision is:\n" -msgstr "" +msgstr "La première révision exempte du problème est :\n" msgid "The first bad revision is:\n" -msgstr "" +msgstr "La première révision présentant le problème est :\n" msgid "Due to skipped revisions, the first good revision could be any of:\n" msgstr "" +"Certaines révisions n'ayant pas été considérées, la première révision\n" +"exempte du problème pourrait être parmi :\n" msgid "Due to skipped revisions, the first bad revision could be any of:\n" msgstr "" +"Certaines révisions n'ayant pas été considérées, la première révision\n" +"présentant le problème pourrait être parmi :\n" msgid "cannot bisect (no known good revisions)" -msgstr "" +msgstr "dichotomie impossible (pas de bonne révision connue)" msgid "cannot bisect (no known bad revisions)" -msgstr "" +msgstr "dichotomie impossible (pas de mauvaise révision connue)" msgid "(use of 'hg bisect <cmd>' is deprecated)\n" -msgstr "" +msgstr "('hg bisect <cmd>' ne devrait plus être utilisé)\n" msgid "incompatible arguments" -msgstr "" +msgstr "arguments incompatibles" #, python-format msgid "cannot find executable: %s" -msgstr "" +msgstr "exécutable %s introuvable" #, python-format msgid "failed to execute %s" -msgstr "" +msgstr "impossible d'exécuter %s" #, python-format msgid "%s killed" -msgstr "" +msgstr "%s a été tué" #, python-format msgid "Changeset %d:%s: %s\n" -msgstr "" +msgstr "\"Changeset\" %d:%s: %s\n" #, python-format msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n" -msgstr "" +msgstr "Test du \"changeset\" %s:%s (%s \"changesets\" restant, ~%s tests)\n" msgid "" "set or show the current branch name\n" @@ -5097,7 +5162,8 @@ " the parent of the working directory, negating a previous branch\n" " change.\n" "\n" -" Use the command 'hg update' to switch to an existing branch.\n" +" Use the command 'hg update' to switch to an existing branch. Use\n" +" 'hg commit --close-branch' to mark this branch as closed.\n" " " msgstr "" @@ -5116,9 +5182,11 @@ "list repository named branches\n" "\n" " List the repository's named branches, indicating which ones are\n" -" inactive. If -a/--active is specified, only show active branches.\n" -"\n" -" A branch is considered active if it contains repository heads.\n" +" inactive. If -c/--closed is specified, also list branches which have\n" +" been marked closed (see hg commit --close-branch).\n" +"\n" +" If -a/--active is specified, only show active branches. A branch\n" +" is considered active if it contains repository heads.\n" "\n" " Use the command 'hg update' to switch to an existing branch.\n" " " @@ -5241,6 +5309,9 @@ " " msgstr "" +msgid "nothing changed\n" +msgstr "" + msgid "created new head\n" msgstr "" @@ -5569,7 +5640,8 @@ " 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" +" is considered inactive. If -c/--closed is specified, also show branch\n" +" heads marked closed (see hg commit --close-branch).\n" "\n" " If STARTREV is specified only those heads (or branch heads) that\n" " are descendants of STARTREV will be displayed.\n" @@ -6503,16 +6575,16 @@ msgstr "" msgid "directory prefix for files in archive" -msgstr "" +msgstr "chemin préfixé aux fichiers de l'archive" msgid "revision to distribute" -msgstr "" +msgstr "révision à distribuer" msgid "type of distribution to create" -msgstr "" +msgstr "type de distribution à créer" msgid "[OPTION]... DEST" -msgstr "" +msgstr "[OPTION]... DEST" msgid "merge with old dirstate parent after backout" msgstr "" @@ -6527,25 +6599,25 @@ msgstr "" msgid "reset bisect state" -msgstr "" +msgstr "réinitialiser l'état de la recherche par dichotomie" msgid "mark changeset good" -msgstr "" +msgstr "marquer la révision comme \"bonne\"" msgid "mark changeset bad" -msgstr "" +msgstr "marquer la révision comme \"mauvaise\"" msgid "skip testing changeset" -msgstr "" +msgstr "ne pas considérer la révision" msgid "use command to check changeset state" -msgstr "" +msgstr "utiliser une commande pour tester l'état des révisions" msgid "do not update to target" -msgstr "" +msgstr "ne pas mettre à jour à la révision cible" msgid "[-gbsr] [-c CMD] [REV]" -msgstr "" +msgstr "[-gbsr] [-c CMD] [REV]" msgid "set branch name even if it shadows an existing branch" msgstr "" @@ -6559,6 +6631,9 @@ msgid "show only branches that have unmerged heads" msgstr "" +msgid "show normal and closed heads" +msgstr "" + msgid "[-a]" msgstr "" @@ -6706,9 +6781,6 @@ msgid "show only the active heads from open branches" msgstr "" -msgid "show normal and closed heads" -msgstr "" - msgid "[-r STARTREV] [REV]..." msgstr "" @@ -7007,13 +7079,13 @@ #, python-format msgid "config error at %s:%d: '%s'" -msgstr "" +msgstr "erreur de configuration à %s:%d : '%s'" msgid "not found in manifest" msgstr "" msgid "branch name not in UTF-8!" -msgstr "" +msgstr "le nom de la branche n'est pas en UTF-8 !" #, python-format msgid " searching for copies back to rev %d\n" @@ -7088,21 +7160,23 @@ #, python-format msgid "abort: %s\n" -msgstr "" +msgstr "abandon : %s\n" #, python-format msgid "" "hg: command '%s' is ambiguous:\n" " %s\n" msgstr "" +"hg: la commande '%s' est ambiguë :\n" +" %s\n" #, python-format msgid "hg: %s\n" -msgstr "" +msgstr "hg: %s\n" #, python-format msgid "timed out waiting for lock held by %s" -msgstr "" +msgstr "attendu trop longtemps le verrou détenu par %s" #, python-format msgid "lock held by %s" @@ -7110,78 +7184,84 @@ #, python-format msgid "abort: %s: %s\n" -msgstr "" +msgstr "abandon : %s : %s\n" #, python-format msgid "abort: could not lock %s: %s\n" -msgstr "" +msgstr "abandon : impossible de verrouiller %s : %s\n" #, python-format msgid "hg %s: %s\n" -msgstr "" +msgstr "hg %s: %s\n" #, python-format msgid "abort: %s!\n" -msgstr "" +msgstr "abandon : %s !\n" #, python-format msgid "abort: %s" -msgstr "" +msgstr "abandon : %s" msgid " empty string\n" -msgstr "" +msgstr " chaîne vide\n" msgid "killed!\n" -msgstr "" +msgstr "tué !\n" #, python-format msgid "hg: unknown command '%s'\n" -msgstr "" +msgstr "hg: commande inconnue : '%s'\n" #, python-format msgid "abort: could not import module %s!\n" -msgstr "" +msgstr "abandon : impossible d'importer le module %s !\n" msgid "(did you forget to compile extensions?)\n" -msgstr "" +msgstr "(avez-vous oublié de compiler les extensions ?)\n" msgid "(is your Python install correct?)\n" -msgstr "" +msgstr "(votre installation de Python est-elle correcte ?)\n" #, python-format msgid "abort: error: %s\n" -msgstr "" - +msgstr "abandon : erreur : %s\n" + +# traduction utilisée par la glibc... msgid "broken pipe\n" -msgstr "" +msgstr "relais brisé (pipe)\n" msgid "interrupted!\n" -msgstr "" - +msgstr "interrompu !\n" + +# traduction utilisée par la glibc... msgid "" "\n" "broken pipe\n" msgstr "" +"\n" +"relais brisé (pipe)\n" msgid "abort: out of memory\n" -msgstr "" +msgstr "abandon : plus de mémoire libre\n" msgid "** unknown exception encountered, details follow\n" -msgstr "" +msgstr "** exception inconnue rencontrée, détails ci-dessous\n" msgid "** report bug details to http://mercurial.selenic.com/bts/\n" msgstr "" +"** veuillez signaler le problème en détails sur http://www.selenic.com/" +"mercurial/bts\n" msgid "** or mercurial@selenic.com\n" -msgstr "" +msgstr "** ou mercurial@selenic.com\n" #, python-format msgid "** Mercurial Distributed SCM (version %s)\n" -msgstr "" +msgstr "** Mercurial version %s, système de gestion de sources distribué\n" #, python-format msgid "** Extensions loaded: %s\n" -msgstr "" +msgstr "** Extensions chargées : %s\n" #, python-format msgid "no definition for alias '%s'\n" @@ -7201,22 +7281,24 @@ #, python-format msgid "malformed --config option: %s" -msgstr "" +msgstr "option incorrecte pour --config : %s" #, python-format msgid "extension '%s' overrides commands: %s\n" -msgstr "" +msgstr "l'extension '%s' redéfinit ces commandes : %s\n" msgid "Option --config may not be abbreviated!" -msgstr "" +msgstr "L'option --config ne peut être abrégée !" msgid "Option --cwd may not be abbreviated!" -msgstr "" +msgstr "L'option --cwd ne peut être abrégée !" msgid "" "Option -R has to be separated from other options (e.g. not -qR) and --" "repository may only be abbreviated as --repo!" msgstr "" +"L'option -R doit être séparée des autres options (autrement dit -qR est " +"invalide) et --repository ne peut être abrégé qu'en --repo !" #, python-format msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n" @@ -7224,10 +7306,10 @@ #, python-format msgid "repository '%s' is not local" -msgstr "" +msgstr "le dépôt '%s' n'est pas local" msgid "invalid arguments" -msgstr "" +msgstr "arguments invalides" #, python-format msgid "unrecognized profiling format '%s' - Ignored\n" @@ -7317,11 +7399,11 @@ #, python-format msgid "Inconsistent state, %s:%s is good and bad" -msgstr "" +msgstr "État incohérent, %s:%s est à la fois \"bon\" et \"mauvais\"" #, python-format msgid "unknown bisect kind %s" -msgstr "" +msgstr "type inconnu pour dichotomie : %s" msgid "" "\n" @@ -7791,17 +7873,19 @@ "\n" " Valid URLs are of the form:\n" "\n" -" local/filesystem/path (or file://local/filesystem/path)\n" -" http://[user[:pass]@]host[:port]/[path]\n" -" https://[user[:pass]@]host[:port]/[path]\n" -" ssh://[user[:pass]@]host[:port]/[path]\n" +" local/filesystem/path[#revision]\n" +" file://local/filesystem/path[#revision]\n" +" http://[user[:pass]@]host[:port]/[path][#revision]\n" +" https://[user[:pass]@]host[:port]/[path][#revision]\n" +" ssh://[user[:pass]@]host[:port]/[path][#revision]\n" "\n" " Paths in the local filesystem can either point to Mercurial\n" " repositories or to bundle files (as created by 'hg bundle' or\n" " 'hg incoming --bundle').\n" "\n" " An optional identifier after # indicates a particular branch, tag,\n" -" or changeset to use from the remote repository.\n" +" or changeset to use from the remote repository. See also 'hg help\n" +" revisions'.\n" "\n" " Some features, such as pushing to http:// and https:// URLs are\n" " only possible if the feature is explicitly enabled on the remote\n" @@ -8154,9 +8238,6 @@ msgid "file not tracked!" msgstr "" -msgid "nothing changed\n" -msgstr "" - msgid "unresolved merge conflicts (see hg resolve)" msgstr "" @@ -9055,7 +9136,7 @@ msgstr "" #, python-format -msgid "warning: %s@%s: copy source revision is nullid %s:%s" +msgid "warning: %s@%s: copy source revision is nullid %s:%s\n" msgstr "" #, python-format
--- a/i18n/pt_BR.po Thu Jul 23 12:58:15 2009 -0500 +++ b/i18n/pt_BR.po Thu Jul 23 15:25:47 2009 -0500 @@ -1505,8 +1505,9 @@ msgid "CVS pserver authentication failed" msgstr "autenticação pserver do CVS falhou" -msgid "server sucks" -msgstr "o servidor não colabora" +#, python-format +msgid "unexpected response from CVS server (expected \"Valid-requests\", but got %r)" +msgstr "resposta inesperada do servidor CVS (\"Valid-requests\" esperada, %r recebida)" #, python-format msgid "%d bytes missing from remote file" @@ -5975,6 +5976,10 @@ msgstr "HG: ramo '%s'" #, python-format +msgid "HG: subrepo %s" +msgstr "HG: subrepo %s" + +#, python-format msgid "HG: added %s" msgstr "HG: adicionou %s" @@ -6341,7 +6346,8 @@ " the parent of the working directory, negating a previous branch\n" " change.\n" "\n" -" Use the command 'hg update' to switch to an existing branch.\n" +" Use the command 'hg update' to switch to an existing branch. Use\n" +" 'hg commit --close-branch' to mark this branch as closed.\n" " " msgstr "" "define ou mostra o nome de ramo atual\n" @@ -6360,6 +6366,8 @@ " mudança de ramo anterior.\n" "\n" " Use o comando 'hg update' para alternar para um ramo existente.\n" +" Use 'hg commit --close-branch' para marcar este ramo como\n" +" fechado.\n" " " #, python-format @@ -6377,9 +6385,11 @@ "list repository named branches\n" "\n" " List the repository's named branches, indicating which ones are\n" -" inactive. If -a/--active is specified, only show active branches.\n" -"\n" -" A branch is considered active if it contains repository heads.\n" +" inactive. If -c/--closed is specified, also list branches which have\n" +" been marked closed (see hg commit --close-branch).\n" +"\n" +" If -a/--active is specified, only show active branches. A branch\n" +" is considered active if it contains repository heads.\n" "\n" " Use the command 'hg update' to switch to an existing branch.\n" " " @@ -6387,10 +6397,11 @@ "lista os ramos nomeados do repositório\n" "\n" " Lista os ramos nomeados do repositório, indicando quais são\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" +" inativos. Se -c/--closed for especificado, exibe também ramos\n" +" marcados como fechados (veja hg commit --close-branch).\n" +"\n" +" Se -a/--active for especificado, mostra apenas ramos ativos. Um\n" +" ramo é considerado ativo se contém cabeças de repositório.\n" "\n" " Use o comando 'hg update' para trocar para um ramo existente.\n" " " @@ -6622,6 +6633,9 @@ " -d/--date.\n" " " +msgid "nothing changed\n" +msgstr "nada mudou\n" + msgid "created new head\n" msgstr "nova cabeça criada\n" @@ -6812,8 +6826,8 @@ " 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" +" 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" @@ -7074,7 +7088,8 @@ " 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" +" is considered inactive. If -c/--closed is specified, also show branch\n" +" heads marked closed (see hg commit --close-branch).\n" "\n" " If STARTREV is specified only those heads (or branch heads) that\n" " are descendants of STARTREV will be displayed.\n" @@ -7099,7 +7114,9 @@ " 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" -" é considerado inativo.\n" +" é considerado inativo. Se -c/--closed for especificado, mostra\n" +" também cabeças de ramos marcados como fechados (veja hg commit\n" +" --close-branch).\n" "\n" " Se REVINICIAL for especificada, serão mostradas apenas cabeças\n" " (ou cabeças de ramo) descendentes de REVINICIAL.\n" @@ -8581,6 +8598,9 @@ msgid "show only branches that have unmerged heads" msgstr "mostra apenas ramos que possuem cabeças não mescladas" +msgid "show normal and closed heads" +msgstr "mostra cabeças normais e fechadas" + msgid "[-a]" msgstr "[-a]" @@ -8732,9 +8752,6 @@ msgid "show only the active heads from open branches" msgstr "mostra apenas as cabeças ativas de ramos abertos" -msgid "show normal and closed heads" -msgstr "mostra cabeças normais e fechadas" - msgid "[-r STARTREV] [REV]..." msgstr "[-r REVINICIAL] [REV]..." @@ -10204,17 +10221,19 @@ "\n" " Valid URLs are of the form:\n" "\n" -" local/filesystem/path (or file://local/filesystem/path)\n" -" http://[user[:pass]@]host[:port]/[path]\n" -" https://[user[:pass]@]host[:port]/[path]\n" -" ssh://[user[:pass]@]host[:port]/[path]\n" +" local/filesystem/path[#revision]\n" +" file://local/filesystem/path[#revision]\n" +" http://[user[:pass]@]host[:port]/[path][#revision]\n" +" https://[user[:pass]@]host[:port]/[path][#revision]\n" +" ssh://[user[:pass]@]host[:port]/[path][#revision]\n" "\n" " Paths in the local filesystem can either point to Mercurial\n" " repositories or to bundle files (as created by 'hg bundle' or\n" " 'hg incoming --bundle').\n" "\n" " An optional identifier after # indicates a particular branch, tag,\n" -" or changeset to use from the remote repository.\n" +" or changeset to use from the remote repository. See also 'hg help\n" +" revisions'.\n" "\n" " Some features, such as pushing to http:// and https:// URLs are\n" " only possible if the feature is explicitly enabled on the remote\n" @@ -10265,17 +10284,19 @@ "\n" " URLs válidas são da forma:\n" "\n" -" caminho/no/sistema/de/arquivos/local (ou file://caminho/no/...)\n" -" http://[usuário[:senha]@]servidor[:porta]/[caminho]\n" -" https://[usuário[:senha]@]servidor[:porta]/[caminho]\n" -" ssh://[usuário[:senha]@]servidor[:porta]/[caminho]\n" +" caminho/no/sistema/de/arquivos/local[#revisão]\n" +" file://caminho/no/sistema/de/arquivos/local[#revisão]\n" +" http://[usuário[:senha]@]servidor[:porta]/[caminho][#revisão]\n" +" https://[usuário[:senha]@]servidor[:porta]/[caminho][#revisão]\n" +" ssh://[usuário[:senha]@]servidor[:porta]/[caminho][#revisão]\n" "\n" " Caminhos no sistema de arquivos local podem tanto apontar para\n" " repositórios do Mercurial como para arquivos bundle (criados por\n" " 'hg bundle' ou 'hg incoming --bundle').\n" "\n" " Um identificador opcional após # indica um ramo, etiqueta ou\n" -" changeset do repositório remoto a ser usado.\n" +" changeset do repositório remoto a ser usado. Veja também 'hg\n" +" help revisions'.\n" "\n" " Certas funcionalidades, como o push para URLs http:// e https://\n" " são possíveis apenas se forem explicitamente habilitadas no\n" @@ -10637,9 +10658,6 @@ msgid "file not tracked!" msgstr "arquivo não rastreado!" -msgid "nothing changed\n" -msgstr "nada mudou\n" - msgid "unresolved merge conflicts (see hg resolve)" msgstr "conflitos de mesclagem não resolvidos (veja hg resolve)" @@ -11560,8 +11578,8 @@ msgstr "Revlog de origem %s:%s vazio ou faltando" #, python-format -msgid "warning: %s@%s: copy source revision is nullid %s:%s" -msgstr "aviso: %s@%s: revisão fonte da cópia é nullid %s:%s" +msgid "warning: %s@%s: copy source revision is nullid %s:%s\n" +msgstr "aviso: %s@%s: revisão fonte da cópia é nullid %s:%s\n" #, python-format msgid "checking rename of %s"