i18n-da: synchronized with 6cb1808e5ae7

i18n/da.po

@@ -17,8 +17,8 b' msgid ""'
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <[e-mail]>\n"
-"POT-Creation-Date: 2009-10-26 19:40+0100\n"
-"PO-Revision-Date: 2009-10-26 20:52+0100\n"
+"POT-Creation-Date: 2009-11-07 23:34+0100\n"
+"PO-Revision-Date: 2009-11-08 00:40+0100\n"
 "Last-Translator:  <[e-mail]>\n"
 "Language-Team: Danish\n"
 "MIME-Version: 1.0\n"
@@ -211,7 +211,7 b' msgid ""'
 "    - hgrc files from the HGRCPATH\n"
 "    - EMAIL\n"
 "    - interactive prompt\n"
-"    - LOGNAME (with '@hostname' appended)\n"
+"    - LOGNAME (with ``@hostname`` appended)\n"
 "\n"
 "    (deprecated, use .hgrc)\n"
 "\n"
@@ -443,11 +443,11 b' msgid ""'
 "              the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
 ":domain:      Any text. Finds the first string that looks like an\n"
 "              email address, and extracts just the domain\n"
-"              component. Example: 'User <[e-mail]>' becomes\n"
-"              'example.com'.\n"
+"              component. Example: ``User <[e-mail]>`` becomes\n"
+"              ``example.com``.\n"
 ":email:       Any text. Extracts the first string that looks like\n"
-"              an email address. Example: 'User <[e-mail]>'\n"
-"              becomes '[e-mail]'.\n"
+"              an email address. Example: ``User <[e-mail]>``\n"
+"              becomes ``[e-mail]``.\n"
 ":escape:      Any text. Replaces the special XML/XHTML characters\n"
 "              \"&\", \"<\" and \">\" with XML entities.\n"
 ":fill68:      Any text. Wraps the text to fit in 68 columns.\n"
@@ -531,7 +531,7 b' msgid ""'
 "  ...\n"
 "\n"
 "You can then use the alias for any command that uses a URL (for\n"
-"example 'hg pull alias1' would pull from the 'alias1' path).\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"
@@ -1011,6 +1011,9 b' msgstr "lav statistik efter antallet af \xc3\xa6ndringer"'
 msgid "sort by key (default: sort by count)"
 msgstr "sorter efter nøgle (standard: sorter efter antal)"
 
+msgid "display added/removed lines separately"
+msgstr ""
+
 msgid "file with email aliases"
 msgstr "fil med email-aliaser"
 
@@ -1164,7 +1167,10 b' msgid ""'
 "    revision control system whose parents should be modified (same\n"
 "    format as a key in .hg/shamap). The values are the revision IDs\n"
 "    (in either the source or destination revision control system) that\n"
-"    should be used as the new parents for that node.\n"
+"    should be used as the new parents for that node. For example, if\n"
+"    you have merged \"release-1.0\" into \"trunk\", then you should\n"
+"    specify the revision on \"trunk\" as the first parent and the one on\n"
+"    the \"release-1.0\" branch as the second.\n"
 "\n"
 "    The branchmap is a file that allows you to rename a branch when it is\n"
 "    being brought in from whatever external repository. When used in\n"
@@ -2293,10 +2299,14 b' msgstr "dette system ser ikke ud til at underst\xc3\xb8tte inotify"'
 
 #, 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: "
@@ -3268,7 +3278,9 b' msgid "Error folding patch %s"'
 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"
@@ -3812,14 +3824,20 b' msgid ""'
 "\n"
 "diffs (truncated from %d to %d lines):\n"
 "\n"
-msgstr "\nændringer (afkortet fra %d til %d linier):\n\n"
+msgstr ""
+"\n"
+"ændringer (afkortet fra %d til %d linier):\n"
+"\n"
 
 #, python-format
 msgid ""
 "\n"
 "diffs (%d lines):\n"
 "\n"
-msgstr "\nændringer (%d linier):\n\n"
+msgstr ""
+"\n"
+"ændringer (%d linier):\n"
+"\n"
 
 #, python-format
 msgid "notify: suppressing notification for merge %d:%s\n"
