Merge with i18n

i18n/da.po

@@ -17,8 +17,8 b' msgid ""'
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <[e-mail]>\n"
-"POT-Creation-Date: 2010-04-04 23:48+0200\n"
-"PO-Revision-Date: 2010-04-05 01:09+0200\n"
+"POT-Creation-Date: 2010-05-08 22:29+0200\n"
+"PO-Revision-Date: 2010-05-08 23:40+0200\n"
 "Last-Translator:  <[e-mail]>\n"
 "Language-Team: Danish\n"
 "MIME-Version: 1.0\n"
@@ -384,7 +384,7 b' msgstr "python mysql-underst\xc3\xb8ttelse ikke tilg\xc3\xa6ngelig: %s"'
 
 #, python-format
 msgid "hook type %s does not pass a changeset id"
-msgstr ""
+msgstr "hook type %s overfører ikke noget ændrings-ID"
 
 #, python-format
 msgid "database error: %s"
@@ -940,6 +940,13 b' msgstr "ignoreret af kompatibilitetsgrun'
 msgid "hg debugcvsps [OPTION]... [PATH]..."
 msgstr "hg debugcvsps [TILVALG]... [STI]..."
 
+#, python-format
+msgid "%s does not look like a Bazaar repository"
+msgstr "%s ser ikke ud som et Bazaar depot"
+
+msgid "Bazaar modules could not be loaded"
+msgstr "Bazaar-modulerne kunne ikke indlæses"
+
 msgid ""
 "warning: lightweight checkouts may cause conversion failures, try with a "
 "regular branch instead.\n"
@@ -1051,8 +1058,12 b' msgid "--sourcesort is not supported by '
 msgstr "--sourcesort er ikke supporteret at denne datakilde"
 
 #, python-format
+msgid "%s does not look like a CVS checkout"
+msgstr "%s ser ikke ud som et CVS arbejdskatalog"
+
+#, python-format
 msgid "revision %s is not a patchset number"
-msgstr ""
+msgstr "revision %s er ikke et patchset-nummer"
 
 #, python-format
 msgid "connecting to %s\n"
@@ -1085,6 +1096,9 b' msgstr "ukendt CVS svar: %s"'
 msgid "collecting CVS rlog\n"
 msgstr "samler CVS rlog\n"
 
+msgid "not a CVS sandbox"
+msgstr ""
+
 #, python-format
 msgid "reading cvs log cache %s\n"
 msgstr "læser cvs log-mellemlager %s\n"
@@ -1113,6 +1127,9 b' msgstr "forventede et revisionsnummer"'
 msgid "revision must be followed by date line"
 msgstr "revision skal efterfølges af datolinje"
 
+msgid "log cache overlaps with new log entries, re-run without cache."
+msgstr ""
+
 #, python-format
 msgid "writing cvs log cache %s\n"
 msgstr "skriver cvs log-mellemlager %s\n"
@@ -1140,6 +1157,10 b' msgid "%d changeset entries\\n"'
 msgstr "%d ændringer\n"
 
 #, python-format
+msgid "%s does not look like a darcs repository"
+msgstr "%s ser ikke ud som et darcs depot"
+
+#, python-format
 msgid "darcs version 2.1 or newer needed (found %r)"
 msgstr "kræver darcs version 2.1 eller nyere (fandt %r)"
 
@@ -1164,7 +1185,26 b' msgid "source repository doesn\'t support'
 msgstr "kildedepot understøtter ikke --filemap"
 
 #, python-format
-msgid "%s does not look like a GNU Arch repo"
+msgid "%s does not look like a Git repository"
+msgstr "%s ser ikke ud som et Git depot"
+
+msgid "cannot retrieve git heads"
+msgstr "kan ikke hente git-hoveder"
+
+#, python-format
+msgid "cannot read %r object at %s"
+msgstr "kan ikke læse %r objekt ved %s"
+
+#, python-format
+msgid "cannot read changes in %s"
+msgstr "kan ikke læse ændringer i %s"
+
+#, python-format
+msgid "cannot read tags from %s"
+msgstr "kan ikke læse mærkater fra %s"
+
+#, python-format
+msgid "%s does not look like a GNU Arch repository"
 msgstr "%s ser ikke ud som et GNU Arch depot"
 
 msgid "cannot find a GNU Arch tool"
@@ -1184,7 +1224,7 b' msgid "could not parse cat-log of %s"'
 msgstr "kan ikke parse cat-log af %s"
 
 #, python-format
-msgid "%s is not a local Mercurial repo"
+msgid "%s is not a local Mercurial repository"
 msgstr "%s er ikke et lokalt Mercurial depot"
 
 #, python-format
