Mercurial > hg
changeset 11166:7613832a80be
i18n: fix up bad merge
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 12 May 2010 11:53:09 -0500 |
| parents | e8915e19205a |
| children | b5ef95b5ae14 |
| files | i18n/da.po |
| diffstat | 1 files changed, 272 insertions(+), 611 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/da.po Mon May 10 22:44:06 2010 +0200 +++ b/i18n/da.po Wed May 12 11:53:09 2010 -0500 @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2010-04-04 23:48+0200\n" -"PO-Revision-Date: 2010-04-05 01:09+0200\n" +"POT-Creation-Date: 2010-04-05 01:22+0200\n" +"PO-Revision-Date: 2010-04-05 01:37+0200\n" "Last-Translator: <mg@lazybytes.net>\n" "Language-Team: Danish\n" "MIME-Version: 1.0\n" @@ -54,157 +54,55 @@ msgid "" "hooks for controlling repository access\n" "\n" -"This hook makes it possible to allow or deny write access to given\n" -"branches and paths of a repository when receiving incoming changesets\n" -"via pretxnchangegroup and pretxncommit.\n" +"This hook makes it possible to allow or deny write access to portions\n" +"of a repository when receiving incoming changesets.\n" "\n" "The authorization is matched based on the local user name on the\n" "system where the hook runs, and not the committer of the original\n" "changeset (since the latter is merely informative).\n" "\n" "The acl hook is best used along with a restricted shell like hgsh,\n" -"preventing authenticating users from doing anything other than pushing\n" -"or pulling. The hook is not safe to use if users have interactive\n" -"shell access, as they can then disable the hook. Nor is it safe if\n" -"remote users share an account, because then there is no way to\n" -"distinguish them.\n" -"\n" -"The order in which access checks are performed is:\n" -"\n" -"1) Deny list for branches (section ``acl.deny.branches``)\n" -"2) Allow list for branches (section ``acl.allow.branches``)\n" -"3) Deny list for paths (section ``acl.deny``)\n" -"4) Allow list for paths (section ``acl.allow``)\n" -"\n" -"The allow and deny sections take key-value pairs.\n" -"\n" -"Branch-based Access Control\n" -"---------------------------\n" -"\n" -"Use the ``acl.deny.branches`` and ``acl.allow.branches`` sections to\n" -"have branch-based access control. Keys in these sections can be\n" -"either:\n" -"\n" -"- a branch name, or\n" -"- an asterisk, to match any branch;\n" -"\n" -"The corresponding values can be either:\n" -"\n" -"- a comma-separated list containing users and groups, or\n" -"- an asterisk, to match anyone;\n" -"\n" -"Path-based Access Control\n" -"-------------------------\n" -"\n" -"Use the ``acl.deny`` and ``acl.allow`` sections to have path-based\n" -"access control. Keys in these sections accept a subtree pattern (with\n" -"a glob syntax by default). The corresponding values follow the same\n" -"syntax as the other sections above.\n" -"\n" -"Groups\n" -"------\n" -"\n" -"Group names must be prefixed with an ``@`` symbol. Specifying a group\n" -"name has the same effect as specifying all the users in that group.\n" -"\n" -"You can define group members in the ``acl.groups`` section.\n" -"If a group name is not defined there, and Mercurial is running under\n" -"a Unix-like system, the list of users will be taken from the OS.\n" -"Otherwise, an exception will be raised.\n" -"\n" -"Example Configuration\n" -"---------------------\n" -"\n" -"::\n" +"preventing authenticating users from doing anything other than\n" +"pushing or pulling. The hook is not safe to use if users have\n" +"interactive shell access, as they can then disable the hook.\n" +"Nor is it safe if remote users share an account, because then there\n" +"is no way to distinguish them.\n" +"\n" +"To use this hook, configure the acl extension in your hgrc like this::\n" +"\n" +" [extensions]\n" +" acl =\n" "\n" " [hooks]\n" -"\n" -" # Use this if you want to check access restrictions at commit time\n" -" pretxncommit.acl = python:hgext.acl.hook\n" -" \n" -" # Use this if you want to check access restrictions for pull, push,\n" -" # bundle and serve.\n" " pretxnchangegroup.acl = python:hgext.acl.hook\n" "\n" " [acl]\n" -" # Check whether the source of incoming changes is in this list where\n" -" # \"serve\" == ssh or http, and \"push\", \"pull\" and \"bundle\" are the\n" -" # corresponding hg commands.\n" +" # Check whether the source of incoming changes is in this list\n" +" # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n" " sources = serve\n" "\n" -" [acl.deny.branches] \n" -" \n" -" # Everyone is denied to the frozen branch: \n" -" frozen-branch = * \n" -" \n" -" # A bad user is denied on all branches: \n" -" * = bad-user \n" -" \n" -" [acl.allow.branches] \n" -" \n" -" # A few users are allowed on branch-a: \n" -" branch-a = user-1, user-2, user-3 \n" -" \n" -" # Only one user is allowed on branch-b: \n" -" branch-b = user-1 \n" -" \n" -" # The super user is allowed on any branch: \n" -" * = super-user \n" -" \n" -" # Everyone is allowed on branch-for-tests: \n" -" branch-for-tests = * \n" +"The allow and deny sections take a subtree pattern as key (with a glob\n" +"syntax by default), and a comma separated list of users as the\n" +"corresponding value. The deny list is checked before the allow list\n" +"is. ::\n" +"\n" +" [acl.allow]\n" +" # If acl.allow is not present, all users are allowed by default.\n" +" # An empty acl.allow section means no users allowed.\n" +" docs/** = doc_writer\n" +" .hgtags = release_engineer\n" "\n" " [acl.deny]\n" -" # This list is checked first. If a match is found, acl.allow is not\n" -" # checked. All users are granted access if acl.deny is not present.\n" -" # Format for both lists: glob pattern = user, ..., @group, ...\n" -"\n" -" # To match everyone, use an asterisk for the user:\n" -" # my/glob/pattern = *\n" -"\n" -" # user6 will not have write access to any file:\n" -" ** = user6\n" -"\n" -" # Group \"hg-denied\" will not have write access to any file:\n" -" ** = @hg-denied\n" -"\n" -" # Nobody will be able to change \"DONT-TOUCH-THIS.txt\", despite\n" -" # everyone being able to change all other files. See below.\n" -" src/main/resources/DONT-TOUCH-THIS.txt = *\n" -"\n" -" [acl.allow]\n" -" # if acl.allow not present, all users allowed by default\n" -" # empty acl.allow = no users allowed\n" -"\n" -" # User \"doc_writer\" has write access to any file under the \"docs\"\n" -" # folder:\n" -" docs/** = doc_writer\n" -"\n" -" # User \"jack\" and group \"designers\" have write access to any file\n" -" # under the \"images\" folder:\n" -" images/** = jack, @designers\n" -"\n" -" # Everyone (except for \"user6\" - see acl.deny above) will have write\n" -" # access to any file under the \"resources\" folder (except for 1\n" -" # file. See acl.deny):\n" -" src/main/resources/** = *\n" -"\n" -" .hgtags = release_engineer\n" -"\n" -msgstr "" - -#, python-format -msgid "" -"config error - hook type \"%s\" cannot stop incoming changesets nor commits" -msgstr "konfigurationsfejl - hook type \"%s\" kan ikke stoppe indgående ændringer eller deponeringer" - -#, python-format -msgid "acl: user \"%s\" denied on branch \"%s\" (changeset \"%s\")" -msgstr "" - -#, python-format -msgid "acl: user \"%s\" not allowed on branch \"%s\" (changeset \"%s\")" -msgstr "" +" # If acl.deny is not present, no users are refused by default.\n" +" # An empty acl.deny section means all users allowed.\n" +" glob pattern = user4, user5\n" +" ** = user6\n" +msgstr "" + +#, python-format +msgid "config error - hook type \"%s\" cannot stop incoming changesets" +msgstr "" +"konfigurationsfejl - hook type \"%s\" kan ikke stoppe indgående ændringer" #, python-format msgid "acl: access denied for changeset %s" @@ -239,10 +137,10 @@ "\n" " Bookmarks are pointers to certain commits that move when\n" " committing. Bookmarks are local. They can be renamed, copied and\n" -" deleted. It is possible to use bookmark names in :hg:`merge` and\n" -" :hg:`update` to merge and update respectively to a given bookmark.\n" -"\n" -" You can use :hg:`bookmark NAME` to set a bookmark on the working\n" +" deleted. It is possible to use bookmark names in 'hg merge' and\n" +" 'hg update' to merge and update respectively to a given bookmark.\n" +"\n" +" You can use 'hg bookmark NAME' to set a bookmark on the working\n" " directory's parent revision with the given name. If you specify\n" " a revision using -r REV (where REV may be an existing bookmark),\n" " the bookmark is assigned to that revision.\n" @@ -486,7 +384,7 @@ #, python-format msgid "hook type %s does not pass a changeset id" -msgstr "hook type %s overfører ikke noget ændrings-ID" +msgstr "" #, python-format msgid "database error: %s" @@ -675,15 +573,6 @@ " resolve.resolved = green bold\n" "\n" " bookmarks.current = green\n" -"\n" -"The color extension will try to detect whether to use ANSI codes or\n" -"Win32 console APIs, unless it is made explicit::\n" -"\n" -" [color]\n" -" mode = ansi\n" -"\n" -"Any value other than 'ansi', 'win32', or 'auto' will disable color.\n" -"\n" msgstr "" "farvelæg output for nogle kommandoer\n" "\n" @@ -732,28 +621,17 @@ " resolve.resolved = green bold\\n\"\n" "\n" " bookmarks.current = green\n" -"\n" -"Udvidelsen til forsøge at detektere hvorvidt der skal bruges\n" -"ANSI-koder eller Win32 konsol APIer, med mindre dette gøres\n" -"eksplicit::\n" -"\n" -" [color]\n" -" mode = ansi\n" -"\n" -"Alle andre værdier end 'ansi', 'win32' eller 'auto' vil slå farver\n" -"fra.\n" -"\n" + +msgid "when to colorize (always, auto, or never)" +msgstr "hvornår der skal farvelægges (altid, automatisk eller aldrig)" + +msgid "don't colorize output (DEPRECATED)" +msgstr "farvelæg ikke output (FORÆLDET)" #, python-format msgid "ignoring unknown color/effect %r (configured in color.%s)\n" msgstr "ignorerer ukendt farve/effekt %r (konfigureret i color.%s)\n" -msgid "win32console not found, please install pywin32\n" -msgstr "" - -msgid "when to colorize (always, auto, or never)" -msgstr "hvornår der skal farvelægges (altid, automatisk eller aldrig)" - msgid "import revisions from foreign VCS repositories into Mercurial" msgstr "importer revisioner fra fremmede VCS depoter ind i Mercurial" @@ -1058,13 +936,6 @@ msgid "hg debugcvsps [OPTION]... [PATH]..." msgstr "hg debugcvsps [TILVALG]... [STI]..." -#, python-format -msgid "%s does not look like a Bazaar repository" -msgstr "%s ser ikke ud som et Bazaar depot" - -msgid "Bazaar modules could not be loaded" -msgstr "Bazaar-modulerne kunne ikke indlæses" - msgid "" "warning: lightweight checkouts may cause conversion failures, try with a " "regular branch instead.\n" @@ -1176,12 +1047,8 @@ msgstr "--sourcesort er ikke supporteret at denne datakilde" #, python-format -msgid "%s does not look like a CVS checkout" -msgstr "%s ser ikke ud som et CVS arbejdskatalog" - -#, python-format msgid "revision %s is not a patchset number" -msgstr "revision %s er ikke et patchset-nummer" +msgstr "" #, python-format msgid "connecting to %s\n" @@ -1214,9 +1081,6 @@ msgid "collecting CVS rlog\n" msgstr "samler CVS rlog\n" -msgid "not a CVS sandbox" -msgstr "" - #, python-format msgid "reading cvs log cache %s\n" msgstr "læser cvs log-mellemlager %s\n" @@ -1245,9 +1109,6 @@ msgid "revision must be followed by date line" msgstr "revision skal efterfølges af datolinje" -msgid "log cache overlaps with new log entries, re-run without cache." -msgstr "" - #, python-format msgid "writing cvs log cache %s\n" msgstr "skriver cvs log-mellemlager %s\n" @@ -1275,10 +1136,6 @@ msgstr "%d ændringer\n" #, python-format -msgid "%s does not look like a darcs repository" -msgstr "%s ser ikke ud som et darcs depot" - -#, python-format msgid "darcs version 2.1 or newer needed (found %r)" msgstr "kræver darcs version 2.1 eller nyere (fandt %r)" @@ -1303,26 +1160,7 @@ msgstr "kildedepot understøtter ikke --filemap" #, python-format -msgid "%s does not look like a Git repository" -msgstr "%s ser ikke ud som et Git depot" - -msgid "cannot retrieve git heads" -msgstr "kan ikke hente git-hoveder" - -#, python-format -msgid "cannot read %r object at %s" -msgstr "kan ikke læse %r objekt ved %s" - -#, python-format -msgid "cannot read changes in %s" -msgstr "kan ikke læse ændringer i %s" - -#, python-format -msgid "cannot read tags from %s" -msgstr "kan ikke læse mærkater fra %s" - -#, python-format -msgid "%s does not look like a GNU Arch repository" +msgid "%s does not look like a GNU Arch repo" msgstr "%s ser ikke ud som et GNU Arch depot" msgid "cannot find a GNU Arch tool" @@ -1342,7 +1180,7 @@ msgstr "kan ikke parse cat-log af %s" #, python-format -msgid "%s is not a local Mercurial repository" +msgid "%s is not a local Mercurial repo" msgstr "%s er ikke et lokalt Mercurial depot" #, python-format @@ -1350,10 +1188,6 @@ msgstr "initialiserer mål %s depot\n" #, python-format -msgid "could not create hg repository %s as sink" -msgstr "kunne ikke oprette hg depot %s som mål" - -#, python-format msgid "pulling from %s into %s\n" msgstr "hiver fra %s ind i %s\n" @@ -1372,17 +1206,13 @@ msgstr "ignorerer: %s\n" #, python-format -msgid "%s does not look like a monotone repository" +msgid "%s does not look like a monotone repo" msgstr "%s ser ikke ud som et monotone depot" #, python-format msgid "copying file in renamed directory from '%s' to '%s'" msgstr "kopierer fil i omdøbt katalog fra '%s' til '%s'" -#, python-format -msgid "%s does not look like a P4 repository" -msgstr "%s ser ikke ud som et P4 depot" - msgid "reading p4 views\n" msgstr "læser p4 views\n" @@ -1397,10 +1227,6 @@ "repository. Use --source-type if you know better.\n" msgstr "" -#, python-format -msgid "%s does not look like a Subversion repository" -msgstr "%s ser ikke ud som et Subversion depot" - msgid "Subversion python bindings could not be loaded" msgstr "Subversion python bindingerne kunne ikke indlæses" @@ -1467,11 +1293,11 @@ msgstr "svn: gren har ikke nogen revision %s" #, python-format -msgid "initializing svn repository %r\n" +msgid "initializing svn repo %r\n" msgstr "initialiserer svn depot %r\n" #, python-format -msgid "initializing svn working copy %r\n" +msgid "initializing svn wc %r\n" msgstr "initialiserer svn arbejdskatalog %r\n" msgid "unexpected svn output:\n" @@ -1602,7 +1428,7 @@ " parent, with local changes as the second. To switch the merge\n" " order, use --switch-parent.\n" "\n" -" See :hg:`help dates` for a list of formats valid for -d/--date.\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" @@ -2158,7 +1984,7 @@ msgstr "genskanner på grund af ændring af .hgignore\n" msgid "cannot start: socket is already bound" -msgstr "kan ikke starte: soklen er allede bundet" +msgstr "" msgid "" "cannot start: tried linking .hg/inotify.sock to a temporary socket but .hg/" @@ -2240,22 +2066,27 @@ "lose speed in huge repositories.\n" "\n" "For [keywordmaps] template mapping and expansion demonstration and\n" -"control run :hg:`kwdemo`. See :hg:`help templates` for a list of\n" +"control run \"hg kwdemo\". See \"hg help templates\" for a list of\n" "available templates and filters.\n" "\n" "An additional date template filter {date|utcdate} is provided. It\n" "returns a date like \"2006/09/18 15:13:13\".\n" "\n" -"The default template mappings (view with :hg:`kwdemo -d`) can be\n" -"replaced with customized keywords and templates. Again, run\n" -":hg:`kwdemo` to control the results of your config changes.\n" -"\n" -"Before changing/disabling active keywords, run :hg:`kwshrink` to avoid\n" +"The default template mappings (view with \"hg kwdemo -d\") can be\n" +"replaced with customized keywords and templates. Again, run \"hg\n" +"kwdemo\" to control the results of your config changes.\n" +"\n" +"Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n" "the risk of inadvertently storing expanded keywords in the change\n" "history.\n" "\n" "To force expansion after enabling it, or a configuration change, run\n" -":hg:`kwexpand`.\n" +"\"hg kwexpand\".\n" +"\n" +"Also, when committing with the record extension or using mq's qrecord,\n" +"be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n" +"the files in question to update keyword expansions after all changes\n" +"have been checked in.\n" "\n" "Expansions spanning more than one line and incremental expansions,\n" "like CVS' $Log$, are not supported. A keyword template map \"Log =\n" @@ -2369,7 +2200,7 @@ " execution by including only files that are actual candidates for\n" " expansion.\n" "\n" -" See :hg:`help keyword` on how to construct patterns both for\n" +" See \"hg help keyword\" on how to construct patterns both for\n" " inclusion and exclusion of files.\n" "\n" " With -A/--all and -v/--verbose the codes used to show the status\n" @@ -2386,15 +2217,15 @@ "revert expanded keywords in the working directory\n" "\n" " Run before changing/disabling active keywords or if you experience\n" -" problems with :hg:`import` or :hg:`merge`.\n" +" problems with \"hg import\" or \"hg merge\".\n" "\n" " kwshrink refuses to run if given files contain local changes.\n" " " msgstr "" -"før ekspanderede nøgleord tilbage i arbejdskataloget\n" +"før ekspanderede nøgleord tilbge i arbejdskataloget\n" "\n" " Brug denne kommando før du ændrer/deaktiverer nøgleord eller hvis\n" -" du oplever problemer med :hg:`import` eller :hg:`merge`.\n" +" du oplever problemer med \"hg import\" eller \"hg merge\".\n" "\n" " kwshrink nægter at køre hvis de angivne filer indeholder lokale\n" " ændringer.\n" @@ -2437,7 +2268,7 @@ "Known patches are represented as patch files in the .hg/patches\n" "directory. Applied patches are both patch files and changesets.\n" "\n" -"Common tasks (use :hg:`help command` for more details)::\n" +"Common tasks (use \"hg help command\" for more details)::\n" "\n" " create new patch qnew\n" " import existing patch qimport\n" @@ -2472,7 +2303,7 @@ "biblioteket. Anvendte rettelser er både rettelse-filer og Mercurial\n" "ændringer.\n" "\n" -"Almindelige opgaver (brug :hg:`help kommado` for flere detaljer)::\n" +"Almindelige opgaver (brug \"hg help kommado\" for flere detaljer)::\n" "\n" " opret ny rettelse qnew\n" " importer eksisterende rettelse qimport\n" @@ -2595,7 +2426,7 @@ msgstr "rettelse fejlede, afvisninger er efterladt i arbejdskataloget\n" msgid "fuzz found when applying patch, stopping\n" -msgstr "fandt fnidder ved anvendelsen af rettelsen, stopper\n" +msgstr "" #, python-format msgid "revision %d is not managed" @@ -2686,10 +2517,6 @@ msgid "patch series already fully applied\n" msgstr "serien af rettelser er allerede anvendt fuldt ud\n" -#, python-format -msgid "patch '%s' not found" -msgstr "rettelsen '%s' blev ikke fundet" - msgid "cleaning up working directory..." msgstr "rydder op i arbejdskataloget..." @@ -2748,7 +2575,7 @@ msgstr "rettelsen %s er ikke i series filen" msgid "No saved patch data found\n" -msgstr "Fandt ingen gemt rettelsesdata\n" +msgstr "" #, python-format msgid "restoring status: %s\n" @@ -3049,9 +2876,9 @@ " last refresh (thus showing what the current patch would become\n" " after a qrefresh).\n" "\n" -" Use :hg:`diff` if you only want to see the changes made since the\n" -" last qrefresh, or :hg:`export qtip` if you want to see changes\n" -" made by the current patch without including changes made since the\n" +" Use 'hg diff' if you only want to see the changes made since the\n" +" last qrefresh, or 'hg export qtip' if you want to see changes made\n" +" by the current patch without including changes made since the\n" " qrefresh.\n" " " msgstr "" @@ -3062,10 +2889,10 @@ " (dermed ser man hvad den nuværende patch vil blive efter en\n" " qrefresh)\n" "\n" -" Brug :hg:`diff` hvis du kun vil se ændringer lavet siden den\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" +" Brug 'hg diff' hvis du kun vil se ændringer lavet siden den sidste\n" +" qrefresh, eller 'hg export qtip' hvis du vil se ændringer lavet af\n" +" den nuværende patch uden at inkludere ændringer lavet siden\n" +" qrefresh.\n" " " msgid "" @@ -3241,30 +3068,19 @@ msgstr "kopier %s til %s\n" msgid "" -"strip a changeset and all its descendants from the repository\n" -"\n" -" The strip command removes all changesets whose local revision\n" -" number is greater than or equal to REV, and then restores any\n" -" changesets that are not descendants of REV. If the working\n" -" directory has uncommitted changes, the operation is aborted unless\n" -" the --force flag is supplied.\n" -"\n" -" If a parent of the working directory is stripped, then the working\n" -" directory will automatically be updated to the most recent\n" -" available ancestor of the stripped parent after the operation\n" -" completes.\n" -"\n" -" Any stripped changesets are stored in ``.hg/strip-backup`` as a\n" -" bundle (see ``hg help bundle`` and ``hg help unbundle``). They can\n" -" be restored by running ``hg unbundle .hg/strip-backup/BUNDLE``,\n" -" where BUNDLE is the bundle file created by the strip. Note that\n" -" the local revision numbers will in general be different after the\n" -" restore.\n" -"\n" -" Use the --nobackup option to discard the backup bundle once the\n" -" operation completes.\n" -" " -msgstr "" +"strip a revision and all its descendants from the repository\n" +"\n" +" If one of the working directory's parent revisions is stripped, the\n" +" working directory will be updated to the parent of the stripped\n" +" revision.\n" +" " +msgstr "" +"strip en revision og alle dens efterkommere fra depotet\n" +"\n" +" Hvis en af arbejdskatalogets forælder-revisioner bliver strippet,\n" +" så vil arbejdskataloget blive opdateret til forældren af den\n" +" strippede revision.\n" +" " msgid "" "set or print guarded patches to push\n" @@ -3412,20 +3228,6 @@ msgid "There is no Mercurial repository here (.hg not found)" msgstr "Der er intet Mercurial depot her (.hg ikke fundet)" -msgid "no queue repository" -msgstr "intet kø-depot" - -#, python-format -msgid "%d applied" -msgstr "%d anvendte" - -#, python-format -msgid "%d unapplied" -msgstr "%d ikke-anvendte" - -msgid "mq: (empty queue)\n" -msgstr "" - msgid "operate on patch repository" msgstr "arbejd på rettelsesdepot" @@ -3537,8 +3339,8 @@ msgid "add \"Date: <given date>\" to patch" msgstr "tilføj \"Date: <given dato>\" til rettelsen" -msgid "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..." -msgstr "hg qnew [-e] [-m TEKST] [-l FIL] RETTELSE [FIL]..." +msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..." +msgstr "hg qnew [-e] [-m TEKST] [-l FIL] [-f] RETTELSE [FIL]..." msgid "hg qnext [-s]" msgstr "hg qnext [-s]" @@ -3562,7 +3364,7 @@ msgstr "" msgid "list patch name in commit text" -msgstr "put rettelsens navn ind i deponeringsbeskeden" +msgstr "" msgid "apply all patches" msgstr "anvend alle rettelser" @@ -3573,11 +3375,8 @@ msgid "merge queue name (DEPRECATED)" msgstr "sammenføj med navngiven kø (FORÆLDET)" -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] [-m] [-n NAME] [PATCH | INDEX]" +msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NAVN] [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" @@ -3604,7 +3403,7 @@ msgstr "" msgid "update queue working directory" -msgstr "opdater arbejdskataloget for kø-depotet" +msgstr "" msgid "hg qrestore [-d] [-u] REV" msgstr "hg qrestore [-d] [-u] REV" @@ -3645,14 +3444,10 @@ msgid "hg qseries [-ms]" msgstr "hg qseries [-ms]" -msgid "" -"force removal of changesets even if the working directory has uncommitted " -"changes" -msgstr "" - -msgid "" -"bundle only changesets with local revision number greater than REV which are " -"not descendants of REV (DEPRECATED)" +msgid "force removal with local changes" +msgstr "gennemtving fjernelse af rettelse med lokale ændringer" + +msgid "bundle unrelated changesets" msgstr "" msgid "no backups" @@ -3808,8 +3603,8 @@ "\n" "If pager.attend is present, pager.ignore will be ignored.\n" "\n" -"To ignore global commands like :hg:`version` or :hg:`help`, you have\n" -"to specify them in the global .hgrc\n" +"To ignore global commands like \"hg version\" or \"hg help\", you have to\n" +"specify them in the global .hgrc\n" msgstr "" msgid "" @@ -3861,7 +3656,7 @@ "\n" "- The changeset description.\n" "- [Optional] The result of running diffstat on the patch.\n" -"- The patch itself, as generated by :hg:`export`.\n" +"- The patch itself, as generated by \"hg export\".\n" "\n" "Each message refers to the first in the series using the In-Reply-To\n" "and References headers, so they will show up as a sequence in threaded\n" @@ -3883,11 +3678,11 @@ "Use ``[patchbomb]`` as configuration section name if you need to\n" "override global ``[email]`` address settings.\n" "\n" -"Then you can use the :hg:`email` command to mail a series of\n" -"changesets as a patchbomb.\n" +"Then you can use the \"hg email\" command to mail a series of changesets\n" +"as a patchbomb.\n" "\n" "To avoid sending patches prematurely, it is a good idea to first run\n" -"the :hg:`email` command with the \"-n\" option (test only). You will be\n" +"the \"email\" command with the \"-n\" option (test only). You will be\n" "prompted for an email recipient address, a subject and an introductory\n" "message describing the patches of your patchbomb. Then when all is\n" "done, patchbomb messages are displayed. If the PAGER environment\n" @@ -3943,7 +3738,7 @@ " description. Next, (optionally) if the diffstat program is\n" " installed and -d/--diffstat is used, the result of running\n" " diffstat on the patch. Finally, the patch itself, as generated by\n" -" :hg:`export`.\n" +" \"hg export\".\n" "\n" " By default the patch is included as text in the email body for\n" " easy reviewing. Using the -a/--attach option will instead create\n" @@ -4132,7 +3927,7 @@ "\n" " This means that purge will delete:\n" "\n" -" - Unknown files: files marked with \"?\" by :hg:`status`\n" +" - Unknown files: files marked with \"?\" by \"hg status\"\n" " - Empty directories: in fact Mercurial ignores directories unless\n" " they contain files under source control management\n" "\n" @@ -4140,7 +3935,7 @@ "\n" " - Modified and unmodified tracked files\n" " - Ignored files (unless --all is specified)\n" -" - New files added to the repository (with :hg:`add`)\n" +" - New files added to the repository (with \"hg add\")\n" "\n" " If directories are given on the command line, only files in these\n" " directories are considered.\n" @@ -4418,10 +4213,10 @@ msgid "" "interactively select changes to commit\n" "\n" -" If a list of files is omitted, all changes reported by :hg:`status`\n" +" If a list of files is omitted, all changes reported by \"hg status\"\n" " will be candidates for recording.\n" "\n" -" See :hg:`help dates` for a list of formats valid for -d/--date.\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" "\n" " You will be prompted for whether to record changes to each\n" " modified file, and for files with multiple changes, for each\n" @@ -4443,9 +4238,9 @@ "vælg ændringer interaktivt til deponering\n" "\n" " Hvis en liste af filer er udeladt, så vil alle ændringer\n" -" rapporteret af :hg:`status` være kandidater til at blive optaget.\n" -"\n" -" Se :hg:`help dates` for en liste af gyldige formater til -d/--date.\n" +" rapporteret af \"hg status\" være kandidater til at blive optaget.\n" +"\n" +" Se 'hg help dates' for en liste af gyldige formater til -d/--date.\n" "\n" " Du vil blive spurgt om hvorvidt der skal optages ændringer for\n" " hver ændret fil. For filer med flere ændringer spørges der til\n" @@ -4482,7 +4277,7 @@ msgstr "hg qrecord [TILVALG]... RETTELSE [FIL]..." msgid "recreates hardlinks between repository clones" -msgstr "genopret hårde lænker mellem depot-kloner" +msgstr "" msgid "" "recreate hardlinks between two repositories\n" @@ -4541,7 +4336,7 @@ #, python-format msgid "relinked %d files (%d bytes reclaimed)\n" -msgstr "genlænkede %d filer (%d byte indvundet)\n" +msgstr "" msgid "[ORIGIN]" msgstr "[KILDE]" @@ -4968,6 +4763,9 @@ msgid "invalid format spec '%%%s' in output filename" msgstr "ugyldig formatspecifikation '%%%s' i output filnavn" +msgid "searching" +msgstr "søger" + #, python-format msgid "adding %s\n" msgstr "tilføjer %s\n" @@ -5099,7 +4897,11 @@ #, python-format msgid "%s: no key named '%s'" -msgstr "%s: ingen nøgle ved navn '%s'" +msgstr "" + +#, python-format +msgid "%s: %s" +msgstr "%s: %s" #, python-format msgid "Found revision %s from %s\n" @@ -5169,7 +4971,7 @@ " .. container:: verbose\n" "\n" " An example showing how new (unknown) files are added\n" -" automatically by :hg:`add`::\n" +" automatically by ``hg add``::\n" "\n" " $ ls\n" " foo.c\n" @@ -5186,7 +4988,7 @@ " Opskriv filer til at blive versionsstyret og tilføjet til depotet.\n" "\n" " Filerne vil bliver tilføjet til depotet ved næste deponering. For\n" -" at omgøre en tilføjelse før det, se :hg:`forget`.\n" +" at omgøre en tilføjelse før det, se hg forget.\n" "\n" " Hvis der ikke er angivet nogen navne tilføjes alle filer til\n" " depotet.\n" @@ -5194,7 +4996,7 @@ " .. container:: verbose\n" "\n" " An example showing how new (unknown) files are added\n" -" automatically by `:hg:`add``::\n" +" automatically by ``hg add``::\n" "\n" " $ ls\n" " foo.c\n" @@ -5304,7 +5106,7 @@ " :``zip``: zip archive, compressed using deflate\n" "\n" " The exact name of the destination archive or directory is given\n" -" using a format string; see :hg:`help export` for details.\n" +" using a format string; see 'hg help export' for details.\n" "\n" " Each member added to an archive file has a directory prefix\n" " prepended. Use -p/--prefix to specify a format string for the\n" @@ -5337,7 +5139,7 @@ " changeset afterwards. This saves you from doing the merge by hand.\n" " The result of this merge is not committed, as with a normal merge.\n" "\n" -" See :hg:`help dates` for a list of formats valid for -d/--date.\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" "omgør effekten af tidligere ændringer\n" @@ -5356,8 +5158,7 @@ " Resultatet af denne sammenføjning er ikke lagt i depot, som ved en\n" " normal sammenføjning.\n" "\n" -" Se :hg:`help dates` for en liste af gyldige formater til\n" -" -d/--date.\n" +" Se 'hg help dates' for en liste af gyldige formater til -d/--date.\n" " " msgid "please specify just one revision" @@ -5479,8 +5280,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. Use\n" -" :hg:`commit --close-branch` to mark this branch as closed.\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 "" "angiv eller vis navnet på den aktuelle gren\n" @@ -5496,8 +5297,8 @@ " Brug -C/--clean for at nulstille arbejdskatalogs gren til samme\n" " gren dets forældre-ændring og derved negere end tidligere ændring.\n" "\n" -" Brug kommandoen :hg:`update` for at skifte til en eksisterende\n" -" gren. Brug :hg:`commit --close-branch` for at markere denne gren\n" +" Brug kommandoen 'hg update' for at skifte til en eksisterende\n" +" gren. Brug 'hg commit --close-branch' for at markere denne gren\n" " som lukket.\n" " " @@ -5525,19 +5326,19 @@ " 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" +" Use the command 'hg update' to switch to an existing branch.\n" " " msgstr "" "vis navngivne grene i depotet\n" "\n" " Viser depotets navngivne grene og indikerer hvilke der er\n" " inaktive. Hvis -c/--closed er angivet, så vises lukkede grene også\n" -" (se :hg:`commit --close-branch`).\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" +" Brug kommandoen 'hg update' for at skifte til en eksisterende\n" " gren.\n" " " @@ -5622,11 +5423,11 @@ " The location of the source is added to the new repository's\n" " .hg/hgrc file, as the default to be used for future pulls.\n" "\n" -" See :hg:`help urls` for valid source format details.\n" +" See 'hg help urls' for valid source format details.\n" "\n" " It is possible to specify an ``ssh://`` URL as the destination, but no\n" " .hg/hgrc and working directory will be created on the remote side.\n" -" Please see :hg:`help urls` for important details about ``ssh://`` URLs.\n" +" Please see 'hg help urls' for important details about ``ssh://`` URLs.\n" "\n" " A set of changesets (tags, or branch names) to pull may be specified\n" " by listing each changeset (tag, or branch name) with -r/--rev.\n" @@ -5684,11 +5485,11 @@ " Placeringen af kilden tilføjes til det nye depots .hg/hgrc fil som\n" " den nye standard for fremtidige kald til 'hg pull'.\n" "\n" -" Se :hg:`help urls` for detaljer om gyldige formatter for kilden.\n" +" Se 'hg help urls' for detaljer om gyldige formatter for kilden.\n" "\n" " Det er muligt at specificere en ``ssh://`` URL som destination,\n" " men der vil ikke bliver oprettet nogen .hg/hgrc fil eller noget\n" -" arbejdskatalog på den anden side. Se venligst :hg:`help urls` for\n" +" arbejdskatalog på den anden side. Se venligst 'hg help urls' for\n" " vigtige detaljer om ``ssh://`` URLer.\n" "\n" " Der kan angives en mængde af ændringer (mærkater eller navne på\n" @@ -5750,7 +5551,7 @@ " centralized RCS, this operation is a local operation. See hg push\n" " for a way to actively distribute your changes.\n" "\n" -" If a list of files is omitted, all changes reported by :hg:`status`\n" +" If a list of files is omitted, all changes reported by \"hg status\"\n" " will be committed.\n" "\n" " If you are committing the result of a merge, do not provide any\n" @@ -5759,17 +5560,17 @@ " If no commit message is specified, the configured editor is\n" " started to prompt you for a message.\n" "\n" -" See :hg:`help dates` for a list of formats valid for -d/--date.\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" "lægger de specificerede filer eller alle udestående ændringer i depot\n" "\n" " Deponerer ændringer i de angivne filer ind i depotet. Dette er en\n" -" lokal operation, i modsætning til et centraliseret RCS. Se\n" -" :hg:`push` for en måde til aktivt distribuere dine ændringer.\n" +" lokal operation, i modsætning til et centraliseret RCS. Se hg push\n" +" for en måde til aktivt distribuere dine ændringer.\n" "\n" " Hvis en liste af filer udelades vil alle ændringer rapporteret af\n" -" :hg:`status` blive deponeret.\n" +" \"hg status\" blive deponeret.\n" "\n" " Hvis du deponerer resultatet af en sammenføjning, undlad da at\n" " angive filnavne eller -I/-X filtre.\n" @@ -5777,8 +5578,7 @@ " Hvis der ikke angives en deponeringsbesked, så starten den\n" " konfigurerede editor for at bede dig om en besked.\n" "\n" -" Se :hg:`help dates` for en liste af gyldige formater til\n" -" -d/--date.\n" +" Se 'hg help dates' for en liste af gyldige formater til -d/--date.\n" " " msgid "nothing changed\n" @@ -5858,10 +5658,6 @@ " " msgstr "" -#, python-format -msgid "read config from: %s\n" -msgstr "læste konfigurationsfil: %s\n" - msgid "only one config item permitted" msgstr "" @@ -5910,10 +5706,10 @@ msgstr "Kontrollerer udvidelser...\n" msgid " One or more extensions could not be found" -msgstr " En eller flere udvidelser blev ikke fundet" +msgstr "" msgid " (check that you compiled the extensions)\n" -msgstr " (kontroller at du har kompileret udvidelserne)\n" +msgstr "" msgid "Checking templates...\n" msgstr "" @@ -5922,23 +5718,21 @@ msgstr "" msgid "Checking patch...\n" -msgstr "Kontrollerer patch...\n" +msgstr "" msgid " patch call failed:\n" -msgstr " kaldet til patch fejlede:\n" +msgstr "" msgid " unexpected patch output!\n" -msgstr " uventet output fra patch!\n" +msgstr "" msgid " patch test failed!\n" -msgstr " patch testen fejlede!\n" +msgstr "" msgid "" " (Current patch tool may be incompatible with patch, or misconfigured. " "Please check your .hgrc file)\n" -msgstr " (Det nuværende patch-værktøj er måske inkompatibelt med patch eller konfigureret forkert. Undersøg venligst din .hgrc-fil)\n" -" (Det nuværende patch-værktøj er måske inkompatibelt med patch eller " -"konfigureret forkert. Undersøg venligst din .hgrc-fil)\n" +msgstr "" msgid "" " Internal patcher failure, please report this error to http://mercurial." @@ -5959,20 +5753,20 @@ msgstr "" msgid "Checking username...\n" -msgstr "Kontrollerer brugernavn...\n" +msgstr "" msgid " (specify a username in your .hgrc file)\n" -msgstr " (angiv et brugernavn i din .hgrc-fil)\n" +msgstr "" msgid "No problems detected\n" msgstr "Fandt ingen problemer\n" #, python-format msgid "%s problems detected, please check your install!\n" -msgstr "fandt %s problemer, kontroller venligst din installation!\n" +msgstr "" msgid "dump rename information" -msgstr "dump information om omdøbninger" +msgstr "" #, python-format msgid "%s renamed from %s:%s\n" @@ -6010,7 +5804,7 @@ " anyway, probably with undesirable results.\n" "\n" " Use the -g/--git option to generate diffs in the git extended diff\n" -" format. For more information, read :hg:`help diffs`.\n" +" format. For more information, read 'hg help diffs'.\n" " " msgstr "" "find ændringer i hele depotet (eller udvalgte filer)\n" @@ -6037,7 +5831,7 @@ " ændringer alligevel, sandsynligvis med uønskede resultater.\n" "\n" " Brug -g/--git tilvalget for at generere ændringer i det udvidede\n" -" git diff-format. For mere information, læs :hg:`help diffs`.\n" +" git diff-format. For mere information, læs hg help diffs.\n" " " msgid "" @@ -6070,7 +5864,7 @@ " diff anyway, probably with undesirable results.\n" "\n" " Use the -g/--git option to generate diffs in the git extended diff\n" -" format. See :hg:`help diffs` for more information.\n" +" format. See 'hg help diffs' for more information.\n" "\n" " With the --switch-parent option, the diff will be against the\n" " second parent. It can be useful to review a merge.\n" @@ -6106,7 +5900,7 @@ " annotering alligevel, sandsynligvis med et uønsket resultat.\n" "\n" " Brug -g/--git tilvalget for at generere ændringer i det udvidede\n" -" git diff-format. Se :hg:`help diffs` for mere information.\n" +" git diff-format. Se 'hg help diffs' for mere information.\n" "\n" " Med --switch-parent tilvalget vil ændringerne blive beregnet i\n" " forhold til den anden forælder. Dette kan være nyttigt til at\n" @@ -6117,10 +5911,10 @@ msgstr "" msgid "exporting patches:\n" -msgstr "eksporterer rettelser:\n" +msgstr "" msgid "exporting patch:\n" -msgstr "eksporterer rettelse:\n" +msgstr "" msgid "" "forget the specified files on the next commit\n" @@ -6291,13 +6085,11 @@ "\n" msgid "use \"hg help extensions\" for information on enabling extensions\n" -msgstr "brug \"hg help extensions\" for at få mere information om hvordan man slår udvidelser til\n" -"brug \"hg help extensions\" for at få mere information om hvordan man slår " -"udvidelser til\n" +msgstr "" #, python-format msgid "'%s' is provided by the following extension:" -msgstr "'%s' er i denne udvidelse:" +msgstr "" msgid "Mercurial Distributed SCM\n" msgstr "Mercurial Distribueret SCM\n" @@ -6313,7 +6105,7 @@ msgstr "aktiverede udvidelser:" msgid "DEPRECATED" -msgstr "FORÆLDET" +msgstr "" msgid "" "\n" @@ -6372,7 +6164,7 @@ "\n" " To read a patch from standard input, use \"-\" as the patch name. If\n" " a URL is specified, the patch will be downloaded from it.\n" -" See :hg:`help dates` for a list of formats valid for -d/--date.\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" @@ -6418,7 +6210,7 @@ " If no directory is given, the current directory is used.\n" "\n" " It is possible to specify an ``ssh://`` URL as the destination.\n" -" See :hg:`help urls` for more information.\n" +" See 'hg help urls' for more information.\n" " " msgstr "" "opret et nyt depot i det givne katalog\n" @@ -6430,7 +6222,7 @@ " anvendt.\n" "\n" " Det er muligt at angive en ``ssh://`` URL som destination.\n" -" Se :hg:`help urls` for mere information.\n" +" Se 'hg help urls' for mere information.\n" " " msgid "" @@ -6469,7 +6261,7 @@ " --follow is set, in which case the working directory parent is\n" " used as the starting revision.\n" "\n" -" See :hg:`help dates` for a list of formats valid for -d/--date.\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" "\n" " By default this command prints revision number and changeset id,\n" " tags, non-trivial parents, user, date and time, and a summary for\n" @@ -6497,7 +6289,7 @@ " standard, med mindre --follow er brugt, i hvilket tilfælde\n" " arbejdskatalogets forælder bruges som startrevision.\n" "\n" -" Se :hg:`help dates` for en liste af gyldige formater til -d/--date.\n" +" Se 'hg help dates' for en liste af gyldige formater til -d/--date.\n" "\n" " Som standard udskriver denne kommando revisionsnummer og ændrings\n" " ID, mærkater, ikke-trivielle forældre, bruger, dato og tid, og et\n" @@ -6618,7 +6410,7 @@ " " msgid "can only specify an explicit filename" -msgstr "kan kun angive et eksplicit filnavn" +msgstr "" #, python-format msgid "'%s' not found in manifest!" @@ -6630,22 +6422,10 @@ " Show definition of symbolic path name NAME. If no name is given,\n" " show definition of all available names.\n" "\n" -" Path names are defined in the [paths] section of\n" -" ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a\n" -" repository, ``.hg/hgrc`` is used, too.\n" -"\n" -" The path names ``default`` and ``default-push`` have a special\n" -" meaning. When performing a push or pull operation, they are used\n" -" as fallbacks if no location is specified on the command-line.\n" -" When ``default-push`` is set, it will be used for push and\n" -" ``default`` will be used for pull; otherwise ``default`` is used\n" -" as the fallback for both. When cloning a repository, the clone\n" -" source is written as ``default`` in ``.hg/hgrc``. Note that\n" -" ``default`` and ``default-push`` apply to all inbound (e.g.\n" -" :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and\n" -" :hg:`bundle`) operations.\n" -"\n" -" See :hg:`help urls` for more information.\n" +" Path names are defined in the [paths] section of /etc/mercurial/hgrc\n" +" and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n" +"\n" +" See 'hg help urls' for more information.\n" " " msgstr "" @@ -6677,7 +6457,7 @@ " where X is the last changeset listed by hg incoming.\n" "\n" " If SOURCE is omitted, the 'default' path will be used.\n" -" See :hg:`help urls` for more information.\n" +" See 'hg help urls' for more information.\n" " " msgstr "" "hent ændringer fra den angivne kilde\n" @@ -6689,13 +6469,13 @@ " med mindre -R er angivet). Som standard opdateres arbejdskataloget\n" " ikke.\n" "\n" -" Brug :hg:`incoming` for at se hvad der ville være blevet tilføjet\n" -" på det tidspunkt du udførte kommandoen. Hvis du derefter beslutter\n" -" at tilføje disse ændringer til depotet, så bør du bruge :hg:`pull\n" -" -r X` hvor ``X`` er den sidste ændring nævnt af :hg:`incoming`.\n" +" Brug hg incoming for at se hvad der ville være blevet tilføjet på\n" +" det tidspunkt du udførte kommandoen. Hvis du derefter beslutter at\n" +" tilføje disse ændringer til depotet, så bør du bruge pull -r X\n" +" hvor X er den sidste ændring nævnt af hg incoming.\n" "\n" " Hvis KILDE udelades, så bruges 'default' stien.\n" -" Se :hg:`help urls` for mere information.\n" +" Se 'hg help urls' for mere information.\n" " " msgid "" @@ -6715,7 +6495,7 @@ " If -r/--rev is used, the named revision and all its ancestors will\n" " be pushed to the remote repository.\n" "\n" -" Please see :hg:`help urls` for important details about ``ssh://``\n" +" Please see 'hg help urls' for important details about ``ssh://``\n" " URLs. If DESTINATION is omitted, a default path will be used.\n" " " msgstr "" @@ -6737,7 +6517,7 @@ " Hvis -r/--rev bruges, så vil den navngivne revision og alle dets\n" " forfædre bliver skubbet til det andet depot.\n" "\n" -" Se venligst :hg:`help urls` for vigtige detaljer om ``ssh://``\n" +" Se venligst 'hg help urls' for vigtige detaljer om ``ssh://``\n" " URL'er. Hvis DESTINATION udelades vil en standard sti blive brugt.\n" " " @@ -6897,8 +6677,8 @@ "\n" " Using the -r/--rev option, revert the given files or directories\n" " to their contents as of a specific revision. This can be helpful\n" -" to \"roll back\" some or all of an earlier change. See :hg:`help\n" -" dates` for a list of formats valid for -d/--date.\n" +" to \"roll back\" some or all of an earlier change. See 'hg help\n" +" dates' for a list of formats valid for -d/--date.\n" "\n" " Revert modifies the working directory. It does not commit any\n" " changes, or change the parent of the working directory. If you\n" @@ -6950,7 +6730,7 @@ msgstr "%s behøver ingen ændringer\n" msgid "" -"roll back the last transaction (dangerous)\n" +"roll back the last transaction\n" "\n" " This command should be used with care. There is only one level of\n" " rollback, and there is no way to undo a rollback. It will also\n" @@ -6984,24 +6764,11 @@ " Print the root directory of the current repository.\n" " " msgstr "" -"print roden (toppen) af det nuværende arbejdskatalog\n" -"\n" -" Print rod-kataloget for det nuværende depot.\n" -" " - -msgid "" -"start stand-alone webserver\n" -"\n" -" Start a local HTTP repository browser and pull server. You can use\n" -" this for ad-hoc sharing and browing of repositories. It is\n" -" recommended to use a real web server to serve a repository for\n" -" longer periods of time.\n" -"\n" -" Please note that the server does not implement access control.\n" -" This means that, by default, anybody can read from the server and\n" -" nobody can write to it by default. Set the ``web.allow_push``\n" -" option to ``*`` to allow everybody to push to the server. You\n" -" should use a real web server if you need to authenticate users.\n" + +msgid "" +"export the repository via HTTP\n" +"\n" +" Start a local HTTP repository browser and pull server.\n" "\n" " By default, the server logs accesses to stdout and errors to\n" " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n" @@ -7014,24 +6781,16 @@ msgstr "" "eksporter depotet via HTTP\n" "\n" -" Start en lokal HTTP depotbrowser og pull-server. Du kan bruge\n" -" denne til ad-hoc deling og browsning af depoter. Det anbefales at\n" -" man bruger en rigtig web-server for at serve et depot for længere\n" -" tidsrum.\n" -"\n" -" Bemærk venligst at serveren ikke implementerer adgangskontrol.\n" -" Dette betyder at alle som udgangspunkt kan læse fra serveren og at\n" -" ingen kan skrive til den. Sæt ``web.allow_push`` til ``*`` for at\n" -" tillade at enhver skubber ændringer til serveren. Du skal bruge en\n" -" rigtig web-server hvis du har behov for at autentificere brugere.\n" +" Start en lokal HTTP depotbrowser og pull-server.\n" "\n" " Som standard logger serveren forespørgsler til stdout og fejl til\n" " stderr. Brug -A/--accesslog og -E/--errorlog tilvalgene for at\n" -" logge til filer." +" logge til filer.\n" "\n" " For at få serveren til at vælge et frit portnummer at lytte til,\n" " angiv da portnummer 0; så vil serveren skrive det portnummer den\n" " bruger.\n" +" " #, python-format msgid "listening at http://%s%s/%s (bound to %s:%d)\n" @@ -7119,10 +6878,6 @@ " " msgstr "" -#, python-format -msgid "parent: %d:%s " -msgstr "forælder: %d:%s" - msgid " (empty repository)" msgstr "(tomt depot)" @@ -7130,18 +6885,22 @@ msgstr "(ingen revision hentet frem)" #, python-format +msgid "parent: %d:%s %s\n" +msgstr "forælder: %d:%s %s\n" + +#, python-format msgid "branch: %s\n" msgstr "gren: %s\n" #, python-format +msgid "%d added" +msgstr "%d tilføjet" + +#, python-format msgid "%d modified" msgstr "%d ændret" #, python-format -msgid "%d added" -msgstr "%d tilføjet" - -#, python-format msgid "%d removed" msgstr "%d fjernet" @@ -7150,21 +6909,17 @@ msgstr "%d slettet" #, python-format +msgid "%d ignored" +msgstr "%d ignoreret" + +#, python-format msgid "%d unknown" msgstr "%d ukendt" #, python-format -msgid "%d ignored" -msgstr "%d ignoreret" - -#, python-format msgid "%d unresolved" msgstr "%d uløst" -#, python-format -msgid "%d subrepos" -msgstr "%d underdepoter" - msgid " (merge)" msgstr " (sammenføj)" @@ -7224,10 +6979,7 @@ " necessary. The file '.hg/localtags' is used for local tags (not\n" " shared among repositories).\n" "\n" -" See :hg:`help dates` for a list of formats valid for -d/--date.\n" -"\n" -" Since tag names have priority over branch names during revision\n" -" lookup, using an existing branch name as a tag name is discouraged.\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" @@ -7289,7 +7041,7 @@ msgstr "" msgid "" -"update working directory (or switch revisions)\n" +"update working directory\n" "\n" " Update the repository's working directory to the specified\n" " changeset.\n" @@ -7316,13 +7068,13 @@ " 3. With the -C/--clean option, uncommitted changes are discarded and\n" " the working directory is updated to the requested changeset.\n" "\n" -" Use null as the changeset to remove the working directory (like\n" -" :hg:`clone -U`).\n" -"\n" -" If you want to update just one file to an older changeset, use :hg:" -"`revert`.\n" -"\n" -" See :hg:`help dates` for a list of formats valid for -d/--date.\n" +" Use null as the changeset to remove the working directory (like 'hg\n" +" clone -U').\n" +"\n" +" If you want to update just one file to an older changeset, use 'hg " +"revert'.\n" +"\n" +" See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" "opdater arbejdskataloget\n" @@ -7352,13 +7104,13 @@ " 3. Med -C/--clean tilvalget bliver udeponerede ændringer kasseret\n" " og arbejdskataloget bliver opdateret til den ønskede ændring.\n" "\n" -" Brug null som ændring for at fjerne arbejdskataloget (ligesom\n" -" :hg:`clone -U`).\n" +" Brug null som ændring for at fjerne arbejdskataloget (ligesom 'hg\n" +" clone -U').\n" "\n" " Hvis du vil opdatere blot en enkelt fil til en ældre revision,\n" -" brug da :hg:`revert`.\n" -"\n" -" Se :hg:`help dates` for en liste af gyldige formater til -d/--date.\n" +" brug da revert.\n" +"\n" +" Se 'hg help dates' for en liste af gyldige formater til -d/--date.\n" " " msgid "cannot specify both -c/--check and -C/--clean" @@ -7487,9 +7239,6 @@ msgid "do not show merges" msgstr "vis ikke sammenføjninger" -msgid "output diffstat-style summary of changes" -msgstr "vis en opsummering af ændringerne i stil med diffstat" - msgid "treat all files as text" msgstr "behandl alle filer som tekst" @@ -7514,7 +7263,9 @@ msgid "number of lines of context to show" msgstr "antal linier kontekst der skal vises" -msgstr "vis en opsummering af ændringerne i stil med diffstat" +msgid "output diffstat-style summary of changes" +msgstr "" + msgid "guess renamed files by similarity (0<=s<=100)" msgstr "gæt omdøbte filer ud fra enshed (0<=s<=100)" @@ -7761,8 +7512,8 @@ msgid "print matching line numbers" msgstr "udskriv matchende linienumre" -msgid "only search files changed within revision range" -msgstr "søg kun i filer som er ændret i det angivne interval" +msgid "search in given revision range" +msgstr "søg i det angivne interval" msgid "[OPTION]... PATTERN [FILE]..." msgstr "[TILVALG]... MØNSTER [FIL]..." @@ -7880,11 +7631,8 @@ msgid "revisions committed by user" msgstr "revisioner deponeret af bruger" -msgid "show only changesets within the given named branch (DEPRECATED)" -msgstr "vis kun ændringer på den angivne navngivne gren (FORÆLDET)" - -msgid "show changesets within the given named branch" -msgstr "vis ændringer på den angivne navngivne gren" +msgid "show only changesets within the given named branch" +msgstr "vis kun ændringer på den angivne navngivne gren" msgid "do not display revision or any of its ancestors" msgstr "vis ikke revision eller nogen af den forfædre" @@ -7991,7 +7739,7 @@ msgid "name of error log file to write to" msgstr "navn på fejlllog fil der skrives til" -msgid "port to listen on (default: 8000)" +msgid "port to listen on (default: 8000" msgstr "port der skal lyttes på (standard: 8000)" msgid "address to listen on (default: all interfaces)" @@ -8003,11 +7751,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 (DEPRECATED)" -msgstr "" +msgid "name of the webdir config file (serve more than one repository)" +msgstr "navn på webdir konfigurationsfil (serve mere end et depot)" msgid "for remote clients" msgstr "for fjernklienter" @@ -8129,10 +7874,6 @@ msgstr "" #, python-format -msgid "setting %r to other parent only allowed in merges" -msgstr "" - -#, python-format msgid "not in dirstate: %s\n" msgstr "ikke i dirstate: %s\n" @@ -8212,6 +7953,10 @@ msgid "hg: unknown command '%s'\n" msgstr "hg: ukendt kommando '%s'\n" +#, python-format +msgid "abort: could not import module %s!\n" +msgstr "afbrudt: kunne ikke importere modul %s!\n" + msgid "(did you forget to compile extensions?)\n" msgstr "(glemte du at kompilere udvidelserne?)\n" @@ -8411,9 +8156,6 @@ msgid "Using additional features" msgstr "Brug af yderligere funktioner" -msgid "Configuring hgweb" -msgstr "Konfigurering af hgweb" - msgid "" "Mercurial reads configuration data from several files, if they exist.\n" "Below we list the most specific file first.\n" @@ -8422,15 +8164,12 @@ "\n" "- ``<repo>\\.hg\\hgrc``\n" "- ``%USERPROFILE%\\.hgrc``\n" -"- ``%USERPROFILE%\\mercurial.ini``\n" +"- ``%USERPROFILE%\\Mercurial.ini``\n" "- ``%HOME%\\.hgrc``\n" -"- ``%HOME%\\mercurial.ini``\n" -"- ``C:\\mercurial\\mercurial.ini`` (unless regkey or hgrc.d\\ or mercurial." -"ini found)\n" -"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (unless hgrc.d\\ or mercurial." -"ini found)\n" -"- ``<hg.exe-dir>\\hgrc.d\\*.rc`` (unless mercurial.ini found)\n" -"- ``<hg.exe-dir>\\mercurial.ini``\n" +"- ``%HOME%\\Mercurial.ini``\n" +"- ``C:\\Mercurial\\Mercurial.ini``\n" +"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``\n" +"- ``<install-dir>\\Mercurial.ini``\n" "\n" "On Unix, these files are read:\n" "\n" @@ -8449,7 +8188,7 @@ " username = Firstname Lastname <firstname.lastname@example.net>\n" " verbose = True\n" "\n" -"The above entries will be referred to as ``ui.username`` and\n" +"This above entries will be referred to as ``ui.username`` and\n" "``ui.verbose``, respectively. Please see the hgrc man page for a full\n" "description of the possible configuration values:\n" "\n" @@ -8464,15 +8203,12 @@ "\n" "- ``<repo>\\.hg\\hgrc``\n" "- ``%USERPROFILE%\\.hgrc``\n" -"- ``%USERPROFILE%\\mercurial.ini``\n" +"- ``%USERPROFILE%\\Mercurial.ini``\n" "- ``%HOME%\\.hgrc``\n" -"- ``%HOME%\\mercurial.ini``\n" -"- ``C:\\mercurial\\mercurial.ini`` (med mindre regkey eller hgrc.d\\\n" -" eller mercurial.ini blev fundet)\n" -"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (med mindre hgrc.d\\ eller\n" -" mercurial.init blev fundet)\n" -"- ``<hg.exe-dir>\\hgrc.d\\*.rc`` (med mindre mercurial.ini blev fundet)\n" -"- ``<hg.exe-dir>\\mercurial.ini``\n" +"- ``%HOME%\\Mercurial.ini``\n" +"- ``C:\\Mercurial\\Mercurial.ini``\n" +"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``\n" +"- ``<install-dir>\\Mercurial.ini``\n" "\n" "På Unix læses disse filer:\n" "\n" @@ -8592,7 +8328,7 @@ "format.\n" "\n" "This means that when generating diffs from a Mercurial repository\n" -"(e.g. with :hg:`export`), you should be careful about things like file\n" +"(e.g. with \"hg export\"), you should be careful about things like file\n" "copies and renames or other things mentioned above, because when\n" "applying a standard diff to a different repository, this extra\n" "information is lost. Mercurial's internal operations (like push and\n" @@ -8763,56 +8499,6 @@ " baz = !\n" msgid "" -"Mercurial's internal web server, hgweb, can serve either a single\n" -"repository, or a collection of them. In the latter case, a special\n" -"configuration file can be used to specify the repository paths to use\n" -"and global web configuration options.\n" -"\n" -"This file uses the same syntax as hgrc configuration files, but only\n" -"the following sections are recognized:\n" -"\n" -" - web\n" -" - paths\n" -" - collections\n" -"\n" -"The ``web`` section can specify all the settings described in the web\n" -"section of the hgrc documentation.\n" -"\n" -"The ``paths`` section provides mappings of physical repository\n" -"paths to virtual ones. For instance::\n" -"\n" -" [paths]\n" -" projects/a = /foo/bar\n" -" projects/b = /baz/quux\n" -" web/root = /real/root/*\n" -" / = /real/root2/*\n" -" virtual/root2 = /real/root2/**\n" -"\n" -"- The first two entries make two repositories in different directories\n" -" appear under the same directory in the web interface\n" -"- The third entry maps every Mercurial repository found in '/real/root'\n" -" into 'web/root'. This format is preferred over the [collections] one,\n" -" since using absolute paths as configuration keys is not supported on " -"every\n" -" platform (especially on Windows).\n" -"- The fourth entry is a special case mapping all repositories in\n" -" '/real/root2' in the root of the virtual directory.\n" -"- The fifth entry recursively finds all repositories under the real\n" -" root, and maps their relative paths under the virtual root.\n" -"\n" -"The ``collections`` section provides mappings of trees of physical\n" -"repositories paths to virtual ones, though the paths syntax is generally\n" -"preferred. For instance::\n" -"\n" -" [collections]\n" -" /foo = /foo\n" -"\n" -"Here, the left side will be stripped off all repositories found in the\n" -"right side. Thus ``/foo/bar`` and ``foo/quux/baz`` will be listed as\n" -"``bar`` and ``quux/baz`` respectively.\n" -msgstr "" - -msgid "" "When Mercurial accepts more than one revision, they may be specified\n" "individually, or provided as a topologically continuous range,\n" "separated by the \":\" character.\n" @@ -8928,9 +8614,8 @@ "You can customize output for any \"log-like\" command: log,\n" "outgoing, incoming, tip, parents, heads and glog.\n" "\n" -"Four styles are packaged with Mercurial: default (the style used\n" -"when no explicit preference is passed), compact, changelog,\n" -"and xml.\n" +"Three styles are packaged with Mercurial: default (the style used\n" +"when no explicit preference is passed), compact and changelog.\n" "Usage::\n" "\n" " $ hg log -r1 --style changelog\n" @@ -9083,12 +8768,12 @@ " 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 :hg:`\n" -"incoming --bundle`).\n" +"repositories or to bundle files (as created by 'hg bundle' or 'hg\n" +"incoming --bundle').\n" "\n" "An optional identifier after # indicates a particular branch, tag, or\n" -"changeset to use from the remote repository. See also :hg:`help\n" -"revisions`.\n" +"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 only\n" "possible if the feature is explicitly enabled on the remote Mercurial\n" @@ -9123,7 +8808,7 @@ " ...\n" "\n" "You can then use the alias for any command that uses a URL (for\n" -"example :hg:`pull alias1` will be treated as :hg:`pull URL1`).\n" +"example 'hg pull alias1' will be treated as 'hg pull URL1').\n" "\n" "Two path aliases are special because they are used as defaults when\n" "you do not provide the URL to a command:\n" @@ -9354,10 +9039,6 @@ msgid "%r cannot be used in a tag name" msgstr "%r kan ikke bruges i et mærkatnavnet" -#, python-format -msgid "warning: tag %s conflicts with existing branch name\n" -msgstr "advarsel: mærkat %s er i konflikt med et eksisterende grennavn\n" - msgid "working copy of .hgtags is changed (please commit .hgtags manually)" msgstr "arbejdskopien af .hgtags er ændret (deponer venligst .hgtags manuelt)" @@ -9378,16 +9059,8 @@ msgid "no interrupted transaction available\n" msgstr "ingen afbrudt transaktion tilgængelig\n" -#, python-format -msgid "rolling back to revision %s (undo %s: %s)\n" -msgstr "" - -#, python-format -msgid "rolling back to revision %s (undo %s)\n" -msgstr "ruller tilbage til revision %s (fortryd %s)\n" - -msgid "rolling back unknown transaction\n" -msgstr "ruller ukendt transaktion tilbage\n" +msgid "rolling back last transaction\n" +msgstr "ruller sidste transaktion tilbage\n" #, python-format msgid "Named branch could not be reset, current branch still is: %s\n" @@ -9483,9 +9156,6 @@ msgid "queries" msgstr "" -msgid "searching" -msgstr "søger" - msgid "already have changeset " msgstr "har allerede ændringen " @@ -9510,15 +9180,12 @@ msgid "abort: push creates new remote heads!\n" msgstr "afbrudt: skub laver nye fjern-hoveder!\n" +msgid "(did you forget to merge? use push -f to force)\n" +msgstr "(glemte du at sammenføje? brug push -f for at gennemtvinge)\n" + msgid "(you should pull and merge or use push -f to force)\n" msgstr "(du skal hive og sammenføje eller bruge -f for at gennemtvinge)\n" -msgid "(did you forget to merge? use push -f to force)\n" -msgstr "(glemte du at sammenføje? brug push -f for at gennemtvinge)\n" - -msgid "(did you forget to merge? use push -f to force)\n" -msgstr "(glemte du at sammenføje? brug push -f for at gennemtvinge)\n" - #, python-format msgid "abort: push creates new remote branches: %s!\n" msgstr "afbrudt: skub laver nye grene i fjerndepotet: %s!\n" @@ -9801,8 +9468,8 @@ msgstr "binær rettelse er %d byte, ikke %d" #, python-format -msgid "unable to strip away %d of %d dirs from %s" -msgstr "kan ikke strippe %d ud af %d kataloger fra %s" +msgid "unable to strip away %d dirs from %s" +msgstr "kan ikke strippe %d kataloger fra %s" msgid "undefined source and destination files" msgstr "" @@ -9901,12 +9568,6 @@ msgid "consistency error adding group" msgstr "konsistensfejl ved tilføjelse af gruppe" -msgid "searching for exact renames" -msgstr "leder efter eksakte omdøbninger" - -msgid "searching for similar files" -msgstr "leder efter lignende filer" - #, python-format msgid "%s looks like a binary file." msgstr "%s ser ud som en binær fil." @@ -9989,8 +9650,8 @@ msgstr "hiver underdepot %s fra %s\n" #, python-format -msgid "pushing subrepo %s to %s\n" -msgstr "skubber underdepot %s til %s\n" +msgid "pushing subrepo %s\n" +msgstr "skubber til underdepot %s\n" msgid "cannot commit svn externals" msgstr "kan ikke deponere svn externals" @@ -10261,6 +9922,9 @@ msgid "checking changesets\n" msgstr "kontrollerer ændringer\n" +msgid "checking" +msgstr "kontrollerer" + #, python-format msgid "unpacking changeset %s" msgstr "udpakker ændring %s" @@ -10302,9 +9966,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)"