@@ -3946,14 +3964,14 b' msgid ""'
 msgstr ""
 
 #, python-format
-msgid "%sPlease enter a valid value"
-msgstr "%sAngiv venligst en gyldig værdi."
+msgid "%s Please enter a valid value"
+msgstr "%s Angiv venligst en gyldig værdi"
 
 msgid "Please enter a valid value.\n"
 msgstr "Angiv venligst en gyldig værdi.\n"
 
-msgid "does the diffstat above look okay? "
-msgstr "ser det ovenstående diffstat okay ud? "
+msgid "does the diffstat above look okay?"
+msgstr "ser det ovenstående diffstat okay ud?"
 
 msgid "diffstat rejected"
 msgstr "diffstat afvist"
@@ -4026,13 +4044,18 b' msgid ""'
 "\n"
 "Write the introductory message for the patch series.\n"
 "\n"
-msgstr "\nSkriv introduktionsbeskeden for rettelsesserien.\n\n"
+msgstr ""
+"\n"
+"Skriv introduktionsbeskeden for rettelsesserien.\n"
+"\n"
 
 #, python-format
 msgid ""
 "This patch series consists of %d patches.\n"
 "\n"
-msgstr "Denne rettelsesserie består af %d rettelser.\n\n"
+msgstr ""
+"Denne rettelsesserie består af %d rettelser.\n"
+"\n"
 
 msgid "Final summary:\n"
 msgstr "Endeligt sammendrag:\n"
@@ -4404,6 +4427,77 b' msgstr "hg record [TILVALG]... [FIL]..."'
 msgid "hg qrecord [OPTION]... PATCH [FILE]..."
 msgstr "hg qrecord [TILVALG]... RETTELSE [FIL]..."
 
+msgid "recreates hardlinks between repository clones"
+msgstr ""
+
+msgid ""
+"recreate hardlinks between two repositories\n"
+"\n"
+"    When repositories are cloned locally, their data files will be "
+"hardlinked\n"
+"    so that they only use the space of a single repository.\n"
+"\n"
+"    Unfortunately, subsequent pulls into either repository will break "
+"hardlinks\n"
+"    for any files touched by the new changesets, even if both repositories "
+"end\n"
+"    up pulling the same changes.\n"
+"\n"
+"    Similarly, passing --rev to \"hg clone\" will fail to use\n"
+"    any hardlinks, falling back to a complete copy of the source "
+"repository.\n"
+"\n"
+"    This command lets you recreate those hardlinks and reclaim that wasted\n"
+"    space.\n"
+"\n"
+"    This repository will be relinked to share space with ORIGIN, which must "
+"be\n"
+"    on the same local disk. If ORIGIN is omitted, looks for \"default-relink"
+"\",\n"
+"    then \"default\", in [paths].\n"
+"\n"
+"    Do not attempt any read operations on this repository while the command "
+"is\n"
+"    running. (Both repositories will be locked against writes.)\n"
+"    "
+msgstr ""
+
+#, python-format
+msgid "relinking %s to %s\n"
+msgstr ""
+
+#, python-format
+msgid "collected %d candidate storage files\n"
+msgstr ""
+
+msgid "source and destination are on different devices"
+msgstr "kilden og destinationen er på forskellige enheder"
+
+#, python-format
+msgid "not linkable: %s\n"
+msgstr ""
+
+#, python-format
+msgid "pruned down to %d probably relinkable files\n"
+msgstr ""
+
+msgid " files"
+msgstr " filer"
+
+msgid "relink"
+msgstr ""
+
+#, python-format
+msgid "%s: %s\n"
+msgstr "%s: %s\n"
+
+#, python-format
+msgid "relinked %d files (%d bytes reclaimed)\n"
+msgstr ""
+
+msgid "[ORIGIN]"
+msgstr ""
+
 msgid "share a common history between several working directories"
 msgstr ""
 
@@ -4905,10 +4999,6 b' msgstr ""'
 msgid "cannot follow nonexistent file: \"%s\""
 msgstr ""
 
-#, python-format
-msgid "%s:%s copy source revision cannot be found!\n"
-msgstr ""
-
 msgid "can only follow copies/renames for explicit filenames"
 msgstr ""
 
