i18n-da: synchronized with hg.pot

i18n/da.po

@@ -16,8 +16,8 b''
 msgid ""
 msgstr ""
 "Project-Id-Version: Mercurial\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-08 00:41+0200\n"
+"Report-Msgid-Bugs-To: <[e-mail]>\n"
+"POT-Creation-Date: 2009-05-02 17:00+0200\n"
 "PO-Revision-Date: 2009-04-08 00:44+0200\n"
 "Last-Translator:  <[e-mail]>\n"
 "Language-Team: Danish\n"
@@ -171,7 +171,7 b' msgid ""'
 "Set the name of the bookmark that we are currently on\n"
 "\n"
 "    Set the name of the bookmark that we are on (hg update <bookmark>).\n"
-"    The name is recoreded in .hg/bookmarks.current\n"
+"    The name is recorded in .hg/bookmarks.current\n"
 "    "
 msgstr ""
 
@@ -496,13 +496,14 b' msgstr ""'
 msgid "database error: %s"
 msgstr ""
 
+#, fuzzy
 msgid ""
 "show the children of the given or working directory revision\n"
 "\n"
 "    Print the children of the working directory's revisions. If a\n"
-"    revision is given via --rev, the children of that revision will be\n"
-"    printed. If a file argument is given, revision in which the file\n"
-"    was last changed (after the working directory revision or the\n"
+"    revision is given via --rev/-r, the children of that revision will\n"
+"    be printed. If a file argument is given, revision in which the\n"
+"    file was last changed (after the working directory revision or the\n"
 "    argument to --rev if given) is printed.\n"
 "    "
 msgstr ""
@@ -531,10 +532,11 b' msgstr ""'
 msgid "Revision %d is a merge, ignoring...\n"
 msgstr ""
 
-#, python-format
-msgid "\rgenerating stats: %d%%"
-msgstr ""
-
+#, fuzzy, python-format
+msgid "generating stats: %d%%"
+msgstr "genopretter status: %s\n"
+
+#, fuzzy
 msgid ""
 "graph count of revisions grouped by template\n"
 "\n"
@@ -560,7 +562,11 b' msgid ""'
 "\n"
 "    The map file format used to specify aliases is fairly simple:\n"
 "\n"
-"    <alias email> <actual email>"
+"    <alias email> <actual email>\n"
+"\n"
+"    By default .hgchurn in the working directory root will be used, if\n"
+"    it exists. Use the --aliases option to override this.\n"
+"    "
 msgstr ""
 "plot antallet af revisioner grupperet efter et mønster\n"
 "\n"
@@ -809,6 +815,9 b' msgid ""'
 "    Internal cvsps is selected by setting\n"
 "        --config convert.cvsps=builtin\n"
 "    and has a few more configurable options:\n"
+"        --config convert.cvsps.cache=True     (boolean)\n"
+"            Set to False to disable remote log caching, for testing and\n"
+"            debugging purposes.\n"
 "        --config convert.cvsps.fuzz=60        (integer)\n"
 "            Specify the maximum time (in seconds) that is allowed\n"
 "            between commits with identical user and log message in a\n"
@@ -985,6 +994,10 b' msgid "%s %s"'
 msgstr ""
 
 #, python-format
+msgid "syntax error in %s(%d): key/value pair expected"
+msgstr ""
+
+#, python-format
 msgid "could not open map file %r: %s"
 msgstr ""
 
@@ -1127,6 +1140,12 b' msgid "synthetic changeset cannot have m'
 msgstr ""
 
 #, python-format
+msgid ""
+"warning: CVS commit message references non-existent branch %r:\n"
+"%s\n"
+msgstr ""
+
+#, python-format
 msgid "%d changeset entries\n"
 msgstr "%d ændringer\n"
 
@@ -1277,7 +1296,7 b' msgstr ""'
 msgid "found branch %s at %d\n"
 msgstr ""
 
-msgid "svn: start revision is not supported with with more than one branch"
+msgid "svn: start revision is not supported with more than one branch"
 msgstr ""
 
 #, python-format
@@ -1425,19 +1444,16 b' msgid ""'
 "fast (at least faster than having to compare the entire tree).\n"
 msgstr ""
 
-msgid "snapshot files as of some revision"
+msgid ""
+"snapshot files as of some revision\n"
+"    if not using snapshot, -I/-X does not work and recursive diff\n"
+"    in tools like kdiff3 and meld displays too many files."
 msgstr ""
 
 #, python-format
 msgid "making snapshot of %d files from rev %s\n"
 msgstr ""
 
-msgid ""
-"snapshot files from working directory.\n"
-"    if not using snapshot, -I/-X does not work and recursive diff\n"
-"    in tools like kdiff3 and meld displays too many files."
-msgstr ""
-
 #, python-format
 msgid "making snapshot of %d files from working directory\n"
 msgstr ""
@@ -1473,10 +1489,10 b' msgid ""'
 "    an external program. The default program used is diff, with\n"
 "    default options \"-Npru\".\n"
 "\n"
-"    To select a different program, use the -p option. The program will\n"
-"    be passed the names of two directories to compare. To pass\n"
-"    additional options to the program, use the -o option. These will\n"
-"    be passed before the names of the directories to compare.\n"
+"    To select a different program, use the -p/--program option. The\n"
+"    program will be passed the names of two directories to compare. To\n"
+"    pass additional options to the program, use -o/--option. These\n"
+"    will be passed before the names of the directories to compare.\n"
 "\n"
 "    When two revision arguments are given, then changes are shown\n"
 "    between those revisions. If only one revision is specified then\n"