@@ -1192,6 +1232,10 b' msgid "initializing destination %s repos'
 msgstr "initialiserer mål %s depot\n"
 
 #, python-format
+msgid "could not create hg repository %s as sink"
+msgstr "kunne ikke oprette hg depot %s som mål"
+
+#, python-format
 msgid "pulling from %s into %s\n"
 msgstr "hiver fra %s ind i %s\n"
 
@@ -1210,13 +1254,17 b' msgid "ignoring: %s\\n"'
 msgstr "ignorerer: %s\n"
 
 #, python-format
-msgid "%s does not look like a monotone repo"
+msgid "%s does not look like a monotone repository"
 msgstr "%s ser ikke ud som et monotone depot"
 
 #, python-format
 msgid "copying file in renamed directory from '%s' to '%s'"
 msgstr "kopierer fil i omdøbt katalog fra '%s' til '%s'"
 
+#, python-format
+msgid "%s does not look like a P4 repository"
+msgstr "%s ser ikke ud som et P4 depot"
+
 msgid "reading p4 views\n"
 msgstr "læser p4 views\n"
 
@@ -1231,6 +1279,10 b' msgid ""'
 "repository. Use --source-type if you know better.\n"
 msgstr ""
 
+#, python-format
+msgid "%s does not look like a Subversion repository"
+msgstr "%s ser ikke ud som et Subversion depot"
+
 msgid "Subversion python bindings could not be loaded"
 msgstr "Subversion python bindingerne kunne ikke indlæses"
 
@@ -1297,11 +1349,11 b' msgid "svn: branch has no revision %s"'
 msgstr "svn: gren har ikke nogen revision %s"
 
 #, python-format
-msgid "initializing svn repo %r\n"
+msgid "initializing svn repository %r\n"
 msgstr "initialiserer svn depot %r\n"
 
 #, python-format
-msgid "initializing svn wc %r\n"
+msgid "initializing svn working copy %r\n"
 msgstr "initialiserer svn arbejdskatalog %r\n"
 
 msgid "unexpected svn output:\n"
@@ -1988,7 +2040,7 b' msgid "rescanning due to .hgignore chang'
 msgstr "genskanner på grund af ændring af .hgignore\n"
 
 msgid "cannot start: socket is already bound"
-msgstr ""
+msgstr "kan ikke starte: soklen er allede bundet"
 
 msgid ""
 "cannot start: tried linking .hg/inotify.sock to a temporary socket but .hg/"
@@ -2439,7 +2491,7 b' msgid "patch failed, rejects left in wor'
 msgstr "rettelse fejlede, afvisninger er efterladt i arbejdskataloget\n"
 
 msgid "fuzz found when applying patch, stopping\n"
-msgstr ""
+msgstr "fandt fnidder ved anvendelsen af rettelsen, stopper\n"
 
 #, python-format
 msgid "revision %d is not managed"
@@ -2588,7 +2640,7 b' msgid "patch %s is not in series file"'
 msgstr "rettelsen %s er ikke i series filen"
 
 msgid "No saved patch data found\n"
-msgstr ""
+msgstr "Fandt ingen gemt rettelsesdata\n"
 
 #, python-format
 msgid "restoring status: %s\n"
@@ -3081,19 +3133,30 b' msgid "copy %s to %s\\n"'
 msgstr "kopier %s til %s\n"
 
 msgid ""
-"strip a revision and all its descendants from the repository\n"
-"\n"
-"    If one of the working directory's parent revisions is stripped, the\n"
-"    working directory will be updated to the parent of the stripped\n"
-"    revision.\n"
-"    "
-msgstr ""
-"strip en revision og alle dens efterkommere fra depotet\n"
-"\n"
-"    Hvis en af arbejdskatalogets forælder-revisioner bliver strippet,\n"
-"    så vil arbejdskataloget blive opdateret til forældren af den\n"
-"    strippede revision.\n"
-"    "
+"strip a changeset and all its descendants from the repository\n"
+"\n"
+"    The strip command removes all changesets whose local revision\n"
+"    number is greater than or equal to REV, and then restores any\n"
+"    changesets that are not descendants of REV. If the working\n"
+"    directory has uncommitted changes, the operation is aborted unless\n"
+"    the --force flag is supplied.\n"
+"\n"
+"    If a parent of the working directory is stripped, then the working\n"
+"    directory will automatically be updated to the most recent\n"
+"    available ancestor of the stripped parent after the operation\n"
+"    completes.\n"
+"\n"
+"    Any stripped changesets are stored in ``.hg/strip-backup`` as a\n"
+"    bundle (see ``hg help bundle`` and ``hg help unbundle``). They can\n"
+"    be restored by running ``hg unbundle .hg/strip-backup/BUNDLE``,\n"
+"    where BUNDLE is the bundle file created by the strip. Note that\n"
+"    the local revision numbers will in general be different after the\n"
+"    restore.\n"
+"\n"
+"    Use the --nobackup option to discard the backup bundle once the\n"
+"    operation completes.\n"
+"    "
+msgstr ""
 
 msgid ""
 "set or print guarded patches to push\n"
