--- a/i18n/da.po Sat Sep 18 09:07:57 2010 +0000
+++ b/i18n/da.po Sat Sep 18 22:03:33 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-08-15 17:28+0200\n"
-"PO-Revision-Date: 2010-08-26 08:58+0200\n"
+"POT-Creation-Date: 2010-09-18 21:41+0200\n"
+"PO-Revision-Date: 2010-09-18 22:02+0200\n"
"Last-Translator: <mg@lazybytes.net>\n"
"Language-Team: Danish\n"
"Language: \n"
@@ -300,7 +300,7 @@
"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::"
+"your configuration file::"
msgstr ""
msgid ""
@@ -383,6 +383,10 @@
msgid "deleting remote bookmark %s\n"
msgstr "sletter fjern-bogmærke %s\n"
+#, python-format
+msgid "bookmark %s does not exist on the local or remote repository!\n"
+msgstr ""
+
msgid "searching for changes\n"
msgstr "leder efter ændringer\n"
@@ -396,6 +400,9 @@
msgid "bookmark to import"
msgstr "bogmærke der skal importeres"
+msgid "BOOKMARK"
+msgstr ""
+
msgid "bookmark to export"
msgstr "bogmærke der skal eksporteres"
@@ -820,6 +827,10 @@
" bruges .hgchurn i arbejdskatalogets rod, hvis denne findes.\n"
" "
+#, python-format
+msgid "skipping malformed alias: %s\n"
+msgstr "springer misdannet alias over: %s\n"
+
msgid "count rate for the specified revision or range"
msgstr "lav statistik for de specificerede revisioner"
@@ -889,8 +900,8 @@
"render_text funktionen som kan bruges til at tilføje effekter til\n"
"vilkårlig tekst."
-msgid "Default effects may be overridden from the .hgrc file::"
-msgstr "Standardeffekterne som kan overskrives fra en .hgrc fil::"
+msgid "Default effects may be overridden from your configuration file::"
+msgstr "Standardeffekterne som kan overskrives i din konfigurationsfil::"
msgid ""
" [color]\n"
@@ -959,6 +970,13 @@
msgstr " bookmarks.current = green"
msgid ""
+" branches.active = none\n"
+" branches.closed = black bold\n"
+" branches.current = green\n"
+" branches.inactive = none"
+msgstr ""
+
+msgid ""
"The color extension will try to detect whether to use ANSI codes or\n"
"Win32 console APIs, unless it is made explicit::"
msgstr ""
@@ -980,8 +998,10 @@
msgid "win32console not found, please install pywin32\n"
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)"
+msgid "when to colorize (boolean, always, auto, or never)"
+msgstr ""
+"hvornår der skal farvelægges (boolks værdi, \"always\", \"auto\" eller "
+"\"never\")"
msgid "TYPE"
msgstr "TYPE"
@@ -1032,9 +1052,13 @@
msgid ""
" If no destination directory name is specified, it defaults to the\n"
-" basename of the source with '-hg' appended. If the destination\n"
+" basename of the source with ``-hg`` appended. If the destination\n"
" repository doesn't exist, it will be created."
msgstr ""
+" Hvis der ikke angivet et navn til destinationen, så bruges\n"
+" grundnavnet for kilden med ``-hg`` tilføjet. Hvis\n"
+" destinationsdepotet ikke allerede findes, så vil det bliver\n"
+" oprettet."
msgid ""
" By default, all sources except Mercurial will use --branchsort.\n"
@@ -1072,16 +1096,21 @@
msgid ""
" 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"
+" updated on each commit copied, so :hg:`convert` can be interrupted\n"
" and can be run repeatedly to copy new commits."
msgstr ""
msgid ""
-" The [username mapping] file is a simple text file that maps each\n"
-" source commit author to a destination commit author. It is handy\n"
-" for source SCMs that use unix logins to identify authors (eg:\n"
-" CVS). One line per author mapping and the line format is:\n"
-" srcauthor=whatever string you want"
+" The authormap is a simple text file that maps each source commit\n"
+" author to a destination commit author. It is handy for source SCMs\n"
+" that use unix logins to identify authors (eg: CVS). One line per\n"
+" author mapping and the line format is::"
+msgstr ""
+
+msgid " source author = destination author"
+msgstr " forfatter i kildes = forfatter i destinationen"
+
+msgid " Empty lines and lines starting with a ``#`` are ignored."
msgstr ""
msgid ""
@@ -1100,20 +1129,20 @@
msgstr ""
msgid ""
-" Comment lines start with '#'. A specified path matches if it\n"
+" Comment lines start with ``#``. A specified path matches if it\n"
" equals the full relative name of a file or one of its parent\n"
-" directories. The 'include' or 'exclude' directive with the longest\n"
-" matching path applies, so line order does not matter."
-msgstr ""
-
-msgid ""
-" The 'include' directive causes a file, or all files under a\n"
+" directories. The ``include`` or ``exclude`` directive with the\n"
+" longest matching path applies, so line order does not matter."
+msgstr ""
+
+msgid ""
+" 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\n"
-" included. The 'exclude' directive causes files or directories to\n"
-" be omitted. The 'rename' directive renames a file or directory if\n"
+" included. The ``exclude`` directive causes files or directories to\n"
+" be omitted. The ``rename`` directive renames a file or directory if\n"
" it is converted. To rename from a subdirectory into the root of\n"
-" the repository, use '.' as the path to rename to."
+" the repository, use ``.`` as the path to rename to."
msgstr ""
msgid ""
@@ -1122,7 +1151,14 @@
" useful if you want to e.g. give a Subversion merge two parents, or\n"
" graft two disconnected series of history together. Each entry\n"
" contains a key, followed by a space, followed by one or two\n"
-" comma-separated values. The key is the revision ID in the source\n"
+" comma-separated values::"
+msgstr ""
+
+msgid " key parent1, parent2"
+msgstr ""
+
+msgid ""
+" The key is the revision ID in the source\n"
" revision control system whose parents should be modified (same\n"
" format as a key in .hg/shamap). The values are the revision IDs\n"
" (in either the source or destination revision control system) that\n"
@@ -1138,11 +1174,18 @@
" conjunction with a splicemap, it allows for a powerful combination\n"
" to help fix even the most badly mismanaged repositories and turn them\n"
" into nicely structured Mercurial repositories. The branchmap contains\n"
-" lines of the form \"original_branch_name new_branch_name\".\n"
-" \"original_branch_name\" is the name of the branch in the source\n"
-" repository, and \"new_branch_name\" is the name of the branch is the\n"
-" destination repository. This can be used to (for instance) move code\n"
-" in one repository from \"default\" to a named branch."
+" lines of the form::"
+msgstr ""
+
+msgid " original_branch_name new_branch_name"
+msgstr ""
+
+msgid ""
+" where \"original_branch_name\" is the name of the branch in the\n"
+" source repository, and \"new_branch_name\" is the name of the branch\n"
+" is the destination repository. No whitespace is allowed in the\n"
+" branch names. This can be used to (for instance) move code in one\n"
+" repository from \"default\" to a named branch."
msgstr ""
msgid ""
@@ -1314,21 +1357,24 @@
" dates."
msgstr ""
-msgid "username mapping filename"
-msgstr "brugernavnsafbildningsfilnavn"
+msgid "username mapping filename (DEPRECATED, use --authormap instead)"
+msgstr ""
+
+msgid "source repository type"
+msgstr "kildedepotstype"
msgid "destination repository type"
msgstr "type for destinations repository"
+msgid "import up to target revision REV"
+msgstr "importer op til revision REV"
+
+msgid "remap usernames using this file"
+msgstr "konverter brugernavne ved hjælp af denne fil"
+
msgid "remap file names using contents of file"
msgstr "konverter filnavne ved brug af filindhold"
-msgid "import up to target revision REV"
-msgstr "importer op til revision REV"
-
-msgid "source repository type"
-msgstr "kildedepotstype"
-
msgid "splice synthesized history into place"
msgstr "ind-splejs syntetisk historie"
@@ -2282,8 +2328,8 @@
msgid "Signing %d:%s\n"
msgstr "Underskriver: %d:%s\n"
-msgid "Error while signing"
-msgstr "Fejl ved underskrivning"
+msgid "error while signing"
+msgstr "fejl ved underskrivning"
msgid ""
"working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
@@ -2452,7 +2498,7 @@
msgid ""
"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::"
+"the path to hgk in your configuration file::"
msgstr ""
msgid ""
@@ -2804,6 +2850,11 @@
msgstr ""
msgid ""
+"Keywords expand to the changeset data pertaining to the latest change\n"
+"relative to the working directory parent of each file."
+msgstr ""
+
+msgid ""
"Configuration is done in the [keyword], [keywordset] and [keywordmaps]\n"
"sections of hgrc files."
msgstr ""
@@ -3691,6 +3742,14 @@
" blive opdateret ligesom matchede filer og forblive i patchen."
msgid ""
+" If -e/--edit is specified, Mercurial will start your configured editor "
+"for\n"
+" you to enter a message. In case qrefresh fails, you will find a backup "
+"of\n"
+" your message in ``.hg/last-message.txt``."
+msgstr ""
+
+msgid ""
" hg add/remove/copy/rename work as usual, though you might want to\n"
" use git-style patches (-g/--git or [diff] git=1) to track copies\n"
" and renames. See the diffs help topic for more information on the\n"
@@ -3753,20 +3812,17 @@
msgid "qfold requires at least one patch name"
msgstr "qfold kræver navnet på mindst én rettelse"
-msgid "No patches applied"
-msgstr "Der er ikke anvendt nogen rettelser"
-
-#, python-format
-msgid "Skipping already folded patch %s"
-msgstr "Springer allerede foldet rettelse %s over"
+#, python-format
+msgid "Skipping already folded patch %s\n"
+msgstr "Springer allerede foldet rettelse %s over\n"
#, python-format
msgid "qfold cannot fold already applied patch %s"
msgstr "qfold kan ikke folde allerede anvendt rettelse %s"
#, python-format
-msgid "Error folding patch %s"
-msgstr "Fejl ved foldning af rettelse %s"
+msgid "error folding patch %s"
+msgstr "fejl ved foldning af rettelse %s"
msgid "push or pop patches until named patch is at top of stack"
msgstr ""
@@ -3928,7 +3984,7 @@
msgstr ""
msgid ""
-" Use the --nobackup option to discard the backup bundle once the\n"
+" Use the --no-backup option to discard the backup bundle once the\n"
" operation completes.\n"
" "
msgstr ""
@@ -4099,6 +4155,12 @@
msgid "patches applied - cannot set new queue active"
msgstr ""
+msgid "cannot delete queue that does not exist"
+msgstr ""
+
+msgid "cannot delete currently active queue"
+msgstr ""
+
msgid " (active)\n"
msgstr " (aktiv)\n"
@@ -4109,10 +4171,12 @@
msgid "queue \"%s\" already exists"
msgstr "køen \"%s\" eksisterer allerede"
-msgid "cannot delete queue that does not exist"
-msgstr ""
-
-msgid "cannot delete currently active queue"
+#, python-format
+msgid "can't rename \"%s\" to its current name"
+msgstr "kan ikke omdøbe \"%s\" til dets nuværende navn"
+
+#, python-format
+msgid "non-queue directory \"%s\" already exists"
msgstr ""
msgid "use --create to create a new queue"
@@ -4138,8 +4202,8 @@
msgid "only a local queue repository may be initialized"
msgstr ""
-msgid "There is no Mercurial repository here (.hg not found)"
-msgstr "Der er intet Mercurial depot her (.hg ikke fundet)"
+msgid "there is no Mercurial repository here (.hg not found)"
+msgstr "der er intet Mercurial depot her (.hg ikke fundet)"
msgid "no queue repository"
msgstr ""
@@ -4393,6 +4457,9 @@
msgid "no backups"
msgstr "ingen backupper"
+msgid "no backups (DEPRECATED)"
+msgstr "ingen backupper (FORÆLDET)"
+
msgid "hg strip [-f] [-n] REV..."
msgstr "hg strip [-f] [-n] REV..."
@@ -4417,9 +4484,15 @@
msgid "create new queue"
msgstr "opret en ny kø"
+msgid "rename active queue"
+msgstr "omdøb den aktive kø"
+
msgid "delete reference to queue"
msgstr ""
+msgid "delete queue, and remove patch dir"
+msgstr ""
+
msgid "[OPTION] [QUEUE]"
msgstr "[TILVALG] [KØ]"
@@ -4602,7 +4675,7 @@
msgid ""
"To ignore global commands like :hg:`version` or :hg:`help`, you have\n"
-"to specify them in the global .hgrc\n"
+"to specify them in your user configuration file.\n"
msgstr ""
msgid "interpret suffixes to refer to ancestor revisions"
@@ -4669,9 +4742,9 @@
msgstr ""
msgid ""
-"With the -d/--diffstat option, you will be prompted for each changeset\n"
-"with a diffstat summary and the changeset summary, so you can be sure\n"
-"you are sending the right changes."
+"With the -d/--diffstat or -c/--confirm options, you will be presented\n"
+"with a final summary of all messages and asked for confirmation before\n"
+"the messages are sent."
msgstr ""
msgid ""
@@ -4746,12 +4819,6 @@
msgid "Please enter a valid value.\n"
msgstr "Angiv venligst en gyldig værdi.\n"
-msgid "does the diffstat above look okay?"
-msgstr "ser det ovenstående diffstat okay ud?"
-
-msgid "diffstat rejected"
-msgstr "diffstat afvist"
-
msgid "send changesets by email"
msgstr ""
@@ -4843,8 +4910,24 @@
msgid "This patch series consists of %d patches."
msgstr "Denne rettelsesserie består af %d rettelser."
-msgid "Final summary:\n"
-msgstr "Endeligt sammendrag:\n"
+msgid ""
+"\n"
+"Final summary:"
+msgstr ""
+"\n"
+"Endeligt sammendrag:"
+
+msgid "are you sure you want to send (yn)?"
+msgstr ""
+
+msgid "&No"
+msgstr ""
+
+msgid "&Yes"
+msgstr ""
+
+msgid "patchbomb canceled"
+msgstr ""
msgid "Displaying "
msgstr "Viser "
@@ -4852,9 +4935,15 @@
msgid "Writing "
msgstr "Skriver "
+msgid "writing"
+msgstr "skriver"
+
msgid "Sending "
msgstr "Sender "
+msgid "sending"
+msgstr "sender"
+
msgid "send patches as attachments"
msgstr "send rettelser som vedhæftede filer"
@@ -4867,6 +4956,9 @@
msgid "email addresses of copy recipients"
msgstr ""
+msgid "ask for confirmation before sending"
+msgstr ""
+
msgid "add diffstat output to messages"
msgstr "tilføj diffstat resultat til beskeder"
@@ -5588,8 +5680,8 @@
msgid "%s: empty changeset"
msgstr "%s: tom ændring"
-msgid "Fix up the merge and run hg transplant --continue"
-msgstr "Ret sammenføjningen og kør hg transplant --continue"
+msgid "fix up the merge and run hg transplant --continue"
+msgstr "ret sammenføjningen og kør hg transplant --continue"
#, python-format
msgid "%s transplanted as %s\n"
@@ -5949,18 +6041,6 @@
msgid "integrity check failed on %s:%d"
msgstr "integritetstjek fejlede på %s:%d"
-#, python-format
-msgid "%s: not a Mercurial bundle file"
-msgstr "%s er ikke et Mercurial bundt"
-
-#, python-format
-msgid "%s: unknown bundle version"
-msgstr "%s: bundtet har ukendt version"
-
-#, python-format
-msgid "%s: unknown bundle compression type"
-msgstr "%s: bundet har ukendt kompressionstype"
-
msgid "cannot create new bundle repository"
msgstr ""
@@ -5968,6 +6048,14 @@
msgid "premature EOF reading chunk (got %d bytes, expected %d)"
msgstr "for tidlig EOF ved læsning af chunk (fik %d bytes, forventede %d)"
+#, python-format
+msgid "%s: not a Mercurial bundle"
+msgstr "%s: ej et Mercurial bundt"
+
+#, python-format
+msgid "%s: unknown bundle version %s"
+msgstr "%s: bundtet har ukendt version %s"
+
msgid "empty username"
msgstr "tomt brugernavn"
@@ -6154,6 +6242,10 @@
msgid "can only follow copies/renames for explicit filenames"
msgstr "kan kun følge kopier/omdøbninger for eksplicitte filnavne"
+#, python-format
+msgid "skipping missing subrepository: %s\n"
+msgstr "springer manglende underdepot over: %s\n"
+
msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed."
msgstr ""
"HG: Skriv deponeringsbesked. Linier som starter med 'HG:' bliver fjernet."
@@ -6478,6 +6570,12 @@
msgid "The first bad revision is:\n"
msgstr "Den første dårlige revision er:\n"
+#, python-format
+msgid ""
+"Not all ancestors of this changeset have been checked.\n"
+"To check the other ancestors, start from the common ancestor, %s.\n"
+msgstr ""
+
msgid "Due to skipped revisions, the first good revision could be any of:\n"
msgstr ""
"På grund af oversprungne revisioner kan den første gode revision være en "
@@ -6841,11 +6939,11 @@
" angive filnavne eller -I/-X filtre."
msgid ""
-" If no commit message is specified, the configured editor is\n"
-" started to prompt you for a message."
-msgstr ""
-" Hvis der ikke angives en deponeringsbesked, så starten den\n"
-" konfigurerede editor for at bede dig om en besked."
+" If no commit message is specified, Mercurial starts your\n"
+" configured editor where you can enter a message. In case your\n"
+" commit fails, you will find a backup of your message in\n"
+" ``.hg/last-message.txt``."
+msgstr ""
msgid ""
" Returns 0 on success, 1 if nothing changed.\n"
@@ -6943,7 +7041,7 @@
msgid ""
" All string valued-elements are either strictly alphanumeric, or must\n"
-" be enclosed in double quotes (\"...\"), with \"\" as escape character."
+" be enclosed in double quotes (\"...\"), with \"\\\" as escape character."
msgstr ""
msgid ""
@@ -7097,8 +7195,9 @@
msgid " (check that your locale is properly set)\n"
msgstr ""
-msgid "Checking extensions...\n"
-msgstr "Kontrollerer udvidelser...\n"
+#, python-format
+msgid "Checking installed modules (%s)...\n"
+msgstr "Kontrollerer installerede moduler (%s)...\n"
msgid " One or more extensions could not be found"
msgstr ""
@@ -7126,7 +7225,7 @@
msgid ""
" (Current patch tool may be incompatible with patch, or misconfigured. "
-"Please check your .hgrc file)\n"
+"Please check your configuration file)\n"
msgstr ""
msgid ""
@@ -7140,7 +7239,7 @@
msgid " No commit editor set and can't find vi in PATH\n"
msgstr ""
-msgid " (specify a commit editor in your .hgrc file)\n"
+msgid " (specify a commit editor in your configuration file)\n"
msgstr ""
#, python-format
@@ -7150,7 +7249,7 @@
msgid "Checking username...\n"
msgstr ""
-msgid " (specify a username in your .hgrc file)\n"
+msgid " (specify a username in your configuration file)\n"
msgstr ""
msgid "No problems detected\n"
@@ -7640,6 +7739,9 @@
" "
msgstr ""
+msgid "cannot combine --bundle and --subrepos"
+msgstr ""
+
msgid "create a new repository in the given directory"
msgstr "opret et nyt depot i det givne katalog"
@@ -7883,8 +7985,8 @@
msgstr ""
msgid ""
-" Path names are defined in the [paths] section of\n"
-" ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a\n"
+" Path names are defined in the [paths] section of your\n"
+" configuration file and in ``/etc/mercurial/hgrc``. If run inside a\n"
" repository, ``.hg/hgrc`` is used, too."
msgstr ""
@@ -7956,6 +8058,13 @@
" "
msgstr ""
+msgid ""
+"other repository doesn't support revision lookup, so a rev cannot be "
+"specified."
+msgstr ""
+"det andet depot understøtter ikke revisionsopslag, så en revision kan ikke "
+"angives."
+
msgid "push changes to the specified destination"
msgstr "skub ændringer til den angivne destination"
@@ -8092,17 +8201,21 @@
msgstr "fjerner ikke %s: filen følges ikke\n"
#, python-format
-msgid "not removing %s: file %s (use -f to force removal)\n"
-msgstr "fjerner ikke %s: filen %s (brug -f for at forcere fjernelsen)\n"
-
-msgid "still exists"
-msgstr "eksisterer stadig"
-
-msgid "is modified"
-msgstr "er modificeret"
-
-msgid "has been marked for add"
-msgstr "er markeret som tilføjet"
+msgid "not removing %s: file still exists (use -f to force removal)\n"
+msgstr ""
+"fjerner ikke %s: filen eksisterer stadig (brug -f for at forcere "
+"fjernelsen)\n"
+
+#, python-format
+msgid "not removing %s: file is modified (use -f to force removal)\n"
+msgstr "fjerner ikke %s: filen er ændret (brug -f for at forcere fjernelsen)\n"
+
+#, python-format
+msgid ""
+"not removing %s: file has been marked for add (use -f to force removal)\n"
+msgstr ""
+"fjerner ikke %s: filen er markeret som tilføjt (brug -f for at forcere "
+"fjernelsen)\n"
msgid "rename files; equivalent of copy + remove"
msgstr ""
@@ -8120,38 +8233,48 @@
" 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`."
-msgid "various operations to help finish a merge"
-msgstr ""
-
-msgid ""
-" This command includes several actions that are often useful while\n"
-" performing a merge, after running ``merge`` but before running\n"
-" ``commit``. (It is only meaningful if your working directory has\n"
-" two parents.) It is most relevant for merges with unresolved\n"
-" conflicts, which are typically a result of non-interactive merging with\n"
-" ``internal:merge`` or a command-line merge tool like ``diff3``."
-msgstr ""
-
-msgid " The available actions are:"
-msgstr ""
-
-msgid ""
-" 1) list files that were merged with conflicts (U, for unresolved)\n"
-" and without conflicts (R, for resolved): ``hg resolve -l``\n"
-" (this is like ``status`` for merges)\n"
-" 2) record that you have resolved conflicts in certain files:\n"
-" ``hg resolve -m [file ...]`` (default: mark all unresolved files)\n"
-" 3) forget that you have resolved conflicts in certain files:\n"
-" ``hg resolve -u [file ...]`` (default: unmark all resolved files)\n"
-" 4) discard your current attempt(s) at resolving conflicts and\n"
-" restart the merge from scratch: ``hg resolve file...``\n"
-" (or ``-a`` for all unresolved files)"
-msgstr ""
-
-msgid ""
-" Note that Mercurial will not let you commit files with unresolved merge\n"
-" conflicts. You must use ``hg resolve -m ...`` before you can commit\n"
-" after a conflicting merge."
+msgid "redo merges or set/view the merge status of files"
+msgstr ""
+
+msgid ""
+" Merges with unresolved conflicts are often the result of\n"
+" non-interactive merging using the ``internal:merge`` configuration\n"
+" setting, or a command-line merge tool like ``diff3``. The resolve\n"
+" command is used to manage the files involved in a merge, after\n"
+" :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the\n"
+" working directory must have two parents)."
+msgstr ""
+
+msgid " The resolve command can be used in the following ways:"
+msgstr ""
+
+msgid ""
+" - :hg:`resolve FILE...`: attempt to re-merge the specified files,\n"
+" 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."
+msgstr ""
+
+msgid ""
+" - :hg:`resolve -m [FILE]`: mark a file as having been resolved\n"
+" (e.g. after having manually fixed-up the files). The default is\n"
+" to mark all unresolved files."
+msgstr ""
+
+msgid ""
+" - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The\n"
+" default is to mark all resolved files."
+msgstr ""
+
+msgid ""
+" - :hg:`resolve -l`: list files which had or still have conflicts.\n"
+" In the printed list, ``U`` = unresolved and ``R`` = resolved."
+msgstr ""
+
+msgid ""
+" Note that Mercurial will not let you commit files with unresolved\n"
+" merge conflicts. You must use :hg:`resolve -m ...` before you can\n"
+" commit after a conflicting merge."
msgstr ""
msgid ""
@@ -8336,6 +8459,9 @@
" angiv da portnummer 0; så vil serveren skrive det portnummer den\n"
" bruger."
+msgid "There is no Mercurial repository here (.hg not found)"
+msgstr "Der er intet Mercurial depot her (.hg ikke fundet)"
+
#, python-format
msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
msgstr "lytter på http://%s%s/%s (bundet til %s:%d)\n"
@@ -8862,6 +8988,9 @@
msgid "guess renamed files by similarity (0<=s<=100)"
msgstr "gæt omdøbte filer ud fra enshed (0<=s<=100)"
+msgid "recurse into subrepositories"
+msgstr "fortsæt rekursivt ind i underdepoter"
+
msgid "[OPTION]... [FILE]..."
msgstr "[TILVALG]... [FIL]..."
@@ -9347,7 +9476,7 @@
msgid "mark files as resolved"
msgstr "marker filer som løste"
-msgid "unmark files as resolved"
+msgid "mark files as unresolved"
msgstr "marker filer som uløste"
msgid "hide status prefix"
@@ -9498,6 +9627,10 @@
msgid "not found in manifest"
msgstr "blev ikke fundet i manifest"
+#, python-format
+msgid "no such file in rev %s"
+msgstr "ingen sådan fil i revision %s"
+
msgid "branch name not in UTF-8!"
msgstr "grennavn er ikke i UTF-8!"
@@ -9541,6 +9674,18 @@
msgstr "kopiering fejlede: %s er ikke en fil eller en symbolsk længe\n"
#, python-format
+msgid "invalid character in dag description: %s..."
+msgstr "ugyldig tegn i DAG-beskrivelsen: %s..."
+
+#, python-format
+msgid "expected id %i, got %i"
+msgstr ""
+
+#, python-format
+msgid "parent id %i is larger than current id %i"
+msgstr ""
+
+#, python-format
msgid "invalid event type in dag: %s"
msgstr ""
@@ -9632,10 +9777,6 @@
msgstr "afbrudt: %s\n"
#, python-format
-msgid "(%s)\n"
-msgstr ""
-
-#, python-format
msgid "hg: parse error at %s: %s\n"
msgstr "hg: konfigurationsfejl på %s: %s\n"
@@ -9696,6 +9837,10 @@
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"
@@ -9773,11 +9918,11 @@
msgid "extension '%s' overrides commands: %s\n"
msgstr "udvidelse '%s' overskriver kommandoer: %s\n"
-msgid "Option --config may not be abbreviated!"
-msgstr "Tilvalget --config må ikke forkortes!"
-
-msgid "Option --cwd may not be abbreviated!"
-msgstr "Tilvalget --cwd må ikke forkortes!"
+msgid "option --config may not be abbreviated!"
+msgstr "tilvalget --config må ikke forkortes!"
+
+msgid "option --cwd may not be abbreviated!"
+msgstr "tilvalget --cwd må ikke forkortes!"
msgid ""
"Option -R has to be separated from other options (e.g. not -qR) and --"
@@ -9863,12 +10008,6 @@
msgid "was merge of '%s' successful (yn)?"
msgstr ""
-msgid "&No"
-msgstr ""
-
-msgid "&Yes"
-msgstr ""
-
#, python-format
msgid ""
" output file %s appears unchanged\n"
@@ -9879,9 +10018,12 @@
msgid "merging %s failed!\n"
msgstr "sammenføjning af %s fejlede!\n"
-#, python-format
-msgid "Inconsistent state, %s:%s is good and bad"
-msgstr "Inkonsistent tilstant, %s:%s er god og dårlig"
+msgid "starting revisions are not directly related"
+msgstr "startrevisionerne er ikke direkte relaterede"
+
+#, python-format
+msgid "inconsistent state, %s:%s is good and bad"
+msgstr "inkonsistent tilstant, %s:%s er god og dårlig"
#, python-format
msgid "unknown bisect kind %s"
@@ -10150,8 +10292,8 @@
msgid ""
"To make Mercurial produce the git extended diff format, use the --git\n"
"option available for many commands, or set 'git = True' in the [diff]\n"
-"section of your hgrc. You do not need to set this option when\n"
-"importing diffs in this format or using them in the mq extension.\n"
+"section of your configuration file. You do not need to set this option\n"
+"when importing diffs in this format or using them in the mq extension.\n"
msgstr ""
msgid ""
@@ -10168,7 +10310,7 @@
" This is the name of the editor to run when committing. See EDITOR."
msgstr ""
-msgid " (deprecated, use .hgrc)"
+msgid " (deprecated, use configuration file)"
msgstr ""
msgid ""
@@ -10198,10 +10340,10 @@
msgid ""
"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."
+" A list of files or directories to search for configuration\n"
+" files. Item separator is \":\" on Unix, \";\" on Windows. If HGRCPATH\n"
+" is not set, platform default search path is used. If empty, only\n"
+" the .hg/hgrc from the current repository is read."
msgstr ""
msgid " For each element in HGRCPATH:"
@@ -10214,9 +10356,9 @@
msgid ""
"HGPLAIN\n"
-" When set, this disables any options in .hgrc that might change\n"
-" Mercurial's default output. This includes encoding, defaults,\n"
-" verbose mode, debug mode, quiet mode, tracebacks, and\n"
+" When set, this disables any configuration settings that might\n"
+" change Mercurial's default output. This includes encoding,\n"
+" defaults, verbose mode, debug mode, quiet mode, tracebacks, and\n"
" localization. This can be useful when scripting against Mercurial\n"
" in the face of existing user configuration."
msgstr ""
@@ -10234,7 +10376,7 @@
msgid ""
" - HGUSER (deprecated)\n"
-" - hgrc files from the HGRCPATH\n"
+" - configuration files from the HGRCPATH\n"
" - EMAIL\n"
" - interactive prompt\n"
" - LOGNAME (with ``@hostname`` appended)"
@@ -10299,13 +10441,13 @@
"behov."
msgid ""
-"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::"
+"To enable the \"foo\" extension, either shipped with Mercurial or in the\n"
+"Python search path, create an entry for it in your configuration file,\n"
+"like this::"
msgstr ""
"For at aktivere \"foo\" udvidelsen, som enten er kommet sammen med\n"
"Mercurial eller lagt i Pythons søgesti, lav da en indgang for den i\n"
-"din hgrc::"
+"din konfigurationsfil::"
msgid ""
" [extensions]\n"
@@ -10325,11 +10467,12 @@
" myfeature = ~/.hgext/myfeature.py"
msgid ""
-"To explicitly disable an extension enabled in an hgrc of broader\n"
-"scope, prepend its path with !::"
+"To explicitly disable an extension enabled in a configuration file of\n"
+"broader scope, prepend its path with !::"
msgstr ""
"For eksplicit at deaktivere en udvidelse som er slået til i en mere\n"
-"bredt dækkende hgrc-fil, så skal man sætte et ! foran dens sti::"
+"bredt dækkende konfigurationsfil, så skal man sætte et ! foran dens\n"
+"sti::"
msgid ""
" [extensions]\n"
@@ -10407,6 +10550,21 @@
msgstr ""
msgid ""
+"Branch, inactive\n"
+" If a named branch has no topological heads, it is considered to be\n"
+" inactive. As an example, a feature branch becomes inactive when it\n"
+" is merged into the default branch. The :hg:`branches` command\n"
+" shows inactive branches by default, though they can be hidden with\n"
+" :hg:`branches --active`."
+msgstr ""
+
+msgid ""
+" NOTE: this concept is deprecated because it is too implicit.\n"
+" Branches should now be explicitly closed using :hg:`commit\n"
+" --close-branch` when they are no longer needed."
+msgstr ""
+
+msgid ""
"Branch, named\n"
" A collection of changesets which have the same branch name. By\n"
" default, children of a changeset in a named branch belong to the\n"
@@ -11270,6 +11428,12 @@
msgstr ""
msgid ""
+"``present(set)``\n"
+" An empty set, if any revision in set isn't found; otherwise,\n"
+" all revisions in set."
+msgstr ""
+
+msgid ""
"``removes(pattern)``\n"
" Changesets which remove files matching pattern."
msgstr ""
@@ -11577,6 +11741,11 @@
msgid ":shortdate: Date. Returns a date like \"2006-09-18\"."
msgstr ""
+msgid ""
+":stringify: Any type. Turns the value into text by converting values into\n"
+" text and concatenating them."
+msgstr ""
+
msgid ":strip: Any text. Strips all leading and trailing whitespace."
msgstr ""
@@ -11657,13 +11826,13 @@
" Compression yes"
msgid ""
-" Alternatively specify \"ssh -C\" as your ssh command in your hgrc or\n"
-" with the --ssh command line option."
-msgstr ""
-
-msgid ""
-"These URLs can all be stored in your hgrc with path aliases under the\n"
-"[paths] section like so::"
+" Alternatively specify \"ssh -C\" as your ssh command in your\n"
+" configuration file or with the --ssh command line option."
+msgstr ""
+
+msgid ""
+"These URLs can all be stored in your configuration file with path\n"
+"aliases under the [paths] section like so::"
msgstr ""
msgid ""
@@ -11753,11 +11922,11 @@
msgstr "brug 'hg resolve' for at prøve at sammenføje uløste filer igen\n"
msgid ""
-"use 'hg resolve' to retry unresolved file merges or 'hg update -C' to "
+"use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to "
"abandon\n"
msgstr ""
"brug 'hg resolve' for at prøve at sammenføje uløste filer igen eller 'hg up -"
-"C' for at opgive\n"
+"C .' for at opgive\n"
msgid "(branch merge, don't forget to commit)\n"
msgstr "(grensammenføjning, glem ikke at deponere)\n"
@@ -11766,6 +11935,10 @@
msgid "error reading %s/.hg/hgrc: %s\n"
msgstr "fejl ved læsning af %s/.hg/hgrc: %s\n"
+#, python-format
+msgid "error accessing repository at %s\n"
+msgstr "kunne ikke tilgå depot ved %s\n"
+
msgid "SSL support is unavailable"
msgstr "understøttelse for SSL er ikke tilstede"
@@ -11999,7 +12172,7 @@
msgstr "anmoder om alle ændringer\n"
msgid ""
-"Partial pull cannot be done because other repository doesn't support "
+"partial pull cannot be done because other repository doesn't support "
"changegroupsubset."
msgstr ""
@@ -12079,7 +12252,7 @@
msgid "transferred %s in %.1f seconds (%s/sec)\n"
msgstr "overførte %s i %.1f sekunder (%s/sek)\n"
-msgid "no [smtp]host in hgrc - cannot send mail"
+msgid "smtp.host not configured - cannot send mail"
msgstr ""
#, python-format
@@ -12124,6 +12297,13 @@
msgstr "kunne ikke fjerne %s fra manifest"
#, python-format
+msgid "invalid pattern (%s): %s"
+msgstr "ugyldigt mønster (%s): %s"
+
+msgid "invalid pattern"
+msgstr "ugyldig mønster"
+
+#, python-format
msgid "diff context lines count must be an integer, not %r"
msgstr ""
@@ -12294,8 +12474,8 @@
msgstr "patch kommando fejlede: %s"
#, python-format
-msgid "Unsupported line endings type: %s"
-msgstr "Linieendelse %s understøttes ikke"
+msgid "unsupported line endings type: %s"
+msgstr "linieendelse %s understøttes ikke"
msgid ""
"internal patcher failed\n"
@@ -12572,6 +12752,10 @@
msgstr "ukendt underdepottype %s"
#, python-format
+msgid "warning: %s in %s\n"
+msgstr "advarsel: %s i %s\n"
+
+#, python-format
msgid "removing subrepo %s\n"
msgstr "fjerner underdepot %s\n"
@@ -12737,8 +12921,8 @@
msgstr "kunne ikke lave et symbolsk link til %r: %s"
#, python-format
-msgid "invalid date: %r "
-msgstr "ugyldig dato: %r "
+msgid "invalid date: %r"
+msgstr "ugyldig dato: %r"
#, python-format
msgid "date exceeds 32 bits: %d"
@@ -12792,6 +12976,10 @@
msgid "%.0f bytes"
msgstr "%.0f byte"
+#, python-format
+msgid "no port number associated with service '%s'"
+msgstr ""
+
msgid "cannot verify bundle or remote repos"
msgstr "kan ikke verificere bundt eller fjerndepoter"