--- a/i18n/da.po Wed Sep 16 23:46:06 2009 +0200
+++ b/i18n/da.po Thu Sep 17 00:43:25 2009 +0200
@@ -17,8 +17,8 @@
msgstr ""
"Project-Id-Version: Mercurial\n"
"Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2009-07-20 23:05+0200\n"
-"PO-Revision-Date: 2009-07-21 00:18+0200\n"
+"POT-Creation-Date: 2009-09-17 00:19+0200\n"
+"PO-Revision-Date: 2009-09-17 00:43+0200\n"
"Last-Translator: <mg@lazybytes.net>\n"
"Language-Team: Danish\n"
"MIME-Version: 1.0\n"
@@ -36,8 +36,12 @@
msgid "COMMANDS"
msgstr "KOMMANDOER"
-msgid " options:\n"
-msgstr " tilvalg:\n"
+msgid ""
+" options:\n"
+"\n"
+msgstr ""
+" tilvalg:\n"
+"\n"
#, python-format
msgid ""
@@ -64,7 +68,7 @@
"Nor is it safe if remote users share an account, because then there\n"
"is no way to distinguish them.\n"
"\n"
-"To use this hook, configure the acl extension in your hgrc like this:\n"
+"To use this hook, configure the acl extension in your hgrc like this::\n"
"\n"
" [extensions]\n"
" hgext.acl =\n"
@@ -77,10 +81,10 @@
" # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n"
" sources = serve\n"
"\n"
-"The allow and deny sections take a subtree pattern as key (with a\n"
-"glob syntax by default), and a comma separated list of users as\n"
-"the corresponding value. The deny list is checked before the allow\n"
-"list is.\n"
+"The allow and deny sections take a subtree pattern as key (with a glob\n"
+"syntax by default), and a comma separated list of users as the\n"
+"corresponding value. The deny list is checked before the allow list\n"
+"is. ::\n"
"\n"
" [acl.allow]\n"
" # If acl.allow is not present, all users are allowed by default.\n"
@@ -133,16 +137,16 @@
"\n"
"Bookmarks are local movable markers to changesets. Every bookmark\n"
"points to a changeset identified by its hash. If you commit a\n"
-"changeset that is based on a changeset that has a bookmark on it,\n"
-"the bookmark shifts to the new changeset.\n"
-"\n"
-"It is possible to use bookmark names in every revision lookup\n"
-"(e.g. hg merge, hg update).\n"
+"changeset that is based on a changeset that has a bookmark on it, the\n"
+"bookmark shifts to the new changeset.\n"
+"\n"
+"It is possible to use bookmark names in every revision lookup (e.g. hg\n"
+"merge, hg update).\n"
"\n"
"By default, when several bookmarks point to the same changeset, they\n"
"will all move forward together. It is possible to obtain a more\n"
"git-like experience by adding the following configuration option to\n"
-"your .hgrc:\n"
+"your .hgrc::\n"
"\n"
" [bookmarks]\n"
" track.current = True\n"
@@ -217,65 +221,86 @@
"be run by Mercurial as the user pushing the change; you will need to\n"
"ensure the Bugzilla install file permissions are set appropriately.\n"
"\n"
-"Configuring the extension:\n"
-"\n"
-" [bugzilla]\n"
-"\n"
-" host Hostname of the MySQL server holding the Bugzilla\n"
-" database.\n"
-" db Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
-" user Username to use to access MySQL server. Default 'bugs'.\n"
-" password Password to use to access MySQL server.\n"
-" timeout Database connection timeout (seconds). Default 5.\n"
-" version Bugzilla version. Specify '3.0' for Bugzilla versions\n"
-" 3.0 and later, '2.18' for Bugzilla versions from 2.18\n"
-" and '2.16' for versions prior to 2.18.\n"
-" bzuser Fallback Bugzilla user name to record comments with, if\n"
-" changeset committer cannot be found as a Bugzilla user.\n"
-" bzdir Bugzilla install directory. Used by default notify.\n"
-" Default '/var/www/html/bugzilla'.\n"
-" notify The command to run to get Bugzilla to send bug change\n"
-" notification emails. Substitutes from a map with 3\n"
-" keys, 'bzdir', 'id' (bug id) and 'user' (committer\n"
-" bugzilla email). Default depends on version; from 2.18\n"
-" it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
-" %(id)s %(user)s\".\n"
-" regexp Regular expression to match bug IDs in changeset commit\n"
-" message. Must contain one \"()\" group. The default\n"
-" expression matches 'Bug 1234', 'Bug no. 1234', 'Bug\n"
-" number 1234', 'Bugs 1234,5678', 'Bug 1234 and 5678' and\n"
-" variations thereof. Matching is case insensitive.\n"
-" style The style file to use when formatting comments.\n"
-" template Template to use when formatting comments. Overrides\n"
-" style if specified. In addition to the usual Mercurial\n"
-" keywords, the extension specifies:\n"
-" {bug} The Bugzilla bug ID.\n"
-" {root} The full pathname of the Mercurial\n"
-" repository.\n"
-" {webroot} Stripped pathname of the Mercurial\n"
-" repository.\n"
-" {hgweb} Base URL for browsing Mercurial\n"
-" repositories.\n"
-" Default 'changeset {node|short} in repo {root} refers '\n"
-" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
-" strip The number of slashes to strip from the front of {root}\n"
-" to produce {webroot}. Default 0.\n"
-" usermap Path of file containing Mercurial committer ID to\n"
-" Bugzilla user ID mappings. If specified, the file\n"
-" should contain one mapping per line,\n"
-" \"committer\"=\"Bugzilla user\". See also the [usermap]\n"
-" section.\n"
-"\n"
-" [usermap]\n"
-" Any entries in this section specify mappings of Mercurial\n"
-" committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
-" \"committer\"=\"Bugzilla user\"\n"
-"\n"
-" [web]\n"
-" baseurl Base URL for browsing Mercurial repositories. Reference\n"
-" from templates as {hgweb}.\n"
-"\n"
-"Activating the extension:\n"
+"The extension is configured through three different configuration\n"
+"sections. These keys are recognized in the [bugzilla] section:\n"
+"\n"
+"host\n"
+" Hostname of the MySQL server holding the Bugzilla database.\n"
+"\n"
+"db\n"
+" Name of the Bugzilla database in MySQL. Default 'bugs'.\n"
+"\n"
+"user\n"
+" Username to use to access MySQL server. Default 'bugs'.\n"
+"\n"
+"password\n"
+" Password to use to access MySQL server.\n"
+"\n"
+"timeout\n"
+" Database connection timeout (seconds). Default 5.\n"
+"\n"
+"version\n"
+" Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n"
+" '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n"
+" to 2.18.\n"
+"\n"
+"bzuser\n"
+" Fallback Bugzilla user name to record comments with, if changeset\n"
+" committer cannot be found as a Bugzilla user.\n"
+"\n"
+"bzdir\n"
+" Bugzilla install directory. Used by default notify. Default\n"
+" '/var/www/html/bugzilla'.\n"
+"\n"
+"notify\n"
+" The command to run to get Bugzilla to send bug change notification\n"
+" emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n"
+" and 'user' (committer bugzilla email). Default depends on version;\n"
+" from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
+" %(id)s %(user)s\".\n"
+"\n"
+"regexp\n"
+" Regular expression to match bug IDs in changeset commit message.\n"
+" Must contain one \"()\" group. The default expression matches 'Bug\n"
+" 1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n"
+" 1234 and 5678' and variations thereof. Matching is case insensitive.\n"
+"\n"
+"style\n"
+" The style file to use when formatting comments.\n"
+"\n"
+"template\n"
+" Template to use when formatting comments. Overrides style if\n"
+" specified. In addition to the usual Mercurial keywords, the\n"
+" extension specifies::\n"
+"\n"
+" {bug} The Bugzilla bug ID.\n"
+" {root} The full pathname of the Mercurial repository.\n"
+" {webroot} Stripped pathname of the Mercurial repository.\n"
+" {hgweb} Base URL for browsing Mercurial repositories.\n"
+"\n"
+" Default 'changeset {node|short} in repo {root} refers '\n"
+" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'\n"
+"\n"
+"strip\n"
+" The number of slashes to strip from the front of {root} to produce\n"
+" {webroot}. Default 0.\n"
+"\n"
+"usermap\n"
+" Path of file containing Mercurial committer ID to Bugzilla user ID\n"
+" mappings. If specified, the file should contain one mapping per\n"
+" line, \"committer\"=\"Bugzilla user\". See also the [usermap] section.\n"
+"\n"
+"The [usermap] section is used to specify mappings of Mercurial\n"
+"committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
+"\"committer\"=\"Bugzilla user\"\n"
+"\n"
+"Finally, the [web] section supports one entry:\n"
+"\n"
+"baseurl\n"
+" Base URL for browsing Mercurial repositories. Reference from\n"
+" templates as {hgweb}.\n"
+"\n"
+"Activating the extension::\n"
"\n"
" [extensions]\n"
" hgext.bugzilla =\n"
@@ -288,7 +313,7 @@
"\n"
"This example configuration is for a collection of Mercurial\n"
"repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
-"installation in /opt/bugzilla-3.2.\n"
+"installation in /opt/bugzilla-3.2. ::\n"
"\n"
" [bugzilla]\n"
" host=localhost\n"
@@ -296,8 +321,9 @@
" version=3.0\n"
" bzuser=unknown@domain.com\n"
" bzdir=/opt/bugzilla-3.2\n"
-" template=Changeset {node|short} in {root|basename}.\\n{hgweb}/{webroot}/"
-"rev/{node|short}\\n\\n{desc}\\n\n"
+" template=Changeset {node|short} in {root|basename}.\n"
+" {hgweb}/{webroot}/rev/{node|short}\\n\n"
+" {desc}\\n\n"
" strip=5\n"
"\n"
" [web]\n"
@@ -306,7 +332,7 @@
" [usermap]\n"
" user@emaildomain.com=user.name@bugzilladomain.com\n"
"\n"
-"Commits add a comment to the Bugzilla bug record of the form:\n"
+"Commits add a comment to the Bugzilla bug record of the form::\n"
"\n"
" Changeset 3b16791d6642 in repository-name.\n"
" http://dev.domain.com/hg/repository-name/rev/3b16791d6642\n"
@@ -437,7 +463,7 @@
" alternatively the number of matching revisions if the\n"
" --changesets option is specified.\n"
"\n"
-" Examples:\n"
+" Examples::\n"
"\n"
" # display count of changed lines for every committer\n"
" hg churn -t '{author|email}'\n"
@@ -452,12 +478,12 @@
" hg churn -f '%Y' -s\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"
-" 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"
+" by providing a file using the following format::\n"
+"\n"
+" <alias email> <actual email>\n"
+"\n"
+" Such a file may be specified with the --aliases option, otherwise\n"
+" a .hgchurn file will be looked for in the working directory root.\n"
" "
msgstr ""
"histogram over ændringer i depotet\n"
@@ -472,7 +498,7 @@
" alternativt på antallet af matchende revisioner, hvis --changesets\n"
" tilvalget er specificeret.\n"
"\n"
-" Eksempler:\n"
+" Eksempler::\n"
"\n"
" # viser antaller af ændrede linier for hver bruger\n"
" hg churn -t '{author|email}'\n"
@@ -487,9 +513,9 @@
" hg churn -f '%Y' -s\n"
"\n"
" Det er muligt at afbilde alternative e-mail-adresser til\n"
-" hoved-adresser ved at bruge en fil med følgende format:\n"
-"\n"
-" <alias email> <faktisk email>\n"
+" hoved-adresser ved at bruge en fil med følgende format::\n"
+"\n"
+" <alias email> <faktisk email>\n"
"\n"
" En sådan fil kan angivet med --aliases tilvalget. Som standard\n"
" bruges .hgchurn i arbejdskatalogets rod, hvis denne findes.\n"
@@ -540,33 +566,33 @@
"function (aka ANSI escape codes). This module also provides the\n"
"render_text function, which can be used to add effects to any text.\n"
"\n"
-"Default effects may be overridden from the .hgrc file:\n"
-"\n"
-"[color]\n"
-"status.modified = blue bold underline red_background\n"
-"status.added = green bold\n"
-"status.removed = red bold blue_background\n"
-"status.deleted = cyan bold underline\n"
-"status.unknown = magenta bold underline\n"
-"status.ignored = black bold\n"
-"\n"
-"# 'none' turns off all effects\n"
-"status.clean = none\n"
-"status.copied = none\n"
-"\n"
-"qseries.applied = blue bold underline\n"
-"qseries.unapplied = black bold\n"
-"qseries.missing = red bold\n"
-"\n"
-"diff.diffline = bold\n"
-"diff.extended = cyan bold\n"
-"diff.file_a = red bold\n"
-"diff.file_b = green bold\n"
-"diff.hunk = magenta\n"
-"diff.deleted = red\n"
-"diff.inserted = green\n"
-"diff.changed = white\n"
-"diff.trailingwhitespace = bold red_background\n"
+"Default effects may be overridden from the .hgrc file::\n"
+"\n"
+" [color]\n"
+" status.modified = blue bold underline red_background\n"
+" status.added = green bold\n"
+" status.removed = red bold blue_background\n"
+" status.deleted = cyan bold underline\n"
+" status.unknown = magenta bold underline\n"
+" status.ignored = black bold\n"
+"\n"
+" # 'none' turns off all effects\n"
+" status.clean = none\n"
+" status.copied = none\n"
+"\n"
+" qseries.applied = blue bold underline\n"
+" qseries.unapplied = black bold\n"
+" qseries.missing = red bold\n"
+"\n"
+" diff.diffline = bold\n"
+" diff.extended = cyan bold\n"
+" diff.file_a = red bold\n"
+" diff.file_b = green bold\n"
+" diff.hunk = magenta\n"
+" diff.deleted = red\n"
+" diff.inserted = green\n"
+" diff.changed = white\n"
+" diff.trailingwhitespace = bold red_background\n"
msgstr ""
msgid "when to colorize (always, auto, or never)"
@@ -586,6 +612,7 @@
"convert a foreign SCM repository to a Mercurial one.\n"
"\n"
" Accepted source formats [identifiers]:\n"
+"\n"
" - Mercurial [hg]\n"
" - CVS [cvs]\n"
" - Darcs [darcs]\n"
@@ -597,6 +624,7 @@
" - Perforce [p4]\n"
"\n"
" Accepted destination formats [identifiers]:\n"
+"\n"
" - Mercurial [hg]\n"
" - Subversion [svn] (history on branches is not preserved)\n"
"\n"
@@ -608,23 +636,28 @@
" 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"
+" By default, all sources except Mercurial will use --branchsort.\n"
+" Mercurial uses --sourcesort to preserve original revision numbers\n"
+" order. Sort modes have the following effects:\n"
+"\n"
+" --branchsort convert from parent to child revision when possible,\n"
+" which means branches are usually converted one after\n"
+" the other. It generates more compact repositories.\n"
+"\n"
+" --datesort sort revisions by date. Converted repositories have\n"
+" good-looking changelogs but are often an order of\n"
+" magnitude larger than the same ones generated by\n"
+" --branchsort.\n"
+"\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"
-" revision, like so:\n"
-" <source ID> <destination ID>\n"
+" revision, like so::\n"
+"\n"
+" <source ID> <destination ID>\n"
"\n"
" If the file doesn't exist, it's automatically created. It's\n"
" updated on each commit copied, so convert-repo can be interrupted\n"
@@ -638,7 +671,7 @@
"\n"
" The filemap is a file that allows filtering and remapping of files\n"
" and directories. Comment lines start with '#'. Each line can\n"
-" contain one of the following directives:\n"
+" contain one of the following directives::\n"
"\n"
" include path/to/file\n"
"\n"
@@ -648,11 +681,11 @@
"\n"
" The 'include' directive causes a file, or all files under a\n"
" directory, to be included in the destination repository, and the\n"
-" exclusion of all other files and directories not explicitly included.\n"
-" The 'exclude' directive causes files or directories to be omitted.\n"
-" The 'rename' directive renames a file or directory. To rename from\n"
-" a subdirectory into the root of the repository, use '.' as the\n"
-" path to rename to.\n"
+" exclusion of all other files and directories not explicitly\n"
+" included. The 'exclude' directive causes files or directories to\n"
+" be omitted. The 'rename' directive renames a file or directory. To\n"
+" rename from a subdirectory into the root of the repository, use\n"
+" '.' as the path to rename to.\n"
"\n"
" The splicemap is a file that allows insertion of synthetic\n"
" history, letting you specify the parents of a revision. This is\n"
@@ -677,7 +710,7 @@
" in one repository from \"default\" to a named branch.\n"
"\n"
" Mercurial Source\n"
-" -----------------\n"
+" ----------------\n"
"\n"
" --config convert.hg.ignoreerrors=False (boolean)\n"
" ignore integrity errors when reading. Use it to fix Mercurial\n"
@@ -705,36 +738,38 @@
" Because CVS does not have changesets, it is necessary to collect\n"
" individual commits to CVS and merge them into changesets. CVS\n"
" source uses its internal changeset merging code by default but can\n"
-" be configured to call the external 'cvsps' program by setting:\n"
-" --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
+" be configured to call the external 'cvsps' program by setting::\n"
+"\n"
+" --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n"
+"\n"
" This option is deprecated and will be removed in Mercurial 1.4.\n"
"\n"
" The options shown are the defaults.\n"
"\n"
-" Internal cvsps is selected by setting\n"
-" --config convert.cvsps=builtin\n"
+" Internal cvsps is selected by setting ::\n"
+"\n"
+" --config convert.cvsps=builtin\n"
+"\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"
-" single changeset. When very large files were checked in as\n"
-" part of a changeset then the default may not be long\n"
-" enough.\n"
-" --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
-" Specify a regular expression to which commit log messages\n"
-" are matched. If a match occurs, then the conversion\n"
-" process will insert a dummy revision merging the branch on\n"
-" which this log message occurs to the branch indicated in\n"
-" the regex.\n"
-" --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
-" Specify a regular expression to which commit log messages\n"
-" are matched. If a match occurs, then the conversion\n"
-" process will add the most recent revision on the branch\n"
-" indicated in the regex as the second parent of the\n"
-" changeset.\n"
+"\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 between\n"
+" commits with identical user and log message in a single\n"
+" changeset. When very large files were checked in as part of a\n"
+" changeset then the default may not be long enough.\n"
+" --config convert.cvsps.mergeto='{{mergetobranch ([-\\w]+)}}'\n"
+" Specify a regular expression to which commit log messages are\n"
+" matched. If a match occurs, then the conversion process will\n"
+" insert a dummy revision merging the branch on which this log\n"
+" message occurs to the branch indicated in the regex.\n"
+" --config convert.cvsps.mergefrom='{{mergefrombranch ([-\\w]+)}}'\n"
+" Specify a regular expression to which commit log messages are\n"
+" matched. If a match occurs, then the conversion process will\n"
+" add the most recent revision on the branch indicated in the\n"
+" regex as the second parent of the changeset.\n"
"\n"
" The hgext/convert/cvsps wrapper script allows the builtin\n"
" changeset merging code to be run without doing a conversion. Its\n"
@@ -784,7 +819,6 @@
" --config convert.p4.startrev=0 (perforce changelist number)\n"
" specify initial Perforce revision.\n"
"\n"
-"\n"
" Mercurial Destination\n"
" ---------------------\n"
"\n"
@@ -1007,7 +1041,8 @@
#, python-format
msgid ""
"unexpected response from CVS server (expected \"Valid-requests\", but got %r)"
-msgstr "uventet svar fra CVS serveren (forventede \"Valid-requests\", men fik %r)"
+msgstr ""
+"uventet svar fra CVS serveren (forventede \"Valid-requests\", men fik %r)"
#, python-format
msgid "%d bytes missing from remote file"
@@ -1086,6 +1121,10 @@
msgid "%d changeset entries\n"
msgstr "%d ændringer\n"
+#, python-format
+msgid "darcs version 2.1 or newer needed (found %r)"
+msgstr ""
+
msgid "Python ElementTree module is not available"
msgstr "Python ElementTree modulet er ikke tilstede"
@@ -1330,14 +1369,14 @@
msgid ""
"command to allow external programs to compare revisions\n"
"\n"
-"The `extdiff' Mercurial extension allows you to use external programs\n"
-"to compare revisions, or revision with working directory. The external diff\n"
-"programs are called with a configurable set of options and two\n"
+"The extdiff Mercurial extension allows you to use external programs\n"
+"to compare revisions, or revision with working directory. The external\n"
+"diff programs are called with a configurable set of options and two\n"
"non-option arguments: paths to directories containing snapshots of\n"
"files to compare.\n"
"\n"
-"The `extdiff' extension also allows to configure new diff commands, so\n"
-"you do not need to type \"hg extdiff -p kdiff3\" always.\n"
+"The extdiff extension also allows to configure new diff commands, so\n"
+"you do not need to type \"hg extdiff -p kdiff3\" always. ::\n"
"\n"
" [extdiff]\n"
" # add new command that runs GNU diff(1) in 'context diff' mode\n"
@@ -1353,14 +1392,13 @@
" meld =\n"
"\n"
" # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n"
-" # (see http://www.vim.org/scripts/script.php?script_id=102)\n"
-" # Non English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" "
-"in\n"
+" # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n"
+" # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n"
" # your .vimrc\n"
" vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n"
"\n"
"You can use -I/-X and list of file or directory names like normal \"hg\n"
-"diff\" command. The `extdiff' extension makes snapshots of only needed\n"
+"diff\" command. The extdiff extension makes snapshots of only needed\n"
"files, so running the external diff program will actually be pretty\n"
"fast (at least faster than having to compare the entire tree).\n"
msgstr ""
@@ -1419,6 +1457,21 @@
msgstr "hg extdiff [TILVALG]... [FIL]..."
#, python-format
+msgid ""
+"use %(path)s to diff repository (or selected files)\n"
+"\n"
+" Show differences between revisions for the specified files, using the\n"
+" %(path)s program.\n"
+"\n"
+" When two revision arguments are given, then changes are shown between\n"
+" those revisions. If only one revision is specified then that revision "
+"is\n"
+" compared to the working directory, and, when no revisions are "
+"specified,\n"
+" the working directory files are compared to its parent."
+msgstr ""
+
+#, python-format
msgid "hg %s [OPTION]... [FILE]..."
msgstr "hg %s [TILVALG]... [FIL]..."
@@ -1492,10 +1545,6 @@
msgstr "sammenføjer med %d:%s\n"
#, python-format
-msgid "Automated merge with %s"
-msgstr "Automatisk sammenføjning med %s"
-
-#, python-format
msgid "new changeset %d:%s merges remote changes with local\n"
msgstr "ny ændring %d:%s fletter fjernændringer sammen med lokale\n"
@@ -1576,10 +1625,6 @@
"arbejdskopien af .hgsigs er ændret (deponer venligst .hgsigs manuelt eller "
"brug --force)"
-#, python-format
-msgid "Added signature for changeset %s"
-msgstr "Tilføjede underskrift af ændring %s"
-
msgid "unknown signature version"
msgstr "ukendt underskrift-version"
@@ -1655,38 +1700,38 @@
msgid ""
"hooks for integrating with the CIA.vc notification service\n"
"\n"
-"This is meant to be run as a changegroup or incoming hook.\n"
-"To configure it, set the following options in your hgrc:\n"
-"\n"
-"[cia]\n"
-"# your registered CIA user name\n"
-"user = foo\n"
-"# the name of the project in CIA\n"
-"project = foo\n"
-"# the module (subproject) (optional)\n"
-"#module = foo\n"
-"# Append a diffstat to the log message (optional)\n"
-"#diffstat = False\n"
-"# Template to use for log messages (optional)\n"
-"#template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
-"# Style to use (optional)\n"
-"#style = foo\n"
-"# The URL of the CIA notification service (optional)\n"
-"# You can use mailto: URLs to send by email, eg\n"
-"# mailto:cia@cia.vc\n"
-"# Make sure to set email.from if you do this.\n"
-"#url = http://cia.vc/\n"
-"# print message instead of sending it (optional)\n"
-"#test = False\n"
-"\n"
-"[hooks]\n"
-"# one of these:\n"
-"changegroup.cia = python:hgcia.hook\n"
-"#incoming.cia = python:hgcia.hook\n"
-"\n"
-"[web]\n"
-"# If you want hyperlinks (optional)\n"
-"baseurl = http://server/path/to/repo\n"
+"This is meant to be run as a changegroup or incoming hook. To\n"
+"configure it, set the following options in your hgrc::\n"
+"\n"
+" [cia]\n"
+" # your registered CIA user name\n"
+" user = foo\n"
+" # the name of the project in CIA\n"
+" project = foo\n"
+" # the module (subproject) (optional)\n"
+" #module = foo\n"
+" # Append a diffstat to the log message (optional)\n"
+" #diffstat = False\n"
+" # Template to use for log messages (optional)\n"
+" #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
+" # Style to use (optional)\n"
+" #style = foo\n"
+" # The URL of the CIA notification service (optional)\n"
+" # You can use mailto: URLs to send by email, eg\n"
+" # mailto:cia@cia.vc\n"
+" # Make sure to set email.from if you do this.\n"
+" #url = http://cia.vc/\n"
+" # print message instead of sending it (optional)\n"
+" #test = False\n"
+"\n"
+" [hooks]\n"
+" # one of these:\n"
+" changegroup.cia = python:hgcia.hook\n"
+" #incoming.cia = python:hgcia.hook\n"
+"\n"
+" [web]\n"
+" # If you want hyperlinks (optional)\n"
+" baseurl = http://server/path/to/repo\n"
msgstr ""
#, python-format
@@ -1717,19 +1762,19 @@
"\n"
"The hg view command will launch the hgk Tcl script. For this command\n"
"to work, hgk must be in your search path. Alternately, you can specify\n"
-"the path to hgk in your .hgrc file:\n"
+"the path to hgk in your .hgrc file::\n"
"\n"
" [hgk]\n"
" path=/location/of/hgk\n"
"\n"
"hgk can make use of the extdiff extension to visualize revisions.\n"
-"Assuming you had already configured extdiff vdiff command, just add:\n"
+"Assuming you had already configured extdiff vdiff command, just add::\n"
"\n"
" [hgk]\n"
" vdiff=vdiff\n"
"\n"
"Revisions context menu will now display additional entries to fire\n"
-"vdiff on hovered and selected revisions."
+"vdiff on hovered and selected revisions.\n"
msgstr ""
msgid "diff trees from two commits"
@@ -1819,10 +1864,10 @@
"It depends on the Pygments syntax highlighting library:\n"
"http://pygments.org/\n"
"\n"
-"There is a single configuration option:\n"
-"\n"
-"[web]\n"
-"pygments_style = <style>\n"
+"There is a single configuration option::\n"
+"\n"
+" [web]\n"
+" pygments_style = <style>\n"
"\n"
"The default is 'colorful'.\n"
msgstr ""
@@ -1831,10 +1876,10 @@
"Det afhænger af Pygments biblioteket til syntaksfarvelægning:\n"
"http://pygments.org/\n"
"\n"
-"Der er en enkelt konfigurationsmulighed:\n"
-"\n"
-"[web]\n"
-"pygments_style = <stil>\n"
+"Der er en enkelt konfigurationsmulighed::\n"
+"\n"
+" [web]\n"
+" pygments_style = <stil>\n"
"\n"
"Standardstilen er 'colorful'.\n"
"\n"
@@ -1949,10 +1994,6 @@
msgstr "overvåger kataloger under %r\n"
#, python-format
-msgid "status: %r dir(%d) -> %s\n"
-msgstr ""
-
-#, python-format
msgid "status: %r %s -> %s\n"
msgstr ""
@@ -2021,12 +2062,12 @@
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"
-"A few example patterns (link to bug tracking, etc.) that may\n"
-"be used in your hgrc:\n"
+"This extension allows the use of a special syntax in summaries, which\n"
+"will be automatically expanded into links or any other arbitrary\n"
+"expression, much like InterWiki does.\n"
+"\n"
+"A few example patterns (link to bug tracking, etc.) that may be used\n"
+"in your hgrc::\n"
"\n"
" [interhg]\n"
" issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n"
@@ -2056,20 +2097,22 @@
"Configuration is done in the [keyword] and [keywordmaps] sections of\n"
"hgrc files.\n"
"\n"
-"Example:\n"
+"Example::\n"
"\n"
" [keyword]\n"
" # expand keywords in every python file except those matching \"x*\"\n"
" **.py =\n"
" x* = ignore\n"
"\n"
-"Note: the more specific you are in your filename patterns\n"
-" the less you lose speed in huge repositories.\n"
+"NOTE: the more specific you are in your filename patterns the less you\n"
+"lose speed in huge repositories.\n"
"\n"
"For [keywordmaps] template mapping and expansion demonstration and\n"
-"control run \"hg kwdemo\".\n"
-"\n"
-"An additional date template filter {date|utcdate} is provided.\n"
+"control run \"hg kwdemo\". See \"hg help templates\" for a list of\n"
+"available templates and filters.\n"
+"\n"
+"An additional date template filter {date|utcdate} is provided. It\n"
+"returns a date like \"2006/09/18 15:13:13\".\n"
"\n"
"The default template mappings (view with \"hg kwdemo -d\") can be\n"
"replaced with customized keywords and templates. Again, run \"hg\n"
@@ -2088,8 +2131,8 @@
"have been checked in.\n"
"\n"
"Expansions spanning more than one line and incremental expansions,\n"
-"like CVS' $Log$, are not supported. A keyword template map\n"
-"\"Log = {desc}\" expands to the first line of the changeset description.\n"
+"like CVS' $Log$, are not supported. A keyword template map \"Log =\n"
+"{desc}\" expands to the first line of the changeset description.\n"
msgstr ""
#, python-format
@@ -2112,10 +2155,12 @@
" Show current, custom, or default keyword template maps and their\n"
" expansions.\n"
"\n"
-" Extend current configuration by specifying maps as arguments and\n"
-" optionally by reading from an additional hgrc file.\n"
-"\n"
-" Override current keyword template maps with \"default\" option.\n"
+" Extend the current configuration by specifying maps as arguments\n"
+" and using -f/--rcfile to source an external hgrc file.\n"
+"\n"
+" Use -d/--default to disable current configuration.\n"
+"\n"
+" See \"hg help templates\" for information on templates and filters.\n"
" "
msgstr ""
@@ -2123,25 +2168,50 @@
msgid "creating temporary repository at %s\n"
msgstr "opretter midlertidigt depot ved %s\n"
-#, python-format
-msgid ""
-"\n"
-"\tconfig using %s keyword template maps\n"
-msgstr ""
-
-#, python-format
-msgid ""
-"\n"
-"%s keywords written to %s:\n"
-msgstr "\n%s nøgleord skrevet til %s:\n"
+msgid ""
+"\n"
+"\tconfiguration using custom keyword template maps\n"
+msgstr ""
+"\n"
+"\tkonfiguration med tilpaset nøgleordskabelon\n"
+
+msgid "\textending current template maps\n"
+msgstr ""
+
+msgid "\toverriding default template maps\n"
+msgstr "\toverskriver standard skabelon\n"
+
+msgid ""
+"\n"
+"\tconfiguration using default keyword template maps\n"
+msgstr ""
+"\n"
+"\tkonfiguration med standard nøgleordskabelon\n"
+
+msgid "\tdisabling current template maps\n"
+msgstr "deaktiverer nuævrende skabelon\n"
+
+msgid ""
+"\n"
+"\tconfiguration using current keyword template maps\n"
+msgstr ""
+"\n"
+"\tkonfiguration med nuværende nøgleordskabelon\n"
+
+#, python-format
+msgid ""
+"\n"
+"keywords written to %s:\n"
+msgstr ""
+"\n"
+"nøgleord skrevet til %s:\n"
msgid "unhooked all commit hooks\n"
msgstr ""
-#, python-format
-msgid ""
-"\n"
-"\t%s keywords expanded%s\n"
+msgid ""
+"\n"
+"\tkeywords expanded\n"
msgstr ""
#, python-format
@@ -2168,8 +2238,8 @@
" [keyword] configuration patterns.\n"
"\n"
" Useful to prevent inadvertent keyword expansion and to speed up\n"
-" execution by including only files that are actual candidates\n"
-" for expansion.\n"
+" execution by including only files that are actual candidates for\n"
+" expansion.\n"
"\n"
" See \"hg help keyword\" on how to construct patterns both for\n"
" inclusion and exclusion of files.\n"
@@ -2177,11 +2247,12 @@
" Use -u/--untracked to list untracked files as well.\n"
"\n"
" With -a/--all and -v/--verbose the codes used to show the status\n"
-" of files are:\n"
-" K = keyword expansion candidate\n"
-" k = keyword expansion candidate (untracked)\n"
-" I = ignored\n"
-" i = ignored (untracked)\n"
+" of files are::\n"
+"\n"
+" K = keyword expansion candidate\n"
+" k = keyword expansion candidate (untracked)\n"
+" I = ignored\n"
+" i = ignored (untracked)\n"
" "
msgstr ""
@@ -2232,19 +2303,18 @@
"Known patches are represented as patch files in the .hg/patches\n"
"directory. Applied patches are both patch files and changesets.\n"
"\n"
-"Common tasks (use \"hg help command\" for more details):\n"
-"\n"
-"prepare repository to work with patches qinit\n"
-"create new patch qnew\n"
-"import existing patch qimport\n"
-"\n"
-"print patch series qseries\n"
-"print applied patches qapplied\n"
-"print name of top applied patch qtop\n"
-"\n"
-"add known patch to applied stack qpush\n"
-"remove patch from applied stack qpop\n"
-"refresh contents of top applied patch qrefresh\n"
+"Common tasks (use \"hg help command\" for more details)::\n"
+"\n"
+" prepare repository to work with patches qinit\n"
+" create new patch qnew\n"
+" import existing patch qimport\n"
+"\n"
+" print patch series qseries\n"
+" print applied patches qapplied\n"
+"\n"
+" add known patch to applied stack qpush\n"
+" remove patch from applied stack qpop\n"
+" refresh contents of top applied patch qrefresh\n"
msgstr ""
"håndter en stak af rettelser\n"
"\n"
@@ -2257,19 +2327,18 @@
"biblioteket. Anvendte rettelser er både rettelse-filer og Mercurial\n"
"ændringer.\n"
"\n"
-"Almindelige opgaver (brug \"hg help kommado\" for flere detaljer):\n"
-"\n"
-"forbered repository til at arbejde med rettelser qinit\n"
-"opret ny rettelse qnew\n"
-"importer eksisterende rettelse qimport\n"
-"\n"
-"list rettelse-serien qseries\n"
-"list anvendte rettelser qapplied\n"
-"list navnet på den øverste rettelse qtop\n"
-"\n"
-"anvend og put rettelse på stakken qpush\n"
-"fjern rettelse fra stakken qpop\n"
-"genopfrisk indholdet af den øverste rettelse qrefresh\n"
+"Almindelige opgaver (brug \"hg help kommado\" for flere detaljer)::\n"
+"\n"
+" forbered repository til at arbejde med rettelser qinit\n"
+" opret ny rettelse qnew\n"
+" importer eksisterende rettelse qimport\n"
+"\n"
+" list rettelse-serien qseries\n"
+" list anvendte rettelser qapplied\n"
+"\n"
+" anvend og put rettelse på stakken qpush\n"
+" fjern rettelse fra stakken qpop\n"
+" genopfrisk indholdet af den øverste rettelse qrefresh\n"
#, python-format
msgid "%s appears more than once in %s"
@@ -2503,6 +2572,10 @@
msgid "deletions found between repo revs"
msgstr ""
+#, python-format
+msgid "popping %s\n"
+msgstr "fjerner %s\n"
+
msgid "patch queue now empty\n"
msgstr "køen af rettelser er nu tom\n"
@@ -2619,9 +2692,15 @@
msgid "print the patches already applied"
msgstr "udskriver rettelserne som allerede er anvendt"
+msgid "only one patch applied\n"
+msgstr "kun én rettelse er anvendt\n"
+
msgid "print the patches not yet applied"
msgstr "udskriver rettelserne som ikke er anvendt endnu"
+msgid "all patches applied\n"
+msgstr "alle rettelser er anvendt\n"
+
msgid ""
"import a patch\n"
"\n"
@@ -2738,15 +2817,9 @@
msgid "print the name of the next patch"
msgstr "udskriver navnet på den næste rettelse"
-msgid "all patches applied\n"
-msgstr "alle rettelser er anvendt\n"
-
msgid "print the name of the previous patch"
msgstr "udskriver navnet på den forgående rettelse"
-msgid "only one patch applied\n"
-msgstr "kun én rettelse er anvendt\n"
-
msgid ""
"create a new patch\n"
"\n"
@@ -3095,8 +3168,11 @@
msgid "print first line of patch header"
msgstr ""
-msgid "hg qapplied [-s] [PATCH]"
-msgstr "hg qapplied [-s] [RETTELSE]"
+msgid "show only the last patch"
+msgstr "vis kun den sidste rettelse"
+
+msgid "hg qapplied [-1] [-s] [PATCH]"
+msgstr "hg qapplied [-1] [-s] [RETTELSE]"
msgid "use pull protocol to copy metadata"
msgstr "brug træk-protokol til at kopiere metadata"
@@ -3239,17 +3315,17 @@
msgid "refresh only files already in the patch and specified files"
msgstr ""
-msgid "add/update \"From: <current user>\" in patch"
-msgstr "tilføj/opdater \"From: <aktuel bruger>\" i rettelsen"
-
-msgid "add/update \"From: <given user>\" in patch"
-msgstr "tilføj/opdater \"From: <given bruger>\" i rettelsen"
-
-msgid "update \"Date: <current date>\" in patch (if present)"
-msgstr "opdater \"Date: <aktuel dato>\" i rettelsen (hvis tilstede)"
-
-msgid "update \"Date: <given date>\" in patch (if present)"
-msgstr "opdater \"Date: <given dato>\" i rettelsen (hvis tilstede)"
+msgid "add/update author field in patch with current user"
+msgstr ""
+
+msgid "add/update author field in patch with given user"
+msgstr ""
+
+msgid "add/update date field in patch with current date"
+msgstr "tilføj/opdater datofeltet i rettelsen med den aktuelle dato"
+
+msgid "add/update date field in patch with given date"
+msgstr "tilføj/opdater datofeltet i rettelsen med den angivne dato"
msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
msgstr "hg qrefresh [-I] [-X] [-e] [-m TEKST] [-l FIL] [-s] [FIL]..."
@@ -3317,8 +3393,11 @@
msgid "hg qtop [-s]"
msgstr "hg qtop [-s]"
-msgid "hg qunapplied [-s] [PATCH]"
-msgstr "hg qunapplied [-s] [RETTELSE]"
+msgid "show only the first patch"
+msgstr "vis kun den første rettelse"
+
+msgid "hg qunapplied [-1] [-s] [PATCH]"
+msgstr "hg qunapplied [-1] [-s] [RETTELSE]"
msgid "finish all applied changesets"
msgstr "afslut alle anvendte ændringer"
@@ -3329,65 +3408,66 @@
msgid ""
"hooks for sending email notifications at commit/push time\n"
"\n"
-"Subscriptions can be managed through hgrc. Default mode is to print\n"
-"messages to stdout, for testing and configuring.\n"
-"\n"
-"To use, configure notify extension and enable in hgrc like this:\n"
-"\n"
-" [extensions]\n"
-" hgext.notify =\n"
-"\n"
-" [hooks]\n"
-" # one email for each incoming changeset\n"
-" incoming.notify = python:hgext.notify.hook\n"
-" # batch emails when many changesets incoming at one time\n"
-" changegroup.notify = python:hgext.notify.hook\n"
-"\n"
-" [notify]\n"
-" # config items go in here\n"
-"\n"
-" config items:\n"
-"\n"
-" REQUIRED:\n"
-" config = /path/to/file # file containing subscriptions\n"
-"\n"
-" OPTIONAL:\n"
-" test = True # print messages to stdout for testing\n"
-" strip = 3 # number of slashes to strip for url paths\n"
-" domain = example.com # domain to use if committer missing domain\n"
-" style = ... # style file to use when formatting email\n"
-" template = ... # template to use when formatting email\n"
-" incoming = ... # template to use when run as incoming hook\n"
-" changegroup = ... # template when run as changegroup hook\n"
-" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
-" maxsubject = 67 # truncate subject line longer than this\n"
-" diffstat = True # add a diffstat before the diff content\n"
-" sources = serve # notify if source of incoming changes in this "
+"Subscriptions can be managed through a hgrc file. Default mode is to\n"
+"print messages to stdout, for testing and configuring.\n"
+"\n"
+"To use, configure the notify extension and enable it in hgrc like\n"
+"this::\n"
+"\n"
+" [extensions]\n"
+" hgext.notify =\n"
+"\n"
+" [hooks]\n"
+" # one email for each incoming changeset\n"
+" incoming.notify = python:hgext.notify.hook\n"
+" # batch emails when many changesets incoming at one time\n"
+" changegroup.notify = python:hgext.notify.hook\n"
+"\n"
+" [notify]\n"
+" # config items go here\n"
+"\n"
+"Required configuration items::\n"
+"\n"
+" config = /path/to/file # file containing subscriptions\n"
+"\n"
+"Optional configuration items::\n"
+"\n"
+" test = True # print messages to stdout for testing\n"
+" strip = 3 # number of slashes to strip for url paths\n"
+" domain = example.com # domain to use if committer missing domain\n"
+" style = ... # style file to use when formatting email\n"
+" template = ... # template to use when formatting email\n"
+" incoming = ... # template to use when run as incoming hook\n"
+" changegroup = ... # template when run as changegroup hook\n"
+" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
+" maxsubject = 67 # truncate subject line longer than this\n"
+" diffstat = True # add a diffstat before the diff content\n"
+" sources = serve # notify if source of incoming changes in this "
"list\n"
-" # (serve == ssh or http, push, pull, bundle)\n"
-" [email]\n"
-" from = user@host.com # email address to send as if none given\n"
-" [web]\n"
-" baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
-"\n"
-" notify config file has same format as regular hgrc. it has two\n"
-" sections so you can express subscriptions in whatever way is handier\n"
-" for you.\n"
-"\n"
-" [usersubs]\n"
-" # key is subscriber email, value is \",\"-separated list of glob "
-"patterns\n"
-" user@host = pattern\n"
-"\n"
-" [reposubs]\n"
-" # key is glob pattern, value is \",\"-separated list of subscriber "
-"emails\n"
-" pattern = user@host\n"
-"\n"
-" glob patterns are matched against path to repository root.\n"
-"\n"
-" if you like, you can put notify config file in repository that users\n"
-" can push changes to, they can manage their own subscriptions."
+" # (serve == ssh or http, push, pull, bundle)\n"
+" [email]\n"
+" from = user@host.com # email address to send as if none given\n"
+" [web]\n"
+" baseurl = http://hgserver/... # root of hg web site for browsing commits\n"
+"\n"
+"The notify config file has same format as a regular hgrc file. It has\n"
+"two sections so you can express subscriptions in whatever way is\n"
+"handier for you.\n"
+"\n"
+"::\n"
+"\n"
+" [usersubs]\n"
+" # key is subscriber email, value is \",\"-separated list of glob patterns\n"
+" user@host = pattern\n"
+"\n"
+" [reposubs]\n"
+" # key is glob pattern, value is \",\"-separated list of subscriber emails\n"
+" pattern = user@host\n"
+"\n"
+"Glob patterns are matched against path to repository root.\n"
+"\n"
+"If you like, you can put notify config file in repository that users\n"
+"can push changes to, they can manage their own subscriptions.\n"
msgstr ""
#, python-format
@@ -3423,7 +3503,7 @@
msgid ""
"browse command output with an external pager\n"
"\n"
-"To set the pager that should be used, set the application variable:\n"
+"To set the pager that should be used, set the application variable::\n"
"\n"
" [pager]\n"
" pager = LESS='FSRX' less\n"
@@ -3432,19 +3512,19 @@
"$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n"
"\n"
"If you notice \"BROKEN PIPE\" error messages, you can disable them by\n"
-"setting:\n"
+"setting::\n"
"\n"
" [pager]\n"
" quiet = True\n"
"\n"
"You can disable the pager for certain commands by adding them to the\n"
-"pager.ignore list:\n"
+"pager.ignore list::\n"
"\n"
" [pager]\n"
" ignore = version, help, update\n"
"\n"
"You can also enable the pager only for certain commands using\n"
-"pager.attend:\n"
+"pager.attend::\n"
"\n"
" [pager]\n"
" attend = log\n"
@@ -3461,15 +3541,15 @@
"This extension allows you to use git-style suffixes to refer to the\n"
"ancestors of a specific revision.\n"
"\n"
-"For example, if you can refer to a revision as \"foo\", then:\n"
-"\n"
-"- foo^N = Nth parent of foo\n"
+"For example, if you can refer to a revision as \"foo\", then::\n"
+"\n"
+" foo^N = Nth parent of foo\n"
" foo^0 = foo\n"
" foo^1 = first parent of foo\n"
" foo^2 = second parent of foo\n"
" foo^ = foo^1\n"
"\n"
-"- foo~N = Nth first grandparent of foo\n"
+" foo~N = Nth first grandparent of foo\n"
" foo~0 = foo\n"
" foo~1 = foo^1 = foo^ = first parent of foo\n"
" foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
@@ -3485,11 +3565,9 @@
"first line of the changeset description as the subject text. The\n"
"message contains two or three body parts:\n"
"\n"
-" The changeset description.\n"
-"\n"
-" [Optional] The result of running diffstat on the patch.\n"
-"\n"
-" The patch itself, as generated by \"hg export\".\n"
+"- The changeset description.\n"
+"- [Optional] The result of running diffstat on the patch.\n"
+"- The patch itself, as generated by \"hg export\".\n"
"\n"
"Each message refers to the first in the series using the In-Reply-To\n"
"and References headers, so they will show up as a sequence in threaded\n"
@@ -3500,7 +3578,7 @@
"you are sending the right changes.\n"
"\n"
"To configure other defaults, add a section like this to your hgrc\n"
-"file:\n"
+"file::\n"
"\n"
" [email]\n"
" from = My Name <my@email>\n"
@@ -3523,13 +3601,13 @@
"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"
-"files, e.g. with mutt:\n"
+"files, e.g. with mutt::\n"
"\n"
" % mutt -R -f mbox\n"
"\n"
-"When you are previewing the patchbomb messages, you can use `formail'\n"
+"When you are previewing the patchbomb messages, you can use ``formail``\n"
"(a utility that is commonly installed as part of the procmail\n"
-"package), to send each message out:\n"
+"package), to send each message out::\n"
"\n"
" % formail -s sendmail -bm -t < mbox\n"
"\n"
@@ -3539,7 +3617,7 @@
"to be a sendmail compatible mailer or fill out the [smtp] section so\n"
"that the patchbomb extension can automatically send patchbombs\n"
"directly from the commandline. See the [email] and [smtp] sections in\n"
-"hgrc(5) for details."
+"hgrc(5) for details.\n"
msgstr ""
msgid "Please enter a valid value.\n"
@@ -3579,23 +3657,24 @@
" single email containing a binary Mercurial bundle as an attachment\n"
" will be sent.\n"
"\n"
-" Examples:\n"
-"\n"
-" hg email -r 3000 # send patch 3000 only\n"
-" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
-" hg email -r 3000:3005 # send patches 3000 through 3005\n"
-" hg email 3000 # send patch 3000 (deprecated)\n"
-"\n"
-" hg email -o # send all patches not in default\n"
-" hg email -o DEST # send all patches not in DEST\n"
-" hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
-" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n"
-"\n"
-" hg email -b # send bundle of all patches not in default\n"
-" hg email -b DEST # send bundle of all patches not in DEST\n"
-" hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
+" Examples::\n"
+"\n"
+" hg email -r 3000 # send patch 3000 only\n"
+" hg email -r 3000 -r 3001 # send patches 3000 and 3001\n"
+" hg email -r 3000:3005 # send patches 3000 through 3005\n"
+" hg email 3000 # send patch 3000 (deprecated)\n"
+"\n"
+" hg email -o # send all patches not in default\n"
+" hg email -o DEST # send all patches not in DEST\n"
+" hg email -o -r 3000 # send all ancestors of 3000 not in default\n"
+" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n"
+"\n"
+" hg email -b # send bundle of all patches not in default\n"
+" hg email -b DEST # send bundle of all patches not in DEST\n"
+" hg email -b -r 3000 # bundle of all ancestors of 3000 not in "
"default\n"
-" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST\n"
+" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in "
+"DEST\n"
"\n"
" Before using this command, you will need to enable email in your\n"
" hgrc. See the [email] section in hgrc(5) for details.\n"
@@ -3674,6 +3753,9 @@
msgid "message identifier to reply to"
msgstr ""
+msgid "flags to add in subject prefixes"
+msgstr ""
+
msgid "email addresses of recipients"
msgstr ""
@@ -3714,13 +3796,16 @@
" and uncommitted changes in an otherwise-clean source tree.\n"
"\n"
" This means that purge will delete:\n"
-" - Unknown files: files marked with \"?\" by \"hg status\"\n"
-" - Empty directories: in fact Mercurial ignores directories unless\n"
-" they contain files under source control management\n"
+"\n"
+" - Unknown files: files marked with \"?\" by \"hg status\"\n"
+" - Empty directories: in fact Mercurial ignores directories unless\n"
+" they contain files under source control management\n"
+"\n"
" But it will leave untouched:\n"
-" - Modified and unmodified tracked files\n"
-" - Ignored files (unless --all is specified)\n"
-" - New files added to the repository (with \"hg add\")\n"
+"\n"
+" - Modified and unmodified tracked files\n"
+" - Ignored files (unless --all is specified)\n"
+" - New files added to the repository (with \"hg add\")\n"
"\n"
" If directories are given on the command line, only files in these\n"
" directories are considered.\n"
@@ -3770,7 +3855,7 @@
"repository.\n"
"\n"
"For more information:\n"
-"http://mercurial.selenic.com/wiki/RebaseProject\n"
+"http://mercurial.selenic.com/wiki/RebaseExtension\n"
msgstr ""
msgid "first revision, do not change ancestor\n"
@@ -3981,30 +4066,9 @@
msgid "&?"
msgstr ""
-msgid "y"
-msgstr ""
-
-msgid "?"
-msgstr ""
-
msgid "y - record this change"
msgstr ""
-msgid "s"
-msgstr ""
-
-msgid "f"
-msgstr ""
-
-msgid "d"
-msgstr ""
-
-msgid "a"
-msgstr ""
-
-msgid "q"
-msgstr ""
-
msgid "user quit"
msgstr "user quit"
@@ -4015,6 +4079,9 @@
msgid " and "
msgstr " og "
+msgid "y"
+msgstr ""
+
#, python-format
msgid "record this change to %r?"
msgstr "optag denne ændring i %r?"
@@ -4034,19 +4101,19 @@
" You will be prompted for whether to record changes to each\n"
" modified file, and for files with multiple changes, for each\n"
" change to use. For each query, the following responses are\n"
-" possible:\n"
-"\n"
-" y - record this change\n"
-" n - skip this change\n"
-"\n"
-" s - skip remaining changes to this file\n"
-" f - record remaining changes to this file\n"
-"\n"
-" d - done, skip remaining changes and files\n"
-" a - record all changes to all remaining files\n"
-" q - quit, recording no changes\n"
-"\n"
-" ? - display help"
+" possible::\n"
+"\n"
+" y - record this change\n"
+" n - skip this change\n"
+"\n"
+" s - skip remaining changes to this file\n"
+" f - record remaining changes to this file\n"
+"\n"
+" d - done, skip remaining changes and files\n"
+" a - record all changes to all remaining files\n"
+" q - quit, recording no changes\n"
+"\n"
+" ? - display help"
msgstr ""
msgid "'mq' extension not loaded"
@@ -4162,9 +4229,9 @@
"\n"
" Selected changesets will be applied on top of the current working\n"
" directory with the log of the original changeset. If --log is\n"
-" specified, log messages will have a comment appended of the form:\n"
-"\n"
-" (transplanted from CHANGESETHASH)\n"
+" specified, log messages will have a comment appended of the form::\n"
+"\n"
+" (transplanted from CHANGESETHASH)\n"
"\n"
" You can rewrite the changelog message with the --filter option.\n"
" Its argument will be invoked with the current changelog message as\n"
@@ -4255,19 +4322,22 @@
"operation.\n"
"\n"
"This extension is useful for:\n"
-" * Japanese Windows users using shift_jis encoding.\n"
-" * Chinese Windows users using big5 encoding.\n"
-" * All users who use a repository with one of problematic encodings on\n"
-" case-insensitive file system.\n"
+"\n"
+"- Japanese Windows users using shift_jis encoding.\n"
+"- Chinese Windows users using big5 encoding.\n"
+"- All users who use a repository with one of problematic encodings on\n"
+" case-insensitive file system.\n"
"\n"
"This extension is not needed for:\n"
-" * Any user who use only ASCII chars in path.\n"
-" * Any user who do not use any of problematic encodings.\n"
+"\n"
+"- Any user who use only ASCII chars in path.\n"
+"- Any user who do not use any of problematic encodings.\n"
"\n"
"Note that there are some limitations on using this extension:\n"
-" * You should use single encoding in one repository.\n"
-" * You should set same encoding for the repository by locale or\n"
-" HGENCODING.\n"
+"\n"
+"- You should use single encoding in one repository.\n"
+"- You should set same encoding for the repository by locale or\n"
+" HGENCODING.\n"
"\n"
"Path encoding conversion are done between Unicode and\n"
"encoding.encoding which is decided by Mercurial from current locale\n"
@@ -4275,7 +4345,7 @@
msgstr ""
#, python-format
-msgid "[win32mbcs] filename conversion fail with %s encoding\n"
+msgid "[win32mbcs] filename conversion failed with %s encoding\n"
msgstr ""
msgid "[win32mbcs] cannot activate on this platform.\n"
@@ -4288,31 +4358,31 @@
msgid ""
"perform automatic newline conversion\n"
"\n"
-"To perform automatic newline conversion, use:\n"
-"\n"
-"[extensions]\n"
-"hgext.win32text =\n"
-"[encode]\n"
-"** = cleverencode:\n"
-"# or ** = macencode:\n"
-"\n"
-"[decode]\n"
-"** = cleverdecode:\n"
-"# or ** = macdecode:\n"
+"To perform automatic newline conversion, use::\n"
+"\n"
+" [extensions]\n"
+" hgext.win32text =\n"
+" [encode]\n"
+" ** = cleverencode:\n"
+" # or ** = macencode:\n"
+"\n"
+" [decode]\n"
+" ** = cleverdecode:\n"
+" # or ** = macdecode:\n"
"\n"
"If not doing conversion, to make sure you do not commit CRLF/CR by "
-"accident:\n"
-"\n"
-"[hooks]\n"
-"pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
-"# or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
+"accident::\n"
+"\n"
+" [hooks]\n"
+" pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n"
+" # or pretxncommit.cr = python:hgext.win32text.forbidcr\n"
"\n"
"To do the same check on a server to prevent CRLF/CR from being\n"
-"pushed or pulled:\n"
-"\n"
-"[hooks]\n"
-"pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
-"# or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
+"pushed or pulled::\n"
+"\n"
+" [hooks]\n"
+" pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n"
+" # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n"
msgstr ""
#, python-format
@@ -4358,15 +4428,15 @@
"without knowing their actual IP address.\n"
"\n"
"To allow other people to discover your repository using run \"hg serve\"\n"
-"in your repository.\n"
-"\n"
-" $ cd test\n"
-" $ hg serve\n"
-"\n"
-"You can discover zeroconf enabled repositories by running \"hg paths\".\n"
-"\n"
-" $ hg paths\n"
-" zc-test = http://example.com:8000/test\n"
+"in your repository::\n"
+"\n"
+" $ cd test\n"
+" $ hg serve\n"
+"\n"
+"You can discover zeroconf enabled repositories by running \"hg paths\"::\n"
+"\n"
+" $ hg paths\n"
+" zc-test = http://example.com:8000/test\n"
msgstr ""
msgid "archive prefix contains illegal components"
@@ -4661,11 +4731,11 @@
" commit.\n"
"\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"
+" parameter greater than 0, this compares every removed file with\n"
+" every added file and records those similar enough as renames. This\n"
+" option takes a percentage between 0 (disabled) and 100 (files must\n"
+" be identical) as its parameter. Detecting renamed files this way\n"
+" can be expensive.\n"
" "
msgstr ""
@@ -4721,14 +4791,14 @@
" 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"
-" \"tbz2\": tar archive, compressed using bzip2\n"
-" \"tgz\": tar archive, compressed using gzip\n"
-" \"uzip\": zip archive, uncompressed\n"
-" \"zip\": zip archive, compressed using deflate\n"
+" types are::\n"
+"\n"
+" \"files\" (default): a directory full of files\n"
+" \"tar\": tar archive, uncompressed\n"
+" \"tbz2\": tar archive, compressed using bzip2\n"
+" \"tgz\": tar archive, compressed using gzip\n"
+" \"uzip\": zip archive, uncompressed\n"
+" \"zip\": zip archive, compressed using deflate\n"
"\n"
" The exact name of the destination archive or directory is given\n"
" using a format string; see 'hg help export' for details.\n"
@@ -4809,10 +4879,6 @@
msgstr ""
#, python-format
-msgid "Backed out changeset %s"
-msgstr ""
-
-#, python-format
msgid "changeset %s backs out changeset %s\n"
msgstr "ændring %s bakker ændring %s ud\n"
@@ -4894,8 +4960,8 @@
msgstr "Ændring %d:%s: %s\n"
#, python-format
-msgid "Testing changeset %s:%s (%s changesets remaining, ~%s tests)\n"
-msgstr "Tester ændring %s:%s (%s ændringer tilbage, ~%s test)\n"
+msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
+msgstr "Tester ændring %d:%s (%d ændringer tilbage, ~%d test)\n"
msgid ""
"set or show the current branch name\n"
@@ -4996,11 +5062,11 @@
"\n"
" Output may be to a file, in which case the name of the file is\n"
" given using a format string. The formatting rules are the same as\n"
-" for the export command, with the following additions:\n"
-"\n"
-" %s basename of file being printed\n"
-" %d dirname of file being printed, or '.' if in repository root\n"
-" %p root-relative path name of file being printed\n"
+" for the export command, with the following additions::\n"
+"\n"
+" %s basename of file being printed\n"
+" %d dirname of file being printed, or '.' if in repository root\n"
+" %p root-relative path name of file being printed\n"
" "
msgstr ""
@@ -5039,7 +5105,7 @@
" avoid hardlinking.\n"
"\n"
" In some cases, you can clone repositories and checked out files\n"
-" using full hardlinks with\n"
+" using full hardlinks with ::\n"
"\n"
" $ cp -al REPO REPOCLONE\n"
"\n"
@@ -5049,7 +5115,6 @@
" breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
" this is not compatible with certain extensions that place their\n"
" metadata under the .hg directory, such as mq.\n"
-"\n"
" "
msgstr ""
"lav en kopi af et eksisterende depot\n"
@@ -5086,7 +5151,7 @@
" men rapporterer ingen fejl. I disse tilfælde skal --pull bruges\n"
" for at undgå hårde lænker.\n"
"\n"
-" I nogle tilfælde kan man klone depoter og udhentede filer med\n"
+" I nogle tilfælde kan man klone depoter og udhentede filer med ::\n"
"\n"
" $ cp -al DEPOT DEPOTKLON\n"
"\n"
@@ -5097,7 +5162,6 @@
" Linux Kernel værktøjer gør det). Dette er desuden ikke kompatibelt\n"
" med visse udvidelser som placerer deres metadata under .hg mappen,\n"
" såsom mq.\n"
-"\n"
" "
msgid ""
@@ -5399,16 +5463,16 @@
" first parent only.\n"
"\n"
" Output may be to a file, in which case the name of the file is\n"
-" given using a format string. The formatting rules are as follows:\n"
-"\n"
-" %% literal \"%\" character\n"
-" %H changeset hash (40 bytes of hexadecimal)\n"
-" %N number of patches being generated\n"
-" %R changeset revision number\n"
-" %b basename of the exporting repository\n"
-" %h short-form changeset hash (12 bytes of hexadecimal)\n"
-" %n zero-padded sequence number, starting at 1\n"
-" %r zero-padded changeset revision number\n"
+" given using a format string. The formatting rules are as follows::\n"
+"\n"
+" %% literal \"%\" character\n"
+" %H changeset hash (40 bytes of hexadecimal)\n"
+" %N number of patches being generated\n"
+" %R changeset revision number\n"
+" %b basename of the exporting repository\n"
+" %h short-form changeset hash (12 bytes of hexadecimal)\n"
+" %n zero-padded sequence number, starting at 1\n"
+" %r zero-padded changeset revision number\n"
"\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"
@@ -5434,16 +5498,16 @@
" sammenføjningsændringen med dennes første forælder.\n"
"\n"
" Uddata kan gemmes i en fil, og filnavnet er givet ved en\n"
-" format-streng. Formatteringsreglerne er som følger:\n"
-"\n"
-" %% litteral % tegn\n"
-" %H ændringshash (40 byte heksadecimal)\n"
-" %N antallet af rettelser som bliver genereret\n"
-" %R revisionnummer for ændringen\n"
-" %b grundnavn for det eksporterede depot\n"
-" %h kortform ændringshash (12 byte heksadecimal)\n"
-" %n nul-fyldt sekvensnummer, startende ved 1\n"
-" %r nul-fyldt revisionsnummer for ændringen\n"
+" format-streng. Formatteringsreglerne er som følger::\n"
+"\n"
+" %% litteral % tegn\n"
+" %H ændringshash (40 byte heksadecimal)\n"
+" %N antallet af rettelser som bliver genereret\n"
+" %R revisionnummer for ændringen\n"
+" %b grundnavn for det eksporterede depot\n"
+" %h kortform ændringshash (12 byte heksadecimal)\n"
+" %n nul-fyldt sekvensnummer, startende ved 1\n"
+" %r nul-fyldt revisionsnummer for ændringen\n"
"\n"
" Uden -a/--text tilvalget vil annotate undgå at behandle filer som\n"
" den detekterer som binære. Med -a vil annotate generere en\n"
@@ -5545,6 +5609,9 @@
" "
msgstr ""
+msgid "you must specify a branch to use --closed"
+msgstr ""
+
#, python-format
msgid "no open branch heads on branch %s\n"
msgstr "ingen åbne gren-hoveder på gren %s\n"
@@ -5616,8 +5683,12 @@
msgstr "ingen hjælpetekst tilgængelig"
#, python-format
-msgid "%s extension - %s\n"
-msgstr "%s udvidelse - %s\n"
+msgid ""
+"%s extension - %s\n"
+"\n"
+msgstr ""
+"%s udvidelse - %s\n"
+"\n"
msgid "Mercurial Distributed SCM\n"
msgstr "Mercurial Distribueret SCM\n"
@@ -6061,15 +6132,15 @@
"\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 [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"
-" -f R RD RD R\n"
-" -A W W W R\n"
-" -Af R R R R\n"
+" states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n"
+" reported by hg status). The actions are Warn, Remove (from branch)\n"
+" and Delete (from disk)::\n"
+"\n"
+" A C M !\n"
+" none W RD W R\n"
+" -f R RD RD R\n"
+" -A W W W R\n"
+" -Af R R R R\n"
"\n"
" This command schedules the files to be removed at the next commit.\n"
" To undo a remove before that, see hg revert.\n"
@@ -6089,13 +6160,13 @@
" filtilstande (søjler) og kombinationer af tilvalg (rækker). Mulige\n"
" filtilstande er tilføjet [A], ren [C], ændret [M] og manglende [!]\n"
" (som rapporteret af hg status). Handlingerne er Warn, Remove (fra\n"
-" gren) og Delete (fra disk).\n"
-"\n"
-" A C M !\n"
-" none W RD W R\n"
-" -f R RD RD R\n"
-" -A W W W R\n"
-" -Af R R R R\n"
+" gren) og Delete (fra disk)::\n"
+"\n"
+" A C M !\n"
+" none W RD W R\n"
+" -f R RD RD R\n"
+" -A W W W R\n"
+" -Af R R R R\n"
"\n"
" Denne kommando planlægger filerne til at blive fjernet ved næste\n"
" deponering. For at omgøre en fjernelse før det, se hg revert.\n"
@@ -6149,9 +6220,10 @@
" 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"
-" R = resolved\n"
+" The codes used to show the status of files are::\n"
+"\n"
+" U = unresolved\n"
+" R = resolved\n"
" "
msgstr ""
@@ -6245,7 +6317,7 @@
" Transactions are used to encapsulate the effects of all commands\n"
" that create new changesets or propagate existing changesets into a\n"
" repository. For example, the following commands are transactional,\n"
-" and their effects can be rolled back:\n"
+" and their effects can be rolled back::\n"
"\n"
" commit\n"
" import\n"
@@ -6314,15 +6386,16 @@
" 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"
-" A = added\n"
-" R = removed\n"
-" C = clean\n"
-" ! = missing (deleted by non-hg command, but still tracked)\n"
-" ? = not tracked\n"
-" I = ignored\n"
-" = origin of the previous file listed as A (added)\n"
+" The codes used to show the status of files are::\n"
+"\n"
+" M = modified\n"
+" A = added\n"
+" R = removed\n"
+" C = clean\n"
+" ! = missing (deleted by non-hg command, but still tracked)\n"
+" ? = not tracked\n"
+" I = ignored\n"
+" = origin of the previous file listed as A (added)\n"
" "
msgstr ""
"vis ændrede filer i arbejdskataloget\n"
@@ -6347,15 +6420,16 @@
" Hvis der angivet en revision bruges denne som en basisrevision.\n"
" Hvis der angives to revisioner, da vises forskellene mellem dem.\n"
"\n"
-" Koderne som bruges til at vise status for filerne er:\n"
-" M = ændret\n"
-" A = tilføjet\n"
-" R = fjernet\n"
-" C = ren\n"
-" ! = mangler (slettet af en ikke-hg kommando, men følges stadig)\n"
-" ? = følges ikke\n"
-" I = ignoreret\n"
-" = den foregående fil markeret som A (tilføjet) stammer herfra\n"
+" Koderne som bruges til at vise status for filerne er::\n"
+"\n"
+" M = ændret\n"
+" A = tilføjet\n"
+" R = fjernet\n"
+" C = ren\n"
+" ! = mangler (slettet af en ikke-hg kommando, men følges stadig)\n"
+" ? = følges ikke\n"
+" I = ignoreret\n"
+" = den foregående fil markeret som A (tilføjet) stammer herfra\n"
" "
msgid ""
@@ -6403,17 +6477,9 @@
msgstr "mærkaten '%s' er ikke en lokal mærkat"
#, python-format
-msgid "Removed tag %s"
-msgstr "Mærke %s er fjernet"
-
-#, python-format
msgid "tag '%s' already exists (use -f to force)"
msgstr "mærkaten '%s' eksisterer allerede (brug -f for at gennemtvinge)"
-#, python-format
-msgid "Added tag %s for changeset %s"
-msgstr "Tilføjede mærkat %s til ændring %s"
-
msgid ""
"list repository tags\n"
"\n"
@@ -6732,8 +6798,8 @@
msgid "show only branches that have unmerged heads"
msgstr "vil kun grene som har usammenføjne hoveder"
-msgid "show normal and closed heads"
-msgstr "vis normale og lukkede hoveder"
+msgid "show normal and closed branches"
+msgstr "vis normale og lukkede grene"
msgid "[-a]"
msgstr "[-a]"
@@ -6879,8 +6945,11 @@
msgid "show only heads which are descendants of REV"
msgstr "vis kun hoveder som er efterkommere af REV"
-msgid "show only the active heads from open branches"
-msgstr "vis kun aktive hoveder fra åbne grene"
+msgid "show only the active branch heads from open branches"
+msgstr "vis kun aktive grenhoveder fra åbne grene"
+
+msgid "show normal and closed branch heads"
+msgstr "vis normale og lukkede grenhoveder"
msgid "[-r STARTREV] [REV]..."
msgstr "[-r STARTREV] [REV]..."
@@ -7459,9 +7528,6 @@
msgid "&Other"
msgstr ""
-msgid "l"
-msgstr "l"
-
#, python-format
msgid "merging %s and %s to %s\n"
msgstr "føjer %s og %s sammen til %s\n"
@@ -7489,9 +7555,6 @@
msgid "&Yes"
msgstr ""
-msgid "n"
-msgstr ""
-
#, python-format
msgid "merging %s failed!\n"
msgstr "sammenføjning af %s fejlede!\n"
@@ -7512,27 +7575,27 @@
" implement hooks.\n"
"\n"
" Extensions are not loaded by default for a variety of reasons:\n"
-" they can increase startup overhead; they may be meant for\n"
-" advanced usage only; they may provide potentially dangerous\n"
-" abilities (such as letting you destroy or modify history); they\n"
-" might not be ready for prime time; or they may alter some\n"
-" usual behaviors of stock Mercurial. It is thus up to the user to\n"
-" activate extensions as needed.\n"
-"\n"
-" To enable the \"foo\" extension, either shipped with Mercurial\n"
-" or in the Python search path, create an entry for it in your\n"
-" hgrc, like this:\n"
+" they can increase startup overhead; they may be meant for advanced\n"
+" usage only; they may provide potentially dangerous abilities (such\n"
+" as letting you destroy or modify history); they might not be ready\n"
+" for prime time; or they may alter some usual behaviors of stock\n"
+" Mercurial. It is thus up to the user to activate extensions as\n"
+" needed.\n"
+"\n"
+" To enable the \"foo\" extension, either shipped with Mercurial or in\n"
+" the Python search path, create an entry for it in your hgrc, like\n"
+" this::\n"
"\n"
" [extensions]\n"
" foo =\n"
"\n"
-" You may also specify the full path to an extension:\n"
+" You may also specify the full path to an extension::\n"
"\n"
" [extensions]\n"
" myfeature = ~/.hgext/myfeature.py\n"
"\n"
" To explicitly disable an extension enabled in an hgrc of broader\n"
-" scope, prepend its path with !:\n"
+" scope, prepend its path with !::\n"
"\n"
" [extensions]\n"
" # disabling extension bar residing in /path/to/extension/bar.py\n"
@@ -7551,78 +7614,80 @@
msgid ""
"\n"
" Some commands allow the user to specify a date, e.g.:\n"
-" * backout, commit, import, tag: Specify the commit date.\n"
-" * log, revert, update: Select revision(s) by date.\n"
-"\n"
-" Many date formats are valid. Here are some examples:\n"
-"\n"
-" \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
-" \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
-" \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
-" \"Dec 6\" (midnight)\n"
-" \"13:18\" (today assumed)\n"
-" \"3:39\" (3:39AM assumed)\n"
-" \"3:39pm\" (15:39)\n"
-" \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
-" \"2006-12-6 13:18\"\n"
-" \"2006-12-6\"\n"
-" \"12-6\"\n"
-" \"12/6\"\n"
-" \"12/6/6\" (Dec 6 2006)\n"
-"\n"
-" Lastly, there is Mercurial's internal format:\n"
-"\n"
-" \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
+"\n"
+" - backout, commit, import, tag: Specify the commit date.\n"
+" - log, revert, update: Select revision(s) by date.\n"
+"\n"
+" Many date formats are valid. Here are some examples::\n"
+"\n"
+" \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n"
+" \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n"
+" \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n"
+" \"Dec 6\" (midnight)\n"
+" \"13:18\" (today assumed)\n"
+" \"3:39\" (3:39AM assumed)\n"
+" \"3:39pm\" (15:39)\n"
+" \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
+" \"2006-12-6 13:18\"\n"
+" \"2006-12-6\"\n"
+" \"12-6\"\n"
+" \"12/6\"\n"
+" \"12/6/6\" (Dec 6 2006)\n"
+"\n"
+" Lastly, there is Mercurial's internal format::\n"
+"\n"
+" \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n"
"\n"
" This is the internal representation format for dates. unixtime is\n"
" the number of seconds since the epoch (1970-01-01 00:00 UTC).\n"
" offset is the offset of the local timezone, in seconds west of UTC\n"
" (negative if the timezone is east of UTC).\n"
"\n"
-" The log command also accepts date ranges:\n"
-"\n"
-" \"<{datetime}\" - at or before a given date/time\n"
-" \">{datetime}\" - on or after a given date/time\n"
-" \"{datetime} to {datetime}\" - a date range, inclusive\n"
-" \"-{days}\" - within a given number of days of today\n"
+" The log command also accepts date ranges::\n"
+"\n"
+" \"<{datetime}\" - at or before a given date/time\n"
+" \">{datetime}\" - on or after a given date/time\n"
+" \"{datetime} to {datetime}\" - a date range, inclusive\n"
+" \"-{days}\" - within a given number of days of today\n"
" "
msgstr ""
"\n"
" Nogle kommandoer tillader brugeren at specificere en dato, f.eks.:\n"
-" * backout, commit, import, tag: specificer commit-datoen.\n"
-" * log, revert, update: vælg revisioner efter dato.\n"
-"\n"
-" Der er mange gyldige datoformater. Her er nogle eksempler:\n"
-"\n"
-" \"Wed Dec 6 13:18:29 2006\" (antager lokal tidszone)\n"
-" \"Dec 6 13:18 -0600\" (antager år, tidszone er angivet)\n"
-" \"Dec 6 13:18 UTC\" (UTC og GMT er aliaser for +0000)\n"
-" \"Dec 6\" (midnat)\n"
-" \"13:18\" (antager dags dato)\n"
-" \"3:39\"\n"
-" \"3:39pm\" (15:39)\n"
-" \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
-" \"2006-12-6 13:18\"\n"
-" \"2006-12-6\"\n"
-" \"12-6\"\n"
-" \"12/6\"\n"
-" \"12/6/6\" (6. dec. 2006)\n"
-"\n"
-" Endelig er der Mercurials interne format:\n"
-"\n"
-" \"1165432709 0\" (Ons 6. dec. 13:18:29 2006 UTC)\n"
+"\n"
+" - backout, commit, import, tag: specificer commit-datoen.\n"
+" - log, revert, update: vælg revisioner efter dato.\n"
+"\n"
+" Der er mange gyldige datoformater. Her er nogle eksempler::\n"
+"\n"
+" \"Wed Dec 6 13:18:29 2006\" (antager lokal tidszone)\n"
+" \"Dec 6 13:18 -0600\" (antager år, tidszone er angivet)\n"
+" \"Dec 6 13:18 UTC\" (UTC og GMT er aliaser for +0000)\n"
+" \"Dec 6\" (midnat)\n"
+" \"13:18\" (antager dags dato)\n"
+" \"3:39\"\n"
+" \"3:39pm\" (15:39)\n"
+" \"2006-12-06 13:18:29\" (ISO 8601 format)\n"
+" \"2006-12-6 13:18\"\n"
+" \"2006-12-6\"\n"
+" \"12-6\"\n"
+" \"12/6\"\n"
+" \"12/6/6\" (6. dec. 2006)\n"
+"\n"
+" Endelig er der Mercurials interne format::\n"
+"\n"
+" \"1165432709 0\" (Ons 6. dec. 13:18:29 2006 UTC)\n"
"\n"
" Dette er den interne repræsentation af datoer. unixtime er\n"
" antallet af sekunder siden begyndelsen af epoken (1970-01-01 00:00\n"
" UTC). offset er den lokale tidszone, angivet i antal sekunder vest\n"
" for UTC (negativ hvis tidszonen er øst for UTC).\n"
"\n"
-" Kommandoen log accepterer også datointervaller:\n"
-"\n"
-" \"<{date}\" - på eller før den angivne dato/tidspunkt\n"
-" \">{date}\" - på eller efter den angivne dato/tidspunkt\n"
-" \"{date} to {date}\" - et datointerval, inklusiv endepunkterne\n"
-" \"-{days}\" - indenfor et angivet antal dage, fra dags dato\n"
+" Kommandoen log accepterer også datointervaller::\n"
+"\n"
+" \"<{date}\" - på eller før den angivne dato/tidspunkt\n"
+" \">{date}\" - på eller efter den angivne dato/tidspunkt\n"
+" \"{date} to {date}\" - et datointerval, inklusiv endepunkterne\n"
+" \"-{days}\" - indenfor et angivet antal dage, fra dags dato\n"
" "
msgid "File Name Patterns"
@@ -7643,34 +7708,34 @@
" the current repository root.\n"
"\n"
" To use an extended glob, start a name with \"glob:\". Globs are\n"
-" rooted at the current directory; a glob such as \"*.c\" will only\n"
-" match files in the current directory ending with \".c\".\n"
-"\n"
-" The supported glob syntax extensions are \"**\" to match any string\n"
-" across path separators and \"{a,b}\" to mean \"a or b\".\n"
+" rooted at the current directory; a glob such as \"``*.c``\" will\n"
+" only match files in the current directory ending with \".c\".\n"
+"\n"
+" The supported glob syntax extensions are \"``**``\" to match any\n"
+" string across path separators and \"{a,b}\" to mean \"a or b\".\n"
"\n"
" To use a Perl/Python regular expression, start a name with \"re:\".\n"
" Regexp pattern matching is anchored at the root of the repository.\n"
"\n"
-" Plain examples:\n"
-"\n"
-" path:foo/bar a name bar in a directory named foo in the root of\n"
-" the repository\n"
-" path:path:name a file or directory named \"path:name\"\n"
-"\n"
-" Glob examples:\n"
-"\n"
-" glob:*.c any name ending in \".c\" in the current directory\n"
-" *.c any name ending in \".c\" in the current directory\n"
-" **.c any name ending in \".c\" in any subdirectory of the\n"
-" current directory including itself.\n"
-" foo/*.c any name ending in \".c\" in the directory foo\n"
-" foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
-" including itself.\n"
-"\n"
-" Regexp examples:\n"
-"\n"
-" re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
+" Plain examples::\n"
+"\n"
+" path:foo/bar a name bar in a directory named foo in the root\n"
+" of the repository\n"
+" path:path:name a file or directory named \"path:name\"\n"
+"\n"
+" Glob examples::\n"
+"\n"
+" glob:*.c any name ending in \".c\" in the current directory\n"
+" *.c any name ending in \".c\" in the current directory\n"
+" **.c any name ending in \".c\" in any subdirectory of the\n"
+" current directory including itself.\n"
+" foo/*.c any name ending in \".c\" in the directory foo\n"
+" foo/**.c any name ending in \".c\" in any subdirectory of foo\n"
+" including itself.\n"
+"\n"
+" Regexp examples::\n"
+"\n"
+" re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n"
"\n"
" "
msgstr ""
@@ -7680,25 +7745,25 @@
msgid ""
"\n"
-"HG::\n"
+"HG\n"
" Path to the 'hg' executable, automatically passed when running\n"
" hooks, extensions or external tools. If unset or empty, this is\n"
" the hg executable's name if it's frozen, or an executable named\n"
" 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
" Windows) is searched.\n"
"\n"
-"HGEDITOR::\n"
+"HGEDITOR\n"
" This is the name of the editor to run when committing. See EDITOR.\n"
"\n"
" (deprecated, use .hgrc)\n"
"\n"
-"HGENCODING::\n"
+"HGENCODING\n"
" This overrides the default locale setting detected by Mercurial.\n"
" This setting is used to convert data including usernames,\n"
" changeset descriptions, tag names, and branches. This setting can\n"
" be overridden with the --encoding command-line option.\n"
"\n"
-"HGENCODINGMODE::\n"
+"HGENCODINGMODE\n"
" This sets Mercurial's behavior for handling unknown characters\n"
" while transcoding user input. The default is \"strict\", which\n"
" causes Mercurial to abort if it can't map a character. Other\n"
@@ -7706,45 +7771,46 @@
" \"ignore\", which drops them. This setting can be overridden with\n"
" the --encodingmode command-line option.\n"
"\n"
-"HGMERGE::\n"
+"HGMERGE\n"
" An executable to use for resolving merge conflicts. The program\n"
" will be executed with three arguments: local file, remote file,\n"
" ancestor file.\n"
"\n"
" (deprecated, use .hgrc)\n"
"\n"
-"HGRCPATH::\n"
+"HGRCPATH\n"
" A list of files or directories to search for hgrc files. Item\n"
" separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n"
" platform default search path is used. If empty, only the .hg/hgrc\n"
" from the current repository is read.\n"
"\n"
" For each element in HGRCPATH:\n"
-" * if it's a directory, all files ending with .rc are added\n"
-" * otherwise, the file itself will be added\n"
-"\n"
-"HGUSER::\n"
+"\n"
+" - if it's a directory, all files ending with .rc are added\n"
+" - otherwise, the file itself will be added\n"
+"\n"
+"HGUSER\n"
" This is the string used as the author of a commit. If not set,\n"
" available values will be considered in this order:\n"
"\n"
-" * HGUSER (deprecated)\n"
-" * hgrc files from the HGRCPATH\n"
-" * EMAIL\n"
-" * interactive prompt\n"
-" * LOGNAME (with '@hostname' appended)\n"
+" - HGUSER (deprecated)\n"
+" - hgrc files from the HGRCPATH\n"
+" - EMAIL\n"
+" - interactive prompt\n"
+" - LOGNAME (with '@hostname' appended)\n"
"\n"
" (deprecated, use .hgrc)\n"
"\n"
-"EMAIL::\n"
+"EMAIL\n"
" May be used as the author of a commit; see HGUSER.\n"
"\n"
-"LOGNAME::\n"
+"LOGNAME\n"
" May be used as the author of a commit; see HGUSER.\n"
"\n"
-"VISUAL::\n"
+"VISUAL\n"
" This is the name of the editor to use when committing. See EDITOR.\n"
"\n"
-"EDITOR::\n"
+"EDITOR\n"
" Sometimes Mercurial needs to open a text file in an editor for a\n"
" user to modify, for example when writing commit messages. The\n"
" editor it uses is determined by looking at the environment\n"
@@ -7752,7 +7818,7 @@
" non-empty one is chosen. If all of them are empty, the editor\n"
" defaults to 'vi'.\n"
"\n"
-"PYTHONPATH::\n"
+"PYTHONPATH\n"
" This is used by Python to find imported modules and may need to be\n"
" set appropriately if this Mercurial is not installed system-wide.\n"
" "
@@ -7766,22 +7832,21 @@
" Mercurial supports several ways to specify individual revisions.\n"
"\n"
" A plain integer is treated as a revision number. Negative integers\n"
-" are treated as topological offsets from the tip, with -1 denoting\n"
-" the tip. As such, negative numbers are only useful if you've\n"
-" memorized your local tree numbers and want to save typing a single\n"
-" digit. This editor suggests copy and paste.\n"
+" are treated as sequential offsets from the tip, with -1 denoting\n"
+" the tip, -2 denoting the revision prior to the tip, and so forth.\n"
"\n"
" A 40-digit hexadecimal string is treated as a unique revision\n"
" identifier.\n"
"\n"
" A hexadecimal string less than 40 characters long is treated as a\n"
-" unique revision identifier, and referred to as a short-form\n"
+" unique revision identifier and is referred to as a short-form\n"
" identifier. A short-form identifier is only valid if it is the\n"
" prefix of exactly one full-length identifier.\n"
"\n"
-" Any other string is treated as a tag name, which is a symbolic\n"
-" name associated with a revision identifier. Tag names may not\n"
-" contain the \":\" character.\n"
+" Any other string is treated as a tag or branch name. A tag name is\n"
+" a symbolic name associated with a revision identifier. A branch\n"
+" name denotes the tipmost revision of that branch. Tag and branch\n"
+" names must not contain the \":\" character.\n"
"\n"
" The reserved name \"tip\" is a special tag that always identifies\n"
" the most recent revision.\n"
@@ -7832,10 +7897,10 @@
" While this standard format is often enough, it does not encode the\n"
" following information:\n"
"\n"
-" - executable status and other permission bits\n"
-" - copy or rename information\n"
-" - changes in binary files\n"
-" - creation or deletion of empty files\n"
+" - executable status and other permission bits\n"
+" - copy or rename information\n"
+" - changes in binary files\n"
+" - creation or deletion of empty files\n"
"\n"
" Mercurial also supports the extended diff format from the git VCS\n"
" which addresses these limitations. The git diff format is not\n"
@@ -7873,12 +7938,12 @@
"\n"
" Three styles are packaged with Mercurial: default (the style used\n"
" when no explicit preference is passed), compact and changelog.\n"
-" Usage:\n"
+" Usage::\n"
"\n"
" $ hg log -r1 --style changelog\n"
"\n"
" A template is a piece of text, with markup to invoke variable\n"
-" expansion:\n"
+" expansion::\n"
"\n"
" $ hg log -r1 --template \"{node}\\n\"\n"
" b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
@@ -7887,78 +7952,93 @@
" keywords depends on the exact context of the templater. These\n"
" keywords are usually available for templating a log-like command:\n"
"\n"
-" - author: String. The unmodified author of the changeset.\n"
-" - branches: String. The name of the branch on which the changeset\n"
-" was committed. Will be empty if the branch name was default.\n"
-" - date: Date information. The date when the changeset was committed.\n"
-" - desc: String. The text of the changeset description.\n"
-" - diffstat: String. Statistics of changes with the following\n"
-" format: \"modified files: +added/-removed lines\"\n"
-" - files: List of strings. All files modified, added, or removed by\n"
-" this changeset.\n"
-" - file_adds: List of strings. Files added by this changeset.\n"
-" - file_mods: List of strings. Files modified by this changeset.\n"
-" - file_dels: List of strings. Files removed by this changeset.\n"
-" - node: String. The changeset identification hash, as a\n"
-" 40-character hexadecimal string.\n"
-" - parents: List of strings. The parents of the changeset.\n"
-" - rev: Integer. The repository-local changeset revision number.\n"
-" - tags: List of strings. Any tags associated with the changeset.\n"
+" :author: String. The unmodified author of the changeset.\n"
+" :branches: String. The name of the branch on which the changeset\n"
+" was committed. Will be empty if the branch name was\n"
+" default.\n"
+" :date: Date information. The date when the changeset was\n"
+" committed.\n"
+" :desc: String. The text of the changeset description.\n"
+" :diffstat: String. Statistics of changes with the following\n"
+" format: \"modified files: +added/-removed lines\"\n"
+" :files: List of strings. All files modified, added, or removed\n"
+" by this changeset.\n"
+" :file_adds: List of strings. Files added by this changeset.\n"
+" :file_mods: List of strings. Files modified by this changeset.\n"
+" :file_dels: List of strings. Files removed by this changeset.\n"
+" :node: String. The changeset identification hash, as a\n"
+" 40-character hexadecimal string.\n"
+" :parents: List of strings. The parents of the changeset.\n"
+" :rev: Integer. The repository-local changeset revision\n"
+" number.\n"
+" :tags: List of strings. Any tags associated with the\n"
+" changeset.\n"
"\n"
" The \"date\" keyword does not produce human-readable output. If you\n"
" want to use a date in your output, you can use a filter to process\n"
" it. Filters are functions which return a string based on the input\n"
" variable. You can also use a chain of filters to get the desired\n"
-" output:\n"
+" output::\n"
"\n"
" $ hg tip --template \"{date|isodate}\\n\"\n"
" 2008-08-21 18:22 +0000\n"
"\n"
" List of filters:\n"
"\n"
-" - addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
-" every line except the last.\n"
-" - age: Date. Returns a human-readable date/time difference between\n"
-" the given date/time and the current date/time.\n"
-" - basename: Any text. Treats the text as a path, and returns the\n"
-" last component of the path after splitting by the path\n"
-" separator (ignoring trailing separators). 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"
-" email address, and extracts just the domain component.\n"
-" Example: 'User <user@example.com>' becomes 'example.com'.\n"
-" - email: Any text. Extracts the first string that looks like an\n"
-" email address. Example: 'User <user@example.com>' becomes\n"
-" 'user@example.com'.\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"
-" - 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"
-" - localdate: Date. Converts a date to local date.\n"
-" - obfuscate: Any text. Returns the input text rendered as a\n"
-" sequence of XML entities.\n"
-" - person: Any text. Returns the text before an email address.\n"
-" - rfc822date: Date. Returns a date using the same format used\n"
-" in email headers.\n"
-" - short: Changeset hash. Returns the short form of a changeset\n"
-" hash, i.e. a 12-byte hexadecimal string.\n"
-" - shortdate: Date. Returns a date like \"2006-09-18\".\n"
-" - strip: Any text. Strips all leading and trailing whitespace.\n"
-" - tabindent: Any text. Returns the text, with every line except\n"
-" the first starting with a tab character.\n"
-" - urlescape: Any text. Escapes all \"special\" characters. For\n"
-" example, \"foo bar\" becomes \"foo%20bar\".\n"
-" - user: Any text. Returns the user portion of an email address.\n"
+" :addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
+" every line except the last.\n"
+" :age: Date. Returns a human-readable date/time difference\n"
+" between the given date/time and the current\n"
+" date/time.\n"
+" :basename: Any text. Treats the text as a path, and returns the\n"
+" last component of the path after splitting by the\n"
+" path separator (ignoring trailing separators). For\n"
+" example, \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//"
+"\"\n"
+" becomes \"bar\".\n"
+" :stripdir: Treat the text as path and strip a directory level,\n"
+" if possible. For example, \"foo\" and \"foo/bar\" becomes\n"
+" \"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"
+" email address, and extracts just the domain\n"
+" component. Example: 'User <user@example.com>' becomes\n"
+" 'example.com'.\n"
+" :email: Any text. Extracts the first string that looks like\n"
+" an email address. Example: 'User <user@example.com>'\n"
+" becomes 'user@example.com'.\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"
+" :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"
+" \"2009-08-18 13:00 +0200\".\n"
+" :isodatesec: Date. Returns the date in ISO 8601 format, including\n"
+" seconds: \"2009-08-18 13:00:13 +0200\". See also the\n"
+" rfc3339date filter.\n"
+" :localdate: Date. Converts a date to local date.\n"
+" :obfuscate: Any text. Returns the input text rendered as a\n"
+" sequence of XML entities.\n"
+" :person: Any text. Returns the text before an email address.\n"
+" :rfc822date: Date. Returns a date using the same format used in\n"
+" email headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n"
+" :rfc3339date: Date. Returns a date using the Internet date format\n"
+" specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n"
+" :short: Changeset hash. Returns the short form of a changeset\n"
+" hash, i.e. a 12-byte hexadecimal string.\n"
+" :shortdate: Date. Returns a date like \"2006-09-18\".\n"
+" :strip: Any text. Strips all leading and trailing whitespace.\n"
+" :tabindent: Any text. Returns the text, with every line except\n"
+" the first starting with a tab character.\n"
+" :urlescape: Any text. Escapes all \"special\" characters. For\n"
+" example, \"foo bar\" becomes \"foo%20bar\".\n"
+" :user: Any text. Returns the user portion of an email\n"
+" address.\n"
" "
msgstr ""
@@ -7967,7 +8047,7 @@
msgid ""
"\n"
-" Valid URLs are of the form:\n"
+" Valid URLs are of the form::\n"
"\n"
" local/filesystem/path[#revision]\n"
" file://local/filesystem/path[#revision]\n"
@@ -7976,8 +8056,8 @@
" ssh://[user[:pass]@]host[:port]/[path][#revision]\n"
"\n"
" Paths in the local filesystem can either point to Mercurial\n"
-" repositories or to bundle files (as created by 'hg bundle' or\n"
-" 'hg incoming --bundle').\n"
+" repositories or to bundle files (as created by 'hg bundle' or 'hg\n"
+" incoming --bundle').\n"
"\n"
" An optional identifier after # indicates a particular branch, tag,\n"
" or changeset to use from the remote repository. See also 'hg help\n"
@@ -7988,28 +8068,34 @@
" Mercurial server.\n"
"\n"
" Some notes about using SSH with Mercurial:\n"
+"\n"
" - SSH requires an accessible shell account on the destination\n"
" machine and a copy of hg in the remote path or specified with as\n"
" remotecmd.\n"
" - path is relative to the remote user's home directory by default.\n"
-" Use an extra slash at the start of a path to specify an absolute "
-"path:\n"
+" Use an extra slash at the start of a path to specify an absolute\n"
+" path::\n"
+"\n"
" ssh://example.com//tmp/repository\n"
+"\n"
" - Mercurial doesn't use its own compression via SSH; the right\n"
-" thing to do is to configure it in your ~/.ssh/config, e.g.:\n"
+" thing to do is to configure it in your ~/.ssh/config, e.g.::\n"
+"\n"
" Host *.mylocalnetwork.example.com\n"
" Compression no\n"
" Host *\n"
" Compression yes\n"
+"\n"
" Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n"
" or with the --ssh command line option.\n"
"\n"
" These URLs can all be stored in your hgrc with path aliases under\n"
-" the [paths] section like so:\n"
-" [paths]\n"
-" alias1 = URL1\n"
-" alias2 = URL2\n"
-" ...\n"
+" the [paths] section like so::\n"
+"\n"
+" [paths]\n"
+" alias1 = URL1\n"
+" alias2 = URL2\n"
+" ...\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"
@@ -8232,8 +8318,8 @@
msgstr "kan ikke lave nyt http depot"
#, python-format
-msgid "%s: ignoring invalid syntax '%s'\n"
-msgstr "%s: ignorerer ugyldig syntaks '%s'\n"
+msgid "ignoring invalid syntax '%s'"
+msgstr "ignorerer ugyldig syntaks '%s'"
#, python-format
msgid "skipping unreadable ignore file '%s': %s\n"
@@ -8263,17 +8349,6 @@
msgstr "arbejdskopien af .hgtags er ændret (deponer venligst .hgtags manuelt)"
#, python-format
-msgid "%s, line %s: %s\n"
-msgstr "%s, linie %s: %s\n"
-
-msgid "cannot parse entry"
-msgstr ""
-
-#, python-format
-msgid "node '%s' is not well formed"
-msgstr "knude '%s' er ikke korrekt formet"
-
-#, python-format
msgid "working directory has unknown parent '%s'!"
msgstr "arbejdsbiblioteket har ukendt forældre '%s'!"
@@ -8633,9 +8708,6 @@
msgid "&Delete"
msgstr ""
-msgid "c"
-msgstr ""
-
#, python-format
msgid ""
"remote changed %s which local deleted\n"
@@ -8781,6 +8853,10 @@
msgstr ""
#, python-format
+msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
+msgstr "%d filer ændret, %d indsættelser(+), %d sletninger(-)\n"
+
+#, python-format
msgid "exited with status %d"
msgstr "afsluttede med status %d"
@@ -8909,9 +8985,6 @@
msgid "&Remote"
msgstr ""
-msgid "r"
-msgstr ""
-
#, python-format
msgid ""
" local changed subrepository %s which remote removed\n"
@@ -8936,6 +9009,17 @@
msgid "pushing subrepo %s\n"
msgstr "skubber til underdepot %s\n"
+#, python-format
+msgid "%s, line %s: %s\n"
+msgstr "%s, linie %s: %s\n"
+
+msgid "cannot parse entry"
+msgstr ""
+
+#, python-format
+msgid "node '%s' is not well formed"
+msgstr "knude '%s' er ikke korrekt formet"
+
msgid "unmatched quotes"
msgstr ""
@@ -9001,12 +9085,12 @@
msgid "username %s contains a newline\n"
msgstr "brugernavn %s indeholder et linieskift\n"
+msgid "response expected"
+msgstr "svar forventet"
+
msgid "unrecognized response\n"
msgstr "svar ikke genkendt\n"
-msgid "response expected"
-msgstr "svar forventet"
-
msgid "password: "
msgstr "kodeord: "