@@ -2259,7 +2275,11 b' msgid "Overwrites selected files expandi'
 msgstr ""
 
 #, python-format
-msgid "overwriting %s %s keywords\n"
+msgid "overwriting %s expanding keywords\n"
+msgstr ""
+
+#, python-format
+msgid "overwriting %s shrinking keywords\n"
 msgstr ""
 
 msgid "Unconditionally removes all keyword substitutions from text."
@@ -2844,14 +2864,14 b' msgid ""'
 "remove patches from queue\n"
 "\n"
 "    The patches must not be applied, unless they are arguments to the\n"
-"    --rev parameter. At least one patch or revision is required.\n"
+"    -r/--rev parameter. At least one patch or revision is required.\n"
 "\n"
 "    With --rev, mq will stop managing the named revisions (converting\n"
 "    them to regular mercurial changesets). The qfinish command should\n"
-"    be used as an alternative for qdel -r, as the latter option is\n"
+"    be used as an alternative for qdelete -r, as the latter option is\n"
 "    deprecated.\n"
 "\n"
-"    With --keep, the patch files are preserved in the patch\n"
+"    With -k/--keep, the patch files are preserved in the patch\n"
 "    directory."
 msgstr ""
 
@@ -2869,31 +2889,35 b' msgid ""'
 "    to the series.\n"
 "\n"
 "    The patch will have the same name as its source file unless you\n"
-"    give it a new one with --name.\n"
+"    give it a new one with -n/--name.\n"
 "\n"
 "    You can register an existing patch inside the patch directory with\n"
-"    the --existing flag.\n"
-"\n"
-"    With --force, an existing patch of the same name will be\n"
+"    the -e/--existing flag.\n"
+"\n"
+"    With -f/--force, an existing patch of the same name will be\n"
 "    overwritten.\n"
 "\n"
-"    An existing changeset may be placed under mq control with --rev\n"
+"    An existing changeset may be placed under mq control with -r/--rev\n"
 "    (e.g. qimport --rev tip -n patch will place tip under mq control).\n"
-"    With --git, patches imported with --rev will use the git diff\n"
+"    With -g/--git, patches imported with --rev will use the git diff\n"
 "    format. See the diffs help topic for information on why this is\n"
 "    important for preserving rename/copy information and permission\n"
 "    changes.\n"
+"\n"
+"    To import a patch from standard input, pass - as the patch file.\n"
+"    When importing from standard input, a patch name must be specified\n"
+"    using the --name flag.\n"
 "    "
 msgstr ""
 
 msgid ""
 "init a new queue repository\n"
 "\n"
-"    The queue repository is unversioned by default. If -c is\n"
-"    specified, qinit will create a separate nested repository for\n"
-"    patches (qinit -c may also be run later to convert an unversioned\n"
-"    patch repository into a versioned one). You can use qcommit to\n"
-"    commit changes to this queue repository."
+"    The queue repository is unversioned by default. If\n"
+"    -c/--create-repo is specified, qinit will create a separate nested\n"
+"    repository for patches (qinit -c may also be run later to convert\n"
+"    an unversioned patch repository into a versioned one). You can use\n"
+"    qcommit to commit changes to this queue repository."
 msgstr ""
 
 msgid ""
@@ -2954,19 +2978,21 b' msgid ""'
 "\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 is specified, in which case the patch will be\n"
-"    initialized with them. You may also use -I, -X, and/or a list of\n"
-"    files after the patch name to add only changes to matching files\n"
-"    to the new patch, leaving the rest as uncommitted modifications.\n"
-"\n"
-"    -u and -d can be used to set the (given) user and date, respectively.\n"
-"    -U and -D set user to current user and date to current date.\n"
-"\n"
-"    -e, -m or -l set the patch header as well as the commit message.\n"
-"    If none is specified, the header is empty and the commit message\n"
-"    is '[mq]: PATCH'.\n"
-"\n"
-"    Use the --git option to keep the patch in the git extended diff\n"
+"    unless -f/--force is specified, in which case the patch will be\n"
+"    initialized with them. 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"
+"\n"
+"    -u/--user and -d/--date can be used to set the (given) user and\n"
+"    date, respectively. -U/--currentuser and -D/--currentdate set user\n"
+"    to current user and date to current date.\n"
+"\n"
+"    -e/--edit, -m/--message or -l/--logfile set the patch header as\n"
+"    well as the commit message. If none is specified, the header is\n"
+"    empty and the commit message is '[mq]: PATCH'.\n"
+"\n"
+"    Use the -g/--git option to keep the patch in the git extended diff\n"
 "    format. Read the diffs help topic for more information on why this\n"
 "    is important for preserving permission changes and copy/rename\n"
 "    information.\n"
@@ -2980,13 +3006,13 b' msgid ""'
 "    contain only the modifications that match those patterns; the\n"
 "    remaining modifications will remain in the working directory.\n"
 "\n"
-"    If --short is specified, files currently included in the patch\n"
+"    If -s/--short is specified, files currently included in the patch\n"
 "    will be refreshed just like matched files and remain in the patch.\n"
 "\n"
 "    hg add/remove/copy/rename work as usual, though you might want to\n"
-"    use git-style patches (--git or [diff] git=1) to track copies and\n"
-"    renames. See the diffs help topic for more information on the git\n"
-"    diff format.\n"
+"    use git-style patches (-g/--git or [diff] git=1) to track copies\n"
+"    and renames. See the diffs help topic for more information on the\n"
+"    git diff format.\n"
 "    "
 msgstr ""
 