@@ -5380,22 +5470,36 b' msgid ""'
 "    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"
-"    If you use the -r/--rev option to clone up to a specific revision,\n"
-"    no subsequent revisions (including subsequent tags) will be\n"
-"    present in the cloned repository. This option implies --pull, even\n"
-"    on local repositories.\n"
-"\n"
-"    By default, clone will check out the head of the 'default' branch.\n"
-"    If the -U/--noupdate option is used, the new clone will contain\n"
-"    only a repository (.hg) and no working copy (the working copy\n"
-"    parent is the null revision).\n"
-"\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"
 "\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 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"
+"    of the changesets of the source repository. Only the set of changesets\n"
+"    defined by all -r/--rev options (including their direct and indirect\n"
+"    parent changesets) will be pulled into the destination repository.\n"
+"    No subsequent changesets (including subsequent tags) will be present\n"
+"    in the destination.\n"
+"\n"
+"    Using -r/--rev (or 'clone src#rev dest') implies --pull, even for\n"
+"    local source repositories.\n"
+"\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"
@@ -5426,16 +5530,6 b' msgstr ""'
 "    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"
-"    Hvis du bruger -r/--rev tilvalget for at klone op til en specifik\n"
-"    revision, så vil ingen efterfølgende revisioner (inklusiv\n"
-"    efterfølgende mærkater) findes i det klonede depot. Denne\n"
-"    valgmulighed medfører --pull, selv ved lokale depoter.\n"
-"\n"
-"    Som udgangspunkt vil clone hente hovedet af 'default' grenen. Hvis\n"
-"    -U/--noupdate tilvalget bruges vil den nye klon kun indeholde et\n"
-"    depot (.hg) og intet arbejdskatalog (arbejdskatalogets forælder er\n"
-"    sat til nul revisionen).\n"
-"\n"
 "    Se 'hg help urls' for detaljer om gyldige formatter for kilden.\n"
 "\n"
 "    Det er muligt at specificere en ssh:// URL som destination, men\n"
@@ -5443,6 +5537,33 b' msgstr ""'
 "    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) 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"
+"    klonede depot kun indeholde en delmængde af ændringerne i\n"
+"    kildedepotet. Det er kun mængden af ændringer defineret af alle\n"
+"    -r/--rev tilvalgene (inklusiv deres direkte og indirekte forfædre)\n"
+"    som vil blive hevet ind i destinationsdepotet. Ingen efterfølgende\n"
+"    revisioner (inklusiv efterfølgende mærkater) vil findes i\n"
+"    destinationen.\n"
+"\n"
+"    Brug af -r/--rev (eller 'clone kilde#rev destination') medfører\n"
+"    --pull, selv ved lokale depoter.\n"
+"\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"
@@ -5463,6 +5584,9 b' msgstr ""'
 "    såsom mq.\n"
 "    "
 
+msgid "cannot specify both --noupdate and --updaterev"
+msgstr "man kan ikke angive både --noupdate og --updaterev"
+
 msgid ""
 "commit the specified files or all outstanding changes\n"
 "\n"
@@ -6001,6 +6125,9 b' msgstr ""'
 "basale kommandoer:\n"
 "\n"
 
+msgid "DEPRECATED"
+msgstr ""
+
 msgid ""
 "\n"
 "additional help topics:\n"
@@ -6029,7 +6156,8 b' msgstr ""'
 msgid ""
 "import an ordered set of patches\n"
 "\n"
-"    Import a list of patches and commit them individually.\n"
+"    Import a list of patches and commit them individually (unless\n"
+"    --no-commit is specified).\n"
 "\n"
 "    If there are outstanding changes in the working directory, import\n"
 "    will abort unless given the -f/--force flag.\n"
@@ -6501,14 +6629,16 b' msgstr ""'
 msgid ""
 "retry file merges from a merge or update\n"
 "\n"
-"    This command will cleanly retry unresolved file merges using file\n"
-"    revisions preserved from the last update or merge. To attempt to\n"
-"    resolve all unresolved files, use the -a/--all switch.\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"
@@ -6906,58 +7036,68 b' msgid ""'
 "update working directory\n"
 "\n"
 "    Update the repository's working directory to the specified\n"
