--- a/i18n/da.po Sun Jun 21 01:06:24 2009 +0200
+++ b/i18n/da.po Sun Jun 21 01:12:16 2009 +0200
@@ -17,7 +17,7 @@
msgstr ""
"Project-Id-Version: Mercurial\n"
"Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2009-05-31 19:37+0200\n"
+"POT-Creation-Date: 2009-06-21 00:59+0200\n"
"PO-Revision-Date: 2009-06-21 01:05+0200\n"
"Last-Translator: <mg@daimi.au.dk>\n"
"Language-Team: Danish\n"
@@ -82,7 +82,7 @@
msgstr "acl: tillader ændring %s\n"
msgid ""
-"mercurial bookmarks\n"
+"Mercurial bookmarks\n"
"\n"
"Mercurial bookmarks are local moveable pointers to changesets. Every\n"
"bookmark points to a changeset identified by its hash. If you commit a\n"
@@ -99,22 +99,22 @@
"track.current = True\n"
"\n"
"This will cause bookmarks to track the bookmark that you are currently\n"
-"on, and just updates it. This is similar to git's approach of\n"
+"on, and just updates it. This is similar to git's approach to\n"
"branching.\n"
msgstr ""
msgid ""
-"mercurial bookmarks\n"
+"Mercurial bookmarks\n"
"\n"
" Bookmarks are pointers to certain commits that move when\n"
" commiting. Bookmarks are local. They can be renamed, copied and\n"
" deleted. It is possible to use bookmark names in 'hg merge' and\n"
-" 'hg update' to update to a given bookmark.\n"
-"\n"
-" You can use 'hg bookmark NAME' to set a bookmark on the current\n"
-" tip with the given name. If you specify a revision using -r REV\n"
-" (where REV may be an existing bookmark), the bookmark is set to\n"
-" that revision.\n"
+" 'hg update' to merge and update respectively to a given bookmark.\n"
+"\n"
+" You can use 'hg bookmark NAME' to set a bookmark on the working\n"
+" directory's parent revision with the given name. If you specify\n"
+" a revision using -r REV (where REV may be an existing bookmark),\n"
+" the bookmark is assigned to that revision.\n"
" "
msgstr ""
@@ -372,14 +372,19 @@
msgid "generating stats: %d%%"
msgstr "genererer statistik: %d%%"
-msgid ""
-"graph count of revisions grouped by template\n"
-"\n"
-" Will graph count of changed lines or revisions grouped by template\n"
-" or alternatively by date, if dateformat is used. In this case it\n"
-" will override template.\n"
-"\n"
-" By default statistics are counted for number of changed lines.\n"
+#, fuzzy
+msgid ""
+"histogram of changes to the repository\n"
+"\n"
+" This command will display a histogram representing the number\n"
+" of changed lines or revisions, grouped according to the given\n"
+" template. The default template will group changes by author.\n"
+" The --dateformat option may be used to group the results by\n"
+" date instead.\n"
+"\n"
+" Statistics are based on the number of changed lines, or\n"
+" alternatively the number of matching revisions if the\n"
+" --changesets option is specified.\n"
"\n"
" Examples:\n"
"\n"
@@ -395,12 +400,13 @@
" # display count of lines changed in every year\n"
" hg churn -f '%Y' -s\n"
"\n"
-" The map file format used to specify aliases is fairly simple:\n"
-"\n"
+" It is possible to map alternate email addresses to a main address\n"
+" by providing a file using the following format:\n"
+" \n"
" <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"
+" Such a file may be specified with the --aliases option, otherwise a\n"
+" .hgchurn file will be looked for in the working directory root.\n"
" "
msgstr ""
"plot antallet af revisioner grupperet efter et mønster\n"
@@ -483,7 +489,7 @@
"[extensions]\n"
"color =\n"
"\n"
-"Default effects my be overridden from the .hgrc file:\n"
+"Default effects may be overridden from the .hgrc file:\n"
"\n"
"[color]\n"
"status.modified = blue bold underline red_background\n"
@@ -547,6 +553,18 @@
" basename of the source with '-hg' appended. If the destination\n"
" repository doesn't exist, it will be created.\n"
"\n"
+" By default, all sources except Mercurial will use\n"
+" --branchsort. Mercurial uses --sourcesort to preserve original\n"
+" revision numbers order. Sort modes have the following effects:\n"
+" --branchsort: convert from parent to child revision when\n"
+" possible, which means branches are usually converted one after\n"
+" the other. It generates more compact repositories.\n"
+" --datesort: sort revisions by date. Converted repositories have\n"
+" good-looking changelogs but are often an order of magnitude\n"
+" larger than the same ones generated by --branchsort.\n"
+" --sourcesort: try to preserve source revisions order, only\n"
+" supported by Mercurial sources.\n"
+"\n"
" If <REVMAP> isn't given, it will be put in a default location\n"
" (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n"
" that maps each source commit ID to the destination ID for that\n"
@@ -759,9 +777,17 @@
msgid "change branch names while converting"
msgstr "omdøb grene under konverteringen"
+#, fuzzy
+msgid "try to sort changesets by branches"
+msgstr "forsøg at sortere ændringer efter dato"
+
msgid "try to sort changesets by date"
msgstr "forsøg at sortere ændringer efter dato"
+#, fuzzy
+msgid "preserve source changesets order"
+msgstr "forsøg at sortere ændringer efter dato"
+
msgid "hg convert [OPTION]... SOURCE [DEST [REVMAP]]"
msgstr ""
@@ -854,6 +880,10 @@
msgid "%s: unknown repository type"
msgstr "%s: ukendt arkivtype"
+#, fuzzy, python-format
+msgid "unknown sort mode: %s"
+msgstr "ukendt CVS svar: %s"
+
#, python-format
msgid "cycle detected between %s and %s"
msgstr ""
@@ -898,6 +928,12 @@
msgid "assuming destination %s\n"
msgstr ""
+msgid "more than one sort mode specified"
+msgstr ""
+
+msgid "--sourcesort is not supported by this data source"
+msgstr ""
+
msgid ""
"warning: support for external cvsps is deprecated and will be removed in "
"Mercurial 1.4\n"
@@ -1620,7 +1656,7 @@
"distributed with Mercurial.)\n"
"\n"
"hgk consists of two parts: a Tcl script that does the displaying and\n"
-"querying of information, and an extension to mercurial named hgk.py,\n"
+"querying of information, and an extension to Mercurial named hgk.py,\n"
"which provides hooks for hgk to get information. hgk can be found in\n"
"the contrib directory, and hgk.py can be found in the hgext directory.\n"
"\n"
@@ -1808,6 +1844,9 @@
msgid "failed to contact inotify server: %s\n"
msgstr ""
+msgid "received empty answer from inotify server"
+msgstr ""
+
#, python-format
msgid "(inotify: received response from incompatible server version %d)\n"
msgstr ""
@@ -1927,11 +1966,25 @@
msgid "finished setup\n"
msgstr ""
-msgid "polling: no timeout\n"
-msgstr ""
-
-#, python-format
-msgid "polling: %sms timeout\n"
+msgid ""
+"expand expressions into changelog and summaries\n"
+"\n"
+"This extension allows the use of a special syntax in summaries,\n"
+"which will be automatically expanded into links or any other\n"
+"arbitrary expression, much like InterWiki does.\n"
+"\n"
+"To enable this extension, add the following lines to your hgrc:\n"
+"\n"
+" [extensions]\n"
+" interhg =\n"
+"\n"
+"A few example patterns (link to bug tracking, etc.):\n"
+"\n"
+" [interhg]\n"
+" issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
+" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!"
+"i\n"
+" boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n"
msgstr ""
#, python-format
@@ -1943,7 +1996,7 @@
msgstr ""
msgid ""
-"keyword expansion in local repositories\n"
+"keyword expansion in tracked files\n"
"\n"
"This extension expands RCS/CVS-like or self-customized $Keywords$ in\n"
"tracked text files selected by your configuration.\n"
@@ -2009,7 +2062,7 @@
"print [keywordmaps] configuration and an expansion example\n"
"\n"
" Show current, custom, or default keyword template maps and their\n"
-" expansion.\n"
+" expansions.\n"
"\n"
" Extend current configuration by specifying maps as arguments and\n"
" optionally by reading from an additional hgrc file.\n"
@@ -2044,7 +2097,7 @@
msgstr ""
msgid ""
-"expand keywords in working directory\n"
+"expand keywords in the working directory\n"
"\n"
" Run after (re)enabling keyword expansion.\n"
"\n"
@@ -2062,7 +2115,7 @@
msgstr ""
msgid ""
-"revert expanded keywords in working directory\n"
+"revert expanded keywords in the working directory\n"
"\n"
" Run before changing/disabling active keywords or if you experience\n"
" problems with \"hg import\" or \"hg merge\".\n"
@@ -2483,7 +2536,7 @@
" -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"
+" them to regular Mercurial changesets). The qfinish command should\n"
" be used as an alternative for qdelete -r, as the latter option is\n"
" deprecated.\n"
"\n"
@@ -2548,7 +2601,7 @@
" Source patch repository is looked for in <src>/.hg/patches by\n"
" default. Use -p <url> to change.\n"
"\n"
-" The patch directory must be a nested mercurial repository, as\n"
+" The patch directory must be a nested Mercurial repository, as\n"
" would be created by qinit -c.\n"
" "
msgstr ""
@@ -2953,8 +3006,9 @@
msgid "import file in patch directory"
msgstr ""
-msgid "patch file name"
-msgstr "patch navn"
+#, fuzzy
+msgid "name of patch file"
+msgstr "ingen rettelser anvendt"
msgid "overwrite existing files"
msgstr ""
@@ -3486,7 +3540,7 @@
msgid "send changes not in target as a binary bundle"
msgstr ""
-msgid "file name of the bundle attachment"
+msgid "name of the bundle attachment file"
msgstr ""
msgid "a revision to send"
@@ -3551,7 +3605,7 @@
msgid "purge ignored files too"
msgstr ""
-msgid "print the file names instead of deleting them"
+msgid "print filenames instead of deleting them"
msgstr ""
msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
@@ -3874,6 +3928,24 @@
msgstr ""
msgid ""
+"create a new shared repository (experimental)\n"
+"\n"
+" Initialize a new repository and working directory that shares its\n"
+" history with another repository.\n"
+"\n"
+" NOTE: actions that change history such as rollback or moving the\n"
+" source may confuse sharers.\n"
+" "
+msgstr ""
+
+#, fuzzy
+msgid "do not create a working copy"
+msgstr "%s: slettet i arbejdskopien\n"
+
+msgid "[-U] SOURCE [DEST]"
+msgstr ""
+
+msgid ""
"patch transplanting tool\n"
"\n"
"This extension allows you to transplant patches from another branch.\n"
@@ -4050,7 +4122,7 @@
" hgext.win32mbcs =\n"
"\n"
"Path encoding conversion are done between Unicode and\n"
-"encoding.encoding which is decided by mercurial from current locale\n"
+"encoding.encoding which is decided by Mercurial from current locale\n"
"setting or HGENCODING.\n"
"\n"
msgstr ""
@@ -4102,7 +4174,7 @@
msgstr ""
msgid ""
-"zeroconf support for mercurial repositories\n"
+"zeroconf support for Mercurial repositories\n"
"\n"
"Zeroconf enabled repositories will be announced in a network without\n"
"the need to configure a server or a service. They can be discovered\n"
@@ -4189,7 +4261,7 @@
msgstr "der er specificeret for mange revisioner"
#, python-format
-msgid "invalid format spec '%%%s' in output file name"
+msgid "invalid format spec '%%%s' in output filename"
msgstr ""
#, python-format
@@ -4341,23 +4413,7 @@
msgid "%s:%s copy source revision cannot be found!\n"
msgstr ""
-msgid "can only follow copies/renames for explicit file names"
-msgstr ""
-
-#, python-format
-msgid "file %s not found!"
-msgstr "filen %s blev ikke fundet!"
-
-#, python-format
-msgid "no match under directory %s!"
-msgstr ""
-
-#, python-format
-msgid "can't commit %s: unsupported file type!"
-msgstr ""
-
-#, python-format
-msgid "file %s not tracked!"
+msgid "can only follow copies/renames for explicit filenames"
msgstr ""
msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
@@ -4444,18 +4500,20 @@
msgid "similarity must be between 0 and 100"
msgstr ""
-msgid ""
-"show changeset information per file line\n"
+#, fuzzy
+msgid ""
+"show changeset information by line for each file\n"
"\n"
" List changes in files, showing the revision id responsible for\n"
" each line\n"
"\n"
-" This command is useful to discover who did a change or when a\n"
-" change took place.\n"
+" This command is useful for discovering when a change was made and\n"
+" by whom.\n"
"\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"
+" it detects as binary. With -a, annotate will annotate the file\n"
+" anyway, although the results will probably be neither useful\n"
+" nor desirable.\n"
" "
msgstr ""
"vis information om ændringer pr linie\n"
@@ -4471,7 +4529,7 @@
" annotering alligevel, sandsynligvis med et uønsket resultat.\n"
" "
-msgid "at least one file name or pattern required"
+msgid "at least one filename or pattern is required"
msgstr ""
msgid "at least one of -n/-c is required for -l"
@@ -4482,7 +4540,7 @@
msgstr ""
msgid ""
-"create unversioned archive of a repository revision\n"
+"create an unversioned archive of a repository revision\n"
"\n"
" By default, the revision used is the parent of the working\n"
" directory; use -r/--rev to specify a different revision.\n"
@@ -4516,15 +4574,16 @@
msgid "cannot archive plain files to stdout"
msgstr ""
+#, fuzzy
msgid ""
"reverse effect of earlier changeset\n"
"\n"
" Commit the backed out changes as a new changeset. The new\n"
" changeset is a child of the backed out changeset.\n"
"\n"
-" If you back out a changeset other than the tip, a new head is\n"
+" If you backout a changeset other than the tip, a new head is\n"
" created. This head will be the new tip and you should merge this\n"
-" backout changeset with another head (current one by default).\n"
+" backout changeset with another head.\n"
"\n"
" The --merge option remembers the parent of the working directory\n"
" before starting the backout, then merges the new head with that\n"
@@ -4559,14 +4618,17 @@
msgid "please specify a revision to backout"
msgstr ""
-msgid "cannot back out change on a different branch"
+#, fuzzy
+msgid "cannot backout change on a different branch"
msgstr "kan ikke bakke en ændring på en anden gren ud"
-msgid "cannot back out a change with no parents"
+#, fuzzy
+msgid "cannot backout a change with no parents"
msgstr "kan ikke bakke en ændring ud uden forældre"
-msgid "cannot back out a merge changeset without --parent"
-msgstr ""
+#, fuzzy
+msgid "cannot backout a merge changeset without --parent"
+msgstr "kan ikke bakke en ændring ud uden forældre"
#, python-format
msgid "%s is not a parent of %s"
@@ -4601,18 +4663,18 @@
" 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 -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"
+" you have performed tests, mark the working directory as good or\n"
+" bad, 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"
"\n"
-" If you supply a command it will be used for automatic bisection.\n"
-" Its exit status will be used as flag to mark revision as bad or\n"
-" good. In case exit status is 0 the revision is marked as good, 125\n"
-" - skipped, 127 (command not found) - bisection will be aborted;\n"
-" any other status bigger than 0 will mark revision as bad.\n"
+" If you supply a command, it will be used for automatic bisection.\n"
+" Its exit status will be used to mark revisions as good or bad:\n"
+" status 0 means good, 125 means to skip the revision, 127\n"
+" (command not found) will abort the bisection, and any other\n"
+" non-zero exit status means the revision is bad.\n"
" "
msgstr ""
@@ -4640,6 +4702,10 @@
msgid "incompatible arguments"
msgstr ""
+#, fuzzy, python-format
+msgid "cannot find executable: %s"
+msgstr "ikke i dirstate: %s\n"
+
#, python-format
msgid "failed to execute %s"
msgstr ""
@@ -4648,8 +4714,8 @@
msgid "%s killed"
msgstr "%s dræbt"
-#, python-format
-msgid "Changeset %s: %s\n"
+#, fuzzy, python-format
+msgid "Changeset %d:%s: %s\n"
msgstr "Ændring: %s: %s\n"
#, python-format
@@ -4660,12 +4726,13 @@
"set or show the current branch name\n"
"\n"
" With no argument, show the current branch name. With one argument,\n"
-" set the working directory branch name (the branch does not exist\n"
-" in the repository until the next commit). It is recommended to use\n"
-" the 'default' branch as your primary development branch.\n"
+" set the working directory branch name (the branch will not exist\n"
+" in the repository until the next commit). Standard practice\n"
+" recommends that primary development take place on the 'default'\n"
+" branch.\n"
"\n"
" Unless -f/--force is specified, branch will not let you set a\n"
-" branch name that shadows an existing branch.\n"
+" branch name that already exists, even if it's inactive.\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"
@@ -4744,6 +4811,7 @@
" "
msgstr ""
+#, fuzzy
msgid ""
"make a copy of an existing repository\n"
"\n"
@@ -4769,8 +4837,7 @@
"\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"
-" Look at the help text for URLs for important details about ssh://\n"
-" URLs.\n"
+" Please see 'hg help urls' for important details about ssh:// URLs.\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"
@@ -4841,18 +4908,19 @@
"\n"
" "
+#, fuzzy
msgid ""
"commit the specified files or all outstanding changes\n"
"\n"
" Commit changes to the given files into the repository. Unlike a\n"
" centralized RCS, this operation is a local operation. See hg push\n"
-" for means to actively distribute your changes.\n"
+" for a way to actively distribute your changes.\n"
"\n"
" If a list of files is omitted, all changes reported by \"hg status\"\n"
" will be committed.\n"
"\n"
" If you are committing the result of a merge, do not provide any\n"
-" file names or -I/-X filters.\n"
+" filenames or -I/-X filters.\n"
"\n"
" If no commit message is specified, the configured editor is\n"
" started to prompt you for a message.\n"
@@ -4893,7 +4961,7 @@
" 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 -A/--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 with the next commit. To undo a copy\n"
@@ -4949,8 +5017,8 @@
" With multiple arguments, print names and values of all config\n"
" items with matching section names.\n"
"\n"
-" With the --debug flag, the source (filename and line number) is\n"
-" printed for each config item.\n"
+" With --debug, the source (filename and line number) is printed\n"
+" for each config item.\n"
" "
msgstr ""
@@ -4985,7 +5053,7 @@
msgid "dump the contents of an index file"
msgstr ""
-msgid "dump an index DAG as a .dot file"
+msgid "dump an index DAG as a graphviz dot file"
msgstr ""
msgid "test Mercurial installation"
@@ -5124,6 +5192,7 @@
" git 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"
@@ -5153,7 +5222,7 @@
" 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"
+" format. See 'hg help diffs' for more information.\n"
"\n"
" With the --switch-parent option, the diff will be against the\n"
" second parent. It can be useful to review a merge.\n"
@@ -5231,20 +5300,29 @@
"\n"
" With no arguments, show all repository head changesets.\n"
"\n"
-" If branch or revisions names are given this will show the heads of\n"
-" the specified branches or the branches those revisions are tagged\n"
-" with.\n"
-"\n"
" Repository \"heads\" are changesets that don't have child\n"
" changesets. They are where development generally takes place and\n"
" are the usual targets for update and merge operations.\n"
"\n"
-" Branch heads are changesets that have a given branch tag, but have\n"
-" no child changesets with that tag. They are usually where\n"
-" development on the given branch takes place.\n"
+" If one or more REV is given, the \"branch heads\" will be shown for\n"
+" the named branch associated with that revision. The name of the\n"
+" branch is called the revision's branch tag.\n"
+"\n"
+" Branch heads are revisions on a given named branch that do not have\n"
+" any children on the same branch. A branch head could be a true head\n"
+" or it could be the last changeset on a branch before a new branch\n"
+" was created. If none of the branch heads are true heads, the branch\n"
+" is considered inactive.\n"
+"\n"
+" If STARTREV is specified only those heads (or branch heads) that\n"
+" are descendants of STARTREV will be displayed.\n"
" "
msgstr ""
+#, fuzzy, python-format
+msgid "no open branch heads on branch %s\n"
+msgstr "indskrænker forgreningssøgning til %s:%s\n"
+
#, python-format
msgid "no changes on branch %s containing %s are reachable from %s\n"
msgstr ""
@@ -5256,7 +5334,7 @@
msgid ""
"show help for a given topic or a help overview\n"
"\n"
-" With no arguments, print a list of commands and short help.\n"
+" With no arguments, print a list of commands with short help messages.\n"
"\n"
" Given a topic, extension, or command name, print help for that\n"
" topic."
@@ -5350,7 +5428,8 @@
" With no revision, print a summary of the current state of the\n"
" repository.\n"
"\n"
-" With a path, do a lookup in another repository.\n"
+" Specifying a path to a repository root or Mercurial bundle will\n"
+" cause lookup to operate on that repository/bundle.\n"
"\n"
" This summary identifies the repository state using one or two\n"
" parent hash identifiers, followed by a \"+\" if there are\n"
@@ -5368,8 +5447,8 @@
" 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"
-" text/x-patch to be used). From and Subject headers of email\n"
+" as attachments work (to use the body part, it must have type\n"
+" text/plain or text/x-patch). From and Subject headers of email\n"
" message are used as default committer and commit message. All\n"
" text/plain body parts before first diff are added to commit\n"
" message.\n"
@@ -5388,8 +5467,8 @@
" 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"
+" To read a patch from standard input, use \"-\" as the patch name.\n"
+" See 'hg help dates' for a list of formats valid for -d/--date.\n"
" "
msgstr ""
@@ -5407,8 +5486,9 @@
"meddelse:\n"
"%s\n"
-msgid "not a mercurial patch"
-msgstr ""
+#, fuzzy
+msgid "not a Mercurial patch"
+msgstr "%s er ikke en Mercurial bundle fil"
msgid "patch is damaged or loses information"
msgstr ""
@@ -5417,8 +5497,8 @@
"show new changesets found in source\n"
"\n"
" Show new changesets found in the specified path/URL or the default\n"
-" pull location. These are the changesets that would be pulled if a\n"
-" pull was requested.\n"
+" pull location. These are the changesets that would have been pulled\n"
+" if a pull at the time you issued this command.\n"
"\n"
" For remote repository, using --bundle avoids downloading the\n"
" changesets twice if the incoming is followed by a pull.\n"
@@ -5427,11 +5507,12 @@
" "
msgstr ""
+#, fuzzy
msgid ""
"create a new repository in the given directory\n"
"\n"
" Initialize a new repository in the given directory. If the given\n"
-" directory does not exist, it is created.\n"
+" directory does not exist, it will be created.\n"
"\n"
" If no directory is given, the current directory is used.\n"
"\n"
@@ -5454,20 +5535,20 @@
msgid ""
"locate files matching specific patterns\n"
"\n"
-" Print all files under Mercurial control whose names match the\n"
-" given patterns.\n"
-"\n"
-" This command searches the entire repository by default. To search\n"
-" just the current directory and its subdirectories, use\n"
-" \"--include .\".\n"
-"\n"
-" If no patterns are given to match, this command prints all file\n"
-" names.\n"
+" Print files under Mercurial control in the working directory whose\n"
+" names match the given patterns.\n"
+"\n"
+" By default, this command searches all directories in the working\n"
+" directory. To search just the current directory and its\n"
+" subdirectories, use \"--include .\".\n"
+"\n"
+" If no patterns are given to match, this command prints the names\n"
+" of all files under Mercurial control in the working directory.\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\". This\n"
" will avoid the problem of \"xargs\" treating single filenames that\n"
-" contain white space as multiple filenames.\n"
+" contain whitespace as multiple filenames.\n"
" "
msgstr ""
@@ -5478,8 +5559,8 @@
" project.\n"
"\n"
" File history is shown without following rename or copy history of\n"
-" files. Use -f/--follow with a file name to follow history across\n"
-" renames and copies. --follow without a file name will only show\n"
+" files. Use -f/--follow with a filename to follow history across\n"
+" renames and copies. --follow without a filename will only show\n"
" ancestors or descendants of the starting revision. --follow-first\n"
" only follows the first parent of merge revisions.\n"
"\n"
@@ -5489,16 +5570,15 @@
"\n"
" See 'hg help dates' for a list of formats valid for -d/--date.\n"
"\n"
-" By default this command outputs: changeset id and hash, tags,\n"
-" non-trivial parents, user, date and time, and a summary for each\n"
-" commit. When the -v/--verbose switch is used, the list of changed\n"
-" files and full commit message is shown.\n"
+" By default this command prints revision number and changeset id,\n"
+" tags, non-trivial parents, user, date and time, and a summary for\n"
+" each commit. When the -v/--verbose switch is used, the list of\n"
+" changed files and full commit message are shown.\n"
"\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"
-"\n"
+" its first parent. Also, only files different from BOTH parents\n"
+" will appear in files:.\n"
" "
msgstr ""
@@ -5507,28 +5587,29 @@
"\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 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"
+" is used, or the null revision if no revision is checked out.\n"
+"\n"
+" With -v, print file permissions, symlink and executable bits.\n"
+" With --debug, print file revision hashes.\n"
" "
msgstr ""
+#, fuzzy
msgid ""
"merge working directory with another revision\n"
"\n"
-" The contents of the current working directory is updated with all\n"
-" changes made in the requested revision since the last common\n"
-" predecessor revision.\n"
+" The current working directory is updated with all changes made in\n"
+" the requested revision since the last common predecessor revision.\n"
"\n"
" Files that changed between either parent are marked as changed for\n"
" the next commit and a commit must be performed before any further\n"
-" updates are allowed. The next commit has two parents.\n"
+" updates to the repository are allowed. The next commit will have\n"
+" two parents.\n"
"\n"
" If no revision is specified, the working directory's parent is a\n"
" head revision, and the current branch contains exactly one other\n"
" head, the other head is merged with by default. Otherwise, an\n"
-" explicit revision to merge with must be provided.\n"
+" explicit revision with which to merge with must be provided.\n"
" "
msgstr ""
"sammenføj arbejdskataloget med en anden revision\n"
@@ -5579,14 +5660,15 @@
" "
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 -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"
+" If a file argument is given, the revision in which the file was\n"
+" last changed (before the working directory revision or the\n"
+" argument to --rev if given) is printed.\n"
" "
msgstr ""
"vis forældrene til arbejdskataloget eller en revision\n"
@@ -5598,7 +5680,7 @@
" --rev, hvis givet).\n"
" "
-msgid "can only specify an explicit file name"
+msgid "can only specify an explicit filename"
msgstr ""
#, python-format
@@ -5609,7 +5691,7 @@
"show aliases for remote repositories\n"
"\n"
" Show definition of symbolic path name NAME. If no name is given,\n"
-" show definition of available names.\n"
+" show definition of all available names.\n"
"\n"
" Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
" and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
@@ -5630,17 +5712,21 @@
msgid "(run 'hg update' to get a working copy)\n"
msgstr "(kør 'hg update' for at få en arbejdskopi)\n"
+#, fuzzy
msgid ""
"pull changes from the specified source\n"
"\n"
-" Pull changes from a remote repository to the local one.\n"
+" Pull changes from a remote repository to a local one.\n"
"\n"
" This finds all changes from the repository at the specified path\n"
-" or URL and adds them to the local repository. By default, this\n"
-" does not update the copy of the project in the working directory.\n"
-"\n"
-" Use hg incoming if you want to see what will be added by the next\n"
-" pull without actually adding the changes to the repository.\n"
+" or URL and adds them to a local repository (the current one unless\n"
+" -R is specified). By default, this does not update the copy of the\n"
+" project in the working directory.\n"
+"\n"
+" Use hg incoming if you want to see what would have been added by a\n"
+" pull at the time you issued this command. If you then decide to\n"
+" added those changes to the repository, you should use pull -r X\n"
+" where X is the last changeset listed by hg incoming.\n"
"\n"
" If SOURCE is omitted, the 'default' path will be used.\n"
" See 'hg help urls' for more information.\n"
@@ -5662,6 +5748,7 @@
" Se 'hg help urls' for mere information.\n"
" "
+#, fuzzy
msgid ""
"push changes to the specified destination\n"
"\n"
@@ -5674,12 +5761,12 @@
"\n"
" By default, push will refuse to run if it detects the result would\n"
" increase the number of remote heads. This generally indicates the\n"
-" the client has forgotten to pull and merge before pushing.\n"
+" user forgot to pull and merge before pushing.\n"
"\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"
+" Please see 'hg help urls' for important details about ssh://\n"
" URLs. If DESTINATION is omitted, a default path will be used.\n"
" See 'hg help urls' for more information.\n"
" "
@@ -5721,6 +5808,7 @@
" "
msgstr ""
+#, fuzzy
msgid ""
"remove the specified files on the next commit\n"
"\n"
@@ -5730,13 +5818,13 @@
" 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"
+" revision without deleting them from the working directory.\n"
"\n"
" The following table details the behavior of remove for different\n"
" file states (columns) and option combinations (rows). The file\n"
-" states are Added, Clean, Modified and Missing (as reported by hg\n"
-" status). The actions are Warn, Remove (from branch) and Delete\n"
-" (from disk).\n"
+" states are Added [A], Clean [C], Modified [M] and Missing [!]\n"
+" (as reported by hg status). The actions are Warn, Remove (from\n"
+" branch) and Delete (from disk).\n"
"\n"
" A C M !\n"
" none W RD W R\n"
@@ -5821,9 +5909,9 @@
" 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"
-" as resolved before the new commits are permitted.\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"
" U = unresolved\n"
@@ -5967,15 +6055,16 @@
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/--all is given. Unless options\n"
-" described with \"show only ...\" are given, the options -mardu are\n"
-" used.\n"
+" the source of a copy/move operation, are not listed unless\n"
+" -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n"
+" Unless options described with \"show only ...\" are given, the\n"
+" options -mardu are used.\n"
"\n"
" Option -q/--quiet hides untracked (unknown and ignored) files\n"
" unless explicitly requested with -u/--unknown or -i/--ignored.\n"
@@ -5986,7 +6075,8 @@
" to one merge parent.\n"
"\n"
" If one revision is given, it is used as the base revision.\n"
-" If two revisions are given, the difference between them is shown.\n"
+" If two revisions are given, the differences between them are\n"
+" shown.\n"
"\n"
" The codes used to show the status of files are:\n"
" M = modified\n"
@@ -5996,7 +6086,7 @@
" ! = 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"
+" = origin of the previous file listed as A (added)\n"
" "
msgstr ""
"vis ændrede filer i arbejdskataloget\n"
@@ -6104,9 +6194,9 @@
msgid ""
"show the tip revision\n"
"\n"
-" The tip revision (usually just called the tip) is the most\n"
-" recently added changeset in the repository, the most recently\n"
-" changed head.\n"
+" The tip revision (usually just called the tip) is the changeset\n"
+" most recently added to the repository (and therefore the most\n"
+" recently changed head).\n"
"\n"
" If you have just made a commit, that commit will be the tip. If\n"
" you have just pulled changes from another repository, the tip of\n"
@@ -6506,6 +6596,10 @@
msgid "[OPTION]..."
msgstr ""
+#, fuzzy
+msgid "revision to check"
+msgstr "revision som skal bakkes ud"
+
msgid "[OPTION]... [-r REV1 [-r REV2]] [FILE]..."
msgstr ""
@@ -6545,7 +6639,11 @@
msgid "show only the active heads from open branches"
msgstr ""
-msgid "[-r REV] [REV]..."
+#, fuzzy
+msgid "show normal and closed heads"
+msgstr "vis kun tilføjede filer"
+
+msgid "[-r STARTREV] [REV]..."
msgstr ""
msgid "[TOPIC]"
@@ -6916,7 +7014,7 @@
msgstr ""
#, python-format
-msgid "%s: unsupported file type (type is %s)\n"
+msgid "unsupported file type (type is %s)"
msgstr ""
#, python-format
@@ -7054,8 +7152,8 @@
"Option -R has to be separated from other options (e.g. not -qR) and --"
"repository may only be abbreviated as --repo!"
msgstr ""
-"Tilvalget -R skal adskilles fra andre tilvalg (fx ikke -qR) og --"
-"repository må kun forkortes som --repo!"
+"Tilvalget -R skal adskilles fra andre tilvalg (fx ikke -qR) og --repository "
+"må kun forkortes som --repo!"
#, python-format
msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n"
@@ -7647,6 +7745,16 @@
" "
msgstr ""
+msgid "can only share local repositories"
+msgstr ""
+
+#, fuzzy
+msgid "destination already exists"
+msgstr "%s eksisterer allerede"
+
+msgid "updating working directory\n"
+msgstr "opdaterer arbejdskatalog\n"
+
#, python-format
msgid "destination directory: %s\n"
msgstr ""
@@ -7667,9 +7775,6 @@
msgid "clone from remote to remote not supported"
msgstr ""
-msgid "updating working directory\n"
-msgstr "opdaterer arbejdskatalog\n"
-
msgid "updated"
msgstr "opdateret"
@@ -7857,6 +7962,10 @@
msgid "requirement '%s' not supported"
msgstr "betingelse '%s' er ikke understøttet"
+#, fuzzy, python-format
+msgid ".hg/sharedpath points to nonexistent directory %s"
+msgstr "rev %d peger på ikke eksisterende ændring %d"
+
#, python-format
msgid "%r cannot be used in a tag name"
msgstr "%r kan ikke bruges i et mærkatnavnet"
@@ -7933,8 +8042,16 @@
msgid "cannot partially commit a merge (do not specify files or patterns)"
msgstr ""
-#, python-format
-msgid "%s not tracked!\n"
+#, fuzzy
+msgid "file not found!"
+msgstr "filen %s blev ikke fundet!"
+
+#, fuzzy
+msgid "no match under directory!"
+msgstr "skift arbejdskatalog"
+
+#, fuzzy
+msgid "file not tracked!"
msgstr "%s følges ikke\n"
msgid "nothing changed\n"
@@ -7943,6 +8060,10 @@
msgid "unresolved merge conflicts (see hg resolve)"
msgstr ""
+#, fuzzy, python-format
+msgid "committing subrepository %s\n"
+msgstr "kloner hovedarkiv\n"
+
#, python-format
msgid "trouble committing %s!\n"
msgstr "problem ved arkivering %s!\n"
@@ -7974,6 +8095,10 @@
msgstr "%s eksisterer stadig!\n"
#, python-format
+msgid "%s not tracked!\n"
+msgstr "%s følges ikke\n"
+
+#, python-format
msgid "%s not removed!\n"
msgstr "%s ikke fjernet!\n"
@@ -8189,17 +8314,6 @@
msgid "case-folding collision between %s and %s"
msgstr ""
-msgid "resolving manifests\n"
-msgstr ""
-
-#, python-format
-msgid " overwrite %s partial %s\n"
-msgstr ""
-
-#, python-format
-msgid " ancestor %s local %s remote %s\n"
-msgstr ""
-
#, python-format
msgid ""
" conflicting flags for %s\n"
@@ -8215,6 +8329,17 @@
msgid "Sym&link"
msgstr ""
+msgid "resolving manifests\n"
+msgstr ""
+
+#, python-format
+msgid " overwrite %s partial %s\n"
+msgstr ""
+
+#, python-format
+msgid " ancestor %s local %s remote %s\n"
+msgstr ""
+
#, python-format
msgid ""
" local changed %s which remote deleted\n"
@@ -8270,16 +8395,20 @@
msgstr "intet at sammenføje (brug 'hg update' eller kontroller 'hg heads')"
msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
-msgstr "udestående uarkiverede ændringer (brug 'hg status' for at se ændringer)"
+msgstr ""
+"udestående uarkiverede æ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)"
+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)"
+msgstr ""
+"krydser navngivne grene (brug 'hg update -C' for at kassere ændringerne)"
#, python-format
msgid "cannot create %s: destination already exists"
@@ -8362,6 +8491,10 @@
msgid "patch command failed: %s"
msgstr ""
+#, fuzzy, python-format
+msgid "Unsupported line endings type: %s"
+msgstr "ikke i dirstate: %s\n"
+
#, python-format
msgid "no valid hunks found; trying with %r instead\n"
msgstr ""
@@ -8486,6 +8619,43 @@
msgid "sending %s (%d bytes)\n"
msgstr ""
+#, python-format
+msgid ""
+" subrepository sources for %s differ\n"
+"use (l)ocal source (%s) or (r)emote source (%s)?"
+msgstr ""
+
+#, fuzzy
+msgid "&Remote"
+msgstr "fjernsystem: "
+
+msgid "r"
+msgstr ""
+
+#, python-format
+msgid ""
+" local changed subrepository %s which remote removed\n"
+"use (c)hanged version or (d)elete?"
+msgstr ""
+
+#, python-format
+msgid ""
+" remote changed subrepository %s which local removed\n"
+"use (c)hanged version or (d)elete?"
+msgstr ""
+
+#, fuzzy, python-format
+msgid "removing subrepo %s\n"
+msgstr "fjerner %s\n"
+
+#, fuzzy, python-format
+msgid "pulling subrepo %s\n"
+msgstr "hiver fra %s\n"
+
+#, fuzzy, python-format
+msgid "pushing subrepo %s\n"
+msgstr "skubber til %s\n"
+
msgid "unmatched quotes"
msgstr ""
@@ -8823,3 +8993,6 @@
msgid "user name not available - set USERNAME environment variable"
msgstr "der er ikke noget brugernavn - sæt USERNAME miljøvariabel"
+
+#~ msgid "patch file name"
+#~ msgstr "patch navn"