@@ -3077,8 +3103,8 b' msgstr ""'
 msgid ""
 "push the next patch onto the stack\n"
 "\n"
-"    When --force is applied, all local changes in patched files will\n"
-"    be lost.\n"
+"    When -f/--force is applied, all local changes in patched files\n"
+"    will be lost.\n"
 "    "
 msgstr ""
 
@@ -3214,10 +3240,10 b' msgid ""'
 "    patches) by moving them out of mq control into regular repository\n"
 "    history.\n"
 "\n"
-"    Accepts a revision range or the --applied option. If --applied is\n"
-"    specified, all applied mq revisions are removed from mq control.\n"
-"    Otherwise, the given revisions must be at the base of the stack of\n"
-"    applied patches.\n"
+"    Accepts a revision range or the -a/--applied option. If --applied\n"
+"    is specified, all applied mq revisions are removed from mq\n"
+"    control. Otherwise, the given revisions must be at the base of the\n"
+"    stack of applied patches.\n"
 "\n"
 "    This can be especially useful if your changes have been applied to\n"
 "    an upstream repository, or if you are about to push your changes\n"
@@ -3702,7 +3728,7 b' msgid ""'
 "is set, your pager will be fired up once for each patchbomb message,\n"
 "so you can verify everything is alright.\n"
 "\n"
-"The \"-m\" (mbox) option is also very useful. Instead of previewing each\n"
+"The -m/--mbox option is also very useful. Instead of previewing each\n"
 "patchbomb message in a pager or sending the messages directly, it will\n"
 "create a UNIX mailbox file with the patch emails. This mailbox file\n"
 "can be previewed with any mail user agent which supports UNIX mbox\n"
@@ -3748,11 +3774,11 b' msgid ""'
 "    program is installed, the result of running diffstat on the patch.\n"
 "    Finally, the patch itself, as generated by \"hg export\".\n"
 "\n"
-"    With --outgoing, emails will be generated for patches not found in\n"
-"    the destination repository (or only those which are ancestors of\n"
-"    the specified revisions if any are provided)\n"
-"\n"
-"    With --bundle, changesets are selected as for --outgoing, but a\n"
+"    With -o/--outgoing, emails will be generated for patches not found\n"
+"    in the destination repository (or only those which are ancestors\n"
+"    of the specified revisions if any are provided)\n"
+"\n"
+"    With -b/--bundle, changesets are selected as for --outgoing, but a\n"
 "    single email containing a binary Mercurial bundle as an attachment\n"
 "    will be sent.\n"
 "\n"
@@ -3851,6 +3877,9 b' msgstr ""'
 msgid "subject of first message (intro or single patch)"
 msgstr ""
 
+msgid "\"message identifier to reply to\""
+msgstr ""
+
 msgid "email addresses of recipients"
 msgstr ""
 
@@ -3869,10 +3898,11 b' msgstr ""'
 msgid "a revision to send"
 msgstr ""
 
-msgid "run even when remote repository is unrelated (with -b)"
-msgstr ""
-
-msgid "a base changeset to specify instead of a destination (with -b)"
+#, fuzzy
+msgid "run even when remote repository is unrelated (with -b/--bundle)"
+msgstr "kør selv hvis fjernarkivet er urelateret"
+
+msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
 msgstr ""
 
 msgid "send an introduction email for a single patch"
@@ -3931,7 +3961,7 b' msgstr ""'
 msgid "print the file names instead of deleting them"
 msgstr ""
 
-msgid "end filenames with NUL, for use with xargs (implies -p)"
+msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
 msgstr ""
 
 msgid "hg purge [OPTION]... [DIR]..."
@@ -3961,7 +3991,7 b' msgid ""'
 "    changes relative to a master development tree.\n"
 "\n"
 "    If a rebase is interrupted to manually resolve a merge, it can be\n"
-"    continued with --continue or aborted with --abort.\n"
+"    continued with --continue/-c or aborted with --abort/-a.\n"
 "    "
 msgstr ""
 
@@ -4151,7 +4181,7 b' msgid "abort an interrupted rebase"'
 msgstr ""
 
 msgid ""
-"hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] "
+"hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] "
 "| [-c] | [-a]"
 msgstr ""
 
@@ -4228,6 +4258,31 b' msgstr ""'
 msgid "[Ynsfdaq?]"
 msgstr ""
 
+msgid "&Yes, record this change"
+msgstr ""
+
+msgid "&No, skip this change"
+msgstr ""
+
+msgid "&Skip remaining changes to this file"
+msgstr ""
+
+msgid "Record remaining changes to this &file"
+msgstr ""
+
+msgid "&Done, skip remaining changes and files"
+msgstr ""
+
+msgid "Record &all changes to all remaining files"
+msgstr ""
+
+#, fuzzy
+msgid "&Quit, recording no changes"
+msgstr "leder efter ændringer\n"
+
+msgid "&?"
+msgstr ""
+
 msgid "y"
 msgstr ""
 
@@ -4450,11 +4505,12 b' msgid ""'
 "    Its argument will be invoked with the current changelog message as\n"
 "    $1 and the patch as $2.\n"
 "\n"