-"    revision, or the tip of the current branch if none is specified.\n"
-"    Use null as the revision to remove the working copy (like 'hg\n"
+"    changeset.\n"
+"\n"
+"    If no changeset is specified, attempt to update to the head of the\n"
+"    current branch. If this head is a descendant of the working\n"
+"    directory's parent, update to it, otherwise abort.\n"
+"\n"
+"    The following rules apply when the working directory contains\n"
+"    uncommitted changes:\n"
+"\n"
+"    1. If neither -c/--check nor -C/--clean is specified, uncommitted\n"
+"       changes are merged into the requested changeset, and the merged "
+"result\n"
+"       is left uncommitted. Updating and merging will occur only if the\n"
+"       requested changeset is an ancestor or descendant of the parent\n"
+"       changeset. Otherwise, the update is aborted and the uncommitted "
+"changes\n"
+"       are preserved.\n"
+"\n"
+"    2. With the -c/--check option, the update is aborted and the\n"
+"       uncommitted changes are preserved.\n"
+"\n"
+"    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 'hg\n"
 "    clone -U').\n"
 "\n"
-"    When the working directory contains no uncommitted changes, it\n"
-"    will be replaced by the state of the requested revision from the\n"
-"    repository. When the requested revision is on a different branch,\n"
-"    the working directory will additionally be switched to that\n"
-"    branch.\n"
-"\n"
-"    When there are uncommitted changes, use option -C/--clean to\n"
-"    discard them, forcibly replacing the state of the working\n"
-"    directory with the requested revision. Alternately, use -c/--check\n"
-"    to abort.\n"
-"\n"
-"    When there are uncommitted changes and option -C/--clean is not\n"
-"    used, and the parent revision and requested revision are on the\n"
-"    same branch, and one of them is an ancestor of the other, then the\n"
-"    new working directory will contain the requested revision merged\n"
-"    with the uncommitted changes. Otherwise, the update will fail with\n"
-"    a suggestion to use 'merge' or 'update -C' instead.\n"
-"\n"
-"    If you want to update just one file to an older revision, use\n"
-"    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"
 "    "
 msgstr ""
 "opdater arbejdskataloget\n"
 "\n"
-"    Opdater depotets arbejdskatalog til den angivne revision, eller\n"
-"    spidsen af den nuværende gren hvis ingen revision er angivet. Brug\n"
-"    null som revision for at fjerne arbejdskataloget (ligesom 'hg\n"
+"    Opdater depotets arbejdskatalog til den angivne ændring.\n"
+"\n"
+"    Hvis der ikke er angivet nogen ændring, forsøg da at opdatere til\n"
+"    spidsen af den nuværende gren. Hvis dette hoved nedstammer fra\n"
+"    arbejdskatalogets forælder, da opdateres der til det, ellers\n"
+"    afbrydes der.\n"
+"\n"
+"    De følgende regler gælder når arbejdskataloget indeholder\n"
+"    udeponerede ændringer:\n"
+"\n"
+"    1. Hvis hverken -c/--check eler -C/--clean er angivet, så bliver\n"
+"       udeponerede ændringer føjet ind i den ønskede ændring og det\n"
+"       sammenføjne resultat bliver efterlad udeponeret. Opdateringen\n"
+"       eller sammenføjningen vil kun finde sted hvis den ønskede\n"
+"       ændring er forfar til eller nedstammer fra forældreændringen.\n"
+"       Ellers vil opdateringen blive afbrudt og de udeponerede\n"
+"       ændringer bliver bevaret.\n"
+"\n"
+"    2. Med -c/--check tilvalget vil opdateringen blive afbrudt og de\n"
+"       udeponerede ændringer bliver bevaret.\n"
+"\n"
+"    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 'hg\n"
 "    clone -U').\n"
 "\n"
