# HG changeset patch # User Martin Geisler # Date 2010-10-23 14:27:27 # Node ID b6bf1f501f9f10da20346358d0a7d94413d6034e # Parent b814f67d41c0ea9c988895aa12eda48a9eeac88a i18n-da: synchronize with b814f67d41c0 diff --git a/i18n/da.po b/i18n/da.po --- a/i18n/da.po +++ b/i18n/da.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-23 14:31+0200\n" -"PO-Revision-Date: 2010-10-23 15:02+0200\n" +"POT-Creation-Date: 2010-10-23 16:24+0200\n" +"PO-Revision-Date: 2010-10-23 16:26+0200\n" "Last-Translator: \n" "Language-Team: Danish\n" "Language: \n" @@ -41,7 +41,7 @@ msgid "Extensions" msgstr "Udvidelser" msgid "" -"This section contains help for extensions that is distributed together with " +"This section contains help for extensions that are distributed together with " "Mercurial. Help for other extensions is available in the help system." msgstr "" @@ -1028,6 +1028,8 @@ msgstr "ignorerer ukendt farve/effekt %r msgid "win32console not found, please install pywin32\n" msgstr "win32console blev ikke fundet, installer venligst pywin32\n" +#. i18n: 'always', 'auto', and 'never' are keywords and should +#. not be translated msgid "when to colorize (boolean, always, auto, or never)" msgstr "" "hvornår der skal farvelægges (boolks værdi, \"always\", \"auto\" eller " @@ -2019,7 +2021,7 @@ msgstr "" msgid "" "- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or\n" -" ``CRLF`` override the default interpretation of ``native`` for\n" +" ``CRLF`` to override the default interpretation of ``native`` for\n" " checkout. This can be used with :hg:`archive` on Unix, say, to\n" " generate an archive where files have line endings for Windows." msgstr "" @@ -4769,7 +4771,9 @@ msgid "" msgstr "" msgid "when to paginate (boolean, always, auto, or never)" -msgstr "hvornår der skal farvelægges (boolks værdi, \"always\", \"auto\" eller \"never\")" +msgstr "" +"hvornår der skal farvelægges (boolks værdi, \"always\", \"auto\" eller " +"\"never\")" msgid "interpret suffixes to refer to ancestor revisions" msgstr "fortolk suffikser for at referere til forfader-revisioner" @@ -7903,13 +7907,13 @@ msgstr "" " følger kun den første forældre for sammenføjningsrevisioner." msgid "" -" If no revision range is specified, the default is tip:0 unless\n" +" If no revision range is specified, the default is ``tip:0`` unless\n" " --follow is set, in which case the working directory parent is\n" " used as the starting revision. You can specify a revision set for\n" " log, see :hg:`help revsets` for more information." msgstr "" -" Hvis der ikke angives et revisionsinterval, da bruges tip:0 som\n" -" standard, med mindre --follow er brugt, i hvilket tilfælde\n" +" Hvis der ikke angives et revisionsinterval, da bruges ``tip:0``\n" +" som standard, med mindre --follow er brugt, i hvilket tilfælde\n" " arbejdskatalogets forælder bruges som startrevision. Du kan\n" " specificere en mængde af ændringer til log, se :hg:`help revsets`\n" " for mere information." @@ -7991,7 +7995,8 @@ msgstr "" " skal en eksplicit revision angives." msgid " :hg:`resolve` must be used to resolve unresolved files." -msgstr " :hg:`resolve` skal bruges for at prøve at sammenføje uløste filer igen" +msgstr "" +" :hg:`resolve` skal bruges for at prøve at sammenføje uløste filer igen" msgid "" " To undo an uncommitted merge, use :hg:`update --clean .` which\n" @@ -8349,7 +8354,8 @@ msgid " The resolve command can be us msgstr "" msgid "" -" - :hg:`resolve [--tool] FILE...`: attempt to re-merge the specified\n" +" - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the " +"specified\n" " files, discarding any previous merge attempts. Re-merging is not\n" " performed for files already marked as resolved. Use ``--all/-a``\n" " to selects all unresolved files. ``--tool`` can be used to specify\n" @@ -9154,6 +9160,9 @@ msgstr "" msgid "parent to choose when backing out merge" msgstr "" +msgid "specify merge tool" +msgstr "angiv sammenføjningsværktøj" + msgid "revision to backout" msgstr "revision som skal bakkes ud" @@ -9519,9 +9528,6 @@ msgstr "[-r REV]" msgid "force a merge with outstanding changes" msgstr "" -msgid "specify merge tool" -msgstr "angiv sammenføjningsværktøj" - msgid "revision to merge" msgstr "revision der skal sammenføjes" @@ -9889,6 +9895,10 @@ msgid "abort: %s\n" msgstr "afbrudt: %s\n" #, python-format +msgid "(%s)\n" +msgstr "(%s)\n" + +#, python-format msgid "hg: parse error at %s: %s\n" msgstr "hg: konfigurationsfejl på %s: %s\n" @@ -9949,10 +9959,6 @@ msgstr "dræbt!\n" msgid "hg: unknown command '%s'\n" msgstr "hg: ukendt kommando '%s'\n" -#, python-format -msgid "(%s)\n" -msgstr "" - msgid "(did you forget to compile extensions?)\n" msgstr "(glemte du at kompilere udvidelserne?)\n" @@ -11209,19 +11215,46 @@ msgid "" "made on both branches." msgstr "" -msgid "The merge tools are used both for :hg:`resolve` and :hg:`merge`." -msgstr "" - -msgid "" -"Usually, the merge tool tries to automatically, by combining all the\n" -"non-overlapping changes that occurred separately in the two different\n" -"evolutions of the same initial base file. Furthermore, some\n" +msgid "" +"Merge tools are used both for :hg:`resolve`, :hg:`merge`, :hg:`update`,\n" +":hg:`backout` and in several extensions." +msgstr "" + +msgid "" +"Usually, the merge tool tries to automatically reconcile the files by\n" +"combining all non-overlapping changes that occurred separately in\n" +"the two different evolutions of the same initial base file. Furthermore, " +"some\n" "interactive merge programs make it easier to manually resolve\n" "conflicting merges, either in a graphical way, or by inserting some\n" "conflict markers. Mercurial does not include any interactive merge\n" -"programs but relies on external tools for that. External merge tools\n" -"and their properties and usage is configured in merge-tools section -\n" -"see hgrc(5)." +"programs but relies on external tools for that." +msgstr "" + +msgid "" +"Available merge tools\n" +"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" +msgstr "" + +msgid "" +"External merge tools and their properties and usage is configured in the\n" +"merge-tools configuration section - see hgrc(5) - but they can often also " +"just\n" +"be named by their executable." +msgstr "" + +msgid "" +"A merge tool is generally usable if its executable can be found on the\n" +"system and if it can handle the merge. The executable can be found on the\n" +"system if it either is an absolute or relative executable path or the name " +"of\n" +"an application in the executable search path. The tool is assumed to be " +"able\n" +"to handle the merge if it can handle symlinks if the file is a symlink, if " +"it\n" +"can handle binary files if the file is binary, and if a GUI is available if " +"the\n" +"tool requires a GUI." msgstr "" msgid "" @@ -11231,7 +11264,9 @@ msgstr "" msgid "" "``internal:merge``\n" -" Uses the internal non-interactive merge tool for merging files." +" Uses the internal non-interactive simple merge algorithm for merging " +"files.\n" +" It will fail if there are any conflicts." msgstr "" msgid "" @@ -11248,7 +11283,7 @@ msgstr "" msgid "" "``internal:other``\n" -" Uses the remote version of files as the merged version." +" Uses the other version of files as the merged version." msgstr "" msgid "" @@ -11261,40 +11296,68 @@ msgid "" "``internal:dump``\n" " Creates three versions of the files to merge, containing the\n" " contents of local, other and base. These files can then be used to\n" -" perform a merge manually. If the file merged is name ``a.txt``,\n" -" these files will accordingly be named ``a.txt.local``,\n" +" perform a merge manually. If the file to be merged is named\n" +" ``a.txt``, these files will accordingly be named ``a.txt.local``,\n" " ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n" -" same directory as the file to merge." -msgstr "" - -msgid "How Mercurial decides which merge program to use" -msgstr "" - -msgid "" -"1. If the ``HGMERGE`` environment variable is present, it is used. If\n" -" specified it must be either an executable path or the name of an\n" -" application in your executable search path." -msgstr "" - -msgid "" -"2. If the filename of the file to be merged matches any of the\n" -" patterns in the merge-patterns configuration section, then the\n" -" corresponding merge tool is used, unless the file to be merged is a\n" -" symlink. Here binary capabilities of the merge tool are not\n" -" considered." -msgstr "" - -msgid "3. If ui.merge is set, it is used." -msgstr "" - -msgid "" -"4. If any merge tools are present in the merge-tools configuration\n" -" section, and any of the tools can be found on the system, the\n" -" priority settings are used to determine which one to use. Binary,\n" -" symlink and GUI capabilities do also have to match." -msgstr "" - -msgid "5. If a program named ``hgmerge`` exists on the system, it is used." +" same directory as ``a.txt``." +msgstr "" + +msgid "" +"Internal tools are always available and do not require a GUI but will by " +"default\n" +"not handle symlinks or binary files." +msgstr "" + +msgid "" +"Choosing a merge tool\n" +"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" +msgstr "" + +msgid "Mercurial uses these rules when decing which merge tool to use:" +msgstr "" + +msgid "" +"0. If a tool has been specified with the --tool option to merge or resolve, " +"it\n" +" is used. If it is the name of a tool in the merge-tools configuration, " +"its\n" +" configuration is used. Otherwise the specified tool must be executable " +"by\n" +" the shell." +msgstr "" + +msgid "" +"1. If the ``HGMERGE`` environment variable is present, its value is used " +"and\n" +" must be executable by the shell." +msgstr "" + +msgid "" +"2. If the filename of the file to be merged matches any of the patterns in " +"the\n" +" merge-patterns configuration section, the first usable merge tool\n" +" corresponding to a matching pattern is used. Here, binary capabilities of " +"the\n" +" merge tool are not considered." +msgstr "" + +msgid "" +"3. If ui.merge is set it will be considered next. If the value is not the " +"name\n" +" of a configured tool, the specified value is used and must be executable " +"by\n" +" the shell. Otherwise the named tool is used if it is usable." +msgstr "" + +msgid "" +"4. If any usable merge tools are present in the merge-tools configuration\n" +" section, the one with the higest priority is used." +msgstr "" + +msgid "" +"5. If a program named ``hgmerge`` can be found on the system, it is used - " +"but\n" +" it will by default not be used for symlinks and binary files." msgstr "" msgid "" @@ -11302,22 +11365,24 @@ msgid "" " ``internal:merge`` is used." msgstr "" -msgid "7. The merge fails." +msgid "7. The merge of the file fails and must be resolved before commit." msgstr "" msgid "" ".. note::\n" " After selecting a merge program, Mercurial will by default attempt\n" -" to merge the files using a simple merge algorithm first, to see if\n" -" they can be merged without conflicts. Only if there are conflicting\n" -" changes Mercurial will actually execute the merge program. Whether\n" -" to use the simple merge algorithm first can be controlled be the\n" -" premerge setting of the merge tool, which is enabled by default\n" -" unless the file is binary or symlink." -msgstr "" - -msgid "" -"See the merge-tools and ui sections of hgrc(5) for details on\n" +" to merge the files using a simple merge algorithm first. Only if it " +"doesn't\n" +" succeed because of conflicting changes Mercurial will actually execute " +"the\n" +" merge program. Whether to use the simple merge algorithm first can be\n" +" controlled by the premerge setting of the merge tool. Premerge is enabled " +"by\n" +" default unless the file is binary or a symlink." +msgstr "" + +msgid "" +"See the merge-tools and ui sections of hgrc(5) for details on the\n" "configuration of merge tools.\n" msgstr "" @@ -11753,34 +11818,34 @@ msgstr "" msgid "- Changesets on the default branch::" msgstr "- Ændringer på default grenen::" -msgid " hg log -r 'branch(default)'" -msgstr " hg log -r 'branch(default)'" +msgid " hg log -r \"branch(default)\"" +msgstr " hg log -r \"branch(default)\"" msgid "- Changesets on the default branch since tag 1.5 (excluding merges)::" msgstr "" -msgid " hg log -r 'branch(default) and 1.5:: and not merge()'" -msgstr " hg log -r 'branch(default) and 1.5:: and not merge()'" +msgid " hg log -r \"branch(default) and 1.5:: and not merge()\"" +msgstr " hg log -r \"branch(default) and 1.5:: and not merge()\"" msgid "- Open branch heads::" msgstr "- Åbne grenhoveder::" -msgid " hg log -r 'head() and not closed()'" -msgstr " hg log -r 'head() and not closed()'" +msgid " hg log -r \"head() and not closed()\"" +msgstr " hg log -r \"head() and not closed()\"" msgid "" "- Changesets between tags 1.3 and 1.5 mentioning \"bug\" that affect\n" " ``hgext/*``::" msgstr "" -msgid " hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'" -msgstr " hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'" +msgid " hg log -r \"1.3::1.5 and keyword(bug) and file('hgext/*')\"" +msgstr " hg log -r \"1.3::1.5 and keyword(bug) and file(\"hgext/*\")\"" msgid "- Changesets in committed May 2008, sorted by user::" msgstr "" -msgid " hg log -r 'sort(date(\"May 2008\"), user)'" -msgstr " hg log -r 'sort(date(\"May 2008\"), user)'" +msgid " hg log -r \"sort(date('May 2008'), user)\"" +msgstr " hg log -r \"sort(date(\"May 2008\"), user)\"" msgid "" "- Changesets mentioning \"bug\" or \"issue\" that are not in a tagged\n" @@ -11788,9 +11853,9 @@ msgid "" msgstr "" msgid "" -" hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged" -"())'\n" -msgstr " hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n" +" hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged" +"())\"\n" +msgstr " hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged())\"\n" msgid "" "Mercurial allows you to customize output of commands through\n" @@ -12676,10 +12741,14 @@ msgstr "" "udestående ikke-deponerede ændringer (brug 'hg status' for at se ændringer)" msgid "crosses branches (merge branches or use --clean to discard changes)" -msgstr "krydser grene (sammenføj grenene eller brug --clean for at kassere ændringerne)" +msgstr "" +"krydser grene (sammenføj grenene eller brug --clean for at kassere " +"ændringerne)" msgid "crosses branches (merge branches or use --check to force update)" -msgstr "krydser grene (sammenføj grenene eller brug --check for at forcere opdateringen)" +msgstr "" +"krydser grene (sammenføj grenene eller brug --check for at forcere " +"opdateringen)" msgid "Attention:" msgstr ""