-"    If --source is specified, selects changesets from the named\n"
-"    repository. If --branch is specified, selects changesets from the\n"
-"    branch holding the named revision, up to that revision. If --all\n"
-"    is specified, all changesets on the branch will be transplanted,\n"
-"    otherwise you will be prompted to select the changesets you want.\n"
+"    If --source/-s is specified, selects changesets from the named\n"
+"    repository. If --branch/-b is specified, selects changesets from\n"
+"    the branch holding the named revision, up to that revision. If\n"
+"    --all/-a is specified, all changesets on the branch will be\n"
+"    transplanted, otherwise you will be prompted to select the\n"
+"    changesets you want.\n"
 "\n"
 "    hg transplant --branch REVISION --all will rebase the selected\n"
 "    branch (up to the named revision) onto your current working\n"
@@ -4470,7 +4526,7 b' msgid ""'
 "\n"
 "    If a changeset application fails, you can fix the merge by hand\n"
 "    and then resume where you left off by calling hg transplant\n"
-"    --continue.\n"
+"    --continue/-c.\n"
 "    "
 msgstr ""
 
@@ -4894,11 +4950,12 b' msgid ""'
 "    .hgignore. As with add, these changes take effect at the next\n"
 "    commit.\n"
 "\n"
-"    Use the -s option to detect renamed files. With a parameter > 0,\n"
-"    this compares every removed file with every added file and records\n"
-"    those similar enough as renames. This option takes a percentage\n"
-"    between 0 (disabled) and 100 (files must be identical) as its\n"
-"    parameter. Detecting renamed files this way can be expensive.\n"
+"    Use the -s/--similarity option to detect renamed files. With a\n"
+"    parameter > 0, this compares every removed file with every added\n"
+"    file and records those similar enough as renames. This option\n"
+"    takes a percentage between 0 (disabled) and 100 (files must be\n"
+"    identical) as its parameter. Detecting renamed files this way can\n"
+"    be expensive.\n"
 "    "
 msgstr ""
 
@@ -4908,6 +4965,7 b' msgstr ""'
 msgid "similarity must be between 0 and 100"
 msgstr ""
 
+#, fuzzy
 msgid ""
 "show changeset information per file line\n"
 "\n"
@@ -4917,9 +4975,9 b' msgid ""'
 "    This command is useful to discover who did a change or when a\n"
 "    change took place.\n"
 "\n"
-"    Without the -a option, annotate will avoid processing files it\n"
-"    detects as binary. With -a, annotate will generate an annotation\n"
-"    anyway, probably with undesirable results.\n"
+"    Without the -a/--text option, annotate will avoid processing files\n"
+"    it detects as binary. With -a, annotate will generate an\n"
+"    annotation anyway, probably with undesirable results.\n"
 "    "
 msgstr ""
 "vis information om ændringer pr linie\n"
@@ -4948,10 +5006,10 b' msgid ""'
 "create unversioned archive of a repository revision\n"
 "\n"
 "    By default, the revision used is the parent of the working\n"
-"    directory; use \"-r\" to specify a different revision.\n"
-"\n"
-"    To specify the type of archive to create, use \"-t\". Valid types\n"
-"    are:\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"
 "\n"
 "    \"files\" (default): a directory full of files\n"
 "    \"tar\": tar archive, uncompressed\n"
@@ -4964,8 +5022,9 b' msgid ""'
 "    using a format string; see 'hg help export' for details.\n"
 "\n"
 "    Each member added to an archive file has a directory prefix\n"
-"    prepended. Use \"-p\" to specify a format string for the prefix. The\n"
-"    default is the basename of the archive, with suffixes removed.\n"
+"    prepended. Use -p/--prefix to specify a format string for the\n"
+"    prefix. The default is the basename of the archive, with suffixes\n"
+"    removed.\n"
 "    "
 msgstr ""
 
@@ -5062,10 +5121,10 b' msgid ""'
 "    use, mark the earliest changeset you know exhibits the problem as\n"
 "    bad, then mark the latest changeset which is free from the problem\n"
 "    as good. Bisect will update your working directory to a revision\n"
-"    for testing (unless the --noupdate option is specified). Once you\n"
-"    have performed tests, mark the working directory as bad or good\n"
-"    and bisect will either update to another candidate changeset or\n"
-"    announce that it has found the bad revision.\n"
+"    for testing (unless the -U/--noupdate option is specified). Once\n"
+"    you have performed tests, mark the working directory as bad or\n"
+"    good and bisect will either update to another candidate changeset\n"
+"    or announce that it has found the bad revision.\n"
 "\n"
 "    As a shortcut, you can also use the revision argument to mark a\n"
 "    revision as good or bad without checking it out first.\n"
@@ -5078,12 +5137,18 b' msgid ""'
 "    "
 msgstr ""
 
-#, python-format
-msgid "The first %s revision is:\n"
+#, fuzzy
+msgid "The first good revision is:\n"
 msgstr "Den første %s revision er:\n"
 
-#, python-format
-msgid "Due to skipped revisions, the first %s revision could be any of:\n"
+#, fuzzy
+msgid "The first bad revision is:\n"
+msgstr "Den første %s revision er:\n"
+
+msgid "Due to skipped revisions, the first good revision could be any of:\n"
+msgstr ""
+
+msgid "Due to skipped revisions, the first bad revision could be any of:\n"
 msgstr ""
 
 msgid "cannot bisect (no known good revisions)"
@@ -5122,11 +5187,11 b' msgid ""'
 "    in the repository until the next commit). It is recommended to use\n"
 "    the 'default' branch as your primary development branch.\n"
 "\n"
