--- a/i18n/da.po Wed Jun 30 13:03:48 2010 +0900
+++ b/i18n/da.po Thu Jul 01 15:25:29 2010 +0200
@@ -17,8 +17,8 @@
msgstr ""
"Project-Id-Version: Mercurial\n"
"Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2010-06-20 16:37+0200\n"
-"PO-Revision-Date: 2010-06-20 20:01+0200\n"
+"POT-Creation-Date: 2010-07-01 14:56+0200\n"
+"PO-Revision-Date: 2010-07-01 15:23+0200\n"
"Last-Translator: <mg@lazybytes.net>\n"
"Language-Team: Danish\n"
"MIME-Version: 1.0\n"
@@ -146,8 +146,10 @@
msgid ""
" # Use this if you want to check access restrictions at commit time\n"
-" pretxncommit.acl = python:hgext.acl.hook\n"
-" \n"
+" pretxncommit.acl = python:hgext.acl.hook"
+msgstr ""
+
+msgid ""
" # Use this if you want to check access restrictions for pull, push,\n"
" # bundle and serve.\n"
" pretxnchangegroup.acl = python:hgext.acl.hook"
@@ -163,28 +165,40 @@
" sources = serve"
msgstr ""
-msgid ""
-" [acl.deny.branches] \n"
-" \n"
-" # Everyone is denied to the frozen branch: \n"
-" frozen-branch = * \n"
-" \n"
-" # A bad user is denied on all branches: \n"
-" * = bad-user \n"
-" \n"
-" [acl.allow.branches] \n"
-" \n"
-" # A few users are allowed on branch-a: \n"
-" branch-a = user-1, user-2, user-3 \n"
-" \n"
-" # Only one user is allowed on branch-b: \n"
-" branch-b = user-1 \n"
-" \n"
-" # The super user is allowed on any branch: \n"
-" * = super-user \n"
-" \n"
-" # Everyone is allowed on branch-for-tests: \n"
-" branch-for-tests = * "
+msgid " [acl.deny.branches]"
+msgstr " [acl.deny.branches]"
+
+msgid ""
+" # Everyone is denied to the frozen branch:\n"
+" frozen-branch = *"
+msgstr ""
+
+msgid ""
+" # A bad user is denied on all branches:\n"
+" * = bad-user"
+msgstr ""
+
+msgid " [acl.allow.branches]"
+msgstr " [acl.allow.branches]"
+
+msgid ""
+" # A few users are allowed on branch-a:\n"
+" branch-a = user-1, user-2, user-3"
+msgstr ""
+
+msgid ""
+" # Only one user is allowed on branch-b:\n"
+" branch-b = user-1"
+msgstr ""
+
+msgid ""
+" # The super user is allowed on any branch:\n"
+" * = super-user"
+msgstr ""
+
+msgid ""
+" # Everyone is allowed on branch-for-tests:\n"
+" branch-for-tests = *"
msgstr ""
msgid ""
@@ -250,7 +264,9 @@
#, python-format
msgid ""
"config error - hook type \"%s\" cannot stop incoming changesets nor commits"
-msgstr "konfigurationsfejl - hook type \"%s\" kan ikke stoppe indgående ændringer eller deponeringer"
+msgstr ""
+"konfigurationsfejl - hook type \"%s\" kan ikke stoppe indgående ændringer "
+"eller deponeringer"
#, python-format
msgid "acl: user \"%s\" denied on branch \"%s\" (changeset \"%s\")"
@@ -344,8 +360,8 @@
msgstr ""
#, python-format
-msgid "failed to update bookmark %s!\n"
-msgstr "kunne ikke opdatere bogmærke %s!\n"
+msgid "updating bookmark %s failed!\n"
+msgstr "opdatering af bogmærke %s fejlede!\n"
#, python-format
msgid "remote bookmark %s not found!"
@@ -363,9 +379,15 @@
msgid "deleting remote bookmark %s\n"
msgstr "sletter fjern-bogmærke %s\n"
-#, python-format
-msgid "updating bookmark %s failed!\n"
-msgstr "opdatering af bogmærke %s fejlede!\n"
+msgid "searching for changes\n"
+msgstr "leder efter ændringer\n"
+
+msgid "no changes found\n"
+msgstr "fandt ingen ændringer\n"
+
+#, python-format
+msgid "comparing with %s\n"
+msgstr "sammenligner med %s\n"
msgid "bookmark to import"
msgstr "bogmærke der skal importeres"
@@ -373,6 +395,9 @@
msgid "bookmark to export"
msgstr "bogmærke der skal eksporteres"
+msgid "compare bookmark"
+msgstr "sammenlign bogmærke"
+
msgid "force"
msgstr "gennemtving"
@@ -714,7 +739,7 @@
msgstr "Revision %d er en sammenføjning; ignorerer...\n"
msgid "analyzing"
-msgstr ""
+msgstr "analyserer"
msgid "histogram of changes to the repository"
msgstr "histogram over ændringer i depotet"
@@ -795,19 +820,19 @@
msgstr "lav statistik for de specificerede revisioner"
msgid "DATE"
-msgstr ""
+msgstr "DATO"
msgid "count rate for revisions matching date spec"
msgstr "lav statistik for revisioner som matcher dato specifikationen"
msgid "TEMPLATE"
-msgstr ""
+msgstr "MØNSTER"
msgid "template to group changesets"
msgstr "skabelon for gruppering af ændringer"
msgid "FORMAT"
-msgstr ""
+msgstr "FORMAT"
msgid "strftime-compatible format for grouping by date"
msgstr "strftime-kompatibelt format til gruppering efter dato"
@@ -949,7 +974,7 @@
msgstr "ignorerer ukendt farve/effekt %r (konfigureret i color.%s)\n"
msgid "win32console not found, please install pywin32\n"
-msgstr ""
+msgstr "win32console blev ikke fundet, installer venligst pywin32\n"
msgid "when to colorize (always, auto, or never)"
msgstr "hvornår der skal farvelægges (altid, automatisk eller aldrig)"
@@ -1605,19 +1630,19 @@
msgstr "%s ser ikke ud som et Git depot"
msgid "cannot retrieve git heads"
-msgstr ""
+msgstr "kan ikke hente hoveder fra git"
#, python-format
msgid "cannot read %r object at %s"
-msgstr ""
+msgstr "kan ikke læse %r objekt ved %s"
#, python-format
msgid "cannot read changes in %s"
-msgstr ""
+msgstr "kan ikke læse ændringer i %s"
#, python-format
msgid "cannot read tags from %s"
-msgstr ""
+msgstr "kan ikke læse mærkater fra %s"
#, python-format
msgid "%s does not look like a GNU Arch repository"
@@ -1781,7 +1806,7 @@
msgstr "XXX MÆRKATER ER IKKE IMPLEMENTERET ENDNU\n"
msgid "automatically manage newlines in repository files"
-msgstr ""
+msgstr "automatisk håndtering af linieskift i depotfiler"
msgid ""
"This extension allows you to manage the type of line endings (CRLF or\n"
@@ -1789,6 +1814,10 @@
"directory. That way you can get CRLF line endings on Windows and LF on\n"
"Unix/Mac, thereby letting everybody use their OS native line endings."
msgstr ""
+"Denne udvidelse lader dig håndtere linieskifttypen (CRLF eller LF) som\n"
+"bruges i depotet og i det lokale arbejdskatalog. På den måde kan du få\n"
+"CRLF linieskift på Windows og LF på Linux/Mac, og således lade alle\n"
+"bruge de linieskift der passer til deres OS."
msgid ""
"The extension reads its configuration from a versioned ``.hgeol``\n"
@@ -1797,6 +1826,11 @@
"configuration files. It uses two sections, ``[patterns]`` and\n"
"``[repository]``."
msgstr ""
+"Udvidelsen læser sin konfiguration fra en versioneret ``.hgeol``\n"
+"konfigurationsfil hver gang du udfører en ``hg`` kommando. Denne\n"
+"``.hgeol`` fil bruger samme syntaks som alle andre Mercurial\n"
+"konfigurationsfiler. Den bruger to sektioner: ``[patterns]`` og\n"
+"``[repository]``."
msgid ""
"The ``[patterns]`` section specifies the line endings used in the\n"
@@ -1804,6 +1838,10 @@
"first match is used, so put more specific patterns first. The\n"
"available line endings are ``LF``, ``CRLF``, and ``BIN``."
msgstr ""
+"Sektionen ``[patterns]`` angiver hvilken type linieskift der skal\n"
+"bruges i arbejdskataloget. Typen er angivet ved et filmønster. Den\n"
+"første træffer bliver brugt, så skriv mere specifikke mønstre først.\n"
+"De mulige linieskifttyper er ``LF``, ``CRLF`` og ``BIN``."
msgid ""
"Files with the declared format of ``CRLF`` or ``LF`` are always\n"
@@ -1814,6 +1852,13 @@
"endings) is Mercurial's default behaviour; it is only needed if you\n"
"need to override a later, more general pattern."
msgstr ""
+"Filer deklareret som ``CRLF`` eller ``LF`` bliver altid hentet ud i\n"
+"dette format og filer deklareret som binære (``BIN``) bliver ikke\n"
+"ændret. Desuden er ``native`` et alias for platforms normale\n"
+"linieskift: ``LF`` på Unix (samt Mac OS X) og ``CRLF`` på Windows.\n"
+"Bemærk at ``BIN`` (gør ingenting ved linieskift) er Mercurials\n"
+"standardopførsel; det er kun nødvendigt at bruge den hvis du skal\n"
+"overskrive et senere og mere generelt mønster."
msgid ""
"The optional ``[repository]`` section specifies the line endings to\n"
@@ -1826,9 +1871,18 @@
"declared as ``LF``, ``CRLF``, or ``BIN`` in the ``[patterns]`` section\n"
"are always stored as-is in the repository."
msgstr ""
+"Den valgfrie ``[repository]`` sektion angiver linieskifttypen der\n"
+"bruges når filer gemmes i depotet. Den har en enkelt indstilling,\n"
+"``native``, som bestemmer typen af linieskift for filer som er\n"
+"deklareret som ``native`` i ``[patterns]`` sektionen. Den kan sættes\n"
+"til ``LF`` eller ``CRLF``. Standardindstillingen er ``LF``. Som et\n"
+"eksempel betyder dette på Windows, at filer konfigureret som\n"
+"``native`` vil blive konverteret fra ``CRLF`` til ``LF`` når de gemmes\n"
+"i depotet. Filer som er deklareret som ``LF``, ``CRLF`` eller ``BIN``\n"
+"i ``[patterns]`` sektionen bliver altid gemt uden ændring i depotet."
msgid "Example versioned ``.hgeol`` file::"
-msgstr ""
+msgstr "Et eksempel på en versioneret ``.hgeol`` fil::"
msgid ""
" [patterns]\n"
@@ -1857,6 +1911,9 @@
"(not the ``.hgeol`` file) for settings that control the overall\n"
"behavior. There are two settings:"
msgstr ""
+"Udvidelsen bruger en valgfri ``[eol]`` sektion i den hgrc fil (ikke\n"
+"``.hgeol`` filen) til at bestemme den overordnede opførsel. Der er to\n"
+"indstillinger:"
msgid ""
"- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or\n"
@@ -1864,6 +1921,11 @@
" checkout. This can be used with :hg:`archive` on Unix, say, to\n"
" generate an archive where files have line endings for Windows."
msgstr ""
+"- ``eol.native`` (standard er ``os.linesep``) kan sættes til ``LF``\n"
+" eller ``CRLF`` for at overskrive den sædvanlige fortolkning af\n"
+" ``native`` når filer hentes ud. Dette kan f.eks. bruges med\n"
+" :hg:`archive` på Unix til at lave et arkiv hvor filerne har\n"
+" linieskift til Windows."
msgid ""
"- ``eol.only-consistent`` (default True) can be set to False to make\n"
@@ -1872,30 +1934,37 @@
" Such files are normally not touched under the assumption that they\n"
" have mixed EOLs on purpose."
msgstr ""
+"- ``eol.only-consistent`` (standard er True) kan sættes til False for\n"
+" at lade udvidelsen konvertere filer med inkonsistente linieskift.\n"
+" Inkonsistent betyder at der er både ``CRLF`` og ``LF`` linieskift\n"
+" til stedet i filen. Sådanne filer bliver normalt ikke rørt under\n"
+" antagelse af at de har miksede linieskift med vilje."
msgid ""
"See :hg:`help patterns` for more information about the glob patterns\n"
"used.\n"
msgstr ""
+"Se :hg:`help patterns` for mere information on de brugte\n"
+"glob-mønstre.\n"
#, python-format
msgid "%s should not have CRLF line endings"
-msgstr ""
+msgstr "%s skulle ikke have CRLF linieskift"
#, python-format
msgid "%s should not have LF line endings"
-msgstr ""
+msgstr "%s skulle ikke have LF linieskift"
msgid "the eol extension is incompatible with the win32text extension"
-msgstr ""
+msgstr "eol-udvidelsen er inkompatibel med win32text-udvidelsen"
#, python-format
msgid "ignoring unknown EOL style '%s' from %s\n"
-msgstr ""
+msgstr "ignorerer ukendt linieskifttype '%s' fra %s\n"
#, python-format
msgid "inconsistent newline style in %s\n"
-msgstr ""
+msgstr "inkonsistent linieskift i %s\n"
msgid "command to allow external programs to compare revisions"
msgstr ""
@@ -2015,7 +2084,7 @@
msgstr ""
msgid "CMD"
-msgstr ""
+msgstr "KMD"
msgid "comparison program to run"
msgstr "sammenligningsprogram der skal køres"
@@ -2271,18 +2340,11 @@
" Knuder udskrevet med et @-tegn er forældre til arbejdskataloget.\n"
" "
-#, python-format
-msgid "comparing with %s\n"
-msgstr "sammenligner med %s\n"
-
-msgid "no changes found\n"
-msgstr "fandt ingen ændringer\n"
-
msgid "show the revision DAG"
msgstr "vis revisionsgrafen"
msgid "NUM"
-msgstr ""
+msgstr "TAL"
msgid "limit number of changes displayed"
msgstr "begræns antaln viste ændringer"
@@ -2762,6 +2824,9 @@
" svnutcdate \"2006-09-18 15:13:13Z\"\n"
" svnisodate \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\""
msgstr ""
+" utcdate \"2006/09/18 15:13:13\"\n"
+" svnutcdate \"2006-09-18 15:13:13Z\"\n"
+" svnisodate \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\""
msgid ""
"The default template mappings (view with :hg:`kwdemo -d`) can be\n"
@@ -4061,7 +4126,7 @@
msgstr "%d ikke-anvendte"
msgid "mq: (empty queue)\n"
-msgstr ""
+msgstr "mq: (tom kø)\n"
msgid "operate on patch repository"
msgstr "arbejd på rettelsesdepot"
@@ -4085,7 +4150,7 @@
msgstr "brug ukomprimeret overførsel (hurtig over LAN)"
msgid "REPO"
-msgstr ""
+msgstr "DEPOT"
msgid "location of source patch repository"
msgstr "placering af kilde rettelse-depotet"
@@ -4169,7 +4234,7 @@
msgstr "tilføj \"From: <aktuel bruger>\" til rettelsen"
msgid "USER"
-msgstr ""
+msgstr "BRUGER"
msgid "add \"From: <USER>\" to patch"
msgstr "tilføj \"From: <BRUGER>\" til rettelsen"
@@ -5203,7 +5268,8 @@
" rapporteret af :hg:`status` være kandidater til at blive optaget."
msgid " See :hg:`help dates` for a list of formats valid for -d/--date."
-msgstr " Se :hg:`help dates` for en liste af gyldige formater til -d/--date."
+msgstr ""
+" Se :hg:`help dates` for en liste af gyldige formater til -d/--date."
msgid ""
" You will be prompted for whether to record changes to each\n"
@@ -7684,6 +7750,12 @@
" skal en eksplicit revision angives."
msgid ""
+" To undo an uncommitted merge, use :hg:`update --clean .` which\n"
+" will check out a clean copy of the original merge parent, losing\n"
+" all changes."
+msgstr ""
+
+msgid ""
" Returns 0 on success, 1 if there are unresolved files.\n"
" "
msgstr ""
@@ -7693,7 +7765,8 @@
"branch '%s' has %d heads - please merge with an explicit rev\n"
"(run 'hg heads .' to see heads)"
msgstr ""
-"afbrudt: gren '%s' har %d hoveder - sammenføj venligst med en eksplicit revision\n"
+"afbrudt: gren '%s' har %d hoveder - sammenføj venligst med en eksplicit "
+"revision\n"
"(kør 'hg heads .' for se hovederne)"
#, python-format
@@ -7701,7 +7774,8 @@
"branch '%s' has one head - please merge with an explicit rev\n"
"(run 'hg heads' to see all heads)"
msgstr ""
-"afbrudt: gren '%s' har et hoved - sammenføj venligst med en eksplicit revision\n"
+"afbrudt: gren '%s' har et hoved - sammenføj venligst med en eksplicit "
+"revision\n"
"(kør 'hg heads' for at se alle hoveder)"
msgid "there is nothing to merge"
@@ -8062,8 +8136,13 @@
msgstr ""
msgid ""
-" (Use update -r to check out earlier revisions, revert does not\n"
-" change the working directory parents.)"
+" NOTE: This command is most likely not what you are looking for. revert\n"
+" will partially overwrite content in the working directory without "
+"changing\n"
+" the working directory parents. Use :hg:`update -r rev` to check out "
+"earlier\n"
+" revisions, or :hg:`update --clean .` to undo a merge which has added\n"
+" another parent."
msgstr ""
msgid ""
@@ -9469,9 +9548,6 @@
msgid "unsupported file type (type is %s)"
msgstr "usupporteret filtype (typen er %s)"
-msgid "searching for changes\n"
-msgstr "leder efter ændringer\n"
-
msgid "queries"
msgstr ""
@@ -9846,6 +9922,27 @@
"- ``<install-root>/etc/mercurial/hgrc.d/*.rc``"
msgid ""
+"If there is a per-repository configuration file which is not owned by\n"
+"the active user, Mercurial will warn you that the file is skipped::"
+msgstr ""
+
+msgid ""
+" not trusting file <repo>/.hg/hgrc from untrusted user USER, group GROUP"
+msgstr " stoler ikke på filen <depot>/.hg/hgrc fra ubetroet bruger BRUGER, gruppe GRUPPE"
+
+msgid ""
+"If this bothers you, the warning can be silenced (the file would still\n"
+"be ignored) or trust can be established. Use one of the following\n"
+"settings, the syntax is explained below:"
+msgstr ""
+
+msgid ""
+"- ``ui.report_untrusted = False``\n"
+"- ``trusted.users = USER``\n"
+"- ``trusted.groups = GROUP``"
+msgstr ""
+
+msgid ""
"The configuration files for Mercurial use a simple ini-file format. A\n"
"configuration file consists of sections, led by a ``[section]`` header\n"
"and followed by ``name = value`` entries::"
@@ -10197,7 +10294,7 @@
"Branch\n"
" (Noun) A child changeset that has been created from a parent that\n"
" is not a head. These are known as topological branches, see\n"
-" 'Branch, topological'.If a topological branch is named, it becomes\n"
+" 'Branch, topological'. If a topological branch is named, it becomes\n"
" a named branch. If a topological branch is not named, it becomes\n"
" an anonymous branch. See 'Branch, anonymous' and 'Branch, named'."
msgstr ""
@@ -10262,8 +10359,8 @@
" collection of disjoint subsets. A named branch is not necessarily\n"
" a topological branch. If a new named branch is created from the\n"
" head of another named branch, or the default branch, but no\n"
-" further changesets are added to that previous branch, then the new\n"
-" named branch will be a branch in name only."
+" further changesets are added to that previous branch, then that\n"
+" previous branch will be a branch in name only."
msgstr ""
msgid ""
@@ -10403,7 +10500,7 @@
" consisting of nodes and edges, where nodes correspond to\n"
" changesets and edges imply a parent -> child relation. This graph\n"
" can be visualized by graphical tools such as :hg:`glog`\n"
-" (graphlog). In mercurial, the DAG is limited by the requirement\n"
+" (graphlog). In Mercurial, the DAG is limited by the requirement\n"
" for children to have at most two parents."
msgstr ""
@@ -10645,7 +10742,7 @@
msgid ""
"Rewriting history\n"
-" See 'History, rewriting'."
+" See 'History, rewriting'."
msgstr ""
msgid ""
@@ -10674,7 +10771,7 @@
" (Noun) Another synonym of changeset."
msgstr ""
-msgid " Example: \"I've pushed an update\"."
+msgid " Example: \"I've pushed an update\"."
msgstr ""
msgid ""
@@ -10693,7 +10790,7 @@
msgid ""
"Working directory parent\n"
-" See 'Parent, working directory'.\n"
+" See 'Parent, working directory'.\n"
msgstr ""
msgid ""
@@ -10923,10 +11020,10 @@
msgid ""
"Identifiers such as branch names must be quoted with single or double\n"
-"quotes if they contain characters outside of ``[a-zA-Z0-9]`` or if\n"
-"they match one of the predefined predicates. Special characters can be\n"
-"used in the identifiers by quoting them, e.g., ``\\n`` is interpreted\n"
-"as a newline."
+"quotes if they contain characters outside of\n"
+"``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n"
+"predicates. Special characters can be used in quoted identifiers by\n"
+"escaping them, e.g., ``\\n`` is interpreted as a newline."
msgstr ""
msgid "There is a single prefix operator:"
@@ -10945,7 +11042,7 @@
" A DAG range, meaning all changesets that are descendants of x and\n"
" ancestors of y, including x and y themselves. If the first endpoint\n"
" is left out, this is equivalent to ``ancestors(y)``, if the second\n"
-" is left out it is equivalent to ``descendents(x)``."
+" is left out it is equivalent to ``descendants(x)``."
msgstr ""
msgid " An alternative syntax is ``x..y``."
@@ -12040,8 +12137,8 @@
msgid "branch %s not found"
msgstr "gren %s blev ikke fundet"
-msgid "can't merge with ancestor"
-msgstr "kan ikke sammenføje med forfader"
+msgid "merging with a working directory ancestor has no effect"
+msgstr "sammenføjning med en forfader til arbejdskataloget har ingen effekt"
msgid "nothing to merge (use 'hg update' or check 'hg heads')"
msgstr "intet at sammenføje (brug 'hg update' eller kontroller 'hg heads')"
@@ -12783,3 +12880,9 @@
msgid "user name not available - set USERNAME environment variable"
msgstr "der er ikke noget brugernavn - sæt USERNAME miljøvariabel"
+
+#~ msgid "failed to update bookmark %s!\n"
+#~ msgstr "kunne ikke opdatere bogmærke %s!\n"
+
+#~ msgid "can't merge with ancestor"
+#~ msgstr "kan ikke sammenføje med forfader"