Mercurial > hg
changeset 10861:30cce7010630
Merge with i18n
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 05 Apr 2010 17:48:31 -0500 |
| parents | b07bd417115b (current diff) 2c8cadcb76a6 (diff) |
| children | f97b98db6fd1 |
| files | |
| diffstat | 1 files changed, 451 insertions(+), 274 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/da.po Mon Apr 05 15:25:08 2010 -0500 +++ b/i18n/da.po Mon Apr 05 17:48:31 2010 -0500 @@ -1,9 +1,9 @@ # Danish translations for Mercurial # Danske oversættelser for Mercurial # Copyright (C) 2009, 2010 Matt Mackall and others -# +# # Translation dictionary: -# +# # changeset ændring # commit deponere # merge sammenføje @@ -12,14 +12,14 @@ # revision revision # tag mærkat # working directory arbejdskatalog -# +# msgid "" msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2010-02-28 17:12+0100\n" -"PO-Revision-Date: 2010-02-28 18:06+0100\n" -"Last-Translator: <mg@lazybytes.net>\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" "Content-Type: text/plain; charset=UTF-8\n" @@ -101,7 +101,8 @@ #, python-format msgid "config error - hook type \"%s\" cannot stop incoming changesets" -msgstr "konfigurationsfejl - hook type \"%s\" kan ikke stoppe indgående ændringer" +msgstr "" +"konfigurationsfejl - hook type \"%s\" kan ikke stoppe indgående ændringer" #, python-format msgid "acl: access denied for changeset %s" @@ -165,7 +166,7 @@ msgstr "et bogmærke kan ikke hedde det samme som en eksisterende gren" msgid "no bookmarks set\n" -msgstr "ingen bogmærker\r\n" +msgstr "der er ingen bogmærker\n" msgid "force" msgstr "gennemtving" @@ -257,7 +258,8 @@ " {hgweb} Base URL for browsing Mercurial repositories.\n" "\n" " Default 'changeset {node|short} in repo {root} refers '\n" -" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\\n\n" +" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n" +"\n" "strip\n" " The number of slashes to strip from the front of {root} to produce\n" " {webroot}. Default 0.\n" @@ -299,7 +301,9 @@ " bzuser=unknown@domain.com\n" " bzdir=/opt/bugzilla-3.2\n" " template=Changeset {node|short} in {root|basename}.\n" -" {hgweb}/{webroot}/rev/{node|short}\\n\\n {desc}\\n\\n strip=5\n" +" {hgweb}/{webroot}/rev/{node|short}\\n\n" +" {desc}\\n\n" +" strip=5\n" "\n" " [web]\n" " baseurl=http://dev.domain.com/hg\n" @@ -421,9 +425,8 @@ msgid "Revision %d is a merge, ignoring...\n" msgstr "Revision %d er en sammenføjning; ignorerer...\n" -#, python-format -msgid "generating stats: %d%%" -msgstr "genererer statistik: %d%%" +msgid "analyzing" +msgstr "" msgid "" "histogram of changes to the repository\n" @@ -520,16 +523,14 @@ msgid "file with email aliases" msgstr "fil med email-aliaser" -msgid "show progress" -msgstr "vis fremskridt" - -msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]" -msgstr "hg churn [-d DATO] [-r REV] [--aliases FIL] [--progress] [FIL]" +msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [FILE]" +msgstr "hg churn [-d DATO] [-r REV] [--aliases FIL] [FIL]" msgid "" "colorize output from some commands\n" "\n" -"This extension modifies the status and resolve commands to add color to their\n" +"This extension modifies the status and resolve commands to add color to " +"their\n" "output to reflect file status, the qseries command to add color to reflect\n" "patch status (applied, unapplied, missing), and to diff-related\n" "commands to highlight additions, removals, diff headers, and trailing\n" @@ -616,7 +617,9 @@ " diff.changed = white\n" " diff.trailingwhitespace = bold red_background\n" "\n" -" resolve.unresolved = red bold\\n\"\\n resolve.resolved = green bold\\n\"\\n\n" +" resolve.unresolved = red bold\\n\"\n" +" resolve.resolved = green bold\\n\"\n" +"\n" " bookmarks.current = green\n" msgid "when to colorize (always, auto, or never)" @@ -933,7 +936,9 @@ msgid "hg debugcvsps [OPTION]... [PATH]..." msgstr "hg debugcvsps [TILVALG]... [STI]..." -msgid "warning: lightweight checkouts may cause conversion failures, try with a regular branch instead.\n" +msgid "" +"warning: lightweight checkouts may cause conversion failures, try with a " +"regular branch instead.\n" msgstr "" msgid "bzr source type could not be determined\n" @@ -1053,13 +1058,18 @@ msgstr "CVS pserver godkendelse fejlede" #, python-format -msgid "unexpected response from CVS server (expected \"Valid-requests\", but got %r)" -msgstr "uventet svar fra CVS serveren (forventede \"Valid-requests\", men fik %r)" +msgid "" +"unexpected response from CVS server (expected \"Valid-requests\", but got %r)" +msgstr "" +"uventet svar fra CVS serveren (forventede \"Valid-requests\", men fik %r)" #, python-format msgid "%d bytes missing from remote file" msgstr "%d byte mangler i fjernfilen" +msgid "malformed response from CVS" +msgstr "misdannet svar fra CVS" + #, python-format msgid "cvs server: %s\n" msgstr "cvs server: %s\n" @@ -1161,7 +1171,8 @@ msgstr "analyserer træ version %s...\n" #, python-format -msgid "tree analysis stopped because it points to an unregistered archive %s...\n" +msgid "" +"tree analysis stopped because it points to an unregistered archive %s...\n" msgstr "" #, python-format @@ -1211,7 +1222,9 @@ msgid "Mercurial failed to run itself, check hg executable is in PATH" msgstr "Mercurial kunne ikke køre sig selv, kontroller om hg er i PATH" -msgid "svn: cannot probe remote repository, assume it could be a subversion repository. Use --source-type if you know better.\n" +msgid "" +"svn: cannot probe remote repository, assume it could be a subversion " +"repository. Use --source-type if you know better.\n" msgstr "" msgid "Subversion python bindings could not be loaded" @@ -1419,8 +1432,11 @@ " " msgstr "" -msgid "working dir not at branch tip (use \"hg update\" to check out branch tip)" -msgstr "arbejdskataloget er ikke ved gren-spidsen (brug \"hg update\" for at hente gren-spidsen)" +msgid "" +"working dir not at branch tip (use \"hg update\" to check out branch tip)" +msgstr "" +"arbejdskataloget er ikke ved gren-spidsen (brug \"hg update\" for at hente " +"gren-spidsen)" msgid "outstanding uncommitted merge" msgstr "udestående udeponeret sammenføjning" @@ -1431,19 +1447,30 @@ msgid "working directory is missing some files" msgstr "arbejdskataloget mangler nogle filer" -msgid "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" -msgstr "flere hoveder i denne gren (brug \"hg heads .\" og \"hg merge\" for at sammenføje)" +msgid "" +"multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" +msgstr "" +"flere hoveder i denne gren (brug \"hg heads .\" og \"hg merge\" for at " +"sammenføje)" #, python-format msgid "pulling from %s\n" msgstr "hiver fra %s\n" -msgid "Other repository doesn't support revision lookup, so a rev cannot be specified." -msgstr "Det andet depot understøtter ikke revisionsopslag, så en revision kan ikke angives." - -#, python-format -msgid "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge\" to merge them)\n" -msgstr "sammenføjer ikke med %d andre nye gren-hoveder (brug \"hg heads .\" og \"hg merge\" for at sammenføje dem)\n" +msgid "" +"Other repository doesn't support revision lookup, so a rev cannot be " +"specified." +msgstr "" +"Det andet depot understøtter ikke revisionsopslag, så en revision kan ikke " +"angives." + +#, python-format +msgid "" +"not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge" +"\" to merge them)\n" +msgstr "" +"sammenføjer ikke med %d andre nye gren-hoveder (brug \"hg heads .\" og \"hg " +"merge\" for at sammenføje dem)\n" #, python-format msgid "updating to %d:%s\n" @@ -1531,8 +1558,12 @@ msgid "Error while signing" msgstr "Fejl ved underskrivning" -msgid "working copy of .hgsigs is changed (please commit .hgsigs manually or use --force)" -msgstr "arbejdskopien af .hgsigs er ændret (deponer venligst .hgsigs manuelt eller brug --force)" +msgid "" +"working copy of .hgsigs is changed (please commit .hgsigs manually or use --" +"force)" +msgstr "" +"arbejdskopien af .hgsigs er ændret (deponer venligst .hgsigs manuelt eller " +"brug --force)" msgid "unknown signature version" msgstr "ukendt underskrift-version" @@ -1634,7 +1665,8 @@ " # Append a diffstat to the log message (optional)\n" " #diffstat = False\n" " # Template to use for log messages (optional)\n" -" #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\\n # Style to use (optional)\n" +" #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n" +" # Style to use (optional)\n" " #style = foo\n" " # The URL of the CIA notification service (optional)\n" " # You can use mailto: URLs to send by email, eg\n" @@ -1869,10 +1901,14 @@ #, python-format msgid "*** the current per-user limit on the number of inotify watches is %s\n" -msgstr "*** den nuværende grænse pr bruger for antallet af inotify overvågninger er %s\n" +msgstr "" +"*** den nuværende grænse pr bruger for antallet af inotify overvågninger er %" +"s\n" msgid "*** this limit is too low to watch every directory in this repository\n" -msgstr "*** denne grænse er for lille til at overvåge alle biblioteker i dette depot\n" +msgstr "" +"*** denne grænse er for lille til at overvåge alle biblioteker i dette " +"depot\n" msgid "*** counting directories: " msgstr "*** tæller kataloger: " @@ -1950,7 +1986,9 @@ msgid "cannot start: socket is already bound" msgstr "" -msgid "cannot start: tried linking .hg/inotify.sock to a temporary socket but .hg/inotify.sock already exists" +msgid "" +"cannot start: tried linking .hg/inotify.sock to a temporary socket but .hg/" +"inotify.sock already exists" msgstr "" #, python-format @@ -1977,7 +2015,8 @@ "\n" " [interhg]\n" " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" -" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!i\n" +" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!" +"i\n" " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n" msgstr "" "ekspander udtryk i historikken og sammendrag\n" @@ -1991,7 +2030,8 @@ "\n" " [interhg]\n" " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" -" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!i\n" +" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!" +"i\n" " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n" #, python-format @@ -2124,11 +2164,8 @@ "\n" "nøgleord skrevet til %s:\n" -msgid "unhooked all commit hooks\n" -msgstr "" - msgid "hg keyword configuration and expansion example" -msgstr "" +msgstr "eksempel på konfiguration og ekspansion af nøgleord" msgid "" "\n" @@ -2149,7 +2186,8 @@ "\n" " Kør efter at at keyword-udvidelsen er blevet (gen)aktiveret.\n" "\n" -" kwexpand nægter at køre hvis de angivne filer indeholder lokale ændringer.\n" +" kwexpand nægter at køre hvis de angivne filer indeholder lokale " +"ændringer.\n" " " msgid "" @@ -2214,12 +2252,6 @@ msgid "only show unknown (not tracked) files" msgstr "vis kun ukendte (ikke-fulgte) filer" -msgid "show keyword status flags of all files (DEPRECATED)" -msgstr "vis keyword status for alle filer (FORÆLDET)" - -msgid "only show untracked files (DEPRECATED)" -msgstr "vis kun ikke-fulgte filer (FORÆLDET)" - msgid "hg kwfiles [OPTION]... [FILE]..." msgstr "hg kwfiles [TILVALG]... [FIL]..." @@ -2238,7 +2270,6 @@ "\n" "Common tasks (use \"hg help command\" for more details)::\n" "\n" -" prepare repository to work with patches qinit\n" " create new patch qnew\n" " import existing patch qimport\n" "\n" @@ -2274,7 +2305,6 @@ "\n" "Almindelige opgaver (brug \"hg help kommado\" for flere detaljer)::\n" "\n" -" forbered repository til at arbejde med rettelser qinit\n" " opret ny rettelse qnew\n" " importer eksisterende rettelse qimport\n" "\n" @@ -2301,7 +2331,7 @@ #, python-format msgid "mq.git option can be auto/keep/yes/no got %s" -msgstr "" +msgstr "mq.git indstillingen kan være auto/keep/yes/no, fik %s" #, python-format msgid "%s appears more than once in %s" @@ -2348,7 +2378,7 @@ #, python-format msgid "error removing undo: %s\n" -msgstr "" +msgstr "fejl ved fjernelse af undo: %s\n" #, python-format msgid "apply failed for patch %s" @@ -2464,7 +2494,7 @@ #, python-format msgid "cannot push to a previous patch: %s" -msgstr "" +msgstr "kan ikke skubbe til en tidligere rettelse: %s" #, python-format msgid "qpush: %s is already at the top\n" @@ -2532,7 +2562,9 @@ msgid "cannot refresh a revision with children" msgstr "kan ikke genopfriske en revision som har børn" -msgid "refresh interrupted while patch was popped! (revert --all, qpush to recover)\n" +msgid "" +"refresh interrupted while patch was popped! (revert --all, qpush to " +"recover)\n" msgstr "" msgid "patch queue directory already exists" @@ -2629,7 +2661,8 @@ msgid "" "remove patches from queue\n" "\n" -" The patches must not be applied, and at least one patch is required. With\n" +" The patches must not be applied, and at least one patch is required. " +"With\n" " -k/--keep, the patch files are preserved in the patch directory.\n" "\n" " To stop managing a patch and move it into permanent history,\n" @@ -2713,7 +2746,7 @@ " qcommit to commit changes to this queue repository.\n" "\n" " This command is deprecated. Without -c, it's implied by other relevant\n" -" commands. With -c, use hg init -Q instead." +" commands. With -c, use hg init --mq instead." msgstr "" "opret et nyt kø-depot (FORÆLDET)\n" "\n" @@ -2723,8 +2756,8 @@ " uversioneret patch depot til et versioneret et). Du kan bruge\n" " qcommit for at deponere ændringer i dette kø-depot.\n" "\n" -" Denne kommando er forældet. Uden -c er den kommandoen ikke\n" -" nødvendig, med -c bør hg init -Q bruges i stedet." +" Denne kommando er forældet. Uden -c er kommandoen ikke nødvendig,\n" +" med -c bør hg init --mq bruges i stedet." msgid "" "clone main and patch repository at same time\n" @@ -2739,12 +2772,12 @@ " default. Use -p <url> to change.\n" "\n" " The patch directory must be a nested Mercurial repository, as\n" -" would be created by qinit -c.\n" -" " -msgstr "" - -msgid "versioned patch repository not found (see qinit -c)" -msgstr "versionsstyret depot til rettelser blev ikke fundet (se qinit -c)" +" would be created by init --mq.\n" +" " +msgstr "" + +msgid "versioned patch repository not found (see init --mq)" +msgstr "versionsstyret rettelsesdepot blev ikke fundet (se init --mq)" msgid "cloning main repository\n" msgstr "kloner hoveddepot\n" @@ -2761,7 +2794,7 @@ msgid "" "commit changes in the queue repository (DEPRECATED)\n" "\n" -" This command is deprecated; use hg -Q commit instead." +" This command is deprecated; use hg commit --mq instead." msgstr "" msgid "print the entire series file" @@ -2780,9 +2813,8 @@ "create a new patch\n" "\n" " qnew creates a new patch on top of the currently-applied patch (if\n" -" any). It will refuse to run if there are any outstanding changes\n" -" unless -f/--force is specified, in which case the patch will be\n" -" initialized with them. You may also use -I/--include,\n" +" any). The patch will be initialized with any outstanding changes\n" +" in the working directory. You may also use -I/--include,\n" " -X/--exclude, and/or a list of files after the patch name to add\n" " only changes to matching files to the new patch, leaving the rest\n" " as uncommitted modifications.\n" @@ -2896,7 +2928,9 @@ msgstr "Fejl ved foldning af rettelse %s" msgid "push or pop patches until named patch is at top of stack" -msgstr "tilføj eller fjern rettelser indtil den navngivne rettelser er på toppen af stakken" +msgstr "" +"tilføj eller fjern rettelser indtil den navngivne rettelser er på toppen af " +"stakken" msgid "" "set or print guards for a patch\n" @@ -3123,11 +3157,14 @@ #, python-format msgid "number of unguarded, unapplied patches has changed from %d to %d\n" -msgstr "antallet af ufiltrerede og ikke-anvendte rettelser har ændret sig fra %d til %d\n" +msgstr "" +"antallet af ufiltrerede og ikke-anvendte rettelser har ændret sig fra %d til " +"%d\n" #, python-format msgid "number of guarded, applied patches has changed from %d to %d\n" -msgstr "antallet af filtrerede og anvendte rettelser har ændret sig fra %d til %d\n" +msgstr "" +"antallet af filtrerede og anvendte rettelser har ændret sig fra %d til %d\n" msgid "guards in series file:\n" msgstr "filtre i seriefilen:\n" @@ -3185,6 +3222,12 @@ msgid "cannot import over an applied patch" msgstr "kan ikke importere henover en anvendt rettelse" +msgid "only a local queue repository may be initialized" +msgstr "" + +msgid "There is no Mercurial repository here (.hg not found)" +msgstr "Der er intet Mercurial depot her (.hg ikke fundet)" + msgid "operate on patch repository" msgstr "arbejd på rettelsesdepot" @@ -3465,7 +3508,8 @@ " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" " maxsubject = 67 # truncate subject line longer than this\n" " diffstat = True # add a diffstat before the diff content\n" -" sources = serve # notify if source of incoming changes in this list\n" +" sources = serve # notify if source of incoming changes in this " +"list\n" " # (serve == ssh or http, push, pull, bundle)\n" " merge = False # send notification for merges (default True)\n" " [email]\n" @@ -3723,8 +3767,10 @@ "\n" " hg email -b # send bundle of all patches not in default\n" " hg email -b DEST # send bundle of all patches not in DEST\n" -" hg email -b -r 3000 # bundle of all ancestors of 3000 not in default\n" -" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n" +" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " +"default\n" +" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in " +"DEST\n" "\n" " Before using this command, you will need to enable email in your\n" " hgrc. See the [email] section in hgrc(5) for details.\n" @@ -3736,6 +3782,8 @@ msgid "--outgoing mode always on with --bundle; do not re-specify --outgoing" msgstr "" +"--outgoing tilvalget er altid aktivt med --bundle; undlad at angive --" +"outgoing igen" msgid "too many destinations" msgstr "for mange destinationer" @@ -3858,6 +3906,9 @@ " width = <none> # if set, the maximum width of the progress information\n" " # (that is, min(width, term width) will be used)\n" " clear-complete = True # clear the progress bar after it's done\n" +" disable = False # if true, don't show a progress bar\n" +" assume-tty = False # if true, ALWAYS show a progress bar, unless\n" +" # disable is given\n" "\n" "Valid entries for the format field are topic, bar, number, unit, and\n" "item. item defaults to the last 20 characters of the item, but this\n" @@ -3948,8 +3999,39 @@ "move changeset (and descendants) to a different branch\n" "\n" " Rebase uses repeated merging to graft changesets from one part of\n" -" history onto another. This can be useful for linearizing local\n" -" changes relative to a master development tree.\n" +" history (the source) onto another (the destination). This can be\n" +" useful for linearizing local changes relative to a master\n" +" development tree.\n" +"\n" +" If you don't specify a destination changeset (``-d/--dest``),\n" +" rebase uses the tipmost head of the current named branch as the\n" +" destination. (The destination changeset is not modified by\n" +" rebasing, but new changesets are added as its descendants.)\n" +"\n" +" You can specify which changesets to rebase in two ways: as a\n" +" \"source\" changeset or as a \"base\" changeset. Both are shorthand\n" +" for a topologically related set of changesets (the \"source\n" +" branch\"). If you specify source (``-s/--source``), rebase will\n" +" rebase that changeset and all of its descendants onto dest. If you\n" +" specify base (``-b/--base``), rebase will select ancestors of base\n" +" back to but not including the common ancestor with dest. Thus,\n" +" ``-b`` is less precise but more convenient than ``-s``: you can\n" +" specify any changeset in the source branch, and rebase will select\n" +" the whole branch. If you specify neither ``-s`` nor ``-b``, rebase\n" +" uses the parent of the working directory as the base.\n" +"\n" +" By default, rebase recreates the changesets in the source branch\n" +" as descendants of dest and then destroys the originals. Use\n" +" ``--keep`` to preserve the original source changesets. Some\n" +" changesets in the source branch (e.g. merges from the destination\n" +" branch) may be dropped if they no longer contribute any change.\n" +"\n" +" One result of the rules for selecting the destination changeset\n" +" and source branch is that, unlike ``merge``, rebase will do\n" +" nothing if you are at the latest (tipmost) head of a named branch\n" +" with two heads. You need to explicitly specify source and/or\n" +" destination (or ``update`` to the other head, if it's the head of\n" +" the intended source branch).\n" "\n" " If a rebase is interrupted to manually resolve a merge, it can be\n" " continued with --continue/-c or aborted with --abort/-a.\n" @@ -4031,13 +4113,15 @@ msgid "rebase working directory to branch head" msgstr "" -msgid "rebase from a given revision" -msgstr "" - -msgid "rebase from the base of a given revision" -msgstr "" - -msgid "rebase onto a given revision" +msgid "rebase from the specified changeset" +msgstr "" + +msgid "" +"rebase from the base of the specified changeset (up to greatest common " +"ancestor of base and dest)" +msgstr "" + +msgid "rebase onto the specified changeset" msgstr "" msgid "collapse the rebased changesets" @@ -4058,8 +4142,12 @@ msgid "abort an interrupted rebase" msgstr "" -msgid "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--detach] [--keep] [--keepbranches] | [-c] | [-a]" -msgstr "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--detach] [--keep] [--keepbranches] | [-c] | [-a]" +msgid "" +"hg rebase [-s REV | -b REV] [-d REV] [options]\n" +"hg rebase {-a|-c}" +msgstr "" +"hg rebase [-s REV | -b REV] [-d REV] [tilvalg]\n" +"hg rebase {-a|-c}" msgid "commands to interactively select changes for commit/qrefresh" msgstr "" @@ -4223,35 +4311,35 @@ #, python-format msgid "relinking %s to %s\n" -msgstr "" +msgstr "kæder %s og %s sammen igen\n" #, python-format msgid "collected %d candidate storage files\n" -msgstr "" +msgstr "opsamlede %d kandidatfiler\n" msgid "source and destination are on different devices" msgstr "kilden og destinationen er på forskellige enheder" #, python-format msgid "not linkable: %s\n" -msgstr "" +msgstr "kan ikke sammenkædes: %s\n" #, python-format msgid "pruned down to %d probably relinkable files\n" -msgstr "" +msgstr "beskåret til %d filer der potentielt kan sammenkædes\n" msgid " files" msgstr " filer" -msgid "relink" -msgstr "" +msgid "relinking" +msgstr "sammenkæder" #, python-format msgid "relinked %d files (%d bytes reclaimed)\n" msgstr "" msgid "[ORIGIN]" -msgstr "" +msgstr "[KILDE]" msgid "" "extend schemes with shortcuts to repository swarms\n" @@ -4285,16 +4373,17 @@ " bb = https://bitbucket.org/\n" " bb+ssh = ssh://hg@bitbucket.org/\n" " gcode = https://{1}.googlecode.com/hg/\n" +" kiln = https://{1}.kilnhg.com/Repo/\n" "\n" "You can override a predefined scheme by defining a new scheme with the\n" "same name.\n" msgstr "" msgid "share a common history between several working directories" -msgstr "" - -msgid "" -"create a new shared repository (experimental)\n" +msgstr "del en fælles historie mellem flere arbejdsbiblioteker" + +msgid "" +"create a new shared repository\n" "\n" " Initialize a new repository and working directory that shares its\n" " history with another repository.\n" @@ -4315,7 +4404,7 @@ msgstr "opret ikke en arbejdskopi" msgid "[-U] SOURCE [DEST]" -msgstr "" +msgstr "[-U] KILDE [DESTINATION]" msgid "" "command to transplant changesets from another branch\n" @@ -4328,15 +4417,15 @@ #, python-format msgid "skipping already applied revision %s\n" -msgstr "" +msgstr "springer allerede anvendt revision %s over\n" #, python-format msgid "skipping merge changeset %s:%s\n" -msgstr "" +msgstr "springer sammenføjning over: %s:%s\n" #, python-format msgid "%s merged at %s\n" -msgstr "" +msgstr "%s sammenføjet ved %s\n" #, python-format msgid "%s transplanted to %s\n" @@ -4357,7 +4446,7 @@ msgstr "%s: tom ændring" msgid "Fix up the merge and run hg transplant --continue" -msgstr "" +msgstr "Ret sammenføjningen og kør hg transplant --continue" #, python-format msgid "%s transplanted as %s\n" @@ -4464,15 +4553,16 @@ msgstr "sammenføj ved REV" msgid "append transplant info to log message" -msgstr "" +msgstr "tilføj information on transplantationen i deponeringsbeskeden" msgid "continue last transplant session after repair" -msgstr "" +msgstr "fortsæt sidste transplantation efter reparation" msgid "filter changesets through FILTER" msgstr "filtrer ændringer igennem FILTER" -msgid "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." +msgid "" +"hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." msgstr "hg transplant [-s DEPOT] [-b GREN [-a]] [-p REV] [-m REV] [REV]..." msgid "" @@ -4513,10 +4603,10 @@ #, python-format msgid "[win32mbcs] filename conversion failed with %s encoding\n" -msgstr "" +msgstr "[win32mbcs] konvertering af filnavn fejlede med %s tegnkodning\n" msgid "[win32mbcs] cannot activate on this platform.\n" -msgstr "" +msgstr "[win32mbcs] kan ikke aktiveres på denn platform.\n" msgid "" "perform automatic newline conversion\n" @@ -4533,7 +4623,8 @@ " ** = cleverdecode:\n" " # or ** = macdecode:\n" "\n" -"If not doing conversion, to make sure you do not commit CRLF/CR by accident::\n" +"If not doing conversion, to make sure you do not commit CRLF/CR by " +"accident::\n" "\n" " [hooks]\n" " pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n" @@ -4558,10 +4649,11 @@ #, python-format msgid "Attempt to commit or push text file(s) using %s line endings\n" msgstr "" +"Forsøg på at deponere eller skubbe tekstfiler som bruge %s linieskift\n" #, python-format msgid "in %s: %s\n" -msgstr "" +msgstr "i %s: %s\n" #, python-format msgid "" @@ -4612,7 +4704,7 @@ msgstr "ukendt depottype '%s'" msgid "invalid changegroup" -msgstr "" +msgstr "ugyldig changegroup" msgid "unknown parent" msgstr "ukendt forælder" @@ -4652,24 +4744,27 @@ msgstr "navnet '%s' er reserveret" msgid "options --message and --logfile are mutually exclusive" -msgstr "" +msgstr "tilvalgene --message og --logfile udelukker hinanden" #, python-format msgid "can't read commit message '%s': %s" msgstr "kan ikke læse deponeringsbesked '%s': %s" msgid "limit must be a positive integer" -msgstr "" +msgstr "grænsen skal være et positivt heltal" msgid "limit must be positive" -msgstr "" +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 "" +msgstr "ugyldig formatspecifikation '%%%s' i output filnavn" + +msgid "searching" +msgstr "søger" #, python-format msgid "adding %s\n" @@ -4717,7 +4812,9 @@ #, python-format msgid "%s has not been committed yet, so no copy data will be stored for %s.\n" -msgstr "%s er endnu ikke comitted, så der vil ikke blive gemt kopieringsdata for %s.\n" +msgstr "" +"%s er endnu ikke comitted, så der vil ikke blive gemt kopieringsdata for %" +"s.\n" msgid "no source or destination specified" msgstr "ingen kilde eller destination angivet" @@ -4726,7 +4823,8 @@ msgstr "ingen destination angivet" msgid "with multiple sources, destination must be an existing directory" -msgstr "destinationen skal være en eksisterende mappe når der angivet flere kilder" +msgstr "" +"destinationen skal være en eksisterende mappe når der angivet flere kilder" #, python-format msgid "destination %s is not a directory" @@ -4759,7 +4857,7 @@ #, python-format msgid "manifest: %d:%s\n" -msgstr "" +msgstr "manifest: %d:%s\n" #, python-format msgid "user: %s\n" @@ -4803,24 +4901,25 @@ #, python-format msgid "%s: %s" -msgstr "" +msgstr "%s: %s" #, python-format msgid "Found revision %s from %s\n" -msgstr "" +msgstr "Fandt revision %s fra %s\n" msgid "revision matching date not found" -msgstr "" +msgstr "fandt ingen revision på datoen" #, python-format msgid "cannot follow nonexistent file: \"%s\"" -msgstr "" +msgstr "kan ikke følge ikke-eksisterende fil: \"%s\"" msgid "can only follow copies/renames for explicit filenames" -msgstr "" +msgstr "kan kun følge kopier/omdøbninger for eksplicitte filnavne" msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." -msgstr "HG: Skriv deponeringsbesked. Linier som starter med 'HG:' bliver fjernet." +msgstr "" +"HG: Skriv deponeringsbesked. Linier som starter med 'HG:' bliver fjernet." msgid "HG: Leave message empty to abort commit." msgstr "HG: Efterlad beskeden tom for at afbryde deponeringen." @@ -4994,8 +5093,10 @@ " By default, the revision used is the parent of the working\n" " directory; use -r/--rev to specify a different revision.\n" "\n" -" To specify the type of archive to create, use -t/--type. Valid\n" -" types are:\n" +" The archive type is automatically detected based on file\n" +" extension (or override using -t/--type).\n" +"\n" +" Valid types are:\n" "\n" " :``files``: a directory full of files (default)\n" " :``tar``: tar archive, uncompressed\n" @@ -5126,16 +5227,20 @@ msgstr "Den første dårlige revision er:\n" msgid "Due to skipped revisions, the first good revision could be any of:\n" -msgstr "På grund af oversprungne revisioner kan den første gode revision være en hvilken som helst af:\n" +msgstr "" +"På grund af oversprungne revisioner kan den første gode revision være en " +"hvilken som helst af:\n" msgid "Due to skipped revisions, the first bad revision could be any of:\n" -msgstr "På grund af oversprungne revisioner kan den første dårlige revision være en hvilken som helst af:\n" +msgstr "" +"På grund af oversprungne revisioner kan den første dårlige revision være en " +"hvilken som helst af:\n" msgid "cannot bisect (no known good revisions)" -msgstr "" +msgstr "kan ikke halvere (kender ingen gode revisioner)" msgid "cannot bisect (no known bad revisions)" -msgstr "" +msgstr "kan ikke halvere (kender ingen dårlige revisioner)" msgid "(use of 'hg bisect <cmd>' is deprecated)\n" msgstr "(formen 'hg bisect <kommando>' er forældet)\n" @@ -5201,8 +5306,11 @@ msgid "reset working directory to branch %s\n" msgstr "nulstil arbejdskataloget til gren %s\n" -msgid "a branch of the same name already exists (use --force to override)" -msgstr "en gren ved samme navn eksisterer allerede (brug --force for at gennemtvinge)" +msgid "" +"a branch of the same name already exists (use 'hg update' to switch to it)" +msgstr "" +"en gren af samme navn eksisterer allerede (brug 'hg update' for at skifte " +"til den)" #, python-format msgid "marked working directory as branch %s\n" @@ -5269,7 +5377,7 @@ msgstr "--base er inkompatibelt med at angive en destination" msgid "unknown bundle type specified with --type" -msgstr "" +msgstr "ukendt bundt-type angivet med --type" msgid "" "output the current or given revision of files\n" @@ -5321,20 +5429,6 @@ " .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" "\n" -" If the -U/--noupdate option is specified, the new clone will contain\n" -" only a repository (.hg) and no working copy (the working copy parent\n" -" will be the null changeset). Otherwise, clone will initially check\n" -" out (in order of precedence):\n" -"\n" -" a) the changeset, tag or branch specified with -u/--updaterev\n" -" b) the changeset, tag or branch given with the first -r/--rev\n" -" c) the branch given with the first -b/--branch\n" -" d) the branch given with the url#branch source syntax\n" -" e) the head of the default branch\n" -"\n" -" Use 'hg clone -u . src dst' to checkout the source repository's\n" -" parent changeset (applicable for local source repositories only).\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" " If -r/--rev is used, the cloned repository will contain only a subset\n" @@ -5349,12 +5443,12 @@ "\n" " For efficiency, hardlinks are used for cloning whenever the source\n" " and destination are on the same filesystem (note this applies only\n" -" to the repository data, not to the checked out files). Some\n" +" to the repository data, not to the working directory). Some\n" " filesystems, such as AFS, implement hardlinking incorrectly, but\n" " do not report errors. In these cases, use the --pull option to\n" " avoid hardlinking.\n" "\n" -" In some cases, you can clone repositories and checked out files\n" +" In some cases, you can clone repositories and the working directory\n" " using full hardlinks with ::\n" "\n" " $ cp -al REPO REPOCLONE\n" @@ -5365,6 +5459,20 @@ " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" " this is not compatible with certain extensions that place their\n" " metadata under the .hg directory, such as mq.\n" +"\n" +" Mercurial will update the working directory to the first applicable\n" +" revision from this list:\n" +"\n" +" a) null if -U or the source repository has no changesets\n" +" b) if -u . and the source repository is local, the first parent of\n" +" the source repository's working directory\n" +" c) the changeset specified with -u (if a branch name, this means the\n" +" latest head of that branch)\n" +" d) the changeset specified with -r\n" +" e) the tipmost head specified with -b\n" +" f) the tipmost head specified with the url#branch source syntax\n" +" g) the tipmost head of the default branch\n" +" h) tip\n" " " msgstr "" "lav en kopi af et eksisterende depot\n" @@ -5384,22 +5492,6 @@ " arbejdskatalog på den anden side. Se venligst 'hg help urls' for\n" " vigtige detaljer om ``ssh://`` URLer.\n" "\n" -" Hvis -U/--noupdate tilvalget bruges vil den nye klon kun indeholde\n" -" et depot (.hg) og intet arbejdskatalog (arbejdskatalogets forælder\n" -" er sat til nul revisionen). Ellers vil clone kommandoen hente\n" -"\n" -" a) ændringen, mærkaten eller grenen specificeret med\n" -" -u/--updaterev\n" -" b) ændringen, mærkaten eller grenen angivet med den første\n" -" -r/--rev\n" -" c) grenen angivet med det første -b/--branch tilvalg\n" -" d) grenen angivet ved url#gren syntaksen\n" -" e) hovedet af default grenen\n" -"\n" -" Brug 'hg clone -u . kilde destination' for at hente ændringen i\n" -" kildedepotet ud i destinations depotet (kan kun anvendes ved\n" -" lokale kildedepoter).\n" -"\n" " Der kan angives en mængde af ændringer (mærkater eller navne på\n" " grene) som skal hives ved at angive hver ændring (mærkat eller\n" " grennavn) med -r/--rev. Hvis -r/--rev tilvalget bruges, så vil det\n" @@ -5414,12 +5506,13 @@ "\n" " Af effektivitetsgrunde bruges hårde lænker ved kloning når kilden\n" " og destinationen er på det samme filsystem (bemærk at dette kun\n" -" gælder for depotdata og ikke for de udhentede filer). Nogle\n" +" gælder for depotdata og ikke for de arbejdsbiblioteket). Nogle\n" " filsystemer, såsom AFS, implementerer ikke hårde lænker korrekt,\n" " men rapporterer ingen fejl. I disse tilfælde skal --pull bruges\n" " for at undgå hårde lænker.\n" "\n" -" I nogle tilfælde kan man klone depoter og udhentede filer med ::\n" +" I nogle tilfælde kan du klone depoter og arbejdsbiblioteket og\n" +" bruge hårde lænker til alle filer med ::\n" "\n" " $ cp -al DEPOT DEPOTKLON\n" "\n" @@ -5430,6 +5523,22 @@ " Linux Kernel værktøjer gør det). Dette er desuden ikke kompatibelt\n" " med visse udvidelser som placerer deres metadata under .hg mappen,\n" " såsom mq.\n" +"\n" +" Mercurial vil opdatere arbejdsbiblioteket til den første brugbare\n" +" revision fra denne liste:\n" +"\n" +" a) null, hvis -U tilvalget er brugt eller hvis kildedepotet ikke\n" +" indeholder nogen ændringer\n" +" b) den første forælder til kildedepotets arbejdsbiblioteket hvis\n" +" -u . er brugt og hvis kildedepotet er lokalt\n" +" c) ændringer specificeret med -u (hvis det er navnet på en gren,\n" +" så tolkes det som denne grens hoved)\n" +" d) ændringen angivet med -r\n" +" e) hovedet med størst revisionsnummer angivet med -b\n" +" f) hovedet med størst revisionsnummer angivet med url#gren\n" +" syntaksen\n" +" g) hovedet med størst revisionsnummer på default grenen\n" +" h) revisionen med størst revisionsnummer\n" " " msgid "cannot specify both --noupdate and --updaterev" @@ -5499,10 +5608,7 @@ msgstr "" msgid "find the ancestor revision of two revisions in a given index" -msgstr "" - -msgid "There is no Mercurial repository here (.hg not found)" -msgstr "Der er intet Mercurial depot her (.hg ikke fundet)" +msgstr "find forfader-revisionen til to revisioner i det angivne indeks" msgid "either two or three arguments required" msgstr "kræver enten to eller tre argumenter" @@ -5511,10 +5617,10 @@ msgstr "" msgid "rebuild the dirstate as it would look like for the given revision" -msgstr "" +msgstr "genopbygger dirstate som den ville se ud for den angivne revision" msgid "validate the correctness of the current dirstate" -msgstr "" +msgstr "valider korrektheden af den nuværende dirstate" #, python-format msgid "%s in state %s, but not in manifest1\n" @@ -5534,6 +5640,7 @@ msgid ".hg/dirstate inconsistent with current parent's manifest" msgstr "" +".hg/dirstate er inkonsistent i forhold til den nuværende forælders manifest" msgid "" "show combined config settings from all hgrc files\n" @@ -5563,7 +5670,7 @@ msgstr "" msgid "show the contents of the current dirstate" -msgstr "" +msgstr "vil indholdet af den nuværende dirstate" #, python-format msgid "copy: %s -> %s\n" @@ -5577,26 +5684,26 @@ msgstr "ugyldig revisionsidentification %s" msgid "parse and display a date" -msgstr "" +msgstr "fortolk og vis en dato" msgid "dump the contents of an index file" -msgstr "" +msgstr "dump indholdet af en indeksfil" msgid "dump an index DAG as a graphviz dot file" -msgstr "" +msgstr "dump en indeks-DAG som en graphviz dot-fil" msgid "test Mercurial installation" msgstr "test Mercurial installationen" #, python-format msgid "Checking encoding (%s)...\n" -msgstr "" +msgstr "Kontrollerer tegnsæt (%s)...\n" msgid " (check that your locale is properly set)\n" msgstr "" msgid "Checking extensions...\n" -msgstr "" +msgstr "Kontrollerer udvidelser...\n" msgid " One or more extensions could not be found" msgstr "" @@ -5622,10 +5729,14 @@ msgid " patch test failed!\n" msgstr "" -msgid " (Current patch tool may be incompatible with patch, or misconfigured. Please check your .hgrc file)\n" -msgstr "" - -msgid " Internal patcher failure, please report this error to http://mercurial.selenic.com/bts/\n" +msgid "" +" (Current patch tool may be incompatible with patch, or misconfigured. " +"Please check your .hgrc file)\n" +msgstr "" + +msgid "" +" Internal patcher failure, please report this error to http://mercurial." +"selenic.com/bts/\n" msgstr "" msgid "Checking commit editor...\n" @@ -5878,7 +5989,8 @@ " If STARTREV is specified, only those heads that are descendants of\n" " STARTREV will be displayed.\n" "\n" -" If -t/--topo is specified, named branch mechanics will be ignored and only\n" +" If -t/--topo is specified, named branch mechanics will be ignored and " +"only\n" " changesets without children will be shown.\n" " " msgstr "" @@ -5907,7 +6019,9 @@ msgstr "brug \"hg help\" for den fulde liste af kommandoer" msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details" -msgstr "brug \"hg help\" for den fulde liste af kommandoer eller \"hg -v\" for detaljer" +msgstr "" +"brug \"hg help\" for den fulde liste af kommandoer eller \"hg -v\" for " +"detaljer" #, python-format msgid "use \"hg -v help%s\" to show aliases and global options" @@ -5937,6 +6051,16 @@ #, python-format msgid "" +"alias for: hg %s\n" +"\n" +"%s" +msgstr "" +"alias for: hg %s\n" +"\n" +"%s" + +#, python-format +msgid "" "\n" "use \"hg -v help %s\" to show verbose help\n" msgstr "" @@ -6225,14 +6349,18 @@ #, python-format msgid "abort: branch '%s' has %d heads - please merge with an explicit rev\n" -msgstr "afbrudt: gren '%s' har %d hoveder - sammenføj venligst med en eksplicit revision\n" +msgstr "" +"afbrudt: gren '%s' har %d hoveder - sammenføj venligst med en eksplicit " +"revision\n" msgid "(run 'hg heads .' to see heads)\n" msgstr "(kør 'hg heads .' for at se hoveder)\n" #, python-format msgid "abort: branch '%s' has one head - please merge with an explicit rev\n" -msgstr "afbrudt: gren '%s' har et hoved - sammenføj venligst med en eksplicit revision\n" +msgstr "" +"afbrudt: gren '%s' har et hoved - sammenføj venligst med en eksplicit " +"revision\n" msgid "(run 'hg heads' to see all heads)\n" msgstr "(kør 'hg heads' for at se alle hoveder)\n" @@ -6244,8 +6372,12 @@ msgid "%s - use \"hg update\" instead" msgstr "%s - brug \"hg update\" istedet" -msgid "working dir not at a head rev - use \"hg update\" or merge with an explicit rev" -msgstr "arbejdskataloget er ikke ved en hovedrevision - brug \"hg update\" eller sammenføj med en eksplicit revision" +msgid "" +"working dir not at a head rev - use \"hg update\" or merge with an explicit " +"rev" +msgstr "" +"arbejdskataloget er ikke ved en hovedrevision - brug \"hg update\" eller " +"sammenføj med en eksplicit revision" msgid "" "show changesets not found in the destination\n" @@ -6491,26 +6623,31 @@ msgstr "" msgid "" -"retry file merges from a merge or update\n" -"\n" -" This command can cleanly retry unresolved file merges using file\n" -" revisions preserved from the last update or merge.\n" -"\n" -" If a conflict is resolved manually, please note that the changes\n" -" will be overwritten if the merge is retried with resolve. The\n" -" -m/--mark switch should be used to mark the file as resolved.\n" -"\n" -" You can specify a set of files to operate on, or use the -a/--all\n" -" switch to select all unresolved files.\n" -"\n" -" This command also allows listing resolved files and manually\n" -" indicating whether or not files are resolved. All files must be\n" -" marked as resolved before a commit is permitted.\n" -"\n" -" The codes used to show the status of files are::\n" -"\n" -" U = unresolved\n" -" R = resolved\n" +"various operations to help finish a merge\n" +"\n" +" This command includes several actions that are often useful while\n" +" performing a merge, after running ``merge`` but before running\n" +" ``commit``. (It is only meaningful if your working directory has\n" +" two parents.) It is most relevant for merges with unresolved\n" +" conflicts, which are typically a result of non-interactive merging with\n" +" ``internal:merge`` or a command-line merge tool like ``diff3``.\n" +"\n" +" The available actions are:\n" +"\n" +" 1) list files that were merged with conflicts (U, for unresolved)\n" +" and without conflicts (R, for resolved): ``hg resolve -l``\n" +" (this is like ``status`` for merges)\n" +" 2) record that you have resolved conflicts in certain files:\n" +" ``hg resolve -m [file ...]`` (default: mark all unresolved files)\n" +" 3) forget that you have resolved conflicts in certain files:\n" +" ``hg resolve -u [file ...]`` (default: unmark all resolved files)\n" +" 4) discard your current attempt(s) at resolving conflicts and\n" +" restart the merge from scratch: ``hg resolve file...``\n" +" (or ``-a`` for all unresolved files)\n" +"\n" +" Note that Mercurial will not let you commit files with unresolved merge\n" +" conflicts. You must use ``hg resolve -m ...`` before you can commit\n" +" after a conflicting merge.\n" " " msgstr "" @@ -6521,7 +6658,9 @@ msgstr "kan ikke angive --all og mønstre" msgid "no files or directories specified; use --all to remerge all files" -msgstr "ingen filer eller mapper specificeret; brug --all for at gen-sammenføje alle filerne" +msgstr "" +"ingen filer eller mapper specificeret; brug --all for at gen-sammenføje alle " +"filerne" msgid "" "restore individual files or directories to an earlier state\n" @@ -6562,7 +6701,9 @@ msgstr "du kan ikke specificeret en revision og en dato" msgid "no files or directories specified; use --all to revert the whole repo" -msgstr "ingen filer eller mapper specificeret; brug --all for at føre hele repo'et tilbage" +msgstr "" +"ingen filer eller mapper specificeret; brug --all for at føre hele repo'et " +"tilbage" #, python-format msgid "forgetting %s\n" @@ -6632,6 +6773,10 @@ " 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" " files.\n" +"\n" +" To have the server choose a free port number to listen on, specify\n" +" a port number of 0; in this case, the server will print the port\n" +" number it uses.\n" " " msgstr "" "eksporter depotet via HTTP\n" @@ -6641,6 +6786,10 @@ " 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.\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 @@ -6922,7 +7071,8 @@ " 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" +" 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" " " @@ -7125,8 +7275,8 @@ msgid "annotate the specified revision" msgstr "annotér den angivne revision" -msgid "follow copies and renames (DEPRECATED)" -msgstr "følg kopier og omdøbninger (FORÆLDET)" +msgid "follow copies/renames and list the filename (DEPRECATED)" +msgstr "følg kopier/omdøbninger og vis filnavnet (FORÆLDET)" msgid "don't follow copies and renames" msgstr "følg ikke kopier og omdøbninger" @@ -7180,7 +7330,7 @@ msgstr "[TILVALG]... [-r] REV" msgid "reset bisect state" -msgstr "nulstil bisect" +msgstr "nulstil tilstand for halvering" msgid "mark changeset good" msgstr "marker ændring som god" @@ -7404,7 +7554,9 @@ msgid "[-nibt] [-r REV] [SOURCE]" msgstr "[-nibt] [-r REV] [KILDE]" -msgid "directory strip option for patch. This has the same meaning as the corresponding patch option" +msgid "" +"directory strip option for patch. This has the same meaning as the " +"corresponding patch option" msgstr "" msgid "base path" @@ -7587,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)" @@ -7853,16 +8005,6 @@ msgstr "ingen definition for alias '%s'\n" #, python-format -msgid "" -"alias for: hg %s\n" -"\n" -"%s" -msgstr "" -"alias for: hg %s\n" -"\n" -"%s" - -#, python-format msgid "alias '%s' resolves to unknown command '%s'\n" msgstr "alias '%s' oversætter til ukendt kommando '%s'\n" @@ -7884,8 +8026,12 @@ msgid "Option --cwd may not be abbreviated!" msgstr "Tilvalget --cwd må ikke forkortes!" -msgid "Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!" -msgstr "Tilvalget -R skal adskilles fra andre tilvalg (fx ikke -qR) og --repository må kun forkortes som --repo!" +msgid "" +"Option -R has to be separated from other options (e.g. not -qR) and --" +"repository may only be abbreviated as --repo!" +msgstr "" +"Tilvalget -R skal adskilles fra andre tilvalg (fx ikke -qR) og --repository " +"må kun forkortes som --repo!" #, python-format msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n" @@ -7902,8 +8048,12 @@ msgid "unrecognized profiling format '%s' - Ignored\n" msgstr "profileringsformat '%s' ikke genkendt - Ignoreret\n" -msgid "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/misc/lsprof/" -msgstr "lsprof er ikke tilgængelig - installer fra http://codespeak.net/svn/user/arigo/hack/misc/lsprof/" +msgid "" +"lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/" +"misc/lsprof/" +msgstr "" +"lsprof er ikke tilgængelig - installer fra http://codespeak.net/svn/user/" +"arigo/hack/misc/lsprof/" #, python-format msgid "*** failed to import extension %s from %s: %s\n" @@ -7967,11 +8117,11 @@ #, python-format msgid "Inconsistent state, %s:%s is good and bad" -msgstr "" +msgstr "Inkonsistent tilstant, %s:%s er god og dårlig" #, python-format msgid "unknown bisect kind %s" -msgstr "" +msgstr "ukendt halverings-type %s" msgid "disabled extensions:" msgstr "deaktiverede udvidelser:" @@ -8473,7 +8623,8 @@ "A template is a piece of text, with markup to invoke variable\n" "expansion::\n" "\n" -" $ hg log -r1 --template \"{node}\\n\"\\n b56ce7b07c52de7d5fd79fb89701ea538af65746\n" +" $ hg log -r1 --template \"{node}\\n\"\n" +" b56ce7b07c52de7d5fd79fb89701ea538af65746\n" "\n" "Strings in curly braces are called keywords. The availability of\n" "keywords depends on the exact context of the templater. These\n" @@ -8523,10 +8674,12 @@ "The \"date\" keyword does not produce human-readable output. If you\n" "want to use a date in your output, you can use a filter to process\n" "it. Filters are functions which return a string based on the input\n" -"variable. You can also use a chain of filters to get the desired\n" -"output::\n" -"\n" -" $ hg tip --template \"{date|isodate}\\n\"\\n 2008-08-21 18:22 +0000\n" +"variable. Be sure to use the stringify filter first when you're\n" +"applying a string-input filter to a list-like input variable.\n" +"You can also use a chain of filters to get the desired output::\n" +"\n" +" $ hg tip --template \"{date|isodate}\\n\"\n" +" 2008-08-21 18:22 +0000\n" "\n" "List of filters:\n" "\n" @@ -8695,7 +8848,9 @@ msgid "destination '%s' is not empty" msgstr "målet '%s' er ikke tomt" -msgid "src repository does not support revision lookup and so doesn't support clone by revision" +msgid "" +"src repository does not support revision lookup and so doesn't support clone " +"by revision" msgstr "" msgid "clone from remote to remote not supported" @@ -8706,14 +8861,19 @@ msgstr "opdaterer til gren %s\n" #, python-format -msgid "%d files updated, %d files merged, %d files removed, %d files unresolved\n" +msgid "" +"%d files updated, %d files merged, %d files removed, %d files unresolved\n" msgstr "" msgid "use 'hg resolve' to retry unresolved file merges\n" msgstr "brug 'hg resolve' for at prøve at sammenføje uløste filer igen\n" -msgid "use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon\n" -msgstr "brug 'hg resolve' for at prøve at sammenføje uløste filer igen eller 'hg up -C' for at opgive\n" +msgid "" +"use 'hg resolve' to retry unresolved file merges or 'hg update -C' to " +"abandon\n" +msgstr "" +"brug 'hg resolve' for at prøve at sammenføje uløste filer igen eller 'hg up -" +"C' for at opgive\n" msgid "(branch merge, don't forget to commit)\n" msgstr "(grensammenføjning, glem ikke at deponere)\n" @@ -8904,7 +9064,8 @@ #, python-format msgid "Named branch could not be reset, current branch still is: %s\n" -msgstr "Navngiven gren kunne ikke nulstilles, den nuværende gren er stadig: %s\n" +msgstr "" +"Navngiven gren kunne ikke nulstilles, den nuværende gren er stadig: %s\n" msgid "no rollback information available\n" msgstr "ingen tilbagerulningsinformation til stede\n" @@ -8922,7 +9083,9 @@ msgstr "arbejdskatalog for %s" msgid "cannot partially commit a merge (do not specify files or patterns)" -msgstr "kan ikke deponere en sammenføjning partielt (undgå at specificere filer eller mønstre)" +msgstr "" +"kan ikke deponere en sammenføjning partielt (undgå at specificere filer " +"eller mønstre)" msgid "file not found!" msgstr "filen blev ikke fundet!" @@ -8954,15 +9117,14 @@ #, python-format msgid "" -"%s: files over 10MB may cause memory and performance problems\n" -"(use 'hg revert %s' to unadd the file)\n" -msgstr "" -"%s: filer på over 10 MB kan skabe hukommelses- og ydelsesproblemer\n" -"(brug 'hg revert %s' for at u-tilføje filen)\n" +"%s: up to %d MB of RAM may be required to manage this file\n" +"(use 'hg revert %s' to cancel the pending addition)\n" +msgstr "" #, python-format msgid "%s not added: only files and symlinks supported currently\n" -msgstr "%s ikke tilføjet: i øjeblikket understøttes kun filer og symbolske lænker\n" +msgstr "" +"%s ikke tilføjet: i øjeblikket understøttes kun filer og symbolske lænker\n" #, python-format msgid "%s already tracked!\n" @@ -8994,9 +9156,6 @@ msgid "queries" msgstr "" -msgid "searching" -msgstr "søger" - msgid "already have changeset " msgstr "har allerede ændringen " @@ -9009,7 +9168,9 @@ msgid "requesting all changes\n" msgstr "anmoder om alle ændringer\n" -msgid "Partial pull cannot be done because other repository doesn't support changegroupsubset." +msgid "" +"Partial pull cannot be done because other repository doesn't support " +"changegroupsubset." msgstr "" #, python-format @@ -9039,21 +9200,21 @@ msgid "%d changesets found\n" msgstr "fandt %d ændringer\n" -msgid "bundle changes" -msgstr "" +msgid "bundling changes" +msgstr "bundter ændringer" msgid "chunks" msgstr "" -msgid "bundle manifests" -msgstr "" +msgid "bundling manifests" +msgstr "bundter manifester" #, python-format msgid "empty or missing revlog for %s" msgstr "tom eller manglende revlog for %s" -msgid "bundle files" -msgstr "" +msgid "bundling files" +msgstr "bundter filer" msgid "adding changesets\n" msgstr "tilføjer ændringer\n" @@ -9163,7 +9324,9 @@ msgstr "" #, python-format -msgid "untracked file in working directory differs from file in requested revision: '%s'" +msgid "" +"untracked file in working directory differs from file in requested revision: " +"'%s'" msgstr "" #, python-format @@ -9236,10 +9399,15 @@ msgstr "intet at sammenføje (brug 'hg update' eller kontroller 'hg heads')" msgid "outstanding uncommitted changes (use 'hg status' to list changes)" -msgstr "udestående 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)" +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')" @@ -9322,6 +9490,15 @@ 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" + #, python-format msgid " %d files changed, %d insertions(+), %d deletions(-)\n" msgstr "%d filer ændret, %d indsættelser(+), %d sletninger(-)\n" @@ -9469,8 +9646,8 @@ msgstr "fjerner underdepot %s\n" #, python-format -msgid "pulling subrepo %s\n" -msgstr "hiver fra underdepot %s\n" +msgid "pulling subrepo %s from %s\n" +msgstr "hiver underdepot %s fra %s\n" #, python-format msgid "pushing subrepo %s\n" @@ -9745,8 +9922,8 @@ msgid "checking changesets\n" msgstr "kontrollerer ændringer\n" -msgid "changelog" -msgstr "" +msgid "checking" +msgstr "kontrollerer" #, python-format msgid "unpacking changeset %s" @@ -9769,7 +9946,7 @@ msgid "crosschecking files in changesets and manifests\n" msgstr "krydstjekker filer i ændringer og manifester\n" -msgid "crosscheck" +msgid "crosschecking" msgstr "" #, python-format