-"    Unless --force is specified, branch will not let you set a branch\n"
-"    name that shadows an existing branch.\n"
-"\n"
-"    Use --clean to reset the working directory branch to that of the\n"
-"    parent of the working directory, negating a previous branch\n"
+"    Unless -f/--force is specified, branch will not let you set a\n"
+"    branch name that shadows an existing branch.\n"
+"\n"
+"    Use -C/--clean to reset the working directory branch to that of\n"
+"    the parent of the working directory, negating a previous branch\n"
 "    change.\n"
 "\n"
 "    Use the command 'hg update' to switch to an existing branch.\n"
@@ -5165,8 +5230,9 b' msgid ""'
 "    If no destination repository is specified the destination is\n"
 "    assumed to have all the nodes specified by one or more --base\n"
 "    parameters. To create a bundle containing all changesets, use\n"
-"    --all (or --base null). To change the compression method applied,\n"
-"    use the -t option (by default, bundles are compressed using bz2).\n"
+"    -a/--all (or --base null). To change the compression method\n"
+"    applied, use the -t/--type option (by default, bundles are\n"
+"    compressed using bz2).\n"
 "\n"
 "    The bundle file can then be transferred using conventional means\n"
 "    and applied to another repository with the unbundle or pull\n"
@@ -5201,6 +5267,7 b' msgid ""'
 "    "
 msgstr ""
 
+#, fuzzy
 msgid ""
 "make a copy of an existing repository\n"
 "\n"
@@ -5212,15 +5279,15 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 option to clone up to a specific revision, no\n"
-"    subsequent revisions (including subsequent tags) will be present\n"
-"    in the cloned repository. This option implies --pull, even on\n"
-"    local repositories.\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 option is used, the new clone will contain only a\n"
-"    repository (.hg) and no working copy (the working copy parent is\n"
-"    the null revision).\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"
@@ -5350,7 +5417,7 b' msgid ""'
 "    the source must be a single file.\n"
 "\n"
 "    By default, this command copies the contents of files as they\n"
-"    stand in the working directory. If invoked with --after, the\n"
+"    stand in the working directory. If invoked with -A/--after, the\n"
 "    operation is recorded, but no copying is performed.\n"
 "\n"
 "    This command takes effect with the next commit. To undo a copy\n"
@@ -5528,6 +5595,7 b' msgstr "%s ikke omd\xc3\xb8bt\\n"'
 msgid "show how files match on given patterns"
 msgstr ""
 
+#, fuzzy
 msgid ""
 "diff repository (or selected files)\n"
 "\n"
@@ -5545,11 +5613,11 b' msgid ""'
 "    revisions are specified, the working directory files are compared\n"
 "    to its parent.\n"
 "\n"
-"    Without the -a option, diff will avoid generating diffs of files\n"
-"    it detects as binary. With -a, diff will generate a diff anyway,\n"
-"    probably with undesirable results.\n"
-"\n"
-"    Use the --git option to generate diffs in the git extended diff\n"
+"    Without the -a/--text option, diff will avoid generating diffs of\n"
+"    files it detects as binary. With -a, diff will generate a diff\n"
+"    anyway, probably with undesirable results.\n"
+"\n"
+"    Use the -g/--git option to generate diffs in the git extended diff\n"
 "    format. For more information, read 'hg help diffs'.\n"
 "    "
 msgstr ""
@@ -5577,6 +5645,7 b' msgstr ""'
 "    diff-format. For mere information, læs hg help diffs.\n"
 "    "
 
+#, fuzzy
 msgid ""
 "dump the header and diffs for one or more changesets\n"
 "\n"
@@ -5601,11 +5670,11 b' msgid ""'
 "    %n   zero-padded sequence number, starting at 1\n"
 "    %r   zero-padded changeset revision number\n"
 "\n"
-"    Without the -a option, export will avoid generating diffs of files\n"
-"    it detects as binary. With -a, export will generate a diff anyway,\n"
-"    probably with undesirable results.\n"
-"\n"
-"    Use the --git option to generate diffs in the git extended diff\n"
+"    Without the -a/--text option, export will avoid generating diffs\n"
+"    of files it detects as binary. With -a, export will generate a\n"
+"    diff anyway, probably with undesirable results.\n"
+"\n"
+"    Use the -g/--git option to generate diffs in the git extended diff\n"
 "    format. Read the diffs help topic for more information.\n"
 "\n"
 "    With the --switch-parent option, the diff will be against the\n"
@@ -5818,7 +5887,7 b' msgid ""'
 "    Import a list of patches and commit them individually.\n"
 "\n"
 "    If there are outstanding changes in the working directory, import\n"
-"    will abort unless given the -f flag.\n"
+"    will abort unless given the -f/--force flag.\n"
 "\n"
 "    You can import a patch straight from a mail message. Even patches\n"
 "    as attachments work (body part must be type text/plain or\n"
@@ -5829,7 +5898,8 b' msgid ""'
 "\n"
 "    If the imported patch was generated by hg export, user and\n"
 "    description from patch override values from message headers and\n"
-"    body. Values given on command line with -m and -u override these.\n"
+"    body. Values given on command line with -m/--message and -u/--user\n"
+"    override these.\n"
 "\n"
 "    If --exact is specified, import will set the working directory to\n"
 "    the parent of each patch before applying it, and will abort if the\n"
@@ -5837,8 +5907,8 b' msgid ""'
 "    the patch. This may happen due to character set problems or other\n"
 "    deficiencies in the text patch format.\n"
 "\n"
-"    With --similarity, hg will attempt to discover renames and copies\n"
-"    in the patch in the same way as 'addremove'.\n"
+"    With -s/--similarity, hg will attempt to discover renames and\n"
+"    copies in the patch in the same way as 'addremove'.\n"
 "\n"
 "    To read a patch from standard input, use patch name \"-\". See 'hg\n"
 "    help dates' for a list of formats valid for -d/--date.\n"