@@ -3352,8 +3415,8 b' msgstr "tilf\xc3\xb8j \\"Date: <aktuel dato>\\" til rettelsen"'
 msgid "add \"Date: <given date>\" to patch"
 msgstr "tilføj \"Date: <given dato>\" til rettelsen"
 
-msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..."
-msgstr "hg qnew [-e] [-m TEKST] [-l FIL] [-f] RETTELSE [FIL]..."
+msgid "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..."
+msgstr "hg qnew [-e] [-m TEKST] [-l FIL] RETTELSE [FIL]..."
 
 msgid "hg qnext [-s]"
 msgstr "hg qnext [-s]"
@@ -3377,7 +3440,7 b' msgid "apply if the patch has rejects"'
 msgstr ""
 
 msgid "list patch name in commit text"
-msgstr ""
+msgstr "put rettelsens navn ind i deponeringsbeskeden"
 
 msgid "apply all patches"
 msgstr "anvend alle rettelser"
@@ -3416,7 +3479,7 b' msgid "delete save entry"'
 msgstr ""
 
 msgid "update queue working directory"
-msgstr ""
+msgstr "opdater arbejdskataloget for kø-depotet"
 
 msgid "hg qrestore [-d] [-u] REV"
 msgstr "hg qrestore [-d] [-u] REV"
@@ -3457,10 +3520,14 b' msgstr "udskriv rettelser som ikke er i '
 msgid "hg qseries [-ms]"
 msgstr "hg qseries [-ms]"
 
-msgid "force removal with local changes"
-msgstr "gennemtving fjernelse af rettelse med lokale ændringer"
-
-msgid "bundle unrelated changesets"
+msgid ""
+"force removal of changesets even if the working directory has uncommitted "
+"changes"
+msgstr ""
+
+msgid ""
+"bundle only changesets with local revision number greater than REV which are "
+"not descendants of REV (DEPRECATED)"
 msgstr ""
 
 msgid "no backups"
@@ -4290,7 +4357,7 b' msgid "hg qrecord [OPTION]... PATCH [FIL'
 msgstr "hg qrecord [TILVALG]... RETTELSE [FIL]..."
 
 msgid "recreates hardlinks between repository clones"
-msgstr ""
+msgstr "genopret hårde lænker mellem depot-kloner"
 
 msgid ""
 "recreate hardlinks between two repositories\n"
@@ -4349,7 +4416,7 b' msgstr "sammenk\xc3\xa6der"'
 
 #, python-format
 msgid "relinked %d files (%d bytes reclaimed)\n"
-msgstr ""
+msgstr "genlænkede %d filer (%d byte indvundet)\n"
 
 msgid "[ORIGIN]"
 msgstr "[KILDE]"
@@ -4907,7 +4974,7 b' msgstr "uddrag: %s\\n"'
 
 #, python-format
 msgid "%s: no key named '%s'"
-msgstr ""
+msgstr "%s: ingen nøgle ved navn '%s'"
 
 #, python-format
 msgid "%s: %s"
@@ -5714,10 +5781,10 b' msgid "Checking extensions...\\n"'
 msgstr "Kontrollerer udvidelser...\n"
 
 msgid " One or more extensions could not be found"
-msgstr ""
+msgstr " En eller flere udvidelser blev ikke fundet"
 
 msgid " (check that you compiled the extensions)\n"
-msgstr ""
+msgstr " (kontroller at du har kompileret udvidelserne)\n"
 
 msgid "Checking templates...\n"
 msgstr ""
@@ -5726,21 +5793,21 b' msgid " (templates seem to have been ins'
 msgstr ""
 
 msgid "Checking patch...\n"
-msgstr ""
+msgstr "Kontrollerer patch...\n"
 
 msgid " patch call failed:\n"
-msgstr ""
+msgstr " kaldet til patch fejlede:\n"
 
 msgid " unexpected patch output!\n"
-msgstr ""
+msgstr " uventet output fra patch!\n"
 
 msgid " patch test failed!\n"
