Mercurial > hg-stable
changeset 12833:93776857e17e stable
i18n-da: synchronized with 3d6ba8c2b1b8
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Sat, 23 Oct 2010 15:04:05 +0200 |
| parents | 64f5ae917020 |
| children | b814f67d41c0 |
| files | i18n/da.po |
| diffstat | 1 files changed, 678 insertions(+), 335 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/da.po Thu Oct 21 16:57:17 2010 +0200 +++ b/i18n/da.po Sat Oct 23 15:04:05 2010 +0200 @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2010-09-18 21:41+0200\n" -"PO-Revision-Date: 2010-09-18 22:02+0200\n" +"POT-Creation-Date: 2010-10-23 14:31+0200\n" +"PO-Revision-Date: 2010-10-23 15:02+0200\n" "Last-Translator: <mg@lazybytes.net>\n" "Language-Team: Danish\n" "Language: \n" @@ -37,8 +37,16 @@ msgid "Commands" msgstr "Kommandoer" -msgid " options:" -msgstr " tilvalg:" +msgid "Extensions" +msgstr "Udvidelser" + +msgid "" +"This section contains help for extensions that is distributed together with " +"Mercurial. Help for other extensions is available in the help system." +msgstr "" + +msgid "options:" +msgstr "tilvalg:" #, python-format msgid " aliases: %s" @@ -83,7 +91,7 @@ msgid "" "Branch-based Access Control\n" -"---------------------------" +"..........................." msgstr "" msgid "" @@ -107,7 +115,7 @@ msgid "" "Path-based Access Control\n" -"-------------------------" +"........................." msgstr "" msgid "" @@ -119,7 +127,7 @@ msgid "" "Groups\n" -"------" +"......" msgstr "" msgid "" @@ -136,7 +144,7 @@ msgid "" "Example Configuration\n" -"---------------------" +"....................." msgstr "" msgid "::" @@ -327,7 +335,13 @@ " You can use :hg:`bookmark NAME` to set a bookmark on the working\n" " directory's parent revision with the given name. If you specify\n" " a revision using -r REV (where REV may be an existing bookmark),\n" -" the bookmark is assigned to that revision.\n" +" the bookmark is assigned to that revision." +msgstr "" + +msgid "" +" Bookmarks can be pushed and pulled between repositories (see :hg:`help\n" +" push` and :hg:`help pull`). This requires the bookmark extension to be\n" +" enabled for both the local and remote repositories.\n" " " msgstr "" @@ -409,6 +423,22 @@ msgid "compare bookmark" msgstr "sammenlign bogmærke" +msgid "bookmark takes one or no arguments" +msgstr "bookmark tager et eller to argumenter" + +msgid "the argument to bookmark must be a string" +msgstr "" + +msgid "" +"\n" +"Added by the bookmarks extension:" +msgstr "" + +msgid "" +"``bookmark([name])``\n" +" The named bookmark or all bookmarks.\n" +msgstr "" + msgid "force" msgstr "gennemtving" @@ -1190,7 +1220,7 @@ msgid "" " Mercurial Source\n" -" ----------------" +" ''''''''''''''''" msgstr "" msgid "" @@ -1207,7 +1237,7 @@ msgid "" " CVS Source\n" -" ----------" +" ''''''''''" msgstr "" msgid "" @@ -1264,7 +1294,7 @@ msgid "" " Subversion Source\n" -" -----------------" +" '''''''''''''''''" msgstr "" msgid "" @@ -1302,7 +1332,7 @@ msgid "" " Perforce Source\n" -" ---------------" +" '''''''''''''''" msgstr "" msgid "" @@ -1326,7 +1356,7 @@ msgid "" " Mercurial Destination\n" -" ---------------------" +" '''''''''''''''''''''" msgstr "" msgid "" @@ -1665,6 +1695,13 @@ msgid "Python ElementTree module is not available" msgstr "Python ElementTree modulet er ikke tilstede" +#, python-format +msgid "%s repository format is unsupported, please upgrade" +msgstr "" + +msgid "failed to detect repository format!" +msgstr "" + msgid "internal calling inconsistency" msgstr "intern kaldeinkonsistens" @@ -2205,12 +2242,14 @@ " order, use --switch-parent." msgstr "" -msgid "" -" See :hg:`help dates` for a list of formats valid for -d/--date.\n" +msgid " See :hg:`help dates` for a list of formats valid for -d/--date." +msgstr "" +" Se :hg:`help dates` for en liste af gyldige formater til -d/--date." + +msgid "" +" Returns 0 on success.\n" " " msgstr "" -" Se :hg:`help dates` for en liste af gyldige formater til -d/--date.\n" -" " msgid "" "working dir not at branch tip (use \"hg update\" to check out branch tip)" @@ -2321,6 +2360,13 @@ " Hvis der ikke angives en revision, så bruges forældren til\n" " arbejdskataloget, eller tip, hvis der ikke er hentet en revision." +msgid "" +" See :hg:`help dates` for a list of formats valid for -d/--date.\n" +" " +msgstr "" +" Se :hg:`help dates` for en liste af gyldige formater til -d/--date.\n" +" " + msgid "uncommitted merge - please provide a specific revision" msgstr "udeponeret sammenføjning - angiv venligst en specifik revision" @@ -2876,8 +2922,9 @@ msgstr "" msgid "" -"NOTE: the more specific you are in your filename patterns the less you\n" -"lose speed in huge repositories." +".. note::\n" +" The more specific you are in your filename patterns the less you\n" +" lose speed in huge repositories." msgstr "" msgid "" @@ -3537,6 +3584,9 @@ msgid "print the patches already applied" msgstr "udskriver rettelserne som allerede er anvendt" +msgid " Returns 0 on success." +msgstr "" + msgid "only one patch applied\n" msgstr "kun én rettelse er anvendt\n" @@ -3607,10 +3657,15 @@ msgid " To import an existing patch while renaming it::" msgstr "" -msgid "" -" hg qimport -e existing-patch -n new-name\n" +msgid " hg qimport -e existing-patch -n new-name" +msgstr "" + +msgid "" +" Returns 0 if import succeeded.\n" " " msgstr "" +" Returnerer 0 hvis importeringen lykkedes.\n" +" " msgid "init a new queue repository (DEPRECATED)" msgstr "opret et nyt kø-depot (FORÆLDET)" @@ -3653,9 +3708,15 @@ msgid "" " The patch directory must be a nested Mercurial repository, as\n" -" would be created by :hg:`init --mq`.\n" +" would be created by :hg:`init --mq`." +msgstr "" + +msgid "" +" Return 0 on success.\n" " " msgstr "" +" Returnerer 0 ved succes.\n" +" " msgid "versioned patch repository not found (see init --mq)" msgstr "versionsstyret rettelsesdepot blev ikke fundet (se init --mq)" @@ -3718,9 +3779,19 @@ " Use the -g/--git option to keep the patch in the git extended diff\n" " format. Read the diffs help topic for more information on why this\n" " is important for preserving permission changes and copy/rename\n" -" information.\n" +" information." +msgstr "" +" Brug -g/--git tilvalget for at generere ændringer i det udvidede\n" +" git diff-format. Se :hg:`help diffs` for mere information om\n" +" hvorfor dette er vigtigt for at bevare filrettigheder og\n" +" information om kopieringer og omdøbninger." + +msgid "" +" Returns 0 on successful creation of a new patch.\n" " " msgstr "" +" Returnerer 0 hvis patchen blev oprettet.\n" +" " msgid "update the current patch" msgstr "opdater den aktuelle patch" @@ -3753,14 +3824,12 @@ " hg add/remove/copy/rename work as usual, though you might want to\n" " use git-style patches (-g/--git or [diff] git=1) to track copies\n" " and renames. See the diffs help topic for more information on the\n" -" git diff format.\n" -" " +" git diff format." msgstr "" " hg add/remove/copy/rename virker som sædvanlig, dog vil du måske\n" " bruge git-patches (-g/--git eller [diff] git=1) for at følge\n" " kopier og omdøbninger. Se 'hg help diffs' for mere information om\n" -" git diff formatet.\n" -" " +" git diff formatet." msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" msgstr "tilvalg \"-e\" er inkompatibelt med \"-m\" eller \"-l\"" @@ -3783,14 +3852,12 @@ " Use :hg:`diff` if you only want to see the changes made since the\n" " last qrefresh, or :hg:`export qtip` if you want to see changes\n" " made by the current patch without including changes made since the\n" -" qrefresh.\n" -" " +" qrefresh." msgstr "" " Brug :hg:`diff` hvis du kun vil se ændringer lavet siden den\n" " sidste qrefresh, eller :hg:`export qtip` hvis du vil se ændringer\n" " lavet af den nuværende patch uden at inkludere ændringer lavet\n" -" siden qrefresh.\n" -" " +" siden qrefresh." msgid "fold the named patches into the current patch" msgstr "" @@ -3806,7 +3873,7 @@ msgid "" " The header for each folded patch will be concatenated with the\n" -" current patch header, separated by a line of '* * *'." +" current patch header, separated by a line of ``* * *``." msgstr "" msgid "qfold requires at least one patch name" @@ -3849,22 +3916,21 @@ msgid "" " With no arguments, print the currently active guards.\n" -" With arguments, set guards for the named patch.\n" -" NOTE: Specifying negative guards now requires '--'." -msgstr "" -" Uden argumenter vises de nuværende aktive filtre.\n" -" Med argumenter sættes filtre for den navngivne rettelse.\n" -" BEMÆRK: negative filtre skal nu specificeres med '--'." +" With arguments, set guards for the named patch." +msgstr "" +" Uden argumenter: vis de aktiverede filtre.\n" +" Med argumenter: sæt filtre for den navngivne patch." + +msgid "" +" .. note::\n" +" Specifying negative guards now requires '--'." +msgstr "" msgid " To set guards on another patch::" msgstr " For at sætte filtre på en anden rettelse::" -msgid "" -" hg qguard other.patch -- +2.6.17 -stable\n" -" " -msgstr "" -" hg qguard other.patch -- +2.6.17 -stable\n" -" " +msgid " hg qguard other.patch -- +2.6.17 -stable" +msgstr " hg qguard other.patch -- +2.6.17 -stable" msgid "cannot mix -l/--list with options or arguments" msgstr "kan ikke blande -l/--list med tilvalg eller argumenter" @@ -3884,11 +3950,16 @@ msgid "" " When -f/--force is applied, all local changes in patched files\n" -" will be lost.\n" -" " +" will be lost." msgstr "" " Når -f/--force er angivet, så vil alle lokale ændringer i de\n" -" rettede filer gå tabt.\n" +" rettede filer gå tabt." + +msgid "" +" Return 0 on succces.\n" +" " +msgstr "" +" Returnerer 0 ved succes.\n" " " msgid "no saved queues found, please use -n\n" @@ -3904,13 +3975,11 @@ msgid "" " By default, pops off the top of the patch stack. If given a patch\n" " name, keeps popping off patches until the named patch is at the\n" -" top of the stack.\n" -" " +" top of the stack." msgstr "" " Som standard fjernes toppen af stakken. Hvis der angives en\n" " rettelse, så vil der blive fjernet rettelser indtil den angivne\n" -" rettelse er på toppen af stakken.\n" -" " +" rettelse er på toppen af stakken." #, python-format msgid "using patch queue: %s\n" @@ -3937,8 +4006,8 @@ msgid "restore the queue state saved by a revision (DEPRECATED)" msgstr "" -msgid " This command is deprecated, use rebase --mq instead." -msgstr "" +msgid " This command is deprecated, use :hg:`rebase` instead." +msgstr " Denne kommando er forældet. Brug :hg:`rebase` i stedet." msgid "save current queue state (DEPRECATED)" msgstr "" @@ -3985,8 +4054,10 @@ msgid "" " Use the --no-backup option to discard the backup bundle once the\n" -" operation completes.\n" -" " +" operation completes." +msgstr "" + +msgid "empty revision set" msgstr "" msgid "set or print guarded patches to push" @@ -4115,8 +4186,7 @@ msgid "" " This can be especially useful if your changes have been applied to\n" " an upstream repository, or if you are about to push your changes\n" -" to upstream.\n" -" " +" to upstream." msgstr "" msgid "no revisions specified" @@ -4148,8 +4218,7 @@ msgid "" " To delete an existing queue, use --delete. You cannot delete the " "currently\n" -" active queue.\n" -" " +" active queue." msgstr "" msgid "patches applied - cannot set new queue active" @@ -4261,8 +4330,8 @@ msgid "stop managing a revision (DEPRECATED)" msgstr "" -msgid "hg qdelete [-k] [-r REV]... [PATCH]..." -msgstr "hg qdelete [-k] [-r REV]... [RETTELSE]..." +msgid "hg qdelete [-k] [PATCH]..." +msgstr "hg qdelete [-k] [RETTELSE]..." msgid "edit patch header" msgstr "rediger rettelsens hoved" @@ -4354,11 +4423,11 @@ msgid "forget any local changes to patched files" msgstr "glem eventuelle lokale ændringer i de rettede filer" -msgid "hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]" -msgstr "hg qpop [-a] [-n NAVN] [-f] [RETTELSE | INDEKS]" - -msgid "apply if the patch has rejects" -msgstr "" +msgid "hg qpop [-a] [-f] [PATCH | INDEX]" +msgstr "hg qpop [-a] [-f] [RETTELSE | INDEKS]" + +msgid "apply on top of local changes" +msgstr "anvend ovenpå lokale ændringer" msgid "list patch name in commit text" msgstr "" @@ -4375,8 +4444,8 @@ msgid "reorder patch series and apply only the patch" msgstr "" -msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [--move] [PATCH | INDEX]" -msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NAVN] [--move] [RETTELSE | INDEKS]" +msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]" +msgstr "hg qpush [-f] [-l] [-a] [--move] [RETTELSE | INDEKS]" msgid "refresh only files already in the patch and specified files" msgstr "genopfrisk kun filer som allerede findes i rettelsen og angivne filer" @@ -4460,8 +4529,11 @@ msgid "no backups (DEPRECATED)" msgstr "ingen backupper (FORÆLDET)" -msgid "hg strip [-f] [-n] REV..." -msgstr "hg strip [-f] [-n] REV..." +msgid "do not modify working copy during strip" +msgstr "" + +msgid "hg strip [-k] [-f] [-n] REV..." +msgstr "hg strip [-k] [-f] [-n] REV..." msgid "hg qtop [-s]" msgstr "hg qtop [-s]" @@ -4632,6 +4704,18 @@ msgstr "" msgid "" +"By default, the pager is only executed if a command has output. To\n" +"force the pager to run even if a command prints nothing, set::" +msgstr "" + +msgid "" +" [pager]\n" +" force = True" +msgstr "" +" [pager]\n" +" force = True" + +msgid "" "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" "setting::" msgstr "" @@ -4675,8 +4759,17 @@ msgid "" "To ignore global commands like :hg:`version` or :hg:`help`, you have\n" -"to specify them in your user configuration file.\n" -msgstr "" +"to specify them in your user configuration file." +msgstr "" + +msgid "" +"The --pager=... option can also be used to control when the pager is\n" +"used. Use a boolean value like yes, no, on, off, or use auto for\n" +"normal behavior.\n" +msgstr "" + +msgid "when to paginate (boolean, always, auto, or never)" +msgstr "hvornår der skal farvelægges (boolks værdi, \"always\", \"auto\" eller \"never\")" msgid "interpret suffixes to refer to ancestor revisions" msgstr "fortolk suffikser for at referere til forfader-revisioner" @@ -4742,12 +4835,6 @@ msgstr "" msgid "" -"With the -d/--diffstat or -c/--confirm options, you will be presented\n" -"with a final summary of all messages and asked for confirmation before\n" -"the messages are sent." -msgstr "" - -msgid "" "To configure other defaults, add a section like this to your hgrc\n" "file::" msgstr "" @@ -4772,39 +4859,6 @@ msgstr "" msgid "" -"To avoid sending patches prematurely, it is a good idea to first run\n" -"the :hg:`email` command with the \"-n\" option (test only). You will be\n" -"prompted for an email recipient address, a subject and an introductory\n" -"message describing the patches of your patchbomb. Then when all is\n" -"done, patchbomb messages are displayed. If the PAGER environment\n" -"variable is set, your pager will be fired up once for each patchbomb\n" -"message, so you can verify everything is alright." -msgstr "" - -msgid "" -"The -m/--mbox option is also very useful. Instead of previewing each\n" -"patchbomb message in a pager or sending the messages directly, it will\n" -"create a UNIX mailbox file with the patch emails. This mailbox file\n" -"can be previewed with any mail user agent which supports UNIX mbox\n" -"files, e.g. with mutt::" -msgstr "" - -msgid " % mutt -R -f mbox" -msgstr "" - -msgid "" -"When you are previewing the patchbomb messages, you can use ``formail``\n" -"(a utility that is commonly installed as part of the procmail\n" -"package), to send each message out::" -msgstr "" - -msgid " % formail -s sendmail -bm -t < mbox" -msgstr " % formail -s sendmail -bm -t < mbox" - -msgid "That should be all. Now your patchbomb is on its way out." -msgstr "" - -msgid "" "You can also either configure the method option in the email section\n" "to be a sendmail compatible mailer or fill out the [smtp] section so\n" "that the patchbomb extension can automatically send patchbombs\n" @@ -4832,10 +4886,21 @@ " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" " the first line of the changeset description as the subject text.\n" " The message contains two or three parts. First, the changeset\n" -" description. Next, (optionally) if the diffstat program is\n" -" installed and -d/--diffstat is used, the result of running\n" -" diffstat on the patch. Finally, the patch itself, as generated by\n" -" :hg:`export`." +" description." +msgstr "" + +msgid "" +" With the -d/--diffstat option, if the diffstat program is\n" +" installed, the result of running diffstat on the patch is inserted." +msgstr "" + +msgid " Finally, the patch itself, as generated by :hg:`export`." +msgstr "" + +msgid "" +" With the -d/--diffstat or -c/--confirm options, you will be presented\n" +" with a final summary of all messages and asked for confirmation before\n" +" the messages are sent." msgstr "" msgid "" @@ -4858,6 +4923,23 @@ msgstr "" msgid "" +" With -m/--mbox, instead of previewing each patchbomb message in a\n" +" pager or sending the messages directly, it will create a UNIX\n" +" mailbox file with the patch emails. This mailbox file can be\n" +" previewed with any mail user agent which supports UNIX mbox\n" +" files." +msgstr "" + +msgid "" +" With -n/--test, all steps will run, but mail will not be sent.\n" +" You will be prompted for an email recipient address, a subject and\n" +" an introductory message describing the patches of your patchbomb.\n" +" Then when all is done, patchbomb messages are displayed. If the\n" +" PAGER environment variable is set, your pager will be fired up once\n" +" for each patchbomb message, so you can verify everything is alright." +msgstr "" + +msgid "" " hg email -r 3000 # send patch 3000 only\n" " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" " hg email -r 3000:3005 # send patches 3000 through 3005\n" @@ -4880,6 +4962,15 @@ msgstr "" msgid "" +" hg email -o -m mbox && # generate an mbox file...\n" +" mutt -R -f mbox # ... and view it with mutt\n" +" hg email -o -m mbox && # generate an mbox file ...\n" +" formail -s sendmail \\ # ... and use formail to send from the " +"mbox\n" +" -bm -t < mbox # ... using sendmail" +msgstr "" + +msgid "" " Before using this command, you will need to enable email in your\n" " hgrc. See the [email] section in hgrc(5) for details.\n" " " @@ -5237,8 +5328,8 @@ msgid "rebasing" msgstr "" -msgid " changesets" -msgstr " ændringer" +msgid "changesets" +msgstr "ændringer" msgid "fix unresolved conflicts with hg resolve then run hg rebase --continue" msgstr "ret uløste konflikter med hg resolve og kør så hg rebase --continue" @@ -5392,10 +5483,6 @@ " Hvis en liste af filer er udeladt, så vil alle ændringer\n" " rapporteret af :hg:`status` være kandidater til at blive optaget." -msgid " See :hg:`help dates` for a list of formats valid for -d/--date." -msgstr "" -" Se :hg:`help dates` for en liste af gyldige formater til -d/--date." - msgid "" " You will be prompted for whether to record changes to each\n" " modified file, and for files with multiple changes, for each\n" @@ -5447,9 +5534,6 @@ msgid "no changes to record\n" msgstr "ingen ændringer at optage\n" -msgid "patch failed to apply" -msgstr "rettelse kunne ikke tilføjes" - msgid "hg record [OPTION]... [FILE]..." msgstr "hg record [TILVALG]... [FIL]..." @@ -5525,9 +5609,6 @@ msgid "not linkable: %s\n" msgstr "kan ikke sammenkædes: %s\n" -msgid " files" -msgstr " filer" - msgid "pruning" msgstr "beskærer" @@ -5621,15 +5702,16 @@ msgstr "" msgid "" -" NOTE: using rollback or extensions that destroy/modify history\n" -" (mq, rebase, etc.) can cause considerable confusion with shared\n" -" clones. In particular, if two shared clones are both updated to\n" -" the same changeset, and one of them destroys that changeset with\n" -" rollback, the other clone will suddenly stop working: all\n" -" operations will fail with \"abort: working directory has unknown\n" -" parent\". The only known workaround is to use debugsetparents on\n" -" the broken clone to reset it to a changeset that still exists\n" -" (e.g. tip).\n" +" .. note::\n" +" using rollback or extensions that destroy/modify history (mq,\n" +" rebase, etc.) can cause considerable confusion with shared\n" +" clones. In particular, if two shared clones are both updated to\n" +" the same changeset, and one of them destroys that changeset\n" +" with rollback, the other clone will suddenly stop working: all\n" +" operations will fail with \"abort: working directory has unknown\n" +" parent\". The only known workaround is to use debugsetparents on\n" +" the broken clone to reset it to a changeset that still exists\n" +" (e.g. tip).\n" " " msgstr "" @@ -5786,6 +5868,19 @@ msgid "outstanding local changes" msgstr "udestående lokale ændringer" +msgid "" +"\n" +"Added by the transplant extension:" +msgstr "" + +msgid "" +"``transplanted(set)``\n" +" Transplanted changesets in set.\n" +msgstr "" + +msgid "Specifying Revision Sets" +msgstr "Angivning af af mængder af revisioner" + msgid "pull patches from REPO" msgstr "hiv rettelser fra DEPOT" @@ -6080,9 +6175,6 @@ msgid "limit must be positive" msgstr "grænsen skal være positiv" -msgid "too many revisions specified" -msgstr "der er specificeret for mange revisioner" - #, python-format msgid "invalid format spec '%%%s' in output filename" msgstr "ugyldig formatspecifikation '%%%s' i output filnavn" @@ -6408,11 +6500,6 @@ " annotering alligevel, selvom resultatet sandsynligvis vil være\n" " hverken brugbart eller ønskværdigt." -msgid "" -" Returns 0 on success.\n" -" " -msgstr "" - msgid "at least one filename or pattern is required" msgstr "kræver mindst et filnavn eller mønster" @@ -6473,33 +6560,38 @@ msgstr "omgør effekten af tidligere ændringer" msgid "" -" Commit the backed out changes as a new changeset. The new\n" -" changeset is a child of the backed out changeset." -msgstr "" -" Deponerer de omgjorte ændringer som en ny ændring. Den nye ændring\n" -" er et barn af den omgjorte ændring." - -msgid "" -" If you backout a changeset other than the tip, a new head is\n" -" created. This head will be the new tip and you should merge this\n" -" backout changeset with another head." -msgstr "" -" Hvis du omgør en ændring som ikke er spidsen, så vil et der blive\n" -" lavet et nyt hoved. Dette hoved vil være den nye spids og du bør\n" -" sammenføje denne omgjorte ændring med et andet hoved (det\n" -" nuværende hoved som standard)." - -msgid "" +" The backout command merges the reverse effect of the reverted\n" +" changeset into the working directory." +msgstr "" + +msgid "" +" With the --merge option, it first commits the reverted changes\n" +" as a new changeset. This new changeset is a child of the reverted\n" +" changeset.\n" " The --merge option remembers the parent of the working directory\n" " before starting the backout, then merges the new head with that\n" -" changeset afterwards. This saves you from doing the merge by hand.\n" -" The result of this merge is not committed, as with a normal merge." -msgstr "" -" Med --merge tilvalget vil forælderen til arbejdskataloget blive\n" -" husket og det nye hoved vil blive sammenføjet med denne ændring\n" -" bagefter. Dette sparer dig for at lave sammenføjningen selv.\n" -" Resultatet af denne sammenføjning er ikke lagt i depot, som ved en\n" -" normal sammenføjning." +" changeset afterwards.\n" +" This will result in an explicit merge in the history." +msgstr "" +" Med --merge tilvalget bliver de omgjorte ændringer først deponeret\n" +" som en ny ændring. Denne nye ændring vil være et barn af den\n" +" omgjorte ændring. Derefter bliver det nye hoved sammenføjet med\n" +" arbejdskatalogets forælderrevision. Derved skabes der en eksplicit\n" +" sammenføjning i historien." + +msgid "" +" If you backout a changeset other than the original parent of the\n" +" working directory, the result of this merge is not committed,\n" +" as with a normal merge. Otherwise, no merge is needed and the\n" +" commit is automatic." +msgstr "" + +msgid "" +" Note that the default behavior (without --merge) has changed in\n" +" version 1.7. To restore the previous default behavior, use\n" +" :hg:`backout --merge` and then :hg:`update --clean .` to get rid of\n" +" the ongoing merge." +msgstr "" msgid "please specify just one revision" msgstr "angiv venligst kun en revision" @@ -6531,12 +6623,6 @@ msgid "merging with changeset %s\n" msgstr "sammenføjer med ændring %s\n" -msgid "the backout changeset is a new head - do not forget to merge\n" -msgstr "" - -msgid "(use \"backout --merge\" if you want to auto-merge)\n" -msgstr "(brug \"backout --merge\" hvis du vil sammenføje automatisk)\n" - msgid "subdivision search of changesets" msgstr "" @@ -7283,14 +7369,15 @@ msgstr " Ændringerne mellem filerne vises i unified diff-formatet." msgid "" -" NOTE: diff may generate unexpected results for merges, as it will\n" -" default to comparing against the working directory's first parent\n" -" changeset if no revisions are specified." -msgstr "" -" BEMÆRK: diff kan generere overraskende resultater for\n" -" sammenføjninger, idet den som udgangspunkt vil sammenligne med\n" -" arbejdskatalogets første forælder, hvis der ikke angivet en\n" -" revision." +" .. note::\n" +" diff may generate unexpected results for merges, as it will\n" +" default to comparing against the working directory's first\n" +" parent changeset if no revisions are specified." +msgstr "" +" .. note::\n" +" diff kan generere overraskende resultater for sammenføjninger,\n" +" idet den som udgangspunkt vil sammenligne med arbejdskatalogets\n" +" første forælder, hvis der ikke angivet en revision." msgid "" " Alternatively you can specify -c/--change with a revision to see\n" @@ -7333,13 +7420,15 @@ " og deponeringsbeskeden." msgid "" -" NOTE: export may generate unexpected diff output for merge\n" -" changesets, as it will compare the merge changeset against its\n" -" first parent only." -msgstr "" -" BEMÆRK: export kan generere uventet diff uddata for\n" -" sammenføjningsændringer idet den kun vil sammenligne\n" -" sammenføjningsændringen med dennes første forælder." +" .. note::\n" +" export may generate unexpected diff output for merge\n" +" changesets, as it will compare the merge changeset against its\n" +" first parent only." +msgstr "" +" .. note::\n" +" export kan generere uventet diff uddata for\n" +" sammenføjningsændringer idet den kun vil sammenligne\n" +" sammenføjningsændringen med dennes første forælder." msgid "" " Output may be to a file, in which case the name of the file is\n" @@ -7837,15 +7926,17 @@ " listen af ændrede filer og den fulde deponeringsbesked." msgid "" -" NOTE: log -p/--patch may generate unexpected diff output for merge\n" -" changesets, as it will only compare the merge changeset against\n" -" its first parent. Also, only files different from BOTH parents\n" -" will appear in files:." -msgstr "" -" BEMÆRK: log -p/--patch kan generere uventet diff output for\n" -" sammenføjningsændringer idet den kun sammenligner ændringen med\n" -" dennes første forælder. Ydermere vises kun filer som er\n" -" forskellige fra BEGGE forældre i files:." +" .. note::\n" +" log -p/--patch may generate unexpected diff output for merge\n" +" changesets, as it will only compare the merge changeset against\n" +" its first parent. Also, only files different from BOTH parents\n" +" will appear in files:." +msgstr "" +" .. note::\n" +" log -p/--patch kan generere uventet diff output for\n" +" sammenføjningsændringer idet den kun sammenligner ændringen med\n" +" dennes første forælder. Ydermere vises kun filer som er\n" +" forskellige fra BEGGE forældre i files:." msgid "output the current or given revision of the project manifest" msgstr "" @@ -7883,6 +7974,12 @@ " næste deponerede ændring får to forældre." msgid "" +" ``--tool`` can be used to specify the merge tool used for file\n" +" merges. It overrides the HGMERGE environment variable and your\n" +" configuration files." +msgstr "" + +msgid "" " If no revision is specified, the working directory's parent is a\n" " head revision, and the current branch contains exactly one other\n" " head, the other head is merged with by default. Otherwise, an\n" @@ -7893,6 +7990,9 @@ " hoved, så sammenføjes der med dette hoved som standard. Ellers\n" " skal en eksplicit revision angives." +msgid " :hg:`resolve` must be used to resolve unresolved files." +msgstr " :hg:`resolve` skal bruges for at prøve at sammenføje uløste filer igen" + msgid "" " To undo an uncommitted merge, use :hg:`update --clean .` which\n" " will check out a clean copy of the original merge parent, losing\n" @@ -8249,10 +8349,12 @@ msgstr "" msgid "" -" - :hg:`resolve FILE...`: attempt to re-merge the specified files,\n" -" discarding any previous merge attempts. Re-merging is not\n" +" - :hg:`resolve [--tool] FILE...`: attempt to re-merge the specified\n" +" files, discarding any previous merge attempts. Re-merging is not\n" " performed for files already marked as resolved. Use ``--all/-a``\n" -" to selects all unresolved files." +" to selects all unresolved files. ``--tool`` can be used to specify\n" +" the merge tool used for the given files. It overrides the HGMERGE\n" +" environment variable and your configuration files." msgstr "" msgid "" @@ -8297,13 +8399,13 @@ msgstr "" msgid "" -" NOTE: This command is most likely not what you are looking for. revert\n" -" will partially overwrite content in the working directory without " -"changing\n" -" the working directory parents. Use :hg:`update -r rev` to check out " -"earlier\n" -" revisions, or :hg:`update --clean .` to undo a merge which has added\n" -" another parent." +" .. note::\n" +" This command is most likely not what you are looking for.\n" +" Revert will partially overwrite content in the working\n" +" directory without changing the working directory parents. Use\n" +" :hg:`update -r rev` to check out earlier revisions, or\n" +" :hg:`update --clean .` to undo a merge which has added another\n" +" parent." msgstr "" msgid "" @@ -8493,16 +8595,18 @@ " -u/--unknown eller -i/--ignored." msgid "" -" NOTE: status may appear to disagree with diff if permissions have\n" -" changed or a merge has occurred. The standard diff format does not\n" -" report permission changes and diff only reports changes relative\n" -" to one merge parent." -msgstr "" -" BEMÆRK: status kan tilsyneladende være forskellig fra diff hvis\n" -" rettigheder er blevet ændret eller hvis en sammenføjning har\n" -" fundet sted. Det normale diff-format rapporterer ikke ændringer i\n" -" rettigheder og diff rapporterer kun ænringer relativt til en\n" -" sammenføjningsforældre." +" .. note::\n" +" status may appear to disagree with diff if permissions have\n" +" changed or a merge has occurred. The standard diff format does\n" +" not report permission changes and diff only reports changes\n" +" relative to one merge parent." +msgstr "" +" .. note::\n" +" status kan tilsyneladende være forskellig fra diff hvis\n" +" rettigheder er blevet ændret eller hvis en sammenføjning har\n" +" fundet sted. Det normale diff-format rapporterer ikke ændringer\n" +" i rettigheder og diff rapporterer kun ænringer relativt til en\n" +" sammenføjningsforældre." msgid "" " If one revision is given, it is used as the base revision.\n" @@ -8747,18 +8851,20 @@ msgid "" " Update the repository's working directory to the specified\n" +" changeset. If no changeset is specified, update to the tip of the\n" +" current named branch." +msgstr "" +" Opdater depotets arbejdskatalog til den angivne ændring. Hvis der\n" +" ikke angives en ændring, da opdateres til spidsen af den nuværende\n" +" gren." + +msgid "" +" If the changeset is not a descendant of the working directory's\n" +" parent, the update is aborted. With the -c/--check option, the\n" +" working directory is checked for uncommitted changes; if none are\n" +" found, the working directory is updated to the specified\n" " changeset." -msgstr " Opdater depotets arbejdskatalog til den angivne ændring." - -msgid "" -" If no changeset is specified, attempt to update to the tip of the\n" -" current branch. If this changeset is a descendant of the working\n" -" directory's parent, update to it, otherwise abort." -msgstr "" -" Hvis der ikke er angivet nogen ændring, forsøg da at opdatere til\n" -" spidsen af den nuværende gren. Hvis denne ændring nedstammer fra\n" -" arbejdskatalogets forælder, da opdateres der til det, ellers\n" -" afbrydes der." +msgstr "" msgid "" " The following rules apply when the working directory contains\n" @@ -8808,8 +8914,8 @@ " :hg:`clone -U`)." msgid "" -" If you want to update just one file to an older changeset, use :hg:" -"`revert`." +" If you want to update just one file to an older changeset, use\n" +" :hg:`revert`." msgstr "" " Hvis du vil opdatere blot en enkelt fil til en ældre revision,\n" " brug da :hg:`revert`." @@ -9273,8 +9379,11 @@ msgid "[OPTION]... PATTERN [FILE]..." msgstr "[TILVALG]... MØNSTER [FIL]..." -msgid "show only heads which are descendants of REV" -msgstr "vis kun hoveder som er efterkommere af REV" +msgid "show only heads which are descendants of STARTREV" +msgstr "vis kun hoveder som er efterkommere af STARTREV" + +msgid "STARTREV" +msgstr "STARTREV" msgid "show topological heads only" msgstr "" @@ -9285,8 +9394,8 @@ msgid "show normal and closed branch heads" msgstr "vis normale og lukkede grenhoveder" -msgid "[-ac] [-r REV] [REV]..." -msgstr "[-ac] [-r REV] [REV]..." +msgid "[-ac] [-r STARTREV] [REV]..." +msgstr "[-ac] [-r STARTREV] [REV]..." msgid "[TOPIC]" msgstr "[EMNE]" @@ -9410,6 +9519,9 @@ msgid "force a merge with outstanding changes" msgstr "" +msgid "specify merge tool" +msgstr "angiv sammenføjningsværktøj" + msgid "revision to merge" msgstr "revision der skal sammenføjes" @@ -9521,8 +9633,8 @@ msgid "name to show in web pages (default: working directory)" msgstr "navn der skal vises på websider (standard: arbejdskatalog)" -msgid "name of the hgweb config file (serve more than one repository)" -msgstr "navn på hgweb konfigurationsfil (serve mere end et depot)" +msgid "name of the hgweb config file (see \"hg help hgweb\")" +msgstr "navn på hgweb konfigurationsfil (se \"hg help hgweb\")" msgid "name of the hgweb config file (DEPRECATED)" msgstr "navn på hgweb konfigurationsfilen (FORÆLDET)" @@ -9614,8 +9726,8 @@ msgid "discard uncommitted changes (no backup)" msgstr "kasser ikke-deponerede ændringer (ingen sikkerhedskopi)" -msgid "check for uncommitted changes" -msgstr "kontroller for udeponerede ændringer" +msgid "update across branches if no uncommitted changes" +msgstr "opdater på tværs af grene hvis der er ingen udeponerede ændringer" msgid "[-c] [-C] [-d DATE] [[-r] REV]" msgstr "[-c] [-C] [-d DATO] [[-r] REV]" @@ -10050,12 +10162,12 @@ msgid "Specifying Multiple Revisions" msgstr "Angivning af flere revisioner" -msgid "Specifying Revision Sets" -msgstr "Angivning af af mængder af revisioner" - msgid "Diff Formats" msgstr "" +msgid "Merge Tools" +msgstr "" + msgid "Template Usage" msgstr "Brug af skabeloner" @@ -11087,6 +11199,128 @@ "``bar`` and ``quux/baz`` respectively.\n" msgstr "" +msgid "To merge files Mercurial uses merge tools." +msgstr "" + +msgid "" +"A merge tool combines two different versions of a file into a merged\n" +"file. Merge tools are given the two files and the greatest common\n" +"ancestor of the two file versions, so they can determine the changes\n" +"made on both branches." +msgstr "" + +msgid "The merge tools are used both for :hg:`resolve` and :hg:`merge`." +msgstr "" + +msgid "" +"Usually, the merge tool tries to automatically, by combining all the\n" +"non-overlapping changes that occurred separately in the two different\n" +"evolutions of the same initial base file. Furthermore, some\n" +"interactive merge programs make it easier to manually resolve\n" +"conflicting merges, either in a graphical way, or by inserting some\n" +"conflict markers. Mercurial does not include any interactive merge\n" +"programs but relies on external tools for that. External merge tools\n" +"and their properties and usage is configured in merge-tools section -\n" +"see hgrc(5)." +msgstr "" + +msgid "" +"There are a some internal merge tools which can be used. The internal\n" +"merge tools are:" +msgstr "" + +msgid "" +"``internal:merge``\n" +" Uses the internal non-interactive merge tool for merging files." +msgstr "" + +msgid "" +"``internal:fail``\n" +" Rather than attempting to merge files that were modified on both\n" +" branches, it marks these files as unresolved. Then the resolve\n" +" command must be used to mark files resolved." +msgstr "" + +msgid "" +"``internal:local``\n" +" Uses the local version of files as the merged version." +msgstr "" + +msgid "" +"``internal:other``\n" +" Uses the remote version of files as the merged version." +msgstr "" + +msgid "" +"``internal:prompt``\n" +" Asks the user which of the local or the other version to keep as\n" +" the merged version." +msgstr "" + +msgid "" +"``internal:dump``\n" +" Creates three versions of the files to merge, containing the\n" +" contents of local, other and base. These files can then be used to\n" +" perform a merge manually. If the file merged is name ``a.txt``,\n" +" these files will accordingly be named ``a.txt.local``,\n" +" ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n" +" same directory as the file to merge." +msgstr "" + +msgid "How Mercurial decides which merge program to use" +msgstr "" + +msgid "" +"1. If the ``HGMERGE`` environment variable is present, it is used. If\n" +" specified it must be either an executable path or the name of an\n" +" application in your executable search path." +msgstr "" + +msgid "" +"2. If the filename of the file to be merged matches any of the\n" +" patterns in the merge-patterns configuration section, then the\n" +" corresponding merge tool is used, unless the file to be merged is a\n" +" symlink. Here binary capabilities of the merge tool are not\n" +" considered." +msgstr "" + +msgid "3. If ui.merge is set, it is used." +msgstr "" + +msgid "" +"4. If any merge tools are present in the merge-tools configuration\n" +" section, and any of the tools can be found on the system, the\n" +" priority settings are used to determine which one to use. Binary,\n" +" symlink and GUI capabilities do also have to match." +msgstr "" + +msgid "5. If a program named ``hgmerge`` exists on the system, it is used." +msgstr "" + +msgid "" +"6. If the file to be merged is not binary and is not a symlink, then\n" +" ``internal:merge`` is used." +msgstr "" + +msgid "7. The merge fails." +msgstr "" + +msgid "" +".. note::\n" +" After selecting a merge program, Mercurial will by default attempt\n" +" to merge the files using a simple merge algorithm first, to see if\n" +" they can be merged without conflicts. Only if there are conflicting\n" +" changes Mercurial will actually execute the merge program. Whether\n" +" to use the simple merge algorithm first can be controlled be the\n" +" premerge setting of the merge tool, which is enabled by default\n" +" unless the file is binary or symlink." +msgstr "" + +msgid "" +"See the merge-tools and ui sections of hgrc(5) for details on\n" +"configuration of merge tools.\n" +msgstr "" + msgid "" "When Mercurial accepts more than one revision, they may be specified\n" "individually, or provided as a topologically continuous range,\n" @@ -11243,8 +11477,13 @@ "Identifiers such as branch names must be quoted with single or double\n" "quotes if they contain characters outside of\n" "``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n" -"predicates. Special characters can be used in quoted identifiers by\n" -"escaping them, e.g., ``\\n`` is interpreted as a newline." +"predicates." +msgstr "" + +msgid "" +"Special characters can be used in quoted identifiers by escaping them,\n" +"e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n" +"interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``." msgstr "" msgid "There is a single prefix operator:" @@ -11362,12 +11601,13 @@ msgid "" "``grep(regex)``\n" -" Like ``keyword(string)`` but accepts a regex." +" Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``\n" +" to ensure special escape characters are handled correctly." msgstr "" msgid "" "``head()``\n" -" Changeset is a head." +" Changeset is a named branch head." msgstr "" msgid "" @@ -11376,6 +11616,11 @@ msgstr "" msgid "" +"``id(string)``\n" +" Revision non-ambiguously specified by the given hex string prefix" +msgstr "" + +msgid "" "``keyword(string)``\n" " Search commit message, user name, and names of changed files for\n" " string." @@ -11439,6 +11684,11 @@ msgstr "" msgid "" +"``rev(number)``\n" +" Revision with the given numeric identifier." +msgstr "" + +msgid "" "``reverse(set)``\n" " Reverse order of set." msgstr "" @@ -11466,8 +11716,8 @@ msgstr "" msgid "" -"``tagged()``\n" -" Changeset is tagged." +"``tag(name)``\n" +" The specified tag by name, or all tagged revisions if no name is given." msgstr "" msgid "" @@ -11497,21 +11747,50 @@ " -P x -> !::x\n" " -l x -> limit(expr, x)" -msgid "Some sample queries::" -msgstr "" - -msgid "" -" hg log -r 'branch(default)'\n" -" hg log -r 'branch(default) and 1.5:: and not merge()'\n" -" hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n" -" hg log -r 'sort(date(\"May 2008\"), user)'\n" -" hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n" -msgstr "" -" hg log -r 'branch(default)'\n" -" hg log -r 'branch(default) and 1.5:: and not merge()'\n" -" hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n" -" hg log -r 'sort(date(\"May 2008\"), user)'\n" -" hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n" +msgid "Some sample queries:" +msgstr "" + +msgid "- Changesets on the default branch::" +msgstr "- Ændringer på default grenen::" + +msgid " hg log -r 'branch(default)'" +msgstr " hg log -r 'branch(default)'" + +msgid "- Changesets on the default branch since tag 1.5 (excluding merges)::" +msgstr "" + +msgid " hg log -r 'branch(default) and 1.5:: and not merge()'" +msgstr " hg log -r 'branch(default) and 1.5:: and not merge()'" + +msgid "- Open branch heads::" +msgstr "- Åbne grenhoveder::" + +msgid " hg log -r 'head() and not closed()'" +msgstr " hg log -r 'head() and not closed()'" + +msgid "" +"- Changesets between tags 1.3 and 1.5 mentioning \"bug\" that affect\n" +" ``hgext/*``::" +msgstr "" + +msgid " hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'" +msgstr " hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'" + +msgid "- Changesets in committed May 2008, sorted by user::" +msgstr "" + +msgid " hg log -r 'sort(date(\"May 2008\"), user)'" +msgstr " hg log -r 'sort(date(\"May 2008\"), user)'" + +msgid "" +"- Changesets mentioning \"bug\" or \"issue\" that are not in a tagged\n" +" release::" +msgstr "" + +msgid "" +" hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged" +"())'\n" +msgstr " hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n" msgid "" "Mercurial allows you to customize output of commands through\n" @@ -11684,6 +11963,11 @@ " and \">\" with XML entities." msgstr "" +msgid "" +":hex: Any text. Convert a binary Mercurial node identifier into\n" +" its long hexadecimal representation." +msgstr "" + msgid ":fill68: Any text. Wraps the text to fit in 68 columns." msgstr "" @@ -11796,6 +12080,11 @@ "server." msgstr "" +msgid "" +"Note that the security of HTTPS URLs depends on proper configuration of\n" +"web.cacerts." +msgstr "" + msgid "Some notes about using SSH with Mercurial:" msgstr "" @@ -12199,9 +12488,6 @@ msgid "adding changesets\n" msgstr "tilføjer ændringer\n" -msgid "changesets" -msgstr "ændringer" - msgid "received changelog group is empty" msgstr "modtagen changelog-gruppe er tom" @@ -12372,7 +12658,7 @@ msgstr "henter %s til %s\n" #, python-format -msgid "warning: detected divergent renames of %s to:\n" +msgid "note: possible conflict - %s was renamed multiple times to:\n" msgstr "" #, python-format @@ -12389,15 +12675,38 @@ msgstr "" "udestående ikke-deponerede ændringer (brug 'hg status' for at se ændringer)" -msgid "" -"crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard " -"changes)" -msgstr "" -"krydser grene (brug 'hg merge' for at sammenføje eller 'hg update -C' for at " -"kassere ændringerne)" - -msgid "crosses branches (use 'hg merge' or use 'hg update -c')" -msgstr "krydser grene (brug 'hg merge' eller 'hg update -c')" +msgid "crosses branches (merge branches or use --clean to discard changes)" +msgstr "krydser grene (sammenføj grenene eller brug --clean for at kassere ændringerne)" + +msgid "crosses branches (merge branches or use --check to force update)" +msgstr "krydser grene (sammenføj grenene eller brug --check for at forcere opdateringen)" + +msgid "Attention:" +msgstr "" + +msgid "Caution:" +msgstr "Forsigtig:" + +msgid "!Danger!" +msgstr "!Fare!" + +msgid "Error:" +msgstr "Fejl:" + +msgid "Hint:" +msgstr "" + +msgid "Important:" +msgstr "Vigtigt:" + +msgid "Note:" +msgstr "Bemærk:" + +msgid "Tip:" +msgstr "Tip:" + +msgid "Warning!" +msgstr "Advarsel!" #, python-format msgid "cannot create %s: destination already exists" @@ -12477,14 +12786,8 @@ msgid "unsupported line endings type: %s" msgstr "linieendelse %s understøttes ikke" -msgid "" -"internal patcher failed\n" -"please report details to http://mercurial.selenic.com/bts/\n" -"or mercurial@selenic.com\n" -msgstr "" -"intern lappe-funktionalitet fejlede\n" -"angiv venligst fejldetaljer på http://mercurial.selenic.com/bts/\n" -"eller mercurial@selenic.com\n" +msgid "patch failed to apply" +msgstr "rettelse kunne ikke tilføjes" #, python-format msgid " %d files changed, %d insertions(+), %d deletions(-)\n" @@ -12557,12 +12860,12 @@ msgid "%s not found in the transaction" msgstr "%s ikke fundet i transaktionen" +msgid "consistency error in delta" +msgstr "konsistensfejl i delta" + msgid "unknown base" msgstr "" -msgid "consistency error adding group" -msgstr "konsistensfejl ved tilføjelse af gruppe" - msgid "unterminated string" msgstr "" @@ -12583,16 +12886,31 @@ msgid "not a function: %s" msgstr "ikke en funktion: %s" -msgid "limit wants two arguments" -msgstr "" - -msgid "limit wants a number" -msgstr "" +msgid "id requires one argument" +msgstr "id kræver et argument" + +msgid "id requires a string" +msgstr "" + +msgid "rev requires one argument" +msgstr "" + +msgid "rev requires a number" +msgstr "" + +msgid "rev expects a number" +msgstr "rev forventer et revisionsnummer" + +msgid "limit requires two arguments" +msgstr "limit kræver to argumenter" + +msgid "limit requires a number" +msgstr "limit kræver et tal" msgid "limit expects a number" msgstr "" -msgid "ancestor wants two arguments" +msgid "ancestor requires two arguments" msgstr "" msgid "ancestor arguments must be single revisions" @@ -12601,31 +12919,35 @@ msgid "follow takes no arguments" msgstr "" -msgid "date wants a string" -msgstr "" - -msgid "keyword wants a string" -msgstr "" - -msgid "grep wants a string" -msgstr "" - -msgid "author wants a string" -msgstr "" - -msgid "file wants a pattern" -msgstr "" - -msgid "contains wants a pattern" -msgstr "" - -msgid "modifies wants a pattern" -msgstr "" - -msgid "adds wants a pattern" -msgstr "" - -msgid "removes wants a pattern" +msgid "date requires a string" +msgstr "" + +msgid "keyword requires a string" +msgstr "" + +msgid "grep requires a string" +msgstr "" + +#, python-format +msgid "invalid match pattern: %s" +msgstr "ugyldigt søgemønster: %s" + +msgid "author requires a string" +msgstr "" + +msgid "file requires a pattern" +msgstr "" + +msgid "contains requires a pattern" +msgstr "" + +msgid "modifies requires a pattern" +msgstr "" + +msgid "adds requires a pattern" +msgstr "" + +msgid "removes requires a pattern" msgstr "" msgid "merge takes no arguments" @@ -12637,7 +12959,7 @@ msgid "head takes no arguments" msgstr "" -msgid "sort wants one or two arguments" +msgid "sort requires one or two arguments" msgstr "" msgid "sort spec must be a string" @@ -12650,10 +12972,13 @@ msgid "all takes no arguments" msgstr "" -msgid "outgoing wants a repository path" -msgstr "" - -msgid "tagged takes no arguments" +msgid "outgoing requires a repository path" +msgstr "" + +msgid "tag takes one or no arguments" +msgstr "" + +msgid "the argument to tag must be a string" msgstr "" msgid "can't negate that" @@ -12748,12 +13073,16 @@ msgstr "" #, python-format +msgid "default path for subrepository %s not found" +msgstr "" + +#, python-format msgid "unknown subrepo type %s" msgstr "ukendt underdepottype %s" #, python-format -msgid "warning: %s in %s\n" -msgstr "advarsel: %s i %s\n" +msgid "warning: error \"%s\" in subrepository \"%s\"\n" +msgstr "advarsel: fejl \"%s\" i underdepot \"%s\"\n" #, python-format msgid "removing subrepo %s\n" @@ -12785,6 +13114,9 @@ msgid "node '%s' is not well formed" msgstr "knude '%s' er ikke korrekt formet" +msgid ".hg/tags.cache is corrupt, rebuilding it\n" +msgstr "" + msgid "unmatched quotes" msgstr "" @@ -12829,6 +13161,10 @@ msgstr "Ignoreret: %s\n" #, python-format +msgid "(deprecated '%%' in path %s=%s from %s)\n" +msgstr "" + +#, python-format msgid "ignoring untrusted configuration option %s.%s = %s\n" msgstr "" @@ -12850,10 +13186,6 @@ msgid "username %s contains a newline\n" msgstr "brugernavn %s indeholder et linieskift\n" -#, python-format -msgid "(deprecated '%%' in path %s=%s from %s)\n" -msgstr "" - msgid "response expected" msgstr "svar forventet" @@ -12894,7 +13226,18 @@ msgid "certificate checking requires Python 2.6" msgstr "" -msgid "server identity verification succeeded\n" +msgid "no certificate received" +msgstr "modtog ikke noget certifikat" + +#, python-format +msgid "certificate is for %s" +msgstr "certifikatet er for %s" + +msgid "no commonName found in certificate" +msgstr "" + +#, python-format +msgid "%s certificate error: %s" msgstr "" #, python-format @@ -13044,6 +13387,9 @@ msgid "checking changesets\n" msgstr "kontrollerer ændringer\n" +msgid "checking" +msgstr "kontrollerer" + #, python-format msgid "unpacking changeset %s" msgstr "udpakker ændring %s" @@ -13085,9 +13431,6 @@ msgid "cannot decode filename '%s'" msgstr "kan ikke dekode filnavn '%s'" -msgid "checking" -msgstr "kontrollerer" - #, python-format msgid "broken revlog! (%s)" msgstr "beskadiget revlog! (%s)"