@@ -5917,9 +5987,9 b' msgid ""'
 "    names.\n"
 "\n"
 "    If you want to feed the output of this command into the \"xargs\"\n"
-"    command, use the \"-0\" option to both this command and \"xargs\".\n"
-"    This will avoid the problem of \"xargs\" treating single filenames\n"
-"    that contain white space as multiple filenames.\n"
+"    command, use the -0 option to both this command and \"xargs\". This\n"
+"    will avoid the problem of \"xargs\" treating single filenames that\n"
+"    contain white space as multiple filenames.\n"
 "    "
 msgstr ""
 
@@ -5946,7 +6016,7 b' msgid ""'
 "    commit. When the -v/--verbose switch is used, the list of changed\n"
 "    files and full commit message is shown.\n"
 "\n"
-"    NOTE: log -p may generate unexpected diff output for merge\n"
+"    NOTE: log -p/--patch may generate unexpected diff output for merge\n"
 "    changesets, as it will only compare the merge changeset against\n"
 "    its first parent. Also, the files: list will only reflect files\n"
 "    that are different from BOTH parents.\n"
@@ -5966,7 +6036,7 b' msgid ""'
 "\n"
 "    Print a list of version controlled files for the given revision.\n"
 "    If no revision is given, the first parent of the working directory\n"
-"    is used, or tip if no revision is checked out.\n"
+"    is used, or the null revision if none is checked out.\n"
 "\n"
 "    With -v flag, print file permissions, symlink and executable bits.\n"
 "    With --debug flag, print file revision hashes.\n"
@@ -6038,12 +6108,13 b' msgid ""'
 "    "
 msgstr ""
 
+#, fuzzy
 msgid ""
 "show the parents of the working directory or revision\n"
 "\n"
 "    Print the working directory's parent revisions. If a revision is\n"
-"    given via --rev, the parent of that revision will be printed. If a\n"
-"    file argument is given, revision in which the file was last\n"
+"    given via -r/--rev, the parent of that revision will be printed.\n"
+"    If a file argument is given, revision in which the file was last\n"
 "    changed (before the working directory revision or the argument to\n"
 "    --rev if given) is printed.\n"
 "    "
@@ -6126,6 +6197,7 b' msgid ""'
 "specified."
 msgstr ""
 
+#, fuzzy
 msgid ""
 "push changes to the specified destination\n"
 "\n"
@@ -6140,8 +6212,8 b' msgid ""'
 "    increase the number of remote heads. This generally indicates the\n"
 "    the client has forgotten to pull and merge before pushing.\n"
 "\n"
-"    If -r is used, the named revision and all its ancestors will be\n"
-"    pushed to the remote repository.\n"
+"    If -r/--rev is used, the named revision and all its ancestors will\n"
+"    be pushed to the remote repository.\n"
 "\n"
 "    Look at the help text for URLs for important details about ssh://\n"
 "    URLs. If DESTINATION is omitted, a default path will be used.\n"
@@ -6202,16 +6274,17 b' msgid ""'
 "    "
 msgstr ""
 
+#, fuzzy
 msgid ""
 "remove the specified files on the next commit\n"
 "\n"
 "    Schedule the indicated files for removal from the repository.\n"
 "\n"
 "    This only removes files from the current branch, not from the\n"
-"    entire project history. -A can be used to remove only files that\n"
-"    have already been deleted, -f can be used to force deletion, and\n"
-"    -Af can be used to remove files from the next revision without\n"
-"    deleting them.\n"
+"    entire project history. -A/--after can be used to remove only\n"
+"    files that have already been deleted, -f/--force can be used to\n"
+"    force deletion, and -Af can be used to remove files from the next\n"
+"    revision without deleting them.\n"
 "\n"
 "    The following table details the behavior of remove for different\n"
 "    file states (columns) and option combinations (rows). The file\n"
@@ -6279,7 +6352,7 b' msgid ""'
 "    file, there can only be one source.\n"
 "\n"
 "    By default, this command copies the contents of files as they\n"
-"    exist in the working directory. If invoked with --after, the\n"
+"    exist in the working directory. If invoked with -A/--after, the\n"
 "    operation is recorded, but no copying is performed.\n"
 "\n"
 "    This command takes effect at the next commit. To undo a rename\n"
@@ -6292,11 +6365,11 b' msgid ""'
 "\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 switch.\n"
+"    resolve all unresolved files, use the -a/--all switch.\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 -m\n"
-"    switch should be used to mark the file as resolved.\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"
 "    This command will also allow listing resolved files and manually\n"
 "    marking and unmarking files as resolved. All files must be marked\n"
@@ -6332,10 +6405,10 b' msgid ""'
 "    working directory has two parents, you must explicitly specify the\n"
 "    revision to revert to.\n"
 "\n"
-"    Using the -r option, revert the given files or directories to\n"
-"    their contents as of a specific revision. This can be helpful to\n"
-"    \"roll back\" some or all of an earlier change. See 'hg help dates'\n"
-"    for a list of formats valid for -d/--date.\n"
+"    Using the -r/--rev option, revert the given files or directories\n"
+"    to their contents as of a specific revision. This can be helpful\n"
+"    to \"roll back\" some or all of an earlier change. See 'hg help\n"
+"    dates' for a list of formats valid for -d/--date.\n"
 "\n"
 "    Revert modifies the working directory. It does not commit any\n"
 "    changes, or change the parent of the working directory. If you\n"