-msgstr ""
+msgstr " patch testen fejlede!\n"
 
 msgid ""
 " (Current patch tool may be incompatible with patch, or misconfigured. "
 "Please check your .hgrc file)\n"
-msgstr ""
+msgstr " (Det nuværende patch-værktøj er måske inkompatibelt med patch eller konfigureret forkert. Undersøg venligst din .hgrc-fil)\n"
 
 msgid ""
 " Internal patcher failure, please report this error to http://mercurial."
@@ -5761,20 +5828,20 b' msgid " Can\'t find editor \'%s\' in PATH\\n'
 msgstr ""
 
 msgid "Checking username...\n"
-msgstr ""
+msgstr "Kontrollerer brugernavn...\n"
 
 msgid " (specify a username in your .hgrc file)\n"
-msgstr ""
+msgstr " (angiv et brugernavn i din .hgrc-fil)\n"
 
 msgid "No problems detected\n"
 msgstr "Fandt ingen problemer\n"
 
 #, python-format
 msgid "%s problems detected, please check your install!\n"
-msgstr ""
+msgstr "fandt %s problemer, kontroller venligst din installation!\n"
 
 msgid "dump rename information"
-msgstr ""
+msgstr "dump information om omdøbninger"
 
 #, python-format
 msgid "%s renamed from %s:%s\n"
@@ -5919,10 +5986,10 b' msgid "export requires at least one chan'
 msgstr ""
 
 msgid "exporting patches:\n"
-msgstr ""
+msgstr "eksporterer rettelser:\n"
 
 msgid "exporting patch:\n"
-msgstr ""
+msgstr "eksporterer rettelse:\n"
 
 msgid ""
 "forget the specified files on the next commit\n"
@@ -6093,11 +6160,11 b' msgstr ""'
 "\n"
 
 msgid "use \"hg help extensions\" for information on enabling extensions\n"
-msgstr ""
+msgstr "brug \"hg help extensions\" for at få mere information om hvordan man slår udvidelser til\n"
 
 #, python-format
 msgid "'%s' is provided by the following extension:"
-msgstr ""
+msgstr "'%s' er i denne udvidelse:"
 
 msgid "Mercurial Distributed SCM\n"
 msgstr "Mercurial Distribueret SCM\n"
@@ -6113,7 +6180,7 b' msgid "enabled extensions:"'
 msgstr "aktiverede udvidelser:"
 
 msgid "DEPRECATED"
-msgstr ""
+msgstr "FORÆLDET"
 
 msgid ""
 "\n"
@@ -6418,7 +6485,7 b' msgstr ""'
 "    "
 
 msgid "can only specify an explicit filename"
-msgstr ""
+msgstr "kan kun angive et eksplicit filnavn"
 
 #, python-format
 msgid "'%s' not found in manifest!"
@@ -6433,6 +6500,17 b' msgid ""'
 "    Path names are defined in the [paths] section of /etc/mercurial/hgrc\n"
 "    and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n"
 "\n"
+"    The path names ``default`` and ``default-push`` have a special\n"
+"    meaning.  When performing a push or pull operation, they are used\n"
+"    as fallbacks if no location is specified on the command-line.\n"
+"    When ``default-push`` is set, it will be used for push and\n"
+"    ``default`` will be used for pull; otherwise ``default`` is used\n"
+"    as the fallback for both.  When cloning a repository, the clone\n"
+"    source is written as ``default`` in ``.hg/hgrc``.  Note that\n"
+"    ``default`` and ``default-push`` apply to all inbound (e.g. ``hg\n"
+"    incoming``) and outbound (e.g. ``hg outgoing``, ``hg email`` and\n"
+"    ``hg bundle``) operations.\n"
+"\n"
 "    See 'hg help urls' for more information.\n"
 "    "
 msgstr ""
@@ -6772,11 +6850,24 b' msgid ""'
 "    Print the root directory of the current repository.\n"
 "    "
 msgstr ""
+"print roden (toppen) af det nuværende arbejdskatalog\n"
+"\n"
+"    Print rod-kataloget for det nuværende depot.\n"
+"    "
 
 msgid ""
 "export the repository via HTTP\n"
 "\n"