-"    Hvis arbejdskataloget ikke indeholder nogen ikke-deponerede\n"
-"    ændringer, da vil det blive erstattet af den ønskede revision fra\n"
-"    depotet. Hvis den ønskede revision er på en anden gren, så vil\n"
-"    arbejdskataloget yderligere blive skiftet til denne gren.\n"
-"\n"
-"    Hvis der er ikke-deponerede ændringer kan -C/--clean tilvalget\n"
-"    bruges for at kassere dem og sætte tilstanden af arbejdskataloget\n"
-"    lig tilstanden i den ønskede revision. Alternativt, brug\n"
-"    -c/--check for at afbryde.\n"
-"\n"
-"    Hvis der er ikke-deponerede ændringer, og -C/--clean tilvalget\n"
-"    ikke bruges, og forældrerevisionen og den ønskede revision begge\n"
-"    er på samme gren, og en af dem er en forfar til den anden, så vil\n"
-"    det nye arbejdskatalog indeholde den ønskede revision sammenføjet\n"
-"    med de ikke-deponerede ændringer. Ellers vil opdateringen fejle\n"
-"    med et forslag til at bruge 'merge' eller 'update -C' i stedet.\n"
-"\n"
 "    Hvis du vil opdatere blot en enkelt fil til en ældre revision,\n"
 "    brug da revert.\n"
 "\n"
@@ -7039,8 +7179,8 b' msgstr "angiv tegnkodningen"'
 msgid "set the charset encoding mode"
 msgstr "angiv tegnkodningstilstand"
 
-msgid "print traceback on exception"
-msgstr "udskriv traceback ved exception"
+msgid "always print a traceback on exception"
+msgstr "udskriv altid traceback ved fejlsituationer"
 
 msgid "time how long the command takes"
 msgstr "tag tid på hvor lang tid kommandoen tager"
@@ -7099,6 +7239,9 b' msgstr "inkluder ikke datoer i diff-hove'
 msgid "show which function each change is in"
 msgstr "vis hvilken funktion hver ændring er i"
 
+msgid "produce a diff that undoes the changes"
+msgstr ""
+
 msgid "ignore white space when comparing lines"
 msgstr "ignorer blanktegn når linier sammenlignes"
 
@@ -7111,6 +7254,9 b' msgstr "ignorer \xc3\xa6ndringer hvis linier alle er blanke"'
 msgid "number of lines of context to show"
 msgstr "antal linier kontekst der skal vises"
 
+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)"
 
@@ -7240,6 +7386,9 b' msgstr "[TILVALG]... FIL..."'
 msgid "the clone will only contain a repository (no working copy)"
 msgstr "klonen vil kun indeholde et depot (intet arbejdsbibliotek)"
 
+msgid "revision, tag or branch to check out"
+msgstr "revision, mærkat eller gren som skal hentes ud"
+
 msgid "a changeset you would like to have after cloning"
 msgstr "en ændringer du gerne vil have efter kloningen"
 
@@ -7407,8 +7556,8 b' msgstr "vis nyeste postering f\xc3\xb8rst"'
 msgid "file to store the bundles into"
 msgstr "fil hvor bundterne skal gemmes"
 
-msgid "a specific revision up to which you would like to pull"
-msgstr "en specifik revision hvortil du gerne vil trække"
+msgid "a specific remote revision up to which you would like to pull"
+msgstr "en specifik revision op til hvilken du gerne vil trække"
 
 msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
 msgstr "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILNAVN] [KILDE]"
@@ -7515,8 +7664,8 b' msgstr ""'
 msgid "[OPTION]... SOURCE... DEST"
 msgstr "[TILVALG]... KILDE... MÅL"
 
-msgid "remerge all unresolved files"
-msgstr "gen-sammenføj alle uløste filer"
+msgid "select all unresolved files"
+msgstr "vælg alle uløste filer"
 
 msgid "list state of files needing merge"
 msgstr "vis tilstand af filer som har brug for sammenføjning"
@@ -7527,6 +7676,9 b' msgstr "marker filer som l\xc3\xb8ste"'
 msgid "unmark files as resolved"
 msgstr "marker filer som uløste"
 
+msgid "hide status prefix"
+msgstr "skjul statuspræfix"
+
 msgid "revert all changes when no arguments given"
 msgstr "før alle ændringer tilbage når inget argument angives"
 