@@ -6421,13 +6494,14 b' msgid ""'
 "    "
 msgstr ""
 
+#, fuzzy
 msgid ""
 "export the repository via HTTP\n"
 "\n"
 "    Start a local HTTP repository browser and pull server.\n"
 "\n"
 "    By default, the server logs accesses to stdout and errors to\n"
-"    stderr. Use the \"-A\" and \"-E\" options to log to files.\n"
+"    stderr. Use the -A and -E options to log to files.\n"
 "    "
 msgstr ""
 "eksporter arkivet via HTTP\n"
@@ -6442,14 +6516,16 b' msgstr ""'
 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
 msgstr "lytter på http://%s%s/%s (bundet til %s:%d)\n"
 
+#, fuzzy
 msgid ""
 "show changed files in the working directory\n"
 "\n"
 "    Show status of files in the repository. If names are given, only\n"
 "    files that match are shown. Files that are clean or ignored or\n"
-"    source of a copy/move operation, are not listed unless -c (clean),\n"
-"    -i (ignored), -C (copies) or -A is given. Unless options described\n"
-"    with \"show only ...\" are given, the options -mardu are used.\n"
+"    source of a copy/move operation, are not listed unless -c/--clean,\n"
+"    -i/--ignored, -C/--copies or -A/--all is given. Unless options\n"
+"    described with \"show only ...\" are given, the options -mardu are\n"
+"    used.\n"
 "\n"
 "    Option -q/--quiet hides untracked (unknown and ignored) files\n"
 "    unless explicitly requested with -u/--unknown or -i/--ignored.\n"
@@ -6467,7 +6543,7 b' msgid ""'
 "    A = added\n"
 "    R = removed\n"
 "    C = clean\n"
-"    ! = missing, but still tracked\n"
+"    ! = missing (deleted by non-hg command, but still tracked)\n"
 "    ? = not tracked\n"
 "    I = ignored\n"
 "      = the previous added file was copied from here\n"
@@ -6597,6 +6673,7 b' msgid ""'
 "    "
 msgstr ""
 
+#, fuzzy
 msgid ""
 "update working directory\n"
 "\n"
@@ -6625,7 +6702,7 b' msgid ""'
 "    If you want to update just one file to an older revision, use\n"
 "    revert.\n"
 "\n"
-"    See 'hg help dates' for a list of formats valid for --date.\n"
+"    See 'hg help dates' for a list of formats valid for -d/--date.\n"
 "    "
 msgstr ""
 "opdater arbejdskataloget\n"
@@ -6713,9 +6790,6 b' msgstr ""'
 msgid "set the charset encoding mode"
 msgstr ""
 
-msgid "print improved command execution profile"
-msgstr ""
-
 msgid "print traceback on exception"
 msgstr ""
 
@@ -7022,7 +7096,7 b' msgstr ""'
 msgid "[OPTION]... PATTERN [FILE]..."
 msgstr ""
 
-msgid "show only heads which are descendants of rev"
+msgid "show only heads which are descendants of REV"
 msgstr ""
 
 msgid "show only the active heads from open branches"
@@ -7053,8 +7127,8 b' msgid "[-nibt] [-r REV] [SOURCE]"'
 msgstr ""
 
 msgid ""
-"directory strip option for patch. This has the same\n"
-"meaning as the corresponding patch option"
+"directory strip option for patch. This has the same meaning as the "
+"corresponding patch option"
 msgstr ""
 
 msgid "base path"
@@ -7069,7 +7143,7 b' msgstr ""'
 msgid "apply patch to the nodes from which it was generated"
 msgstr ""
 
-msgid "Use any branch information in patch (implied by --exact)"
+msgid "use any branch information in patch (implied by --exact)"
 msgstr ""
 
 msgid "[OPTION]... PATCH..."
@@ -7090,7 +7164,7 b' msgstr ""'
 msgid "[-e CMD] [--remotecmd CMD] [DEST]"
 msgstr ""
 
-msgid "search the repository as it stood at rev"
+msgid "search the repository as it stood at REV"
 msgstr ""
 
 msgid "end filenames with NUL, for use with xargs"
@@ -7318,6 +7392,10 b' msgstr ""'
 msgid "[-C] [-d DATE] [[-r] REV]"
 msgstr ""
 
+#, fuzzy, python-format
+msgid "config error at %s:%d: '%s'"
+msgstr "kan ikke starte server på '%s:%d': %s"
+
 msgid "not found in manifest"
 msgstr ""
 
@@ -7406,6 +7484,10 b' msgstr ""'
 "    %s\n"
 
 #, python-format
+msgid "hg: %s\n"
+msgstr "hg: %s\n"
+
+#, python-format
 msgid "timed out waiting for lock held by %s"
 msgstr ""
 
@@ -7426,10 +7508,6 b' msgid "hg %s: %s\\n"'
 msgstr "hg %s: %s\n"
 
 #, python-format
-msgid "hg: %s\n"
-msgstr "hg: %s\n"
-
-#, python-format
 msgid "abort: %s!\n"
 msgstr "afbrudt: %s!\n"
 
@@ -7522,7 +7600,8 b' msgstr ""'
 msgid "invalid arguments"
 msgstr ""
 
-msgid "exception raised - generating profile anyway\n"
+#, python-format
+msgid "unrecognized profiling format '%s' - Ignored\n"
 msgstr ""
 
 msgid ""
@@ -7564,7 +7643,10 b' msgid ""'
 "keep (l)ocal or take (o)ther?"
 msgstr ""
 
