i18n/da.po
branchstable
changeset 12835 b6bf1f501f9f
parent 12833 93776857e17e
child 12868 a19366f2c1aa
equal deleted inserted replaced
12834:b814f67d41c0 12835:b6bf1f501f9f
    15 #
    15 #
    16 msgid ""
    16 msgid ""
    17 msgstr ""
    17 msgstr ""
    18 "Project-Id-Version: Mercurial\n"
    18 "Project-Id-Version: Mercurial\n"
    19 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
    19 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
    20 "POT-Creation-Date: 2010-10-23 14:31+0200\n"
    20 "POT-Creation-Date: 2010-10-23 16:24+0200\n"
    21 "PO-Revision-Date: 2010-10-23 15:02+0200\n"
    21 "PO-Revision-Date: 2010-10-23 16:26+0200\n"
    22 "Last-Translator: <mg@lazybytes.net>\n"
    22 "Last-Translator: <mg@lazybytes.net>\n"
    23 "Language-Team: Danish\n"
    23 "Language-Team: Danish\n"
    24 "Language: \n"
    24 "Language: \n"
    25 "MIME-Version: 1.0\n"
    25 "MIME-Version: 1.0\n"
    26 "Content-Type: text/plain; charset=UTF-8\n"
    26 "Content-Type: text/plain; charset=UTF-8\n"
    39 
    39 
    40 msgid "Extensions"
    40 msgid "Extensions"
    41 msgstr "Udvidelser"
    41 msgstr "Udvidelser"
    42 
    42 
    43 msgid ""
    43 msgid ""
    44 "This section contains help for extensions that is distributed together with "
    44 "This section contains help for extensions that are distributed together with "
    45 "Mercurial. Help for other extensions is available in the help system."
    45 "Mercurial. Help for other extensions is available in the help system."
    46 msgstr ""
    46 msgstr ""
    47 
    47 
    48 msgid "options:"
    48 msgid "options:"
    49 msgstr "tilvalg:"
    49 msgstr "tilvalg:"
  1026 msgstr "ignorerer ukendt farve/effekt %r (konfigureret i color.%s)\n"
  1026 msgstr "ignorerer ukendt farve/effekt %r (konfigureret i color.%s)\n"
  1027 
  1027 
  1028 msgid "win32console not found, please install pywin32\n"
  1028 msgid "win32console not found, please install pywin32\n"
  1029 msgstr "win32console blev ikke fundet, installer venligst pywin32\n"
  1029 msgstr "win32console blev ikke fundet, installer venligst pywin32\n"
  1030 
  1030 
       
  1031 #. i18n: 'always', 'auto', and 'never' are keywords and should
       
  1032 #. not be translated
  1031 msgid "when to colorize (boolean, always, auto, or never)"
  1033 msgid "when to colorize (boolean, always, auto, or never)"
  1032 msgstr ""
  1034 msgstr ""
  1033 "hvornår der skal farvelægges (boolks værdi, \"always\", \"auto\" eller "
  1035 "hvornår der skal farvelægges (boolks værdi, \"always\", \"auto\" eller "
  1034 "\"never\")"
  1036 "\"never\")"
  1035 
  1037 
  2017 "``.hgeol`` filen) til at bestemme den overordnede opførsel. Der er to\n"
  2019 "``.hgeol`` filen) til at bestemme den overordnede opførsel. Der er to\n"
  2018 "indstillinger:"
  2020 "indstillinger:"
  2019 
  2021 
  2020 msgid ""
  2022 msgid ""
  2021 "- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or\n"
  2023 "- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or\n"
  2022 "  ``CRLF`` override the default interpretation of ``native`` for\n"
  2024 "  ``CRLF`` to override the default interpretation of ``native`` for\n"
  2023 "  checkout. This can be used with :hg:`archive` on Unix, say, to\n"
  2025 "  checkout. This can be used with :hg:`archive` on Unix, say, to\n"
  2024 "  generate an archive where files have line endings for Windows."
  2026 "  generate an archive where files have line endings for Windows."
  2025 msgstr ""
  2027 msgstr ""
  2026 "- ``eol.native`` (standard er ``os.linesep``) kan sættes til ``LF``\n"
  2028 "- ``eol.native`` (standard er ``os.linesep``) kan sættes til ``LF``\n"
  2027 "  eller ``CRLF`` for at overskrive den sædvanlige fortolkning af\n"
  2029 "  eller ``CRLF`` for at overskrive den sædvanlige fortolkning af\n"
  4767 "used. Use a boolean value like yes, no, on, off, or use auto for\n"
  4769 "used. Use a boolean value like yes, no, on, off, or use auto for\n"
  4768 "normal behavior.\n"
  4770 "normal behavior.\n"
  4769 msgstr ""
  4771 msgstr ""
  4770 
  4772 
  4771 msgid "when to paginate (boolean, always, auto, or never)"
  4773 msgid "when to paginate (boolean, always, auto, or never)"
  4772 msgstr "hvornår der skal farvelægges (boolks værdi, \"always\", \"auto\" eller \"never\")"
  4774 msgstr ""
       
  4775 "hvornår der skal farvelægges (boolks værdi, \"always\", \"auto\" eller "
       
  4776 "\"never\")"
  4773 
  4777 
  4774 msgid "interpret suffixes to refer to ancestor revisions"
  4778 msgid "interpret suffixes to refer to ancestor revisions"
  4775 msgstr "fortolk suffikser for at referere til forfader-revisioner"
  4779 msgstr "fortolk suffikser for at referere til forfader-revisioner"
  4776 
  4780 
  4777 msgid ""
  4781 msgid ""
  7901 "    omdøbninger og kopieringer. --follow uden et filnavn vil kun vise\n"
  7905 "    omdøbninger og kopieringer. --follow uden et filnavn vil kun vise\n"
  7902 "    forfædre eller efterkommere af startrevisionen. --follow-first\n"
  7906 "    forfædre eller efterkommere af startrevisionen. --follow-first\n"
  7903 "    følger kun den første forældre for sammenføjningsrevisioner."
  7907 "    følger kun den første forældre for sammenføjningsrevisioner."
  7904 
  7908 
  7905 msgid ""
  7909 msgid ""
  7906 "    If no revision range is specified, the default is tip:0 unless\n"
  7910 "    If no revision range is specified, the default is ``tip:0`` unless\n"
  7907 "    --follow is set, in which case the working directory parent is\n"
  7911 "    --follow is set, in which case the working directory parent is\n"
  7908 "    used as the starting revision. You can specify a revision set for\n"
  7912 "    used as the starting revision. You can specify a revision set for\n"
  7909 "    log, see :hg:`help revsets` for more information."
  7913 "    log, see :hg:`help revsets` for more information."
  7910 msgstr ""
  7914 msgstr ""
  7911 "    Hvis der ikke angives et revisionsinterval, da bruges tip:0 som\n"
  7915 "    Hvis der ikke angives et revisionsinterval, da bruges ``tip:0``\n"
  7912 "    standard, med mindre --follow er brugt, i hvilket tilfælde\n"
  7916 "    som standard, med mindre --follow er brugt, i hvilket tilfælde\n"
  7913 "    arbejdskatalogets forælder bruges som startrevision. Du kan\n"
  7917 "    arbejdskatalogets forælder bruges som startrevision. Du kan\n"
  7914 "    specificere en mængde af ændringer til log, se :hg:`help revsets`\n"
  7918 "    specificere en mængde af ændringer til log, se :hg:`help revsets`\n"
  7915 "    for mere information."
  7919 "    for mere information."
  7916 
  7920 
  7917 msgid ""
  7921 msgid ""
  7989 "    hovedrevision og den nuværende gren indeholder præcis et andet\n"
  7993 "    hovedrevision og den nuværende gren indeholder præcis et andet\n"
  7990 "    hoved, så sammenføjes der med dette hoved som standard. Ellers\n"
  7994 "    hoved, så sammenføjes der med dette hoved som standard. Ellers\n"
  7991 "    skal en eksplicit revision angives."
  7995 "    skal en eksplicit revision angives."
  7992 
  7996 
  7993 msgid "    :hg:`resolve` must be used to resolve unresolved files."
  7997 msgid "    :hg:`resolve` must be used to resolve unresolved files."
  7994 msgstr "    :hg:`resolve` skal bruges for at prøve at sammenføje uløste filer igen"
  7998 msgstr ""
       
  7999 "    :hg:`resolve` skal bruges for at prøve at sammenføje uløste filer igen"
  7995 
  8000 
  7996 msgid ""
  8001 msgid ""
  7997 "    To undo an uncommitted merge, use :hg:`update --clean .` which\n"
  8002 "    To undo an uncommitted merge, use :hg:`update --clean .` which\n"
  7998 "    will check out a clean copy of the original merge parent, losing\n"
  8003 "    will check out a clean copy of the original merge parent, losing\n"
  7999 "    all changes."
  8004 "    all changes."
  8347 
  8352 
  8348 msgid "    The resolve command can be used in the following ways:"
  8353 msgid "    The resolve command can be used in the following ways:"
  8349 msgstr ""
  8354 msgstr ""
  8350 
  8355 
  8351 msgid ""
  8356 msgid ""
  8352 "    - :hg:`resolve [--tool] FILE...`: attempt to re-merge the specified\n"
  8357 "    - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the "
       
  8358 "specified\n"
  8353 "      files, discarding any previous merge attempts. Re-merging is not\n"
  8359 "      files, discarding any previous merge attempts. Re-merging is not\n"
  8354 "      performed for files already marked as resolved. Use ``--all/-a``\n"
  8360 "      performed for files already marked as resolved. Use ``--all/-a``\n"
  8355 "      to selects all unresolved files. ``--tool`` can be used to specify\n"
  8361 "      to selects all unresolved files. ``--tool`` can be used to specify\n"
  8356 "      the merge tool used for the given files. It overrides the HGMERGE\n"
  8362 "      the merge tool used for the given files. It overrides the HGMERGE\n"
  8357 "      environment variable and your configuration files."
  8363 "      environment variable and your configuration files."
  9152 msgstr ""
  9158 msgstr ""
  9153 
  9159 
  9154 msgid "parent to choose when backing out merge"
  9160 msgid "parent to choose when backing out merge"
  9155 msgstr ""
  9161 msgstr ""
  9156 
  9162 
       
  9163 msgid "specify merge tool"
       
  9164 msgstr "angiv sammenføjningsværktøj"
       
  9165 
  9157 msgid "revision to backout"
  9166 msgid "revision to backout"
  9158 msgstr "revision som skal bakkes ud"
  9167 msgstr "revision som skal bakkes ud"
  9159 
  9168 
  9160 msgid "[OPTION]... [-r] REV"
  9169 msgid "[OPTION]... [-r] REV"
  9161 msgstr "[TILVALG]... [-r] REV"
  9170 msgstr "[TILVALG]... [-r] REV"
  9517 msgstr "[-r REV]"
  9526 msgstr "[-r REV]"
  9518 
  9527 
  9519 msgid "force a merge with outstanding changes"
  9528 msgid "force a merge with outstanding changes"
  9520 msgstr ""
  9529 msgstr ""
  9521 
  9530 
  9522 msgid "specify merge tool"
       
  9523 msgstr "angiv sammenføjningsværktøj"
       
  9524 
       
  9525 msgid "revision to merge"
  9531 msgid "revision to merge"
  9526 msgstr "revision der skal sammenføjes"
  9532 msgstr "revision der skal sammenføjes"
  9527 
  9533 
  9528 msgid "review revisions to merge (no merge is performed)"
  9534 msgid "review revisions to merge (no merge is performed)"
  9529 msgstr ""
  9535 msgstr ""
  9887 #, python-format
  9893 #, python-format
  9888 msgid "abort: %s\n"
  9894 msgid "abort: %s\n"
  9889 msgstr "afbrudt: %s\n"
  9895 msgstr "afbrudt: %s\n"
  9890 
  9896 
  9891 #, python-format
  9897 #, python-format
       
  9898 msgid "(%s)\n"
       
  9899 msgstr "(%s)\n"
       
  9900 
       
  9901 #, python-format
  9892 msgid "hg: parse error at %s: %s\n"
  9902 msgid "hg: parse error at %s: %s\n"
  9893 msgstr "hg: konfigurationsfejl på %s: %s\n"
  9903 msgstr "hg: konfigurationsfejl på %s: %s\n"
  9894 
  9904 
  9895 #, python-format
  9905 #, python-format
  9896 msgid "hg: parse error: %s\n"
  9906 msgid "hg: parse error: %s\n"
  9946 msgstr "dræbt!\n"
  9956 msgstr "dræbt!\n"
  9947 
  9957 
  9948 #, python-format
  9958 #, python-format
  9949 msgid "hg: unknown command '%s'\n"
  9959 msgid "hg: unknown command '%s'\n"
  9950 msgstr "hg: ukendt kommando '%s'\n"
  9960 msgstr "hg: ukendt kommando '%s'\n"
  9951 
       
  9952 #, python-format
       
  9953 msgid "(%s)\n"
       
  9954 msgstr ""
       
  9955 
  9961 
  9956 msgid "(did you forget to compile extensions?)\n"
  9962 msgid "(did you forget to compile extensions?)\n"
  9957 msgstr "(glemte du at kompilere udvidelserne?)\n"
  9963 msgstr "(glemte du at kompilere udvidelserne?)\n"
  9958 
  9964 
  9959 msgid "(is your Python install correct?)\n"
  9965 msgid "(is your Python install correct?)\n"
 11207 "file. Merge tools are given the two files and the greatest common\n"
 11213 "file. Merge tools are given the two files and the greatest common\n"
 11208 "ancestor of the two file versions, so they can determine the changes\n"
 11214 "ancestor of the two file versions, so they can determine the changes\n"
 11209 "made on both branches."
 11215 "made on both branches."
 11210 msgstr ""
 11216 msgstr ""
 11211 
 11217 
 11212 msgid "The merge tools are used both for :hg:`resolve` and :hg:`merge`."
 11218 msgid ""
 11213 msgstr ""
 11219 "Merge tools are used both for :hg:`resolve`, :hg:`merge`, :hg:`update`,\n"
 11214 
 11220 ":hg:`backout` and in several extensions."
 11215 msgid ""
 11221 msgstr ""
 11216 "Usually, the merge tool tries to automatically, by combining all the\n"
 11222 
 11217 "non-overlapping changes that occurred separately in the two different\n"
 11223 msgid ""
 11218 "evolutions of the same initial base file. Furthermore, some\n"
 11224 "Usually, the merge tool tries to automatically reconcile the files by\n"
       
 11225 "combining all non-overlapping changes that occurred separately in\n"
       
 11226 "the two different evolutions of the same initial base file. Furthermore, "
       
 11227 "some\n"
 11219 "interactive merge programs make it easier to manually resolve\n"
 11228 "interactive merge programs make it easier to manually resolve\n"
 11220 "conflicting merges, either in a graphical way, or by inserting some\n"
 11229 "conflicting merges, either in a graphical way, or by inserting some\n"
 11221 "conflict markers. Mercurial does not include any interactive merge\n"
 11230 "conflict markers. Mercurial does not include any interactive merge\n"
 11222 "programs but relies on external tools for that. External merge tools\n"
 11231 "programs but relies on external tools for that."
 11223 "and their properties and usage is configured in merge-tools section -\n"
 11232 msgstr ""
 11224 "see hgrc(5)."
 11233 
       
 11234 msgid ""
       
 11235 "Available merge tools\n"
       
 11236 "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
       
 11237 msgstr ""
       
 11238 
       
 11239 msgid ""
       
 11240 "External merge tools and their properties and usage is configured in the\n"
       
 11241 "merge-tools configuration section - see hgrc(5) - but they can often also "
       
 11242 "just\n"
       
 11243 "be named by their executable."
       
 11244 msgstr ""
       
 11245 
       
 11246 msgid ""
       
 11247 "A merge tool is generally usable if its executable can be found on the\n"
       
 11248 "system and if it can handle the merge. The executable can be found on the\n"
       
 11249 "system if it either is an absolute or relative executable path or the name "
       
 11250 "of\n"
       
 11251 "an application in the executable search path. The tool is assumed to be "
       
 11252 "able\n"
       
 11253 "to handle the merge if it can handle symlinks if the file is a symlink, if "
       
 11254 "it\n"
       
 11255 "can handle binary files if the file is binary, and if a GUI is available if "
       
 11256 "the\n"
       
 11257 "tool requires a GUI."
 11225 msgstr ""
 11258 msgstr ""
 11226 
 11259 
 11227 msgid ""
 11260 msgid ""
 11228 "There are a some internal merge tools which can be used. The internal\n"
 11261 "There are a some internal merge tools which can be used. The internal\n"
 11229 "merge tools are:"
 11262 "merge tools are:"
 11230 msgstr ""
 11263 msgstr ""
 11231 
 11264 
 11232 msgid ""
 11265 msgid ""
 11233 "``internal:merge``\n"
 11266 "``internal:merge``\n"
 11234 "   Uses the internal non-interactive merge tool for merging files."
 11267 "   Uses the internal non-interactive simple merge algorithm for merging "
       
 11268 "files.\n"
       
 11269 "   It will fail if there are any conflicts."
 11235 msgstr ""
 11270 msgstr ""
 11236 
 11271 
 11237 msgid ""
 11272 msgid ""
 11238 "``internal:fail``\n"
 11273 "``internal:fail``\n"
 11239 "   Rather than attempting to merge files that were modified on both\n"
 11274 "   Rather than attempting to merge files that were modified on both\n"
 11246 "   Uses the local version of files as the merged version."
 11281 "   Uses the local version of files as the merged version."
 11247 msgstr ""
 11282 msgstr ""
 11248 
 11283 
 11249 msgid ""
 11284 msgid ""
 11250 "``internal:other``\n"
 11285 "``internal:other``\n"
 11251 "   Uses the remote version of files as the merged version."
 11286 "   Uses the other version of files as the merged version."
 11252 msgstr ""
 11287 msgstr ""
 11253 
 11288 
 11254 msgid ""
 11289 msgid ""
 11255 "``internal:prompt``\n"
 11290 "``internal:prompt``\n"
 11256 "   Asks the user which of the local or the other version to keep as\n"
 11291 "   Asks the user which of the local or the other version to keep as\n"
 11259 
 11294 
 11260 msgid ""
 11295 msgid ""
 11261 "``internal:dump``\n"
 11296 "``internal:dump``\n"
 11262 "   Creates three versions of the files to merge, containing the\n"
 11297 "   Creates three versions of the files to merge, containing the\n"
 11263 "   contents of local, other and base. These files can then be used to\n"
 11298 "   contents of local, other and base. These files can then be used to\n"
 11264 "   perform a merge manually. If the file merged is name ``a.txt``,\n"
 11299 "   perform a merge manually. If the file to be merged is named\n"
 11265 "   these files will accordingly be named ``a.txt.local``,\n"
 11300 "   ``a.txt``, these files will accordingly be named ``a.txt.local``,\n"
 11266 "   ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n"
 11301 "   ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n"
 11267 "   same directory as the file to merge."
 11302 "   same directory as ``a.txt``."
 11268 msgstr ""
 11303 msgstr ""
 11269 
 11304 
 11270 msgid "How Mercurial decides which merge program to use"
 11305 msgid ""
 11271 msgstr ""
 11306 "Internal tools are always available and do not require a GUI but will by "
 11272 
 11307 "default\n"
 11273 msgid ""
 11308 "not handle symlinks or binary files."
 11274 "1. If the ``HGMERGE`` environment variable is present, it is used. If\n"
 11309 msgstr ""
 11275 "   specified it must be either an executable path or the name of an\n"
 11310 
 11276 "   application in your executable search path."
 11311 msgid ""
 11277 msgstr ""
 11312 "Choosing a merge tool\n"
 11278 
 11313 "\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
 11279 msgid ""
 11314 msgstr ""
 11280 "2. If the filename of the file to be merged matches any of the\n"
 11315 
 11281 "   patterns in the merge-patterns configuration section, then the\n"
 11316 msgid "Mercurial uses these rules when decing which merge tool to use:"
 11282 "   corresponding merge tool is used, unless the file to be merged is a\n"
 11317 msgstr ""
 11283 "   symlink. Here binary capabilities of the merge tool are not\n"
 11318 
 11284 "   considered."
 11319 msgid ""
 11285 msgstr ""
 11320 "0. If a tool has been specified with the --tool option to merge or resolve, "
 11286 
 11321 "it\n"
 11287 msgid "3. If ui.merge is set, it is used."
 11322 "   is used.  If it is the name of a tool in the merge-tools configuration, "
 11288 msgstr ""
 11323 "its\n"
 11289 
 11324 "   configuration is used. Otherwise the specified tool must be executable "
 11290 msgid ""
 11325 "by\n"
 11291 "4. If any merge tools are present in the merge-tools configuration\n"
 11326 "   the shell."
 11292 "   section, and any of the tools can be found on the system, the\n"
 11327 msgstr ""
 11293 "   priority settings are used to determine which one to use. Binary,\n"
 11328 
 11294 "   symlink and GUI capabilities do also have to match."
 11329 msgid ""
 11295 msgstr ""
 11330 "1. If the ``HGMERGE`` environment variable is present, its value is used "
 11296 
 11331 "and\n"
 11297 msgid "5. If a program named ``hgmerge`` exists on the system, it is used."
 11332 "   must be executable by the shell."
       
 11333 msgstr ""
       
 11334 
       
 11335 msgid ""
       
 11336 "2. If the filename of the file to be merged matches any of the patterns in "
       
 11337 "the\n"
       
 11338 "   merge-patterns configuration section, the first usable merge tool\n"
       
 11339 "   corresponding to a matching pattern is used. Here, binary capabilities of "
       
 11340 "the\n"
       
 11341 "   merge tool are not considered."
       
 11342 msgstr ""
       
 11343 
       
 11344 msgid ""
       
 11345 "3. If ui.merge is set it will be considered next. If the value is not the "
       
 11346 "name\n"
       
 11347 "   of a configured tool, the specified value is used and must be executable "
       
 11348 "by\n"
       
 11349 "   the shell. Otherwise the named tool is used if it is usable."
       
 11350 msgstr ""
       
 11351 
       
 11352 msgid ""
       
 11353 "4. If any usable merge tools are present in the merge-tools configuration\n"
       
 11354 "   section, the one with the higest priority is used."
       
 11355 msgstr ""
       
 11356 
       
 11357 msgid ""
       
 11358 "5. If a program named ``hgmerge`` can be found on the system, it is used - "
       
 11359 "but\n"
       
 11360 "   it will by default not be used for symlinks and binary files."
 11298 msgstr ""
 11361 msgstr ""
 11299 
 11362 
 11300 msgid ""
 11363 msgid ""
 11301 "6. If the file to be merged is not binary and is not a symlink, then\n"
 11364 "6. If the file to be merged is not binary and is not a symlink, then\n"
 11302 "   ``internal:merge`` is used."
 11365 "   ``internal:merge`` is used."
 11303 msgstr ""
 11366 msgstr ""
 11304 
 11367 
 11305 msgid "7. The merge fails."
 11368 msgid "7. The merge of the file fails and must be resolved before commit."
 11306 msgstr ""
 11369 msgstr ""
 11307 
 11370 
 11308 msgid ""
 11371 msgid ""
 11309 ".. note::\n"
 11372 ".. note::\n"
 11310 "   After selecting a merge program, Mercurial will by default attempt\n"
 11373 "   After selecting a merge program, Mercurial will by default attempt\n"
 11311 "   to merge the files using a simple merge algorithm first, to see if\n"
 11374 "   to merge the files using a simple merge algorithm first. Only if it "
 11312 "   they can be merged without conflicts. Only if there are conflicting\n"
 11375 "doesn't\n"
 11313 "   changes Mercurial will actually execute the merge program. Whether\n"
 11376 "   succeed because of conflicting changes Mercurial will actually execute "
 11314 "   to use the simple merge algorithm first can be controlled be the\n"
 11377 "the\n"
 11315 "   premerge setting of the merge tool, which is enabled by default\n"
 11378 "   merge program. Whether to use the simple merge algorithm first can be\n"
 11316 "   unless the file is binary or symlink."
 11379 "   controlled by the premerge setting of the merge tool. Premerge is enabled "
 11317 msgstr ""
 11380 "by\n"
 11318 
 11381 "   default unless the file is binary or a symlink."
 11319 msgid ""
 11382 msgstr ""
 11320 "See the merge-tools and ui sections of hgrc(5) for details on\n"
 11383 
       
 11384 msgid ""
       
 11385 "See the merge-tools and ui sections of hgrc(5) for details on the\n"
 11321 "configuration of merge tools.\n"
 11386 "configuration of merge tools.\n"
 11322 msgstr ""
 11387 msgstr ""
 11323 
 11388 
 11324 msgid ""
 11389 msgid ""
 11325 "When Mercurial accepts more than one revision, they may be specified\n"
 11390 "When Mercurial accepts more than one revision, they may be specified\n"
 11751 msgstr ""
 11816 msgstr ""
 11752 
 11817 
 11753 msgid "- Changesets on the default branch::"
 11818 msgid "- Changesets on the default branch::"
 11754 msgstr "- Ændringer på default grenen::"
 11819 msgstr "- Ændringer på default grenen::"
 11755 
 11820 
 11756 msgid "    hg log -r 'branch(default)'"
 11821 msgid "    hg log -r \"branch(default)\""
 11757 msgstr "    hg log -r 'branch(default)'"
 11822 msgstr "    hg log -r \"branch(default)\""
 11758 
 11823 
 11759 msgid "- Changesets on the default branch since tag 1.5 (excluding merges)::"
 11824 msgid "- Changesets on the default branch since tag 1.5 (excluding merges)::"
 11760 msgstr ""
 11825 msgstr ""
 11761 
 11826 
 11762 msgid "    hg log -r 'branch(default) and 1.5:: and not merge()'"
 11827 msgid "    hg log -r \"branch(default) and 1.5:: and not merge()\""
 11763 msgstr "    hg log -r 'branch(default) and 1.5:: and not merge()'"
 11828 msgstr "    hg log -r \"branch(default) and 1.5:: and not merge()\""
 11764 
 11829 
 11765 msgid "- Open branch heads::"
 11830 msgid "- Open branch heads::"
 11766 msgstr "- Åbne grenhoveder::"
 11831 msgstr "- Åbne grenhoveder::"
 11767 
 11832 
 11768 msgid "    hg log -r 'head() and not closed()'"
 11833 msgid "    hg log -r \"head() and not closed()\""
 11769 msgstr "    hg log -r 'head() and not closed()'"
 11834 msgstr "    hg log -r \"head() and not closed()\""
 11770 
 11835 
 11771 msgid ""
 11836 msgid ""
 11772 "- Changesets between tags 1.3 and 1.5 mentioning \"bug\" that affect\n"
 11837 "- Changesets between tags 1.3 and 1.5 mentioning \"bug\" that affect\n"
 11773 "  ``hgext/*``::"
 11838 "  ``hgext/*``::"
 11774 msgstr ""
 11839 msgstr ""
 11775 
 11840 
 11776 msgid "    hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'"
 11841 msgid "    hg log -r \"1.3::1.5 and keyword(bug) and file('hgext/*')\""
 11777 msgstr "    hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'"
 11842 msgstr "    hg log -r \"1.3::1.5 and keyword(bug) and file(\"hgext/*\")\""
 11778 
 11843 
 11779 msgid "- Changesets in committed May 2008, sorted by user::"
 11844 msgid "- Changesets in committed May 2008, sorted by user::"
 11780 msgstr ""
 11845 msgstr ""
 11781 
 11846 
 11782 msgid "    hg log -r 'sort(date(\"May 2008\"), user)'"
 11847 msgid "    hg log -r \"sort(date('May 2008'), user)\""
 11783 msgstr "    hg log -r 'sort(date(\"May 2008\"), user)'"
 11848 msgstr "    hg log -r \"sort(date(\"May 2008\"), user)\""
 11784 
 11849 
 11785 msgid ""
 11850 msgid ""
 11786 "- Changesets mentioning \"bug\" or \"issue\" that are not in a tagged\n"
 11851 "- Changesets mentioning \"bug\" or \"issue\" that are not in a tagged\n"
 11787 "  release::"
 11852 "  release::"
 11788 msgstr ""
 11853 msgstr ""
 11789 
 11854 
 11790 msgid ""
 11855 msgid ""
 11791 "    hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged"
 11856 "    hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged"
 11792 "())'\n"
 11857 "())\"\n"
 11793 msgstr "    hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n"
 11858 msgstr "    hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged())\"\n"
 11794 
 11859 
 11795 msgid ""
 11860 msgid ""
 11796 "Mercurial allows you to customize output of commands through\n"
 11861 "Mercurial allows you to customize output of commands through\n"
 11797 "templates. You can either pass in a template from the command\n"
 11862 "templates. You can either pass in a template from the command\n"
 11798 "line, via the --template option, or select an existing\n"
 11863 "line, via the --template option, or select an existing\n"
 12674 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
 12739 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
 12675 msgstr ""
 12740 msgstr ""
 12676 "udestående ikke-deponerede ændringer (brug 'hg status' for at se ændringer)"
 12741 "udestående ikke-deponerede ændringer (brug 'hg status' for at se ændringer)"
 12677 
 12742 
 12678 msgid "crosses branches (merge branches or use --clean to discard changes)"
 12743 msgid "crosses branches (merge branches or use --clean to discard changes)"
 12679 msgstr "krydser grene (sammenføj grenene eller brug --clean for at kassere ændringerne)"
 12744 msgstr ""
       
 12745 "krydser grene (sammenføj grenene eller brug --clean for at kassere "
       
 12746 "ændringerne)"
 12680 
 12747 
 12681 msgid "crosses branches (merge branches or use --check to force update)"
 12748 msgid "crosses branches (merge branches or use --check to force update)"
 12682 msgstr "krydser grene (sammenføj grenene eller brug --check for at forcere opdateringen)"
 12749 msgstr ""
       
 12750 "krydser grene (sammenføj grenene eller brug --check for at forcere "
       
 12751 "opdateringen)"
 12683 
 12752 
 12684 msgid "Attention:"
 12753 msgid "Attention:"
 12685 msgstr ""
 12754 msgstr ""
 12686 
 12755 
 12687 msgid "Caution:"
 12756 msgid "Caution:"