Mercurial > hg

changeset 10866:532138ba8a06 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge stable with stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 06 Apr 2010 15:39:44 +0200
parents 3492f443f579 (current diff) 36cec3184612 (diff)
children 1b82ab3c7194 9606edb8777e
files
diffstat 1 files changed, 231 insertions(+), 172 deletions(-) [+]
line wrap: on
line diff
--- a/i18n/da.po	Tue Apr 06 11:49:42 2010 +0200
+++ b/i18n/da.po	Tue Apr 06 15:39:44 2010 +0200
@@ -17,8 +17,8 @@
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2010-02-28 17:12+0100\n"
-"PO-Revision-Date: 2010-02-28 18:06+0100\n"
+"POT-Creation-Date: 2010-04-04 23:48+0200\n"
+"PO-Revision-Date: 2010-04-05 01:09+0200\n"
 "Last-Translator:  <mg@lazybytes.net>\n"
 "Language-Team: Danish\n"
 "MIME-Version: 1.0\n"
@@ -166,7 +166,7 @@
 msgstr "et bogmærke kan ikke hedde det samme som en eksisterende gren"
 
 msgid "no bookmarks set\n"
-msgstr ""
+msgstr "der er ingen bogmærker\n"
 
 msgid "force"
 msgstr "gennemtving"
@@ -1071,6 +1071,9 @@
 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"
@@ -2169,7 +2172,7 @@
 msgstr ""
 
 msgid "hg keyword configuration and expansion example"
-msgstr ""
+msgstr "eksempel på konfiguration og ekspansion af nøgleord"
 
 msgid ""
 "\n"
@@ -2280,7 +2283,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"
@@ -2316,7 +2318,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"
@@ -2343,7 +2344,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"
@@ -2390,7 +2391,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"
@@ -2506,7 +2507,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"
@@ -2758,7 +2759,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"
@@ -2768,8 +2769,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"
@@ -2784,12 +2785,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"
@@ -2806,7 +2807,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"
@@ -2825,9 +2826,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"
@@ -3235,6 +3235,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"
 
@@ -3789,6 +3795,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"
@@ -3911,6 +3919,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"
@@ -4001,8 +4012,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"
@@ -4084,13 +4126,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"
@@ -4112,9 +4156,11 @@
 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]"
+"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 ""
@@ -4278,35 +4324,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"
@@ -4340,16 +4386,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"
@@ -4370,7 +4417,7 @@
 msgstr "opret ikke en arbejdskopi"
 
 msgid "[-U] SOURCE [DEST]"
-msgstr ""
+msgstr "[-U] KILDE [DESTINATION]"
 
 msgid ""
 "command to transplant changesets from another branch\n"
@@ -4383,15 +4430,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"
@@ -4412,7 +4459,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"
@@ -4519,10 +4566,10 @@
 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"
@@ -4569,10 +4616,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"
@@ -4615,10 +4662,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 ""
@@ -4669,7 +4717,7 @@
 msgstr "ukendt depottype '%s'"
 
 msgid "invalid changegroup"
-msgstr ""
+msgstr "ugyldig changegroup"
 
 msgid "unknown parent"
 msgstr "ukendt forælder"
@@ -4709,24 +4757,24 @@
 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"
 
 #, python-format
 msgid "adding %s\n"
@@ -4819,7 +4867,7 @@
 
 #, python-format
 msgid "manifest:    %d:%s\n"
-msgstr ""
+msgstr "manifest:    %d:%s\n"
 
 #, python-format
 msgid "user:        %s\n"
@@ -4863,21 +4911,21 @@
 
 #, 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 ""
@@ -5197,10 +5245,10 @@
 "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"
@@ -5266,9 +5314,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"
@@ -5335,7 +5385,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"
@@ -5387,20 +5437,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"
@@ -5415,12 +5451,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"
@@ -5431,6 +5467,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"
@@ -5450,22 +5500,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"
@@ -5480,12 +5514,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"
@@ -5496,6 +5531,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"
@@ -5565,10 +5616,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"
@@ -5577,10 +5625,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"
@@ -5600,6 +5648,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"
@@ -5629,7 +5678,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"
@@ -5643,26 +5692,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 ""
@@ -6010,9 +6059,21 @@
 
 #, 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 "\nbrug \"hg -v help %s\" for at se udførlig hjælp\n"
+msgstr ""
+"\n"
+"brug \"hg -v help %s\" for at se udførlig hjælp\n"
 
 msgid "options:\n"
 msgstr "valgmuligheder:\n"
@@ -6296,14 +6357,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"
@@ -6566,26 +6631,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 ""
 
@@ -7205,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"
@@ -7260,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"
@@ -7935,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"
 
@@ -8057,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:"
@@ -8614,8 +8674,9 @@
 "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"
+"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"
@@ -9056,11 +9117,9 @@
 
 #, 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"
@@ -9144,21 +9203,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"
@@ -9857,8 +9916,8 @@
 msgid "checking changesets\n"
 msgstr "kontrollerer ændringer\n"
 
-msgid "changelog"
-msgstr ""
+msgid "checking"
+msgstr "kontrollerer"
 
 #, python-format
 msgid "unpacking changeset %s"
@@ -9881,7 +9940,7 @@
 msgid "crosschecking files in changesets and manifests\n"
 msgstr "krydstjekker filer i ændringer og manifester\n"
 
-msgid "crosscheck"
+msgid "crosschecking"
 msgstr ""
 
 #, python-format