-msgid "[lo]"
+msgid "&Local"
+msgstr ""
+
+msgid "&Other"
 msgstr ""
 
 msgid "l"
@@ -7591,7 +7673,10 b' msgid ""'
 "was merge successful (yn)?"
 msgstr ""
 
-msgid "[yn]"
+msgid "&No"
+msgstr ""
+
+msgid "&Yes"
 msgstr ""
 
 msgid "n"
@@ -7989,6 +8074,8 b' msgid ""'
 "          separator (ignoring trailing seprators). For example,\n"
 "          \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar"
 "\".\n"
+"    - stripdir: Treat the text as path and strip a directory level, if\n"
+"          possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\".\n"
 "    - date: Date. Returns a date in a Unix date format, including\n"
 "          the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
 "    - domain: Any text. Finds the first string that looks like an\n"
@@ -8002,6 +8089,7 b' msgid ""'
 "    - fill68: Any text. Wraps the text to fit in 68 columns.\n"
 "    - fill76: Any text. Wraps the text to fit in 76 columns.\n"
 "    - firstline: Any text. Returns the first line of text.\n"
+"    - nonempty: Any text. Returns '(none)' if the string is empty.\n"
 "    - hgdate: Date. Returns the date as a pair of numbers:\n"
 "          \"1157407993 25200\" (Unix timestamp, timezone offset).\n"
 "    - isodate: Date. Returns the date in ISO 8601 format.\n"
@@ -8610,9 +8698,6 b' msgstr ""'
 msgid "invalid local address: %s"
 msgstr ""
 
-msgid "'\\n' and '\\r' disallowed in filenames"
-msgstr ""
-
 #, python-format
 msgid "failed to remove %s from manifest"
 msgstr ""
@@ -8648,13 +8733,26 b' msgid ""'
 "(n)one, e(x)ec or sym(l)ink?"
 msgstr ""
 
+#, fuzzy
+msgid "&None"
+msgstr "færdig\n"
+
+msgid "E&xec"
+msgstr ""
+
+msgid "Sym&link"
+msgstr ""
+
 #, python-format
 msgid ""
 " local changed %s which remote deleted\n"
 "use (c)hanged version or (d)elete?"
 msgstr ""
 
-msgid "[cd]"
+msgid "&Changed"
+msgstr ""
+
+msgid "&Delete"
 msgstr ""
 
 msgid "c"
@@ -8666,6 +8764,9 b' msgid ""'
 "use (c)hanged version or leave (d)eleted?"
 msgstr ""
 
+msgid "&Deleted"
+msgstr ""
+
 #, python-format
 msgid "preserving %s for resolve of %s\n"
 msgstr ""
@@ -8741,7 +8842,11 b' msgid "file %s already exists\\n"'
 msgstr "filen %s eksisterer allerede\n"
 
 #, python-format
-msgid "Hunk #%d succeeded at %d %s(offset %d %s).\n"
+msgid "Hunk #%d succeeded at %d %s(offset %d line).\n"
+msgstr ""
+
+#, python-format
+msgid "Hunk #%d succeeded at %d %s(offset %d lines).\n"
 msgstr ""
 
 #, python-format
@@ -8910,21 +9015,17 b' msgid "unmatched quotes"'
 msgstr ""
 
 #, python-format
+msgid "Error expanding '%s%%%s'"
+msgstr ""
+
+#, python-format
 msgid "style not found: %s"
 msgstr ""
 
 #, python-format
-msgid "%s:%s: parse error"
-msgstr ""
-
-#, python-format
 msgid "template file %s: %s"
 msgstr ""
 
-#, python-format
-msgid "Error expanding '%s%%%s'"
-msgstr ""
-
 msgid "transaction abort!\n"
 msgstr ""
 
@@ -8935,45 +9036,24 b' msgstr ""'
 msgid "rollback completed\n"
 msgstr ""
 
+msgid "rollback failed - please run hg recover\n"
+msgstr ""
+
 #, python-format
 msgid "Not trusting file %s from untrusted user %s, group %s\n"
 msgstr ""
 
 #, python-format
-msgid ""
-"Failed to parse %s\n"
-"%s"
-msgstr ""
-
-#, python-format
 msgid "Ignored: %s\n"
 msgstr "Ignoreret: %s\n"
 
 #, python-format
-msgid "unable to open %s: %s"
-msgstr "kunne ikke åbne %s: %s"
-
-#, python-format
-msgid ""
-"failed to parse %s\n"
-"%s"
-msgstr ""
-
-#, python-format
-msgid ""
-"Error in configuration section [%s] parameter '%s':\n"
-"%s"
-msgstr ""
-
-#, python-format
-msgid "Ignoring untrusted configuration option %s.%s = %s\n"
-msgstr ""
-
-#, python-format
-msgid ""
-"Error in configuration section [%s]:\n"
-"%s"
-msgstr ""
+msgid "ignoring untrusted configuration option %s.%s = %s\n"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "%s.%s not a boolean ('%s')"
+msgstr "%s er ikke forældre til %s"
 
 msgid "enter a commit username:"
 msgstr "angiv et arkiveringsbrugernavn:"
@@ -9257,3 +9337,6 b' msgstr "(f\xc3\xb8rste beskadigede \xc3\xa6ndring er tilsyneladende %d)\\n"'
 
 msgid "user name not available - set USERNAME environment variable"
 msgstr "der er ikke noget brugernavn - sæt USERNAME miljøvariabel"
+
+#~ msgid "unable to open %s: %s"
+#~ msgstr "kunne ikke åbne %s: %s"