@@ -7611,9 +7763,6 b' msgstr "vis kun ukendte filer"'
 msgid "show only ignored files"
 msgstr "vis kun ignorerede filer"
 
-msgid "hide status prefix"
-msgstr "skjul statuspræfix"
-
 msgid "show source of copied files"
 msgstr "vis kilder for kopierede filer"
 
@@ -7644,14 +7793,14 b' msgstr "opdater til ny spids hvis \xc3\xa6ndringer blev pakket ud"'
 msgid "[-u] FILE..."
 msgstr "[-u] FIL..."
 
-msgid "overwrite locally modified files (no backup)"
-msgstr "overskrev lokalt modificerede filer (uden sikkerhedskopi)"
+msgid "discard uncommitted changes (no backup)"
+msgstr "kasser ikke-deponerede ændringer (ingen sikkerhedskopi)"
 
 msgid "check for uncommitted changes"
 msgstr "kontroller for udeponerede ændringer"
 
-msgid "[-C] [-d DATE] [[-r] REV]"
-msgstr "[-C] [-d DATO] [[-r] REV]"
+msgid "[-c] [-C] [-d DATE] [[-r] REV]"
+msgstr "[-c] [-C] [-d DATO] [[-r] REV]"
 
 #, python-format
 msgid "config error at %s:%d: '%s'"
@@ -8092,8 +8241,16 b' msgid "real URL is %s\\n"'
 msgstr "den rigtige URL er %s\n"
 
 #, python-format
-msgid "'%s' does not appear to be an hg repository"
-msgstr "'%s' ser ikke ud til at være et hg depot"
+msgid ""
+"'%s' does not appear to be an hg repository:\n"
+"---%%<--- (%s)\n"
+"%s\n"
+"---%%<---\n"
+msgstr ""
+"'%s' ser ikke ud til at være et hg depot:\n"
+"---%%<--- (%s)\n"
+"%s\n"
+"---%%<---\n"
 
 #, python-format
 msgid "'%s' sent a broken Content-Type header (%s)"
@@ -8164,8 +8321,8 b' msgstr "arbejdsbiblioteket har ukendt for\xc3\xa6ldre \'%s\'!"'
 msgid "unknown revision '%s'"
 msgstr "ukendt revision '%s'"
 
-msgid "journal already exists - run hg recover"
-msgstr "journalen eksisterer allerede -- kør hg recover"
+msgid "abandoned transaction found - run hg recover"
+msgstr ""
 
 msgid "rolling back interrupted transaction\n"
 msgstr "ruller afbrudt transaktion tilbage\n"
@@ -8472,17 +8629,13 b' msgid "outstanding uncommitted changes ('
 msgstr ""
 "udestående ikke-deponerede ændringer (brug 'hg status' for at se ændringer)"
 
-msgid "crosses branches (use 'hg merge' or 'hg update -C' to discard changes)"
-msgstr ""
-"krydser grene (brug 'hg merge' eller 'hg update -C' for at kassere "
-"ændringerne)"
-
-msgid "crosses branches (use 'hg merge' or 'hg update -C')"
-msgstr "krydser grene (brug 'hg merge' eller 'hg update -C')"
-
-msgid "crosses named branches (use 'hg update -C' to discard changes)"
-msgstr ""
-"krydser navngivne grene (brug 'hg update -C' for at kassere ændringerne)"
+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')"
 
 #, python-format
 msgid "cannot create %s: destination already exists"
@@ -8658,6 +8811,10 b' msgstr "skub afvist: %s"'
 msgid "unsynced changes"
 msgstr ""
 
+#, python-format
+msgid "'%s' does not appear to be an hg repository"
+msgstr "'%s' ser ikke ud til at være et hg depot"
+
 msgid "cannot lock static-http repository"
 msgstr "kan ikke låse static-http depot"
 
@@ -8943,6 +9100,9 b' msgstr "kontrollerer for\xc3\xa6ldre til %s"'
 msgid "duplicate revision %d (%d)"
 msgstr "duplikeret revision %d (%d)"
 
+msgid "abandoned transaction found - run hg recover\n"
+msgstr ""
+
 #, python-format
 msgid "repository uses revlog format %d\n"
 msgstr "depotet bruger revlog format %d\n"