-"    Start a local HTTP repository browser and pull server.\n"
+"    Start a local HTTP repository browser and pull server. You can use\n"
+"    this for ad-hoc sharing and browing of repositories. It is\n"
+"    recommended to use a real web server to serve a repository for\n"
+"    longer periods of time.\n"
+"\n"
+"    Please note that the server does not implement access control.\n"
+"    This means that, by default, anybody can read from the server and\n"
+"    nobody can write to it by default. Set the ``web.allow_push``\n"
+"    option to ``*`` to allow everybody to push to the server. You\n"
+"    should use a real web server if you need to authenticate users.\n"
 "\n"
 "    By default, the server logs accesses to stdout and errors to\n"
 "    stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n"
@@ -6785,12 +6876,20 b' msgid ""'
 msgstr ""
 "eksporter depotet via HTTP\n"
 "\n"
-"    Start en lokal HTTP depotbrowser og pull-server.\n"
+"    Start en lokal HTTP depotbrowser og pull-server. Du kan bruge\n"
+"    denne til ad-hoc deling og browsning af depoter. Det anbefales at\n"
+"    man bruger en rigtig web-server for at serve et depot for længere\n"
+"    tidsrum.\n"
+"\n"
+"    Bemærk venligst at serveren ikke implementerer adgangskontrol.\n"
+"    Dette betyder at alle som udgangspunkt kan læse fra serveren og at\n"
+"    ingen kan skrive til den. Sæt ``web.allow_push`` til ``*`` for at\n"
+"    tillade at enhver skubber ændringer til serveren. Du skal bruge en\n"
+"    rigtig web-server hvis du har behov for at autentificere brugere.\n"
 "\n"
 "    Som standard logger serveren forespørgsler til stdout og fejl til\n"
 "    stderr. Brug -A/--accesslog og -E/--errorlog tilvalgene for at\n"
-"    logge til filer.\n"
-"    "
+"    logge til filer."
 
 #, python-format
 msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
@@ -7264,7 +7363,7 b' msgid "number of lines of context to sho'
 msgstr "antal linier kontekst der skal vises"
 
 msgid "output diffstat-style summary of changes"
-msgstr ""
+msgstr "vis en opsummering af ændringerne i stil med diffstat"
 
 msgid "guess renamed files by similarity (0<=s<=100)"
 msgstr "gæt omdøbte filer ud fra enshed (0<=s<=100)"
@@ -7512,8 +7611,8 b' msgstr "udskriv kun filnavne og revision'
 msgid "print matching line numbers"
 msgstr "udskriv matchende linienumre"
 
-msgid "search in given revision range"
-msgstr "søg i det angivne interval"
+msgid "only search files changed within revision range"
+msgstr "søg kun i filer som er ændret i det angivne interval"
 
 msgid "[OPTION]... PATTERN [FILE]..."
 msgstr "[TILVALG]... MØNSTER [FIL]..."
@@ -7953,10 +8052,6 b' msgstr "dr\xc3\xa6bt!\\n"'
 msgid "hg: unknown command '%s'\n"
 msgstr "hg: ukendt kommando '%s'\n"
 
-#, python-format
-msgid "abort: could not import module %s!\n"
-msgstr "afbrudt: kunne ikke importere modul %s!\n"
-
 msgid "(did you forget to compile extensions?)\n"
 msgstr "(glemte du at kompilere udvidelserne?)\n"
 
@@ -8614,8 +8709,9 b' msgid ""'
 "You can customize output for any \"log-like\" command: log,\n"
 "outgoing, incoming, tip, parents, heads and glog.\n"
 "\n"
-"Three styles are packaged with Mercurial: default (the style used\n"
-"when no explicit preference is passed), compact and changelog.\n"
+"Four styles are packaged with Mercurial: default (the style used\n"
+"when no explicit preference is passed), compact, changelog,\n"
+"and xml.\n"
 "Usage::\n"
 "\n"
 "    $ hg log -r1 --style changelog\n"
@@ -9183,12 +9279,12 b' msgstr "afbrudt: skub laver nye hoveder p\xc3\xa5 grenen \'%s\'!\\n"'
 msgid "abort: push creates new remote heads!\n"
 msgstr "afbrudt: skub laver nye fjern-hoveder!\n"
 
+msgid "(you should pull and merge or use push -f to force)\n"
+msgstr "(du skal hive og sammenføje eller bruge -f for at gennemtvinge)\n"
+
 msgid "(did you forget to merge? use push -f to force)\n"
 msgstr "(glemte du at sammenføje? brug push -f for at gennemtvinge)\n"
 
-msgid "(you should pull and merge or use push -f to force)\n"
-msgstr "(du skal hive og sammenføje eller bruge -f for at gennemtvinge)\n"
-
 #, python-format
 msgid "abort: push creates new remote branches: %s!\n"
 msgstr "afbrudt: skub laver nye grene i fjerndepotet: %s!\n"